-// PicoDrive\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006-2008, Grazvydas "notaz" Ignotas\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
+/*\r
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2009\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
\r
#include "pico_int.h"\r
-#include "cd/gfx_cd.h"\r
\r
+int line_base_cycles;\r
extern const unsigned char hcounts_32[];\r
extern const unsigned char hcounts_40[];\r
\r
SekCyclesDone(), SekPc);\r
\r
Pico.m.dma_xfers += len;\r
- if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA());\r
- else SekEndTimeslice(SekCyclesLeftNoMCD - CheckDMA());\r
+ SekCyclesBurnRun(CheckDMA());\r
\r
if ((source&0xe00000)==0xe00000) { // Ram\r
pd=(u16 *)(Pico.ram+(source&0xfffe));\r
break;\r
\r
default:\r
- elprintf(EL_VDPDMA|EL_ANOMALY, "DMA with bad type %i", Pico.video.type);\r
+ if (Pico.video.type != 0 || (EL_LOGMASK & EL_VDPDMA))\r
+ elprintf(EL_VDPDMA|EL_ANOMALY, "DMA with bad type %i", Pico.video.type);\r
break;\r
}\r
// remember addr\r
if (cmd&0x80) CommandDma();\r
}\r
\r
-static __inline void DrawSync(int blank_on)\r
+static void DrawSync(int blank_on)\r
{\r
if (Pico.m.scanline < 224 && !(PicoOpt & POPT_ALT_RENDERER) &&\r
!PicoSkipFrame && DrawScanline <= Pico.m.scanline) {\r
pvid->lwrite_cnt++;\r
if (pvid->lwrite_cnt >= 4) pvid->status|=0x100; // FIFO full\r
if (pvid->lwrite_cnt > 4) {\r
- SekCyclesBurn(32); // penalty // 488/12-8\r
- if (SekCycleCnt>=SekCycleAim) SekEndRun(0);\r
+ SekCyclesBurnRun(32); // penalty // 488/12-8\r
}\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
return;\r
}\r
\r
- if (num == 1 && !(d&0x40) && SekCyclesLeft > 390) blank_on = 1;\r
+ if (num == 1 && !(d&0x40) && SekCyclesDone() - line_base_cycles <= 488-390)\r
+ blank_on = 1;\r
DrawSync(blank_on);\r
pvid->reg[num]=(unsigned char)d;\r
switch (num)\r
update_irq:\r
#ifndef EMU_CORE_DEBUG\r
// update IRQ level\r
- if (!SekShouldInterrupt) // hack\r
+ if (!SekShouldInterrupt()) // hack\r
{\r
int lines, pints, irq=0;\r
lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10);\r
unsigned int d;\r
d=pv->status;\r
//if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)\r
- if (SekCyclesLeft < 84+4) d|=0x0004; // H-Blank (Sonic3 vs)\r
+ if (SekCyclesDone() - line_base_cycles >= 488-88)\r
+ d|=0x0004; // H-Blank (Sonic3 vs)\r
\r
d |= ((pv->reg[1]&0x40)^0x40) >> 3; // set V-Blank if display is disabled\r
d |= (pv->pending_ints&0x20)<<2; // V-int pending?\r
if ((a&0x1c)==0x08)\r
{\r
unsigned int d;\r
- int lineCycles;\r
\r
- lineCycles = (488-SekCyclesLeft)&0x1ff;\r
+ d = (SekCyclesDone() - line_base_cycles) & 0x1ff; // FIXME\r
if (Pico.video.reg[12]&1)\r
- d = hcounts_40[lineCycles];\r
- else d = hcounts_32[lineCycles];\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
return d | (Pico.video.v_counter << 8);\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 (SekCyclesLeft < 84+4) d |= 4; // H-Blank\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
elprintf(EL_HVCNT, "vcounter: %02x (%i) @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);\r
return Pico.video.v_counter;\r
case 9:\r
- d = (488-SekCyclesLeft)&0x1ff;\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
\r
return 0;\r
}\r
+\r
+// vim:shiftwidth=2:ts=2:expandtab\r