diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2016-06-24 16:47:54 -0400 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-01 18:49:53 -0700 |
| commit | ef249a8ed92431778642eda5aa65397865b7cae3 (patch) | |
| tree | 4175d2a27c16a91611776e2b44e19238c8fdf089 | |
| parent | 3681430062da117d2d2d4cb32f5b673c840fcc21 (diff) | |
| download | uhd-ef249a8ed92431778642eda5aa65397865b7cae3.tar.gz uhd-ef249a8ed92431778642eda5aa65397865b7cae3.tar.bz2 uhd-ef249a8ed92431778642eda5aa65397865b7cae3.zip | |
usb: fix 'timeout' variables to be unsigned since that is what the 'libusb_control_transfer' API uses.
| -rw-r--r-- | host/include/uhd/transport/usb_control.hpp | 2 | ||||
| -rw-r--r-- | host/lib/transport/libusb1_control.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_iface.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/host/include/uhd/transport/usb_control.hpp b/host/include/uhd/transport/usb_control.hpp index c5d07bbd4..f23ad5247 100644 --- a/host/include/uhd/transport/usb_control.hpp +++ b/host/include/uhd/transport/usb_control.hpp @@ -62,7 +62,7 @@ public: boost::uint16_t index, unsigned char *buff, boost::uint16_t length, - boost::int32_t timeout = 0) = 0; + boost::uint32_t timeout = 0) = 0; }; }} //namespace diff --git a/host/lib/transport/libusb1_control.cpp b/host/lib/transport/libusb1_control.cpp index 1e6cc8cd3..dfe787726 100644 --- a/host/lib/transport/libusb1_control.cpp +++ b/host/lib/transport/libusb1_control.cpp @@ -42,7 +42,7 @@ public: boost::uint16_t index, unsigned char *buff, boost::uint16_t length, - boost::int32_t libusb_timeout = 0 + boost::uint32_t libusb_timeout = 0 ){ boost::mutex::scoped_lock lock(_mutex); return libusb_control_transfer(_handle->get(), diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp index 207c418fc..218f8fd0e 100644 --- a/host/lib/usrp/b200/b200_iface.cpp +++ b/host/lib/usrp/b200/b200_iface.cpp @@ -142,7 +142,7 @@ public: boost::uint16_t index, unsigned char *buff, boost::uint16_t length, - boost::int32_t timeout = 0) { + boost::uint32_t timeout = 0) { return _usb_ctrl->submit(VRT_VENDOR_OUT, // bmReqeustType request, // bRequest value, // wValue @@ -157,7 +157,7 @@ public: boost::uint16_t index, unsigned char *buff, boost::uint16_t length, - boost::int32_t timeout = 0) { + boost::uint32_t timeout = 0) { return _usb_ctrl->submit(VRT_VENDOR_IN, // bmReqeustType request, // bRequest value, // wValue |