[Commit-gnuradio] [gnuradio] 58/148: Merge branch 'vita_rx' of http://gnuradio.org/git/matt 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 ae30d00ac5cfdcebead30bf0f726d9bf32df0450
Merge: 00ec663 bb24e64
Author: Josh Blum <address@hidden>
Date:   Fri Dec 11 11:01:45 2009 -0800

    Merge branch 'vita_rx' of http://gnuradio.org/git/matt into wip/usrp2

 usrp2/fpga/timing/time_compare.v              |   6 +-
 usrp2/fpga/top/u2_core/u2_core.v              |  61 ++---
 usrp2/fpga/top/u2_rev3/Makefile               |   2 +
 usrp2/fpga/vrt/.gitignore                     |   2 +
 usrp2/fpga/vrt/vita_rx.build                  |   2 +-
 usrp2/fpga/vrt/vita_rx_framer.v               |  14 +-
 usrp2/fpga/vrt/vita_rx_tb.v                   |  10 +-
 usrp2/fpga/vrt/vita_tx.build                  |   1 +
 usrp2/fpga/vrt/vita_tx_control.v              | 194 ++++-----------
 usrp2/fpga/vrt/vita_tx_deframer.v             | 332 ++++++++++----------------
 usrp2/fpga/vrt/{vita_rx_tb.v => vita_tx_tb.v} | 111 ++++++---
 11 files changed, 308 insertions(+), 427 deletions(-)