diff options
| author | ttsou | 2009-09-17 11:24:55 -0400 |
|---|---|---|
| committer | ttsou | 2009-09-17 14:10:04 -0400 |
| commit | 8d3550d330eeac88f4991db866288468be084ddf (patch) | |
| tree | 2e9c4fdc0809b0f76af3d60bd65d15d37ea68546 | |
| parent | 943a61fcc94d7668c4abf5133806398e8d75148b (diff) | |
| download | gnuradio-8d3550d330eeac88f4991db866288468be084ddf.tar.gz gnuradio-8d3550d330eeac88f4991db866288468be084ddf.tar.bz2 gnuradio-8d3550d330eeac88f4991db866288468be084ddf.zip | |
Allow fusb_sysconfig to build on non-linux libusb-0.12 impls
| -rw-r--r-- | usrp/host/lib/fusb_sysconfig_darwin.cc | 2 | ||||
| -rw-r--r-- | usrp/host/lib/fusb_sysconfig_generic.cc | 2 | ||||
| -rw-r--r-- | usrp/host/lib/fusb_sysconfig_libusb1.cc | 3 | ||||
| -rw-r--r-- | usrp/host/lib/fusb_sysconfig_ra_wb.cc | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/usrp/host/lib/fusb_sysconfig_darwin.cc b/usrp/host/lib/fusb_sysconfig_darwin.cc index 4d19d1292..3d1f656cd 100644 --- a/usrp/host/lib/fusb_sysconfig_darwin.cc +++ b/usrp/host/lib/fusb_sysconfig_darwin.cc @@ -27,7 +27,7 @@ static const int MAX_BLOCK_SIZE = 32 * 1024; // 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_darwin (udh); } diff --git a/usrp/host/lib/fusb_sysconfig_generic.cc b/usrp/host/lib/fusb_sysconfig_generic.cc index 58baba5a5..271ba6e3a 100644 --- a/usrp/host/lib/fusb_sysconfig_generic.cc +++ b/usrp/host/lib/fusb_sysconfig_generic.cc @@ -27,7 +27,7 @@ static const int MAX_BLOCK_SIZE = 16 * 1024; // 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_generic (udh); } diff --git a/usrp/host/lib/fusb_sysconfig_libusb1.cc b/usrp/host/lib/fusb_sysconfig_libusb1.cc index f71e34fa9..a005f540d 100644 --- a/usrp/host/lib/fusb_sysconfig_libusb1.cc +++ b/usrp/host/lib/fusb_sysconfig_libusb1.cc @@ -30,8 +30,7 @@ static const int FUSB_BUFFER_SIZE = 1 * (1L << 20); // 1 MB struct libusb_context; fusb_devhandle * -fusb_sysconfig::make_devhandle (libusb_device_handle *udh, - libusb_context *ctx) +fusb_sysconfig::make_devhandle (libusb_device_handle *udh, libusb_context *ctx) { return new fusb_devhandle_libusb1 (udh, ctx); } diff --git a/usrp/host/lib/fusb_sysconfig_ra_wb.cc b/usrp/host/lib/fusb_sysconfig_ra_wb.cc index 9da831fd5..561ab2223 100644 --- a/usrp/host/lib/fusb_sysconfig_ra_wb.cc +++ b/usrp/host/lib/fusb_sysconfig_ra_wb.cc @@ -31,7 +31,7 @@ static const int MAX_BLOCK_SIZE = 64 * 1024; static const int FUSB_BUFFER_SIZE = 256 * (1L << 10); // 256 kB 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_ra_wb (udh); } |