diff options
| author | Josh Blum | 2009-10-12 12:16:12 -0700 |
|---|---|---|
| committer | Josh Blum | 2009-10-12 12:16:12 -0700 |
| commit | 5b74bb4d34f381fa8a8af1e1d96ea2d673a8be71 (patch) | |
| tree | ad6a9f64e3b610d008b0fb612772efd4162a82aa /usrp/host/apps | |
| parent | 57e810d3f07909947a9fb2daeb507b439d5f4f50 (diff) | |
| parent | 38d5389f3054164a2f04d6e4e8fe381aa5ee03fc (diff) | |
| download | gnuradio-5b74bb4d34f381fa8a8af1e1d96ea2d673a8be71.tar.gz gnuradio-5b74bb4d34f381fa8a8af1e1d96ea2d673a8be71.tar.bz2 gnuradio-5b74bb4d34f381fa8a8af1e1d96ea2d673a8be71.zip | |
Merge commit '38d5389f3054164a2f04d6e4e8fe381aa5ee03fc' into vrt
Diffstat (limited to 'usrp/host/apps')
| -rw-r--r-- | usrp/host/apps/test_usrp_standard_rx.cc | 1 | ||||
| -rw-r--r-- | usrp/host/apps/test_usrp_standard_tx.cc | 1 | ||||
| -rw-r--r-- | usrp/host/apps/usrp_cal_dc_offset.cc | 1 | ||||
| -rw-r--r-- | usrp/host/apps/usrper.cc | 11 |
4 files changed, 6 insertions, 8 deletions
diff --git a/usrp/host/apps/test_usrp_standard_rx.cc b/usrp/host/apps/test_usrp_standard_rx.cc index f6897ed23..4098decda 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 3f8817373..cc9f9edfc 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 22d427dff..5f708d672 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 fe8ff90d2..593cd7921 100644 --- 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 <usb.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) { @@ -194,7 +195,7 @@ main (int argc, char **argv) usrp_one_time_init (); - struct usb_device *udev = usrp_find_device (which_board, fx2_ok_p); + 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 usb_dev_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); |