From 566a7a4829ea66cf86ad104164ea66b73987c1a5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 20 Jan 2015 21:03:55 -0500 Subject: [PATCH 1/3] SI_DeviceKeyboard: Remove superfluous virtual specifiers. Removes an unnecessary memset as well. --- Source/Core/Core/HW/SI_DeviceKeyboard.cpp | 3 +-- Source/Core/Core/HW/SI_DeviceKeyboard.h | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp index bd1ba902ba..a6abb31508 100644 --- a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp +++ b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp @@ -51,8 +51,7 @@ int CSIDevice_Keyboard::RunBuffer(u8* _pBuffer, int _iLength) KeyboardStatus CSIDevice_Keyboard::GetKeyboardStatus() { - KeyboardStatus KeyStatus; - memset(&KeyStatus, 0, sizeof(KeyStatus)); + KeyboardStatus KeyStatus = {}; Keyboard::GetStatus(ISIDevice::m_iDeviceNumber, &KeyStatus); return KeyStatus; } diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.h b/Source/Core/Core/HW/SI_DeviceKeyboard.h index 923a5a8603..8155b80ec0 100644 --- a/Source/Core/Core/HW/SI_DeviceKeyboard.h +++ b/Source/Core/Core/HW/SI_DeviceKeyboard.h @@ -50,17 +50,17 @@ public: CSIDevice_Keyboard(SIDevices device, int _iDeviceNumber); // Run the SI Buffer - virtual int RunBuffer(u8* _pBuffer, int _iLength) override; + int RunBuffer(u8* _pBuffer, int _iLength) override; // Return true on new data - virtual bool GetData(u32& _Hi, u32& _Low) override; + bool GetData(u32& _Hi, u32& _Low) override; - virtual KeyboardStatus GetKeyboardStatus(); - virtual void MapKeys(KeyboardStatus& KeyStatus, u8* key); + KeyboardStatus GetKeyboardStatus(); + void MapKeys(KeyboardStatus& KeyStatus, u8* key); // Send a command directly - virtual void SendCommand(u32 _Cmd, u8 _Poll) override; + void SendCommand(u32 _Cmd, u8 _Poll) override; // Savestate support - virtual void DoState(PointerWrap& p) override; + void DoState(PointerWrap& p) override; }; From b1c1a2cc6f1985014d1182acc1d9c9cc4f9c6b15 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 20 Jan 2015 21:19:48 -0500 Subject: [PATCH 2/3] Core: Add the GCKeyboard source files to the GCKeyboard VS filter Was previously in the GCPad filter. --- Source/Core/Core/Core.vcxproj.filters | 31 +++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 6f1d44f1f6..d8213794ae 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -409,12 +409,6 @@ HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GCPad - HW %28Flipper/Hollywood%29\GCMemcard @@ -718,6 +712,14 @@ PowerPC\JitILCommon + + + + HW %28Flipper/Hollywood%29\GCKeyboard + + + HW %28Flipper/Hollywood%29\GCKeyboard + @@ -727,7 +729,6 @@ - @@ -937,12 +938,6 @@ HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GCPad - HW %28Flipper/Hollywood%29\GCMemcard @@ -1222,8 +1217,16 @@ PowerPC\JitILCommon + + + + HW %28Flipper/Hollywood%29\GCKeyboard + + + HW %28Flipper/Hollywood%29\GCKeyboard + - + \ No newline at end of file From 52e74a5070212a7f9280f820e504f0e90dd6326f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 20 Jan 2015 21:28:40 -0500 Subject: [PATCH 3/3] GCKeyboardEmu: Use range-based for loops for iterating the key arrays --- Source/Core/Core/HW/GCKeyboardEmu.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/HW/GCKeyboardEmu.cpp b/Source/Core/Core/HW/GCKeyboardEmu.cpp index 8836aaeaa3..6efaf7e728 100644 --- a/Source/Core/Core/HW/GCKeyboardEmu.cpp +++ b/Source/Core/Core/HW/GCKeyboardEmu.cpp @@ -217,28 +217,28 @@ GCKeyboard::GCKeyboard(const unsigned int index) : m_index(index) { // buttons groups.emplace_back(m_keys0x = new Buttons(_trans("Keys"))); - for (unsigned int i = 0; i < sizeof(named_keys0) / sizeof(*named_keys0); ++i) - m_keys0x->controls.emplace_back(new ControlGroup::Input(named_keys0[i])); + for (const char* key : named_keys0) + m_keys0x->controls.emplace_back(new ControlGroup::Input(key)); groups.emplace_back(m_keys1x = new Buttons(_trans("Keys"))); - for (unsigned int i = 0; i < sizeof(named_keys1) / sizeof(*named_keys1); ++i) - m_keys1x->controls.emplace_back(new ControlGroup::Input(named_keys1[i])); + for (const char* key : named_keys1) + m_keys1x->controls.emplace_back(new ControlGroup::Input(key)); groups.emplace_back(m_keys2x = new Buttons(_trans("Keys"))); - for (unsigned int i = 0; i < sizeof(named_keys2) / sizeof(*named_keys2); ++i) - m_keys2x->controls.emplace_back(new ControlGroup::Input(named_keys2[i])); + for (const char* key : named_keys2) + m_keys2x->controls.emplace_back(new ControlGroup::Input(key)); groups.emplace_back(m_keys3x = new Buttons(_trans("Keys"))); - for (unsigned int i = 0; i < sizeof(named_keys3) / sizeof(*named_keys3); ++i) - m_keys3x->controls.emplace_back(new ControlGroup::Input(named_keys3[i])); + for (const char* key : named_keys3) + m_keys3x->controls.emplace_back(new ControlGroup::Input(key)); groups.emplace_back(m_keys4x = new Buttons(_trans("Keys"))); - for (unsigned int i = 0; i < sizeof(named_keys4) / sizeof(*named_keys4); ++i) - m_keys4x->controls.emplace_back(new ControlGroup::Input(named_keys4[i])); + for (const char* key : named_keys4) + m_keys4x->controls.emplace_back(new ControlGroup::Input(key)); groups.emplace_back(m_keys5x = new Buttons(_trans("Keys"))); - for (unsigned int i = 0; i < sizeof(named_keys5) / sizeof(*named_keys5); ++i) - m_keys5x->controls.emplace_back(new ControlGroup::Input(named_keys5[i])); + for (const char* key : named_keys5) + m_keys5x->controls.emplace_back(new ControlGroup::Input(key)); // options