From: Jan Michel Date: Wed, 16 Jan 2019 15:19:47 +0000 (+0100) Subject: Add plattform setting to CTS - different connectors for AddOn multiplexer X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=258b6dadad52c25cfee9bddf701b85d656f51005;p=trb3.git Add plattform setting to CTS - different connectors for AddOn multiplexer --- diff --git a/cts/source/cts.vhd b/cts/source/cts.vhd index 21a52fe..06844c5 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 1 := 0; OUTPUT_MULTIPLEXERS : integer range 0 to 255 := 0; EXTERNAL_TRIGGER_ID : std_logic_vector(7 downto 0) := X"00"; @@ -798,7 +798,7 @@ begin PERIPH_TRIGGER_COUNT => PERIPH_TRIGGER_COUNT, OUTPUT_MULTIPLEXERS => OUTPUT_MULTIPLEXERS, - + PLATTFORM => PLATTFORM, TRIGGER_ADDON_COUNT => TRIGGER_ADDON_COUNT, EXTERNAL_TRIGGER_ID => EXTERNAL_TRIGGER_ID ) diff --git a/cts/source/cts_pkg.vhd b/cts/source/cts_pkg.vhd index 39613c9..854c74a 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 1 := 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 1 := 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 8409e5d..43b6b13 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 1 := 0; EXTERNAL_TRIGGER_ID : std_logic_vector(7 downto 0) := X"00" ); @@ -582,7 +582,7 @@ begin REGIO_UNKNOWN_ADDR_OUT <= REGIO_WRITE_ENABLE_IN; REGIO_DATAREADY_OUT <= REGIO_READ_ENABLE_IN; REGIO_DATA_OUT <= CTS_BLOCK_HEADER( - id => 16#15#, + id => 16#15# + PLATTFORM, len => TRIGGER_ADDON_COUNT, itc_base => ITC_BASE_INPUTS + TRIGGER_INPUT_COUNT, itc_num => TRIGGER_ADDON_COUNT @@ -804,4 +804,4 @@ begin end if; end if; end process; -end RTL; \ No newline at end of file +end RTL;