From 606d8fc36de0e1812da66e48f23eb7b840b28ebb Mon Sep 17 00:00:00 2001 From: Trung Tran Date: Fri, 13 Jul 2018 16:00:24 -0700 Subject: mg: fix tx power issue This commit will fix power issues with 2 radios configuration (UHD 3.12+). Removed unused _master boolean. CPLD path are now correct, each radio has its own CPLD object. --- host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp') diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp index 365082048..e58e1706e 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp @@ -25,9 +25,8 @@ double magnesium_radio_ctrl_impl::_set_all_gain( "freq=" << freq << " Hz, " "chan=" << chan << ", " "dir=" << dir); - const size_t ad9371_chan = _master ? 0 : 1; ;// FIXME: use chan when 2 radios - const magnesium_cpld_ctrl::chan_sel_t chan_sel = - _master ? magnesium_cpld_ctrl::CHAN1 : magnesium_cpld_ctrl::CHAN2; + const size_t ad9371_chan = chan; + auto chan_sel = static_cast(chan); gain_tuple_t gain_tuple = (dir == RX_DIRECTION) ? get_rx_gain_tuple(gain, _map_freq_to_rx_band(freq)): get_tx_gain_tuple(gain, _map_freq_to_tx_band(freq)); -- cgit v1.2.3