sound code rewrite for lower sample rates (except mp3s)
[picodrive.git] / platform / gp2x / emu.c
index a90d850..871d05f 100644 (file)
@@ -48,6 +48,7 @@ unsigned char *rom_data = NULL;
 \r
 extern int crashed_940;\r
 \r
+static short sndBuffer[2*44100/50];\r
 static char noticeMsg[64];                                     // notice msg to draw\r
 static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
 static int reset_timing, osd_fps_x;\r
@@ -96,29 +97,131 @@ static int try_rfn_cut(void)
        return 0;\r
 }\r
 \r
-static void get_ext(char *ext)\r
+static void get_ext(char *file, char *ext)\r
 {\r
        char *p;\r
 \r
-       p = romFileName + strlen(romFileName) - 4;\r
-       if (p < romFileName) p = romFileName;\r
+       p = file + strlen(file) - 4;\r
+       if (p < file) p = file;\r
        strncpy(ext, p, 4);\r
        ext[4] = 0;\r
        strlwr(ext);\r
 }\r
 \r
+char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };\r
+char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303",   "eu_mcd1_9210" };\r
+char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
+\r
+extern char **g_argv;\r
+\r
+int find_bios(int region, char **bios_file)\r
+{\r
+       static char bios_path[1024];\r
+       int i, j, count;\r
+       char **files;\r
+       FILE *f = NULL;\r
+\r
+       if (region == 4) { // US\r
+               files = biosfiles_us;\r
+               count = sizeof(biosfiles_us) / sizeof(char *);\r
+       } else if (region == 8) { // EU\r
+               files = biosfiles_eu;\r
+               count = sizeof(biosfiles_eu) / sizeof(char *);\r
+       } else if (region == 1 || region == 2) {\r
+               files = biosfiles_jp;\r
+               count = sizeof(biosfiles_jp) / sizeof(char *);\r
+       } else {\r
+               return 0;\r
+       }\r
+\r
+       for (i = 0; i < count; i++)\r
+       {\r
+               strncpy(bios_path, g_argv[0], 1023);\r
+               bios_path[1024-32] = 0;\r
+               for (j = strlen(bios_path); j > 0; j--)\r
+                       if (bios_path[j] == '/') { bios_path[j+1] = 0; break; }\r
+               strcat(bios_path, files[i]);\r
+               strcat(bios_path, ".bin");\r
+               f = fopen(bios_path, "rb");\r
+               if (f) break;\r
+\r
+               bios_path[strlen(bios_path) - 4] = 0;\r
+               strcat(bios_path, ".zip");\r
+               f = fopen(bios_path, "rb");\r
+               if (f) break;\r
+       }\r
+\r
+       if (f) {\r
+               printf("using bios: %s\n", bios_path);\r
+               fclose(f);\r
+               if (bios_file) *bios_file = bios_path;\r
+               return 1;\r
+       } else {\r
+               sprintf(menuErrorMsg, "no %s BIOS files found, read docs",\r
+                       region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+               printf("%s\n", menuErrorMsg);\r
+               return 0;\r
+       }\r
+}\r
+\r
+/* checks if romFileName points to valid MegaCD image\r
+ * if so, checks for suitable BIOS */\r
+static int cd_check(char *ext, char **bios_file)\r
+{\r
+       unsigned char buf[32];\r
+       FILE *cd_f;\r
+       int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
+\r
+       cd_f = fopen(romFileName, "rb");\r
+       if (!cd_f) return 0; // let the upper level handle this\r
+\r
+       if (fread(buf, 1, 32, cd_f) != 32) {\r
+               fclose(cd_f);\r
+               return 0;\r
+       }\r
+\r
+       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)\r
+       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)\r
+       if (type == 0) {\r
+               fclose(cd_f);\r
+               return 0;\r
+       }\r
+\r
+       /* it seems we have a CD image here. Try to detect region and load a suitable BIOS now.. */\r
+       fseek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
+       fread(buf, 1, 1, cd_f);\r
+       fclose(cd_f);\r
+\r
+       if (buf[0] == 0x64) region = 8; // EU\r
+       if (buf[0] == 0xa1) region = 1; // JAP\r
+\r
+       printf("detected %s Sega/Mega CD image with %s region\n",\r
+               type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+\r
+       if (PicoRegionOverride) {\r
+               region = PicoRegionOverride;\r
+               printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+       }\r
+\r
+       if(find_bios(region, bios_file))\r
+                return type;   // CD and BIOS detected\r
+\r
+       return -1;              // CD detected but load failed\r
+}\r
+\r
 int emu_ReloadRom(void)\r
 {\r
        unsigned int rom_size = 0;\r
+       char *used_rom_name = romFileName;\r
        char ext[5];\r
        FILE *rom;\r
-       int ret;\r
+       int ret, cd_state;\r
 \r
        printf("emu_ReloadRom(%s)\n", romFileName);\r
 \r
-       // detect wrong extensions\r
-       get_ext(ext);\r
+       get_ext(romFileName, ext);\r
 \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
                return 0;\r
@@ -162,10 +265,23 @@ int emu_ReloadRom(void)
                        sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
                        return 0;\r
                }\r
