diff options
author | Martin Braun <martin.braun@ettus.com> | 2019-07-03 20:15:35 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:16:25 -0800 |
commit | c256b9df6502536c2e451e690f1ad5962c664d1a (patch) | |
tree | a83ad13e6f5978bbe14bb3ecf8294ba1e3d28db4 /host/lib/usrp/dboard/rhodium/rhodium_bands.cpp | |
parent | 9a8435ed998fc5c65257f4c55768750b227ab19e (diff) | |
download | uhd-c256b9df6502536c2e451e690f1ad5962c664d1a.tar.gz uhd-c256b9df6502536c2e451e690f1ad5962c664d1a.tar.bz2 uhd-c256b9df6502536c2e451e690f1ad5962c664d1a.zip |
x300/mpmd: Port all RFNoC devices to the new RFNoC framework
Co-Authored-By: Alex Williams <alex.williams@ni.com>
Co-Authored-By: Sugandha Gupta <sugandha.gupta@ettus.com>
Co-Authored-By: Brent Stapleton <brent.stapleton@ettus.com>
Co-Authored-By: Ciro Nishiguchi <ciro.nishiguchi@ni.com>
Diffstat (limited to 'host/lib/usrp/dboard/rhodium/rhodium_bands.cpp')
-rw-r--r-- | host/lib/usrp/dboard/rhodium/rhodium_bands.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp index ffa206195..9e0a1d3d3 100644 --- a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp +++ b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp @@ -4,8 +4,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include "rhodium_radio_ctrl_impl.hpp" #include "rhodium_constants.hpp" +#include "rhodium_radio_control.hpp" #include <uhd/utils/math.hpp> using namespace uhd; @@ -30,7 +30,7 @@ namespace { * chosen to allow as much of the full bandwidth through unattenuated. * * Switch selection logic for these bands can be found in - * rhodium_radio_ctrl_impl::_update_rx_freq_switches() + * rhodium_radio_control_impl::_update_rx_freq_switches() */ constexpr double RHODIUM_RX_BAND0_MIN_FREQ = RHODIUM_MIN_FREQ; constexpr double RHODIUM_RX_BAND1_MIN_FREQ = 450e6; @@ -55,7 +55,7 @@ namespace { * bandwidth through unattenuated. * * Switch selection logic for these bands can be found in - * rhodium_radio_ctrl_impl::_update_tx_freq_switches() + * rhodium_radio_control_impl::_update_tx_freq_switches() */ constexpr double RHODIUM_TX_BAND0_MIN_FREQ = RHODIUM_MIN_FREQ; constexpr double RHODIUM_TX_BAND1_MIN_FREQ = 450e6; @@ -67,9 +67,9 @@ namespace { constexpr double RHODIUM_TX_BAND7_MIN_FREQ = 4100e6; } -rhodium_radio_ctrl_impl::rx_band -rhodium_radio_ctrl_impl::_map_freq_to_rx_band(const double freq) { - +rhodium_radio_control_impl::rx_band rhodium_radio_control_impl::_map_freq_to_rx_band( + const double freq) +{ auto freq_compare = fp_compare_epsilon<double>(freq, RHODIUM_FREQ_COMPARE_EPSILON); if (freq_compare < RHODIUM_RX_BAND0_MIN_FREQ) { @@ -95,9 +95,9 @@ rhodium_radio_ctrl_impl::_map_freq_to_rx_band(const double freq) { } } -rhodium_radio_ctrl_impl::tx_band -rhodium_radio_ctrl_impl::_map_freq_to_tx_band(const double freq) { - +rhodium_radio_control_impl::tx_band rhodium_radio_control_impl::_map_freq_to_tx_band( + const double freq) +{ auto freq_compare = fp_compare_epsilon<double>(freq, RHODIUM_FREQ_COMPARE_EPSILON); if (freq_compare < RHODIUM_TX_BAND0_MIN_FREQ) { @@ -123,12 +123,12 @@ rhodium_radio_ctrl_impl::_map_freq_to_tx_band(const double freq) { } } -bool rhodium_radio_ctrl_impl::_is_rx_lowband(const double freq) +bool rhodium_radio_control_impl::_is_rx_lowband(const double freq) { return _map_freq_to_rx_band(freq) == rx_band::RX_BAND_0; } -bool rhodium_radio_ctrl_impl::_is_tx_lowband(const double freq) +bool rhodium_radio_control_impl::_is_tx_lowband(const double freq) { return _map_freq_to_tx_band(freq) == tx_band::TX_BAND_0; } |