From 1c538cc4991b9d40711d08934e76b40f66f770ea Mon Sep 17 00:00:00 2001 From: David Gabriel Monk <david.gabriel.monk@cern.ch> Date: Fri, 14 Oct 2022 12:02:34 +0200 Subject: [PATCH] Update top/firmware/hdl/link_maps.vhd, top/firmware/hdl/emp_payload.vhd --- top/firmware/hdl/emp_payload.vhd | 2 +- top/firmware/hdl/link_maps.vhd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/top/firmware/hdl/emp_payload.vhd b/top/firmware/hdl/emp_payload.vhd index f0ebbcb4..c4b1c141 100644 --- a/top/firmware/hdl/emp_payload.vhd +++ b/top/firmware/hdl/emp_payload.vhd @@ -236,7 +236,7 @@ begin end generate; -linkor.data(63 downto 0) <= linksout(0).data(63 downto 0) or linksout(1).data(63 downto 0) or linksout(2).data(63 downto 0) or linksout(3).data(63 downto 0); --or linksout(4).data(63 downto 0) or linksout(5).data(63 downto 0); +linkor.data(63 downto 0) <= linksout(0).data(63 downto 0) or linksout(1).data(63 downto 0) or linksout(2).data(63 downto 0) or linksout(3).data(63 downto 0) or linksout(4).data(63 downto 0) or linksout(5).data(63 downto 0) or linksout(6).data(63 downto 0) or linksout(7).data(63 downto 0); --==============================-- genHack: for i in 0 to cNumberOfFEModules - 1 generate diff --git a/top/firmware/hdl/link_maps.vhd b/top/firmware/hdl/link_maps.vhd index d0ca6517..092d162a 100644 --- a/top/firmware/hdl/link_maps.vhd +++ b/top/firmware/hdl/link_maps.vhd @@ -3,11 +3,11 @@ use IEEE.STD_LOGIC_1164.ALL; use IEEE.NUMERIC_STD.ALL; package dtc_link_maps is - constant cNumberOfFEModules : integer := 4; + constant cNumberOfFEModules : integer := 8; constant cNumberOfOutputLinks : integer := 4; type tDTCInputLinkMap is array(0 to cNumberOfFEModules - 1) of integer; - constant cDTCInputLinkMap : tDTCInputLinkMap := (8, 9, 10, 11); + constant cDTCInputLinkMap : tDTCInputLinkMap := (8, 9, 10, 11, 12, 13, 14, 15); type tDTCOutputLinkMap is array(0 to cNumberOfOutputLinks - 1) of integer; constant cDTCOutputLinkMap : tDTCOutputLinkMap := (16, 17, 18, 19); -- GitLab