X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=954d26f5dfe696f19f04679a83adea0bda440ae6;hb=fa283c9a387276360ffb881f2125cbdb7adfa382;hp=63b2d047d0ee18268ad90c9414573ee89faecc60;hpb=ea8c405fa721a8658b1f7c51cf6238ba2bba8a17;p=picodrive.git diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c index 63b2d04..954d26f 100644 --- a/platform/gp2x/emu.c +++ b/platform/gp2x/emu.c @@ -105,7 +105,7 @@ static void find_combos(void) for (act = 0; act < 32; act++) { int keyc = 0; - if (act == 16) continue; // player2 flag + if (act == 16 || act == 17) continue; // player2 flag for (u = 0; u < 32; u++) { if (currentConfig.KeyBinds[u] & (1 << act)) keyc++; @@ -229,10 +229,9 @@ void osd_text(int x, int y, const char *text) static void cd_leds(void) { - // mmu problems? // static int old_reg; -// if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change +// if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change // mmu hack problems? old_reg = Pico_mcd->s68k_regs[0]; if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) { @@ -252,7 +251,7 @@ static void cd_leds(void) unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0; *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2; *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2; - *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2; + *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; } } @@ -630,7 +629,7 @@ static void simpleWait(int thissec, int lim_time) void emu_Loop(void) { static int gp2x_old_clock = 200; - static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, PsndLen_real = 0, pal_old = 0; + static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0; char fpsbuff[24]; // fps count c string struct timeval tval; // timing int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0; @@ -694,7 +693,6 @@ void emu_Loop(void) memset(sndBuffer, 0, sizeof(sndBuffer)); PsndOut = sndBuffer; PsndRate_old = PsndRate; - PsndLen_real = PsndLen; PicoOpt_old = PicoOpt; pal_old = Pico.m.pal; } else {