diff --git a/top/firmware/hdl/emp_payload.vhd b/top/firmware/hdl/emp_payload.vhd
index c4b1c141536b20581ffd8ebca856eefc25d02f79..9496b19d2a9e227343780c3336f20632a6ff18d5 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);
+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);
--==============================--
genHack: for i in 0 to cNumberOfFEModules - 1 generate
diff --git a/top/firmware/hdl/emp_project_decl.vhd b/top/firmware/hdl/emp_project_decl.vhd
index fdc5575eec30b6c0d471caf07825f2de0b2bb1be..6f1884bb3356b0e7a9a2f3cbafb59129cd649127 100644
--- a/top/firmware/hdl/emp_project_decl.vhd
+++ b/top/firmware/hdl/emp_project_decl.vhd
@@ -32,8 +32,8 @@ package emp_project_decl is
-- mgt -> buf -> fmt -> (algo) -> (fmt) -> buf -> mgt -> clk -> altclk
constant REGION_CONF : region_conf_array_t := (
--- 0 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 225 -- Right Column
--- 1 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 226
+ 0 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 225 -- Right Column
+ 1 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 226
2 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 227
3 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 228
4 => (no_mgt, buf, no_fmt, buf, no_mgt), --Bank 229
@@ -58,6 +58,8 @@ package emp_project_decl is
-- for data framer (ic_simple, no_ec, n_ec_spare, ec_broadcast)
constant REGION_DATA_FRAMER_CONF : region_data_framer_conf_array_t := (
+ 0 => ( 0=>(false, true, 0, false), 1=>(false, true, 0, false), 2=>(false, true, 0, false), 3=>(false, true, 0, false)),
+ 1 => ( 0=>(false, true, 0, false), 1=>(false, true, 0, false), 2=>(false, true, 0, false), 3=>(false, true, 0, false)),
2 => ( 0=>(false, true, 0, false), 1=>(false, true, 0, false), 2=>(false, true, 0, false), 3=>(false, true, 0, false)),
3 => ( 0=>(false, true, 0, false), 1=>(false, true, 0, false), 2=>(false, true, 0, false), 3=>(false, true, 0, false)),
others => kDummyRegionDataFramer
@@ -65,6 +67,8 @@ package emp_project_decl is
-- for lpgbt
constant REGION_LPGBT_CONF : region_lpgbt_conf_array_t := (
+ 0 => (FEC5, DATARATE_5G12, PCS),
+ 1 => (FEC5, DATARATE_5G12, PCS),
2 => (FEC5, DATARATE_5G12, PCS),
3 => (FEC5, DATARATE_5G12, PCS),
others => kDummyRegionLpgbt
diff --git a/top/firmware/hdl/link_maps.vhd b/top/firmware/hdl/link_maps.vhd
index 092d162ae7a501fe41428bad7e6fc0f2902a90e5..a8f8d45d3ce422686816c1cb5cc4f2f5f0a71143 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 := 8;
+ constant cNumberOfFEModules : integer := 16;
constant cNumberOfOutputLinks : integer := 4;
type tDTCInputLinkMap is array(0 to cNumberOfFEModules - 1) of integer;
- constant cDTCInputLinkMap : tDTCInputLinkMap := (8, 9, 10, 11, 12, 13, 14, 15);
+ constant cDTCInputLinkMap : tDTCInputLinkMap := (0, 1, 2, 3, 4, 5, 6, 7, 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);