*** empty log message ***

diff --git a/trb3_gbe/trb3_central.prj b/trb3_gbe/trb3_central.prj
index fd09e78f076169aab8ba971c68c9bc72a776a72f..bb54e25277ff54c3704d74ed273feb10735cbbf5 100644 (file)
--- a/trb3_gbe/trb3_central.prj
+++ b/trb3_gbe/trb3_central.prj
@@ -57,8 +57,9 @@ add_file -vhdl -lib work "../../trbnet/trb_net16_hub_func.vhd"
 add_file -vhdl -lib work "../base/trb3_components.vhd"
 add_file -vhdl -lib work "../../trbnet/basics/signal_sync.vhd"
 add_file -vhdl -lib work "../../trbnet/basics/pulse_sync.vhd"
+add_file -vhdl -lib work "../../trbnet/basics/priority_arbiter.vhd"
 add_file -vhdl -lib work "../../trbnet/special/trb_net_reset_handler.vhd"
-
+add_file -vhdl -lib work "../../trbnet/lattice/ecp3/lattice_ecp2m_fifo.vhd"
 #gbe files
 add_file -vhdl -lib work "../../trbnet/gbe2_ecp3/trb_net_gbe_protocols.vhd"
 add_file -vhdl -lib work "../../trbnet/gbe2_ecp3/trb_net_gbe_components.vhd"
@@ -174,7 +175,7 @@ add_file -vhdl -lib work "../../trbnet/trb_net16_api_base.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_iobuf.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_io_multiplexer.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_hub_base.vhd"
-add_file -vhdl -lib work "../../trbnet/trb_net16_hub_logic.vhd"
+add_file -vhdl -lib work "../../trbnet/trb_net16_hub_logic_2.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_hub_ipu_logic.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_regio_bus_handler.vhd"
 add_file -vhdl -lib work "../../trbnet/special/slv_register.vhd"
@@ -185,6 +186,7 @@ add_file -vhdl -lib work "../../trbnet/special/fpga_reboot.vhd"
 
 
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/spi_dpram_32_to_8.vhd"
+add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_19x16.vhd"
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_19x16_obuf.vhd"
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/lattice_ecp3_fifo_18x1k.vhd"
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/lattice_ecp3_fifo_16bit_dualport.vhd"

diff --git a/trb3_gbe/trb3_central.vhd b/trb3_gbe/trb3_central.vhd
index c02dc7f8915aeeb775621a416e377c94822aac6c..26a5b827fd8cae9df9daec85c1e7dfffd04b806f 100644 (file)
--- a/trb3_gbe/trb3_central.vhd
+++ b/trb3_gbe/trb3_central.vhd
@@ -488,17 +488,17 @@ gen_ethernet_hub : if USE_ETHERNET = c_YES generate
          MII_NUMBER          => 5,
     
     --optical link SFP1 is uplink on all channels  (e.g. connect a Hub)
---       MII_IS_UPLINK       => (0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0),
---       MII_IS_DOWNLINK     => (1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0),
---       MII_IS_UPLINK_ONLY  => (0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0),
+         MII_IS_UPLINK       => (0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0),
+         MII_IS_DOWNLINK     => (1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0),
+         MII_IS_UPLINK_ONLY  => (0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0),
 
     --optical link SFP1 is uplink on TRG & IPU and downlink on sctrl  (e.g. connect a CTS, sctrl via GbE)
-    MII_IS_UPLINK       => (0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0),
-    MII_IS_DOWNLINK     => (1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0),
-    MII_IS_UPLINK_ONLY  => (0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0),
+--     MII_IS_UPLINK       => (0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0),
+--     MII_IS_DOWNLINK     => (1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0),
+--     MII_IS_UPLINK_ONLY  => (0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0),
 
          USE_ONEWIRE         => c_YES,
-         HARDWARE_VERSION    => x"90000E00",
+         HARDWARE_VERSION    => x"90000E30",
          INIT_ENDPOINT_ID    => x"0005",
          COMPILE_TIME        => std_logic_vector(to_unsigned(VERSION_NUMBER_TIME,32))
   )
@@ -508,17 +508,6 @@ gen_ethernet_hub : if USE_ETHERNET = c_YES generate
          CLK_EN                  => '1',
 
          --Media interfacces
---       MED_DATAREADY_OUT       => med_dataready_out(mii-1 downto 0),
---       MED_DATA_OUT            => med_data_out(mii*16-1 downto 0),
---       MED_PACKET_NUM_OUT      => med_packet_num_out(mii*3-1 downto 0),
---       MED_READ_IN             => med_read_in(mii-1 downto 0),
---       MED_DATAREADY_IN        => med_dataready_in(mii-1 downto 0),
---       MED_DATA_IN             => med_data_in(mii*16-1 downto 0),
---       MED_PACKET_NUM_IN       => med_packet_num_in(mii*3-1 downto 0),
---       MED_READ_OUT            => med_read_out(mii-1 downto 0),
---       MED_STAT_OP             => med_stat_op(mii*16-1 downto 0),
---       MED_CTRL_OP             => med_ctrl_op(mii*16-1 downto 0),
-
          MED_DATAREADY_OUT(5*1-1 downto 0)   => med_dataready_out,
          MED_DATA_OUT(5*16-1 downto 0)       => med_data_out,
          MED_PACKET_NUM_OUT(5*3-1 downto 0)  => med_packet_num_out,