[Commit-gnuradio] [gnuradio] 113/148: Merge branch 'udp' 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 5d21a642912b66f6c45cbbd855ecd60c302bf3fe
Merge: 0b4e86f 6ce0a09
Author: Josh Blum <address@hidden>
Date:   Tue Jan 5 14:39:52 2010 -0800

    Merge branch 'udp' of http://gnuradio.org/git/matt into wip/usrp2
    
    Conflicts:
        usrp2/fpga/top/u2_rev3/Makefile

 usrp2/fpga/control_lib/newfifo/ll8_to_fifo19.v     |  86 ++++-----
 usrp2/fpga/simple_gemac/eth_tasks_f19.v            |  92 +++++++++
 .../fpga/simple_gemac/simple_gemac_wrapper19.build |   1 +
 usrp2/fpga/simple_gemac/simple_gemac_wrapper19.v   | 165 ++++++++++++++++
 .../fpga/simple_gemac/simple_gemac_wrapper19_tb.v  | 209 +++++++++++++++++++++
 usrp2/fpga/top/u2_core/u2_core.v                   |  17 +-
 usrp2/fpga/top/u2_rev3/Makefile                    |  13 +-
 usrp2/fpga/udp/add_onescomp.v                      |  12 ++
 usrp2/fpga/udp/fifo19_rxrealign.v                  |  42 +++++
 usrp2/fpga/udp/prot_eng_rx.v                       | 121 ++++++++++++
 usrp2/fpga/udp/prot_eng_tx.v                       | 119 ++++++++++++
 usrp2/fpga/udp/prot_eng_tx_tb.v                    | 167 ++++++++++++++++
 usrp2/fpga/udp/udp_wrapper.v                       |  78 ++++++++
 13 files changed, 1073 insertions(+), 49 deletions(-)

diff --cc usrp2/fpga/top/u2_core/u2_core.v
index f9ac07a,5b52483..ada0f66
mode 100644,100755..100644
--- a/usrp2/fpga/top/u2_core/u2_core.v
+++ b/usrp2/fpga/top/u2_core/u2_core.v
diff --cc usrp2/fpga/top/u2_rev3/Makefile
index 1f8bbe3,e0a78bf..d27469f
--- a/usrp2/fpga/top/u2_rev3/Makefile
+++ b/usrp2/fpga/top/u2_rev3/Makefile
@@@ -84,11 -84,12 +84,16 @@@ control_lib/wb_bridge_16_32.v 
  control_lib/reset_sync.v \
  control_lib/priority_enc.v \
  control_lib/pic.v \
 +vrt/vita_rx_control.v \
 +vrt/vita_rx_framer.v \
 +vrt/vita_tx_control.v \
 +vrt/vita_tx_deframer.v \
+ udp/udp_wrapper.v \
+ udp/fifo19_rxrealign.v \
+ udp/prot_eng_tx.v \
+ udp/add_onescomp.v \
  simple_gemac/simple_gemac_wrapper.v \
+ simple_gemac/simple_gemac_wrapper19.v \
  simple_gemac/simple_gemac.v \
  simple_gemac/simple_gemac_wb.v \
  simple_gemac/simple_gemac_tx.v \