From 13f1dc28f162c74cc0eac6673d3c12d5195238d1 Mon Sep 17 00:00:00 2001 From: michael-west Date: Sat, 6 Feb 2021 14:34:19 -0800 Subject: mpmd: Skip find if "resource" key is specified MPM devices were being discovered when trying to locate PCIe connected devices. Adding filter to exclude them if the "resource" key is specified in the device address arguments. Replaces "lib: disable non pcie types in find with resource" to reduce impact to older devices and remove API change. Signed-off-by: michael-west --- host/lib/usrp/b200/b200_impl.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'host/lib/usrp/b200') diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 139dd9362..7f250fd42 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -182,14 +182,8 @@ static device_addrs_t b200_find(const device_addr_t& hint) // Return an empty list of addresses when an address or resource is specified, // since an address and resource is intended for a different, non-USB, device. for (device_addr_t hint_i : separate_device_addr(hint)) { - if (hint_i.has_key("addr")) + if (hint_i.has_key("addr") || hint_i.has_key("resource")) return b200_addrs; - - if (hint.has_key_with_prefix("resource")) { - UHD_LOG_TRACE( - "B200 FIND", "Returning early, PCIe is not supported with b200 devices."); - return b200_addrs; - } } // Important note: -- cgit v1.2.3