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

nfc_target_send_bits() function returns now sent bits count on success and libnfc error code on failure.

Browse source
This commit is contained in:
Audrey Diacre 2012-01-04 13:27:15 +00:00
parent 1c49329ffa
commit 951dde8143
7 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libnfc/chips/pn53x.c
View file

@ -1831,13 +1831,14 @@ pn53x_target_receive_bytes (struct nfc_device *pnd, uint8_t *pbtRx, size_t *pszR
return *pszRx;
}
bool
int
pn53x_target_send_bits (struct nfc_device *pnd, const uint8_t *pbtTx, const size_t szTxBits, const uint8_t *pbtTxPar)
{
size_t szFrameBits = 0;
size_t szFrameBytes = 0;
uint8_t ui8Bits = 0;
uint8_t abtCmd[PN53x_EXTENDED_FRAME__DATA_MAX_LEN] = { TgResponseToInitiator };
int res = 0;
// Check if we should prepare the parity bits ourself
if (!pnd->bPar) {
@ -1858,15 +1859,15 @@ pn53x_target_send_bits (struct nfc_device *pnd, const uint8_t *pbtTx, const size
memcpy (abtCmd + 1, pbtTx, szFrameBytes);
// Set the amount of transmission bits in the PN53X chip register
if (pn53x_set_tx_bits (pnd, ui8Bits) < 0)
return false;
if ((res = pn53x_set_tx_bits (pnd, ui8Bits)) < 0)
return res;
// Try to send the bits to the reader
if (pn53x_transceive (pnd, abtCmd, szFrameBytes + 1, NULL, NULL, -1) < 0)
return false;
if ((res = pn53x_transceive (pnd, abtCmd, szFrameBytes + 1, NULL, NULL, -1)) < 0)
return res;
// Everyting seems ok, return true
return true;
// Everyting seems ok, return return sent bits count
return szTxBits;
}
int

2
libnfc/chips/pn53x.h
View file

@ -315,7 +315,7 @@ int pn53x_initiator_deselect_target (struct nfc_device *pnd);
int pn53x_target_init (struct nfc_device *pnd, nfc_target *pnt, uint8_t *pbtRx, size_t *pszRx);
bool pn53x_target_receive_bits (struct nfc_device *pnd, uint8_t *pbtRx, size_t *pszRxBits, uint8_t *pbtRxPar);
int pn53x_target_receive_bytes (struct nfc_device *pnd, uint8_t *pbtRx, size_t *pszRx, int timeout);
bool pn53x_target_send_bits (struct nfc_device *pnd, const uint8_t *pbtTx, const size_t szTxBits, const uint8_t *pbtTxPar);
int pn53x_target_send_bits (struct nfc_device *pnd, const uint8_t *pbtTx, const size_t szTxBits, const uint8_t *pbtTxPar);
int pn53x_target_send_bytes (struct nfc_device *pnd, const uint8_t *pbtTx, const size_t szTx, int timeout);
// Error handling functions