X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=ac7810e020e22d66ca02b4bc788ccfaaa3125ab4;hb=a6fdf00681f781fbccf7aa4bf95582f20e3039bb;hp=89eb270dcb36aadff7201622ebb7f615af9628b2;hpb=b7a8e8fc6abc7fba2f580684da44413d481be825;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index 89eb270dc..ac7810e02 100644
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -188,11 +188,12 @@ typedef struct schDlHqTbCb
 #ifdef NR_DRX
 typedef struct schDrxHarqCb
 {
-   uint32_t     retxStrtIndex;     
-   uint32_t     rttIndex;                  
-   uint32_t     retxIndex;        
-   int16_t      retxExpDistance; 
-   uint8_t      retxTmrReduction;     
+   uint32_t     rttExpIndex;
+   CmLList      *rttExpNode;
+   uint32_t     retxStrtIndex; 
+   CmLList      *retxStrtNode;
+   uint32_t     retxExpIndex;
+   CmLList      *retxExpNode;
 }SchDrxHarqCb;
 #endif
 
@@ -214,6 +215,7 @@ typedef struct schUlHqProcCb
    uint8_t           dmrsMappingType;
    uint8_t           nrOfDmrsSymbols;
    uint8_t           dmrsAddPos;
+   SlotTimingInfo    puschTime;
 #ifdef NR_DRX
    SchDrxHarqCb      ulDrxHarqCb;
 #endif
@@ -230,6 +232,7 @@ struct schDlHqProcCb
    uint8_t           k1;
    SchLcPrbEstimate  dlLcPrbEst; /*DL PRB Alloc Estimate among different LC*/
    CmLList           dlHqProcLink;
+   SlotTimingInfo    pucchTime;
 #ifdef NR_DRX
    SchDrxHarqCb      dlDrxHarqCb;
 #endif
@@ -392,7 +395,7 @@ typedef struct schUeCfgCb
    bool phyCellGrpCfgPres;
    SchPhyCellGrpCfg   phyCellGrpCfg;
    bool spCellCfgPres;
-   SchSpCellCfg       spCellCfg;
+   SchSpCellRecfg       spCellCfg;
    SchAmbrCfg         *ambrCfg;
    SchModulationInfo  dlModInfo;
    SchModulationInfo  ulModInfo;
@@ -412,8 +415,12 @@ typedef struct schHqUlMap
 #ifdef NR_DRX
 typedef struct  schDrxUeCb
 {
-   bool      drxDlUeActiveStatus;    /* variable is used to store the status about downlink active status */
-   bool      drxUlUeActiveStatus;    /* variable is used to store the status about uplink active status */
+   bool      drxDlUeActiveStatus;       /* Final Dl Ue status which is marked as true if drxDlUeActiveMask or drxDlUeActiveMaskForHarq is present */
+   bool      drxUlUeActiveStatus;       /* Final Ul Ue status which is marked as true if drxUlUeActiveMask or drxUlUeActiveMaskForHarq is present */
+   uint32_t  drxDlUeActiveMask;          /* variable is used to store the status about downlink active status of Ue for On-duration, inactive timer*/
+   uint32_t  drxUlUeActiveMask;          /* variable is used to store the status about uplink active status for on-duration inactive timer*/
+   uint32_t  drxDlUeActiveMaskForHarq;   /* variable is used to store the status about downlink active status for harq*/
+   uint32_t  drxUlUeActiveMaskForHarq;   /* variable is used to store the status about uplink active status for harq */
    uint32_t  onDurationLen;          /* length of on duration which is received from ue cfg/recfg in form of ms and subms, informs about after how many slots on duration gets expire */
    uint32_t  inActvTimerLen;         /* length of inActvTimer value received from ue cfg/recfg in form of ms, informs about after how many slots in active gets expire */
    uint8_t   harqRttDlTimerLen;      /* length of harqRttDlTimer received from ue cfg/recfg in form of symbols, inform about after how many slots on the harq drx-HARQ-RTT-TimerDL expire */
@@ -586,6 +593,7 @@ SchCb schCb[SCH_MAX_INST];
 
 /* function declarations */
 short int schActvTmr(Ent ent,Inst inst);
+void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm);
 
 /* Configuration related function declarations */
 void schInitUlSlot(SchUlSlotInfo *schUlSlotInfo);