X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=84f9beff6cfcdb9eb18c99a0e9774dd7cbfeadcd;hb=3364273455756ae289662a274d5bcbf391ecd58e;hp=168b22deea88ee0a0dd672d1e712e751a85cad31;hpb=b580426053b24d64971d6f94571c4ea2c5a09f53;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 168b22dee..84f9beff6 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -48,12 +48,16 @@ #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 DU_TAC 1 @@ -69,8 +73,6 @@ #define SUL_ARFCN 100 #define SUL_BAND 2 - - #define TIME_CFG 0 #define CARRIER_IDX 1 #define NUM_TX_ANT 2 @@ -99,9 +101,10 @@ /* MACRO defines for PRACH Configuration */ #define PRACH_CONFIG_IDX 88 -#define PRACH_FREQ_START 0 +#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 @@ -159,8 +162,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 +175,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 */ @@ -208,13 +211,6 @@ /* Events */ #define EVTCFG 0 -#ifdef EGTP_TEST -/* Macro definitions for EGTP procedures */ -#define EGTP_LCL_TEID 1 /* EGTP local tunnel id */ -#define EGTP_REM_TEID 10 /* EGTP remote tinnel id */ -#endif - - /* 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 */ @@ -231,8 +227,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 */ @@ -283,12 +277,6 @@ #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 -#define LC_ID 1 -#endif - /* MACRO definitions for modulcation order */ #define MOD_ORDER_QPSK 2 #define MOD_ORDER_QAM16 4 @@ -300,6 +288,14 @@ /*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 */ + +/* Slice Ratio */ +#define MAX_RATIO 30 +#define MIN_RATIO 20 +#define DEDICATED_RATIO 10 +#define DEDICATED_SLICE_INDEX 1 +#define NUM_OF_SUPPORTED_SLICE 2 + typedef enum { GNBDU, @@ -496,13 +492,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 */ @@ -659,12 +648,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 */ @@ -676,32 +659,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 @@ -709,7 +670,6 @@ typedef struct f1SrvdPlmn Plmn plmn; Plmn extPlmn; /* Extended available PLMN list */ F1TaiSliceSuppLst taiSliceSuppLst; - RrmPolicy rrmPolicy; }F1SrvdPlmn; typedef struct f1BrdcstPlmnInfo @@ -1260,6 +1220,29 @@ typedef struct sib1Params SrvCellCfgCommSib srvCellCfgCommSib; }Sib1Params; +typedef struct policyMemberList +{ + Plmn plmn; + Snssai snssai; +}PolicyMemberList; + +typedef struct rrmPolicy +{ + ResourceType rsrcType; + uint8_t numMemberList; + PolicyMemberList **memberList; + uint8_t policyMaxRatio; + uint8_t policyMinRatio; + uint8_t policyDedicatedRatio; +}RrmPolicy; + +typedef struct copyOfRecvdSliceCfg +{ + RrmPolicy **rrmPolicy; + uint8_t totalRrmPolicy; + uint8_t totalSliceCount; +}CopyOfRecvdSliceCfg; + typedef struct duCfgParams { SctpParams sctpParams; /* SCTP Params */ @@ -1273,14 +1256,18 @@ typedef struct duCfgParams MacCellCfg macCellCfg; /* MAC cell configuration */ MibParams mibParams; /* MIB Params */ Sib1Params sib1Params; /* SIB1 Params */ + CopyOfRecvdSliceCfg tempSliceCfg; }DuCfgParams; +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(RrmPolicy rrmPolicy[], uint8_t policyNum, uint8_t memberList, CopyOfRecvdSliceCfg *tempSliceCfg); #endif /* __DU_CONFIG_H__ */