]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
Revert "statebits also to ADC clock domain"
authorAndreas Neiser <neiser@kph.uni-mainz.de>
Thu, 5 Mar 2015 09:32:11 +0000 (10:32 +0100)
committerAndreas Neiser <neiser@kph.uni-mainz.de>
Sat, 13 Jun 2015 15:37:02 +0000 (17:37 +0200)
This reverts commit 2c86b4b98dcbe5fac40b29e116320c6a7b9cea52.

Conflicts:
ADC/source/adc_processor_cfd.vhd

ADC/source/adc_processor_cfd.vhd

index e1930ac1c4da581eeee79116be0ff7672f2209ab..27e2c19e8b3faa0fa67ce1e063ed9169187d8014 100644 (file)
@@ -114,6 +114,7 @@ begin
   READOUT_TX.data_write <= RDO_write_main when rising_edge(CLK_SYS);
   READOUT_TX.data       <= RDO_data_main when rising_edge(CLK_SYS);
   readout_reset         <= CONTROL(12) when rising_edge(CLK_SYS);
+  statebits             <= std_logic_vector(to_unsigned(state_t'pos(state), 8));
 
   proc_readout : process
     variable channelselect : integer range 0 to 3;
@@ -222,9 +223,6 @@ begin
     end if;
   end process;
 
-  statebits             <= std_logic_vector(to_unsigned(state_t'pos(state), 8)) when rising_edge(CLK_SYS);
-  statebits_adc <= statebits when rising_edge(CLK_ADC);
-  
   PROC_DEBUG_BUFFER : process
     variable c : integer range 0 to 3;
   begin
@@ -249,7 +247,7 @@ begin
             DEBUG_BUFFER_DATA(12)           <= '1'; -- ADC_VALID
             DEBUG_BUFFER_DATA(19 downto 16) <= trigger_gen;
           when x"6" =>
-            DEBUG_BUFFER_DATA(7 downto 0) <= statebits_adc;
+            DEBUG_BUFFER_DATA(7 downto 0) <= statebits;
           when others => null;
         end case;
       end if;