forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-04-11 09:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save & restore NP_INFINITE_SELECT status when changing it internally

Browse Source
This commit is contained in:
Philippe Teuwen
2014-02-01 02:32:57 +01:00
parent 69c4d0768a
commit 827d9792dd
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libnfc/nfc.c
View File

@@ -573,6 +573,7 @@ nfc_initiator_list_passive_targets(nfc_device *pnd,
pnd->last_error = 0;
// Let the reader only try once to find a tag
bool bInfiniteSelect = pnd->bInfiniteSelect;
if ((res = nfc_device_set_property_bool(pnd, NP_INFINITE_SELECT, false)) < 0) {
return res;
}
@@ -603,6 +604,11 @@ nfc_initiator_list_passive_targets(nfc_device *pnd,
break;
}
}
if (bInfiniteSelect) {
if ((res = nfc_device_set_property_bool(pnd, NP_INFINITE_SELECT, true)) < 0) {
return res;
}
}
return szTargetFound;
}
@@ -684,18 +690,30 @@ nfc_initiator_poll_dep_target(struct nfc_device *pnd,
const int period = 300;
int remaining_time = timeout;
int res;
int result = 0;
bool bInfiniteSelect = pnd->bInfiniteSelect;
if ((res = nfc_device_set_property_bool(pnd, NP_INFINITE_SELECT, true)) < 0)
return res;
while (remaining_time > 0) {
if ((res = nfc_initiator_select_dep_target(pnd, ndm, nbr, pndiInitiator, pnt, period)) < 0) {
if (res != NFC_ETIMEOUT)
return res;
if (res != NFC_ETIMEOUT) {
result = res;
goto end;
}
}
if (res == 1) {
result = res;
goto end;
}
if (res == 1)
return res;
remaining_time -= period;
}
return 0;
end:
if (! bInfiniteSelect) {
if ((res = nfc_device_set_property_bool(pnd, NP_INFINITE_SELECT, false)) < 0) {
return res;
}
}
return result;
}
/** @ingroup initiator