X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=pico%2Fvideoport.c;h=42f55c8200e4aeb428956873134f656a9a84b986;hb=92dfd9afa6e06a071c2e025ff7e0d4f1824a5e8d;hp=c1a1ba908bff0bc09a9d53b04617fba22d90f3c8;hpb=697746df021a83dcb556afdb36abc6977780985c;p=picodrive.git

diff --git a/pico/videoport.c b/pico/videoport.c
index c1a1ba9..42f55c8 100644
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -1,11 +1,11 @@
-// PicoDrive
-
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2008, Grazvydas "notaz" Ignotas
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
+/*
+ * PicoDrive
+ * (c) Copyright Dave, 2004
+ * (C) notaz, 2006-2009
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include "pico_int.h"
 #include "cd/gfx_cd.h"
@@ -93,8 +93,7 @@ static void DmaSlow(int len)
     SekCyclesDone(), SekPc);
 
   Pico.m.dma_xfers += len;
-  if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA());
-  else SekEndTimeslice(SekCyclesLeftNoMCD - CheckDMA());
+  SekCyclesBurnRun(CheckDMA());
 
   if ((source&0xe00000)==0xe00000) { // Ram
     pd=(u16 *)(Pico.ram+(source&0xfffe));
@@ -208,7 +207,8 @@ static void DmaSlow(int len)
       break;
 
     default:
-      elprintf(EL_VDPDMA|EL_ANOMALY, "DMA with bad type %i", Pico.video.type);
+      if (Pico.video.type != 0 || (EL_LOGMASK & EL_VDPDMA))
+        elprintf(EL_VDPDMA|EL_ANOMALY, "DMA with bad type %i", Pico.video.type);
       break;
   }
   // remember addr
@@ -361,8 +361,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
         pvid->lwrite_cnt++;
         if (pvid->lwrite_cnt >= 4) pvid->status|=0x100; // FIFO full
         if (pvid->lwrite_cnt >  4) {
-          SekCyclesBurn(32); // penalty // 488/12-8
-          if (SekCycleCnt>=SekCycleAim) SekEndRun(0);
+          SekCyclesBurnRun(32); // penalty // 488/12-8
         }
         elprintf(EL_ASVDP, "VDP data write: %04x [%06x] {%i} #%i @ %06x", d, Pico.video.addr,
                  Pico.video.type, pvid->lwrite_cnt, SekPc);
@@ -424,7 +423,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
 update_irq:
 #ifndef EMU_CORE_DEBUG
         // update IRQ level
-        if (!SekShouldInterrupt) // hack
+        if (!SekShouldInterrupt()) // hack
         {
           int lines, pints, irq=0;
           lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10);
@@ -545,3 +544,5 @@ unsigned int PicoVideoRead8(unsigned int a)
 
   return 0;
 }
+
+// vim:shiftwidth=2:ts=2:expandtab