Skip to content
Snippets Groups Projects
Commit 5eff5d37 authored by Reinier van der Walle's avatar Reinier van der Walle
Browse files

processed review comments

parent a3536474
No related branches found
No related tags found
2 merge requests!100Removed text for XSub that is now written in Confluence Subband correlator...,!88Resolve L2SDP-288
...@@ -5,7 +5,6 @@ hdl_lib_uses_sim = ...@@ -5,7 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology = hdl_lib_technology =
synth_files = synth_files =
src/vhdl/st_pkg.vhd
src/vhdl/st_acc.vhd src/vhdl/st_acc.vhd
src/vhdl/st_ctrl.vhd src/vhdl/st_ctrl.vhd
src/vhdl/st_calc.vhd src/vhdl/st_calc.vhd
...@@ -18,6 +17,8 @@ synth_files = ...@@ -18,6 +17,8 @@ synth_files =
src/vhdl/mms_st_histogram.vhd src/vhdl/mms_st_histogram.vhd
src/vhdl/st_histogram_8_april.vhd src/vhdl/st_histogram_8_april.vhd
tb/vhdl/tb_st_pkg.vhd
test_bench_files = test_bench_files =
tb/vhdl/tb_st_acc.vhd tb/vhdl/tb_st_acc.vhd
tb/vhdl/tb_st_calc.vhd tb/vhdl/tb_st_calc.vhd
......
...@@ -49,7 +49,6 @@ USE dp_lib.dp_stream_pkg.ALL; ...@@ -49,7 +49,6 @@ USE dp_lib.dp_stream_pkg.ALL;
USE technology_lib.technology_select_pkg.ALL; USE technology_lib.technology_select_pkg.ALL;
ENTITY st_xsq IS ENTITY st_xsq IS
GENERIC ( GENERIC (
g_technology : NATURAL := c_tech_select_default;
g_nof_signal_inputs : NATURAL := 2; g_nof_signal_inputs : NATURAL := 2;
g_nof_crosslets : NATURAL := 1; g_nof_crosslets : NATURAL := 1;
g_in_data_w : NATURAL := 18; -- width of the data to be accumulated g_in_data_w : NATURAL := 18; -- width of the data to be accumulated
...@@ -143,7 +142,6 @@ BEGIN ...@@ -143,7 +142,6 @@ BEGIN
--------------------------------------------------------------- ---------------------------------------------------------------
st_calc : ENTITY work.st_calc st_calc : ENTITY work.st_calc
GENERIC MAP ( GENERIC MAP (
g_technology => g_technology,
g_nof_mux => 1, g_nof_mux => 1,
g_nof_stat => c_nof_statistics, g_nof_stat => c_nof_statistics,
g_in_dat_w => g_in_data_w, g_in_dat_w => g_in_data_w,
...@@ -199,7 +197,6 @@ BEGIN ...@@ -199,7 +197,6 @@ BEGIN
-- ram for real values -- ram for real values
stat_reg_re : ENTITY common_lib.common_ram_crw_crw_ratio stat_reg_re : ENTITY common_lib.common_ram_crw_crw_ratio
GENERIC MAP ( GENERIC MAP (
g_technology => g_technology,
g_ram_a => c_mm_ram, g_ram_a => c_mm_ram,
g_ram_b => c_stat_ram, g_ram_b => c_stat_ram,
g_init_file => "UNUSED" g_init_file => "UNUSED"
...@@ -229,7 +226,6 @@ BEGIN ...@@ -229,7 +226,6 @@ BEGIN
-- ram for imaginary values -- ram for imaginary values
stat_reg_im : ENTITY common_lib.common_ram_crw_crw_ratio stat_reg_im : ENTITY common_lib.common_ram_crw_crw_ratio
GENERIC MAP ( GENERIC MAP (
g_technology => g_technology,
g_ram_a => c_mm_ram, g_ram_a => c_mm_ram,
g_ram_b => c_stat_ram, g_ram_b => c_stat_ram,
g_init_file => "UNUSED" g_init_file => "UNUSED"
......
...@@ -31,10 +31,8 @@ USE common_lib.common_pkg.ALL; ...@@ -31,10 +31,8 @@ USE common_lib.common_pkg.ALL;
USE common_lib.common_mem_pkg.ALL; USE common_lib.common_mem_pkg.ALL;
USE common_lib.common_field_pkg.ALL; USE common_lib.common_field_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL;
USE technology_lib.technology_select_pkg.ALL;
ENTITY st_xsq_arr IS ENTITY st_xsq_arr IS
GENERIC ( GENERIC (
g_technology : NATURAL := c_tech_select_default;
g_nof_streams : NATURAL := 1; g_nof_streams : NATURAL := 1;
g_nof_crosslets : NATURAL := 1; g_nof_crosslets : NATURAL := 1;
g_nof_signal_inputs : NATURAL := 2; g_nof_signal_inputs : NATURAL := 2;
...@@ -73,7 +71,6 @@ BEGIN ...@@ -73,7 +71,6 @@ BEGIN
gen_xsq : FOR I IN 0 TO g_nof_streams-1 GENERATE gen_xsq : FOR I IN 0 TO g_nof_streams-1 GENERATE
st_xsq : ENTITY work.st_xsq st_xsq : ENTITY work.st_xsq
GENERIC MAP ( GENERIC MAP (
g_technology => g_technology,
g_nof_signal_inputs => g_nof_signal_inputs, g_nof_signal_inputs => g_nof_signal_inputs,
g_nof_crosslets => g_nof_crosslets, g_nof_crosslets => g_nof_crosslets,
g_in_data_w => g_in_data_w, g_in_data_w => g_in_data_w,
......
...@@ -25,13 +25,13 @@ USE IEEE.std_logic_1164.ALL; ...@@ -25,13 +25,13 @@ USE IEEE.std_logic_1164.ALL;
USE IEEE.numeric_std.ALL; USE IEEE.numeric_std.ALL;
USE common_lib.common_pkg.ALL; USE common_lib.common_pkg.ALL;
PACKAGE st_pkg IS PACKAGE tb_st_pkg IS
FUNCTION func_st_calculate_expected_xsq(a_re, a_im, b_re, b_im : t_integer_arr; N_crosslets, N_int : NATURAL) RETURN t_integer_arr; FUNCTION func_st_calculate_expected_xsq(a_re, a_im, b_re, b_im : t_integer_arr; N_crosslets, N_int : NATURAL) RETURN t_integer_arr;
END st_pkg; END tb_st_pkg;
PACKAGE BODY st_pkg IS PACKAGE BODY tb_st_pkg IS
FUNCTION func_st_calculate_expected_xsq(a_re, a_im, b_re, b_im : t_integer_arr; N_crosslets, N_int : NATURAL) RETURN t_integer_arr IS FUNCTION func_st_calculate_expected_xsq(a_re, a_im, b_re, b_im : t_integer_arr; N_crosslets, N_int : NATURAL) RETURN t_integer_arr IS
CONSTANT c_N_s : NATURAL := a_re'LENGTH/N_crosslets; CONSTANT c_N_s : NATURAL := a_re'LENGTH/N_crosslets;
...@@ -51,4 +51,4 @@ PACKAGE BODY st_pkg IS ...@@ -51,4 +51,4 @@ PACKAGE BODY st_pkg IS
RETURN v_exp_xsq; RETURN v_exp_xsq;
END; END;
END st_pkg; END tb_st_pkg;
...@@ -47,7 +47,7 @@ USE mm_lib.mm_file_pkg.ALL; ...@@ -47,7 +47,7 @@ USE mm_lib.mm_file_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL;
USE diag_lib.diag_pkg.ALL; USE diag_lib.diag_pkg.ALL;
USE dp_lib.tb_dp_pkg.ALL; USE dp_lib.tb_dp_pkg.ALL;
USE work.st_pkg.ALL; USE work.tb_st_pkg.ALL;
ENTITY tb_st_xsq IS ENTITY tb_st_xsq IS
GENERIC( GENERIC(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment