From 15d8fdc4b93a35a4f8344bfab5a9256e231866ca Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 4 Nov 2021 20:59:16 +0100 Subject: rfnoc: blocks: Minor cleanup (whitespace, typos) --- host/include/uhd/rfnoc/fir_filter_block_control.hpp | 5 +---- host/include/uhd/rfnoc/siggen_block_control.hpp | 6 ++---- host/include/uhd/rfnoc/split_stream_block_control.hpp | 1 - host/include/uhd/rfnoc/switchboard_block_control.hpp | 4 ++-- host/include/uhd/rfnoc/vector_iir_block_control.hpp | 1 - host/include/uhd/rfnoc/window_block_control.hpp | 1 - 6 files changed, 5 insertions(+), 13 deletions(-) (limited to 'host/include') diff --git a/host/include/uhd/rfnoc/fir_filter_block_control.hpp b/host/include/uhd/rfnoc/fir_filter_block_control.hpp index 5652f68ee..d44a0b25a 100644 --- a/host/include/uhd/rfnoc/fir_filter_block_control.hpp +++ b/host/include/uhd/rfnoc/fir_filter_block_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_FIR_FILTER_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_FIR_FILTER_BLOCK_CONTROL_HPP +#pragma once #include #include @@ -65,5 +64,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_FIR_FILTER_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/siggen_block_control.hpp b/host/include/uhd/rfnoc/siggen_block_control.hpp index e599659b6..319a1a605 100644 --- a/host/include/uhd/rfnoc/siggen_block_control.hpp +++ b/host/include/uhd/rfnoc/siggen_block_control.hpp @@ -13,6 +13,8 @@ namespace uhd { namespace rfnoc { +enum class siggen_waveform { CONSTANT, SINE_WAVE, NOISE }; + /*! Siggen Control Class * * The Siggen Block is an RFNoC block that acts as a simple function @@ -21,9 +23,6 @@ namespace uhd { namespace rfnoc { * and phase increment between samples (but with a random initial phase * offset), and a noise source. */ - -enum class siggen_waveform { CONSTANT, SINE_WAVE, NOISE }; - class UHD_API siggen_block_control : public noc_block_base { public: @@ -203,4 +202,3 @@ public: }; }} // namespace uhd::rfnoc - diff --git a/host/include/uhd/rfnoc/split_stream_block_control.hpp b/host/include/uhd/rfnoc/split_stream_block_control.hpp index 596d7f19c..e6efc4100 100644 --- a/host/include/uhd/rfnoc/split_stream_block_control.hpp +++ b/host/include/uhd/rfnoc/split_stream_block_control.hpp @@ -60,4 +60,3 @@ public: }; }} // namespace uhd::rfnoc - diff --git a/host/include/uhd/rfnoc/switchboard_block_control.hpp b/host/include/uhd/rfnoc/switchboard_block_control.hpp index 0b0b4c722..785838806 100644 --- a/host/include/uhd/rfnoc/switchboard_block_control.hpp +++ b/host/include/uhd/rfnoc/switchboard_block_control.hpp @@ -14,10 +14,10 @@ namespace uhd { namespace rfnoc { /*! Switchboard Block Control Class * * The Switchboard Block is an RFNoC block that routes any single input to any - * single output. Routing is 1 to 1, that is, an input port can only be connected + * single output. Routing is 1 to 1, that is, an input port can only be connected * to one output port, and vice versa. * - * INIT: This block is initialized with only input port 0 connected to output + * INIT: This block is initialized with only input port 0 connected to output * port 0. * * NOTE: This block is not intended to switch during the transmission of packets. diff --git a/host/include/uhd/rfnoc/vector_iir_block_control.hpp b/host/include/uhd/rfnoc/vector_iir_block_control.hpp index d23340a82..2c1cc7c0e 100644 --- a/host/include/uhd/rfnoc/vector_iir_block_control.hpp +++ b/host/include/uhd/rfnoc/vector_iir_block_control.hpp @@ -106,4 +106,3 @@ public: }; }} // namespace uhd::rfnoc - diff --git a/host/include/uhd/rfnoc/window_block_control.hpp b/host/include/uhd/rfnoc/window_block_control.hpp index 316a1a288..0ab6a6375 100644 --- a/host/include/uhd/rfnoc/window_block_control.hpp +++ b/host/include/uhd/rfnoc/window_block_control.hpp @@ -71,4 +71,3 @@ public: }; }} // namespace uhd::rfnoc - -- cgit v1.2.3