From: CatalystG Date: Mon, 25 Mar 2013 00:24:44 +0000 (-0400) Subject: Add missing ifdef, move QNX RAM mapping closer to others X-Git-Tag: r20~119 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f23d33868c571ef2a9206223530292e9c3c2709c;p=pcsx_rearmed.git Add missing ifdef, move QNX RAM mapping closer to others --- diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c index 5cdeb96d..a3b766ac 100644 --- a/libpcsxcore/new_dynarec/new_dynarec.c +++ b/libpcsxcore/new_dynarec/new_dynarec.c @@ -41,9 +41,10 @@ #include "assem_arm.h" #endif +#ifdef __BLACKBERRY_QNX__ #undef __clear_cache #define __clear_cache(start,end) msync(start, (size_t)((void*)end - (void*)start), MS_SYNC | MS_CACHE_ONLY | MS_INVALIDATE_ICACHE); - +#endif #define MAXBLOCK 4096 #define MAX_OUTPUT_BLOCK_SIZE 262144 diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c index 422b485c..62bbe26d 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);