platform, fix no cart sram for MSU/MD+ cartridges

diff --git a/pico/cd/mcd.c b/pico/cd/mcd.c
index 6c3548e..de20b7b 100644 (file)
--- a/pico/cd/mcd.c
+++ b/pico/cd/mcd.c
@@ -106,15 +106,17 @@ PICO_INTERNAL int PicoResetMCD(void)
   // reset button doesn't affect MCD hardware
 
   // use Pico.sv.data for RAM cart
-  if (PicoIn.opt & POPT_EN_MCD_RAMCART) {
-    if (Pico.sv.data == NULL)
-      Pico.sv.data = calloc(1, 0x12000);
-  }
-  else if (Pico.sv.data != NULL) {
-    free(Pico.sv.data);
-    Pico.sv.data = NULL;
+  if (Pico.romsize == 0) {
+    if (PicoIn.opt & POPT_EN_MCD_RAMCART) {
+      if (Pico.sv.data == NULL)
+        Pico.sv.data = calloc(1, 0x12000);
+    }
+    else if (Pico.sv.data != NULL) {
+      free(Pico.sv.data);
+      Pico.sv.data = NULL;
+    }
+    Pico.sv.start = Pico.sv.end = 0; // unused
   }
-  Pico.sv.start = Pico.sv.end = 0; // unused
 
   msd_reset();
   return 0;

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 1aa3345..627fc98 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -868,9 +868,9 @@ char *emu_get_save_fname(int load, int is_sram, int slot, int *time)
 \r
        if (is_sram)\r
        {\r
-               strcpy(ext, (PicoIn.AHW & PAHW_MCD) ? ".brm" : ".srm");\r
+               strcpy(ext, (PicoIn.AHW & PAHW_MCD) && Pico.romsize == 0 ? ".brm" : ".srm");\r
                romfname_ext(saveFname, sizeof(static_buff),\r
-                       (PicoIn.AHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);\r
+                       (PicoIn.AHW & PAHW_MCD) && Pico.romsize == 0 ? "brm"PATH_SEP : "srm"PATH_SEP, ext);\r
                if (!load)\r
                        return saveFname;\r
 \r
@@ -944,7 +944,7 @@ int emu_save_load_game(int load, int sram)
                int sram_size;\r
                unsigned char *sram_data;\r
                int truncate = 1;\r
-               if (PicoIn.AHW & PAHW_MCD)\r
+               if ((PicoIn.AHW & PAHW_MCD) && Pico.romsize == 0)\r
                {\r
                        if (PicoIn.opt & POPT_EN_MCD_RAMCART) {\r
                                sram_size = 0x12000;\r
@@ -971,7 +971,7 @@ int emu_save_load_game(int load, int sram)
                        ret = fread(sram_data, 1, sram_size, sramFile);\r
                        ret = ret > 0 ? 0 : -1;\r
                        fclose(sramFile);\r
-                       if ((PicoIn.AHW & PAHW_MCD) && (PicoIn.opt&POPT_EN_MCD_RAMCART))\r
+                       if ((PicoIn.AHW & PAHW_MCD) && Pico.romsize == 0 && (PicoIn.opt&POPT_EN_MCD_RAMCART))\r
                                memcpy(Pico_mcd->bram, sram_data, 0x2000);\r
                } else {\r
                        // sram save needs some special processing\r

diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index dd30ad1..82e7245 100644 (file)
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -1680,7 +1680,7 @@ void *retro_get_memory_data(unsigned type)
    {
       case RETRO_MEMORY_SAVE_RAM:
          /* Note: MCD RAM cart uses Pico.sv.data */
-         if ((PicoIn.AHW & PAHW_MCD) &&
+         if ((PicoIn.AHW & PAHW_MCD) && Pico.romsize == 0 &&
                !(PicoIn.opt & POPT_EN_MCD_RAMCART))
             data = Pico_mcd->bram;
          else
@@ -1716,7 +1716,7 @@ size_t retro_get_memory_size(unsigned type)
       case RETRO_MEMORY_SAVE_RAM:
          if (PicoIn.AHW & PAHW_MCD)
          {
-            if (PicoIn.opt & POPT_EN_MCD_RAMCART)
+            if (Pico.romsize == 0 && PicoIn.opt & POPT_EN_MCD_RAMCART)
                return 0x12000;
             else /* bram */
                return 0x2000;