Applied libusb-1.0 patch set from Thomas Tsou <ttsou@vt.edu>:

[debian/gnuradio] / usrp / host / apps / usrper.cc

diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
index fe8ff90d2f5471f13f2d0570911be65bd65f00d8..1c4beb713f67fe491dcf357c229a4d65aed38aee 100644 (file)
--- 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);