diff options
author | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 22:52:41 -0800 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 22:52:41 -0800 |
commit | 24c3565f9f887045e414652edffd6b5536f8c7a5 (patch) | |
tree | a0e40a679d6a029268fc2a328f3643c40a9e880b /host/lib/usrp/usrp1/soft_time_ctrl.hpp | |
parent | 330a014dfc32b34a7fe5555d3ae2d87a25dc2466 (diff) | |
parent | 37116e6c5be8e2660b9dd165e04ea1af4087f1f0 (diff) | |
download | uhd-24c3565f9f887045e414652edffd6b5536f8c7a5.tar.gz uhd-24c3565f9f887045e414652edffd6b5536f8c7a5.tar.bz2 uhd-24c3565f9f887045e414652edffd6b5536f8c7a5.zip |
Merge branch 'next' of ettus.sourcerepo.com:ettus/uhdpriv into next
Diffstat (limited to 'host/lib/usrp/usrp1/soft_time_ctrl.hpp')
-rw-r--r-- | host/lib/usrp/usrp1/soft_time_ctrl.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.hpp b/host/lib/usrp/usrp1/soft_time_ctrl.hpp index 42056c285..7fdac7fc8 100644 --- a/host/lib/usrp/usrp1/soft_time_ctrl.hpp +++ b/host/lib/usrp/usrp1/soft_time_ctrl.hpp @@ -41,8 +41,7 @@ public: /*! * Make a new soft time control. - * \param start_streaming a function callback to start streaming - * \param stop_streaming a function callback to stop streaming + * \param stream_on_off a function to enable/disable rx * \return a new soft time control object */ static sptr make(const cb_fcn_type &stream_on_off); @@ -59,7 +58,7 @@ public: virtual void recv_post(rx_metadata_t &md, size_t &nsamps) = 0; //! Call before the internal send function - virtual void send_pre(const tx_metadata_t &md, double timeout) = 0; + virtual bool send_pre(const tx_metadata_t &md, double &timeout) = 0; //! Issue a stream command to receive virtual void issue_stream_cmd(const stream_cmd_t &cmd) = 0; |