From 297a8566a0755d7909b3ae9f212f21b4eb86b330 Mon Sep 17 00:00:00 2001 From: Audrey Diacre Date: Fri, 25 Nov 2011 15:47:24 +0000 Subject: [PATCH] Oups, too quick replacement commited in r1183 --- include/nfc/nfc-types.h | 6 +++--- libnfc/chips/pn53x.c | 2 +- libnfc/chips/pn53x.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/nfc/nfc-types.h b/include/nfc/nfc-types.h index 28f4a21..647ccce 100644 --- a/include/nfc/nfc-types.h +++ b/include/nfc/nfc-types.h @@ -282,7 +282,7 @@ typedef enum { } nfc_baud_rate; /** - * @enum nfc_modulationype + * @enum nfc_modulation_type * @brief NFC modulation type enumeration */ typedef enum { @@ -294,14 +294,14 @@ typedef enum { NMT_ISO14443B2CT, // ISO14443-2B ASK CTx NMT_FELICA, NMT_DEP, -} nfc_modulationype; +} nfc_modulation_type; /** * @struct nfc_modulation * @brief NFC modulation structure */ typedef struct { - nfc_modulationype nmt; + nfc_modulation_type nmt; nfc_baud_rate nbr; } nfc_modulation; diff --git a/libnfc/chips/pn53x.c b/libnfc/chips/pn53x.c index 46b873c..8627622 100644 --- a/libnfc/chips/pn53x.c +++ b/libnfc/chips/pn53x.c @@ -318,7 +318,7 @@ pn53x_unwrap_frame (const uint8_t *pbtFrame, const size_t szFrameBits, uint8_t * } bool -pn53x_decode_target_data (const uint8_t *pbtRawData, size_t szRawData, pn53x_type type, nfc_modulationype nmt, +pn53x_decode_target_data (const uint8_t *pbtRawData, size_t szRawData, pn53x_type type, nfc_modulation_type nmt, nfc_target_info *pnti) { uint8_t szAttribRes; diff --git a/libnfc/chips/pn53x.h b/libnfc/chips/pn53x.h index 431dd42..e892f0b 100644 --- a/libnfc/chips/pn53x.h +++ b/libnfc/chips/pn53x.h @@ -265,7 +265,7 @@ bool pn53x_wrap_frame (const uint8_t *pbtTx, const size_t szTxBits, const uin bool pn53x_unwrap_frame (const uint8_t *pbtFrame, const size_t szFrameBits, uint8_t *pbtRx, size_t *pszRxBits, uint8_t *pbtRxPar); bool pn53x_decode_target_data (const uint8_t *pbtRawData, size_t szRawData, - pn53x_type chip_type, nfc_modulationype nmt, + pn53x_type chip_type, nfc_modulation_type nmt, nfc_target_info *pnti); bool pn53x_read_register (nfc_device *pnd, uint16_t ui16Reg, uint8_t *ui8Value); bool pn53x_write_register (nfc_device *pnd, uint16_t ui16Reg, uint8_t ui8SymbolMask, uint8_t ui8Value);