Merge branch 'udp' into u1e_merge_with_udp

* udp:
  better test program for just the tx side
  fix typo, no functionality difference
  ignores
  move dsp settings regs to reclocked setting bus.  Works, gets us to within 18ps of passing timing
  reverting logic clean up which should have made timing better, but made it worse instead

Conflicts:
	usrp2/control_lib/settings_bus.v
	usrp2/top/u2_core/u2_core.v

1 files changed, 1 insertions, 1 deletions

diff --git a/usrp2/vrt/vita_tx_deframer.v b/usrp2/vrt/vita_tx_deframer.v
index 49428ead5..220d3b061 100644
--- a/usrp2/vrt/vita_tx_deframer.v
+++ b/usrp2/vrt/vita_tx_deframer.v
@@ -28,7 +28,7 @@ module vita_tx_deframer
 
    reg [3:0] vita_state;
    wire      has_streamid, has_classid, has_secs, has_tics, has_trailer;
-   assign has_streamid 	= (data_i[31:28]==4'b001);
+   assign has_streamid 	= (data_i[31:28]==4'b0001);
    assign has_classid 	= data_i[27];
    assign has_secs 	= ~(data_i[23:22]==2'b00);
    assign has_tics 	= ~(data_i[21:20]==2'b00);