diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-10-01 11:48:19 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-10-01 11:48:19 -0400 |
| commit | 58cbeb5b9594a0b9f781b80c1727110e5c6cebe6 (patch) | |
| tree | 45ddddc8787cf5cdf041f50318105e3aec267236 /gr-uhd/lib | |
| parent | 221459befafea980a370b93bc9ce7612b27f7e07 (diff) | |
| parent | ec67ecbc6b49158d0a6d86384826aecb289827e0 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index d3a631b0d5..3ed204c6ac 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -87,7 +87,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") { @@ -106,19 +106,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_source_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; } |