diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-08-12 16:33:26 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-08-12 16:33:26 -0700 |
| commit | d745b5cf6d9a918be141339ceca5fbf9d6259eab (patch) | |
| tree | e08c449fe7041b734cd537cdca06f68dac219387 /host/lib/transport | |
| parent | 094bf7607362b08663c1b94ca05432da519036c5 (diff) | |
| parent | bc9dd05988454428de1b6efd235d980b8eaa9afe (diff) | |
| download | uhd-d745b5cf6d9a918be141339ceca5fbf9d6259eab.tar.gz uhd-d745b5cf6d9a918be141339ceca5fbf9d6259eab.tar.bz2 uhd-d745b5cf6d9a918be141339ceca5fbf9d6259eab.zip | |
Merge branch 'master' into ashish/register_api
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/transport/libusb1_zero_copy.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index 9ec8a5c0b..6abc399b4 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2010-2013 Ettus Research LLC +# Copyright 2010-2013,2015 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ INCLUDE_SUBDIRECTORY(nirio) MESSAGE(STATUS "") FIND_PACKAGE(USB1) -LIBUHD_REGISTER_COMPONENT("USB" ENABLE_USB ON "ENABLE_LIBUHD;LIBUSB_FOUND" OFF) +LIBUHD_REGISTER_COMPONENT("USB" ENABLE_USB ON "ENABLE_LIBUHD;LIBUSB_FOUND" OFF OFF) IF(ENABLE_USB) MESSAGE(STATUS "USB support enabled via libusb.") diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp index 6925e7659..b67b36d0a 100644 --- a/host/lib/transport/libusb1_zero_copy.cpp +++ b/host/lib/transport/libusb1_zero_copy.cpp @@ -139,8 +139,8 @@ public: #endif const int ret = libusb_submit_transfer(_lut); if (ret != LIBUSB_SUCCESS) - throw uhd::runtime_error(str(boost::format("usb %s submit failed: %s") - % _name % libusb_strerror((libusb_error)ret))); + throw uhd::usb_error(ret, str(boost::format( + "usb %s submit failed: %s") % _name % libusb_error_name(ret))); } template <typename buffer_type> @@ -353,7 +353,7 @@ private: _enqueued.push_back(_released.front()); _released.pop_front(); } - catch (uhd::runtime_error& e) + catch (uhd::usb_error& e) { _status = STATUS_ERROR; throw e; |