diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-02-29 12:42:16 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-02-29 12:42:16 -0800 |
| commit | 2855abc807f336dcfe9b18d2f7ca53b9e67b7adb (patch) | |
| tree | 335dcd3615d13cbfed4edb0b09b96912510e7399 | |
| parent | 261ae74f8ecbd255417b8fcd9f2caddff7ae5977 (diff) | |
| parent | f212665812b9d25b28a254bcb8d0203d80dd77c1 (diff) | |
| download | uhd-2855abc807f336dcfe9b18d2f7ca53b9e67b7adb.tar.gz uhd-2855abc807f336dcfe9b18d2f7ca53b9e67b7adb.tar.bz2 uhd-2855abc807f336dcfe9b18d2f7ca53b9e67b7adb.zip | |
Merge branch 'maint'
| -rw-r--r-- | firmware/e300/battery/README.md | 2 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/firmware/e300/battery/README.md b/firmware/e300/battery/README.md index fc4d504dd..a1074425d 100644 --- a/firmware/e300/battery/README.md +++ b/firmware/e300/battery/README.md @@ -5,7 +5,7 @@ Welcome to the NI Ettus Research USRP E310/E312 Firmware distribution. # Dependencies -In order to build you'll *avr-gcc* and *avr-libc*. +In order to build you'll *avr-gcc*, *avr-libc*, and *srec_cat*. # Building diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 61d71644b..386732cdf 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -344,10 +344,12 @@ b200_impl::b200_impl(const uhd::device_addr_t& device_addr, usb_device_handle::s //locate the matching handle in the device list BOOST_FOREACH(usb_device_handle::sptr dev_handle, device_list) { - if (dev_handle->get_serial() == device_addr["serial"]){ - handle = dev_handle; - break; - } + try { + if (dev_handle->get_serial() == device_addr["serial"]){ + handle = dev_handle; + break; + } + } catch (const uhd::exception &e) { continue; } } UHD_ASSERT_THROW(handle.get() != NULL); //better be found |