From 75b9a3c8975763f005c6c2573c9907210d909bcb Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Fri, 16 Oct 2015 07:19:49 +0000
Subject: [PATCH] Renamed use_1GbE field in use_streaming_1GbE, only TRUE when
 1GbE offload is used. Added filename prefix to func_sel_revision_rec.

---
 .../unb1_test/src/vhdl/unb1_test_pkg.vhd      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd
index 4e3ce3cf6a..938a6736e7 100644
--- a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd
+++ b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd
@@ -31,7 +31,7 @@ PACKAGE unb1_test_pkg IS
   TYPE t_unb1_test_config IS RECORD
     use_front             : NATURAL;
     use_back              : NATURAL;
-    use_1GbE              : BOOLEAN;
+    use_streaming_1GbE    : BOOLEAN;
     use_nof_streams_1GbE  : NATURAL;
     use_10GbE             : BOOLEAN;
     use_nof_streams_10GbE : NATURAL;
@@ -73,9 +73,16 @@ PACKAGE unb1_test_pkg IS
                                                                                    ( field_name_pad("usr_hdr_field_5"    ), "  ",  8, field_default(0) ),
                                                                                    ( field_name_pad("usr_hdr_field_6"    ), "  ", 27, field_default(0) ) );
 
+  -- Function to select the revision configuration. 
+  FUNCTION func_unb1_test_sel_revision_rec(g_design_name : STRING) RETURN t_unb1_test_config;
+
+END unb1_test_pkg;
+
+PACKAGE BODY unb1_test_pkg IS
+
   CONSTANT c_all             : t_unb1_test_config := ( 1, 0,  TRUE, 1,  TRUE, 3, 1, 1, 2, c_tech_ddr3_4g_single_rank_800m_master);
   CONSTANT c_1GbE            : t_unb1_test_config := ( 0, 0,  TRUE, 1, FALSE, 0, 0, 0, 0, c_tech_ddr3_4g_single_rank_800m_master);
-  CONSTANT c_10GbE           : t_unb1_test_config := ( 1, 0,  TRUE, 1,  TRUE, 3, 0, 0, 0, c_tech_ddr3_4g_single_rank_800m_master);
+  CONSTANT c_10GbE           : t_unb1_test_config := ( 1, 0, FALSE, 1,  TRUE, 3, 0, 0, 0, c_tech_ddr3_4g_single_rank_800m_master);
   CONSTANT c_ddr_MB_I        : t_unb1_test_config := ( 0, 0, FALSE, 1, FALSE, 0, 1, 0, 1, c_tech_ddr3_4g_single_rank_800m_master);  
   CONSTANT c_ddr_MB_II       : t_unb1_test_config := ( 0, 0, FALSE, 1, FALSE, 0, 0, 1, 1, c_tech_ddr3_4g_single_rank_800m_master);  
   CONSTANT c_ddr_MB_I_II     : t_unb1_test_config := ( 0, 0, FALSE, 1, FALSE, 0, 1, 1, 2, c_tech_ddr3_4g_single_rank_800m_master);  
@@ -83,14 +90,7 @@ PACKAGE unb1_test_pkg IS
   CONSTANT c_ddr_16g_MB_II   : t_unb1_test_config := ( 0, 0, FALSE, 1, FALSE, 0, 0, 1, 1, c_tech_ddr3_16g_dual_rank_800m);  
   CONSTANT c_ddr_16g_MB_I_II : t_unb1_test_config := ( 0, 0, FALSE, 1, FALSE, 0, 1, 1, 2, c_tech_ddr3_16g_dual_rank_800m);  
 
-  -- Function to select the revision configuration. 
-  FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_unb1_test_config;
-
-END unb1_test_pkg;
-
-PACKAGE BODY unb1_test_pkg IS
-
-  FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_unb1_test_config IS
+  FUNCTION func_unb1_test_sel_revision_rec(g_design_name : STRING) RETURN t_unb1_test_config IS
   BEGIN
     IF    g_design_name = "unb1_test_all"             THEN RETURN c_all;
     ELSIF g_design_name = "unb1_test_1GbE"            THEN RETURN c_1GbE;
-- 
GitLab