diff options
Diffstat (limited to 'src/core/hle/service/nfp/nfp_device.cpp')
-rw-r--r-- | src/core/hle/service/nfp/nfp_device.cpp | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index ddff90d6a..53bc56814 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -448,7 +448,7 @@ Result NfpDevice::DeleteRegisterInfo() { rng.GenerateRandomBytes(&tag_data.unknown, sizeof(u8)); rng.GenerateRandomBytes(&tag_data.unknown2[0], sizeof(u32)); rng.GenerateRandomBytes(&tag_data.unknown2[1], sizeof(u32)); - rng.GenerateRandomBytes(&tag_data.application_area_crc, sizeof(u32)); + rng.GenerateRandomBytes(&tag_data.register_info_crc, sizeof(u32)); rng.GenerateRandomBytes(&tag_data.settings.init_date, sizeof(u32)); tag_data.settings.settings.font_region.Assign(0); tag_data.settings.settings.amiibo_initialized.Assign(0); @@ -486,9 +486,7 @@ Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { settings.settings.font_region.Assign(0); settings.settings.amiibo_initialized.Assign(1); - // TODO: this is a mix of tag.file input - std::array<u8, 0x7e> unknown_input{}; - tag_data.application_area_crc = CalculateCrc(unknown_input); + UpdateRegisterInfoCrc(); return Flush(); } @@ -716,9 +714,7 @@ Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span<const u8> dat tag_data.application_area_id = access_id; tag_data.unknown = {}; - // TODO: this is a mix of tag_data input - std::array<u8, 0x7e> unknown_input{}; - tag_data.application_area_crc = CalculateCrc(unknown_input); + UpdateRegisterInfoCrc(); return Flush(); } @@ -838,6 +834,29 @@ void NfpDevice::UpdateSettingsCrc() { settings.crc = CalculateCrc(unknown_input); } +void NfpDevice::UpdateRegisterInfoCrc() { +#pragma pack(push, 1) + struct CrcData { + Mii::Ver3StoreData mii; + u8 application_id_byte; + u8 unknown; + std::array<u32, 0x7> unknown2; + }; + static_assert(sizeof(CrcData) == 0x7e, "CrcData is an invalid size"); +#pragma pack(pop) + + const CrcData crc_data{ + .mii = tag_data.owner_mii, + .application_id_byte = tag_data.application_id_byte, + .unknown = tag_data.unknown, + .unknown2 = tag_data.unknown2, + }; + + std::array<u8, sizeof(CrcData)> data{}; + memcpy(data.data(), &crc_data, sizeof(CrcData)); + tag_data.register_info_crc = CalculateCrc(data); +} + u32 NfpDevice::CalculateCrc(std::span<const u8> data) { constexpr u32 magic = 0xedb88320; u32 crc = 0xffffffff; @@ -847,17 +866,15 @@ u32 NfpDevice::CalculateCrc(std::span<const u8> data) { } for (u8 input : data) { - u32 temp = (crc ^ input) >> 1; - if (((crc ^ input) & 1) != 0) { - temp = temp ^ magic; - } - - for (std::size_t step = 0; step < 7; ++step) { - crc = temp >> 1; - if ((temp & 1) != 0) { - crc = temp >> 1 ^ magic; - } - } + crc ^= input; + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); } return ~crc; |