From 51014e8756a50a3550a65d0bc96152363e406950 Mon Sep 17 00:00:00 2001
From: CatalystG
Date: Sun, 24 Mar 2013 18:09:00 -0400
Subject: Add support for PlayBook/BB10 with libretro

---
 libpcsxcore/psxmem.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libpcsxcore/psxmem.c')

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index f12a981..422b485 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -129,8 +129,13 @@ int psxMemInit() {
 
 	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
 #ifndef RAM_FIXED
+#ifdef __BLACKBERRY_QNX__
+	if (psxM == NULL)
+		psxM = psxMap(0x70000000, 0x00210000, 0, MAP_TAG_RAM);
+#else
 	if (psxM == NULL)
 		psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
+#endif
 #endif
 	if (psxM == NULL) {
 		SysMessage(_("mapping main RAM failed"));
-- 
cgit v1.2.3


From 0b5d059012a087cd108fe65edaa92e512101fc1a Mon Sep 17 00:00:00 2001
From: CatalystG
Date: Sun, 24 Mar 2013 20:24:44 -0400
Subject: Add missing ifdef, move QNX RAM mapping closer to others

---
 libpcsxcore/psxmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libpcsxcore/psxmem.c')

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 422b485..62bbe26 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -131,7 +131,7 @@ int psxMemInit() {
 #ifndef RAM_FIXED
 #ifdef __BLACKBERRY_QNX__
 	if (psxM == NULL)
-		psxM = psxMap(0x70000000, 0x00210000, 0, MAP_TAG_RAM);
+		psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
 #else
 	if (psxM == NULL)
 		psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
-- 
cgit v1.2.3