diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-09-13 11:56:01 -0700 | 
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 11:49:12 -0800 | 
| commit | 7670d8abeff1666558a5f621fcde4230b8bec3e9 (patch) | |
| tree | 1b466d4c757b845e89ffafe53d78d531694205c9 /host/lib/usrp | |
| parent | 600640ddf122fa6489b9d10aa4ec5835d06524e4 (diff) | |
| download | uhd-7670d8abeff1666558a5f621fcde4230b8bec3e9.tar.gz uhd-7670d8abeff1666558a5f621fcde4230b8bec3e9.tar.bz2 uhd-7670d8abeff1666558a5f621fcde4230b8bec3e9.zip | |
twinrx: Make gpio_iface a wb_iface (was: timed_wb_iface)
This completely eliminates the need for cmd_time_ctrl in the TwinRX
codebase, reducing the number of dependencies on the X300 codebase.
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_io.hpp | 13 | 
1 files changed, 2 insertions, 11 deletions
| diff --git a/host/lib/usrp/dboard/twinrx/twinrx_io.hpp b/host/lib/usrp/dboard/twinrx/twinrx_io.hpp index c9665f1dd..ea1f1150a 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_io.hpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_io.hpp @@ -38,7 +38,8 @@ static uint32_t get_reg(wb_iface::wb_addr_type addr) {  }  } -class twinrx_gpio : public timed_wb_iface { +class twinrx_gpio : public wb_iface +{  public:      typedef boost::shared_ptr<twinrx_gpio> sptr; @@ -107,16 +108,6 @@ public:              mask<uint32_t>(CPLD_FULL_ADDR)|mask<uint32_t>(CPLD_DATA));      } -    // Timed command interface -    inline time_spec_t get_time() { -        return _db_iface->get_command_time(); -    } - -    void set_time(const time_spec_t& t) { -        boost::lock_guard<boost::mutex> lock(_mutex); -        _db_iface->set_command_time(t); -    } -  private:    //Members/definitions      static const uint32_t GPIO_OUTPUT_MASK   = 0xFC06FE03;      static const uint32_t GPIO_PINCTRL_MASK  = 0x00000000; | 
