From: ttsou <ttsou@vt.edu>
Date: Thu, 17 Sep 2009 15:24:55 +0000 (-0400)
Subject: Allow fusb_sysconfig to build on non-linux libusb-0.12 impls
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8d3550d330eeac88f4991db866288468be084ddf;p=debian%2Fgnuradio

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 4d19d129..3d1f656c 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 58baba5a..271ba6e3 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 f71e34fa..a005f540 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 9da831fd..561ab222 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);
 }