diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-05-31 08:33:47 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-05-31 08:51:43 -0400 |
| commit | e0552e0642fa8b2efd05de402f65263ff61eba4a (patch) | |
| tree | f02d27e836c2eebd9a64076aa11bd39ccbbba1b1 /Source/Core | |
| parent | cc54652fb3d7c7f9782d56b32a58e6f5257f6942 (diff) | |
IOS/USB_KBD: Rename SMessageData to MessageData
We don't need to prefix this with S to signify that it's a struct.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/IOS/USB/USB_KBD.cpp | 4 | ||||
| -rw-r--r-- | 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<u8, 256> 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<u8, 6>; #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<SMessageData> m_MessageQueue; + std::queue<MessageData> m_MessageQueue; std::array<bool, 256> m_OldKeyBuffer{}; u8 m_OldModifiers = 0; |
