*** empty log message ***

diff --git a/cts/trb3_central.p2t b/cts/trb3_central.p2t
index 09ab769c12aee698bf70a681da9b893ca75bb95e..3838d811216aae4a52b87bd1e14709b294e4a965 100644 (file)
--- a/cts/trb3_central.p2t
+++ b/cts/trb3_central.p2t
@@ -4,7 +4,7 @@
 -n 1
 -y
 -s 12
--t 11
+-t 10
 -c 1
 -e 2
 #-g guidefile.ncd

diff --git a/cts/trb3_central.prj b/cts/trb3_central.prj
index ef262ef8423226664e76a63bb4bf4d6983ed3ede..831554e58416335d5716376770c1e62b669b6912 100644 (file)
--- a/cts/trb3_central.prj
+++ b/cts/trb3_central.prj
@@ -173,7 +173,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_hub_streaming_port_sctrl_cts.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_regio_bus_handler.vhd"
@@ -187,6 +187,7 @@ add_file -vhdl -lib work "../../trbnet/special/handler_ipu.vhd"
 add_file -vhdl -lib work "../../trbnet/special/handler_data.vhd"
 add_file -vhdl -lib work "../../trbnet/special/handler_trigger_and_data.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_trigger.vhd"
+add_file -vhdl -lib work "../../trbnet/basics/priority_arbiter.vhd"
 
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_36x256_oreg.vhd"
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_36x512_oreg.vhd"
@@ -206,6 +207,7 @@ add_file -vhdl -lib work "../../trbnet/lattice/ecp2m/fifo/fifo_var_oreg.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_obuf.vhd"
+add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_19x16.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"
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo_dualclock_width_16_reg.vhd"

diff --git a/cts/trb3_central.vhd b/cts/trb3_central.vhd
index fd43a2d9f728d10f09042ffcddf8757bd2afe806..6016fc7b14421bc1df590638415af25376f9f62e 100644 (file)
--- a/cts/trb3_central.vhd
+++ b/cts/trb3_central.vhd
@@ -25,12 +25,12 @@ use work.trb_net_gbe_components.all;
 -- INT_NUMBER        => 5,
 -- INT_CHANNELS      => (0,1,0,1,3),
 
--- No trigger sent to optical link, slow control receiving possible
+-- No trigger / sctrl sent to optical link, slow control receiving possible
 -- MII_IS_UPLINK        => (0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0);
 -- MII_IS_DOWNLINK      => (1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0);
 -- MII_IS_UPLINK_ONLY   => (0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0);
 
--- Trigger sent to optical link, slow control receiving possible
+-- Trigger / sctrl sent to optical link, slow control receiving possible
 -- MII_IS_UPLINK        => (0,0,0,0,1,0,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);
@@ -365,7 +365,7 @@ THE_RESET_HANDLER : trb_net_reset_handler
     DEBUG_OUT       => open
   );
 
-trb_reset_in <= reset_via_gbe_delayed(2);
+trb_reset_in <= reset_via_gbe_delayed(2) or MED_STAT_OP(4*16+13);
 reset_i <= reset_i_temp or trb_reset_in;
 
 process begin
@@ -501,7 +501,7 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4_onboard
     MII_IS_UPLINK_ONLY   => (0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0),         
     COMPILE_TIME                     => std_logic_vector(to_unsigned(VERSION_NUMBER_TIME,32)),
     COMPILE_VERSION                  => x"0001",
-    HARDWARE_VERSION                 => x"9000CE00",
+    HARDWARE_VERSION                 => x"9000CEE0",
     INIT_ENDPOINT_ID                 => x"0005",
     BROADCAST_BITMASK                => x"7E",
     CLOCK_FREQUENCY                  => 100,
@@ -590,7 +590,7 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4_onboard
          MY_ADDRESS_OUT          => my_address,
     UNIQUE_ID_OUT           => mc_unique_id,
     TIMER_TICKS_OUT         => timer_ticks,
-    EXTERNAL_SEND_RESET     => external_send_reset,
+    EXTERNAL_SEND_RESET     => reset_via_gbe,
 
          REGIO_ADDR_OUT          => regio_addr_out,
          REGIO_READ_ENABLE_OUT   => regio_read_enable_out,
@@ -678,24 +678,24 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4_onboard
          --gk 23.04.10
          LED_PACKET_SENT_OUT         => open, --buf_SFP_LED_ORANGE(17),
          LED_AN_DONE_N_OUT           => link_ok, --buf_SFP_LED_GREEN(17),
