diff options
| author | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-14 10:35:25 -0800 | 
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-16 11:40:23 -0800 | 
| commit | 967be2a4e82b1a125b26bb72a60318a4fb2b50c4 (patch) | |
| tree | 8a24954b54d1546dc8049a17e485adb0a605f74f /host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp | |
| parent | aafe4e8b742a0e21d3818f21f34e3c8613132530 (diff) | |
| download | uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.gz uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.bz2 uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.zip  | |
uhd: mpm: apply clang-format to all files
Applying formatting changes to all .cpp and .hpp files in the following
directories:
```
find host/examples/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find host/tests/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find host/lib/usrp/dboard/neon/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find host/lib/usrp/dboard/magnesium/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find host/lib/usrp/device3/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find host/lib/usrp/mpmd/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find host/lib/usrp/x300/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find host/utils/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
find mpm/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
```
Also formatted host/include/, except Cpp03 was used as a the language
standard instead of Cpp11.
```
sed -i 's/ Cpp11/ Cpp03/g' .clang-format
find host/include/ -iname *.hpp -o -iname *.cpp | \
    xargs clang-format -i -style=file
```
Formatting style was designated by the .clang-format file.
Diffstat (limited to 'host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp')
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp | 125 | 
1 files changed, 54 insertions, 71 deletions
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp index 05b6dbe8f..67b20f5fa 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp @@ -15,47 +15,45 @@ using namespace uhd::rfnoc;  using namespace magnesium;  namespace { -    typedef magnesium_radio_ctrl_impl::rx_band rx_band; -    typedef magnesium_radio_ctrl_impl::tx_band tx_band; +typedef magnesium_radio_ctrl_impl::rx_band rx_band; +typedef magnesium_radio_ctrl_impl::tx_band tx_band; -    const size_t TX_LOWBAND = 0; -    const size_t TX_HIGHBAND = 1; -    const size_t RX_LOWBAND = 0; -    const size_t RX_MIDBAND = 1; -    const size_t RX_HIGHBAND = 2; +const size_t TX_LOWBAND  = 0; +const size_t TX_HIGHBAND = 1; +const size_t RX_LOWBAND  = 0; +const size_t RX_MIDBAND  = 1; +const size_t RX_HIGHBAND = 2; -    size_t map_tx_band(const tx_band band) -    { -        if (band == tx_band::LOWBAND) { -            return TX_LOWBAND; -        } -        return TX_HIGHBAND; +size_t map_tx_band(const tx_band band) +{ +    if (band == tx_band::LOWBAND) { +        return TX_LOWBAND;      } +    return TX_HIGHBAND; +} -    size_t map_rx_band(const rx_band band) -    { -        if (band == rx_band::LOWBAND) { -            return RX_LOWBAND; -        } -        if (band == rx_band::BAND0 or -                band == rx_band::BAND1 or -                band == rx_band::BAND2 or -                band == rx_band::BAND3) { -            return RX_MIDBAND; -        } -        return RX_HIGHBAND; +size_t map_rx_band(const rx_band band) +{ +    if (band == rx_band::LOWBAND) { +        return RX_LOWBAND; +    } +    if (band == rx_band::BAND0 or band == rx_band::BAND1 or band == rx_band::BAND2 +        or band == rx_band::BAND3) { +        return RX_MIDBAND;      } +    return RX_HIGHBAND; +} -    //! Maps gain index -> gain_tuple_t -    // -    // Note: This is an int, for easier lookups. We're basically hardcoding the -    // knowledge that the gain map has a 1 dB granularity. -    using gain_tuple_map_t = std::map<int, gain_tuple_t>; +//! Maps gain index -> gain_tuple_t +// +// Note: This is an int, for easier lookups. We're basically hardcoding the +// knowledge that the gain map has a 1 dB granularity. +using gain_tuple_map_t = std::map<int, gain_tuple_t>; -    //! Maps band -> gain_tuple_map_t -    using gain_tables_t = std::map<size_t, gain_tuple_map_t>; +//! Maps band -> gain_tuple_map_t +using gain_tables_t = std::map<size_t, gain_tuple_map_t>; -    // clang-format off +// clang-format off      /*! RX gain tables       */      const gain_tables_t rx_gain_tables = { @@ -437,53 +435,38 @@ namespace {                  {65, {0, 0, false}}          }}      }; /* tx_gain_tables */ -    // clang-format on +// clang-format on -    gain_tuple_t fine_tune_ad9371_att( -            const gain_tuple_t gain_tuple, -            const double gain_index -    ) { -        // Here, we hardcode the half-dB steps. We soak up all half-dB -        // steps by twiddling the AD9371 attenuation, but we need to make -        // sure we don't make it negative. -        if (gain_index - int(gain_index) >= .5) { -            gain_tuple_t gt2 = gain_tuple; -            gt2.ad9371_att = std::max(0.0, gain_tuple.ad9371_att - .5); -            return gt2; -        } -        return gain_tuple; +gain_tuple_t fine_tune_ad9371_att(const gain_tuple_t gain_tuple, const double gain_index) +{ +    // Here, we hardcode the half-dB steps. We soak up all half-dB +    // steps by twiddling the AD9371 attenuation, but we need to make +    // sure we don't make it negative. +    if (gain_index - int(gain_index) >= .5) { +        gain_tuple_t gt2 = gain_tuple; +        gt2.ad9371_att   = std::max(0.0, gain_tuple.ad9371_att - .5); +        return gt2;      } +    return gain_tuple; +} -} /* namespace ANON */ +} // namespace  gain_tuple_t magnesium::get_rx_gain_tuple( -    const double gain_index, -    const magnesium_radio_ctrl_impl::rx_band band -) { -    UHD_ASSERT_THROW( -        gain_index <= ALL_RX_MAX_GAIN and gain_index >= ALL_RX_MIN_GAIN -    ); -    auto &gain_table = rx_gain_tables.at(map_rx_band(band)); +    const double gain_index, const magnesium_radio_ctrl_impl::rx_band band) +{ +    UHD_ASSERT_THROW(gain_index <= ALL_RX_MAX_GAIN and gain_index >= ALL_RX_MIN_GAIN); +    auto& gain_table            = rx_gain_tables.at(map_rx_band(band));      const int gain_index_truncd = int(gain_index); -    return fine_tune_ad9371_att( -        gain_table.at(gain_index_truncd), -        gain_index -    ); +    return fine_tune_ad9371_att(gain_table.at(gain_index_truncd), gain_index);  }  gain_tuple_t magnesium::get_tx_gain_tuple( -    const double gain_index, -    const magnesium_radio_ctrl_impl::tx_band band -) { -    UHD_ASSERT_THROW( -        gain_index <= ALL_TX_MAX_GAIN and gain_index >= ALL_TX_MIN_GAIN -    ); -    auto &gain_table = tx_gain_tables.at(map_tx_band(band)); +    const double gain_index, const magnesium_radio_ctrl_impl::tx_band band) +{ +    UHD_ASSERT_THROW(gain_index <= ALL_TX_MAX_GAIN and gain_index >= ALL_TX_MIN_GAIN); +    auto& gain_table            = tx_gain_tables.at(map_tx_band(band));      const int gain_index_truncd = int(gain_index); -    return fine_tune_ad9371_att( -        gain_table.at(gain_index_truncd), -        gain_index -    ); +    return fine_tune_ad9371_att(gain_table.at(gain_index_truncd), gain_index);  } -  | 
