forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-03-03 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfc_initiator_transceive_bits() function does not now use pszRxBits as parameter because this function returns it.

Browse Source
This commit is contained in:
Audrey Diacre
2012-01-04 15:30:42 +00:00
parent 61c3e5b814
commit 6e7092b160
9 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/nfc-mfclassic.c
View File

@@ -82,7 +82,7 @@ static size_t num_keys = sizeof (keys) / 6;
#define MAX_FRAME_LEN 264
static uint8_t abtRx[MAX_FRAME_LEN];
static size_t szRxBits;
static int szRxBits;
static size_t szRx = sizeof(abtRx);
uint8_t abtHalt[4] = { 0x50, 0x00, 0x00, 0x00 };
@@ -98,8 +98,7 @@ transmit_bits (const uint8_t *pbtTx, const size_t szTxBits)
printf ("Sent bits: ");
print_hex_bits (pbtTx, szTxBits);
// Transmit the bit frame command, we don't use the arbitrary parity feature
int res = 0;
if ((res = nfc_initiator_transceive_bits (pnd, pbtTx, szTxBits, NULL, abtRx, &szRxBits, NULL)) < 0)
if ((szRxBits = nfc_initiator_transceive_bits (pnd, pbtTx, szTxBits, NULL, abtRx, NULL)) < 0)
return false;
// Show received answer

4
utils/nfc-mfsetuid.c
View File

@@ -57,7 +57,7 @@
#define MAX_FRAME_LEN 264
static uint8_t abtRx[MAX_FRAME_LEN];
static size_t szRxBits;
static int szRxBits;
static size_t szRx = sizeof(abtRx);
static uint8_t abtRawUid[12];
static uint8_t abtAtqa[2];
@@ -96,7 +96,7 @@ transmit_bits (const uint8_t *pbtTx, const size_t szTxBits)
print_hex_bits (pbtTx, szTxBits);
}
// Transmit the bit frame command, we don't use the arbitrary parity feature
if (nfc_initiator_transceive_bits (pnd, pbtTx, szTxBits, NULL, abtRx, &szRxBits, NULL) < 0)
if ((szRxBits = nfc_initiator_transceive_bits (pnd, pbtTx, szTxBits, NULL, abtRx, NULL)) < 0)
return false;
// Show received answer