[Commit-gnuradio] [gnuradio] 32/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 f8a3c34b5676a610e2b393d7af2a028d9172fe9e
Merge: 4e43221 da5b379
Author: Josh Blum <address@hidden>
Date:   Fri Nov 6 11:49:37 2009 -0800

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

 usrp2/firmware/lib/memory_map.h       |  62 ++++++--
 usrp2/fpga/control_lib/pic.v          | 183 +++++++++++++++++++++++
 usrp2/fpga/control_lib/priority_enc.v |  44 ++++++
 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      |  21 +++
 usrp2/fpga/top/u2_core/u2_core.v      |  81 +++++++---
 usrp2/fpga/top/u2_rev3/Makefile       |   7 +-
 usrp2/fpga/vrt/.gitignore             |   2 +
 usrp2/fpga/vrt/vita_rx.build          |   1 +
 usrp2/fpga/vrt/vita_rx_control.v      | 174 ++++++++++++++++++++++
 usrp2/fpga/vrt/vita_rx_framer.v       | 195 ++++++++++++++++++++++++
 usrp2/fpga/vrt/vita_rx_tb.v           | 211 ++++++++++++++++++++++++++
 usrp2/fpga/vrt/vita_tx_control.v      | 174 ++++++++++++++++++++++
 usrp2/fpga/vrt/vita_tx_deframer.v     | 269 ++++++++++++++++++++++++++++++++++
 16 files changed, 1408 insertions(+), 48 deletions(-)