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/usrp2/usrp2_fifo_ctrl.hpp | |
| 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/usrp2/usrp2_fifo_ctrl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp index 13dfb5b46..5bc7f6676 100644 --- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp +++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.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 @@ -30,7 +30,7 @@ * The usrp2 FIFO control class: * Provide high-speed peek/poke interface. */ -class usrp2_fifo_ctrl : public uhd::wb_iface, public uhd::spi_iface +class usrp2_fifo_ctrl : public uhd::timed_wb_iface, public uhd::spi_iface { public: typedef boost::shared_ptr<usrp2_fifo_ctrl> sptr; @@ -38,9 +38,6 @@ public: //! Make a new FIFO control object static sptr make(uhd::transport::zero_copy_if::sptr xport); - //! 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; }; |