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

Move all Mifare related code from libnfc API to examples: NFC is capable of Mifare, but Mifare is not NFC.

Browse source
This commit is contained in:
Romuald Conty 2010-06-15 15:33:22 +00:00
parent db735ab224
commit f7c31885f5
9 changed files with 214 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,40 +279,6 @@ typedef struct {
nfc_target_type_t ntt;
} nfc_target_t;
////////////////////////////////////////////////////////////////////
// InDataExchange, MIFARE Classic card
typedef enum {
MC_AUTH_A = 0x60,
MC_AUTH_B = 0x61,
MC_READ = 0x30,
MC_WRITE = 0xA0,
MC_TRANSFER = 0xB0,
MC_DECREMENT = 0xC0,
MC_INCREMENT = 0xC1,
MC_STORE = 0xC2
}mifare_cmd;
// MIFARE Classic command params
typedef struct {
byte_t abtKey[6];
byte_t abtUid[4];
}mifare_param_auth;
typedef struct {
byte_t abtData[16];
}mifare_param_data;
typedef struct {
byte_t abtValue[4];
}mifare_param_value;
typedef union {
mifare_param_auth mpa;
mifare_param_data mpd;
mifare_param_value mpv;
}mifare_param;
// Reset struct alignment to default
#pragma pack()

1
include/nfc/nfc.h
View file

@ -68,7 +68,6 @@ NFC_EXPORT bool nfc_initiator_poll_targets(const nfc_device_t* pnd, const nfc_ta
NFC_EXPORT bool nfc_initiator_transceive_bits(const nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTxBits, const byte_t* pbtTxPar, byte_t* pbtRx, size_t* pszRxBits, byte_t* pbtRxPar);
NFC_EXPORT bool nfc_initiator_transceive_bytes(const nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTxLen, byte_t* pbtRx, size_t* pszRxLen);
NFC_EXPORT bool nfc_initiator_transceive_dep_bytes(const nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTxLen, byte_t* pbtRx, size_t* pszRxLen);
NFC_EXPORT bool nfc_initiator_mifare_cmd(const nfc_device_t* pnd, const mifare_cmd mc, const uint8_t ui8Block, mifare_param* pmp);
/* NFC target: act as tag (i.e. MIFARE Classic) or NFC target device. */
NFC_EXPORT bool nfc_target_init(const nfc_device_t* pnd, byte_t* pbtRx, size_t* pszRxBits);