X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=7a38ea9c43af928445448702647978754c65c173;hb=9761a7d0d41ad429d53c64ff35fe061c38092dbf;hp=849389d3d04ce2ce20ef1ccc639e7643b06b1b8a;hpb=b6d7ac70909e29ba8f40d6eaee53dd5b1bb71e52;p=picodrive.git

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 849389d..7a38ea9 100644
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -12,7 +12,6 @@
 
 extern const unsigned char  hcounts_32[];
 extern const unsigned char  hcounts_40[];
-extern const unsigned short vcounts[];
 
 #ifndef UTYPES_DEFINED
 typedef unsigned char  u8;
@@ -43,7 +42,6 @@ static void VideoWrite(u16 d)
     //default:elprintf(EL_ANOMALY, "VDP write %04x with bad type %i", d, Pico.video.type); break;
   }
 
-  //dprintf("w[%i] @ %04x, inc=%i [%i|%i]", Pico.video.type, a, Pico.video.reg[0xf], Pico.m.scanline, SekCyclesDone());
   AutoIncrement();
 }
 
@@ -92,14 +90,9 @@ static void DmaSlow(int len)
     Pico.video.type, source, a, len, inc, (Pico.video.status&8)||!(Pico.video.reg[1]&0x40),
     SekCyclesDone(), SekPc);
 
