Miroirs/crab
1
0
Fork 0
mirror of https://github.com/mattrberry/crab.git synced 2024-11-16 19:49:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix timer off-by-one (stop kirby audio clicking)

Browse source
This commit is contained in:
Matthew Berry 2021-02-08 00:07:46 -08:00
parent ed6d42b2e2
commit 6c575089b1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/crab/timer.cr
View file

@ -42,7 +42,7 @@ class Timer
@gba.apu.timer_overflow timer_number if timer_number <= 1 @gba.apu.timer_overflow timer_number if timer_number <= 1
@interrupt_events[timer_number].call @interrupt_events[timer_number].call
@gba.interrupts.schedule_interrupt_check if tmcnt.irq_enable @gba.interrupts.schedule_interrupt_check if tmcnt.irq_enable
cycles_until_overflow = freq_to_cycles(tmcnt.frequency) * (0xFFFF - @tm[timer_number]) cycles_until_overflow = freq_to_cycles(tmcnt.frequency) * (0x10000 - @tm[timer_number])
log " scheduling overflow for timer #{timer_number} in #{cycles_until_overflow} cycles" unless tmcnt.cascade log " scheduling overflow for timer #{timer_number} in #{cycles_until_overflow} cycles" unless tmcnt.cascade
@gba.scheduler.schedule cycles_until_overflow, @events[timer_number], @event_types[timer_number] unless tmcnt.cascade @gba.scheduler.schedule cycles_until_overflow, @events[timer_number], @event_types[timer_number] unless tmcnt.cascade
} }
@ -81,8 +81,8 @@ class Timer
log " TMCNT: #{tmcnt.to_s}" log " TMCNT: #{tmcnt.to_s}"
@cycle_enabled[timer_number] = @gba.scheduler.cycles @cycle_enabled[timer_number] = @gba.scheduler.cycles
@tm[timer_number] = @tmd[timer_number] @tm[timer_number] = @tmd[timer_number]
log " freq_to_cycles(#{tmcnt.frequency}) -> #{hex_str freq_to_cycles(tmcnt.frequency)}, @tm[#{timer_number}] -> #{hex_str @tm[timer_number]}, 0xFFFF - @tm[#{timer_number}] -> #{0xFFFF - @tm[timer_number]}" log " freq_to_cycles(#{tmcnt.frequency}) -> #{hex_str freq_to_cycles(tmcnt.frequency)}, @tm[#{timer_number}] -> #{hex_str @tm[timer_number]}, 0x10000 - @tm[#{timer_number}] -> #{0x10000 - @tm[timer_number]}"
cycles_until_overflow = freq_to_cycles(tmcnt.frequency) * (0xFFFF - @tm[timer_number]) cycles_until_overflow = freq_to_cycles(tmcnt.frequency) * (0x10000 - @tm[timer_number])
log " Scheduling overflow for timer #{timer_number} in #{cycles_until_overflow} cycles" log " Scheduling overflow for timer #{timer_number} in #{cycles_until_overflow} cycles"
@gba.scheduler.schedule cycles_until_overflow, @events[timer_number], @event_types[timer_number] unless tmcnt.cascade @gba.scheduler.schedule cycles_until_overflow, @events[timer_number], @event_types[timer_number] unless tmcnt.cascade
elsif !tmcnt.enable && enabled # disabled elsif !tmcnt.enable && enabled # disabled