Skip to content
Snippets Groups Projects
Commit 83841a07 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Correct c_sdp_subband_equalizer_latency = 7, to account for added msb and lsb...

Correct c_sdp_subband_equalizer_latency = 7, to account for added msb and lsb pipeline in requantizer.
parent ca58894c
No related branches found
No related tags found
1 merge request!289Rename c_sdp_W_fsub_wg into c_sdp_W_local_oscillator. Use...
...@@ -118,8 +118,6 @@ ARCHITECTURE str OF node_sdp_filterbank IS ...@@ -118,8 +118,6 @@ ARCHITECTURE str OF node_sdp_filterbank IS
CONSTANT c_coefs_file_prefix : STRING := "data/Coeffs16384Kaiser-quant_1wb"; CONSTANT c_coefs_file_prefix : STRING := "data/Coeffs16384Kaiser-quant_1wb";
CONSTANT c_gains_file_name : STRING := "data/gains_1024_complex_16b13f_unit"; -- Can be generated by src/python/sdp_hex.py CONSTANT c_gains_file_name : STRING := "data/gains_1024_complex_16b13f_unit"; -- Can be generated by src/python/sdp_hex.py
CONSTANT c_subband_equalizer_latency : NATURAL := 5;
CONSTANT c_nof_masters : POSITIVE := 2; -- for M&C MM access and for statistics offload MM access CONSTANT c_nof_masters : POSITIVE := 2; -- for M&C MM access and for statistics offload MM access
CONSTANT c_fft : t_fft := func_wpfb_map_wpfb_parameters_to_fft(g_wpfb); CONSTANT c_fft : t_fft := func_wpfb_map_wpfb_parameters_to_fft(g_wpfb);
...@@ -275,7 +273,7 @@ BEGIN ...@@ -275,7 +273,7 @@ BEGIN
u_dp_selector_arr : ENTITY dp_lib.dp_selector_arr u_dp_selector_arr : ENTITY dp_lib.dp_selector_arr
GENERIC MAP ( GENERIC MAP (
g_nof_arr => c_sdp_P_pfb, g_nof_arr => c_sdp_P_pfb,
g_pipeline => c_subband_equalizer_latency g_pipeline => c_sdp_subband_equalizer_latency
) )
PORT MAP ( PORT MAP (
mm_rst => mm_rst, mm_rst => mm_rst,
......
...@@ -102,7 +102,9 @@ ARCHITECTURE str OF node_sdp_oversampled_filterbank IS ...@@ -102,7 +102,9 @@ ARCHITECTURE str OF node_sdp_oversampled_filterbank IS
CONSTANT c_coefs_file_prefix : STRING := "data/Coeffs16384Kaiser-quant_1wb"; CONSTANT c_coefs_file_prefix : STRING := "data/Coeffs16384Kaiser-quant_1wb";
CONSTANT c_gains_file_name : STRING := "data/gains_1024_complex_16b13f_unit"; -- Can be generated by src/python/sdp_hex.py CONSTANT c_gains_file_name : STRING := "data/gains_1024_complex_16b13f_unit"; -- Can be generated by src/python/sdp_hex.py
CONSTANT c_subband_equalizer_latency : NATURAL := 5; -- Use quantized subbands
CONSTANT c_subband_raw_dat_w : NATURAL := c_sdp_W_subband;
CONSTANT c_subband_raw_fraction_w : NATURAL := 0;
CONSTANT c_nof_masters : POSITIVE := 2; CONSTANT c_nof_masters : POSITIVE := 2;
...@@ -538,7 +540,9 @@ BEGIN ...@@ -538,7 +540,9 @@ BEGIN
u_sdp_subband_equalizer : ENTITY work.sdp_subband_equalizer u_sdp_subband_equalizer : ENTITY work.sdp_subband_equalizer
GENERIC MAP ( GENERIC MAP (
g_gains_file_name => c_gains_file_name, g_gains_file_name => c_gains_file_name,
g_nof_streams => c_sdp_R_os * c_sdp_P_pfb g_nof_streams => c_sdp_R_os * c_sdp_P_pfb,
g_raw_dat_w => c_subband_raw_dat_w,
g_raw_fraction_w => c_subband_raw_fraction_w
) )
PORT MAP( PORT MAP(
dp_clk => dp_clk, dp_clk => dp_clk,
...@@ -563,7 +567,7 @@ BEGIN ...@@ -563,7 +567,7 @@ BEGIN
u_dp_selector_arr : ENTITY dp_lib.dp_selector_arr u_dp_selector_arr : ENTITY dp_lib.dp_selector_arr
GENERIC MAP ( GENERIC MAP (
g_nof_arr => c_sdp_R_os * c_sdp_P_pfb, g_nof_arr => c_sdp_R_os * c_sdp_P_pfb,
g_pipeline => c_subband_equalizer_latency g_pipeline => c_sdp_subband_equalizer_latency
) )
PORT MAP ( PORT MAP (
mm_rst => mm_rst, mm_rst => mm_rst,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment