diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-03-01 16:39:08 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-03-01 16:39:08 -0800 |
| commit | da26a3e34ece4a68ddc3542644308c406a162683 (patch) | |
| tree | c390929a21b8ccaeb4d79dc75b59a57c300c2865 /host/lib/usrp/cores | |
| parent | 79a797d5b376fbfa51ffcd42d57956e83b4903c9 (diff) | |
| parent | 5ca309a86e8d99f3431bfd0116579e7d57bf64a7 (diff) | |
| download | uhd-da26a3e34ece4a68ddc3542644308c406a162683.tar.gz uhd-da26a3e34ece4a68ddc3542644308c406a162683.tar.bz2 uhd-da26a3e34ece4a68ddc3542644308c406a162683.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/cores')
| -rw-r--r-- | host/lib/usrp/cores/gpio_atr_3000.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/host/lib/usrp/cores/gpio_atr_3000.cpp b/host/lib/usrp/cores/gpio_atr_3000.cpp index 6df592e1b..4b141e2ab 100644 --- a/host/lib/usrp/cores/gpio_atr_3000.cpp +++ b/host/lib/usrp/cores/gpio_atr_3000.cpp @@ -271,6 +271,7 @@ public: return (~_atr_disable_reg.get()) >> compute_shift(unit); } + using gpio_atr_3000_impl::set_gpio_ddr; inline void set_gpio_ddr(const db_unit_t unit, const uint32_t value, const uint32_t mask) { gpio_atr_3000_impl::set_gpio_ddr(DDR_OUTPUT, compute_mask(unit, value&mask)); @@ -282,6 +283,7 @@ public: return _ddr_reg.get() >> compute_shift(unit); } + using gpio_atr_3000_impl::set_atr_reg; inline void set_atr_reg(const db_unit_t unit, const gpio_atr_reg_t atr, const uint32_t value, const uint32_t mask) { gpio_atr_3000_impl::set_atr_reg(atr, value << compute_shift(unit), compute_mask(unit, mask)); @@ -300,6 +302,7 @@ public: return (reg->get() & compute_mask(unit, MASK_SET_ALL)) >> compute_shift(unit); } + using gpio_atr_3000_impl::set_gpio_out; inline void set_gpio_out(const db_unit_t unit, const uint32_t value, const uint32_t mask) { gpio_atr_3000_impl::set_gpio_out( @@ -312,6 +315,7 @@ public: return (_atr_idle_reg.get_gpio_out() & compute_mask(unit, MASK_SET_ALL)) >> compute_shift(unit); } + using gpio_atr_3000_impl::read_gpio; inline uint32_t read_gpio(const db_unit_t unit) { return (gpio_atr_3000_impl::read_gpio() & compute_mask(unit, MASK_SET_ALL)) >> compute_shift(unit); |