diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-24 15:53:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-24 15:53:03 -0700 |
| commit | 192663bcc919a794a24eabb38d12519f445b7a47 (patch) | |
| tree | ba55269010c4484bef12d4019c691d9e469165d7 /host/lib/transport/libusb1_zero_copy.cpp | |
| parent | 77cdb4a9695e71e64e1d87cfad2cb4d8717f971e (diff) | |
| parent | 5d6d25b49cc783ef012410064bc9eb0e66e50227 (diff) | |
| download | uhd-192663bcc919a794a24eabb38d12519f445b7a47.tar.gz uhd-192663bcc919a794a24eabb38d12519f445b7a47.tar.bz2 uhd-192663bcc919a794a24eabb38d12519f445b7a47.zip | |
Merge branch 'master' into usrp_e
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host/lib/transport/libusb1_zero_copy.cpp')
| -rw-r--r-- | host/lib/transport/libusb1_zero_copy.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp index b890a87f9..b3a160462 100644 --- a/host/lib/transport/libusb1_zero_copy.cpp +++ b/host/lib/transport/libusb1_zero_copy.cpp @@ -18,7 +18,6 @@ #include "libusb1_base.hpp" #include <uhd/transport/usb_zero_copy.hpp> #include <uhd/utils/assert.hpp> -#include <boost/asio.hpp> #include <boost/format.hpp> #include <iostream> #include <iomanip> @@ -208,7 +207,7 @@ libusb_transfer *usb_endpoint::allocate_transfer(int buff_len) endpoint, // endpoint buff, // buffer buff_len, // length - callback, // callback + libusb_transfer_cb_fn(callback), // callback this, // user_data 0); // timeout return lut; |