From 8bd7498ed9fea9c46fa34705986968416d818029 Mon Sep 17 00:00:00 2001 From: Brent Stapleton Date: Thu, 10 Jan 2019 17:13:17 -0800 Subject: uhd: skip formatting misc arrays, maps, etc. Various data structures are nicely formatted to be human-readable. clang-format makes these structures harder to read, so we can skip formatting these sections. --- host/lib/usrp/common/ad9361_driver/ad9361_device.cpp | 4 ++++ host/lib/usrp/common/lmx2592.cpp | 2 ++ 2 files changed, 6 insertions(+) (limited to 'host/lib/usrp/common') 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 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, 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, -- cgit v1.2.3