From: Jan Michel Date: Fri, 17 Nov 2017 14:40:12 +0000 (+0100) Subject: Revert "gkorcyl gbe with configurable ip address" X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=89c5eb5f9bb55fcd7826eafbecc3a82897562e51;p=trb3.git Revert "gkorcyl gbe with configurable ip address" reinclude CTS in CTS, correct TDC version and outdated setting This reverts commit e35c607b1da004b911a163c981b5c97939b97a2a. --- diff --git a/cts/config_default.vhd b/cts/config_default.vhd index c384344..8906391 100644 --- a/cts/config_default.vhd +++ b/cts/config_default.vhd @@ -8,7 +8,7 @@ package config is --Begin of configuration ------------------------------------------------------------------------------ - constant INCLUDE_CTS : integer range c_NO to c_YES := c_NO; + constant INCLUDE_CTS : integer range c_NO to c_YES := c_YES; constant INCLUDE_CBMNET : integer range c_NO to c_YES := c_NO; constant INCLUDE_MBS_MASTER : integer range c_NO to c_YES := c_NO; constant INCLUDE_TIMESTAMP_GENERATOR : integer := c_NO; diff --git a/cts/source/cts_pkg.vhd b/cts/source/cts_pkg.vhd index 0f7aabf..39613c9 100755 --- a/cts/source/cts_pkg.vhd +++ b/cts/source/cts_pkg.vhd @@ -22,7 +22,7 @@ package cts_pkg is -- PERIPH_TRIGGER_COUNT: integer range 0 to 15 := 2; ADDON_GROUPS : integer range 1 to 8 := 5; - ADDON_LINE_COUNT : integer range 0 to 255 := 22; -- number of lines available from add-on board +-- ADDON_LINE_COUNT : integer range 0 to 255 := 22; -- number of lines available from add-on board ADDON_GROUP_UPPER : CTS_GROUP_CONFIG_T := (3,7,11,12,13, others=>'0'); diff --git a/cts/tdc_release b/cts/tdc_release index 776b998..6a654d0 120000 --- a/cts/tdc_release +++ b/cts/tdc_release @@ -1 +1 @@ -../../tdc/releases/tdc_v2.1.3 \ No newline at end of file +../../tdc/releases/tdc_v2.3 \ No newline at end of file diff --git a/cts/trb3_central.vhd b/cts/trb3_central.vhd index f5b554b..e0a20b7 100644 --- a/cts/trb3_central.vhd +++ b/cts/trb3_central.vhd @@ -1377,12 +1377,6 @@ end generate; GSC_REPLY_PACKET_NUM_IN => gsc_reply_packet_num, GSC_REPLY_READ_OUT => gsc_reply_read, GSC_BUSY_IN => gsc_busy, - - FORCE_IP_L0_IN => x"0000_0000", - FORCE_IP_L1_IN => x"0000_0000", - FORCE_IP_L2_IN => x"0000_0000", - FORCE_IP_L3_IN => x"0000_0000", - BUS_IP_RX => busgbeip_rx, BUS_IP_TX => busgbeip_tx,