better mmuhack usage

[libpicofe.git] / gp2x / emu.c

diff --git a/gp2x/emu.c b/gp2x/emu.c
index c16b658..eca0dc4 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006-2007 notaz, All rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
@@ -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
@@ -307,7 +310,7 @@ int emu_ReloadRom(void)
 \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 short *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
+         ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
                if (rom_data) free(rom_data);\r
                rom_data = 0;\r
                sprintf(menuErrorMsg, "Not a ROM selected.");\r
@@ -479,8 +482,8 @@ int emu_ReadConfig(int game)
                // set default config\r
                memset(&currentConfig, 0, sizeof(currentConfig));\r
                currentConfig.lastRomFile[0] = 0;\r
-               currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds\r
-               currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda\r
+               currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, 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
@@ -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
@@ -1323,7 +1328,7 @@ if (Pico.m.frame_count == 31563) {
 \r
        // save SRAM\r
        if((currentConfig.EmuOpt & 1) && SRam.changed) {\r
-               osd_text(4, 232, "Writing SRAM/BRAM..");\r
+               emu_state_cb("Writing SRAM/BRAM..");\r
                emu_SaveLoadGame(0, 1);\r
                SRam.changed = 0;\r
        }\r
@@ -1454,29 +1459,42 @@ int emu_SaveLoadGame(int load, int sram)
                FILE *sramFile;\r
                int sram_size;\r
                unsigned char *sram_data;\r
+               int truncate = 1;\r
                if (PicoMCD&1) {\r
-                       sram_size = 0x2000;\r
-                       sram_data = Pico_mcd->bram;\r
+                       if (PicoOpt&0x8000) { // MCD RAM cart?\r
+                               sram_size = 0x12000;\r
+                               sram_data = SRam.data;\r
+                               if (sram_data)\r
+                                       memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);\r
+                       } else {\r
+                               sram_size = 0x2000;\r
+                               sram_data = Pico_mcd->bram;\r
+                               truncate  = 0; // the .brm may contain RAM cart data after normal brm\r
+                       }\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
+               if (!sram_data) return 0; // SRam forcefully disabled for this game\r
 \r
-               if(load) {\r
+               if (load) {\r
                        sramFile = fopen(saveFname, "rb");\r
                        if(!sramFile) return -1;\r
                        fread(sram_data, 1, sram_size, sramFile);\r
                        fclose(sramFile);\r
+                       if ((PicoMCD&1) && (PicoOpt&0x8000))\r
+                               memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\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
+                       for (; sram_size > 0; sram_size--)\r
+                               if (sram_data[sram_size-1]) break;\r
 \r
-                       if(sram_size) {\r
-                               sramFile = fopen(saveFname, "wb");\r
+                       if (sram_size) {\r
+                               sramFile = fopen(saveFname, truncate ? "wb" : "r+b");\r
+                               if (!sramFile) sramFile = fopen(saveFname, "wb"); // retry\r
+                               if (!sramFile) return -1;\r
                                ret = fwrite(sram_data, 1, sram_size, sramFile);\r
                                ret = (ret != sram_size) ? -1 : 0;\r
                                fclose(sramFile);\r