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/lib/i2c/i2c_regs_iface.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 'mpm/lib/i2c/i2c_regs_iface.cpp')
-rw-r--r-- | mpm/lib/i2c/i2c_regs_iface.cpp | 75 |
1 files changed, 28 insertions, 47 deletions
diff --git a/mpm/lib/i2c/i2c_regs_iface.cpp b/mpm/lib/i2c/i2c_regs_iface.cpp index c476cf636..575e19d26 100644 --- a/mpm/lib/i2c/i2c_regs_iface.cpp +++ b/mpm/lib/i2c/i2c_regs_iface.cpp @@ -4,10 +4,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include <mpm/types/regs_iface.hpp> +#include <mpm/exception.hpp> #include <mpm/i2c/i2c_iface.hpp> #include <mpm/i2c/i2c_regs_iface.hpp> -#include <mpm/exception.hpp> +#include <mpm/types/regs_iface.hpp> using mpm::types::regs_iface; @@ -18,26 +18,21 @@ using mpm::types::regs_iface; class i2c_regs_iface_impl : public regs_iface { public: - - i2c_regs_iface_impl( - mpm::i2c::i2c_iface::sptr i2c_iface, - const size_t reg_addr_size - ) : _i2c_iface(i2c_iface), - _reg_addr_size(reg_addr_size) + i2c_regs_iface_impl(mpm::i2c::i2c_iface::sptr i2c_iface, const size_t reg_addr_size) + : _i2c_iface(i2c_iface), _reg_addr_size(reg_addr_size) { if (reg_addr_size > 4) { throw mpm::runtime_error("reg_addr_size too largs for i2c_regs_iface"); } } - uint8_t peek8( - const uint32_t addr - ) { + uint8_t peek8(const uint32_t addr) + { uint8_t rx[1]; uint8_t tx[5]; int i = 0; for (; i < _reg_addr_size; i++) { - tx[i] = 0xff & (addr >> 8*(_reg_addr_size-i-1)); + tx[i] = 0xff & (addr >> 8 * (_reg_addr_size - i - 1)); } int err = _i2c_iface->transfer(tx, _reg_addr_size, rx, 1); @@ -48,14 +43,12 @@ public: return rx[0]; } - void poke8( - const uint32_t addr, - const uint8_t data - ) { + void poke8(const uint32_t addr, const uint8_t data) + { uint8_t tx[5]; int i = 0; for (; i < _reg_addr_size; i++) { - tx[i] = 0xff & (addr >> 8*(_reg_addr_size-i-1)); + tx[i] = 0xff & (addr >> 8 * (_reg_addr_size - i - 1)); } tx[i] = data; @@ -65,14 +58,13 @@ public: } } - uint16_t peek16( - const uint32_t addr - ) { + uint16_t peek16(const uint32_t addr) + { uint8_t rx[2]; uint8_t tx[5]; int i = 0; for (; i < _reg_addr_size; i++) { - tx[i] = 0xff & (addr >> 8*(_reg_addr_size-i-1)); + tx[i] = 0xff & (addr >> 8 * (_reg_addr_size - i - 1)); } int err = _i2c_iface->transfer(tx, _reg_addr_size, rx, 2); @@ -81,21 +73,19 @@ public: } uint16_t data = rx[0]; - data = (data << 8) | rx[1]; + data = (data << 8) | rx[1]; return data; } - void poke16( - const uint32_t addr, - const uint16_t data - ) { + void poke16(const uint32_t addr, const uint16_t data) + { uint8_t tx[6]; int i = 0; for (; i < _reg_addr_size; i++) { - tx[i] = 0xff & (addr >> 8*(_reg_addr_size-i-1)); + tx[i] = 0xff & (addr >> 8 * (_reg_addr_size - i - 1)); } - tx[i] = (data >> 8) & 0xff; - tx[i+1] = data & 0xff; + tx[i] = (data >> 8) & 0xff; + tx[i + 1] = data & 0xff; int err = _i2c_iface->transfer(tx, _reg_addr_size + 2, NULL, 0); if (err) { @@ -110,27 +100,18 @@ private: }; regs_iface::sptr mpm::i2c::make_i2c_regs_iface( - mpm::i2c::i2c_iface::sptr i2c_iface, - const size_t reg_addr_size -) { - return std::make_shared<i2c_regs_iface_impl>( - i2c_iface, - reg_addr_size - ); + mpm::i2c::i2c_iface::sptr i2c_iface, const size_t reg_addr_size) +{ + return std::make_shared<i2c_regs_iface_impl>(i2c_iface, reg_addr_size); } -mpm::types::regs_iface::sptr mpm::i2c::make_i2cdev_regs_iface( - const std::string &bus, +mpm::types::regs_iface::sptr mpm::i2c::make_i2cdev_regs_iface(const std::string& bus, const uint16_t addr, const bool ten_bit_addr, const int timeout_ms, - const size_t reg_addr_size -) { - auto i2c_iface_sptr = mpm::i2c::i2c_iface::make_i2cdev( - bus, addr, ten_bit_addr, timeout_ms - ); - return std::make_shared<i2c_regs_iface_impl>( - i2c_iface_sptr, - reg_addr_size - ); + const size_t reg_addr_size) +{ + auto i2c_iface_sptr = + mpm::i2c::i2c_iface::make_i2cdev(bus, addr, ten_bit_addr, timeout_ms); + return std::make_shared<i2c_regs_iface_impl>(i2c_iface_sptr, reg_addr_size); } |