-               get_ext(ext);\r
+               get_ext(romFileName, ext);\r
        }\r
 \r
-       rom = fopen(romFileName, "rb");\r
+       // check for MegaCD image\r
+       cd_state = cd_check(ext, &used_rom_name);\r
+       if (cd_state > 0) {\r
+               PicoMCD |= 1;\r
+               get_ext(used_rom_name, ext);\r
+       } else if (cd_state == -1) {\r
+               // bios_help() ?\r
+               return 0;\r
+       } else {\r
+               if (PicoMCD & 1) PicoExitMCD();\r
+               PicoMCD &= ~1;\r
+       }\r
+\r
+       rom = fopen(used_rom_name, "rb");\r
        if(!rom) {\r
                sprintf(menuErrorMsg, "Failed to open rom.");\r
                return 0;\r
@@ -180,9 +296,9 @@ int emu_ReloadRom(void)
        // zipfile support\r
        if(!strcasecmp(ext, ".zip")) {\r
                fclose(rom);\r
-               ret = CartLoadZip(romFileName, &rom_data, &rom_size);\r
+               ret = CartLoadZip(used_rom_name, &rom_data, &rom_size);\r
                if(ret) {\r
-                       if (ret == 4) strcpy(menuErrorMsg, "No ROMs in zip found.");\r
+                       if (ret == 4) strcpy(menuErrorMsg, "No ROMs found in zip.");\r
                        else sprintf(menuErrorMsg, "Unzip failed with code %i", ret);\r
                        printf("%s\n", menuErrorMsg);\r
                        return 0;\r
@@ -206,16 +322,28 @@ int emu_ReloadRom(void)
                return 0;\r
        }\r
 \r
+       // load config for this ROM (do this before insert to get correct region)\r
+       ret = emu_ReadConfig(1);\r
+       if (!ret)\r
+               emu_ReadConfig(0);\r
+\r
        printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
        if(PicoCartInsert(rom_data, rom_size)) {\r
                sprintf(menuErrorMsg, "Failed to load ROM.");\r
                return 0;\r
        }\r
 \r
-       // load config for this ROM\r
-       ret = emu_ReadConfig(1);\r
-       if (!ret)\r
-               emu_ReadConfig(0);\r
+       Pico.m.frame_count = 0;\r
+\r
+       // insert CD if it was detected\r
+       if (cd_state > 0) {\r
+               ret = Insert_CD(romFileName, cd_state == 2);\r
+               if (ret != 0) {\r
+                       sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
+                       printf("%s\n", menuErrorMsg);\r
+                       return 0;\r
+               }\r
+       }\r
 \r
        // emu_ReadConfig() might have messed currentConfig.lastRomFile\r
        strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);\r
@@ -253,8 +381,6 @@ int emu_ReloadRom(void)
        if(currentConfig.EmuOpt & 1)\r
                emu_SaveLoadGame(1, 1);\r
 \r
-       Pico.m.frame_count = 0;\r
-\r
        return 1;\r
 }\r
 \r
