diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-01-31 20:20:14 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-03-14 15:17:44 -0700 |
| commit | 6652eb4a033b38bd952563f3544eb11e98f27327 (patch) | |
| tree | c1b0af72cbaceaa1df462f18194f4063fb13ae17 /host/lib/usrp/usrp1 | |
| parent | 86b95486ed6d68e2772d79f20feddbef5439981b (diff) | |
| download | uhd-6652eb4a033b38bd952563f3544eb11e98f27327.tar.gz uhd-6652eb4a033b38bd952563f3544eb11e98f27327.tar.bz2 uhd-6652eb4a033b38bd952563f3544eb11e98f27327.zip | |
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>
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/io_impl.cpp | 6 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/mb_eeprom.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_calc_mux.hpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.hpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp index a4ffac3db..0e79a5985 100644 --- a/host/lib/usrp/usrp1/io_impl.cpp +++ b/host/lib/usrp/usrp1/io_impl.cpp @@ -5,13 +5,13 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include "validate_subdev_spec.hpp" +#include "usrp1_calc_mux.hpp" +#include "usrp1_impl.hpp" +#include <uhdlib/usrp/common/validate_subdev_spec.hpp> #define SRPH_DONT_CHECK_SEQUENCE #include "../../transport/super_recv_packet_handler.hpp" #define SSPH_DONT_PAD_TO_ONE #include "../../transport/super_send_packet_handler.hpp" -#include "usrp1_calc_mux.hpp" -#include "usrp1_impl.hpp" #include <uhd/utils/log.hpp> #include <uhd/utils/tasks.hpp> #include <uhd/utils/safe_call.hpp> diff --git a/host/lib/usrp/usrp1/mb_eeprom.cpp b/host/lib/usrp/usrp1/mb_eeprom.cpp index cedbb8944..9b868fd4e 100644 --- a/host/lib/usrp/usrp1/mb_eeprom.cpp +++ b/host/lib/usrp/usrp1/mb_eeprom.cpp @@ -5,7 +5,7 @@ // #include "usrp1_impl.hpp" -#include "eeprom_utils.hpp" +#include <uhdlib/utils/eeprom_utils.hpp> #include <uhd/usrp/mboard_eeprom.hpp> #include <uhd/types/byte_vector.hpp> diff --git a/host/lib/usrp/usrp1/usrp1_calc_mux.hpp b/host/lib/usrp/usrp1/usrp1_calc_mux.hpp index 76e0bf971..1169f2fe8 100644 --- a/host/lib/usrp/usrp1/usrp1_calc_mux.hpp +++ b/host/lib/usrp/usrp1/usrp1_calc_mux.hpp @@ -9,6 +9,7 @@ #include <uhd/exception.hpp> #include <uhd/types/dict.hpp> #include <uhd/utils/algorithm.hpp> +#include <uhd/utils/log.hpp> #include <boost/assign/list_of.hpp> #include <boost/format.hpp> #include <utility> diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp index ec6bc52d4..4ae4e83e0 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.hpp +++ b/host/lib/usrp/usrp1/usrp1_iface.hpp @@ -8,7 +8,7 @@ #ifndef INCLUDED_USRP1_IFACE_HPP #define INCLUDED_USRP1_IFACE_HPP -#include "fx2_ctrl.hpp" +#include <uhdlib/usrp/common/fx2_ctrl.hpp> #include <uhd/types/wb_iface.hpp> #include <uhd/types/serial.hpp> #include <boost/shared_ptr.hpp> |