aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/gpif/packet_reframer.v
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-03-26 15:11:09 -0700
committerJosh Blum <josh@joshknows.com>2012-03-26 15:11:09 -0700
commit95de4f7343e52fe54a140fdd1462a2087a877a2e (patch)
tree754ff8bcd8a199bd2ad135c8e15e52df2cd79b23 /fpga/usrp2/gpif/packet_reframer.v
parent68510d56fdba693e077955865ebcb4f10e26e9e1 (diff)
parent842c54ecb5f20d7787ccd8f6034755a92ed67b5f (diff)
downloaduhd-95de4f7343e52fe54a140fdd1462a2087a877a2e.tar.gz
uhd-95de4f7343e52fe54a140fdd1462a2087a877a2e.tar.bz2
uhd-95de4f7343e52fe54a140fdd1462a2087a877a2e.zip
Merge branch 'fpga_maint' into maint
Diffstat (limited to 'fpga/usrp2/gpif/packet_reframer.v')
-rw-r--r--fpga/usrp2/gpif/packet_reframer.v5
1 files changed, 2 insertions, 3 deletions
diff --git a/fpga/usrp2/gpif/packet_reframer.v b/fpga/usrp2/gpif/packet_reframer.v
index 8bb8a3678..e0ce9e174 100644
--- a/fpga/usrp2/gpif/packet_reframer.v
+++ b/fpga/usrp2/gpif/packet_reframer.v
@@ -20,7 +20,7 @@
module packet_reframer
(input clk, input reset, input clear,
- input [18:0] data_i,
+ input [15:0] data_i,
input src_rdy_i,
output dst_rdy_o,
output [18:0] data_o,
@@ -60,8 +60,7 @@ module packet_reframer
wire occ_out = 0;
assign eof_out = (state == RF_PKT) & (length == 2);
wire sof_out = (state == RF_IDLE);
- wire [15:0] data_out = data_i[15:0];
- assign data_o = {occ_out, eof_out, sof_out, data_out};
+ assign data_o = {occ_out, eof_out, sof_out, data_i[15:0]};
endmodule // packet_reframer