From 85eaac561ebfc6368545a3b9e9c57da923fab0d1 Mon Sep 17 00:00:00 2001 From: Pepping <pepping> Date: Thu, 27 Aug 2015 09:49:14 +0000 Subject: [PATCH] Added entry for filter design, Added two more constants --- .../src/vhdl/apertif_unb1_correlator_pkg.vhd | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_pkg.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_pkg.vhd index b6c140ec57..9092e28b66 100644 --- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_pkg.vhd +++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_pkg.vhd @@ -26,24 +26,26 @@ USE common_lib.common_pkg.ALL; PACKAGE apertif_unb1_correlator_pkg IS - CONSTANT c_nof_revisions : NATURAL := 5; - CONSTANT c_nof_constants : NATURAL := 12; + CONSTANT c_nof_revisions : NATURAL := 6; + CONSTANT c_nof_constants : NATURAL := 14; TYPE t_apertif_unb1_correlator_revision_matrix IS ARRAY(INTEGER RANGE 0 TO c_nof_constants-1, INTEGER RANGE 0 TO c_nof_revisions-1) OF BOOLEAN; CONSTANT c_apertif_unb1_correlator_revision_matrix : t_apertif_unb1_correlator_revision_matrix := - (-- 0 1 2 3 4 - ( TRUE, TRUE, TRUE, FALSE, TRUE), -- c_use_input_node - ( TRUE, FALSE, FALSE, TRUE, TRUE), -- c_use_mesh_node - ( TRUE, TRUE, TRUE, FALSE, TRUE), -- c_use_processing_node - ( TRUE, FALSE, TRUE, FALSE, TRUE), -- c_use_bg_input - (FALSE, FALSE, FALSE, FALSE, FALSE), -- c_use_db_input - ( TRUE, TRUE, TRUE, FALSE, TRUE), -- c_use_interleave - (FALSE, FALSE, FALSE, TRUE, FALSE), -- c_use_bg_mesh - ( TRUE, FALSE, FALSE, TRUE, FALSE), -- c_use_db_mesh - (FALSE, FALSE, FALSE, FALSE, FALSE), -- c_use_repack - (FALSE, FALSE, FALSE, FALSE, TRUE), -- c_use_db_processing - ( TRUE, TRUE, TRUE, FALSE, FALSE), -- c_use_wpfb - ( TRUE, TRUE, TRUE, FALSE, FALSE) -- c_use_cor + (-- 0 1 2 3 4 5 + ( TRUE, TRUE, TRUE, FALSE, TRUE, TRUE), -- c_use_input_node + ( TRUE, FALSE, FALSE, TRUE, TRUE, FALSE), -- c_use_mesh_node + ( TRUE, TRUE, TRUE, FALSE, TRUE, TRUE), -- c_use_processing_node + ( TRUE, FALSE, TRUE, FALSE, TRUE, TRUE), -- c_use_bg_input + (FALSE, FALSE, FALSE, FALSE, FALSE, FALSE), -- c_use_db_input + ( TRUE, TRUE, TRUE, FALSE, TRUE, TRUE), -- c_use_interleave + (FALSE, FALSE, FALSE, TRUE, FALSE, FALSE), -- c_use_bg_mesh + ( TRUE, FALSE, FALSE, TRUE, FALSE, FALSE), -- c_use_db_mesh + (FALSE, FALSE, FALSE, FALSE, FALSE, FALSE), -- c_use_repack + (FALSE, FALSE, FALSE, FALSE, TRUE, FALSE), -- c_use_db_processing + ( TRUE, TRUE, TRUE, FALSE, FALSE, TRUE), -- c_use_wpfb + ( TRUE, TRUE, TRUE, FALSE, FALSE, FALSE), -- c_use_cor + (FALSE, FALSE, FALSE, FALSE, FALSE, TRUE), -- c_use_chan_stats + (FALSE, FALSE, FALSE, FALSE, FALSE, TRUE) -- c_use_bg_processing ); FUNCTION func_revision_number(g_design_name : STRING) RETURN NATURAL; @@ -61,6 +63,7 @@ PACKAGE BODY apertif_unb1_correlator_pkg IS ELSIF g_design_name = "apertif_unb1_correlator_lite_bg" THEN RETURN 2; ELSIF g_design_name = "apertif_unb1_correlator_mesh_ref" THEN RETURN 3; ELSIF g_design_name = "apertif_unb1_correlator_mesh_dis" THEN RETURN 4; + ELSIF g_design_name = "apertif_unb1_correlator_filter" THEN RETURN 5; ELSE RETURN 0; END IF; END; @@ -77,8 +80,10 @@ PACKAGE BODY apertif_unb1_correlator_pkg IS ELSIF c_name = "c_use_db_mesh" THEN RETURN 7; ELSIF c_name = "c_use_repack" THEN RETURN 8; ELSIF c_name = "c_use_db_processing" THEN RETURN 9; - ELSIF c_name = "c_use_wpfb" THEN RETURN 11; - ELSIF c_name = "c_use_cor" THEN RETURN 10; + ELSIF c_name = "c_use_wpfb" THEN RETURN 10; + ELSIF c_name = "c_use_cor" THEN RETURN 11; + ELSIF c_name = "c_use_chan_stats" THEN RETURN 12; + ELSIF c_name = "c_use_bg_processing" THEN RETURN 13; ELSE RETURN 0; END IF; END; @@ -89,7 +94,7 @@ PACKAGE BODY apertif_unb1_correlator_pkg IS BEGIN RETURN c_apertif_unb1_correlator_revision_matrix(v_con_index, v_rev_index); END; - - + END apertif_unb1_correlator_pkg; + -- GitLab