Addon information correction

diff --git a/32PinAddOn/config.vhd b/32PinAddOn/config.vhd
index 04c529b9daf08c21a63b036fdc88654f35f7a12c..bde75078c063bb850a891a1114944887a428577e 100644 (file)
--- a/32PinAddOn/config.vhd
+++ b/32PinAddOn/config.vhd
@@ -11,32 +11,24 @@ package config is
 ------------------------------------------------------------------------------
 
 --Include GbE logic     
-    constant NUM_TDC_CHANNELS       : integer range 1 to 65 := 65;
-    constant NUM_TDC_CHANNELS_POWER2: integer range 0 to 6  := 6;  --the nearest power of two, for convenience reasons
-    constant USE_DOUBLE_EDGE        : integer := c_YES;
-    --constant ADDON_TYPE              : integer               := 0; -- ADA v1
-    --constant ADDON_TYPE              : integer               := 1; -- ADA v2
-    --constant ADDON_TYPE              : integer               := 2; -- Multitest
-    --constant ADDON_TYPE              : integer               := 3; -- SFP
-    --constant ADDON_TYPE              : integer               := 4; -- Padiwa
-    --constant ADDON_TYPE              : integer               := 5; -- GPIN
-    --constant ADDON_TYPE              : integer               := 6; -- Nxyter
-    constant ADDON_TYPE              : integer               := 7; -- 32PinAddon
+    constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 65;
+    constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 6;  --the nearest power of two, for convenience reasons
+    constant USE_DOUBLE_EDGE         : integer               := c_YES;
 
 --Include SPI on AddOn connector    
     constant INCLUDE_SPI            : integer := c_YES;
 
 --Add logic to generate configurable trigger signal from input signals.
-    constant INCLUDE_TRIGGER_LOGIC  : integer := c_YES;    
+    constant INCLUDE_TRIGGER_LOGIC  : integer := c_YES;
     
---Run wih 125 MHz instead of 100 MHz     
-    constant USE_125_MHZ            : integer := c_NO;  --not implemented yet!  
+--Run wih 125 MHz instead of 100 MHz
+    constant USE_125_MHZ            : integer := c_NO;  --not implemented yet!
     
 --Use sync mode, RX clock for all parts of the FPGA
     constant USE_RXCLOCK            : integer := c_NO;  --not implemented yet!
     
    
---Address settings   
+--Address settings
     constant INIT_ADDRESS           : std_logic_vector := x"F305";
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"48";
    
@@ -55,9 +47,6 @@ package config is
     constant HW_INFO_DOUBLE_EDGE     : hw_info_t := (x"00000000",x"00000800", others => x"00000000");
     constant HW_INFO_NUM_CHANS       : hw_info_t := (x"00000000",x"00000010",x"00000020",x"00000030",
                                                      x"00000040",x"00000050",x"00000060",x"00000070", others => x"00000000");
-    constant HW_INFO_ADDON           : hw_info_t := (x"00000000",x"00001000",x"00002000",x"00003000",
-                                                     x"00004000",x"00005000",x"00006000",x"00007000", others => x"00000000");
-    
     constant CLOCK_FREQUENCY_ARR  : intlist_t := (100,125, others => 0);
     constant MEDIA_FREQUENCY_ARR  : intlist_t := (200,125, others => 0);
                           
@@ -73,7 +62,7 @@ package body config is
   
   constant HARDWARE_INFO        : std_logic_vector(31 downto 0) := std_logic_vector(
                                       HW_INFO_BASE + HW_INFO_SPI(INCLUDE_SPI) + HW_INFO_DOUBLE_EDGE(USE_DOUBLE_EDGE) +
-                                      HW_INFO_NUM_CHANS(NUM_TDC_CHANNELS_POWER2) + HW_INFO_ADDON(ADDON_TYPE));
+                                      HW_INFO_NUM_CHANS(NUM_TDC_CHANNELS_POWER2));
   constant CLOCK_FREQUENCY      : integer := CLOCK_FREQUENCY_ARR(USE_125_MHZ);
   constant MEDIA_FREQUENCY      : integer := MEDIA_FREQUENCY_ARR(USE_125_MHZ);
   

diff --git a/wasa/config.vhd b/wasa/config.vhd
index b14e07535c726a18e97bae86aad2d816fddd6221..b8c916e995a2768fac9ed8e62ea643597508ce82 100644 (file)
--- a/wasa/config.vhd
+++ b/wasa/config.vhd
@@ -14,14 +14,6 @@ package config is
     constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 65;
     constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 6;  --the nearest power of two, for convenience reasons
     constant USE_DOUBLE_EDGE         : integer               := c_YES;
-    --constant ADDON_TYPE              : integer               := 0; -- ADA v1
-    --constant ADDON_TYPE              : integer               := 1; -- ADA v2
-    --constant ADDON_TYPE              : integer               := 2; -- Multitest
-    --constant ADDON_TYPE              : integer               := 3; -- SFP
-    constant ADDON_TYPE              : integer               := 4; -- Padiwa
-    --constant ADDON_TYPE              : integer               := 5; -- GPIN
-    --constant ADDON_TYPE              : integer               := 6; -- Nxyter
-    --constant ADDON_TYPE              : integer               := 7; -- 32PinAddon
     
 --Include SPI on AddOn connector    
     constant INCLUDE_SPI            : integer := c_YES;
@@ -50,14 +42,11 @@ package config is
 ------------------------------------------------------------------------------
     type intlist_t is array(0 to 7) of integer;
     type hw_info_t is array(0 to 7) of unsigned(31 downto 0);
-    constant HW_INFO_BASE            : unsigned(31 downto 0) := x"91007000";
+    constant HW_INFO_BASE            : unsigned(31 downto 0) := x"91004000";
     constant HW_INFO_SPI             : hw_info_t := (x"00000000",x"00000400", others => x"00000000");
     constant HW_INFO_DOUBLE_EDGE     : hw_info_t := (x"00000000",x"00000800", others => x"00000000");
     constant HW_INFO_NUM_CHANS       : hw_info_t := (x"00000000",x"00000010",x"00000020",x"00000030",
                                                      x"00000040",x"00000050",x"00000060",x"00000070", others => x"00000000");
-    constant HW_INFO_ADDON           : hw_info_t := (x"00000000",x"00001000",x"00002000",x"00003000",
-                                                     x"00004000",x"00005000",x"00006000",x"00007000", others => x"00000000");
-    
     constant CLOCK_FREQUENCY_ARR  : intlist_t := (100,125, others => 0);
     constant MEDIA_FREQUENCY_ARR  : intlist_t := (200,125, others => 0);
                           
@@ -73,7 +62,7 @@ package body config is
   
   constant HARDWARE_INFO        : std_logic_vector(31 downto 0) := std_logic_vector(
                                       HW_INFO_BASE + HW_INFO_SPI(INCLUDE_SPI) + HW_INFO_DOUBLE_EDGE(USE_DOUBLE_EDGE) +
-                                      HW_INFO_NUM_CHANS(NUM_TDC_CHANNELS_POWER2) + HW_INFO_ADDON(ADDON_TYPE));
+                                      HW_INFO_NUM_CHANS(NUM_TDC_CHANNELS_POWER2));
   constant CLOCK_FREQUENCY      : integer := CLOCK_FREQUENCY_ARR(USE_125_MHZ);
   constant MEDIA_FREQUENCY      : integer := MEDIA_FREQUENCY_ARR(USE_125_MHZ);