diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-01-04 07:21:00 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-01-08 15:03:48 -0800 |
| commit | ab83e9259b6fc45ae8258bd0b4252e3b6d7260c5 (patch) | |
| tree | 510b21acb15b3b62835f2cf8b492a9d0548c808f /host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | |
| parent | aeb18f50a0598395d3b0a6179414f6dbfcad2d44 (diff) | |
| download | uhd-ab83e9259b6fc45ae8258bd0b4252e3b6d7260c5.tar.gz uhd-ab83e9259b6fc45ae8258bd0b4252e3b6d7260c5.tar.bz2 uhd-ab83e9259b6fc45ae8258bd0b4252e3b6d7260c5.zip | |
mg: Use enums for all bands, move freq mapping to single location
This removes the need to re-implement the band checks (in particular,
the low band check) in multiple places, potentially causing confusion.
Signed-off-by: Trung Tran <trung.tran@ettus.com>
Reviewed-by: Trung Tran <trung.tran@ettus.com>
Diffstat (limited to 'host/lib/usrp/dboard/magnesium/magnesium_constants.hpp')
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp index ba072ad6e..72a708165 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp @@ -23,19 +23,7 @@ static const double MAGNESIUM_RADIO_RATE = 125e6; // Hz static const double MAGNESIUM_MIN_FREQ = 1e6; // Hz static const double MAGNESIUM_MAX_FREQ = 6e9; // Hz -static const double MAGNESIUM_LOWBAND_FREQ = 300e6; - -static const double MAGNESIUM_RX_BAND1_MIN_FREQ = MAGNESIUM_LOWBAND_FREQ; -static const double MAGNESIUM_RX_BAND2_MIN_FREQ = 600e6; -static const double MAGNESIUM_RX_BAND3_MIN_FREQ = 1050e6; -static const double MAGNESIUM_RX_BAND4_MIN_FREQ = 1600e6; -static const double MAGNESIUM_RX_BAND5_MIN_FREQ = 2100e6; -static const double MAGNESIUM_RX_BAND6_MIN_FREQ = 2700e6; - -static const double MAGNESIUM_TX_BAND1_MIN_FREQ = MAGNESIUM_LOWBAND_FREQ; -static const double MAGNESIUM_TX_BAND2_MIN_FREQ = 800e6; -static const double MAGNESIUM_TX_BAND3_MIN_FREQ = 1700e6; -static const double MAGNESIUM_TX_BAND4_MIN_FREQ = 3400e6; +static constexpr double MAGNESIUM_LOWBAND_FREQ = 300e6; static const double AD9371_MIN_RX_GAIN = 0.0; // dB static const double AD9371_MAX_RX_GAIN = 30.0; // dB |