FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-01-30 08:32:52 +08:00
Code Issues Projects Releases Wiki Activity

Rewrite resets

Browse Source
This commit is contained in:
Alex Forencich 2020-08-27 13:26:03 -07:00
parent 00e2756385
commit 2c6185c0a5
2 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
rtl/axi_fifo_rd.v
View File

@ -263,17 +263,8 @@ if (FIFO_DELAY) begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
state_reg <= STATE_IDLE;
count_reg <= count_next;
m_axi_arvalid_reg <= 1'b0;
s_axi_arready_reg <= 1'b0;
end else begin
state_reg <= state_next; state_reg <= state_next;
count_reg <= {COUNT_WIDTH{1'b0}}; count_reg <= count_next;
m_axi_arvalid_reg <= m_axi_arvalid_next;
s_axi_arready_reg <= s_axi_arready_next;
end
m_axi_arid_reg <= m_axi_arid_next; m_axi_arid_reg <= m_axi_arid_next;
m_axi_araddr_reg <= m_axi_araddr_next; m_axi_araddr_reg <= m_axi_araddr_next;
@ -286,6 +277,15 @@ if (FIFO_DELAY) begin
m_axi_arqos_reg <= m_axi_arqos_next; m_axi_arqos_reg <= m_axi_arqos_next;
m_axi_arregion_reg <= m_axi_arregion_next; m_axi_arregion_reg <= m_axi_arregion_next;
m_axi_aruser_reg <= m_axi_aruser_next; m_axi_aruser_reg <= m_axi_aruser_next;
m_axi_arvalid_reg <= m_axi_arvalid_next;
s_axi_arready_reg <= s_axi_arready_next;
if (rst) begin
state_reg <= STATE_IDLE;
count_reg <= {COUNT_WIDTH{1'b0}};
m_axi_arvalid_reg <= 1'b0;
s_axi_arready_reg <= 1'b0;
end
end end
end else begin end else begin
// bypass AR channel // bypass AR channel
@ -331,17 +331,16 @@ always @* begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
wr_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
end else begin
wr_ptr_reg <= wr_ptr_next; wr_ptr_reg <= wr_ptr_next;
end
wr_addr_reg <= wr_ptr_next; wr_addr_reg <= wr_ptr_next;
if (write) begin if (write) begin
mem[wr_addr_reg[FIFO_ADDR_WIDTH-1:0]] <= m_axi_r; mem[wr_addr_reg[FIFO_ADDR_WIDTH-1:0]] <= m_axi_r;
end end
if (rst) begin
wr_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
end
end end
// Read logic // Read logic
@ -367,19 +366,19 @@ always @* begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
rd_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
mem_read_data_valid_reg <= 1'b0;
end else begin
rd_ptr_reg <= rd_ptr_next; rd_ptr_reg <= rd_ptr_next;
mem_read_data_valid_reg <= mem_read_data_valid_next;
end
rd_addr_reg <= rd_ptr_next; rd_addr_reg <= rd_ptr_next;
mem_read_data_valid_reg <= mem_read_data_valid_next;
if (read) begin if (read) begin
mem_read_data_reg <= mem[rd_addr_reg[FIFO_ADDR_WIDTH-1:0]]; mem_read_data_reg <= mem[rd_addr_reg[FIFO_ADDR_WIDTH-1:0]];
end end
if (rst) begin
rd_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
mem_read_data_valid_reg <= 1'b0;
end
end end
// Output register // Output register
@ -395,15 +394,15 @@ always @* begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
s_axi_rvalid_reg <= 1'b0;
end else begin
s_axi_rvalid_reg <= s_axi_rvalid_next; s_axi_rvalid_reg <= s_axi_rvalid_next;
end
if (store_output) begin if (store_output) begin
s_axi_r_reg <= mem_read_data_reg; s_axi_r_reg <= mem_read_data_reg;
end end
if (rst) begin
s_axi_rvalid_reg <= 1'b0;
end
end end
endmodule endmodule

51
rtl/axi_fifo_wr.v
View File

@ -294,18 +294,9 @@ if (FIFO_DELAY) begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
state_reg <= STATE_IDLE;
hold_reg <= 1'b1;
m_axi_awvalid_reg <= 1'b0;
s_axi_awready_reg <= 1'b0;
end else begin
state_reg <= state_next; state_reg <= state_next;
hold_reg <= hold_next;
m_axi_awvalid_reg <= m_axi_awvalid_next;
s_axi_awready_reg <= s_axi_awready_next;
end
hold_reg <= hold_next;
count_reg <= count_next; count_reg <= count_next;
m_axi_awid_reg <= m_axi_awid_next; m_axi_awid_reg <= m_axi_awid_next;
@ -319,6 +310,15 @@ if (FIFO_DELAY) begin
m_axi_awqos_reg <= m_axi_awqos_next; m_axi_awqos_reg <= m_axi_awqos_next;
m_axi_awregion_reg <= m_axi_awregion_next; m_axi_awregion_reg <= m_axi_awregion_next;
m_axi_awuser_reg <= m_axi_awuser_next; m_axi_awuser_reg <= m_axi_awuser_next;
m_axi_awvalid_reg <= m_axi_awvalid_next;
s_axi_awready_reg <= s_axi_awready_next;
if (rst) begin
state_reg <= STATE_IDLE;
hold_reg <= 1'b1;
m_axi_awvalid_reg <= 1'b0;
s_axi_awready_reg <= 1'b0;
end
end end
end else begin end else begin
// bypass AW channel // bypass AW channel
@ -372,17 +372,16 @@ always @* begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
wr_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
end else begin
wr_ptr_reg <= wr_ptr_next; wr_ptr_reg <= wr_ptr_next;
end
wr_addr_reg <= wr_ptr_next; wr_addr_reg <= wr_ptr_next;
if (write) begin if (write) begin
mem[wr_addr_reg[FIFO_ADDR_WIDTH-1:0]] <= s_axi_w; mem[wr_addr_reg[FIFO_ADDR_WIDTH-1:0]] <= s_axi_w;
end end
if (rst) begin
wr_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
end
end end
// Read logic // Read logic
@ -408,19 +407,19 @@ always @* begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
rd_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
mem_read_data_valid_reg <= 1'b0;
end else begin
rd_ptr_reg <= rd_ptr_next; rd_ptr_reg <= rd_ptr_next;
mem_read_data_valid_reg <= mem_read_data_valid_next;
end
rd_addr_reg <= rd_ptr_next; rd_addr_reg <= rd_ptr_next;
mem_read_data_valid_reg <= mem_read_data_valid_next;
if (read) begin if (read) begin
mem_read_data_reg <= mem[rd_addr_reg[FIFO_ADDR_WIDTH-1:0]]; mem_read_data_reg <= mem[rd_addr_reg[FIFO_ADDR_WIDTH-1:0]];
end end
if (rst) begin
rd_ptr_reg <= {FIFO_ADDR_WIDTH+1{1'b0}};
mem_read_data_valid_reg <= 1'b0;
end
end end
// Output register // Output register
@ -436,15 +435,15 @@ always @* begin
end end
always @(posedge clk) begin always @(posedge clk) begin
if (rst) begin
m_axi_wvalid_reg <= 1'b0;
end else begin
m_axi_wvalid_reg <= m_axi_wvalid_next; m_axi_wvalid_reg <= m_axi_wvalid_next;
end
if (store_output) begin if (store_output) begin
m_axi_w_reg <= mem_read_data_reg; m_axi_w_reg <= mem_read_data_reg;
end end
if (rst) begin
m_axi_wvalid_reg <= 1'b0;
end
end end
endmodule endmodule