piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon/DualShockUDPClient: Make use of std::array where applicable

Browse Source 
Provides the same semantics of a C array, but is much nicer to work
with.

Notably, it makes all cases of performing comparisons with said arrays
significantly less reading-involved.
This commit is contained in:
Lioncash
2019-11-22 16:07:12 -05:00
parent 67097b4574
commit 278d03f737
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h
View File

@ -4,6 +4,8 @@
#pragma once
#include <array>
#include <cstring>
#include <optional>
#include <zlib.h>
@ -17,12 +19,12 @@ namespace ciface::DualShockUDPClient::Proto
//
// WARNING: Little endian host assumed
static constexpr u16 CEMUHOOK_PROTOCOL_VERSION = 1001;
constexpr u16 CEMUHOOK_PROTOCOL_VERSION = 1001;
static constexpr int PORT_COUNT = 4;
constexpr int PORT_COUNT = 4;
static constexpr char CLIENT[] = "DSUC";
static constexpr char SERVER[] = "DSUS";
constexpr std::array<u8, 4> CLIENT{'D', 'S', 'U', 'C'};
constexpr std::array<u8, 4> SERVER{'D', 'S', 'U', 'S'};
#pragma pack(push, 1)
@ -69,7 +71,7 @@ enum RegisterFlags : u8
struct MessageHeader
{
u8 source[4];
std::array<u8, 4> source;
u16 protocol_version;
u16 message_length; // actually message size minus header size
u32 crc32;
@ -101,7 +103,7 @@ struct VersionResponse
MessageHeader header;
u32 message_type;
u16 max_protocol_version;
u8 padding[2];
std::array<u8, 2> padding;
};
struct ListPorts
@ -111,7 +113,7 @@ struct ListPorts
MessageHeader header;
u32 message_type;
u32 pad_request_count;
u8 pad_id[4];
std::array<u8, 4> pad_id;
};
struct PortInfo
@ -124,7 +126,7 @@ struct PortInfo
DsState pad_state;
DsModel model;
DsConnection connection_type;
u8 pad_mac_address[6];
std::array<u8, 6> pad_mac_address;
DsBattery battery_status;
u8 padding;
};
@ -137,7 +139,7 @@ struct PadDataRequest
u32 message_type;
RegisterFlags register_flags;
u8 pad_id_to_register;
u8 mac_address_to_register[6];
std::array<u8, 6> mac_address_to_register;
};
struct PadDataResponse
@ -150,7 +152,7 @@ struct PadDataResponse
DsState pad_state;
DsModel model;
DsConnection connection_type;
u8 pad_mac_address[6];
std::array<u8, 6> pad_mac_address;
DsBattery battery_status;
u8 active;
u32 hid_packet_counter;
@ -224,11 +226,11 @@ static inline u32 CRC32(const void* buffer, unsigned length)
template <typename MsgType>
struct Message
{
Message() : m_message{} {}
Message() = default;
explicit Message(u32 source_uid) : m_message{}
explicit Message(u32 source_uid)
{
memcpy((char*)m_message.header.source, MsgType::FROM, sizeof(m_message.header.source));
m_message.header.source = MsgType::FROM;
m_message.header.protocol_version = CEMUHOOK_PROTOCOL_VERSION;
m_message.header.message_length = sizeof(*this) - sizeof(m_message.header);
m_message.header.source_uid = source_uid;
@ -253,7 +255,7 @@ struct Message
}
if (m_message.header.protocol_version > CEMUHOOK_PROTOCOL_VERSION)
return std::nullopt;
if (memcmp(m_message.header.source, ToMsgType::FROM, sizeof(m_message.header.source)))
if (m_message.header.source != ToMsgType::FROM)
return std::nullopt;
if (m_message.message_type != ToMsgType::TYPE)
return std::nullopt;
@ -265,7 +267,7 @@ struct Message
return tomsg;
}
MsgType m_message;
MsgType m_message{};
};
#pragma pack(pop)