// Cleanups/fixes by James L. Hammons
//
-//
-// Important info:
-//
-// NTSC PAL
-// GPU/DSP/video clock rate 26.590906 26.593900
-// 68000 clock rate 13.295453 13.296950
-// (clock rates in MHz)
-//
-
// Added by SDLEMU (http://sdlemu.ngemu.com)
// Added for GCC UNIX compatibility
#ifdef __GCCUNIX__
#include <time.h>
#include <SDL.h>
-#include "SDLptc.h"
+//#include "SDLptc.h" // Ick! Aargh! Bleah!
#include "jaguar.h"
#include "crc32.h"
#include "unzip.h"
// Uncomment this for speed control
//#define SPEED_CONTROL
-//
// Private function prototypes
-//
uint32 JaguarLoadROM(uint8 *, char *);
void JaguarLoadCart(uint8 *, char *);
-//
+// External variables
+
+//These two should be local!
+extern bool jaguar_use_bios;
+extern bool dsp_enabled;
+
+extern uint8 * jaguar_mainRam;
+extern uint8 * jaguar_bootRom;
+extern uint8 * jaguar_mainRom;
+
// Various paths
-//
-//static char *jaguar_bootRom_path="c:/jaguarEmu/newload.img";
static char * jaguar_bootRom_path = "./bios/jagboot.rom";
+//static char *jaguar_bootRom_path="c:/jaguarEmu/newload.img";
//static char *jaguar_bootRom_path="./bios/JagOS.bin";
char * jaguar_eeproms_path = "./eeproms/";
char jaguar_boot_dir[1024];
-//static char romLoadDialog_filePath[1024];
+SDL_Surface * surface, * mainSurface;
+SDL_Joystick * joystick;
+Uint32 mainSurfaceFlags = SDL_SWSURFACE;
-Console console;
-Surface * surface;
-Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
+//Console console;
+//Surface * surface;
+//Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
bool finished = false;
bool fullscreen = false;
bool hardwareTypeNTSC = true; // Set to false for PAL
-//
-// External variables
-//
+bool useJoystick = false;
-extern bool jaguar_use_bios;
-extern bool dsp_enabled;
-extern uint8 * jaguar_mainRam;
-extern uint8 * jaguar_bootRom;
-extern uint8 * jaguar_mainRom;
-
-
-void main_screen_switch(void)
-{
- fullscreen = !fullscreen;
- if (fullscreen)
- console.option("fullscreen output");
- else
- console.option("windowed output");
- console.close();
- console.open("Virtual Jaguar", tom_width, tom_height, format);
-}
// Added/changed by SDLEMU http://sdlemu.ngemu.com
-uint32 totalFrames;//so we can grab this from somewhere else...
+uint32 totalFrames;//so we can grab this from elsewhere...
int main(int argc, char * argv[])
{
uint32 startTime;//, totalFrames;//, endTime;//, w, h;
printf("Portions massaged by James L. Hammons (WIN32)\n");
printf("Contact: http://sdlemu.ngemu.com/ | sdlemu@ngemu.com\n");
- console.option("windowed output");
+// console.option("windowed output");
// BIOS is now ON by default--use the -nobios switch to turn it off!
jaguar_use_bios = true;
haveCart = true; // It looks like we have a cartridge!
if (!strcmp(argv[i], "-fullscreen"))
- {
+// {
fullscreen = true;
- console.option("fullscreen output");
- }
+// console.option("fullscreen output");
+// }
- if (!strcmp(argv[i], "-window"))
- console.option("windowed output");
+//We *don't* need this option!
+/* if (!strcmp(argv[i], "-window"))
+// console.option("windowed output");
+ fullscreen = false;*/
if (!strcmp(argv[i], "-joystick"))
- console.option("joystick enabled");
+// console.option("joystick enabled");
+ useJoystick = true;
if (!strcmp(argv[i], "-joyport"))
{
{
printf("Usage: \n\n");
printf("vj [romfile] [switches]\n");
- printf(" -? or -help : Display usage and switches \n");
- printf(" -fullscreen : Enable fullscreen mode \n");
- printf(" -window : Enable windowed mode (default) \n");
- printf(" -frameskip 1-10 : Enable frameskip 1 (default) - 10 \n");
- printf(" -joystick : Enable joystick/gamepad \n");
- printf(" -joyport 0-3 : Select desired joystick port \n");
- printf(" -nobios : Boot cart without using Jaguar BIOS ROM \n");
- printf(" -dspon : Force VJ to use the DSP \n");
- printf(" -pal : Force VJ to PAL mode (default is NTSC) \n");
+ printf(" -? or -help : Display usage and switches \n");
+ printf(" -fullscreen : Enable fullscreen mode (windowed default)\n");
+ printf(" -frameskip 1-10 : Enable frameskip 1 (default) - 10 \n");
+ printf(" -joystick : Enable joystick/gamepad \n");
+ printf(" -joyport 0-3 : Select desired joystick port \n");
+ printf(" -nobios : Boot cart without using Jaguar BIOS ROM \n");
+ printf(" -dspon : Force VJ to use the DSP \n");
+ printf(" -pal : Force VJ to PAL mode (default is NTSC) \n");
printf("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n");
printf("with the Jaguar BIOS.\n");
- return true;
+ return 1;
}
}
// Get the cartridge ROM (if passed in)
if (haveCart)
- {
JaguarLoadCart(jaguar_mainRom, argv[1]);
- eeprom_init();
- }
jaguar_reset();
- // Setting up the backbuffer
+ // Set up the backbuffer
int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16));
- // Setting up the primary SDL display
- surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
+ // Set up SDL library
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0)
+ {
+ WriteLog("VJ: Could not initialize the SDL library: %s", SDL_GetError());
+ exit(1);
+ }
+
+ // Let's get proper info about the platform we're running on.
+ const SDL_VideoInfo * info = SDL_GetVideoInfo();
+
+ if (!info)
+ {
+ WriteLog("VJ: SDL is unable to get the video query: %s\n", SDL_GetError());
+ exit(1);
+ }
+
+ if (info->hw_available)
+ mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF;
+
+ if (info->blit_hw)
+ mainSurfaceFlags |= SDL_HWACCEL;
+
+ if (fullscreen)
+ mainSurfaceFlags |= SDL_FULLSCREEN;
+
+ // Note: mainSurface is *never* used again!
+ //Not true--had to look at what's what here...
+ mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth(), tom_getVideoModeHeight(), 16, mainSurfaceFlags);
+
+ if (mainSurface == NULL)
+ {
+ WriteLog("VJ: SDL is unable to set the video mode: %s\n", SDL_GetError());
+ exit(1);
+ }
+
+ SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar");
+
+ // Create the primary SDL display (16 BPP, 5/5/5 RGB format)
+// surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
+//Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
+ surface = SDL_CreateRGBSurface(SDL_SWSURFACE, tom_getVideoModeWidth(),
+ tom_getVideoModeHeight(), 16, 0x7C00, 0x03E0, 0x001F, 0);
+ if (surface == NULL)
+ {
+ WriteLog("VJ: Could not create primary SDL surface: %s", SDL_GetError());
+ exit(1);
+ }
// Initialize Joystick support under SDL
- if (console.JoyEnabled() == 1)
+// if (console.JoyEnabled() == 1)
+ if (useJoystick)
{
if (SDL_NumJoysticks() <= 0)
{
- console.option("joystick disabled");
+// console.option("joystick disabled");
+ useJoystick = false;
printf("No joystick(s) or joypad(s) detected on your system. Using keyboard...\n");
}
else
{
- if ((console.joystick = SDL_JoystickOpen(nJoyport)) == 0)
+// if ((console.joystick = SDL_JoystickOpen(nJoyport)) == 0)
+ if ((joystick = SDL_JoystickOpen(nJoyport)) == 0)
{
- console.option("joystick disabled");
+// console.option("joystick disabled");
+ useJoystick = false;
printf("Unable to open a Joystick on port: %d\n", (int)nJoyport);
}
else
}
// Open the display and start emulating some 3l337 Atari Jaguar games :P
- console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
-
+// console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
+
totalFrames = 0;
startTime = clock();
nNormalLast = 0; // Last value of timeGetTime()
// Simple frameskip
if (nFrame == nFrameskip)
{
- int32 * vs = (int32 *)surface->lock();
- memcpy(vs, backbuffer, tom_width * tom_height * 2);
- surface->unlock();
- surface->copy(console);
- console.update();
+// int32 * vs = (int32 *)surface->lock();
+ if (SDL_MUSTLOCK(surface))
+ while (SDL_LockSurface(surface) < 0)
+ SDL_Delay(10);
+// uint8 * vs = (Uint8 *)surface->pixels;
+// memcpy(vs, backbuffer, tom_width * tom_height * 2);
+ memcpy(surface->pixels, backbuffer, tom_width * tom_height * 2);
+// surface->unlock();
+ if (SDL_MUSTLOCK(surface))
+ SDL_UnlockSurface(surface);
+// surface->copy(console);
+ SDL_Rect srcrect, dstrect;
+ srcrect.x = srcrect.y = 0, srcrect.w = surface->w, srcrect.h = surface->h;
+ dstrect.x = dstrect.y = 0, dstrect.w = surface->w, dstrect.h = surface->h;
+// SDL_LowerBlit(surface, &srcrect, dst.surface, &dstrect);
+ SDL_BlitSurface(surface, &srcrect, mainSurface, &dstrect);
+// dst.updates[dst.nupdates++] = dstrect;
+// console.update();
+ SDL_Flip(mainSurface);
+// nupdates = 0;
+
nFrame = 0;
}
else
int elapsedTime = clock() - startTime;
int fps = (1000 * totalFrames) / elapsedTime;
fprintf(log_get(), "Statistics: %i FPS\n", fps);
-
- if (console.JoyEnabled() == 1) {}
-
+
jaguar_done();
version_done();
memory_done();
log_done();
- console.close(); // Close SDL items as last!
+// console.close(); // Close SDL items as last!
+ SDL_JoystickClose(joystick);
+ SDL_FreeSurface(surface);
+ SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
+ SDL_Quit();
return 0;
}
uint32 romsize = JaguarLoadROM(mem, path);
jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romsize);
WriteLog( "CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
+ eeprom_init();
}
projects / virtualjaguar / blobdiff