X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fvideoport.c;h=4da3ce3a763db540a0871c7678c4ba2590c9fac4;hb=334f00e24ed55a3e259d1a9d42c4530a770b9a56;hp=fe96139f05c7158582c9a6593e5fe05ab09388f3;hpb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;p=picodrive.git

diff --git a/pico/videoport.c b/pico/videoport.c
index fe96139..4da3ce3 100644
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -223,7 +223,7 @@ static void DmaCopy(int len)
   unsigned char *vr = (unsigned char *) Pico.vram;
   unsigned char inc=Pico.video.reg[0xf];
   int source;
-  elprintf(EL_VDPDMA, "DmaCopy len %i [%i]", len, SekCyclesDone());
+  elprintf(EL_VDPDMA, "DmaCopy len %i [%u]", len, SekCyclesDone());
 
   Pico.m.dma_xfers += len;
   if (Pico.m.dma_xfers < len)
@@ -254,7 +254,7 @@ static NOINLINE void DmaFill(int data)
   int len, l;
 
   len = GetDmaLength();
-  elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%i]", len, inc, SekCyclesDone());
+  elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%u]", len, inc, SekCyclesDone());
 
   Pico.m.dma_xfers += len;
   if (Pico.m.dma_xfers < len) // lame 16bit var
@@ -377,14 +377,12 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
     }
 
     // preliminary FIFO emulation for Chaos Engine, The (E)
-    if (!(pvid->status&8) && (pvid->reg[1]&0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?
+    if (!(pvid->status & SR_VB) && (pvid->reg[1] & 0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?
     {
-      pvid->status&=~0x200; // FIFO no longer empty
-      pvid->lwrite_cnt++;
-      if (pvid->lwrite_cnt >= 4) pvid->status|=0x100; // FIFO full
-      if (pvid->lwrite_cnt >  4) {
-        SekCyclesBurnRun(32); // penalty // 488/12-8
-      }
+      int use = pvid->type == 1 ? 2 : 1;
+      pvid->lwrite_cnt -= use;
+      if (pvid->lwrite_cnt < 0)
+        SekCyclesLeft = 0;
       elprintf(EL_ASVDP, "VDP data write: %04x [%06x] {%i} #%i @ %06x", d, Pico.video.addr,
                Pico.video.type, pvid->lwrite_cnt, SekPc);
     }
@@ -430,11 +428,11 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
         switch (num)
         {
           case 0x00:
-            elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x10)>>4,
+            elprintf(EL_INTSW, "hint_onoff: %i->%i [%u] pend=%i @ %06x", (dold&0x10)>>4,
                     (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);
             goto update_irq;
           case 0x01:
-            elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x20)>>5,
+            elprintf(EL_INTSW, "vint_onoff: %i->%i [%u] pend=%i @ %06x", (dold&0x20)>>5,
                     (d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);
             goto update_irq;
           case 0x05:
@@ -551,7 +549,7 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
          d = hcounts_40[d];
     else d = hcounts_32[d];
 
-    elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);
+    elprintf(EL_HVCNT, "hv: %02x %02x [%u] @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);
     return d | (Pico.video.v_counter << 8);
   }
 
@@ -563,43 +561,54 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
   return 0;
 }
 
-unsigned int PicoVideoRead8(unsigned int a)
+unsigned char PicoVideoRead8DataH(void)
 {
-  unsigned int d;
-  a&=0x1d;
+  return VideoRead() >> 8;
+}
 
-  switch (a)
-  {
-    case 0: return VideoRead() >> 8;
-    case 1: return VideoRead() & 0xff;
-    case 4: // control port/status reg
-      d = Pico.video.status >> 8;
-      if (d&1) Pico.video.status&=~0x100; // FIFO no longer full
-      Pico.video.pending = 0;
-      elprintf(EL_SR, "SR read (h): %02x @ %06x", d, SekPc);
-      return d;
-    case 5:
-      d = Pico.video.status & 0xff;
-      //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 (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;
-    case 8: // hv counter
-      elprintf(EL_HVCNT, "vcounter: %02x (%i) @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);
-      return Pico.video.v_counter;
-    case 9:
-      d = (SekCyclesDone() - line_base_cycles) & 0x1ff; // FIXME
-      if (Pico.video.reg[12]&1)
-           d = hcounts_40[d];
-      else d = hcounts_32[d];
-      elprintf(EL_HVCNT, "hcounter: %02x (%i) @ %06x", d, SekCyclesDone(), SekPc);
-      return d;
-  }
+unsigned char PicoVideoRead8DataL(void)
+{
+  return VideoRead();
+}
 
-  return 0;
+// FIXME: broken mess
+unsigned char PicoVideoRead8CtlH(void)
+{
+  u8 d = (u8)(Pico.video.status >> 8);
+  if (d & 1)
+    Pico.video.status &= ~0x100; // FIFO no longer full
+  Pico.video.pending = 0;
+  elprintf(EL_SR, "SR read (h): %02x @ %06x", d, SekPc);
+  return d;
+}
+
+unsigned char PicoVideoRead8CtlL(void)
+{
+  u8 d = (u8)Pico.video.status;
+  //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 (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;
+}
+
+unsigned char PicoVideoRead8HV_H(void)
+{
+  elprintf(EL_HVCNT, "vcounter: %02x [%u] @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);
+  return Pico.video.v_counter;
+}
+
+// FIXME: broken
+unsigned char PicoVideoRead8HV_L(void)
+{
+  u32 d = (SekCyclesDone() - line_base_cycles) & 0x1ff; // FIXME
+  if (Pico.video.reg[12]&1)
+       d = hcounts_40[d];
+  else d = hcounts_32[d];
+  elprintf(EL_HVCNT, "hcounter: %02x [%u] @ %06x", d, SekCyclesDone(), SekPc);
+  return d;
 }
 
 // vim:shiftwidth=2:ts=2:expandtab