ROM loader error handling improved

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

diff --git a/base_readme.txt b/base_readme.txt
index d0f074b..0ba3a0f 100644 (file)
--- a/base_readme.txt
+++ b/base_readme.txt
@@ -645,6 +645,10 @@ Additional thanks
 \r
 Changelog\r
 ---------\r
+1.51a\r
+  * Fixed a sync problem between main and sub 68k. Should fix the hanging\r
+    problem for some games.\r
+\r
 1.51\r
   * Improved bin_to_cso_mp3 tool, it should no longer complain about\r
     missing lame.exe even if it's in working dir.\r

diff --git a/common/emu.c b/common/emu.c
index 5b69357..ae1a638 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -177,17 +177,19 @@ int emu_cdCheck(int *pregion)
                        fname = cue_data->tracks[1].fname;\r
                        type  = cue_data->tracks[1].type;\r
                }\r
+               else\r
+                       return -1;\r
        }\r
 \r
        cd_f = pm_open(fname);\r
        if (cue_data != NULL)\r
                cue_destroy(cue_data);\r
 \r
-       if (!cd_f) return 0; // let the upper level handle this\r
+       if (cd_f == NULL) return 0; // let the upper level handle this\r
 \r
        if (pm_read(buf, 32, cd_f) != 32) {\r
                pm_close(cd_f);\r
-               return 0;\r
+               return -1;\r
        }\r
 \r
        if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) {\r
@@ -284,7 +286,7 @@ int emu_ReloadRom(void)
        char *used_rom_name = romFileName;\r
        unsigned char *rom_data = NULL;\r
        char ext[5];\r
-       pm_file *rom;\r
+       pm_file *rom = NULL;\r
        int ret, cd_state, cd_region, cfg_loaded = 0;\r
 \r
        lprintf("emu_ReloadRom(%s)\n", romFileName);\r
@@ -293,7 +295,7 @@ int emu_ReloadRom(void)
 \r
        // detect wrong extensions\r
        if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
-               sprintf(menuErrorMsg, "Not a ROM selected.");\r
+               sprintf(menuErrorMsg, "Not a ROM/CD selected.");\r
                return 0;\r
        }\r
 \r
@@ -356,7 +358,7 @@ int emu_ReloadRom(void)
 \r
        // check for MegaCD image\r
        cd_state = emu_cdCheck(&cd_region);\r
-       if (cd_state != CIT_NOT_CD)\r
+       if (cd_state >= 0 && cd_state != CIT_NOT_CD)\r
        {\r
                PicoAHW |= PAHW_MCD;\r
                // valid CD image, check for BIOS..\r
@@ -386,8 +388,13 @@ int emu_ReloadRom(void)
 \r
        rom = pm_open(used_rom_name);\r
        if (!rom) {\r
-               sprintf(menuErrorMsg, "Failed to open rom.");\r
-               return 0;\r
+               sprintf(menuErrorMsg, "Failed to open ROM/CD image");\r
+               goto fail;\r
+       }\r
+\r
+       if (cd_state < 0) {\r
+               sprintf(menuErrorMsg, "Invalid CD image");\r
+               goto fail;\r
        }\r
 \r
        menu_romload_prepare(used_rom_name); // also CD load\r
@@ -398,19 +405,17 @@ int emu_ReloadRom(void)
        if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
                sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
                lprintf("%s\n", menuErrorMsg);\r
-               pm_close(rom);\r
-               menu_romload_end();\r
-               return 0;\r
+               goto fail2;\r
        }\r
        pm_close(rom);\r
+       rom = NULL;\r
 \r
        // detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
        if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
          ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
                if (rom_data) free(rom_data);\r
                sprintf(menuErrorMsg, "Not a ROM selected.");\r
-               menu_romload_end();\r
-               return 0;\r
+               goto fail2;\r
        }\r
 \r
        // load config for this ROM (do this before insert to get correct region)\r
@@ -424,8 +429,7 @@ int emu_ReloadRom(void)
        lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
        if (PicoCartInsert(rom_data, rom_size)) {\r
                sprintf(menuErrorMsg, "Failed to load ROM.");\r
-               menu_romload_end();\r
-               return 0;\r
+               goto fail2;\r
        }\r
 \r
        // insert CD if it was detected\r
@@ -434,8 +438,7 @@ int emu_ReloadRom(void)
                if (ret != 0) {\r
                        sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
                        lprintf("%s\n", menuErrorMsg);\r
-                       menu_romload_end();\r
-                       return 0;\r
+                       goto fail2;\r
                }\r
        }\r
 \r
@@ -447,13 +450,14 @@ int emu_ReloadRom(void)
        }\r
 \r
        // additional movie stuff\r
-       if (movie_data) {\r
-               if(movie_data[0x14] == '6')\r
+       if (movie_data)\r
+       {\r
+               if (movie_data[0x14] == '6')\r
                     PicoOpt |=  POPT_6BTN_PAD; // 6 button pad\r
                else PicoOpt &= ~POPT_6BTN_PAD;\r
                PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing\r
-               if(movie_data[0xF] >= 'A') {\r
-                       if(movie_data[0x16] & 0x80) {\r
+               if (movie_data[0xF] >= 'A') {\r
+                       if (movie_data[0x16] & 0x80) {\r
                                PicoRegionOverride = 8;\r
                        } else {\r
                                PicoRegionOverride = 4;\r
@@ -467,7 +471,7 @@ int emu_ReloadRom(void)
        else\r
        {\r
                PicoOpt &= ~POPT_DIS_VDP_FIFO;\r
-               if(Pico.m.pal) {\r
+               if (Pico.m.pal) {\r
                        strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");\r
                } else {\r
                        strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS");\r
@@ -483,6 +487,12 @@ int emu_ReloadRom(void)
        lastRomFile[sizeof(lastRomFile)-1] = 0;\r
        rom_loaded = 1;\r
        return 1;\r
+\r
+fail2:\r
+       menu_romload_end();\r
+fail:\r
+       if (rom != NULL) pm_close(rom);\r
+       return 0;\r
 }\r
 \r
 \r

diff --git a/gp2x/version.h b/gp2x/version.h
index d9dd3d3..fd18b42 100644 (file)
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.51"\r
+#define VERSION "1.51a"\r
 \r

diff --git a/psp/version.h b/psp/version.h
index d9dd3d3..fd18b42 100644 (file)
--- a/psp/version.h
+++ b/psp/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.51"\r
+#define VERSION "1.51a"\r
 \r