]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
Bugfix: Reset of signal in wrong process causes multiple drivers
authorHadaq in Frankfurt <hadaq@frankfurt>
Thu, 4 Apr 2013 21:24:08 +0000 (23:24 +0200)
committerHadaq in Frankfurt <hadaq@frankfurt>
Thu, 4 Apr 2013 21:24:08 +0000 (23:24 +0200)
cts/source/cts.vhd

index 4bd976577624d07ed4f076d982dad9d83bb114ed..fe7fbd3341a1d2509e37aac8d1a61cc8e537ea53 100755 (executable)
@@ -644,9 +644,7 @@ begin
    begin
       if rising_edge(CLK) then
          if RESET='1' then
-            eb_mask_i     <= (0 => '1', others => '0');
             eb_mask_buf_i <= (0 => '1', others => '0');
-            eb_aggr_threshold_i <= x"00";
             eb_aggr_counter_i   <= x"00";
          elsif eb_aggr_threshold_i /= x"00" and ro_next_cycle_i = '1' then
             if eb_aggr_threshold_i = eb_aggr_counter_i then
@@ -817,6 +815,9 @@ begin
             throttle_threshold_i <= (others => '0');
             throttle_enabled_i <= '0';
             stop_triggers_i <= '0';
+            eb_aggr_threshold_i <= x"00";
+            eb_mask_i     <= (0 => '1', others => '0');
+
             
          else