@@ -328,10 +454,11 @@ int emu_ReadConfig(int game)
                // set default config\r
                memset(&currentConfig, 0, sizeof(currentConfig));\r
                currentConfig.lastRomFile[0] = 0;\r
-               currentConfig.EmuOpt  = 0x1f;\r
-               currentConfig.PicoOpt = 0x0f;\r
-               currentConfig.PsndRate = 22050;\r
+               currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds\r
+               currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda\r
+               currentConfig.PsndRate = 22050; // 44100;\r
                currentConfig.PicoRegion = 0; // auto\r
+               currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
                currentConfig.Frameskip = -1; // auto\r
                currentConfig.CPUclock = 200;\r
                currentConfig.volume = 50;\r
@@ -366,6 +493,7 @@ int emu_ReadConfig(int game)
        PicoOpt = currentConfig.PicoOpt;\r
        PsndRate = currentConfig.PsndRate;\r
        PicoRegionOverride = currentConfig.PicoRegion;\r
+       PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;\r
        if (PicoOpt & 0x20) {\r
                actionNames[ 8] = "Z"; actionNames[ 9] = "Y";\r
                actionNames[10] = "X"; actionNames[11] = "MODE";\r
@@ -403,6 +531,7 @@ int emu_WriteConfig(int game)
                currentConfig.PicoOpt = PicoOpt;\r
                currentConfig.PsndRate = PsndRate;\r
                currentConfig.PicoRegion = PicoRegionOverride;\r
+               currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;\r
                bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);\r
                fflush(f);\r
                fclose(f);\r
@@ -440,19 +569,14 @@ void osd_text(int x, int y, char *text)
        int len = strlen(text)*8;\r
 \r
        if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
-               int *p, i, h, black, white;\r
-               if (PicoOpt&0x10) {\r
-                       black = 0x40404040; white = 0x41;\r
-               } else {\r
-                       black = 0xe0e0e0e0; white = 0xf0;\r
-               }\r
+               int *p, i, h;\r
                x &= ~3; // align x\r
                len = (len+3) >> 2;\r
                for (h = 0; h < 8; h++) {\r
                        p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));\r
-                       for (i = len; i; i--, p++) *p = black;\r
+                       for (i = len; i; i--, p++) *p = 0xe0e0e0e0;\r
                }\r
-               gp2x_text_out8_2(x, y, text, white);\r
+               gp2x_text_out8_2(x, y, text, 0xf0);\r
        } else {\r
                int *p, i, h;\r
                x &= ~1; // align x\r
@@ -465,6 +589,35 @@ void osd_text(int x, int y, char *text)
        }\r
 }\r
 \r
