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/n230/n230_clk_pps_ctrl.hpp     |  8 +++---
 host/lib/usrp/n230/n230_cores.hpp            |  4 +--
 host/lib/usrp/n230/n230_frontend_ctrl.hpp    |  8 +++---
 host/lib/usrp/n230/n230_impl.cpp             | 15 +++++------
 host/lib/usrp/n230/n230_impl.hpp             |  2 +-
 host/lib/usrp/n230/n230_resource_manager.hpp | 37 ++++++++++++++--------------
 host/lib/usrp/n230/n230_stream_manager.cpp   |  4 +--
 host/lib/usrp/n230/n230_stream_manager.hpp   |  9 ++++---
 8 files changed, 45 insertions(+), 42 deletions(-)

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

diff --git a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp
index 53ff0571f..af9ffc307 100644
--- a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp
+++ b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp
@@ -8,14 +8,14 @@
 #ifndef INCLUDED_N230_CLK_PPS_CTRL_HPP
 #define INCLUDED_N230_CLK_PPS_CTRL_HPP
 
-#include "time_core_3000.hpp"
-#include "ad9361_ctrl.hpp"
+#include "n230_cores.hpp"
+#include "n230_fpga_defs.h"
 #include <uhd/types/sensors.hpp>
+#include <uhdlib/usrp/cores/time_core_3000.hpp>
+#include <uhdlib/usrp/common/ad9361_ctrl.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include <vector>
-#include "n230_cores.hpp"
-#include "n230_fpga_defs.h"
 
 namespace uhd { namespace usrp { namespace n230 {
 
diff --git a/host/lib/usrp/n230/n230_cores.hpp b/host/lib/usrp/n230/n230_cores.hpp
index ac454cc39..2768ada41 100644
--- a/host/lib/usrp/n230/n230_cores.hpp
+++ b/host/lib/usrp/n230/n230_cores.hpp
@@ -8,8 +8,8 @@
 #ifndef INCLUDED_N230_CORES_HPP
 #define INCLUDED_N230_CORES_HPP
 
-#include "spi_core_3000.hpp"
-#include "adf4001_ctrl.hpp"
+#include <uhdlib/usrp/cores/spi_core_3000.hpp>
+#include <uhdlib/usrp/common/adf4001_ctrl.hpp>
 #include <boost/thread/mutex.hpp>
 
 namespace uhd { namespace usrp { namespace n230 {
diff --git a/host/lib/usrp/n230/n230_frontend_ctrl.hpp b/host/lib/usrp/n230/n230_frontend_ctrl.hpp
index 6faa35ac8..842814213 100644
--- a/host/lib/usrp/n230/n230_frontend_ctrl.hpp
+++ b/host/lib/usrp/n230/n230_frontend_ctrl.hpp
@@ -8,14 +8,14 @@
 #ifndef INCLUDED_N230_FRONTEND_CTRL_HPP
 #define INCLUDED_N230_FRONTEND_CTRL_HPP
 
-#include "radio_ctrl_core_3000.hpp"
-#include "ad9361_ctrl.hpp"
-#include "gpio_atr_3000.hpp"
+#include "n230_fpga_defs.h"
+#include <uhdlib/usrp/cores/radio_ctrl_core_3000.hpp>
+#include <uhdlib/usrp/cores/gpio_atr_3000.hpp>
+#include <uhdlib/usrp/common/ad9361_ctrl.hpp>
 #include <uhd/types/sensors.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include <vector>
-#include "n230_fpga_defs.h"
 
 namespace uhd { namespace usrp { namespace n230 {
 
diff --git a/host/lib/usrp/n230/n230_impl.cpp b/host/lib/usrp/n230/n230_impl.cpp
index 04d404311..c4e3af0b2 100644
--- a/host/lib/usrp/n230/n230_impl.cpp
+++ b/host/lib/usrp/n230/n230_impl.cpp
@@ -6,9 +6,14 @@
 //
 
 #include "n230_impl.hpp"
-
 #include "n230_fw_ctrl_iface.hpp"
-#include "validate_subdev_spec.hpp"
+#include "n230_defaults.h"
+#include "n230_fpga_defs.h"
+#include "n230_fw_defs.h"
+#include "n230_fw_host_iface.h"
+
+#include <uhdlib/usrp/common/validate_subdev_spec.hpp>
+
 #include <uhd/utils/static.hpp>
 #include <uhd/transport/if_addrs.hpp>
 #include <uhd/transport/udp_zero_copy.hpp>
@@ -22,6 +27,7 @@
 #include <uhd/usrp/mboard_eeprom.hpp>
 #include <uhd/usrp/dboard_eeprom.hpp>
 #include <uhd/usrp/gps_ctrl.hpp>
+
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
@@ -31,11 +37,6 @@
 #include <boost/asio.hpp> //used for htonl and ntohl
 #include <boost/make_shared.hpp>
 
-#include "n230_defaults.h"
-#include "n230_fpga_defs.h"
-#include "n230_fw_defs.h"
-#include "n230_fw_host_iface.h"
-
 namespace uhd { namespace usrp { namespace n230 {
 
 using namespace uhd::transport;
diff --git a/host/lib/usrp/n230/n230_impl.hpp b/host/lib/usrp/n230/n230_impl.hpp
index d0547922a..213f0f61e 100644
--- a/host/lib/usrp/n230/n230_impl.hpp
+++ b/host/lib/usrp/n230/n230_impl.hpp
@@ -16,7 +16,7 @@
 #include "n230_eeprom_manager.hpp"
 #include "n230_resource_manager.hpp"
 #include "n230_stream_manager.hpp"
-#include "recv_packet_demuxer_3000.hpp"
+#include <uhdlib/usrp/common/recv_packet_demuxer_3000.hpp>
 
 namespace uhd { namespace usrp { namespace n230 {
 
diff --git a/host/lib/usrp/n230/n230_resource_manager.hpp b/host/lib/usrp/n230/n230_resource_manager.hpp
index b2a9b6a9d..4b4065e8f 100644
--- a/host/lib/usrp/n230/n230_resource_manager.hpp
+++ b/host/lib/usrp/n230/n230_resource_manager.hpp
@@ -8,17 +8,25 @@
 #ifndef INCLUDED_N230_RESOURCE_MANAGER_HPP
 #define INCLUDED_N230_RESOURCE_MANAGER_HPP
 
-#include "radio_ctrl_core_3000.hpp"
-#include "spi_core_3000.hpp"
-#include "gpio_atr_3000.hpp"
-#include "rx_vita_core_3000.hpp"
-#include "tx_vita_core_3000.hpp"
-#include "time_core_3000.hpp"
-#include "rx_dsp_core_3000.hpp"
-#include "tx_dsp_core_3000.hpp"
-#include "user_settings_core_3000.hpp"
-#include "ad9361_ctrl.hpp"
-#include "ad936x_manager.hpp"
+#include "n230_fw_ctrl_iface.hpp"
+#include "n230_clk_pps_ctrl.hpp"
+#include "n230_cores.hpp"
+#include "n230_fpga_defs.h"
+#include "n230_frontend_ctrl.hpp"
+#include "n230_uart.hpp"
+
+#include <uhdlib/usrp/cores/radio_ctrl_core_3000.hpp>
+#include <uhdlib/usrp/cores/spi_core_3000.hpp>
+#include <uhdlib/usrp/cores/gpio_atr_3000.hpp>
+#include <uhdlib/usrp/cores/rx_vita_core_3000.hpp>
+#include <uhdlib/usrp/cores/tx_vita_core_3000.hpp>
+#include <uhdlib/usrp/cores/time_core_3000.hpp>
+#include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+#include <uhdlib/usrp/cores/tx_dsp_core_3000.hpp>
+#include <uhdlib/usrp/cores/user_settings_core_3000.hpp>
+#include <uhdlib/usrp/common/ad9361_ctrl.hpp>
+#include <uhdlib/usrp/common/ad936x_manager.hpp>
+
 #include <uhd/utils/tasks.hpp>
 #include <uhd/types/sid.hpp>
 #include <uhd/types/device_addr.hpp>
@@ -27,13 +35,6 @@
 #include <uhd/transport/bounded_buffer.hpp>
 #include <uhd/usrp/gps_ctrl.hpp>
 
-#include "n230_fw_ctrl_iface.hpp"
-#include "n230_clk_pps_ctrl.hpp"
-#include "n230_cores.hpp"
-#include "n230_fpga_defs.h"
-#include "n230_frontend_ctrl.hpp"
-#include "n230_uart.hpp"
-
 namespace uhd { namespace usrp { namespace n230 {
 
 enum n230_eth_port_t {
diff --git a/host/lib/usrp/n230/n230_stream_manager.cpp b/host/lib/usrp/n230/n230_stream_manager.cpp
index 3071adf3a..5c44992ca 100644
--- a/host/lib/usrp/n230/n230_stream_manager.cpp
+++ b/host/lib/usrp/n230/n230_stream_manager.cpp
@@ -9,11 +9,11 @@
 
 #include "../../transport/super_recv_packet_handler.hpp"
 #include "../../transport/super_send_packet_handler.hpp"
-#include "async_packet_handler.hpp"
+#include <uhdlib/usrp/common/async_packet_handler.hpp>
 #include <uhd/transport/bounded_buffer.hpp>
-#include <boost/bind.hpp>
 #include <uhd/utils/tasks.hpp>
 #include <uhd/utils/log.hpp>
+#include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
 
 static const double N230_RX_SW_BUFF_FULL_FACTOR   = 0.90;     //Buffer should ideally be 90% full.
diff --git a/host/lib/usrp/n230/n230_stream_manager.hpp b/host/lib/usrp/n230/n230_stream_manager.hpp
index a6acb602d..6ec219f0b 100644
--- a/host/lib/usrp/n230/n230_stream_manager.hpp
+++ b/host/lib/usrp/n230/n230_stream_manager.hpp
@@ -8,8 +8,11 @@
 #ifndef INCLUDED_N230_STREAM_MANAGER_HPP
 #define INCLUDED_N230_STREAM_MANAGER_HPP
 
-#include "time_core_3000.hpp"
-#include "rx_vita_core_3000.hpp"
+#include "n230_device_args.hpp"
+#include "n230_resource_manager.hpp"
+
+#include <uhdlib/usrp/cores/time_core_3000.hpp>
+#include <uhdlib/usrp/cores/rx_vita_core_3000.hpp>
 #include <uhd/types/sid.hpp>
 #include <uhd/types/device_addr.hpp>
 #include <uhd/types/metadata.hpp>
@@ -19,8 +22,6 @@
 #include <uhd/property_tree.hpp>
 #include <uhd/utils/tasks.hpp>
 #include <boost/smart_ptr.hpp>
-#include "n230_device_args.hpp"
-#include "n230_resource_manager.hpp"
 
 namespace uhd { namespace usrp { namespace n230 {
 
-- 
cgit v1.2.3