zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util_axis_fifo: Switch data and tlast order, improve maintainability

main
Istvan Csomortani 2021-02-15 09:17:19 +00:00 committed by István Csomortáni
parent 4a772265a9
commit 8ce1d6bf36
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/util_axis_fifo/util_axis_fifo.v
View File

@ -227,11 +227,11 @@ end else begin : fifo /* ADDRESS_WIDTH != 0 - this is a real FIFO implementation
.clka(s_axis_aclk), .clka(s_axis_aclk),
.wea(s_mem_write), .wea(s_mem_write),
.addra(s_axis_waddr), .addra(s_axis_waddr),
.dina({s_axis_data, s_axis_tlast}), .dina({s_axis_tlast, s_axis_data}),
.clkb(m_axis_aclk), .clkb(m_axis_aclk),
.reb(m_mem_read), .reb(m_mem_read),
.addrb(m_axis_raddr), .addrb(m_axis_raddr),
.doutb({m_axis_data, m_axis_tlast}) .doutb({m_axis_tlast, m_axis_data})
); );
assign _m_axis_ready = ~valid || m_axis_ready; assign _m_axis_ready = ~valid || m_axis_ready;
@ -245,7 +245,7 @@ end else begin : fifo /* ADDRESS_WIDTH != 0 - this is a real FIFO implementation
// Let the synthesizer decide what to infer (distributed or block RAM) // Let the synthesizer decide what to infer (distributed or block RAM)
always @(posedge s_axis_aclk) begin always @(posedge s_axis_aclk) begin
if (s_mem_write) if (s_mem_write)
ram[s_axis_waddr] <= {s_axis_data, s_axis_tlast}; ram[s_axis_waddr] <= {s_axis_tlast, s_axis_data};
end end
if (M_AXIS_REGISTERED == 1) begin if (M_AXIS_REGISTERED == 1) begin
@ -258,15 +258,15 @@ end else begin : fifo /* ADDRESS_WIDTH != 0 - this is a real FIFO implementation
end end
assign _m_axis_ready = ~valid || m_axis_ready; assign _m_axis_ready = ~valid || m_axis_ready;
assign m_axis_data = data[DATA_WIDTH:1]; assign m_axis_data = data[DATA_WIDTH-1:0];
assign m_axis_tlast = data[0]; assign m_axis_tlast = data[DATA_WIDTH];
assign m_axis_valid = valid; assign m_axis_valid = valid;
end else begin end else begin
assign _m_axis_ready = m_axis_ready; assign _m_axis_ready = m_axis_ready;
assign m_axis_valid = _m_axis_valid; assign m_axis_valid = _m_axis_valid;
assign {m_axis_data, m_axis_tlast} = ram[m_axis_raddr]; assign {m_axis_tlast, m_axis_data} = ram[m_axis_raddr];
end end
end end