Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

silence gpio

Layle79b8b7b48dd5
diff --git a/crates/gecko/src/hollywood.rs b/crates/gecko/src/hollywood.rs
index 5317eb9..8b6753e 100644
--- a/crates/gecko/src/hollywood.rs
+++ b/crates/gecko/src/hollywood.rs
@@ -1,8 +1,10 @@
+pub mod gpio;
pub mod ipc;
pub mod irq;
pub mod regs;
pub struct Hollywood {
+ pub gpio: gpio::Gpio,
pub ipc: ipc::Ipc,
pub irq: irq::Irq,
}
@@ -10,6 +12,7 @@ pub struct Hollywood {
impl Hollywood {
pub fn new() -> Self {
Hollywood {
+ gpio: gpio::Gpio::new(),
ipc: ipc::Ipc::new(),
irq: irq::Irq::new(),
}
diff --git a/crates/gecko/src/hollywood/gpio.rs b/crates/gecko/src/hollywood/gpio.rs
new file mode 100644
index 0000000..b6b37d1
--- /dev/null
+++ b/crates/gecko/src/hollywood/gpio.rs
@@ -0,0 +1,40 @@
+use crate::hollywood::regs::{
+ GpioBDir, GpioBIn, GpioBIntFlag, GpioBIntLvl, GpioBIntMask, GpioBOut, GpioBOwner, GpioBStraps,
+};
+
+pub struct Gpio {
+ pub out: GpioBOut,
+ pub dir: GpioBDir,
+ pub intlvl: GpioBIntLvl,
+ pub intmask: GpioBIntMask,
+ pub straps: GpioBStraps,
+ pub owner: GpioBOwner,
+}
+
+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),
+ }
+ }
+}
+
+crate::mmio_device_dispatch! {
+ read = gpio_read,
+ write = gpio_write,
+ registers = [
+ GpioBOut,
+ GpioBDir,
+ GpioBIn,
+ GpioBIntLvl,
+ GpioBIntFlag,
+ GpioBIntMask,
+ GpioBStraps,
+ GpioBOwner,
+ ],
+}
diff --git a/crates/gecko/src/hollywood/regs.rs b/crates/gecko/src/hollywood/regs.rs
index 28453b6..796a400 100644
--- a/crates/gecko/src/hollywood/regs.rs
+++ b/crates/gecko/src/hollywood/regs.rs
@@ -154,3 +154,101 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for Mask {
crate::hollywood::irq::route_to_pi(sys);
}
}
+
+// 0x0D80_00C0 HW_GPIOB_OUT
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBOut {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBOut: u32 @ 0x0D80_00C0);
+crate::mmio_default_access!(GpioBOut => System.hollywood.gpio.out);
+
+// 0x0D80_00C4 HW_GPIOB_DIR
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBDir {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBDir: u32 @ 0x0D80_00C4);
+crate::mmio_default_access!(GpioBDir => System.hollywood.gpio.dir);
+
+// 0x0D80_00C8 HW_GPIOB_IN
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBIn {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBIn: u32 @ 0x0D80_00C8);
+
+impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for GpioBIn {
+ #[inline(always)]
+ fn read(_sys: &mut System<SYSTEM>) -> Self {
+ Self::from_raw(0)
+ }
+
+ #[inline(always)]
+ fn write(self, _sys: &mut System<SYSTEM>, _: WriteMask) {}
+}
+
+// 0x0D80_00CC HW_GPIOB_INTLVL
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBIntLvl {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBIntLvl: u32 @ 0x0D80_00CC);
+crate::mmio_default_access!(GpioBIntLvl => System.hollywood.gpio.intlvl);
+
+// 0x0D80_00D0 HW_GPIOB_INTFLAG
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBIntFlag {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBIntFlag: u32 @ 0x0D80_00D0);
+
+impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for GpioBIntFlag {
+ #[inline(always)]
+ fn read(_sys: &mut System<SYSTEM>) -> Self {
+ Self::from_raw(0)
+ }
+
+ #[inline(always)]
+ fn write(self, _sys: &mut System<SYSTEM>, _: WriteMask) {}
+}
+
+// 0x0D80_00D4 HW_GPIOB_INTMASK
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBIntMask {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBIntMask: u32 @ 0x0D80_00D4);
+crate::mmio_default_access!(GpioBIntMask => System.hollywood.gpio.intmask);
+
+// 0x0D80_00D8 HW_GPIOB_STRAPS
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBStraps {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBStraps: u32 @ 0x0D80_00D8);
+crate::mmio_default_access!(GpioBStraps => System.hollywood.gpio.straps);
+
+// 0x0D80_00DC HW_GPIOB_OWNER
+#[chapa::bitfield(u32, order = lsb0)]
+#[derive(Copy, Clone, Debug)]
+pub struct GpioBOwner {
+ #[bits(0..=31)]
+ pub value: u32,
+}
+crate::mmio_reg!(GpioBOwner: u32 @ 0x0D80_00DC);
+crate::mmio_default_access!(GpioBOwner => System.hollywood.gpio.owner);
diff --git a/crates/gecko/src/mmio/bus.rs b/crates/gecko/src/mmio/bus.rs
index 6d0c81d..9a04e18 100644
--- a/crates/gecko/src/mmio/bus.rs
+++ b/crates/gecko/src/mmio/bus.rs
@@ -2,8 +2,9 @@
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_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_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,
};
use crate::system::{System, SystemId, WII};
@@ -331,6 +332,9 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
crate::hollywood::irq::irq_read(self, phys, 1).unwrap_or(0) as u8
}
+ HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_read(self, phys, 1).unwrap_or(0) as u8
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -466,6 +470,9 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
crate::hollywood::irq::irq_read(self, phys, 2).unwrap_or(0) as u16
}
+ HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_read(self, phys, 2).unwrap_or(0) as u16
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -601,6 +608,9 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
crate::hollywood::irq::irq_read(self, phys, 4).unwrap_or(0)
}
+ HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_read(self, phys, 4).unwrap_or(0)
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -759,6 +769,9 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
crate::hollywood::irq::irq_write(self, phys, 1, raw);
}
+ HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_write(self, phys, 1, raw);
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -924,6 +937,9 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
crate::hollywood::irq::irq_write(self, phys, 2, raw);
}
+ HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_write(self, phys, 2, raw);
+ }
HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
tracing::warn!(
device = "HOLLYWOOD",
@@ -1088,6 +1104,9 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
crate::hollywood::irq::irq_write(self, phys, 4, val);
}
+ HOLLYWOOD_GPIO_PPC_BASE..=HOLLYWOOD_GPIO_PPC_END if SYSTEM == WII => {
+ crate::hollywood::gpio::gpio_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 ed8dc60..072fe4d 100644
--- a/crates/gecko/src/mmio/constants.rs
+++ b/crates/gecko/src/mmio/constants.rs
@@ -70,3 +70,7 @@ pub const IPC_END: u32 = 0x0D00_000F;
// [Wii] Hollywood interrupt controller
pub const HOLLYWOOD_IRQ_BASE: u32 = 0x0D00_0030;
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;