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/e300 | |
| 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/e300')
| -rw-r--r-- | host/lib/usrp/e300/e300_fifo_config.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/e300/e300_fifo_config.cpp b/host/lib/usrp/e300/e300_fifo_config.cpp index 7d4834040..c02c943dd 100644 --- a/host/lib/usrp/e300/e300_fifo_config.cpp +++ b/host/lib/usrp/e300/e300_fifo_config.cpp @@ -7,6 +7,7 @@ #ifdef E300_NATIVE +#include <uhd/utils/system_time.hpp> #include <uhd/config.hpp> #include <stdint.h> #include <atomic> @@ -238,7 +239,7 @@ public: template <typename T> UHD_INLINE typename T::sptr get_buff(const double timeout) { - const time_spec_t exit_time = time_spec_t::get_system_time() + time_spec_t(timeout); + const time_spec_t exit_time = uhd::get_system_time() + time_spec_t(timeout); while (1) { if (zf_peek32(_addrs.ctrl + ARBITER_RB_STATUS_OCC)) @@ -251,7 +252,7 @@ public: _index = 0; return _buffs[_index++]->get_new<T>(); } - if (time_spec_t::get_system_time() > exit_time) { + if (uhd::get_system_time() > exit_time) { break; } _waiter->wait(timeout); |