diff options
author | Martin Braun <martin.braun@ettus.com> | 2021-03-09 10:38:42 +0100 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-03-17 15:44:05 -0500 |
commit | 668a04befdc4ec43b2a6e86992c672ef5f8408e0 (patch) | |
tree | 67734ba32968831a5b4ea8dd59b7b2ab52e68d01 /host/lib/usrp/dboard | |
parent | 19f3c1203a42d9da3d7cb16c881fe2bbdc5ec0ce (diff) | |
download | uhd-668a04befdc4ec43b2a6e86992c672ef5f8408e0.tar.gz uhd-668a04befdc4ec43b2a6e86992c672ef5f8408e0.tar.bz2 uhd-668a04befdc4ec43b2a6e86992c672ef5f8408e0.zip |
host: Update code base using clang-tidy
The checks from the new clang-tidy file are applied to the source tree
using:
$ find . -name "*.cpp" | sort -u | xargs \
--max-procs 8 --max-args 1 clang-tidy --format-style=file \
--fix -p /path/to/compile_commands.json
Note: This is the same procedure as 107a49c0, but applied to all the new
code since then.
Diffstat (limited to 'host/lib/usrp/dboard')
-rw-r--r-- | host/lib/usrp/dboard/db_dbsrx.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_dbsrx2.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_rfx.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_tvrx.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_tvrx2.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_ubx.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_wbx_simple.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_xcvr2450.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp | 36 | ||||
-rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp | 55 |
10 files changed, 57 insertions, 50 deletions
diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp index 238dbd95e..a55e5fc70 100644 --- a/host/lib/usrp/dboard/db_dbsrx.cpp +++ b/host/lib/usrp/dboard/db_dbsrx.cpp @@ -56,7 +56,7 @@ class dbsrx : public rx_dboard_base { public: dbsrx(ctor_args_t args); - virtual ~dbsrx(void); + ~dbsrx(void) override; private: double _lo_freq; diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp index 19c058ada..7635327b1 100644 --- a/host/lib/usrp/dboard/db_dbsrx2.cpp +++ b/host/lib/usrp/dboard/db_dbsrx2.cpp @@ -50,7 +50,7 @@ class dbsrx2 : public rx_dboard_base { public: dbsrx2(ctor_args_t args); - virtual ~dbsrx2(void); + ~dbsrx2(void) override; private: double _lo_freq; diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp index 05f5c9a0e..f4de7ccaa 100644 --- a/host/lib/usrp/dboard/db_rfx.cpp +++ b/host/lib/usrp/dboard/db_rfx.cpp @@ -63,7 +63,7 @@ class rfx_xcvr : public xcvr_dboard_base public: rfx_xcvr( ctor_args_t args, const freq_range_t& freq_range, bool rx_div2, bool tx_div2); - virtual ~rfx_xcvr(void); + ~rfx_xcvr(void) override; private: const freq_range_t _freq_range; diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp index c9a940d15..60a019a2e 100644 --- a/host/lib/usrp/dboard/db_tvrx.cpp +++ b/host/lib/usrp/dboard/db_tvrx.cpp @@ -187,7 +187,7 @@ class tvrx : public rx_dboard_base { public: tvrx(ctor_args_t args); - virtual ~tvrx(void); + ~tvrx(void) override; private: uhd::dict<std::string, double> _gains; diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp index 0f1673633..cc1249dee 100644 --- a/host/lib/usrp/dboard/db_tvrx2.cpp +++ b/host/lib/usrp/dboard/db_tvrx2.cpp @@ -763,7 +763,7 @@ class tvrx2 : public rx_dboard_base { public: tvrx2(ctor_args_t args); - virtual ~tvrx2(void); + ~tvrx2(void) override; private: double _freq_scalar; diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp index 733a4b8e2..d36347b86 100644 --- a/host/lib/usrp/dboard/db_ubx.cpp +++ b/host/lib/usrp/dboard/db_ubx.cpp @@ -560,7 +560,7 @@ public: .set(0); } - virtual ~ubx_xcvr(void) + ~ubx_xcvr(void) override { UHD_SAFE_CALL( // Shutdown synthesizers diff --git a/host/lib/usrp/dboard/db_wbx_simple.cpp b/host/lib/usrp/dboard/db_wbx_simple.cpp index 35675a081..4fbaa738e 100644 --- a/host/lib/usrp/dboard/db_wbx_simple.cpp +++ b/host/lib/usrp/dboard/db_wbx_simple.cpp @@ -39,7 +39,7 @@ class wbx_simple : public wbx_base { public: wbx_simple(ctor_args_t args); - virtual ~wbx_simple(void); + ~wbx_simple(void) override; private: void set_rx_ant(const std::string& ant); diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp index d42a56562..26c0d5950 100644 --- a/host/lib/usrp/dboard/db_xcvr2450.cpp +++ b/host/lib/usrp/dboard/db_xcvr2450.cpp @@ -93,7 +93,7 @@ class xcvr2450 : public xcvr_dboard_base { public: xcvr2450(ctor_args_t args); - virtual ~xcvr2450(void); + ~xcvr2450(void) override; private: double _lo_freq; diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp index 879885640..3881c9285 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp @@ -104,8 +104,10 @@ magnesium_radio_control_impl::magnesium_radio_control_impl(make_args_ptr make_ar RFNOC_LOG_TRACE("Entering magnesium_radio_control_impl ctor..."); UHD_ASSERT_THROW(get_block_id().get_block_count() < 2); - _tx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>(MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS); - _rx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>(MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS); + _tx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>( + MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS); + _rx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>( + MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS); const char radio_slot_name[2] = {'A', 'B'}; _radio_slot = radio_slot_name[get_block_id().get_block_count()]; @@ -256,16 +258,17 @@ double magnesium_radio_control_impl::set_tx_frequency( double coerced_if_freq = 0; if (_map_freq_to_tx_band(_tx_band_map, freq) == tx_band::LOWBAND) { - _is_low_band[TX_DIRECTION] = true; - coerced_if_freq = - this->_set_tx_lo_freq(adf4351_source, MAGNESIUM_LO2, MAGNESIUM_TX_IF_FREQ, chan); + _is_low_band[TX_DIRECTION] = true; + coerced_if_freq = this->_set_tx_lo_freq( + adf4351_source, MAGNESIUM_LO2, MAGNESIUM_TX_IF_FREQ, chan); RFNOC_LOG_TRACE("coerced_if_freq = " << coerced_if_freq); } else { _is_low_band[TX_DIRECTION] = false; _lo_disable(_tx_lo); } // external LO required to tune at 2xdesired_frequency. - const double lo1_freq = (ad9371_source == "internal" ? 1 : 2) * (coerced_if_freq + freq); + const double lo1_freq = + (ad9371_source == "internal" ? 1 : 2) * (coerced_if_freq + freq); this->_set_tx_lo_freq(ad9371_source, MAGNESIUM_LO1, lo1_freq, chan); this->_update_freq(chan, TX_DIRECTION); @@ -324,16 +327,17 @@ double magnesium_radio_control_impl::set_rx_frequency( double coerced_if_freq = 0; if (_map_freq_to_rx_band(_rx_band_map, freq) == rx_band::LOWBAND) { - _is_low_band[RX_DIRECTION] = true; - coerced_if_freq = - this->_set_rx_lo_freq(adf4351_source, MAGNESIUM_LO2, MAGNESIUM_RX_IF_FREQ, chan); + _is_low_band[RX_DIRECTION] = true; + coerced_if_freq = this->_set_rx_lo_freq( + adf4351_source, MAGNESIUM_LO2, MAGNESIUM_RX_IF_FREQ, chan); RFNOC_LOG_TRACE("coerced_if_freq = " << coerced_if_freq); } else { _is_low_band[RX_DIRECTION] = false; _lo_disable(_rx_lo); } // external LO required to tune at 2xdesired_frequency. - const double lo1_freq = (ad9371_source == "internal" ? 1 : 2) * coerced_if_freq + freq; + const double lo1_freq = + (ad9371_source == "internal" ? 1 : 2) * coerced_if_freq + freq; this->_set_rx_lo_freq(ad9371_source, MAGNESIUM_LO1, lo1_freq, chan); @@ -714,14 +718,14 @@ meta_range_t magnesium_radio_control_impl::get_rx_bandwidth_range(size_t) const *****************************************************************************/ std::vector<std::string> magnesium_radio_control_impl::get_rx_lo_names( const size_t /*chan*/ - ) const +) const { return std::vector<std::string>{MAGNESIUM_LO1, MAGNESIUM_LO2}; } std::vector<std::string> magnesium_radio_control_impl::get_rx_lo_sources( const std::string& name, const size_t /*chan*/ - ) const +) const { if (name == MAGNESIUM_LO2) { return std::vector<std::string>{"internal"}; @@ -734,7 +738,7 @@ std::vector<std::string> magnesium_radio_control_impl::get_rx_lo_sources( freq_range_t magnesium_radio_control_impl::get_rx_lo_freq_range( const std::string& name, const size_t /*chan*/ - ) const +) const { if (name == MAGNESIUM_LO1) { return freq_range_t{ADF4351_MIN_FREQ, ADF4351_MAX_FREQ}; @@ -763,7 +767,7 @@ void magnesium_radio_control_impl::set_rx_lo_source( const std::string magnesium_radio_control_impl::get_rx_lo_source( const std::string& name, const size_t /*chan*/ - ) const +) const { if (name == MAGNESIUM_LO1) { // TODO: should we use this from cache? @@ -832,14 +836,14 @@ double magnesium_radio_control_impl::get_rx_lo_freq( // TX LO std::vector<std::string> magnesium_radio_control_impl::get_tx_lo_names( const size_t /*chan*/ - ) const +) const { return std::vector<std::string>{MAGNESIUM_LO1, MAGNESIUM_LO2}; } std::vector<std::string> magnesium_radio_control_impl::get_tx_lo_sources( const std::string& name, const size_t /*chan*/ - ) const +) const { if (name == MAGNESIUM_LO2) { return std::vector<std::string>{"internal"}; diff --git a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp index c337af2f9..29ab194be 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp @@ -156,19 +156,19 @@ public: commit(); } - ~twinrx_ctrl_impl() + ~twinrx_ctrl_impl() override { UHD_SAFE_CALL(boost::lock_guard<boost::mutex> lock(_mutex); _gpio_iface->set_field(twinrx_gpio::FIELD_SWPS_EN, 0);) } - void commit() + void commit() override { boost::lock_guard<boost::mutex> lock(_mutex); _commit(); } - void set_chan_enabled(channel_t ch, bool enabled, bool commit = true) + void set_chan_enabled(channel_t ch, bool enabled, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -189,7 +189,7 @@ public: _commit(); } - void set_preamp1(channel_t ch, preamp_state_t value, bool commit = true) + void set_preamp1(channel_t ch, preamp_state_t value, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -216,7 +216,7 @@ public: _commit(); } - void set_preamp2(channel_t ch, bool enabled, bool commit = true) + void set_preamp2(channel_t ch, bool enabled, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -233,7 +233,8 @@ public: _commit(); } - void set_lb_preamp_preselector(channel_t ch, bool enabled, bool commit = true) + void set_lb_preamp_preselector( + channel_t ch, bool enabled, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -248,7 +249,7 @@ public: _commit(); } - void set_signal_path(channel_t ch, signal_path_t path, bool commit = true) + void set_signal_path(channel_t ch, signal_path_t path, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -295,7 +296,8 @@ public: _commit(); } - void set_lb_preselector(channel_t ch, preselector_path_t path, bool commit = true) + void set_lb_preselector( + channel_t ch, preselector_path_t path, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); uint32_t sw7val = 0, sw8val = 0; @@ -331,7 +333,8 @@ public: _commit(); } - void set_hb_preselector(channel_t ch, preselector_path_t path, bool commit = true) + void set_hb_preselector( + channel_t ch, preselector_path_t path, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); uint32_t sw9ch1val = 0, sw10ch1val = 0, sw9ch2val = 0, sw10ch2val = 0; @@ -375,7 +378,7 @@ public: _commit(); } - void set_input_atten(channel_t ch, uint8_t atten, bool commit = true) + void set_input_atten(channel_t ch, uint8_t atten, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -388,7 +391,7 @@ public: _commit(); } - void set_lb_atten(channel_t ch, uint8_t atten, bool commit = true) + void set_lb_atten(channel_t ch, uint8_t atten, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -401,7 +404,7 @@ public: _commit(); } - void set_hb_atten(channel_t ch, uint8_t atten, bool commit = true) + void set_hb_atten(channel_t ch, uint8_t atten, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -414,7 +417,7 @@ public: _commit(); } - void set_lo1_source(channel_t ch, lo_source_t source, bool commit = true) + void set_lo1_source(channel_t ch, lo_source_t source, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -442,7 +445,7 @@ public: _commit(); } - void set_lo2_source(channel_t ch, lo_source_t source, bool commit = true) + void set_lo2_source(channel_t ch, lo_source_t source, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (ch == CH1 or ch == BOTH) { @@ -467,7 +470,7 @@ public: _commit(); } - void set_lo1_export_source(lo_export_source_t source, bool commit = true) + void set_lo1_export_source(lo_export_source_t source, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); // SW22 may conflict with the cal switch but this attr takes priority and we @@ -481,7 +484,7 @@ public: _commit(); } - void set_lo2_export_source(lo_export_source_t source, bool commit = true) + void set_lo2_export_source(lo_export_source_t source, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); _cpld_regs->if0_reg7.set( @@ -496,7 +499,7 @@ public: _commit(); } - void set_antenna_mapping(antenna_mapping_t mapping, bool commit = true) + void set_antenna_mapping(antenna_mapping_t mapping, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); @@ -543,7 +546,7 @@ public: _commit(); } - void set_crossover_cal_mode(cal_mode_t cal_mode, bool commit = true) + void set_crossover_cal_mode(cal_mode_t cal_mode, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); if (_lo1_export == LO_CH1_SYNTH && cal_mode == CAL_CH2) { @@ -560,7 +563,7 @@ public: _commit(); } - double set_lo1_synth_freq(channel_t ch, double freq, bool commit = true) + double set_lo1_synth_freq(channel_t ch, double freq, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); @@ -581,7 +584,7 @@ public: return coerced_freq; } - double set_lo2_synth_freq(channel_t ch, double freq, bool commit = true) + double set_lo2_synth_freq(channel_t ch, double freq, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); @@ -600,7 +603,7 @@ public: return coerced_freq; } - double set_lo1_charge_pump(channel_t ch, double current, bool commit = true) + double set_lo1_charge_pump(channel_t ch, double current, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); double coerced_current = 0.0; @@ -619,7 +622,7 @@ public: return coerced_current; } - double set_lo2_charge_pump(channel_t ch, double current, bool commit = true) + double set_lo2_charge_pump(channel_t ch, double current, bool commit = true) override { boost::lock_guard<boost::mutex> lock(_mutex); double coerced_current = 0.0; @@ -638,19 +641,19 @@ public: return coerced_current; } - uhd::meta_range_t get_lo1_charge_pump_range() + uhd::meta_range_t get_lo1_charge_pump_range() override { // assume that both channels have the same range return _lo1_iface[size_t(CH1)]->get_charge_pump_current_range(); } - uhd::meta_range_t get_lo2_charge_pump_range() + uhd::meta_range_t get_lo2_charge_pump_range() override { // assume that both channels have the same range return _lo2_iface[size_t(CH1)]->get_charge_pump_current_range(); } - bool read_lo1_locked(channel_t ch) + bool read_lo1_locked(channel_t ch) override { boost::lock_guard<boost::mutex> lock(_mutex); @@ -666,7 +669,7 @@ public: return locked; } - bool read_lo2_locked(channel_t ch) + bool read_lo2_locked(channel_t ch) override { boost::lock_guard<boost::mutex> lock(_mutex); |