+static void cd_leds(void)\r
+{\r
+       // mmu problems?\r
+//     static\r
+       int old_reg;\r
+//     if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change\r
+       old_reg = Pico_mcd->s68k_regs[0];\r
+\r
+       if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+               // 8-bit modes\r
+               unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
+               unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
+               *(unsigned int *)((char *)gp2x_screen + 320*2+ 4) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*3+ 4) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*4+ 4) = col_g;\r
+               *(unsigned int *)((char *)gp2x_screen + 320*2+12) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*3+12) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*4+12) = col_r;\r
+       } else {\r
+               // 16-bit modes\r
+               unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+4);\r
+               unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;\r
+               unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;\r
+               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+       }\r
+}\r
+\r
 static int EmuScan16(unsigned int num, void *sdata)\r
 {\r
        if (!(Pico.video.reg[1]&8)) num += 8;\r
@@ -486,6 +639,8 @@ static void (*vidCpyM2)(void *dest, void *src) = NULL;
 \r
 static void blit(char *fps, char *notice)\r
 {\r
+       int emu_opt = currentConfig.EmuOpt;\r
+\r
        if (PicoOpt&0x10) {\r
                // 8bit fast renderer\r
                if (Pico.m.dirtyPal) {\r
@@ -495,7 +650,7 @@ static void blit(char *fps, char *notice)
                        gp2x_video_setpalette(localPal, 0x40);\r
                }\r
                vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
-       } else if (!(currentConfig.EmuOpt&0x80)) {\r
+       } else if (!(emu_opt&0x80)) {\r
                // 8bit accurate renderer\r
                if (Pico.m.dirtyPal) {\r
                        Pico.m.dirtyPal = 0;\r
@@ -504,6 +659,8 @@ static void blit(char *fps, char *notice)
                                vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);\r
                                vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);\r
                                blockcpy(localPal+0xc0, localPal+0x40, 0x40*4);\r
+                               localPal[0xc0] = 0x0000c000;\r
+                               localPal[0xd0] = 0x00c00000;\r
                                localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
                                localPal[0xf0] = 0x00ffffff;\r
                                gp2x_video_setpalette(localPal, 0x100);\r
@@ -520,8 +677,10 @@ static void blit(char *fps, char *notice)
        }\r
 \r
        if (notice) osd_text(4, 232, notice);\r
-       if (currentConfig.EmuOpt & 2)\r
+       if (emu_opt & 2)\r
                osd_text(osd_fps_x, 232, fps);\r
+       if ((emu_opt & 0x400) && (PicoMCD & 1))\r
+               cd_leds();\r
 \r
        //gp2x_video_wait_vsync();\r
        gp2x_video_flip();\r
@@ -543,18 +702,14 @@ static void blit(char *fps, char *notice)
 // clears whole screen or just the notice area (in all buffers)\r
 static void clearArea(int full)\r
 {\r
-       if (PicoOpt&0x10) {\r
-               // 8bit fast renderer\r
-               if (full) gp2x_memset_all_buffers(0, 0x40, 320*240);\r
-               else      gp2x_memset_all_buffers(320*232, 0x40, 320*8);\r
-       } else if (currentConfig.EmuOpt&0x80) {\r
+       if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+               // 8-bit renderers\r
+               if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+               else      gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
+       } else {\r
                // 16bit accurate renderer\r
                if (full) gp2x_memset_all_buffers(0, 0, 320*240*2);\r
                else      gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);\r
-       } else {\r
-               // 8bit accurate renderer\r
-               if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
-               else      gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
        }\r
 }\r
 \r
@@ -562,27 +717,27 @@ static void clearArea(int full)
 static void vidResetMode(void)\r
 {\r
        if (PicoOpt&0x10) {\r
-               localPal[0x40] = 0;\r
-               localPal[0x41] = 0x00ffffff;\r
                gp2x_video_changemode(8);\r
-               gp2x_video_setpalette(localPal, 0x42);\r
-               gp2x_memset_all_buffers(0, 0x40, 320*240);\r
-               gp2x_video_flip();\r
        } else if (currentConfig.EmuOpt&0x80) {\r
                gp2x_video_changemode(15);\r
                PicoDrawSetColorFormat(1);\r
                PicoScan = EmuScan16;\r
                PicoScan(0, 0);\r
        } else {\r
+               gp2x_video_changemode(8);\r
+               PicoDrawSetColorFormat(2);\r
+               PicoScan = EmuScan8;\r
+               PicoScan(0, 0);\r
+       }\r
+       if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+               // setup pal for 8-bit modes\r
+               localPal[0xc0] = 0x0000c000; // MCD LEDs\r
+               localPal[0xd0] = 0x00c00000;\r
                localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
                localPal[0xf0] = 0x00ffffff;\r
-               gp2x_video_changemode(8);\r
                gp2x_video_setpalette(localPal, 0x100);\r
                gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
                gp2x_video_flip();\r
-               PicoDrawSetColorFormat(2);\r
-               PicoScan = EmuScan8;\r
-               PicoScan(0, 0);\r
        }\r
        Pico.m.dirtyPal = 1;\r
        // reset scaling\r
