[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 7ef4258ceaf5fa9fa242138c0abc9572a72c3d6f
Merge: 4bf227c 06a7a77
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 30 15:56:00 2015 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-uhd/lib/usrp_sink_impl.cc
        gr-uhd/lib/usrp_source_impl.cc

 gr-uhd/doc/uhd.dox                                 |  13 +-
 gr-uhd/examples/grc/uhd_msg_tune.grc               | 451 ++++++++++++-----
 gr-uhd/include/gnuradio/uhd/CMakeLists.txt         |   1 +
 .../gnuradio/uhd/{usrp_sink.h => usrp_block.h}     | 283 ++++-------
 gr-uhd/include/gnuradio/uhd/usrp_sink.h            | 540 +++------------------
 gr-uhd/include/gnuradio/uhd/usrp_source.h          | 467 ++----------------
 gr-uhd/lib/CMakeLists.txt                          |   1 +
 gr-uhd/lib/usrp_block_impl.cc                      | 428 ++++++++++++++++
 gr-uhd/lib/usrp_block_impl.h                       | 199 ++++++++
 gr-uhd/lib/usrp_common.h                           | 211 --------
 gr-uhd/lib/usrp_sink_impl.cc                       | 297 +-----------
 gr-uhd/lib/usrp_sink_impl.h                        |  48 +-
 gr-uhd/lib/usrp_source_impl.cc                     | 274 +----------
 gr-uhd/lib/usrp_source_impl.h                      |  47 +-
 gr-uhd/swig/uhd_swig.i                             |   2 +
 15 files changed, 1189 insertions(+), 2073 deletions(-)

diff --cc gr-uhd/lib/usrp_sink_impl.cc
index b6c1f93,513dfaf..b95b58b
--- a/gr-uhd/lib/usrp_sink_impl.cc
+++ b/gr-uhd/lib/usrp_sink_impl.cc
@@@ -64,53 -64,16 +64,16 @@@ namespace gr 
      usrp_sink_impl::usrp_sink_impl(const ::uhd::device_addr_t &device_addr,
                                     const ::uhd::stream_args_t &stream_args,
                                     const std::string &length_tag_name)
-       : sync_block("usrp_sink",
 -      : usrp_block("gr uhd usrp sink",
--                      args_to_io_sig(stream_args),
--                      io_signature::make(0, 0, 0)),
-         usrp_common_impl(device_addr, stream_args, length_tag_name),
++      : usrp_block("usrp_sink",
++                   args_to_io_sig(stream_args),
++                   io_signature::make(0, 0, 0)),
+         usrp_block_impl(device_addr, stream_args, length_tag_name),
          _length_tag_key(length_tag_name.empty() ? pmt::PMT_NIL : 
pmt::string_to_symbol(length_tag_name)),
-         _nitems_to_send(0),
-         _curr_freq(stream_args.channels.size(), 0.0),
-         _curr_lo_offset(stream_args.channels.size(), 0.0),
-         _curr_gain(stream_args.channels.size(), 0.0),
-         _chans_to_tune(stream_args.channels.size())
+         _nitems_to_send(0)
      {
-       message_port_register_in(pmt::mp("command"));
-       set_msg_handler(
-           pmt::mp("command"),
-           boost::bind(&usrp_sink_impl::msg_handler_command, this, _1)
-       );
- 
-       _check_sensors_locked();
+       // nop
      }
  
-     bool usrp_sink_impl::_check_sensors_locked()
-     {
-       bool clocks_locked = true;
- 
-       // 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") {
-           continue;
-         }
-         else if (_dev->get_clock_source(mboard_index) == "mimo") {
-           sensor_name = "mimo_locked";
-         }
-         if (not _wait_for_locked_sensor(
-                 get_mboard_sensor_names(mboard_index),
-                 sensor_name,
-                 boost::bind(&usrp_sink_impl::get_mboard_sensor, this, _1, 
mboard_index)
-             )) {
-           GR_LOG_WARN(d_logger, boost::format("Sensor '%s' failed to lock 
within timeout on motherboard %d.") % sensor_name % mboard_index);
-           clocks_locked = false;
-         }
-       }
- 
-       return clocks_locked;
-     }
- 
- 
      usrp_sink_impl::~usrp_sink_impl()
      {
      }
diff --cc gr-uhd/lib/usrp_source_impl.cc
index f04ff3d,4265535..dfb38f6
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@@ -64,10 -62,10 +62,10 @@@ namespace gr 
  
      usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t 
&device_addr,
                                         const ::uhd::stream_args_t 
&stream_args):
-       sync_block("usrp_source",
 -      usrp_block("gr uhd usrp source",
--                    io_signature::make(0, 0, 0),
--                    args_to_io_sig(stream_args)),
-       usrp_common_impl(device_addr, stream_args, ""),
++      usrp_block("usrp_source",
++                 io_signature::make(0, 0, 0),
++                 args_to_io_sig(stream_args)),
+       usrp_block_impl(device_addr, stream_args, ""),
        _tag_now(false)
      {
        std::stringstream str;