bugfix, fd leak

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@86 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index d29469b..b1d7c5d 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -216,13 +216,15 @@ static __inline void update_chips(void)
        // delayed setting of DMNA bit (needed for Silpheed)
        if (Pico_mcd->m.state_flags & 2) {
                Pico_mcd->m.state_flags &= ~2;
-               Pico_mcd->s68k_regs[3] |=  2;
-               Pico_mcd->s68k_regs[3] &= ~1;
+               if (!(Pico_mcd->s68k_regs[3] & 4)) {
+                       Pico_mcd->s68k_regs[3] |=  2;
+                       Pico_mcd->s68k_regs[3] &= ~1;
 #ifdef USE_POLL_DETECT
-               if ((s68k_poll_adclk&0xfe) == 2) {
-                       SekSetStopS68k(0); s68k_poll_adclk = 0;
-               }
+                       if ((s68k_poll_adclk&0xfe) == 2) {
+                               SekSetStopS68k(0); s68k_poll_adclk = 0;
+                       }
 #endif
+               }
        }
 }
 

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index c16b658..f3b4c02 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -272,6 +272,9 @@ int emu_ReloadRom(void)
                get_ext(romFileName, ext);\r
        }\r
 \r
+       if ((PicoMCD & 1) && Pico_mcd != NULL)\r
+               Stop_CD();\r
+\r
        // check for MegaCD image\r
        cd_state = emu_cd_check(&used_rom_name);\r
        if (cd_state > 0) {\r
@@ -837,9 +840,11 @@ static void RunEvents(unsigned int which)
 {\r
        if(which & 0x1800) { // save or load (but not both)\r
                int do_it = 1;\r
-               if (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200) && emu_check_save_file(state_slot)) {\r
+               if ( emu_check_save_file(state_slot) &&\r
+                               (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load\r
+                                (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save\r
                        unsigned long keys;\r
-                       blit("", "OVERWRITE SAVE? (Y=yes, X=no)");\r
+                       blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)");\r
                        while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )\r
                                usleep(50*1024);\r
                        if (keys & GP2X_X) do_it = 0;\r

diff --git a/platform/gp2x/emu.h b/platform/gp2x/emu.h
index 627c226..986a77d 100644 (file)
--- a/platform/gp2x/emu.h
+++ b/platform/gp2x/emu.h
@@ -20,7 +20,7 @@ typedef struct {
        char lastRomFile[512];\r
        int EmuOpt;             // LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,\r
                                        // squidgehack, no_save_cfg_on_exit, <unused>, 16_bit_mode\r
-                                       // craigix_ram, confirm_save, show_cd_leds\r
+                                       // craigix_ram, confirm_save, show_cd_leds, confirm_load\r
                                        //\r
        int PicoOpt;  // used for config saving only, see Pico.h\r
        int PsndRate; // ditto\r

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 881ea98..ce3f72f 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -956,7 +956,7 @@ static const char *region_name(unsigned int code)
 static void draw_menu_options(int menu_sel)\r
 {\r
        int tl_x = 25, tl_y = 32, y;\r
-       char monostereo[8], strframeskip[8], *strrend, *strscaling;\r
+       char monostereo[8], strframeskip[8], *strrend, *strscaling, *strssconfirm;\r
 \r
        strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");\r
        if (currentConfig.Frameskip < 0)\r
@@ -975,6 +975,12 @@ static void draw_menu_options(int menu_sel)
                case 2:  strscaling = "hw horiz. + vert."; break;\r
                case 3:  strscaling = "sw horizontal";     break;\r
        }\r
+       switch ((currentConfig.EmuOpt >> 9) & 5) {\r
+               default: strssconfirm = "OFF";    break;\r
+               case 1:  strssconfirm = "writes"; break;\r
+               case 4:  strssconfirm = "loads";  break;\r
+               case 5:  strssconfirm = "both";   break;\r
+       }\r
 \r
        y = tl_y;\r
        //memset(gp2x_screen, 0, 320*240);\r
@@ -992,7 +998,7 @@ static void draw_menu_options(int menu_sel)
        gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9\r
        gp2x_text_out8(tl_x, (y+=10), "Genesis Region:      %s",       region_name(currentConfig.PicoRegion));\r
        gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11\r
-       gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites    %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 12\r
+       gp2x_text_out8(tl_x, (y+=10), "Confirm savestate          %s", strssconfirm); // 12\r
        gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 13\r
        gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);\r
        gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");\r
@@ -1083,7 +1089,6 @@ static int menu_loop_options(void)
                                case  8: currentConfig.PicoOpt^=0x200; break;\r
                                case  9: currentConfig.PicoOpt^=0x020; break;\r
                                case 11: currentConfig.EmuOpt ^=0x001; break;\r
-                               case 12: currentConfig.EmuOpt ^=0x200; break;\r
                                case 15: cd_menu_loop_options();\r
                                        if (engineState == PGS_ReloadRom)\r
                                                return 0; // test BIOS\r
@@ -1138,6 +1143,15 @@ static int menu_loop_options(void)
                                case 10:\r
                                        region_prevnext(inp & GP2X_RIGHT);\r
                                        break;\r
+                               case 12: {\r
+                                       int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
+                                       n += (inp & GP2X_LEFT) ? -1 : 1;\r
+                                       if (n < 0) n = 0; else if (n > 3) n = 3;\r
+                                       n |= n << 1; n &= ~2;\r
+                                       currentConfig.EmuOpt &= ~0xa00;\r
+                                       currentConfig.EmuOpt |= n << 9;\r
+                                       break;\r
+                               }\r
                                case 13:\r
                                        if (inp & GP2X_RIGHT) {\r
                                                state_slot++; if (state_slot > 9) state_slot = 0;\r

diff --git a/platform/linux/gp2x.c b/platform/linux/gp2x.c
index 40cd7bc..c8c9564 100644 (file)
--- a/platform/linux/gp2x.c
+++ b/platform/linux/gp2x.c
@@ -402,7 +402,7 @@ int mmuunhack(void)
 /* misc */
 void spend_cycles(int c)
 {
-       usleep(c/*/200*/);
+       usleep(c/200);
 }
 
 

diff --git a/platform/readme.txt b/platform/readme.txt
index 1c5a379..a68fced 100644 (file)
--- a/platform/readme.txt
+++ b/platform/readme.txt
@@ -227,6 +227,9 @@ Changelog
   * Improved z80 timing, should fix some sound problems.\r
   * Fixed a bug with sram register (fixes Phantasy Star 4).\r
   * Added code for PRG ram write protection register (Dungeon Explorer).\r
+  * The memory mode register change in 1.31 was unsafe and caused some glitches in\r
+    AH-3 Thunderstrike. Fixed.\r
+  * Fixed a file descriptor leak.\r
 \r
 1.31\r
   * Changed the way memory mode register is read (fixes Lunar 2, broken in 1.30).\r