aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2017-11-10 17:23:45 -0800
committerMartin Braun <martin.braun@ettus.com>2017-12-22 15:05:05 -0800
commitd5ba6965e53e579a29d24ef5a86dc954e38ecf99 (patch)
treeffe25ffc18355a2998332d78ee6b99d2a6e66feb /host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
parentdb73d59969185bc3c261b39e3a6e9e2462b14a3a (diff)
downloaduhd-d5ba6965e53e579a29d24ef5a86dc954e38ecf99.tar.gz
uhd-d5ba6965e53e579a29d24ef5a86dc954e38ecf99.tar.bz2
uhd-d5ba6965e53e579a29d24ef5a86dc954e38ecf99.zip
mg: Force updating of CPLD/ATR bits at init
Diffstat (limited to 'host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp')
-rw-r--r--host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
index 562fecc30..c7163052b 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
@@ -45,9 +45,7 @@ void magnesium_radio_ctrl_impl::_update_atr_switches(
const direction_t dir,
const std::string &ant
){
- UHD_ASSERT_THROW(dir == RX_DIRECTION or dir == TX_DIRECTION);
-
- if (dir == RX_DIRECTION) {
+ if (dir == RX_DIRECTION or dir == DX_DIRECTION) {
// These default values work for RX2
bool trx_led = false;
bool rx2_led = true;
@@ -107,9 +105,8 @@ void magnesium_radio_ctrl_impl::_update_atr_switches(
false /* don't defer commit */
);
}
- if (dir == TX_DIRECTION) {
- UHD_LOG_TRACE(unique_id(),
- "Updating all TX-ATR related switches for antenna==" << ant);
+ if (dir == TX_DIRECTION or dir == DX_DIRECTION) {
+ UHD_LOG_TRACE(unique_id(), "Updating all TX-ATR related switches...");
_cpld->set_tx_atr_bits(
chan,
magnesium_cpld_ctrl::ON,