From c449fe8561febbd88d4c3524a75f33814c2dca2b Mon Sep 17 00:00:00 2001
From: Adam Laurie <adam@algroup.co.uk>
Date: Tue, 1 Dec 2009 22:28:41 +0000
Subject: [PATCH] add some debuggers to help figure out why nfc-list doesn't
 see libusb devices

---
 src/lib/drivers/acr122.c    | 6 +++++-
 src/lib/drivers/pn531_usb.c | 1 +
 src/lib/drivers/pn533_usb.c | 1 +
 src/lib/nfc.c               | 6 ++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/lib/drivers/acr122.c b/src/lib/drivers/acr122.c
index ba18a2f..f8c8a39 100644
--- a/src/lib/drivers/acr122.c
+++ b/src/lib/drivers/acr122.c
@@ -144,7 +144,11 @@ acr122_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_t *p
   *pszDeviceFound = 0;
 
   // Test if context succeeded
-  if (!(pscc = acr122_get_scardcontext ())) return false;
+  if (!(pscc = acr122_get_scardcontext ()))
+  {
+    DBG("%s","PCSC-LITE daemon not found");
+    return false;
+  }
 
   // Retrieve the string array of all available pcsc readers
   if (SCardListReaders(*pscc,NULL,acDeviceNames,(void*)&szDeviceNamesLen) != SCARD_S_SUCCESS) return false;
diff --git a/src/lib/drivers/pn531_usb.c b/src/lib/drivers/pn531_usb.c
index 17e6f24..8c77db5 100644
--- a/src/lib/drivers/pn531_usb.c
+++ b/src/lib/drivers/pn531_usb.c
@@ -100,6 +100,7 @@ nfc_device_t* pn531_usb_connect(const nfc_device_desc_t* pndd)
   us.uiEndPointOut = 0;
   us.pudh = NULL;
 
+  DBG("%s", "Looking for PN531 device");
   usb_init();
   if (usb_find_busses() < 0) return NULL;
   if (usb_find_devices() < 0) return NULL;
diff --git a/src/lib/drivers/pn533_usb.c b/src/lib/drivers/pn533_usb.c
index 5bba127..5a8d469 100644
--- a/src/lib/drivers/pn533_usb.c
+++ b/src/lib/drivers/pn533_usb.c
@@ -98,6 +98,7 @@ nfc_device_t* pn533_usb_connect(const nfc_device_desc_t* pndd)
   us.uiEndPointOut = 0;
   us.pudh = NULL;
 
+  DBG("%s", "Looking for PN533 device");
   usb_init();
   if (usb_find_busses() < 0) return NULL;
   if (usb_find_devices() < 0) return NULL;
diff --git a/src/lib/nfc.c b/src/lib/nfc.c
index 2293460..30a9d9d 100644
--- a/src/lib/nfc.c
+++ b/src/lib/nfc.c
@@ -94,12 +94,17 @@ 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]);
       size_t szN = 0;
       if (drivers_callbacks_list[uiDriver].list_devices (pnddDevices + (*pszDeviceFound), szDevices - (*pszDeviceFound), &szN))
       {
         *pszDeviceFound += szN;
       }
     }
+    #ifdef DEBUG
+    else
+      DBG("Not checking driver: %s",drivers_callbacks_list[uiDriver]);
+    #endif
   }
 }
 
@@ -115,6 +120,7 @@ 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 ();
       pnd = drivers_callbacks_list[uiDriver].connect(pndd);
     } else {