make dma honour banking

[picodrive.git] / pico / videoport.c

diff --git a/pico/videoport.c b/pico/videoport.c
index 42f55c8..35ece48 100644 (file)
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -8,8 +8,9 @@
  */\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
 extern const unsigned char  hcounts_40[];\r
 \r
@@ -36,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
@@ -134,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
@@ -172,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
@@ -241,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
@@ -280,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
@@ -319,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
@@ -396,7 +397,8 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
           return;\r
         }\r
 \r
-        if (num == 1 && !(d&0x40) && SekCyclesLeft > 390) blank_on = 1;\r
+        if (num == 1 && !(d&0x40) && SekCyclesDone() - line_base_cycles <= 488-390)\r
+          blank_on = 1;\r
         DrawSync(blank_on);\r
         pvid->reg[num]=(unsigned char)d;\r
         switch (num)\r
@@ -411,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
@@ -457,7 +459,8 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
     unsigned int d;\r
     d=pv->status;\r
     //if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)\r
-    if (SekCyclesLeft < 84+4)      d|=0x0004; // H-Blank (Sonic3 vs)\r
+    if (SekCyclesDone() - line_base_cycles >= 488-88)\r
+      d|=0x0004; // H-Blank (Sonic3 vs)\r
 \r
     d |= ((pv->reg[1]&0x40)^0x40) >> 3;  // set V-Blank if display is disabled\r
     d |= (pv->pending_ints&0x20)<<2;     // V-int pending?\r
@@ -487,12 +490,11 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
   if ((a&0x1c)==0x08)\r
   {\r
     unsigned int d;\r
-    int lineCycles;\r
 \r
-    lineCycles = (488-SekCyclesLeft)&0x1ff;\r
+    d = (SekCyclesDone() - line_base_cycles) & 0x1ff; // FIXME\r
     if (Pico.video.reg[12]&1)\r
-         d = hcounts_40[lineCycles];\r
-    else d = hcounts_32[lineCycles];\r
+         d = hcounts_40[d];\r
+    else d = hcounts_32[d];\r
 \r
     elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);\r
     return d | (Pico.video.v_counter << 8);\r
@@ -526,7 +528,7 @@ unsigned int PicoVideoRead8(unsigned int a)
       //if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)\r
       d |= ((Pico.video.reg[1]&0x40)^0x40) >> 3;  // set V-Blank if display is disabled\r
       d |= (Pico.video.pending_ints&0x20)<<2;     // V-int pending?\r
-      if (SekCyclesLeft < 84+4) d |= 4;    // H-Blank\r
+      if (SekCyclesDone() - line_base_cycles >= 488-88) d |= 4;    // H-Blank\r
       Pico.video.pending = 0;\r
       elprintf(EL_SR, "SR read (l): %02x @ %06x", d, SekPc);\r
       return d;\r
@@ -534,7 +536,7 @@ unsigned int PicoVideoRead8(unsigned int a)
       elprintf(EL_HVCNT, "vcounter: %02x (%i) @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);\r
       return Pico.video.v_counter;\r
     case 9:\r
-      d = (488-SekCyclesLeft)&0x1ff;\r
+      d = (SekCyclesDone() - line_base_cycles) & 0x1ff; // FIXME\r
       if (Pico.video.reg[12]&1)\r
            d = hcounts_40[d];\r
       else d = hcounts_32[d];\r