Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

fix ppcctrl, progresses now

Layled97afcf90c4f
diff --git a/crates/gecko/src/hollywood/ipc.rs b/crates/gecko/src/hollywood/ipc.rs
index 787e6c3..9e5ce59 100644
--- a/crates/gecko/src/hollywood/ipc.rs
+++ b/crates/gecko/src/hollywood/ipc.rs
@@ -83,6 +83,11 @@ crate::mmio_device_dispatch! {
pub fn deliver_response<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>, cmd_paddr: u32, result: i32) {
sys.mmio.phys_write_u32(cmd_paddr + 0x04, result as u32);
sys.hollywood.ipc.armmsg = ArmMsg::from_raw(cmd_paddr);
- sys.hollywood.ipc.ppcctrl = sys.hollywood.ipc.ppcctrl.with_arm_response(true);
+ sys.hollywood.ipc.ppcctrl = sys
+ .hollywood
+ .ipc
+ .ppcctrl
+ .with_arm_response(true)
+ .with_arm_post_ack(true);
crate::hollywood::irq::assert_ipc(sys);
}
diff --git a/crates/gecko/src/starlet.rs b/crates/gecko/src/starlet.rs
index 121649c..21173ed 100644
--- a/crates/gecko/src/starlet.rs
+++ b/crates/gecko/src/starlet.rs
@@ -100,7 +100,7 @@ fn process_command<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>, cmd_paddr:
const IOS_IOCTL: u32 = 6;
const IOS_IOCTLV: u32 = 7;
- debug_assert!(SYSTEM == crate::WII, "Starlet dispatch reached on non-Wii system");
+ assert!(SYSTEM == crate::WII, "Starlet dispatch reached on non-Wii system");
let wii: &mut crate::Wii = unsafe { ::core::mem::transmute(sys) };
let cmd = wii.mmio.phys_read_u32(cmd_paddr);