usrp: Corrected error message

[debian/gnuradio] / usrp / host / lib / usrp_prims_libusb0.cc

diff --git a/usrp/host/lib/usrp_prims_libusb0.cc b/usrp/host/lib/usrp_prims_libusb0.cc
index 7a82eabfaf634180397215cee664d7d07509bfb1..4fbfabea941e3d6bcee733dbd3fb6f3c048cfb3a 100644 (file)
--- a/usrp/host/lib/usrp_prims_libusb0.cc
+++ b/usrp/host/lib/usrp_prims_libusb0.cc
@@ -57,11 +57,20 @@ _get_usb_device_descriptor (struct usb_device *q)
 {
   return q->descriptor;
 }
+
 int
 _get_usb_string_descriptor (struct usb_dev_handle *udh, int index,
                            unsigned char* data, int length)
 {
-  return usb_get_string_simple (udh, index, (char*) data, length);
+  int ret;
+  ret =  usb_get_string_simple (udh, index, (char*) data, length);
+
+  if (ret < 0) {
+    fprintf (stderr, "usrp: usb_get_string_descriptor failed: %s\n",
+             usb_strerror());
+  }
+
+  return ret;
 }
 
 int
@@ -69,8 +78,14 @@ _usb_control_transfer (struct usb_dev_handle *udh, int request_type,
                       int request, int value, int index,
                       unsigned char *data, int length, unsigned int timeout)
 {
-  return usb_control_msg (udh, request_type,request, value, index,
-                          (char*) data, length, (int) timeout);
+  int ret;
+
+  ret = usb_control_msg (udh, request_type,request, value, index,
+                         (char*) data, length, (int) timeout);
+  if (ret < 0) 
+    fprintf (stderr, "usrp: usb_control_msg failed: %s\n", usb_strerror());
+
+  return ret;
 }
 
 
@@ -90,6 +105,12 @@ usrp_one_time_init (libusb_context **ctx)
   }
 }
 
+void
+usrp_deinit (libusb_context *ctx)
+{
+  // nop
+}
+
 void
 usrp_rescan ()
 {
@@ -198,8 +219,10 @@ write_cmd (struct usb_dev_handle *udh,
                           (char *) bytes, len, 1000);
   if (r < 0){
     // we get EPIPE if the firmware stalls the endpoint.
-    if (errno != EPIPE)
+    if (errno != EPIPE) {
       fprintf (stderr, "usb_control_msg failed: %s\n", usb_strerror ());
+      fprintf (stderr, "write_cmd failed\n");
+    }
   }
 
   return r;