From 967be2a4e82b1a125b26bb72a60318a4fb2b50c4 Mon Sep 17 00:00:00 2001 From: Brent Stapleton Date: Mon, 14 Jan 2019 10:35:25 -0800 Subject: 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. --- mpm/lib/xbar_iface.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'mpm/lib/xbar_iface.cpp') diff --git a/mpm/lib/xbar_iface.cpp b/mpm/lib/xbar_iface.cpp index cff5ed2e7..05d1e2053 100644 --- a/mpm/lib/xbar_iface.cpp +++ b/mpm/lib/xbar_iface.cpp @@ -5,41 +5,48 @@ // #include "mpm/xbar_iface.hpp" +#include #include -#include #include -#include +#include using namespace mpm; std::mutex xbar_iface::_lock; // Initialize lock for all objects -xbar_iface::xbar_iface(const std::string &device){ +xbar_iface::xbar_iface(const std::string& device) +{ _fd = open(device.c_str(), O_RDWR); } -xbar_iface::~xbar_iface(){ +xbar_iface::~xbar_iface() +{ close(_fd); } -void xbar_iface::set_route(uint8_t dst_addr, uint8_t dst_port) { +void xbar_iface::set_route(uint8_t dst_addr, uint8_t dst_port) +{ std::lock_guard lock(_lock); rfnoc_crossbar_cmd cmd = {.dest_addr = dst_addr, .dest_port = dst_port}; - int err = ioctl(_fd, RFNCBWROUTIOC, &cmd); + int err = ioctl(_fd, RFNCBWROUTIOC, &cmd); if (err < 0) { - throw mpm::os_error(str(boost::format("setting crossbar route failed! Error: %d") % err)); + throw mpm::os_error( + str(boost::format("setting crossbar route failed! Error: %d") % err)); } } -void xbar_iface::del_route(uint8_t dst_addr, uint8_t dst_port){ +void xbar_iface::del_route(uint8_t dst_addr, uint8_t dst_port) +{ std::lock_guard lock(_lock); rfnoc_crossbar_cmd cmd = {.dest_addr = dst_addr, .dest_port = dst_port}; - int err = ioctl(_fd, RFNCDELROUTIOC, &cmd); - if (err < 0){ - throw mpm::os_error(str(boost::format("deleting crossbar route failed! Error: %d") % err)); + int err = ioctl(_fd, RFNCDELROUTIOC, &cmd); + if (err < 0) { + throw mpm::os_error( + str(boost::format("deleting crossbar route failed! Error: %d") % err)); } } -xbar_iface::sptr xbar_iface::make(const std::string &device){ +xbar_iface::sptr xbar_iface::make(const std::string& device) +{ return std::make_shared(device); } -- cgit v1.2.3