Remove proto-RFNoC files

This commit removes all files and parts of files that are used by
proto-RFNoC only.

uhd: Fix include CMakeLists.txt, add missing files

4 files changed, 71 insertions, 82 deletions

diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp
index 30a3c5804..69f990807 100644
--- a/host/lib/usrp/mpmd/mpmd_impl.cpp
+++ b/host/lib/usrp/mpmd/mpmd_impl.cpp
@@ -7,15 +7,9 @@
 #include "mpmd_impl.hpp"
 #include <uhd/exception.hpp>
 #include <uhd/types/component_file.hpp>
-#include <uhd/types/eeprom.hpp>
-#include <uhd/types/sensors.hpp>
-#include <uhd/usrp/mboard_eeprom.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/utils/tasks.hpp>
-#include <uhdlib/rfnoc/radio_ctrl_impl.hpp>
-#include <uhdlib/rfnoc/rpc_block_ctrl.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/asio.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/thread.hpp>
 #include <chrono>
diff --git a/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.cpp b/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.cpp
index baf0dde3e..2a3a48b62 100644
--- a/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.cpp
+++ b/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.cpp
@@ -192,77 +192,79 @@ mpmd_link_if_ctrl_dpdk_udp::mpmd_link_if_ctrl_dpdk_udp(
     }
 }
 
