Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

fix aram busy flag being set by audio DMA, unblocks metroid prime

Layle686a3237e054
diff --git a/crates/gecko/src/flipper/ai.rs b/crates/gecko/src/flipper/ai.rs
index 4292ef2..f306e34 100644
--- a/crates/gecko/src/flipper/ai.rs
+++ b/crates/gecko/src/flipper/ai.rs
@@ -76,7 +76,6 @@ pub fn start_audio_dma<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {
sys.scheduler.cancel(crate::scheduler::Handler::AiAudioDmaBlock);
sys.ai.audio_dma_remaining_blocks = blocks;
sys.ai.audio_dma_current_addr = sys.dsp.audio_dma_start_addr.raw();
- sys.dsp.csr.set_dma_status(true);
let addr = sys.dsp.audio_dma_start_addr.raw();
let len = blocks as u32 * AUDIO_DMA_BLOCK_BYTES;
@@ -93,7 +92,6 @@ pub fn start_audio_dma<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {
pub fn stop_audio_dma<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {
sys.scheduler.cancel(crate::scheduler::Handler::AiAudioDmaBlock);
sys.ai.audio_dma_remaining_blocks = 0;
- sys.dsp.csr.set_dma_status(false);
}
#[inline(always)]
@@ -143,7 +141,6 @@ pub fn audio_dma_block_handler<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>)
}
if sys.dsp.audio_dma_control.play() {
- sys.dsp.csr.set_dma_status(true);
sys.scheduler.schedule_in(
cycles_per_audio_dma_block(sys),
crate::scheduler::Handler::AiAudioDmaBlock,