diff --git a/top/firmware/hdl/emp_project_decl.vhd b/top/firmware/hdl/emp_project_decl.vhd index d704bc636351a0c8a6d942025e3d012c0ad507c0..b875c86b377ce5274152bff043f45a395939ab34 100644 --- a/top/firmware/hdl/emp_project_decl.vhd +++ b/top/firmware/hdl/emp_project_decl.vhd @@ -36,7 +36,7 @@ package emp_project_decl is constant REGION_CONF : region_conf_array_t := ( -- 0 => (no_mgt, buf, no_fmt, buf, no_mgt), --Bank 225 -- Right Column 1 => (no_mgt, buf, no_fmt, buf, no_mgt), --Bank 226 - -- 2 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 227 + 2 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 227 3 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 228 4 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 229 5 => (lpgbt, buf, no_fmt, buf, lpgbt), --Bank 230 @@ -60,7 +60,12 @@ 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 := ( --- 2 => ( 0=>(false, true, 0, false, lpgbtv0), 1=>(false, true, 0, false, lpgbtv0), 2=>(false, true, 0, false, lpgbtv1), 3=>(false, true, 0, false, lpgbtv0)), + 2 => ( + 0=>(false, true, 0, false, lpgbtv1), + 1=>(false, true, 0, false, lpgbtv1), + 2=>(false, true, 0, false, lpgbtv1), + 3=>(false, true, 0, false, lpgbtv1) + ), -- 3 => ( 0=>(false, true, 0, false, lpgbtv0), 1=>(false, true, 0, false, lpgbtv0), 2=>(false, true, 0, false, lpgbtv0), 3=>(false, true, 0, false, lpgbtv0)), 3 => ( 0=>(false, true, 0, false, lpgbtv0), @@ -91,7 +96,7 @@ package emp_project_decl is -- for lpgbt constant REGION_LPGBT_CONF : region_lpgbt_conf_array_t := ( --- 2 => (FEC5, DATARATE_5G12, PCS), + 2 => (FEC5, DATARATE_5G12, PCS), 3 => (FEC5, DATARATE_5G12, PCS), 4 => (FEC5, DATARATE_5G12, PCS), 5 => (FEC5, DATARATE_5G12, PCS), diff --git a/top/firmware/hdl/link_maps.vhd b/top/firmware/hdl/link_maps.vhd index 215bf5a39fe018fba048266733b275c989f38a6b..58bdafbb37cb7dcdae3ba783742b5df03ed70d7c 100644 --- a/top/firmware/hdl/link_maps.vhd +++ b/top/firmware/hdl/link_maps.vhd @@ -5,8 +5,8 @@ use work.dtc_link_maps_func.all; package dtc_link_maps is - constant cNumberOfFEModules : integer := 12; - constant cNumberOfOutputLinks : integer := 12; + constant cNumberOfFEModules : integer := 14; + constant cNumberOfOutputLinks : integer := 14; constant cNumberOfEcalInputLinks : integer := 4; constant cNumberOfEcalOutputLinks : integer := 1; @@ -23,7 +23,9 @@ package dtc_link_maps is 8 => (24, "2S", 5, "CIC2"), 9 => (25, "2S", 5, "CIC2"), 10 => (26, "2S", 5, "CIC2"), - 11 => (27, "2S", 5, "CIC2") + 11 => (27, "2S", 5, "CIC2"), + 12 => (8, "PS", 5, "CIC2"), + 13 => (9, "PS", 5, "CIC2") ); type tECALInputLinkMap is array(0 to cNumberOfEcalInputLinks - 1) of integer; @@ -33,7 +35,7 @@ package dtc_link_maps is constant cECALOutputLink : integer := 7; type tDTCOutputLinkMap is array(0 to cNumberOfOutputLinks - 1) of integer; - constant cDTCOutputLinkMap : tDTCOutputLinkMap := (28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39); + constant cDTCOutputLinkMap : tDTCOutputLinkMap := (28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41); end package dtc_link_maps;