X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.h;h=eb440dd49ea03223dca6ac4c4a49fa63bb6baa0f;hb=48c9e01be8ad93a7902e22f9ad07aba4527e6572;hp=4260a35976bdc85bb51abcf6f009bf363e7ea22a;hpb=7feeb8806243f9f0bc6c3d6e957b97d12cecb7df;p=picodrive.git

diff --git a/pico/memory.h b/pico/memory.h
index 4260a35..eb440dd 100644
--- a/pico/memory.h
+++ b/pico/memory.h
@@ -1,9 +1,11 @@
 // memory map related stuff
 
+#include "pico_port.h"
+
 typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;
-typedef unsigned long  uptr; // unsigned pointer-sized int
+typedef uintptr_t      uptr; // unsigned pointer-sized int
 
 #define M68K_MEM_SHIFT 16
 // minimum size we can map
@@ -133,17 +135,25 @@ void name(u32 a, u32 d)                         \
   }                                             \
 }
 
+#ifdef NEED_DMA_SOURCE // meh
+
 static __inline void *m68k_dma_source(u32 a)
 {
+  u8 *base;
   uptr v;
-  a &= 0x00fffffe;
   v = m68k_read16_map[a >> M68K_MEM_SHIFT];
-  if (map_flag_set(v))
-    return NULL;
+  if (map_flag_set(v)) {
+    if (a >= Pico.romsize) // Rom
+      return NULL;
+    base = Pico.rom;
+  }
   else
-    return (void *)((v << 1) + a);
+    base = (void *)(v << 1);
+  return base + (a & 0xfe0000);
 }
 
+#endif
+
 // 32x
 typedef struct {
   uptr addr; // stores (membase >> 1) or ((handler >> 1) | (1<<31))