Merge branch 'ashish/gpio_atr_redux' into master-staging

Conflicts:
	host/lib/usrp/cores/CMakeLists.txt
	host/lib/usrp/x300/x300_impl.hpp

1 files changed, 10 insertions, 10 deletions

diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp
index 81cdaefac..327ae675b 100644
--- a/host/lib/usrp/dboard/db_wbx_version4.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version4.cpp
@@ -136,29 +136,29 @@ wbx_base::wbx_version4::wbx_version4(wbx_base *_self_wbx_base) {
     //between bursts) set TX gain iobits to min gain (max attenuation) when
     //RX_ONLY or IDLE to suppress LO leakage
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, \
-            dboard_iface::ATR_REG_IDLE, v4_tx_mod, \
+            gpio_atr::ATR_REG_IDLE, v4_tx_mod, \
             TX_ATTN_MASK | TX_MIXER_DIS | v4_tx_mod);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, \
-            dboard_iface::ATR_REG_RX_ONLY, v4_tx_mod, \
+            gpio_atr::ATR_REG_RX_ONLY, v4_tx_mod, \
             TX_ATTN_MASK | TX_MIXER_DIS | v4_tx_mod);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, \
-            dboard_iface::ATR_REG_TX_ONLY, v4_tx_mod, \
+            gpio_atr::ATR_REG_TX_ONLY, v4_tx_mod, \
             TX_ATTN_MASK | TX_MIXER_DIS | v4_tx_mod);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, \
-            dboard_iface::ATR_REG_FULL_DUPLEX, v4_tx_mod, \
+            gpio_atr::ATR_REG_FULL_DUPLEX, v4_tx_mod, \
             TX_ATTN_MASK | TX_MIXER_DIS | v4_tx_mod);
 
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, \
-            dboard_iface::ATR_REG_IDLE, \
+            gpio_atr::ATR_REG_IDLE, \
             RX_MIXER_ENB, RX_MIXER_DIS | RX_MIXER_ENB);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, \
-            dboard_iface::ATR_REG_TX_ONLY, \
+            gpio_atr::ATR_REG_TX_ONLY, \
             RX_MIXER_ENB, RX_MIXER_DIS | RX_MIXER_ENB);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, \
-            dboard_iface::ATR_REG_RX_ONLY, \
+            gpio_atr::ATR_REG_RX_ONLY, \
             RX_MIXER_ENB, RX_MIXER_DIS | RX_MIXER_ENB);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, \
-            dboard_iface::ATR_REG_FULL_DUPLEX, \
+            gpio_atr::ATR_REG_FULL_DUPLEX, \
             RX_MIXER_ENB, RX_MIXER_DIS | RX_MIXER_ENB);
 }
 
@@ -188,8 +188,8 @@ double wbx_base::wbx_version4::set_tx_gain(double gain, const std::string &name)
 
         //write the new gain to tx gpio outputs
         //Update ATR with gain io_bits, only update for TX_ONLY and FULL_DUPLEX ATR states
-        self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, dboard_iface::ATR_REG_TX_ONLY,     io_bits, TX_ATTN_MASK);
-        self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, dboard_iface::ATR_REG_FULL_DUPLEX, io_bits, TX_ATTN_MASK);
+        self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, gpio_atr::ATR_REG_TX_ONLY,     io_bits, TX_ATTN_MASK);
+        self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, gpio_atr::ATR_REG_FULL_DUPLEX, io_bits, TX_ATTN_MASK);
 
     }
     else UHD_THROW_INVALID_CODE_PATH();