add timeout on nfc_target_init() and this function returns now received bytes count on success.

This commit is contained in:
Audrey Diacre 2012-01-05 15:10:11 +00:00
parent c80ebdca25
commit 239fd750c4
14 changed files with 22 additions and 21 deletions

View file

@ -119,7 +119,7 @@ main (int argc, const char *argv[])
print_nfc_target (nt, false);
printf ("Waiting for initiator request...\n");
if(nfc_target_init (pnd, &nt, abtRx, &szRx) < 0) {
if(nfc_target_init (pnd, &nt, abtRx, &szRx, 0) < 0) {
nfc_perror(pnd, "nfc_target_init");
goto error;
}

View file

@ -140,7 +140,7 @@ nfc_target_emulate_tag(nfc_device *pnd, nfc_target *pnt)
uint8_t abtTx[MAX_FRAME_LEN];
bool loop = true;
if (nfc_target_init (pnd, pnt, abtRx, &szRx) < 0) {
if (nfc_target_init (pnd, pnt, abtRx, &szRx, 0) < 0) {
nfc_perror (pnd, "nfc_target_init");
return false;
}

View file

@ -155,7 +155,7 @@ main (int argc, char *argv[])
},
},
};
if (nfc_target_init (pnd, &nt, abtRecv, &szRecvBits) < 0) {
if (nfc_target_init (pnd, &nt, abtRecv, &szRecvBits, 0) < 0) {
nfc_perror (pnd, "nfc_target_init");
ERR ("Could not come out of auto-emulation, no command was received");
goto error;

View file

@ -146,7 +146,7 @@ main (int argc, char *argv[])
},
};
if (nfc_target_init (pndTag, &nt, abtReaderRx, &szReaderRxBits) < 0) {
if (nfc_target_init (pndTag, &nt, abtReaderRx, &szReaderRxBits, 0) < 0) {
ERR ("%s", "Initialization of NFC emulator failed");
nfc_disconnect (pndTag);
return EXIT_FAILURE;

View file

@ -176,7 +176,7 @@ main (int argc, const char *argv[])
};
printf ("Now both, NFC device (configured as target) and SAM are readables from an external NFC initiator.\n");
printf ("Please note that NFC device (configured as target) stay in target mode until it receive RATS, ATR_REQ or proprietary command.\n");
if (nfc_target_init (pnd, &nt, abtRx, &szRx) < 0) {
if (nfc_target_init (pnd, &nt, abtRx, &szRx, 0) < 0) {
nfc_perror(pnd, "nfc_target_init");
return EXIT_FAILURE;
}