summaryrefslogtreecommitdiff
path: root/src/input_common/helpers/joycon_protocol/nfc.cpp
diff options
context:
space:
mode:
authorGravatar Narr the Reg2023-05-30 06:13:01 -0600
committerGravatar GitHub2023-05-30 06:13:01 -0600
commit810d19b6be80ac71adb96b8643823f84e265e8d8 (patch)
treeafd5a19d68c6a52a39cdb7ceff8e310bd33e7d61 /src/input_common/helpers/joycon_protocol/nfc.cpp
parentMerge pull request #10484 from Morph1984/fmt10 (diff)
parentinput_common: rename PAGE_SIZE to avoid conflict (diff)
downloadyuzu-810d19b6be80ac71adb96b8643823f84e265e8d8.tar.gz
yuzu-810d19b6be80ac71adb96b8643823f84e265e8d8.tar.xz
yuzu-810d19b6be80ac71adb96b8643823f84e265e8d8.zip
Merge pull request #10504 from 12101111/rename-pagesize
input_common: rename PAGE_SIZE to avoid conflict
Diffstat (limited to 'src/input_common/helpers/joycon_protocol/nfc.cpp')
-rw-r--r--src/input_common/helpers/joycon_protocol/nfc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp
index 3b7a628e5..f7058c4a7 100644
--- a/src/input_common/helpers/joycon_protocol/nfc.cpp
+++ b/src/input_common/helpers/joycon_protocol/nfc.cpp
@@ -528,9 +528,9 @@ NFCWritePackage NfcProtocol::MakeAmiiboWritePackage(const TagUUID& tag_uuid,
528} 528}
529 529
530NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8> data) const { 530NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8> data) const {
531 constexpr u8 PAGE_SIZE = 4; 531 constexpr u8 NFC_PAGE_SIZE = 4;
532 532
533 if (static_cast<std::size_t>(page * PAGE_SIZE) + size >= data.size()) { 533 if (static_cast<std::size_t>(page * NFC_PAGE_SIZE) + size >= data.size()) {
534 return {}; 534 return {};
535 } 535 }
536 536
@@ -539,7 +539,7 @@ NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8>
539 .data_size = size, 539 .data_size = size,
540 .data = {}, 540 .data = {},
541 }; 541 };
542 std::memcpy(chunk.data.data(), data.data() + (page * PAGE_SIZE), size); 542 std::memcpy(chunk.data.data(), data.data() + (page * NFC_PAGE_SIZE), size);
543 return chunk; 543 return chunk;
544} 544}
545 545