diff options
| author | ttsou <ttsou@vt.edu> | 2009-09-14 18:51:28 -0400 |
|---|---|---|
| committer | ttsou <ttsou@vt.edu> | 2009-09-16 17:08:52 -0400 |
| commit | dce6d742c364daedda2f6e79da09e552ee910ede (patch) | |
| tree | 1b1b04050e02b9fd8bdb26ba531ff6a93a69b308 | |
| parent | 68b0364367f8d99a34f0c38e8a0db0a290f297fc (diff) | |
Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration
| -rw-r--r-- | config/grc_usrp.m4 | 2 | ||||
| -rw-r--r-- | config/usrp_libusb.m4 | 7 | ||||
| -rw-r--r-- | usrp/host/include/usrp/usrp_prims.h.in | 2 | ||||
| -rw-r--r-- | usrp/host/lib/fusb_libusb1.cc | 2 | ||||
| -rw-r--r-- | usrp/host/lib/usrp_prims_libusb1.cc | 13 |
5 files changed, 10 insertions, 16 deletions
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4 index b9740aea7b..286641928b 100644 --- a/config/grc_usrp.m4 +++ b/config/grc_usrp.m4 @@ -45,7 +45,7 @@ AC_DEFUN([GRC_USRP],[ AC_CHECK_FUNCS([sigaction snprintf]) dnl Make sure libusb version is installed; required for legacy USB - USRP_LIBUSB([$req_libusb1],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])]) + USRP_LIBUSB([$req_libusb1],[],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])]) dnl Make sure SDCC >= 2.4.0 is available. USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC.])]) diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4 index 593ffbd5cd..d5f12ad7bb 100644 --- a/config/usrp_libusb.m4 +++ b/config/usrp_libusb.m4 @@ -118,6 +118,7 @@ _EOF_ if test x$have_libusb1 = xyes; then echo 'struct libusb_device;' >> $tmpfile echo 'struct libusb_device_handle;' >> $tmpfile + echo 'struct libusb_device_descriptor;' >> $tmpfile echo >> $tmpfile fi @@ -132,9 +133,9 @@ _EOF_ have_libusb1=$have_libusb1 ]) - AC_SUBST(USB_LIBS) - ifelse([$1], , :, [$1]) + AC_SUBST(USB_LIBS) + ifelse([$2], , :, [$2]) else - ifelse([$2], , :, [$2]) + ifelse([$3], , :, [$3]) fi ]) diff --git a/usrp/host/include/usrp/usrp_prims.h.in b/usrp/host/include/usrp/usrp_prims.h.in index 7f5457afc2..8198d17972 100644 --- a/usrp/host/include/usrp/usrp_prims.h.in +++ b/usrp/host/include/usrp/usrp_prims.h.in @@ -277,7 +277,7 @@ libusb_device_descriptor _get_usb_device_descriptor (libusb_device *q); int _get_usb_string_descriptor (libusb_device_handle *udh, int index, unsigned char* data, int length); -int _usb_control_transfer (struct usb_dev_handle *udh, int request_type, +int _usb_control_transfer (libusb_device_handle *udh, int request_type, int request, int value, int index, unsigned char *data, int length, unsigned int timeout); diff --git a/usrp/host/lib/fusb_libusb1.cc b/usrp/host/lib/fusb_libusb1.cc index 9d79cfe52a..1be2fa2f1e 100644 --- a/usrp/host/lib/fusb_libusb1.cc +++ b/usrp/host/lib/fusb_libusb1.cc @@ -105,7 +105,7 @@ alloc_lut (fusb_ephandle_libusb1 *self, int buffer_length, int endpoint, write_buffer = new unsigned char [buffer_length]; // We need the base class libusb_device_handle - libusb_device_handle *dev_handle = dh->get_libusb_device_handle(); + libusb_device_handle *dev_handle = dh->get_usb_dev_handle(); // Load the libusb_transfer for bulk transfer libusb_fill_bulk_transfer (lut, // transfer diff --git a/usrp/host/lib/usrp_prims_libusb1.cc b/usrp/host/lib/usrp_prims_libusb1.cc index 4ce81509bf..b7eba87ea2 100644 --- a/usrp/host/lib/usrp_prims_libusb1.cc +++ b/usrp/host/lib/usrp_prims_libusb1.cc @@ -26,10 +26,6 @@ #include "usrp/usrp_prims.h" #include "usrp_commands.h" -#include "usrp_ids.h" -#include "usrp_i2c_addr.h" -#include "fpga_regs_common.h" -#include "fpga_regs_standard.h" #include <libusb-1.0/libusb.h> #include <errno.h> #include <stdio.h> @@ -37,11 +33,8 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> -#include <time.h> // FIXME should check with autoconf (nanosleep) -#include <algorithm> #include <ad9862.h> #include <assert.h> -#include "std_paths.h" extern "C" { #include "md5.h" @@ -79,9 +72,9 @@ _get_usb_string_descriptor (struct libusb_device_handle *udh, int index, } int -_usb_control_transfer (struct libusb_dev_handle *udh, int request_type, - int request, int value, int index, - unsigned char *data, int length, unsigned int timeout) +_usb_control_transfer (struct libusb_device_handle *udh, int request_type, + int request, int value, int index, + unsigned char *data, int length, unsigned int timeout) { return libusb_control_transfer (udh, request_type, request, value, index, data, length, timeout); |