From 9457c960d398d0654375a07d027107c03b81859c Mon Sep 17 00:00:00 2001 From: Ashish Chaudhari Date: Fri, 16 Oct 2015 22:30:02 -0700 Subject: fixup! usrp3: Fixed issue where ATR Idle could clobber GPIO out --- host/lib/usrp/cores/gpio_atr_3000.cpp | 8 ++++---- 1 file 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(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(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) -- cgit v1.2.3