X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=4da0cf4c0190492cc5970a1fabc3b445a94961d1;hp=422b485ce104f54fd7afae780c6bf320dbeab481;hb=4b5b6cf713480df38c7e79d669cb9e72d70b3ba0;hpb=a48745850385e49bf1ca9f8c4e98d925032a8a06

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 422b485c..4da0cf4c 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -52,8 +52,9 @@ retry:
 		goto out;
 	}
 
-	if (is_fixed)
-		flags |= MAP_FIXED;
+	/* avoid MAP_FIXED, it overrides existing mappings.. */
+	/* if (is_fixed)
+		flags |= MAP_FIXED; */
 
 	req = (void *)addr;
 	ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
@@ -65,6 +66,11 @@ out:
 		SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
 			addr, ret);
 
+		if (is_fixed) {
+			psxUnmap(ret, size, tag);
+			return NULL;
+		}
+
 		if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
 		    && !tried_to_align)
 		{
@@ -131,7 +137,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);