aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-01-08 13:12:34 +0100
committerAaron Rossetto <aaron.rossetto@ni.com>2021-03-17 15:49:26 -0500
commitb36fa03407f43dfc8e93a719186264b8d3e6db52 (patch)
tree9957b776d6e3b199597ab597cde68e5111d37b88 /host/lib
parent668a04befdc4ec43b2a6e86992c672ef5f8408e0 (diff)
downloaduhd-b36fa03407f43dfc8e93a719186264b8d3e6db52.tar.gz
uhd-b36fa03407f43dfc8e93a719186264b8d3e6db52.tar.bz2
uhd-b36fa03407f43dfc8e93a719186264b8d3e6db52.zip
uhd: Fix radio_control-related method constness
The const-ness of some radio_control differed between base class and implementation. This fixes the consistency, but also makes sure these methods follow the rules for when to make methods 'const'. The following rules apply: - Methods that query static capabilities are const. Here, we made get_tx_lo_sources() const (the RX version was already const). - Getters that may have to interact with the device (e.g., peek a register) are not const, because the act of peeking is usually also non-const. Here, we changed get_rx_lo_export_enabled() to non-const. - All base classes are fixed such that the derived classes and the base classes have the same const-ness. Clang was warning about differences. This can cause very tricky bugs, where the radio_control_impl version can get called instead of the intended child class.
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/include/uhdlib/rfnoc/radio_control_impl.hpp5
-rw-r--r--host/lib/rfnoc/radio_control_impl.cpp4
-rw-r--r--host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp6
-rw-r--r--host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp9
-rw-r--r--host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp4
-rw-r--r--host/lib/usrp/x300/x300_radio_control.cpp3
6 files changed, 15 insertions, 16 deletions
diff --git a/host/lib/include/uhdlib/rfnoc/radio_control_impl.hpp b/host/lib/include/uhdlib/rfnoc/radio_control_impl.hpp
index ba11e50bf..7d9ce6ec2 100644
--- a/host/lib/include/uhdlib/rfnoc/radio_control_impl.hpp
+++ b/host/lib/include/uhdlib/rfnoc/radio_control_impl.hpp
@@ -131,14 +131,13 @@ public:
const std::string& name, const size_t chan) override;
void set_rx_lo_export_enabled(
bool enabled, const std::string& name, const size_t chan) override;
- bool get_rx_lo_export_enabled(
- const std::string& name, const size_t chan) const override;
+ bool get_rx_lo_export_enabled(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) override;
+ const std::string& name, const size_t chan) const override;
freq_range_t get_tx_lo_freq_range(
const std::string& name, const size_t chan) override;
void set_tx_lo_source(
diff --git a/host/lib/rfnoc/radio_control_impl.cpp b/host/lib/rfnoc/radio_control_impl.cpp
index 00cdd12ae..709bbd87d 100644
--- a/host/lib/rfnoc/radio_control_impl.cpp
+++ b/host/lib/rfnoc/radio_control_impl.cpp
@@ -689,7 +689,7 @@ void radio_control_impl::set_rx_lo_export_enabled(bool, const std::string&, cons
"set_rx_lo_export_enabled is not supported on this radio");
}
-bool radio_control_impl::get_rx_lo_export_enabled(const std::string&, const size_t) const
+bool radio_control_impl::get_rx_lo_export_enabled(const std::string&, const size_t)
{
return false;
}
@@ -709,7 +709,7 @@ std::vector<std::string> radio_control_impl::get_tx_lo_names(const size_t) const
}
std::vector<std::string> radio_control_impl::get_tx_lo_sources(
- const std::string&, const size_t)
+ const std::string&, const size_t) const
{
return {"internal"};
}
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
index 3881c9285..b84fcee6d 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
@@ -767,7 +767,7 @@ void magnesium_radio_control_impl::set_rx_lo_source(
const std::string magnesium_radio_control_impl::get_rx_lo_source(
const std::string& name, const size_t /*chan*/
-) const
+)
{
if (name == MAGNESIUM_LO1) {
// TODO: should we use this from cache?
@@ -1073,7 +1073,7 @@ eeprom_map_t magnesium_radio_control_impl::get_db_eeprom()
/**************************************************************************
* Sensor API
*************************************************************************/
-std::vector<std::string> magnesium_radio_control_impl::get_rx_sensor_names(size_t)
+std::vector<std::string> magnesium_radio_control_impl::get_rx_sensor_names(size_t) const
{
auto sensor_names = _rpcc->request_with_token<std::vector<std::string>>(
this->_rpc_prefix + "get_sensors", "RX");
@@ -1092,7 +1092,7 @@ sensor_value_t magnesium_radio_control_impl::get_rx_sensor(
_rpc_prefix + "get_sensor", "RX", name, chan));
}
-std::vector<std::string> magnesium_radio_control_impl::get_tx_sensor_names(size_t)
+std::vector<std::string> magnesium_radio_control_impl::get_tx_sensor_names(size_t) const
{
auto sensor_names = _rpcc->request_with_token<std::vector<std::string>>(
this->_rpc_prefix + "get_sensors", "TX");
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp
index 897e00868..f80f75f00 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.hpp
@@ -116,13 +116,14 @@ public:
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) override;
- const std::string get_rx_lo_source(const std::string& name, const size_t chan) const;
+ 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;
+ const std::string& name, const size_t chan) const override;
freq_range_t get_tx_lo_freq_range(
const std::string& name, const size_t chan) override;
void set_tx_lo_source(
@@ -150,9 +151,9 @@ public:
/**************************************************************************
* Sensor API
*************************************************************************/
- std::vector<std::string> get_rx_sensor_names(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);
+ 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;
/**************************************************************************
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp
index 4d5ce2cbd..696f81c85 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp
@@ -107,7 +107,7 @@ public:
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;
+ const std::string& name, const size_t chan) const override;
freq_range_t get_tx_lo_freq_range(
const std::string& name, const size_t chan) override;
void set_tx_lo_source(
@@ -123,7 +123,7 @@ public:
void set_rx_lo_export_enabled(
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);
+ bool get_rx_lo_export_enabled(const std::string& name, const size_t chan) override;
/**************************************************************************
* GPIO Controls
diff --git a/host/lib/usrp/x300/x300_radio_control.cpp b/host/lib/usrp/x300/x300_radio_control.cpp
index 3ab60e661..c6750e397 100644
--- a/host/lib/usrp/x300/x300_radio_control.cpp
+++ b/host/lib/usrp/x300/x300_radio_control.cpp
@@ -696,8 +696,7 @@ public:
}
}
- bool get_rx_lo_export_enabled(
- const std::string& name, const size_t chan) const override
+ bool get_rx_lo_export_enabled(const std::string& name, const size_t chan) override
{
fs_path rx_fe_fe_root = get_db_path("rx", chan);