From 2765475e7b3948faf28028ce18e1da0ce0bb67be Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 28 Dec 2018 15:13:08 -0600 Subject: [PATCH] HW: DK Bongos actual fix --- Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp | 2 +- Source/Core/Core/HW/SI/SI_DeviceGCController.cpp | 2 +- Source/Core/Core/HW/SI/SI_DeviceGCController.h | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp index 0650a7c504..3ef843f950 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp @@ -66,7 +66,7 @@ bool CSIDevice_GCAdapter::GetData(u32& hi, u32& low) if (m_simulate_konga) { - hi &= CSIDevice_TaruKonga::BUTTON_MASK; + hi &= CSIDevice_TaruKonga::HI_BUTTON_MASK; } return true; diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp index 994b068a1d..441981178e 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp @@ -355,7 +355,7 @@ bool CSIDevice_TaruKonga::GetData(u32& hi, u32& low) // Unsets the first 16 bits (StickX/Y), PAD_USE_ORIGIN, // and all buttons except: A, B, X, Y, Start, R - hi &= BUTTON_MASK; + hi &= HI_BUTTON_MASK; return true; } diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.h b/Source/Core/Core/HW/SI/SI_DeviceGCController.h index 87d6197819..8c117ccc3b 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCController.h +++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.h @@ -123,7 +123,8 @@ public: bool GetData(u32& hi, u32& low) override; - static const u32 BUTTON_MASK = (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | - PAD_BUTTON_START | PAD_TRIGGER_R); + static const u32 HI_BUTTON_MASK = + (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_BUTTON_START | PAD_TRIGGER_R) + << 16; }; } // namespace SerialInterface