From: Twinaphex <libretro@gmail.com>
Date: Sat, 14 Dec 2019 18:09:16 +0000 (+0100)
Subject: Merge pull request #368 from negativeExponent/memmap
X-Git-Tag: r24l~689
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f4c0ee2cf547eefd91aa2e11439bad2ceb35e0;hp=be2b71324715fa4657b67861bbff3cbc2a5860a3;p=pcsx_rearmed.git

Merge pull request #368 from negativeExponent/memmap

Access psx main memory using retro_memory_map
---

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4d490875..d63f1268 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1052,6 +1052,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 +1327,8 @@ bool retro_load_game(const struct retro_game_info *info)
 		}
 	}
 
+	set_retro_memmap();
+
 	return true;
 }