diff options
Diffstat (limited to 'host/lib/usrp/dboard')
| -rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_sbx_common.hpp | 14 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_twinrx.cpp | 6 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_wbx_common.hpp | 26 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.hpp | 20 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/e3xx/e320_radio_control_impl.hpp | 20 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp | 36 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.hpp | 102 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp | 106 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp | 103 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_experts.hpp | 20 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_io.hpp | 4 |
12 files changed, 240 insertions, 221 deletions
diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index 3282d53c3..d97220fde 100644 --- a/host/lib/usrp/dboard/db_basic_and_lf.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -28,7 +28,7 @@ class basic_rx : public rx_dboard_base { public: basic_rx(ctor_args_t args, double max_freq); - virtual ~basic_rx(void); + ~basic_rx(void) override; private: double _max_freq; @@ -38,7 +38,7 @@ class basic_tx : public tx_dboard_base { public: basic_tx(ctor_args_t args, double max_freq); - virtual ~basic_tx(void); + ~basic_tx(void) override; private: double _max_freq; diff --git a/host/lib/usrp/dboard/db_sbx_common.hpp b/host/lib/usrp/dboard/db_sbx_common.hpp index c11f0bbe2..235d45fd2 100644 --- a/host/lib/usrp/dboard/db_sbx_common.hpp +++ b/host/lib/usrp/dboard/db_sbx_common.hpp @@ -124,7 +124,7 @@ class sbx_xcvr : public xcvr_dboard_base { public: sbx_xcvr(ctor_args_t args); - virtual ~sbx_xcvr(void); + ~sbx_xcvr(void) override; protected: uhd::dict<std::string, double> _tx_gains, _rx_gains; @@ -182,9 +182,9 @@ protected: { public: sbx_version3(sbx_xcvr* _self_sbx_xcvr); - virtual ~sbx_version3(void); + ~sbx_version3(void) override; - double set_lo_freq(dboard_iface::unit_t unit, double target_freq); + double set_lo_freq(dboard_iface::unit_t unit, double target_freq) override; /*! This is the registered instance of the wrapper class, sbx_base. */ sbx_xcvr* self_base; @@ -204,9 +204,9 @@ protected: { public: sbx_version4(sbx_xcvr* _self_sbx_xcvr); - virtual ~sbx_version4(void); + ~sbx_version4(void) override; - double set_lo_freq(dboard_iface::unit_t unit, double target_freq); + double set_lo_freq(dboard_iface::unit_t unit, double target_freq) override; /*! This is the registered instance of the wrapper class, sbx_base. */ sbx_xcvr* self_base; @@ -231,9 +231,9 @@ protected: { public: cbx(sbx_xcvr* _self_sbx_xcvr); - virtual ~cbx(void); + ~cbx(void) override; - double set_lo_freq(dboard_iface::unit_t unit, double target_freq); + double set_lo_freq(dboard_iface::unit_t unit, double target_freq) override; /*! This is the registered instance of the wrapper class, sbx_base. */ sbx_xcvr* self_base; diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp index a7c57979d..9aa67318b 100644 --- a/host/lib/usrp/dboard/db_twinrx.cpp +++ b/host/lib/usrp/dboard/db_twinrx.cpp @@ -247,7 +247,7 @@ public: _expert, prepend_ch("synth/LO2/mapping", _ch_name), MAPPING_NONE); } - virtual ~twinrx_rcvr_fe(void) {} + ~twinrx_rcvr_fe(void) override {} sensor_value_t get_lo_locked() { @@ -287,7 +287,7 @@ public: _expert = expert_factory::create_container("twinrx_expert"); } - virtual ~twinrx_rcvr(void) {} + ~twinrx_rcvr(void) override {} inline expert_container::sptr get_expert() { @@ -299,7 +299,7 @@ public: return _ctrl; } - virtual void initialize() + void initialize() override { //--------------------------------------------------------- // Add internal channel-agnostic data nodes to expert diff --git a/host/lib/usrp/dboard/db_wbx_common.hpp b/host/lib/usrp/dboard/db_wbx_common.hpp index e7beabd8b..63a40c504 100644 --- a/host/lib/usrp/dboard/db_wbx_common.hpp +++ b/host/lib/usrp/dboard/db_wbx_common.hpp @@ -95,7 +95,7 @@ class wbx_base : public xcvr_dboard_base { public: wbx_base(ctor_args_t args); - virtual ~wbx_base(void); + ~wbx_base(void) override; protected: virtual double set_rx_gain(double gain, const std::string& name); @@ -156,11 +156,11 @@ protected: { public: wbx_version2(wbx_base* _self_wbx_base); - virtual ~wbx_version2(void); + ~wbx_version2(void) override; - double set_tx_gain(double gain, const std::string& name); - void set_tx_enabled(bool enb); - double set_lo_freq(dboard_iface::unit_t unit, double target_freq); + double set_tx_gain(double gain, const std::string& name) override; + void set_tx_enabled(bool enb) override; + double set_lo_freq(dboard_iface::unit_t unit, double target_freq) override; }; /*! @@ -172,11 +172,11 @@ protected: { public: wbx_version3(wbx_base* _self_wbx_base); - virtual ~wbx_version3(void); + ~wbx_version3(void) override; - double set_tx_gain(double gain, const std::string& name); - void set_tx_enabled(bool enb); - double set_lo_freq(dboard_iface::unit_t unit, double target_freq); + double set_tx_gain(double gain, const std::string& name) override; + void set_tx_enabled(bool enb) override; + double set_lo_freq(dboard_iface::unit_t unit, double target_freq) override; }; /*! @@ -188,11 +188,11 @@ protected: { public: wbx_version4(wbx_base* _self_wbx_base); - virtual ~wbx_version4(void); + ~wbx_version4(void) override; - double set_tx_gain(double gain, const std::string& name); - void set_tx_enabled(bool enb); - double set_lo_freq(dboard_iface::unit_t unit, double target_freq); + double set_tx_gain(double gain, const std::string& name) override; + void set_tx_enabled(bool enb) override; + double set_lo_freq(dboard_iface::unit_t unit, double target_freq) override; }; /*! diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.hpp b/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.hpp index 04fa800e2..0fe0ccd56 100644 --- a/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.hpp +++ b/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.hpp @@ -29,9 +29,9 @@ public: * Structors and deinit ***********************************************************************/ e31x_radio_control_impl(make_args_ptr make_args); - virtual ~e31x_radio_control_impl(); + ~e31x_radio_control_impl() override; - std::vector<std::string> get_gpio_banks() const + std::vector<std::string> get_gpio_banks() const override { return {E31x_GPIO_BANK}; } @@ -117,22 +117,22 @@ private: /************************************************************************ * E3XX API calls ***********************************************************************/ - const std::string get_default_timing_mode() + const std::string get_default_timing_mode() override { return TIMING_MODE_1R1T; }; uint32_t get_rx_switches( - const size_t chan, const double freq, const std::string& ant); + const size_t chan, const double freq, const std::string& ant) override; - uint32_t get_tx_switches(const size_t chan, const double freq); + uint32_t get_tx_switches(const size_t chan, const double freq) override; - uint32_t get_idle_switches(); + uint32_t get_idle_switches() override; - uint32_t get_tx_led(); - uint32_t get_rx_led(); - uint32_t get_txrx_led(); - uint32_t get_idle_led(); + uint32_t get_tx_led() override; + uint32_t get_rx_led() override; + uint32_t get_txrx_led() override; + uint32_t get_idle_led() override; }; }} /* namespace uhd::rfnoc */ diff --git a/host/lib/usrp/dboard/e3xx/e320_radio_control_impl.hpp b/host/lib/usrp/dboard/e3xx/e320_radio_control_impl.hpp index f781eb49d..7ba64b0ab 100644 --- a/host/lib/usrp/dboard/e3xx/e320_radio_control_impl.hpp +++ b/host/lib/usrp/dboard/e3xx/e320_radio_control_impl.hpp @@ -28,9 +28,9 @@ public: * Structors ***********************************************************************/ e320_radio_control_impl(make_args_ptr make_args); - virtual ~e320_radio_control_impl(); + ~e320_radio_control_impl() override; - std::vector<std::string> get_gpio_banks() const + std::vector<std::string> get_gpio_banks() const override { return {E320_GPIO_BANK}; } @@ -103,22 +103,22 @@ protected: /************************************************************************ * E3XX API calls ***********************************************************************/ - const std::string get_default_timing_mode() + const std::string get_default_timing_mode() override { return TIMING_MODE_2R2T; }; uint32_t get_rx_switches( - const size_t chan, const double freq, const std::string& ant); + const size_t chan, const double freq, const std::string& ant) override; - uint32_t get_tx_switches(const size_t chan, const double freq); + uint32_t get_tx_switches(const size_t chan, const double freq) override; - uint32_t get_idle_switches(); + uint32_t get_idle_switches() override; - uint32_t get_tx_led(); - uint32_t get_rx_led(); - uint32_t get_txrx_led(); - uint32_t get_idle_led(); + uint32_t get_tx_led() override; + uint32_t get_rx_led() override; + uint32_t get_txrx_led() override; + uint32_t get_idle_led() override; }; }} /* namespace uhd::rfnoc */ diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp index acd0be211..108b94a80 100644 --- a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp +++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp @@ -21,94 +21,94 @@ public: _log_prefix, "Initialized controls with RPC prefix " << _rpc_prefix); } - double set_bw_filter(const std::string& which, const double bw) + double set_bw_filter(const std::string& which, const double bw) override { return _rpcc->request_with_token<double>( this->_rpc_prefix + "set_bw_filter", which, bw); } - double set_gain(const std::string& which, const double value) + double set_gain(const std::string& which, const double value) override { return _rpcc->request_with_token<double>( this->_rpc_prefix + "set_gain", which, value); } - void set_agc(const std::string& which, bool enable) + void set_agc(const std::string& which, bool enable) override { _rpcc->request_with_token<void>(this->_rpc_prefix + "set_agc", which, enable); } - void set_agc_mode(const std::string& which, const std::string& mode) + void set_agc_mode(const std::string& which, const std::string& mode) override { _rpcc->request_with_token<void>(this->_rpc_prefix + "set_agc_mode", which, mode); } - double set_clock_rate(const double rate) + double set_clock_rate(const double rate) override { return _rpcc->request_with_token<double>( E3XX_RATE_TIMEOUT, this->_rpc_prefix + "set_catalina_clock_rate", rate); } - void set_active_chains(bool tx1, bool tx2, bool rx1, bool rx2) + void set_active_chains(bool tx1, bool tx2, bool rx1, bool rx2) override { _rpcc->request_with_token<void>( this->_rpc_prefix + "set_active_chains", tx1, tx2, rx1, rx2); } - double tune(const std::string& which, const double value) + double tune(const std::string& which, const double value) override { return _rpcc->request_with_token<double>( E3XX_TUNE_TIMEOUT, this->_rpc_prefix + "catalina_tune", which, value); } - void set_dc_offset_auto(const std::string& which, const bool on) + void set_dc_offset_auto(const std::string& which, const bool on) override { _rpcc->request_with_token<void>( this->_rpc_prefix + "set_dc_offset_auto", which, on); } - void set_timing_mode(const std::string& timing_mode) + void set_timing_mode(const std::string& timing_mode) override { _rpcc->request_with_token<void>( this->_rpc_prefix + "set_timing_mode", timing_mode); } - void set_iq_balance_auto(const std::string& which, const bool on) + void set_iq_balance_auto(const std::string& which, const bool on) override { _rpcc->request_with_token<void>( this->_rpc_prefix + "set_iq_balance_auto", which, on); } - double get_freq(const std::string& which) + double get_freq(const std::string& which) override { return _rpcc->request_with_token<double>(this->_rpc_prefix + "get_freq", which); } - void data_port_loopback(const bool on) + void data_port_loopback(const bool on) override { _rpcc->request_with_token<void>(this->_rpc_prefix + "data_port_loopback", on); } - sensor_value_t get_rssi(const std::string& which) + sensor_value_t get_rssi(const std::string& which) override { return sensor_value_t(_rpcc->request_with_token<sensor_value_t::sensor_map_t>( this->_rpc_prefix + "get_rssi", which)); } - sensor_value_t get_temperature() + sensor_value_t get_temperature() override { return sensor_value_t(_rpcc->request_with_token<sensor_value_t::sensor_map_t>( this->_rpc_prefix + "get_temperature")); } - std::vector<std::string> get_filter_names(const std::string& which) + std::vector<std::string> get_filter_names(const std::string& which) override { return _rpcc->request_with_token<std::vector<std::string>>( this->_rpc_prefix + "get_filter_names", which); } filter_info_base::sptr get_filter( - const std::string& /*which*/, const std::string& /*filter_name*/) + const std::string& /*which*/, const std::string& /*filter_name*/) override { throw uhd::runtime_error( "ad9361_ctrl::get_filter is not supported over an RPC connection"); @@ -116,13 +116,13 @@ public: void set_filter(const std::string& /*which*/, const std::string& /*filter_name*/, - const filter_info_base::sptr /*filter*/) + const filter_info_base::sptr /*filter*/) override { throw uhd::runtime_error( "ad9361_ctrl::set_filter is not supported over an RPC connection"); } - void output_digital_test_tone(bool enb) + void output_digital_test_tone(bool enb) override { _rpcc->request_with_token<void>( this->_rpc_prefix + "output_digital_test_tone", enb); diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.hpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.hpp index d5714634c..658edc987 100644 --- a/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.hpp +++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.hpp @@ -71,90 +71,94 @@ public: * Structors ***********************************************************************/ e3xx_radio_control_impl(make_args_ptr make_args); - virtual ~e3xx_radio_control_impl(); + ~e3xx_radio_control_impl() override; /************************************************************************ * node_t && noc_block_base API calls ***********************************************************************/ - void deinit(); + void deinit() override; bool check_topology(const std::vector<size_t>& connected_inputs, - const std::vector<size_t>& connected_outputs); + const std::vector<size_t>& connected_outputs) override; /************************************************************************ * radio_control API calls ***********************************************************************/ - double set_rate(const double rate); - uhd::meta_range_t get_rate_range() const; + double set_rate(const double rate) override; + uhd::meta_range_t get_rate_range() const 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); - double set_tx_gain(const double gain, const size_t chan); - double set_rx_gain(const double gain, const size_t chan); - void set_rx_agc(const bool enable, const size_t chan); - double set_tx_bandwidth(const double bandwidth, const size_t chan); - double set_rx_bandwidth(const double bandwidth, 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; + double set_tx_gain(const double gain, const size_t chan) override; + double set_rx_gain(const double gain, const size_t chan) override; + void set_rx_agc(const bool enable, const size_t chan) override; + double set_tx_bandwidth(const double bandwidth, const size_t chan) override; + double set_rx_bandwidth(const double bandwidth, const size_t chan) override; // Getters - std::vector<std::string> get_tx_antennas(const size_t chan) const; - std::vector<std::string> get_rx_antennas(const size_t chan) const; - uhd::freq_range_t get_tx_frequency_range(const size_t chan) const; - uhd::freq_range_t get_rx_frequency_range(const size_t chan) 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; - meta_range_t get_tx_bandwidth_range(size_t chan) const; - meta_range_t get_rx_bandwidth_range(size_t chan) const; + std::vector<std::string> get_tx_antennas(const size_t chan) const override; + std::vector<std::string> get_rx_antennas(const size_t chan) const override; + uhd::freq_range_t get_tx_frequency_range(const size_t chan) const override; + uhd::freq_range_t get_rx_frequency_range(const size_t chan) 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; + meta_range_t get_tx_bandwidth_range(size_t chan) const override; + meta_range_t get_rx_bandwidth_range(size_t chan) const override; /************************************************************************** * Calibration-Related API Calls *************************************************************************/ - virtual void set_rx_dc_offset(const bool enb, size_t chan = ALL_CHANS); - virtual void set_rx_iq_balance(const bool enb, size_t chan); + void set_rx_dc_offset(const bool enb, size_t chan = ALL_CHANS) override; + void set_rx_iq_balance(const bool enb, size_t chan) override; /************************************************************************** * GPIO Controls *************************************************************************/ - virtual void set_gpio_attr( - const std::string& bank, const std::string& attr, const uint32_t value); - virtual uint32_t get_gpio_attr(const std::string& bank, const std::string& attr); + void set_gpio_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; /************************************************************************** * 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; /************************************************************************** * Filter API *************************************************************************/ - std::vector<std::string> get_rx_filter_names(const size_t chan) const; - uhd::filter_info_base::sptr get_rx_filter(const std::string& name, const size_t chan); - void set_rx_filter( - const std::string& name, uhd::filter_info_base::sptr filter, const size_t chan); - - std::vector<std::string> get_tx_filter_names(const size_t chan) const; - uhd::filter_info_base::sptr get_tx_filter(const std::string& name, const size_t chan); - void set_tx_filter( - const std::string& name, uhd::filter_info_base::sptr filter, const size_t chan); + std::vector<std::string> get_rx_filter_names(const size_t chan) const override; + uhd::filter_info_base::sptr get_rx_filter( + const std::string& name, const size_t chan) override; + void set_rx_filter(const std::string& name, + uhd::filter_info_base::sptr filter, + const size_t chan) override; + + std::vector<std::string> get_tx_filter_names(const size_t chan) const override; + uhd::filter_info_base::sptr get_tx_filter( + const std::string& name, const size_t chan) override; + void set_tx_filter(const std::string& name, + uhd::filter_info_base::sptr filter, + const size_t chan) override; /************************************************************************** * Radio Identification API Calls *************************************************************************/ - std::string get_slot_name() const + std::string get_slot_name() const override { return "A"; } - virtual size_t get_chan_from_dboard_fe( - const std::string& fe, const uhd::direction_t direction) const; - virtual std::string get_dboard_fe_from_chan( - const size_t chan, const uhd::direction_t direction) const; - virtual std::string get_fe_name( - const size_t chan, const uhd::direction_t direction) const; + size_t get_chan_from_dboard_fe( + 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 override; + std::string get_fe_name( + const size_t chan, const uhd::direction_t direction) const override; protected: //! Map a frequency in Hz to an rx_band value. Will return @@ -239,9 +243,9 @@ private: void _set_atr_bits(const size_t chan); - void set_db_eeprom(const uhd::eeprom_map_t& db_eeprom); + void set_db_eeprom(const uhd::eeprom_map_t& db_eeprom) override; - uhd::eeprom_map_t get_db_eeprom(); + uhd::eeprom_map_t get_db_eeprom() override; /************************************************************************** * Private attributes diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp index e8c252605..897e00868 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp @@ -67,99 +67,107 @@ public: * Structors ***********************************************************************/ magnesium_radio_control_impl(make_args_ptr make_args); - virtual ~magnesium_radio_control_impl(); + ~magnesium_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); - double set_tx_gain(const double gain, const size_t chan); - double set_tx_gain(const double gain, const std::string& name, const size_t chan); - double set_rx_gain(const double gain, const size_t chan); - double set_rx_gain(const double gain, const std::string& name, const size_t chan); - double set_tx_bandwidth(const double bandwidth, const size_t chan); - double set_rx_bandwidth(const double bandwidth, 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; + double set_tx_gain(const double gain, const size_t chan) override; + double set_tx_gain( + const double gain, const std::string& name, const size_t chan) override; + double set_rx_gain(const double gain, const size_t chan) override; + double set_rx_gain( + const double gain, const std::string& name, const size_t chan) override; + double set_tx_bandwidth(const double bandwidth, const size_t chan) override; + double set_rx_bandwidth(const double bandwidth, const size_t chan) override; // Getters - std::vector<std::string> get_tx_antennas(const size_t chan) const; - std::vector<std::string> get_rx_antennas(const size_t chan) const; - uhd::freq_range_t get_tx_frequency_range(const size_t chan) const; - uhd::freq_range_t get_rx_frequency_range(const size_t chan) const; - std::vector<std::string> get_tx_gain_names(const size_t) const; - std::vector<std::string> get_rx_gain_names(const size_t) const; - double get_tx_gain(const std::string&, size_t); - double get_rx_gain(const std::string&, size_t); - uhd::gain_range_t get_tx_gain_range(const size_t) const; - uhd::gain_range_t get_tx_gain_range(const std::string&, const size_t) const; - uhd::gain_range_t get_rx_gain_range(const size_t) const; - uhd::gain_range_t get_rx_gain_range(const std::string&, const size_t) const; - uhd::meta_range_t get_tx_bandwidth_range(size_t chan) const; - uhd::meta_range_t get_rx_bandwidth_range(size_t chan) const; + std::vector<std::string> get_tx_antennas(const size_t chan) const override; + std::vector<std::string> get_rx_antennas(const size_t chan) const override; + uhd::freq_range_t get_tx_frequency_range(const size_t chan) const override; + uhd::freq_range_t get_rx_frequency_range(const size_t chan) const override; + std::vector<std::string> get_tx_gain_names(const size_t) const override; + std::vector<std::string> get_rx_gain_names(const size_t) const override; + double get_tx_gain(const std::string&, size_t) override; + double get_rx_gain(const std::string&, size_t) override; + uhd::gain_range_t get_tx_gain_range(const size_t) const override; + uhd::gain_range_t get_tx_gain_range(const std::string&, const size_t) const override; + uhd::gain_range_t get_rx_gain_range(const size_t) const override; + uhd::gain_range_t get_rx_gain_range(const std::string&, const size_t) const override; + uhd::meta_range_t get_tx_bandwidth_range(size_t chan) const override; + uhd::meta_range_t get_rx_bandwidth_range(size_t chan) 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& 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) const; - 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; + 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; /************************************************************************** * 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); - uhd::sensor_value_t get_rx_sensor(const std::string& name, size_t chan); + 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); - uhd::sensor_value_t get_tx_sensor(const std::string& name, size_t chan); + 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; private: /************************************************************************** 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 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; |