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

pn53x_idle: call driver-dependent PowerDown & do InRelease first, skip redundant InDeselect

Browse Source
This commit is contained in:
Philippe Teuwen
2013-01-31 01:16:37 +01:00
parent 1682a86166
commit 683505f39b
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libnfc/chips/pn53x.c
View File

@@ -947,30 +947,25 @@ pn53x_idle(struct nfc_device *pnd)
if ((res = pn53x_InRelease(pnd, 0)) < 0) { if ((res = pn53x_InRelease(pnd, 0)) < 0) {
return res; return res;
} }
if (CHIP_DATA(pnd)->type == PN532) { if ((CHIP_DATA(pnd)->type == PN532) && (pnd->driver->powerdown)) {
// Use PowerDown to go in "Low VBat" power mode // Use PowerDown to go in "Low VBat" power mode
if ((res = pn53x_PowerDown(pnd)) < 0) { if ((res = pnd->driver->powerdown(pnd)) < 0) {
return res; return res;
} }
} }
break; break;
case INITIATOR: case INITIATOR:
// Deselect all active communications // Use InRelease to go in "Standby mode"
if ((res = pn53x_InDeselect(pnd, 0)) < 0) { if ((res = pn53x_InRelease(pnd, 0)) < 0) {
return res; return res;
} }
// Disable RF field to avoid heating // Disable RF field to avoid heating
if ((res = nfc_device_set_property_bool(pnd, NP_ACTIVATE_FIELD, false)) < 0) { if ((res = nfc_device_set_property_bool(pnd, NP_ACTIVATE_FIELD, false)) < 0) {
return res; return res;
} }
if (CHIP_DATA(pnd)->type == PN532) { if ((CHIP_DATA(pnd)->type == PN532) && (pnd->driver->powerdown)) {
// Use PowerDown to go in "Low VBat" power mode // Use PowerDown to go in "Low VBat" power mode
if ((res = pn53x_PowerDown(pnd)) < 0) { if ((res = pnd->driver->powerdown(pnd)) < 0) {
return res;
}
} else {
// Use InRelease to go in "Standby mode"
if ((res = pn53x_InRelease(pnd, 0)) < 0) {
return res; return res;
} }
} }