diff options
author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
---|---|---|
committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
commit | 625724d7f81c214e9955334860a364802be3fda9 (patch) | |
tree | 39d6d0087646ef4028bc6a57d33c89a28112fed8 /host/lib/usrp/common | |
parent | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (diff) | |
parent | 3f0b770ab14aa0acaf4846680e3ee7379a1f93d7 (diff) | |
download | uhd-625724d7f81c214e9955334860a364802be3fda9.tar.gz uhd-625724d7f81c214e9955334860a364802be3fda9.tar.bz2 uhd-625724d7f81c214e9955334860a364802be3fda9.zip |
Merge branch 'master' into vivado
Diffstat (limited to 'host/lib/usrp/common')
-rw-r--r-- | host/lib/usrp/common/fifo_ctrl_excelsior.cpp | 8 | ||||
-rw-r--r-- | host/lib/usrp/common/fifo_ctrl_excelsior.hpp | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/host/lib/usrp/common/fifo_ctrl_excelsior.cpp b/host/lib/usrp/common/fifo_ctrl_excelsior.cpp index 2ea5b66da..f55d1ef41 100644 --- a/host/lib/usrp/common/fifo_ctrl_excelsior.cpp +++ b/host/lib/usrp/common/fifo_ctrl_excelsior.cpp @@ -1,5 +1,5 @@ // -// Copyright 2012 Ettus Research LLC +// Copyright 2012,2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -207,6 +207,12 @@ public: if (_use_time) _timeout = MASSIVE_TIMEOUT; //permanently sets larger timeout } + uhd::time_spec_t get_time(void) + { + boost::mutex::scoped_lock lock(_mutex); + return _time; + } + void set_tick_rate(const double rate){ boost::mutex::scoped_lock lock(_mutex); _tick_rate = rate; diff --git a/host/lib/usrp/common/fifo_ctrl_excelsior.hpp b/host/lib/usrp/common/fifo_ctrl_excelsior.hpp index bd7777ffa..759e2ccc9 100644 --- a/host/lib/usrp/common/fifo_ctrl_excelsior.hpp +++ b/host/lib/usrp/common/fifo_ctrl_excelsior.hpp @@ -1,5 +1,5 @@ // -// Copyright 2012 Ettus Research LLC +// Copyright 2012,2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ struct fifo_ctrl_excelsior_config /*! * Provide access to peek, poke, spi, and async messages. */ -class fifo_ctrl_excelsior : public uhd::wb_iface, public uhd::spi_iface +class fifo_ctrl_excelsior : public uhd::timed_wb_iface, public uhd::spi_iface { public: typedef boost::shared_ptr<fifo_ctrl_excelsior> sptr; @@ -51,9 +51,6 @@ public: const fifo_ctrl_excelsior_config &config ); - //! Set the command time that will activate - virtual void set_time(const uhd::time_spec_t &time) = 0; - //! Set the tick rate (converting time into ticks) virtual void set_tick_rate(const double rate) = 0; |