The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-11 06:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

IOS/USB_KBD: Make the message type enum an enum class

Browse Source 
Avoids polluting the surrounding scope with enum values. We can also
make use of it in MessageData's constructor to enforce proper type
passing.
This commit is contained in:
Lioncash 2019-05-31 08:46:17 -04:00
parent d89ea8bf41
commit 7f5ca64c4d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,8 +176,9 @@ constexpr std::array<u8, 256> s_key_codes_azerty{};
#endif #endif
} // Anonymous namespace } // Anonymous namespace
USB_KBD::MessageData::MessageData(u32 type, u8 modifiers, PressedKeyData pressed_keys) USB_KBD::MessageData::MessageData(MessageType type, u8 modifiers, PressedKeyData pressed_keys)
: MsgType{Common::swap32(type)}, Modifiers{modifiers}, PressedKeys{pressed_keys} : MsgType{Common::swap32(static_cast<u32>(type))}, Modifiers{modifiers}, PressedKeys{
pressed_keys}
{ {
} }
@ -198,7 +199,7 @@ IPCCommandResult USB_KBD::Open(const OpenRequest& request)
m_OldKeyBuffer.fill(false); m_OldKeyBuffer.fill(false);
m_OldModifiers = 0x00; m_OldModifiers = 0x00;
// m_MessageQueue.emplace(MSG_KBD_CONNECT, 0, PressedKeyData{}); // m_MessageQueue.emplace(MessageType::KeyboardConnect, 0, PressedKeyData{});
return Device::Open(request); return Device::Open(request);
} }
@ -304,6 +305,6 @@ void USB_KBD::Update()
} }
if (GotEvent) if (GotEvent)
m_MessageQueue.emplace(MSG_EVENT, Modifiers, PressedKeys); m_MessageQueue.emplace(MessageType::Event, Modifiers, PressedKeys);
} }
} // namespace IOS::HLE::Device } // namespace IOS::HLE::Device

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

@ -26,11 +26,11 @@ public:
void Update() override; void Update() override;
private: private:
enum enum class MessageType : u32
{ {
MSG_KBD_CONNECT = 0, KeyboardConnect = 0,
MSG_KBD_DISCONNECT = 1, KeyboardDisconnect = 1,
MSG_EVENT = 2 Event = 2
}; };
using PressedKeyData = std::array<u8, 6>; using PressedKeyData = std::array<u8, 6>;
@ -38,13 +38,13 @@ private:
#pragma pack(push, 1) #pragma pack(push, 1)
struct MessageData struct MessageData
{ {
u32 MsgType = 0; MessageType MsgType{};
u32 Unk1 = 0; u32 Unk1 = 0;
u8 Modifiers = 0; u8 Modifiers = 0;
u8 Unk2 = 0; u8 Unk2 = 0;
PressedKeyData PressedKeys{}; PressedKeyData PressedKeys{};
MessageData(u32 msg_type, u8 modifiers, PressedKeyData pressed_keys); MessageData(MessageType msg_type, u8 modifiers, PressedKeyData pressed_keys);
}; };
static_assert(std::is_trivially_copyable_v<MessageData>, static_assert(std::is_trivially_copyable_v<MessageData>,
"MessageData must be trivially copyable, as it's copied into emulated memory."); "MessageData must be trivially copyable, as it's copied into emulated memory.");