X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.c;h=80ffb90efd04c7535659ac2e6d8274b787df17fc;hb=f81107f59093904c3daac2e9c257261fddc6caf0;hp=22f45a33e5facd387202cb90255b603c1dbd2377;hpb=1f1ff763e661bab664151c4821c65dad35777976;p=picodrive.git diff --git a/pico/pico.c b/pico/pico.c index 22f45a3..80ffb90 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" @@ -54,6 +54,7 @@ void PicoExit(void) if (SRam.data) free(SRam.data); + pevt_dump(); } void PicoPower(void) @@ -145,6 +146,10 @@ int PicoReset(void) if (Pico.romsize <= 0) return 1; +#ifdef 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(); @@ -207,7 +212,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) @@ -217,8 +222,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 +272,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;