From 5c1771cc68edca442d870611ef8d9662b5d00d8b Mon Sep 17 00:00:00 2001 From: Andrew Lynch Date: Wed, 10 Jun 2020 17:15:46 -0500 Subject: CHDR: support multiple CHDR widths Support management payloads on busses over 64 bits Automatically set CHDR width for mpmd_link_if_ctrl_udp --- host/lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'host/lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp') diff --git a/host/lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp b/host/lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp index b4a0dfd32..bdf088025 100644 --- a/host/lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp +++ b/host/lib/usrp/mpmd/mpmd_link_if_ctrl_udp.cpp @@ -26,9 +26,6 @@ using namespace uhd; using namespace uhd::transport; using namespace uhd::mpmd::xport; -const uhd::rfnoc::chdr::chdr_packet_factory mpmd_link_if_ctrl_udp::_pkt_factory( - uhd::rfnoc::CHDR_W_64, ENDIANNESS_LITTLE); - namespace { //! Maximum CHDR packet size in bytes @@ -214,10 +211,12 @@ size_t discover_mtu(const std::string& address, * Structors *****************************************************************************/ mpmd_link_if_ctrl_udp::mpmd_link_if_ctrl_udp(const uhd::device_addr_t& mb_args, - const mpmd_link_if_mgr::xport_info_list_t& xport_info) + const mpmd_link_if_mgr::xport_info_list_t& xport_info, + const uhd::rfnoc::chdr_w_t chdr_w) : _mb_args(mb_args) , _udp_info(get_udp_info_from_xport_info(xport_info)) , _mtu(MPMD_10GE_DATA_FRAME_MAX_SIZE) + , _pkt_factory(chdr_w, ENDIANNESS_LITTLE) { const bool use_dpdk = mb_args.has_key("use_dpdk"); // FIXME use constrained_device_args -- cgit v1.2.3