crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rework NMT_END_ENUM

Browse source
This commit is contained in:
Philippe Teuwen 2020-05-11 20:00:04 +02:00
parent 10f880374c
commit a07d879496
5 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nfc/nfc-types.h
View file

@ -323,7 +323,7 @@ typedef enum {
NMT_FELICA, NMT_FELICA,
NMT_DEP, NMT_DEP,
NMT_ISO14443BICLASS, // HID iClass 14443B mode NMT_ISO14443BICLASS, // HID iClass 14443B mode
NMT_END_ENUM, // dummy for sizing - always should be last NMT_END_ENUM = NMT_ISO14443BICLASS, // dummy for sizing - always should alias last
} nfc_modulation_type; } nfc_modulation_type;
/** /**

15
libnfc/chips/pn53x.c
View file

@ -86,7 +86,7 @@ pn53x_init(struct nfc_device *pnd)
} }
if (!CHIP_DATA(pnd)->supported_modulation_as_initiator) { if (!CHIP_DATA(pnd)->supported_modulation_as_initiator) {
CHIP_DATA(pnd)->supported_modulation_as_initiator = malloc(sizeof(nfc_modulation_type) * (NMT_END_ENUM)); CHIP_DATA(pnd)->supported_modulation_as_initiator = malloc(sizeof(nfc_modulation_type) * (NMT_END_ENUM + 1));
if (! CHIP_DATA(pnd)->supported_modulation_as_initiator) if (! CHIP_DATA(pnd)->supported_modulation_as_initiator)
return NFC_ESOFT; return NFC_ESOFT;
int nbSupportedModulation = 0; int nbSupportedModulation = 0;
@ -629,8 +629,6 @@ pn53x_decode_target_data(const uint8_t *pbtRawData, size_t szRawData, pn53x_type
// Should not happend... // Should not happend...
case NMT_DEP: case NMT_DEP:
return NFC_ECHIP; return NFC_ECHIP;
case NMT_END_ENUM:
break;
} }
return NFC_SUCCESS; return NFC_SUCCESS;
} }
@ -2355,8 +2353,6 @@ pn53x_initiator_target_is_present(struct nfc_device *pnd, const nfc_target *pnt)
case NMT_ISO14443BICLASS: case NMT_ISO14443BICLASS:
ret = pn53x_ISO14443B_ICLASS_is_present(pnd); ret = pn53x_ISO14443B_ICLASS_is_present(pnd);
break; break;
case NMT_END_ENUM:
break;
} }
if (ret == NFC_ETGRELEASED) if (ret == NFC_ETGRELEASED)
pn53x_current_target_free(pnd); pn53x_current_target_free(pnd);
@ -2410,7 +2406,6 @@ pn53x_target_init(struct nfc_device *pnd, nfc_target *pnt, uint8_t *pbtRx, const
case NMT_ISO14443BICLASS: case NMT_ISO14443BICLASS:
case NMT_JEWEL: case NMT_JEWEL:
case NMT_BARCODE: case NMT_BARCODE:
case NMT_END_ENUM:
pnd->last_error = NFC_EDEVNOTSUPP; pnd->last_error = NFC_EDEVNOTSUPP;
return pnd->last_error; return pnd->last_error;
} }
@ -2514,7 +2509,6 @@ pn53x_target_init(struct nfc_device *pnd, nfc_target *pnt, uint8_t *pbtRx, const
case NMT_ISO14443BICLASS: case NMT_ISO14443BICLASS:
case NMT_JEWEL: case NMT_JEWEL:
case NMT_BARCODE: case NMT_BARCODE:
case NMT_END_ENUM:
pnd->last_error = NFC_EDEVNOTSUPP; pnd->last_error = NFC_EDEVNOTSUPP;
return pnd->last_error; return pnd->last_error;
} }
@ -2672,8 +2666,6 @@ pn53x_target_receive_bytes(struct nfc_device *pnd, uint8_t *pbtRx, const size_t
case NMT_FELICA: case NMT_FELICA:
abtCmd[0] = TgGetInitiatorCommand; abtCmd[0] = TgGetInitiatorCommand;
break; break;
case NMT_END_ENUM:
break;
} }
} else { } else {
abtCmd[0] = TgGetInitiatorCommand; abtCmd[0] = TgGetInitiatorCommand;
@ -2781,8 +2773,6 @@ pn53x_target_send_bytes(struct nfc_device *pnd, const uint8_t *pbtTx, const size
case NMT_FELICA: case NMT_FELICA:
abtCmd[0] = TgResponseToInitiator; abtCmd[0] = TgResponseToInitiator;
break; break;
case NMT_END_ENUM:
break;
} }
} else { } else {
abtCmd[0] = TgResponseToInitiator; abtCmd[0] = TgResponseToInitiator;
@ -3442,7 +3432,6 @@ pn53x_nm_to_pm(const nfc_modulation nm)
case NMT_ISO14443B2SR: case NMT_ISO14443B2SR:
case NMT_ISO14443B2CT: case NMT_ISO14443B2CT:
case NMT_DEP: case NMT_DEP:
case NMT_END_ENUM:
// Nothing to do... // Nothing to do...
break; break;
} }
@ -3540,7 +3529,6 @@ pn53x_nm_to_ptt(const nfc_modulation nm)
case NMT_ISO14443B2CT: case NMT_ISO14443B2CT:
case NMT_BARCODE: case NMT_BARCODE:
case NMT_DEP: case NMT_DEP:
case NMT_END_ENUM:
// Nothing to do... // Nothing to do...
break; break;
} }
@ -3601,7 +3589,6 @@ pn53x_get_supported_baud_rate(nfc_device *pnd, const nfc_mode mode, const nfc_mo
case NMT_DEP: case NMT_DEP:
*supported_br = (nfc_baud_rate *)pn53x_dep_supported_baud_rates; *supported_br = (nfc_baud_rate *)pn53x_dep_supported_baud_rates;
break; break;
case NMT_END_ENUM:
default: default:
return NFC_EINVARG; return NFC_EINVARG;
} }

2
libnfc/nfc-internal.c
View file

@ -195,8 +195,6 @@ prepare_initiator_data(const nfc_modulation nm, uint8_t **ppbtInitiatorData, siz
*ppbtInitiatorData = NULL; *ppbtInitiatorData = NULL;
*pszInitiatorData = 0; *pszInitiatorData = 0;
break; break;
case NMT_END_ENUM:
break;
} }
} }

2
libnfc/nfc.c
View file

@ -1404,8 +1404,6 @@ str_nfc_modulation_type(const nfc_modulation_type nmt)
return "Thinfilm NFC Barcode"; return "Thinfilm NFC Barcode";
case NMT_DEP: case NMT_DEP:
return "D.E.P."; return "D.E.P.";
case NMT_END_ENUM:
break;
} }
return "???"; return "???";

2
libnfc/target-subr.c
View file

@ -687,8 +687,6 @@ snprint_nfc_target(char *dst, size_t size, const nfc_target *pnt, bool verbose)
case NMT_DEP: case NMT_DEP:
snprint_nfc_dep_info(dst + off, size - off, &pnt->nti.ndi, verbose); snprint_nfc_dep_info(dst + off, size - off, &pnt->nti.ndi, verbose);
break; break;
case NMT_END_ENUM:
break;
} }
} }
} }