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.

1 files changed, 1 insertions, 4 deletions

diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index 9fdbc03ed..7bf362753 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -114,14 +114,11 @@ device::sptr device::make(const device_addr_t& hint, device_filter_t filter, siz
 
     typedef std::tuple<device_addr_t, make_t> dev_addr_make_t;
     std::vector<dev_addr_make_t> dev_addr_makers;
-    device_addr_t hint_with_prefs = prefs::get_usrp_args(hint);
-    UHD_LOGGER_DEBUG("UHD") << "Looking for device with hint: "
-                            << hint_with_prefs.to_string();
 
     for (const dev_fcn_reg_t& fcn : get_dev_fcn_regs()) {
         try {
             if (filter == ANY or std::get<2>(fcn) == filter) {
-                for (device_addr_t dev_addr : std::get<0>(fcn)(hint_with_prefs)) {
+                for (device_addr_t dev_addr : std::get<0>(fcn)(hint)) {
                     // append the discovered address and its factory function
                     dev_addr_makers.push_back(
                         dev_addr_make_t(dev_addr, std::get<1>(fcn)));