-           --CTS interface
-           CTS_NUMBER_IN               => gbe_cts_number,
-           CTS_CODE_IN                 => gbe_cts_code,
-           CTS_INFORMATION_IN          => gbe_cts_information,
-           CTS_READOUT_TYPE_IN         => gbe_cts_readout_type,
-           CTS_START_READOUT_IN        => gbe_cts_start_readout,
-           CTS_DATA_OUT                => open,
-           CTS_DATAREADY_OUT           => open,
-           CTS_READOUT_FINISHED_OUT    => gbe_cts_readout_finished,
-           CTS_READ_IN                 => '1',
-           CTS_LENGTH_OUT              => open,
-           CTS_ERROR_PATTERN_OUT       => gbe_cts_status_bits,
-           --Data payload interface
-           FEE_DATA_IN                 => gbe_fee_data,
-           FEE_DATAREADY_IN            => gbe_fee_dataready,
-           FEE_READ_OUT                => gbe_fee_read,
-           FEE_STATUS_BITS_IN          => gbe_fee_status_bits,
-           FEE_BUSY_IN                 => gbe_fee_busy,
+    --CTS interface
+    CTS_NUMBER_IN               => gbe_cts_number,
+    CTS_CODE_IN                 => gbe_cts_code,
+    CTS_INFORMATION_IN          => gbe_cts_information,
+    CTS_READOUT_TYPE_IN         => gbe_cts_readout_type,
+    CTS_START_READOUT_IN        => gbe_cts_start_readout,
+    CTS_DATA_OUT                => open,
+    CTS_DATAREADY_OUT           => open,
+    CTS_READOUT_FINISHED_OUT    => gbe_cts_readout_finished,
+    CTS_READ_IN                 => '1',
+    CTS_LENGTH_OUT              => open,
+    CTS_ERROR_PATTERN_OUT       => gbe_cts_status_bits,
+    --Data payload interface
+    FEE_DATA_IN                 => gbe_fee_data,
+    FEE_DATAREADY_IN            => gbe_fee_dataready,
+    FEE_READ_OUT                => gbe_fee_read,
+    FEE_STATUS_BITS_IN          => gbe_fee_status_bits,
+    FEE_BUSY_IN                 => gbe_fee_busy,
          --SFP   Connection
          SFP_RXD_P_IN                => SFP_RX_P(6), --these ports are don't care
          SFP_RXD_N_IN                => SFP_RX_N(6),
@@ -707,20 +707,20 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4_onboard
          SFP_LOS_IN                  => SFP_LOS(8), -- SFP Loss Of Signal ('0' = OK, '1' = no signal)
          SFP_TXDIS_OUT               => SFP_TXDIS(8),  -- SFP disable
 
-       -- interface between main_controller and hub logic
-       MC_UNIQUE_ID_IN          => mc_unique_id,
-       GSC_CLK_IN               => clk_100_i,
-       GSC_INIT_DATAREADY_OUT   => gsc_init_dataready,
-       GSC_INIT_DATA_OUT        => gsc_init_data,
-       GSC_INIT_PACKET_NUM_OUT  => gsc_init_packet_num,
-       GSC_INIT_READ_IN         => gsc_init_read,
-       GSC_REPLY_DATAREADY_IN   => gsc_reply_dataready,
-       GSC_REPLY_DATA_IN        => gsc_reply_data,
-       GSC_REPLY_PACKET_NUM_IN  => gsc_reply_packet_num,
-       GSC_REPLY_READ_OUT       => gsc_reply_read,
-       GSC_BUSY_IN              => gsc_busy,
-
-       MAKE_RESET_OUT           => reset_via_gbe,
+    -- interface between main_controller and hub logic
+    MC_UNIQUE_ID_IN          => mc_unique_id,
+    GSC_CLK_IN               => clk_100_i,
+    GSC_INIT_DATAREADY_OUT   => gsc_init_dataready,
+    GSC_INIT_DATA_OUT        => gsc_init_data,
+    GSC_INIT_PACKET_NUM_OUT  => gsc_init_packet_num,
+    GSC_INIT_READ_IN         => gsc_init_read,
+    GSC_REPLY_DATAREADY_IN   => gsc_reply_dataready,
+    GSC_REPLY_DATA_IN        => gsc_reply_data,
+    GSC_REPLY_PACKET_NUM_IN  => gsc_reply_packet_num,
+    GSC_REPLY_READ_OUT       => gsc_reply_read,
+    GSC_BUSY_IN              => gsc_busy,
+
+    MAKE_RESET_OUT           => reset_via_gbe,
 
          --for simulation of receiving part only
          MAC_RX_EOF_IN         => '0',