X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fmac_sch_interface.h;h=0d1ab67a9754750065bbd3c6777d7b4dac6dcf61;hb=2bd852089c3226f721d83b30f816b90f803237f6;hp=0e1c862ebb89059ee7a67699f16bbb73bf44041c;hpb=051044374d0ed16423e2ef98c70395fde934f0ce;p=o-du%2Fl2.git diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h index 0e1c862eb..0d1ab67a9 100644 --- a/src/cm/mac_sch_interface.h +++ b/src/cm/mac_sch_interface.h @@ -797,7 +797,7 @@ typedef struct schShortDrx uint8_t drxShortCycleTimer; }SchShortDrx; -typedef struct schDrxInfo +typedef struct schDrxCfg { SchDrxOnDurationTimer drxOnDurationTimer; uint16_t drxInactivityTimer; @@ -806,9 +806,10 @@ typedef struct schDrxInfo uint16_t drxRetransmissionTimerDl; uint16_t drxRetransmissionTimerUl; SchDrxLongCycleStartOffset drxLongCycleStartOffset; + bool shortDrxPres; SchShortDrx shortDrx; - uint8_t drxSlotOffset; -}SchDrxInfo; + uint8_t drxSlotOffset; +}SchDrxCfg; #endif typedef struct schCellCfg @@ -830,9 +831,6 @@ typedef struct schCellCfg #ifdef NR_TDD TDDCfg tddCfg; /* TDD Cfg */ #endif -#ifdef NR_DRX - SchDrxInfo drxInfo; /* Drx configuration */ -#endif }SchCellCfg; typedef struct schCellCfgCfm @@ -1201,6 +1199,9 @@ typedef struct schMacCellGrpCfg SchSchedReqCfg schedReqCfg; SchTagCfg tagCfg; SchPhrCfg phrCfg; /* To be used only if phrCfgSetupPres is true */ +#ifdef NR_DRX + SchDrxCfg drxCfg; /* Drx configuration */ +#endif }SchMacCellGrpCfg; /* Physical Cell Group Configuration */