aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/mpmd/mpmd_find.cpp9
-rw-r--r--host/lib/usrp/mpmd/mpmd_impl.cpp8
2 files changed, 15 insertions, 2 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()) {
diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp
index d685b93b2..bd5ea8540 100644
--- a/host/lib/usrp/mpmd/mpmd_impl.cpp
+++ b/host/lib/usrp/mpmd/mpmd_impl.cpp
@@ -9,6 +9,7 @@
#include <uhd/types/component_file.hpp>
#include <uhd/utils/static.hpp>
#include <uhd/utils/tasks.hpp>
+#include <uhdlib/utils/prefs.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/thread.hpp>
#include <chrono>
@@ -149,7 +150,12 @@ const std::string mpmd_impl::MPM_ECHO_CMD = "MPM-ECHO";
mpmd_impl::mpmd_impl(const device_addr_t& device_args)
: rfnoc_device(), _device_args(device_args)
{
- const device_addrs_t mb_args = separate_device_addr(device_args);
+ const device_addrs_t mb_args_without_prefs = separate_device_addr(device_args);
+ device_addrs_t mb_args;
+ for (size_t i = 0; i < mb_args_without_prefs.size(); ++i)
+ {
+ mb_args.push_back(prefs::get_usrp_args(mb_args_without_prefs[i]));
+ }
const size_t num_mboards = mb_args.size();
_mb.reserve(num_mboards);
const bool serialize_init = device_args.has_key("serialize_init");