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 /mpm/tests | |
| 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 'mpm/tests')
| -rw-r--r-- | mpm/tests/tests_device.hpp | 23 | ||||
| -rw-r--r-- | mpm/tests/tests_spi_iface.cpp | 98 | 
2 files changed, 58 insertions, 63 deletions
| diff --git a/mpm/tests/tests_device.hpp b/mpm/tests/tests_device.hpp index 390575178..75cc05b95 100644 --- a/mpm/tests/tests_device.hpp +++ b/mpm/tests/tests_device.hpp @@ -4,20 +4,19 @@  // SPDX-License-Identifier: GPL-3.0-or-later  // -#include <mpm/tests/tests_spi_iface.hpp>  #include <mpm/spi_iface.hpp> +#include <mpm/tests/tests_spi_iface.hpp>  #include <memory>  namespace mpm { namespace tests { -    class tests_dboard_periph_manager -    { -    public: -        typedef std::shared_ptr<tests_dboard_periph_manager> sptr; -        static sptr make(); +class tests_dboard_periph_manager +{ +public: +    typedef std::shared_ptr<tests_dboard_periph_manager> sptr; +    static sptr make(); -    private: -        mpm::spi_iface::sptr _dev1_spi; -        mpm::spi_iface::sptr _dev2_spi; -    }; -} -} +private: +    mpm::spi_iface::sptr _dev1_spi; +    mpm::spi_iface::sptr _dev2_spi; +}; +}} // namespace mpm::tests diff --git a/mpm/tests/tests_spi_iface.cpp b/mpm/tests/tests_spi_iface.cpp index 063002fa9..40636a8fa 100644 --- a/mpm/tests/tests_spi_iface.cpp +++ b/mpm/tests/tests_spi_iface.cpp @@ -6,63 +6,59 @@  #include <mpm/tests/tests_spi_iface.hpp> -       /************************************************************************** -         * spi_iface API calls -         *************************************************************************/ -namespace mpm{ +/************************************************************************** + * spi_iface API calls + *************************************************************************/ +namespace mpm { -    void tests_spi_iface::write_byte( -            const uint16_t addr, -            const uint8_t data -            ) { -            _regs[addr] = data; -        } +void tests_spi_iface::write_byte(const uint16_t addr, const uint8_t data) +{ +    _regs[addr] = data; +} -    void tests_spi_iface::write_bytes( -            const uint16_t *addr, -            const uint8_t *data, -            const uint32_t count -            ) { -            for (size_t i = 0; i < count; i++) { -                _regs[addr[i]] = data[i]; -            } -        } +void tests_spi_iface::write_bytes( +    const uint16_t* addr, const uint8_t* data, const uint32_t count) +{ +    for (size_t i = 0; i < count; i++) { +        _regs[addr[i]] = data[i]; +    } +} -    uint8_t tests_spi_iface::read_byte(const uint16_t addr) -        { -            if (_regs.count(addr)) { -                return _regs.at(addr); -            } -            return _default_val; -        } +uint8_t tests_spi_iface::read_byte(const uint16_t addr) +{ +    if (_regs.count(addr)) { +        return _regs.at(addr); +    } +    return _default_val; +} -    void tests_spi_iface::write_field( -            const uint16_t addr, -            const uint8_t field_val, -            const uint8_t mask, -            const uint8_t start_bit -            ) { -            const uint8_t old_value = read_byte(addr); -            _regs[addr] = (old_value & ~mask) | ((field_val << start_bit) & mask); -        } +void tests_spi_iface::write_field(const uint16_t addr, +    const uint8_t field_val, +    const uint8_t mask, +    const uint8_t start_bit) +{ +    const uint8_t old_value = read_byte(addr); +    _regs[addr]             = (old_value & ~mask) | ((field_val << start_bit) & mask); +} -    uint8_t tests_spi_iface::read_field( -            const uint16_t addr, -            const uint8_t mask, -            const uint8_t start_bit -            ) { -            return (read_byte(addr) & mask) >> start_bit; -        } +uint8_t tests_spi_iface::read_field( +    const uint16_t addr, const uint8_t mask, const uint8_t start_bit) +{ +    return (read_byte(addr) & mask) >> start_bit; +} -    spi_iface::spi_wire_mode_t tests_spi_iface::get_wire_mode() const{ -        return spi_iface::spi_wire_mode_t::THREE_WIRE_MODE; -    } +spi_iface::spi_wire_mode_t tests_spi_iface::get_wire_mode() const +{ +    return spi_iface::spi_wire_mode_t::THREE_WIRE_MODE; +} -    spi_iface::spi_endianness_t tests_spi_iface::get_endianness() const{ -        return spi_iface::spi_endianness_t::LSB_FIRST; -    } -    size_t tests_spi_iface::get_chip_select() const{ -        return 0; -    } +spi_iface::spi_endianness_t tests_spi_iface::get_endianness() const +{ +    return spi_iface::spi_endianness_t::LSB_FIRST; +} +size_t tests_spi_iface::get_chip_select() const +{ +    return 0;  } +} // namespace mpm | 
