X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=0619b0523d070f2de61b07053a0ca800aaffa9cf;hb=94e1e961b57f253b760298ab0bae96a7de6d20fa;hp=d498ceb32d30b3fe9b13071d276b6c09e984b59d;hpb=79aba4838bf4f43d1905e21a84e4c40906531bef;p=virtualjaguar diff --git a/src/vj.cpp b/src/vj.cpp index d498ceb..0619b05 100644 --- a/src/vj.cpp +++ b/src/vj.cpp @@ -6,65 +6,49 @@ // Cleanups/fixes/enhancements by James L. Hammons and Adam Green // -#ifdef __GCCUNIX__ -#include // Is this necessary anymore? -#endif - -#include #include +#include +#include "file.h" +//#include "gui.h" #include "jaguar.h" -#include "video.h" -#include "gui.h" +#include "log.h" +#include "memory.h" #include "sdlemu_opengl.h" #include "settings.h" // Pull in "vjs" struct - -// Uncomment this for speed control (?) -//#define SPEED_CONTROL +#include "video.h" // 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 +// Uncomment this for an official Virtual Jaguar release +//#define VJ_RELEASE_VERSION "1.1.0" +#warning !!! FIX !!! Figure out how to use this in GUI.CPP as well! + #ifdef USE_BUILT_IN_BIOS #include "jagboot.h" #include "jagcd.h" #endif -// Private function prototypes - -// External variables - -extern uint8 * jaguar_mainRam; -extern uint8 * jaguar_mainRom; -extern uint8 * jaguar_bootRom; -extern uint8 * jaguar_CDBootROM; - -// Global variables (export capable) -//should these even be here anymore? -bool finished = false; -bool showGUI = false; -bool showMessage = false; -uint32 showMessageTimeout; -char messageBuffer[200]; -bool BIOSLoaded = false; -bool CDBIOSLoaded = false; +// Private function prototypes // // The main emulator loop (what else?) // //Maybe we should move the video stuff to TOM? Makes more sense to put it there... //Actually, it would probably be better served in VIDEO.CPP... !!! FIX !!! [DONE] -uint32 totalFrames;//temp, so we can grab this from elsewhere... -int main(int argc, char * argv[]) +//uint32 totalFrames;//temp, so we can grab this from elsewhere... +int main_old(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.8\n"); +#ifdef VJ_RELEASE_VERSION + printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v%s\n", VJ_RELEASE_VERSION); +#else + printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator SVN %s\n", __DATE__); +#endif 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"); @@ -72,7 +56,7 @@ int main(int argc, char * argv[]) bool haveCart = false; // Assume there is no cartridge...! - log_init("vj.log"); + LogInit("vj.log"); LoadVJSettings(); // Get config file settings... // Check the switches... ;-) @@ -85,7 +69,7 @@ int main(int argc, char * argv[]) if (argv[i][0] != '-') haveCart = true; // It looks like we have a cartridge! - if (!strcmp(argv[i], "-joystick")) + if (!strcmp(argv[i], "-joystick")) vjs.useJoystick = true; if (!strcmp(argv[i], "-joyport")) @@ -100,9 +84,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")) @@ -129,10 +110,10 @@ int main(int argc, char * argv[]) if (!strcmp(argv[i], "-nogl")) vjs.useOpenGL = false; - if (!strcmp(argv[i], "-fullscreen")) + if (!strcmp(argv[i], "-fullscreen")) vjs.fullscreen = true; - if (!strcmp(argv[i], "-window")) + if (!strcmp(argv[i], "-window")) vjs.fullscreen = false; if (!strcmp(argv[i], "-pal")) @@ -141,11 +122,11 @@ int main(int argc, char * argv[]) if (!strcmp(argv[i], "-ntsc")) vjs.hardwareTypeNTSC = true; - if (!strcmp(argv[i], "-help") || !strcmp(argv[i], "-?")) + if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-?")) { printf("Usage: \n\n"); printf("vj [romfile] [switches]\n"); - printf(" -? or -help : Display usage and switches \n"); + printf(" -? or --help : Display usage and switches \n"); printf(" -frameskip 1-10 : Enable frameskip 1 - 10 (default: none) \n"); printf(" -joystick : Enable joystick/gamepad \n"); printf(" -joyport 0-3 : Select desired joystick port \n"); @@ -169,8 +150,6 @@ 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) < 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; @@ -178,128 +157,58 @@ int main(int argc, char * argv[]) WriteLog("VJ: SDL successfully initialized.\n"); -WriteLog("Initializing memory subsystem...\n"); - InitMemory(); -WriteLog("Initializing version...\n"); - InitVersion(); - version_display(log_get()); -WriteLog("Initializing jaguar subsystem...\n"); - jaguar_init(); +// WriteLog("Initializing memory subsystem...\n"); +// MemoryInit(); +#ifdef VJ_RELEASE_VERSION + WriteLog("Virtual Jaguar %s (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__); +#else + WriteLog("Virtual Jaguar SVN %s (Last full build was on %s %s)\n", __DATE__, __DATE__, __TIME__); +#endif + WriteLog("Initializing jaguar subsystem...\n"); + JaguarInit(); // 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); + memcpy(jaguarBootROM, jagBootROM, 0x20000); + memcpy(jaguarCDBootROM, 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!] WriteLog("About to attempt to load BIOSes...\n"); - BIOSLoaded = (JaguarLoadROM(jaguar_bootRom, vjs.jagBootPath) == 0x20000 ? true : false); + BIOSLoaded = (JaguarLoadROM(jaguarBootROM, vjs.jagBootPath) == 0x20000 ? true : false); WriteLog("VJ: BIOS is %savailable...\n", (BIOSLoaded ? "" : "not ")); - CDBIOSLoaded = (JaguarLoadROM(jaguar_CDBootROM, vjs.CDBootPath) == 0x40000 ? true : false); + CDBIOSLoaded = (JaguarLoadROM(jaguarCDBootROM, vjs.CDBootPath) == 0x40000 ? true : false); WriteLog("VJ: CD BIOS is %savailable...\n", (CDBIOSLoaded ? "" : "not ")); #endif - SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack... + SET32(jaguarMainRAM, 0, 0x00200000); // Set top of stack... WriteLog("Initializing video subsystem...\n"); - InitVideo(); + VideoInit(); WriteLog("Initializing GUI subsystem...\n"); - InitGUI(); +#warning "!!! FIX !!! (GUIInit())" +// GUIInit(); - // 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(); - GUIMain(haveCart ? argv[1] : NULL); - -/* 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