diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-06-22 20:01:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-23 09:58:20 -0700 |
| commit | ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d (patch) | |
| tree | 6342382f3d1c45fc5c83ca36fed24a2d4a173aff /host/lib/usrp/b200/b200_impl.cpp | |
| parent | fd9dc3f2be1e8056a1355351b97c7d40e9bd2d1f (diff) | |
| parent | 9caf20c29956be283b032110096a81f99a121da7 (diff) | |
| download | uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.tar.gz uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.tar.bz2 uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_impl.cpp
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 78edec31c..b9905c0fc 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -792,9 +792,6 @@ void b200_impl::setup_radio(const size_t dspno) //////////////////////////////////////////////////////////////////// // connect rx dsp control objects //////////////////////////////////////////////////////////////////// - _tree->access<double>(mb_path / "tick_rate") - .add_coerced_subscriber(boost::bind(&rx_vita_core_3000::set_tick_rate, perif.framer, _1)) - .add_coerced_subscriber(boost::bind(&rx_dsp_core_3000::set_tick_rate, perif.ddc, _1)); const fs_path rx_dsp_path = mb_path / "rx_dsps" / dspno; perif.ddc->populate_subtree(_tree->subtree(rx_dsp_path)); _tree->create<bool>(rx_dsp_path / "rate" / "set").set(false); @@ -805,12 +802,14 @@ void b200_impl::setup_radio(const size_t dspno) ; _tree->create<stream_cmd_t>(rx_dsp_path / "stream_cmd") .add_coerced_subscriber(boost::bind(&rx_vita_core_3000::issue_stream_command, perif.framer, _1)); + _tree->access<double>(mb_path / "tick_rate") + .add_coerced_subscriber(boost::bind(&rx_vita_core_3000::set_tick_rate, perif.framer, _1)) + .add_coerced_subscriber(boost::bind(&b200_impl::update_rx_dsp_tick_rate, this, _1, perif.ddc, rx_dsp_path)) + ; //////////////////////////////////////////////////////////////////// // create tx dsp control objects //////////////////////////////////////////////////////////////////// - _tree->access<double>(mb_path / "tick_rate") - .add_coerced_subscriber(boost::bind(&tx_dsp_core_3000::set_tick_rate, perif.duc, _1)); const fs_path tx_dsp_path = mb_path / "tx_dsps" / dspno; perif.duc->populate_subtree(_tree->subtree(tx_dsp_path)); _tree->create<bool>(tx_dsp_path / "rate" / "set").set(false); @@ -819,6 +818,9 @@ void b200_impl::setup_radio(const size_t dspno) .add_coerced_subscriber(boost::bind(&lambda_set_bool_prop, boost::weak_ptr<property_tree>(_tree), tx_dsp_path / "rate" / "set", true, _1)) .add_coerced_subscriber(boost::bind(&b200_impl::update_tx_samp_rate, this, dspno, _1)) ; + _tree->access<double>(mb_path / "tick_rate") + .add_coerced_subscriber(boost::bind(&b200_impl::update_tx_dsp_tick_rate, this, _1, perif.duc, tx_dsp_path)) + ; //////////////////////////////////////////////////////////////////// // create RF frontend interfacing |