Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2025-02-16 21:38:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enum order fixes by Willy-JL

Browse source 
Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
This commit is contained in:
Methodius 2024-01-20 05:18:16 +09:00
parent e3930a30c0
commit b5964b9795
No known key found for this signature in database
GPG key ID: 122FA99A00B41679
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/main/nfc/helpers/protocol_support/nfc_protocol_support_defs.c
View file

@ -40,8 +40,8 @@ const NfcProtocolSupportBase* nfc_protocol_support[NfcProtocolNum] = {
[NfcProtocolMfUltralight] = &nfc_protocol_support_mf_ultralight, [NfcProtocolMfUltralight] = &nfc_protocol_support_mf_ultralight,
[NfcProtocolMfClassic] = &nfc_protocol_support_mf_classic, [NfcProtocolMfClassic] = &nfc_protocol_support_mf_classic,
[NfcProtocolMfDesfire] = &nfc_protocol_support_mf_desfire, [NfcProtocolMfDesfire] = &nfc_protocol_support_mf_desfire,
[NfcProtocolEmv] = &nfc_protocol_support_emv,
[NfcProtocolSlix] = &nfc_protocol_support_slix, [NfcProtocolSlix] = &nfc_protocol_support_slix,
[NfcProtocolSt25tb] = &nfc_protocol_support_st25tb, [NfcProtocolSt25tb] = &nfc_protocol_support_st25tb,
[NfcProtocolEmv] = &nfc_protocol_support_emv,
/* Add new protocol support implementations here */ /* Add new protocol support implementations here */
}; };

2
lib/nfc/protocols/nfc_device_defs.c
View file

@ -41,8 +41,8 @@ const NfcDeviceBase* nfc_devices[NfcProtocolNum] = {
[NfcProtocolMfUltralight] = &nfc_device_mf_ultralight, [NfcProtocolMfUltralight] = &nfc_device_mf_ultralight,
[NfcProtocolMfClassic] = &nfc_device_mf_classic, [NfcProtocolMfClassic] = &nfc_device_mf_classic,
[NfcProtocolMfDesfire] = &nfc_device_mf_desfire, [NfcProtocolMfDesfire] = &nfc_device_mf_desfire,
[NfcProtocolEmv] = &nfc_device_emv,
[NfcProtocolSlix] = &nfc_device_slix, [NfcProtocolSlix] = &nfc_device_slix,
[NfcProtocolSt25tb] = &nfc_device_st25tb, [NfcProtocolSt25tb] = &nfc_device_st25tb,
[NfcProtocolEmv] = &nfc_device_emv,
/* Add new protocols here */ /* Add new protocols here */
}; };

4
lib/nfc/protocols/nfc_poller_defs.c
View file

@ -23,8 +23,8 @@ const NfcPollerBase* nfc_pollers_api[NfcProtocolNum] = {
[NfcProtocolMfUltralight] = &mf_ultralight_poller, [NfcProtocolMfUltralight] = &mf_ultralight_poller,
[NfcProtocolMfClassic] = &mf_classic_poller, [NfcProtocolMfClassic] = &mf_classic_poller,
[NfcProtocolMfDesfire] = &mf_desfire_poller, [NfcProtocolMfDesfire] = &mf_desfire_poller,
[NfcProtocolEmv] = &emv_poller,
[NfcProtocolSlix] = &nfc_poller_slix, [NfcProtocolSlix] = &nfc_poller_slix,
/* Add new pollers here */
[NfcProtocolSt25tb] = &nfc_poller_st25tb, [NfcProtocolSt25tb] = &nfc_poller_st25tb,
[NfcProtocolEmv] = &emv_poller,
/* Add new pollers here */
}; };

12
lib/nfc/protocols/nfc_protocol.c
View file

@ -137,12 +137,6 @@ static const NfcProtocolTreeNode nfc_protocol_nodes[NfcProtocolNum] = {
.children_num = 0, .children_num = 0,
.children_protocol = NULL, .children_protocol = NULL,
}, },
[NfcProtocolEmv] =
{
.parent_protocol = NfcProtocolIso14443_4a,
.children_num = 0,
.children_protocol = NULL,
},
[NfcProtocolSlix] = [NfcProtocolSlix] =
{ {
.parent_protocol = NfcProtocolIso15693_3, .parent_protocol = NfcProtocolIso15693_3,
@ -155,6 +149,12 @@ static const NfcProtocolTreeNode nfc_protocol_nodes[NfcProtocolNum] = {
.children_num = 0, .children_num = 0,
.children_protocol = NULL, .children_protocol = NULL,
}, },
[NfcProtocolEmv] =
{
.parent_protocol = NfcProtocolIso14443_4a,
.children_num = 0,
.children_protocol = NULL,
},
/* Add new protocols here */ /* Add new protocols here */
}; };

2
lib/nfc/protocols/nfc_protocol.h
View file

@ -185,9 +185,9 @@ typedef enum {
NfcProtocolMfUltralight, NfcProtocolMfUltralight,
NfcProtocolMfClassic, NfcProtocolMfClassic,
NfcProtocolMfDesfire, NfcProtocolMfDesfire,
NfcProtocolEmv,
NfcProtocolSlix, NfcProtocolSlix,
NfcProtocolSt25tb, NfcProtocolSt25tb,
NfcProtocolEmv,
/* Add new protocols here */ /* Add new protocols here */
NfcProtocolNum, /**< Special value representing the number of available protocols. */ NfcProtocolNum, /**< Special value representing the number of available protocols. */