diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-08-24 15:48:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-03-05 13:53:45 -0800 |
| commit | 7fa1f6ed0726ff0f908245e43a01f50620293e8d (patch) | |
| tree | 714036231990d38fc4ccd2b2913b6a4ebac2235d /host/lib/usrp/usrp1 | |
| parent | 347bb79d2adef4b5bf3e3a94577ecc18c0408519 (diff) | |
| download | uhd-7fa1f6ed0726ff0f908245e43a01f50620293e8d.tar.gz uhd-7fa1f6ed0726ff0f908245e43a01f50620293e8d.tar.bz2 uhd-7fa1f6ed0726ff0f908245e43a01f50620293e8d.zip | |
uhd: Moved get_system_time outside of public API
uhd::get_system_time() is an abstracted way of reading back a time, and
is not UHD-specific. As such, there's no reason to keep it in the public
part of the API where we're contractually obligated not to touch it.
Instead, moving it to the internal API space.
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/soft_time_ctrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp index 626f973e1..061075e32 100644 --- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp +++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp @@ -6,6 +6,7 @@ // #include "soft_time_ctrl.hpp" +#include <uhd/utils/system_time.hpp> #include <uhd/utils/tasks.hpp> #include <boost/make_shared.hpp> #include <boost/thread/condition_variable.hpp> @@ -49,7 +50,7 @@ public: ******************************************************************/ void set_time(const time_spec_t &time){ boost::mutex::scoped_lock lock(_update_mutex); - _time_offset = time_spec_t::get_system_time() - time; + _time_offset = uhd::get_system_time() - time; } time_spec_t get_time(void){ @@ -59,7 +60,7 @@ public: UHD_INLINE time_spec_t time_now(void){ //internal get time without scoped lock - return time_spec_t::get_system_time() - _time_offset; + return uhd::get_system_time() - _time_offset; } UHD_INLINE void sleep_until_time( |