diff options
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/dboard_manager.cpp | 10 | ||||
| -rw-r--r-- | host/lib/usrp2/usrp2_impl.cpp | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp index b1c10e1c1..d5e7d5b8a 100644 --- a/host/lib/usrp/dboard_manager.cpp +++ b/host/lib/usrp/dboard_manager.cpp @@ -483,19 +483,19 @@ void dboard_manager::populate_prop_tree_from_subdev( tree->create<int>(root / "gains"); //phony property so this dir exists BOOST_FOREACH(const std::string &name, gain_names){ tree->create<double>(root / "gains" / name / "value") - .subscribe_master(boost::bind(&get_set_gain, subdev, name, _1)); + .coerce(boost::bind(&get_set_gain, subdev, name, _1)); tree->create<meta_range_t>(root / "gains" / name / "range") .publish(boost::bind(&get_gain_range, subdev, name)); } tree->create<double>(root / "freq/value") - .subscribe_master(boost::bind(&get_set_freq, subdev, _1)); + .coerce(boost::bind(&get_set_freq, subdev, _1)); tree->create<meta_range_t>(root / "freq/range") .publish(boost::bind(&get_freq_range, subdev)); tree->create<std::string>(root / "antenna/value") - .subscribe_master(boost::bind(&get_set_ant, subdev, _1)); + .coerce(boost::bind(&get_set_ant, subdev, _1)); tree->create<std::vector<std::string> >(root / "antenna/options") .publish(boost::bind(&get_ants, subdev)); @@ -504,11 +504,11 @@ void dboard_manager::populate_prop_tree_from_subdev( .publish(boost::bind(&get_conn, subdev)); tree->create<bool>(root / "enabled") - .subscribe_master(boost::bind(&get_set_enb, subdev, _1)); + .coerce(boost::bind(&get_set_enb, subdev, _1)); tree->create<bool>(root / "use_lo_offset") .publish(boost::bind(&get_use_lo_off, subdev)); tree->create<double>(root / "bandwidth/value") - .subscribe_master(boost::bind(&get_set_bw, subdev, _1)); + .coerce(boost::bind(&get_set_bw, subdev, _1)); } diff --git a/host/lib/usrp2/usrp2_impl.cpp b/host/lib/usrp2/usrp2_impl.cpp index e65461103..4c0eed7cc 100644 --- a/host/lib/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp2/usrp2_impl.cpp @@ -433,10 +433,10 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){ _mbc[mb].dsp_xports[dspno]->get_recv_buff(0.01).get(); //recv with timeout for expected property_tree::path_type rx_dsp_path = mb_path / str(boost::format("rx_dsps/%u") % dspno); _tree->create<double>(rx_dsp_path / "rate/value") - .subscribe_master(boost::bind(&rx_dsp_core_200::set_host_rate, _mbc[mb].rx_dsps[dspno], _1)) + .coerce(boost::bind(&rx_dsp_core_200::set_host_rate, _mbc[mb].rx_dsps[dspno], _1)) .subscribe(boost::bind(&usrp2_impl::update_rx_samp_rate, this, _1)); _tree->create<double>(rx_dsp_path / "freq/value") - .subscribe_master(boost::bind(&rx_dsp_core_200::set_freq, _mbc[mb].rx_dsps[dspno], _1)); + .coerce(boost::bind(&rx_dsp_core_200::set_freq, _mbc[mb].rx_dsps[dspno], _1)); _tree->create<meta_range_t>(rx_dsp_path / "freq/range") .publish(boost::bind(&rx_dsp_core_200::get_freq_range, _mbc[mb].rx_dsps[dspno])); _tree->create<stream_cmd_t>(rx_dsp_path / "stream_cmd") @@ -452,10 +452,10 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){ _tree->access<double>(mb_path / "tick_rate") .subscribe(boost::bind(&tx_dsp_core_200::set_tick_rate, _mbc[mb].tx_dsp, _1)); _tree->create<double>(mb_path / "tx_dsps/0/rate/value") - .subscribe_master(boost::bind(&tx_dsp_core_200::set_host_rate, _mbc[mb].tx_dsp, _1)) + .coerce(boost::bind(&tx_dsp_core_200::set_host_rate, _mbc[mb].tx_dsp, _1)) .subscribe(boost::bind(&usrp2_impl::update_tx_samp_rate, this, _1)); _tree->create<double>(mb_path / "tx_dsps/0/freq/value") - .subscribe_master(boost::bind(&usrp2_impl::set_tx_dsp_freq, this, mb, _1)); + .coerce(boost::bind(&usrp2_impl::set_tx_dsp_freq, this, mb, _1)); _tree->create<meta_range_t>(mb_path / "tx_dsps/0/freq/range") .publish(boost::bind(&usrp2_impl::get_tx_dsp_freq_range, this, mb)); |