aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard/magnesium
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-03-09 10:38:42 +0100
committerAaron Rossetto <aaron.rossetto@ni.com>2021-03-17 15:44:05 -0500
commit668a04befdc4ec43b2a6e86992c672ef5f8408e0 (patch)
tree67734ba32968831a5b4ea8dd59b7b2ab52e68d01 /host/lib/usrp/dboard/magnesium
parent19f3c1203a42d9da3d7cb16c881fe2bbdc5ec0ce (diff)
downloaduhd-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/dboard/magnesium')
-rw-r--r--host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp36
1 files changed, 20 insertions, 16 deletions
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
index 879885640..3881c9285 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
@@ -104,8 +104,10 @@ magnesium_radio_control_impl::magnesium_radio_control_impl(make_args_ptr make_ar
RFNOC_LOG_TRACE("Entering magnesium_radio_control_impl ctor...");
UHD_ASSERT_THROW(get_block_id().get_block_count() < 2);
- _tx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>(MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS);
- _rx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>(MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS);
+ _tx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>(
+ MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS);
+ _rx_gain_profile_api = std::make_shared<rf_control::enumerated_gain_profile>(
+ MAGNESIUM_GP_OPTIONS, "default", MAGNESIUM_NUM_CHANS);
const char radio_slot_name[2] = {'A', 'B'};
_radio_slot = radio_slot_name[get_block_id().get_block_count()];
@@ -256,16 +258,17 @@ double magnesium_radio_control_impl::set_tx_frequency(
double coerced_if_freq = 0;
if (_map_freq_to_tx_band(_tx_band_map, freq) == tx_band::LOWBAND) {
- _is_low_band[TX_DIRECTION] = true;
- coerced_if_freq =
- this->_set_tx_lo_freq(adf4351_source, MAGNESIUM_LO2, MAGNESIUM_TX_IF_FREQ, chan);
+ _is_low_band[TX_DIRECTION] = true;
+ coerced_if_freq = this->_set_tx_lo_freq(
+ adf4351_source, MAGNESIUM_LO2, MAGNESIUM_TX_IF_FREQ, chan);
RFNOC_LOG_TRACE("coerced_if_freq = " << coerced_if_freq);
} else {
_is_low_band[TX_DIRECTION] = false;
_lo_disable(_tx_lo);
}
// external LO required to tune at 2xdesired_frequency.
- const double lo1_freq = (ad9371_source == "internal" ? 1 : 2) * (coerced_if_freq + freq);
+ const double lo1_freq =
+ (ad9371_source == "internal" ? 1 : 2) * (coerced_if_freq + freq);
this->_set_tx_lo_freq(ad9371_source, MAGNESIUM_LO1, lo1_freq, chan);
this->_update_freq(chan, TX_DIRECTION);
@@ -324,16 +327,17 @@ double magnesium_radio_control_impl::set_rx_frequency(
double coerced_if_freq = 0;
if (_map_freq_to_rx_band(_rx_band_map, freq) == rx_band::LOWBAND) {
- _is_low_band[RX_DIRECTION] = true;
- coerced_if_freq =
- this->_set_rx_lo_freq(adf4351_source, MAGNESIUM_LO2, MAGNESIUM_RX_IF_FREQ, chan);
+ _is_low_band[RX_DIRECTION] = true;
+ coerced_if_freq = this->_set_rx_lo_freq(
+ adf4351_source, MAGNESIUM_LO2, MAGNESIUM_RX_IF_FREQ, chan);
RFNOC_LOG_TRACE("coerced_if_freq = " << coerced_if_freq);
} else {
_is_low_band[RX_DIRECTION] = false;
_lo_disable(_rx_lo);
}
// external LO required to tune at 2xdesired_frequency.
- const double lo1_freq = (ad9371_source == "internal" ? 1 : 2) * coerced_if_freq + freq;
+ const double lo1_freq =
+ (ad9371_source == "internal" ? 1 : 2) * coerced_if_freq + freq;
this->_set_rx_lo_freq(ad9371_source, MAGNESIUM_LO1, lo1_freq, chan);
@@ -714,14 +718,14 @@ meta_range_t magnesium_radio_control_impl::get_rx_bandwidth_range(size_t) const
*****************************************************************************/
std::vector<std::string> magnesium_radio_control_impl::get_rx_lo_names(
const size_t /*chan*/
- ) const
+) const
{
return std::vector<std::string>{MAGNESIUM_LO1, MAGNESIUM_LO2};
}
std::vector<std::string> magnesium_radio_control_impl::get_rx_lo_sources(
const std::string& name, const size_t /*chan*/
- ) const
+) const
{
if (name == MAGNESIUM_LO2) {
return std::vector<std::string>{"internal"};
@@ -734,7 +738,7 @@ std::vector<std::string> magnesium_radio_control_impl::get_rx_lo_sources(
freq_range_t magnesium_radio_control_impl::get_rx_lo_freq_range(
const std::string& name, const size_t /*chan*/
- ) const
+) const
{
if (name == MAGNESIUM_LO1) {
return freq_range_t{ADF4351_MIN_FREQ, ADF4351_MAX_FREQ};
@@ -763,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
+) const
{
if (name == MAGNESIUM_LO1) {
// TODO: should we use this from cache?
@@ -832,14 +836,14 @@ double magnesium_radio_control_impl::get_rx_lo_freq(
// TX LO
std::vector<std::string> magnesium_radio_control_impl::get_tx_lo_names(
const size_t /*chan*/
- ) const
+) const
{
return std::vector<std::string>{MAGNESIUM_LO1, MAGNESIUM_LO2};
}
std::vector<std::string> magnesium_radio_control_impl::get_tx_lo_sources(
const std::string& name, const size_t /*chan*/
- ) const
+) const
{
if (name == MAGNESIUM_LO2) {
return std::vector<std::string>{"internal"};