[Patch-gnuradio] [PATCH 4/4] usrp: libusb-1.0 other

[Thomas Tsou]

Other related changes. Aside from usrper.cc, these files do not use libusb 
directly.

---
 usrp/host/apps/test_usrp_standard_rx.cc |    1 -
 usrp/host/apps/test_usrp_standard_tx.cc |    1 -
 usrp/host/apps/usrp_cal_dc_offset.cc    |    1 -
 usrp/host/apps/usrper.cc                |    6 +++---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/usrp/host/apps/test_usrp_standard_rx.cc 
b/usrp/host/apps/test_usrp_standard_rx.cc
index f6897ed..4098dec 100644
--- a/usrp/host/apps/test_usrp_standard_rx.cc
+++ b/usrp/host/apps/test_usrp_standard_rx.cc
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <usb.h>                       /* needed for usb functions */
 #include <getopt.h>
 #include <assert.h>
 #include <math.h>
diff --git a/usrp/host/apps/test_usrp_standard_tx.cc 
b/usrp/host/apps/test_usrp_standard_tx.cc
index 3f88173..cc9f9ed 100644
--- a/usrp/host/apps/test_usrp_standard_tx.cc
+++ b/usrp/host/apps/test_usrp_standard_tx.cc
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <usb.h>                       /* needed for usb functions */
 #include <getopt.h>
 #include <assert.h>
 #include <math.h>
diff --git a/usrp/host/apps/usrp_cal_dc_offset.cc 
b/usrp/host/apps/usrp_cal_dc_offset.cc
index 22d427d..5f708d6 100644
--- a/usrp/host/apps/usrp_cal_dc_offset.cc
+++ b/usrp/host/apps/usrp_cal_dc_offset.cc
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <usb.h>                       /* needed for usb functions */
 #include <getopt.h>
 #include <assert.h>
 #include <math.h>
diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
index fe8ff90..1c4beb7 100644
--- a/usrp/host/apps/usrper.cc
+++ b/usrp/host/apps/usrper.cc
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <usb.h>                       /* needed for usb functions */
+#include <libusb-1.0/libusb.h>                 /* needed for usb functions */
 #include <getopt.h>
 #include <assert.h>
 #include <errno.h>
@@ -194,7 +194,7 @@ main (int argc, char **argv)
   usrp_one_time_init ();
 
   
-  struct usb_device *udev = usrp_find_device (which_board, fx2_ok_p);
+  struct libusb_device *udev = usrp_find_device (which_board, fx2_ok_p);
   if (udev == 0){
     fprintf (stderr, "%s: failed to find usrp[%d]\n", prog_name, which_board);
     exit (1);
@@ -208,7 +208,7 @@ main (int argc, char **argv)
     fprintf (stderr, "%s: found unconfigured FX2; needs firmware.\n", 
prog_name);
   }
 
-  struct usb_dev_handle *udh = usrp_open_cmd_interface (udev);
+  struct libusb_device_handle *udh = usrp_open_cmd_interface (udev);
   if (udh == 0){
     fprintf (stderr, "%s: failed to open_cmd_interface\n", prog_name);
     exit (1);
-- 
1.6.2.5