diff options
| author |   Martin Braun <martin.braun@ettus.com> | 2024-01-26 14:41:20 +0100 |
|---|---|---|
| committer |   Aki Tomita <121511582+atomita-ni@users.noreply.github.com> | 2024-02-28 09:38:28 -0600 |
| commit | 7fb64baf10dae55039a32667535c1b4eb03c9150 (patch) | |
| tree | f7eea7cb0a30a5854ea4aecaabce33197c0164e4 /host | |
| parent | examples: Amend rx_to_file.py to use DramReceiver (diff) | |
| download | uhd-7fb64baf10dae55039a32667535c1b4eb03c9150.tar.xz uhd-7fb64baf10dae55039a32667535c1b4eb03c9150.zip | |
python: Make block_controller_factory_python.hpp public
This moves said file into include/, making it available for OOT block
authors.
Diffstat (limited to 'host')
16 files changed, 18 insertions, 19 deletions
diff --git a/host/include/uhd/rfnoc/CMakeLists.txt b/host/include/uhd/rfnoc/CMakeLists.txt index 7b21a02ea..2faea3ba2 100644 --- a/host/include/uhd/rfnoc/CMakeLists.txt +++ b/host/include/uhd/rfnoc/CMakeLists.txt @@ -31,6 +31,7 @@ UHD_INSTALL(FILES # Infrastructure actions.hpp block_id.hpp + block_controller_factory_python.hpp blockdef.hpp chdr_types.hpp constants.hpp diff --git a/host/lib/rfnoc/block_controller_factory_python.hpp b/host/include/uhd/rfnoc/block_controller_factory_python.hpp index bf1b78203..63553b5b2 100644 --- a/host/lib/rfnoc/block_controller_factory_python.hpp +++ b/host/include/uhd/rfnoc/block_controller_factory_python.hpp @@ -8,9 +8,7 @@ #include <uhd/rfnoc/noc_block_base.hpp> -using namespace uhd::rfnoc; - -namespace { +namespace uhd { namespace rfnoc { // Static factory for constructing a block controller T given an instance of // the superclass noc_block_base for the block controller, as might be @@ -21,10 +19,10 @@ template <typename T> class block_controller_factory { public: - static typename T::sptr make_from(noc_block_base::sptr block_base) + static typename T::sptr make_from(uhd::rfnoc::noc_block_base::sptr block_base) { return std::dynamic_pointer_cast<T>(block_base); } }; -} // namespace +}} // namespace uhd::rfnoc diff --git a/host/lib/rfnoc/ddc_block_control_python.hpp b/host/lib/rfnoc/ddc_block_control_python.hpp index 75a44e1ea..a4b61eaf5 100644 --- a/host/lib/rfnoc/ddc_block_control_python.hpp +++ b/host/lib/rfnoc/ddc_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/ddc_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/duc_block_control_python.hpp b/host/lib/rfnoc/duc_block_control_python.hpp index b34b06227..f9cec0e09 100644 --- a/host/lib/rfnoc/duc_block_control_python.hpp +++ b/host/lib/rfnoc/duc_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/duc_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/fft_block_control_python.hpp b/host/lib/rfnoc/fft_block_control_python.hpp index 1c97105ce..94f91e90c 100644 --- a/host/lib/rfnoc/fft_block_control_python.hpp +++ b/host/lib/rfnoc/fft_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/fft_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/fir_filter_block_control_python.hpp b/host/lib/rfnoc/fir_filter_block_control_python.hpp index 269f61669..d9d7dbf8f 100644 --- a/host/lib/rfnoc/fir_filter_block_control_python.hpp +++ b/host/lib/rfnoc/fir_filter_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/fir_filter_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/fosphor_block_control_python.hpp b/host/lib/rfnoc/fosphor_block_control_python.hpp index 49363ad93..f9d845342 100644 --- a/host/lib/rfnoc/fosphor_block_control_python.hpp +++ b/host/lib/rfnoc/fosphor_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/fosphor_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/keep_one_in_n_block_control_python.hpp b/host/lib/rfnoc/keep_one_in_n_block_control_python.hpp index d26a9dec7..b5a0cf729 100644 --- a/host/lib/rfnoc/keep_one_in_n_block_control_python.hpp +++ b/host/lib/rfnoc/keep_one_in_n_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/keep_one_in_n_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/moving_average_block_control_python.hpp b/host/lib/rfnoc/moving_average_block_control_python.hpp index 67fd9b594..61a7fd250 100644 --- a/host/lib/rfnoc/moving_average_block_control_python.hpp +++ b/host/lib/rfnoc/moving_average_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/moving_average_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/null_block_control_python.hpp b/host/lib/rfnoc/null_block_control_python.hpp index 77cc34c16..79a4fc840 100644 --- a/host/lib/rfnoc/null_block_control_python.hpp +++ b/host/lib/rfnoc/null_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/null_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/radio_control_python.hpp b/host/lib/rfnoc/radio_control_python.hpp index e5858dfb1..06487c808 100644 --- a/host/lib/rfnoc/radio_control_python.hpp +++ b/host/lib/rfnoc/radio_control_python.hpp @@ -6,9 +6,9 @@ #pragma once -#include "block_controller_factory_python.hpp" #include <uhd/features/discoverable_feature.hpp> #include <uhd/features/internal_sync_iface.hpp> +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/radio_control.hpp> #include <pybind11/stl.h> diff --git a/host/lib/rfnoc/replay_block_control_python.hpp b/host/lib/rfnoc/replay_block_control_python.hpp index d9c25f9e0..7641152ed 100644 --- a/host/lib/rfnoc/replay_block_control_python.hpp +++ b/host/lib/rfnoc/replay_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/replay_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/siggen_block_control_python.hpp b/host/lib/rfnoc/siggen_block_control_python.hpp index 6031878c9..73b55a8ab 100644 --- a/host/lib/rfnoc/siggen_block_control_python.hpp +++ b/host/lib/rfnoc/siggen_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/siggen_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/switchboard_block_control_python.hpp b/host/lib/rfnoc/switchboard_block_control_python.hpp index 7715b05c0..7cda698f7 100644 --- a/host/lib/rfnoc/switchboard_block_control_python.hpp +++ b/host/lib/rfnoc/switchboard_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/switchboard_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/vector_iir_block_control_python.hpp b/host/lib/rfnoc/vector_iir_block_control_python.hpp index 1042fb861..a521be0c2 100644 --- a/host/lib/rfnoc/vector_iir_block_control_python.hpp +++ b/host/lib/rfnoc/vector_iir_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/vector_iir_block_control.hpp> using namespace uhd::rfnoc; diff --git a/host/lib/rfnoc/window_block_control_python.hpp b/host/lib/rfnoc/window_block_control_python.hpp index 4c195f9f0..bc9050429 100644 --- a/host/lib/rfnoc/window_block_control_python.hpp +++ b/host/lib/rfnoc/window_block_control_python.hpp @@ -6,7 +6,7 @@ #pragma once -#include "block_controller_factory_python.hpp" +#include <uhd/rfnoc/block_controller_factory_python.hpp> #include <uhd/rfnoc/window_block_control.hpp> using namespace uhd::rfnoc; |