Browse Source
Merge pull request #12255 from german77/amiibo
service: nfc: Don't tag amiibos as corrupted if they are loaded as read only
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
5 deletions
-
src/core/hle/service/nfc/common/device.cpp
|
|
|
@ -438,16 +438,16 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target |
|
|
|
is_corrupted = true; |
|
|
|
} |
|
|
|
|
|
|
|
if (!is_corrupted) { |
|
|
|
device_state = DeviceState::TagMounted; |
|
|
|
mount_target = mount_target_; |
|
|
|
|
|
|
|
if (!is_corrupted && mount_target != NFP::MountTarget::Rom) { |
|
|
|
std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File)); |
|
|
|
memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data)); |
|
|
|
WriteBackupData(encrypted_tag_data.uuid, data); |
|
|
|
} |
|
|
|
|
|
|
|
device_state = DeviceState::TagMounted; |
|
|
|
mount_target = mount_target_; |
|
|
|
|
|
|
|
if (is_corrupted) { |
|
|
|
if (is_corrupted && mount_target != NFP::MountTarget::Rom) { |
|
|
|
bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess(); |
|
|
|
return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData; |
|
|
|
} |
|
|
|
|