Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-22 05:14:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert NFC u2f

Browse Source
This commit is contained in:
VerstreuteSeele
2023-01-14 09:00:41 +01:00
parent 905bb23fdf
commit 49dabee42f
13 changed files with 65 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/targets/f7/furi_hal/furi_hal_nfc.c
View File

@@ -205,7 +205,13 @@ bool furi_hal_nfc_activate_nfca(uint32_t timeout, uint32_t* cuid) {
return true;
}
bool furi_hal_nfc_listen(FuriHalNfcDevData* nfc_data, bool activate_after_sak, uint32_t timeout) {
bool furi_hal_nfc_listen(
uint8_t* uid,
uint8_t uid_len,
uint8_t* atqa,
uint8_t sak,
bool activate_after_sak,
uint32_t timeout) {
rfalNfcState state = rfalNfcGetState();
if(state == RFAL_NFC_STATE_NOTINIT) {
rfalNfcInitialize();
@@ -226,18 +232,16 @@ bool furi_hal_nfc_listen(FuriHalNfcDevData* nfc_data, bool activate_after_sak, u
.notifyCb = NULL,
.activate_after_sak = activate_after_sak,
};
if(nfc_data->interface == FuriHalNfcInterfaceIsoDep) {
params.compMode = RFAL_COMPLIANCE_MODE_ISO;
} else if(FURI_BIT(nfc_data->sak, 5)) {
if(FURI_BIT(sak, 5)) {
params.compMode = RFAL_COMPLIANCE_MODE_EMV;
} else {
params.compMode = RFAL_COMPLIANCE_MODE_NFC;
}
params.lmConfigPA.nfcidLen = nfc_data->uid_len;
memcpy(params.lmConfigPA.nfcid, nfc_data->uid, nfc_data->uid_len);
params.lmConfigPA.SENS_RES[0] = nfc_data->atqa[0];
params.lmConfigPA.SENS_RES[1] = nfc_data->atqa[1];
params.lmConfigPA.SEL_RES = nfc_data->sak;
params.lmConfigPA.nfcidLen = uid_len;
memcpy(params.lmConfigPA.nfcid, uid, uid_len);
params.lmConfigPA.SENS_RES[0] = atqa[0];
params.lmConfigPA.SENS_RES[1] = atqa[1];
params.lmConfigPA.SEL_RES = sak;
rfalNfcDiscover(&params);
// Disable EMD suppression.