From ca58894c02b3e44643980634d16f9084a1ae27df Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Thu, 3 Nov 2022 07:28:16 +0100
Subject: [PATCH] Correct g_dsp_data_w = g_subband_raw_dat_w in
u_reorder_col_wide.
---
.../lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
index 1d8dcd661b..523a0b955f 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
@@ -44,8 +44,9 @@ ENTITY node_sdp_beamformer IS
g_sim_sdp : t_sdp_sim := c_sdp_sim;
g_beamset_id : NATURAL := 0;
g_scope_selected_beamlet : NATURAL := 0;
- g_subband_raw_dat_w : NATURAL := c_sdp_W_subband;
- g_subband_raw_fraction_w : NATURAL := 0
+ -- Use no default raw width, to force instance to set it
+ g_subband_raw_dat_w : NATURAL; -- default: c_sdp_W_subband;
+ g_subband_raw_fraction_w : NATURAL -- default: 0
);
PORT (
dp_clk : IN STD_LOGIC;
@@ -151,7 +152,7 @@ BEGIN
u_reorder_col_wide : ENTITY reorder_lib.reorder_col_wide
GENERIC MAP (
g_wb_factor => c_sdp_P_pfb, -- g_wb_factor is only used for number of parallel streams
- g_dsp_data_w => c_sdp_W_subband,
+ g_dsp_data_w => g_subband_raw_dat_w,
g_nof_ch_in => c_sdp_N_sub * c_sdp_Q_fft,
g_nof_ch_sel => c_sdp_S_sub_bf * c_sdp_Q_fft,
g_select_file_prefix => c_bf_select_file_prefix,
--
GitLab