diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-04-06 16:35:50 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-04-06 16:35:50 -0700 |
commit | 38b740cde2dfde06185edb83d9caa64a56789914 (patch) | |
tree | f5073ba267ee22a36e915bdb40fba94845e15958 /host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp | |
parent | 949eebc0e456db83bb44da24197a038ea695b65b (diff) | |
parent | 93d909e7c8c4053a05cdc9cb69c886183b4a7f09 (diff) | |
download | uhd-38b740cde2dfde06185edb83d9caa64a56789914.tar.gz uhd-38b740cde2dfde06185edb83d9caa64a56789914.tar.bz2 uhd-38b740cde2dfde06185edb83d9caa64a56789914.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp index 9e8687b94..0276a7a66 100644 --- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp +++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp @@ -155,6 +155,12 @@ public: if (_use_time) _timeout = MASSIVE_TIMEOUT; //permanently sets larger timeout } + uhd::time_spec_t get_time() + { + boost::mutex::scoped_lock lock(_mutex); + return _time; + } + void set_tick_rate(const double rate){ boost::mutex::scoped_lock lock(_mutex); _tick_rate = rate; |