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

Fix NFC device autodetection.

Browse source
This commit is contained in:
Romuald Conty 2009-12-07 13:53:15 +00:00
parent 309cbd6635
commit 1909518572
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/lib/nfc.c
View file

@ -118,19 +118,20 @@ nfc_device_t* nfc_connect(nfc_device_desc_t* pndd)
// Search through the device list for an available device
for (uiDriver=0; uiDriver<sizeof(drivers_callbacks_list)/sizeof(drivers_callbacks_list[0]); uiDriver++)
{
if (pndd == NULL) {
if(pndd == NULL) {
// No device description specified: try to automatically claim a device
if(drivers_callbacks_list[uiDriver].pick_device != NULL) {
DBG("Autodetecting available devices using %s driver.", drivers_callbacks_list[uiDriver].acDriver);
pndd = drivers_callbacks_list[uiDriver].pick_device ();
}
// auto-connect with NULL descriptor is allowed (NULL means "first available")
DBG("Auto-connecting to %s using %s driver", pndd->acDevice, drivers_callbacks_list[uiDriver].acDriver);
pnd = drivers_callbacks_list[uiDriver].connect(pndd);
if(pnd == NULL)
{
DBG("%s Not found",drivers_callbacks_list[uiDriver].acDriver);
pndd = NULL;
if(pndd != NULL) {
DBG("Auto-connecting to %s using %s driver", pndd->acDevice, drivers_callbacks_list[uiDriver].acDriver);
pnd = drivers_callbacks_list[uiDriver].connect(pndd);
if(pnd == NULL) {
DBG("No device available using %s driver",drivers_callbacks_list[uiDriver].acDriver);
pndd = NULL;
}
}
}
} else {
// Specific device is requested: using device description pndd