X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flibretro%2Flibretro.c;h=1260f4833ceac1be916e7fbefb75b8ac5b8e2150;hb=c3e69f81d86410bce18d0335d2c879bda71285db;hp=75fdf90bb37bef1abfae99354815b91fc6c43ab1;hpb=38d161b0956af97da294c12c86d56d21637e2479;p=picodrive.git

diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index 75fdf90..1260f48 100644
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -482,7 +482,7 @@ void retro_set_environment(retro_environment_t cb)
       { "picodrive_sprlim",      "No sprite limit; disabled|enabled" },
       { "picodrive_ramcart",     "MegaCD RAM cart; disabled|enabled" },
       { "picodrive_region",      "Region; Auto|Japan NTSC|Japan PAL|US|Europe" },
-      { "picodrive_region_fps",  "Region FPS; Auto|NTSC|PAL"},
+      { "picodrive_region_fps",  "Region FPS; Auto|NTSC|PAL" },
 #ifdef DRC_SH2
       { "picodrive_drc", "Dynamic recompilers; enabled|disabled" },
 #endif
@@ -889,17 +889,17 @@ bool retro_load_game(const struct retro_game_info *info)
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,    "D-Pad Up" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,  "D-Pad Down" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "1 Start" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "2" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Pause" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "Button 1 Start" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "Button 2" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Button Pause" },
 
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,  "D-Pad Left" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,    "D-Pad Up" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,  "D-Pad Down" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "1 Start" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "2" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Pause" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "Button 1 Start" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "Button 2" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Button Pause" },
 
       { 0 },
    };
@@ -983,38 +983,64 @@ unsigned retro_get_region(void)
    return Pico.m.pal ? RETRO_REGION_PAL : RETRO_REGION_NTSC;
 }
 
-void *retro_get_memory_data(unsigned id)
+void *retro_get_memory_data(unsigned type)
 {
-   if (id != RETRO_MEMORY_SAVE_RAM)
-      return NULL;
+   uint8_t* data;
 
-   if (PicoAHW & PAHW_MCD)
-      return Pico_mcd->bram;
-   else
-      return SRam.data;
+   switch(type)
+   {
+      case RETRO_MEMORY_SAVE_RAM:
+         if (PicoAHW & PAHW_MCD)
+            data = Pico_mcd->bram;
+         else
+            data = SRam.data;
+         break;
+      case RETRO_MEMORY_SYSTEM_RAM:
+         if (PicoAHW & PAHW_SMS)
+            data = Pico.vramb;
+         else
+            data = Pico.ram;
+         break;
+      default:
+         data = NULL;
+         break;
+   }
+   
+   return data;
 }
 
-size_t retro_get_memory_size(unsigned id)
+size_t retro_get_memory_size(unsigned type)
 {
    unsigned int i;
    int sum;
-
-   if (id != RETRO_MEMORY_SAVE_RAM)
-      return 0;
-
-   if (PicoAHW & PAHW_MCD)
-      // bram
-      return 0x2000;
-
-   if (Pico.m.frame_count == 0)
-      return SRam.size;
-
-   // if game doesn't write to sram, don't report it to
-   // libretro so that RA doesn't write out zeroed .srm
-   for (i = 0, sum = 0; i < SRam.size; i++)
-      sum |= SRam.data[i];
-
-   return (sum != 0) ? SRam.size : 0;
+   
+   switch(type)
+   {
+      case RETRO_MEMORY_SAVE_RAM:
+         if (PicoAHW & PAHW_MCD)
+            // bram
+            return 0x2000;
+
+         if (Pico.m.frame_count == 0)
+            return SRam.size;
+
+         // if game doesn't write to sram, don't report it to
+         // libretro so that RA doesn't write out zeroed .srm
+         for (i = 0, sum = 0; i < SRam.size; i++)
+            sum |= SRam.data[i];
+
+         return (sum != 0) ? SRam.size : 0;
+            
+      case RETRO_MEMORY_SYSTEM_RAM:
+         if (PicoAHW & PAHW_SMS)
+            return sizeof(Pico.vramb);
+         else
+            return sizeof(Pico.ram);
+            
+      default:
+         return 0;
+   }
+   
 }
 
 void retro_reset(void)