diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
| commit | 6464a000150858b5d65a53490f0593d5ba1e4ca6 (patch) | |
| tree | a199c3773d683d9e37fa300900291c3628cff6e4 /host/lib/usrp/b200/b200_impl.cpp | |
| parent | d697bff4547b6a7fb95e127ec12e2989fc6fc2e5 (diff) | |
| parent | 8adefb1d80f08a53856fef45b80ed5a07f0a9a26 (diff) | |
| download | uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.gz uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.bz2 uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 6bd49e013..12baa1c14 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -227,7 +227,7 @@ static device_addrs_t b200_find(const device_addr_t &hint) try { // Turn the 16-Bit product ID into a string representation new_addr["product"] = B2XX_STR_NAMES[get_b200_product(handle, mb_eeprom)]; - } catch (const uhd::runtime_error &e) { + } catch (const uhd::runtime_error &) { // No problem if this fails -- this is just device discovery, after all. new_addr["product"] = "B2??"; } @@ -258,7 +258,8 @@ static device::sptr b200_make(const device_addr_t &device_addr) try { return device::sptr(new b200_impl(device_addr, handle)); } - catch (const uhd::usb_error &e) { + catch (const uhd::usb_error &) { + UHD_MSG(status) << "Detected bad USB state; resetting." << std::flush; libusb::device_handle::sptr dev_handle(libusb::device_handle::get_cached_handle( boost::static_pointer_cast<libusb::special_handle>(handle)->get_device() )); |