X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=7d2e4c9f4d08eb9d7de34af3c78e099f2a0eb86b;hb=3eceb3e5eb30b6df9f674f76b9e7b4e936e5be06;hp=9e8b12404041fbc8ccd3efb81df4de6fdbcf7349;hpb=80a4fa9d0aede180472530cab6efa6acc925424b;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 9e8b12404..7d2e4c9f4 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -14,25 +14,20 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -*******************************************************************************/ + *******************************************************************************/ #ifndef __DU_CONFIG_H_ #define __DU_CONFIG_H__ -#include "stdbool.h" -#include "du_app_mac_inf.h" -#include "du_log.h" -#include "odu_common_codec.h" - /* MACROS */ #define DU_INST 0 #define DU_ID 1 -#define DU_IP_V4_ADDR "10.0.2.20" -#define CU_IP_V4_ADDR "10.0.2.25" -#define RIC_IP_V4_ADDR "10.0.2.30" +#define DU_IP_V4_ADDR "192.168.130.81" +#define CU_IP_V4_ADDR "192.168.130.82" +#define RIC_IP_V4_ADDR "192.168.130.80" #define DU_PORT 38472 #define CU_PORT 38472 -#define RIC_PORT 38482 +#define RIC_PORT 36422 /* using X2 port since E2 port not defined */ #define DU_EGTP_PORT 39001 #define CU_EGTP_PORT 39002 #define NR_PCI 1 @@ -48,7 +43,8 @@ #define PLMN_MNC1 8 #define PLMN_MNC2 0 #define PLMN_SIZE 3 -#define NR_ARFCN 2079427 +#define NR_DL_ARFCN 385627 +#define NR_UL_ARFCN 386687 #define SUL_ARFCN 100 #define NR_FREQ_BAND 257 #define NR_FREQ_BAND_IND 78 @@ -60,38 +56,52 @@ #define FREQ_SHIFT_7P5KHZ FALSE #define SSB_PBCH_PWR -5 #define BCH_PAYLOAD MAC_GEN_FULL_PBCH_PAYLD -#define SUBCARRIER_SPACING 1 +#define TOTAL_PRB_BW 106 +#define SUBCARRIER_SPACING 0 +#define NORMAL_CYCLIC_PREFIX 0 #define SCS_CARRIER_BANDWIDTH 273 /* Subcarrier spacing- carrier bandwidth */ #define OFFSET_TO_POINT_A 24 /* PRB Offset to Point A */ #define BETA_PSS BETA_PSS_0DB -#define SSB_PERIODICITY 2 +#define SSB_PERIODICITY_5MS 5 +#define SSB_PERIODICITY_10MS 10 +#define SSB_PERIODICITY_20MS 20 +#define SSB_PERIODICITY_40MS 40 +#define SSB_PERIODICITY_80MS 80 +#define SSB_PERIODICITY_160MS 160 #define SSB_SUBCARRIER_OFFSET 0 #define SSB_MULT_CARRIER_BAND FALSE #define MULT_CELL_CARRIER FALSE #define FREQ_LOC_BW 1099 /* DL frequency location and bandwidth */ #define UL_P_MAX 23 #define BANDWIDTH 20 +#define DMRS_TYPE_A_POS 2 +#define NUM_SYMBOLS_PER_SLOT 14 /* Number of symbols within a slot */ +#define CORESET0_END_PRB 48 +#define CORESET1_NUM_PRB 24 /* MACRO defines for PRACH Configuration */ -#define PRACH_CONFIG_IDX 147 +#define PRACH_CONFIG_IDX 88 #define PRACH_FREQ_START 0 #define PRACH_SEQ_LEN SHORT_SEQUENCE #define PRACH_SUBCARRIER_SPACING 1 #define PRACH_RESTRICTED_SET_CFG 0 #define NUM_PRACH_FDM 1 -#define ROOT_SEQ_IDX 0 +#define ROOT_SEQ_IDX 24 #define NUM_ROOT_SEQ 1 #define ZERO_CORRELATION_ZONE_CFG 6 -#define NUM_UNUSED_ROOT_SEQ 1 +#define NUM_UNUSED_ROOT_SEQ 0 #define UNUSED_ROOT_SEQ 1 -#define SSB_PER_RACH 0 +#define SSB_PER_RACH 1 #define PRACH_MULT_CARRIER_BAND FALSE #define PRACH_PREAMBLE_RCVD_TGT_PWR -74 #define NUM_RA_PREAMBLE 63 #define RSRP_THRESHOLD_SSB 31 #define TDD_PERIODICITY TX_PRDCTY_MS_2P5 #define RSS_MEASUREMENT_UNIT DONT_REPORT_RSSI - +#define RA_CONT_RES_TIMER 64 +#define RA_RSP_WINDOW 180 +#define PRACH_RESTRICTED_SET 0 /* Unrestricted */ +#define ROOT_SEQ_LEN 139 /* MACRCO Ddefine for PDCCH Configuration */ #define PDCCH_CTRL_RSRC_SET_ZERO 13 /* Control resouce set zero */ @@ -102,20 +112,44 @@ #define PDCCH_SEARCH_SPACE_ID_PAGING 1 /* Search space id for paging */ #define PDCCH_SEARCH_SPACE_ID_RA 1 /* Search spaced id for random access */ #define PDCCH_SERACH_SPACE_DCI_FORMAT 0 +#define PDCCH_CTRL_RSRC_SET_ONE_ID 1 +#define PDCCH_CTRL_RSRC_SET_ONE_DURATION 2 /* Duration for control resource set id i */ +#define PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY 1 /* Precoded granularity */ +#define PDCCH_SRCH_SPC_TWO_ID 2 +#define PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE 7 /* Num of candidate at aggregation level 1 */ +#define PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE 7 /* Num of candidate at aggregation level 2 */ +#define PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE 4 /* Num of candidate at aggregation level 4 */ +#define PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE 2 /* Num of candidate at aggregation level 8 */ +#define PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE 1 /* Num of candidate at aggregation level 16 */ +#define PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT 0 /* format 0-0 and 1-0 */ +#define PDCCH_SYMBOL_WITHIN_SLOT 128 /* Symbol within Slot Value */ + + #define SIB1_VALUE_TAG 10 -/* MACRCO Ddefine for PDSCH Configuration */ +/* MACRO Ddefine for PDSCH Configuration */ #define PDSCH_K0 0 -#define PDSCH_START_SYMB_AND_LEN 53 +#define PDSCH_START_SYMBOL 2 +#define PDSCH_LENGTH_SYMBOL 12 +#define PDSCH_RES_ALLOC_TYPE 1 /* Resource allocation type */ +#define PDSCH_MAX_CODEWORD_SCH_BY_DCI 0 /* Max num of codewords scheduled by DCI */ +#define PDSCH_RBG_SIZE 0 /* 0: config1 */ +#define PDSCH_NUM_HARQ_PROC 5 /* MACRO Define for PUSCH Configuration */ -#define PUSCH_K0 3 -#define PUSCH_START_SYMB_AND_LEN 55 +#define PUSCH_K2 3 +#define PUSCH_START_SYMBOL 0 +#define PUSCH_LENGTH_SYMBOL 14 + #define PUSCH_MSG3_DELTA_PREAMBLE 0 #define PUSCH_P0_NOMINAL_WITH_GRANT -70 +#define PUSCH_TRANSFORM_PRECODER 1 /* 1: Disabled */ +#define PUSCH_MAX_MIMO_LAYERS 1 +#define PUSCH_PROCESS_TYPE2_ENABLED false /* Macro define for PUCCH Configuration */ #define PUCCH_RSRC_COMMON 0 +#define PUCCH_GROUP_HOPPING 2 /* disable */ #define PUCCH_P0_NOMINAL -74 /* MACRO defines for TDD DL-UL Configuration */ @@ -124,6 +158,19 @@ #define NUM_UL_SLOTS 1 #define NUM_UL_SYMBOLS 0 +/* MACRO defines for SRC config */ +#define SRS_RSRC_ID 1 +#define SRS_RSET_ID 1 +#define SRS_COMB_OFFSET_N2 0 +#define SRS_CYCLIC_SHIFT_N2 0 +#define SRS_FREQ_DOM_POS 0 +#define SRS_FREQ_DOM_SHIFT 0 +#define C_SRS 0 +#define B_SRS 0 +#define B_HOP 0 +#define SRS_SEQ_ID 0 +#define APERIODIC_SRS_RESRC_TRIGGER 1 + #define DU_PROC 0 #define DU_INST 0 #define DU_POOL 1 @@ -137,11 +184,6 @@ /* Events */ #define EVTCFG 0 -/* Selector */ -#define DU_SELECTOR_LC 0 -#define DU_SELECTOR_TC 1 -#define DU_SELECTOR_LWLC 2 - #ifdef EGTP_TEST /* Macro definitions for EGTP procedures */ #define EGTP_LCL_TEID 1 /* EGTP local tunnel id */ @@ -152,14 +194,12 @@ /* Macro definitions for F1 procedures */ #define CU_DU_NAME_LEN_MAX 30 /* Max length of CU/DU name string */ #define MAX_F1_CONNECTIONS 65536 /* Max num of F1 connections */ -#define DU_MAX_CELLS 1 /* Max num of cells served by gNB-DU */ #define MAX_PLMN 6 /* Max num of broadcast PLMN ids */ #define MAXNRARFCN 3279165 /* Maximum values of NRAFCN */ #define MAXNRCELLBANDS 2 /* Maximum number of frequency bands */ #define MAX_NUM_OF_SLICE_ITEMS 1024 /* Maximum number of signalled slice support items */ #define MAXBPLMNNRMINUS1 1 /* Maximum number of PLMN Ids broadcast in an NR cell minus 1 */ #define MAXNUMOFSIBTYPES 32 /* Maximum number of SIB types */ -#define MAX_UEID 512 /* Maximum number of UE Ids */ #define MAX_TNL_ASSOC 32 /* Max num of TNL Assoc between CU and DU */ #define MAXCELLINENB 256 /* Max num of cells served by eNB */ #define MAX_NUM_OF_UE_ID 65536 /* Max num of UEs served by DU */ @@ -178,6 +218,41 @@ #define DU_RANAC 1 #define CELL_IDENTITY 32 +/* Macro definitions for DUtoCuRrcContainer */ +#define CELL_GRP_ID 1 +#define SCH_REQ_ID 0 +#define SR_PROHIBIT_TMR 5 +#define SR_TRANS_MAX 2 +#define PERIODIC_BSR_TMR 2 +#define RETX_BSR_TMR 5 +#define SR_DELAY_TMR 6 +#define TAG_ID 0 +#define TIME_ALIGNMENT_TMR 7 +#define PHR_PERIODIC_TMR 7 +#define PHR_PROHIBHIT_TMR 0 +#define PHR_PWR_FACTOR_CHANGE 3 +#define PHR_MODE_OTHER_CG 0 +#define SN_FIELD_LEN 0 +#define T_POLL_RETRANSMIT 8 +#define POLL_PDU 0 +#define POLL_BYTE 43 +#define MAX_RETX_THRESHOLD 5 +#define T_REASSEMBLY 8 +#define T_STATUS_PROHIBHIT 7 +#define MAC_LC_PRIORITY 1 +#define PRIORTISIED_BIT_RATE 15 +#define BUCKET_SIZE_DURATION 5 +#define LC_GRP 0 +#define P_NR_FR1 0 +#define PDSCH_HARQ_ACK_CODEBOOK 1 +#define SERV_CELL_IDX 0 +#define RLM_SYNC_OUT_SYNC_THRESHOLD 0 +#define ACTIVE_DL_BWP_ID 0 +#define ACTIVE_UL_BWP_ID 0 +#define SCRAMBLING_ID NR_PCI +#define DMRS_ADDITIONAL_POS 0 /* DMRS Additional poistion */ +#define RES_ALLOC_TYPE 1 /* Resource allocation type */ + #ifdef EGTP_TEST #define UE_ID 1 #define RB_ID 1 @@ -238,13 +313,13 @@ typedef enum typedef enum { - ALL + ALL }F1ResetAll; typedef enum { - IN_SERVICE, - OUT_OF_SERVICE + IN_SERVICE, + OUT_OF_SERVICE }SrvState; typedef enum @@ -362,6 +437,19 @@ typedef enum PERMIT_HIGH_PRIOR_SESSION_AND_MOBILE_TERM_SERVICE }F1UacStandardAction; +typedef enum +{ + PDSCH_MAPPING_TYPE_A, + PDSCH_MAPPING_TYPE_B, +}pdschMappingType; + +typedef enum +{ + PUSCH_MAPPING_TYPE_A, + PUSCH_MAPPING_TYPE_B, +}puschMappingType; + + typedef struct f1RrcVersion { char rrcVer[30]; /* Latest RRC Version */ @@ -439,8 +527,8 @@ typedef struct f1ResetType typedef struct nrEcgi { - Plmn plmn; - uint16_t cellId; + Plmn plmn; + uint16_t cellId; }NrEcgi; typedef struct f1SibType @@ -464,8 +552,8 @@ typedef struct f1SulInfo typedef struct f1FreqBand { - uint16_t nrFreqBand; - uint16_t sulBand[MAXNRCELLBANDS]; + uint16_t nrFreqBand; + uint16_t sulBand[MAXNRCELLBANDS]; }F1FreqBand; typedef struct f1NrFreqInfo @@ -531,8 +619,8 @@ typedef struct epIpAddr typedef struct epIpAddrPort { - EpIpAddr epIpAddr; - char port[2]; + EpIpAddr epIpAddr; + char port[2]; }EpIpAddrPort; typedef struct f1TaiSliceSuppLst @@ -559,7 +647,7 @@ typedef struct f1BrdcstPlmnInfo typedef struct f1CellInfo { NrEcgi nrCgi; /* Cell global Identity */ - uint32_t nrPci; /* Physical Cell Identity */ + uint32_t nrPci; /* Physical Cell Identity */ Plmn plmn[MAX_PLMN]; /* Available PLMN list */ Plmn extPlmn[MAX_PLMN]; /* Extended available PLMN list */ }F1CellInfo; @@ -567,10 +655,10 @@ typedef struct f1CellInfo typedef struct f1DuCellInfo { F1CellInfo cellInfo; /* cell info */ - uint16_t tac; /* tracking area code */ - uint16_t epsTac; /* Configured EPS TAC */ + uint16_t tac; /* tracking area code */ + uint16_t epsTac; /* Configured EPS TAC */ NrModeInfo f1Mode; /* NR mode info : FDD/TDD */ - uint8_t measTimeCfg; /* Measurement timing configuration */ + uint8_t measTimeCfg; /* Measurement timing configuration */ F1CellDir cellDir; /* Cell Direction */ F1CellType cellType; /* Cell Type */ F1BrdcstPlmnInfo brdcstPlmnInfo[MAXBPLMNNRMINUS1]; /* Broadcast PLMN Identity Info List */ @@ -615,8 +703,8 @@ typedef struct f1ActCellFail typedef struct srvStatus { - SrvState state; - bool switchOffOngoing; + SrvState state; + bool switchOffOngoing; }SrvStatus; typedef struct f1CellStatus @@ -640,8 +728,8 @@ typedef struct tnlAssocInfo typedef struct f1TnlAssocUsage { - bool pres; - F1AssocUsage usage; + bool pres; + F1AssocUsage usage; }F1TnlAssocUsage; typedef struct f1TnlAssoc @@ -711,22 +799,22 @@ typedef struct f1UacAssistInfo }F1UacAssistInfo; /* F1 setup related structures */ - +#if 0 typedef struct f1SetupReq { - uint32_t transId; /* Uniquely identify transaction */ - uint32_t duId; /* DU ID */ - char duName[CU_DU_NAME_LEN_MAX]; /* DU name */ - F1DuSrvdCellInfo srvdCellLst[DU_MAX_CELLS]; /* Serving cell list */ - F1RrcVersion rrcVersion; /* RRC version */ + uint32_t transId; /* Uniquely identify transaction */ + uint32_t duId; /* DU ID */ + char duName[CU_DU_NAME_LEN_MAX]; /* DU name */ + F1DuSrvdCellInfo srvdCellLst[MAX_NUM_CELL]; /* Serving cell list */ + F1RrcVersion rrcVersion; /* RRC version */ }F1SetupReq; typedef struct f1setupRsp { - uint32_t transId; /* Uniquely identify transaction */ - char cuName[CU_DU_NAME_LEN_MAX]; /* CU Name */ - F1CuActCellInfo actCellInfo; /* cells to be activated */ - F1RrcVersion rrcVersion; /* RRC version */ + uint32_t transId; /* Uniquely identify transaction */ + char cuName[CU_DU_NAME_LEN_MAX]; /* CU Name */ + F1CuActCellInfo actCellInfo; /* cells to be activated */ + F1RrcVersion rrcVersion; /* RRC version */ }F1SetupRsp; typedef struct f1SetupFail @@ -739,9 +827,9 @@ typedef struct f1SetupFail * the RESET message and remove the indicated UE contexts including F1AP ID. */ typedef struct f1Reset { - uint32_t transId; /* Uniquely identify transaction */ - F1FailCause cause; /* Failure cause */ - F1ResetType resetType; /* type of reset */ + uint32_t transId; /* Uniquely identify transaction */ + F1FailCause cause; /* Failure cause */ + F1ResetType resetType; /* type of reset */ }F1Reset; /* After the gNB-CU has released all assigned F1 resources and the UE F1AP IDs for all indicated @@ -749,40 +837,40 @@ typedef struct f1Reset * the gNB-CU shall respond with the RESET ACKNOWLEDGE message. */ typedef struct f1ResetAck { - uint32_t transId; /* Uniquely identify transaction */ - F1LogicalConnUeAssoc ueAssocLogicalConn[MAX_F1_CONNECTIONS]; /* UE associated logical F1-connection list */ - F1CritDiagnostic critDiagnostic; /* Critical diagnostics */ + uint32_t transId; /* Uniquely identify transaction */ + F1LogicalConnUeAssoc ueAssocLogicalConn[MAX_F1_CONNECTIONS]; /* UE associated logical F1-connection list */ + F1CritDiagnostic critDiagnostic; /* Critical diagnostics */ }F1ResetAck; typedef struct f1ErrorInd { - uint32_t transId; /* Uniquely identify transaction */ - F1Entity errorOrigin; /* Specifies if error is originated at DU or CU */ - F1FailCause cause; /* Failure cause */ -/* If failure is due to Ue related message. */ - uint32_t gnbCuUeF1apId; /* gNB-CU UE F1AP Id */ - uint32_t gnbDuUeF1apId; /* gNB-DU UE F1AP Id */ - F1CritDiagnostic critDiagnostic; /* Critical diagnostics */ + uint32_t transId; /* Uniquely identify transaction */ + F1Entity errorOrigin; /* Specifies if error is originated at DU or CU */ + F1FailCause cause; /* Failure cause */ + /* If failure is due to Ue related message. */ + uint32_t gnbCuUeF1apId; /* gNB-CU UE F1AP Id */ + uint32_t gnbDuUeF1apId; /* gNB-DU UE F1AP Id */ + F1CritDiagnostic critDiagnostic; /* Critical diagnostics */ }F1ErrorInd; typedef struct f1GnbDuCfgUpd { - uint32_t transId; /* Uniquely identify transaction */ - F1DuSrvdCellInfo srvdCellLstAdd[DU_MAX_CELLS]; /* Served cell list to be added */ - F1DuSrvdCellToDel srvdCellLstMod[DU_MAX_CELLS]; /* Served cell list to be modified */ - NrEcgi srvdCellLstDel[DU_MAX_CELLS]; /* Served cell list to be deleted */ - F1CellStatus cellStatus[DU_MAX_CELLS]; /* Cell status */ - F1DedSIDelUE ueLst[MAX_UEID]; /* Ue list that requires dedicated SI delivery */ - uint32_t gnbDuId; - F1TnlAssocToRmv gnbDuTnlAssocRmv[MAX_TNL_ASSOC]; /* TNL Assoc list to remove */ + uint32_t transId; /* Uniquely identify transaction */ + F1DuSrvdCellInfo srvdCellLstAdd[MAX_NUM_CELL]; /* Served cell list to be added */ + F1DuSrvdCellToDel srvdCellLstMod[MAX_NUM_CELL]; /* Served cell list to be modified */ + NrEcgi srvdCellLstDel[MAX_NUM_CELL]; /* Served cell list to be deleted */ + F1CellStatus cellStatus[MAX_NUM_CELL]; /* Cell status */ + F1DedSIDelUE ueLst[MAX_NUM_UE]; /* Ue list that requires dedicated SI delivery */ + uint32_t gnbDuId; + F1TnlAssocToRmv gnbDuTnlAssocRmv[MAX_TNL_ASSOC]; /* TNL Assoc list to remove */ }F1GnbDuCfgUpd; typedef struct f1GnbDuCfgUpdAck { uint32_t transId; /* Uniquely identify transaction */ - F1CuActCellInfo cellLstAct[DU_MAX_CELLS]; /* List of cells to be activated */ + F1CuActCellInfo cellLstAct[MAX_NUM_CELL]; /* List of cells to be activated */ F1CritDiagnostic critDiagnostic; /* Critical diagnostics */ - NrEcgi cellLstDeact[DU_MAX_CELLS]; /* List of cells to be deactivated */ + NrEcgi cellLstDeact[MAX_NUM_CELL]; /* List of cells to be deactivated */ }F1GnbDuCfgUpdAck; typedef struct f1GnbDuCfgUpdFail @@ -793,31 +881,31 @@ typedef struct f1GnbDuCfgUpdFail /* Sent by the gNB-CU to transfer updated information associated to an F1-C interface instance */ typedef struct f1GnbCuCfgUpd { - uint32_t transId; /* Uniquely identifies transaction */ - F1CuActCellInfo cellLstAct[DU_MAX_CELLS]; /* List of cells to be activated */ - NrEcgi cellLstDeact[DU_MAX_CELLS]; /* List of cells to be deactivated */ - F1TnlAssoc assocLstAdd[MAX_TNL_ASSOC]; /* List of TNL assocs to be added */ - F1TnlAssoc assocLstUpd[MAX_TNL_ASSOC]; /* List of TNL assocs to be updated */ - F1TnlAssocToRmv assocLstRmv[MAX_TNL_ASSOC]; /* List of TNL assocs to be removed */ - F1CellBarred cellToBarList[DU_MAX_CELLS]; /* List of Cells to be barred */ - F1ProtectEUTRARsrc protectEutraRsrcList[MAXCELLINENB]; /* List of Protected EUTRA resources */ + uint32_t transId; /* Uniquely identifies transaction */ + F1CuActCellInfo cellLstAct[MAX_NUM_CELL]; /* List of cells to be activated */ + NrEcgi cellLstDeact[MAX_NUM_CELL]; /* List of cells to be deactivated */ + F1TnlAssoc assocLstAdd[MAX_TNL_ASSOC]; /* List of TNL assocs to be added */ + F1TnlAssoc assocLstUpd[MAX_TNL_ASSOC]; /* List of TNL assocs to be updated */ + F1TnlAssocToRmv assocLstRmv[MAX_TNL_ASSOC]; /* List of TNL assocs to be removed */ + F1CellBarred cellToBarList[MAX_NUM_CELL]; /* List of Cells to be barred */ + F1ProtectEUTRARsrc protectEutraRsrcList[MAXCELLINENB]; /* List of Protected EUTRA resources */ }F1GnbCuCfgUpd; /* Sent by a gNB-DU to a gNB-CU to acknowledge update of information * associated to an F1-C interface instance */ typedef struct f1GnbCuCfgUpdAck { - uint32_t transId; /* Uniquely identify transaction */ - F1ActCellFail actCellFailList[DU_MAX_CELLS]; /* Cells failed to be activated list */ - F1CritDiagnostic critDiagnostic; /* Critical diagnostics */ - F1TnlAssocAddr assocSetupList[MAX_TNL_ASSOC]; /* TNL Assoc Setup list */ - F1TnlAssocSetupFail assocSetupFailList[MAX_TNL_ASSOC]; /* TNL Assoc Setup fail list */ - F1DedSIDelUE dedSiDelUelist[MAX_NUM_OF_UE_ID]; /* Dedicated SI delivery needed UE list */ + uint32_t transId; /* Uniquely identify transaction */ + F1ActCellFail actCellFailList[MAX_NUM_CELL]; /* Cells failed to be activated list */ + F1CritDiagnostic critDiagnostic; /* Critical diagnostics */ + F1TnlAssocAddr assocSetupList[MAX_TNL_ASSOC]; /* TNL Assoc Setup list */ + F1TnlAssocSetupFail assocSetupFailList[MAX_TNL_ASSOC]; /* TNL Assoc Setup fail list */ + F1DedSIDelUE dedSiDelUelist[MAX_NUM_OF_UE_ID]; /* Dedicated SI delivery needed UE list */ }F1GnbCuCfgUpdAck; typedef struct f1GnbCuCfgUpdFail { - F1FailureIE gnbCuCfgUpdFail; + F1FailureIE gnbCuCfgUpdFail; }F1GnbCuCfgUpdFail; /* This procedure enables coordination of radio resource allocation between a gNB-CU and @@ -834,8 +922,8 @@ typedef struct f1GnbDuRsrcCoordReq * for data traffic, as a response to the GNB-DU RESOURCE COORDINATION REQUEST. */ typedef struct f1GnbDuRsrcCoordRsp { - uint32_t transId; /* Uniquely identifies transaction */ - uint8_t cellResCoordRspCont; /* Container for X2AP E-UTRA - NR cell resource coordination response */ + uint32_t transId; /* Uniquely identifies transaction */ + uint8_t cellResCoordRspCont; /* Container for X2AP E-UTRA - NR cell resource coordination response */ }F1GnbDuRsrcCoordRsp; /* This message is sent by the gNB-DU to indicate to the gNB-CU its status of overload */ @@ -876,21 +964,22 @@ typedef struct f1NwkAccessRateRed uint32_t transId; /* Uniquely identifies transaction */ F1UacAssistInfo uacAssistInfo; /* UAC Assistance Information */ }F1NwkAccessRateRed; +#endif typedef struct f1Ipaddr { - bool ipV4Pres; - uint32_t ipV4Addr; + bool ipV4Pres; + uint32_t ipV4Addr; }F1IpAddr; typedef struct sctpParams { F1IpAddr duIpAddr; - U16 duPort[MAX_DU_PORT]; + uint16_t duPort[MAX_DU_PORT]; F1IpAddr cuIpAddr; - U16 cuPort; + uint16_t cuPort; F1IpAddr ricIpAddr; - U16 ricPort; + uint16_t ricPort; }SctpParams; typedef struct f1EgtpParams @@ -905,26 +994,26 @@ typedef struct f1EgtpParams typedef struct schedulerCfg { - uint8_t numTxAntPorts; /*!< Number of Tx antenna ports */ - uint8_t ulSchdType; /*!< Indicates which UL scheduler to use, range - * is 0..(number of schedulers - 1) */ - uint8_t dlSchdType; /*!< Indicates which DL scheduler to use, range - * is 0..(number of schedulers - 1) */ - uint8_t numCells; /*!< Max number of cells */ - uint8_t maxUlUePerTti; /*!< Max number of UE in UL per TTI */ - uint8_t maxDlUePerTti; /*!< Max number of UE in DL per TTI */ + uint8_t numTxAntPorts; /*!< Number of Tx antenna ports */ + uint8_t ulSchdType; /*!< Indicates which UL scheduler to use, range + * is 0..(number of schedulers - 1) */ + uint8_t dlSchdType; /*!< Indicates which DL scheduler to use, range + * is 0..(number of schedulers - 1) */ + uint8_t numCells; /*!< Max number of cells */ + uint8_t maxUlUePerTti; /*!< Max number of UE in UL per TTI */ + uint8_t maxDlUePerTti; /*!< Max number of UE in DL per TTI */ }SchedulerCfg; typedef struct mibParams { - uint8_t sysFrmNum; - long subCarrierSpacingCommon; - long ssb_SubcarrierOffset; - long dmrs_TypeA_Position; - long controlResourceSetZero; - long searchSpaceZero; - long cellBarred; - long intraFreqReselection; + uint8_t sysFrmNum; + long subCarrierSpacingCommon; + long ssb_SubcarrierOffset; + long dmrs_TypeA_Position; + long controlResourceSetZero; + long searchSpaceZero; + long cellBarred; + long intraFreqReselection; }MibParams; typedef struct siSchedInfo @@ -961,9 +1050,9 @@ typedef struct pdcchCfgCommon typedef struct pdschCfgCommon { uint8_t present; - long k0; - long mapType; /* Mapping Type */ - long startSymbAndLen; /* Start Symbol and Length */ + long k0; + long mapType; /* Mapping Type */ + uint16_t sliv; }PdschCfgCommon; typedef struct bcchCfg @@ -981,9 +1070,9 @@ typedef struct pcchCfg typedef struct scsSpecCarrier { - long scsOffset; /* Offset to point A considering subcarrier spacing */ - long scs; /* subcarrier spacing */ - long scsBw; /* Carrier bandwidth considering subcarrier spacing */ + long scsOffset; /* Offset to point A considering subcarrier spacing */ + long scs; /* subcarrier spacing */ + long scsBw; /* Carrier bandwidth considering subcarrier spacing */ }ScsSpecCarrier; @@ -1023,12 +1112,12 @@ typedef struct rachCfgCommon typedef struct puschCfgCommon { - uint8_t present; - long k2; - long mapType; - long startSymbAndLen; - long msg3DeltaPreamble; - long p0NominalWithGrant; + uint8_t present; + long k2; + long mapType; + uint16_t sliv; + long msg3DeltaPreamble; + long p0NominalWithGrant; }PuschCfgCommon; typedef struct pucchCfgCommon @@ -1072,11 +1161,11 @@ typedef struct srvCellCfgCommSib typedef struct sib1Params { - Plmn plmn; - uint8_t tac; - long ranac; - uint8_t cellIdentity; - long cellResvdForOpUse; + Plmn plmn; + uint8_t tac; + long ranac; + uint8_t cellIdentity; + long cellResvdForOpUse; long connEstFailCnt; long connEstFailOffValidity; SiSchedInfo siSchedInfo; @@ -1091,7 +1180,7 @@ typedef struct duCfgParams uint32_t duId; uint8_t duName[CU_DU_NAME_LEN_MAX]; SchedulerCfg schedCfg; - F1DuSrvdCellInfo srvdCellLst[DU_MAX_CELLS]; /* Serving cell list *///TODO: this must be removed eventually + F1DuSrvdCellInfo srvdCellLst[MAX_NUM_CELL]; /* Serving cell list *///TODO: this must be removed eventually F1RrcVersion rrcVersion; /* RRC version */ MacCellCfg macCellCfg; /* MAC cell configuration */ MibParams mibParams; /* MIB Params */ @@ -1100,13 +1189,13 @@ typedef struct duCfgParams /*function declarations */ void FillSlotConfig(); -S16 readClCfg(); -S16 readCfg(); -S16 duReadCfg(); -S16 bitStringToInt(BIT_STRING_t *bitString, uint16_t *val); +uint8_t readClCfg(); +uint8_t readCfg(); +uint8_t duReadCfg(); +uint16_t calcSliv(uint8_t startSymbol, uint8_t lengthSymbol); #endif /* __DU_CONFIG_H__ */ /********************************************************************** - End of file -**********************************************************************/ + End of file + **********************************************************************/