diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-10-16 22:30:02 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-10-16 22:30:02 -0700 |
| commit | 9457c960d398d0654375a07d027107c03b81859c (patch) | |
| tree | 8005fd2d41258697823ee969c6673ed998862a9c | |
| parent | 7f4e6e2f40ece7ff64e5a19c169eb327803f5fea (diff) | |
| download | uhd-9457c960d398d0654375a07d027107c03b81859c.tar.gz uhd-9457c960d398d0654375a07d027107c03b81859c.tar.bz2 uhd-9457c960d398d0654375a07d027107c03b81859c.zip | |
fixup! usrp3: Fixed issue where ATR Idle could clobber GPIO out
| -rw-r--r-- | host/lib/usrp/cores/gpio_atr_3000.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/cores/gpio_atr_3000.cpp b/host/lib/usrp/cores/gpio_atr_3000.cpp index 59683d1c9..5d907bc2a 100644 --- a/host/lib/usrp/cores/gpio_atr_3000.cpp +++ b/host/lib/usrp/cores/gpio_atr_3000.cpp @@ -164,7 +164,7 @@ public: } } -protected: +private: //Special RB addr value to indicate no readback //This value is invalid as a real address because it is not a multiple of 4 static const wb_iface::wb_addr_type READBACK_DISABLED = 0xFFFFFFFF; @@ -229,14 +229,14 @@ public: { gpio_atr_3000_impl::set_atr_reg(atr, static_cast<boost::uint32_t>(value) << compute_shift(unit), - compute_mask(unit, ~(_atr_disable_reg.get(masked_reg_t::REGISTER)))); + compute_mask(unit, 0xFFFF)); } inline void set_gpio_out(const db_unit_t unit, const boost::uint16_t value) { - gpio_atr_3000_impl::set_atr_reg(ATR_REG_IDLE, + gpio_atr_3000_impl::set_gpio_out( static_cast<boost::uint32_t>(value) << compute_shift(unit), - compute_mask(unit, _atr_disable_reg.get(masked_reg_t::REGISTER))); + compute_mask(unit, 0xFFFF)); } inline boost::uint16_t read_gpio(const db_unit_t unit) |