From fac9e49b249acdb89a94b507f204bb4d0e433178 Mon Sep 17 00:00:00 2001 From: Daniel van der Schuur <schuur@astron.nl> Date: Thu, 9 Apr 2015 09:09:41 +0000 Subject: [PATCH] -Fixed dp_offload_tx generic map. --- .../designs/unb1_test/src/vhdl/unb1_test.vhd | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd index 57249fe699..bf0714f790 100644 --- a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd +++ b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd @@ -327,8 +327,7 @@ ARCHITECTURE str OF unb1_test IS SIGNAL reg_dp_offload_tx_miso : t_mem_miso; SIGNAL reg_dp_offload_tx_hdr_dat_mosi : t_mem_mosi; SIGNAL reg_dp_offload_tx_hdr_dat_miso : t_mem_miso; - SIGNAL reg_dp_offload_tx_hdr_ovr_mosi : t_mem_mosi; - SIGNAL reg_dp_offload_tx_hdr_ovr_miso : t_mem_miso; + SIGNAL reg_dp_offload_rx_hdr_dat_mosi : t_mem_mosi; SIGNAL reg_dp_offload_rx_hdr_dat_miso : t_mem_miso; @@ -584,8 +583,8 @@ BEGIN 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_ovr_mosi => reg_dp_offload_tx_hdr_ovr_mosi, - reg_dp_offload_tx_hdr_ovr_miso => reg_dp_offload_tx_hdr_ovr_miso, + reg_dp_offload_tx_hdr_ovr_mosi => OPEN, -- FIXME DS: This MM bus can be removed. + reg_dp_offload_tx_hdr_ovr_miso => c_mem_miso_rst, -- FIXME 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, @@ -650,9 +649,8 @@ BEGIN g_def_nof_words_per_block => c_def_nof_words_per_block, g_max_nof_blocks_per_packet => c_max_nof_blocks_per_packet, g_def_nof_blocks_per_packet => c_def_nof_blocks_per_packet, - g_output_fifo_depth => c_max_frame_nof_words, g_hdr_field_arr => c_hdr_field_arr, - g_hdr_field_ovr_init => c_hdr_field_ovr_init + g_hdr_field_sel => c_hdr_field_ovr_init ) PORT MAP ( mm_rst => mm_rst, @@ -667,9 +665,6 @@ BEGIN reg_hdr_dat_mosi => reg_dp_offload_tx_hdr_dat_mosi, reg_hdr_dat_miso => reg_dp_offload_tx_hdr_dat_miso, - reg_hdr_ovr_mosi => reg_dp_offload_tx_hdr_ovr_mosi, - reg_hdr_ovr_miso => reg_dp_offload_tx_hdr_ovr_miso, - snk_in_arr => block_gen_src_out_arr(c_nof_streams_10GbE-1 DOWNTO 0), snk_out_arr => block_gen_src_in_arr(c_nof_streams_10GbE-1 DOWNTO 0), -- GitLab