From 4247f76dfc200f36a58d7f59f60c622a695b22f6 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Thu, 7 Jun 2018 15:46:50 +0000
Subject: [PATCH] Use dp_concat_field_blk.vhd instead of dp_offload_tx.vhd.
---
.../apertif_unb1_correlator_vis_offload.vhd | 23 ++++++++-----------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
index de148e8f65..6255170c51 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
@@ -108,9 +108,6 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
CONSTANT c_nof_hdr_words : NATURAL := field_slv_len(c_hdr_field_arr)/c_tech_tse_data_w;
CONSTANT c_nof_offload_streams : NATURAL := 1;
- CONSTANT c_nof_words_per_block : NATURAL := 2*g_nof_visibilities; -- factor 2 because of 64b->32b interleaving.
- CONSTANT c_nof_blocks_per_packet : NATURAL := 1;
-
SIGNAL dp_offload_tx_snk_in_arr : t_dp_sosi_arr(c_nof_offload_streams-1 DOWNTO 0);
SIGNAL dp_offload_tx_snk_out_arr : t_dp_siso_arr(c_nof_offload_streams-1 DOWNTO 0);
@@ -139,16 +136,14 @@ BEGIN
---------------------------------------------------------------------------------------
snk_out <= dp_offload_tx_snk_out_arr(0);
- u_dp_offload_tx : ENTITY dp_lib.dp_offload_tx
+ u_dp_concat_field_blk : ENTITY dp_lib.dp_concat_field_blk
GENERIC MAP (
- g_nof_streams => c_nof_offload_streams,
- g_data_w => c_tech_tse_data_w,
- g_use_complex => FALSE,
- g_nof_words_per_block => c_nof_words_per_block,
- g_nof_blocks_per_packet => c_nof_blocks_per_packet,
- g_hdr_field_arr => c_hdr_field_arr,
- g_hdr_field_sel => c_hdr_field_sel
- )
+ g_nof_streams => c_nof_offload_streams,
+ g_data_w => c_tech_tse_data_w, -- = c_word_sz = 32b
+ g_symbol_w => c_tech_tse_data_w, -- = c_word_sz = 32b
+ g_hdr_field_arr => c_hdr_field_arr,
+ g_hdr_field_sel => c_hdr_field_sel
+ )
PORT MAP (
mm_rst => mm_rst,
mm_clk => mm_clk,
@@ -158,14 +153,14 @@ BEGIN
reg_hdr_dat_mosi => reg_dp_offload_tx_hdr_dat_mosi,
reg_hdr_dat_miso => reg_dp_offload_tx_hdr_dat_miso,
-
+
snk_in_arr => dp_offload_tx_snk_in_arr,
snk_out_arr => dp_offload_tx_snk_out_arr,
src_out_arr => dp_offload_tx_src_out_arr,
src_in_arr => dp_offload_tx_src_in_arr,
- hdr_fields_in_arr => hdr_fields_in_arr
+ hdr_fields_in_arr => hdr_fields_in_arr -- hdr_fields_in_arr(i) is considered valid @ snk_in_arr(i).sop
);
src_out <= dp_offload_tx_src_out_arr(0);
--
GitLab