VERY experimental Nintendo Switch 2 emulator
C++
input_common: rename PAGE_SIZE to avoid conflict
121011113f3e98609832
diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cppindex 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;}