From 2362b3b3fbfd642c92b782771863fa2cd8ef23b0 Mon Sep 17 00:00:00 2001 From: Andrew Lynch Date: Tue, 14 Jan 2020 16:08:46 -0600 Subject: device: read in preferences file before discovery --- host/lib/device.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'host/lib') diff --git a/host/lib/device.cpp b/host/lib/device.cpp index 1749f4a60..752e70288 100644 --- a/host/lib/device.cpp +++ b/host/lib/device.cpp @@ -130,11 +130,13 @@ device::sptr device::make(const device_addr_t &hint, device_filter_t filter, siz typedef std::tuple dev_addr_make_t; std::vector 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)){ + for (device_addr_t dev_addr : std::get<0>(fcn)(hint_with_prefs)) { //append the discovered address and its factory function dev_addr_makers.push_back(dev_addr_make_t(dev_addr, std::get<1>(fcn))); } -- cgit v1.2.3