X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr.h;h=c2604087ef6b504167ce5b16d2c530c66202e719;hb=0ba7b600f85b2975e1d60e5b8ad1523349b5f396;hp=a46a3709fe76fac16f72880358cf074f23346839;hpb=04ac036d193d4f4807cfaae96ce74dfd1c3e7966;p=o-du%2Fl2.git diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h index a46a3709f..c2604087e 100644 --- a/src/du_app/du_mgr.h +++ b/src/du_app/du_mgr.h @@ -57,6 +57,7 @@ #define DU_SET_ZERO(_buf, _size) \ memset((_buf), 0, _size); +/*Refer Spec 38.331 Annexure A: maxNrofPageRec : 32 [Maximum number of page records]*/ #define MAX_PAGING_UE_RECORDS 32 typedef enum @@ -128,6 +129,17 @@ typedef struct upTnlCfg GtpTnlCfg *tnlCfg2; /* Tunnel 2 */ }UpTnlCfg; +#ifdef NR_DRX +/* This structures is taken from the DRX Cycle section of + * specification 33.473. */ +typedef struct drxCycle +{ + uint16_t drxLongCycleLength; + bool shortDrxCyclePres; + ShortDrx shortDrxCycle; +}DrxCycle; +#endif + typedef struct duUeCfg { void *cellGrpCfg; @@ -141,7 +153,11 @@ typedef struct duUeCfg UpTnlCfg upTnlInfo[MAX_NUM_DRB]; /* User plane TNL Info*/ uint8_t numDrbSetupMod; /*No. of DRB Added during Modification*/ MacUeCfg copyOfmacUeCfg; - DataTransmissionAction dataTransmissionAction; + DataTransmissionAction dataTransmissionAction; +#ifdef NR_DRX + bool drxCyclePres; + DrxCycle drxCycle; +#endif }DuUeCfg; typedef struct f1UeContextSetup @@ -170,6 +186,7 @@ typedef struct duUeCb uint32_t gnbCuUeF1apId; /* GNB CU UE F1AP ID */ uint32_t drbBitMap; /* Drb Bit Map */ UeState ueState; /* UE Active/ Ue Inactive state */ + MacCfraResource cfraResource; /* CF-RA resource assigned by MAC/SCH */ MacUeCfg macUeCfg; /* Mac Ue Cfg */ RlcUeCfg rlcUeCfg; /* Rlc Ue Cfg */ }DuUeCb; @@ -200,9 +217,8 @@ typedef struct pagingMsg typedef struct duPagUeRecord { - uint16_t pagUeId; /*UEID calculated from 5gsTMSI as per Spec 38.304*/ - uint64_t sTmsi; /*UE Paging Identity: 5GS-TMSI*/ - uint8_t pagPriority; /* Paging priority */ + uint16_t pagUeId; /*UEID calculated from 5gsTMSI as per Spec 38.304*/ + uint64_t sTmsi; /* UE Paging Identity: S-TMSI */ }DuPagUeRecord; typedef struct duPagInfo @@ -334,6 +350,7 @@ uint8_t duSendEgtpDatInd(Buffer *mBuf); uint8_t duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm); uint8_t duBuildAndSendMacCellStart(); uint8_t duBuildAndSendMacCellStop(uint16_t cellId); + #endif /**********************************************************************