From dce6d742c364daedda2f6e79da09e552ee910ede Mon Sep 17 00:00:00 2001
From: ttsou
Date: Mon, 14 Sep 2009 18:51:28 -0400
Subject: Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims
 integration

---
 usrp/host/lib/fusb_libusb1.cc       |  2 +-
 usrp/host/lib/usrp_prims_libusb1.cc | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'usrp/host/lib')

diff --git a/usrp/host/lib/fusb_libusb1.cc b/usrp/host/lib/fusb_libusb1.cc
index 9d79cfe52..1be2fa2f1 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 4ce81509b..b7eba87ea 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);
-- 
cgit