X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=ab8542187a1daf9a3cafc668f905b81138132984;hb=9f2c632c7c04c7c86cf66ba3210b43c3e8394e48;hp=4d4908751ed97e6603108cf654968656cf33c81c;hpb=34af0fff1456e3721af1691b2a135cd915ff42cd;p=pcsx_rearmed.git

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4d490875..ab854218 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -15,6 +15,10 @@
 #include <sys/syscall.h>
 #endif
 
+#ifdef SWITCH
+#include <switch.h>
+#endif
+
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"
 #include "../libpcsxcore/psxmem_map.h"
@@ -1052,6 +1056,20 @@ strcasestr(const char *s, const char*find)
 }
 #endif
 
+static void set_retro_memmap(void)
+{
+	struct retro_memory_map retromap = { 0 };
+	struct retro_memory_descriptor mmap =
+	{
+		0, psxM, 0, 0, 0, 0, 0x200000
+	};
+
+	retromap.descriptors = &mmap;
+	retromap.num_descriptors = 1;
+
+    environ_cb(RETRO_ENVIRONMENT_SET_MEMORY_MAPS, &retromap);
+}
+
 bool retro_load_game(const struct retro_game_info *info)
 {
 	size_t i;
@@ -1313,6 +1331,8 @@ bool retro_load_game(const struct retro_game_info *info)
 		}
 	}
 
+	set_retro_memmap();
+
 	return true;
 }
 
@@ -2425,7 +2445,7 @@ void retro_init(void)
 
 #ifdef _3DS
    vout_buf = linearMemAlign(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2, 0x80);
-#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && !defined(VITA)
+#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && !defined(VITA) && !defined(__SWITCH__)
 	posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
 #else
 	vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);