initial move from mld_threads to gruel:: namespace threads and such

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

diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
index 9c6403c9d64f623a7d9d05729a01f5f688ebb9f4..593cd7921e1e5694690d45b151f34eeb970117bb 100644 (file)
--- a/usrp/host/apps/usrper.cc
+++ b/usrp/host/apps/usrper.cc
@@ -19,22 +19,23 @@
  * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <libusb-1.0/libusb.h>                 /* needed for usb functions */
 #include <getopt.h>
 #include <assert.h>
 #include <errno.h>
 
 #include "usrp/usrp_prims.h"
 #include "usrp_spi_defs.h"
-#include <string.h>
 
 char *prog_name;
 
-
 static void
 set_progname (char *path)
 {
@@ -191,10 +192,10 @@ main (int argc, char **argv)
   const char *cmd = argv[optind++];
   nopts--;
 
-  libusb_context *ctx = usrp_one_time_init (true);
+  usrp_one_time_init ();
 
   
-  struct libusb_device *udev = usrp_find_device (which_board, fx2_ok_p, ctx);
+  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 +209,7 @@ main (int argc, char **argv)
     fprintf (stderr, "%s: found unconfigured FX2; needs firmware.\n", prog_name);
   }
 
-  struct libusb_device_handle *udh = usrp_open_cmd_interface (udev);
+  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);