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/usrp2 | |
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/usrp2')
-rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.cpp | 24 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.cpp | 12 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/dboard_iface.cpp | 56 |
3 files changed, 46 insertions, 46 deletions
diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp index 19a7fc1c5..324826dc0 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.cpp +++ b/host/lib/usrp/usrp2/clock_ctrl.cpp @@ -77,7 +77,7 @@ public: this->enable_test_clock(enb_test_clk); } - ~usrp2_clock_ctrl_impl(void) + ~usrp2_clock_ctrl_impl(void) override { UHD_SAFE_CALL( // power down clock outputs @@ -89,7 +89,7 @@ public: this->enable_test_clock(false);) } - void enable_mimo_clock_out(bool enb) + void enable_mimo_clock_out(bool enb) override { // calculate the low and high dividers size_t divider = size_t(this->get_master_clock_rate() / 10e6); @@ -145,7 +145,7 @@ public: } // uses output clock 7 (cmos) - void enable_rx_dboard_clock(bool enb) + void enable_rx_dboard_clock(bool enb) override { switch (_iface->get_rev()) { case usrp2_iface::USRP_N200_R4: @@ -170,7 +170,7 @@ public: } } - void set_rate_rx_dboard_clock(double rate) + void set_rate_rx_dboard_clock(double rate) override { assert_has(get_rates_rx_dboard_clock(), rate, "rx dboard clock rate"); size_t divider = size_t(get_master_clock_rate() / rate); @@ -188,7 +188,7 @@ public: this->update_regs(); } - std::vector<double> get_rates_rx_dboard_clock(void) + std::vector<double> get_rates_rx_dboard_clock(void) override { std::vector<double> rates; for (size_t i = 1; i <= 16 + 16; i++) @@ -198,7 +198,7 @@ public: // uses output clock 6 (cmos) on USRP2, output clock 5 (cmos) on N200/N210 r3, // and output clock 5 (lvds) on N200/N210 r4 - void enable_tx_dboard_clock(bool enb) + void enable_tx_dboard_clock(bool enb) override { switch (_iface->get_rev()) { case usrp2_iface::USRP_N200_R4: @@ -236,7 +236,7 @@ public: this->update_regs(); } - void set_rate_tx_dboard_clock(double rate) + void set_rate_tx_dboard_clock(double rate) override { assert_has(get_rates_tx_dboard_clock(), rate, "tx dboard clock rate"); size_t divider = size_t(get_master_clock_rate() / rate); @@ -269,12 +269,12 @@ public: this->update_regs(); } - std::vector<double> get_rates_tx_dboard_clock(void) + std::vector<double> get_rates_tx_dboard_clock(void) override { return get_rates_rx_dboard_clock(); // same master clock, same dividers... } - void enable_test_clock(bool enb) + void enable_test_clock(bool enb) override { _ad9510_regs.power_down_lvpecl_out0 = enb ? ad9510_regs_t::POWER_DOWN_LVPECL_OUT0_NORMAL @@ -293,7 +293,7 @@ public: * If we are to use an external reference, enable the charge pump. * \param enb true to enable the CP */ - void enable_external_ref(bool enb) + void enable_external_ref(bool enb) override { _ad9510_regs.charge_pump_mode = (enb) ? ad9510_regs_t::CHARGE_PUMP_MODE_NORMAL : ad9510_regs_t::CHARGE_PUMP_MODE_3STATE; @@ -303,12 +303,12 @@ public: this->update_regs(); } - double get_master_clock_rate(void) + double get_master_clock_rate(void) override { return 100e6; } - void set_mimo_clock_delay(double delay) + void set_mimo_clock_delay(double delay) override { // delay_val is a 5-bit value (0-31) for fine control // the equations below determine delay for a given ramp current, # of caps and diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp index 6fe91da9e..bf31daf18 100644 --- a/host/lib/usrp/usrp2/codec_ctrl.cpp +++ b/host/lib/usrp/usrp2/codec_ctrl.cpp @@ -96,7 +96,7 @@ public: } } - ~usrp2_codec_ctrl_impl(void) + ~usrp2_codec_ctrl_impl(void) override { UHD_SAFE_CALL( // power-down dac @@ -124,7 +124,7 @@ public: }) } - void set_tx_mod_mode(int mod_mode) + void set_tx_mod_mode(int mod_mode) override { // set the sign of the frequency shift _ad9777_regs.modulation_form = (mod_mode > 0) @@ -153,7 +153,7 @@ public: this->send_ad9777_reg(0x01); // set the register } - void set_rx_digital_gain(double gain) + void set_rx_digital_gain(double gain) override { // fine digital gain switch (_iface->get_rev()) { case usrp2_iface::USRP_N200: @@ -169,7 +169,7 @@ public: } } - void set_rx_digital_fine_gain(double gain) + void set_rx_digital_fine_gain(double gain) override { // gain correction switch (_iface->get_rev()) { case usrp2_iface::USRP_N200: @@ -185,7 +185,7 @@ public: } } - void set_rx_analog_gain(bool /*gain*/) + void set_rx_analog_gain(bool /*gain*/) override { // turns on/off analog 3.5dB preamp switch (_iface->get_rev()) { case usrp2_iface::USRP_N200: @@ -203,7 +203,7 @@ public: } } - size_t get_tx_interpolation() const + size_t get_tx_interpolation() const override { return 4; } diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp index 55325dafc..649019a91 100644 --- a/host/lib/usrp/usrp2/dboard_iface.cpp +++ b/host/lib/usrp/usrp2/dboard_iface.cpp @@ -31,9 +31,9 @@ public: uhd::i2c_iface::sptr i2c_iface, uhd::spi_iface::sptr spi_iface, usrp2_clock_ctrl::sptr clock_ctrl); - ~usrp2_dboard_iface(void); + ~usrp2_dboard_iface(void) override; - special_props_t get_special_props(void) + special_props_t get_special_props(void) override { special_props_t props; props.soft_clock_divider = false; @@ -41,39 +41,39 @@ public: return props; } - void write_aux_dac(unit_t, aux_dac_t, double); - double read_aux_adc(unit_t, aux_adc_t); + void write_aux_dac(unit_t, aux_dac_t, double) override; + double read_aux_adc(unit_t, aux_adc_t) override; - void set_pin_ctrl(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff); - uint32_t get_pin_ctrl(unit_t unit); + void set_pin_ctrl(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff) override; + uint32_t get_pin_ctrl(unit_t unit) override; void set_atr_reg( - unit_t unit, atr_reg_t reg, uint32_t value, uint32_t mask = 0xffffffff); - uint32_t get_atr_reg(unit_t unit, atr_reg_t reg); - void set_gpio_ddr(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff); - uint32_t get_gpio_ddr(unit_t unit); - void set_gpio_out(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff); - uint32_t get_gpio_out(unit_t unit); - uint32_t read_gpio(unit_t unit); - - void set_command_time(const uhd::time_spec_t& t); - uhd::time_spec_t get_command_time(void); - - void write_i2c(uint16_t, const byte_vector_t&); - byte_vector_t read_i2c(uint16_t, size_t); - - void set_clock_rate(unit_t, double); - double get_clock_rate(unit_t); - std::vector<double> get_clock_rates(unit_t); - void set_clock_enabled(unit_t, bool); - double get_codec_rate(unit_t); + unit_t unit, atr_reg_t reg, uint32_t value, uint32_t mask = 0xffffffff) override; + uint32_t get_atr_reg(unit_t unit, atr_reg_t reg) override; + void set_gpio_ddr(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff) override; + uint32_t get_gpio_ddr(unit_t unit) override; + void set_gpio_out(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff) override; + uint32_t get_gpio_out(unit_t unit) override; + uint32_t read_gpio(unit_t unit) override; + + void set_command_time(const uhd::time_spec_t& t) override; + uhd::time_spec_t get_command_time(void) override; + + void write_i2c(uint16_t, const byte_vector_t&) override; + byte_vector_t read_i2c(uint16_t, size_t) override; + + void set_clock_rate(unit_t, double) override; + double get_clock_rate(unit_t) override; + std::vector<double> get_clock_rates(unit_t) override; + void set_clock_enabled(unit_t, bool) override; + double get_codec_rate(unit_t) override; void set_fe_connection( - unit_t unit, const std::string&, const fe_connection_t& fe_conn); + unit_t unit, const std::string&, const fe_connection_t& fe_conn) override; void write_spi( - unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits); + unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits) override; uint32_t read_write_spi( - unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits); + unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits) override; private: timed_wb_iface::sptr _wb_iface; |