mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 08:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IOS/USB_KBD: Rename SMessageData to MessageData

Browse Source 
We don't need to prefix this with S to signify that it's a struct.
This commit is contained in:
Lioncash 2019-05-31 08:33:47 -04:00
parent cc54652fb3
commit e0552e0642
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/IOS/USB/USB_KBD.cpp
View File

@ -176,7 +176,7 @@ constexpr std::array<u8, 256> s_key_codes_azerty{};
#endif #endif
} // Anonymous namespace } // 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} : 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() && if (SConfig::GetInstance().m_WiiKeyboard && !Core::WantsDeterminism() &&
ControlReference::InputGateOn() && !m_MessageQueue.empty()) 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(); m_MessageQueue.pop();
} }
return GetDefaultReply(IPC_SUCCESS); return GetDefaultReply(IPC_SUCCESS);

6
Source/Core/Core/IOS/USB/USB_KBD.h
View File

@ -35,7 +35,7 @@ private:
using PressedKeyData = std::array<u8, 6>; using PressedKeyData = std::array<u8, 6>;
#pragma pack(push, 1) #pragma pack(push, 1)
struct SMessageData struct MessageData
{ {
u32 MsgType = 0; u32 MsgType = 0;
u32 Unk1 = 0; u32 Unk1 = 0;
@ -43,10 +43,10 @@ private:
u8 Unk2 = 0; u8 Unk2 = 0;
PressedKeyData PressedKeys{}; PressedKeyData PressedKeys{};
SMessageData(u32 msg_type, u8 modifiers, PressedKeyData pressed_keys); MessageData(u32 msg_type, u8 modifiers, PressedKeyData pressed_keys);
}; };
#pragma pack(pop) #pragma pack(pop)
std::queue<SMessageData> m_MessageQueue; std::queue<MessageData> m_MessageQueue;
std::array<bool, 256> m_OldKeyBuffer{}; std::array<bool, 256> m_OldKeyBuffer{};
u8 m_OldModifiers = 0; u8 m_OldModifiers = 0;