From be4dda6d4666988fc8624bd336a22ee6d1a82f59 Mon Sep 17 00:00:00 2001 From: Derek Kozel Date: Wed, 25 Jan 2017 00:42:36 -0800 Subject: X300: Move property tree check to subscriber Command Time path in the daughterboard does not yet exist during X300 initialization, so check cannot be done while subscribing. --- host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'host') diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp index bb17eb2ec..0e11cb42c 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp @@ -126,8 +126,7 @@ UHD_RFNOC_RADIO_BLOCK_CONSTRUCTOR(x300_radio_ctrl) // Bind the daughterboard command time to the motherboard level property //////////////////////////////////////////////////////////////// - if (_tree->exists(fs_path("time") / "cmd") and - _tree->exists(fs_path("dboards" / _radio_slot / "rx_frontends" / _rx_fe_map.at(i).db_fe_name / "time" / "cmd"))) { + if (_tree->exists(fs_path("time") / "cmd")) { _tree->access(fs_path("time") / "cmd") .add_coerced_subscriber(boost::bind(&x300_radio_ctrl_impl::set_fe_cmd_time, this, _1, i)); } @@ -180,9 +179,11 @@ double x300_radio_ctrl_impl::set_rate(double rate) void x300_radio_ctrl_impl::set_fe_cmd_time(const time_spec_t &time, const size_t chan) { - _tree->access( - fs_path("dboards" / _radio_slot / "rx_frontends" / _rx_fe_map.at(chan).db_fe_name / "time" / "cmd") - ).set(time); + if (_tree->exists(fs_path("dboards" / _radio_slot / "rx_frontends" / _rx_fe_map.at(chan).db_fe_name / "time" / "cmd"))) { + _tree->access( + fs_path("dboards" / _radio_slot / "rx_frontends" / _rx_fe_map.at(chan).db_fe_name / "time" / "cmd") + ).set(time); + } } void x300_radio_ctrl_impl::set_tx_antenna(const std::string &ant, const size_t chan) -- cgit v1.2.3