From: Jan Michel Date: Sat, 9 May 2020 13:53:00 +0000 (+0200) Subject: correct non-existent mult registers for channels<=32 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=4b46feda1d1af1626e4000dacabed3ac513c2c74;p=trb3.git correct non-existent mult registers for channels<=32 --- diff --git a/base/code/input_to_trigger_logic_record.vhd b/base/code/input_to_trigger_logic_record.vhd index 6d4ca78..e3e25f4 100644 --- a/base/code/input_to_trigger_logic_record.vhd +++ b/base/code/input_to_trigger_logic_record.vhd @@ -50,7 +50,7 @@ signal coin_enable : std_logic := '0'; signal current_multiplicity0, current_multiplicity1 : unsigned(7 downto 0); signal current_multiplicity, set_multiplicity : unsigned(7 downto 0); signal multiplicity_trigger : std_logic := '0'; -signal multiplicity_enable : std_logic_vector(INPUTS-1 downto 0); +signal multiplicity_enable : std_logic_vector(register_bits downto 0); signal mult_gated : std_logic_vector(INPUTS-1 downto 0); signal set_output_coin, set_output_mult, set_output_simplecoin : std_logic_vector(7 downto 0); @@ -118,7 +118,7 @@ begin set_output_mult <= BUS_RX.data(15 downto 8); set_output_coin <= BUS_RX.data(23 downto 16); edge_enable <= BUS_RX.data(31 downto 24); - elsif BUS_RX.addr(6 downto 0) = "0110101" and INPUTS >= 32 then + elsif BUS_RX.addr(6 downto 0) = "0110101" and INPUTS > 32 then multiplicity_enable(63 downto 32) <= BUS_RX.data; else BUS_TX.nack <= '1'; @@ -183,7 +183,7 @@ begin BUS_TX.data <= multiplicity_enable(31 downto 0); elsif BUS_RX.addr(6 downto 0) = "0110100" then BUS_TX.data <= edge_enable & set_output_coin & set_output_mult & set_output_simplecoin; - elsif BUS_RX.addr(6 downto 0) = "0110101" and INPUTS >= 32 then + elsif BUS_RX.addr(6 downto 0) = "0110101" and INPUTS > 32 then BUS_TX.data <= multiplicity_enable(63 downto 32); else BUS_TX.nack <= '1';