From 48dc74f20a90629b55c1ab676639c05a125ea383 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 2 Jul 2008 11:40:19 +0000 Subject: [PATCH] timer adjustments based on Nem's new info git-svn-id: file:///home/notaz/opt/svn/PicoDrive@513 be3aeb3a-fb24-0410-a615-afba39da0efa --- Pico/Memory.c | 23 ++++++++++------------- Pico/PicoInt.h | 8 ++++---- Pico/sound/sound.c | 4 ++-- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Pico/Memory.c b/Pico/Memory.c index 290dba4..004d3af 100644 --- a/Pico/Memory.c +++ b/Pico/Memory.c @@ -700,7 +700,7 @@ static int get_scanline(int is_from_z80) return Pico.m.scanline; } -/* probably not should be in this file, but it's near related code here */ +/* probably should not be in this file, but it's near related code here */ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new) { int xcycles = z80_cycles << 8; @@ -719,12 +719,10 @@ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new) if ((mode_old ^ mode_new) & 1) // turning on/off { - if (mode_old & 1) { - timer_a_offset = timer_a_next_oflow - xcycles; + if (mode_old & 1) timer_a_next_oflow = TIMER_NO_OFLOW; - } else - timer_a_next_oflow = xcycles + timer_a_offset; + timer_a_next_oflow = xcycles + timer_a_step; } if (mode_new & 1) elprintf(EL_YMTIMER, "timer a upd to %i @ %i", timer_a_next_oflow>>8, z80_cycles); @@ -736,12 +734,10 @@ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new) if ((mode_old ^ mode_new) & 2) { - if (mode_old & 2) { - timer_b_offset = timer_b_next_oflow - xcycles; + if (mode_old & 2) timer_b_next_oflow = TIMER_NO_OFLOW; - } else - timer_b_next_oflow = xcycles + timer_b_offset; + timer_b_next_oflow = xcycles + timer_b_step; } if (mode_new & 2) elprintf(EL_YMTIMER, "timer b upd to %i @ %i", timer_b_next_oflow>>8, z80_cycles); @@ -792,8 +788,9 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80) ym2612.OPN.ST.TA = TAnew; //ym2612.OPN.ST.TAC = (1024-TAnew)*18; //ym2612.OPN.ST.TAT = 0; - timer_a_step = timer_a_offset = TIMER_A_TICK_ZCYCLES * (1024 - TAnew); + timer_a_step = TIMER_A_TICK_ZCYCLES * (1024 - TAnew); if (ym2612.OPN.ST.mode & 1) { + // this is not right, should really be done on overflow only int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone()); timer_a_next_oflow = (cycles << 8) + timer_a_step; } @@ -807,7 +804,7 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80) ym2612.OPN.ST.TB = d; //ym2612.OPN.ST.TBC = (256-d) * 288; //ym2612.OPN.ST.TBT = 0; - timer_b_step = timer_b_offset = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800 + timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800 if (ym2612.OPN.ST.mode & 2) { int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone()); timer_b_next_oflow = (cycles << 8) + timer_b_step; @@ -966,11 +963,11 @@ void ym2612_unpack_state(void) tac = (1024 - ym2612.OPN.ST.TA) << 16; tbc = (256 - ym2612.OPN.ST.TB) << 16; if (ym2612.OPN.ST.mode & 1) - timer_a_next_oflow = (double)(tac - tat) / (double)tac * timer_a_step; + timer_a_next_oflow = (int)((double)(tac - tat) / (double)tac * timer_a_step); else timer_a_next_oflow = TIMER_NO_OFLOW; if (ym2612.OPN.ST.mode & 2) - timer_b_next_oflow = (double)(tbc - tbt) / (double)tbc * timer_b_step; + timer_b_next_oflow = (int)((double)(tbc - tbt) / (double)tbc * timer_b_step); else timer_b_next_oflow = TIMER_NO_OFLOW; elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, timer_a_next_oflow >> 8); diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h index 4994ffc..c9aa1aa 100644 --- a/Pico/PicoInt.h +++ b/Pico/PicoInt.h @@ -476,8 +476,8 @@ PICO_INTERNAL void cdda_start_play(); extern short cdda_out_buffer[2*1152]; extern int PsndLen_exc_cnt; extern int PsndLen_exc_add; -extern int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles -extern int timer_b_next_oflow, timer_b_step, timer_b_offset; +extern int timer_a_next_oflow, timer_a_step; // in z80 cycles +extern int timer_b_next_oflow, timer_b_step; void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new); void ym2612_pack_state(void); @@ -498,8 +498,8 @@ void ym2612_unpack_state(void); #define timers_reset() \ timer_a_next_oflow = timer_b_next_oflow = TIMER_NO_OFLOW; \ - timer_a_step = timer_a_offset = TIMER_A_TICK_ZCYCLES * 1024; \ - timer_b_step = timer_b_offset = TIMER_B_TICK_ZCYCLES * 256; + timer_a_step = TIMER_A_TICK_ZCYCLES * 1024; \ + timer_b_step = TIMER_B_TICK_ZCYCLES * 256; // VideoPort.c diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c index e296742..cfa21a4 100644 --- a/Pico/sound/sound.c +++ b/Pico/sound/sound.c @@ -35,8 +35,8 @@ int PsndDacLine=0; short *PsndOut=NULL; // PCM data buffer // timers -int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles -int timer_b_next_oflow, timer_b_step, timer_b_offset; +int timer_a_next_oflow, timer_a_step; // in z80 cycles +int timer_b_next_oflow, timer_b_step; // sn76496 extern int *sn76496_regs; -- 2.39.2