From: Andreas Neiser <neiser@kph.uni-mainz.de>
Date: Thu, 5 Mar 2015 13:03:16 +0000 (+0100)
Subject: Improve locking of readout
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e44f66b517a6446265399e78134e17007ba2f74d;p=trb3.git

Improve locking of readout
---

diff --git a/ADC/source/adc_processor_cfd.vhd b/ADC/source/adc_processor_cfd.vhd
index d1ad16d..db25369 100644
--- a/ADC/source/adc_processor_cfd.vhd
+++ b/ADC/source/adc_processor_cfd.vhd
@@ -146,7 +146,7 @@ begin
         elsif READOUT_RX.valid_timing_trg = '1' then
           state <= TRIG_DLY;
           counter := to_integer(trigger_delay);
-          epoch_counter_save <= epoch_counter;
+          epoch_counter_save <= epoch_counter; -- all channels at the same time
         end if;
 
       when RELEASE_DIRECT =>
@@ -183,7 +183,7 @@ begin
 
       when WAIT_BSY =>
         busy_in_sys(channelselect) <= '1';
-        if busy_out_sys(channelselect) = '0' then
+        if busy_out_sys(channelselect) = '1' then
           -- start moving the counter already now
           -- the RAM output is registered 
           ram_counter(channelselect) <= ram_counter(channelselect) + 1;
diff --git a/ADC/source/adc_processor_cfd_ch.vhd b/ADC/source/adc_processor_cfd_ch.vhd
index d602558..e1657bd 100644
--- a/ADC/source/adc_processor_cfd_ch.vhd
+++ b/ADC/source/adc_processor_cfd_ch.vhd
@@ -92,7 +92,7 @@ architecture arch of adc_processor_cfd_ch is
   signal integral_sum                      : signed(RESOLUTION_CFD - 1 downto 0) := (others => '0');
 
   signal epoch_counter, epoch_counter_save : unsigned(23 downto 0) := (others => '0');
-  type state_t is (IDLE, INTEGRATE, WRITE1, WRITE2, WRITE3, WRITE4, FINISH, WAIT_BSY);
+  type state_t is (IDLE, INTEGRATE, WRITE1, WRITE2, WRITE3, WRITE4, FINISH, LOCKED);
   signal state : state_t := IDLE;
 
   signal ram_counter : unsigned(8 downto 0) := (others => '0'); 
@@ -239,10 +239,11 @@ begin
     end if;
 
     RAM_BSY_OUT <= '0';
+    RAM_DATA <= (others => '0'); -- always write zeros as end marker
+    
 
     case state is
       when IDLE =>
-        RAM_DATA <= (others => '0'); -- always write zeros as end marker
         if zeroX = '1' then
           state            <= INTEGRATE;
           integral_counter := to_integer(CONF.IntegrateWindow);
@@ -250,20 +251,22 @@ begin
           cfd_prev_save <= cfd_prev;
           cfd_save <= cfd.value;
           epoch_counter_save <= epoch_counter;
+        elsif RAM_BSY_IN = '1' then
+          state <= LOCKED;
         end if;        
       
       when INTEGRATE =>
         if integral_counter = 0 then
-          state         <= WAIT_BSY;
+          state         <= WRITE1;
         else
           integral_sum <= integral_sum + resize(delay_integral_out, RESOLUTION_CFD);
           integral_counter := integral_counter - 1;
         end if;
       
-      when WAIT_BSY =>
+      when LOCKED =>
+        RAM_BSY_OUT <= '1';
         if RAM_BSY_IN = '0' then
-          state <= WRITE1; 
-          RAM_BSY_OUT <= '1';
+          state <= IDLE;           
         end if;