From 10c2101e72de7f764f183ebd33fad0125550c92c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 25 Nov 2018 16:24:55 -0600 Subject: [PATCH] WiimoteReal: Unbreak. --- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 9 ++------- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index a121ced085..ac039daa15 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -966,7 +966,6 @@ void Wiimote::ControlChannel(const u16 channel_id, const void* data, u32 size) return; } - // this all good? m_reporting_channel = channel_id; const hid_packet* hidp = reinterpret_cast(data); @@ -1008,7 +1007,6 @@ void Wiimote::ControlChannel(const u16 channel_id, const void* data, u32 size) void Wiimote::InterruptChannel(const u16 channel_id, const void* data, u32 size) { - // this all good? m_reporting_channel = channel_id; const hid_packet* hidp = reinterpret_cast(data); @@ -1019,11 +1017,8 @@ void Wiimote::InterruptChannel(const u16 channel_id, const void* data, u32 size) switch (hidp->param) { case HID_PARAM_OUTPUT: - { - const wm_report* sr = reinterpret_cast(hidp->data); - HidOutputReport(sr); - } - break; + HidOutputReport(reinterpret_cast(hidp->data)); + break; default: PanicAlert("HidInput: HID_TYPE_DATA - param 0x%02x", hidp->param); diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index cd6a283d1b..97c4fbd327 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -680,9 +680,9 @@ private: // Activate motion plus: reg_data.ext_identifier[2] = ACTIVE_DEVICE_ADDR << 1; - times_updated_since_activation = 0x2; + reg_data.initialization_status = 0x2; - // Test some hax + // Some hax to disable encryption: std::array data = {0x55}; i2c_bus.BusWrite(ACTIVE_DEVICE_ADDR, 0xf0, (int)data.size(), data.data()); }