X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=316a1e7f49aa65df61eeb41e098f050c387ada77;hb=5b0a8c1ccec481f354d22c1dff57b35bf72a1622;hp=9a7029df14f90868611cea2c8134a6521f3b4e1d;hpb=eae02ffcdfa215eb3ad990e2b0718d7a62eaa84a;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 9a7029df1..316a1e7f4 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -19,26 +19,28 @@ #ifndef __DU_CONFIG_H_ #define __DU_CONFIG_H__ +#ifdef O1_ENABLE +#include "CmInterface.h" +#endif + /* MACROS */ #define DU_INST 0 #define DU_ID 1 #ifndef O1_ENABLE - #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 36421 + +#define F1_SCTP_PORT 38472 /* As per the spec 38.472, the registered port number for F1AP is 38472 */ +#define E2_SCTP_PORT 36421 #endif -#define DU_EGTP_PORT 39001 -#define CU_EGTP_PORT 39002 +#define F1_EGTP_PORT 2152 /* As per the spec 29.281, the registered port number for GTP-U is 2152 */ #define NR_PCI 1 #define NR_CELL_ID 1 -#define DU_NAME "ORAN_OAM_DU" +#define DU_NAME "ORAN OAM DU" #define CELL_TYPE SMALL //TODO: while testing for TDD, Mu1 and 100 MHz, this flag must be enabled @@ -48,14 +50,19 @@ #define NR_DL_ARFCN 623400 #define NR_UL_ARFCN 623400 #define NR_FREQ_BAND 78 +#define NR_SCS SCS_30KHZ +#define NR_BANDWIDTH BANDWIDTH_100MHZ #else #define DUPLEX_MODE DUP_MODE_FDD #define NR_NUMEROLOGY 0 #define NR_DL_ARFCN 428000 #define NR_UL_ARFCN 390000 #define NR_FREQ_BAND 1 +#define NR_SCS SCS_15KHZ +#define NR_BANDWIDTH BANDWIDTH_20MHZ #endif +#define TRANS_ID 1 #define DU_TAC 1 #define PLMN_MCC0 3 #define PLMN_MCC1 1 @@ -69,9 +76,8 @@ #define SUL_ARFCN 100 #define SUL_BAND 2 - - -#define TIME_CFG 0 +#define TIME_CFG 4 +#define MEAS_TIMING_ARFCN 630432 #define CARRIER_IDX 1 #define NUM_TX_ANT 2 #define NUM_RX_ANT 2 @@ -81,13 +87,9 @@ #define NORMAL_CYCLIC_PREFIX 0 #define OFFSET_TO_POINT_A 24 /* PRB Offset to Point A */ #define BETA_PSS BETA_PSS_0DB -#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_PERIODICITY 20 +#define SSB_SUBCARRIER_OFFSET 0 +#define SSB_FREQUENCY 3000000 /*ssbFrequency in kHz*/ #define SSB_MULT_CARRIER_BAND FALSE #define MULT_CELL_CARRIER FALSE #define FREQ_LOC_BW 28875 /* DL frequency location and bandwidth. Spec 38.508 Table 4.3.1.0B-1*/ @@ -98,10 +100,15 @@ #define CORESET1_NUM_PRB 24 /* MACRO defines for PRACH Configuration */ +#ifndef NR_TDD +#define PRACH_CONFIG_IDX 16 +#else #define PRACH_CONFIG_IDX 88 -#define PRACH_FREQ_START 0 +#endif +#define PRACH_MAX_PRB 24 /* As per (spec 38.211-Table 6.3.3.2-1), max allocated PRBs can go upto 24 */ +#define PRACH_FREQ_START (MAX_NUM_RB - PRACH_MAX_PRB) /* In order to allocate PRACH from end of the resource grid */ #define PRACH_SEQ_LEN SHORT_SEQUENCE -#define PRACH_SUBCARRIER_SPACING 0 +#define PRACH_SUBCARRIER_SPACING NR_SCS #define PRACH_RESTRICTED_SET_CFG 0 #define NUM_PRACH_FDM 1 #define ROOT_SEQ_IDX 0 @@ -110,6 +117,7 @@ #define NUM_UNUSED_ROOT_SEQ 0 #define UNUSED_ROOT_SEQ 1 #define SSB_PER_RACH 1 +#define CB_PREAMBLE_PER_SSB 8 #define PRACH_MULT_CARRIER_BAND FALSE #define PRACH_PREAMBLE_RCVD_TGT_PWR -74 #define NUM_RA_PREAMBLE 63 @@ -122,8 +130,6 @@ #define RSS_MEASUREMENT_UNIT DONT_REPORT_RSSI #define RA_CONT_RES_TIMER 64 #define RA_RSP_WINDOW 10 -#define PRACH_RESTRICTED_SET 0 /* Unrestricted */ -#define ROOT_SEQ_LEN 139 /* MACRCO Ddefine for PDCCH Configuration */ #define PDCCH_SEARCH_SPACE_ID 1 /* Common search space id */ @@ -148,6 +154,7 @@ #define SIB1_VALUE_TAG 10 /* MACRO Ddefine for PDSCH Configuration */ +#define NUM_TIME_DOM_RSRC_ALLOC 2 #define PDSCH_K0_CFG1 0 #define PDSCH_K0_CFG2 1 #define PDSCH_START_SYMBOL 3 @@ -159,8 +166,8 @@ /* MACRO Define for PUSCH Configuration */ #define MAX_UL_ALLOC 16 -#define PUSCH_K2_CFG1 3 -#define PUSCH_K2_CFG2 4 +#define PUSCH_K2_CFG1 4 +#define PUSCH_K2_CFG2 5 #define PUSCH_START_SYMBOL 3 #define PUSCH_LENGTH_SYMBOL 11 @@ -172,7 +179,7 @@ /* Macro define for PUCCH Configuration */ #define PUCCH_RSRC_COMMON 0 -#define PUCCH_GROUP_HOPPING 2 /* disable */ +#define PUCCH_GROUP_HOPPING 0 /* Neither sequence hopping nor group hopping */ #define PUCCH_P0_NOMINAL -74 /* MACRO defines for TDD DL-UL Configuration */ @@ -211,7 +218,7 @@ /* 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 MAX_PLMN 1 /* Max num of broadcast PLMN ids */ + #define MAXNRARFCN 3279165 /* Maximum values of NRAFCN */ #define MAX_NRCELL_BANDS 2 /* Maximum number of frequency bands */ #define MAX_NUM_OF_SLICE_ITEMS 1024 /* Maximum number of signalled slice support items */ @@ -224,8 +231,6 @@ #define MAXNUMOFUACPERPLMN 64 /* Maximum number of signalled categories per PLMN */ #define NR_RANAC 150 /* RANAC */ #define DEFAULT_CELLS 1 /* Max num of broadcast PLMN ids */ -#define NUM_OF_SUPPORTED_SLICE 2 -#define DEDICATED_SLICE_INDEX 1 #define IE_EXTENSION_LIST_COUNT 1 /* Macro definitions for MIB/SIB1 */ @@ -233,10 +238,10 @@ #define SPARE 0 #define SSB_SC_OFFSET 0 #define DU_RANAC 1 -#define CELL_IDENTITY 32 +#define CELL_IDENTITY 1 /* Macro definitions for DUtoCuRrcContainer */ -#define CELL_GRP_ID 1 +#define CELL_GRP_ID 0 #define SCH_REQ_ID 0 #define SR_PROHIBIT_TMR 5 #define SR_TRANS_MAX 2 @@ -249,7 +254,7 @@ #define PHR_PROHIBHIT_TMR 0 #define PHR_PWR_FACTOR_CHANGE 3 #define PHR_MODE_OTHER_CG 0 -#define SN_FIELD_LEN 0 +#define SN_FIELD_LEN_12BIT 0 /*As per Spec 38.331, The network configures only value size12 in SN-FieldLengthAM for SRB */ #define T_POLL_RETRANSMIT 8 /* Enum for 45ms */ #define T_POLL_RETRANSMIT_VAL 45 /* Value in ms */ #define POLL_PDU 0 /* Enum for 4 pdus */ @@ -286,7 +291,32 @@ /*VALID Tunnel ID*/ #define MIN_TEID 1 /*[Spec 29.281,Sec 5.1]: All Zero TEIDs are never assigned for setting up GTP-U Tunnel*/ -#define MAX_TEID 10 /*[Spec 29.281]: Max limit is not mentioned but as per GTP-U Header Format, TEID occupies 4 octets */ +#define MAX_TEID MAX_NUM_DRB * MAX_NUM_UE /*[Spec 29.281]: Max limit is not mentioned but as per GTP-U Header Format, TEID occupies 4 octets */ + +/* Slice Ratio */ +#define MAX_RATIO 30 +#define MIN_RATIO 20 +#define DEDICATED_RATIO 10 +#define NUM_OF_SUPPORTED_SLICE 2 + +#ifdef NR_DRX +/* Macros for Drx configuration */ +#define DRX_ONDURATION_TIMER_VALUE_PRESENT_IN_MS true +#define DRX_ONDURATION_TIMER_VALUE_IN_SUBMS 32 +#define DRX_ONDURATION_TIMER_VALUE_IN_MS 10 +#define DRX_INACTIVITY_TIMER 2 +#define DRX_HARQ_RTT_TIMER_DL 56 +#define DRX_HARQ_RTT_TIMER_UL 56 +#define DRX_RETRANSMISSION_TIMER_DL 4 +#define DRX_RETRANSMISSION_TIMER_UL 4 +#define DRX_LONG_CYCLE_START_OFFSET_CHOICE 40 +#define DRX_LONG_CYCLE_START_OFFSET_VAL 8 +#define DRX_SHORT_CYCLE_PRESENT true +#define DRX_SHORT_CYCLE 2 +#define DRX_SHORT_CYCLE_TIMER 2 +#define DRX_SLOT_OFFSET 0 +#endif + typedef enum { GNBDU, @@ -483,13 +513,6 @@ typedef enum PUSCH_MAPPING_TYPE_B, }puschMappingType; -typedef enum -{ - PRB, - DRB, - RRC_CONNECTED_USERS -}ResourceType; - typedef struct f1RrcVersion { char rrcVer[30]; /* Latest RRC Version */ @@ -646,12 +669,6 @@ typedef struct f1EutraModeInfo }mode; }F1EutraModeInfo; -typedef struct f1Snsaai -{ - uint8_t sst; - uint8_t sd[SD_SIZE]; -}F1Snsaai; - typedef struct epIpAddr { char transportAddr[20]; /* Transport Layer Address */ @@ -663,32 +680,10 @@ typedef struct epIpAddrPort char port[2]; }EpIpAddrPort; -typedef struct policyMemberList -{ - Plmn plmn; - F1Snsaai snsaai; -}PolicyMemberList; - -typedef struct rrmPolicyRatio -{ - uint8_t policyMaxRatio; - uint8_t policyMinRatio; - uint8_t policyDedicatedRatio; -}RrmPolicyRatio; - -typedef struct rrmPolicy -{ - bool present; - ResourceType rsrcType; - PolicyMemberList memberList; - RrmPolicyRatio rrmPolicyRatio; -}RrmPolicy; - typedef struct f1TaiSliceSuppLst { - bool pres; uint8_t numSupportedSlices; - F1Snsaai *snssai[MAX_NUM_OF_SLICE_ITEMS]; + Snssai **snssai; }F1TaiSliceSuppLst; typedef struct f1SrvdPlmn @@ -696,7 +691,6 @@ typedef struct f1SrvdPlmn Plmn plmn; Plmn extPlmn; /* Extended available PLMN list */ F1TaiSliceSuppLst taiSliceSuppLst; - RrmPolicy rrmPolicy; }F1SrvdPlmn; typedef struct f1BrdcstPlmnInfo @@ -721,7 +715,7 @@ typedef struct f1DuCellInfo 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 measTimeCfgDuration; /* Measurement timing configuration */ F1CellDir cellDir; /* Cell Direction */ F1CellType cellType; /* Cell Type */ F1BrdcstPlmnInfo brdcstPlmnInfo[MAX_BPLMN_NRCELL_MINUS_1]; /* Broadcast PLMN Identity Info List */ @@ -1131,10 +1125,12 @@ typedef struct bcchCfg typedef struct pcchCfg { - long dfltPagingCycle; /* Default paging cycle */ - long nAndPagingFrmOffPresent; - long nAndPagingFrmOff; /* n and Paging Frame offset */ - long numPagingOcc; /* Number of paging occassions in paging frame */ + uint16_t dfltPagingCycle; /* Default paging cycle */ + uint8_t nAndPagingFrmOffsetType; /*Number of PagingFrames in PagingCycle defined in terms of T.*/ + uint8_t pageFrameOffset; /* Paging Frame offset */ + uint8_t ns; /* Number of paging occassions in paging frame */ + uint8_t firstPDCCHMontioringType; /* First PDCCH Monitoring Paging Occasion Presence Type*/ + uint16_t firstPDCCHMontioringInfo[MAX_PO_PER_PF];/*Indicates the first PDCCH monitoring occasion of each PO of the PF*/ }PcchCfg; typedef struct scsSpecCarrier @@ -1169,8 +1165,8 @@ typedef struct rachCfgCommon long pwrRampingStep; /* Power ramping steps for PRACH */ long raRspWindow; /* RA response window */ long numRaPreamble; /* Total num of preamble used in random access */ - uint8_t ssbPerRachOccPresent; long numSsbPerRachOcc; /* Numer of SSBs per RACH Occassion */ + long numCbPreamblePerSsb; /* Number of Contention-Based preamble per SSB */ long contResTimer; /* Contention resolution timer */ long rsrpThreshSsb; uint8_t rootSeqIdxPresent; @@ -1205,6 +1201,7 @@ typedef struct pucchCfgCommon typedef struct ulCfgCommon { + long freqBandInd; /* Uplink frequency band indicator */ long pMax; /* Max UL transmission power that UE applies */ long locAndBw; /* Frequency location and bandwidth */ ScsSpecCarrier ulScsCarrier; /* SCS Specific carrier */ @@ -1226,6 +1223,7 @@ typedef struct tddUlDlCfgCommon typedef struct srvCellCfgCommSib { + long scs; DlCfgCommon dlCfg; UlCfgCommon ulCfg; uint8_t ssbPosInBurst; @@ -1243,6 +1241,7 @@ typedef struct sib1Params long cellResvdForOpUse; long connEstFailCnt; long connEstFailOffValidity; + long connEstFailOffset; SiSchedInfo siSchedInfo; SrvCellCfgCommSib srvCellCfgCommSib; }Sib1Params; @@ -1253,21 +1252,56 @@ typedef struct duCfgParams F1EgtpParams egtpParams; /* EGTP Params */ uint32_t maxUe; uint32_t duId; - uint8_t duName[CU_DU_NAME_LEN_MAX]; + char *duName; SchedulerCfg schedCfg; 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 */ Sib1Params sib1Params; /* SIB1 Params */ + MacSliceCfgReq tempSliceCfg; }DuCfgParams; +#ifndef O1_ENABLE +//RRM POLICY STRUCT + +typedef struct rRMPolicyMemberList +{ + uint8_t mcc[3]; + uint8_t mnc[3]; + uint8_t sd[3]; + uint8_t sst; +}RRMPolicyMemberList; + +typedef enum +{ + PRB, + PRB_UL, + PRB_DL, + RRC, + DRB +}RrmResourceType; + +typedef struct rrmPolicyList +{ + char id[1]; + RrmResourceType resourceType; + uint8_t rRMMemberNum; + RRMPolicyMemberList rRMPolicyMemberList[2]; + uint8_t rRMPolicyMaxRatio; + uint8_t rRMPolicyMinRatio; + uint8_t rRMPolicyDedicatedRatio; +}RrmPolicyList; +#endif + +DuCfgParams duCfgParam; + /*function declarations */ -void FillSlotConfig(); uint8_t readClCfg(); uint8_t readCfg(); uint8_t duReadCfg(); uint16_t calcSliv(uint8_t startSymbol, uint8_t lengthSymbol); +uint8_t cpyRrmPolicyInDuCfgParams(RrmPolicyList rrmPolicy[], uint8_t policyNum, MacSliceCfgReq *tempSliceCfg); #endif /* __DU_CONFIG_H__ */