From b1cf8ce634b234a0e546045a75fb8940d8e76c7f Mon Sep 17 00:00:00 2001
From: Ashish Chaudhari <ashish@ettus.com>
Date: Mon, 27 May 2019 13:29:42 -0700
Subject: rfnoc: Support for new backend iface plus fixes

- Add support for new backend iface with max_async_msgs and mtu
  moved to after the noc ID
- Fixed offsets for block info registers
---
 host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp | 2 +-
 host/lib/include/uhdlib/rfnoc/client_zero.hpp        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'host/lib/include/uhdlib/rfnoc')

diff --git a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp
index c13955888..afaa22306 100644
--- a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp
+++ b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp
@@ -7,7 +7,7 @@
 #ifndef INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP
 #define INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP
 
-#include <uhdlib/rfnoc/chdr/chdr_types.hpp>
+#include <uhdlib/rfnoc/chdr/chdr_packet.hpp>
 #include <uhdlib/rfnoc/ctrlport_endpoint.hpp>
 #include <uhdlib/rfnoc/xports.hpp>
 #include <functional>
diff --git a/host/lib/include/uhdlib/rfnoc/client_zero.hpp b/host/lib/include/uhdlib/rfnoc/client_zero.hpp
index 8eb2d6397..c6d3e879b 100644
--- a/host/lib/include/uhdlib/rfnoc/client_zero.hpp
+++ b/host/lib/include/uhdlib/rfnoc/client_zero.hpp
@@ -8,8 +8,11 @@
 #define INCLUDED_LIBUHD_CLIENT_ZERO_HPP
 
 #include <uhd/rfnoc/register_iface_holder.hpp>
+#include <uhdlib/rfnoc/chdr_ctrl_endpoint.hpp>
 #include <chrono>
 #include <cstdint>
+#include <functional>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -40,7 +43,8 @@ public:
         uint8_t num_inputs;
         uint8_t num_outputs;
         uint8_t ctrl_fifo_size;
-        uint8_t mtu;
+        uint8_t ctrl_max_async_msgs;
+        uint8_t data_mtu;
     };
 
     //! Return the RFNoC protocol version for this motherboard
-- 
cgit v1.2.3