Merge "[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-472] Handling of drx timer in SCH...

[o-du/l2.git] / src / 5gnrsch / sch_ue_mgr.c

diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c
index db15108..3e94b75 100644 (file)
--- a/src/5gnrsch/sch_ue_mgr.c
+++ b/src/5gnrsch/sch_ue_mgr.c
@@ -271,18 +271,18 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg)
             /* intialize the Dl drxHarqCb */
             for(idx =0; idx<ueCb->dlHqEnt.numHqPrcs; idx++)
             {
-               schInitDrxHarqCb(&ueCb->dlHqEnt.procs[idx].drxHarqCb);
+               schInitDrxHarqCb(&ueCb->dlHqEnt.procs[idx].dlDrxHarqCb);
             }
             /* intialize the Ul drxHarqCb */
             for(idx =0; idx<ueCb->ulHqEnt.numHqPrcs; idx++)
             {
-               schInitDrxHarqCb(&ueCb->ulHqEnt.procs[idx].drxHarqCb);
+               schInitDrxHarqCb(&ueCb->ulHqEnt.procs[idx].ulDrxHarqCb);
             }
             /* convert all the drx configuration recived in ms/subms into number of slots and store into the drxUeCb */
             schFillDrxUeCb(ueCb->cellCb->cellCfg.numerology, ueCfg->macCellGrpCfg.drxCfg, &ueCb->drxUeCb);
             /* Calculate the onduration timer and short cycle timer (if shortcycle configuration is present) as soon as we 
              * recived ueCfg request */
-            schAddUeInOndurationAndShortCycleList(ueCb->cellCb, ueCb, 0);
+            schAddUeInOndurationList(ueCb->cellCb, ueCb, 0);
 
          }
          else
@@ -1301,7 +1301,7 @@ uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete  *ueDelete)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t SchSendCellDeleteRspToMac(SchCellDelete  *ueDelete, Inst inst, SchMacRsp result)
+uint8_t SchSendCellDeleteRspToMac(SchCellDeleteReq  *ueDelete, Inst inst, SchMacRsp result)
 {
    Pst rspPst;
    uint8_t ret=0;
@@ -1442,7 +1442,7 @@ void deleteSchCellCb(SchCellCb *cellCb)
  *
  * ****************************************************************/
 
-uint8_t MacSchCellDeleteReq(Pst *pst, SchCellDelete  *cellDelete)
+uint8_t MacSchCellDeleteReq(Pst *pst, SchCellDeleteReq  *cellDelete)
 {
    uint8_t   cellIdx=0, ret = RFAILED;
    Inst      inst = pst->dstInst - SCH_INST_START;