summaryrefslogtreecommitdiffstats
path: root/fpga
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-08-16 19:51:20 -0700
committerJosh Blum <josh@joshknows.com>2010-08-16 19:51:20 -0700
commit0541029e4ecd06e840966b4005af316b92eeb9e5 (patch)
tree8d78c73a451634c7db7c04c861ff3654dc8797f4 /fpga
parentef6953024f1075a729e85f2511c75de337879888 (diff)
parent230368da5c55c0eb587960db50f68e1b618f271c (diff)
downloaduhd-0541029e4ecd06e840966b4005af316b92eeb9e5.tar.gz
uhd-0541029e4ecd06e840966b4005af316b92eeb9e5.tar.bz2
uhd-0541029e4ecd06e840966b4005af316b92eeb9e5.zip
Merge branch 'premerge'
Diffstat (limited to 'fpga')
-rw-r--r--fpga/usrp2/vrt/vita_rx_framer.v2
1 files changed, 1 insertions, 1 deletions
diff --git a/fpga/usrp2/vrt/vita_rx_framer.v b/fpga/usrp2/vrt/vita_rx_framer.v
index fd82263d0..235817941 100644
--- a/fpga/usrp2/vrt/vita_rx_framer.v
+++ b/fpga/usrp2/vrt/vita_rx_framer.v
@@ -128,7 +128,7 @@ module vita_rx_framer
VITA_ERR_SECS : pkt_fifo_line <= {2'b00,vita_time_fifo_o[63:32]};
VITA_ERR_TICS : pkt_fifo_line <= {2'b00,32'd0};
VITA_ERR_TICS2 : pkt_fifo_line <= {2'b00,vita_time_fifo_o[31:0]};
- VITA_ERR_PAYLOAD : pkt_fifo_line <= {2'b11,28'd0,flags_fifo_o};
+ VITA_ERR_PAYLOAD : pkt_fifo_line <= {2'b10,28'd0,flags_fifo_o};
//VITA_ERR_TRAILER : pkt_fifo_line <= {2'b11,vita_trailer};
default : pkt_fifo_line <= 34'h0_FFFF_FFFF;