-  if (Pico.m.scanline != -1) {
-    Pico.m.dma_xfers += len;
-    if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA());
-    else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());
-  } else {
-    // be approximate in non-accurate mode
-    SekSetCyclesLeft(SekCyclesLeft - (len*(((488<<8)/167))>>8));
-  }
+  Pico.m.dma_xfers += len;
+  if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA());
+  else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());
 
   if ((source&0xe00000)==0xe00000) { // Ram
     pd=(u16 *)(Pico.ram+(source&0xfffe));
@@ -230,16 +223,15 @@ static void DmaCopy(int len)
   elprintf(EL_VDPDMA, "DmaCopy len %i [%i]", len, SekCyclesDone());
 
   Pico.m.dma_xfers += len;
-  if(Pico.m.scanline != -1)
-    Pico.video.status|=2; // dma busy
+  Pico.video.status |= 2; // dma busy
 
   source =Pico.video.reg[0x15];
   source|=Pico.video.reg[0x16]<<8;
   vrs=vr+source;
 
-  if(source+len > 0x10000) len=0x10000-source; // clip??
+  if (source+len > 0x10000) len=0x10000-source; // clip??
 
-  for(;len;len--)
+  for (; len; len--)
   {
     vr[a] = *vrs++;
     // AutoIncrement
@@ -264,17 +256,16 @@ static void DmaFill(int data)
   elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%i]", len, inc, SekCyclesDone());
 
   Pico.m.dma_xfers += len;
-  if(Pico.m.scanline != -1)
-    Pico.video.status|=2; // dma busy (in accurate mode)
+  Pico.video.status |= 2; // dma busy
 
   // from Charles MacDonald's genvdp.txt:
   // Write lower byte to address specified
   vr[a] = (unsigned char) data;
   a=(u16)(a+inc);
 
-  if(!inc) len=1;
+  if (!inc) len=1;
 
-  for(;len;len--) {
+  for (; len; len--) {
     // Write upper byte to adjacent address
     // (here we are byteswapped, so address is already 'adjacent')
     vr[a] = high;
@@ -327,7 +318,7 @@ static __inline void DrawSync(int blank_on)
 {
   if (Pico.m.scanline < 224 && !(PicoOpt & POPT_ALT_RENDERER) &&
       !PicoSkipFrame && DrawScanline <= Pico.m.scanline) {
-    elprintf(EL_ANOMALY, "sync");
+    //elprintf(EL_ANOMALY, "sync");
     PicoDrawSync(Pico.m.scanline, blank_on);
   }
 }
@@ -336,8 +327,8 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
 {
   struct PicoVideo *pvid=&Pico.video;
 
-  if (Pico.m.scanline < 224)
-    elprintf(EL_STATUS, "PicoVideoWrite [%06x] %04x", a, d);
+  //if (Pico.m.scanline < 224)
+  //  elprintf(EL_STATUS, "PicoVideoWrite [%06x] %04x", a, d);
   a&=0x1c;
 
   if (a==0x00) // Data port 0 or 2
@@ -362,7 +353,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
     else
     {
       // preliminary FIFO emulation for Chaos Engine, The (E)
-      if (!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1 && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display, accurate mode?
+      if (!(pvid->status&8) && (pvid->reg[1]&0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?
       {
         pvid->status&=~0x200; // FIFO no longer empty
         pvid->lwrite_cnt++;
@@ -439,7 +430,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
           else if (pints & 0x10) irq = 4;
           SekInterrupt(irq); // update line
 
-          if (irq && Pico.m.scanline!=-1) SekEndRun(24); // make it delayed
+          if (irq) SekEndRun(24); // make it delayed
         }
 #endif
       }
@@ -458,24 +449,19 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
 {
   a&=0x1c;
 
-  if (a==0x00) // data port
-  {
-    return VideoRead();
-  }
-
   if (a==0x04) // control port
   {
     struct PicoVideo *pv=&Pico.video;
     unsigned int d;
     d=pv->status;
-    if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)
-    if (!(pv->reg[1]&0x40))        d|=0x0008; // set V-Blank if display is disabled
+    //if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)
     if (SekCyclesLeft < 84+4)      d|=0x0004; // H-Blank (Sonic3 vs)
 
-    d|=(pv->pending_ints&0x20)<<2; // V-int pending?
+    d |= ((pv->reg[1]&0x40)^0x40) >> 3;  // set V-Blank if display is disabled
+    d |= (pv->pending_ints&0x20)<<2;     // V-int pending?
     if (d&0x100) pv->status&=~0x100; // FIFO no longer full
 
-    pv->pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)
+    pv->pending = 0; // ctrl port reads clear write-pending flag (Charles MacDonald)
 
     elprintf(EL_SR, "SR read: %04x @ %06x", d, SekPc);
     return d;
@@ -498,40 +484,60 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
   // check: Sonic 3D Blast bonus, Cannon Fodder, Chase HQ II, 3 Ninjas kick back, Road Rash 3, Skitchin', Wheel of Fortune
   if ((a&0x1c)==0x08)
   {
-    unsigned int hc, d;
-
-    if (Pico.m.scanline != -1)
-    {
-      int lineCycles=(488-SekCyclesLeft)&0x1ff;
-      d=Pico.m.scanline; // V-Counter
-
-      if(Pico.video.reg[12]&1)
-           hc=hcounts_40[lineCycles];
-      else hc=hcounts_32[lineCycles];
+    unsigned int d;
+    int lineCycles;
+    
+    lineCycles = (488-SekCyclesLeft)&0x1ff;
+    if (Pico.video.reg[12]&1)
+         d = hcounts_40[lineCycles];
+    else d = hcounts_32[lineCycles];
+
+    elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);
+    return d | (Pico.video.v_counter << 8);
+  }
 
-      //if(lineCycles > 488-12) d++; // Wheel of Fortune
-    } else {
-      // get approximate V-Counter
-      d=vcounts[SekCyclesDone()>>8];
-      hc = Pico.m.rotate&0xff;
-    }
+  if (a==0x00) // data port
+  {
+    return VideoRead();
+  }
 
-    if(Pico.m.pal) {
-      if (d >= 0x103) d-=56; // based on Gens
-    } else {
-      if (d >= 0xEB)  d-=6;
-    }
+  return 0;
+}
 
-    if((Pico.video.reg[12]&6) == 6) {
-      // interlace mode 2 (Combat Cars (UE) [!])
-      d <<= 1;
-      if (d&0xf00) d|= 1;
-    }
+unsigned int PicoVideoRead8(unsigned int a)
+{
+  unsigned int d;
+  a&=0x1d;
 
-    elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);
-    d&=0xff; d<<=8;
-    d|=hc;
-    return d;
+  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 (SekCyclesLeft < 84+4) 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 = (488-SekCyclesLeft)&0x1ff;
+      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;
   }
 
   return 0;