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

more debuggers and fix auto-connecting to libusb devices (still no way to list them though)

Browse Source
This commit is contained in:
Adam Laurie
2009-12-02 11:45:38 +00:00
parent c449fe8561
commit b8a9a7d743
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/nfc.c
View File

@@ -94,7 +94,7 @@ nfc_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_t *pszD
{
if (drivers_callbacks_list[uiDriver].list_devices != NULL)
{
DBG("Checking driver: %s",drivers_callbacks_list[uiDriver]);
DBG("Checking driver: %s",drivers_callbacks_list[uiDriver].acDriver);
size_t szN = 0;
if (drivers_callbacks_list[uiDriver].list_devices (pnddDevices + (*pszDeviceFound), szDevices - (*pszDeviceFound), &szN))
{
@@ -103,7 +103,7 @@ nfc_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_t *pszD
}
#ifdef DEBUG
else
DBG("Not checking driver: %s",drivers_callbacks_list[uiDriver]);
DBG("Not checking driver: %s",drivers_callbacks_list[uiDriver].acDriver);
#endif
}
}
@@ -120,9 +120,16 @@ nfc_device_t* nfc_connect(nfc_device_desc_t* pndd)
{
if (pndd == NULL) {
// No device description specified: try to automatically claim a device
DBG("%s","Autodetecting available devices...");
pndd = drivers_callbacks_list[uiDriver].pick_device ();
DBG("Autodetecting available devices: %s", drivers_callbacks_list[uiDriver].acDriver);
if(drivers_callbacks_list[uiDriver].pick_device != NULL)
pndd = drivers_callbacks_list[uiDriver].pick_device ();
DBG("Auto-connecting %s device",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;
}
} else {
// Specific device is requested: using device description pndd
if( 0 != strcmp(drivers_callbacks_list[uiDriver].acDriver, pndd->pcDriver ) )