From 5802a362f83bba3959a260ea9e00e4c65cf9508f Mon Sep 17 00:00:00 2001 From: Lane Kolbly Date: Tue, 7 Apr 2020 15:19:32 -0500 Subject: uhd: Replace include guards with pragma once Pragma once is the more modern version of include guards, eliminating any potential problems with mistyping include guards. Let's use those. --- host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp | 5 +---- host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp | 5 +---- 21 files changed, 21 insertions(+), 84 deletions(-) (limited to 'host/lib/include/uhdlib/usrp/cores') diff --git a/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp index f69bafab9..810587fb2 100644 --- a/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_DMA_FIFO_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_DMA_FIFO_CORE_3000_HPP +#pragma once #include #include @@ -53,5 +52,3 @@ public: //! Return the number of packats that have been transferred virtual uint32_t get_packet_count() = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_DMA_FIFO_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp b/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp index 5e1c90845..74b4c3848 100644 --- a/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp +++ b/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP -#define INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP +#pragma once #include @@ -23,5 +22,3 @@ void get_freq_and_freq_word(const double requested_freq, */ std::tuple get_freq_and_freq_word( const double requested_freq, const double tick_rate); - -#endif /* INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp index ad7d4b588..aa266cbcb 100644 --- a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_GPIO_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_GPIO_CORE_3000_HPP +#pragma once #include #include @@ -200,5 +199,3 @@ public: }; }}} // namespace uhd::usrp::gpio_atr - -#endif /* INCLUDED_LIBUHD_USRP_GPIO_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp index 920dd1e3c..fdc9dc8da 100644 --- a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_GPIO_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_GPIO_CORE_200_HPP +#pragma once #include #include @@ -75,5 +74,3 @@ public: virtual void set_all_regs(const uint32_t value) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_GPIO_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp index 15afda0ef..e38f73127 100644 --- a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp +++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_I2C_CORE_100_WB32_HPP -#define INCLUDED_LIBUHD_USRP_I2C_CORE_100_WB32_HPP +#pragma once #include #include @@ -26,5 +25,3 @@ public: virtual void set_clock_rate(const double rate) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_I2C_CORE_100_WB32_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp index 2f6c4da79..4b7353812 100644 --- a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_I2C_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_I2C_CORE_200_HPP +#pragma once #include #include @@ -25,5 +24,3 @@ public: //! makes a new i2c core from iface and slave base static sptr make(uhd::wb_iface::sptr iface, const size_t base, const size_t readback); }; - -#endif /* INCLUDED_LIBUHD_USRP_I2C_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp index c94217e82..0b5ba6a6f 100644 --- a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP -#define INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP +#pragma once #include #include @@ -48,5 +47,3 @@ public: //! Set the tick rate (converting time into ticks) virtual void set_tick_rate(const double rate) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp index 7f0cd9995..bbbb7d38a 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_DSP_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_RX_DSP_CORE_200_HPP +#pragma once #include #include @@ -56,5 +55,3 @@ public: virtual void setup(const uhd::stream_args_t& stream_args) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_DSP_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp index f89d78191..0547ac4b1 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_DSP_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_RX_DSP_CORE_3000_HPP +#pragma once #include #include @@ -58,5 +57,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_DSP_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp index 8c51dac6c..6b7d84e9d 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP +#pragma once #include #include @@ -39,5 +38,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp index d340d6f4d..6b5dafe2a 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_3000_HPP +#pragma once #include #include @@ -56,5 +55,3 @@ public: */ virtual double get_output_rate(void) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp index 0f1850ddc..22e0d39ed 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_VITA_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_RX_VITA_CORE_3000_HPP +#pragma once #include #include @@ -44,5 +43,3 @@ public: virtual bool in_continuous_streaming_mode(void) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_VITA_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp index 6dc0474ce..e0caaa2e7 100644 --- a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_SPI_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_SPI_CORE_3000_HPP +#pragma once #include #include @@ -44,5 +43,3 @@ public: //! Get state of shutdown register virtual bool get_shutdown() = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_SPI_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp index 27ef775f8..cf225ed9f 100644 --- a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TIME64_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_TIME64_CORE_200_HPP +#pragma once #include #include @@ -53,5 +52,3 @@ public: virtual std::vector get_time_sources(void) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TIME64_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp index 93575bfaa..ff9883e6e 100644 --- a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TIME_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TIME_CORE_3000_HPP +#pragma once #include #include @@ -46,5 +45,3 @@ public: virtual void set_time_next_pps(const uhd::time_spec_t& time) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TIME_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp index 55423bceb..4d9ec44c3 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_DSP_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_TX_DSP_CORE_200_HPP +#pragma once #include #include @@ -47,5 +46,3 @@ public: virtual void setup(const uhd::stream_args_t& stream_args) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_DSP_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp index 5dbded392..a328965f8 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_DSP_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TX_DSP_CORE_3000_HPP +#pragma once #include #include @@ -49,5 +48,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_DSP_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp index 23a097085..04c89a580 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP +#pragma once #include #include @@ -37,5 +36,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp index 22b6865c1..29559d875 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_VITA_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TX_VITA_CORE_3000_HPP +#pragma once #include #include @@ -39,5 +38,3 @@ public: virtual void configure_flow_control( const size_t cycs_per_up, const size_t pkts_per_up) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_VITA_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp index 717b4a8b1..fe3071c2b 100644 --- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP +#pragma once #include #include @@ -26,5 +25,3 @@ public: virtual void set_reg(const user_reg_t& reg) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp index 002b04a3f..3f461ddb7 100644 --- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP +#pragma once #include #include @@ -22,5 +21,3 @@ public: const wb_addr_type sr_base_addr, const wb_addr_type rb_reg_addr); }; - -#endif /* INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP */ -- cgit v1.2.3