minor fixes

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;

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;

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;