aimeio: Check for felica before trying to generate an access code

This commit is contained in:
Hay1tsme
2026-08-24 01:28:25 -04:00
parent af88b8f06e
commit 1beeaf30b3
+14 -13
View File
@@ -265,6 +265,20 @@ HRESULT aime_io_nfc_poll(uint8_t unit_no)
return S_OK;
}
/* Try FeliCa IC */
hr = aime_io_read_id_file(
aime_io_cfg.felica_path,
aime_io_felica_id,
sizeof(aime_io_felica_id));
if (SUCCEEDED(hr) && hr != S_FALSE) {
aime_io_felica_id_present = true;
return S_OK;
}
// 2026-08-24 Hay1tsme: Skipping Generating aime before checking for felica was incredibly annoying.
/* Try generating AiMe IC (if enabled) */
if (aime_io_cfg.aime_gen) {
@@ -281,19 +295,6 @@ HRESULT aime_io_nfc_poll(uint8_t unit_no)
return S_OK;
}
/* Try FeliCa IC */
hr = aime_io_read_id_file(
aime_io_cfg.felica_path,
aime_io_felica_id,
sizeof(aime_io_felica_id));
if (SUCCEEDED(hr) && hr != S_FALSE) {
aime_io_felica_id_present = true;
return S_OK;
}
/* Try generating FeliCa IC (if enabled) */
if (aime_io_cfg.felica_gen) {