diff options
| author | Matt Ettus <matt@ettus.com> | 2010-07-09 14:22:51 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-07-09 14:22:51 -0700 |
| commit | 5b76de10206ab2d8e824c059bb84f6de2fb79995 (patch) | |
| tree | 332f6ec5747ae6838e65aa9db81440039cb8468a /usrp2/vrt/vita_rx_framer.v | |
| parent | c3ef4c04fd8d887a733fa9a8ed5b6702cf453a01 (diff) | |
| parent | 4f79676f7d51a2718c13f79151f2ed852c7447b6 (diff) | |
| download | uhd-5b76de10206ab2d8e824c059bb84f6de2fb79995.tar.gz uhd-5b76de10206ab2d8e824c059bb84f6de2fb79995.tar.bz2 uhd-5b76de10206ab2d8e824c059bb84f6de2fb79995.zip | |
Merge branch 'reload' into u1e
* reload:
fix to stop endless error packets
updated tests to match new features
Diffstat (limited to 'usrp2/vrt/vita_rx_framer.v')
| -rw-r--r-- | usrp2/vrt/vita_rx_framer.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usrp2/vrt/vita_rx_framer.v b/usrp2/vrt/vita_rx_framer.v index 3c910924c..fd82263d0 100644 --- a/usrp2/vrt/vita_rx_framer.v +++ b/usrp2/vrt/vita_rx_framer.v @@ -193,7 +193,7 @@ module vita_rx_framer VITA_PAYLOAD : // Write if sample ready and no error flags req_write_pkt_fifo <= (sample_fifo_src_rdy_i & ~|flags_fifo_o[3:1]); - VITA_ERR_HEADER, VITA_ERR_STREAMID, VITA_ERR_SECS, VITA_ERR_TICS, VITA_ERR_TICS2, VITA_ERR_PAYLOAD, VITA_ERR_TRAILER : + VITA_ERR_HEADER, VITA_ERR_STREAMID, VITA_ERR_SECS, VITA_ERR_TICS, VITA_ERR_TICS2, VITA_ERR_PAYLOAD : req_write_pkt_fifo <= 1; default : req_write_pkt_fifo <= 0; @@ -213,7 +213,7 @@ module vita_rx_framer ( ((vita_state==VITA_PAYLOAD) & (sample_phase == (numchan-4'd1)) & ~|flags_fifo_o[3:1]) | - (vita_state==VITA_ERR_TRAILER)); + (vita_state==VITA_ERR_PAYLOAD)); assign debug_rx = vita_state; |