diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
| commit | 450abc5b213fc477ae0f2d648405a8b6a55a7b03 (patch) | |
| tree | 01820d898ecd6541f988378413b4c55f16ebad6d /host/lib/usrp/usrp1/usrp1_impl.cpp | |
| parent | 7cb95203f8d7173e3d7070d24f68358be67d0b29 (diff) | |
| parent | b70d4430d4a898fe99b54740a1c4821ed9a1077b (diff) | |
| download | uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.gz uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.bz2 uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into tvrx_uhd
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index a6806dbc3..80ea49e9d 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -62,7 +62,7 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) hint.has_key("fw")? hint["fw"] : "usrp1_fw.ihx" ); } - catch(const std::exception &e){ + catch(...){ uhd::print_warning( "Could not locate USRP1 firmware.\n" "Please install the images package.\n" @@ -96,7 +96,10 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) device_addr_t new_addr; new_addr["type"] = "usrp1"; new_addr["serial"] = handle->get_serial(); - usrp1_addrs.push_back(new_addr); + //this is a found usrp1 when a hint serial is not specified or it matches + if (not hint.has_key("serial") or hint["serial"] == new_addr["serial"]){ + usrp1_addrs.push_back(new_addr); + } } return usrp1_addrs; |