X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fgp2x%2Fmain.c;h=3f4dff95dfd9cfefacf6a57e05c00c20304fe0b4;hb=32a0f49f4d70fe79def8718ec0b4e2460d629d6c;hp=e9223f2b1d817f8008cc5192c6a68c55aac93b9d;hpb=b2b95d2e0d1fd5e52d03c2152605b09b024c1d0e;p=fceu.git diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c index e9223f2..3f4dff9 100644 --- a/drivers/gp2x/main.c +++ b/drivers/gp2x/main.c @@ -1,7 +1,4 @@ /* FCE Ultra - NES/Famicom Emulator - * - * Copyright notice for this file: - * Copyright (C) 2002 Ben Parnell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,11 +15,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* This file contains or coordinates all of the code necessary to compile - on a UNIX system that can use svgalib, such as FreeBSD and Linux. - This code is not guaranteed to compile on FreeBSD, though. -*/ - #include #include @@ -36,6 +28,7 @@ #include #include "main.h" +#include "minimal.h" #include "throttle.h" #include "menu.h" #include "gp2x.h" @@ -45,11 +38,12 @@ #include "../common/unixdsp.h" #include "../common/cheat.h" +#include "../../fce.h" + #include "dface.h" -// just for printing some iNES info for user.. -#include "../../fce.h" -#include "../../ines.h" + +void CleanSurface(void); // internals extern char lastLoadedGameName[2048]; @@ -57,14 +51,12 @@ extern uint8 Exit; // exit emu loop flag void CloseGame(void); FCEUGI *fceugi = NULL; -static int ntsccol=0,ntschue=-1,ntsctint=-1; +int ntsccol=0,ntschue=-1,ntsctint=-1; int soundvol=70; int inited=0; -int swapbuttons=0; -int showfps=0; -int srendlinev[2]={0,0}; -int erendlinev[2]={239,239}; +int srendlinev[2]={8,0}; +int erendlinev[2]={231,239}; int srendline,erendline; @@ -92,7 +84,6 @@ static void ParseGI(FCEUGI *gi) InputType[1]=gi->input[1]; if(gi->inputfc>=0) InputTypeFC=gi->inputfc; - FCEUI_GetCurrentVidSystem(&srendline,&erendline); } void FCEUD_PrintError(char *s) @@ -129,37 +120,73 @@ static CFGSTRUCT fceuconfig[]={ AC(eoptions), ACA(srendlinev), ACA(erendlinev), - ACA(lastLoadedGameName), ADDCFGSTRUCT(DriverConfig), ENDCFGSTRUCT }; -static void SaveConfig(void) +void SaveConfig(const char *name) { char tdir[2048]; - sprintf(tdir,"%s"PSS"fceu.cfg",BaseDirectory); - DriverInterface(DES_GETNTSCTINT,&ntsctint); - DriverInterface(DES_GETNTSCHUE,&ntschue); + if (name) + sprintf(tdir,"%s"PSS"cfg"PSS"%s.cfg",BaseDirectory,name); + else sprintf(tdir,"%s"PSS"fceu2.cfg",BaseDirectory); + FCEUI_GetNTSCTH(&ntsctint, &ntschue); SaveFCEUConfig(tdir,fceuconfig); } -static void LoadConfig(void) +static void LoadConfig(const char *name) { char tdir[2048]; - sprintf(tdir,"%s"PSS"fceu.cfg",BaseDirectory); + if (name) + sprintf(tdir,"%s"PSS"cfg"PSS"%s.cfg",BaseDirectory,name); + else sprintf(tdir,"%s"PSS"fceu2.cfg",BaseDirectory); + FCEUI_GetNTSCTH(&ntsctint, &ntschue); /* Get default settings for if no config file exists. */ LoadFCEUConfig(tdir,fceuconfig); - if(ntsctint>=0) DriverInterface(DES_SETNTSCTINT,&ntsctint); - if(ntschue>=0) DriverInterface(DES_SETNTSCHUE,&ntschue); + FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue); +} + +static void LoadLLGN(void) +{ + char tdir[2048]; + FILE *f; + int len; + sprintf(tdir,"%s"PSS"last_rom.txt",BaseDirectory); + f=fopen(tdir, "r"); + if(f) + { + len = fread(lastLoadedGameName, 1, sizeof(lastLoadedGameName)-1, f); + lastLoadedGameName[len] = 0; + fclose(f); + } +} + +static void SaveLLGN(void) +{ + // save last loaded game name + if (lastLoadedGameName[0]) + { + char tdir[2048]; + FILE *f; + sprintf(tdir,"%s"PSS"last_rom.txt",BaseDirectory); + f=fopen(tdir, "w"); + if(f) + { + fwrite(lastLoadedGameName, 1, strlen(lastLoadedGameName), f); + fclose(f); + sync(); + } + } } + static void CreateDirs(void) { - char *subs[5]={"fcs","snaps","gameinfo","sav","cheats"}; + char *subs[]={"fcs","snaps","gameinfo","sav","cheats","cfg"}; char tdir[2048]; int x; mkdir(BaseDirectory,S_IRWXU); - for(x=0;x<5;x++) + for(x=0;x239) erendlinev[x]=239; } - printf("main() setrendered lines: %d, %d, %d, %d\n",srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]); - printf("main() clip sides %d\n", eoptions&EO_CLIPSIDES); - srendlinev[0]=0; + printf("FCEUI_SetRenderedLines: %d, %d, %d, %d\n",srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]); + printf("clip sides: %d\n", eoptions&EO_CLIPSIDES); FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]); - FCEUI_SetRenderedLines(0,erendlinev[0],srendlinev[1],erendlinev[1]); FCEUI_SetSoundVolume(soundvol); - DriverInterface(DES_NTSCCOL,&ntsccol); DoDriverArgs(); if(fcexp) @@ -309,6 +331,7 @@ static int DoArgs(int argc, char *argv[]) return ret; } + #include "usage.h" int CLImain(int argc, char *argv[]) @@ -332,11 +355,14 @@ int CLImain(int argc, char *argv[]) lastLoadedGameName[0] = 0; CreateDirs(); - LoadConfig(); - gp2x_opt_setup(); + LoadConfig(NULL); last_arg_parsed=DoArgs(argc-1,&argv[1]); + gp2x_opt_setup(); + gp2x_cpuclock_gamma_update(); + LoadLLGN(); + FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue); if(cpalette) - LoadCPalette(); + LoadCPalette(); // TODO if(InitSound()) inited|=1; @@ -348,7 +374,6 @@ int CLImain(int argc, char *argv[]) } else { - lastLoadedGameName[0] = 0; Exit = 1; } @@ -361,22 +386,25 @@ int CLImain(int argc, char *argv[]) fceugi=FCEUI_LoadGame(lastLoadedGameName); if (fceugi) { + char infostring[32]; + LoadConfig(lastLoadedGameName); + if (Settings.region_force) + FCEUI_SetVidSystem(Settings.region_force - 1); ParseGI(fceugi); - //RefreshThrottleFPS(); InitOtherInput(); - // additional print for gpfce - // TODO: handlers for other formats then iNES - { - int MapperNo; - iNES_HEADER *head = iNESGetHead(); - MapperNo = (head->ROM_type>>4); - MapperNo|=(head->ROM_type2&0xF0); - FCEU_DispMessage("%s, Mapper: %d%s%s", PAL?"PAL":"NTSC", MapperNo, (head->ROM_type&2)?", BB":"", (head->ROM_type&4)?", T":""); - } + GameInterface(GI_INFOSTRING, infostring); + FCEU_DispMessage("%s", infostring); } else - strcpy(menuErrorMsg, "failed to load ROM"); + { + switch(LoadGameLastError) { + default: strcpy(menuErrorMsg, "failed to load ROM"); break; + case 2: strcpy(menuErrorMsg, "Can't find a ROM for movie"); break; + case 10: strcpy(menuErrorMsg, "FDS BIOS ROM is missing, read docs"); break; + case 11: strcpy(menuErrorMsg, "Error reading auxillary FDS file"); break; + } + } } if(Exit || !fceugi) { @@ -389,12 +417,25 @@ int CLImain(int argc, char *argv[]) } } + PrepareOtherInput(); + RefreshThrottleFPS(); + FCEUI_GetCurrentVidSystem(&srendline,&erendline); gp2x_video_changemode(Settings.scaling == 3 ? 15 : 8); - gp2x_video_RGB_setscaling(0, 320, 240); - gp2x_start_sound(22050, 16, 0); + switch (Settings.scaling & 3) { + case 0: gp2x_video_set_offs(0); gp2x_video_RGB_setscaling(0, 320, 240); break; + case 1: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(0, 256, 240); break; + case 2: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(srendline, 256, erendline-srendline); break; + case 3: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(0, 320, 240); break; + } + CleanSurface(); + gp2x_start_sound(Settings.sound_rate, 16, 0); FCEUI_Emulate(); } + if (fceugi) + CloseGame(); + + SaveLLGN(); DriverKill(); return 0; } @@ -403,39 +444,29 @@ static int DriverInitialize(void) { SetSignals((void *)CloseStuff); - if(InitJoysticks()) - inited|=2; if(!InitVideo()) return 0; inited|=4; - if(!InitKeyboard()) return 0; - inited|=8; return 1; } static void DriverKill(void) { - SaveConfig(); + // SaveConfig(NULL); // done explicitly in menu now SetSignals(SIG_IGN); - if(inited&2) - KillJoysticks(); - if(inited&8) - KillKeyboard(); if(inited&4) KillVideo(); if(inited&1) KillSound(); - if(inited&16) - KillMouse(); inited=0; } void FCEUD_Update(uint8 *xbuf, int16 *Buffer, int Count) { - if(!Count && !NoWaiting && !(eoptions&EO_NOTHROTTLE)) + if(!Count && !(eoptions&EO_NOTHROTTLE)) SpeedThrottle(); BlitScreen(xbuf); - if(Count && !NoWaiting && !(eoptions&EO_NOTHROTTLE)) + if(Count && !(eoptions&EO_NOTHROTTLE)) WriteSound(Buffer,Count); FCEUD_UpdateInput(); }