Update config files with new broadcast addresses

diff --git a/adcaddon/config.vhd b/adcaddon/config.vhd
index 02c29cc8afdc3c8e0e136e24e5f25556f6ca007b..5a51718e665f22489200d7f3b844abd86066ce3d 100644 (file)
--- a/adcaddon/config.vhd
+++ b/adcaddon/config.vhd
@@ -20,7 +20,7 @@ package config is
    
 --Address settings   
     constant INIT_ADDRESS           : std_logic_vector := x"F3CC";
-    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"60";
+    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"68";
    
 --set to 0 for backplane serdes, set to 3 for front SFP serdes
     constant SERDES_NUM             : integer := 3;
@@ -118,4 +118,4 @@ end function;
 
   constant INCLUDED_FEATURES : std_logic_vector(63 downto 0) := generateIncludedFeatures;    
 
-end package body;
\ No newline at end of file
+end package body;

diff --git a/backplanemaster/config.vhd b/backplanemaster/config.vhd
index 830412879815cf9464e06bd390d4ba7d88b627a9..9c1ca7e97df6f51b148b19b17e9a28dcd98e2f33 100644 (file)
--- a/backplanemaster/config.vhd
+++ b/backplanemaster/config.vhd
@@ -22,7 +22,7 @@ package config is
    
 --Address settings   
     constant INIT_ADDRESS           : std_logic_vector := x"F3CE";
-    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"61";
+    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"61"; --61 with GbE, 60 without
    
 
     constant INCLUDE_UART           : integer  := c_YES;
@@ -37,7 +37,7 @@ package config is
     constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
     constant MONITOR_INPUT_NUM      : integer  := 22;
 
-    constant INCLUDE_GBE            : integer  := c_YES;
+    constant INCLUDE_GBE            : integer  := c_NO;
 
     
 ------------------------------------------------------------------------------

diff --git a/cts/config.vhd b/cts/config.vhd
index bde78a7041f945c5f96abab6d2875bff5b7b9b7e..e38424b364062e239da4b43b850bc495a7b17d13 100644 (file)
--- a/cts/config.vhd
+++ b/cts/config.vhd
@@ -27,7 +27,7 @@ package config is
    
 --Address settings   
     constant INIT_ADDRESS           : std_logic_vector := x"F3C0";
-    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"61";
+    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"62";  --62 for SFP, 63 for backplane
    
 
     constant INCLUDE_UART           : integer  := c_YES;
@@ -49,7 +49,7 @@ package config is
     -- 0: KEL on board
     -- 1: Canadian
     constant NUM_TDC_MODULES         : integer range 1 to 4  := 1;  -- number of tdc modules to implement
-    constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 11; -- number of tdc channels per module
+    constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 12; -- number of tdc channels per module
     constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 4;  --the nearest power of two, for convenience reasons 
     constant DOUBLE_EDGE_TYPE        : integer range 0 to 3  := 3;  --double edge type:  0, 1, 2,  3
     -- 0: single edge only,

diff --git a/hub/config.vhd b/hub/config.vhd
index ca579d597ab8aa355aafbba79309ba5356830778..1fd5f1c4807ea374a8aafeeeea91f1208a088005 100644 (file)
--- a/hub/config.vhd
+++ b/hub/config.vhd
@@ -26,7 +26,7 @@ package config is
    
 --Address settings   
     constant INIT_ADDRESS           : std_logic_vector := x"F3CD";
-    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"61";
+    
    
 
     constant INCLUDE_UART           : integer  := c_YES;
@@ -114,7 +114,7 @@ package config is
     constant CLOCK_FREQUENCY      : integer;
     constant MEDIA_FREQUENCY      : integer;
     constant INCLUDED_FEATURES    : std_logic_vector(63 downto 0);
-    
+    constant BROADCAST_SPECIAL_ADDR : std_logic_vector;
     
 end;
 
