X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=537e917a837e334fcedf317e4c9127950fbee4e2;hb=c459aefdad169c97b6fb93a20c1219a76aa07505;hp=024cf6f4e3dc76d82866c51ea7d0d2ae07425a6b;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c index 024cf6f..537e917 100644 --- a/Pico/VideoPort.c +++ b/Pico/VideoPort.c @@ -53,29 +53,11 @@ static unsigned int VideoRead() case 8: d=Pico.cram [a&0x003f]; break; case 4: d=Pico.vsram[a&0x003f]; break; } - + AutoIncrement(); return d; } -// calculate the number of cycles 68k->VDP dma operation would take -static int DmaSlowBurn(int len) -{ - // test: Legend of Galahad, Time Killers - int burn,maxlen,line=Pico.m.scanline; - - if(line == -1) line=vcounts[SekCyclesDone()>>8]; - maxlen=(224-line)*18; - if(len <= maxlen) - burn = len*(((488<<8)/18))>>8; - else { - burn = maxlen*(((488<<8)/18))>>8; - burn += (len-maxlen)*(((488<<8)/180))>>8; - } - - return burn; -} - static int GetDmaLength() { struct PicoVideo *pvid=&Pico.video; @@ -93,28 +75,32 @@ static void DmaSlow(int len) u16 *pd=0, *pdend, *r; unsigned int a=Pico.video.addr, a2, d; unsigned char inc=Pico.video.reg[0xf]; - unsigned int source, burn; + unsigned int source; source =Pico.video.reg[0x15]<<1; source|=Pico.video.reg[0x16]<<9; source|=Pico.video.reg[0x17]<<17; - //dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc, - // (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone()); + dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i] @ %x", + Pico.video.type, source, a, len, inc, (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), + Pico.m.scanline, SekCyclesDone(), SekPc); + + if(Pico.m.scanline != -1) { + Pico.m.dma_bytes += len; + SekSetCyclesLeft(SekCyclesLeft - CheckDMA()); + } else { + // be approximate in non-accurate mode + SekSetCyclesLeft(SekCyclesLeft - (len*(((488<<8)/167))>>8)); + } if ((source&0xe00000)==0xe00000) { pd=(u16 *)(Pico.ram+(source&0xfffe)); pdend=(u16 *)(Pico.ram+0x10000); } // Ram - else if(source>8); // very approximate - if(!(Pico.video.status&8)) burn+=burn>>1; // a hack for Legend of Galahad - } else burn = DmaSlowBurn(len); - SekCyclesBurn(burn); - if(!(Pico.video.status&8)) - SekEndRun(0); - //dprintf("DmaSlow burn: %i @ %06x", burn, SekPc); + else if(PicoMCD & 1) { + if(source<0x20000) { pd=(u16 *)(Pico_mcd->bios+(source&~1)); pdend=(u16 *)(Pico_mcd->bios+0x20000); } // Bios area + else { dprintf("unsupported src"); return; } // Invalid source address + } else { + if(source%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc, - // (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone()); Pico.m.dirtyPal = 1; r = Pico.cram; for(a2=a&0x7f; len; len--) @@ -177,7 +161,11 @@ static void DmaCopy(int len) unsigned char *vrs; unsigned char inc=Pico.video.reg[0xf]; int source; - //dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone()); + dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone()); + + Pico.m.dma_bytes += len; + if(Pico.m.scanline != -1) + Pico.video.status|=2; // dma busy source =Pico.video.reg[0x15]; source|=Pico.video.reg[0x16]<<8; @@ -205,9 +193,13 @@ static void DmaFill(int data) unsigned char *vr=(unsigned char *) Pico.vram; unsigned char high = (unsigned char) (data >> 8); unsigned char inc=Pico.video.reg[0xf]; - + len=GetDmaLength(); - //dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone()); + dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone()); + + Pico.m.dma_bytes += len; + if(Pico.m.scanline != -1) + Pico.video.status|=2; // dma busy (in accurate mode) // from Charles MacDonald's genvdp.txt: // Write lower byte to address specified @@ -273,7 +265,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d) a&=0x1c; if (a==0x00) // Data port 0 or 2 - { + { if (pvid->pending) CommandChange(); pvid->pending=0; @@ -304,8 +296,8 @@ void PicoVideoWrite(unsigned int a,unsigned short d) { // Register write: int num=(d>>8)&0x1f; - //if(num==00) dprintf("hint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4, (d&0x10)>>4, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc); - //if(num==01) dprintf("vint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5, (d&0x20)>>5, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc); + if(num==00) dprintf("hint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4, (d&0x10)>>4, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc); + if(num==01) dprintf("vint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5, (d&0x20)>>5, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc); //if(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone()); //if(num==05) dprintf("spr_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone()); //if(num==10) dprintf("hint_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone()); @@ -351,7 +343,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d) unsigned int PicoVideoRead(unsigned int a) { unsigned int d=0; - + a&=0x1c; if (a==0x00) // data port @@ -362,12 +354,12 @@ unsigned int PicoVideoRead(unsigned int a) if (a==0x04) // control port { - //dprintf("sr_read @ %06x [%i|%i]", SekPc, Pico.m.scanline, SekCyclesDone()); d=Pico.video.status; if(PicoOpt&0x10) d|=0x0020; // sprite collision (Shadow of the Beast) if(Pico.m.rotate++&8) d|=0x0100; else d|=0x0200; // Toggle fifo full empty (who uses that stuff?) if(!(Pico.video.reg[1]&0x40)) d|=0x0008; // set V-Blank if display is disabled if(SekCyclesLeft < 84+4) d|=0x0004; // H-Blank (Sonic3 vs) + // dprintf("sr_read %04x @ %06x [%i|%i]", d, SekPc, Pico.m.scanline, SekCyclesDone()); Pico.video.pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald) @@ -387,7 +379,7 @@ unsigned int PicoVideoRead(unsigned int a) // |---------------------|--------------------------| // E4 (hc[0x43]==0) 07 B1 // 40 // E8 (hc[0x45]==0) 05 91 // 32 - + // 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) { @@ -401,7 +393,7 @@ unsigned int PicoVideoRead(unsigned int a) hc=hcounts_40[lineCycles]; else hc=hcounts_32[lineCycles]; - if(lineCycles > 488-12) d++; // Wheel of Fortune + //if(lineCycles > 488-12) d++; // Wheel of Fortune } else { // get approximate V-Counter d=vcounts[SekCyclesDone()>>8]; @@ -420,7 +412,7 @@ unsigned int PicoVideoRead(unsigned int a) if (d&0xf00) d|= 1; } - //dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc); + dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc); d&=0xff; d<<=8; d|=hc; goto end;