Fix NFC device autodetection.

This commit is contained in:
Romuald Conty 2009-12-07 13:53:15 +00:00
parent 309cbd6635
commit 1909518572

View file

@ -123,15 +123,16 @@ nfc_device_t* nfc_connect(nfc_device_desc_t* pndd)
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")
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("%s Not found",drivers_callbacks_list[uiDriver].acDriver);
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
if( 0 != strcmp(drivers_callbacks_list[uiDriver].acDriver, pndd->pcDriver ) )