@@ -623,8 +778,6 @@ static void RunEvents(unsigned int which)
                }\r
                if (do_it) {\r
                        blit("", (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");\r
-                       if(movie_data) {\r
-                       }\r
                        emu_SaveLoadGame(which & 0x1000, 0);\r
                }\r
 \r
@@ -775,24 +928,10 @@ static void updateKeys(void)
        prevEvents = (allActions[0] | allActions[1]) >> 16;\r
 }\r
 \r
-static int snd_excess_add = 0, snd_excess_cnt = 0; // hack\r
 \r
-static void updateSound(void)\r
+static void updateSound(int len)\r
 {\r
-       int len = (PicoOpt&8)?PsndLen*2:PsndLen;\r
-\r
-       snd_excess_cnt += snd_excess_add;\r
-       if (snd_excess_cnt >= 0x10000) {\r
-               snd_excess_cnt -= 0x10000;\r
-               if (PicoOpt&8) {\r
-                       PsndOut[len]   = PsndOut[len-2];\r
-                       PsndOut[len+1] = PsndOut[len-1];\r
-                       len+=2;\r
-               } else {\r
-                       PsndOut[len]   = PsndOut[len-1];\r
-                       len++;\r
-               }\r
-       }\r
+       if (PicoOpt&8) len<<=1;\r
 \r
        gp2x_sound_write(PsndOut, len<<1);\r
 }\r
@@ -872,22 +1011,23 @@ void emu_Loop(void)
 \r
        // prepare sound stuff\r
        if(currentConfig.EmuOpt & 4) {\r
+               int snd_excess_add;\r
                if(PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || crashed_940) {\r
                        /* if 940 is turned off, we need it to be put back to sleep */\r
                        if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {\r
-                               Reset940(1);\r
+                               Reset940(1, 2);\r
                                Pause940(1);\r
                        }\r
-                       sound_rerate();\r
+                       sound_rerate(1);\r
                }\r
                //excess_samples = PsndRate - PsndLen*target_fps;\r
-               snd_excess_cnt = 0;\r
                snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
                printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\r
                gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);\r
                gp2x_sound_volume(currentConfig.volume, currentConfig.volume);\r
                PicoWriteSound = updateSound;\r
-               PsndOut = calloc((PicoOpt&8) ? (PsndLen*4+4) : (PsndLen*2+2), 1);\r
+               memset(sndBuffer, 0, sizeof(sndBuffer));\r
+               PsndOut = sndBuffer;\r
                PsndRate_old = PsndRate;\r
                PsndLen_real = PsndLen;\r
                PicoOpt_old  = PicoOpt;\r
@@ -1083,14 +1223,10 @@ if (Pico.m.frame_count == 31563) {
 \r
        // save SRAM\r
        if((currentConfig.EmuOpt & 1) && SRam.changed) {\r
+               blit("", "Writing SRAM/BRAM..");\r
                emu_SaveLoadGame(0, 1);\r
                SRam.changed = 0;\r
        }\r
-\r
-       if (PsndOut != 0) {\r
-               free(PsndOut);\r
-               PsndOut = 0;\r
-       }\r
 }\r
 \r
 \r
@@ -1112,7 +1248,6 @@ size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)
        return gzwrite(file, p, _n);\r
 }\r
 \r
