A GameCube/Wii emulator and debugger written in Rust.
nunchuck works now
Layle1e28700000b9
diff --git a/crates/debugger/src/main.rs b/crates/debugger/src/main.rsindex 458d918..421517e 100644--- a/crates/debugger/src/main.rs+++ b/crates/debugger/src/main.rs@@ -10,7 +10,7 @@ use winit::window::{Window, WindowId};use gecko::HostInput;use gecko::audio::WavAudioSink;-use gecko::flipper::si::pad::{self, PadStatus, STICK_CENTER};+use gecko::flipper::si::pad::{self, PadStatus, STICK_CENTER, STICK_MAX, STICK_MIN, TRIGGER_MAX, TRIGGER_MIN};use gecko::gamecube::GameCube;use gecko::wii::Wii;use image::Dol;@@ -475,10 +475,10 @@ fn update_pad(pad: &mut PadStatus, key: KeyCode, pressed: bool) {match key {// Analog stick (digital, full deflection)- KeyCode::ArrowUp => pad.stick_y = if pressed { 255 } else { STICK_CENTER },- KeyCode::ArrowDown => pad.stick_y = if pressed { 0 } else { STICK_CENTER },- KeyCode::ArrowLeft => pad.stick_x = if pressed { 0 } else { STICK_CENTER },- KeyCode::ArrowRight => pad.stick_x = if pressed { 255 } else { STICK_CENTER },+ KeyCode::ArrowUp => pad.stick_y = if pressed { STICK_MAX } else { STICK_CENTER },+ KeyCode::ArrowDown => pad.stick_y = if pressed { STICK_MIN } else { STICK_CENTER },+ KeyCode::ArrowLeft => pad.stick_x = if pressed { STICK_MIN } else { STICK_CENTER },+ KeyCode::ArrowRight => pad.stick_x = if pressed { STICK_MAX } else { STICK_CENTER },// Face buttonsKeyCode::KeyX => set_button(&mut pad.buttons, pad::A, pressed),@@ -490,11 +490,11 @@ fn update_pad(pad: &mut PadStatus, key: KeyCode, pressed: bool) {// TriggersKeyCode::KeyA => {set_button(&mut pad.buttons, pad::L, pressed);- pad.trigger_left = if pressed { 255 } else { 0 };+ pad.trigger_left = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };}KeyCode::KeyS => {set_button(&mut pad.buttons, pad::R, pressed);- pad.trigger_right = if pressed { 255 } else { 0 };+ pad.trigger_right = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };}KeyCode::KeyD => set_button(&mut pad.buttons, pad::Z, pressed),diff --git a/crates/gecko/src/flipper/si/pad.rs b/crates/gecko/src/flipper/si/pad.rsindex 8d6b489..a3f7014 100644--- a/crates/gecko/src/flipper/si/pad.rs+++ b/crates/gecko/src/flipper/si/pad.rs@@ -12,7 +12,11 @@ pub const Y: u16 = 0x0800;pub const START: u16 = 0x1000;pub const USE_ORIGIN: u16 = 0x0080;+pub const STICK_MIN: u8 = 0;pub const STICK_CENTER: u8 = 128;+pub const STICK_MAX: u8 = 255;+pub const TRIGGER_MIN: u8 = 0;+pub const TRIGGER_MAX: u8 = 255;pub const GC_CONTROLLER_ID: u32 = 0x0900_0000;#[derive(Clone, Copy, Debug)]diff --git a/crates/gecko/src/hollywood/ipc/usb.rs b/crates/gecko/src/hollywood/ipc/usb.rsindex 686ba7d..4c92428 100644--- a/crates/gecko/src/hollywood/ipc/usb.rs+++ b/crates/gecko/src/hollywood/ipc/usb.rs@@ -1,4 +1,5 @@mod bluetooth;+mod crypto;mod l2cap;mod wiimote;@@ -7,7 +8,7 @@ pub(crate) use bluetooth::{WIIMOTE_ADDR, WIIMOTE_NAME};use std::collections::VecDeque;pub use wiimote::{BTN_A, BTN_B, BTN_DOWN, BTN_HOME, BTN_LEFT, BTN_MINUS, BTN_ONE, BTN_PLUS, BTN_RIGHT, BTN_TWO, BTN_UP,- NUNCHUK_BTN_C, NUNCHUK_BTN_Z,+ NUNCHUK_BTN_C, NUNCHUK_BTN_Z, NUNCHUK_STICK_CENTER, NUNCHUK_STICK_MAX, NUNCHUK_STICK_MIN,};const USB_CTRL: u32 = 0;@@ -173,7 +174,25 @@ impl Bluetooth {}fn set_nunchuk(&mut self, buttons: u8, stick_x: u8, stick_y: u8) -> bool {- self.wiimote.set_nunchuk(buttons, stick_x, stick_y)+ let changed = self.wiimote.set_nunchuk(buttons, stick_x, stick_y);++ if changed {+ tracing::debug!(+ buttons = format!("{buttons:#04x}"),+ stick_x = format!("{stick_x:#04x}"),+ stick_y = format!("{stick_y:#04x}"),+ "Nunchuk state changed"+ );+ }++ if self.host_hid_interrupt_cid.is_none() {+ return changed;+ }++ let report = self.wiimote.make_input_report();+ self.queue_hid_input_report(report);++ changed}}diff --git a/crates/gecko/src/hollywood/ipc/usb/crypto.rs b/crates/gecko/src/hollywood/ipc/usb/crypto.rsnew file mode 100644index 0000000..3bc271d--- /dev/null+++ b/crates/gecko/src/hollywood/ipc/usb/crypto.rs@@ -0,0 +1,282 @@+//! ```c+//! decrypted[i] = ft[(addr + i) & 7] + (raw[i] ^ sb[(addr + i) & 7])+//! ```+//!+//! ```c+//! encrypted[i] = (data[i] - ft[(addr + i) & 7]) ^ sb[(addr + i) & 7]+//! ```+//!+//! Mirrors the algorithm in FFCC at `kpad_nunchuk_keygen` (0x803D9210) and the+//! decrypt loop at `kpad_extension_crypt_buffer` (0x803DA000). The constant+//! tables here are the same ones that live in FFCC `.data5` at+//! `kpad_nunchuk_select_table` (0x80541068) and `kpad_nunchuk_perm_table`+//! (0x80541098..0x80541998 = keygen sbox + 8 round sboxes).++const ANS_TBL_1ST_PARTY: [[u8; 6]; 7] = [+ [0xa8, 0x77, 0xa6, 0xe0, 0xf7, 0x43],+ [0x5a, 0x35, 0x85, 0xe2, 0x72, 0x97],+ [0x8f, 0xb7, 0x1a, 0x62, 0x87, 0x38],+ [0x0d, 0x67, 0xc7, 0xbe, 0x4f, 0x3e],+ [0x20, 0x76, 0x37, 0x8f, 0x68, 0xb7],+ [0xa9, 0x26, 0x3f, 0x2b, 0x10, 0xe3],+ [0x30, 0x7e, 0x90, 0x0e, 0x85, 0x0a],+];++#[rustfmt::skip]+const KEYGEN_SBOX_1ST_PARTY: [u8; 256] = [+ 0x70, 0x51, 0x03, 0x86, 0x40, 0x0d, 0x4f, 0xeb, 0x3e, 0xcc, 0xd1, 0x87, 0x35, 0xbd, 0xf5, 0x0b,+ 0x5e, 0xd0, 0xf8, 0xf2, 0xd5, 0xe2, 0x6c, 0x31, 0x0c, 0xad, 0xfc, 0x21, 0xc3, 0x78, 0xc1, 0x06,+ 0xc2, 0x4c, 0x55, 0xe6, 0x4a, 0x34, 0x48, 0x11, 0x1e, 0xda, 0xe7, 0x1a, 0x84, 0xa0, 0x96, 0xa7,+ 0xe3, 0x7f, 0xaf, 0x63, 0x9c, 0xfa, 0x23, 0x5b, 0x79, 0xc8, 0x9e, 0xba, 0xb2, 0xc9, 0x22, 0x12,+ 0x4b, 0xb3, 0xa1, 0xb6, 0x32, 0x49, 0xa2, 0xe1, 0x89, 0x39, 0x10, 0x66, 0xc5, 0x07, 0x8f, 0x54,+ 0xea, 0x91, 0xca, 0x3f, 0xf9, 0x19, 0xf0, 0xd7, 0x46, 0xbc, 0x28, 0x1b, 0x61, 0xe8, 0x2f, 0x6a,+ 0xae, 0x9d, 0xf6, 0x4e, 0x09, 0x14, 0x77, 0x4d, 0xdb, 0x1f, 0x2e, 0x7b, 0x7c, 0xf1, 0x43, 0xa3,+ 0x00, 0xb8, 0x13, 0x8c, 0x85, 0xb9, 0x29, 0x75, 0x88, 0xfd, 0xd2, 0x56, 0x1c, 0x50, 0x97, 0x41,+ 0xe5, 0x3b, 0x60, 0xb5, 0xc0, 0x64, 0xee, 0x98, 0xd6, 0x2d, 0x25, 0xa4, 0xaa, 0xcd, 0x7d, 0xa8,+ 0x83, 0xc6, 0xab, 0xbe, 0x44, 0x99, 0x26, 0x3c, 0xce, 0x9f, 0xbf, 0xd3, 0xcb, 0x76, 0x7a, 0x7e,+ 0x82, 0x01, 0x8a, 0x9a, 0x80, 0x1d, 0x0e, 0xb0, 0x5c, 0xd4, 0x38, 0x62, 0xf4, 0x30, 0xe0, 0x8e,+ 0x53, 0xb7, 0x02, 0x57, 0xac, 0xa6, 0x52, 0x0a, 0x6d, 0x92, 0x65, 0x17, 0x24, 0x33, 0x45, 0x72,+ 0x74, 0xb1, 0xb4, 0xf7, 0x5d, 0xed, 0x2c, 0xff, 0x47, 0x37, 0x5a, 0x90, 0xbb, 0xdf, 0x2a, 0x16,+ 0x59, 0x95, 0xd9, 0xc4, 0x27, 0x67, 0x73, 0xc7, 0x68, 0xfe, 0xa5, 0xdd, 0x6b, 0x5f, 0x93, 0xd8,+ 0xec, 0x05, 0x3a, 0x8d, 0x6e, 0xfb, 0x3d, 0xa9, 0x69, 0x36, 0xf3, 0x94, 0xde, 0xef, 0x15, 0x6f,+ 0x8b, 0x9b, 0x08, 0x0f, 0xdc, 0x81, 0x18, 0x20, 0x04, 0xe4, 0x71, 0xcf, 0xe9, 0x2b, 0x42, 0x58,+];++#[rustfmt::skip]+const SBOXES_1ST_PARTY: [[u8; 256]; 8] = [+ [+ 0x01, 0xa0, 0xa9, 0x62, 0xd6, 0x3f, 0x85, 0xa7, 0xb6, 0xd4, 0xfa, 0x15, 0x66, 0x17, 0x09, 0xbd,+ 0x5d, 0x14, 0x34, 0x26, 0x59, 0x72, 0x91, 0x54, 0x06, 0x4f, 0xf8, 0xb0, 0x5b, 0x74, 0x93, 0x99,+ 0x8c, 0xf2, 0x45, 0xcd, 0xea, 0x4e, 0xad, 0x10, 0x4a, 0xe5, 0xca, 0xee, 0xdf, 0xc6, 0x6f, 0x9f,+ 0x88, 0x8e, 0x02, 0xcc, 0x08, 0xa8, 0x77, 0x94, 0x6d, 0x21, 0xb1, 0x28, 0xe4, 0x39, 0x79, 0x96,+ 0x60, 0x71, 0x81, 0x16, 0x2e, 0xe6, 0x78, 0xb9, 0xc4, 0x46, 0x9a, 0x42, 0xae, 0xb7, 0x7c, 0x43,+ 0xb3, 0x22, 0x1a, 0x86, 0xc2, 0x32, 0x3d, 0x2d, 0x9c, 0xd2, 0x29, 0xe9, 0x63, 0x9b, 0xd1, 0x31,+ 0x38, 0x5e, 0x1e, 0x36, 0x41, 0xbb, 0x03, 0x18, 0x2b, 0x3e, 0xbf, 0x68, 0x61, 0xfc, 0x52, 0xc0,+ 0xde, 0xe0, 0x0a, 0x58, 0x13, 0x5a, 0x00, 0xbe, 0x1c, 0x90, 0x0e, 0x53, 0x12, 0xfd, 0xe2, 0x6e,+ 0xba, 0xce, 0x24, 0x27, 0x44, 0x7f, 0x87, 0xa3, 0xa1, 0xd5, 0x50, 0x40, 0xe3, 0xf9, 0x83, 0xf7,+ 0xc7, 0xa2, 0x35, 0xc8, 0xdb, 0x19, 0xab, 0x2f, 0x11, 0x25, 0xed, 0x33, 0x9e, 0x55, 0xe1, 0x48,+ 0xaf, 0x73, 0x84, 0xda, 0x2a, 0xaa, 0x51, 0xeb, 0x9d, 0x95, 0xb2, 0xcb, 0xe7, 0x70, 0x80, 0xfe,+ 0x4c, 0x65, 0x04, 0xef, 0xc5, 0xf1, 0xc3, 0x3a, 0xb4, 0xf5, 0x5f, 0x23, 0x89, 0xdd, 0x30, 0xa5,+ 0x8b, 0xd3, 0xf6, 0xdc, 0x4d, 0x64, 0xd7, 0xf0, 0x8f, 0xec, 0x56, 0x37, 0x5c, 0xa4, 0x0d, 0x07,+ 0x76, 0x8a, 0x2c, 0x0b, 0xb5, 0xd8, 0xc1, 0x1f, 0xe8, 0x3b, 0xf4, 0x4b, 0x1b, 0x47, 0x6c, 0x49,+ 0x67, 0x7b, 0x92, 0xcf, 0x75, 0x7e, 0x20, 0xd9, 0x7d, 0x3c, 0x97, 0x7a, 0xd0, 0x05, 0x6b, 0x0f,+ 0x1d, 0xfb, 0x82, 0x98, 0x57, 0x8d, 0xf3, 0x6a, 0xbc, 0xac, 0xc9, 0xa6, 0xff, 0xb8, 0x69, 0x0c,+ ],+ [+ 0x4c, 0x4d, 0x72, 0x07, 0x5a, 0x49, 0x33, 0x8d, 0xa2, 0xab, 0x46, 0x3d, 0x63, 0x0d, 0xa0, 0x97,+ 0xff, 0xf0, 0xf5, 0xfa, 0xc0, 0xe9, 0xdb, 0x62, 0xe4, 0xe1, 0x74, 0x43, 0xdc, 0x86, 0x18, 0x29,+ 0x37, 0xf4, 0x06, 0xe2, 0xed, 0x6f, 0x90, 0x48, 0x1e, 0x2d, 0x1d, 0xea, 0x73, 0x94, 0x54, 0xdf,+ 0x25, 0xf6, 0x47, 0x27, 0xd9, 0x11, 0x77, 0xc9, 0x84, 0x1c, 0x5b, 0x5c, 0x51, 0x81, 0xa6, 0x22,+ 0x3e, 0x24, 0x96, 0xc8, 0x8a, 0xec, 0x82, 0x7c, 0x09, 0xb8, 0x45, 0x4a, 0x57, 0xbb, 0x2f, 0x50,+ 0x75, 0x8e, 0x61, 0x70, 0x8c, 0x6c, 0xaf, 0xd0, 0xfd, 0xb4, 0x1b, 0xae, 0xde, 0xfe, 0x3b, 0xb5,+ 0x36, 0xbd, 0x55, 0x01, 0x0e, 0x9c, 0x41, 0x56, 0x5f, 0xb3, 0x26, 0x03, 0x83, 0xba, 0x13, 0x4b,+ 0xca, 0xc5, 0x0a, 0xf8, 0x60, 0xa5, 0xb9, 0xc7, 0xc3, 0x98, 0x32, 0xfb, 0x12, 0xf9, 0xa7, 0x92,+ 0xaa, 0x68, 0xf3, 0x78, 0x7e, 0x05, 0x20, 0x21, 0x02, 0xe8, 0xbf, 0xf2, 0xb0, 0x59, 0x8f, 0xd2,+ 0xcb, 0x87, 0x65, 0x15, 0xf1, 0x1a, 0xb2, 0x30, 0xad, 0xee, 0x58, 0xa3, 0x8b, 0x66, 0x1f, 0x2c,+ 0xd7, 0x5d, 0x19, 0x85, 0xa8, 0xe6, 0xd3, 0x6b, 0xa1, 0x0c, 0x91, 0x93, 0x6a, 0x5e, 0x0b, 0x79,+ 0xe3, 0xdd, 0x00, 0x4f, 0x3c, 0x89, 0x6e, 0x71, 0x69, 0xa9, 0xac, 0x40, 0xe5, 0x99, 0x28, 0xc6,+ 0x31, 0x4e, 0x7a, 0xcd, 0x08, 0x9e, 0x7d, 0xef, 0x17, 0xfc, 0x88, 0xd8, 0xa4, 0x6d, 0x44, 0x95,+ 0xd1, 0xb7, 0xd4, 0x9b, 0xbe, 0x2a, 0x34, 0x64, 0x2b, 0xcf, 0x2e, 0xeb, 0x38, 0xce, 0x23, 0xe0,+ 0x3a, 0x3f, 0xf7, 0x7b, 0x9f, 0x10, 0x53, 0xbc, 0x52, 0x67, 0x16, 0xe7, 0x80, 0x76, 0x04, 0xc4,+ 0xb6, 0xc1, 0xc2, 0x7f, 0x9a, 0xda, 0xd5, 0x39, 0x42, 0x14, 0x9d, 0xb1, 0x0f, 0x35, 0xd6, 0xcc,+ ],+ [+ 0xb9, 0xda, 0x38, 0x0c, 0xa2, 0x9c, 0x09, 0x1f, 0x06, 0xb1, 0xb6, 0xfd, 0x1a, 0x69, 0x23, 0x30,+ 0xc4, 0xde, 0x01, 0xd1, 0xf4, 0x58, 0x29, 0x37, 0x1c, 0x7d, 0xd5, 0xbf, 0xff, 0xbd, 0xc8, 0xc9,+ 0xcf, 0x65, 0xbe, 0x7b, 0x78, 0x97, 0x98, 0x67, 0x08, 0xb3, 0x26, 0x57, 0xf7, 0xfa, 0x40, 0xad,+ 0x8e, 0x75, 0xa6, 0x7c, 0xdb, 0x91, 0x8b, 0x51, 0x99, 0xd4, 0x17, 0x7a, 0x90, 0x8d, 0xce, 0x63,+ 0xcb, 0x4e, 0xa0, 0xab, 0x18, 0x3a, 0x5b, 0x50, 0x7f, 0x21, 0x74, 0xc1, 0xbb, 0xb8, 0xb7, 0xba,+ 0x0b, 0x35, 0x95, 0x31, 0x59, 0x9a, 0x4d, 0x04, 0x07, 0x1e, 0x5a, 0x76, 0x13, 0xf3, 0x71, 0x83,+ 0xf0, 0x86, 0x03, 0xa8, 0x39, 0x42, 0xaa, 0x28, 0xe6, 0xe4, 0xd8, 0x5d, 0xd3, 0xd0, 0x6e, 0x6f,+ 0x96, 0xfb, 0x5e, 0xbc, 0x56, 0xc2, 0x5f, 0x85, 0x9b, 0xe7, 0xaf, 0xd2, 0x3b, 0x84, 0x6a, 0xa7,+ 0x53, 0xc5, 0x44, 0x49, 0xa5, 0xf9, 0x36, 0x72, 0x3d, 0x2c, 0xd9, 0x1b, 0xa1, 0xf5, 0x4f, 0x93,+ 0x9d, 0x68, 0x47, 0x41, 0x16, 0xca, 0x2a, 0x4c, 0xa3, 0x87, 0xd6, 0xe5, 0x19, 0x2e, 0x77, 0x15,+ 0x6d, 0x70, 0xc0, 0xdf, 0xb2, 0x00, 0x46, 0xed, 0xc6, 0x6c, 0x43, 0x60, 0x92, 0x2d, 0xa9, 0x22,+ 0x45, 0x8f, 0x34, 0x55, 0xae, 0xa4, 0x0a, 0x66, 0x32, 0xe0, 0xdc, 0x02, 0xac, 0xe8, 0x20, 0x8c,+ 0x89, 0x62, 0x4a, 0xfe, 0xee, 0xc3, 0xe3, 0x3c, 0xf1, 0x79, 0x05, 0xe9, 0xf6, 0x27, 0x33, 0xcc,+ 0xf2, 0x9e, 0x11, 0x81, 0x7e, 0x80, 0x10, 0x8a, 0x82, 0x9f, 0x48, 0x0d, 0xd7, 0xb4, 0xfc, 0x2f,+ 0xb5, 0xc7, 0xdd, 0x88, 0x14, 0x6b, 0x2b, 0x54, 0xea, 0x1d, 0x94, 0x5c, 0xb0, 0xef, 0x12, 0x24,+ 0xcd, 0xeb, 0xe1, 0xe2, 0x64, 0x73, 0x3f, 0x0e, 0x52, 0x61, 0x25, 0x3e, 0xf8, 0x0f, 0x4b, 0xec,+ ],+ [+ 0xc0, 0x00, 0x30, 0xf6, 0x02, 0x49, 0x3d, 0x10, 0x6e, 0x20, 0xc9, 0xa6, 0x2f, 0xfe, 0x2c, 0x2b,+ 0x75, 0x2e, 0x45, 0x26, 0xab, 0x48, 0xa9, 0x80, 0xfc, 0x04, 0xcc, 0xd3, 0xb5, 0xba, 0xa3, 0x38,+ 0x31, 0x7d, 0x01, 0xd9, 0xa7, 0x7b, 0x96, 0xb6, 0x63, 0x69, 0x4e, 0xf7, 0xde, 0xe0, 0x78, 0xca,+ 0x50, 0xaa, 0x41, 0x91, 0x65, 0x88, 0xe4, 0x21, 0x85, 0xda, 0x3a, 0x27, 0xbe, 0x1c, 0x3e, 0x42,+ 0x5e, 0x17, 0x52, 0x7f, 0x1f, 0x89, 0x24, 0x6f, 0x8f, 0x5c, 0x67, 0x74, 0x0e, 0x12, 0x87, 0x8d,+ 0xe9, 0x34, 0xed, 0x73, 0xc4, 0xf8, 0x61, 0x5b, 0x05, 0xdf, 0x59, 0x4c, 0x97, 0x79, 0x83, 0x18,+ 0xa4, 0x55, 0x95, 0xeb, 0xbd, 0x53, 0xf5, 0xf1, 0x57, 0x66, 0x46, 0x9f, 0xb2, 0x81, 0x09, 0x51,+ 0x86, 0x22, 0x16, 0xdd, 0x23, 0x93, 0x76, 0x29, 0xc2, 0xd7, 0x1d, 0xd4, 0xbf, 0x36, 0x3f, 0xea,+ 0x4b, 0x11, 0x32, 0xb9, 0x62, 0x54, 0x60, 0xd6, 0x6d, 0x43, 0x9a, 0x0d, 0x92, 0x9c, 0xb0, 0xef,+ 0x58, 0x6c, 0x9d, 0x77, 0x2d, 0x70, 0xfa, 0xf3, 0xb3, 0x0b, 0xe2, 0x40, 0x7e, 0xf4, 0x8a, 0xe5,+ 0x8c, 0x3c, 0x56, 0x71, 0xd1, 0x64, 0xe1, 0x82, 0x0a, 0xcb, 0x13, 0x15, 0x90, 0xec, 0x03, 0x99,+ 0xaf, 0x14, 0x5d, 0x0f, 0x33, 0x4a, 0x94, 0xa5, 0xa8, 0x35, 0x1b, 0xe3, 0x6a, 0xc6, 0x28, 0xff,+ 0x4d, 0xe7, 0x25, 0x84, 0xac, 0x08, 0xae, 0xc5, 0xa2, 0x2a, 0xb8, 0x37, 0x0c, 0x7a, 0xa0, 0xc3,+ 0xce, 0xad, 0x06, 0x1a, 0x9e, 0x8b, 0xfb, 0xd5, 0xf0, 0xc1, 0x1e, 0xd0, 0xb4, 0x9b, 0xb1, 0x44,+ 0xf2, 0x47, 0xc7, 0x68, 0xcf, 0x72, 0xbb, 0x4f, 0x5a, 0xf9, 0xdc, 0x6b, 0xdb, 0xd2, 0xe8, 0x7c,+ 0xc8, 0xee, 0x98, 0xa1, 0xe6, 0xd8, 0x39, 0x07, 0x5f, 0xfd, 0x8e, 0x19, 0xb7, 0x3b, 0xbc, 0xcd,+ ],+ [+ 0x7c, 0xe3, 0x81, 0x73, 0xb2, 0x11, 0xbf, 0x6f, 0x20, 0x98, 0xfe, 0x75, 0x96, 0xef, 0x6c, 0xda,+ 0x50, 0xe1, 0x09, 0x72, 0x54, 0x45, 0xba, 0x34, 0x80, 0x5b, 0xed, 0x3e, 0x53, 0x2c, 0x87, 0xa4,+ 0x57, 0xf3, 0x33, 0x3f, 0x3c, 0xb7, 0x67, 0xb4, 0xa3, 0x25, 0x60, 0x4f, 0x07, 0x6b, 0x1b, 0x47,+ 0x15, 0x0f, 0xe4, 0x0a, 0xea, 0xd1, 0x32, 0x78, 0x36, 0x49, 0x8d, 0x4b, 0xd2, 0xbc, 0xa5, 0xdc,+ 0x1d, 0x0d, 0x4d, 0xcd, 0x9a, 0x82, 0x5f, 0xfc, 0x94, 0x65, 0xbe, 0xe2, 0xf4, 0xc9, 0x1e, 0x44,+ 0xcb, 0x9e, 0x0c, 0x64, 0x71, 0x26, 0x63, 0xb3, 0x14, 0xe8, 0x40, 0x70, 0x8a, 0x0e, 0x19, 0x42,+ 0x6d, 0xac, 0x88, 0x10, 0x5c, 0xdf, 0x41, 0xa9, 0xad, 0xe5, 0xfb, 0x74, 0xcc, 0xd5, 0x06, 0x8e,+ 0x59, 0x86, 0xce, 0x1f, 0x3d, 0x76, 0xe0, 0x8f, 0xb9, 0x77, 0x27, 0x7b, 0xa6, 0xd8, 0x29, 0xd3,+ 0xec, 0xb8, 0x13, 0xf7, 0xfa, 0xc3, 0x51, 0x6a, 0xde, 0x4a, 0x5a, 0xeb, 0xc2, 0x8b, 0x23, 0x48,+ 0x92, 0xcf, 0x62, 0xa8, 0x99, 0xf8, 0xd0, 0x2e, 0x85, 0x61, 0x43, 0xc8, 0xbd, 0xf0, 0x05, 0x93,+ 0xca, 0x4e, 0xf1, 0x7d, 0x30, 0xfd, 0xc4, 0x69, 0x66, 0x2f, 0x08, 0xb1, 0x52, 0xf9, 0x21, 0xe6,+ 0x7a, 0x2b, 0xdd, 0x39, 0x84, 0xff, 0xc0, 0x91, 0xd6, 0x37, 0xd4, 0x7f, 0x2d, 0x9b, 0x5d, 0xa1,+ 0x3b, 0x6e, 0xb5, 0xc5, 0x46, 0x04, 0xf5, 0x90, 0xee, 0x7e, 0x83, 0x1c, 0x03, 0x56, 0xb6, 0xaa,+ 0x00, 0x17, 0x01, 0x35, 0x55, 0x79, 0x0b, 0x12, 0xbb, 0x1a, 0x31, 0xe7, 0x02, 0x28, 0x16, 0xc1,+ 0xf6, 0xa2, 0xdb, 0x18, 0x9c, 0x89, 0x68, 0x38, 0x97, 0xab, 0xc7, 0x2a, 0xd7, 0x3a, 0xf2, 0xc6,+ 0x24, 0x4c, 0xb0, 0x58, 0xa0, 0x22, 0x5e, 0x9d, 0xd9, 0xa7, 0xe9, 0xae, 0xaf, 0x8c, 0x95, 0x9f,+ ],+ [+ 0x28, 0xb7, 0x20, 0xd7, 0xb0, 0x30, 0xc3, 0x09, 0x19, 0xc0, 0x67, 0xd6, 0x00, 0x3c, 0x7e, 0xe7,+ 0xe9, 0xf4, 0x08, 0x5a, 0xf8, 0xb8, 0x2e, 0x05, 0xa6, 0x25, 0x9e, 0x5c, 0xd8, 0x15, 0x0d, 0xe1,+ 0xf6, 0x11, 0x54, 0x6b, 0xcd, 0x21, 0x46, 0x66, 0x5e, 0x84, 0xad, 0x06, 0x38, 0x29, 0x44, 0xc5,+ 0xa2, 0xce, 0xf1, 0xaa, 0xc1, 0x40, 0x71, 0x86, 0xb5, 0xef, 0xfc, 0x36, 0xa8, 0xcb, 0x0a, 0x48,+ 0x27, 0x45, 0x64, 0xa3, 0xaf, 0x8c, 0xb2, 0xc6, 0x9f, 0x07, 0x89, 0xdc, 0x17, 0xd3, 0x49, 0x79,+ 0xfb, 0xfe, 0x1d, 0xd0, 0xb9, 0x88, 0x43, 0x52, 0xbc, 0x01, 0x78, 0x2b, 0x7d, 0x94, 0xc7, 0x0e,+ 0xde, 0xa5, 0xd5, 0x9b, 0xcc, 0xf7, 0x61, 0x7a, 0xc2, 0x74, 0x81, 0x39, 0x03, 0xab, 0x96, 0xa0,+ 0x37, 0xbd, 0x2d, 0x72, 0x75, 0x3f, 0xc9, 0xd4, 0x8e, 0x6f, 0xf9, 0x8d, 0xed, 0x62, 0xdb, 0x1c,+ 0xdf, 0x04, 0xac, 0x1b, 0x6c, 0x14, 0x4b, 0x63, 0xf0, 0xbf, 0xb4, 0x82, 0xec, 0x7b, 0x1a, 0x59,+ 0x92, 0xd2, 0x10, 0x60, 0xb6, 0x3d, 0x5f, 0xe6, 0x80, 0x6e, 0x70, 0xc4, 0xf2, 0x35, 0xd9, 0x7c,+ 0xee, 0xe5, 0x41, 0xa4, 0x5b, 0x50, 0xdd, 0xbb, 0x4c, 0xf3, 0x1f, 0x9d, 0x5d, 0x57, 0x55, 0x51,+ 0x97, 0xe3, 0x58, 0x42, 0x4d, 0x9c, 0x73, 0xba, 0xc8, 0x77, 0x31, 0x69, 0x26, 0xae, 0xea, 0x8a,+ 0xda, 0x22, 0xb3, 0x87, 0x56, 0xfa, 0x93, 0x0b, 0x34, 0x16, 0x33, 0xe8, 0xe4, 0x53, 0xbe, 0xa9,+ 0xb1, 0x3a, 0x3e, 0xf5, 0x90, 0x6a, 0xcf, 0x3b, 0x12, 0xfd, 0x8f, 0x9a, 0xa7, 0x47, 0x91, 0x99,+ 0xeb, 0x0f, 0x24, 0xff, 0x23, 0x18, 0x85, 0x4e, 0x7f, 0x0c, 0xe0, 0xa1, 0xe2, 0xd1, 0x2c, 0x2a,+ 0x4a, 0x02, 0x4f, 0x1e, 0x95, 0x68, 0x8b, 0x98, 0x83, 0x6d, 0x76, 0xca, 0x65, 0x32, 0x13, 0x2f,+ ],+ [+ 0xc3, 0x82, 0x9a, 0xa4, 0xba, 0x81, 0x60, 0x37, 0x34, 0x35, 0xfc, 0x80, 0xa8, 0x51, 0x65, 0x67,+ 0xed, 0x30, 0x5f, 0x10, 0xd3, 0x4a, 0x27, 0x2f, 0x13, 0xb9, 0x2a, 0xd2, 0xcc, 0xe1, 0xef, 0xae,+ 0xeb, 0xbe, 0xf4, 0xbd, 0xcf, 0x43, 0xb3, 0xc5, 0x88, 0x84, 0xb7, 0xdd, 0x39, 0x40, 0xce, 0x48,+ 0x6d, 0x9b, 0x72, 0x61, 0x7e, 0xe7, 0xa1, 0x4e, 0x53, 0x2e, 0x77, 0x3b, 0xe2, 0xc9, 0x36, 0x22,+ 0x1b, 0x6e, 0x73, 0xb1, 0x03, 0xb2, 0x4c, 0x87, 0xa9, 0xd4, 0x4d, 0x0f, 0xd8, 0x15, 0x6c, 0xaa,+ 0x18, 0xf6, 0x49, 0x57, 0x5d, 0xfb, 0x7a, 0x14, 0x94, 0x63, 0xa0, 0x11, 0xb0, 0x9e, 0xde, 0x05,+ 0x46, 0xc8, 0xee, 0x47, 0xdb, 0xdc, 0x24, 0x89, 0x9c, 0x91, 0x97, 0x29, 0xe9, 0x7b, 0xc1, 0x07,+ 0x1e, 0xb8, 0xfd, 0xfe, 0xac, 0xc6, 0x62, 0x98, 0x4f, 0xf1, 0x79, 0xe0, 0xe8, 0x6b, 0x78, 0x56,+ 0xb6, 0x8d, 0x04, 0x50, 0x86, 0xca, 0x6f, 0x20, 0xe6, 0xea, 0xe5, 0x76, 0x17, 0x1c, 0x74, 0x7f,+ 0xbc, 0x0d, 0x2c, 0x85, 0xf7, 0x66, 0x96, 0xe4, 0x8b, 0x75, 0x3f, 0x4b, 0xd9, 0x38, 0xaf, 0x7c,+ 0xda, 0x0b, 0x83, 0x2d, 0x31, 0x32, 0xa2, 0xf5, 0x1d, 0x59, 0x41, 0x45, 0xbf, 0x3c, 0x1f, 0xf8,+ 0xf9, 0x8a, 0xd0, 0x16, 0x25, 0x69, 0x12, 0x99, 0x9d, 0x21, 0x95, 0xab, 0x01, 0xa6, 0xd7, 0xb5,+ 0xc0, 0x7d, 0xff, 0x58, 0x0e, 0x3a, 0x92, 0xd1, 0x55, 0xe3, 0x08, 0x9f, 0xd6, 0x3e, 0x52, 0x8e,+ 0xfa, 0xa3, 0xc7, 0x02, 0xcd, 0xdf, 0x8f, 0x64, 0x19, 0x8c, 0xf3, 0xa7, 0x0c, 0x5e, 0x0a, 0x6a,+ 0x09, 0xf0, 0x93, 0x5b, 0x42, 0xc2, 0x06, 0x23, 0xec, 0x71, 0xad, 0xb4, 0xcb, 0xbb, 0x70, 0x28,+ 0xd5, 0x1a, 0x5c, 0x33, 0x68, 0x5a, 0x00, 0x44, 0x90, 0xa5, 0xc4, 0x26, 0x3d, 0x2b, 0xf2, 0x54,+ ],+ [+ 0x96, 0xad, 0xda, 0x1f, 0xed, 0x33, 0xe1, 0x81, 0x69, 0x08, 0x0d, 0x0a, 0xdb, 0x35, 0x77, 0x9a,+ 0x64, 0xd1, 0xfc, 0x78, 0xaa, 0x1b, 0xd0, 0x67, 0xa0, 0xdd, 0xfa, 0x6c, 0x63, 0x71, 0x05, 0x84,+ 0x17, 0x6a, 0x89, 0x4f, 0x66, 0x7f, 0xc6, 0x50, 0x55, 0x92, 0x6f, 0xbd, 0xe7, 0xd2, 0x40, 0x72,+ 0x8d, 0xbb, 0xec, 0x06, 0x42, 0x8a, 0xe4, 0x88, 0x9d, 0x7e, 0x7a, 0x82, 0x27, 0x13, 0x41, 0x1a,+ 0xaf, 0xc8, 0xa4, 0x76, 0xb4, 0xc2, 0xfe, 0x6d, 0x1c, 0xd9, 0x61, 0x30, 0xb3, 0x7c, 0xea, 0xf7,+ 0x29, 0x0f, 0xf2, 0x3b, 0x51, 0xc1, 0xde, 0x5f, 0xe5, 0x2a, 0x2f, 0x99, 0x0b, 0x5d, 0xa3, 0x2b,+ 0x4a, 0xab, 0x95, 0xa5, 0xd3, 0x58, 0x56, 0xee, 0x28, 0x31, 0x00, 0xcc, 0x15, 0x46, 0xca, 0xe6,+ 0x86, 0x38, 0x3c, 0x65, 0xf5, 0xe3, 0x9f, 0xd6, 0x5b, 0x09, 0x49, 0x83, 0x70, 0x2d, 0x53, 0xa9,+ 0x7d, 0xe2, 0xc4, 0xac, 0x8e, 0x5e, 0xb8, 0x25, 0xf4, 0xb9, 0x57, 0xf3, 0xf1, 0x68, 0x47, 0xb2,+ 0xa2, 0x59, 0x20, 0xce, 0x34, 0x79, 0x5c, 0x90, 0x0e, 0x1e, 0xbe, 0xd5, 0x22, 0x23, 0xb1, 0xc9,+ 0x18, 0x62, 0x16, 0x2e, 0x91, 0x3e, 0x07, 0x8f, 0xd8, 0x3f, 0x93, 0x3d, 0xd4, 0x9b, 0xdf, 0x85,+ 0x21, 0xfb, 0x11, 0x74, 0x97, 0xc7, 0xd7, 0xdc, 0x4c, 0x19, 0x45, 0x98, 0xe9, 0x43, 0x02, 0x4b,+ 0xbc, 0xc3, 0x04, 0x9c, 0x6b, 0xf0, 0x75, 0x52, 0xa7, 0x26, 0xf6, 0xc5, 0xba, 0xcf, 0xb0, 0xb7,+ 0xae, 0x5a, 0xa1, 0xbf, 0x03, 0x8b, 0x80, 0x12, 0x6e, 0x0c, 0xeb, 0xf9, 0xc0, 0x44, 0x24, 0xef,+ 0x10, 0xf8, 0xa8, 0x8c, 0xe8, 0x7b, 0xff, 0x9e, 0x2c, 0xcd, 0x60, 0x36, 0x87, 0xb5, 0x94, 0xa6,+ 0x54, 0x73, 0x3a, 0x14, 0x4e, 0x01, 0x1d, 0xb6, 0xfd, 0x37, 0x48, 0x4d, 0x39, 0xcb, 0xe0, 0x32,+ ],+];++#[derive(Debug, Clone, Copy)]+pub(super) struct Cipher {+ ft: [u8; 8],+ sb: [u8; 8],+}++impl Cipher {+ /// Identity cipher: what the SDK uses before any encryption key is set.+ /// Basically a nop.+ pub(super) const IDENTITY: Self = Self { ft: [0; 8], sb: [0; 8] };++ /// Reconstruct the cipher the SDK is about to use from the 16-byte+ /// extension key the guest just wrote to nunchuk register 0x40.+ ///+ /// The SDK chose a random `idx` in 0..7 that isn't transmitted in the key+ /// (see `kpad_nunchuk_keygen` 0x803D9210).+ /// We brute-force it: try every idx and pick the one whose+ /// `GenerateKeyData(rand, idx)` reproduces the trailing 6 bytes of the key.+ pub(super) fn from_extension_key(ext_key: &[u8; 16]) -> Self {+ let mut rand: [u8; 10] = ext_key[..10].try_into().unwrap();+ rand.reverse();+ let mut key: [u8; 6] = ext_key[10..].try_into().unwrap();+ key.reverse();++ for idx in 0..7 {+ if self::generate_key_data(&rand, idx) == key {+ let (ft, sb) = self::generate_tables(&rand, &key, idx);+ return Self { ft, sb };+ }+ }++ tracing::warn!(+ key = format!("{ext_key:02X?}"),+ "nunchuk encryption key did not match any idx; falling back to identity"+ );+ Self::IDENTITY+ }++ pub(super) fn encrypt(&self, data: &mut [u8], addr: u32) {+ for (i, b) in data.iter_mut().enumerate() {+ let k = ((addr + i as u32) & 7) as usize;+ *b = b.wrapping_sub(self.ft[k]) ^ self.sb[k];+ }+ }+}++fn generate_key_data(rand: &[u8; 10], idx: usize) -> [u8; 6] {+ let ans = &ANS_TBL_1ST_PARTY[idx];+ let t0: [u8; 10] = std::array::from_fn(|i| KEYGEN_SBOX_1ST_PARTY[rand[i] as usize]);++ [+ ((ans[0] ^ t0[5]).rotate_right(t0[2] as u32).wrapping_sub(t0[9])) ^ t0[4],+ ((ans[1] ^ t0[1]).rotate_right(t0[0] as u32).wrapping_sub(t0[5])) ^ t0[7],+ ((ans[2] ^ t0[6]).rotate_right(t0[8] as u32).wrapping_sub(t0[2])) ^ t0[0],+ ((ans[3] ^ t0[4]).rotate_right(t0[7] as u32).wrapping_sub(t0[3])) ^ t0[2],+ ((ans[4] ^ t0[1]).rotate_right(t0[6] as u32).wrapping_sub(t0[3])) ^ t0[4],+ ((ans[5] ^ t0[7]).rotate_right(t0[8] as u32).wrapping_sub(t0[5])) ^ t0[9],+ ]+}++fn generate_tables(rand: &[u8; 10], key: &[u8; 6], idx: usize) -> ([u8; 8], [u8; 8]) {+ let sbox_a = &SBOXES_1ST_PARTY[idx];+ let sbox_b = &SBOXES_1ST_PARTY[idx + 1];+ let a = |i: u8| sbox_a[i as usize];+ let b = |i: u8| sbox_b[i as usize];++ let ft = [+ a(key[4]) ^ b(rand[3]),+ a(key[2]) ^ b(rand[5]),+ a(key[5]) ^ b(rand[7]),+ a(key[0]) ^ b(rand[2]),+ a(key[1]) ^ b(rand[4]),+ a(key[3]) ^ b(rand[9]),+ a(rand[0]) ^ b(rand[6]),+ a(rand[1]) ^ b(rand[8]),+ ];++ let sb = [+ a(key[0]) ^ b(rand[1]),+ a(key[5]) ^ b(rand[4]),+ a(key[3]) ^ b(rand[0]),+ a(key[2]) ^ b(rand[9]),+ a(key[4]) ^ b(rand[7]),+ a(key[1]) ^ b(rand[8]),+ a(rand[3]) ^ b(rand[5]),+ a(rand[2]) ^ b(rand[6]),+ ];++ (ft, sb)+}diff --git a/crates/gecko/src/hollywood/ipc/usb/wiimote.rs b/crates/gecko/src/hollywood/ipc/usb/wiimote.rsindex 76f0941..16f1ded 100644--- a/crates/gecko/src/hollywood/ipc/usb/wiimote.rs+++ b/crates/gecko/src/hollywood/ipc/usb/wiimote.rs@@ -1,3 +1,5 @@+use super::crypto::Cipher;+pub const BTN_TWO: u16 = 0x0001;pub const BTN_ONE: u16 = 0x0002;pub const BTN_B: u16 = 0x0004;@@ -13,6 +15,10 @@ pub const BTN_PLUS: u16 = 0x1000;pub const NUNCHUK_BTN_C: u8 = 0x02;pub const NUNCHUK_BTN_Z: u8 = 0x01;+pub const NUNCHUK_STICK_MIN: u8 = 0x00;+pub const NUNCHUK_STICK_CENTER: u8 = 0x80;+pub const NUNCHUK_STICK_MAX: u8 = 0xFF;+const HID_PREFIX_INPUT: u8 = 0xA1;const HID_PREFIX_OUTPUT: u8 = 0xA2;@@ -70,10 +76,10 @@ enum ReportMode {CoreExt19 = 0x34,/// Core + accel + 16-byte extension.CoreAccelExt16 = 0x35,+ /// Core + 10-byte basic IR + 9-byte extension (no accel).+ CoreIrBasicExt9 = 0x36,/// Core + accel + 10-byte basic IR + 6-byte extension.- CoreAccelIrBasicExt = 0x36,- /// Core + accel + 10-byte basic IR + 6-byte extension (alternate framing).- CoreAccelIrFullExt = 0x37,+ CoreAccelIrBasicExt6 = 0x37,}impl ReportMode {@@ -85,8 +91,8 @@ impl ReportMode {0x33 => Self::CoreAccelIrExt,0x34 => Self::CoreExt19,0x35 => Self::CoreAccelExt16,- 0x36 => Self::CoreAccelIrBasicExt,- 0x37 => Self::CoreAccelIrFullExt,+ 0x36 => Self::CoreIrBasicExt9,+ 0x37 => Self::CoreAccelIrBasicExt6,_ => return None,})}@@ -109,11 +115,14 @@ const NUNCHUK_ID: [u8; 6] = [0x00, 0x00, 0xA4, 0x20, 0x00, 0x00];const NUNCHUK_CALIBRATION: [u8; 16] = [0x80, 0x80, 0x80, 0x00, // accel zero G (X, Y, Z, padding)0xB3, 0xB3, 0xB3, 0x00, // accel one G (X, Y, Z, padding)- 0xFF, 0x00, 0x80, // stick X max, min, center- 0xFF, 0x00, 0x80, // stick Y max, min, center+ 0xE0, 0x20, 0x80, // stick X max, min, center+ 0xE0, 0x20, 0x80, // stick Y max, min, center0x00, 0x00, // checksum (filled below at runtime)];+const NUNCHUK_KEY_REG_BASE: u8 = 0x40;+const NUNCHUK_KEY_LEN: usize = 16;+#[derive(Debug, Clone)]pub(super) struct WiimoteState {buttons: u16,@@ -128,6 +137,9 @@ pub(super) struct WiimoteState {nunchuk_stick_x: u8,nunchuk_stick_y: u8,nunchuk_calibration: [u8; 16],+ nunchuk_key_buf: [u8; NUNCHUK_KEY_LEN],+ nunchuk_key_valid: u16,+ nunchuk_cipher: Cipher,}impl Default for WiimoteState {@@ -150,9 +162,12 @@ impl Default for WiimoteState {eeprom,nunchuk_attached: true,nunchuk_buttons: 0,- nunchuk_stick_x: 0x80,- nunchuk_stick_y: 0x80,+ nunchuk_stick_x: NUNCHUK_STICK_CENTER,+ nunchuk_stick_y: NUNCHUK_STICK_CENTER,nunchuk_calibration,+ nunchuk_key_buf: [0; NUNCHUK_KEY_LEN],+ nunchuk_key_valid: 0,+ nunchuk_cipher: Cipher::IDENTITY,}}}@@ -198,14 +213,13 @@ impl WiimoteState {r.extend_from_slice(&accel);self.append_nunchuk_ext_padded(&mut r, 16);}- ReportMode::CoreAccelIrBasicExt => {- r.extend_from_slice(&accel);+ ReportMode::CoreIrBasicExt9 => {r.extend_from_slice(&ir_basic);- r.extend_from_slice(&self.nunchuk_extension_bytes());+ self.append_nunchuk_ext_padded(&mut r, 9);}- ReportMode::CoreAccelIrFullExt => {+ ReportMode::CoreAccelIrBasicExt6 => {r.extend_from_slice(&accel);- r.extend_from_slice(&ir_extended);+ r.extend_from_slice(&ir_basic);r.extend_from_slice(&self.nunchuk_extension_bytes());}}@@ -221,14 +235,16 @@ impl WiimoteState {// Bits 0,1 of the trailing byte are inverted: 1 = button NOT pressed.let inv_buttons = (!self.nunchuk_buttons) & 0x03;- [+ let mut bytes = [self.nunchuk_stick_x,self.nunchuk_stick_y,0x80, // accel X high bits (zero G)0x80, // accel Y high bits (zero G)0xB3, // accel Z high bits (+1G gravity)inv_buttons,- ]+ ];+ self.nunchuk_cipher.encrypt(&mut bytes, 0);+ bytes}/// Append the 6-byte nunchuk extension followed by 0xFF padding so the@@ -301,16 +317,18 @@ impl WiimoteState {OutputReportId::WriteMemoryAndRegisters if body.len() >= 5 => {let address = self::decode_mem_address(body);- tracing::debug!(addr = format!("{address:#08x}"), "Wiimote write memory");-let address_space = body[0] & 0x06;let size = body[4] as usize;+ let payload = &body[5..5 + size.min(body.len().saturating_sub(5)).min(16)];++ tracing::debug!(addr = format!("{address:#08x}"), "Wiimote write memory");if address_space == 0 {- let payload = &body[5..5 + size.min(body.len().saturating_sub(5)).min(16)];let end = (address as usize + payload.len()).min(self.eeprom.len());let dst = &mut self.eeprom[address as usize..end];dst.copy_from_slice(&payload[..dst.len()]);+ } else {+ self.observe_register_write(address, payload);}self::trivial_ack(self.button_bytes(), raw_id)@@ -392,13 +410,53 @@ impl WiimoteState {break;}- out.push(self.read_chunk_report((address as u16) + offset as u16, &backing[start..end], 0));+ // The SDK runs `kpad_extension_crypt_buffer` (0x803DA000) over the+ // returned bytes when the address sits in extension register space+ // (see `kpad_dispatch_report` 0x803D66D0 read handler branch on+ // `v13 == 1188`, i.e. high word == 0x4A4). It uses the low 16 bits+ // of the request address as the cipher offset.+ let chunk_addr = (address as u16) + offset as u16;+ let mut chunk_data: [u8; 16] = [0; 16];+ chunk_data[..chunk].copy_from_slice(&backing[start..end]);+ self.nunchuk_cipher.encrypt(&mut chunk_data[..chunk], chunk_addr as u32);++ out.push(self.read_chunk_report(chunk_addr, &chunk_data[..chunk], 0));offset += chunk;}out}+ /// Track writes to nunchuk register 0x40-0x4F so we can mirror the cipher+ /// the SDK builds in `kpad_nunchuk_keygen` (0x803D9210). Once all 16 bytes+ /// have arrived we derive `ft`/`sb` and switch our outgoing extension+ /// bytes and register read responses to encrypted output.+ fn observe_register_write(&mut self, address: u32, payload: &[u8]) {+ let reg = (address & 0xFF) as u8;+ let Some(rel) = reg.checked_sub(NUNCHUK_KEY_REG_BASE) else {+ return;+ };++ let rel = rel as usize;+ if rel >= NUNCHUK_KEY_LEN {+ return;+ }++ let count = payload.len().min(NUNCHUK_KEY_LEN - rel);+ self.nunchuk_key_buf[rel..rel + count].copy_from_slice(&payload[..count]);+ for i in 0..count {+ self.nunchuk_key_valid |= 1 << (rel + i);+ }++ if self.nunchuk_key_valid == u16::MAX {+ self.nunchuk_cipher = Cipher::from_extension_key(&self.nunchuk_key_buf);+ tracing::debug!(+ key = format!("{:02X?}", self.nunchuk_key_buf),+ "Wiimote nunchuk encryption key complete"+ );+ }+ }+fn read_chunk_report(&self, address: u16, data: &[u8], error: u8) -> Vec<u8> {let [bb0, bb1] = self.button_bytes();let chunk_len = data.len().min(16);diff --git a/crates/gecko/src/input.rs b/crates/gecko/src/input.rsindex 53be6b4..7e581c6 100644--- a/crates/gecko/src/input.rs+++ b/crates/gecko/src/input.rs@@ -1,4 +1,5 @@use crate::flipper::si::pad;+use crate::hollywood::ipc::usb;use crate::{GC, SystemId, WII};#[derive(Clone, Copy, Debug)]@@ -24,8 +25,8 @@ impl HostInput {Self::Wii {wiimote_buttons: 0,nunchuk_buttons: 0,- nunchuk_stick_x: 0x80,- nunchuk_stick_y: 0x80,+ nunchuk_stick_x: usb::NUNCHUK_STICK_CENTER,+ nunchuk_stick_y: usb::NUNCHUK_STICK_CENTER,}}diff --git a/crates/mcp/src/server.rs b/crates/mcp/src/server.rsindex b8b0282..f5ffe94 100644--- a/crates/mcp/src/server.rs+++ b/crates/mcp/src/server.rs@@ -108,6 +108,20 @@ pub struct SetPadArgs {pub buttons: Option<u16>,}+#[derive(Debug, Deserialize, schemars::JsonSchema)]+pub struct SetWiimoteArgs {+ #[schemars(+ description = "Wiimote core button bitmask: A=0x0008, B=0x0004, ONE=0x0002, TWO=0x0001, MINUS=0x0010, HOME=0x0080, PLUS=0x1000, LEFT=0x0100, RIGHT=0x0200, DOWN=0x0400, UP=0x0800"+ )]+ pub buttons: Option<u16>,+ #[schemars(description = "Nunchuk button bitmask: Z=0x01, C=0x02")]+ pub nunchuk_buttons: Option<u8>,+ #[schemars(description = "Nunchuk stick X (0..=255, center=0x80, full-left=0x00, full-right=0xFF)")]+ pub nunchuk_stick_x: Option<u8>,+ #[schemars(description = "Nunchuk stick Y (0..=255, center=0x80, full-down=0x00, full-up=0xFF)")]+ pub nunchuk_stick_y: Option<u8>,+}+#[derive(Debug, Serialize)]struct StatusJson {loaded: bool,@@ -554,6 +568,26 @@ impl McpServer {s.backend.as_mut().unwrap().apply_host_input(&input);ok_json(&json!({"applied": true}))}++ #[tool(+ description = "Update the Wii remote + nunchuk state. Defaults: buttons=0, stick centered (0x80). Unspecified fields go to those defaults."+ )]+ async fn set_wiimote(&self, Parameters(args): Parameters<SetWiimoteArgs>) -> Result<CallToolResult, McpError> {+ require_loaded(&self.shared)?;+ let input = gecko::HostInput::Wii {+ wiimote_buttons: args.buttons.unwrap_or(0),+ nunchuk_buttons: args.nunchuk_buttons.unwrap_or(0),+ nunchuk_stick_x: args+ .nunchuk_stick_x+ .unwrap_or(gecko::hollywood::ipc::usb::NUNCHUK_STICK_CENTER),+ nunchuk_stick_y: args+ .nunchuk_stick_y+ .unwrap_or(gecko::hollywood::ipc::usb::NUNCHUK_STICK_CENTER),+ };+ let mut s = self.shared.state.lock().unwrap();+ s.backend.as_mut().unwrap().apply_host_input(&input);+ ok_json(&json!({"applied": true}))+ }}#[tool_handler]@@ -563,7 +597,7 @@ impl ServerHandler for McpServer {.with_server_info(Implementation::from_build_env()).with_protocol_version(ProtocolVersion::V_2024_11_05).with_instructions(- "Headless gecko (GameCube/Wii) emulator. Tools: load_game, status, pause/resume, step, run_frames, run_until_pc, run_until_vsync, read_memory, write_memory, search_bytes, get_registers, disassemble, get_view, list_textures, get_texture, list_bound_textures, set_pad."+ "Headless gecko (GameCube/Wii) emulator. Tools: load_game, status, pause/resume, step, run_frames, run_until_pc, run_until_vsync, read_memory, write_memory, search_bytes, get_registers, disassemble, get_view, list_textures, get_texture, list_bound_textures, set_pad, set_wiimote.".to_string(),)}diff --git a/crates/tinyapp/src/main.rs b/crates/tinyapp/src/main.rsindex 2272985..b245ae5 100644--- a/crates/tinyapp/src/main.rs+++ b/crates/tinyapp/src/main.rs@@ -11,7 +11,7 @@ use gecko::HostInput;#[cfg(feature = "audio-wav-dump")]use gecko::audio::WavAudioSink;use gecko::audio::{AudioSink, EmptyAudioSink, MultiplexAudioSink};-use gecko::flipper::si::pad::{self, PadStatus, STICK_CENTER};+use gecko::flipper::si::pad::{self, PadStatus, STICK_CENTER, STICK_MAX, STICK_MIN, TRIGGER_MAX, TRIGGER_MIN};use gecko::gamecube::GameCube;use gecko::hollywood::ipc::usb as wiimote;use gecko::system::{self, System, SystemId};@@ -476,10 +476,10 @@ fn set_bit<T: std::ops::BitOrAssign + std::ops::BitAndAssign + std::ops::Not<Outfn update_pad(pad: &mut PadStatus, key: KeyCode, pressed: bool) {match key {// Analog stick- KeyCode::ArrowUp => pad.stick_y = if pressed { 255 } else { STICK_CENTER },- KeyCode::ArrowDown => pad.stick_y = if pressed { 0 } else { STICK_CENTER },- KeyCode::ArrowLeft => pad.stick_x = if pressed { 0 } else { STICK_CENTER },- KeyCode::ArrowRight => pad.stick_x = if pressed { 255 } else { STICK_CENTER },+ KeyCode::ArrowUp => pad.stick_y = if pressed { STICK_MAX } else { STICK_CENTER },+ KeyCode::ArrowDown => pad.stick_y = if pressed { STICK_MIN } else { STICK_CENTER },+ KeyCode::ArrowLeft => pad.stick_x = if pressed { STICK_MIN } else { STICK_CENTER },+ KeyCode::ArrowRight => pad.stick_x = if pressed { STICK_MAX } else { STICK_CENTER },// Face buttonsKeyCode::KeyX => self::set_bit(&mut pad.buttons, pad::A, pressed),@@ -491,11 +491,11 @@ fn update_pad(pad: &mut PadStatus, key: KeyCode, pressed: bool) {// TriggersKeyCode::KeyA => {self::set_bit(&mut pad.buttons, pad::L, pressed);- pad.trigger_left = if pressed { 255 } else { 0 };+ pad.trigger_left = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };}KeyCode::KeyS => {self::set_bit(&mut pad.buttons, pad::R, pressed);- pad.trigger_right = if pressed { 255 } else { 0 };+ pad.trigger_right = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };}KeyCode::KeyD => self::set_bit(&mut pad.buttons, pad::Z, pressed),@@ -526,12 +526,12 @@ pub fn update_wiimote_keys(buttons: &mut u16, key: KeyCode, pressed: bool) {}pub fn update_nunchuk_keys(buttons: &mut u8, stick_x: &mut u8, stick_y: &mut u8, key: KeyCode, pressed: bool) {- const NEUTRAL: u8 = 0x80;+ use wiimote::{NUNCHUK_STICK_CENTER as C, NUNCHUK_STICK_MAX as MAX, NUNCHUK_STICK_MIN as MIN};match key {- KeyCode::KeyW => *stick_y = if pressed { 0xFF } else { NEUTRAL },- KeyCode::KeyS => *stick_y = if pressed { 0x00 } else { NEUTRAL },- KeyCode::KeyA => *stick_x = if pressed { 0x00 } else { NEUTRAL },- KeyCode::KeyD => *stick_x = if pressed { 0xFF } else { NEUTRAL },+ KeyCode::KeyW => *stick_y = if pressed { MAX } else { C },+ KeyCode::KeyS => *stick_y = if pressed { MIN } else { C },+ KeyCode::KeyA => *stick_x = if pressed { MIN } else { C },+ KeyCode::KeyD => *stick_x = if pressed { MAX } else { C },KeyCode::KeyQ => self::set_bit(buttons, wiimote::NUNCHUK_BTN_Z, pressed),KeyCode::KeyE => self::set_bit(buttons, wiimote::NUNCHUK_BTN_C, pressed),_ => {}diff --git a/crates/web/src/lib.rs b/crates/web/src/lib.rsindex 6a6fe07..5dd3170 100644--- a/crates/web/src/lib.rs+++ b/crates/web/src/lib.rs@@ -5,7 +5,7 @@ use std::sync::{Arc, Mutex};use egui::ViewportId;use gecko::HostInput;-use gecko::flipper::si::pad::{self, PadStatus, STICK_CENTER};+use gecko::flipper::si::pad::{self, PadStatus, STICK_CENTER, STICK_MAX, STICK_MIN, TRIGGER_MAX, TRIGGER_MIN};use gecko::flipper::vi::regs::RefreshRate;use gecko::gamecube::GameCube;use gecko::host::{GxAction, RenderSink};@@ -525,10 +525,10 @@ fn update_pad(pad: &mut PadStatus, key: KeyCode, pressed: bool) {};match key {- KeyCode::ArrowUp => pad.stick_y = if pressed { 255 } else { STICK_CENTER },- KeyCode::ArrowDown => pad.stick_y = if pressed { 0 } else { STICK_CENTER },- KeyCode::ArrowLeft => pad.stick_x = if pressed { 0 } else { STICK_CENTER },- KeyCode::ArrowRight => pad.stick_x = if pressed { 255 } else { STICK_CENTER },+ KeyCode::ArrowUp => pad.stick_y = if pressed { STICK_MAX } else { STICK_CENTER },+ KeyCode::ArrowDown => pad.stick_y = if pressed { STICK_MIN } else { STICK_CENTER },+ KeyCode::ArrowLeft => pad.stick_x = if pressed { STICK_MIN } else { STICK_CENTER },+ KeyCode::ArrowRight => pad.stick_x = if pressed { STICK_MAX } else { STICK_CENTER },KeyCode::KeyX => set_button(&mut pad.buttons, pad::A, pressed),KeyCode::KeyZ => set_button(&mut pad.buttons, pad::B, pressed),KeyCode::KeyC => set_button(&mut pad.buttons, pad::X, pressed),@@ -536,11 +536,11 @@ fn update_pad(pad: &mut PadStatus, key: KeyCode, pressed: bool) {KeyCode::Enter => set_button(&mut pad.buttons, pad::START, pressed),KeyCode::KeyA => {set_button(&mut pad.buttons, pad::L, pressed);- pad.trigger_left = if pressed { 255 } else { 0 };+ pad.trigger_left = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };}KeyCode::KeyS => {set_button(&mut pad.buttons, pad::R, pressed);- pad.trigger_right = if pressed { 255 } else { 0 };+ pad.trigger_right = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };}KeyCode::KeyD => set_button(&mut pad.buttons, pad::Z, pressed),KeyCode::KeyI => set_button(&mut pad.buttons, pad::DPAD_UP, pressed),