X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fgp2x.c;h=ac8bb920a503498561d87a7cfaaf1fa393741fe4;hp=e7c3a0e9648b5b2372c35bdbe61839a97e3d5bc8;hb=HEAD;hpb=b2b95d2e0d1fd5e52d03c2152605b09b024c1d0e diff --git a/drivers/gp2x/gp2x.c b/drivers/gp2x/gp2x.c index e7c3a0e..ac8bb92 100644 --- a/drivers/gp2x/gp2x.c +++ b/drivers/gp2x/gp2x.c @@ -5,7 +5,9 @@ #include "../../driver.h" #include "../common/config.h" #include "../common/args.h" -#include "gp2x.h" +#include "../common/platform.h" +#include "../common/settings.h" +#include "../common/revision.h" #include "gp2x-video.h" #ifdef NETWORK #include "unix-netplay.h" @@ -15,69 +17,21 @@ #include "cpuctrl.h" #include "squidgehack.h" -int CLImain(int argc, char *argv[]); - -//#define SOUND_RATE 44100 -#define SOUND_RATE 22050 -#define GP2X_PORT_VERSION "0.4" - -DSETTINGS Settings; -CFGSTRUCT DriverConfig[]={ - AC(Settings.sound), - ACA(Settings.joyBMap), - ACA(Settings.joyAMap), - ACA(Settings.joy), - AC(Settings.showfps), - AC(Settings.scaling), - AC(Settings.frameskip), - AC(Settings.sstate_confirm), - AC(Settings.region_force), - AC(Settings.cpuclock), - AC(Settings.mmuhack), - AC(Settings.ramtimings), - // TODO - ENDCFGSTRUCT -}; - +extern uint8 PAL; char *DriverUsage= -"-joyx y Use joystick y as virtual joystick x.\n\ --sound x Sound.\n\ - 0 = Disabled.\n\ - Otherwise, x = playback rate.\n\ --showfps x Display fps counter if x is nonzero\n\ --mmuhack x Enable squidge's MMU hack if x is nonzero (GP2X).\n\ +"-mmuhack x Enable squidge's MMU hack if x is nonzero (GP2X).\n\ -ramtimings x Enable RAM overclocking if x is nonzero (GP2X).\n\ -" -#ifdef NETWORK -"-connect s Connect to server 's' for TCP/IP network play.\n\ --server Be a host/server for TCP/IP network play.\n\ --netport x Use TCP/IP port x for network play." -#endif -; +"; -#ifdef NETWORK -static int docheckie[2]={0,0}; -#endif ARGPSTRUCT DriverArgs[]={ - {"-joy1",0,&Settings.joy[0],0},{"-joy2",0,&Settings.joy[1],0}, - {"-joy3",0,&Settings.joy[2],0},{"-joy4",0,&Settings.joy[3],0}, - {"-sound",0,&Settings.sound,0}, - {"-showfps",0,&Settings.showfps,0}, {"-mmuhack",0,&Settings.mmuhack,0}, {"-ramtimings",0,&Settings.ramtimings,0}, {"-menu",0,&ext_menu,0x4001}, {"-menustate",0,&ext_state,0x4001}, - #ifdef NETWORK - {"-connect",&docheckie[0],&netplayhost,0x4001}, - {"-server",&docheckie[1],0,0}, - {"-netport",0,&Port,0}, - #endif {0,0,0,0} }; - - void GetBaseDirectory(char *BaseDirectory) { strcpy(BaseDirectory, "fceultra"); @@ -89,106 +43,74 @@ static void SetDefaults(void) Settings.cpuclock = 150; Settings.frameskip = -1; // auto Settings.mmuhack = 1; - Settings.sound=SOUND_RATE; + Settings.sound_rate = 22050; + Settings.turbo_rate_add = (8*2 << 24) / 60 + 1; // 8Hz turbofire + Settings.gamma = 100; + Settings.sstate_confirm = 1; + // default controls, RLDU SEBA + Settings.KeyBinds[ 0] = 0x010; // GP2X_UP + Settings.KeyBinds[ 4] = 0x020; // GP2X_DOWN + Settings.KeyBinds[ 2] = 0x040; // GP2X_LEFT + Settings.KeyBinds[ 6] = 0x080; // GP2X_RIGHT + Settings.KeyBinds[13] = 0x001; // GP2X_B + Settings.KeyBinds[14] = 0x002; // GP2X_X + Settings.KeyBinds[12] = 0x100; // GP2X_A + Settings.KeyBinds[15] = 0x200; // GP2X_Y + Settings.KeyBinds[ 8] = 0x008; // GP2X_START + Settings.KeyBinds[ 9] = 0x004; // GP2X_SELECT + Settings.KeyBinds[10] = 0x80000000; // GP2X_L + Settings.KeyBinds[11] = 0x40000000; // GP2X_R + Settings.KeyBinds[27] = 0xc0000000; // GP2X_PUSH } void DoDriverArgs(void) { - int x; - - #ifdef NETWORK - if(docheckie[0]) - netplay=2; - else if(docheckie[1]) - netplay=1; - - if(netplay) - FCEUI_SetNetworkPlay(netplay); - #endif - - for(x=0;x<4;x++) - if(!Settings.joy[x]) - { - memset(Settings.joyBMap[x],0,sizeof(Settings.joyBMap[0])); - memset(Settings.joyAMap[x],0,sizeof(Settings.joyAMap[0])); - } -} - -int InitMouse(void) -{ - return(0); -} - -void KillMouse(void){} - -void GetMouseData(uint32 *d) -{ -} - -int InitKeyboard(void) -{ - return(1); } -int UpdateKeyboard(void) -{ - return(1); -} - -void KillKeyboard(void) -{ - -} -char *GetKeyboard(void) -{ - return NULL; -} - -extern int swapbuttons; // TODO: rm -char **g_argv; +int mmuhack_status = 0; -// TODO: cleanup -int main(int argc, char *argv[]) +void platform_init(void) { - int ret; - g_argv = argv; - - puts("Starting GPFCE - Port version " GP2X_PORT_VERSION " (" __DATE__ ")"); - puts("Based on FCE Ultra "VERSION_STRING"..."); - puts("Ported by Zheng Zhu"); - puts("Additional optimization/misc work by notaz\n"); + printf("Starting GPFCE " REV " (" __DATE__ ")\n"); + puts("Based on FCE Ultra "VERSION_STRING" and 0.98.1x versions"); + puts("Original port by Zheng Zhu"); + puts("Menu/optimization/misc work by notaz\n"); gp2x_init(); cpuctrl_init(); - // unscale the screen, in case this is bad. - gp2x_video_changemode(8); - gp2x_video_RGB_setscaling(0, 320, 240); - SetDefaults(); +} - ret = CLImain(argc,argv); +void platform_finish(void) +{ + // unscale the screen, in case it is bad. + gp2x_video_RGB_setscaling(320, 240); - // unscale the screen, in case this is bad. - gp2x_video_RGB_setscaling(0, 320, 240); + if (mmuhack_status > 0) + mmuunhack(); + set_gamma(100); cpuctrl_deinit(); gp2x_deinit(); return(ret?0:-1); } - -int mmuhack_status = 0; +void platform_set_volume(int val) // 0-100 +{ + platform_set_volume(val, val); +} /* optional GP2X stuff to be done after config is loaded */ -void gp2x_opt_setup(void) +void platform_late_init(void) { if (Settings.mmuhack) { int ret = mmuhack(); - printf("squidge hack code finished and returned %i\n", ret); fflush(stdout); + printf("squidge hack code finished and returned %s\n", ret > 0 ? "ok" : "fail"); + fflush(stdout); mmuhack_status = ret; } if (Settings.ramtimings) { @@ -199,3 +121,42 @@ void gp2x_opt_setup(void) } } +void platform_apply_config(void) +{ + static int prev_cpuclock = 200, prev_gamma = 100, prev_vsync = 0, prev_pal = 0; + if (Settings.cpuclock != 0 && Settings.cpuclock != prev_cpuclock) + { + set_FCLK(Settings.cpuclock); + prev_cpuclock = Settings.cpuclock; + } + + if (Settings.gamma != 0 && Settings.gamma != prev_gamma) + { + set_gamma(Settings.gamma); + prev_gamma = Settings.gamma; + } + + if (Settings.perfect_vsync != prev_vsync || (Settings.perfect_vsync && prev_pal != PAL)) + { + if (Settings.perfect_vsync) + { + set_LCD_custom_rate(PAL ? LCDR_100_02 : LCDR_120_20); + prev_pal = PAL; + } + else + { + unset_LCD_custom_rate(); + } + prev_vsync = Settings.perfect_vsync; + } + + gp2x_video_changemode(Settings.scaling == 3 ? 15 : 8); + switch (Settings.scaling & 3) { + case 0: gp2x_video_set_offs(0); gp2x_video_RGB_setscaling(320, 240); break; + case 1: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(256, 240); break; + case 2: gp2x_video_set_offs(32+srendline*320); gp2x_video_RGB_setscaling(256, erendline-srendline); break; + case 3: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(320, 240); break; + } +} + +