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

pn53x_usb: continue to search a available device on usb errors (r1092 reverted then issue fixed).

Browse source
This commit is contained in:
Romuald Conty 2011-05-25 12:08:42 +00:00
parent 917717c4ca
commit 17c63aebb5
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libnfc/drivers/pn53x_usb.c
View file

@ -202,6 +202,15 @@ pn53x_usb_probe (nfc_device_desc_t pnddDevices[], size_t szDevices, size_t * psz
}
usb_dev_handle *udev = usb_open (dev);
// Set configuration
int res = usb_set_configuration (udev, 1);
if (res < 0) {
usb_close (udev);
// we failed to use the device
continue;
}
pn53x_usb_get_usb_device_name (dev, udev, pnddDevices[*pszDeviceFound].acDevice, sizeof (pnddDevices[*pszDeviceFound].acDevice));
usb_close (udev);
pnddDevices[*pszDeviceFound].pcDriver = PN53X_USB_DRIVER_NAME;
@ -280,7 +289,7 @@ pn53x_usb_connect (const nfc_device_desc_t *pndd)
}
usb_close (data.pudh);
// we failed to use the specified device
continue;
return NULL;
}
res = usb_claim_interface (data.pudh, 0);
@ -288,7 +297,7 @@ pn53x_usb_connect (const nfc_device_desc_t *pndd)
DBG ("Can't claim interface (%s)", strerror (-res));
usb_close (data.pudh);
// we failed to use the specified device
continue;
return NULL;
}
data.model = pn53x_usb_get_device_model (dev->descriptor.idVendor, dev->descriptor.idProduct);
// Allocate memory for the device info and specification, fill it and return the info

1
libnfc/nfc.c
View file

@ -154,6 +154,7 @@ nfc_pick_device (void)
DBG ("No %s device found", ndr->name);
free (pndd);
} else {
DBG ("One %s device found", ndr->name);
return pndd;
}
}