diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd index 0ca713bb2c374871edd6654c8eb6de3926c2ea0c..b056fc1b37554cb8680bf308636c05be50f0dfc8 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd @@ -48,6 +48,7 @@ USE work.sdp_pkg.ALL; ENTITY node_sdp_filterbank IS GENERIC ( g_sim : BOOLEAN := FALSE; + g_wpfb : t_wpfb := c_sdp_wpfb_subbands; g_scope_selected_subband : NATURAL := 0 ); PORT ( @@ -71,7 +72,7 @@ END node_sdp_filterbank; ARCHITECTURE str OF node_sdp_filterbank IS - CONSTANT c_coefs_file_prefix : STRING := "UNUSED"; --"data/coefs_wide"; + CONSTANT c_coefs_file_prefix : STRING := "data/Coeffs16384Kaiser-quant_1wb"; SIGNAL ram_st_sst_mosi_arr : t_mem_mosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_mem_mosi_rst); SIGNAL ram_st_sst_miso_arr : t_mem_miso_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_mem_miso_rst); @@ -121,7 +122,7 @@ BEGIN -- PFB u_wpfb_unit_dev : ENTITY wpfb_lib.wpfb_unit_dev GENERIC MAP ( - g_wpfb => c_sdp_wpfb_subbands, + g_wpfb => g_wpfb, g_use_prefilter => TRUE, g_stats_ena => FALSE, g_use_bg => FALSE, @@ -150,10 +151,11 @@ BEGIN gen_stats_streams: FOR I IN 0 TO c_sdp_P_pfb-1 GENERATE u_subband_stats : ENTITY st_lib.st_sst GENERIC MAP( - g_nof_stat => c_sdp_N_fft, + g_nof_stat => c_sdp_N_sub, + g_xst_enable => TRUE, g_in_data_w => c_sdp_W_subband, - g_stat_data_w => c_sdp_wpfb_subbands.stat_data_w, - g_stat_data_sz => c_sdp_wpfb_subbands.stat_data_sz + g_stat_data_w => g_wpfb.stat_data_w, + g_stat_data_sz => g_wpfb.stat_data_sz ) PORT MAP ( mm_rst => mm_rst, @@ -174,7 +176,7 @@ BEGIN u_mem_mux_sst : ENTITY common_lib.common_mem_mux GENERIC MAP ( g_nof_mosi => c_sdp_P_pfb, - g_mult_addr_w => ceil_log2(c_sdp_N_sub*c_sdp_Q_fft*c_sdp_wpfb_subbands.stat_data_sz) + g_mult_addr_w => ceil_log2(c_sdp_N_sub*c_sdp_Q_fft*g_wpfb.stat_data_sz) ) PORT MAP ( mosi => ram_st_sst_mosi,