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

minor fixes

parent 7daf8186
No related branches found
No related tags found
1 merge request!277Resolve DIST2-2
Pipeline #35092 passed
Stage: simulation
Stage: synthesis
Hide whitespace changes
Inline Side-by-side
applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd
+ 1
− 1
View file @ 8214628f
...@@ -37,7 +37,7 @@ USE dp_lib.dp_stream_pkg.ALL; ...@@ -37,7 +37,7 @@ USE dp_lib.dp_stream_pkg.ALL;
ENTITY disturb2_unb2b_sdp_station_full_wg IS ENTITY disturb2_unb2b_sdp_station_full_wg IS
GENERIC ( GENERIC (
g_design_name : STRING := "Disturb2_unb2b_sdp_station_full_wg"; g_design_name : STRING := "disturb2_unb2b_sdp_station_full_wg";
g_design_note : STRING := "Disturb2 SDP station full design WG"; g_design_note : STRING := "Disturb2 SDP station full design WG";
g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim : BOOLEAN := FALSE; --Overridden by TB
g_sim_unb_nr : NATURAL := 0; g_sim_unb_nr : NATURAL := 0;
......
applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd
+ 4
− 3
View file @ 8214628f
...@@ -48,9 +48,9 @@ PACKAGE lofar2_unb2b_sdp_station_pkg IS ...@@ -48,9 +48,9 @@ PACKAGE lofar2_unb2b_sdp_station_pkg IS
CONSTANT c_xsub_one : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, 1); CONSTANT c_xsub_one : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, 1);
CONSTANT c_xsub_ring : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, 9); CONSTANT c_xsub_ring : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, 9);
CONSTANT c_full_wg : t_lofar2_unb2b_sdp_station_config := (TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, 9); CONSTANT c_full_wg : t_lofar2_unb2b_sdp_station_config := (TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_os : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_wg_os : t_lofar2_unb2b_sdp_station_config := (TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, FALSE, TRUE, TRUE, TRUE, 9); CONSTANT c_full : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, FALSE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_wg_os : t_lofar2_unb2b_sdp_station_config := (TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_os : t_lofar2_unb2b_sdp_station_config := (FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
-- Function to select the revision configuration. -- Function to select the revision configuration.
FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2b_sdp_station_config; FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2b_sdp_station_config;
...@@ -70,8 +70,9 @@ PACKAGE BODY lofar2_unb2b_sdp_station_pkg IS ...@@ -70,8 +70,9 @@ PACKAGE BODY lofar2_unb2b_sdp_station_pkg IS
ELSIF g_design_name = "lofar2_unb2b_sdp_station_xsub_one" THEN RETURN c_xsub_one; ELSIF g_design_name = "lofar2_unb2b_sdp_station_xsub_one" THEN RETURN c_xsub_one;
ELSIF g_design_name = "lofar2_unb2b_sdp_station_xsub_ring" THEN RETURN c_xsub_ring; ELSIF g_design_name = "lofar2_unb2b_sdp_station_xsub_ring" THEN RETURN c_xsub_ring;
ELSIF g_design_name = "lofar2_unb2b_sdp_station_full_wg" THEN RETURN c_full_wg; ELSIF g_design_name = "lofar2_unb2b_sdp_station_full_wg" THEN RETURN c_full_wg;
ELSIF g_design_name = "disturb2_unb2b_sdp_station_full" THEN RETURN c_full_os; ELSIF g_design_name = "lofar2_unb2b_sdp_station_full" THEN RETURN c_full;
ELSIF g_design_name = "disturb2_unb2b_sdp_station_full_wg" THEN RETURN c_full_wg_os; ELSIF g_design_name = "disturb2_unb2b_sdp_station_full_wg" THEN RETURN c_full_wg_os;
ELSIF g_design_name = "disturb2_unb2b_sdp_station_full" THEN RETURN c_full_os;
ELSE RETURN c_full; ELSE RETURN c_full;
END IF; END IF;
END; END;
......
applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd
+ 4
− 3
View file @ 8214628f
...@@ -48,9 +48,9 @@ PACKAGE lofar2_unb2c_sdp_station_pkg IS ...@@ -48,9 +48,9 @@ PACKAGE lofar2_unb2c_sdp_station_pkg IS
CONSTANT c_xsub_one : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, 1); CONSTANT c_xsub_one : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, 1);
CONSTANT c_xsub_ring : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, 9); CONSTANT c_xsub_ring : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, 9);
CONSTANT c_full_wg : t_lofar2_unb2c_sdp_station_config := (TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, 9); CONSTANT c_full_wg : t_lofar2_unb2c_sdp_station_config := (TRUE, TRUE, FALSE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_os : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_wg_os : t_lofar2_unb2c_sdp_station_config := (TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, TRUE, TRUE, TRUE, 9); CONSTANT c_full : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_wg_os : t_lofar2_unb2c_sdp_station_config := (TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
CONSTANT c_full_os : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, 9);
-- Function to select the revision configuration. -- Function to select the revision configuration.
FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2c_sdp_station_config; FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2c_sdp_station_config;
...@@ -70,8 +70,9 @@ PACKAGE BODY lofar2_unb2c_sdp_station_pkg IS ...@@ -70,8 +70,9 @@ PACKAGE BODY lofar2_unb2c_sdp_station_pkg IS
ELSIF g_design_name = "lofar2_unb2c_sdp_station_xsub_one" THEN RETURN c_xsub_one; ELSIF g_design_name = "lofar2_unb2c_sdp_station_xsub_one" THEN RETURN c_xsub_one;
ELSIF g_design_name = "lofar2_unb2c_sdp_station_xsub_ring" THEN RETURN c_xsub_ring; ELSIF g_design_name = "lofar2_unb2c_sdp_station_xsub_ring" THEN RETURN c_xsub_ring;
ELSIF g_design_name = "lofar2_unb2c_sdp_station_full_wg" THEN RETURN c_full_wg; ELSIF g_design_name = "lofar2_unb2c_sdp_station_full_wg" THEN RETURN c_full_wg;
ELSIF g_design_name = "disturb2_unb2c_sdp_station_full" THEN RETURN c_full_os; ELSIF g_design_name = "lofar2_unb2c_sdp_station_full" THEN RETURN c_full;
ELSIF g_design_name = "disturb2_unb2c_sdp_station_full_wg" THEN RETURN c_full_wg_os; ELSIF g_design_name = "disturb2_unb2c_sdp_station_full_wg" THEN RETURN c_full_wg_os;
ELSIF g_design_name = "disturb2_unb2c_sdp_station_full" THEN RETURN c_full_os;
ELSE RETURN c_full; ELSE RETURN c_full;
END IF; END IF;
END; END;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment