Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert NFC FeliCa WIP PR (breaks more than adds)

Browse Source
This commit is contained in:
Willy-JL
2023-07-18 20:52:56 +01:00
parent 8d16b0e8f5
commit 1c00a0d119
48 changed files with 153 additions and 2615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nfc/helpers/reader_analyzer.c
View File

@@ -56,11 +56,13 @@ struct ReaderAnalyzer {
static FuriHalNfcDevData reader_analyzer_nfc_data[] = {
[ReaderAnalyzerNfcDataMfClassic] =
{.interface = FuriHalNfcInterfaceRf,
{.sak = 0x08,
.atqa = {0x44, 0x00},
.interface = FuriHalNfcInterfaceRf,
.type = FuriHalNfcTypeA,
.uid_len = READER_ANALYZER_UID_SIZE,
.uid = {0x04, 0x77, 0x70, 0x2A, 0x23, 0x4F, 0x80},
.a_data = {.sak = 0x08, .atqa = {0x44, 0x00}, .cuid = 0x2A234F80}},
.cuid = 0x2A234F80},
};
void reader_analyzer_parse(ReaderAnalyzer* instance, uint8_t* buffer, size_t size) {
@@ -122,7 +124,7 @@ ReaderAnalyzer* reader_analyzer_alloc() {
reader_analyzer_nfc_data[ReaderAnalyzerNfcDataMfClassic].uid,
Uid.full_uid,
READER_ANALYZER_UID_SIZE);
reader_analyzer_nfc_data[ReaderAnalyzerNfcDataMfClassic].a_data.cuid =
reader_analyzer_nfc_data[ReaderAnalyzerNfcDataMfClassic].cuid =
nfc_util_bytes2num(Uid.uid_converter.cuid, READER_ANALYZER_CUID_SIZE);
instance->nfc_data = reader_analyzer_nfc_data[ReaderAnalyzerNfcDataMfClassic];
@@ -156,7 +158,7 @@ void reader_analyzer_start(ReaderAnalyzer* instance, ReaderAnalyzerMode mode) {
instance->debug_log = nfc_debug_log_alloc();
}
if(mode & ReaderAnalyzerModeMfkey) {
instance->mfkey32 = mfkey32_alloc(instance->nfc_data.a_data.cuid);
instance->mfkey32 = mfkey32_alloc(instance->nfc_data.cuid);
if(instance->mfkey32) {
mfkey32_set_callback(instance->mfkey32, reader_analyzer_mfkey_callback, instance);
}