diff options
| author | 12101111 <w12101111@gmail.com> | 2023-05-30 16:59:06 +0800 |
|---|---|---|
| committer | 12101111 <w12101111@gmail.com> | 2023-05-30 16:59:06 +0800 |
| commit | f78f82e08dcd49c2bed90daab0e494010e0084f5 (patch) | |
| tree | afd5a19d68c6a52a39cdb7ceff8e310bd33e7d61 /src/input_common/helpers/joycon_protocol/nfc.cpp | |
| parent | 53fd08b360a393af2e6bfdddc5c549492fcb40bf (diff) | |
input_common: rename PAGE_SIZE to avoid conflict
See also: https://github.com/yuzu-emu/yuzu/issues/8779
Diffstat (limited to 'src/input_common/helpers/joycon_protocol/nfc.cpp')
| -rw-r--r-- | src/input_common/helpers/joycon_protocol/nfc.cpp | 6 |
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 3b7a628e56..f7058c4a76 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; } |