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/b100 | |
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/b100')
-rw-r--r-- | host/lib/usrp/b100/clock_ctrl.cpp | 32 | ||||
-rw-r--r-- | host/lib/usrp/b100/codec_ctrl.cpp | 14 |
2 files changed, 23 insertions, 23 deletions
diff --git a/host/lib/usrp/b100/clock_ctrl.cpp b/host/lib/usrp/b100/clock_ctrl.cpp index 12ef2052f..e8d112635 100644 --- a/host/lib/usrp/b100/clock_ctrl.cpp +++ b/host/lib/usrp/b100/clock_ctrl.cpp @@ -232,7 +232,7 @@ public: this->enable_tx_dboard_clock(false); } - ~b100_clock_ctrl_impl(void) + ~b100_clock_ctrl_impl(void) override { UHD_SAFE_CALL(this->enable_test_clock(ENABLE_THE_TEST_OUT); this->enable_rx_dboard_clock(false); @@ -339,7 +339,7 @@ public: this->send_all_regs(); } - void set_fpga_clock_rate(double rate) + void set_fpga_clock_rate(double rate) override { if (_out_rate == rate) return; @@ -352,7 +352,7 @@ public: set_tx_dboard_clock_rate(rate); } - double get_fpga_clock_rate(void) + double get_fpga_clock_rate(void) override { return this->_out_rate; } @@ -360,7 +360,7 @@ public: /*********************************************************************** * FPGA clock enable **********************************************************************/ - void enable_fpga_clock(bool enb) + void enable_fpga_clock(bool enb) override { _ad9522_regs.out0_format = ad9522_regs_t::OUT0_FORMAT_LVDS; _ad9522_regs.out0_lvds_power_down = !enb; @@ -385,7 +385,7 @@ public: /*********************************************************************** * RX Dboard Clock Control (output 9, divider 3) **********************************************************************/ - void enable_rx_dboard_clock(bool enb) + void enable_rx_dboard_clock(bool enb) override { _ad9522_regs.out9_format = ad9522_regs_t::OUT9_FORMAT_LVDS; _ad9522_regs.out9_lvds_power_down = !enb; @@ -393,7 +393,7 @@ public: this->latch_regs(); } - std::vector<double> get_rx_dboard_clock_rates(void) + std::vector<double> get_rx_dboard_clock_rates(void) override { std::vector<double> rates; for (size_t div = 1; div <= 16 + 16; div++) @@ -401,7 +401,7 @@ public: return rates; } - void set_rx_dboard_clock_rate(double rate) + void set_rx_dboard_clock_rate(double rate) override { assert_has(get_rx_dboard_clock_rates(), rate, "rx dboard clock rate"); _rx_clock_rate = rate; @@ -416,7 +416,7 @@ public: this->soft_sync(); } - double get_rx_clock_rate(void) + double get_rx_clock_rate(void) override { return _rx_clock_rate; } @@ -424,7 +424,7 @@ public: /*********************************************************************** * TX Dboard Clock Control (output 6, divider 2) **********************************************************************/ - void enable_tx_dboard_clock(bool enb) + void enable_tx_dboard_clock(bool enb) override { _ad9522_regs.out6_format = ad9522_regs_t::OUT6_FORMAT_LVDS; _ad9522_regs.out6_lvds_power_down = !enb; @@ -432,12 +432,12 @@ public: this->latch_regs(); } - std::vector<double> get_tx_dboard_clock_rates(void) + std::vector<double> get_tx_dboard_clock_rates(void) override { return get_rx_dboard_clock_rates(); // same master clock, same dividers... } - void set_tx_dboard_clock_rate(double rate) + void set_tx_dboard_clock_rate(double rate) override { assert_has(get_tx_dboard_clock_rates(), rate, "tx dboard clock rate"); _tx_clock_rate = rate; @@ -452,7 +452,7 @@ public: this->soft_sync(); } - double get_tx_clock_rate(void) + double get_tx_clock_rate(void) override { return _tx_clock_rate; } @@ -460,7 +460,7 @@ public: /*********************************************************************** * Clock reference control **********************************************************************/ - void use_internal_ref(void) + void use_internal_ref(void) override { _ad9522_regs.enable_ref2 = 1; _ad9522_regs.enable_ref1 = 0; @@ -471,7 +471,7 @@ public: this->latch_regs(); } - void use_external_ref(void) + void use_external_ref(void) override { _ad9522_regs.enable_ref2 = 0; _ad9522_regs.enable_ref1 = 1; @@ -482,7 +482,7 @@ public: this->latch_regs(); } - void use_auto_ref(void) + void use_auto_ref(void) override { _ad9522_regs.enable_ref2 = 1; _ad9522_regs.enable_ref1 = 1; @@ -493,7 +493,7 @@ public: this->latch_regs(); } - bool get_locked(void) + bool get_locked(void) override { static const uint8_t addr = 0x01F; uint32_t reg = this->read_reg(addr); diff --git a/host/lib/usrp/b100/codec_ctrl.cpp b/host/lib/usrp/b100/codec_ctrl.cpp index f6e2d8b93..fad25cf8c 100644 --- a/host/lib/usrp/b100/codec_ctrl.cpp +++ b/host/lib/usrp/b100/codec_ctrl.cpp @@ -36,17 +36,17 @@ class b100_codec_ctrl_impl : public b100_codec_ctrl public: // structors b100_codec_ctrl_impl(spi_iface::sptr iface); - ~b100_codec_ctrl_impl(void); + ~b100_codec_ctrl_impl(void) override; // aux adc and dac control - double read_aux_adc(aux_adc_t which); - void write_aux_dac(aux_dac_t which, double volts); + double read_aux_adc(aux_adc_t which) override; + void write_aux_dac(aux_dac_t which, double volts) override; // pga gain control - void set_tx_pga_gain(double); - double get_tx_pga_gain(void); - void set_rx_pga_gain(double, char); - double get_rx_pga_gain(char); + void set_tx_pga_gain(double) override; + double get_tx_pga_gain(void) override; + void set_rx_pga_gain(double, char) override; + double get_rx_pga_gain(char) override; private: spi_iface::sptr _iface; |