Add core option to force the Region FPS (NTSC, PAL)

[picodrive.git] / platform / libretro / libretro.c

diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index 62b168e..0a4ab49 100644 (file)
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -26,13 +26,16 @@
 
 #ifdef _3DS
 #include "3ds/3ds_utils.h"
-#define MEMOP_PROT   6
+#define MEMOP_MAP     4
+#define MEMOP_UNMAP   5
+#define MEMOP_PROT    6
+
 int svcDuplicateHandle(unsigned int* out, unsigned int original);
 int svcCloseHandle(unsigned int handle);
 int svcControlProcessMemory(unsigned int process, void* addr0, void* addr1,
                             unsigned int size, unsigned int type, unsigned int perm);
-#define MEMOP_MAP     4
-#define MEMOP_UNMAP   5
+void* linearMemAlign(size_t size, size_t alignment);
+void linearFree(void* mem);
 
 static int ctr_svchack_successful = 0;
 #endif
@@ -466,7 +469,7 @@ void lprintf(const char *fmt, ...)
    vsprintf(buffer, fmt, ap);
    /* TODO - add 'level' param for warning/error messages? */
    if (log_cb)
-      log_cb(RETRO_LOG_INFO, "%s\n", fmt, ap);
+      log_cb(RETRO_LOG_INFO, "%s", buffer);
    va_end(ap);
 }
 
@@ -474,12 +477,12 @@ void lprintf(const char *fmt, ...)
 void retro_set_environment(retro_environment_t cb)
 {
    static const struct retro_variable vars[] = {
-      //{ "region", "Region; Auto|NTSC|PAL" },
-      { "picodrive_input1", "Input device 1; 3 button pad|6 button pad|None" },
-      { "picodrive_input2", "Input device 2; 3 button pad|6 button pad|None" },
-      { "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_input1",      "Input device 1; 3 button pad|6 button pad|None" },
+      { "picodrive_input2",      "Input device 2; 3 button pad|6 button pad|None" },
+      { "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"},
 #ifdef DRC_SH2
       { "picodrive_drc", "Dynamic recompilers; enabled|disabled" },
 #endif
@@ -1141,6 +1144,7 @@ static void update_variables(void)
          PicoOpt &= ~POPT_EN_MCD_RAMCART;
    }
 
+   int OldPicoRegionOverride = PicoRegionOverride;
    var.value = NULL;
    var.key = "picodrive_region";
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
@@ -1156,6 +1160,27 @@ static void update_variables(void)
          PicoRegionOverride = 8;
    }
 
+   int OldPicoRegionFPSOverride = PicoRegionFPSOverride;
+   var.value = NULL;
+   var.key = "picodrive_region_fps";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
+      if (strcmp(var.value, "Auto") == 0)
+         PicoRegionFPSOverride = 0;
+      else if (strcmp(var.value, "NTSC") == 0)
+         PicoRegionFPSOverride = 1;
+      else if (strcmp(var.value, "PAL") == 0)
+         PicoRegionFPSOverride = 2;         
+   }
+   
+   // Update region, fps and sound flags if needed
+   if (PicoRegionOverride    != OldPicoRegionOverride ||
+       PicoRegionFPSOverride != OldPicoRegionFPSOverride)
+   {
+      PicoDetectRegion();
+      PicoLoopPrepare();
+      PsndRerate(1);
+   }
+      
 #ifdef DRC_SH2
    var.value = NULL;
    var.key = "picodrive_drc";
@@ -1235,7 +1260,11 @@ void retro_init(void)
 
    vout_width = 320;
    vout_height = 240;
+#ifdef _3DS
+   vout_buf = linearMemAlign(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2, 0x80);
+#else
    vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
+#endif
 
    PicoInit();
    PicoDrawSetOutFormat(PDF_RGB555, 0);
@@ -1250,5 +1279,11 @@ void retro_init(void)
 
 void retro_deinit(void)
 {
+#ifdef _3DS
+   linearFree(vout_buf);
+#else
+   free(vout_buf);
+#endif
+   vout_buf = NULL;
    PicoExit();
 }