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

Fix *transceive*() calls from examples and utils (bug introduced in previous commit)

Browse source
This commit is contained in:
Romuald Conty 2012-11-24 13:00:23 +01:00
parent 6650105174
commit 3ee77eb79e
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/nfc-anticol.c
View file

@ -83,7 +83,7 @@ transmit_bits(const uint8_t *pbtTx, const size_t szTxBits)
print_hex_bits(pbtTx, szTxBits); print_hex_bits(pbtTx, szTxBits);
} }
// Transmit the bit frame command, we don't use the arbitrary parity feature // Transmit the bit frame command, we don't use the arbitrary parity feature
if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, NULL)) < 0) if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, sizeof(abtRx), NULL)) < 0)
return false; return false;
// Show received answer // Show received answer

2
examples/nfc-mfsetuid.c
View file

@ -95,7 +95,7 @@ transmit_bits(const uint8_t *pbtTx, const size_t szTxBits)
print_hex_bits(pbtTx, szTxBits); print_hex_bits(pbtTx, szTxBits);
} }
// Transmit the bit frame command, we don't use the arbitrary parity feature // Transmit the bit frame command, we don't use the arbitrary parity feature
if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, NULL)) < 0) if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, sizeof(abtRx), NULL)) < 0)
return false; return false;
// Show received answer // Show received answer

2
examples/nfc-relay.c
View file

@ -205,7 +205,7 @@ main(int argc, char *argv[])
} }
// Forward the frame to the original tag // Forward the frame to the original tag
if ((szTagRxBits = nfc_initiator_transceive_bits if ((szTagRxBits = nfc_initiator_transceive_bits
(pndReader, abtReaderRx, (size_t) szReaderRxBits, abtReaderRxPar, abtTagRx, abtTagRxPar)) > 0) { (pndReader, abtReaderRx, (size_t) szReaderRxBits, abtReaderRxPar, abtTagRx, sizeof(abtTagRx), abtTagRxPar)) > 0) {
// Redirect the answer back to the reader // Redirect the answer back to the reader
if (nfc_target_send_bits(pndTag, abtTagRx, szTagRxBits, abtTagRxPar) < 0) { if (nfc_target_send_bits(pndTag, abtTagRx, szTagRxBits, abtTagRxPar) < 0) {
nfc_perror(pndTag, "nfc_target_send_bits"); nfc_perror(pndTag, "nfc_target_send_bits");

4
libnfc/nfc.c
View file

@ -120,7 +120,7 @@ nfc_init(nfc_context *context)
/** @ingroup lib /** @ingroup lib
* @brief Deinitialize libnfc. * @brief Deinitialize libnfc.
* Should be called after closing all open devices and before your application terminates. * Should be called after closing all open devices and before your application terminates.
*@param context The context to deinitialize * @param context The context to deinitialize
*/ */
void void
nfc_exit(nfc_context *context) nfc_exit(nfc_context *context)
@ -684,6 +684,7 @@ nfc_initiator_transceive_bits(nfc_device *pnd,
uint8_t *pbtRx, const size_t szRx, uint8_t *pbtRx, const size_t szRx,
uint8_t *pbtRxPar) uint8_t *pbtRxPar)
{ {
(void)szRx;
HAL(initiator_transceive_bits, pnd, pbtTx, szTxBits, pbtTxPar, pbtRx, pbtRxPar); HAL(initiator_transceive_bits, pnd, pbtTx, szTxBits, pbtTxPar, pbtRx, pbtRxPar);
} }
@ -764,6 +765,7 @@ nfc_initiator_transceive_bits_timed(nfc_device *pnd,
uint8_t *pbtRxPar, uint8_t *pbtRxPar,
uint32_t *cycles) uint32_t *cycles)
{ {
(void)szRx;
HAL(initiator_transceive_bits_timed, pnd, pbtTx, szTxBits, pbtTxPar, pbtRx, pbtRxPar, cycles); HAL(initiator_transceive_bits_timed, pnd, pbtTx, szTxBits, pbtTxPar, pbtRx, pbtRxPar, cycles);
} }

2
utils/nfc-mfclassic.c
View file

@ -98,7 +98,7 @@ transmit_bits(const uint8_t *pbtTx, const size_t szTxBits)
printf("Sent bits: "); printf("Sent bits: ");
print_hex_bits(pbtTx, szTxBits); print_hex_bits(pbtTx, szTxBits);
// Transmit the bit frame command, we don't use the arbitrary parity feature // Transmit the bit frame command, we don't use the arbitrary parity feature
if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, NULL)) < 0) if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, sizeof(abtRx), NULL)) < 0)
return false; return false;
// Show received answer // Show received answer