diff options
| author | michael-west <michael.west@ettus.com> | 2015-05-04 15:14:32 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-05-05 17:11:27 -0700 |
| commit | 5c5bbac3e0bf553981c38ee8b1503f1154d7f6c6 (patch) | |
| tree | 734207c5f97984b516366c396018bf8540e760b3 /host | |
| parent | ebc54485b8754756b1deafb15cce366e77f2f039 (diff) | |
| download | uhd-5c5bbac3e0bf553981c38ee8b1503f1154d7f6c6.tar.gz uhd-5c5bbac3e0bf553981c38ee8b1503f1154d7f6c6.tar.bz2 uhd-5c5bbac3e0bf553981c38ee8b1503f1154d7f6c6.zip | |
B200: Made find function properly ignore missing "product" value (BUG #770)
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 724f5f8b9..bd07fcaee 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -171,10 +171,8 @@ static device_addrs_t b200_find(const device_addr_t &hint) new_addr["product"] = B2X0_STR_NAMES[get_b200_type(mb_eeprom)]; } catch (const uhd::runtime_error &e) { // No problem if this fails -- this is just device discovery, after all. - UHD_MSG(error) << e.what() << std::endl; - // Skip this loop. - continue; } + //this is a found b200 when the hint serial and name match or blank if ( (not hint.has_key("name") or hint["name"] == new_addr["name"]) and |