diff options
author | Martin Braun <martin.braun@ettus.com> | 2021-01-08 09:33:36 +0100 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-03-04 08:07:26 -0600 |
commit | 107a49c0c236940da7d3bd0f57da4bc1e2a34cb4 (patch) | |
tree | fdeaad56030a02948377c45838dab97beb7a5c84 /host/lib/usrp/dboard/rhodium | |
parent | 7d5e48032baa62cbe7467833b9e057900602f4b9 (diff) | |
download | uhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.tar.gz uhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.tar.bz2 uhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.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
Diffstat (limited to 'host/lib/usrp/dboard/rhodium')
-rw-r--r-- | host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp | 103 |
1 files changed, 55 insertions, 48 deletions
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp index 1d33f0357..4d5ce2cbd 100644 --- a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp +++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp @@ -61,98 +61,105 @@ public: * Structors ***********************************************************************/ rhodium_radio_control_impl(make_args_ptr make_args); - virtual ~rhodium_radio_control_impl(); + ~rhodium_radio_control_impl() override; /************************************************************************ * RF API calls ***********************************************************************/ // Note: We use the cached values in radio_ctrl_impl, so most getters are // not reimplemented here - double set_rate(double rate); + double set_rate(double rate) override; // Setters - void set_tx_antenna(const std::string& ant, const size_t chan); - void set_rx_antenna(const std::string& ant, const size_t chan); - double set_tx_frequency(const double freq, const size_t chan); - double set_rx_frequency(const double freq, const size_t chan); - void set_tx_tune_args(const uhd::device_addr_t&, const size_t chan); - void set_rx_tune_args(const uhd::device_addr_t&, const size_t chan); - double set_tx_gain(const double gain, const size_t chan); - double set_rx_gain(const double gain, const size_t chan); + void set_tx_antenna(const std::string& ant, const size_t chan) override; + void set_rx_antenna(const std::string& ant, const size_t chan) override; + double set_tx_frequency(const double freq, const size_t chan) override; + double set_rx_frequency(const double freq, const size_t chan) override; + void set_tx_tune_args(const uhd::device_addr_t&, const size_t chan) override; + void set_rx_tune_args(const uhd::device_addr_t&, const size_t chan) override; + double set_tx_gain(const double gain, const size_t chan) override; + double set_rx_gain(const double gain, const size_t chan) override; // Getters - std::vector<std::string> get_tx_antennas(const size_t) const; - std::vector<std::string> get_rx_antennas(const size_t) const; - uhd::freq_range_t get_tx_frequency_range(const size_t) const; - uhd::freq_range_t get_rx_frequency_range(const size_t) const; - uhd::gain_range_t get_tx_gain_range(const size_t) const; - uhd::gain_range_t get_rx_gain_range(const size_t) const; - uhd::meta_range_t get_tx_bandwidth_range(size_t) const; - uhd::meta_range_t get_rx_bandwidth_range(size_t) const; + std::vector<std::string> get_tx_antennas(const size_t) const override; + std::vector<std::string> get_rx_antennas(const size_t) const override; + uhd::freq_range_t get_tx_frequency_range(const size_t) const override; + uhd::freq_range_t get_rx_frequency_range(const size_t) const override; + uhd::gain_range_t get_tx_gain_range(const size_t) const override; + uhd::gain_range_t get_rx_gain_range(const size_t) const override; + uhd::meta_range_t get_tx_bandwidth_range(size_t) const override; + uhd::meta_range_t get_rx_bandwidth_range(size_t) const override; /************************************************************************** * LO Controls *************************************************************************/ - std::vector<std::string> get_rx_lo_names(const size_t chan) const; + std::vector<std::string> get_rx_lo_names(const size_t chan) const override; std::vector<std::string> get_rx_lo_sources( - const std::string& name, const size_t chan) const; - freq_range_t get_rx_lo_freq_range(const std::string& name, const size_t chan) const; + const std::string& name, const size_t chan) const override; + freq_range_t get_rx_lo_freq_range( + const std::string& name, const size_t chan) const override; void set_rx_lo_source( - const std::string& src, const std::string& name, const size_t chan); - const std::string get_rx_lo_source(const std::string& name, const size_t chan); - double set_rx_lo_freq(double freq, const std::string& name, const size_t chan); - double get_rx_lo_freq(const std::string& name, const size_t chan); - std::vector<std::string> get_tx_lo_names(const size_t chan) const; + const std::string& src, const std::string& name, const size_t chan) override; + const std::string get_rx_lo_source( + const std::string& name, const size_t chan) override; + double set_rx_lo_freq( + double freq, const std::string& name, const size_t chan) override; + double get_rx_lo_freq(const std::string& name, const size_t chan) override; + std::vector<std::string> get_tx_lo_names(const size_t chan) const override; std::vector<std::string> get_tx_lo_sources( const std::string& name, const size_t chan) const; - freq_range_t get_tx_lo_freq_range(const std::string& name, const size_t chan); + freq_range_t get_tx_lo_freq_range( + const std::string& name, const size_t chan) override; void set_tx_lo_source( - const std::string& src, const std::string& name, const size_t chan); - const std::string get_tx_lo_source(const std::string& name, const size_t chan); - double set_tx_lo_freq(const double freq, const std::string& name, const size_t chan); - double get_tx_lo_freq(const std::string& name, const size_t chan); + const std::string& src, const std::string& name, const size_t chan) override; + const std::string get_tx_lo_source( + const std::string& name, const size_t chan) override; + double set_tx_lo_freq( + const double freq, const std::string& name, const size_t chan) override; + double get_tx_lo_freq(const std::string& name, const size_t chan) override; // LO Export Control void set_tx_lo_export_enabled( - const bool enabled, const std::string& name, const size_t chan); + const bool enabled, const std::string& name, const size_t chan) override; void set_rx_lo_export_enabled( - const bool enabled, const std::string& name, const size_t chan); - bool get_tx_lo_export_enabled(const std::string& name, const size_t chan); + const bool enabled, const std::string& name, const size_t chan) override; + bool get_tx_lo_export_enabled(const std::string& name, const size_t chan) override; bool get_rx_lo_export_enabled(const std::string& name, const size_t chan); /************************************************************************** * GPIO Controls *************************************************************************/ - std::vector<std::string> get_gpio_banks() const; + std::vector<std::string> get_gpio_banks() const override; void set_gpio_attr( - const std::string& bank, const std::string& attr, const uint32_t value); - uint32_t get_gpio_attr(const std::string& bank, const std::string& attr); + const std::string& bank, const std::string& attr, const uint32_t value) override; + uint32_t get_gpio_attr(const std::string& bank, const std::string& attr) override; /************************************************************************** * EEPROM API *************************************************************************/ - void set_db_eeprom(const uhd::eeprom_map_t& db_eeprom); - uhd::eeprom_map_t get_db_eeprom(); + void set_db_eeprom(const uhd::eeprom_map_t& db_eeprom) override; + uhd::eeprom_map_t get_db_eeprom() override; /************************************************************************** * Sensor API *************************************************************************/ - std::vector<std::string> get_rx_sensor_names(size_t chan) const; - uhd::sensor_value_t get_rx_sensor(const std::string& name, size_t chan); - std::vector<std::string> get_tx_sensor_names(size_t chan) const; - uhd::sensor_value_t get_tx_sensor(const std::string& name, size_t chan); + std::vector<std::string> get_rx_sensor_names(size_t chan) const override; + uhd::sensor_value_t get_rx_sensor(const std::string& name, size_t chan) override; + std::vector<std::string> get_tx_sensor_names(size_t chan) const override; + uhd::sensor_value_t get_tx_sensor(const std::string& name, size_t chan) override; /************************************************************************** * Radio Identification API Calls *************************************************************************/ - std::string get_slot_name() const + std::string get_slot_name() const override { return _radio_slot; } size_t get_chan_from_dboard_fe( - const std::string& fe, const uhd::direction_t direction) const; + const std::string& fe, const uhd::direction_t direction) const override; std::string get_dboard_fe_from_chan( - const size_t chan, const uhd::direction_t direction) const; - std::string get_fe_name(const size_t chan, const uhd::direction_t direction) const; + const size_t chan, const uhd::direction_t direction) const override; + std::string get_fe_name( + const size_t chan, const uhd::direction_t direction) const override; /************************************************************************ * ??? calls @@ -201,7 +208,7 @@ private: //! Safely shut down all peripherals // // Reminder: After this is called, no peeks and pokes are allowed! - void deinit() + void deinit() override { RFNOC_LOG_TRACE("deinit()"); // Remove access to all peripherals |