Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

more dvd commands (read sector data and audio toggle (stubbed))

Layle0f9a01e955da
diff --git a/crates/gecko/src/dvd.rs b/crates/gecko/src/dvd.rs
index bd43f52..8ffc377 100644
--- a/crates/gecko/src/dvd.rs
+++ b/crates/gecko/src/dvd.rs
@@ -13,6 +13,8 @@ const DIIMMBUF: u32 = DI_BASE + 0x20;
pub enum Command {
ReadDiskId,
+ ReadSectorData,
+ AudioToggle(bool),
}
pub struct DvdInterface {
@@ -59,8 +61,11 @@ impl DvdInterface {
let sub1 = (self.cmdbuf0 >> 16) & 0xFF;
let sub2 = self.cmdbuf0 & 0xFFFF;
- match (cmd, sub2) {
- (0xA8, 0x0040) => Some(Command::ReadDiskId),
+ match (cmd, sub1, sub2) {
+ (0xA8, _, 0x0000) => Some(Command::ReadSectorData),
+ (0xA8, _, 0x0040) => Some(Command::ReadDiskId),
+ (0xE4, 0x00, _) => Some(Command::AudioToggle(false)),
+ (0xE4, 0x01, _) => Some(Command::AudioToggle(true)),
_ => {
tracing::error!(
cmd = format!("{cmd:02X}"),
@@ -80,6 +85,22 @@ impl GameCube {
#[inline(always)]
fn process_dvd_command(&mut self, cmd: Command, dvd: &image::dvd::Dvd) {
match cmd {
+ Command::ReadSectorData => {
+ let src = self.di.cmdbuf1 << 2;
+ let dst = self.di.dma_address.address();
+ let len = self.di.cmdbuf2 as usize;
+ assert!(len == self.di.dma_length.length() as usize, "DMA length mismatch");
+
+ let buffer = self.mmio.phys_slice_mut(dst, len);
+ buffer.copy_from_slice(&dvd.data()[src as usize..src as usize + len]);
+
+ tracing::debug!(
+ src = format!("{:08X}", src),
+ dst = format!("{:08X}", dst),
+ len = format!("{:08X}", len),
+ "ReadSectorData command"
+ );
+ }
Command::ReadDiskId => {
let src = self.di.cmdbuf1;
let dst = self.di.dma_address.address();
@@ -95,6 +116,10 @@ impl GameCube {
"ReadDiskId command"
);
}
+ Command::AudioToggle(enable) => {
+ tracing::warn!(enable, "AudioToggle stubbed");
+ self.di.immbuf = 0;
+ }
}
}
diff --git a/crates/scripting/src/lib.rs b/crates/scripting/src/lib.rs
index 6cca6a5..7e1f163 100644
--- a/crates/scripting/src/lib.rs
+++ b/crates/scripting/src/lib.rs
@@ -159,7 +159,7 @@ impl LuaScriptHost {
let refresh_requested = Arc::new(AtomicBool::new(false));
let log_fn = lua.create_function(|_, msg: String| {
- tracing::info!("{}", msg);
+ tracing::info!(target: "lua", "{}", msg);
Ok(())
})?;
lua.globals().set("log", log_fn)?;
diff --git a/scripts/bs2_dvd_state_logger.lua b/scripts/bs2_dvd_state_logger.lua
index 37585b9..ca12294 100644
--- a/scripts/bs2_dvd_state_logger.lua
+++ b/scripts/bs2_dvd_state_logger.lua
@@ -45,7 +45,7 @@ traps = {
-- },
bus_write_pre = {
virt = {
- [0x8145d548] = log_state_machine_write,
+ [0x8145d548] = log_state_machine_write,
},
},
}
\ No newline at end of file