tdc_version package added

diff --git a/32PinAddOn/trb3_periph_32PinAddOn.prj b/32PinAddOn/trb3_periph_32PinAddOn.prj
index dffe62a3d6e6b73a2220900f93165857c1170e0a..4ed43e2100f2e32e30c94b3c21e9ddafc80ace99 100644 (file)
--- a/32PinAddOn/trb3_periph_32PinAddOn.prj
+++ b/32PinAddOn/trb3_periph_32PinAddOn.prj
@@ -52,6 +52,7 @@ impl -active "workdir"
 #add_file options
 
 add_file -vhdl -lib work "version.vhd"
+add_file -vhdl -lib work "tdc_version.vhd"
 add_file -vhdl -lib work "config.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_std.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_components.vhd"

diff --git a/32PinAddOn/trb3_periph_32PinAddOn.vhd b/32PinAddOn/trb3_periph_32PinAddOn.vhd
index 08d89217e8a4c79e75ac39d78e7f3d2cf38a1cb6..0a3a87d2e6d53cf2e05899a56558508d694c2b2c 100644 (file)
--- a/32PinAddOn/trb3_periph_32PinAddOn.vhd
+++ b/32PinAddOn/trb3_periph_32PinAddOn.vhd
@@ -7,6 +7,7 @@ use work.trb_net_std.all;
 use work.trb_net_components.all;
 use work.trb3_components.all;
 use work.config.all;
+use work.tdc_version.all;
 use work.version.all;
 
 
@@ -266,14 +267,14 @@ architecture trb3_periph_32PinAddOn_arch of trb3_periph_32PinAddOn is
   signal stat_nack  : std_logic                     := '0';
   signal stat_addr  : std_logic_vector(15 downto 0) := (others => '0');
 
-  signal sed_error  : std_logic;
-  signal sed_din    : std_logic_vector(31 downto 0);
-  signal sed_dout   : std_logic_vector(31 downto 0);
-  signal sed_write  : std_logic := '0';
-  signal sed_read   : std_logic := '0';
-  signal sed_ack    : std_logic := '0';
-  signal sed_nack   : std_logic := '0';
-  signal sed_addr   : std_logic_vector(15 downto 0) := (others => '0');  
+  signal sed_error : std_logic;
+  signal sed_din   : std_logic_vector(31 downto 0);
+  signal sed_dout  : std_logic_vector(31 downto 0);
+  signal sed_write : std_logic                     := '0';
+  signal sed_read  : std_logic                     := '0';
+  signal sed_ack   : std_logic                     := '0';
+  signal sed_nack  : std_logic                     := '0';
+  signal sed_addr  : std_logic_vector(15 downto 0) := (others => '0');
 
   --TDC
   signal hit_in_i         : std_logic_vector(64 downto 1);
