make dma honour banking

[picodrive.git] / pico / videoport.c

diff --git a/pico/videoport.c b/pico/videoport.c
index 1e60686..35ece48 100644 (file)
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -8,7 +8,7 @@
  */\r
 \r
 #include "pico_int.h"\r
-#include "cd/gfx_cd.h"\r
+#include "memory.h"\r
 \r
 int line_base_cycles;\r
 extern const unsigned char  hcounts_32[];\r
@@ -37,7 +37,7 @@ static void VideoWrite(u16 d)
     case 1: if(a&1) d=(u16)((d<<8)|(d>>8)); // If address is odd, bytes are swapped (which game needs this?)\r
             Pico.vram [(a>>1)&0x7fff]=d;\r
             if (a - ((unsigned)(Pico.video.reg[5]&0x7f) << 9) < 0x400)\r
-              rendstatus |= PDRAW_DIRTY_SPRITES;\r
+              Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;\r
             break;\r
     case 3: Pico.m.dirtyPal = 1;\r
             Pico.cram [(a>>1)&0x003f]=d; break; // wraps (Desert Strike)\r
@@ -135,10 +135,10 @@ static void DmaSlow(int len)
     // if we have DmaHook, let it handle ROM because of possible DMA delay\r
     if (PicoDmaHook && PicoDmaHook(source, len, &pd, &pdend));\r
     else if (source<Pico.romsize) { // Rom\r
-      pd=(u16 *)(Pico.rom+(source&~1));\r
+      pd=m68k_dma_source(source);\r
       pdend=(u16 *)(Pico.rom+Pico.romsize);\r
     }\r
-    else {\r
+    if (!pd) {\r
       elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: invalid src", Pico.video.type, source, a);\r
       return;\r
     }\r
@@ -173,7 +173,7 @@ static void DmaSlow(int len)
           //if(pd >= pdend) pd-=0x8000; // should be good for RAM, bad for ROM\r
         }\r
       }\r
-      rendstatus |= PDRAW_DIRTY_SPRITES;\r
+      Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;\r
       break;\r
 \r
     case 3: // cram\r
@@ -242,7 +242,7 @@ static void DmaCopy(int len)
   }\r
   // remember addr\r
   Pico.video.addr=a;\r
-  rendstatus |= PDRAW_DIRTY_SPRITES;\r
+  Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;\r
 }\r
 \r
 // check: Contra, Megaman\r
@@ -281,7 +281,7 @@ static void DmaFill(int data)
   // update length\r
   Pico.video.reg[0x13] = Pico.video.reg[0x14] = 0; // Dino Dini's Soccer (E) (by Haze)\r
 \r
-  rendstatus |= PDRAW_DIRTY_SPRITES;\r
+  Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;\r
 }\r
 \r
 static void CommandDma(void)\r
@@ -320,7 +320,7 @@ static void CommandChange(void)
 static void DrawSync(int blank_on)\r
 {\r
   if (Pico.m.scanline < 224 && !(PicoOpt & POPT_ALT_RENDERER) &&\r
-      !PicoSkipFrame && DrawScanline <= Pico.m.scanline) {\r
+      !PicoSkipFrame && Pico.est.DrawScanline <= Pico.m.scanline) {\r
     //elprintf(EL_ANOMALY, "sync");\r
     PicoDrawSync(Pico.m.scanline, blank_on);\r
   }\r
@@ -413,7 +413,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             goto update_irq;\r
           case 0x05:\r
             //elprintf(EL_STATUS, "spritep moved to %04x", (unsigned)(Pico.video.reg[5]&0x7f) << 9);\r
-            if (d^dold) rendstatus |= PDRAW_SPRITES_MOVED;\r
+            if (d^dold) Pico.est.rendstatus |= PDRAW_SPRITES_MOVED;\r
             break;\r
           case 0x0c:\r
             // renderers should update their palettes if sh/hi mode is changed\r