diff options
author | Martin Braun <martin.braun@ettus.com> | 2020-03-02 15:25:13 -0800 |
---|---|---|
committer | atrnati <54334261+atrnati@users.noreply.github.com> | 2020-03-03 08:51:32 -0600 |
commit | 876d4150aa3da531ddd687b48afada6e43f79146 (patch) | |
tree | fd72a71419f4cd800d4e500cfcaded4dfc8dc367 /host/lib/transport/nirio/nirio_resource_manager.cpp | |
parent | 1393553d623bdf4ba40d5435c9719b6ce990d9ac (diff) | |
download | uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.gz uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.bz2 uhd-876d4150aa3da531ddd687b48afada6e43f79146.zip |
uhd: Apply clang-format against all .cpp and .hpp files in host/
Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of
files that clang-format gets applied against.
Diffstat (limited to 'host/lib/transport/nirio/nirio_resource_manager.cpp')
-rw-r--r-- | host/lib/transport/nirio/nirio_resource_manager.cpp | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/host/lib/transport/nirio/nirio_resource_manager.cpp b/host/lib/transport/nirio/nirio_resource_manager.cpp index 42e85d7c1..4650e83a2 100644 --- a/host/lib/transport/nirio/nirio_resource_manager.cpp +++ b/host/lib/transport/nirio/nirio_resource_manager.cpp @@ -9,22 +9,19 @@ // "push" and "pop" introduced in GCC 4.6; works with all clang #if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC_MINOR__ > 5) - #pragma GCC diagnostic push +# pragma GCC diagnostic push #endif #if defined(__clang__) || defined(__GNUC__) - #pragma GCC diagnostic ignored "-Wmissing-field-initializers" +# pragma GCC diagnostic ignored "-Wmissing-field-initializers" #endif -namespace uhd { namespace niusrprio -{ +namespace uhd { namespace niusrprio { -nirio_resource_manager::nirio_resource_manager():_fifo_info_map(), _reg_info_map() -{ -} +nirio_resource_manager::nirio_resource_manager() : _fifo_info_map(), _reg_info_map() {} void nirio_resource_manager::set_proxy(niriok_proxy::sptr proxy) { - _kernel_proxy = proxy; + _kernel_proxy = proxy; } @@ -34,18 +31,22 @@ nirio_resource_manager::~nirio_resource_manager() } nirio_status nirio_resource_manager::initialize( - const nirio_register_info_vtr& reg_info_vtr, - const nirio_fifo_info_vtr& fifo_info_vtr) + const nirio_register_info_vtr& reg_info_vtr, const nirio_fifo_info_vtr& fifo_info_vtr) { nirio_status status = 0; - for (nirio_fifo_info_vtr::const_iterator it = fifo_info_vtr.begin(); it != fifo_info_vtr.end(); it++) { + for (nirio_fifo_info_vtr::const_iterator it = fifo_info_vtr.begin(); + it != fifo_info_vtr.end(); + it++) { const nirio_fifo_info_t& fifo_info = *it; - status = _add_fifo_resource(fifo_info); - if (nirio_status_fatal(status)) return status; + status = _add_fifo_resource(fifo_info); + if (nirio_status_fatal(status)) + return status; _fifo_info_map.insert(fifo_info_map_t::value_type(fifo_info.name, fifo_info)); } - for (nirio_register_info_vtr::const_iterator it = reg_info_vtr.begin(); it != reg_info_vtr.end(); it++) { + for (nirio_register_info_vtr::const_iterator it = reg_info_vtr.begin(); + it != reg_info_vtr.end(); + it++) { const nirio_register_info_t& reg_info = *it; _reg_info_map.insert(register_info_map_t::value_type(reg_info.name, reg_info)); @@ -59,11 +60,12 @@ void nirio_resource_manager::finalize() } nirio_status nirio_resource_manager::get_register_offset( - const char* register_name, - uint32_t& offset) + const char* register_name, uint32_t& offset) { - register_info_map_t::const_iterator it = _reg_info_map.find(fifo_info_map_t::key_type(register_name)); - if (it == _reg_info_map.end()) return NiRio_Status_InvalidParameter; + register_info_map_t::const_iterator it = + _reg_info_map.find(fifo_info_map_t::key_type(register_name)); + if (it == _reg_info_map.end()) + return NiRio_Status_InvalidParameter; offset = (*it).second.offset; @@ -82,15 +84,18 @@ nirio_status nirio_resource_manager::_set_driver_config() return _kernel_proxy->set_device_config(); } -nirio_fifo_info_t* nirio_resource_manager::_lookup_fifo_info(const char* fifo_name) { - fifo_info_map_t::iterator it = _fifo_info_map.find(fifo_info_map_t::key_type(fifo_name)); - if (it == _fifo_info_map.end()) return NULL; +nirio_fifo_info_t* nirio_resource_manager::_lookup_fifo_info(const char* fifo_name) +{ + fifo_info_map_t::iterator it = + _fifo_info_map.find(fifo_info_map_t::key_type(fifo_name)); + if (it == _fifo_info_map.end()) + return NULL; return &((*it).second); } -}} +}} // namespace uhd::niusrprio #if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC_MINOR__ > 5) - #pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif |