X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_ue_mgr.c;h=aa74c06b54f421aa0990e50afb17fda64f565cb2;hb=de6a435729e3cad9d4a66329080b8206a64f452c;hp=db1510825cff7ed96c38fb12b49a3275eaa7f23a;hpb=6bd517aac8dc6e3166389be3f468c58ba56d5608;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c index db1510825..aa74c06b5 100644 --- a/src/5gnrsch/sch_ue_mgr.c +++ b/src/5gnrsch/sch_ue_mgr.c @@ -28,9 +28,6 @@ #include "mac_sch_interface.h" #include "sch.h" #include "sch_utils.h" -#ifdef NR_DRX -#include "sch_drx.h" -#endif /* local defines */ SchUeCfgRspFunc SchUeCfgRspOpts[] = @@ -259,56 +256,8 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) { memcpy(&ueCb->ueCfg.macCellGrpCfg , &ueCfg->macCellGrpCfg, sizeof(SchMacCellGrpCfg)); ueCb->ueCfg.macCellGrpCfgPres = true; -#ifdef NR_DRX - if(ueCfg->macCellGrpCfg.drxCfgPresent == true) - { - if(ueCb->ueDrxInfoPres == false) - { - ueCb->ueDrxInfoPres = true; - /* intialize the drxUeCb */ - schInitDrxUeCb(ueCb); - - /* intialize the Dl drxHarqCb */ - for(idx =0; idxdlHqEnt.numHqPrcs; idx++) - { - schInitDrxHarqCb(&ueCb->dlHqEnt.procs[idx].drxHarqCb); - } - /* intialize the Ul drxHarqCb */ - for(idx =0; idxulHqEnt.numHqPrcs; idx++) - { - schInitDrxHarqCb(&ueCb->ulHqEnt.procs[idx].drxHarqCb); - } - /* 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); - - } - else - { - /* 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); - - /* Recalculate/Restart timer based on their presence */ - schDrxUeReCfgTimer(ueCb->cellCb, ueCb); - } - } -#endif } -#ifdef NR_DRX - if(ueCfg->drxConfigIndicatorRelease == true) - { - if(ueCb->ueDrxInfoPres == true) - { - schDeleteUeDrxInfo(ueCb->cellCb, ueCb); - ueCb->ueDrxInfoPres = false; - } - } -#endif - if(ueCfg->phyCellGrpCfgPres == true) { memcpy(&ueCb->ueCfg.phyCellGrpCfg , &ueCfg->phyCellGrpCfg, sizeof(SchPhyCellGrpCfg)); @@ -1190,14 +1139,7 @@ void deleteSchUeCb(SchUeCb *ueCb) SCH_FREE(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, sizeof(Snssai)); SCH_FREE(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, sizeof(Snssai)); } -#ifdef NR_DRX - if(ueCb->ueDrxInfoPres) - { - /* Removing all the calculated drx configuration timer list */ - schDeleteUeDrxInfo(ueCb->cellCb, ueCb); - ueCb->ueDrxInfoPres = false; - } -#endif + memset(ueCb, 0, sizeof(SchUeCb)); } }