From b71d069daf9f46c3e26160b8c44588b9a5688aea Mon Sep 17 00:00:00 2001 From: Reinier van der Walle <walle@astron.nl> Date: Tue, 9 Feb 2021 15:08:53 +0100 Subject: [PATCH] Updated g_sdp_wpfb --- .../lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd index d20dee52d2..051475bce5 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd @@ -107,18 +107,30 @@ PACKAGE sdp_pkg is -- In SDP c_nof_channels = 2**nof_chan = 1 and wb_factor = 1, -- therefore these parameters are not explicitly used in calculation of derived constants + -- LTS 2020_11_23: + --CONSTANT c_sdp_wpfb_subbands : t_wpfb := + -- (1, c_sdp_N_fft, 0, c_sdp_P_pfb, + -- c_sdp_N_taps, 1, c_sdp_W_adc, 16, c_sdp_W_fir_coef, + -- true, false, true, 16, c_sdp_W_subband, 1, 18, 2, + -- true, 54, 2, 195313, c_fft_pipeline, c_fft_pipeline, + -- c_fil_ppf_pipeline); + -- LTS 2021-02-03, changes based on results from u_wpfb_stage22 in tb_tb_verify_pfb_wg.vhd: + -- . fil_backoff_w = 0 (was 1) + -- . fil_out_dat_w = fft_in_dat_w = 17 (was 16) + -- . g_fft_out_gain_w = 0 (was 1) + -- . g_fft_stage_dat_w = 22 (was 18) + -- . g_fft_guard_w = 1 (was 2) CONSTANT c_sdp_wpfb_subbands : t_wpfb := - (1, c_sdp_N_fft, 0, c_sdp_P_pfb, - c_sdp_N_taps, 1, c_sdp_W_adc, 16, c_sdp_W_fir_coef, - true, false, true, 16, c_sdp_W_subband, 1, 18, 2, - true, 54, 2, 195313, c_fft_pipeline, c_fft_pipeline, - c_fil_ppf_pipeline); + (1, c_sdp_N_fft, 0, c_sdp_P_pfb, + c_sdp_N_taps, 0, c_sdp_W_adc, 17, c_sdp_W_fir_coef, + true, false, true, 17, c_sdp_W_subband, 0, 22, 1, + true, 54, 2, 195313, c_fft_pipeline, c_fft_pipeline, + c_fil_ppf_pipeline); -- JESD204 CONSTANT c_sdp_jesd204b_bus_w : NATURAL := 12; CONSTANT c_sdp_jesd204b_nof_bus : NATURAL := 1; - -- AIT MM address widths CONSTANT c_sdp_jesd204b_addr_w : NATURAL := 8 + ceil_log2(c_sdp_S_pn); CONSTANT c_sdp_reg_bsn_monitor_input_addr_w : NATURAL := 8; -- GitLab