From e0552e0642fa8b2efd05de402f65263ff61eba4a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 31 May 2019 08:33:47 -0400 Subject: [PATCH] IOS/USB_KBD: Rename SMessageData to MessageData We don't need to prefix this with S to signify that it's a struct. --- Source/Core/Core/IOS/USB/USB_KBD.cpp | 4 ++-- Source/Core/Core/IOS/USB/USB_KBD.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/IOS/USB/USB_KBD.cpp b/Source/Core/Core/IOS/USB/USB_KBD.cpp index 606bd71276..ac006c1444 100644 --- a/Source/Core/Core/IOS/USB/USB_KBD.cpp +++ b/Source/Core/Core/IOS/USB/USB_KBD.cpp @@ -176,7 +176,7 @@ constexpr std::array s_key_codes_azerty{}; #endif } // Anonymous namespace -USB_KBD::SMessageData::SMessageData(u32 type, u8 modifiers, PressedKeyData pressed_keys) +USB_KBD::MessageData::MessageData(u32 type, u8 modifiers, PressedKeyData pressed_keys) : MsgType{Common::swap32(type)}, Modifiers{modifiers}, PressedKeys{pressed_keys} { } @@ -213,7 +213,7 @@ IPCCommandResult USB_KBD::IOCtl(const IOCtlRequest& request) if (SConfig::GetInstance().m_WiiKeyboard && !Core::WantsDeterminism() && ControlReference::InputGateOn() && !m_MessageQueue.empty()) { - Memory::CopyToEmu(request.buffer_out, &m_MessageQueue.front(), sizeof(SMessageData)); + Memory::CopyToEmu(request.buffer_out, &m_MessageQueue.front(), sizeof(MessageData)); m_MessageQueue.pop(); } return GetDefaultReply(IPC_SUCCESS); diff --git a/Source/Core/Core/IOS/USB/USB_KBD.h b/Source/Core/Core/IOS/USB/USB_KBD.h index fa5caf5f70..bd53e0ae0e 100644 --- a/Source/Core/Core/IOS/USB/USB_KBD.h +++ b/Source/Core/Core/IOS/USB/USB_KBD.h @@ -35,7 +35,7 @@ private: using PressedKeyData = std::array; #pragma pack(push, 1) - struct SMessageData + struct MessageData { u32 MsgType = 0; u32 Unk1 = 0; @@ -43,10 +43,10 @@ private: u8 Unk2 = 0; PressedKeyData PressedKeys{}; - SMessageData(u32 msg_type, u8 modifiers, PressedKeyData pressed_keys); + MessageData(u32 msg_type, u8 modifiers, PressedKeyData pressed_keys); }; #pragma pack(pop) - std::queue m_MessageQueue; + std::queue m_MessageQueue; std::array m_OldKeyBuffer{}; u8 m_OldModifiers = 0;