From: Jan Michel Date: Wed, 10 Sep 2025 12:34:33 +0000 (+0200) Subject: allow higher platform numbers in CTS X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;p=trb3.git allow higher platform numbers in CTS --- diff --git a/base/code/sedcheck.vhd b/base/code/sedcheck.vhd index 5d49af2..2ee9513 100644 --- a/base/code/sedcheck.vhd +++ b/base/code/sedcheck.vhd @@ -8,6 +8,7 @@ use work.trb_net_std.all; entity sedcheck is port( CLK : in std_logic; + DISABLE_IN : in std_logic := '0'; ERROR_OUT : out std_logic; RELOAD_OUT : out std_logic; BUS_RX : in CTRLBUS_RX; @@ -171,7 +172,7 @@ proc_ctrl : process begin end if; end case; - if control_i(0) = '0' then + if control_i(0) = '0' or DISABLE_IN = '1' then sed_enable <= '0'; state <= IDLE; end if; diff --git a/cts/source/cts.vhd b/cts/source/cts.vhd index df84a69..f50bef5 100755 --- a/cts/source/cts.vhd +++ b/cts/source/cts.vhd @@ -113,7 +113,7 @@ entity CTS is ADDON_GROUP_UPPER : CTS_GROUP_CONFIG_T := (3,7,11,12,13, others=>0); -- PERIPH_TRIGGER_COUNT: integer range 0 to 1 := 1; - PLATTFORM : integer range 0 to 3 := 0; + PLATTFORM : integer range 0 to 7 := 0; OUTPUT_MULTIPLEXERS : integer range 0 to 255 := 0; EXTERNAL_TRIGGER_ID : std_logic_vector(7 downto 0) := X"00"; @@ -351,8 +351,8 @@ architecture RTL of CTS is --signal busy_out_i : std_logic; begin - assert(EFFECTIVE_INPUT_COUNT > 0) report "The CTS requires atleast 1 input or input multiplexer"; - assert(TRIGGER_ADDON_COUNT = 0 or ADDON_LINE_COUNT > 0) report "If you use an input multiplexer you have to provide atleast 1 addon input line"; + assert(EFFECTIVE_INPUT_COUNT > 0) report "The CTS requires atleast 1 input or input multiplexer" severity error; + assert(TRIGGER_ADDON_COUNT = 0 or ADDON_LINE_COUNT > 0) report "If you use an input multiplexer you have to provide atleast 1 addon input line" severity error; -- Trigger Distribution diff --git a/cts/source/cts_pkg.vhd b/cts/source/cts_pkg.vhd index 094e62b..0dcd2ee 100755 --- a/cts/source/cts_pkg.vhd +++ b/cts/source/cts_pkg.vhd @@ -29,7 +29,7 @@ package cts_pkg is OUTPUT_MULTIPLEXERS : integer range 0 to 255 := 0; EXTERNAL_TRIGGER_ID : std_logic_vector(7 downto 0) := X"00"; - PLATTFORM : integer range 0 to 3 := 0; + PLATTFORM : integer range 0 to 7 := 0; TIME_REFERENCE_COUNT: positive := 10; -- Number of clock cycles the time reference needs to stay asserted (100ns) FIFO_ADDR_WIDTH : integer range 1 to 31 := 9 -- 2**(FIFO_ADDR_WIDTH-1) events can be stored in read-out buffer of CTS ); @@ -191,7 +191,7 @@ package cts_pkg is PERIPH_TRIGGER_COUNT: integer range 0 to 15 := 2; OUTPUT_MULTIPLEXERS : integer range 0 to 255 := 0; - PLATTFORM : integer range 0 to 3 := 0; + PLATTFORM : integer range 0 to 7 := 0; EXTERNAL_TRIGGER_ID : std_logic_vector(7 downto 0) := X"00" ); diff --git a/cts/source/cts_trigger.vhd b/cts/source/cts_trigger.vhd index b01c83d..bb862e1 100755 --- a/cts/source/cts_trigger.vhd +++ b/cts/source/cts_trigger.vhd @@ -21,7 +21,7 @@ entity CTS_TRIGGER is PERIPH_TRIGGER_COUNT: integer range 0 to 15 := 1; OUTPUT_MULTIPLEXERS : integer range 0 to 255 := 0; - PLATTFORM : integer range 0 to 3 := 0; + PLATTFORM : integer range 0 to 7 := 0; EXTERNAL_TRIGGER_ID : std_logic_vector(7 downto 0) := X"00" );