diff options
| author | Matt Ettus <matt@ettus.com> | 2011-03-23 18:51:36 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2011-05-26 17:31:21 -0700 |
| commit | 88cc06c10e9aaf7db13557a581f0489b226e7e78 (patch) | |
| tree | d7670136e124441c296448b5d0561d258de0dc35 /usrp2/gpif/gpif.v | |
| parent | d71f8599d0698e951ccd35ee96da9cd2229a9987 (diff) | |
| download | uhd-88cc06c10e9aaf7db13557a581f0489b226e7e78.tar.gz uhd-88cc06c10e9aaf7db13557a581f0489b226e7e78.tar.bz2 uhd-88cc06c10e9aaf7db13557a581f0489b226e7e78.zip | |
u1p: better way of reframing the packets
Diffstat (limited to 'usrp2/gpif/gpif.v')
| -rw-r--r-- | usrp2/gpif/gpif.v | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/usrp2/gpif/gpif.v b/usrp2/gpif/gpif.v index 8cac8b466..4f0ed233b 100644 --- a/usrp2/gpif/gpif.v +++ b/usrp2/gpif/gpif.v @@ -61,9 +61,18 @@ module gpif .ctrl_o(ctrl_data), .ctrl_src_rdy_o(ctrl_src_rdy), .ctrl_dst_rdy_i(ctrl_dst_rdy), .debug(debug_wr) ); + // join vita packets which are longer than one frame, drop frame padding + wire [18:0] refr_data; + wire refr_src_rdy, refr_dst_rdy; + + packet_reframer tx_packet_reframer + (.clk(fifo_clk), .reset(fifo_rst), .clear(clear_tx), + .data_i(tx19_data), .src_rdy_i(tx19_src_rdy), .dst_rdy_o(tx19_dst_rdy), + .data_o(refr_data), .src_rdy_o(refr_src_rdy), .dst_rdy_i(refr_dst_rdy)); + fifo19_to_fifo36 #(.LE(1)) f19_to_f36 (.clk(fifo_clk), .reset(fifo_rst), .clear(0), - .f19_datain(tx19_data), .f19_src_rdy_i(tx19_src_rdy), .f19_dst_rdy_o(tx19_dst_rdy), + .f19_datain(refr_data), .f19_src_rdy_i(refr_src_rdy), .f19_dst_rdy_o(refr_dst_rdy), .f36_dataout(tx36_data), .f36_src_rdy_o(tx36_src_rdy), .f36_dst_rdy_i(tx36_dst_rdy)); fifo_cascade #(.WIDTH(36), .SIZE(TXFIFOSIZE)) tx_fifo36 |