diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-28 11:11:29 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-28 11:11:29 -0700 |
| commit | 071c4d4226d9cbeb1f1f67139261b13205816d8a (patch) | |
| tree | 6593df48a731cb6bff687822b284fcba649cf6f6 /host/lib/usrp/usrp1 | |
| parent | f5bdb7ccb39ef23d4b2c0872fe410e9d5d031958 (diff) | |
| parent | 852f5c5f7b31bfb2e7561a86ca9f5380bd53d130 (diff) | |
| download | uhd-071c4d4226d9cbeb1f1f67139261b13205816d8a.tar.gz uhd-071c4d4226d9cbeb1f1f67139261b13205816d8a.tar.bz2 uhd-071c4d4226d9cbeb1f1f67139261b13205816d8a.zip | |
Merge branch 'master' into libusb
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index a56649305..b4c23bf12 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -95,7 +95,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; |