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

daq1: Updated project with interrupts in IPI to work correctly in Linux

main
Adrian Costina 2015-03-17 17:41:51 +02:00
parent cdd8965035
commit 1edec41cf8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/daq1/common/daq1_bd.tcl
View File

@ -50,7 +50,6 @@ set tx_data_n [create_bd_port -dir O -from 15 -to 0 tx_data_n]
# interrupts # interrupts
set ad9250_dma_irq [create_bd_port -dir O ad9250_dma_irq]
set ad9122_dma_irq [create_bd_port -dir O ad9122_dma_irq] set ad9122_dma_irq [create_bd_port -dir O ad9122_dma_irq]
# dac peripherals # dac peripherals
@ -181,7 +180,6 @@ connect_bd_net -net axi_ad9250_adc_dovf [get_bd_pins axi_ad9250_core/a
connect_bd_net -net axi_ad9250_dma_wr [get_bd_pins axi_ad9250_dma/fifo_wr_en] [get_bd_ports adc_dwr] connect_bd_net -net axi_ad9250_dma_wr [get_bd_pins axi_ad9250_dma/fifo_wr_en] [get_bd_ports adc_dwr]
connect_bd_net -net axi_ad9250_dma_sync [get_bd_pins axi_ad9250_dma/fifo_wr_sync] [get_bd_ports adc_dsync] connect_bd_net -net axi_ad9250_dma_sync [get_bd_pins axi_ad9250_dma/fifo_wr_sync] [get_bd_ports adc_dsync]
connect_bd_net -net axi_ad9250_dma_data [get_bd_pins axi_ad9250_dma/fifo_wr_din] [get_bd_ports adc_ddata] connect_bd_net -net axi_ad9250_dma_data [get_bd_pins axi_ad9250_dma/fifo_wr_din] [get_bd_ports adc_ddata]
connect_bd_net -net axi_ad9250_dma_irq [get_bd_pins axi_ad9250_dma/irq] [get_bd_ports ad9250_dma_irq]
connect_bd_net -net axi_ad9250_adc_clk [get_bd_ports adc_clk] connect_bd_net -net axi_ad9250_adc_clk [get_bd_ports adc_clk]
@ -205,10 +203,16 @@ connect_bd_net -net axi_ad9122_dac_ddata_1 [get_bd_pins axi_ad9122_core/d
connect_bd_net -net axi_ad9122_dma_drd [get_bd_pins axi_ad9122_dma/fifo_rd_en] [get_bd_ports dac_drd] connect_bd_net -net axi_ad9122_dma_drd [get_bd_pins axi_ad9122_dma/fifo_rd_en] [get_bd_ports dac_drd]
connect_bd_net -net axi_ad9122_dma_ddata [get_bd_pins axi_ad9122_dma/fifo_rd_dout] [get_bd_ports dac_ddata] connect_bd_net -net axi_ad9122_dma_ddata [get_bd_pins axi_ad9122_dma/fifo_rd_dout] [get_bd_ports dac_ddata]
connect_bd_net -net axi_ad9122_dac_dunf [get_bd_pins axi_ad9122_core/dac_dunf] [get_bd_pins axi_ad9122_dma/fifo_rd_underflow] connect_bd_net -net axi_ad9122_dac_dunf [get_bd_pins axi_ad9122_core/dac_dunf] [get_bd_pins axi_ad9122_dma/fifo_rd_underflow]
connect_bd_net -net axi_ad9122_dma_irq [get_bd_pins axi_ad9122_dma/irq] [get_bd_ports ad9122_dma_irq]
connect_bd_net -net axi_ad9122_dac_div_clk [get_bd_ports dac_clk] connect_bd_net -net axi_ad9122_dac_div_clk [get_bd_ports dac_clk]
# interrupts
delete_bd_objs [get_bd_nets ps_intr_12_s] [get_bd_ports ps_intr_12]
delete_bd_objs [get_bd_nets ps_intr_13_s] [get_bd_ports ps_intr_13]
connect_bd_net -net axi_ad9122_dma_irq [get_bd_pins axi_ad9122_dma/irq] [get_bd_pins sys_concat_intc/In12]
connect_bd_net -net axi_ad9250_dma_irq [get_bd_pins axi_ad9250_dma/irq] [get_bd_pins sys_concat_intc/In13]
# interconnect (cpu) # interconnect (cpu)
connect_bd_intf_net -intf_net axi_cpu_interconnect_m07_axi [get_bd_intf_pins axi_cpu_interconnect/M07_AXI] [get_bd_intf_pins axi_ad9122_dma/s_axi] connect_bd_intf_net -intf_net axi_cpu_interconnect_m07_axi [get_bd_intf_pins axi_cpu_interconnect/M07_AXI] [get_bd_intf_pins axi_ad9122_dma/s_axi]

4
projects/daq1/zc706/system_top.v
View File

@ -373,8 +373,6 @@ module system_top (
.ps_intr_1 (ps_intrs[1]), .ps_intr_1 (ps_intrs[1]),
.ps_intr_10 (ps_intrs[10]), .ps_intr_10 (ps_intrs[10]),
.ps_intr_11 (ps_intrs[11]), .ps_intr_11 (ps_intrs[11]),
.ps_intr_12 (ps_intrs[12]),
.ps_intr_13 (ps_intrs[13]),
.ps_intr_2 (ps_intrs[2]), .ps_intr_2 (ps_intrs[2]),
.ps_intr_3 (ps_intrs[3]), .ps_intr_3 (ps_intrs[3]),
.ps_intr_4 (ps_intrs[4]), .ps_intr_4 (ps_intrs[4]),
@ -383,8 +381,6 @@ module system_top (
.ps_intr_7 (ps_intrs[7]), .ps_intr_7 (ps_intrs[7]),
.ps_intr_8 (ps_intrs[8]), .ps_intr_8 (ps_intrs[8]),
.ps_intr_9 (ps_intrs[9]), .ps_intr_9 (ps_intrs[9]),
.ad9250_dma_irq (ps_intrs[13]),
.ad9122_dma_irq (ps_intrs[12]),
.rx_data_n (rx_data_n), .rx_data_n (rx_data_n),
.rx_data_p (rx_data_p), .rx_data_p (rx_data_p),
.rx_ref_clk (rx_ref_clk), .rx_ref_clk (rx_ref_clk),