From 1f83ce1992f7d517e1ff20af2fabf79e3cfb81e6 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Thu, 29 Apr 2021 09:59:03 +0200
Subject: uhd: Remove references to device3

device3 was an object used in UHD-3 RFNoC. It is no longer required.
---
 host/include/uhd/rfnoc_graph.hpp     |  4 ++--
 host/include/uhd/usrp/multi_usrp.hpp | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'host/include')

diff --git a/host/include/uhd/rfnoc_graph.hpp b/host/include/uhd/rfnoc_graph.hpp
index e51fc3d83..968075cff 100644
--- a/host/include/uhd/rfnoc_graph.hpp
+++ b/host/include/uhd/rfnoc_graph.hpp
@@ -130,8 +130,8 @@ public:
      * on this device) or if the type does not match, it will throw a uhd::lookup_error.
      *
      * \code{.cpp}
-     * // Assume DEV is a device3::sptr
-     * auto block_controller = get_block<my_noc_block>("0/MyBlock#0");
+     * // Assume DEV is an rfnoc_graph::sptr
+     * auto block_controller = DEV->get_block<my_noc_block>("0/MyBlock#0");
      * block_controller->my_own_block_method();
      * \endcode
      * \note this access is not thread safe if performed during block enumeration
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp
index 08370471a..c11d78950 100644
--- a/host/include/uhd/usrp/multi_usrp.hpp
+++ b/host/include/uhd/usrp/multi_usrp.hpp
@@ -26,6 +26,8 @@
 
 #include <uhd/config.hpp>
 #include <uhd/device.hpp>
+#include <uhd/rfnoc/mb_controller.hpp>
+#include <uhd/rfnoc/radio_control.hpp>
 #include <uhd/types/filters.hpp>
 #include <uhd/types/ranges.hpp>
 #include <uhd/types/sensors.hpp>
@@ -36,17 +38,12 @@
 #include <uhd/usrp/dboard_iface.hpp>
 #include <uhd/usrp/subdev_spec.hpp>
 #include <uhd/utils/noncopyable.hpp>
-#include <uhd/rfnoc/mb_controller.hpp>
-#include <uhd/rfnoc/radio_control.hpp>
 #include <complex>
 #include <memory>
 #include <string>
 #include <vector>
 
-namespace uhd {
-class device3;
-
-namespace usrp {
+namespace uhd { namespace usrp {
 
 /*!
  * The Multi-USRP device class:
@@ -1879,7 +1876,7 @@ public:
         uhd::filter_info_base::sptr filter,
         const size_t chan) = 0;
 
-     /*! Get direct access to the underlying mb_controller object.
+    /*! Get direct access to the underlying mb_controller object.
      *
      * Note: This is an advanced API, created for corner cases where the
      * application is using multi_usrp, but some special features from
@@ -1899,5 +1896,4 @@ public:
     virtual uhd::rfnoc::mb_controller& get_mb_controller(const size_t mboard = 0) = 0;
 };
 
-} // namespace usrp
-} // namespace uhd
+}} // namespace uhd::usrp
-- 
cgit v1.2.3