From 036cde39ed69c6430203f63bf419e6020f0939b7 Mon Sep 17 00:00:00 2001 From: David Gabriel Monk <david.gabriel.monk@cern.ch> Date: Sat, 15 Oct 2022 18:12:34 +0200 Subject: [PATCH] Update top/firmware/hdl/emp_payload.vhd, top/firmware/hdl/link_maps.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 aeb60cdd..75ef42a1 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) or linksout(6).data(63 downto 0) or linksout(7).data(63 downto 0) or linksout(8).data(63 downto 0) or linksout(9).data(63 downto 0) or linksout(10).data(63 downto 0) or linksout(11).data(63 downto 0) or linksout(12).data(63 downto 0) or linksout(13).data(63 downto 0) or linksout(14).data(63 downto 0) or linksout(15).data(63 downto 0) or linksout(16).data(63 downto 0) or linksout(17).data(63 downto 0) or linksout(18).data(63 downto 0) or linksout(19).data(63 downto 0) or linksout(20).data(63 downto 0) or linksout(21).data(63 downto 0) or linksout(22).data(63 downto 0) or linksout(23).data(63 downto 0) or linksout(24).data(63 downto 0) or linksout(25).data(63 downto 0) or linksout(26).data(63 downto 0) or linksout(27).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) or linksout(8).data(63 downto 0) or linksout(9).data(63 downto 0) or linksout(10).data(63 downto 0) or linksout(11).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 37ac0295..d408c7a9 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 := 28; + constant cNumberOfFEModules : integer := 12; constant cNumberOfOutputLinks : integer := 4; type tDTCInputLinkMap is array(0 to cNumberOfFEModules - 1) of integer; - constant cDTCInputLinkMap : tDTCInputLinkMap := (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27); + constant cDTCInputLinkMap : tDTCInputLinkMap := (16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27); type tDTCOutputLinkMap is array(0 to cNumberOfOutputLinks - 1) of integer; constant cDTCOutputLinkMap : tDTCOutputLinkMap := (16, 17, 18, 19); -- GitLab