Merge pull request #312 from retro-wertz/main_ram_map

[pcsx_rearmed.git] / frontend / libretro.c

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 91f1b51..992da60 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1364,6 +1364,8 @@ void *retro_get_memory_data(unsigned id)
 {
        if (id == RETRO_MEMORY_SAVE_RAM)
                return Mcd1Data;
+       else if (id == RETRO_MEMORY_SYSTEM_RAM)
+               return psxM;
        else
                return NULL;
 }
@@ -1372,6 +1374,8 @@ size_t retro_get_memory_size(unsigned id)
 {
        if (id == RETRO_MEMORY_SAVE_RAM)
                return MCD_SIZE;
+       else if (id == RETRO_MEMORY_SYSTEM_RAM)
+               return 0x210000;
        else
                return 0;
 }
@@ -1823,7 +1827,7 @@ void retro_run(void)
                        // Query digital inputs
                        //
                        // > Pad-Up
-                       if (ret & (1 < RETRO_DEVICE_ID_JOYPAD_UP))
+                       if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_UP))
                                in_keystate[i] |= (1 << DKEY_UP);
                        // > Pad-Right
                        if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))