rfnoc: Add rfnoc_device base class

All USRP device impls that are RFNoC devices will need to derive from
this (instead of device3).

2 files changed, 83 insertions, 0 deletions

diff --git a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
index dc1bea3ae..466ec0cbf 100644
--- a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
+++ b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
@@ -7,6 +7,7 @@
 #ifndef INCLUDED_LIBUHD_MB_IFACE_HPP
 #define INCLUDED_LIBUHD_MB_IFACE_HPP
 
+#include <uhdlib/rfnoc/chdr/chdr_types.hpp>
 #include <memory>
 
 namespace uhd { namespace rfnoc {
diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
new file mode 100644
index 000000000..7197bc9c4
--- /dev/null
+++ b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
@@ -0,0 +1,82 @@
+//
+// Copyright 2019 Ettus Research, a National Instruments Brand
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+//
+
+#ifndef INCLUDED_LIBUHD_RFNOC_DEVICE_HPP
+#define INCLUDED_LIBUHD_RFNOC_DEVICE_HPP
+
+#include <uhd/device.hpp>
+#include <uhd/exception.hpp>
+#include <uhdlib/rfnoc/client_zero.hpp>
+#include <uhdlib/rfnoc/mb_iface.hpp>
+#include <boost/shared_ptr.hpp>
+
+namespace uhd { namespace rfnoc { namespace detail {
+
+/*! Extends uhd::device with features required to operate in an rfnoc_graph
+ */
+class rfnoc_device : public uhd::device
+{
+public:
+    using sptr = boost::shared_ptr<rfnoc_device>; // FIXME make std::shared_ptr when
+                                                  // uhd::device is ready
+
+    rfnoc_device()
+    {
+        _type = uhd::device::USRP;
+        _tree = uhd::property_tree::make();
+    }
+
+    /*! Return a reference to the mb_iface for a given motherboard
+     */
+    uhd::rfnoc::mb_iface& get_mb_iface(const size_t mb_idx)
+    {
+        if (mb_idx >= _iface_registry.size()) {
+            throw uhd::index_error(
+                std::string("Cannot get mb_iface, invalid motherboard index: ")
+                + std::to_string(mb_idx));
+        }
+        return *_iface_registry.at(mb_idx);
+    }
+
+    /*! Return the number of motherboards in this device
+     */
+    size_t get_num_mbs()
+    {
+        return _iface_registry.size();
+    }
+
+    //! Directly getting a streamer no longer supported
+    uhd::rx_streamer::sptr get_rx_stream(const stream_args_t&)
+    {
+        UHD_THROW_INVALID_CODE_PATH();
+    }
+
+    //! Directly getting a streamer no longer supported
+    uhd::tx_streamer::sptr get_tx_stream(const stream_args_t&)
+    {
+        UHD_THROW_INVALID_CODE_PATH();
+    }
+
+    //! Directly getting async messages no longer supported
+    bool recv_async_msg(uhd::async_metadata_t&, double)
+    {
+        UHD_THROW_INVALID_CODE_PATH();
+    }
+
+
+protected:
+    void register_mb_iface(const size_t mb_idx, mb_iface* mb_if)
+    {
+        _iface_registry.emplace(mb_idx, std::move(mb_if));
+    }
+
+private:
+    std::unordered_map<size_t, mb_iface::uptr> _iface_registry;
+}; // class rfnoc_device
+
+}}} // namespace uhd::rfnoc::detail
+
+#endif /* INCLUDED_LIBUHD_RFNOC_DEVICE_HPP */