update CTS config files

diff --git a/cts/config_32TDC.vhd b/cts/config_32TDC.vhd
index 8f44d971e2157387bcadf25ce916b7fdb99be8f1..127a80dcb0f8540bcfcfa66a7fd6c0381e82ac73 100644 (file)
--- a/cts/config_32TDC.vhd
+++ b/cts/config_32TDC.vhd
@@ -76,7 +76,7 @@ package config is
 --     constant INCLUDE_MBS_MASTER : integer range c_NO to c_YES := c_NO; 
 --Which external trigger module (ETM) to use?
      constant INCLUDE_ETM : integer range c_NO to c_YES := c_YES;
-     type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B);
+     type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B, ETM_CHOICE_SPILLMON);
      constant ETM_CHOICE : ETM_CHOICE_type := ETM_CHOICE_MBS_VULOM;
      constant ETM_ID : std_logic_vector(7 downto 0);
 
@@ -205,6 +205,7 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
+    t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
     t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));

diff --git a/cts/config_8SFP_KEL.vhd b/cts/config_8SFP_KEL.vhd
index 3c23914629cfcbd8d3afdea486251f04d5f9869e..8434886fc582fad9276cde5dd321361f77f20b9d 100644 (file)
--- a/cts/config_8SFP_KEL.vhd
+++ b/cts/config_8SFP_KEL.vhd
@@ -76,7 +76,7 @@ package config is
 --     constant INCLUDE_MBS_MASTER : integer range c_NO to c_YES := c_NO; 
 --Which external trigger module (ETM) to use?
      constant INCLUDE_ETM : integer range c_NO to c_YES := c_YES;
-     type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B,  ETM_CHOICE_SPILLMON);
+     type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B, ETM_CHOICE_SPILLMON);
      constant ETM_CHOICE : ETM_CHOICE_type := ETM_CHOICE_MBS_VULOM;
      constant ETM_ID : std_logic_vector(7 downto 0);
 
@@ -205,6 +205,7 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
+    t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
     t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));

diff --git a/cts/config_8SFP_RJAdapter.vhd b/cts/config_8SFP_RJAdapter.vhd
index aef2dfa352c39915a55dc2584507c124ee6d14e6..afadb536bfd53650cd865527c9402429b908602e 100644 (file)
--- a/cts/config_8SFP_RJAdapter.vhd
+++ b/cts/config_8SFP_RJAdapter.vhd
@@ -205,6 +205,7 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
+    t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
     t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));

diff --git a/cts/config_8TDC_R3B.vhd b/cts/config_8TDC_R3B.vhd
index 730d8ebab07b9d62778f6c0b171ff572a40b30c0..f802ccbfe0a77e4aa8879a611e9934dedf02888d 100644 (file)
--- a/cts/config_8TDC_R3B.vhd
+++ b/cts/config_8TDC_R3B.vhd
@@ -76,7 +76,7 @@ package config is
 --     constant INCLUDE_MBS_MASTER : integer range c_NO to c_YES := c_NO; 
 --Which external trigger module (ETM) to use?
      constant INCLUDE_ETM : integer range c_NO to c_YES := c_YES;
-     type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B);
+     type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET, ETM_CHOICE_M26, ETM_CHOICE_R3B, ETM_CHOICE_SPILLMON);
      constant ETM_CHOICE : ETM_CHOICE_type := ETM_CHOICE_R3B;
      constant ETM_ID : std_logic_vector(7 downto 0);
 
@@ -205,6 +205,7 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
+    t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
     t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));

diff --git a/cts/config_backplane_KEL.vhd b/cts/config_backplane_KEL.vhd
index 665633ffe5b777bead045a60005a0cd08bcacf64..e19420fb439421d659400c10a56d7d1d2cc67a34 100644 (file)
--- a/cts/config_backplane_KEL.vhd
+++ b/cts/config_backplane_KEL.vhd
@@ -144,7 +144,7 @@ package config is
 ------------------------------------------------------------------------------
     constant cts_rdo_additional_ports : integer := INCLUDE_TDC + INCLUDE_TIMESTAMP_GENERATOR + INCLUDE_ETM; --for TDC
     
-    constant HW_INFO_BASE            : unsigned(31 downto 0) := x"9500A000";
+    constant HW_INFO_BASE            : unsigned(31 downto 0) := x"9500B000";
     
     constant CLOCK_FREQUENCY_ARR  : intlist_t := (100,120, others => 0);
     constant MEDIA_FREQUENCY_ARR  : intlist_t := (200,240, others => 0);
@@ -202,6 +202,7 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
+    t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
     t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));

diff --git a/cts/config_simple.vhd b/cts/config_simple.vhd
index 796b969b523faf953cbb55035bbea09ba2f87fb8..40f69b04df2fcb6bd55ce3061f20e6b31fccac43 100644 (file)
--- a/cts/config_simple.vhd
+++ b/cts/config_simple.vhd
@@ -207,6 +207,7 @@ function generateIncludedFeatures return std_logic_vector is
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(26 downto 24) := std_logic_vector(to_unsigned(SFP_NUM_ARR(CFG_MODE),3)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));
+    t(39 downto 39) := std_logic_vector(to_unsigned(1,1)); --contains CTS
     t(40 downto 40) := std_logic_vector(to_unsigned(INCLUDE_LCD,1));
     t(42 downto 42) := std_logic_vector(to_unsigned(INCLUDE_SPI,1));
     t(43 downto 43) := std_logic_vector(to_unsigned(INCLUDE_UART,1));