X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_ue_mgr.c;h=1254674d818d8c1c3dc277db2f5a0ac7344c3db9;hb=6636207100c598cd70537d177670ef131e263931;hp=aa74c06b54f421aa0990e50afb17fda64f565cb2;hpb=97a2285207414a7948f5e1dfcb5318fa9507c123;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c index aa74c06b5..1254674d8 100644 --- a/src/5gnrsch/sch_ue_mgr.c +++ b/src/5gnrsch/sch_ue_mgr.c @@ -28,28 +28,9 @@ #include "mac_sch_interface.h" #include "sch.h" #include "sch_utils.h" - -/* local defines */ -SchUeCfgRspFunc SchUeCfgRspOpts[] = -{ - packSchUeCfgRsp, /* LC */ - MacProcSchUeCfgRsp, /* TC */ - packSchUeCfgRsp /* LWLC */ -}; - -SchUeDeleteRspFunc SchUeDeleteRspOpts[] = -{ - packSchUeDeleteRsp, /* LC */ - MacProcSchUeDeleteRsp, /* TC */ - packSchUeDeleteRsp /* LWLC */ -}; - -SchCellDeleteRspFunc SchCellDeleteRspOpts[]= -{ - packSchCellDeleteRsp, /* LC */ - MacProcSchCellDeleteRsp, /* TC */ - packSchCellDeleteRsp /* LWLC */ -}; +#ifdef NR_DRX +#include "sch_drx.h" +#endif /******************************************************************* * @@ -66,7 +47,7 @@ SchCellDeleteRspFunc SchCellDeleteRspOpts[]= * RFAILED - failure * * ****************************************************************/ -void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\ +void SchSendUeCfgRspToMac(SchUeCfgReq *ueCfg, Inst inst,\ SchMacRsp result, SchUeCfgRsp *cfgRsp) { Pst rspPst; @@ -79,17 +60,42 @@ void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\ /* Filling response post */ memset(&rspPst, 0, sizeof(Pst)); FILL_PST_SCH_TO_MAC(rspPst, inst); - if(event == EVENT_ADD_UE_CONFIG_REQ_TO_SCH) - { - rspPst.event = EVENT_UE_CONFIG_RSP_TO_MAC; - DU_LOG("\nINFO --> SCH : Sending UE Config response to MAC"); - } - else if(event == EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH) - { - rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC; - DU_LOG("\nINFO --> SCH : Sending UE Reconfig response to MAC"); - } - SchUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp); + rspPst.event = EVENT_UE_CONFIG_RSP_TO_MAC; + DU_LOG("\nINFO --> SCH : Sending UE Config response to MAC"); + MacMessageRouter(&rspPst, (void *)cfgRsp); +} + +/******************************************************************* + * + * @brief Fill and send UE Recfg response to MAC + * + * @details + * + * Function : SchSendUeRecfgRspToMac + * + * Functionality: Fill and send UE Recfg response to MAC + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +void SchSendUeRecfgRspToMac(SchUeRecfgReq *ueRecfgReq, Inst inst,\ + SchMacRsp result, SchUeRecfgRsp *reCfgRsp) +{ + Pst rspPst; + + reCfgRsp->cellId = ueRecfgReq->cellId; + reCfgRsp->ueId = ueRecfgReq->ueId; + reCfgRsp->crnti = ueRecfgReq->crnti; + reCfgRsp->rsp = result; + + /* Filling response post */ + memset(&rspPst, 0, sizeof(Pst)); + FILL_PST_SCH_TO_MAC(rspPst, inst); + rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC; + DU_LOG("\nINFO --> SCH : Sending UE Reconfig response to MAC"); + MacMessageRouter(&rspPst, (void *)reCfgRsp); } /******************************************************************* @@ -224,11 +230,54 @@ uint8_t updateDedLcInfo(Inst inst, Snssai *snssai, uint16_t *rsvdDedicatedPRB, b /******************************************************************* * - * @brief Function to fill SchUeCb + * @brief Function to fill SpCellCfg in SchUeCb From SchUeCfg Req + * + * @details + * + * Function : fillSpCellInSchCb + * + * Functionality: Function to fill SpCellCfg in SchUeCb + * + * @params[in] Scheduler instance, + * SchUeCb pointer, + * SchUeCfg pointer + * @return ROK/RFAILED + * + * ****************************************************************/ + +void fillSpCellInSchCb(SchSpCellRecfg *destSpCellCfg, SchSpCellCfg *srcSpCellCfg) +{ + destSpCellCfg->servCellIdx = srcSpCellCfg->servCellIdx; + memcpy(&destSpCellCfg->servCellRecfg.initDlBwp, &srcSpCellCfg->servCellCfg.initDlBwp, sizeof(SchInitalDlBwp)); + destSpCellCfg->servCellRecfg.numDlBwpToAddOrMod = srcSpCellCfg->servCellCfg.numDlBwpToAdd; + if(destSpCellCfg->servCellRecfg.numDlBwpToAddOrMod > 0) + { + memcpy(destSpCellCfg->servCellRecfg.dlBwpToAddOrModList, srcSpCellCfg->servCellCfg.dlBwpToAddList,\ + (sizeof(SchDlBwpInfo) * srcSpCellCfg->servCellCfg.numDlBwpToAdd)); + } + destSpCellCfg->servCellRecfg.firstActvDlBwpId = srcSpCellCfg->servCellCfg.firstActvDlBwpId; + destSpCellCfg->servCellRecfg.defaultDlBwpId = srcSpCellCfg->servCellCfg.defaultDlBwpId; + destSpCellCfg->servCellRecfg.bwpInactivityTmr = srcSpCellCfg->servCellCfg.bwpInactivityTmr; + memcpy(&destSpCellCfg->servCellRecfg.pdschServCellCfg, &srcSpCellCfg->servCellCfg.pdschServCellCfg, sizeof(SchPdschServCellCfg)); + memcpy(&destSpCellCfg->servCellRecfg.initUlBwp, &srcSpCellCfg->servCellCfg.initUlBwp, sizeof(SchInitialUlBwp)); + + destSpCellCfg->servCellRecfg.numDlBwpToAddOrMod = srcSpCellCfg->servCellCfg.numDlBwpToAdd; + if(destSpCellCfg->servCellRecfg.numDlBwpToAddOrMod > 0) + { + memcpy(destSpCellCfg->servCellRecfg.ulBwpToAddOrModList, srcSpCellCfg->servCellCfg.ulBwpToAddList,\ + (sizeof(SchUlBwpInfo) * srcSpCellCfg->servCellCfg.numUlBwpToAdd)); + } + destSpCellCfg->servCellRecfg.firstActvUlBwpId = srcSpCellCfg->servCellCfg.firstActvUlBwpId; + return; +} + +/******************************************************************* + * + * @brief Function to fill SchUeCb From UeCfg Req * * @details * - * Function : fillSchUeCb + * Function : fillSchUeCbFrmCfgReq * * Functionality: Function to fill SchUeCb * @@ -239,7 +288,7 @@ uint8_t updateDedLcInfo(Inst inst, Snssai *snssai, uint16_t *rsvdDedicatedPRB, b * * ****************************************************************/ -uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) +uint8_t fillSchUeCbFrmCfgReq(Inst inst, SchUeCb *ueCb, SchUeCfgReq *ueCfg) { uint8_t lcIdx, ueLcIdx, idx; uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0}; @@ -251,11 +300,47 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) ueCb->ueCfg.cellId = ueCfg->cellId; ueCb->ueCfg.ueId = ueCfg->ueId; ueCb->ueCfg.crnti = ueCfg->crnti; - ueCb->ueCfg.dataTransmissionAction = ueCfg->dataTransmissionInfo; if(ueCfg->macCellGrpCfgPres == true) { 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].dlDrxHarqCb); + } + /* intialize the Ul drxHarqCb */ + for(idx =0; idxulHqEnt.numHqPrcs; idx++) + { + 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 */ + schAddUeInOndurationList(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 } if(ueCfg->phyCellGrpCfgPres == true) @@ -268,23 +353,23 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) { if(ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfgPres == true) { - if(ueCb->ueCfg.spCellCfgPres && ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfgPres == true) + if(ueCb->ueCfg.spCellCfgPres && ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfgPres == true) { for(idx = 0; idx < ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc; idx++) { - if(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0 && ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0) + if(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0 && ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0) { - SCH_FREE(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0, sizeof(uint8_t)); + SCH_FREE(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0, sizeof(uint8_t)); } } } } - memcpy(&ueCb->ueCfg.spCellCfg , &ueCfg->spCellCfg, sizeof(SchSpCellCfg)); + fillSpCellInSchCb(&ueCb->ueCfg.spCellCfg, &ueCfg->spCellCfg); - covertFreqDomRsrcMapToIAPIFormat(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc,\ + covertFreqDomRsrcMapToIAPIFormat(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc,\ freqDomainResource); - memset(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, 0, FREQ_DOM_RSRC_SIZE); - memcpy(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, freqDomainResource, FREQ_DOM_RSRC_SIZE); + memset(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, 0, FREQ_DOM_RSRC_SIZE); + memcpy(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, freqDomainResource, FREQ_DOM_RSRC_SIZE); ueCb->ueCfg.spCellCfgPres = true; dlDataToUlAck = ueCfg->spCellCfg.servCellCfg.initUlBwp.pucchCfg.dlDataToUlAck; @@ -292,14 +377,14 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) { if(dlDataToUlAck) { - BuildK0K1Table(ueCb->cellCb, &ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.k0K1InfoTbl, false, pdschCfg,\ + BuildK0K1Table(ueCb->cellCb, &ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.k0K1InfoTbl, false, pdschCfg,\ ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, dlDataToUlAck->dlDataToUlAckListCount,\ dlDataToUlAck->dlDataToUlAckList); - ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.k0K1TblPrsnt = true; + ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.k0K1TblPrsnt = true; BuildK2InfoTable(ueCb->cellCb, ueCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList,\ ueCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\ - NULLP, &ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.k2InfoTbl); - ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.k2TblPrsnt = true; + NULLP, &ueCb->ueCfg.spCellCfg.servCellRecfg.initUlBwp.k2InfoTbl); + ueCb->ueCfg.spCellCfg.servCellRecfg.initUlBwp.k2TblPrsnt = true; } } } @@ -312,7 +397,7 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) memcpy(&ueCb->ueCfg.dlModInfo, &ueCfg->dlModInfo , sizeof(SchModulationInfo)); memcpy(&ueCb->ueCfg.ulModInfo, &ueCfg->ulModInfo , sizeof(SchModulationInfo)); //Updating SchUlCb and SchDlCb DB in SchUeCb - for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++) + for(lcIdx = 0; lcIdx < ueCfg->numLcsToAdd; lcIdx++) { isLcIdValid = FALSE; /*Re-Initializing*/ @@ -323,101 +408,280 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) DU_LOG("ERROR --> SCH: LCID:%d is not Valid",ueLcIdx); continue; } - if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_ADD) + fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); + fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); + + /*Checking whether this LC belong to Dedicated S-NSSAI + * and Create the Dedicated LC List & Update the Reserve PRB number*/ + if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP) + { + retDL = updateDedLcInfo(inst, ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ + &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated)); + } + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP) { - fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); - fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); + retUL = updateDedLcInfo(inst, ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ + &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated)); + } - /*Checking whether this LC belong to Dedicated S-NSSAI - * and Create the Dedicated LC List & Update the Reserve PRB number*/ - if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP) + if(retUL == RFAILED || retDL == RFAILED)/*FATAL error*/ + { + DU_LOG("\nERROR --> SCH : Failure in updateDedLcInfo"); + return RFAILED; + } + SCH_FREE(ueCfg->schLcCfg[lcIdx].drbQos, sizeof(SchDrbQosInfo)); + SCH_FREE(ueCfg->schLcCfg[lcIdx].snssai, sizeof(Snssai)); + + }/* End of outer for loop */ + return ROK; +} + +/******************************************************************* + * + * @brief Function to fill SchUeCb From UeReconfig Req + * + * @details + * + * Function : fillSchUeCbFrmRecfgReq + * + * Functionality: Function to fill SchUeCb + * + * @params[in] Scheduler instance, + * SchUeCb pointer, + * SchUeCfg pointer + * @return ROK/RFAILED + * + * ****************************************************************/ + +uint8_t fillSchUeCbFrmRecfgReq(Inst inst, SchUeCb *ueCb, SchUeRecfgReq *ueRecfg) +{ + uint8_t lcIdx, ueLcIdx, idx; + uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0}; + SchPdschCfgCmn pdschCfg; + SchPucchDlDataToUlAck *dlDataToUlAck; + uint8_t retDL = ROK, retUL = ROK; + bool isLcIdValid = FALSE; + + + ueCb->ueCfg.cellId = ueRecfg->cellId; + ueCb->ueCfg.ueId = ueRecfg->ueId; + ueCb->ueCfg.crnti = ueRecfg->crnti; + ueCb->ueCfg.dataTransmissionAction = ueRecfg->dataTransmissionInfo; + if(ueRecfg->macCellGrpRecfgPres == true) + { + memcpy(&ueCb->ueCfg.macCellGrpCfg , &ueRecfg->macCellGrpRecfg, sizeof(SchMacCellGrpCfg)); + ueCb->ueCfg.macCellGrpCfgPres = true; +#ifdef NR_DRX + if(ueRecfg->macCellGrpRecfg.drxCfgPresent == true) + { + if(ueCb->ueDrxInfoPres == false) { - retDL = updateDedLcInfo(inst, ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ - &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated)); + ueCb->ueDrxInfoPres = true; + /* intialize the drxUeCb */ + schInitDrxUeCb(ueCb); + + /* intialize the Dl drxHarqCb */ + for(idx =0; idxdlHqEnt.numHqPrcs; idx++) + { + schInitDrxHarqCb(&ueCb->dlHqEnt.procs[idx].dlDrxHarqCb); + } + /* intialize the Ul drxHarqCb */ + for(idx =0; idxulHqEnt.numHqPrcs; idx++) + { + 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, ueRecfg->macCellGrpRecfg.drxCfg, &ueCb->drxUeCb); + /* Calculate the onduration timer and short cycle timer (if shortcycle configuration is present) as soon as we + * recived ueCfg request */ + schAddUeInOndurationList(ueCb->cellCb, ueCb, 0); + } - if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP) + else { - retUL = updateDedLcInfo(inst, ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ - &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated)); - } + /* convert all the drx configuration recived in ms/subms into number + * of slots and store into the drxUeCb */ + schFillDrxUeCb(ueCb->cellCb->cellCfg.numerology, ueRecfg->macCellGrpRecfg.drxCfg, &ueCb->drxUeCb); - if(retUL == RFAILED || retDL == RFAILED)/*FATAL error*/ - { - DU_LOG("\nERROR --> SCH : Failure in updateDedLcInfo"); - return RFAILED; + /* Recalculate/Restart timer based on their presence */ + schDrxUeReCfgTimer(ueCb->cellCb, ueCb); } } - else +#endif + } + +#ifdef NR_DRX + if(ueRecfg->drxConfigIndicatorRelease == true) + { + if(ueCb->ueDrxInfoPres == true) { - if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].lcId == ueCfg->schLcCfg[lcIdx].lcId) + schDeleteUeDrxInfo(ueCb->cellCb, ueCb); + ueCb->ueDrxInfoPres = false; + } + } +#endif + + if(ueRecfg->phyCellGrpRecfgPres == true) + { + memcpy(&ueCb->ueCfg.phyCellGrpCfg , &ueRecfg->phyCellGrpRecfg, sizeof(SchPhyCellGrpCfg)); + ueCb->ueCfg.phyCellGrpCfgPres = true; + } + + if(ueRecfg->spCellRecfgPres == true) + { + if(ueRecfg->spCellRecfg.servCellRecfg.initDlBwp.pdschCfgPres == true) + { + if(ueCb->ueCfg.spCellCfgPres && ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfgPres == true) { - if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_MOD) + for(idx = 0; idx < ueRecfg->spCellRecfg.servCellRecfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc; idx++) { - fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); - /*Updating the RRM reserved pool PRB count*/ - if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP) + if(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0 && ueRecfg->spCellRecfg.servCellRecfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0) { - retUL = updateDedLcInfo(inst, ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ - &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated)); - } - if(retUL == RFAILED) - { - DU_LOG("\nERROR --> SCH : Failed in updating Ded Lc info"); - return RFAILED; + SCH_FREE(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0, sizeof(uint8_t)); } } - if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_DEL) - { - /*Delete the LC node from the UL LC List*/ - if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated) - { - /*Remove from HARQ Transmission or retransmission*/ - } - else/*Default LC list*/ - { + } + } + memcpy(&ueCb->ueCfg.spCellCfg , &ueRecfg->spCellRecfg, sizeof(SchSpCellRecfg)); - } - SCH_FREE(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, sizeof(Snssai)); - memset(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], 0, sizeof(SchUlLcCtxt)); - } - }/*End of UL LC Ctxt*/ + covertFreqDomRsrcMapToIAPIFormat(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc,\ + freqDomainResource); + memset(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, 0, FREQ_DOM_RSRC_SIZE); + memcpy(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, freqDomainResource, FREQ_DOM_RSRC_SIZE); - if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].lcId == ueCfg->schLcCfg[lcIdx].lcId) + ueCb->ueCfg.spCellCfgPres = true; + dlDataToUlAck = ueRecfg->spCellRecfg.servCellRecfg.initUlBwp.pucchCfg.dlDataToUlAck; + if(ueCb->cellCb) + { + if(dlDataToUlAck) { - if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_MOD) - { - fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); - /*Updating the RRM policy*/ - if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP) - { - retDL = updateDedLcInfo(inst, ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].rsvdDedicatedPRB), \ - &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated)); - } - if(retDL == RFAILED) - { - DU_LOG("\nERROR --> SCH : Failed in updating Ded Lc info"); - return RFAILED; - } - } - if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_DEL) - { - /*Delete the LC node from the DL LC List*/ - if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated) - { - /*Remove from HARQ Transmission or retransmission*/ - } - else - { - } - SCH_FREE(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, sizeof(Snssai)); - memset(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], 0, sizeof(SchDlLcCtxt)); - } - }/*End of DL LC ctxt*/ + BuildK0K1Table(ueCb->cellCb, &ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.k0K1InfoTbl, false, pdschCfg,\ + ueRecfg->spCellRecfg.servCellRecfg.initDlBwp.pdschCfg, dlDataToUlAck->dlDataToUlAckListCount,\ + dlDataToUlAck->dlDataToUlAckList); + ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.k0K1TblPrsnt = true; + BuildK2InfoTable(ueCb->cellCb, ueRecfg->spCellRecfg.servCellRecfg.initUlBwp.puschCfg.timeDomRsrcAllocList,\ + ueRecfg->spCellRecfg.servCellRecfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\ + NULLP, &ueCb->ueCfg.spCellCfg.servCellRecfg.initUlBwp.k2InfoTbl); + ueCb->ueCfg.spCellCfg.servCellRecfg.initUlBwp.k2TblPrsnt = true; + } } + } - SCH_FREE(ueCfg->schLcCfg[lcIdx].drbQos, sizeof(SchDrbQosInfo)); - SCH_FREE(ueCfg->schLcCfg[lcIdx].snssai, sizeof(Snssai)); + if(ueRecfg->ambrRecfg) + { + SCH_FREE(ueCb->ueCfg.ambrCfg, sizeof(SchAmbrCfg)); + ueCb->ueCfg.ambrCfg = ueRecfg->ambrRecfg; + } + memcpy(&ueCb->ueCfg.dlModInfo, &ueRecfg->dlModInfo , sizeof(SchModulationInfo)); + memcpy(&ueCb->ueCfg.ulModInfo, &ueRecfg->ulModInfo , sizeof(SchModulationInfo)); + //Updating Num of LC to ADD SchUlCb and SchDlCb DB in SchUeCb + for(lcIdx = 0; lcIdx < ueRecfg->numLcsToAdd; lcIdx++) + { + isLcIdValid = FALSE; /*Re-Initializing*/ + ueLcIdx = ueRecfg->schLcCfgAdd[lcIdx].lcId; + CHECK_LCID(ueLcIdx, isLcIdValid); + if(isLcIdValid == FALSE) + { + DU_LOG("ERROR --> SCH: LCID:%d is not Valid",ueLcIdx); + continue; + } + fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueRecfg->schLcCfgAdd[lcIdx]); + fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueRecfg->schLcCfgAdd[lcIdx]); + + /*Checking whether this LC belong to Dedicated S-NSSAI + * and Create the Dedicated LC List & Update the Reserve PRB number*/ + if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP) + { + retDL = updateDedLcInfo(inst, ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ + &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated)); + } + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP) + { + retUL = updateDedLcInfo(inst, ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ + &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated)); + } + + if(retUL == RFAILED || retDL == RFAILED)/*FATAL error*/ + { + DU_LOG("\nERROR --> SCH : Failure in updateDedLcInfo"); + return RFAILED; + } + SCH_FREE(ueRecfg->schLcCfgAdd[lcIdx].drbQos, sizeof(SchDrbQosInfo)); + SCH_FREE(ueRecfg->schLcCfgAdd[lcIdx].snssai, sizeof(Snssai)); + } + //Updating Num of LC to DEL SchUlCb and SchDlCb DB in SchUeCb + for(lcIdx = 0; lcIdx < ueRecfg->numLcsToDel; lcIdx++) + { + ueLcIdx = ueRecfg->lcIdToDel[lcIdx]; + + if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].lcId == ueRecfg->lcIdToDel[lcIdx]) + { + /*Delete the LC node from the DL LC List*/ + if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated) + { + /*Remove from HARQ Transmission or retransmission*/ + } + else + { + } + SCH_FREE(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, sizeof(Snssai)); + memset(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], 0, sizeof(SchDlLcCtxt)); + } + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].lcId == ueRecfg->lcIdToDel[lcIdx]) + { + /*Delete the LC node from the UL LC List*/ + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated) + { + /*Remove from HARQ Transmission or retransmission*/ + } + else/*Default LC list*/ + { + + } + SCH_FREE(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, sizeof(Snssai)); + memset(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], 0, sizeof(SchUlLcCtxt)); + } + } + //Updating Num of LC to DEL SchUlCb and SchDlCb DB in SchUeCb + for(lcIdx = 0; lcIdx < ueRecfg->numLcsToMod; lcIdx++) + { + ueLcIdx = ueRecfg->schLcCfgMod[lcIdx].lcId; + + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].lcId == ueRecfg->schLcCfgMod[lcIdx].lcId) + { + fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueRecfg->schLcCfgMod[lcIdx]); + /*Updating the RRM reserved pool PRB count*/ + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP) + { + retUL = updateDedLcInfo(inst, ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].rsvdDedicatedPRB),\ + &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated)); + } + if(retUL == RFAILED) + { + DU_LOG("\nERROR --> SCH : Failed in updating Ded Lc info"); + return RFAILED; + } + }/*End of UL LC Ctxt*/ + + if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].lcId == ueRecfg->schLcCfgMod[lcIdx].lcId) + { + fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueRecfg->schLcCfgMod[lcIdx]); + /*Updating the RRM policy*/ + if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP) + { + retDL = updateDedLcInfo(inst, ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].rsvdDedicatedPRB), \ + &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated)); + } + if(retDL == RFAILED) + { + DU_LOG("\nERROR --> SCH : Failed in updating Ded Lc info"); + return RFAILED; + } + }/*End of DL LC ctxt*/ + + SCH_FREE(ueRecfg->schLcCfgMod[lcIdx].drbQos, sizeof(SchDrbQosInfo)); + SCH_FREE(ueRecfg->schLcCfgMod[lcIdx].snssai, sizeof(Snssai)); }/* End of outer for loop */ return ROK; } @@ -438,24 +702,21 @@ uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg) * * ****************************************************************/ -SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) +SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, uint16_t cellId) { - uint8_t idx; + uint8_t idx = 0; SchCellCb *cellCb = NULLP; - SchUeCfgRsp cfgRsp; - memset(&cfgRsp, 0, sizeof(SchUeCfgRsp)); /* Search of cell cb */ for(idx = 0; idx < MAX_NUM_CELL; idx++) { cellCb = schCb[inst].cells[idx]; - if(cellCb->cellId == ueCfg->cellId) - break; + if((cellCb != NULLP) && (cellCb->cellId == cellId)) + break; } - if(idx == MAX_NUM_CELL) + if((idx == MAX_NUM_CELL) || (cellCb == NULLP)) { - DU_LOG("\nERROR --> SCH : Ue create request failed. Invalid cell id %d", ueCfg->cellId); - SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp); + DU_LOG("\nERROR --> SCH : Ue create request failed. Invalid cell id %d", cellId); return NULLP; } @@ -463,7 +724,6 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) if(cellCb->numActvUe > MAX_NUM_UE) { DU_LOG("\nERROR --> SCH : Max number of UE [%d] already configured", MAX_NUM_UE); - SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp); return NULLP; } return cellCb; @@ -476,7 +736,7 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) * * @details * - * Function : MacSchAddUeConfigReq + * Function : SchAddUeConfigReq * * Functionality: Function to Add Ue config request from MAC * @@ -485,7 +745,7 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) * RFAILED - failure * * ****************************************************************/ -uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) +uint8_t SchAddUeConfigReq(Pst *pst, SchUeCfgReq *ueCfg) { uint8_t lcIdx = 0, ret = ROK, idx = 0; SchCellCb *cellCb = NULLP; @@ -494,25 +754,26 @@ uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) Inst inst = pst->dstInst - SCH_INST_START; memset(&cfgRsp, 0, sizeof(SchUeCfgRsp)); -#ifdef CALL_FLOW_DEBUG_LOG - DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_ADD_UE_CONFIG_REQ_TO_SCH\n"); -#endif - if(!ueCfg) { - DU_LOG("\nERROR --> SCH : Adding UE Config Request failed at MacSchAddUeConfigReq()"); + DU_LOG("\nERROR --> SCH : Adding UE Config Request failed at SchAddUeConfigReq()"); return RFAILED; } DU_LOG("\nDEBUG --> SCH : Adding UE Config Request for CRNTI[%d]", ueCfg->crnti); - cellCb = getSchCellCb(pst->event, inst, ueCfg); + cellCb = getSchCellCb(pst->event, inst, ueCfg->cellId); + if(cellCb == NULLP) + { + SchSendUeCfgRspToMac(ueCfg, inst, RSP_NOK, &cfgRsp); + return RFAILED; + } /* Search if UE already configured */ ueCb = &cellCb->ueCb[ueCfg->ueId - 1]; if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) { DU_LOG("\nDEBUG --> SCH : CRNTI %d already configured ", ueCfg->crnti); - SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); + SchSendUeCfgRspToMac(ueCfg, inst, RSP_OK, &cfgRsp); return ROK; } @@ -545,7 +806,7 @@ uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) cmLListInit(&ueCb->hqDlmap[idx]->hqList); cmLListInit(&ueCb->hqUlmap[idx]->hqList); } - ret = fillSchUeCb(inst, ueCb, ueCfg); + ret = fillSchUeCbFrmCfgReq(inst, ueCb, ueCfg); if(ret == ROK) { @@ -569,8 +830,10 @@ uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) for(lcIdx=0; lcIdxbsrInfo[lcIdx].dataVol = 0; - SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); + SchSendUeCfgRspToMac(ueCfg, inst, RSP_OK, &cfgRsp); } + + cellCb->api->SchAddUeConfigReq(ueCb); return ret; } @@ -810,7 +1073,7 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo *puschInfo, DciInfo *dciInfo, b memset(&coreset1, 0, sizeof(SchControlRsrcSet)); if(ueCb->ueCfg.spCellCfgPres == true) { - coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; + coreset1 = ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; } dciInfo->cellId = cellCb->cellId; @@ -881,7 +1144,7 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo *puschInfo, DciInfo *dciInfo, b * * @details * - * Function : MacSchModUeConfigReq + * Function : SchModUeConfigReq * * Functionality: Function to modify Ue Config request from MAC * @@ -890,41 +1153,43 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo *puschInfo, DciInfo *dciInfo, b * RFAILED - failure * * ****************************************************************/ -uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg) +uint8_t SchModUeConfigReq(Pst *pst, SchUeRecfgReq *ueRecfg) { uint8_t ueId, lcIdx, ret = ROK; SchCellCb *cellCb = NULLP; SchUeCb *ueCb = NULLP; - SchUeCfgRsp cfgRsp; + SchUeRecfgRsp recfgRsp; Inst inst = pst->dstInst - SCH_INST_START; - memset(&cfgRsp, 0, sizeof(SchUeCfgRsp)); + memset(&recfgRsp, 0, sizeof(SchUeRecfgRsp)); -#ifdef CALL_FLOW_DEBUG_LOG - DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH\n"); -#endif + if(!ueRecfg) + { + DU_LOG("\nERROR --> SCH : Modifying Ue Config request failed at SchModUeConfigReq()"); + return RFAILED; + } + DU_LOG("\nDEBUG --> SCH : Modifying Ue Config Request for CRNTI[%d]", ueRecfg->crnti); + cellCb = getSchCellCb(pst->event, inst, ueRecfg->cellId); - if(!ueCfg) + if(cellCb == NULLP) { - DU_LOG("\nERROR --> SCH : Modifying Ue Config request failed at MacSchModUeConfigReq()"); + SchSendUeRecfgRspToMac(ueRecfg, inst, RSP_NOK, &recfgRsp); return RFAILED; } - DU_LOG("\nDEBUG --> SCH : Modifying Ue Config Request for CRNTI[%d]", ueCfg->crnti); - cellCb = getSchCellCb(pst->event, inst, ueCfg); /* Search if UE already configured */ - GET_UE_ID(ueCfg->crnti, ueId); + GET_UE_ID(ueRecfg->crnti, ueId); ueCb = &cellCb->ueCb[ueId -1]; if(!ueCb) { - DU_LOG("\nERROR --> SCH : SchUeCb not found at MacSchModUeConfigReq() "); - SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp); + DU_LOG("\nERROR --> SCH : SchUeCb not found at SchModUeConfigReq() "); + SchSendUeRecfgRspToMac(ueRecfg, inst, RSP_NOK, &recfgRsp); return RFAILED; } - if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) + if((ueCb->crnti == ueRecfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) { /* Found the UeCb to Reconfig */ - ret = fillSchUeCb(inst, ueCb, ueCfg); + ret = fillSchUeCbFrmRecfgReq(inst, ueCb, ueRecfg); if(ret == ROK) { ueCb->cellCb = cellCb; @@ -933,45 +1198,12 @@ uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg) for(lcIdx=0; lcIdxbsrInfo[lcIdx].dataVol = 0; - SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); + SchSendUeRecfgRspToMac(ueRecfg, inst, RSP_OK, &recfgRsp); } } return ret; } -/******************************************************************* -* -* @brief Fill and send UE delete response to MAC -* -* @details -* -* Function : SchSendUeDeleteRspToMac -* -* Functionality: Fill and send UE delete response to MAC -* -* @params[in] Inst inst, SchUeDelete *ueDelete, SchMacRsp result, -* ErrorCause cause -* @return ROK - success -* RFAILED - failure -* -* ****************************************************************/ -void SchSendUeDeleteRspToMac(Inst inst, SchUeDelete *ueDelete, SchMacRsp result, ErrorCause cause) -{ - Pst rspPst; - SchUeDeleteRsp delRsp; - - memset(&delRsp, 0, sizeof(SchUeDeleteRsp)); - delRsp.cellId = ueDelete->cellId; - delRsp.crnti = ueDelete->crnti; - delRsp.rsp = result; - delRsp.cause = cause; - - /* Filling response post */ - memset(&rspPst, 0, sizeof(Pst)); - FILL_PST_SCH_TO_MAC(rspPst, inst); - rspPst.event = EVENT_UE_DELETE_RSP_TO_MAC; - SchUeDeleteRspOpts[rspPst.selector](&rspPst, &delRsp); -} /******************************************************************* * @@ -1101,19 +1333,22 @@ void deleteSchUeCb(SchUeCb *ueCb) SCH_FREE(ueCb->hqUlmap, sizeof(SchHqUlMap*)*(ueCb->cellCb->numSlots)); } + schDlHqEntDelete(ueCb); + schUlHqEntDelete(ueCb); + SCH_FREE(ueCb->ueCfg.ambrCfg, sizeof(SchAmbrCfg)); if(ueCb->ueCfg.spCellCfgPres) { - if(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfgPres == true) + if(ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfgPres == true) { - pdschCfg = &ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfg; + pdschCfg = &ueCb->ueCfg.spCellCfg.servCellRecfg.initDlBwp.pdschCfg; for(timeDomRsrcIdx = 0; timeDomRsrcIdx < pdschCfg->numTimeDomRsrcAlloc; timeDomRsrcIdx++) SCH_FREE(pdschCfg->timeDomRsrcAllociList[timeDomRsrcIdx].k0, sizeof(uint8_t)); } - if(ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfgPres == true) + if(ueCb->ueCfg.spCellCfg.servCellRecfg.initUlBwp.pucchCfgPres == true) { - pucchCfg = &ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfg; + pucchCfg = &ueCb->ueCfg.spCellCfg.servCellRecfg.initUlBwp.pucchCfg; SCH_FREE(pucchCfg->resrcSet,sizeof(SchPucchResrcSetCfg)); if(pucchCfg->resrc) { @@ -1130,8 +1365,8 @@ void deleteSchUeCb(SchUeCb *ueCb) SCH_FREE(pucchCfg->dlDataToUlAck, sizeof(SchPucchDlDataToUlAck)); SCH_FREE(pucchCfg->powerControl,sizeof(SchPucchPowerControl)); } - SCH_FREE(ueCb->ueCfg.spCellCfg.servCellCfg.bwpInactivityTmr, sizeof(uint8_t)); - deleteSchPdschServCellCfg(&ueCb->ueCfg.spCellCfg.servCellCfg.pdschServCellCfg); + SCH_FREE(ueCb->ueCfg.spCellCfg.servCellRecfg.bwpInactivityTmr, sizeof(uint8_t)); + deleteSchPdschServCellCfg(&ueCb->ueCfg.spCellCfg.servCellRecfg.pdschServCellCfg); } /*Need to Free the memory allocated for S-NSSAI*/ for(ueLcIdx = 0; ueLcIdx < MAX_NUM_LC; ueLcIdx++) @@ -1139,18 +1374,59 @@ 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)); } } +/******************************************************************* +* +* @brief Fill and send UE delete response to MAC +* +* @details +* +* Function : SchSendUeDeleteRspToMac +* +* Functionality: Fill and send UE delete response to MAC +* +* @params[in] Inst inst, SchUeDelete *ueDelete, SchMacRsp result, +* ErrorCause cause +* @return ROK - success +* RFAILED - failure +* +* ****************************************************************/ +void SchSendUeDeleteRspToMac(Inst inst, SchUeDelete *ueDelete, SchMacRsp result, ErrorCause cause) +{ + Pst rspPst; + SchUeDeleteRsp delRsp; + + memset(&delRsp, 0, sizeof(SchUeDeleteRsp)); + delRsp.cellId = ueDelete->cellId; + delRsp.crnti = ueDelete->crnti; + delRsp.rsp = result; + delRsp.cause = cause; + + /* Filling response post */ + memset(&rspPst, 0, sizeof(Pst)); + FILL_PST_SCH_TO_MAC(rspPst, inst); + rspPst.event = EVENT_UE_DELETE_RSP_TO_MAC; + MacMessageRouter(&rspPst, (void *)&delRsp); +} + /******************************************************************* * * @brief Function for Ue Delete request from MAC to SCH * * @details * -* Function : MacSchUeDeleteReq +* Function : SchProcUeDeleteReq * * Functionality: Function for Ue Delete request from MAC to SCH * @@ -1159,21 +1435,16 @@ void deleteSchUeCb(SchUeCb *ueCb) * RFAILED - failure * * ****************************************************************/ -uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete *ueDelete) +uint8_t SchProcUeDeleteReq(Pst *pst, SchUeDelete *ueDelete) { - uint8_t idx=0, ueId=0, ueIdToDel=0, ret=ROK; + uint8_t idx=0, ueId=0, ret=ROK; ErrorCause result; SchCellCb *cellCb = NULLP; Inst inst = pst->dstInst - SCH_INST_START; - CmLList *node = NULL, *next = NULL; -#ifdef CALL_FLOW_DEBUG_LOG - DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_UE_DELETE_REQ_TO_SCH\n"); -#endif - if(!ueDelete) { - DU_LOG("\nERROR --> SCH : MacSchUeDeleteReq(): Ue Delete request failed"); + DU_LOG("\nERROR --> SCH : SchProcUeDeleteReq(): Ue Delete request failed"); ret = RFAILED; } DU_LOG("\nDEBUG --> SCH : Ue Delete request received for crnti[%d]", ueDelete->crnti); @@ -1182,7 +1453,7 @@ uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete *ueDelete) if(cellCb->cellId != ueDelete->cellId) { - DU_LOG("\nERROR --> SCH : MacSchUeDeleteReq(): cell Id is not available"); + DU_LOG("\nERROR --> SCH : SchProcUeDeleteReq(): cell Id is not available"); result = INVALID_CELLID; } else @@ -1190,28 +1461,15 @@ uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete *ueDelete) GET_UE_ID(ueDelete->crnti, ueId); if(( cellCb->ueCb[ueId-1].crnti == ueDelete->crnti) && ( cellCb->ueCb[ueId-1].state == SCH_UE_STATE_ACTIVE)) { - deleteSchUeCb(&cellCb->ueCb[ueId-1]); - ueIdToDel = ueId; /* Remove UE from ueToBeScheduled list */ - node = cellCb->ueToBeScheduled.first; - while(node) - { - next = node->next; - ueId = *(uint8_t *)node->node; - if(ueId == ueIdToDel) - { - SCH_FREE(node->node, sizeof(uint8_t)); - deleteNodeFromLList(&cellCb->ueToBeScheduled, node); - break; - } - node = next; - } + cellCb->api->SchUeDeleteReq(&cellCb->ueCb[ueId-1]); + deleteSchUeCb(&cellCb->ueCb[ueId-1]); cellCb->numActvUe--; result = NOT_APPLICABLE; } else { - DU_LOG("\nERROR --> SCH : MacSchUeDeleteReq(): SchUeCb not found"); + DU_LOG("\nERROR --> SCH : SchProcUeDeleteReq(): SchUeCb not found"); result = INVALID_UEID; } } @@ -1228,209 +1486,6 @@ uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete *ueDelete) return ret; } -/******************************************************************* - * - * @brief Fill and send Cell delete response to MAC - * - * @details - * - * Function : SchSendCellDeleteRspToMac - * - * Functionality: Fill and send Cell delete response to MAC - * - * @params[in] SchCellDelete *ueDelete, Inst inst, SchMacRsp result - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ -uint8_t SchSendCellDeleteRspToMac(SchCellDelete *ueDelete, Inst inst, SchMacRsp result) -{ - Pst rspPst; - uint8_t ret=0; - - SchCellDeleteRsp delRsp; - - DU_LOG("\nINFO --> SCH : Filling Cell Delete response"); - memset(&delRsp, 0, sizeof(SchCellDeleteRsp)); - delRsp.cellId = ueDelete->cellId; - delRsp.rsp = result; - - /* Filling response post */ - memset(&rspPst, 0, sizeof(Pst)); - FILL_PST_SCH_TO_MAC(rspPst, inst); - rspPst.event = EVENT_CELL_DELETE_RSP_TO_MAC; - ret = SchCellDeleteRspOpts[rspPst.selector](&rspPst, &delRsp); - if(ret == RFAILED) - { - DU_LOG("\nERROR --> SCH : SchSendCellDeleteRspToMac(): failed to send the Cell Delete response"); - return ret; - } - return ret; -} - -/******************************************************************* - * - * @brief Function for cellCb Deletion - * - * @details - * - * Function : deleteSchCellCb - * - * Functionality: Function for cellCb Deletion - * - * @params[in] SchCellDelete *cellDelete - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ -void deleteSchCellCb(SchCellCb *cellCb) -{ - uint8_t sliceIdx=0, slotIdx=0; - CmLListCp *list=NULL; - CmLList *node=NULL, *next=NULL; - SchPageInfo *tempNode = NULLP; - - if(cellCb->schDlSlotInfo) - { - for(slotIdx=0; slotIdxnumSlots; slotIdx++) - { - list = &cellCb->schDlSlotInfo[slotIdx]->prbAlloc.freePrbBlockList; - node = list->first; - while(node) - { - next = node->next; - SCH_FREE(node->node, sizeof(FreePrbBlock)); - deleteNodeFromLList(list, node); - node = next; - } - SCH_FREE(cellCb->schDlSlotInfo[slotIdx], sizeof(SchDlSlotInfo)); - } - SCH_FREE(cellCb->schDlSlotInfo, cellCb->numSlots *sizeof(SchDlSlotInfo*)); - } - - if(cellCb->schUlSlotInfo) - { - for(slotIdx=0; slotIdxnumSlots; slotIdx++) - { - list = &cellCb->schUlSlotInfo[slotIdx]->prbAlloc.freePrbBlockList; - node = list->first; - while(node) - { - next = node->next; - SCH_FREE(node->node, sizeof(FreePrbBlock)); - deleteNodeFromLList(list, node); - node = next; - } - SCH_FREE(cellCb->schUlSlotInfo[slotIdx], sizeof(SchUlSlotInfo)); - } - SCH_FREE(cellCb->schUlSlotInfo, cellCb->numSlots * sizeof(SchUlSlotInfo*)); - } - - if(cellCb->cellCfg.plmnInfoList.snssai) - { - for(sliceIdx=0; sliceIdxcellCfg.plmnInfoList.numSliceSupport; sliceIdx++) - { - SCH_FREE(cellCb->cellCfg.plmnInfoList.snssai[sliceIdx], sizeof(Snssai)); - } - SCH_FREE(cellCb->cellCfg.plmnInfoList.snssai, cellCb->cellCfg.plmnInfoList.numSliceSupport*sizeof(Snssai*)); - } - - for(uint16_t idx =0; idxpageCb.pageIndInfoRecord[idx]; - node = list->first; - while(node) - { - next = node->next; - if(node->node) - { - tempNode = (SchPageInfo*)(node->node); - SCH_FREE(tempNode->pagePdu, tempNode->msgLen); - SCH_FREE(node->node, sizeof(SchPageInfo)); - } - deleteNodeFromLList(list, node); - node = next; - } - } - - /* Remove all UE from ueToBeScheduled list and deallocate */ - node = cellCb->ueToBeScheduled.first; - while(node) - { - next = node->next; - SCH_FREE(node->node, sizeof(uint8_t)); - cmLListDelFrm(&cellCb->ueToBeScheduled, node); - SCH_FREE(node, sizeof(CmLList)); - node = next; - } - - memset(cellCb, 0, sizeof(SchCellCb)); - -} - -/******************************************************************* - * - * @brief Function for cell Delete request from MAC to SCH - * - * @details - * - * Function : MacSchCellDeleteReq - * - * Functionality: Function for cell Delete request from MAC to SCH - * - * @params[in] Pst *pst, SchCellDelete *cellDelete - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ - -uint8_t MacSchCellDeleteReq(Pst *pst, SchCellDelete *cellDelete) -{ - uint8_t cellIdx=0, ret = RFAILED; - Inst inst = pst->dstInst - SCH_INST_START; - SchMacRsp result= RSP_OK; - -#ifdef CALL_FLOW_DEBUG_LOG - DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_CELL_DELETE_REQ_TO_SCH\n"); -#endif - - if(!cellDelete) - { - DU_LOG("\nERROR --> SCH : MacSchCellDeleteReq(): Ue Delete request failed"); - } - else - { - GET_CELL_IDX(cellDelete->cellId, cellIdx); - if(schCb[inst].cells[cellIdx] == NULLP) - { - DU_LOG("\nERROR --> SCH : MacSchCellDeleteReq(): cell Id[%d] is not available", cellDelete->cellId); - result = RSP_NOK; - } - else - { - if(schCb[inst].cells[cellIdx]->cellId == cellDelete->cellId) - { - deleteSchCellCb(schCb[inst].cells[cellIdx]); - result = RSP_OK; - ret = ROK; - SCH_FREE(schCb[inst].cells[cellIdx], sizeof(SchCellCb)); - DU_LOG("\nINFO --> SCH : Sending Cell Delete response to MAC"); - } - else - { - DU_LOG("\nERROR --> SCH : MacSchCellDeleteReq(): cell Id[%d] is not available",cellDelete->cellId); - result = RSP_NOK; - } - } - - if(SchSendCellDeleteRspToMac(cellDelete, inst, result)!=ROK) - { - DU_LOG("\nERROR --> SCH : MacSchCellDeleteReq(): failed to send Cell Delete response"); - ret = RFAILED; - } - } - return ret; -} /******************************************************************* * * @brief Function updates DL HARQ Feedback