cd sync improvements, part2

[picodrive.git] / pico / videoport.c

diff --git a/pico/videoport.c b/pico/videoport.c
index 3d74f51..42f55c8 100644 (file)
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -1,11 +1,11 @@
-// 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
@@ -93,8 +93,7 @@ static void DmaSlow(int len)
     SekCyclesDone(), SekPc);\r
 \r
   Pico.m.dma_xfers += len;\r
-  if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA());\r
-  else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());\r
+  SekCyclesBurnRun(CheckDMA());\r
 \r
   if ((source&0xe00000)==0xe00000) { // Ram\r
     pd=(u16 *)(Pico.ram+(source&0xfffe));\r
@@ -208,7 +207,8 @@ static void DmaSlow(int len)
       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
@@ -316,7 +316,7 @@ static void CommandChange(void)
   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
@@ -361,8 +361,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
         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
@@ -424,7 +423,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
 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
@@ -545,3 +544,5 @@ unsigned int PicoVideoRead8(unsigned int a)
 \r
   return 0;\r
 }\r
+\r
+// vim:shiftwidth=2:ts=2:expandtab\r