Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

ignore macronix EXI on wii

Layled819ada142bc
diff --git a/crates/gecko/src/flipper/exi.rs b/crates/gecko/src/flipper/exi.rs
index dd94a90..c4e29dc 100644
--- a/crates/gecko/src/flipper/exi.rs
+++ b/crates/gecko/src/flipper/exi.rs
@@ -103,7 +103,7 @@ impl ExternalInterface {
}
#[inline(always)]
- pub fn start_immediate_transfer<const CHANNEL: usize>(&mut self) {
+ pub fn start_immediate_transfer<const CHANNEL: usize, const SYSTEM: SystemId>(&mut self) {
let (transfer_type, transfer_length, chip_select, mut bytes) = match CHANNEL {
0 => (
self.ch0_cr.transfer_type(),
@@ -142,7 +142,7 @@ impl ExternalInterface {
let size = (transfer_length as usize) + 1;
if let Some(device) = &mut self.devices[CHANNEL][slot] {
- if device.is_stub() {
+ if device.is_stub() && SYSTEM == crate::system::GC {
tracing::warn!(
channel = CHANNEL,
slot,
@@ -159,13 +159,15 @@ impl ExternalInterface {
device.transfer_byte(&mut bytes[i]);
}
} else {
- tracing::warn!(
- channel = CHANNEL,
- slot,
- ?transfer_type,
- size,
- "EXI immediate transfer to empty slot"
- );
+ if SYSTEM == crate::system::GC {
+ tracing::warn!(
+ channel = CHANNEL,
+ slot,
+ ?transfer_type,
+ size,
+ "EXI immediate transfer to empty slot"
+ );
+ }
bytes[..size].fill(0);
}
@@ -330,7 +332,7 @@ pub fn run_dma<const CHANNEL: usize, const SYSTEM: SystemId>(sys: &mut System<SY
match transfer_type {
TransferType::Read => {
- if stub {
+ if stub && SYSTEM == crate::system::GC {
tracing::warn!(
channel = CHANNEL,
slot,
@@ -344,7 +346,7 @@ pub fn run_dma<const CHANNEL: usize, const SYSTEM: SystemId>(sys: &mut System<SY
sys.mmio.queue_icbi_for_range(address, length);
}
TransferType::Write => {
- if stub {
+ if stub && SYSTEM == crate::system::GC {
tracing::error!(
channel = CHANNEL,
slot,
@@ -363,7 +365,7 @@ pub fn run_dma<const CHANNEL: usize, const SYSTEM: SystemId>(sys: &mut System<SY
);
}
}
- } else {
+ } else if SYSTEM == crate::system::GC {
tracing::warn!(channel = CHANNEL, slot, ?transfer_type, length, "EXI DMA to empty slot");
}
diff --git a/crates/gecko/src/flipper/exi/regs.rs b/crates/gecko/src/flipper/exi/regs.rs
index dbeaa68..480198b 100644
--- a/crates/gecko/src/flipper/exi/regs.rs
+++ b/crates/gecko/src/flipper/exi/regs.rs
@@ -152,7 +152,7 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for Channel0Control {
if self.dma_mode() {
exi::run_dma::<0, SYSTEM>(sys);
} else {
- sys.exi.start_immediate_transfer::<0>();
+ sys.exi.start_immediate_transfer::<0, SYSTEM>();
}
}
exi::refresh_interrupts(sys);
@@ -257,7 +257,7 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for Channel1Control {
if self.dma_mode() {
exi::run_dma::<1, SYSTEM>(sys);
} else {
- sys.exi.start_immediate_transfer::<1>();
+ sys.exi.start_immediate_transfer::<1, SYSTEM>();
}
}
exi::refresh_interrupts(sys);
@@ -364,7 +364,7 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for Channel2Control {
if self.dma_mode() {
exi::run_dma::<2, SYSTEM>(sys);
} else {
- sys.exi.start_immediate_transfer::<2>();
+ sys.exi.start_immediate_transfer::<2, SYSTEM>();
}
}
exi::refresh_interrupts(sys);