X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=309ec236ff0ce9295896270c5563a27dd92d806b;hb=683f283e1328164c176618088c34408ea6c03cf7;hp=74a5629850f64d497c206cc117e1844b8933593a;hpb=8a2e0984567564b6d0124d5d0ffbca39c4ad2957;p=virtualjaguar diff --git a/src/vj.cpp b/src/vj.cpp index 74a5629..309ec23 100644 --- a/src/vj.cpp +++ b/src/vj.cpp @@ -18,8 +18,14 @@ #include "sdlemu_opengl.h" #include "settings.h" // Pull in "vjs" struct -// Uncomment this for speed control (?) -//#define SPEED_CONTROL +// Uncomment this to use built-in BIOS/CD-ROM BIOS +// You'll need a copy of jagboot.h & jagcd.h for this to work...! +//#define USE_BUILT_IN_BIOS + +#ifdef USE_BUILT_IN_BIOS +#include "jagboot.h" +#include "jagcd.h" +#endif // Private function prototypes @@ -49,13 +55,10 @@ bool CDBIOSLoaded = false; uint32 totalFrames;//temp, so we can grab this from elsewhere... int main(int argc, char * argv[]) { -// uint32 startTime;//, totalFrames;//, endTime;//, w, h; -// uint32 nNormalLast = 0; -// int32 nNormalFrac = 0; +//NOTE: This isn't actually used anywhere... !!! FIX !!! int32 nFrameskip = 0; // Default: Show every frame -// int32 nFrame = 0; // No. of Frame - printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v1.0.7\n"); + printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v1.1.0\n"); printf("Based upon Virtual Jaguar core v1.0.0 by David Raingeard.\n"); printf("Written by Niels Wagenaar (Linux/WIN32), Carwin Jones (BeOS),\n"); printf("James L. Hammons (WIN32) and Adam Green (MacOS)\n"); @@ -91,9 +94,6 @@ int main(int argc, char * argv[]) nFrameskip = atoi(argv[++i]) + 1; if (nFrameskip > 10) nFrameskip = 10; -#ifdef SPEED_CONTROL - nFrameskip = 0; -#endif } if (!strcmp(argv[i], "-bios")) @@ -159,12 +159,14 @@ int main(int argc, char * argv[]) } // Set up SDL library - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER - | SDL_INIT_CDROM | SDL_INIT_NOPARACHUTE) < 0) + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER) < 0) +// | SDL_INIT_CDROM) < 0) +// | SDL_INIT_CDROM | SDL_INIT_NOPARACHUTE) < 0) { WriteLog("VJ: Could not initialize the SDL library: %s\n", SDL_GetError()); return -1; } + WriteLog("VJ: SDL successfully initialized.\n"); WriteLog("Initializing memory subsystem...\n"); @@ -176,6 +178,12 @@ WriteLog("Initializing jaguar subsystem...\n"); jaguar_init(); // Get the BIOS ROM +#ifdef USE_BUILT_IN_BIOS + WriteLog("VJ: Using built in BIOS/CD BIOS...\n"); + memcpy(jaguar_bootRom, jagBootROM, 0x20000); + memcpy(jaguar_CDBootROM, jagCDROM, 0x40000); + BIOSLoaded = CDBIOSLoaded = true; +#else // if (vjs.useJaguarBIOS) // What would be nice here would be a way to check if the BIOS was loaded so that we // could disable the pushbutton on the Misc Options menu... !!! FIX !!! [DONE here, but needs to be fixed in GUI as well!] @@ -184,6 +192,7 @@ WriteLog("About to attempt to load BIOSes...\n"); WriteLog("VJ: BIOS is %savailable...\n", (BIOSLoaded ? "" : "not ")); CDBIOSLoaded = (JaguarLoadROM(jaguar_CDBootROM, vjs.CDBootPath) == 0x40000 ? true : false); WriteLog("VJ: CD BIOS is %savailable...\n", (CDBIOSLoaded ? "" : "not ")); +#endif SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack... @@ -192,79 +201,9 @@ WriteLog("Initializing video subsystem...\n"); WriteLog("Initializing GUI subsystem...\n"); InitGUI(); - // Get the cartridge ROM (if passed in) // Now with crunchy GUI goodness! -// JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : vjs.ROMPath)); -//Need to find a better way to handle this crap... WriteLog("About to start GUI...\n"); - GUIMain(); - -/* jaguar_reset(); - - totalFrames = 0; - startTime = clock(); - nNormalLast = 0; // Last value of timeGetTime() - nNormalFrac = 0; // Extra fraction we did - nNormalLast = SDL_GetTicks(); //timeGetTime(); - - while (!finished) - { -#ifdef SPEED_CONTROL - nTime = SDL_GetTicks() - nNormalLast; // calcule le temps écoulé depuis le dernier affichage - // nTime est en mili-secondes. - // détermine le nombre de trames à passer + 1 - nCount = (nTime * 600 - nNormalFrac) / 10000; - - // si le nombre de trames à passer + 1 est nul ou négatif, - // ne rien faire pendant 2 ms - if (nCount <= 0) - { - //Sleep(2); - //SDL_Delay(1); - } // No need to do anything for a bit - else - { - nNormalFrac += nCount * 10000; // - nNormalLast += nNormalFrac / 600; // add the duration of nNormalFrac frames - nNormalFrac %= 600; // - - // Pas plus de 9 (10-1) trames non affichées - if (nCount > 10) - nCount = 10; - for(int i=0; i