From 6fd956def44f7315c47672e961e60a37fd5d1fca Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 16 Apr 2018 13:40:47 -0700 Subject: niusrprio: Refactor niusrprio_session, move out static consts Static const attributes were causing linker issues the way there were being used, but they were only used in niusrprio_session.cpp and thus could be factored out. --- host/include/uhd/transport/nirio/niusrprio_session.h | 4 ---- host/lib/transport/nirio/niusrprio_session.cpp | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/host/include/uhd/transport/nirio/niusrprio_session.h b/host/include/uhd/transport/nirio/niusrprio_session.h index 994d8c9d2..545b5082f 100644 --- a/host/include/uhd/transport/nirio/niusrprio_session.h +++ b/host/include/uhd/transport/nirio/niusrprio_session.h @@ -106,10 +106,6 @@ private: nirio_resource_manager _resource_manager; usrprio_rpc::usrprio_rpc_client _rpc_client; boost::recursive_mutex _session_mutex; - - static const uint32_t FPGA_READY_TIMEOUT_IN_MS = 1000; - static const uint32_t SESSION_LOCK_TIMEOUT_IN_MS = 3000; - static const uint32_t SESSION_LOCK_RETRY_INT_IN_MS = 500; }; }} diff --git a/host/lib/transport/nirio/niusrprio_session.cpp b/host/lib/transport/nirio/niusrprio_session.cpp index 2f11d31e6..0cbc31592 100644 --- a/host/lib/transport/nirio/niusrprio_session.cpp +++ b/host/lib/transport/nirio/niusrprio_session.cpp @@ -6,15 +6,19 @@ // +//@TODO: Move the register defs required by the class to a common location +#include "../../usrp/x300/x300_regs.hpp" #include #include #include #include #include -#include #include -//@TODO: Move the register defs required by the class to a common location -#include "../../usrp/x300/x300_regs.hpp" +#include + +namespace { + constexpr uint32_t FPGA_READY_TIMEOUT_IN_MS = 1000; +} namespace uhd { namespace niusrprio { -- cgit v1.2.3