notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libretro: rework makefile
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
4373121
..
62bbe26
100644
(file)
--- 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
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);
if (psxM == NULL)
psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
+#endif
#endif
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
#endif
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
@@
-198,7
+203,7
@@
void psxMemReset() {
void psxMemShutdown() {
psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
void psxMemShutdown() {
psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
- psxUnmap(psxH, 0x1
f80
0000, MAP_TAG_OTHER);
+ psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
free(psxMemRLUT);
psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
free(psxMemRLUT);