From 86c20c7c6f0a6e4eae3b6e994b0f72fac297069b Mon Sep 17 00:00:00 2001 From: Pepping <pepping> Date: Wed, 20 Apr 2016 15:13:39 +0000 Subject: [PATCH] ADded entry for reg_dp_xonoff --- .../vhdl/apertif_unb1_correlator_nodes.vhd | 81 ++++++++++--------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_nodes.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_nodes.vhd index da8547653b..a09139c3e6 100644 --- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_nodes.vhd +++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_nodes.vhd @@ -131,7 +131,7 @@ END apertif_unb1_correlator_nodes; ARCHITECTURE str OF apertif_unb1_correlator_nodes IS -- Firmware version x.y - CONSTANT c_fw_version : t_unb1_board_fw_version := (0, 8); + CONSTANT c_fw_version : t_unb1_board_fw_version := (0, 11); CONSTANT c_nof_nodes : NATURAL := 8; CONSTANT c_nof_bf_modules : NATURAL := c_bf.nof_bf_units; -- We have 4 BF modules here because each sending fn_beamformer design has 4 bf units. @@ -270,7 +270,9 @@ ARCHITECTURE str OF apertif_unb1_correlator_nodes IS SIGNAL reg_diag_bg_proc_mosi : t_mem_mosi; SIGNAL reg_diag_bg_proc_miso : t_mem_miso; SIGNAL ram_diag_bg_proc_mosi : t_mem_mosi; - SIGNAL ram_diag_bg_proc_miso : t_mem_miso; + SIGNAL ram_diag_bg_proc_miso : t_mem_miso; + SIGNAL reg_dp_xonoff_output_mosi : t_mem_mosi; + SIGNAL reg_dp_xonoff_output_miso : t_mem_miso; SIGNAL reg_mdio_mosi_arr : t_mem_mosi_arr(c_unb1_board_nof_mdio-1 DOWNTO 0); SIGNAL reg_mdio_miso_arr : t_mem_miso_arr(c_unb1_board_nof_mdio-1 DOWNTO 0); @@ -490,7 +492,10 @@ BEGIN src_in => udp_tx_snk_out_arr(0), reg_dp_offload_tx_hdr_dat_mosi => reg_dp_offload_tx_hdr_dat_mosi, - reg_dp_offload_tx_hdr_dat_miso => reg_dp_offload_tx_hdr_dat_miso, + reg_dp_offload_tx_hdr_dat_miso => reg_dp_offload_tx_hdr_dat_miso, + + reg_dp_xonoff_output_mosi => reg_dp_xonoff_output_mosi, + reg_dp_xonoff_output_miso => reg_dp_xonoff_output_miso, ID => ID ); @@ -632,40 +637,42 @@ BEGIN reg_dp_bsn_align_input_miso => reg_dp_bsn_align_input_miso, reg_dp_fifo_fill_mosi => reg_dp_fifo_fill_mosi, reg_dp_fifo_fill_miso => reg_dp_fifo_fill_miso, - reg_diag_data_buffer_mesh_mosi => reg_diag_data_buf_mesh_mosi, - reg_diag_data_buffer_mesh_miso => reg_diag_data_buf_mesh_miso, - ram_diag_data_buffer_mesh_mosi => ram_diag_data_buf_mesh_mosi, - ram_diag_data_buffer_mesh_miso => ram_diag_data_buf_mesh_miso, - ram_fil_coefs_mosi => ram_fil_coefs_mosi, - ram_fil_coefs_miso => ram_fil_coefs_miso, - reg_mdio_0_mosi => reg_mdio_0_mosi, - reg_mdio_0_miso => reg_mdio_0_miso, - reg_mdio_1_mosi => reg_mdio_1_mosi, - reg_mdio_1_miso => reg_mdio_1_miso, - reg_mdio_2_mosi => reg_mdio_2_mosi, - reg_mdio_2_miso => reg_mdio_2_miso, - reg_dp_offload_rx_hdr_dat_mosi => reg_dp_offload_rx_hdr_dat_mosi, - reg_dp_offload_rx_hdr_dat_miso => reg_dp_offload_rx_hdr_dat_miso, - reg_dp_offload_tx_hdr_dat_mosi => reg_dp_offload_tx_hdr_dat_mosi, - reg_dp_offload_tx_hdr_dat_miso => reg_dp_offload_tx_hdr_dat_miso, - reg_tr_10gbe_mosi => reg_tr_10gbe_mosi, - reg_tr_10gbe_miso => reg_tr_10gbe_miso, - reg_tr_xaui_mosi => reg_tr_xaui_mosi, - reg_tr_xaui_miso => reg_tr_xaui_miso, - reg_bsn_monitor_input_mosi => reg_bsn_monitor_input_mosi, - reg_bsn_monitor_input_miso => reg_bsn_monitor_input_miso, - reg_bsn_monitor_proc_mosi => reg_bsn_monitor_proc_mosi, - reg_bsn_monitor_proc_miso => reg_bsn_monitor_proc_miso, - reg_diag_data_buffer_proc_mosi => reg_diag_data_buf_proc_mosi, - reg_diag_data_buffer_proc_miso => reg_diag_data_buf_proc_miso, - ram_diag_data_buffer_proc_mosi => ram_diag_data_buf_proc_mosi, - ram_diag_data_buffer_proc_miso => ram_diag_data_buf_proc_miso, - ram_st_sst_mosi => ram_st_sst_mosi, - ram_st_sst_miso => ram_st_sst_miso, - reg_diag_bg_proc_mosi => reg_diag_bg_proc_mosi, - reg_diag_bg_proc_miso => reg_diag_bg_proc_miso, - ram_diag_bg_proc_mosi => ram_diag_bg_proc_mosi, - ram_diag_bg_proc_miso => ram_diag_bg_proc_miso + reg_diag_data_buffer_mesh_mosi => reg_diag_data_buf_mesh_mosi, + reg_diag_data_buffer_mesh_miso => reg_diag_data_buf_mesh_miso, + ram_diag_data_buffer_mesh_mosi => ram_diag_data_buf_mesh_mosi, + ram_diag_data_buffer_mesh_miso => ram_diag_data_buf_mesh_miso, + ram_fil_coefs_mosi => ram_fil_coefs_mosi, + ram_fil_coefs_miso => ram_fil_coefs_miso, + reg_mdio_0_mosi => reg_mdio_0_mosi, + reg_mdio_0_miso => reg_mdio_0_miso, + reg_mdio_1_mosi => reg_mdio_1_mosi, + reg_mdio_1_miso => reg_mdio_1_miso, + reg_mdio_2_mosi => reg_mdio_2_mosi, + reg_mdio_2_miso => reg_mdio_2_miso, + reg_dp_offload_rx_hdr_dat_mosi => reg_dp_offload_rx_hdr_dat_mosi, + reg_dp_offload_rx_hdr_dat_miso => reg_dp_offload_rx_hdr_dat_miso, + reg_dp_offload_tx_hdr_dat_mosi => reg_dp_offload_tx_hdr_dat_mosi, + reg_dp_offload_tx_hdr_dat_miso => reg_dp_offload_tx_hdr_dat_miso, + reg_tr_10gbe_mosi => reg_tr_10gbe_mosi, + reg_tr_10gbe_miso => reg_tr_10gbe_miso, + reg_tr_xaui_mosi => reg_tr_xaui_mosi, + reg_tr_xaui_miso => reg_tr_xaui_miso, + reg_bsn_monitor_input_mosi => reg_bsn_monitor_input_mosi, + reg_bsn_monitor_input_miso => reg_bsn_monitor_input_miso, + reg_bsn_monitor_proc_mosi => reg_bsn_monitor_proc_mosi, + reg_bsn_monitor_proc_miso => reg_bsn_monitor_proc_miso, + reg_diag_data_buffer_proc_mosi => reg_diag_data_buf_proc_mosi, + reg_diag_data_buffer_proc_miso => reg_diag_data_buf_proc_miso, + ram_diag_data_buffer_proc_mosi => ram_diag_data_buf_proc_mosi, + ram_diag_data_buffer_proc_miso => ram_diag_data_buf_proc_miso, + ram_st_sst_mosi => ram_st_sst_mosi, + ram_st_sst_miso => ram_st_sst_miso, + reg_diag_bg_proc_mosi => reg_diag_bg_proc_mosi, + reg_diag_bg_proc_miso => reg_diag_bg_proc_miso, + ram_diag_bg_proc_mosi => ram_diag_bg_proc_mosi, + ram_diag_bg_proc_miso => ram_diag_bg_proc_miso, + reg_dp_xonoff_output_mosi => reg_dp_xonoff_output_mosi, + reg_dp_xonoff_output_miso => reg_dp_xonoff_output_miso ); reg_mdio_mosi_arr(0) <= reg_mdio_0_mosi; -- GitLab