diff options
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/common/ad9361_driver/ad9361_device.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/common/lmx2592.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_tvrx2.cpp | 5 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_ubx.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp | 2 |
6 files changed, 16 insertions, 1 deletions
diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp index 812de28dc..16bcadd2d 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp @@ -942,10 +942,12 @@ void ad9361_device_t::_calibrate_tx_quadrature() * Note that this table is fixed for all frequency settings. */ void ad9361_device_t::_program_mixer_gm_subtable() { + // clang-format off uint8_t gain[] = { 0x78, 0x74, 0x70, 0x6C, 0x68, 0x64, 0x60, 0x5C, 0x58, 0x54, 0x50, 0x4C, 0x48, 0x30, 0x18, 0x00 }; uint8_t gm[] = { 0x00, 0x0D, 0x15, 0x1B, 0x21, 0x25, 0x29, 0x2C, 0x2F, 0x31, 0x33, 0x34, 0x35, 0x3A, 0x3D, 0x3E }; + // clang-format on /* Start the clock. */ _io_iface->poke8(0x13f, 0x02); @@ -2615,6 +2617,7 @@ filter_info_base::sptr ad9361_device_t::_get_filter_lp_bb(direction_t direction) * For TX direction the INT3 is returned. */ filter_info_base::sptr ad9361_device_t::_get_filter_dec_int_3(direction_t direction) { + // clang-format off uint8_t enable = 0; double rate = _adcclock_freq; double full_scale; @@ -2625,6 +2628,7 @@ filter_info_base::sptr ad9361_device_t::_get_filter_dec_int_3(direction_t direct int16_t taps_array_rx[] = {55, 83, 0, -393, -580, 0, 1914, 4041, 5120, 4041, 1914, 0, -580, -393, 0, 83, 55}; int16_t taps_array_tx[] = {36, -19, 0, -156, -12, 0, 479, 233, 0, -1215, -993, 0, 3569, 6277, 8192, 6277, 3569, 0, -993, -1215, 0, 223, 479, 0, -12, -156, 0, -19, 36}; std::vector<int16_t> taps; + // clang-format on filter_info_base::sptr ret; diff --git a/host/lib/usrp/common/lmx2592.cpp b/host/lib/usrp/common/lmx2592.cpp index 31509232e..f9b2554b5 100644 --- a/host/lib/usrp/common/lmx2592.cpp +++ b/host/lib/usrp/common/lmx2592.cpp @@ -13,6 +13,7 @@ using namespace uhd; namespace { +// clang-format off constexpr double LMX2592_DOUBLER_MAX_REF_FREQ = 60e6; constexpr double LMX2592_MAX_FREQ_PFD = 125e6; @@ -71,6 +72,7 @@ constexpr std::array<std::array<int, NUM_CHDIV_STAGES>, NUM_DIVIDERS> LMX2592_CH constexpr int SPI_ADDR_SHIFT = 16; constexpr int SPI_ADDR_MASK = 0x7f; constexpr int SPI_READ_FLAG = 1 << 23; +// clang-format on enum intermediate_frequency_t { FVCO, diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp index 5f43c75e6..5dba83551 100644 --- a/host/lib/usrp/dboard/db_tvrx2.cpp +++ b/host/lib/usrp/dboard/db_tvrx2.cpp @@ -5,6 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // +// clang-format off // Common IO Pins #define REFCLOCK_DIV_MASK ((1 << 8)|(1 << 9)|(1 << 10)) // Three GPIO lines to CPLD for Clock Divisor Selection #define REFCLOCK_DIV8 ((1 << 8)|(1 << 9)|(1 << 10)) // GPIO to set clock div8 mode @@ -37,6 +38,7 @@ #define OUTPUT_MASK (RX1_OUTPUT_MASK|RX2_OUTPUT_MASK|REFCLOCK_DIV_MASK) #define INPUT_MASK (RX1_INPUT_MASK|RX2_INPUT_MASK) +// clang-format on #include "tda18272hnm_regs.hpp" @@ -100,7 +102,7 @@ struct tvrx2_tda18272_freq_map_t { /*********************************************************************** * The TVRX2 constants **********************************************************************/ - +// clang-format off static const boost::array<freq_range_t, 4> tvrx2_tda18272_rf_bands = list_of ( freq_range_t( 44.056e6, 144.408e6) ) ( freq_range_t( 145.432e6, 361.496e6) ) @@ -735,6 +737,7 @@ static const uhd::dict<std::string, gain_range_t> tvrx2_gain_ranges = map_list_o // ("LPF", gain_range_t(0, 9, 3)) ("IF", gain_range_t(0, 30, 0.5)) ; +// clang-format on /*********************************************************************** * The TVRX2 dboard class diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp index 6f2670ec4..2ab5abaad 100644 --- a/host/lib/usrp/dboard/db_ubx.cpp +++ b/host/lib/usrp/dboard/db_ubx.cpp @@ -162,6 +162,7 @@ static const std::vector<std::string> ubx_rx_antennas{"TX/RX", "RX2", "CAL"}; static const std::vector<std::string> ubx_power_modes{"performance", "powersave"}; static const std::vector<std::string> ubx_xcvr_modes{"FDX", "TX", "TX/RX", "RX"}; +// clang-format off static const ubx_gpio_field_info_t ubx_proto_gpio_info[] = { //Field Unit Offset Mask Width Direction ATR IDLE,TX,RX,FDX {SPI_ADDR, dboard_iface::UNIT_TX, 0, 0x7, 3, ubx_gpio_field_info_t::INPUT, false, 0, 0, 0, 0}, @@ -191,6 +192,7 @@ static const ubx_gpio_field_info_t ubx_v1_gpio_info[] = { {RXLO2_SYNC, dboard_iface::UNIT_RX, 7, 0x1<<7, 1, ubx_gpio_field_info_t::INPUT, true, 0, 0, 0, 0}, {RX_GAIN, dboard_iface::UNIT_RX, 10, 0x3F<<10, 10, ubx_gpio_field_info_t::INPUT, false, 0, 0, 0, 0} }; +// clang-format on /*********************************************************************** * Macros for routing and writing SPI registers diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp index c46849e80..05b6dbe8f 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp @@ -55,6 +55,7 @@ namespace { //! Maps band -> gain_tuple_map_t using gain_tables_t = std::map<size_t, gain_tuple_map_t>; + // clang-format off /*! RX gain tables */ const gain_tables_t rx_gain_tables = { @@ -436,6 +437,7 @@ namespace { {65, {0, 0, false}} }} }; /* tx_gain_tables */ + // clang-format on gain_tuple_t fine_tune_ad9371_att( const gain_tuple_t gain_tuple, diff --git a/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp b/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp index 323869c0f..cc9336f2a 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp @@ -10,6 +10,7 @@ using namespace uhd::usrp::dboard::twinrx; +// clang-format off static const std::vector<twinrx_gain_config_t> HIGHBAND1_TABLE{ // Index, Gain, Atten1, Atten2, Amp1, Amp2 twinrx_gain_config_t( 0, -28.3, 31, 31, false, false ), @@ -793,6 +794,7 @@ static const std::vector<twinrx_gain_config_t> LOWBAND4_TABLE{ twinrx_gain_config_t( 92, 56.6, 0, 1, true, true ), twinrx_gain_config_t( 93, 57.6, 0, 0, true, true ), }; +// clang-format on const twinrx_gain_table twinrx_gain_table::lookup_table ( |