diff options
Diffstat (limited to 'usrp/host')
| -rw-r--r-- | usrp/host/lib/Makefile.am | 5 | ||||
| -rw-r--r-- | usrp/host/lib/fusb.cc | 6 | ||||
| -rw-r--r-- | usrp/host/lib/fusb.h | 2 | ||||
| -rw-r--r-- | usrp/host/lib/fusb_sysconfig_win32.cc | 2 | ||||
| -rw-r--r-- | usrp/host/lib/fusb_win32.cc | 6 | ||||
| -rw-r--r-- | usrp/host/lib/usrp_basic_common.cc | 6 | ||||
| -rw-r--r-- | usrp/host/lib/usrp_basic_libusb.cc | 6 |
7 files changed, 18 insertions, 15 deletions
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index 4dd47595e..7c5dc25a5 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -74,7 +74,10 @@ darwin_CODE = \ win32_CODE = \ fusb_win32.cc \ - fusb_sysconfig_win32.cc + fusb_sysconfig_win32.cc \ + usrp_prims_libusb.cc \ + usrp_basic_libusb.cc + linux_CODE = \ fusb_linux.cc \ diff --git a/usrp/host/lib/fusb.cc b/usrp/host/lib/fusb.cc index ce4bb7aa9..0bd9ded59 100644 --- a/usrp/host/lib/fusb.cc +++ b/usrp/host/lib/fusb.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +//#ifdef HAVE_CONFIG_H +//#include "config.h" +//#endif #include <fusb.h> diff --git a/usrp/host/lib/fusb.h b/usrp/host/lib/fusb.h index 00bdffcc0..341e570a4 100644 --- a/usrp/host/lib/fusb.h +++ b/usrp/host/lib/fusb.h @@ -65,7 +65,7 @@ public: int block_size = 0, int nblocks = 0) = 0; // ACCESSORS - libusb_device_handle *get_libusb_device_handle () const { return d_udh; } + libusb_device_handle *get_usb_dev_handle () const { return d_udh; } }; diff --git a/usrp/host/lib/fusb_sysconfig_win32.cc b/usrp/host/lib/fusb_sysconfig_win32.cc index 16eaaa645..a0d140543 100644 --- a/usrp/host/lib/fusb_sysconfig_win32.cc +++ b/usrp/host/lib/fusb_sysconfig_win32.cc @@ -27,7 +27,7 @@ static const int MAX_BLOCK_SIZE = 64 * 1024; // Windows kernel hard limit static const int FUSB_BUFFER_SIZE = 2 * (1L << 20); // 2 MB fusb_devhandle * -fusb_sysconfig::make_devhandle (usb_dev_handle *udh) +fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx) { return new fusb_devhandle_win32 (udh); } diff --git a/usrp/host/lib/fusb_win32.cc b/usrp/host/lib/fusb_win32.cc index 8900576d9..7b11bb919 100644 --- a/usrp/host/lib/fusb_win32.cc +++ b/usrp/host/lib/fusb_win32.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +//#ifdef HAVE_CONFIG_H +//#include "config.h" +//#endif #include <fusb_win32.h> #include <usb.h> diff --git a/usrp/host/lib/usrp_basic_common.cc b/usrp/host/lib/usrp_basic_common.cc index 79e5b07ec..ad1eca56d 100644 --- a/usrp/host/lib/usrp_basic_common.cc +++ b/usrp/host/lib/usrp_basic_common.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +//#ifdef HAVE_CONFIG_H +//#include "config.h" +//#endif #include "usrp/usrp_basic.h" #include "usrp/usrp_prims.h" diff --git a/usrp/host/lib/usrp_basic_libusb.cc b/usrp/host/lib/usrp_basic_libusb.cc index c788cc054..c4842cac9 100644 --- a/usrp/host/lib/usrp_basic_libusb.cc +++ b/usrp/host/lib/usrp_basic_libusb.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +//#ifdef HAVE_CONFIG_H +//#include "config.h" +//#endif #include <usrp/usrp_basic.h> #include "usrp/usrp_prims.h" |