diff options
| author | 2024-01-08 20:31:48 +0100 | |
|---|---|---|
| committer | 2024-01-08 13:31:48 -0600 | |
| commit | f12446167491b3e691f6a93a01cad3bd9e54d105 (patch) | |
| tree | 8992865b548e08317504d653880c3ee4aacb6ad4 /src/core/hle/service/nfc | |
| parent | Merge pull request #12608 from szepeviktor/typos (diff) | |
| download | yuzu-f12446167491b3e691f6a93a01cad3bd9e54d105.tar.gz yuzu-f12446167491b3e691f6a93a01cad3bd9e54d105.tar.xz yuzu-f12446167491b3e691f6a93a01cad3bd9e54d105.zip | |
Fix typos in src/core (#12625)
* Fix typos in src/core
* Fix typo correction
* Fix indentation of MemoryStateNames
* Fix indent
Diffstat (limited to 'src/core/hle/service/nfc')
| -rw-r--r-- | src/core/hle/service/nfc/common/amiibo_crypto.cpp | 10 | ||||
| -rw-r--r-- | src/core/hle/service/nfc/common/device.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/nfc/common/device.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hle/service/nfc/common/amiibo_crypto.cpp b/src/core/hle/service/nfc/common/amiibo_crypto.cpp index 9556e9193..4274a92c9 100644 --- a/src/core/hle/service/nfc/common/amiibo_crypto.cpp +++ b/src/core/hle/service/nfc/common/amiibo_crypto.cpp | |||
| @@ -19,7 +19,7 @@ namespace Service::NFP::AmiiboCrypto { | |||
| 19 | bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { | 19 | bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { |
| 20 | const auto& amiibo_data = ntag_file.user_memory; | 20 | const auto& amiibo_data = ntag_file.user_memory; |
| 21 | LOG_DEBUG(Service_NFP, "uuid_lock=0x{0:x}", ntag_file.static_lock); | 21 | LOG_DEBUG(Service_NFP, "uuid_lock=0x{0:x}", ntag_file.static_lock); |
| 22 | LOG_DEBUG(Service_NFP, "compability_container=0x{0:x}", ntag_file.compability_container); | 22 | LOG_DEBUG(Service_NFP, "compatibility_container=0x{0:x}", ntag_file.compatibility_container); |
| 23 | LOG_DEBUG(Service_NFP, "write_count={}", static_cast<u16>(amiibo_data.write_counter)); | 23 | LOG_DEBUG(Service_NFP, "write_count={}", static_cast<u16>(amiibo_data.write_counter)); |
| 24 | 24 | ||
| 25 | LOG_DEBUG(Service_NFP, "character_id=0x{0:x}", amiibo_data.model_info.character_id); | 25 | LOG_DEBUG(Service_NFP, "character_id=0x{0:x}", amiibo_data.model_info.character_id); |
| @@ -49,7 +49,7 @@ bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { | |||
| 49 | if (ntag_file.static_lock != 0xE00F) { | 49 | if (ntag_file.static_lock != 0xE00F) { |
| 50 | return false; | 50 | return false; |
| 51 | } | 51 | } |
| 52 | if (ntag_file.compability_container != 0xEEFF10F1U) { | 52 | if (ntag_file.compatibility_container != 0xEEFF10F1U) { |
| 53 | return false; | 53 | return false; |
| 54 | } | 54 | } |
| 55 | if (amiibo_data.model_info.tag_type != NFC::PackedTagType::Type2) { | 55 | if (amiibo_data.model_info.tag_type != NFC::PackedTagType::Type2) { |
| @@ -78,7 +78,7 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) { | |||
| 78 | encoded_data.uid_crc_check2 = nfc_data.uuid_crc_check2; | 78 | encoded_data.uid_crc_check2 = nfc_data.uuid_crc_check2; |
| 79 | encoded_data.internal_number = nfc_data.internal_number; | 79 | encoded_data.internal_number = nfc_data.internal_number; |
| 80 | encoded_data.static_lock = nfc_data.static_lock; | 80 | encoded_data.static_lock = nfc_data.static_lock; |
| 81 | encoded_data.compability_container = nfc_data.compability_container; | 81 | encoded_data.compatibility_container = nfc_data.compatibility_container; |
| 82 | encoded_data.hmac_data = nfc_data.user_memory.hmac_data; | 82 | encoded_data.hmac_data = nfc_data.user_memory.hmac_data; |
| 83 | encoded_data.constant_value = nfc_data.user_memory.constant_value; | 83 | encoded_data.constant_value = nfc_data.user_memory.constant_value; |
| 84 | encoded_data.write_counter = nfc_data.user_memory.write_counter; | 84 | encoded_data.write_counter = nfc_data.user_memory.write_counter; |
| @@ -112,7 +112,7 @@ EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) { | |||
| 112 | nfc_data.uuid_crc_check2 = encoded_data.uid_crc_check2; | 112 | nfc_data.uuid_crc_check2 = encoded_data.uid_crc_check2; |
| 113 | nfc_data.internal_number = encoded_data.internal_number; | 113 | nfc_data.internal_number = encoded_data.internal_number; |
| 114 | nfc_data.static_lock = encoded_data.static_lock; | 114 | nfc_data.static_lock = encoded_data.static_lock; |
| 115 | nfc_data.compability_container = encoded_data.compability_container; | 115 | nfc_data.compatibility_container = encoded_data.compatibility_container; |
| 116 | nfc_data.user_memory.hmac_data = encoded_data.hmac_data; | 116 | nfc_data.user_memory.hmac_data = encoded_data.hmac_data; |
| 117 | nfc_data.user_memory.constant_value = encoded_data.constant_value; | 117 | nfc_data.user_memory.constant_value = encoded_data.constant_value; |
| 118 | nfc_data.user_memory.write_counter = encoded_data.write_counter; | 118 | nfc_data.user_memory.write_counter = encoded_data.write_counter; |
| @@ -257,7 +257,7 @@ void Cipher(const DerivedKeys& keys, const NTAG215File& in_data, NTAG215File& ou | |||
| 257 | out_data.uid_crc_check2 = in_data.uid_crc_check2; | 257 | out_data.uid_crc_check2 = in_data.uid_crc_check2; |
| 258 | out_data.internal_number = in_data.internal_number; | 258 | out_data.internal_number = in_data.internal_number; |
| 259 | out_data.static_lock = in_data.static_lock; | 259 | out_data.static_lock = in_data.static_lock; |
| 260 | out_data.compability_container = in_data.compability_container; | 260 | out_data.compatibility_container = in_data.compatibility_container; |
| 261 | 261 | ||
| 262 | out_data.constant_value = in_data.constant_value; | 262 | out_data.constant_value = in_data.constant_value; |
| 263 | out_data.write_counter = in_data.write_counter; | 263 | out_data.write_counter = in_data.write_counter; |
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index b37fb6da3..31cc87acc 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp | |||
| @@ -75,7 +75,7 @@ void NfcDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { | |||
| 75 | return; | 75 | return; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | if (!is_initalized) { | 78 | if (!is_initialized) { |
| 79 | return; | 79 | return; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| @@ -207,7 +207,7 @@ void NfcDevice::Initialize() { | |||
| 207 | return; | 207 | return; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | is_initalized = npad_device->AddNfcHandle(); | 210 | is_initialized = npad_device->AddNfcHandle(); |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | void NfcDevice::Finalize() { | 213 | void NfcDevice::Finalize() { |
| @@ -226,7 +226,7 @@ void NfcDevice::Finalize() { | |||
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | device_state = DeviceState::Unavailable; | 228 | device_state = DeviceState::Unavailable; |
| 229 | is_initalized = false; | 229 | is_initialized = false; |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | Result NfcDevice::StartDetection(NfcProtocol allowed_protocol) { | 232 | Result NfcDevice::StartDetection(NfcProtocol allowed_protocol) { |
diff --git a/src/core/hle/service/nfc/common/device.h b/src/core/hle/service/nfc/common/device.h index d8efe25ec..15f9b25da 100644 --- a/src/core/hle/service/nfc/common/device.h +++ b/src/core/hle/service/nfc/common/device.h | |||
| @@ -126,7 +126,7 @@ private: | |||
| 126 | Kernel::KEvent* deactivate_event = nullptr; | 126 | Kernel::KEvent* deactivate_event = nullptr; |
| 127 | Kernel::KEvent* availability_change_event = nullptr; | 127 | Kernel::KEvent* availability_change_event = nullptr; |
| 128 | 128 | ||
| 129 | bool is_initalized{}; | 129 | bool is_initialized{}; |
| 130 | NfcProtocol allowed_protocols{}; | 130 | NfcProtocol allowed_protocols{}; |
| 131 | DeviceState device_state{DeviceState::Unavailable}; | 131 | DeviceState device_state{DeviceState::Unavailable}; |
| 132 | 132 | ||