summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
author12101111 <w12101111@gmail.com>2023-05-30 10:59:06 +0200
committer12101111 <w12101111@gmail.com>2023-05-30 10:59:06 +0200
commitf78f82e08dcd49c2bed90daab0e494010e0084f5 (patch)
treeafd5a19d68c6a52a39cdb7ceff8e310bd33e7d61 /src
parentMerge pull request #10484 from Morph1984/fmt10 (diff)
downloadyuzu-f78f82e08dcd49c2bed90daab0e494010e0084f5.tar
yuzu-f78f82e08dcd49c2bed90daab0e494010e0084f5.tar.gz
yuzu-f78f82e08dcd49c2bed90daab0e494010e0084f5.tar.bz2
yuzu-f78f82e08dcd49c2bed90daab0e494010e0084f5.tar.lz
yuzu-f78f82e08dcd49c2bed90daab0e494010e0084f5.tar.xz
yuzu-f78f82e08dcd49c2bed90daab0e494010e0084f5.tar.zst
yuzu-f78f82e08dcd49c2bed90daab0e494010e0084f5.zip
Diffstat (limited to 'src')
-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,
}
NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8> data) const {
- constexpr u8 PAGE_SIZE = 4;
+ constexpr u8 NFC_PAGE_SIZE = 4;
- if (static_cast<std::size_t>(page * PAGE_SIZE) + size >= data.size()) {
+ if (static_cast<std::size_t>(page * NFC_PAGE_SIZE) + size >= data.size()) {
return {};
}
@@ -539,7 +539,7 @@ NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8>
.data_size = size,
.data = {},
};
- std::memcpy(chunk.data.data(), data.data() + (page * PAGE_SIZE), size);
+ std::memcpy(chunk.data.data(), data.data() + (page * NFC_PAGE_SIZE), size);
return chunk;
}