X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.c;h=20648f0c117d24a4188058107cadba6fcec68439;hb=a8fd6e376175c06e2423d0914359c761829d6e93;hp=c63360c647f89b0de2df34972843d182edd37515;hpb=f6c49d38cbb965c502ca2af66d76e92f95acda7c;p=picodrive.git

diff --git a/pico/pico.c b/pico/pico.c
index c63360c..20648f0 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"
@@ -192,10 +192,8 @@ int PicoReset(void)
   if (!(PicoOpt & POPT_DIS_IDLE_DET))
     SekInitIdleDet();
 
-  if (PicoOpt & POPT_EN_32X) {
+  if (PicoOpt & POPT_EN_32X)
     PicoReset32x();
-    return 0;
-  }
 
   // reset sram state; enable sram access by default if it doesn't overlap with ROM
   Pico.m.sram_reg = 0;
@@ -209,7 +207,7 @@ int PicoReset(void)
   return 0;
 }
 
-// flush cinfig changes before emu loop starts
+// flush config changes before emu loop starts
 void PicoLoopPrepare(void)
 {
   if (PicoRegionOverride)
@@ -219,8 +217,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;
 }
 
 
@@ -269,29 +267,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;