alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-11 09:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Rename timer -> fifo_timer

Browse source
This commit is contained in:
Gwilym Kuiper 2022-12-09 22:28:32 +00:00
parent b74c5e39c0
commit 390392a1d8
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
agb/src/sound/mixer/sw_mixer.rs
View file

@ -89,7 +89,7 @@ pub struct Mixer {
indices: [i32; 8], indices: [i32; 8],
frequency: Frequency, frequency: Frequency,
timer: Timer, fifo_timer: Timer,
} }
/// A pointer to a currently playing channel. /// A pointer to a currently playing channel.
@ -119,6 +119,9 @@ impl Mixer {
pub(super) fn new(frequency: Frequency) -> Self { pub(super) fn new(frequency: Frequency) -> Self {
let buffer = Box::pin(MixerBuffer::new(frequency)); let buffer = Box::pin(MixerBuffer::new(frequency));
// SAFETY: you can only ever have 1 Mixer at a time
let fifo_timer = unsafe { Timer::new(0) };
// SAFETY: you can only ever have 1 Mixer at a time // SAFETY: you can only ever have 1 Mixer at a time
let mut interrupt_timer = unsafe { Timer::new(1) }; let mut interrupt_timer = unsafe { Timer::new(1) };
interrupt_timer interrupt_timer
@ -146,7 +149,7 @@ impl Mixer {
interrupt_timer, interrupt_timer,
_interrupt_handler: interrupt_handler, _interrupt_handler: interrupt_handler,
timer: unsafe { Timer::new(0) }, fifo_timer,
} }
} }
@ -155,7 +158,10 @@ impl Mixer {
/// You must call this method in order to start playing sound. You can do as much set up before /// You must call this method in order to start playing sound. You can do as much set up before
/// this as you like, but you will not get any sound out of the console until this method is called. /// this as you like, but you will not get any sound out of the console until this method is called.
pub fn enable(&mut self) { pub fn enable(&mut self) {
hw::set_timer_counter_for_frequency_and_enable(&mut self.timer, self.frequency.frequency()); hw::set_timer_counter_for_frequency_and_enable(
&mut self.fifo_timer,
self.frequency.frequency(),
);
hw::set_sound_control_register_for_mixer(); hw::set_sound_control_register_for_mixer();
self.interrupt_timer.set_enabled(true); self.interrupt_timer.set_enabled(true);