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);
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)
{
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"));
void psxMemShutdown() {
psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
- psxUnmap(psxH, 0x1f800000, MAP_TAG_OTHER);
+ psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
free(psxMemRLUT);