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/mpmd | |
| 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/mpmd')
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.cpp | 9 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.hpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp index 4d3fba8a1..d63a2cfa0 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_impl.cpp @@ -5,11 +5,18 @@ // #include "mpmd_impl.hpp" -#include "rpc_block_ctrl.hpp" #include <../device3/device3_impl.hpp> #include <uhd/exception.hpp> #include <uhd/utils/static.hpp> #include <uhd/utils/tasks.hpp> +#include <uhd/types/sensors.hpp> +#include <uhd/types/eeprom.hpp> +#include <uhd/types/component_file.hpp> +#include <uhd/usrp/mboard_eeprom.hpp> +#include <uhdlib/rfnoc/rpc_block_ctrl.hpp> +#include <uhdlib/rfnoc/radio_ctrl_impl.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/asio.hpp> #include <boost/make_shared.hpp> #include <boost/thread.hpp> #include <memory> diff --git a/host/lib/usrp/mpmd/mpmd_impl.hpp b/host/lib/usrp/mpmd/mpmd_impl.hpp index e3c44a5a0..0a5ed4545 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.hpp +++ b/host/lib/usrp/mpmd/mpmd_impl.hpp @@ -8,7 +8,6 @@ #define INCLUDED_MPMD_IMPL_HPP #include "mpmd_xport_mgr.hpp" -#include "../../utils/rpc.hpp" #include "../device3/device3_impl.hpp" #include <uhd/stream.hpp> #include <uhd/types/device_addr.hpp> @@ -16,6 +15,7 @@ #include <uhd/utils/tasks.hpp> #include <uhd/transport/muxed_zero_copy_if.hpp> #include <uhd/property_tree.hpp> +#include <uhdlib/utils/rpc.hpp> #include <boost/optional.hpp> #include <map> #include <memory> |