From: Michael Boehmer <mboehmer@ph.tum.de>
Date: Fri, 21 Oct 2022 06:31:42 +0000 (+0200)
Subject: changes in reset
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e753de04a27297d9d3fa2f956736ff13fd949458;p=trbnet.git

changes in reset
---

diff --git a/gbe_trb/base/inserter.vhd b/gbe_trb/base/inserter.vhd
index f157b12..727afea 100644
--- a/gbe_trb/base/inserter.vhd
+++ b/gbe_trb/base/inserter.vhd
@@ -180,11 +180,11 @@ begin
 
   TX_K_OUT  <= '1' when (inject_k = '1') else
                '0' when (inject_d = '1') else
-               '1' when (rst_int  = '1') else
+               '1' when (rst_int  = '1') else -- send bad data when in reset
                tx_k_int;
   TX_D_OUT  <= x"dc"   when (inject_k = '1') else
                payload when (inject_d = '1') else -- payload is here
-               x"ee"   when (rst_int  = '1') else
+               x"ee"   when (rst_int  = '1') else -- send bad data when in reset
                tx_d_int;
 
 end architecture;
diff --git a/gbe_trb_ecp3/media/gbe_med_fifo.vhd b/gbe_trb_ecp3/media/gbe_med_fifo.vhd
index a7358db..943104d 100644
--- a/gbe_trb_ecp3/media/gbe_med_fifo.vhd
+++ b/gbe_trb_ecp3/media/gbe_med_fifo.vhd
@@ -693,7 +693,7 @@ begin
       -- SGMII core
       SGMII_GBE_PCS : sgmii_gbe_pcs42
       port map(
-        rst_n                   => CLEAR_N, --rst_n_sgmii_i(i), --RESET_N,
+        rst_n                   => RESET_N, --CLEAR_N,
         signal_detect           => link_rx_ready(i), --serdes_active(i),
         gbe_mode                => '1',
         sgmii_mode              => '0',
@@ -737,7 +737,7 @@ begin
         mr_an_complete          => open,
         mr_page_rx              => mr_page_rx_i(i), --open,
         mr_lp_adv_ability       => open,
-        mr_main_reset           => CLEAR,
+        mr_main_reset           => RESET, --CLEAR,
         mr_an_enable            => link_rx_ready(i), --'1',
         mr_restart_an           => '0',
         mr_adv_ability          => x"0020"