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

axi_dmac: Restore axi_dmac_regmap_request to f7b8a2d version

main
alin724 2021-07-02 11:19:36 +03:00 committed by Alin-Tudor Sferle
parent 30cc7d7420
commit e61cadb2ca
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/axi_dmac/axi_dmac_regmap_request.v
View File

@ -103,7 +103,7 @@ reg [DMA_AXI_ADDR_WIDTH-1:BYTES_PER_BEAT_WIDTH_SRC] up_dma_src_address = 'h00;
reg [DMA_LENGTH_WIDTH-1:0] up_dma_x_length = {DMA_LENGTH_ALIGN{1'b1}}; reg [DMA_LENGTH_WIDTH-1:0] up_dma_x_length = {DMA_LENGTH_ALIGN{1'b1}};
reg up_dma_cyclic = DMA_CYCLIC ? 1'b1 : 1'b0; reg up_dma_cyclic = DMA_CYCLIC ? 1'b1 : 1'b0;
reg up_dma_last = 1'b1; reg up_dma_last = 1'b1;
reg up_dma_enable_tlen_reporting = 1'b1; reg up_dma_enable_tlen_reporting = 1'b0;
wire up_tlf_s_ready; wire up_tlf_s_ready;
reg up_tlf_s_valid = 1'b0; reg up_tlf_s_valid = 1'b0;
@ -132,7 +132,7 @@ always @(posedge clk) begin
up_dma_req_valid <= 1'b0; up_dma_req_valid <= 1'b0;
up_dma_cyclic <= DMA_CYCLIC ? 1'b1 : 1'b0; up_dma_cyclic <= DMA_CYCLIC ? 1'b1 : 1'b0;
up_dma_last <= 1'b1; up_dma_last <= 1'b1;
up_dma_enable_tlen_reporting <= 1'b1; up_dma_enable_tlen_reporting <= 1'b0;
end else begin end else begin
if (ctrl_enable == 1'b1) begin if (ctrl_enable == 1'b1) begin
if (up_wreq == 1'b1 && up_waddr == 9'h102) begin if (up_wreq == 1'b1 && up_waddr == 9'h102) begin
@ -301,9 +301,6 @@ util_axis_fifo #(
.s_axis_full(), .s_axis_full(),
.s_axis_data({up_transfer_id_eot_d, up_measured_transfer_length}), .s_axis_data({up_transfer_id_eot_d, up_measured_transfer_length}),
.s_axis_room(), .s_axis_room(),
.s_axis_tkeep(),
.s_axis_tlast(),
.s_axis_almost_full(),
.m_axis_aclk(clk), .m_axis_aclk(clk),
.m_axis_aresetn(ctrl_enable), .m_axis_aresetn(ctrl_enable),
@ -311,10 +308,7 @@ util_axis_fifo #(
.m_axis_ready(up_tlf_rd & up_tlf_valid), .m_axis_ready(up_tlf_rd & up_tlf_valid),
.m_axis_data(up_tlf_data), .m_axis_data(up_tlf_data),
.m_axis_level(), .m_axis_level(),
.m_axis_empty (), .m_axis_empty ()
.m_axis_tkeep (),
.m_axis_tlast (),
.m_axis_almost_empty ()
); );
endmodule endmodule

2
library/axi_dmac/tb/regmap_tb.v
View File

@ -175,7 +175,7 @@ module regmap_tb;
set_reset_reg_value('h10, 32'h00002101); /* Interface Description*/ set_reset_reg_value('h10, 32'h00002101); /* Interface Description*/
set_reset_reg_value('h80, 'h3); /* IRQ mask */ set_reset_reg_value('h80, 'h3); /* IRQ mask */
set_reset_reg_value('h40c, 'h7); /* Flags */ set_reset_reg_value('h40c, 'h3); /* Flags */
set_reset_reg_value('h418, LENGTH_ALIGN_MASK); /* Length alignment */ set_reset_reg_value('h418, LENGTH_ALIGN_MASK); /* Length alignment */
set_reset_reg_value('h434, VAL_DBG_DEST_ADDR); set_reset_reg_value('h434, VAL_DBG_DEST_ADDR);