From 49dc6863523f49bdff2bae4f5a8cbc453a1d9931 Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Fri, 25 Jun 2021 15:14:18 +0200
Subject: [PATCH] updated tb_lofar2_unb2b_sdp_station_bf_bst_offload.vhd
---
...tb_lofar2_unb2b_sdp_station_bf_bst_offload.vhd | 6 +++---
.../lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd | 15 +++++++--------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf_bst_offload.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf_bst_offload.vhd
index 429a7d3eab..6d2fd81124 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf_bst_offload.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf_bst_offload.vhd
@@ -76,8 +76,8 @@ ARCHITECTURE tb OF tb_lofar2_unb2b_sdp_station_bf_bst_offload IS
CONSTANT c_wpfb_sim : t_wpfb := func_wpfb_set_nof_block_per_sync(c_sdp_wpfb_subbands, c_nof_block_per_sync);
-- MM
- CONSTANT c_mm_file_reg_bsn_source_v2 : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_BSN_SOURCE_V2";
- CONSTANT c_mm_file_reg_stat_enable_bst_0 : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_STAT_ENABLE_BST_0";
+ CONSTANT c_mm_file_reg_bsn_source_v2 : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_BSN_SOURCE_V2";
+ CONSTANT c_mm_file_reg_stat_enable_bst : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_STAT_ENABLE_BST";
-- Tb
SIGNAL tb_end : STD_LOGIC := '0';
@@ -217,7 +217,7 @@ BEGIN
----------------------------------------------------------------------------
-- Offload enable
----------------------------------------------------------------------------
- mmf_mm_bus_wr(c_mm_file_reg_stat_enable_bst_0, 0, 1, tb_clk);
+ mmf_mm_bus_wr(c_mm_file_reg_stat_enable_bst, 0, 1, tb_clk);
-- wait for udp offload is done
proc_common_wait_until_high(ext_clk, eth_done);
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
index 2f50920b76..25745ee6f4 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
@@ -139,14 +139,6 @@ PACKAGE sdp_pkg is
true, 54, 2, 195313, c_fft_pipeline, c_fft_pipeline,
c_fil_ppf_pipeline);
- -- ST UDP offload MM address widths
- CONSTANT c_sdp_reg_stat_enable_addr_w : NATURAL := 1;
-
- -- 10GbE MM address widths
- CONSTANT c_sdp_reg_hdr_dat_addr_w : NATURAL := ceil_log2(c_sdp_N_beamsets) + ceil_log2(field_nof_words(c_sdp_cep_hdr_field_arr, c_word_w));
- CONSTANT c_sdp_reg_nw_10GbE_mac_addr_w : NATURAL := 13;
- CONSTANT c_sdp_reg_nw_10GbE_eth10g_addr_w : NATURAL := 1;
-
-- statistics offload
-- The statistics offload uses the same 1GbE port as the NiosII for M&C. The 1GbE addresses defined in SW and here in FW.
-- See NiosII code:
@@ -273,6 +265,13 @@ PACKAGE sdp_pkg is
( field_name_pad("dp_bsn" ), "RW", 64, field_default(0) )
);
+ -- ST UDP offload MM address widths
+ CONSTANT c_sdp_reg_stat_enable_addr_w : NATURAL := 1;
+
+ -- 10GbE MM address widths
+ CONSTANT c_sdp_reg_hdr_dat_addr_w : NATURAL := ceil_log2(c_sdp_N_beamsets) + ceil_log2(field_nof_words(c_sdp_cep_hdr_field_arr, c_word_w));
+ CONSTANT c_sdp_reg_nw_10GbE_mac_addr_w : NATURAL := 13;
+ CONSTANT c_sdp_reg_nw_10GbE_eth10g_addr_w : NATURAL := 1;
-- JESD204
CONSTANT c_sdp_jesd204b_freq : STRING := "200MHz";
--
GitLab