From 0d9564af3f53125047160c0960b53f2da8b9958c Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Tue, 9 Dec 2014 10:44:25 +0000
Subject: [PATCH] Renamed g_mdio into g_use_mdio.

---
 libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd  | 4 ++--
 libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd      | 6 ++----
 libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd | 5 ++---
 libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd    | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd b/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd
index 3338c4517c..56dd9b130f 100644
--- a/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd
+++ b/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd
@@ -33,7 +33,7 @@ ENTITY mms_tr_xaui IS
   GENERIC (
     g_sim             : BOOLEAN := FALSE;
     g_nof_xaui        : NATURAL := 1; -- Up to 3 (hard XAUI only) supported
-    g_mdio            : BOOLEAN := FALSE
+    g_use_mdio        : BOOLEAN := FALSE
   );                      
   PORT (   
     -- Transceiver PLL reference clock   
@@ -132,7 +132,7 @@ BEGIN
   u_tr_xaui: ENTITY work.tr_xaui 
   GENERIC MAP (
     g_sim              => g_sim,
-    g_mdio             => g_mdio,
+    g_use_mdio         => g_use_mdio,
     g_nof_xaui         => g_nof_xaui
   )
   PORT MAP (     
diff --git a/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd b/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd
index 7018d3ad21..6a9058d453 100644
--- a/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd
+++ b/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd
@@ -37,9 +37,8 @@ ENTITY tr_xaui IS
     g_sim_level             : NATURAL := 0;     -- 0 = use IP; 1 = use fast serdes model
     g_use_xgmii             : BOOLEAN := FALSE; -- Don't use streaming I/O but XGMII (e.g. conenct to 10GbE MAC)
     g_nof_xaui              : NATURAL := 1;     -- Up to 3 (hard XAUI only) supported
-    g_mdio                  : BOOLEAN := FALSE;
+    g_use_mdio              : BOOLEAN := FALSE;
     g_mdio_epcs_dis         : BOOLEAN := FALSE -- TRUE disables EPCS on init; e.g. to target a 10GbE card in PC that does not support it 
-    --g_mdio_mm_ctrl          : BOOLEAN := FALSE  -- FALSE uses mdio_ctlr to auto execute the initialization sequence for the Vitesse chips. TRUE enables MM control.
   );
   PORT (   
     -- Transceiver PLL reference clock   
@@ -215,12 +214,11 @@ BEGIN
   ---------------------------------------------------------------------------
   -- MDIO
   ---------------------------------------------------------------------------
-  gen_mdio: IF g_mdio = TRUE GENERATE
+  gen_mdio: IF g_use_mdio = TRUE GENERATE
     u_tr_xaui_mdio : ENTITY work.tr_xaui_mdio
     GENERIC MAP (
       g_sim           => g_sim,
       g_nof_xaui      => g_nof_xaui,
-      g_mdio          => g_mdio,
       g_mdio_epcs_dis => g_mdio_epcs_dis
     )
     PORT MAP (
diff --git a/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd b/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd
index ab398fc930..b6310ec41f 100644
--- a/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd
+++ b/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd
@@ -31,7 +31,6 @@ ENTITY tr_xaui_mdio IS
   GENERIC (
     g_sim                   : BOOLEAN := FALSE;
     g_nof_xaui              : NATURAL := 1;     -- Up to 3 (hard XAUI only) supported
-    g_mdio                  : BOOLEAN := FALSE;
     g_mdio_epcs_dis         : BOOLEAN := FALSE -- TRUE disables EPCS on init; e.g. to target a 10GbE card in PC that does not support it 
   );
   PORT (   
@@ -176,8 +175,8 @@ BEGIN
          g_mdio_prtad           => c_mdio_vsc8486_prtad,
          g_mdio_cmd_arr         => c_mdio_vsc8486_init_epcs_dis_cmd_arr,
          g_mdio_rst_level       => '0', 
-         g_mdio_rst_cycles      => 250000,
-         g_mdio_post_rst_cycles => 250000
+         g_mdio_rst_cycles      => sel_a_b(g_sim, 10, 250000),
+         g_mdio_post_rst_cycles => sel_a_b(g_sim, 10, 250000)
         ) 
       PORT MAP (
         rst               => tr_rst,
diff --git a/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd b/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd
index 08338dbb02..636c25e820 100644
--- a/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd
+++ b/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd
@@ -135,7 +135,7 @@ BEGIN
     g_technology       => g_technology,
     g_sim              => c_sim,
     g_sim_level        => g_sim_level,
-    g_mdio             => TRUE
+    g_use_mdio         => TRUE
   )
   PORT MAP (     
     tr_clk             => tr_clk,
-- 
GitLab