X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fvideoport.c;h=1e67ddb6239a0676b42e507b66dbc94c35b1bbea;hb=d01fa2044c98b23dfb72188a7486e567ab2d3dda;hp=42f55c8200e4aeb428956873134f656a9a84b986;hpb=9a1f192a146e9b9752ec1a760745b1261fe9bdec;p=picodrive.git

diff --git a/pico/videoport.c b/pico/videoport.c
index 42f55c8..1e67ddb 100644
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -8,8 +8,8 @@
  */
 
 #include "pico_int.h"
-#include "cd/gfx_cd.h"
 
+int line_base_cycles;
 extern const unsigned char  hcounts_32[];
 extern const unsigned char  hcounts_40[];
 
@@ -22,7 +22,7 @@ typedef unsigned int   u32;
 
 int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp) = NULL;
 
-static __inline void AutoIncrement(void)
+static INLINE void AutoIncrement(void)
 {
   Pico.video.addr=(unsigned short)(Pico.video.addr+Pico.video.reg[0xf]);
 }
@@ -36,7 +36,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?)
             Pico.vram [(a>>1)&0x7fff]=d;
             if (a - ((unsigned)(Pico.video.reg[5]&0x7f) << 9) < 0x400)
-              rendstatus |= PDRAW_DIRTY_SPRITES;
+              Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;
             break;
     case 3: Pico.m.dirtyPal = 1;
             Pico.cram [(a>>1)&0x003f]=d; break; // wraps (Desert Strike)
@@ -156,7 +156,7 @@ static void DmaSlow(int len)
       if (inc == 2 && !(a&1) && a+len*2 < 0x10000)
       {
         // most used DMA mode
-        memcpy16(r + (a>>1), pd, len);
+        pmemcpy16(r + (a>>1), pd, len);
         a += len*2;
       }
       else
@@ -172,7 +172,7 @@ static void DmaSlow(int len)
           //if(pd >= pdend) pd-=0x8000; // should be good for RAM, bad for ROM
         }
       }
-      rendstatus |= PDRAW_DIRTY_SPRITES;
+      Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;
       break;
 
     case 3: // cram
@@ -241,7 +241,7 @@ static void DmaCopy(int len)
   }
   // remember addr
   Pico.video.addr=a;
-  rendstatus |= PDRAW_DIRTY_SPRITES;
+  Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;
 }
 
 // check: Contra, Megaman
@@ -280,7 +280,7 @@ static void DmaFill(int data)
   // update length
   Pico.video.reg[0x13] = Pico.video.reg[0x14] = 0; // Dino Dini's Soccer (E) (by Haze)
 
-  rendstatus |= PDRAW_DIRTY_SPRITES;
+  Pico.est.rendstatus |= PDRAW_DIRTY_SPRITES;
 }
 
 static void CommandDma(void)
@@ -319,7 +319,7 @@ static void CommandChange(void)
 static void DrawSync(int blank_on)
 {
   if (Pico.m.scanline < 224 && !(PicoOpt & POPT_ALT_RENDERER) &&
-      !PicoSkipFrame && DrawScanline <= Pico.m.scanline) {
+      !PicoSkipFrame && Pico.est.DrawScanline <= Pico.m.scanline) {
     //elprintf(EL_ANOMALY, "sync");
     PicoDrawSync(Pico.m.scanline, blank_on);
   }
@@ -396,7 +396,8 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
           return;
         }
 
-        if (num == 1 && !(d&0x40) && SekCyclesLeft > 390) blank_on = 1;
+        if (num == 1 && !(d&0x40) && SekCyclesDone() - line_base_cycles <= 488-390)
+          blank_on = 1;
         DrawSync(blank_on);
         pvid->reg[num]=(unsigned char)d;
         switch (num)
@@ -411,7 +412,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             goto update_irq;
           case 0x05:
             //elprintf(EL_STATUS, "spritep moved to %04x", (unsigned)(Pico.video.reg[5]&0x7f) << 9);
-            if (d^dold) rendstatus |= PDRAW_SPRITES_MOVED;
+            if (d^dold) Pico.est.rendstatus |= PDRAW_SPRITES_MOVED;
             break;
           case 0x0c:
             // renderers should update their palettes if sh/hi mode is changed
@@ -457,7 +458,8 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
     unsigned int d;
     d=pv->status;
     //if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)
-    if (SekCyclesLeft < 84+4)      d|=0x0004; // H-Blank (Sonic3 vs)
+    if (SekCyclesDone() - line_base_cycles >= 488-88)
+      d|=0x0004; // H-Blank (Sonic3 vs)
 
     d |= ((pv->reg[1]&0x40)^0x40) >> 3;  // set V-Blank if display is disabled
     d |= (pv->pending_ints&0x20)<<2;     // V-int pending?
@@ -487,12 +489,11 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
   if ((a&0x1c)==0x08)
   {
     unsigned int d;
-    int lineCycles;
 
-    lineCycles = (488-SekCyclesLeft)&0x1ff;
+    d = (SekCyclesDone() - line_base_cycles) & 0x1ff; // FIXME
     if (Pico.video.reg[12]&1)
-         d = hcounts_40[lineCycles];
-    else d = hcounts_32[lineCycles];
+         d = hcounts_40[d];
+    else d = hcounts_32[d];
 
     elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);
     return d | (Pico.video.v_counter << 8);
@@ -526,7 +527,7 @@ unsigned int PicoVideoRead8(unsigned int a)
       //if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)
       d |= ((Pico.video.reg[1]&0x40)^0x40) >> 3;  // set V-Blank if display is disabled
       d |= (Pico.video.pending_ints&0x20)<<2;     // V-int pending?
-      if (SekCyclesLeft < 84+4) d |= 4;    // H-Blank
+      if (SekCyclesDone() - line_base_cycles >= 488-88) d |= 4;    // H-Blank
       Pico.video.pending = 0;
       elprintf(EL_SR, "SR read (l): %02x @ %06x", d, SekPc);
       return d;
@@ -534,7 +535,7 @@ unsigned int PicoVideoRead8(unsigned int a)
       elprintf(EL_HVCNT, "vcounter: %02x (%i) @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);
       return Pico.video.v_counter;
     case 9:
-      d = (488-SekCyclesLeft)&0x1ff;
+      d = (SekCyclesDone() - line_base_cycles) & 0x1ff; // FIXME
       if (Pico.video.reg[12]&1)
            d = hcounts_40[d];
       else d = hcounts_32[d];