Changeset 9890 for firmware/FTU/FTU_top.vhd

Timestamp:

08/24/10 13:39:00 (14 years ago)

Author:

weitzel

Message:

overflow register implemented for FTU rate counter

File:

• firmware/FTU/FTU_top.vhd (modified) (10 diffs)

firmware/FTU/FTU_top.vhd

@@ -97 +97 @@
 
   --rate counter signals
-  signal cntr_reset_sig : STD_LOGIC;  -- initialized in FTU_control  
-  signal rate_array_sig : rate_array_type := (0,0,0,0,0);
-  signal prescaling_sig : STD_LOGIC_VECTOR(7 downto 0);
+  signal cntr_reset_sig : STD_LOGIC;  -- initialized in FTU_control
+  signal rate_array_sig : rate_array_type;  -- initialized by counters
+  signal prescaling_sig : STD_LOGIC_VECTOR(7 downto 0);  -- initialized in FTU_control  
   signal overflow_array : STD_LOGIC_VECTOR(7 downto 0) := "00000000";
+  signal new_rate_A_sig : STD_LOGIC;  -- initialized by patch A counter
+  signal new_rate_B_sig : STD_LOGIC;  -- initialized by patch B counter
+  signal new_rate_C_sig : STD_LOGIC;  -- initialized by patch C counter
+  signal new_rate_D_sig : STD_LOGIC;  -- initialized by patch D counter
+  signal new_rate_t_sig : STD_LOGIC;  -- initialized by trigger counter
+  signal new_rates_sig  : STD_LOGIC := '0';
   
   signal clk_50M_sig   : STD_LOGIC;         -- generated by internal DCM
@@ -133 +139 @@
       prescaling : in  std_logic_vector(7 downto 0);
       counts     : out integer range 0 to 2**16 - 1;
-      overflow   : out std_logic
+      overflow   : out std_logic;
+      new_rate   : out std_logic
       );
   end component;
@@ -146 +153 @@
       ram_dob        : IN  STD_LOGIC_VECTOR(15 downto 0);
       rate_array     : IN  rate_array_type;
+      overflow_array : in  STD_LOGIC_VECTOR(7 downto 0);
+      new_rates      : IN  std_logic;
       reset          : OUT std_logic;
       config_start   : OUT std_logic;
@@ -206 +215 @@
   enables_D <= enable_array_sig(3)(8 downto 0);
 
+  new_rates_sig <= new_rate_A_sig and new_rate_B_sig and new_rate_C_sig and new_rate_D_sig and new_rate_t_sig; 
+  
   --differential input buffer for patch A
   IBUFDS_LVDS_33_A : IBUFDS_LVDS_33
@@ -261 +272 @@
       prescaling => prescaling_sig,
       counts     => rate_array_sig(0),
-      overflow   => overflow_array(0)
+      overflow   => overflow_array(0),
+      new_rate   => new_rate_A_sig 
     );
 
@@ -271 +283 @@
       prescaling => prescaling_sig,
       counts     => rate_array_sig(1),
-      overflow   => overflow_array(1)
+      overflow   => overflow_array(1),
+      new_rate   => new_rate_B_sig 
     );
 
@@ -281 +294 @@
       prescaling => prescaling_sig,
       counts     => rate_array_sig(2),
-      overflow   => overflow_array(2)
+      overflow   => overflow_array(2),
+      new_rate   => new_rate_C_sig 
     );
 
@@ -291 +305 @@
       prescaling => prescaling_sig,
       counts     => rate_array_sig(3),
-      overflow   => overflow_array(3)
+      overflow   => overflow_array(3),
+      new_rate   => new_rate_D_sig 
     );
 
@@ -301 +316 @@
       prescaling => prescaling_sig,
       counts     => rate_array_sig(4),
-      overflow   => overflow_array(4)
+      overflow   => overflow_array(4),
+      new_rate   => new_rate_t_sig 
     );
   
@@ -313 +329 @@
       ram_dob        => ram_dob_sig,
       rate_array     => rate_array_sig,
+      overflow_array => overflow_array,
+      new_rates      => new_rates_sig,
       reset          => reset_sig,
       config_start   => config_start_sig,