Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index b9740aea7bb455c6e1884ed1157e0172611c6f2f..286641928bc8367b101ac2fe34a72cec5b3650e8 100644 (file)
--- 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 593ffbd5cdfbb8fb2f027ede68a1e09f8b9c43c8..d5f12ad7bba8c95127d5db941e5ab6519231b40c 100644 (file)
--- 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 7f5457afc2489e70e92188c2adf00f5b5afd0f21..8198d17972f201e668589b8c07807ce05dd806a6 100644 (file)
--- 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 9d79cfe52ac4f0024de0e76eb0f4aa61634dbdb5..1be2fa2f1e4dca32c777b677d7655e425eebd92f 100644 (file)
--- 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 4ce81509bf969c84685b50eebf75906462ee0191..b7eba87ea27d440ae35bfa7dcf09f1bf55e02b62 100644 (file)
--- 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);