Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

silence more gpio

Layle9d110aea6cc4
diff --git a/crates/gecko/src/hollywood.rs b/crates/gecko/src/hollywood.rs
index 8b6753e..5d9c48b 100644
--- a/crates/gecko/src/hollywood.rs
+++ b/crates/gecko/src/hollywood.rs
@@ -1,9 +1,11 @@
+pub mod compat;
pub mod gpio;
pub mod ipc;
pub mod irq;
pub mod regs;
pub struct Hollywood {
+ pub compat: compat::Compat,
pub gpio: gpio::Gpio,
pub ipc: ipc::Ipc,
pub irq: irq::Irq,
@@ -12,6 +14,7 @@ pub struct Hollywood {
impl Hollywood {
pub fn new() -> Self {
Hollywood {
+ compat: compat::Compat::new(),
gpio: gpio::Gpio::new(),
ipc: ipc::Ipc::new(),
irq: irq::Irq::new(),
diff --git a/crates/gecko/src/hollywood/compat.rs b/crates/gecko/src/hollywood/compat.rs
new file mode 100644
index 0000000..d3ab3b3
--- /dev/null
+++ b/crates/gecko/src/hollywood/compat.rs
@@ -0,0 +1,23 @@
+use crate::hollywood::regs::{HwCompat, HwPllAi, HwPllAiExt};
+
+pub struct Compat {
+ pub compat: HwCompat,
+ pub pll_ai: HwPllAi,
+ pub pll_ai_ext: HwPllAiExt,
+}
+
+impl Compat {
+ pub fn new() -> Self {
+ Compat {
+ compat: HwCompat::from_raw(0),
+ pll_ai: HwPllAi::from_raw(0),
+ pll_ai_ext: HwPllAiExt::from_raw(0),
+ }
+ }
+}
+
+crate::mmio_device_dispatch! {
+ read = compat_read,
+ write = compat_write,
+ registers = [HwCompat, HwPllAi, HwPllAiExt],
+}
diff --git a/crates/gecko/src/hollywood/gpio.rs b/crates/gecko/src/hollywood/gpio.rs
index b6b37d1..ded31c8 100644
--- a/crates/gecko/src/hollywood/gpio.rs
+++ b/crates/gecko/src/hollywood/gpio.rs
@@ -1,25 +1,39 @@
use crate::hollywood::regs::{
- GpioBDir, GpioBIn, GpioBIntFlag, GpioBIntLvl, GpioBIntMask, GpioBOut, GpioBOwner, GpioBStraps,
+ GpioBDir, GpioBIn, GpioBIntFlag, GpioBIntLvl, GpioBIntMask, GpioBOut, GpioBOwner, GpioBStraps, GpioDir, GpioIn,
+ GpioIntFlag, GpioIntLvl, GpioIntMask, GpioOut, GpioOwner, GpioStraps,
};
pub struct Gpio {
- pub out: GpioBOut,
- pub dir: GpioBDir,
- pub intlvl: GpioBIntLvl,
- pub intmask: GpioBIntMask,
- pub straps: GpioBStraps,
- pub owner: GpioBOwner,
+ pub ppc_out: GpioBOut,
+ pub ppc_dir: GpioBDir,
+ pub ppc_intlvl: GpioBIntLvl,
+ pub ppc_intmask: GpioBIntMask,
+ pub ppc_straps: GpioBStraps,
+ pub ppc_owner: GpioBOwner,
+
+ pub arm_out: GpioOut,
+ pub arm_dir: GpioDir,
+ pub arm_intlvl: GpioIntLvl,
+ pub arm_intmask: GpioIntMask,
+ pub arm_straps: GpioStraps,
+ pub arm_owner: GpioOwner,
}
impl Gpio {
pub fn new() -> Self {
Gpio {
- out: GpioBOut::from_raw(0),
- dir: GpioBDir::from_raw(0),
- intlvl: GpioBIntLvl::from_raw(0),
- intmask: GpioBIntMask::from_raw(0),
- straps: GpioBStraps::from_raw(0),
- owner: GpioBOwner::from_raw(0),
+ ppc_out: GpioBOut::from_raw(0),
+ ppc_dir: GpioBDir::from_raw(0),
+ ppc_intlvl: GpioBIntLvl::from_raw(0),
+ ppc_intmask: GpioBIntMask::from_raw(0),
+ ppc_straps: GpioBStraps::from_raw(0),
+ ppc_owner: GpioBOwner::from_raw(0),
+ arm_out: GpioOut::from_raw(0),
+ arm_dir: GpioDir::from_raw(0),
+ arm_intlvl: GpioIntLvl::from_raw(0),
+ arm_intmask: GpioIntMask::from_raw(0),
+ arm_straps: GpioStraps::from_raw(0),
+ arm_owner: GpioOwner::from_raw(0),
}
}
}
@@ -36,5 +50,13 @@ crate::mmio_device_dispatch! {
GpioBIntMask,
GpioBStraps,
GpioBOwner,
+ GpioOut,
+ GpioDir,
+ GpioIn,
+ GpioIntLvl,
+ GpioIntFlag,
+ GpioIntMask,
+ GpioStraps,
+ GpioOwner,
],
}
diff --git a/crates/gecko/src/hollywood/regs.rs b/crates/gecko/src/hollywood/regs.rs
index 796a400..74362d7 100644
--- a/crates/gecko/src/hollywood/regs.rs
+++ b/crates/gecko/src/hollywood/regs.rs
@@ -163,7 +163,7 @@ pub struct GpioBOut {
pub value: u32,
}
crate::mmio_reg!(GpioBOut: u32 @ 0x0D80_00C0);
-crate::mmio_default_access!(GpioBOut => System.hollywood.gpio.out);
+crate::mmio_default_access!(GpioBOut => System.hollywood.gpio.ppc_out);
// 0x0D80_00C4 HW_GPIOB_DIR
#[chapa::bitfield(u32, order = lsb0)]
@@ -173,7 +173,7 @@ pub struct GpioBDir {
pub value: u32,
}
crate::mmio_reg!(GpioBDir: u32 @ 0x0D80_00C4);
-crate::mmio_default_access!(GpioBDir => System.hollywood.gpio.dir);
+crate::mmio_default_access!(GpioBDir => System.hollywood.gpio.ppc_dir);
// 0x0D80_00C8 HW_GPIOB_IN
#[chapa::bitfield(u32, order = lsb0)]
@@ -202,7 +202,7 @@ pub struct GpioBIntLvl {
pub value: u32,
}
crate::mmio_reg!(GpioBIntLvl: u32 @ 0x0D80_00CC);
-crate::mmio_default_access!(GpioBIntLvl => System.hollywood.gpio.intlvl);
+crate::mmio_default_access!(GpioBIntLvl => System.hollywood.gpio.ppc_intlvl);
// 0x0D80_00D0 HW_GPIOB_INTFLAG
#[chapa::bitfield(u32, order = lsb0)]
@@ -231,7 +231,7 @@ pub struct GpioBIntMask {
pub value: u32,
}
crate::mmio_reg!(GpioBIntMask: u32 @ 0x0D80_00D4);
-crate::mmio_default_access!(GpioBIntMask => System.hollywood.gpio.intmask);
+crate::mmio_default_access!(GpioBIntMask => System.hollywood.gpio.ppc_intmask);
// 0x0D80_00D8 HW_GPIOB_STRAPS
#[chapa::bitfield(u32, order = lsb0)]
@@ -241,7 +241,7 @@ pub struct GpioBStraps {
pub value: u32,
}
crate::mmio_reg!(GpioBStraps: u32 @ 0x0D80_00D8);
-crate::mmio_default_access!(GpioBStraps => System.hollywood.gpio.straps);
+crate::mmio_default_access!(GpioBStraps => System.hollywood.gpio.ppc_straps);
// 0x0D80_00DC HW_GPIOB_OWNER
#[chapa::bitfield(u32, order = lsb0)]
@@ -251,4 +251,132 @@ pub struct GpioBOwner {
pub value: u32,
}
crate::mmio_reg!(GpioBOwner: u32 @ 0x0D80_00DC);
-crate::mmio_default_access!(GpioBOwner => System.hollywood.gpio.owner);
+crate::mmio_default_access!(GpioBOwner => System.hollywood.gpio.ppc_owner);
+
+// 0x0D00_00C0 HW_GPIO_OUT
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioOut {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioOut: u32 @ 0x0D00_00C0);
+crate::mmio_default_access!(GpioOut => System.hollywood.gpio.arm_out);
+
+// 0x0D00_00C4 HW_GPIO_DIR
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioDir {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioDir: u32 @ 0x0D00_00C4);
+crate::mmio_default_access!(GpioDir => System.hollywood.gpio.arm_dir);
+
+// 0x0D00_00C8 HW_GPIO_IN (read-only)
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioIn {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioIn: u32 @ 0x0D00_00C8);
+
+impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for GpioIn {
+ #[inline(always)]
+ fn read(_sys: &mut System<SYSTEM>) -> Self {
+ Self::from_raw(0)
+ }
+
+ #[inline(always)]
+ fn write(self, _sys: &mut System<SYSTEM>, _: WriteMask) {}
+}
+
+// 0x0D00_00CC HW_GPIO_INTLVL
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioIntLvl {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioIntLvl: u32 @ 0x0D00_00CC);
+crate::mmio_default_access!(GpioIntLvl => System.hollywood.gpio.arm_intlvl);
+
+// 0x0D00_00D0 HW_GPIO_INTFLAG (W1C against zero)
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioIntFlag {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioIntFlag: u32 @ 0x0D00_00D0);
+
+impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for GpioIntFlag {
+ #[inline(always)]
+ fn read(_sys: &mut System<SYSTEM>) -> Self {
+ Self::from_raw(0)
+ }
+
+ #[inline(always)]
+ fn write(self, _sys: &mut System<SYSTEM>, _: WriteMask) {}
+}
+
+// 0x0D00_00D4 HW_GPIO_INTMASK
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioIntMask {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioIntMask: u32 @ 0x0D00_00D4);
+crate::mmio_default_access!(GpioIntMask => System.hollywood.gpio.arm_intmask);
+
+// 0x0D00_00D8 HW_GPIO_STRAPS
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioStraps {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioStraps: u32 @ 0x0D00_00D8);
+crate::mmio_default_access!(GpioStraps => System.hollywood.gpio.arm_straps);
+
+// 0x0D00_00DC HW_GPIO_OWNER
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioOwner {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioOwner: u32 @ 0x0D00_00DC);
+crate::mmio_default_access!(GpioOwner => System.hollywood.gpio.arm_owner);
+
+// 0x0D80_0180 HW_COMPAT
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct HwCompat {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(HwCompat: u32 @ 0x0D80_0180);
+crate::mmio_default_access!(HwCompat => System.hollywood.compat.compat);
+
+// 0x0D80_01CC HW_PLLAI
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct HwPllAi {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(HwPllAi: u32 @ 0x0D80_01CC);
+crate::mmio_default_access!(HwPllAi => System.hollywood.compat.pll_ai);
+
+// 0x0D80_01D0 HW_PLLAIEXT
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct HwPllAiExt {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(HwPllAiExt: u32 @ 0x0D80_01D0);
+crate::mmio_default_access!(HwPllAiExt => System.hollywood.compat.pll_ai_ext);
diff --git a/crates/gecko/src/mmio/bus.rs b/crates/gecko/src/mmio/bus.rs
index 9a04e18..b14dd2b 100644
--- a/crates/gecko/src/mmio/bus.rs
+++ b/crates/gecko/src/mmio/bus.rs
@@ -2,9 +2,10 @@
use crate::hooks::HookFlags;
use crate::mmio::constants::{
AI_BASE, AI_END, CP_BASE, CP_END, DI_BASE, DI_END, DSP_BASE, DSP_END, EXI_BASE, EXI_END, GX_FIFO_BASE, GX_FIFO_END,
- HOLLYWOOD_GPIO_PPC_BASE, HOLLYWOOD_GPIO_PPC_END, HOLLYWOOD_IRQ_BASE, HOLLYWOOD_IRQ_END, HW_HOLLYWOOD_BASE,
- HW_HOLLYWOOD_END, HW_REG_BASE, HW_REG_END, IPC_BASE, IPC_END, MI_BASE, MI_END, PE_BASE, PE_END, PI_BASE, PI_END,
- RAM_END, SI_BASE, SI_END, VI_BASE, VI_END,
+ HOLLYWOOD_COMPAT_BASE, HOLLYWOOD_COMPAT_END, HOLLYWOOD_GPIO_ARM_BASE, HOLLYWOOD_GPIO_ARM_END,
+ HOLLYWOOD_GPIO_PPC_BASE, HOLLYWOOD_GPIO_PPC_END, HOLLYWOOD_IRQ_BASE, HOLLYWOOD_IRQ_END, HOLLYWOOD_PLL_AI_BASE,
+ HOLLYWOOD_PLL_AI_END, HW_HOLLYWOOD_BASE, HW_HOLLYWOOD_END, HW_REG_BASE, HW_REG_END, IPC_BASE, IPC_END, MI_BASE,
+ MI_END, PE_BASE, PE_END, PI_BASE, PI_END, RAM_END, SI_BASE, SI_END, VI_BASE, VI_END,
};
use crate::system::{System, SystemId, WII};
@@ -335,6 +336,14 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
crate::hollywood::gpio::gpio_read(self, phys, 1).unwrap_or(0) as u8
}
+ HOLLYWOOD_GPIO_ARM_BASE..=HOLLYWOOD_GPIO_ARM_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_read(self, phys, 1).unwrap_or(0) as u8
+ }
+ HOLLYWOOD_COMPAT_BASE..=HOLLYWOOD_COMPAT_END | HOLLYWOOD_PLL_AI_BASE..=HOLLYWOOD_PLL_AI_END
+ if SYSTEM == WII =>
+ {
+ crate::hollywood::compat::compat_read(self, phys, 1).unwrap_or(0) as u8
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -473,6 +482,14 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
crate::hollywood::gpio::gpio_read(self, phys, 2).unwrap_or(0) as u16
}
+ HOLLYWOOD_GPIO_ARM_BASE..=HOLLYWOOD_GPIO_ARM_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_read(self, phys, 2).unwrap_or(0) as u16
+ }
+ HOLLYWOOD_COMPAT_BASE..=HOLLYWOOD_COMPAT_END | HOLLYWOOD_PLL_AI_BASE..=HOLLYWOOD_PLL_AI_END
+ if SYSTEM == WII =>
+ {
+ crate::hollywood::compat::compat_read(self, phys, 2).unwrap_or(0) as u16
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -611,6 +628,14 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
crate::hollywood::gpio::gpio_read(self, phys, 4).unwrap_or(0)
}
+ HOLLYWOOD_GPIO_ARM_BASE..=HOLLYWOOD_GPIO_ARM_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_read(self, phys, 4).unwrap_or(0)
+ }
+ HOLLYWOOD_COMPAT_BASE..=HOLLYWOOD_COMPAT_END | HOLLYWOOD_PLL_AI_BASE..=HOLLYWOOD_PLL_AI_END
+ if SYSTEM == WII =>
+ {
+ crate::hollywood::compat::compat_read(self, phys, 4).unwrap_or(0)
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -772,6 +797,14 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
crate::hollywood::gpio::gpio_write(self, phys, 1, raw);
}
+ HOLLYWOOD_GPIO_ARM_BASE..=HOLLYWOOD_GPIO_ARM_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_write(self, phys, 1, raw);
+ }
+ HOLLYWOOD_COMPAT_BASE..=HOLLYWOOD_COMPAT_END | HOLLYWOOD_PLL_AI_BASE..=HOLLYWOOD_PLL_AI_END
+ if SYSTEM == WII =>
+ {
+ crate::hollywood::compat::compat_write(self, phys, 1, raw);
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -940,6 +973,14 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
crate::hollywood::gpio::gpio_write(self, phys, 2, raw);
}
+ HOLLYWOOD_GPIO_ARM_BASE..=HOLLYWOOD_GPIO_ARM_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_write(self, phys, 2, raw);
+ }
+ HOLLYWOOD_COMPAT_BASE..=HOLLYWOOD_COMPAT_END | HOLLYWOOD_PLL_AI_BASE..=HOLLYWOOD_PLL_AI_END
+ if SYSTEM == WII =>
+ {
+ crate::hollywood::compat::compat_write(self, phys, 2, raw);
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -1107,6 +1148,14 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
crate::hollywood::gpio::gpio_write(self, phys, 4, val);
}
+ HOLLYWOOD_GPIO_ARM_BASE..=HOLLYWOOD_GPIO_ARM_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_write(self, phys, 4, val);
+ }
+ HOLLYWOOD_COMPAT_BASE..=HOLLYWOOD_COMPAT_END | HOLLYWOOD_PLL_AI_BASE..=HOLLYWOOD_PLL_AI_END
+ if SYSTEM == WII =>
+ {
+ crate::hollywood::compat::compat_write(self, phys, 4, val);
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
diff --git a/crates/gecko/src/mmio/constants.rs b/crates/gecko/src/mmio/constants.rs
index 072fe4d..7327598 100644
--- a/crates/gecko/src/mmio/constants.rs
+++ b/crates/gecko/src/mmio/constants.rs
@@ -74,3 +74,15 @@ pub const HOLLYWOOD_IRQ_END: u32 = 0x0D00_003F;
// [Wii] PPC-side mirror of the Hollywood GPIO controller (8 x 32-bit regs)
pub const HOLLYWOOD_GPIO_PPC_BASE: u32 = 0x0D80_00C0;
pub const HOLLYWOOD_GPIO_PPC_END: u32 = 0x0D80_00DF;
+
+// [Wii] ARM-side full Hollywood GPIO controller (8 x 32-bit regs)
+pub const HOLLYWOOD_GPIO_ARM_BASE: u32 = 0x0D00_00C0;
+pub const HOLLYWOOD_GPIO_ARM_END: u32 = 0x0D00_00DF;
+
+// [Wii] HW_COMPAT
+pub const HOLLYWOOD_COMPAT_BASE: u32 = 0x0D80_0180;
+pub const HOLLYWOOD_COMPAT_END: u32 = 0x0D80_0183;
+
+// [Wii] Audio PLL config block ?
+pub const HOLLYWOOD_PLL_AI_BASE: u32 = 0x0D80_01CC;
+pub const HOLLYWOOD_PLL_AI_END: u32 = 0x0D80_01D3;