diff options
| author | michael-west <michael.west@ettus.com> | 2016-08-10 15:31:25 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-10 18:29:59 -0700 |
| commit | 4749dc3ea02a9068169023eb4854d574fe508ac3 (patch) | |
| tree | c7c97378513f8002848dce96510fe18f98a9a881 | |
| parent | 5859c010a78aa321e421828fb2861de5b37f41bd (diff) | |
| download | uhd-4749dc3ea02a9068169023eb4854d574fe508ac3.tar.gz uhd-4749dc3ea02a9068169023eb4854d574fe508ac3.tar.bz2 uhd-4749dc3ea02a9068169023eb4854d574fe508ac3.zip | |
X300: Change so radio check so it only makes sure needed frontends are enabled (prevent function from disabling frontends)
| -rw-r--r-- | host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp index 3a129b334..1d268623c 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp @@ -863,9 +863,12 @@ bool x300_radio_ctrl_impl::check_radio_config() for (size_t chan = 0; chan < _get_num_radios(); chan++) { if (_tree->exists(rx_fe_path / _rx_fe_map.at(chan).db_fe_name / "enabled")) { const bool chan_active = _is_streamer_active(RX_DIRECTION, chan); - _tree->access<bool>(rx_fe_path / _rx_fe_map.at(chan).db_fe_name / "enabled") - .set(chan_active) - ; + if (chan_active) + { + _tree->access<bool>(rx_fe_path / _rx_fe_map.at(chan).db_fe_name / "enabled") + .set(chan_active) + ; + } } } @@ -873,9 +876,12 @@ bool x300_radio_ctrl_impl::check_radio_config() for (size_t chan = 0; chan < _get_num_radios(); chan++) { if (_tree->exists(tx_fe_path / _rx_fe_map.at(chan).db_fe_name / "enabled")) { const bool chan_active = _is_streamer_active(TX_DIRECTION, chan); - _tree->access<bool>(tx_fe_path / _rx_fe_map.at(chan).db_fe_name / "enabled") - .set(chan_active) - ; + if (chan_active) + { + _tree->access<bool>(tx_fe_path / _rx_fe_map.at(chan).db_fe_name / "enabled") + .set(chan_active) + ; + } } } |