aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2020-07-29 18:06:26 +0200
committerAaron Rossetto <aaron.rossetto@ni.com>2020-08-07 07:25:08 -0500
commitc969ccb039292a62218ada8cd77fb38f94915aa5 (patch)
treed80a545f8840852864bb05611eb02e2e57f49830
parentd05bacf1209044ca3f9007b983e963c72ec36337 (diff)
downloaduhd-c969ccb039292a62218ada8cd77fb38f94915aa5.tar.gz
uhd-c969ccb039292a62218ada8cd77fb38f94915aa5.tar.bz2
uhd-c969ccb039292a62218ada8cd77fb38f94915aa5.zip
mpmd: Clean out link_if_mgr
The link_if_mgr used to be a factory for Liberio, UDP, and DPDK. Now, Liberio is gone and DPDK is handled by UDP. This makes the class superfluous. Instead of removing the class, we comment on this, and remove any DPDK references from the file.
-rw-r--r--host/lib/usrp/mpmd/mpmd_link_if_mgr.cpp6
-rw-r--r--host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp5
2 files changed, 4 insertions, 7 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_link_if_mgr.cpp b/host/lib/usrp/mpmd/mpmd_link_if_mgr.cpp
index 2173feeca..558570257 100644
--- a/host/lib/usrp/mpmd/mpmd_link_if_mgr.cpp
+++ b/host/lib/usrp/mpmd/mpmd_link_if_mgr.cpp
@@ -94,12 +94,6 @@ private:
{
// Here, we hard-code the list of available transport types
if (link_type == "udp") {
-#ifdef HAVE_DPDK
- // if (_mb_args.has_key("use_dpdk")) {
- // return std::make_unique<mpmd_link_if_ctrl_dpdk_udp>(_mb_args,
- // xport_info);
- //}
-#endif
return std::make_unique<mpmd_link_if_ctrl_udp>(_mb_args, xport_info, chdr_w);
}
UHD_LOG_WARNING("MPMD", "Cannot instantiate transport medium " << link_type);
diff --git a/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp b/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp
index 8f364c10f..eac73e416 100644
--- a/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp
+++ b/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp
@@ -42,10 +42,13 @@ uhd::dict<std::string, std::string> filter_args(
/*! MPMD Transport Manager
*
- * A transport manager is an object which sets up a physical connection to a
+ * A transport manager is a factory object which sets up a physical connection to a
* CHDR device. Its implementation is specific to the underlying transport
* medium. For example, if the medium is Ethernet/UDP, this class will create
* sockets.
+ *
+ * Note: As of UHD 4.0, there is only one underlying transport medium (UDP).
+ * We keep this factory nevertheless for the sake of continuity and future-proofing.
*/
class mpmd_link_if_mgr
{