[Commit-gnuradio] [gnuradio] 112/148: Merge branch 'wip/usrp2' of http://vps.gnuradio.org/git/jblum into wip/usrp2

[git]

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

nwest pushed a commit to annotated tag old_usrp_devel_udp
in repository gnuradio.

commit f996ba2ad4fc533a20532ae61fd50a3e88cf9f08
Merge: fa92536 0b4e86f
Author: Matt Ettus <address@hidden>
Date:   Tue Jan 5 14:35:23 2010 -0800

    Merge branch 'wip/usrp2' of http://vps.gnuradio.org/git/jblum into wip/usrp2

 gr-pager/grc/.gitignore                          |   1 +
 gr-pager/python/.gitignore                       |   1 +
 gr-usrp2/src/usrp2.i                             |   2 -
 gr-usrp2/src/usrp2_base.cc                       |  17 +--
 gr-usrp2/src/usrp2_base.h                        |  10 --
 gr-wxgui/src/python/plotter/waterfall_plotter.py |  14 +-
 usrp2/apps/find_usrps.cc                         |  15 +-
 usrp2/apps/gpio.cc                               |   4 +-
 usrp2/apps/rx_streaming_samples.cc               |   7 +-
 usrp2/apps/test_mimo_tx.cc                       |   6 +-
 usrp2/apps/tx_samples.cc                         |   5 +-
 usrp2/apps/usrp2_burn_mac_addr.cc                |  52 ++-----
 usrp2/include/usrp2/Makefile.am                  |   1 +
 usrp2/include/usrp2/props.h                      | 108 ++++++++++++++
 usrp2/include/usrp2/usrp2.h                      |  51 ++-----
 usrp2/lib/Makefile.am                            |   1 +
 usrp2/lib/eth_ctrl_transport.cc                  |  14 +-
 usrp2/lib/eth_ctrl_transport.h                   |  11 +-
 usrp2/lib/eth_data_transport.cc                  |  12 +-
 usrp2/lib/eth_data_transport.h                   |   7 +-
 usrp2/lib/find.cc                                | 180 ++++++++++++-----------
 usrp2/lib/props.cc                               | 128 ++++++++++++++++
 usrp2/lib/usrp2.cc                               | 127 ++++------------
 23 files changed, 448 insertions(+), 326 deletions(-)