Broke whole the libnfc :-)
use a new way to handle drivers use absolute include path instead of relative ones move some nfc_device_t members in a better place nfc_device_t now embeddeds driver data and chip data pointers (useful to be more generic) use more readable variables instead of strange coding convention move PRINT_HEX macro into nfc-internal.h silent warnings with more strict CFLAGS chips/pn53x: use the powerful C99 writing to construct PN53x commands chips/pn53x: remove almost all memcpy() chips/pn53x: WriteRegister, ReadRegister and SetParameters command wrappers are correctly named chips/pn53x: introduce chip state (SLEEP, NORMAL or EXECUTE) chips/pn53x: add SAMConfiguration command wrapper (need to be improved) chips/pn53x: remove almost all const arrays chips/pn53x: use human readable defines for commands instead of hex values chips/pn53x: in debug mode, the PN53x command is shown in human-readable string, awesome isn't it? ;-) drivers: split transceive() into send() and receive() to be able to handle more cases (differed replies, abort commands, etc) later drivers: use a const structure of functions instead of -dirty- callbacks array drivers/pn532_uart: major improvement of UART handling drivers/pn532_uart: check PN53x frames when received buses/uart: receive() is now based on expected bytes instead of calculated timeouts.. buses/uart: use a smart way to determine available ports on POSIX systems (tested on Linux and FreeBSD)
This commit is contained in:
Romuald Conty
parent
f1d909ae74
commit
5af845cdfc
20 changed files with 937 additions and 775 deletions
|
|
@ -2,8 +2,7 @@
|
|||
# set the include path found by configure
|
||||
INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
|
||||
|
||||
noinst_HEADERS = pn53x.h
|
||||
noinst_HEADERS = pn53x.h pn53x-internal.h
|
||||
noinst_LTLIBRARIES = libnfcchips.la
|
||||
libnfcchips_la_SOURCES = pn53x.c
|
||||
libnfcchips_la_CFLAGS = -I$(top_srcdir)/libnfc
|
||||
|
||||
|
|
|
|||
190
libnfc/chips/pn53x-internal.h
Normal file
190
libnfc/chips/pn53x-internal.h
Normal file
|
|
@ -0,0 +1,190 @@
|
|||
/*-
|
||||
* Public platform independent Near Field Communication (NFC) library
|
||||
*
|
||||
* Copyright (C) 2011, Romuald Conty, Romain Tartière
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file pn53x-internal.h
|
||||
* @brief PN531, PN532 and PN533 defines and compatibility
|
||||
*/
|
||||
|
||||
#ifndef __PN53X_INTERNAL_H__
|
||||
#define __PN53X_INTERNAL_H__
|
||||
|
||||
#include "pn53x.h"
|
||||
|
||||
// Miscellaneous
|
||||
#define Diagnose 0x00
|
||||
#define GetFirmwareVersion 0x02
|
||||
#define GetGeneralStatus 0x04
|
||||
#define ReadRegister 0x06
|
||||
#define WriteRegister 0x08
|
||||
#define ReadGPIO 0x0C
|
||||
#define WriteGPIO 0x0E
|
||||
#define SetSerialBaudRate 0x10
|
||||
#define SetParameters 0x12
|
||||
#define SAMConfiguration 0x14
|
||||
#define PowerDown 0x16
|
||||
#define AlparCommandForTDA 0x18
|
||||
|
||||
// RF communication
|
||||
#define RFConfiguration 0x32
|
||||
#define RFRegulationTest 0x58
|
||||
|
||||
// Initiator
|
||||
#define InJumpForDEP 0x56
|
||||
#define InJumpForPSL 0x46
|
||||
#define InListPassiveTarget 0x4A
|
||||
#define InATR 0x50
|
||||
#define InPSL 0x4E
|
||||
#define InDataExchange 0x40
|
||||
#define InCommunicateThru 0x42
|
||||
#define InQuartetByteExchange 0x38
|
||||
#define InDeselect 0x44
|
||||
#define InRelease 0x52
|
||||
#define InSelect 0x54
|
||||
#define InActivateDeactivatePaypass 0x48
|
||||
#define InAutoPoll 0x60
|
||||
|
||||
// Target
|
||||
#define TgInitAsTarget 0x8C
|
||||
#define TgSetGeneralBytes 0x92
|
||||
#define TgGetData 0x86
|
||||
#define TgSetData 0x8E
|
||||
#define TgSetDataSecure 0x96
|
||||
#define TgSetMetaData 0x94
|
||||
#define TgSetMetaDataSecure 0x98
|
||||
#define TgGetInitiatorCommand 0x88
|
||||
#define TgResponseToInitiator 0x90
|
||||
#define TgGetTargetStatus 0x8A
|
||||
|
||||
/** @note PN53x's normal frame:
|
||||
*
|
||||
* .-- Start
|
||||
* | .-- Packet lenght
|
||||
* | | .-- Lenght checksum
|
||||
* | | | .-- Direction (D4 Host to PN, D5 PN to Host)
|
||||
* | | | | .-- Code
|
||||
* | | | | | .-- Packet checksum
|
||||
* | | | | | | .-- Postamble
|
||||
* V | | | | | |
|
||||
* ----- V V V V V V
|
||||
* 00 FF 02 FE D4 02 2A 00
|
||||
*/
|
||||
|
||||
/** @note PN53x's extended frame:
|
||||
*
|
||||
* .-- Start
|
||||
* | .-- Fixed to FF to enable extended frame
|
||||
* | | .-- Packet lenght
|
||||
* | | | .-- Lenght checksum
|
||||
* | | | | .-- Direction (D4 Host to PN, D5 PN to Host)
|
||||
* | | | | | .-- Code
|
||||
* | | | | | | .-- Packet checksum
|
||||
* | | | | | | | .-- Postamble
|
||||
* V V V | | | | |
|
||||
* ----- ----- ----- V V V V V
|
||||
* 00 FF FF FF 00 02 FE D4 02 2A 00
|
||||
*/
|
||||
|
||||
/**
|
||||
* Start bytes, packet lenght, lenght checksum, direction, packet checksum and postamble are overhead
|
||||
*/
|
||||
// The TFI is considered part of the overhead
|
||||
# define PN53x_NORMAL_FRAME__DATA_MAX_LEN 254
|
||||
# define PN53x_NORMAL_FRAME__OVERHEAD 8
|
||||
# define PN53x_EXTENDED_FRAME__DATA_MAX_LEN 264
|
||||
# define PN53x_EXTENDED_FRAME__OVERHEAD 11
|
||||
|
||||
typedef struct {
|
||||
uint8_t ui8Code;
|
||||
uint8_t ui8CompatFlags;
|
||||
#ifdef DEBUG
|
||||
const char * abtCommandText;
|
||||
#endif
|
||||
} pn53x_command;
|
||||
|
||||
/*
|
||||
#define PN531 0x01
|
||||
#define PN532 0x02
|
||||
#define PN533 0X04
|
||||
*/
|
||||
|
||||
#ifndef DEBUG
|
||||
# define PNCMD( X, Y ) { X , Y }
|
||||
# define PNCMD_DBG( X ) do { \
|
||||
} while(0)
|
||||
#else
|
||||
# define PNCMD( X, Y ) { X , Y, #X }
|
||||
# define PNCMD_DBG( X ) do { \
|
||||
for (size_t i=0; i<(sizeof(pn53x_commands)/sizeof(pn53x_command)); i++) { \
|
||||
if ( X == pn53x_commands[i].ui8Code ) { \
|
||||
DBG( "%s", pn53x_commands[i].abtCommandText ); \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
} while(0)
|
||||
#endif
|
||||
|
||||
static const pn53x_command pn53x_commands[] = {
|
||||
// Miscellaneous
|
||||
PNCMD( Diagnose, PN531|PN532|PN533 ),
|
||||
PNCMD( GetFirmwareVersion, PN531|PN532|PN533 ),
|
||||
PNCMD( GetGeneralStatus, PN531|PN532|PN533 ),
|
||||
PNCMD( ReadRegister, PN531|PN532|PN533 ),
|
||||
PNCMD( WriteRegister, PN531|PN532|PN533 ),
|
||||
PNCMD( ReadGPIO, PN531|PN532|PN533 ),
|
||||
PNCMD( WriteGPIO, PN531|PN532|PN533 ),
|
||||
PNCMD( SetSerialBaudRate, PN531|PN532|PN533 ),
|
||||
PNCMD( SetParameters, PN531|PN532|PN533 ),
|
||||
PNCMD( SAMConfiguration, PN531|PN532 ),
|
||||
PNCMD( PowerDown, PN531|PN532 ),
|
||||
PNCMD( AlparCommandForTDA, PN533 ),
|
||||
|
||||
// RF communication
|
||||
PNCMD( RFConfiguration, PN531|PN532|PN533 ),
|
||||
PNCMD( RFRegulationTest, PN531|PN532|PN533 ),
|
||||
|
||||
// Initiator
|
||||
PNCMD( InJumpForDEP, PN531|PN532|PN533 ),
|
||||
PNCMD( InJumpForPSL, PN531|PN532|PN533 ),
|
||||
PNCMD( InListPassiveTarget, PN531|PN532|PN533 ),
|
||||
PNCMD( InATR, PN531|PN532|PN533 ),
|
||||
PNCMD( InPSL, PN531|PN532|PN533 ),
|
||||
PNCMD( InDataExchange, PN531|PN532|PN533 ),
|
||||
PNCMD( InCommunicateThru, PN531|PN532|PN533 ),
|
||||
PNCMD( InQuartetByteExchange, PN533 ),
|
||||
PNCMD( InDeselect, PN531|PN532|PN533 ),
|
||||
PNCMD( InRelease, PN531|PN532|PN533 ),
|
||||
PNCMD( InSelect, PN531|PN532|PN533 ),
|
||||
PNCMD( InAutoPoll, PN532 ),
|
||||
PNCMD( InActivateDeactivatePaypass, PN533 ),
|
||||
|
||||
// Target
|
||||
PNCMD( TgInitAsTarget, PN531|PN532|PN533 ),
|
||||
PNCMD( TgSetGeneralBytes, PN531|PN532|PN533 ),
|
||||
PNCMD( TgGetData, PN531|PN532|PN533 ),
|
||||
PNCMD( TgSetData, PN531|PN532|PN533 ),
|
||||
PNCMD( TgSetDataSecure, PN533 ),
|
||||
PNCMD( TgSetMetaData, PN531|PN532|PN533 ),
|
||||
PNCMD( TgSetMetaDataSecure, PN533 ),
|
||||
PNCMD( TgGetInitiatorCommand, PN531|PN532|PN533 ),
|
||||
PNCMD( TgResponseToInitiator, PN531|PN532|PN533 ),
|
||||
PNCMD( TgGetTargetStatus, PN531|PN532|PN533 ),
|
||||
};
|
||||
|
||||
#endif /* __PN53X_INTERNAL_H__ */
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,9 @@
|
|||
/*-
|
||||
* Public platform independent Near Field Communication (NFC) library
|
||||
*
|
||||
* Copyright (C) 2009, 2010, Roel Verdult, Romuald Conty
|
||||
* Copyright (C) 2009, Roel Verdult, Romuald Conty
|
||||
* Copyright (C) 2010, Roel Verdult, Romuald Conty, Romain Tartière
|
||||
* Copyright (C) 2011, Romuald Conty, Romain Tartière
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by the
|
||||
|
|
@ -27,11 +29,6 @@
|
|||
|
||||
# include <nfc/nfc-types.h>
|
||||
|
||||
# define PN53x_NORMAL_FRAME_MAX_LEN 255
|
||||
# define PN53x_NORMAL_FRAME_OVERHEAD 7
|
||||
# define PN53x_EXTENDED_FRAME_MAX_LEN 264
|
||||
# define PN53x_EXTENDED_FRAME_OVERHEAD 10
|
||||
|
||||
// Registers and symbols masks used to covers parts within a register
|
||||
# define REG_CIU_TX_MODE 0x6302
|
||||
# define SYMBOL_TX_CRC_ENABLE 0x80
|
||||
|
|
@ -98,6 +95,24 @@
|
|||
# define DEISERRFRAME 0x0300/* Error frame */
|
||||
# define DENOTSUP 0x0400/* Not supported */
|
||||
|
||||
typedef enum {
|
||||
PN531 = 0x01,
|
||||
PN532 = 0x02,
|
||||
PN533 = 0x04
|
||||
} pn53x_type;
|
||||
|
||||
typedef enum {
|
||||
SLEEP = 0x00, // Need to be wake up to process commands
|
||||
NORMAL = 0x01, // Ready to process command
|
||||
EXECUTE = 0x02, // Need to cancel the running command to process new one
|
||||
} pn53x_state;
|
||||
|
||||
struct pn53x_data {
|
||||
pn53x_type type;
|
||||
pn53x_state state;
|
||||
};
|
||||
|
||||
|
||||
/* PN53x specific types */
|
||||
/**
|
||||
* @enum pn53x_modulation_t
|
||||
|
|
@ -185,18 +200,17 @@ bool pn53x_check_ack_frame_callback (nfc_device_t * pnd, const byte_t * pbtRx
|
|||
const size_t szRxFrameLen);
|
||||
bool pn53x_check_error_frame_callback (nfc_device_t * pnd, const byte_t * pbtRxFrame,
|
||||
const size_t szRxFrameLen);
|
||||
bool pn53x_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx, byte_t * pbtRx,
|
||||
size_t * pszRx);
|
||||
bool pn53x_get_reg (nfc_device_t * pnd, uint16_t ui16Reg, uint8_t * ui8Value);
|
||||
bool pn53x_set_reg (nfc_device_t * pnd, uint16_t ui16Reg, uint8_t ui8SymbolMask, uint8_t ui8Value);
|
||||
bool pn53x_set_parameter (nfc_device_t * pnd, const uint8_t ui8Value, const bool bEnable);
|
||||
bool pn53x_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx, byte_t * pbtRx, size_t *pszRx, bool toto);
|
||||
bool pn53x_read_register (nfc_device_t * pnd, uint16_t ui16Reg, uint8_t * ui8Value);
|
||||
bool pn53x_write_register (nfc_device_t * pnd, uint16_t ui16Reg, uint8_t ui8SymbolMask, uint8_t ui8Value);
|
||||
bool pn53x_set_parameters (nfc_device_t * pnd, const uint8_t ui8Value, const bool bEnable);
|
||||
bool pn53x_set_tx_bits (nfc_device_t * pnd, const uint8_t ui8Bits);
|
||||
bool pn53x_wrap_frame (const byte_t * pbtTx, const size_t szTxBits, const byte_t * pbtTxPar, byte_t * pbtFrame,
|
||||
size_t * pszFrameBits);
|
||||
bool pn53x_unwrap_frame (const byte_t * pbtFrame, const size_t szFrameBits, byte_t * pbtRx, size_t * pszRxBits,
|
||||
byte_t * pbtRxPar);
|
||||
bool pn53x_decode_target_data (const byte_t * pbtRawData, size_t szRawData,
|
||||
nfc_chip_t nc, nfc_modulation_type_t nmt,
|
||||
pn53x_type chip_type, nfc_modulation_type_t nmt,
|
||||
nfc_target_info_t * pnti);
|
||||
bool pn53x_get_firmware_version (nfc_device_t * pnd, char abtFirmwareText[18]);
|
||||
bool pn53x_configure (nfc_device_t * pnd, const nfc_device_option_t ndo, const bool bEnable);
|
||||
|
|
@ -234,6 +248,7 @@ static const struct chip_callbacks pn53x_callbacks_list = {
|
|||
|
||||
// C wrappers for PN53x commands
|
||||
bool pn53x_SetParameters (nfc_device_t * pnd, const uint8_t ui8Value);
|
||||
bool pn53x_SAMConfiguration (nfc_device_t * pnd, const uint8_t ui8Mode);
|
||||
bool pn53x_InListPassiveTarget (nfc_device_t * pnd, const pn53x_modulation_t pmInitModulation,
|
||||
const byte_t szMaxTargets, const byte_t * pbtInitiatorData,
|
||||
const size_t szInitiatorDataLen, byte_t * pbtTargetsData, size_t * pszTargetsData);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue