X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flibretro%2Flibretro.c;h=9588bc8845c6e3850e71913a99437368062fae1b;hb=2d4f989df99867149b8fe9a7f2d9a11799f469af;hp=75fdf90bb37bef1abfae99354815b91fc6c43ab1;hpb=17d4733d38b0518055bf379a1ec486dfc563abe8;p=picodrive.git

diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index 75fdf90..9588bc8 100644
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -1,6 +1,8 @@
 /*
  * libretro core glue for PicoDrive
  * (C) notaz, 2013
+ * (C) aliaspider, 2016
+ * (C) Daniel De Matteis, 2013
  *
  * This work is licensed under the terms of MAME license.
  * See COPYING file in the top-level directory.
@@ -38,6 +40,15 @@ void* linearMemAlign(size_t size, size_t alignment);
 void linearFree(void* mem);
 
 static int ctr_svchack_successful = 0;
+
+#elif defined(VITA)
+#define TARGET_SIZE_2 24 // 2^24 = 16 megabytes
+
+#include <psp2/kernel/sysmem.h>
+static int sceBlock;
+int getVMBlock();
+int _newlib_vm_size_user = 1 << TARGET_SIZE_2;
+
 #endif
 
 #include <pico/pico_int.h>
@@ -55,8 +66,14 @@ static retro_audio_sample_batch_t audio_batch_cb;
 
 #define VOUT_MAX_WIDTH 320
 #define VOUT_MAX_HEIGHT 240
+
+static const float VOUT_PAR = 0.0;
+static const float VOUT_4_3 = (224.0f * (4.0f / 3.0f));
+static const float VOUT_CRT = (224.0f * 1.29911f);
+
 static void *vout_buf;
 static int vout_width, vout_height, vout_offset;
+static float user_vout_width = 0.0;
 
 #ifdef _MSC_VER
 static short sndBuffer[2*44100/50];
@@ -77,14 +94,16 @@ static void snd_write(int len);
 void cache_flush_d_inval_i(void *start, void *end)
 {
 #ifdef __arm__
+   size_t len = (char *)end - (char *)start;
 #if defined(__BLACKBERRY_QNX__)
    msync(start, end - start, MS_SYNC | MS_CACHE_ONLY | MS_INVALIDATE_ICACHE);
 #elif defined(__MACH__)
-   size_t len = (char *)end - (char *)start;
    sys_dcache_flush(start, len);
    sys_icache_invalidate(start, len);
 #elif defined(_3DS)
    ctr_flush_invalidate_cache();
+#elif defined(VITA)
+   sceKernelSyncVMDomain(sceBlock, start, len);
 #else
    __clear_cache(start, end);
 #endif
@@ -438,7 +457,8 @@ int plat_mem_set_exec(void *ptr, size_t size)
       exit(1);
    }
 
-
+#elif defined(VITA)
+   int ret = sceKernelOpenVMDomain();
 #else
    int ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC);
    if (ret != 0 && log_cb)
@@ -455,6 +475,11 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 
    vout_height = line_count;
    vout_offset = vout_width * start_line;
+
+   // Update the geometry
+   struct retro_system_av_info av_info;
+   retro_get_system_av_info(&av_info);
+   environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info);
 }
 
 void emu_32x_startup(void)
@@ -482,7 +507,8 @@ 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" },
+      { "picodrive_aspect",      "Core-provided aspect ratio; PAR|4/3|CRT" },
 #ifdef DRC_SH2
       { "picodrive_drc", "Dynamic recompilers; enabled|disabled" },
 #endif
@@ -513,7 +539,10 @@ void retro_get_system_info(struct retro_system_info *info)
 {
    memset(info, 0, sizeof(*info));
    info->library_name = "PicoDrive";
-   info->library_version = VERSION;
+#ifndef GIT_VERSION
+#define GIT_VERSION ""
+#endif
+   info->library_version = VERSION GIT_VERSION;
    info->valid_extensions = "bin|gen|smd|md|32x|cue|iso|sms";
    info->need_fullpath = true;
 }
@@ -523,11 +552,16 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
    memset(info, 0, sizeof(*info));
    info->timing.fps            = Pico.m.pal ? 50 : 60;
    info->timing.sample_rate    = 44100;
-   info->geometry.base_width   = 320;
+   info->geometry.base_width   = vout_width;
    info->geometry.base_height  = vout_height;
-   info->geometry.max_width    = VOUT_MAX_WIDTH;
-   info->geometry.max_height   = VOUT_MAX_HEIGHT;
-   info->geometry.aspect_ratio = 4.0f / 3.0f;
+   info->geometry.max_width    = vout_width;
+   info->geometry.max_height   = vout_height;
+   
+   float common_width = vout_width;
+   if (user_vout_width != 0)
+      common_width = user_vout_width;
+   
+   info->geometry.aspect_ratio = common_width / vout_height;
 }
 
 /* savestates */
@@ -848,6 +882,22 @@ static const char *find_bios(int *region, const char *cd_fname)
    return NULL;
 }
 
+static void sram_reset()
+{
+   SRam.data = NULL;
+   SRam.start = 0;
+   SRam.end = 0;
+   SRam.flags = '\0';
+   SRam.unused2 = '\0';
+   SRam.changed = '\0' ;
+   SRam.eeprom_type = '\0';
+   SRam.unused3 = '\0';
+   SRam.eeprom_bit_cl = '\0';
+   SRam.eeprom_bit_in = '\0';
+   SRam.eeprom_bit_out = '\0';
+   SRam.size = 0;
+}
+
 bool retro_load_game(const struct retro_game_info *info)
 {
    enum media_type_e media_type;
@@ -889,21 +939,23 @@ 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 },
    };
 
+   sram_reset();
+
    enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
    if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
       if (log_cb)
@@ -983,38 +1035,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)
@@ -1126,6 +1204,26 @@ static void update_variables(void)
       PsndRerate(1);
    }
 
+   float old_user_vout_width = user_vout_width;
+   var.value = NULL;
+   var.key = "picodrive_aspect";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
+      if (strcmp(var.value, "4/3") == 0)
+         user_vout_width = VOUT_4_3;
+      else if (strcmp(var.value, "CRT") == 0)
+         user_vout_width = VOUT_CRT;
+      else
+         user_vout_width = VOUT_PAR;   
+   }
+
+   if (user_vout_width != old_user_vout_width)
+   {
+      // Update the geometry
+      struct retro_system_av_info av_info;
+      retro_get_system_av_info(&av_info);
+      environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info);
+   }
+
 #ifdef DRC_SH2
    var.value = NULL;
    var.key = "picodrive_drc";
@@ -1188,6 +1286,8 @@ void retro_init(void)
 
 #ifdef _3DS
    ctr_svchack_successful = ctr_svchack_init();
+#elif defined(VITA)
+   sceBlock = getVMBlock();
 #endif
 
    PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80