notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove some dead code
[picodrive.git]
/
pico
/
pico.c
diff --git
a/pico/pico.c
b/pico/pico.c
index
4557269
..
8535d48
100644
(file)
--- a/
pico/pico.c
+++ b/
pico/pico.c
@@
-61,6
+61,7
@@
void PicoExit(void)
void PicoPower(void)
\r
{
\r
Pico.m.frame_count = 0;
\r
void PicoPower(void)
\r
{
\r
Pico.m.frame_count = 0;
\r
+ SekCycleCnt = SekCycleAim = 0;
\r
\r
// clear all memory of the emulated machine
\r
memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);
\r
\r
// clear all memory of the emulated machine
\r
memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);
\r
@@
-167,15
+168,15
@@
int PicoReset(void)
}
\r
\r
SekReset();
\r
}
\r
\r
SekReset();
\r
+ // ..but do not reset SekCycle* to not desync with addons
\r
+
\r
// s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
\r
SekSetRealTAS(PicoAHW & PAHW_MCD);
\r
// s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
\r
SekSetRealTAS(PicoAHW & PAHW_MCD);
\r
- SekCycleCnt = SekCycleAim = 0;
\r
\r
Pico.m.dirtyPal = 1;
\r
\r
Pico.m.z80_bank68k = 0;
\r
Pico.m.z80_reset = 1;
\r
\r
Pico.m.dirtyPal = 1;
\r
\r
Pico.m.z80_bank68k = 0;
\r
Pico.m.z80_reset = 1;
\r
- memset(Pico.zram, 0, sizeof(Pico.zram)); // ??
\r
\r
PicoDetectRegion();
\r
Pico.video.status = 0x3428 | Pico.m.pal; // 'always set' bits | vblank | collision | pal
\r
\r
PicoDetectRegion();
\r
Pico.video.status = 0x3428 | Pico.m.pal; // 'always set' bits | vblank | collision | pal
\r
@@
-284,8
+285,11
@@
int z80_scanline_cycles; /* cycles done until z80_scanline */
/* sync z80 to 68k */
\r
PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done)
\r
{
\r
/* sync z80 to 68k */
\r
PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done)
\r
{
\r
+ int m68k_cnt;
\r
int cnt;
\r
int cnt;
\r
- z80_cycle_aim += cycles_68k_to_z80(m68k_cycles_done - last_z80_sync);
\r
+
\r
+ m68k_cnt = m68k_cycles_done - last_z80_sync;
\r
+ z80_cycle_aim += cycles_68k_to_z80(m68k_cnt);
\r
cnt = z80_cycle_aim - z80_cycle_cnt;
\r
last_z80_sync = m68k_cycles_done;
\r
\r
cnt = z80_cycle_aim - z80_cycle_cnt;
\r
last_z80_sync = m68k_cycles_done;
\r
\r