aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/transport/nirio/niriok_proxy.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2020-03-02 15:25:13 -0800
committeratrnati <54334261+atrnati@users.noreply.github.com>2020-03-03 08:51:32 -0600
commit876d4150aa3da531ddd687b48afada6e43f79146 (patch)
treefd72a71419f4cd800d4e500cfcaded4dfc8dc367 /host/lib/transport/nirio/niriok_proxy.cpp
parent1393553d623bdf4ba40d5435c9719b6ce990d9ac (diff)
downloaduhd-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/niriok_proxy.cpp')
-rw-r--r--host/lib/transport/nirio/niriok_proxy.cpp77
1 files changed, 36 insertions, 41 deletions
diff --git a/host/lib/transport/nirio/niriok_proxy.cpp b/host/lib/transport/nirio/niriok_proxy.cpp
index ee177c371..4d413bedb 100644
--- a/host/lib/transport/nirio/niriok_proxy.cpp
+++ b/host/lib/transport/nirio/niriok_proxy.cpp
@@ -12,59 +12,54 @@
// "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
-{
- // initialization of static members
- boost::shared_mutex niriok_proxy::_synchronization;
+namespace uhd { namespace niusrprio {
+// initialization of static members
+boost::shared_mutex niriok_proxy::_synchronization;
+
+//-------------------------------------------------------
+// niriok_proxy
+//-------------------------------------------------------
+niriok_proxy::niriok_proxy() : _device_handle(nirio_driver_iface::INVALID_RIO_HANDLE) {}
- //-------------------------------------------------------
- // niriok_proxy
- //-------------------------------------------------------
- niriok_proxy::niriok_proxy(): _device_handle(nirio_driver_iface::INVALID_RIO_HANDLE)
- {
- }
+niriok_proxy::~niriok_proxy() {}
+
+niriok_proxy::sptr niriok_proxy::make_and_open(const std::string& interface_path)
+{
+ nirio_status status;
- niriok_proxy::~niriok_proxy()
- {
- }
-
- niriok_proxy::sptr niriok_proxy::make_and_open(const std::string& interface_path)
- {
- nirio_status status;
-
- /*
- niriok_proxy_impl_v1 supports NI-RIO 13.0
- niriok_proxy_impl_v2 supports NI-RIO 14.0 and later
+ /*
+ niriok_proxy_impl_v1 supports NI-RIO 13.0
+ niriok_proxy_impl_v2 supports NI-RIO 14.0 and later
- We must dynamically determine which version of the RIO kernel we are
- interfacing to. Opening the interface will fail if there is a version
- incompatibility, so we try to open successively newer interface
- proxies until it succeeds.
- */
+ We must dynamically determine which version of the RIO kernel we are
+ interfacing to. Opening the interface will fail if there is a version
+ incompatibility, so we try to open successively newer interface
+ proxies until it succeeds.
+ */
- sptr proxy_v1(new niriok_proxy_impl_v1);
- status = proxy_v1->open(interface_path);
+ sptr proxy_v1(new niriok_proxy_impl_v1);
+ status = proxy_v1->open(interface_path);
- if (nirio_status_not_fatal(status))
- return proxy_v1;
+ if (nirio_status_not_fatal(status))
+ return proxy_v1;
- sptr proxy_v2(new niriok_proxy_impl_v2);
- status = proxy_v2->open(interface_path);
+ sptr proxy_v2(new niriok_proxy_impl_v2);
+ status = proxy_v2->open(interface_path);
- if (nirio_status_not_fatal(status))
- return proxy_v2;
+ if (nirio_status_not_fatal(status))
+ return proxy_v2;
- throw uhd::runtime_error("Unable to detect a supported version of the NI-RIO kernel interface.");
-
- }
-}}
+ throw uhd::runtime_error(
+ "Unable to detect a supported version of the NI-RIO kernel interface.");
+}
+}} // namespace uhd::niusrprio
#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC_MINOR__ > 5)
- #pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif