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

Merge pull request #346 from analogdevicesinc/spi_engine_trigger_update 

spi_engine: Update pulse generation
main
StancaPop 2019-10-02 14:42:41 +03:00 committed by GitHub
parent e45f014138 994bb6d0cf
commit 9c9ce928d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/spi_engine/axi_spi_engine/axi_spi_engine.v
View File

@ -121,8 +121,9 @@ module axi_spi_engine #(
output offload0_mem_reset, output offload0_mem_reset,
output offload0_enable, output offload0_enable,
input offload0_enabled input offload0_enabled,
); output reg [31:0] pulse_gen_period,
output reg pulse_gen_load);
localparam PCORE_VERSION = 'h010071; localparam PCORE_VERSION = 'h010071;
localparam S_AXI = 0; localparam S_AXI = 0;
@ -281,18 +282,29 @@ module axi_spi_engine #(
reg offload0_mem_reset_reg; reg offload0_mem_reset_reg;
wire offload0_enabled_s; wire offload0_enabled_s;
always @(posedge clk) begin
if ((up_waddr_s == 8'h48) && (up_wreq_s == 1'b1)) begin
pulse_gen_load <= 1'b1;
end else begin
pulse_gen_load <= 1'b0;
end
end
// the software reset should reset all the registers // the software reset should reset all the registers
always @(posedge clk) begin always @(posedge clk) begin
if (up_sw_resetn == 1'b0) begin if (up_sw_resetn == 1'b0) begin
up_irq_mask <= 'h00; up_irq_mask <= 'h00;
offload0_enable_reg <= 1'b0; offload0_enable_reg <= 1'b0;
offload0_mem_reset_reg <= 1'b0; offload0_mem_reset_reg <= 1'b0;
pulse_gen_period <= 'h00;
end else begin end else begin
if (up_wreq_s) begin if (up_wreq_s) begin
case (up_waddr_s) case (up_waddr_s)
8'h20: up_irq_mask <= up_wdata_s; 8'h20: up_irq_mask <= up_wdata_s;
8'h40: offload0_enable_reg <= up_wdata_s[0]; 8'h40: offload0_enable_reg <= up_wdata_s[0];
8'h42: offload0_mem_reset_reg <= up_wdata_s[0]; 8'h42: offload0_mem_reset_reg <= up_wdata_s[0];
8'h48: pulse_gen_period <= up_wdata_s;
endcase endcase
end end
end end
@ -324,6 +336,7 @@ module axi_spi_engine #(
8'h3c: up_rdata_ff <= sdi_fifo_out_data; /* PEEK register */ 8'h3c: up_rdata_ff <= sdi_fifo_out_data; /* PEEK register */
8'h40: up_rdata_ff <= {offload0_enable_reg}; 8'h40: up_rdata_ff <= {offload0_enable_reg};
8'h41: up_rdata_ff <= {offload0_enabled_s}; 8'h41: up_rdata_ff <= {offload0_enabled_s};
8'h48: up_rdata_ff <= pulse_gen_period;
default: up_rdata_ff <= 'h00; default: up_rdata_ff <= 'h00;
endcase endcase
end end

11
projects/adaq7980_sdz/common/adaq7980_bd.tcl
View File

@ -17,11 +17,14 @@ current_bd_instance /spi
ad_ip_instance spi_engine_offload offload ad_ip_instance spi_engine_offload offload
ad_ip_instance spi_engine_interconnect interconnect ad_ip_instance spi_engine_interconnect interconnect
ad_ip_instance util_pulse_gen trigger_gen ad_ip_instance util_pulse_gen trigger_gen
ad_ip_instance xlconstant trigger_gen_pulse_width
ad_ip_parameter offload CONFIG.DATA_WIDTH 16 ad_ip_parameter offload CONFIG.DATA_WIDTH 16
ad_ip_parameter axi CONFIG.DATA_WIDTH 16 ad_ip_parameter axi CONFIG.DATA_WIDTH 16
ad_ip_parameter interconnect CONFIG.DATA_WIDTH 16 ad_ip_parameter interconnect CONFIG.DATA_WIDTH 16
ad_ip_parameter execution CONFIG.DATA_WIDTH 16 ad_ip_parameter execution CONFIG.DATA_WIDTH 16
ad_ip_parameter trigger_gen_pulse_width CONFIG.CONST_WIDTH 32
ad_ip_parameter trigger_gen_pulse_width CONFIG.CONST_VAL 1
## to setup the sample rate of the system change the PULSE_PERIOD value ## to setup the sample rate of the system change the PULSE_PERIOD value
## the acutal sample rate will be PULSE_PERIOD * (1/sys_cpu_clk) ## the acutal sample rate will be PULSE_PERIOD * (1/sys_cpu_clk)
@ -53,12 +56,10 @@ current_bd_instance /spi
ad_connect axi/spi_resetn execution/resetn ad_connect axi/spi_resetn execution/resetn
ad_connect axi/spi_resetn interconnect/resetn ad_connect axi/spi_resetn interconnect/resetn
ad_connect axi/spi_resetn trigger_gen/rstn ad_connect axi/spi_resetn trigger_gen/rstn
ad_connect trigger_gen/load_config GND ad_connect trigger_gen/load_config axi/pulse_gen_load
ad_connect trigger_gen/pulse_width GND ad_connect trigger_gen/pulse_period axi/pulse_gen_period
ad_connect trigger_gen/pulse_period GND ad_connect trigger_gen_pulse_width/dout trigger_gen/pulse_width
ad_connect trigger_gen/pulse offload/trigger ad_connect trigger_gen/pulse offload/trigger
ad_connect resetn axi/s_axi_aresetn ad_connect resetn axi/s_axi_aresetn
ad_connect irq axi/irq ad_connect irq axi/irq