add primary NES memory access, allow get cheevos.

libretro · Mar 17, 2016 · 53d7a99 · 53d7a99
1 parent 1b3d4d7
commit 53d7a99
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 20 deletions.
diff --git a/fceumm-code/src/drivers/libretro/libretro.c b/fceumm-code/src/drivers/libretro/libretro.c
@@ -765,28 +765,55 @@ unsigned retro_get_region(void)
    return FSettings.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 (iNESCart.battery)
-	   return iNESCart.SaveGame[0];
-   if (UNIFCart.battery)
-      return UNIFCart.SaveGame[0];
-
-   return 0;
+   switch(type)
+   {
+      case RETRO_MEMORY_SAVE_RAM:
+         if (iNESCart.battery)
+	         return iNESCart.SaveGame[0];
+         else if (UNIFCart.battery)
+            return UNIFCart.SaveGame[0];
+         else
+            data = NULL;
+         break;
+      case RETRO_MEMORY_SYSTEM_RAM:
+         // TODO: add ExWRAM(0x2000) support ?
+         data = RAM;
+         break;
+      default:
+         data = NULL;
+         break;
+   }
+
+   return data;
 }
 
-size_t retro_get_memory_size(unsigned id)
+size_t retro_get_memory_size(unsigned type)
 {
-   if (id != RETRO_MEMORY_SAVE_RAM)
-      return 0;
+   unsigned size;
 
-   if (iNESCart.battery)
-      return iNESCart.SaveGameLen[0];
-   if (UNIFCart.battery)
-      return UNIFCart.SaveGameLen[0];
-
-   return 0;
+   switch(type)
+   {
+      case RETRO_MEMORY_SAVE_RAM:
+         if (iNESCart.battery)
+            size = iNESCart.SaveGameLen[0];
+         else if (UNIFCart.battery)
+            size = UNIFCart.SaveGameLen[0];
+         else
+            size = 0;
+         break;
+      case RETRO_MEMORY_SYSTEM_RAM:
+         // TODO: detect ExWRAM(0x2000) ?
+         // NES BASE RAM (0x800)
+         size = 0x800;
+         break;
+      default:
+         size = 0;
+         break;
+   }
+
+   return size;
 }
diff --git a/fceumm-code/src/drivers/libretro/libretro.h b/fceumm-code/src/drivers/libretro/libretro.h
@@ -1104,8 +1104,8 @@ void retro_unload_game(void);
 unsigned retro_get_region(void);
 
 // Gets region of memory.
-void *retro_get_memory_data(unsigned id);
-size_t retro_get_memory_size(unsigned id);
+void *retro_get_memory_data(unsigned type);
+size_t retro_get_memory_size(unsigned type);
 
 #ifdef __cplusplus
 }