yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-12 17:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10504 from 12101111/rename-pagesize

Browse Source 
input_common: rename PAGE_SIZE to avoid conflict
This commit is contained in:
Narr the Reg 2023-05-30 06:13:01 -06:00 committed by GitHub
commit 810d19b6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_common/helpers/joycon_protocol/nfc.cpp
View File

@ -528,9 +528,9 @@ NFCWritePackage NfcProtocol::MakeAmiiboWritePackage(const TagUUID& tag_uuid,
} }
NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8> data) const { 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 {}; return {};
} }
@ -539,7 +539,7 @@ NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8>
.data_size = size, .data_size = size,
.data = {}, .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; return chunk;
} }