diff options
Diffstat (limited to 'host/lib/usrp/dboard/twinrx')
-rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_experts.hpp | 20 | ||||
-rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_io.hpp | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/host/lib/usrp/dboard/twinrx/twinrx_experts.hpp b/host/lib/usrp/dboard/twinrx/twinrx_experts.hpp index 9d2269916..0d5fea42c 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_experts.hpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_experts.hpp @@ -77,7 +77,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs experts::data_reader_t<time_spec_t> _command_time; @@ -126,7 +126,7 @@ public: } private: - virtual void resolve(); + void resolve() override; static lo_inj_side_t _compute_lo2_inj_side( double lo1_freq, double if1_freq, double if2_freq, double bandwidth); static bool _has_mixer_spurs(double lo1_freq, @@ -189,7 +189,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs experts::data_reader_t<std::string> _lo_source_ch0; @@ -240,7 +240,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs experts::data_reader_t<twinrx_ctrl::lo_source_t> _lox_src_ch0; @@ -282,7 +282,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs experts::data_reader_t<double> _lo1_freq_c; @@ -331,7 +331,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs const std::string _channel; @@ -390,7 +390,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs experts::data_reader_t<std::string> _antenna_ch0; @@ -449,7 +449,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs experts::data_reader_t<double> _gain; @@ -519,7 +519,7 @@ public: } private: - virtual void resolve(); + void resolve() override; // Inputs experts::data_reader_t<twinrx_ctrl::antenna_mapping_t> _ant_mapping; @@ -610,7 +610,7 @@ public: } private: - virtual void resolve(); + void resolve() override; void _resolve_lox_freq(lo_stage_t lo_stage, experts::data_reader_t<double>& ch0_freq_d, experts::data_reader_t<double>& ch1_freq_d, diff --git a/host/lib/usrp/dboard/twinrx/twinrx_io.hpp b/host/lib/usrp/dboard/twinrx/twinrx_io.hpp index 2949138dd..538b0bfa8 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_io.hpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_io.hpp @@ -88,7 +88,7 @@ public: _db_iface->set_gpio_out(dboard_iface::UNIT_BOTH, 0, ~GPIO_PINCTRL_MASK); } - ~twinrx_gpio() + ~twinrx_gpio() override { _db_iface->set_gpio_ddr(dboard_iface::UNIT_BOTH, ~GPIO_OUTPUT_MASK, SET_ALL_BITS); } @@ -111,7 +111,7 @@ public: } // CPLD register write-only interface - void poke32(const wb_addr_type addr, const uint32_t data) + void poke32(const wb_addr_type addr, const uint32_t data) override { boost::lock_guard<boost::mutex> lock(_mutex); using namespace soft_reg_field; |