usb: fix interfaces to be type 'int' and endpoints to be type 'unsigned char' to match the libusb API.

4 files changed, 16 insertions, 16 deletions

diff --git a/host/include/uhd/transport/usb_control.hpp b/host/include/uhd/transport/usb_control.hpp
index f23ad5247..786bd0815 100644
--- a/host/include/uhd/transport/usb_control.hpp
+++ b/host/include/uhd/transport/usb_control.hpp
@@ -36,7 +36,7 @@ public:
      * \param handle a device handle that uniquely identifies a USB device
      * \param interface the USB interface number for the control transport
      */
-    static sptr make(usb_device_handle::sptr handle, const size_t interface);
+    static sptr make(usb_device_handle::sptr handle, const int interface);
 
     /*!
      * Submit a USB device request:
diff --git a/host/include/uhd/transport/usb_zero_copy.hpp b/host/include/uhd/transport/usb_zero_copy.hpp
index ae1926e1b..eb28040b6 100644
--- a/host/include/uhd/transport/usb_zero_copy.hpp
+++ b/host/include/uhd/transport/usb_zero_copy.hpp
@@ -55,10 +55,10 @@ public:
      */
     static sptr make(
         usb_device_handle::sptr handle,
-        const size_t recv_interface,
-        const size_t recv_endpoint,
-        const size_t send_interface,
-        const size_t send_endpoint,
+        const int recv_interface,
+        const unsigned char recv_endpoint,
+        const int send_interface,
+        const unsigned char send_endpoint,
         const device_addr_t &hints = device_addr_t()
     );
 };
diff --git a/host/lib/transport/libusb1_control.cpp b/host/lib/transport/libusb1_control.cpp
index dfe787726..699581839 100644
--- a/host/lib/transport/libusb1_control.cpp
+++ b/host/lib/transport/libusb1_control.cpp
@@ -30,7 +30,7 @@ usb_control::~usb_control(void){
  **********************************************************************/
 class libusb_control_impl : public usb_control {
 public:
-    libusb_control_impl(libusb::device_handle::sptr handle, const size_t interface):
+    libusb_control_impl(libusb::device_handle::sptr handle, const int interface):
         _handle(handle)
     {
         _handle->claim_interface(interface);
@@ -63,7 +63,7 @@ private:
 /***********************************************************************
  * USB control public make functions
  **********************************************************************/
-usb_control::sptr usb_control::make(usb_device_handle::sptr handle, const size_t interface){
+usb_control::sptr usb_control::make(usb_device_handle::sptr handle, const int interface){
     return sptr(new libusb_control_impl(libusb::device_handle::get_cached_handle(
         boost::static_pointer_cast<libusb::special_handle>(handle)->get_device()
     ), interface));
diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp
index 53e345009..d2c7d2160 100644
--- a/host/lib/transport/libusb1_zero_copy.cpp
+++ b/host/lib/transport/libusb1_zero_copy.cpp
@@ -197,7 +197,7 @@ class libusb_zero_copy_single
 public:
     libusb_zero_copy_single(
         libusb::device_handle::sptr handle,
-        const size_t interface, const size_t endpoint,
+        const int interface, const unsigned char endpoint,
         const size_t num_frames, const size_t frame_size
     ):
         _handle(handle),
@@ -372,10 +372,10 @@ struct libusb_zero_copy_impl : usb_zero_copy
 {
     libusb_zero_copy_impl(
         libusb::device_handle::sptr handle,
-        const size_t recv_interface,
-        const size_t recv_endpoint,
-        const size_t send_interface,
-        const size_t send_endpoint,
+        const int recv_interface,
+        const unsigned char recv_endpoint,
+        const int send_interface,
+        const unsigned char send_endpoint,
         const device_addr_t &hints
     ){
         _recv_impl.reset(new libusb_zero_copy_single(
@@ -415,10 +415,10 @@ struct libusb_zero_copy_impl : usb_zero_copy
  **********************************************************************/
 usb_zero_copy::sptr usb_zero_copy::make(
     usb_device_handle::sptr handle,
-    const size_t recv_interface,
-    const size_t recv_endpoint,
-    const size_t send_interface,
-    const size_t send_endpoint,
+    const int recv_interface,
+    const unsigned char recv_endpoint,
+    const int send_interface,
+    const unsigned char send_endpoint,
     const device_addr_t &hints
 ){
     libusb::device_handle::sptr dev_handle(libusb::device_handle::get_cached_handle(