-uhd::both_xports_t
-mpmd_link_if_ctrl_dpdk_udp::make_transport(
-        mpmd_link_if_mgr::xport_info_t &xport_info,
-        const usrp::device3_impl::xport_type_t xport_type,
-        const uhd::device_addr_t& xport_args
-) {
+// uhd::both_xports_t
+// mpmd_link_if_ctrl_dpdk_udp::make_transport(
+// mpmd_link_if_mgr::xport_info_t &xport_info,
+// const uhd::transport::link_type_t xport_type,
+// const uhd::device_addr_t& xport_args
+//) {
 
-    // Constrain by this transport's MTU and the MTU in the xport_args
-    const size_t send_mtu = std::min(get_mtu(uhd::TX_DIRECTION),
-        xport_args.cast<size_t>("mtu", get_mtu(uhd::TX_DIRECTION)));
-    const size_t recv_mtu = std::min(get_mtu(uhd::RX_DIRECTION),
-        xport_args.cast<size_t>("mtu", get_mtu(uhd::RX_DIRECTION)));
+//// Constrain by this transport's MTU and the MTU in the xport_args
+// const size_t send_mtu = std::min(get_mtu(uhd::TX_DIRECTION),
+// xport_args.cast<size_t>("mtu", get_mtu(uhd::TX_DIRECTION)));
+// const size_t recv_mtu = std::min(get_mtu(uhd::RX_DIRECTION),
+// xport_args.cast<size_t>("mtu", get_mtu(uhd::RX_DIRECTION)));
 
-    // Create actual UHD-DPDK UDP transport
-    transport::zero_copy_xport_params default_buff_args;
-    default_buff_args.num_recv_frames = MPMD_ETH_NUM_CTRL_FRAMES;
-    default_buff_args.num_send_frames = MPMD_ETH_NUM_CTRL_FRAMES;
-    default_buff_args.recv_frame_size = MPMD_10GE_MSG_FRAME_DEFAULT_SIZE;
-    default_buff_args.send_frame_size = MPMD_10GE_MSG_FRAME_DEFAULT_SIZE;
+//// Create actual UHD-DPDK UDP transport
+// transport::zero_copy_xport_params default_buff_args;
+// default_buff_args.num_recv_frames = MPMD_ETH_NUM_CTRL_FRAMES;
+// default_buff_args.num_send_frames = MPMD_ETH_NUM_CTRL_FRAMES;
+// default_buff_args.recv_frame_size = MPMD_10GE_MSG_FRAME_DEFAULT_SIZE;
+// default_buff_args.send_frame_size = MPMD_10GE_MSG_FRAME_DEFAULT_SIZE;
 
-    if (xport_type == usrp::device3_impl::RX_DATA) {
-        default_buff_args.num_recv_frames =
-            xport_args.cast<size_t>("num_recv_frames", MPMD_ETH_NUM_RECV_FRAMES);
-        default_buff_args.recv_frame_size = std::min(
-            xport_args.cast<size_t>("recv_frame_size",
-                MPMD_10GE_DATA_FRAME_DEFAULT_SIZE),
-            recv_mtu);
-    } else if (xport_type == usrp::device3_impl::TX_DATA) {
-        default_buff_args.num_send_frames =
-            xport_args.cast<size_t>("num_send_frames", MPMD_ETH_NUM_SEND_FRAMES);
-        default_buff_args.send_frame_size = std::min(
-            xport_args.cast<size_t>("send_frame_size",
-                MPMD_10GE_DATA_FRAME_DEFAULT_SIZE),
-            send_mtu);
-    }
+// if (xport_type == uhd::transport::link_type_t::RX_DATA) {
+// default_buff_args.num_recv_frames =
+// xport_args.cast<size_t>("num_recv_frames", MPMD_ETH_NUM_RECV_FRAMES);
+// default_buff_args.recv_frame_size = std::min(
+// xport_args.cast<size_t>("recv_frame_size",
+// MPMD_10GE_DATA_FRAME_DEFAULT_SIZE),
+// recv_mtu);
+//} else if (xport_type == uhd::transport::link_type_t::TX_DATA) {
+// default_buff_args.num_send_frames =
+// xport_args.cast<size_t>("num_send_frames", MPMD_ETH_NUM_SEND_FRAMES);
+// default_buff_args.send_frame_size = std::min(
+// xport_args.cast<size_t>("send_frame_size",
+// MPMD_10GE_DATA_FRAME_DEFAULT_SIZE),
+// send_mtu);
+//}
 
-    UHD_LOG_TRACE("BUFF", "num_recv_frames=" << default_buff_args.num_recv_frames
-                     << ", num_send_frames=" << default_buff_args.num_send_frames
-                     << ", recv_frame_size=" << default_buff_args.recv_frame_size
-                     << ", send_frame_size=" << default_buff_args.send_frame_size);
+// UHD_LOG_TRACE("BUFF", "num_recv_frames=" << default_buff_args.num_recv_frames
+//<< ", num_send_frames=" << default_buff_args.num_send_frames
+//<< ", recv_frame_size=" << default_buff_args.recv_frame_size
+//<< ", send_frame_size=" << default_buff_args.send_frame_size);
 
-    int dpdk_port_id = _ctx.get_route(xport_info["ipv4"]);
-    if (dpdk_port_id < 0) {
-        throw uhd::runtime_error("Could not find a DPDK port with route to " +
-            xport_info["ipv4"]);
-    }
-    auto recv = transport::dpdk_zero_copy::make(
-        _ctx,
-        (const unsigned int) dpdk_port_id,
-        xport_info["ipv4"],
-        xport_info["port"],
-        "0",
-        default_buff_args,
-        uhd::device_addr_t()
-    );
-    const uint16_t port = recv->get_local_port();
-    const std::string src_ip_addr = recv->get_local_addr();
-    xport_info["src_port"] = std::to_string(port);
-    xport_info["src_ipv4"] = src_ip_addr;
+// int dpdk_port_id = _ctx.get_route(xport_info["ipv4"]);
+// if (dpdk_port_id < 0) {
+// throw uhd::runtime_error("Could not find a DPDK port with route to " +
+// xport_info["ipv4"]);
+//}
+// auto recv = transport::dpdk_zero_copy::make(
+//_ctx,
+//(const unsigned int) dpdk_port_id,
+// xport_info["ipv4"],
+// xport_info["port"],
+//"0",
+// default_buff_args,
+// uhd::device_addr_t()
+//);
+// const uint16_t port = recv->get_local_port();
+// const std::string src_ip_addr = recv->get_local_addr();
+// xport_info["src_port"] = std::to_string(port);
+// xport_info["src_ipv4"] = src_ip_addr;
 
-    // Create both_xports_t object and finish:
-    both_xports_t xports;
-    xports.endianness = uhd::ENDIANNESS_BIG;
-    xports.send_sid = sid_t(xport_info["send_sid"]);
-    xports.recv_sid = xports.send_sid.reversed();
-    xports.recv_buff_size = (default_buff_args.recv_frame_size-MPMD_UDP_RESERVED_FRAME_SIZE)*default_buff_args.num_recv_frames;
-    xports.send_buff_size = (default_buff_args.send_frame_size-MPMD_UDP_RESERVED_FRAME_SIZE)*default_buff_args.num_send_frames;
-    xports.recv = recv; // Note: This is a type cast!
-    xports.send = recv; // This too
-    return xports;
-}
+//// Create both_xports_t object and finish:
+// both_xports_t xports;
+// xports.endianness = uhd::ENDIANNESS_BIG;
+// xports.send_sid = sid_t(xport_info["send_sid"]);
+// xports.recv_sid = xports.send_sid.reversed();
+// xports.recv_buff_size =
+// (default_buff_args.recv_frame_size-MPMD_UDP_RESERVED_FRAME_SIZE)*default_buff_args.num_recv_frames;
+// xports.send_buff_size =
+// (default_buff_args.send_frame_size-MPMD_UDP_RESERVED_FRAME_SIZE)*default_buff_args.num_send_frames;
+// xports.recv = recv; // Note: This is a type cast!
+// xports.send = recv; // This too
+// return xports;
+//}
 
 bool mpmd_link_if_ctrl_dpdk_udp::is_valid(
     const mpmd_link_if_mgr::xport_info_t& xport_info
diff --git a/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.hpp b/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.hpp
index 4423b4340..8f4f1c7d1 100644
--- a/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.hpp
+++ b/host/lib/usrp/mpmd/mpmd_link_if_ctrl_dpdk_udp.hpp
@@ -10,7 +10,6 @@
 #include "mpmd_link_if_ctrl_base.hpp"
 #include <uhd/types/device_addr.hpp>
 #include <uhdlib/transport/dpdk_zero_copy.hpp>
-#include "../device3/device3_impl.hpp"
 
 namespace uhd { namespace mpmd { namespace xport {
 
@@ -25,12 +24,6 @@ public:
         const uhd::device_addr_t& mb_args
     );
 
-    both_xports_t make_transport(
-        mpmd_link_if_mgr::xport_info_t& xport_info,
-        const usrp::device3_impl::xport_type_t xport_type,
-        const uhd::device_addr_t& xport_args
-    );
-
     bool is_valid(
         const mpmd_link_if_mgr::xport_info_t& xport_info
     ) const;
diff --git a/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp b/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp
index 4b0ba4212..a1d11bad7 100644
--- a/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp
+++ b/host/lib/usrp/mpmd/mpmd_link_if_mgr.hpp
@@ -130,10 +130,10 @@ public:
      *          The latter needs to get sent back to MPM to complete the
      *          transport handshake.
      */
-    //virtual both_xports_t make_transport(const xport_info_list_t& xport_info_list,
-        //const usrp::device3_impl::xport_type_t xport_type,
-        //const uhd::device_addr_t& xport_args,
-        //xport_info_t& xport_info_out) = 0;
+    // virtual both_xports_t make_transport(const xport_info_list_t& xport_info_list,
+    // const uhd::transport::link_type_t::xport_type_t xport_type,
+    // const uhd::device_addr_t& xport_args,
+    // xport_info_t& xport_info_out) = 0;
 
     /*! Return the path MTU for whatever this manager lets us do
      */