summaryrefslogtreecommitdiff
path: root/src/input_common/helpers/joycon_protocol/common_protocol.cpp
diff options
context:
space:
mode:
authorGravatar german772022-12-23 08:32:02 -0600
committerGravatar Narr the Reg2023-01-19 18:05:22 -0600
commite1a3bda4d9881cb99c36b64733b814a3bb437f13 (patch)
treea9c0d864b023a810f48c129bb8bd6e84afb2ed2b /src/input_common/helpers/joycon_protocol/common_protocol.cpp
parentcore: hid: Fix input regressions (diff)
downloadyuzu-e1a3bda4d9881cb99c36b64733b814a3bb437f13.tar.gz
yuzu-e1a3bda4d9881cb99c36b64733b814a3bb437f13.tar.xz
yuzu-e1a3bda4d9881cb99c36b64733b814a3bb437f13.zip
Address review comments
Diffstat (limited to 'src/input_common/helpers/joycon_protocol/common_protocol.cpp')
-rw-r--r--src/input_common/helpers/joycon_protocol/common_protocol.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp
index 43a036e02..a4d08fdaf 100644
--- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp
+++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp
@@ -6,7 +6,7 @@
6 6
7namespace InputCommon::Joycon { 7namespace InputCommon::Joycon {
8JoyconCommonProtocol::JoyconCommonProtocol(std::shared_ptr<JoyconHandle> hidapi_handle_) 8JoyconCommonProtocol::JoyconCommonProtocol(std::shared_ptr<JoyconHandle> hidapi_handle_)
9 : hidapi_handle{hidapi_handle_} {} 9 : hidapi_handle{std::move(hidapi_handle_)} {}
10 10
11u8 JoyconCommonProtocol::GetCounter() { 11u8 JoyconCommonProtocol::GetCounter() {
12 hidapi_handle->packet_counter = (hidapi_handle->packet_counter + 1) & 0x0F; 12 hidapi_handle->packet_counter = (hidapi_handle->packet_counter + 1) & 0x0F;
@@ -256,7 +256,7 @@ DriverResult JoyconCommonProtocol::WaitSetMCUMode(ReportMode report_mode, MCUMod
256} 256}
257 257
258// crc-8-ccitt / polynomial 0x07 look up table 258// crc-8-ccitt / polynomial 0x07 look up table
259static constexpr uint8_t mcu_crc8_table[256] = { 259constexpr std::array<u8, 256> mcu_crc8_table = {
260 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D, 260 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D,
261 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65, 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, 261 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65, 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D,
262 0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD, 262 0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD,
@@ -278,7 +278,7 @@ u8 JoyconCommonProtocol::CalculateMCU_CRC8(u8* buffer, u8 size) const {
278 u8 crc8 = 0x0; 278 u8 crc8 = 0x0;
279 279
280 for (int i = 0; i < size; ++i) { 280 for (int i = 0; i < size; ++i) {
281 crc8 = mcu_crc8_table[(u8)(crc8 ^ buffer[i])]; 281 crc8 = mcu_crc8_table[static_cast<u8>(crc8 ^ buffer[i])];
282 } 282 }
283 return crc8; 283 return crc8;
284} 284}