From 6652eb4a033b38bd952563f3544eb11e98f27327 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Wed, 31 Jan 2018 20:20:14 +0100
Subject: uhd: Move internal headers to uhdlib/

To avoid the proliferation of additional include directories and
multiple ways of including project-local headers, we now default to
moving all headers that are used across UHD into the uhdlib/
subdirectory.

Some #include statements were also reordered as they were modified for
closer compliance with the coding guidelines.

Internal cpp source files should now include files like this:

    #include <uhdlib/rfnoc/ctrl_iface.hpp>

Reviewed-by: Ashish Chaudhari <ashish.chaudhari@ettus.com>
---
 host/lib/usrp/device3/device3_impl.cpp    | 4 ++--
 host/lib/usrp/device3/device3_impl.hpp    | 2 +-
 host/lib/usrp/device3/device3_io_impl.cpp | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'host/lib/usrp/device3')

diff --git a/host/lib/usrp/device3/device3_impl.cpp b/host/lib/usrp/device3/device3_impl.cpp
index 7792a4b73..d4ea8a19f 100644
--- a/host/lib/usrp/device3/device3_impl.cpp
+++ b/host/lib/usrp/device3/device3_impl.cpp
@@ -6,10 +6,10 @@
 //
 
 #include "device3_impl.hpp"
-#include "graph_impl.hpp"
-#include "ctrl_iface.hpp"
 #include <uhd/utils/log.hpp>
 #include <uhd/rfnoc/block_ctrl_base.hpp>
+#include <uhdlib/rfnoc/graph_impl.hpp>
+#include <uhdlib/rfnoc/ctrl_iface.hpp>
 #include <boost/make_shared.hpp>
 #include <algorithm>
 
diff --git a/host/lib/usrp/device3/device3_impl.hpp b/host/lib/usrp/device3/device3_impl.hpp
index 1dbb78155..8ecb1f72b 100644
--- a/host/lib/usrp/device3/device3_impl.hpp
+++ b/host/lib/usrp/device3/device3_impl.hpp
@@ -21,7 +21,7 @@
 #include <uhd/types/direction.hpp>
 #include <uhd/utils/tasks.hpp>
 #include <uhd/device3.hpp>
-#include "xports.hpp"
+#include <uhdlib/rfnoc/xports.hpp>
 
 namespace uhd { namespace usrp {
 
diff --git a/host/lib/usrp/device3/device3_io_impl.cpp b/host/lib/usrp/device3/device3_io_impl.cpp
index 26b3a29e9..fed273ae2 100644
--- a/host/lib/usrp/device3/device3_io_impl.cpp
+++ b/host/lib/usrp/device3/device3_io_impl.cpp
@@ -13,15 +13,14 @@
 #include <uhd/rfnoc/sink_block_ctrl_base.hpp>
 #include <uhd/utils/byteswap.hpp>
 #include <uhd/utils/log.hpp>
-
-#include "../common/async_packet_handler.hpp"
 #include "../../transport/super_recv_packet_handler.hpp"
 #include "../../transport/super_send_packet_handler.hpp"
-#include "../../rfnoc/rx_stream_terminator.hpp"
-#include "../../rfnoc/tx_stream_terminator.hpp"
 #include <uhd/rfnoc/rate_node_ctrl.hpp>
 #include <uhd/rfnoc/radio_ctrl.hpp>
 #include <uhd/transport/zero_copy_flow_ctrl.hpp>
+#include <uhdlib/rfnoc/rx_stream_terminator.hpp>
+#include <uhdlib/rfnoc/tx_stream_terminator.hpp>
+#include <uhdlib/usrp/common/async_packet_handler.hpp>
 #include <boost/atomic.hpp>
 
 #define UHD_TX_STREAMER_LOG() UHD_LOGGER_TRACE("STREAMER")
-- 
cgit v1.2.3