gbe update

diff --git a/cts/trb3_central.prj b/cts/trb3_central.prj
index fc2db73515b29433291d01ce064d2c00ebf60155..3a05cc6a609dcac6dbc669748bc805fa7e3973f6 100644 (file)
--- a/cts/trb3_central.prj
+++ b/cts/trb3_central.prj
@@ -87,7 +87,7 @@ add_file -vhdl -lib work "../base/code/trigger_clock_manager.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/trb_net_gbe_protocols.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe_trb/base/trb_net_gbe_components.vhd"
 
-add_file -vhdl -lib work "../../trb3sc/code/debuguart.vhd"
+#add_file -vhdl -lib work "../../trb3sc/code/debuguart.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart_rec.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart_trans.vhd"

diff --git a/cts/trb3_central.vhd b/cts/trb3_central.vhd
index 88c0a891e6bda7e465c9313ad574312409375966..8bd58275f4248087e8126a2de4267798d1f0ffc2 100644 (file)
--- a/cts/trb3_central.vhd
+++ b/cts/trb3_central.vhd
@@ -2011,22 +2011,22 @@ begin
 ---------------------------------------------------------------------------
 -- Debugging UART
 --------------------------------------------------------------------------- 
-  THE_DEBUG : entity work.debuguart
-    port map(
-      CLK => clk_100_i,
-      RESET => reset_i, 
+--  THE_DEBUG : entity work.debuguart
+--    port map(
+--      CLK => clk_100_i,
+--      RESET => reset_i, 
       
-      RX_IN  => TEST_LINE(30),
-      TX_OUT => TEST_LINE(31),
+--      RX_IN  => TEST_LINE(30),
+--      TX_OUT => TEST_LINE(31),
       
-      DEBUG_ACTIVE  => debug_active,
+--      DEBUG_ACTIVE  => debug_active,
     
-      BUS_DEBUG_TX  => bus_debug_tx_in,
-      BUS_DEBUG_RX  => bus_debug_rx_out,
+--      BUS_DEBUG_TX  => bus_debug_tx_in,
+--      BUS_DEBUG_RX  => bus_debug_rx_out,
       
-      STATUS => open
+--      STATUS => open
       
-      );  
+--      );  
 
   handler_addr     <= bus_debug_rx_out.addr  when debug_active = '1' else regio_addr_out;
   handler_data_out <= bus_debug_rx_out.data  when debug_active = '1' else regio_data_out;

diff --git a/trb3_gbe/trb3_central_gbe.vhd b/trb3_gbe/trb3_central_gbe.vhd
index e7fd3f20cc87780b503b14d1ce83dbdc95658c26..29d5a81c51607d047cbca7a742c98509cf7c6960 100644 (file)
--- a/trb3_gbe/trb3_central_gbe.vhd
+++ b/trb3_gbe/trb3_central_gbe.vhd
@@ -689,13 +689,13 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4
       FIXED_DELAY               => 100,
 
       NUMBER_OF_GBE_LINKS       => 4,
-      LINKS_ACTIVE              => "1100",
+      LINKS_ACTIVE              => "1000",
 
-      LINK_HAS_READOUT  => "1100",
+      LINK_HAS_READOUT  => "1000",
       LINK_HAS_SLOWCTRL => "1000",
-      LINK_HAS_DHCP     => "1100",
-      LINK_HAS_ARP      => "1100",
-      LINK_HAS_PING     => "1100"
+      LINK_HAS_DHCP     => "1000",
+      LINK_HAS_ARP      => "1000",
+      LINK_HAS_PING     => "1000"
       
       )
     port map(