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

NFC: Sort protocol defs and add missing ones

Browse Source
This commit is contained in:
Willy-JL
2025-03-27 04:45:20 +00:00
parent 0b42027973
commit 7525662f14
6 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nfc/protocols/nfc_listener_defs.c
View File

@@ -3,10 +3,10 @@
#include <nfc/protocols/iso14443_3a/iso14443_3a_listener_defs.h>
#include <nfc/protocols/iso14443_4a/iso14443_4a_listener_defs.h>
#include <nfc/protocols/iso15693_3/iso15693_3_listener_defs.h>
#include <nfc/protocols/felica/felica_listener_defs.h>
#include <nfc/protocols/mf_ultralight/mf_ultralight_listener_defs.h>
#include <nfc/protocols/mf_classic/mf_classic_listener_defs.h>
#include <nfc/protocols/slix/slix_listener_defs.h>
#include <nfc/protocols/felica/felica_listener_defs.h>
const NfcListenerBase* nfc_listeners_api[NfcProtocolNum] = {
[NfcProtocolIso14443_3a] = &nfc_listener_iso14443_3a,
@@ -14,10 +14,11 @@ const NfcListenerBase* nfc_listeners_api[NfcProtocolNum] = {
[NfcProtocolIso14443_4a] = &nfc_listener_iso14443_4a,
[NfcProtocolIso14443_4b] = NULL,
[NfcProtocolIso15693_3] = &nfc_listener_iso15693_3,
[NfcProtocolFelica] = &nfc_listener_felica,
[NfcProtocolMfUltralight] = &mf_ultralight_listener,
[NfcProtocolMfClassic] = &mf_classic_listener,
[NfcProtocolMfPlus] = NULL,
[NfcProtocolMfDesfire] = NULL,
[NfcProtocolSlix] = &nfc_listener_slix,
[NfcProtocolSt25tb] = NULL,
[NfcProtocolFelica] = &nfc_listener_felica,
};

2
lib/nfc/protocols/nfc_poller_defs.c
View File

@@ -25,6 +25,6 @@ const NfcPollerBase* nfc_pollers_api[NfcProtocolNum] = {
[NfcProtocolMfPlus] = &mf_plus_poller,
[NfcProtocolMfDesfire] = &mf_desfire_poller,
[NfcProtocolSlix] = &nfc_poller_slix,
/* Add new pollers here */
[NfcProtocolSt25tb] = &nfc_poller_st25tb,
/* Add new pollers here */
};

6
lib/nfc/protocols/nfc_protocol.c
View File

@@ -22,7 +22,9 @@
* | | |
* ISO14443-4A Mf Ultralight Mf Classic
* |
* Mf Desfire
* +-----+----+
* | |
* Mf Desfire Mf Plus
* ```
*
* When implementing a new protocol, its place in the tree must be determined first.
@@ -60,8 +62,8 @@ static const NfcProtocol nfc_protocol_iso14443_3b_children_protocol[] = {
/** List of ISO14443-4A child protocols. */
static const NfcProtocol nfc_protocol_iso14443_4a_children_protocol[] = {
NfcProtocolMfDesfire,
NfcProtocolMfPlus,
NfcProtocolMfDesfire,
};
/** List of ISO115693-3 child protocols. */