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

Smart merge of acr122_usb branch: add acr122_usb driver without removing acr122_pcsc support.

Browse source
This commit is contained in:
Romuald Conty 2012-05-01 23:09:57 +00:00
commit 82b2cfa883
14 changed files with 813 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libnfc/drivers/pn53x_usb.c
View file

@ -312,7 +312,7 @@ nfc_device *
pn53x_usb_open (const nfc_connstring connstring)
{
nfc_device *pnd = NULL;
struct pn53x_usb_descriptor desc = { NULL, NULL } ;
struct pn53x_usb_descriptor desc = { NULL, NULL };
int connstring_decode_level = pn53x_usb_connstring_decode (connstring, &desc);
log_put (LOG_CATEGORY, NFC_PRIORITY_TRACE, "%d element(s) have been decoded from \"%s\"", connstring_decode_level, connstring);
if (connstring_decode_level < 1) {
@ -480,9 +480,9 @@ pn53x_usb_send (nfc_device *pnd, const uint8_t *pbtData, const size_t szData, co
uint8_t abtRxBuf[PN53X_USB_BUFFER_LEN];
if ((res = pn53x_usb_bulk_read (DRIVER_DATA (pnd), abtRxBuf, sizeof (abtRxBuf), timeout)) < 0) {
pnd->last_error = res;
// try to interrupt current device state
pn53x_usb_ack(pnd);
pnd->last_error = res;
return pnd->last_error;
}
@ -551,9 +551,9 @@ read:
}
if (res < 0) {
pnd->last_error = res;
// try to interrupt current device state
pn53x_usb_ack(pnd);
pnd->last_error = res;
return pnd->last_error;
}