-typedef unsigned int (*STATE_SL_FUNC)(void *, unsigned int, unsigned int, void *);\r
 \r
 int emu_SaveLoadGame(int load, int sram)\r
 {\r
@@ -1121,7 +1256,7 @@ int emu_SaveLoadGame(int load, int sram)
 \r
        // make save filename\r
        romfname_ext(saveFname, "");\r
-       if(sram) strcat(saveFname, ".srm");\r
+       if(sram) strcat(saveFname, (PicoMCD&1) ? ".brm" : ".srm");\r
        else {\r
                if(state_slot > 0 && state_slot < 10) sprintf(saveFname, "%s.%i", saveFname, state_slot);\r
                strcat(saveFname, ".mds");\r
@@ -1131,30 +1266,41 @@ int emu_SaveLoadGame(int load, int sram)
 \r
        if(sram) {\r
                FILE *sramFile;\r
-               int sram_size = SRam.end-SRam.start+1;\r
-               if(SRam.reg_back & 4) sram_size=0x2000;\r
-               if(!SRam.data) return 0; // SRam forcefully disabled for this game\r
+               int sram_size;\r
+               unsigned char *sram_data;\r
+               if (PicoMCD&1) {\r
+                       sram_size = 0x2000;\r
+                       sram_data = Pico_mcd->bram;\r
+               } else {\r
+                       sram_size = SRam.end-SRam.start+1;\r
+                       if(SRam.reg_back & 4) sram_size=0x2000;\r
+                       sram_data = SRam.data;\r
+               }\r
+               if(!sram_data) return 0; // SRam forcefully disabled for this game\r
+\r
                if(load) {\r
                        sramFile = fopen(saveFname, "rb");\r
                        if(!sramFile) return -1;\r
-                       fread(SRam.data, 1, sram_size, sramFile);\r
+                       fread(sram_data, 1, sram_size, sramFile);\r
                        fclose(sramFile);\r
                } else {\r
                        // sram save needs some special processing\r
                        // see if we have anything to save\r
                        for(; sram_size > 0; sram_size--)\r
-                               if(SRam.data[sram_size-1]) break;\r
+                               if(sram_data[sram_size-1]) break;\r
 \r
                        if(sram_size) {\r
                                sramFile = fopen(saveFname, "wb");\r
-                               ret = fwrite(SRam.data, 1, sram_size, sramFile);\r
+                               ret = fwrite(sram_data, 1, sram_size, sramFile);\r
                                ret = (ret != sram_size) ? -1 : 0;\r
                                fclose(sramFile);\r
                                sync();\r
                        }\r
                }\r
                return ret;\r
-       } else {\r
+       }\r
+       else\r
+       {\r
                void *PmovFile = NULL;\r
                // try gzip first\r
                if(currentConfig.EmuOpt & 8) {\r
@@ -1162,26 +1308,34 @@ int emu_SaveLoadGame(int load, int sram)
                        if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
                                areaRead  = gzRead2;\r
                                areaWrite = gzWrite2;\r
+                               areaEof   = (areaeof *) gzeof;\r
+                               areaSeek  = (areaseek *) gzseek;\r
                                if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
                        } else\r
                                saveFname[strlen(saveFname)-3] = 0;\r
                }\r
                if(!PmovFile) { // gzip failed or was disabled\r
                        if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {\r
-                               areaRead  = (STATE_SL_FUNC) fread;\r
-                               areaWrite = (STATE_SL_FUNC) fwrite;\r
+                               areaRead  = (arearw *) fread;\r
+                               areaWrite = (arearw *) fwrite;\r
+                               areaEof   = (areaeof *) feof;\r
+                               areaSeek  = (areaseek *) fseek;\r
                        }\r
                }\r
                if(PmovFile) {\r
-                       PmovState(load ? 6 : 5, PmovFile);\r
-                       strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");\r
+                       ret = PmovState(load ? 6 : 5, PmovFile);\r
                        if(areaRead == gzRead2)\r
                                 gzclose(PmovFile);\r
                        else fclose ((FILE *) PmovFile);\r
                        PmovFile = 0;\r
                        if (!load) sync();\r
                        else Pico.m.dirtyPal=1;\r
-               } else {\r
+               }\r
+               else    ret = -1;\r
+               if (!ret)\r
+                       strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");\r
+               else\r
+               {\r
                        strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");\r
                        ret = -1;\r
                }\r