Allow fusb_sysconfig to build on non-linux libusb-0.12 impls

diff --git a/usrp/host/lib/fusb_sysconfig_darwin.cc b/usrp/host/lib/fusb_sysconfig_darwin.cc
index 4d19d1292cfccccbb1ed74537e314c57753b44b4..3d1f656cd3878b2670adf35becf1bf8b2657737f 100644 (file)
--- 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 58baba5a580703980dd3666c5e09dc51a82748ae..271ba6e3abc9a11098b1de9c9928d990dea99319 100644 (file)
--- 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 f71e34fa947dcc14c326954e5eaeee918f70c944..a005f540d242dfa4bb97f9e6dc5e6a2b94595f75 100644 (file)
--- 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 9da831fd562b9d003fb9eea4d128e22d4001a88f..561ab22234501b741470b24bd5e74737f06460dc 100644 (file)
--- 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);
 }