unsigned char *vr = (unsigned char *) Pico.vram;\r
unsigned char inc=Pico.video.reg[0xf];\r
int source;\r
- elprintf(EL_VDPDMA, "DmaCopy len %i [%i]", len, SekCyclesDone());\r
+ elprintf(EL_VDPDMA, "DmaCopy len %i [%u]", len, SekCyclesDone());\r
\r
Pico.m.dma_xfers += len;\r
if (Pico.m.dma_xfers < len)\r
int len, l;\r
\r
len = GetDmaLength();\r
- elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%i]", len, inc, SekCyclesDone());\r
+ elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%u]", len, inc, SekCyclesDone());\r
\r
Pico.m.dma_xfers += len;\r
if (Pico.m.dma_xfers < len) // lame 16bit var\r
// elprintf(EL_STATUS, "PicoVideoWrite [%06x] %04x", a, d);\r
a&=0x1c;\r
\r
- if (a==0x00) // Data port 0 or 2\r
+ switch (a)\r
{\r
+ case 0x00: // Data port 0 or 2\r
// try avoiding the sync..\r
if (Pico.m.scanline < 224 && (pvid->reg[1]&0x40) &&\r
!(!pvid->pending &&\r
}\r
\r
// preliminary FIFO emulation for Chaos Engine, The (E)\r
- if (!(pvid->status&8) && (pvid->reg[1]&0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?\r
+ if (!(pvid->status & SR_VB) && (pvid->reg[1] & 0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?\r
{\r
- pvid->status&=~0x200; // FIFO no longer empty\r
- pvid->lwrite_cnt++;\r
- if (pvid->lwrite_cnt >= 4) pvid->status|=0x100; // FIFO full\r
- if (pvid->lwrite_cnt > 4) {\r
- SekCyclesBurnRun(32); // penalty // 488/12-8\r
- }\r
+ int use = pvid->type == 1 ? 2 : 1;\r
+ pvid->lwrite_cnt -= use;\r
+ if (pvid->lwrite_cnt < 0)\r
+ SekCyclesLeft = 0;\r
elprintf(EL_ASVDP, "VDP data write: %04x [%06x] {%i} #%i @ %06x", d, Pico.video.addr,\r
Pico.video.type, pvid->lwrite_cnt, SekPc);\r
}\r
if ((pvid->command&0x80) && (pvid->reg[1]&0x10) && (pvid->reg[0x17]>>6)==2)\r
DmaFill(d);\r
\r
- return;\r
- }\r
+ break;\r
\r
- if (a==0x04) // Control (command) port 4 or 6\r
- {\r
+ case 0x04: // Control (command) port 4 or 6\r
if (pvid->pending)\r
{\r
// Low word of command:\r
switch (num)\r
{\r
case 0x00:\r
- elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x10)>>4,\r
+ elprintf(EL_INTSW, "hint_onoff: %i->%i [%u] pend=%i @ %06x", (dold&0x10)>>4,\r
(d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);\r
goto update_irq;\r
case 0x01:\r
- elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x20)>>5,\r
+ elprintf(EL_INTSW, "vint_onoff: %i->%i [%u] pend=%i @ %06x", (dold&0x20)>>5,\r
(d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);\r
goto update_irq;\r
case 0x05:\r
pvid->pending=1;\r
}\r
}\r
+ break;\r
+\r
+ // case 0x08: // 08 0a - HV counter - lock up\r
+ // case 0x0c: // 0c 0e - HV counter - lock up\r
+ // case 0x10: // 10 12 - PSG - handled by caller\r
+ // case 0x14: // 14 16 - PSG - handled by caller\r
+ // case 0x18: // 18 1a - no effect?\r
+ case 0x1c: // 1c 1e - debug\r
+ pvid->debug = d;\r
+ pvid->debug_p = 0;\r
+ if (d & (1 << 6)) {\r
+ pvid->debug_p |= PVD_KILL_A | PVD_KILL_B;\r
+ pvid->debug_p |= PVD_KILL_S_LO | PVD_KILL_S_HI;\r
+ }\r
+ switch ((d >> 7) & 3) {\r
+ case 1:\r
+ pvid->debug_p &= ~(PVD_KILL_S_LO | PVD_KILL_S_HI);\r
+ pvid->debug_p |= PVD_FORCE_S;\r
+ break;\r
+ case 2:\r
+ pvid->debug_p &= ~PVD_KILL_A;\r
+ pvid->debug_p |= PVD_FORCE_A;\r
+ break;\r
+ case 3:\r
+ pvid->debug_p &= ~PVD_KILL_B;\r
+ pvid->debug_p |= PVD_FORCE_B;\r
+ break;\r
+ }\r
+ break;\r
}\r
}\r
\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
+ elprintf(EL_HVCNT, "hv: %02x %02x [%u] @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);\r
return d | (Pico.video.v_counter << 8);\r
}\r
\r
return 0;\r
}\r
\r
-unsigned int PicoVideoRead8(unsigned int a)\r
+unsigned char PicoVideoRead8DataH(void)\r
{\r
- unsigned int d;\r
- a&=0x1d;\r
+ return VideoRead() >> 8;\r
+}\r
\r
- switch (a)\r
- {\r
- case 0: return VideoRead() >> 8;\r
- case 1: return VideoRead() & 0xff;\r
- case 4: // control port/status reg\r
- d = Pico.video.status >> 8;\r
- if (d&1) Pico.video.status&=~0x100; // FIFO no longer full\r
- Pico.video.pending = 0;\r
- elprintf(EL_SR, "SR read (h): %02x @ %06x", d, SekPc);\r
- return d;\r
- case 5:\r
- d = Pico.video.status & 0xff;\r
- //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 (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
- case 8: // hv counter\r
- elprintf(EL_HVCNT, "vcounter: %02x (%i) @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);\r
- return Pico.video.v_counter;\r
- case 9:\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
- elprintf(EL_HVCNT, "hcounter: %02x (%i) @ %06x", d, SekCyclesDone(), SekPc);\r
- return d;\r
- }\r
+unsigned char PicoVideoRead8DataL(void)\r
+{\r
+ return VideoRead();\r
+}\r
\r
- return 0;\r
+// FIXME: broken mess\r
+unsigned char PicoVideoRead8CtlH(void)\r
+{\r
+ u8 d = (u8)(Pico.video.status >> 8);\r
+ if (d & 1)\r
+ Pico.video.status &= ~0x100; // FIFO no longer full\r
+ Pico.video.pending = 0;\r
+ elprintf(EL_SR, "SR read (h): %02x @ %06x", d, SekPc);\r
+ return d;\r
+}\r
+\r
+unsigned char PicoVideoRead8CtlL(void)\r
+{\r
+ u8 d = (u8)Pico.video.status;\r
+ //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 (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
+}\r
+\r
+unsigned char PicoVideoRead8HV_H(void)\r
+{\r
+ elprintf(EL_HVCNT, "vcounter: %02x [%u] @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);\r
+ return Pico.video.v_counter;\r
+}\r
+\r
+// FIXME: broken\r
+unsigned char PicoVideoRead8HV_L(void)\r
+{\r
+ u32 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
+ elprintf(EL_HVCNT, "hcounter: %02x [%u] @ %06x", d, SekCyclesDone(), SekPc);\r
+ return d;\r
}\r
\r
// vim:shiftwidth=2:ts=2:expandtab\r