From 8214628fce26c1df344f70e4c2ddb8d464bcc8a1 Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Tue, 30 Aug 2022 09:08:33 +0200
Subject: [PATCH] minor fixes
---
.../disturb2_unb2b_sdp_station_full_wg.vhd | 2 +-
.../src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd | 7 ++++---
.../src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd | 7 ++++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd
index 4878d4fa24..6ebbfeabb2 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd
@@ -37,7 +37,7 @@ USE dp_lib.dp_stream_pkg.ALL;
ENTITY disturb2_unb2b_sdp_station_full_wg IS
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_sim : BOOLEAN := FALSE; --Overridden by TB
g_sim_unb_nr : NATURAL := 0;
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd
index ee9647cb42..eccdc9b76a 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd
@@ -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_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_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_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 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
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_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" THEN RETURN c_full_os;
ELSE RETURN c_full;
END IF;
END;
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd
index ce8ffd3ab0..9c3e30afcb 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd
@@ -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_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_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_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 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
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_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" THEN RETURN c_full_os;
ELSE RETURN c_full;
END IF;
END;
--
GitLab