[Commit-gnuradio] [gnuradio] 61/148: Merge branch 'vita_rx' of gnuradio.org:matt into vita_rx

[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 11f67cbe9e3463a724259979df8e2c46e20da7bf
Merge: 6526930 8c993b6
Author: Matt Ettus <address@hidden>
Date:   Fri Dec 11 17:55:36 2009 -0800

    Merge branch 'vita_rx' of gnuradio.org:matt into vita_rx

 usrp2/firmware/lib/memory_map.h      |  58 ++++++--
 usrp2/fpga/control_lib/setting_reg.v |   4 +-
 usrp2/fpga/sdr_lib/dsp_core_rx.v     |  16 +--
 usrp2/fpga/timing/time_64bit.v       |  12 +-
 usrp2/fpga/timing/time_compare.v     |  23 +++
 usrp2/fpga/top/u2_core/u2_core.v     | 100 +++++++++----
 usrp2/fpga/top/u2_rev3/Makefile      |   6 +
 usrp2/fpga/vrt/.gitignore            |   4 +
 usrp2/fpga/vrt/vita_rx.build         |   1 +
 usrp2/fpga/vrt/vita_rx_control.v     | 174 +++++++++++++++++++++++
 usrp2/fpga/vrt/vita_rx_framer.v      | 199 ++++++++++++++++++++++++++
 usrp2/fpga/vrt/vita_rx_tb.v          | 213 ++++++++++++++++++++++++++++
 usrp2/fpga/vrt/vita_tx.build         |   1 +
 usrp2/fpga/vrt/vita_tx_control.v     |  77 ++++++++++
 usrp2/fpga/vrt/vita_tx_deframer.v    | 187 +++++++++++++++++++++++++
 usrp2/fpga/vrt/vita_tx_tb.v          | 264 +++++++++++++++++++++++++++++++++++
 16 files changed, 1284 insertions(+), 55 deletions(-)