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/dboard/magnesium/magnesium_ad9371_iface.hpp    | 2 +-
 host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp | 8 ++++----
 host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'host/lib/usrp/dboard/magnesium')

diff --git a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.hpp b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.hpp
index 332414ef1..5da9e68e5 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.hpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.hpp
@@ -7,8 +7,8 @@
 #ifndef INCLUDED_LIBUHD_RFNOC_MAGNESIUM_AD9371_IFACE_HPP
 #define INCLUDED_LIBUHD_RFNOC_MAGNESIUM_AD9371_IFACE_HPP
 
-#include "../../../utils/rpc.hpp"
 #include <uhd/types/direction.hpp>
+#include <uhdlib/utils/rpc.hpp>
 #include <iostream>
 #include <string>
 
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp
index a429cd058..27c5db240 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp
@@ -7,16 +7,16 @@
 #ifndef INCLUDED_LIBUHD_RFNOC_MAGNESIUM_RADIO_CTRL_IMPL_HPP
 #define INCLUDED_LIBUHD_RFNOC_MAGNESIUM_RADIO_CTRL_IMPL_HPP
 
-#include "radio_ctrl_impl.hpp"
-#include "rpc_block_ctrl.hpp"
 #include "magnesium_cpld_ctrl.hpp"
 #include "magnesium_cpld_regs.hpp"
 #include "magnesium_ad9371_iface.hpp"
-#include "adf435x.hpp"
-#include "gpio_atr_3000.hpp"
 #include <uhd/types/serial.hpp>
 #include <uhd/usrp/dboard_manager.hpp>
 #include <uhd/usrp/gpio_defs.hpp>
+#include <uhdlib/usrp/cores/gpio_atr_3000.hpp>
+#include <uhdlib/rfnoc/rpc_block_ctrl.hpp>
+#include <uhdlib/rfnoc/radio_ctrl_impl.hpp>
+#include <uhdlib/usrp/common/adf435x.hpp>
 #include <mutex>
 
 namespace uhd {
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
index f89b26de2..a95343574 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
@@ -6,11 +6,11 @@
 
 #include "magnesium_radio_ctrl_impl.hpp"
 #include "magnesium_constants.hpp"
-#include "spi_core_3000.hpp"
 #include <uhd/utils/log.hpp>
 #include <uhd/types/eeprom.hpp>
 #include <uhd/types/sensors.hpp>
 #include <uhd/transport/chdr.hpp>
+#include <uhdlib/usrp/cores/spi_core_3000.hpp>
 #include <vector>
 #include <string>
 #include <boost/algorithm/string.hpp>
-- 
cgit v1.2.3