Merge pull request #7659 from jordan-woyak/dk-bongos-fix2

HW: DK Bongos actual fix
dolphin-emu · Dec 29, 2018 · 187058a · 187058a
2 parents dd1fc70 + 2765475
commit 187058a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -123,7 +123,8 @@ class CSIDevice_TaruKonga : public CSIDevice_GCController
 
   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