FPGA/verilog-ethernet
1
0
Fork 0
mirror of https://github.com/alexforencich/verilog-ethernet.git synced 2025-01-14 06:43:18 +08:00
Code Issues Projects Releases Wiki Activity

merged changes in axis

Browse Source
This commit is contained in:
Alex Forencich 2024-01-17 15:10:47 -08:00
commit 12744433de
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/axis/rtl/axis_arb_mux.v
View File

@ -168,7 +168,7 @@ arb_inst (
.grant_encoded(grant_encoded) .grant_encoded(grant_encoded)
); );
assign request = (s_axis_tvalid_reg & ~grant) | (s_axis_tvalid & grant); assign request = s_axis_tvalid | (s_axis_tvalid_reg & ~grant);
assign acknowledge = grant & s_axis_tvalid_reg & {S_COUNT{m_axis_tready_int_reg}} & (LAST_ENABLE ? s_axis_tlast_reg : {S_COUNT{1'b1}}); assign acknowledge = grant & s_axis_tvalid_reg & {S_COUNT{m_axis_tready_int_reg}} & (LAST_ENABLE ? s_axis_tlast_reg : {S_COUNT{1'b1}});
always @* begin always @* begin

19
lib/axis/rtl/axis_async_fifo.v
View File

@ -861,17 +861,20 @@ if (PAUSE_ENABLE) begin : pause
always @(posedge m_clk) begin always @(posedge m_clk) begin
if (FRAME_PAUSE) begin if (FRAME_PAUSE) begin
if (m_axis_tvalid && m_axis_tready) begin if (pause_reg) begin
if (m_axis_tlast) begin // paused; update pause status
pause_reg <= m_pause_req || s_pause_req_sync3_reg;
end else if (m_axis_tvalid_out) begin
// frame transfer; set frame bit
pause_frame_reg <= 1'b1;
if (m_axis_tready && m_axis_tlast) begin
// end of frame; clear frame bit and update pause status
pause_frame_reg <= 1'b0; pause_frame_reg <= 1'b0;
pause_reg <= m_pause_req || s_pause_req_sync3_reg; pause_reg <= m_pause_req || s_pause_req_sync3_reg;
end else begin
pause_frame_reg <= 1'b1;
end
end else begin
if (!pause_frame_reg) begin
pause_reg <= m_pause_req || s_pause_req_sync3_reg;
end end
end else if (!pause_frame_reg) begin
// idle; update pause status
pause_reg <= m_pause_req || s_pause_req_sync3_reg;
end end
end else begin end else begin
pause_reg <= m_pause_req || s_pause_req_sync3_reg; pause_reg <= m_pause_req || s_pause_req_sync3_reg;

19
lib/axis/rtl/axis_fifo.v
View File

@ -517,17 +517,20 @@ if (PAUSE_ENABLE) begin : pause
always @(posedge clk) begin always @(posedge clk) begin
if (FRAME_PAUSE) begin if (FRAME_PAUSE) begin
if (m_axis_tvalid && m_axis_tready) begin if (pause_reg) begin
if (m_axis_tlast) begin // paused; update pause status
pause_reg <= pause_req;
end else if (m_axis_tvalid_out) begin
// frame transfer; set frame bit
pause_frame_reg <= 1'b1;
if (m_axis_tready && m_axis_tlast) begin
// end of frame; clear frame bit and update pause status
pause_frame_reg <= 1'b0; pause_frame_reg <= 1'b0;
pause_reg <= pause_req; pause_reg <= pause_req;
end else begin
pause_frame_reg <= 1'b1;
end
end else begin
if (!pause_frame_reg) begin
pause_reg <= pause_req;
end end
end else if (!pause_frame_reg) begin
// idle; update pause status
pause_reg <= pause_req;
end end
end else begin end else begin
pause_reg <= pause_req; pause_reg <= pause_req;