X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.c;h=bbc514fec91ae6891b66a711895149fbb4876c63;hb=75a30842c4f9e7e95a199361b9348c9f9dede0e6;hp=12677d7a20a0dd9dc3ade94d8a15adba8e101667;hpb=46bcb899714b81396c77b737da200b09b73f6c1a;p=picodrive.git

diff --git a/pico/pico.c b/pico/pico.c
index 12677d7..bbc514f 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -1,11 +1,11 @@
-// PicoDrive
-
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2008 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
+/*
+ * PicoDrive
+ * (c) Copyright Dave, 2004
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include "pico_int.h"
 #include "sound/ym2612.h"
@@ -16,6 +16,7 @@ int PicoSkipFrame;     // skip rendering frame?
 int PicoPad[2];        // Joypads, format is MXYZ SACB RLDU
 int PicoPadInt[2];     // internal copy
 int PicoAHW;           // active addon hardware: PAHW_*
+int PicoQuirks;        // game-specific quirks
 int PicoRegionOverride; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
 int PicoAutoRgnOrder;
 
@@ -54,6 +55,7 @@ void PicoExit(void)
 
   if (SRam.data)
     free(SRam.data);
+  pevt_dump();
 }
 
 void PicoPower(void)
@@ -69,6 +71,9 @@ void PicoPower(void)
   Pico.video.pending_ints=0;
   z80_reset();
 
+  // my MD1 VA6 console has this in IO
+  Pico.ioports[1] = Pico.ioports[2] = Pico.ioports[3] = 0xff;
+
   // default VDP register values (based on Fusion)
   Pico.video.reg[0] = Pico.video.reg[1] = 0x04;
   Pico.video.reg[0xc] = 0x81;
@@ -145,6 +150,10 @@ int PicoReset(void)
   if (Pico.romsize <= 0)
     return 1;
 
+#if defined(CPU_CMP_R) || defined(CPU_CMP_W) || defined(DRC_CMP)
+  PicoOpt |= POPT_DIS_VDP_FIFO|POPT_DIS_IDLE_DET;
+#endif
+
   /* must call now, so that banking is reset, and correct vectors get fetched */
   if (PicoResetHook)
     PicoResetHook();
@@ -160,7 +169,7 @@ int PicoReset(void)
   SekReset();
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
   SekSetRealTAS(PicoAHW & PAHW_MCD);
-  SekCycleCntT=0;
+  SekCycleCntT = SekCycleCnt = SekCycleAim = 0;
 
   if (PicoAHW & PAHW_MCD)
     // needed for MCD to reset properly, probably some bug hides behind this..
@@ -217,8 +226,8 @@ void PicoLoopPrepare(void)
   // FIXME: PAL has 313 scanlines..
   scanlines_total = Pico.m.pal ? 312 : 262;
 
-  if (PicoAHW & PAHW_32X)
-    p32x_timers_recalc();
+  Pico.m.dirtyPal = 1;
+  rendstatus_old = -1;
 }
 
 
@@ -267,29 +276,6 @@ PICO_INTERNAL int CheckDMA(void)
   return burn;
 }
 
-static __inline void SekRunM68k(int cyc)
-{
-  int cyc_do;
-  pprof_start(m68k);
-
-  SekCycleAim+=cyc;
-  if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
-#if defined(EMU_CORE_DEBUG)
-  // this means we do run-compare
-  SekCycleCnt+=CM_compareRun(cyc_do, 0);
-#elif defined(EMU_C68K)
-  PicoCpuCM68k.cycles=cyc_do;
-  CycloneRun(&PicoCpuCM68k);
-  SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles;
-#elif defined(EMU_M68K)
-  SekCycleCnt+=m68k_execute(cyc_do);
-#elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);
-#endif
-
-  pprof_end(m68k);
-}
-
 #include "pico_cmn.c"
 
 int z80stopCycle;