aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore/psxmem.c
diff options
context:
space:
mode:
authorSquarepusher2013-03-24 17:34:12 -0700
committerSquarepusher2013-03-24 17:34:12 -0700
commitde4229995f85cddc72420b1b094e022b63f3951b (patch)
tree08e4e6802fd590459a3b97eb4404f74af3384a19 /libpcsxcore/psxmem.c
parentab82eb7dd3824b66d5cd143141e861403e373308 (diff)
parent0b5d059012a087cd108fe65edaa92e512101fc1a (diff)
downloadpcsx_rearmed-de4229995f85cddc72420b1b094e022b63f3951b.tar.gz
pcsx_rearmed-de4229995f85cddc72420b1b094e022b63f3951b.tar.bz2
pcsx_rearmed-de4229995f85cddc72420b1b094e022b63f3951b.zip
Merge pull request #1 from CatalystG/libretro
Add support for PlayBook/BB10 with libretro
Diffstat (limited to 'libpcsxcore/psxmem.c')
-rw-r--r--libpcsxcore/psxmem.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index f12a981..62bbe26 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -129,9 +129,14 @@ int psxMemInit() {
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
#ifndef RAM_FIXED
+#ifdef __BLACKBERRY_QNX__
+ if (psxM == NULL)
+ psxM = psxMap(0x77000000, 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"));
return -1;