diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-09-24 19:26:10 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-09-24 19:26:10 -0400 |
| commit | 17aabfe78923eee7fe0f3837c4ffd35bdac44c83 (patch) | |
| tree | 8b3495492dd8c00df5b4c321cbb975d84b53512e /gr-uhd/lib | |
| parent | 08e27c7a76a9ec77b0a38ac7e2be9ac2159b4606 (diff) | |
| parent | 26169d211c0603726c960b1cb23f9c7c506ff944 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/usrp_sink_impl.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc index 844f941020..b363b9f9cd 100644 --- a/gr-uhd/lib/usrp_sink_impl.cc +++ b/gr-uhd/lib/usrp_sink_impl.cc @@ -88,7 +88,7 @@ namespace gr { { bool clocks_locked = true; - // 1) Check ref lock for all mboards + // Check ref lock for all mboards for (size_t mboard_index = 0; mboard_index < _dev->get_num_mboards(); mboard_index++) { std::string sensor_name = "ref_locked"; if (_dev->get_clock_source(mboard_index) == "internal") { @@ -107,19 +107,6 @@ namespace gr { } } - // 2) Check LO for all channels - for (size_t i = 0; i < _nchan; i++) { - size_t chan_index = _stream_args.channels[i]; - if (not _wait_for_locked_sensor( - get_sensor_names(chan_index), - "lo_locked", - boost::bind(&usrp_sink_impl::get_sensor, this, _1, chan_index) - )) { - GR_LOG_WARN(d_logger, boost::format("Sensor 'lo_locked' failed to lock within timeout on channel %d.") % chan_index); - clocks_locked = false; - } - } - return clocks_locked; } |