diff options
| author | Steven Koo <steven.koo@ni.com> | 2020-09-24 13:05:34 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-10-05 12:02:05 -0500 |
| commit | 8fea36aa81195d758a29067141afdc4becefe5ae (patch) | |
| tree | 4f0d411d872355726b7a88c6632a7646425c2587 /host/lib/usrp/usrp2/usrp2_impl.cpp | |
| parent | 75fe86a92bfbd037545afdafd2677f390eccefa5 (diff) | |
| download | uhd-8fea36aa81195d758a29067141afdc4becefe5ae.tar.gz uhd-8fea36aa81195d758a29067141afdc4becefe5ae.tar.bz2 uhd-8fea36aa81195d758a29067141afdc4becefe5ae.zip | |
lib: disable non pcie types in find with resource
mpmd find doesn't respect the "resource" arg hint and can be detected
when "resource" is set. This results in incorrect device selection when
using PCIe. This change adds detection for "resource" as a prefix
in the device hints for mpmd and the other devices.
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index c2514ae02..8ca503aa9 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -68,8 +68,11 @@ device_addrs_t usrp2_find(const device_addr_t& hint_) // Return an empty list of addresses when a resource is specified, // since a resource is intended for a different, non-USB, device. - if (hint.has_key("resource")) + if (hint.has_key_with_prefix("resource")) { + UHD_LOG_TRACE( + "USRP2 FIND", "Returning early, PCIe is not supported with usrp2 devices."); return usrp2_addrs; + } // if no address was specified, send a broadcast on each interface if (not hint.has_key("addr")) { |