]> jspc29.x-matter.uni-frankfurt.de Git - trbnet.git/commitdiff
*** empty log message ***
authorhadaq <hadaq>
Thu, 15 Jul 2010 15:32:13 +0000 (15:32 +0000)
committerhadaq <hadaq>
Thu, 15 Jul 2010 15:32:13 +0000 (15:32 +0000)
special/handler_lvl1.vhd

index 6477d25c3b40b71f08ed28e6258c955778a86155..fdc5f7b83d56202e267a9d8e97f4be1dec708a12 100644 (file)
@@ -359,7 +359,7 @@ begin
                elsif( LVL1_INT_TRG_LOAD_IN = '1' ) then
                        lvl1_int_trg_number <= unsigned(LVL1_INT_TRG_COUNTER_IN);
                elsif( lvl1_int_trg_ce = '1' ) then
-                       lvl1_int_trg_number <= lvl1_int_trg_number + to_unsigned(1,1);
+                       lvl1_int_trg_number <= lvl1_int_trg_number + 1;
                end if;
        end if;
 end process THE_INTERNAL_TRG_CTR_PROC;
@@ -400,7 +400,7 @@ end process COUNT_EDGES_AND_LENGTH_PROC;
 next_error_pattern(31 downto 19) <= LVL1_ERROR_PATTERN_IN(31 downto 19);
 next_error_pattern(18)           <= LVL1_ERROR_PATTERN_IN(18) or mult_trg_found; -- multiple timing triggers
 next_error_pattern(17)           <= LVL1_ERROR_PATTERN_IN(17) or invalid_trg;    -- timing trigger missing
-next_error_pattern(16)           <= LVL1_ERROR_PATTERN_IN(16) or trg_num_match;  -- trigger counter mismatch
+next_error_pattern(16)           <= LVL1_ERROR_PATTERN_IN(16) or (not trg_num_match);  -- trigger counter mismatch
 next_error_pattern(15 downto 0)  <= LVL1_ERROR_PATTERN_IN(15 downto 0);
 
 ---------------------------------------------------------------------------