diff options
| author | Lane Kolbly <lane.kolbly@ni.com> | 2020-03-31 13:39:54 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-04-08 15:32:50 -0500 |
| commit | 843527d303b4407f273b10a8986d6a51f5eeb389 (patch) | |
| tree | 4ec4f68b7a3af44bec3c4e5c8f36361bcdfb307c /host/lib/usrp/mpmd/mpmd_find.cpp | |
| parent | a2ce2facc7330fca15f0bac374563f79fb3e85fb (diff) | |
| download | uhd-843527d303b4407f273b10a8986d6a51f5eeb389.tar.gz uhd-843527d303b4407f273b10a8986d6a51f5eeb389.tar.bz2 uhd-843527d303b4407f273b10a8986d6a51f5eeb389.zip | |
uhd: mpm: Query prefs per-device for multi-device queries
If a user specifies a multi-device query, such as "serial0=1234,serial1=4321",
we have to look up the preferences for each device. To minimize the
impact to non-x400 devices, I simply push the get_usrp_args call down
into mpmd_impl and mpmd_find.
Diffstat (limited to 'host/lib/usrp/mpmd/mpmd_find.cpp')
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_find.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_find.cpp b/host/lib/usrp/mpmd/mpmd_find.cpp index c04615587..9c7ea8958 100644 --- a/host/lib/usrp/mpmd/mpmd_find.cpp +++ b/host/lib/usrp/mpmd/mpmd_find.cpp @@ -13,6 +13,7 @@ #include <uhd/transport/if_addrs.hpp> #include <uhd/transport/udp_simple.hpp> #include <uhd/types/device_addr.hpp> +#include <uhdlib/utils/prefs.hpp> #include <boost/algorithm/string.hpp> #include <boost/asio.hpp> #include <future> @@ -206,7 +207,13 @@ device_addrs_t mpmd_find(const device_addr_t& hint_) } } #endif - device_addrs_t hints = separate_device_addr(hint_); + device_addrs_t hints_without_prefs = separate_device_addr(hint_); + device_addrs_t hints; + for (size_t i = 0; i < hints_without_prefs.size(); i++) + { + hints.push_back(prefs::get_usrp_args(hints_without_prefs[i])); + } + if (hint_.has_key("type")) { if (std::find(MPM_DEVICE_TYPES.cbegin(), MPM_DEVICE_TYPES.cend(), hint_["type"]) == MPM_DEVICE_TYPES.cend()) { |