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/rfnoc/ctrlport_endpoint.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/rfnoc/ctrlport_endpoint.cpp')
-rw-r--r-- | host/lib/rfnoc/ctrlport_endpoint.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/host/lib/rfnoc/ctrlport_endpoint.cpp b/host/lib/rfnoc/ctrlport_endpoint.cpp index 43bbf815c..f259f8f5d 100644 --- a/host/lib/rfnoc/ctrlport_endpoint.cpp +++ b/host/lib/rfnoc/ctrlport_endpoint.cpp @@ -297,9 +297,9 @@ public: // Flow control not needed because we have allocated special room in the // buffer for async message responses ctrl_payload tx_ctrl(rx_ctrl); - tx_ctrl.is_ack = true; - tx_ctrl.src_epid = _my_epid; - tx_ctrl.status = status; + tx_ctrl.is_ack = true; + tx_ctrl.src_epid = _my_epid; + tx_ctrl.status = status; const auto timeout = [&]() { std::unique_lock<std::mutex> lock(_mutex); return _policy.timeout; @@ -368,7 +368,6 @@ private: const uhd::time_spec_t& time_spec, const steady_clock::time_point& timeout_time) { - if (!_client_clk.is_running()) { throw uhd::system_error("Ctrlport client clock is not running"); } @@ -411,9 +410,8 @@ private: if (!buff_not_full()) { // If we're sending a timed command or if we have a timed command in the // queue, use the MASSIVE_TIMEOUT instead - auto timed_timeout = (check_timed_in_queue() - ? start_timeout(MASSIVE_TIMEOUT) - : timeout_time); + auto timed_timeout = + (check_timed_in_queue() ? start_timeout(MASSIVE_TIMEOUT) : timeout_time); if (not _buff_free_cond.wait_until(lock, timed_timeout, buff_not_full)) { throw uhd::op_timeout( "Control operation timed out waiting for space in command buffer"); |