@@ -132,7 +132,7 @@ package body config is
   constant IS_UPLINK            : hub_ct  := IS_UPLINK_ARR(CFG_MODE);
   constant IS_DOWNLINK          : hub_ct  := IS_DOWNLINK_ARR(CFG_MODE);
   constant IS_UPLINK_ONLY       : hub_ct  := IS_UPLINK_ONLY_ARR(CFG_MODE); 
-
+  constant BROADCAST_SPECIAL_ADDR : std_logic_vector := std_logic_vector(to_unsigned(100+CFG_MODE,8));
   
   
 function generateIncludedFeatures return std_logic_vector is
@@ -140,7 +140,9 @@ function generateIncludedFeatures return std_logic_vector is
   begin
     t               := (others => '0');
     t(63 downto 56) := std_logic_vector(to_unsigned(1,8)); --table version 1
-    t(22 downto 16) := "0100111"; --sctrl via GbE
+    if INCLUDE_GBE = c_YES then
+      t(22 downto 16) := "0100111"; --sctrl via GbE
+    end if;  
     t(23 downto 23) := std_logic_vector(to_unsigned(INCLUDE_GBE,1));
     t(27 downto 24) := std_logic_vector(to_unsigned(INTERFACE_NUM-USE_BACKPLANE,4)); --num SFPs with TrbNet
     t(28 downto 28) := std_logic_vector(to_unsigned(USE_BACKPLANE,1));

diff --git a/tdctemplate/config_32_sfp_kel.vhd b/tdctemplate/config_32_sfp_kel.vhd
index 1aa4584f27e3e3036e121cc20dd9516782387d56..801c2b1f2a31ebac083f837c7aaed770bff1efc9 100644 (file)
--- a/tdctemplate/config_32_sfp_kel.vhd
+++ b/tdctemplate/config_32_sfp_kel.vhd
@@ -46,7 +46,7 @@ package config is
    
 --Address settings   
     constant INIT_ADDRESS           : std_logic_vector := x"F3CF";
-    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"62";
+    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"72";
    
 --set to 0 for backplane serdes, set to 3 for front SFP serdes
     constant SERDES_NUM             : integer := 3;

diff --git a/tdctemplate/config_48_crate_4conn.vhd b/tdctemplate/config_48_crate_4conn.vhd
index 478d20dddbe0c8d395749d7f7ed84c12f817d0e6..21c6cee9c5cace969a7d133b8a6e63e993d88738 100644 (file)
--- a/tdctemplate/config_48_crate_4conn.vhd
+++ b/tdctemplate/config_48_crate_4conn.vhd
@@ -46,7 +46,7 @@ package config is
    
 --Address settings   
     constant INIT_ADDRESS           : std_logic_vector := x"F3CF";
-    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"70";
+    constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"71";
    
 --set to 0 for backplane serdes, set to 3 for front SFP serdes
     constant SERDES_NUM             : integer := 0;

diff --git a/template/config.vhd b/template/config.vhd
index ff252d8cf5030bd349536d5c580e223553bb73ee..d7270365b87635fb88b4935a9be94388c2e87359 100644 (file)
--- a/template/config.vhd
+++ b/template/config.vhd
@@ -28,7 +28,7 @@ package config is
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"60";
    
 --set to 0 for backplane serdes, set to 3 for front SFP serdes
-    constant SERDES_NUM             : integer := 0;
+    constant SERDES_NUM             : integer := 3;
    
     constant INCLUDE_UART           : integer  := c_YES;
     constant INCLUDE_SPI            : integer  := c_YES;
@@ -39,7 +39,7 @@ package config is
     constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
     constant INCLUDE_STATISTICS     : integer  := c_YES;
     constant TRIG_GEN_INPUT_NUM     : integer  := 32;
-    constant TRIG_GEN_OUTPUT_NUM    : integer  := 3;
+    constant TRIG_GEN_OUTPUT_NUM    : integer  := 2;
     constant MONITOR_INPUT_NUM      : integer  := 32;        
     
 ------------------------------------------------------------------------------