@@ -493,15 +494,15 @@ begin
 ---------------------------------------------------------------------------
   THE_BUS_HANDLER : trb_net16_regio_bus_handler
     generic map(
-      PORT_NUMBER                 => 9,
-      PORT_ADDRESSES              => (0 => x"d000", 1 => x"d100", 2 => x"d400", 3 => x"c000", 4 => x"c100",
-                                --5  => x"c200", 6  => x"c300", 7 => x"c400", 8 => x"c800", 9 => x"cf00",
-                                --10 => x"cf80", 11 => x"d500", others => x"0000"),
-                                5 => x"c800", 6 => x"cf00", 7 => x"cf80", 8 => x"d500", others => x"0000"),
-      PORT_ADDR_MASK              => (0 => 1, 1 => 6, 2 => 5, 3 => 7, 4 => 5,
-                                --5  => 7, 6  => 7, 7 => 7, 8 => 3, 9 => 6,
-                                --10 => 7, 11 => 4, others => 0)
-                                5 => 3, 6 => 6, 7 => 7, 8 => 4, others => 0)
+      PORT_NUMBER                       => 9,
+      PORT_ADDRESSES                    => (0 => x"d000", 1 => x"d100", 2 => x"d400", 3 => x"c000", 4 => x"c100",
+                                      --5  => x"c200", 6  => x"c300", 7 => x"c400", 8 => x"c800", 9 => x"cf00",
+                                      --10 => x"cf80", 11 => x"d500", others => x"0000"),
+                                      5 => x"c800", 6 => x"cf00", 7 => x"cf80", 8 => x"d500", others => x"0000"),
+      PORT_ADDR_MASK                    => (0 => 1, 1 => 6, 2 => 5, 3 => 7, 4 => 5,
+                                      --5  => 7, 6  => 7, 7 => 7, 8 => 3, 9 => 6,
+                                      --10 => 7, 11 => 4, others => 0)
+                                      5 => 3, 6 => 6, 7 => 7, 8 => 4, others => 0)
       )
     port map(
       CLK   => clk_100_i,
@@ -872,7 +873,7 @@ begin
       CHANNEL_NUMBER => NUM_TDC_CHANNELS,   -- Number of TDC channels
       STATUS_REG_NR  => 21,             -- Number of status regs
       CONTROL_REG_NR => 6,  -- Number of control regs - higher than 8 check tdc_ctrl_addr
-      TDC_VERSION    => x"160",         -- TDC version number
+      TDC_VERSION    => TDC_VERSION,    -- TDC version number
       DEBUG          => c_YES,
       SIMULATION     => c_NO)
     port map (

diff --git a/ADA_Addon/trb3_periph_ADA.prj b/ADA_Addon/trb3_periph_ADA.prj
index 6304f522d4fc1646d1b0528567c3efae76ba5c13..db0557f22132e2949418192f45ee339ae5fb2832 100644 (file)
--- a/ADA_Addon/trb3_periph_ADA.prj
+++ b/ADA_Addon/trb3_periph_ADA.prj
@@ -53,6 +53,7 @@ impl -active "workdir"
 #add_file options
 
 add_file -vhdl -lib work "version.vhd"
+add_file -vhdl -lib work "tdc_version.vhd"
 add_file -vhdl -lib work "config.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_std.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_components.vhd"

diff --git a/ADA_Addon/trb3_periph_ADA.vhd b/ADA_Addon/trb3_periph_ADA.vhd
index 0bef5c37fc9f605756e4cdd45de61c3619482ef9..1f990f83a1f04a656cfea3f7ae7f31d15ce1ecec 100644 (file)
--- a/ADA_Addon/trb3_periph_ADA.vhd
+++ b/ADA_Addon/trb3_periph_ADA.vhd
@@ -7,6 +7,7 @@ use work.trb_net_std.all;
 use work.trb_net_components.all;
 use work.trb3_components.all;
 use work.config.all;
+use work.tdc_version.all;
 use work.version.all;
 
 
@@ -752,7 +753,7 @@ begin
       CHANNEL_NUMBER => NUM_TDC_CHANNELS,   -- Number of TDC channels
       STATUS_REG_NR  => 20,             -- Number of status regs
       CONTROL_REG_NR => 5,  -- Number of control regs - higher than 8 check tdc_ctrl_addr
-      TDC_VERSION    => x"160",         -- TDC version number
+      TDC_VERSION    => TDC_VERSION,         -- TDC version number
       DEBUG          => c_YES,
       SIMULATION     => c_NO)
     port map (

diff --git a/cbmtof/cbmtof.prj b/cbmtof/cbmtof.prj
index 6cfc9c80491da39e0704772b469fc43e71b66599..3543b0cd2efcd22bf98fbd6068c19a3f2864410d 100644 (file)
--- a/cbmtof/cbmtof.prj
+++ b/cbmtof/cbmtof.prj
@@ -52,6 +52,7 @@ impl -active "workdir"
 #add_file options
 
 add_file -vhdl -lib work "version.vhd"
+add_file -vhdl -lib work "tdc_version.vhd"
 add_file -vhdl -lib work "config.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_std.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_components.vhd"

diff --git a/cbmtof/cbmtof.vhd b/cbmtof/cbmtof.vhd
index ef8e33236b4002bf4c93ca4a918aef86fff1e9c1..ab623c86f921195ea3711df810e4dcd868ec9318 100644 (file)
--- a/cbmtof/cbmtof.vhd
+++ b/cbmtof/cbmtof.vhd
@@ -7,6 +7,7 @@ use work.trb_net_std.all;
 use work.trb_net_components.all;
 use work.trb3_components.all;
 use work.config.all;
+use work.tdc_version.all;
 use work.version.all;
 
 
@@ -500,8 +501,8 @@ begin
 ---------------------------------------------------------------------------
 -- I/O
 ---------------------------------------------------------------------------
---  timing_trg_received_i <= SPARE_LINE(0);
-  timing_trg_received_i <= CLK_CM(3);
+  timing_trg_received_i <= SPARE_LINE(0);
+--  timing_trg_received_i <= CLK_CM(3);
 
 ---------------------------------------------------------------------------
 -- Bus Handler

diff --git a/cbmtof/config.vhd b/cbmtof/config.vhd
index 606270f6a0429f0312f35a367cfe63846e5d8cdc..300eb4c86d9acb9b4d65c0583783ce88651d3491 100644 (file)
--- a/cbmtof/config.vhd
+++ b/cbmtof/config.vhd
@@ -13,7 +13,6 @@ 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 TDC_VERSION             : std_logic_vector(11 downto 0) := x"160";
   constant USE_DOUBLE_EDGE         : integer                       := c_YES;
 
 --Include SPI on AddOn connector    

diff --git a/hadesstart/trb3_periph_hadesstart.prj b/hadesstart/trb3_periph_hadesstart.prj
index 2cbe9051cc456f1b3be738410c3bc9fa5b3e2453..347a7cec65610d79bd927897f69e614d5a5bad79 100644 (file)
--- a/hadesstart/trb3_periph_hadesstart.prj
+++ b/hadesstart/trb3_periph_hadesstart.prj
@@ -52,6 +52,7 @@ impl -active "workdir"
 #add_file options
 
 add_file -vhdl -lib work "version.vhd"
+add_file -vhdl -lib work "tdc_version.vhd"
 add_file -vhdl -lib work "config.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_std.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_components.vhd"
@@ -166,6 +167,7 @@ add_file -vhdl -lib "work" "currentRelease/risingEdgeDetect.vhd"
 add_file -vhdl -lib "work" "currentRelease/hit_mux.vhd"
 add_file -vhdl -lib "work" "../base/cores/FIFO_36x128_OutReg.vhd"
 add_file -vhdl -lib "work" "../base/cores/FIFO_DC_36x128_OutReg.vhd"
+add_file -vhdl -lib "work" "../base/cores/FIFO_DC_36x64_OutReg.vhd"
 #add_file -vhdl -lib "work" "currentRelease/Reference_Channel_200.vhd"
 #add_file -vhdl -lib "work" "currentRelease/Reference_Channel.vhd"
 

diff --git a/hadesstart/trb3_periph_hadesstart.vhd b/hadesstart/trb3_periph_hadesstart.vhd
index 09f1a2cae6ace9937a299b9f574fecdfcfe304a8..12ded446b71c7bbbd521ed49eb09cb1596dbeaa2 100644 (file)
--- a/hadesstart/trb3_periph_hadesstart.vhd
+++ b/hadesstart/trb3_periph_hadesstart.vhd
@@ -7,6 +7,7 @@ use work.trb_net_std.all;
 use work.trb_net_components.all;
 use work.trb3_components.all;
 use work.config.all;
+use work.tdc_version.all;
 use work.version.all;
 
 
@@ -818,7 +819,7 @@ THE_SED : entity work.sedcheck
       CHANNEL_NUMBER => NUM_TDC_CHANNELS,  -- Number of TDC channels
       STATUS_REG_NR  => 22,                -- Number of status regs
       CONTROL_REG_NR => 6,                 -- Number of control regs - higher than 8 check tdc_ctrl_addr
-      TDC_VERSION    => x"160",            -- TDC version number
+      TDC_VERSION    => TDC_VERSION        -- TDC version number
       DEBUG          => c_YES,
       SIMULATION     => c_NO)
     port map (

diff --git a/tdc_releases/tdc_v1.6.1/tdc_version.vhd b/tdc_releases/tdc_v1.6.1/tdc_version.vhd
new file mode 100644 (file)
index 0000000..cecf226
--- /dev/null
+++ b/tdc_releases/tdc_v1.6.1/tdc_version.vhd
@@ -0,0 +1,9 @@
+library ieee;
+use IEEE.std_logic_1164.all;
+use ieee.numeric_std.all;
+
+package tdc_version is
+
+  constant TDC_VERSION             : std_logic_vector(11 downto 0) := x"161";
+
+end;

diff --git a/wasa/trb3_periph_padiwa.prj b/wasa/trb3_periph_padiwa.prj
index 3915fc1fb71fe1eb870b5b341e19b02645648247..bac5341959f2830d6e06534f3a5522fc286ca382 100644 (file)
--- a/wasa/trb3_periph_padiwa.prj
+++ b/wasa/trb3_periph_padiwa.prj
@@ -52,6 +52,7 @@ impl -active "workdir"
 #add_file options
 
 add_file -vhdl -lib work "version.vhd"
+add_file -vhdl -lib work "tdc_version.vhd"
 add_file -vhdl -lib work "config.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_std.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_components.vhd"

diff --git a/wasa/trb3_periph_padiwa.vhd b/wasa/trb3_periph_padiwa.vhd
index 225a1a4d36c998dc2e8e309b92458c69312b359c..b77b5b5040836c2e7debd06f37948af734381ac0 100644 (file)
--- a/wasa/trb3_periph_padiwa.vhd
+++ b/wasa/trb3_periph_padiwa.vhd
@@ -7,6 +7,7 @@ use work.trb_net_std.all;
 use work.trb_net_components.all;
 use work.trb3_components.all;
 use work.config.all;
+use work.tdc_version.all;
 use work.version.all;
 
 
@@ -913,7 +914,7 @@ THE_SED : entity work.sedcheck
       CHANNEL_NUMBER => NUM_TDC_CHANNELS,   -- Number of TDC channels
       STATUS_REG_NR  => 21,             -- Number of status regs
       CONTROL_REG_NR => 6,  -- Number of control regs - higher than 8 check tdc_ctrl_addr
-      TDC_VERSION    => x"160",         -- TDC version number
+      TDC_VERSION    => TDC_VERSION       -- TDC version number
       DEBUG          => c_YES,
       SIMULATION     => c_NO)
     port map (