X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_ue_mgr.c;h=b83130e5eee96fa22e86497d5b0fcc4be1e5e9bf;hb=3eb33bcb19a8e47fcf8b58b417d6fa05919952cf;hp=da91f174cf47f2c3553a8bc3719127e63627a1c8;hpb=791615463ef2fcc0d6e0697d7860e6e6a56bd9a6;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_ue_mgr.c b/src/5gnrmac/mac_ue_mgr.c index da91f174c..b83130e5e 100644 --- a/src/5gnrmac/mac_ue_mgr.c +++ b/src/5gnrmac/mac_ue_mgr.c @@ -50,6 +50,20 @@ MacSchModUeConfigReqFunc macSchModUeConfigReqOpts[] = packMacSchModUeConfigReq /* packing for light weight loosely coupled */ }; +MacSchUeDeleteReqFunc macSchUeDeleteReqOpts[] = +{ + packMacSchUeDeleteReq, /* packing for loosely coupled */ + MacSchUeDeleteReq, /* packing for tightly coupled */ + packMacSchUeDeleteReq /* packing for light weight loosely coupled */ +}; + +MacDuUeDeleteRspFunc macDuUeDeleteRspOpts[] = +{ + packDuMacUeDeleteRsp, /* packing for loosely coupled */ + DuProcMacUeDeleteRsp, /* packing for tightly coupled */ + packDuMacUeDeleteRsp /* packing for light weight loosly coupled */ +}; + /******************************************************************* * * @brief Fills mac cell group config to be sent to scheduler @@ -77,7 +91,7 @@ uint8_t fillMacCellGroupCfg(MacCellGrpCfg macCellGrp, SchMacCellGrpCfg *macCell schedReqCfg->addModListCount = macCellGrp.schReqCfg.addModListCount; if(schedReqCfg->addModListCount > MAX_NUM_SR_CFG_PER_CELL_GRP) { - DU_LOG("\nMAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \ + DU_LOG("\nERROR --> MAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \ schedReqCfg->addModListCount, MAX_NUM_SR_CFG_PER_CELL_GRP); return RFAILED; } @@ -97,7 +111,7 @@ uint8_t fillMacCellGroupCfg(MacCellGrpCfg macCellGrp, SchMacCellGrpCfg *macCell tagCfg->addModListCount = macCellGrp.tagCfg.addModListCount; if(tagCfg->addModListCount > MAX_NUM_TAGS) { - DU_LOG("\nMAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \ + DU_LOG("\nERROR --> MAC : Scheduling Request Add/Mod Count %d exceeds max limit %d", \ tagCfg->addModListCount, MAX_NUM_TAGS); return RFAILED; } @@ -122,6 +136,32 @@ uint8_t fillMacCellGroupCfg(MacCellGrpCfg macCellGrp, SchMacCellGrpCfg *macCell macCellGrpCfg->phrCfg.modeOtherCG = macCellGrp.phrCfg.phrOtherCG; } +#ifdef NR_DRX + /* Copy Drx configuration */ + + macCellGrpCfg->drxCfg.drxOnDurationTimer.onDurationTimerValInMs = macCellGrp.drxCfg.drxOnDurationTimer.onDurationTimerValInMs; + if(!macCellGrp.drxCfg.drxOnDurationTimer.onDurationTimerValInMs) + macCellGrpCfg->drxCfg.drxOnDurationTimer.onDurationtimerValue.subMilliSeconds = \ + macCellGrp.drxCfg.drxOnDurationTimer.onDurationtimerValue.subMilliSeconds; + else + macCellGrpCfg->drxCfg.drxOnDurationTimer.onDurationtimerValue.milliSeconds = \ + macCellGrp.drxCfg.drxOnDurationTimer.onDurationtimerValue.milliSeconds; + macCellGrpCfg->drxCfg.drxInactivityTimer = macCellGrp.drxCfg.drxInactivityTimer; + macCellGrpCfg->drxCfg.drxHarqRttTimerDl = macCellGrp.drxCfg.drxHarqRttTimerDl; + macCellGrpCfg->drxCfg.drxHarqRttTimerUl = macCellGrp.drxCfg.drxHarqRttTimerUl; + macCellGrpCfg->drxCfg.drxRetransmissionTimerDl = macCellGrp.drxCfg.drxRetransmissionTimerDl; + macCellGrpCfg->drxCfg.drxRetransmissionTimerUl = macCellGrp.drxCfg.drxRetransmissionTimerUl; + macCellGrpCfg->drxCfg.drxLongCycleStartOffset.drxLongCycleStartOffsetChoice = macCellGrp.drxCfg.drxLongCycleStartOffset.\ + drxLongCycleStartOffsetChoice; + macCellGrpCfg->drxCfg.drxLongCycleStartOffset.drxLongCycleStartOffsetVal = macCellGrp.drxCfg.drxLongCycleStartOffset.drxLongCycleStartOffsetVal; + macCellGrpCfg->drxCfg.shortDrxPres = macCellGrp.drxCfg.shortDrxPres; + if(macCellGrpCfg->drxCfg.shortDrxPres) + { + macCellGrpCfg->drxCfg.shortDrx.drxShortCycle = macCellGrp.drxCfg.shortDrx.drxShortCycle; + macCellGrpCfg->drxCfg.shortDrx.drxShortCycleTimer = macCellGrp.drxCfg.shortDrx.drxShortCycleTimer; + } + macCellGrpCfg->drxCfg.drxSlotOffset = macCellGrp.drxCfg.drxSlotOffset; +#endif return ROK; } @@ -171,10 +211,10 @@ uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg * { if(!schPdschCfg->maxMimoLayers) { - MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxMimoLayers, sizeof(uint8_t)); + MAC_ALLOC(schPdschCfg->maxMimoLayers, sizeof(uint8_t)); if(!schPdschCfg->maxMimoLayers) { - DU_LOG("\nMAC :Memory Alloc MimoLayers Failed at fillPdschServCellCfg()"); + DU_LOG("\nERROR --> MAC :Memory Alloc MimoLayers Failed at fillPdschServCellCfg()"); return RFAILED; } } @@ -192,10 +232,10 @@ uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg * { if(!schPdschCfg->maxCodeBlkGrpPerTb) { - MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxCodeBlkGrpPerTb, sizeof(SchMaxCodeBlkGrpPerTB)); + MAC_ALLOC(schPdschCfg->maxCodeBlkGrpPerTb, sizeof(SchMaxCodeBlkGrpPerTB)); if(!schPdschCfg->maxCodeBlkGrpPerTb) { - DU_LOG("\nMAC :Memory Alloc for code Block Failed at fillPdschServCellCfg()"); + DU_LOG("\nERROR --> MAC :Memory Alloc for code Block Failed at fillPdschServCellCfg()"); return RFAILED; } } @@ -210,10 +250,10 @@ uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg * { if(!schPdschCfg->codeBlkGrpFlushInd) { - MAC_ALLOC_SHRABL_BUF(schPdschCfg->codeBlkGrpFlushInd, sizeof(bool)); + MAC_ALLOC(schPdschCfg->codeBlkGrpFlushInd, sizeof(bool)); if(!schPdschCfg->codeBlkGrpFlushInd) { - DU_LOG("\nMAC :Memory Alloc for Flush Ind Failed at fillPdschServCellCfg()"); + DU_LOG("\nERROR --> MAC :Memory Alloc for Flush Ind Failed at fillPdschServCellCfg()"); return RFAILED; } } @@ -228,10 +268,10 @@ uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg * { if(!schPdschCfg->xOverhead) { - MAC_ALLOC_SHRABL_BUF(schPdschCfg->xOverhead, sizeof(SchPdschXOverhead)); + MAC_ALLOC(schPdschCfg->xOverhead, sizeof(SchPdschXOverhead)); if(!schPdschCfg->xOverhead) { - DU_LOG("\nMAC :Memory Alloc for xOverHead Failed at fillPdschServCellCfg()"); + DU_LOG("\nERROR --> MAC :Memory Alloc for xOverHead Failed at fillPdschServCellCfg()"); return RFAILED; } } @@ -276,7 +316,7 @@ uint8_t fillInitalUlBwpPuschCfg(PuschCfg macPuschCfg, SchPuschCfg *schPuschCfg) schPuschCfg->numTimeDomRsrcAlloc = macPuschCfg.numTimeDomRsrcAlloc; if(schPuschCfg->numTimeDomRsrcAlloc > MAX_NUM_UL_ALLOC) { - DU_LOG("\nMAC : Number of Time domain resource allocation [%d] exceeds max limit [%d]",\ + DU_LOG("\nERROR --> MAC : Number of Time domain resource allocation [%d] exceeds max limit [%d]",\ schPuschCfg->numTimeDomRsrcAlloc, MAX_NUM_UL_ALLOC); return RFAILED; } @@ -296,6 +336,732 @@ uint8_t fillInitalUlBwpPuschCfg(PuschCfg macPuschCfg, SchPuschCfg *schPuschCfg) return ROK; } +/******************************************************************* + * + * @brief Function to fillResrcSetList sent by DU + * + * @details + * + * Function : fillResrcSetList + * + * Functionality: Function to fillResrcSetList sent by DU + * + * @params[in] PucchResrcSetCfg pointer, + * SchPucchResrcSetCfg pointer + * @return void + * + * ****************************************************************/ + +void fillResrcSetList(PucchResrcSetCfg *macRsrcSetList, SchPucchResrcSetCfg *schRsrcSetList) +{ + uint8_t arrIdx, rsrcListIdx; + + /* ResrcSetToAddModList */ + schRsrcSetList->resrcSetToAddModListCount = macRsrcSetList->resrcSetToAddModListCount; + for(arrIdx = 0; arrIdx < macRsrcSetList->resrcSetToAddModListCount; arrIdx++) + { + schRsrcSetList->resrcSetToAddModList[arrIdx].resrcSetId =\ + macRsrcSetList->resrcSetToAddModList[arrIdx].resrcSetId; + + schRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize =\ + macRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize; + + schRsrcSetList->resrcSetToAddModList[arrIdx].resrcListCount =\ + macRsrcSetList->resrcSetToAddModList[arrIdx].resrcListCount; + for(rsrcListIdx = 0; rsrcListIdx < macRsrcSetList->resrcSetToAddModList[arrIdx].\ + resrcListCount; rsrcListIdx++) + { + schRsrcSetList->resrcSetToAddModList[arrIdx].resrcList[rsrcListIdx] =\ + macRsrcSetList->resrcSetToAddModList[arrIdx].resrcList[rsrcListIdx]; + } + } + /* ResrcSetToRelList */ + schRsrcSetList->resrcSetToRelListCount = macRsrcSetList->resrcSetToRelListCount; + for(arrIdx = 0; arrIdx < macRsrcSetList->resrcSetToRelListCount; arrIdx++) + { + schRsrcSetList->resrcSetToRelList[arrIdx] = macRsrcSetList->resrcSetToRelList[arrIdx]; + } +} + +/******************************************************************* + * + * @brief Function to fillResrcList sent by DU + * + * @details + * + * Function : fillResrcList + * + * Functionality: Function to fillResrcList sent by DU + * + * @params[in] PucchResrcCfg pointer, + * SchPucchResrcCfg pointer + * @return ROK/RFAILED; + * + * ****************************************************************/ +uint8_t fillResrcList(PucchResrcCfg *macResrcCfg, SchPucchResrcCfg *schResrcCfg) +{ + uint8_t arrIdx; + + schResrcCfg->resrcToAddModListCount = macResrcCfg->resrcToAddModListCount; + for(arrIdx=0; arrIdx < macResrcCfg->resrcToAddModListCount; arrIdx++) + { + schResrcCfg->resrcToAddModList[arrIdx].resrcId =\ + macResrcCfg->resrcToAddModList[arrIdx].resrcId; + schResrcCfg->resrcToAddModList[arrIdx].startPrb =\ + macResrcCfg->resrcToAddModList[arrIdx].startPrb; + schResrcCfg->resrcToAddModList[arrIdx].intraFreqHop =\ + macResrcCfg->resrcToAddModList[arrIdx].intraFreqHop; + schResrcCfg->resrcToAddModList[arrIdx].secondPrbHop =\ + macResrcCfg->resrcToAddModList[arrIdx].secondPrbHop; + schResrcCfg->resrcToAddModList[arrIdx].pucchFormat =\ + macResrcCfg->resrcToAddModList[arrIdx].pucchFormat; + if(macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format0) + { + MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0, sizeof(SchPucchFormat0)); + if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate memory for Format0 in fillResrcList()"); + return RFAILED; + } + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0->initialCyclicShift =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format0->initialCyclicShift; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0->numSymbols =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format0->numSymbols; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format0->startSymbolIdx =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format0->startSymbolIdx; + } + + if(macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format1) + { + MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1, sizeof(SchPucchFormat1)); + if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate memory for Format1 in fillResrcList()"); + return RFAILED; + } + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1->initialCyclicShift =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format1->initialCyclicShift; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1->numSymbols =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format1->numSymbols; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1->startSymbolIdx =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format1->startSymbolIdx; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format1->timeDomOCC =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format1->timeDomOCC; + } + + if(macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format2) + { + MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format2, sizeof(SchPucchFormat2_3)); + if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format2 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate memory for Format2 in fillResrcList()"); + return RFAILED; + } + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format2->numPrbs =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format2->numPrbs; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format2->numSymbols =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format2->numSymbols; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format2->startSymbolIdx =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format2->startSymbolIdx; + } + + if(macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format3) + { + MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format3, sizeof(SchPucchFormat2_3)); + if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format3 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate memory for Format3 in fillResrcList()"); + return RFAILED; + } + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format3->numPrbs =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format3->numPrbs; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format3->numSymbols =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format3->numSymbols; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format3->startSymbolIdx =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format3->startSymbolIdx; + } + + if(macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format4) + { + MAC_ALLOC(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format4, sizeof(SchPucchFormat4)); + if(schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format4 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate memory for Format4 in fillResrcList()"); + return RFAILED; + } + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format4->numSymbols =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format4->numSymbols; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format4->startSymbolIdx =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format4->startSymbolIdx; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format4->occLen =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format4->occLen; + schResrcCfg->resrcToAddModList[arrIdx].SchPucchFormat.format4->occIdx =\ + macResrcCfg->resrcToAddModList[arrIdx].PucchFormat.format4->occIdx; + } + } + return ROK; +} + +/******************************************************************* + * + * @brief Function to fillPucchFormatCfg sent by DU + * + * @details + * + * Function : fillPucchFormatCfg + * + * Functionality: Function to fillPucchFormatCfg + * + * @params[in] PucchFormatCfg pointer, + * SchPucchFormatCfg pointer + * @return void + * + * ****************************************************************/ + +void fillPucchFormatCfg(PucchFormatCfg *macFormatCfg, SchPucchFormatCfg *schFormatCfg) +{ + schFormatCfg->interSlotFreqHop = macFormatCfg->interSlotFreqHop; + schFormatCfg->addDmrs = macFormatCfg->addDmrs; + schFormatCfg->maxCodeRate = macFormatCfg->maxCodeRate; + schFormatCfg->numSlots = macFormatCfg->numSlots; + schFormatCfg->pi2BPSK = macFormatCfg->pi2BPSK; + schFormatCfg->harqAckCSI = macFormatCfg->harqAckCSI; +} + +/******************************************************************* + * + * @brief Function to fillPucchSchedReqCfg sent by DU + * + * @details + * + * Function : fillPucchSchedReqCfg + * + * Functionality: Function to fillPucchSchedReqCfg + * + * @params[in] PucchSchedReqCfg pointer, + * SchPucchSchedReqCfg pointer + * @return void + * + * ****************************************************************/ +void fillPucchSchedReqCfg(PucchSchedReqCfg *macSchedReqCfg, SchPucchSchedReqCfg *schSchedReqCfg) +{ + uint8_t arrIdx; + + schSchedReqCfg->schedAddModListCount = macSchedReqCfg->schedAddModListCount; + for(arrIdx=0; arrIdx < schSchedReqCfg->schedAddModListCount; arrIdx++) + { + schSchedReqCfg->schedAddModList[arrIdx].resrcId = macSchedReqCfg->schedAddModList[arrIdx].resrcId; + schSchedReqCfg->schedAddModList[arrIdx].requestId = macSchedReqCfg->schedAddModList[arrIdx].requestId; + schSchedReqCfg->schedAddModList[arrIdx].periodicity =\ + macSchedReqCfg->schedAddModList[arrIdx].periodicity; + schSchedReqCfg->schedAddModList[arrIdx].offset =\ + macSchedReqCfg->schedAddModList[arrIdx].offset; + schSchedReqCfg->schedAddModList[arrIdx].resrc =\ + macSchedReqCfg->schedAddModList[arrIdx].resrc; + } + schSchedReqCfg->schedRelListCount = macSchedReqCfg->schedRelListCount; + for(arrIdx=0; arrIdx < schSchedReqCfg->schedRelListCount; arrIdx++) + { + schSchedReqCfg->schedRelList[arrIdx] = macSchedReqCfg->schedRelList[arrIdx]; + } +} + +/******************************************************************* + * + * @brief Function to fillMultiCsiCfg sent by DU + * + * @details + * + * Function : fillMultiCsiCfg + * + * Functionality: Function to fillMultiCsiCfg + * + * @params[in] PucchMultiCsiCfg pointer, + * SchPucchMultiCsiCfg pointer + * @return void + * + * ****************************************************************/ + + void fillMultiCsiCfg(PucchMultiCsiCfg *macCsiCfg, SchPucchMultiCsiCfg *schCsiCfg) + { + uint8_t arrIdx; + + schCsiCfg->multiCsiResrcListCount = macCsiCfg->multiCsiResrcListCount; + for(arrIdx =0; arrIdx < schCsiCfg->multiCsiResrcListCount; arrIdx++) + { + schCsiCfg->multiCsiResrcList[arrIdx] = macCsiCfg->multiCsiResrcList[arrIdx]; + } + } + +/******************************************************************* + * + * @brief Function to fillDlToUlAck sent by DU + * + * @details + * + * Function : fillDlToUlAck + * + * Functionality: Function to fillDlToUlAck + * + * @params[in] PucchDlDataToUlAck pointer, + * SchPucchDlDataToUlAck pointer + * @return void + * + * ****************************************************************/ + +void fillDlToUlAck(PucchDlDataToUlAck *macUlAck, SchPucchDlDataToUlAck *schUlAck) +{ + uint8_t arrIdx; + + schUlAck->dlDataToUlAckListCount = macUlAck->dlDataToUlAckListCount; + for(arrIdx =0; arrIdx < macUlAck->dlDataToUlAckListCount; arrIdx++) + { + schUlAck->dlDataToUlAckList[arrIdx] = macUlAck->dlDataToUlAckList[arrIdx]; + } +} + +/******************************************************************* + * + * @brief Function to fillPucchPowerControl sent by DU + * + * @details + * + * Function : fillPucchPowerControl + * + * Functionality: Function to fillPucchPowerControl + * + * @params[in] PucchPowerControl pointer, + * SchPucchPowerControl pointer + * @return void + * + * ****************************************************************/ + +void fillPucchPowerControl(PucchPowerControl *macPwrCtrl, SchPucchPowerControl *schPwrCtrl) +{ + uint8_t arrIdx; + + schPwrCtrl->deltaF_Format0 = macPwrCtrl->deltaF_Format0; + schPwrCtrl->deltaF_Format1 = macPwrCtrl->deltaF_Format1; + schPwrCtrl->deltaF_Format2 = macPwrCtrl->deltaF_Format2; + schPwrCtrl->deltaF_Format3 = macPwrCtrl->deltaF_Format3; + schPwrCtrl->deltaF_Format4 = macPwrCtrl->deltaF_Format4; + schPwrCtrl->p0SetCount = macPwrCtrl->p0SetCount; + for(arrIdx =0; arrIdx < macPwrCtrl->p0SetCount; arrIdx++) + { + schPwrCtrl->p0Set[arrIdx].p0PucchId = macPwrCtrl->p0Set[arrIdx].p0PucchId; + schPwrCtrl->p0Set[arrIdx].p0PucchVal = macPwrCtrl->p0Set[arrIdx].p0PucchVal; + } + schPwrCtrl->pathLossRefRSListCount = macPwrCtrl->pathLossRefRSListCount; + for(arrIdx = 0; arrIdx < macPwrCtrl->pathLossRefRSListCount; arrIdx++) + { + schPwrCtrl->pathLossRefRSList[arrIdx].pathLossRefRSId =\ + macPwrCtrl->pathLossRefRSList[arrIdx].pathLossRefRSId; + } +} + +/******************************************************************* + * + * @brief Function to fillOtherPucchFormatCfg sent by DU + * + * @details + * + * Function : fillOtherPucchFormatCfg + * + * Functionality: Function to fillOtherPucchFormatCfg + * + * @params[in] PucchFormat + * PucchFormatCfg pointer, + * SchPucchCfg pointer + * @return void + * + * ****************************************************************/ + +uint8_t fillOtherPucchFormatCfg(uint8_t pucchFormat, PucchFormatCfg *macFormatCfg, SchPucchCfg *schPucchCfg) +{ + + switch(pucchFormat) + { + case PUCCH_FORMAT_1: + { + if(macFormatCfg) + { + MAC_ALLOC(schPucchCfg->format1, sizeof(SchPucchFormatCfg)); + if(schPucchCfg->format1 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for Format 1 in fillOtherPucchFormatCfg()"); + return RFAILED; + } + fillPucchFormatCfg(macFormatCfg, schPucchCfg->format1); + } + break; + } + case PUCCH_FORMAT_2: + { + if(macFormatCfg) + { + MAC_ALLOC(schPucchCfg->format2, sizeof(SchPucchFormatCfg)); + if(schPucchCfg->format2 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for Format 2 in fillOtherPucchFormatCfg()"); + return RFAILED; + } + fillPucchFormatCfg(macFormatCfg, schPucchCfg->format2); + } + break; + } + case PUCCH_FORMAT_3: + { + if(macFormatCfg) + { + MAC_ALLOC(schPucchCfg->format3, sizeof(SchPucchFormatCfg)); + if(schPucchCfg->format3 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for Format 3 in fillOtherPucchFormatCfg()"); + return RFAILED; + } + fillPucchFormatCfg(macFormatCfg, schPucchCfg->format3); + } + break; + } + case PUCCH_FORMAT_4: + { + if(macFormatCfg) + { + MAC_ALLOC(schPucchCfg->format4, sizeof(SchPucchFormatCfg)); + if(schPucchCfg->format4 == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for Format 4 in fillOtherPucchFormatCfg()"); + return RFAILED; + } + fillPucchFormatCfg(macFormatCfg, schPucchCfg->format4); + } + break; + } + default: + DU_LOG("\nERROR --> MAC : Invalid Format Cfg %d in fillInitialUlBwpPucchCfg()", pucchFormat); + return RFAILED; + } + return ROK; +} + +/******************************************************************* + * + * @brief Fills PUCCH config in initial UL BWP config for SCH UE Cfg + * + * @details + * + * Function : fillInitalUlBwpPucchCfg + * + * Functionality: + * Fills PUCCH cofig in initial UL BWP config for SCH UE Cfg + * + * @params[in] macPucchCfg : Initial UL-BWP PUCCH cfg at MAC + * schPucchCfg : Initial UL-BWP PUCCH cfg to be filled + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillInitialUlBwpPucchCfg(PucchCfg *macPucchCfg, SchPucchCfg *schPucchCfg) +{ + if(macPucchCfg->resrcSet) + { + MAC_ALLOC(schPucchCfg->resrcSet, sizeof(SchPucchResrcSetCfg)); + if(schPucchCfg->resrcSet == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for Resrc set List in fillInitialUlBwpPucchCfg()"); + return RFAILED; + } + memset(schPucchCfg->resrcSet, 0, sizeof(SchPucchResrcSetCfg)); + fillResrcSetList(macPucchCfg->resrcSet, schPucchCfg->resrcSet); + } + + if(macPucchCfg->resrc) + { + MAC_ALLOC(schPucchCfg->resrc, sizeof(SchPucchResrcCfg)); + if(schPucchCfg->resrc == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for Resrc List in fillInitialUlBwpPucchCfg()"); + return RFAILED; + } + memset(schPucchCfg->resrc, 0, sizeof(SchPucchResrcCfg)); + if((fillResrcList(macPucchCfg->resrc, schPucchCfg->resrc)) != ROK) + { + DU_LOG("\nERROR --> MAC : Failed in fillResrcList() at fillInitialUlBwpPucchCfg()"); + return RFAILED; + } + } + + /* valid for format 1, 2, 3, 4 */ + fillOtherPucchFormatCfg(PUCCH_FORMAT_1, macPucchCfg->format1, schPucchCfg); + fillOtherPucchFormatCfg(PUCCH_FORMAT_2, macPucchCfg->format2, schPucchCfg); + fillOtherPucchFormatCfg(PUCCH_FORMAT_3, macPucchCfg->format3, schPucchCfg); + fillOtherPucchFormatCfg(PUCCH_FORMAT_4, macPucchCfg->format4, schPucchCfg); + + if(macPucchCfg->schedReq) + { + MAC_ALLOC(schPucchCfg->schedReq, sizeof(SchPucchSchedReqCfg)); + if(schPucchCfg->schedReq == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for PucchSchedReqCfg in fillInitialUlBwpPucchCfg()"); + return RFAILED; + } + memset(schPucchCfg->schedReq, 0, sizeof(SchPucchSchedReqCfg)); + fillPucchSchedReqCfg(macPucchCfg->schedReq, schPucchCfg->schedReq); + } + + if(macPucchCfg->multiCsiCfg) + { + MAC_ALLOC(schPucchCfg->multiCsiCfg, sizeof(SchPucchMultiCsiCfg)); + if(schPucchCfg->multiCsiCfg == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for multiCsiCfg in fillInitialUlBwpPucchCfg()"); + return RFAILED; + } + memset(schPucchCfg->multiCsiCfg, 0, sizeof(SchPucchMultiCsiCfg)); + fillMultiCsiCfg(macPucchCfg->multiCsiCfg, schPucchCfg->multiCsiCfg); + } + + //TODO: To add the support for spatial Config + schPucchCfg->spatialInfo = NULLP; + + if(macPucchCfg->dlDataToUlAck) + { + MAC_ALLOC(schPucchCfg->dlDataToUlAck, sizeof(SchPucchDlDataToUlAck)); + if(schPucchCfg->dlDataToUlAck == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for dlDataToUlAck in fillInitialUlBwpPucchCfg()"); + return RFAILED; + } + memset(schPucchCfg->dlDataToUlAck, 0, sizeof(SchPucchDlDataToUlAck)); + fillDlToUlAck(macPucchCfg->dlDataToUlAck, schPucchCfg->dlDataToUlAck); + + } + + if(macPucchCfg->powerControl) + { + MAC_ALLOC(schPucchCfg->powerControl, sizeof(SchPucchPowerControl)); + if(schPucchCfg->powerControl == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate Mem for powerControl in fillInitialUlBwpPucchCfg()"); + return RFAILED; + } + memset(schPucchCfg->powerControl, 0, sizeof(SchPucchPowerControl)); + fillPucchPowerControl(macPucchCfg->powerControl, schPucchCfg->powerControl); + } + + return ROK; +} + +/******************************************************************* + * + * @brief function to free Pucch Format + * + * @details + * + * Function : freeSchPucchFormat + * + * Functionality: + * function to free Pucch Format + * + * @params[in] pucchFormat, SchPucchResrcInfo Pointer, + * SchPucchResrcInfo pointer + * @return void + * ****************************************************************/ + +void freeSchPucchFormat(uint8_t pucchFormat, SchPucchResrcInfo *resrcInfo, SchPucchFormatCfg *formatCfg) +{ + switch(pucchFormat) + { + case PUCCH_FORMAT_0 : + if(resrcInfo->SchPucchFormat.format0) + { + MAC_FREE(resrcInfo->SchPucchFormat.format0, sizeof(SchPucchFormat0)); + resrcInfo->SchPucchFormat.format0 = NULLP; + } + break; + + case PUCCH_FORMAT_1 : + if(resrcInfo->SchPucchFormat.format1) + { + MAC_FREE(resrcInfo->SchPucchFormat.format1, sizeof(SchPucchFormat1)); + resrcInfo->SchPucchFormat.format1 = NULLP; + } + if(formatCfg) + { + memset(formatCfg, 0, sizeof(SchPucchFormatCfg)); + MAC_FREE(formatCfg, sizeof(SchPucchFormatCfg)); + } + break; + + case PUCCH_FORMAT_2 : + if(resrcInfo->SchPucchFormat.format2) + { + MAC_FREE(resrcInfo->SchPucchFormat.format2, sizeof(SchPucchFormat2_3)); + resrcInfo->SchPucchFormat.format2 = NULLP; + } + if(formatCfg) + { + memset(formatCfg, 0, sizeof(SchPucchFormatCfg)); + MAC_FREE(formatCfg, sizeof(SchPucchFormatCfg)); + } + break; + + case PUCCH_FORMAT_3 : + if(resrcInfo->SchPucchFormat.format3) + { + MAC_FREE(resrcInfo->SchPucchFormat.format3, sizeof(SchPucchFormat2_3)); + resrcInfo->SchPucchFormat.format3 = NULLP; + } + if(formatCfg) + { + memset(formatCfg, 0, sizeof(SchPucchFormatCfg)); + MAC_FREE(formatCfg, sizeof(SchPucchFormatCfg)); + } + break; + + case PUCCH_FORMAT_4 : + if(resrcInfo->SchPucchFormat.format4) + { + MAC_FREE(resrcInfo->SchPucchFormat.format4, sizeof(SchPucchFormat4)); + resrcInfo->SchPucchFormat.format4 = NULLP; + } + if(formatCfg) + { + memset(formatCfg, 0, sizeof(SchPucchFormatCfg)); + MAC_FREE(formatCfg, sizeof(SchPucchFormatCfg)); + } + break; + + default: + break; + } +} + +/******************************************************************* + * + * @brief function to free Pucch Resrc Cfg + * + * @details + * + * Function : freePucchResrcCfg + * + * Functionality: + * function to free Pucch Resrc Cfg + * + * @params[in] SchPucchResrcCfg pointer, + * @return void + * ****************************************************************/ + +void freePucchResrcCfg(SchPucchResrcCfg *schRsrcList) +{ + uint8_t resrcIdx; + + /* free Resrc To AddMod List */ + for(resrcIdx = 0; resrcIdx < schRsrcList->resrcToAddModListCount; resrcIdx++) + { + freeSchPucchFormat(schRsrcList->resrcToAddModList[resrcIdx].pucchFormat, + &schRsrcList->resrcToAddModList[resrcIdx], NULLP); + memset(&schRsrcList->resrcToAddModList[resrcIdx], 0, sizeof(SchPucchResrcInfo)); + } + memset(schRsrcList, 0, sizeof(SchPucchResrcCfg)); + MAC_FREE(schRsrcList, sizeof(SchPucchResrcCfg)); +} + +/******************************************************************* + * + * @brief function to free Pucch Sched Req Cfg + * + * @details + * + * Function : freePucchSchedReqCfg + * + * Functionality: + * function to free Pucch Sched Req Cfg + * + * @params[in] SchPucchSchedReqCfg pointer, + * @return void + * ****************************************************************/ + +void freePucchSchedReqCfg(SchPucchSchedReqCfg *schedReqCfg) +{ + uint8_t schedReqIdx; + + for(schedReqIdx = 0; schedReqIdx < schedReqCfg->schedAddModListCount; schedReqIdx++) + { + memset(&schedReqCfg->schedAddModList[schedReqIdx], 0, sizeof(SchSchedReqResrcInfo)); + } + memset(schedReqCfg, 0, sizeof(SchPucchSchedReqCfg)); + MAC_FREE(schedReqCfg, sizeof(SchPucchSchedReqCfg)); +} + +/******************************************************************* + * + * @brief function to free Ul Bwp Pucch Cfg + * + * @details + * + * Function : freeUlBwpPucchCfg + * + * Functionality: + * function to free Ul Bwp Pucch Cfg + * + * @params[in] SchPucchCfg pointer, + * @return void + * ****************************************************************/ + +void freeUlBwpPucchCfg(SchPucchCfg *schPucchCfg) +{ + if(schPucchCfg->resrcSet) + { + memset(schPucchCfg->resrcSet, 0, sizeof(SchPucchResrcSetCfg)); + MAC_FREE(schPucchCfg->resrcSet, sizeof(SchPucchResrcSetCfg)); + } + if(schPucchCfg->resrc) + { + freePucchResrcCfg(schPucchCfg->resrc); + } + if(schPucchCfg->format1) + { + freeSchPucchFormat(PUCCH_FORMAT_1, NULLP, schPucchCfg->format1); + } + if(schPucchCfg->format2) + { + freeSchPucchFormat(PUCCH_FORMAT_2, NULLP, schPucchCfg->format2); + } + if(schPucchCfg->format3) + { + freeSchPucchFormat(PUCCH_FORMAT_3, NULLP, schPucchCfg->format3); + } + if(schPucchCfg->format4) + { + freeSchPucchFormat(PUCCH_FORMAT_4, NULLP, schPucchCfg->format4); + } + if(schPucchCfg->schedReq) + { + freePucchSchedReqCfg(schPucchCfg->schedReq); + } + if(schPucchCfg->spatialInfo) + { + memset(schPucchCfg->spatialInfo, 0, sizeof(SchPucchSpatialCfg)); + MAC_FREE(schPucchCfg->spatialInfo, sizeof(SchPucchSpatialCfg)); + } + if(schPucchCfg->multiCsiCfg) + { + memset(schPucchCfg->multiCsiCfg, 0, sizeof(SchPucchMultiCsiCfg)); + MAC_FREE(schPucchCfg->multiCsiCfg, sizeof(SchPucchMultiCsiCfg)); + } + if(schPucchCfg->dlDataToUlAck) + { + memset(schPucchCfg->dlDataToUlAck, 0, sizeof(SchPucchDlDataToUlAck)); + MAC_FREE(schPucchCfg->dlDataToUlAck, sizeof(SchPucchDlDataToUlAck)); + } + if(schPucchCfg->powerControl) + { + memset(schPucchCfg->powerControl, 0, sizeof(SchPucchPowerControl)); + MAC_FREE(schPucchCfg->powerControl, sizeof(SchPucchPowerControl)); + } +} + /******************************************************************* * * @brief Fills initail UL BWP config to send to scheduler @@ -317,15 +1083,21 @@ uint8_t fillInitialUlBwp(InitialUlBwp macInitUlBwp, SchInitialUlBwp *schInitUlBw schInitUlBwp->pucchCfgPres = macInitUlBwp.pucchPresent; if(schInitUlBwp->pucchCfgPres) { - /* TODO : Optional parameter */ + memset(&schInitUlBwp->pucchCfg, 0, sizeof(SchPucchCfg)); + if(fillInitialUlBwpPucchCfg(&macInitUlBwp.pucchCfg, &schInitUlBwp->pucchCfg) != ROK) + { + DU_LOG("\nERROR --> MAC : Failed to fill Pucch Cfg in fillInitialUlBwpPucchCfg()"); + freeUlBwpPucchCfg(&schInitUlBwp->pucchCfg); + return RFAILED; + } } - schInitUlBwp->puschCfgPres = macInitUlBwp.puschPresent; if(schInitUlBwp->puschCfgPres) { + memset(&schInitUlBwp->puschCfg, 0, sizeof(SchPuschCfg)); if(fillInitalUlBwpPuschCfg(macInitUlBwp.puschCfg, &schInitUlBwp->puschCfg) != ROK) { - DU_LOG("\nMAC : fillInitalUlBwpPuschCfg() failed"); + DU_LOG("\nERROR --> MAC : Failed to fill Pusch Cfg in fillInitalUlBwpPuschCfg()"); return RFAILED; } } @@ -357,7 +1129,7 @@ uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC schPdcchCfg->numCRsetToAddMod = macPdcchCfg.numCRsetToAddMod; if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET) { - DU_LOG("\nMAC : Number of CORESET to ADD/MOD [%d] exceeds max limit [%d]",\ + DU_LOG("\nERROR --> MAC : Number of CORESET to ADD/MOD [%d] exceeds max limit [%d]",\ schPdcchCfg->numCRsetToAddMod, MAX_NUM_CRSET); return RFAILED; } @@ -381,7 +1153,7 @@ uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC schPdcchCfg->numCRsetToRel = macPdcchCfg.numCRsetToRel; if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET) { - DU_LOG("\nMAC : Number of CORESET to release [%d] exceeds max limit [%d]",\ + DU_LOG("\nERROR --> MAC : Number of CORESET to release [%d] exceeds max limit [%d]",\ schPdcchCfg->numCRsetToRel, MAX_NUM_CRSET); return RFAILED; } @@ -395,7 +1167,7 @@ uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC schPdcchCfg->numSearchSpcToAddMod = macPdcchCfg.numSearchSpcToAddMod; if(schPdcchCfg->numSearchSpcToAddMod > MAX_NUM_SEARCH_SPC) { - DU_LOG("\nMAC : Number of search space to ADD/MOD [%d] exceeds max [%d]", \ + DU_LOG("\nERROR --> MAC : Number of search space to ADD/MOD [%d] exceeds max [%d]", \ schPdcchCfg->numSearchSpcToAddMod, MAX_NUM_SEARCH_SPC); return RFAILED; } @@ -429,7 +1201,7 @@ uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchC schPdcchCfg->numSearchSpcToRel = macPdcchCfg.numSearchSpcToRel; if(schPdcchCfg->numSearchSpcToRel > MAX_NUM_SEARCH_SPC) { - DU_LOG("\nMAC : Number of search space to release [%d] exceeds max [%d]", \ + DU_LOG("\nERROR --> MAC : Number of search space to release [%d] exceeds max [%d]", \ schPdcchCfg->numSearchSpcToRel, MAX_NUM_SEARCH_SPC); return RFAILED; } @@ -468,13 +1240,23 @@ uint8_t fillInitDlBwpPdschCfg(PdschConfig macPdschCfg, SchPdschConfig *schPdschC schPdschCfg->numTimeDomRsrcAlloc = macPdschCfg.numTimeDomRsrcAlloc; if(schPdschCfg->numTimeDomRsrcAlloc > MAX_NUM_DL_ALLOC) { - DU_LOG("\nMAC : Number of time domain resource allocation [%d], exceeds\ + DU_LOG("\nERROR --> MAC : Number of time domain resource allocation [%d], exceeds\ max limit [%d]", schPdschCfg->numTimeDomRsrcAlloc, MAX_NUM_DL_ALLOC); return RFAILED; } for(idx = 0; idx < schPdschCfg->numTimeDomRsrcAlloc; idx++) { + if(macPdschCfg.timeDomRsrcAllociList[idx].k0) + { + MAC_ALLOC(schPdschCfg->timeDomRsrcAllociList[idx].k0, sizeof(uint8_t)); + if(!schPdschCfg->timeDomRsrcAllociList[idx].k0) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed for K0 in fillInitDlBwpPdschCfg()"); + return RFAILED; + } + *(schPdschCfg->timeDomRsrcAllociList[idx].k0) = *(macPdschCfg.timeDomRsrcAllociList[idx].k0); + } schPdschCfg->timeDomRsrcAllociList[idx].mappingType = \ macPdschCfg.timeDomRsrcAllociList[idx].mappingType; schPdschCfg->timeDomRsrcAllociList[idx].startSymbol = \ @@ -521,7 +1303,7 @@ uint8_t fillInitialDlBwp(InitialDlBwp macInitDlBwp, SchInitalDlBwp *schInitDlBwp { if(fillInitDlBwpPdcchCfg(macInitDlBwp.pdcchCfg, &schInitDlBwp->pdcchCfg) != ROK) { - DU_LOG("\nMAC : fillInitDlBwpPdcchCfg() failed"); + DU_LOG("\nERROR --> MAC : fillInitDlBwpPdcchCfg() failed"); return RFAILED; } } @@ -531,7 +1313,7 @@ uint8_t fillInitialDlBwp(InitialDlBwp macInitDlBwp, SchInitalDlBwp *schInitDlBwp { if(fillInitDlBwpPdschCfg(macInitDlBwp.pdschCfg,&schInitDlBwp->pdschCfg) != ROK) { - DU_LOG("\nMAC : fillInitDlBwpPdschCfg() failed"); + DU_LOG("\nERROR --> MAC : fillInitDlBwpPdschCfg() failed"); return RFAILED; } } @@ -566,14 +1348,14 @@ uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg) if(fillInitialDlBwp(macSpCellCfg.servCellCfg.initDlBwp, \ &servCellCfg->initDlBwp) != ROK ) { - DU_LOG("\nMAC : fillInitialDlBwp() failed"); + DU_LOG("\nERROR --> MAC : fillInitialDlBwp() failed"); return RFAILED; } servCellCfg->numDlBwpToAdd = macSpCellCfg.servCellCfg.numDlBwpToAdd; if(servCellCfg->numDlBwpToAdd > MAX_NUM_BWP) { - DU_LOG("\nMAC : Number of DL BWP to ADD/MOD [%d] exceeds max limit [%d]",\ + DU_LOG("\nERROR --> MAC : Number of DL BWP to ADD/MOD [%d] exceeds max limit [%d]",\ servCellCfg->numDlBwpToAdd, MAX_NUM_BWP); return RFAILED; } @@ -594,7 +1376,7 @@ uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg) if(fillPdschServCellCfg(macSpCellCfg.servCellCfg.pdschServCellCfg, \ &servCellCfg->pdschServCellCfg) != ROK) { - DU_LOG("\nMAC : fillPdschServCellCfg() failed"); + DU_LOG("\nERROR --> MAC : fillPdschServCellCfg() failed"); return RFAILED; } @@ -602,14 +1384,14 @@ uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg) if(fillInitialUlBwp(macSpCellCfg.servCellCfg.initUlBwp, \ &servCellCfg->initUlBwp) != ROK) { - DU_LOG("\nMAC : fillInitialUlBwp() failed"); + DU_LOG("\nERROR --> MAC : fillInitialUlBwp() failed"); return RFAILED; } servCellCfg->numUlBwpToAdd = macSpCellCfg.servCellCfg.numUlBwpToAdd; if(servCellCfg->numUlBwpToAdd > MAX_NUM_BWP) { - DU_LOG("\nMAC : Number of UL BWP to ADD/MOD [%d] exceeds max limit [%d]",\ + DU_LOG("\nERROR --> MAC : Number of UL BWP to ADD/MOD [%d] exceeds max limit [%d]",\ servCellCfg->numUlBwpToAdd, MAX_NUM_BWP); return RFAILED; } @@ -651,7 +1433,7 @@ uint8_t sendUeReqToSch(Pst *pst, SchUeCfg *schUeCfg) FILL_PST_MAC_TO_SCH(schPst, EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH); return(*macSchModUeConfigReqOpts[schPst.selector])(&schPst,schUeCfg); default: - DU_LOG("\n Invalid Pst received %d", pst->event); + DU_LOG("\nERROR --> Invalid Pst received %d", pst->event); return RFAILED; } } @@ -756,21 +1538,21 @@ uint8_t fillLogicalChannelCfg(SchLcCfg *schLcCfg, LcCfg *macLcCfg) if(macLcCfg->drbQos) { - if(!schLcCfg->drbQos) - { - MAC_ALLOC(schLcCfg->drbQos, sizeof(SchDrbQosInfo)); - if(!schLcCfg->drbQos) - { - DU_LOG("\nMAC : Memory alloc failed at drbQos at fillLogicalChannelCfg()"); - ret = RFAILED; - } - } - if(ret == ROK) - { - fillSchDrbQosInfo(macLcCfg->drbQos, schLcCfg->drbQos); - } - else - return ret; + if(!schLcCfg->drbQos) + { + MAC_ALLOC(schLcCfg->drbQos, sizeof(SchDrbQosInfo)); + if(!schLcCfg->drbQos) + { + DU_LOG("\nERROR --> MAC : Memory alloc failed at drbQos at fillLogicalChannelCfg()"); + ret = RFAILED; + } + } + if(ret == ROK) + { + fillSchDrbQosInfo(macLcCfg->drbQos, schLcCfg->drbQos); + } + else + return ret; } else { @@ -783,10 +1565,10 @@ uint8_t fillLogicalChannelCfg(SchLcCfg *schLcCfg, LcCfg *macLcCfg) { if(!schLcCfg->snssai) { - MAC_ALLOC(schLcCfg->snssai, sizeof(SchSnssai)); + MAC_ALLOC(schLcCfg->snssai, sizeof(Snssai)); if(!schLcCfg->snssai) { - DU_LOG("\nMAC : Memory alloc failed at snssai at fillLogicalChannelCfg()"); + DU_LOG("\nERROR --> MAC : Memory alloc failed at snssai at fillLogicalChannelCfg()"); ret = RFAILED; } } @@ -795,20 +1577,9 @@ uint8_t fillLogicalChannelCfg(SchLcCfg *schLcCfg, LcCfg *macLcCfg) schLcCfg->snssai->sst = macLcCfg->snssai->sst; for(sdIdx = 0; sdIdx < SD_SIZE; sdIdx++) { - schLcCfg->snssai->sd[sdIdx] = macLcCfg->snssai->sd[sdIdx]; + schLcCfg->snssai->sd[sdIdx] = macLcCfg->snssai->sd[sdIdx]; } } - else - { - schLcCfg->snssai = NULLP; - /*Freeing the previously allocated buffer in case of failure */ - if(schLcCfg->drbQos) - { - MAC_FREE(schLcCfg->drbQos, sizeof(SchDrbQosInfo)); - schLcCfg->drbQos = NULLP; - } - return ret; - } } else { @@ -843,7 +1614,7 @@ uint8_t fillSchLcCfgList(SchUeCfg *schUeCfg, MacUeCfg *ueCfg) { if(fillLogicalChannelCfg(&schUeCfg->schLcCfg[lcIdx], &ueCfg->lcCfgList[lcIdx]) != ROK) { - DU_LOG("\nMAC : fillLogicalChannelCfg() failed for lc Idx[%d]", lcIdx); + DU_LOG("\nERROR --> MAC : fillLogicalChannelCfg() failed for lc Idx[%d]", lcIdx); return RFAILED; } schUeCfg->numLcs++; @@ -871,51 +1642,72 @@ uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg) uint8_t ret = ROK; schUeCfg->cellId = ueCfg->cellId; + schUeCfg->ueId = ueCfg->ueId; schUeCfg->crnti = ueCfg->crnti; - + schUeCfg->dataTransmissionInfo = ueCfg->transmissionAction; /* Copy MAC cell group config */ - memset(&schUeCfg->macCellGrpCfg, 0, sizeof(SchMacCellGrpCfg)); - if(fillMacCellGroupCfg(ueCfg->macCellGrpCfg, &schUeCfg->macCellGrpCfg) != ROK) + if(ueCfg->macCellGrpCfgPres == true) { - DU_LOG("\nMAC : fillMacCellGroupCfg() failed"); - return RFAILED; + schUeCfg->macCellGrpCfgPres = true; + memset(&schUeCfg->macCellGrpCfg, 0, sizeof(SchMacCellGrpCfg)); + if(fillMacCellGroupCfg(ueCfg->macCellGrpCfg, &schUeCfg->macCellGrpCfg) != ROK) + { + DU_LOG("\nERROR --> MAC : fillMacCellGroupCfg() failed"); + return RFAILED; + } } - - /* Copy Physical cell group config */ - memset(&schUeCfg->phyCellGrpCfg, 0,sizeof(SchPhyCellGrpCfg)); - if(fillPhyCellGroupCfg(ueCfg->phyCellGrpCfg, &schUeCfg->phyCellGrpCfg) != ROK) + if(ueCfg->phyCellGrpCfgPres == true) { - DU_LOG("\nMAC : fillPhyCellGroupCfg() failed"); - return RFAILED; + schUeCfg->phyCellGrpCfgPres = true; + /* Copy Physical cell group config */ + memset(&schUeCfg->phyCellGrpCfg, 0,sizeof(SchPhyCellGrpCfg)); + if(fillPhyCellGroupCfg(ueCfg->phyCellGrpCfg, &schUeCfg->phyCellGrpCfg) != ROK) + { + DU_LOG("\nERROR --> MAC : fillPhyCellGroupCfg() failed"); + return RFAILED; + } } - /* Copy sp cell config */ - memset(&schUeCfg->spCellCfg, 0, sizeof(SchSpCellCfg)); - if(fillSpCellCfg(ueCfg->spCellCfg, &schUeCfg->spCellCfg) != ROK) + if(ueCfg->spCellCfgPres == true) { - DU_LOG("\nMAC : fillSpCellCfg() failed"); - return RFAILED; + schUeCfg->spCellCfgPres = true; + /* Copy sp cell config */ + memset(&schUeCfg->spCellCfg, 0, sizeof(SchSpCellCfg)); + if(fillSpCellCfg(ueCfg->spCellCfg, &schUeCfg->spCellCfg) != ROK) + { + DU_LOG("\nERROR --> MAC : fillSpCellCfg() failed"); + return RFAILED; + } } - if(ueCfg->ambrCfg != NULLP) { MAC_ALLOC(schUeCfg->ambrCfg, sizeof(SchAmbrCfg)); if(!schUeCfg->ambrCfg) { - DU_LOG("\nMAC : Memory allocation failed in sendReconfigReqToSch"); - return RFAILED; + DU_LOG("\nERROR --> MAC : Memory allocation failed in sendReconfigReqToSch"); + return RFAILED; } schUeCfg->ambrCfg->ulBr = ueCfg->ambrCfg->ulBr; - schUeCfg->ambrCfg->dlBr = ueCfg->ambrCfg->dlBr; } else + { schUeCfg->ambrCfg = NULLP; + } + /* Fill DL modulation infor */ + schUeCfg->dlModInfo.modOrder = ueCfg->dlModInfo.modOrder; + schUeCfg->dlModInfo.mcsIndex = ueCfg->dlModInfo.mcsIndex; + schUeCfg->dlModInfo.mcsTable = ueCfg->dlModInfo.mcsTable; + + /* Fill UL modulation infor */ + schUeCfg->ulModInfo.modOrder = ueCfg->ulModInfo.modOrder; + schUeCfg->ulModInfo.mcsIndex = ueCfg->ulModInfo.mcsIndex; + schUeCfg->ulModInfo.mcsTable = ueCfg->ulModInfo.mcsTable; /* Fill sch Lc Cfg to Add/ Mod/ Del */ ret = fillSchLcCfgList(schUeCfg, ueCfg); if(ret == RFAILED) { - DU_LOG("\nMAC : Failed to copy LCs at fillSchUeCfg()"); + DU_LOG("\nERROR --> MAC : Failed to copy LCs at fillSchUeCfg()"); return ret; } return ret; @@ -940,41 +1732,189 @@ void updateMacUlCb(uint8_t delIdx, UeUlCb *ulCb) { uint8_t lcIdx = 0; - for(lcIdx = delIdx; lcIdx < ulCb->numUlLc; lcIdx++) - { - /* Moving the array element to one step ahead */ - memcpy(&ulCb->lcCb[lcIdx], &ulCb->lcCb[lcIdx+1], sizeof(UlLcCb)); - memset(&ulCb->lcCb[lcIdx+1], 0, sizeof(UlLcCb)); + for(lcIdx = delIdx; lcIdx < ulCb->numUlLc; lcIdx++) + { + /* Moving the array element to one step ahead */ + memcpy(&ulCb->lcCb[lcIdx], &ulCb->lcCb[lcIdx+1], sizeof(UlLcCb)); + memset(&ulCb->lcCb[lcIdx+1], 0, sizeof(UlLcCb)); + } + /*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/ +#if 0 + /*Checking the Memory Leakage of Last Index*/ + if(ulCb->lcCb[ulCb->numUlLc].snssai != NULLP) + { + DU_LOG("ERROR --> MAC: updateMacUlCb Last index deleted :%d memory is leaking",\ + ulCb->numUlLc); + MAC_FREE(ulCb->lcCb[ulCb->numUlLc].snssai, sizeof(Snssai)); + } + else + { + DU_LOG("INFO --> MAC: updateMacUlCb Last index:%d (before deletion) memory is freed successfully",\ + ulCb->numUlLc); + } +#endif +} + +/******************************************************************* + * + * @brief Update UeDlCb Lc List + * + * @details + * + * Function : updateMacDlCb + * + * Functionality: Update UeDlCb Lc List + * + * @params[in] delIdx, UeDlCb pointer + * @return void + * + * ****************************************************************/ + +void updateMacDlCb(uint8_t delIdx, UeDlCb *dlCb) +{ + uint8_t lcIdx = 0; + + for(lcIdx = delIdx; lcIdx < dlCb->numDlLc; lcIdx++) + { + /* Moving the array element to one step ahead */ + memcpy(&dlCb->lcCb[lcIdx], &dlCb->lcCb[lcIdx+1], sizeof(DlLcCb)); + memset(&dlCb->lcCb[lcIdx+1], 0, sizeof(DlLcCb)); + } + /*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/ +#if 0 + /*Checking the Memory Leakage of Last Index*/ + if(dlCb->lcCb[dlCb->numDlLc].snssai != NULLP) + { + DU_LOG("ERROR --> MAC: updateMacDlCb Last Deleted index:%d memory is leaking",\ + dlCb->numDlLc); + MAC_FREE(dlCb->lcCb[dlCb->numDlLc].snssai, sizeof(Snssai)); + } + else + { + DU_LOG("INFO --> MAC: updateMacDlCb Last index:%d (before deletion) memory is freed successfully",\ + dlCb->numDlLc); + } +#endif +} + +/******************************************************************* + * + * @brief Update Mac UL Lc List based on CONFIG_MOD/CONFIG_DEL + * + * @details + * + * Function : updateMacUlLcCtxt + * + * Functionality: Update UeUlCb Lc List + * + * @params[in] UeUlCb pointer, ueLcCfg(received from DUAPP) + * @return void + * + * ****************************************************************/ +void updateMacUlLcCtxt(UeUlCb *ulInfo, LcCfg *ueLcCfg) +{ + uint8_t ueLcIdx = 0; + + /*Traversing UL LC to be updated/Deleted*/ + for(ueLcIdx = 0; ueLcIdx < ulInfo->numUlLc; ueLcIdx++) + { + if(ulInfo->lcCb[ueLcIdx].lcId == ueLcCfg->lcId) + { + if(ueLcCfg->configType == CONFIG_MOD) + { + /*Modify UL LC CB */ + ulInfo->lcCb[ueLcIdx].lcGrpId = ueLcCfg->ulLcCfg.lcGroup; + + /*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/ +#if 0 + /*Modifying/Copying PduSession ID and S-NSSAI into MAC's UECB*/ + if(ueLcCfg->drbQos) + { + ulInfo->lcCb[ueLcIdx].pduSessionId = ueLcCfg->drbQos->pduSessionId; + } + if(ueLcCfg->snssai) + { + if(ulInfo->lcCb[ueLcIdx].snssai == NULLP) + { + MAC_ALLOC(ulInfo->lcCb[ueLcIdx].snssai, sizeof(Snssai)); + } + + memcpy(ulInfo->lcCb[ueLcIdx].snssai, ueLcCfg->snssai, sizeof(Snssai)); + } +#endif + DU_LOG("\nINFO --> MAC: Successfully Modified LC context for lcId[%d], ueLcIdx:%d",\ + ueLcCfg->lcId,ueLcIdx); + break; + } + if(ueLcCfg->configType == CONFIG_DEL) + { + memset(&ulInfo->lcCb[ueLcIdx], 0, sizeof(UlLcCb)); + (ulInfo->numUlLc)--; + updateMacUlCb(ueLcIdx, ulInfo); + DU_LOG("\nINFO --> MAC: Successfully Deleted LC context for lcId[%d]", ueLcCfg->lcId); + break; + } + } } } /******************************************************************* * - * @brief Update UeDlCb Lc List + * @brief Update Mac DL Lc List based on CONFIG_MOD/CONFIG_DEL * * @details * - * Function : updateMacDlCb + * Function : updateMacDlLcCtxt * * Functionality: Update UeDlCb Lc List * - * @params[in] delIdx, UeDlCb pointer + * @params[in] UeDlCb pointer, ueLcCfg(received from DUAPP) * @return void * * ****************************************************************/ - -void updateMacDlCb(uint8_t delIdx, UeDlCb *dlCb) +void updateMacDlLcCtxt(UeDlCb *dlInfo, LcCfg *ueLcCfg) { - uint8_t lcIdx = 0; + uint8_t ueLcIdx = 0; - for(lcIdx = delIdx; lcIdx < dlCb->numDlLc; lcIdx++) + /*Traversing DL LC to be updated/Deleted*/ + for(ueLcIdx = 0; ueLcIdx < dlInfo->numDlLc; ueLcIdx++) { - /* Moving the array element to one step ahead */ - memcpy(&dlCb->lcCb[lcIdx], &dlCb->lcCb[lcIdx+1], sizeof(DlLcCb)); - memset(&dlCb->lcCb[lcIdx+1], 0, sizeof(DlLcCb)); + if(dlInfo->lcCb[ueLcIdx].lcId == ueLcCfg->lcId) + { + if(ueLcCfg->configType == CONFIG_MOD) + { + /*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/ +#if 0 + /*Modifying/Copying PduSession ID and S-NSSAI into MAC's UECB*/ + if(ueLcCfg->drbQos) + { + dlInfo->lcCb[ueLcIdx].pduSessionId = ueLcCfg->drbQos->pduSessionId; + } + if(ueLcCfg->snssai) + { + if(dlInfo->lcCb[ueLcIdx].snssai == NULLP) + { + MAC_ALLOC(dlInfo->lcCb[ueLcIdx].snssai, sizeof(Snssai)); + } + + memcpy(dlInfo->lcCb[ueLcIdx].snssai, ueLcCfg->snssai, sizeof(Snssai)); + } +#endif + DU_LOG("\nINFO --> MAC: Successfully Modified LC context for lcId[%d], ueLcIdx:%d",\ + ueLcCfg->lcId,ueLcIdx); + break; + } + if(ueLcCfg->configType == CONFIG_DEL) + { + memset(&dlInfo->lcCb[ueLcIdx], 0, sizeof(DlLcCb)); + (dlInfo->numDlLc)--; + updateMacDlCb(ueLcIdx, dlInfo); + DU_LOG("\nINFO --> MAC: Successfully Deleted LC context for lcId[%d]", ueLcCfg->lcId); + break; + } + } } } - /******************************************************************* * * @brief Fills Logical channel Cfg List to Add/Mod/Del @@ -993,7 +1933,7 @@ void updateMacDlCb(uint8_t delIdx, UeDlCb *dlCb) uint8_t fillMacLcCfgList(MacUeCb *ueCb, MacUeCfg *ueCfg) { - uint8_t lcIdx, ueLcIdx; + uint8_t lcIdx = 0; for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++) { @@ -1001,45 +1941,50 @@ uint8_t fillMacLcCfgList(MacUeCb *ueCb, MacUeCfg *ueCfg) { if(ueCfg->lcCfgList[lcIdx].configType == CONFIG_ADD) { - /*Filling DL LC CB */ + /*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/ +#if 0 + /*Copying PduSession ID and S-NSSAI into MAC's UECB*/ + if(ueCfg->lcCfgList[lcIdx].drbQos) + { + ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].pduSessionId = \ + ueCfg->lcCfgList[lcIdx].drbQos->pduSessionId; + + ueCb->ulInfo.lcCb[ueCb->ulInfo.numUlLc].pduSessionId = \ + ueCfg->lcCfgList[lcIdx].drbQos->pduSessionId; + } + if(ueCfg->lcCfgList[lcIdx].snssai) + { + if(ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].snssai == NULLP) + { + MAC_ALLOC(ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].snssai, sizeof(Snssai)); + } + if(ueCb->ulInfo.lcCb[ueCb->ulInfo.numUlLc].snssai == NULLP) + { + MAC_ALLOC(ueCb->ulInfo.lcCb[ueCb->ulInfo.numUlLc].snssai, sizeof(Snssai)); + } + + memcpy(ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].snssai, \ + ueCfg->lcCfgList[lcIdx].snssai, sizeof(Snssai)); + + memcpy(ueCb->ulInfo.lcCb[ueCb->ulInfo.numUlLc].snssai, \ + ueCfg->lcCfgList[lcIdx].snssai, sizeof(Snssai)); + + } +#endif + /*Filling DL LC CB */ ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcId = ueCfg->lcCfgList[lcIdx].lcId; ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcState = MAC_LC_STATE_ACTIVE; ueCb->dlInfo.numDlLc++; - /*Filling UL LC CB */ + /*Filling UL LC CB */ ueCb->ulInfo.lcCb[ueCb->ulInfo.numUlLc].lcId = ueCfg->lcCfgList[lcIdx].lcId; ueCb->ulInfo.lcCb[ueCb->ulInfo.numUlLc].lcGrpId = ueCfg->lcCfgList[lcIdx].ulLcCfg.lcGroup; ueCb->ulInfo.lcCb[ueCb->ulInfo.numUlLc].lcActive = MAC_LC_STATE_ACTIVE; ueCb->ulInfo.numUlLc++; }/*End of Add Config */ else - { - //searching for Lc to be Mod - for(ueLcIdx = 0; ueLcIdx < ueCb->ulInfo.numUlLc; ueLcIdx++) - { - if(ueCb->ulInfo.lcCb[ueLcIdx].lcId == ueCfg->lcCfgList[lcIdx].lcId) - { - if(ueCfg->lcCfgList[lcIdx].configType == CONFIG_MOD) - { - /*Nothing to Modify in DL LC CB */ - /*Modify UL LC CB */ - ueCb->ulInfo.lcCb[ueLcIdx].lcGrpId = ueCfg->lcCfgList[lcIdx].ulLcCfg.lcGroup; - DU_LOG("\nMAC: Successfully Modified LC context for lcId[%d]", ueCfg->lcCfgList[lcIdx].lcId); - break; - } - if(ueCfg->lcCfgList[lcIdx].configType == CONFIG_DEL) - { - memset(&ueCb->dlInfo.lcCb[ueLcIdx], 0, sizeof(DlLcCb)); - (ueCb->dlInfo.numDlLc)--; - updateMacDlCb(ueLcIdx, &ueCb->dlInfo); - - memset(&ueCb->ulInfo.lcCb[ueLcIdx], 0, sizeof(UlLcCb)); - (ueCb->ulInfo.numUlLc)--; - updateMacUlCb(ueLcIdx, &ueCb->ulInfo); - DU_LOG("\nMAC: Successfully Deleted LC context for lcId[%d]", ueCfg->lcCfgList[lcIdx].lcId); - break; - } - } - } + { + updateMacUlLcCtxt(&ueCb->ulInfo, &ueCfg->lcCfgList[lcIdx]); + updateMacDlLcCtxt(&ueCb->dlInfo, &ueCfg->lcCfgList[lcIdx]); }/*End of Mod Config */ } } @@ -1067,21 +2012,29 @@ uint8_t fillMacUeCb(MacUeCb *ueCb, MacUeCfg *ueCfg, uint8_t cellIdx) { uint8_t ret = ROK; - ueCb->ueIdx = ueCfg->ueIdx; + ueCb->ueId = ueCfg->ueId; ueCb->crnti = ueCfg->crnti; ueCb->cellCb = macCb.macCell[cellIdx]; - ueCb->dlInfo.dlHarqEnt.numHarqProcs = \ + if(ueCfg->spCellCfgPres) + { + ueCb->dlInfo.dlHarqEnt.numHarqProcs = \ ueCfg->spCellCfg.servCellCfg.pdschServCellCfg.numHarqProcForPdsch; - ueCb->state = UE_STATE_ACTIVE; + } + /*TODO: To check the bsr value during implementation */ - ueCb->bsrTmrCfg.periodicTimer = ueCfg->macCellGrpCfg.bsrTmrCfg.periodicTimer; - ueCb->bsrTmrCfg.retxTimer = ueCfg->macCellGrpCfg.bsrTmrCfg.retxTimer; - ueCb->bsrTmrCfg.srDelayTimer = ueCfg->macCellGrpCfg.bsrTmrCfg.srDelayTimer; + if(ueCfg->macCellGrpCfgPres) + { + ueCb->bsrTmrCfg.periodicTimer = ueCfg->macCellGrpCfg.bsrTmrCfg.periodicTimer; + ueCb->bsrTmrCfg.retxTimer = ueCfg->macCellGrpCfg.bsrTmrCfg.retxTimer; + ueCb->bsrTmrCfg.srDelayTimer = ueCfg->macCellGrpCfg.bsrTmrCfg.srDelayTimer; + } ret = fillMacLcCfgList(ueCb, ueCfg); if(ret == RFAILED) { - DU_LOG("\nMAC: Failed while filing MAC LC List at fillMacUeCb()"); + DU_LOG("\nERROR --> MAC: Failed while filing MAC LC List at fillMacUeCb()"); } + ueCb->transmissionAction = ueCfg->transmissionAction; + return ret; } @@ -1103,15 +2056,15 @@ uint8_t fillMacUeCb(MacUeCb *ueCb, MacUeCfg *ueCfg, uint8_t cellIdx) uint8_t updateMacRaCb(uint16_t cellIdx, MacUeCb *ueCb) { - uint8_t ueIdx; /* Copy RA Cb */ - for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++) + if(macCb.macCell[cellIdx]->macRaCb[ueCb->ueId-1].crnti == ueCb->crnti) { - if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == ueCb->crnti) - { - ueCb->raCb = &macCb.macCell[cellIdx]->macRaCb[ueIdx]; - break; - } + ueCb->raCb = &macCb.macCell[cellIdx]->macRaCb[ueCb->ueId-1]; + } + else + { + DU_LOG("\nERROR --> MAC : No RA CB found for UE ID [%d]", ueCb->ueId); + return RFAILED; } return ROK; } @@ -1133,27 +2086,21 @@ uint8_t updateMacRaCb(uint16_t cellIdx, MacUeCb *ueCb) void deleteMacRaCb(uint16_t cellIdx, MacUeCb *ueCb) { - uint8_t ueIdx; + uint8_t tbIdx; + MacRaCbInfo *raCb = ueCb->raCb; + DlHarqProcCb *hqProcCb; - for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++) + if(raCb && (raCb->crnti == ueCb->crnti)) { - if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == ueCb->crnti) + hqProcCb = &raCb->msg4HqInfo; + MAC_FREE(raCb->msg4Pdu, raCb->msg4PduLen); + for(tbIdx = 0; tbIdx < raCb->msg4HqInfo.numTb; tbIdx++) { - if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu) - { - MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu, \ - macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen); - } - if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu) - { - MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \ - macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize); - } - memset(&macCb.macCell[cellIdx]->macRaCb[ueIdx], 0, sizeof(MacRaCbInfo)); - break; + MAC_FREE(raCb->msg4HqInfo.tbInfo[tbIdx].tb, \ + raCb->msg4HqInfo.tbInfo[tbIdx].tbSize - TX_PAYLOAD_HDR_LEN); } + memset(raCb, 0, sizeof(MacRaCbInfo)); } - } /******************************************************************* @@ -1173,12 +2120,13 @@ void deleteMacRaCb(uint16_t cellIdx, MacUeCb *ueCb) * ****************************************************************/ uint8_t createUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg) { - uint8_t ret =ROK; + uint8_t ret = ROK; + uint8_t hqProcIdx = 0; - if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\ + if((ueCb->ueId == ueCfg->ueId) && (ueCb->crnti == ueCfg->crnti)\ &&(ueCb->state == UE_STATE_ACTIVE)) { - DU_LOG("\n MAC : CRNTI %d already configured ", ueCfg->crnti); + DU_LOG("\nERROR --> MAC : CRNTI %d already configured ", ueCfg->crnti); return ROKDUP; } else @@ -1187,18 +2135,32 @@ uint8_t createUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg) ret = fillMacUeCb(ueCb, ueCfg, cellIdx); if(ret != ROK) { - DU_LOG("\nMAC : Failed to create Ue Cb at createUeCb()"); + DU_LOG("\nERROR --> MAC : Failed to create Ue Cb at createUeCb()"); return ret; } else { - macCb.macCell[cellIdx]->numActvUe++; - updateMacRaCb(cellIdx, ueCb); - return ROK; - } + /* Initialize all DL HARQ PROC ID to MAX NUM OF HARQ PROC */ + for(hqProcIdx = 0; hqProcIdx < MAX_NUM_HARQ_PROC; hqProcIdx++) + { + ueCb->dlInfo.dlHarqEnt.harqProcCb[hqProcIdx].procId = MAX_NUM_HARQ_PROC; + } - } + /* If UE has not requested for RACH yet, it means UE context is created for a + * UE in handover */ + if(macCb.macCell[cellIdx]->macRaCb[ueCb->ueId-1].crnti == ueCb->crnti) + { + ueCb->state = UE_STATE_ACTIVE; + macCb.macCell[cellIdx]->numActvUe++; + updateMacRaCb(cellIdx, ueCb); + } + else + ueCb->state = UE_HANDIN_IN_PROGRESS; + return ROK; + } + } + return ROK; } /******************************************************************* @@ -1220,20 +2182,19 @@ uint8_t modifyUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg) { uint8_t ret = ROK; - if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\ - &&(ueCb->state == UE_STATE_ACTIVE)) + if((ueCb->ueId == ueCfg->ueId) && (ueCb->crnti == ueCfg->crnti)\ + &&(ueCb->state == UE_STATE_ACTIVE)) { - DU_LOG("\n MAC : Modifying Ue config Req for CRNTI %d ", ueCfg->crnti); + DU_LOG("\nINFO --> MAC : Modifying Ue config Req for CRNTI %d ", ueCfg->crnti); ret = fillMacUeCb(ueCb, ueCfg, cellIdx); if(ret != ROK) { - DU_LOG("\nMAC : Failed to modify MacUeCb at modifyUeCb()"); + DU_LOG("\nERROR --> MAC : Failed to modify MacUeCb at modifyUeCb()"); return ret; } else { - deleteMacRaCb(cellIdx, ueCb); - return ROK; + return ROK; } } return RFAILED; @@ -1268,33 +2229,40 @@ uint8_t procMacUeCfgData(Pst *pst, MacUeCfg *ueCfg) /* Validate cell id */ if(macCb.macCell[cellIdx]->cellId != ueCfg->cellId) { - DU_LOG("\nMAC : Cell Id %d not configured", ueCfg->cellId); + DU_LOG("\nERROR --> MAC : Cell Id %d not configured", ueCfg->cellId); return RFAILED; } /* Check if max number of UE configured */ if(macCb.macCell[cellIdx]->numActvUe > MAX_NUM_UE) { - DU_LOG("MAC : Max number of UE [%d] already configured", MAX_NUM_UE); + DU_LOG("\nERROR --> MAC : Max number of UE [%d] already configured", MAX_NUM_UE); return RFAILED; } /* Check if UE already configured */ - ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx -1]; + ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueId -1]; + switch(pst->event) { case EVENT_UE_CONFIG_RSP_TO_MAC: - ret = createUeCb(cellIdx, ueCb, ueCfg); - if(ret != ROK) - DU_LOG("\nMAC: AddUeConfigReq for cellIdx :%d failed in procMacUeCfgData()", cellIdx); - break; + { + ret = createUeCb(cellIdx, ueCb, ueCfg); + if(ret != ROK) + DU_LOG("\nERROR --> MAC: AddUeConfigReq for cellIdx :%d failed in procMacUeCfgData()", cellIdx); + break; + } + case EVENT_UE_RECONFIG_RSP_TO_MAC: - ret = modifyUeCb(cellIdx, ueCb, ueCfg); - if(ret != ROK) - DU_LOG("\nMAC: ModifyUeConfigReq for cellIdx :%d failed at procMacUeCfgData()", cellIdx); - break; + { + ret = modifyUeCb(cellIdx, ueCb, ueCfg); + if(ret != ROK) + DU_LOG("\nERROR --> MAC: ModifyUeConfigReq for cellIdx :%d failed at procMacUeCfgData()", cellIdx); + break; + } + default: - break; + break; } return ret; @@ -1324,12 +2292,12 @@ uint8_t copyToTmpData(MacUeCfg *ueCfg) MAC_ALLOC(tmpData, sizeof(MacUeCfg)); if(!tmpData) { - DU_LOG("\nMAC: Memory Alloc Failed at copyToTmpData()"); + DU_LOG("\nERROR --> MAC: Memory Alloc Failed at copyToTmpData()"); return RFAILED; } memcpy(tmpData, ueCfg, sizeof(MacUeCfg)); GET_CELL_IDX(ueCfg->cellId, cellIdx); - macCb.macCell[cellIdx]->ueCfgTmpData[ueCfg->ueIdx-1] = tmpData; + macCb.macCell[cellIdx]->ueCfgTmpData[ueCfg->ueId-1] = tmpData; return ROK; } @@ -1354,34 +2322,41 @@ uint8_t MacProcUeCreateReq(Pst *pst, MacUeCfg *ueCfg) SchUeCfg schUeCfg; memset(&schUeCfg, 0, sizeof(SchUeCfg)); - DU_LOG("\nMAC : UE Create Request for CRNTI[%d]", ueCfg->crnti); + DU_LOG("\nINFO --> MAC : UE Create Request for CRNTI[%d]", ueCfg->crnti); if(ueCfg) { + /* If CRNTI = 0, MAC must allot a CRNTI to this UE. This scenario hits in + * case of UE in handover */ + if(ueCfg->crnti == 0) + { + GET_CRNTI(ueCfg->crnti, ueCfg->ueId); + } + /*Storing received ueCfg in ueCfgTmpData */ ret = copyToTmpData(ueCfg); if(ret == ROK) { /*Sending Cfg Req to SCH */ - ret = fillSchUeCfg(pst, &schUeCfg, ueCfg); - if(ret != ROK) - DU_LOG("\nMAC : Failed to fill Sch Ue Cfg at MacProcUeCreateReq()"); - else - { + ret = fillSchUeCfg(pst, &schUeCfg, ueCfg); + if(ret != ROK) + DU_LOG("\nERROR --> MAC : Failed to fill Sch Ue Cfg at MacProcUeCreateReq()"); + else + { /* Fill event and send UE create request to SCH */ ret = sendUeReqToSch(pst, &schUeCfg); - if(ret != ROK) - DU_LOG("\nMAC : Failed to send UE Create request to SCH"); - } + if(ret != ROK) + DU_LOG("\nERROR --> MAC : Failed to send UE Create request to SCH"); + } } else { - DU_LOG("\nMAC : Failed to store MAC UE CFG "); + DU_LOG("\nERROR --> MAC : Failed to store MAC UE CFG "); } } else { - DU_LOG("\nMAC : MAC UE Create request processing failed"); + DU_LOG("\nERROR --> MAC : MAC UE Create request processing failed"); ret = RFAILED; } /* FREE shared memory */ @@ -1414,14 +2389,14 @@ uint8_t MacSendUeCreateRsp(MacRsp result, SchUeCfgRsp *schCfgRsp) MAC_ALLOC_SHRABL_BUF(cfgRsp, sizeof(MacUeCfgRsp)); if(!cfgRsp) { - DU_LOG("\nMAC: Memory allocation for UE config response failed"); + DU_LOG("\nERROR --> MAC: Memory allocation for UE config response failed"); return RFAILED; } /* Filling UE Config response */ memset(cfgRsp, 0, sizeof(MacUeCfgRsp)); cfgRsp->cellId = schCfgRsp->cellId; - cfgRsp->ueIdx = schCfgRsp->ueIdx; + cfgRsp->ueId = schCfgRsp->ueId; cfgRsp->result = result; /* Fill Post structure and send UE Create response*/ @@ -1454,14 +2429,14 @@ uint8_t MacSendUeReconfigRsp(MacRsp result, SchUeCfgRsp *schCfgRsp) MAC_ALLOC_SHRABL_BUF(cfgRsp, sizeof(MacUeCfgRsp)); if(!cfgRsp) { - DU_LOG("\nMAC: Memory allocation for UE Reconfig response failed"); + DU_LOG("\nERROR --> MAC: Memory allocation for UE Reconfig response failed"); return RFAILED; } /* Filling UE Config response */ memset(cfgRsp, 0, sizeof(MacUeCfgRsp)); cfgRsp->cellId = schCfgRsp->cellId; - cfgRsp->ueIdx = schCfgRsp->ueIdx; + cfgRsp->ueId = schCfgRsp->ueId; cfgRsp->result = result; /* Fill Post structure and send UE Create response*/ @@ -1481,23 +2456,23 @@ uint8_t MacSendUeReconfigRsp(MacRsp result, SchUeCfgRsp *schCfgRsp) * Functionality: * Function to return Mac Ue Cfg pointer * - * @params[in] cellIdx, ueIdx + * @params[in] cellIdx, ueId * * @return MacUeCfg pointer - success * NULLP - failure * * ****************************************************************/ -MacUeCfg *getMacUeCfg(uint16_t cellIdx, uint8_t ueIdx) +MacUeCfg *getMacUeCfg(uint16_t cellIdx, uint8_t ueId) { MacUeCfg *ueCfg = NULLP; if(macCb.macCell[cellIdx]) { - ueCfg = macCb.macCell[cellIdx]->ueCfgTmpData[ueIdx-1]; + ueCfg = macCb.macCell[cellIdx]->ueCfgTmpData[ueId-1]; } else { - DU_LOG("\nMAC: Failed to get macCellCb in getMacUeCfg()"); + DU_LOG("\nERROR --> MAC: Failed to get macCellCb in getMacUeCfg()"); } return ueCfg; } @@ -1527,66 +2502,80 @@ uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp) uint16_t cellIdx; MacUeCfg *ueCfg = NULLP; +#ifdef CALL_FLOW_DEBUG_LOG + switch(pst->event) + { + case EVENT_UE_CONFIG_RSP_TO_MAC: + DU_LOG("\nCall Flow: ENTSCH -> ENTMAC : EVENT_UE_CONFIG_RSP_TO_MAC\n"); + break; + case EVENT_UE_RECONFIG_RSP_TO_MAC: + DU_LOG("\nCall Flow: ENTSCH -> ENTMAC : EVENT_UE_RECONFIG_RSP_TO_MAC\n"); + break; + default: + DU_LOG("\nCall Flow: ENTSCH -> ENTMAC : Invalid Event\n"); + break; + } +#endif + GET_CELL_IDX(schCfgRsp->cellId, cellIdx); - ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueIdx); + ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueId); if(ueCfg == NULLP) { - DU_LOG("\nMAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event); + DU_LOG("\nERROR --> MAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event); ret = RFAILED; } switch(pst->event) { case EVENT_UE_CONFIG_RSP_TO_MAC: - { - if(schCfgRsp->rsp != RSP_NOK) - { - DU_LOG("\nMAC: SCH UeConfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti); - if(ret == ROK) - { - ret = procMacUeCfgData(pst, ueCfg); - if(ret == ROK) - { - result = MAC_DU_APP_RSP_OK; + { + if(schCfgRsp->rsp != RSP_NOK) + { + DU_LOG("\nINFO --> MAC: SCH UeConfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti); + if(ret == ROK) + { + ret = procMacUeCfgData(pst, ueCfg); + if(ret == ROK) + { + result = MAC_DU_APP_RSP_OK; + } } - } - } - else - { - DU_LOG("\nMAC: SCH UeConfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti); - } - ret = MacSendUeCreateRsp(result, schCfgRsp); - } - break; + } + else + { + DU_LOG("\nERROR --> MAC: SCH UeConfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti); + } + ret = MacSendUeCreateRsp(result, schCfgRsp); + } + break; case EVENT_UE_RECONFIG_RSP_TO_MAC: - { - if(schCfgRsp->rsp != RSP_NOK) - { - DU_LOG("\nMAC: SCH UeReconfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()", schCfgRsp->crnti); - if(ret == ROK) - { - ret = procMacUeCfgData(pst, ueCfg); - if(ret == ROK) - { - result = MAC_DU_APP_RSP_OK; + { + + if(schCfgRsp->rsp != RSP_NOK) + { + DU_LOG("\nINFO --> MAC: SCH UeReconfigRsp for CRNTI[%d] is success in MacProcSchUeCfgRsp()",\ + schCfgRsp->crnti); + if(ret == ROK) + { + ret = procMacUeCfgData(pst, ueCfg); + if(ret == ROK) + { + result = MAC_DU_APP_RSP_OK; + } } - } - } - else - { - DU_LOG("\nMAC: SCH UeReconfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti); - } - ret = MacSendUeReconfigRsp(result, schCfgRsp); - } - break; - - default: - break; + } + else + { + DU_LOG("\nERROR --> MAC: SCH UeReconfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()",\ + schCfgRsp->crnti); + } + ret = MacSendUeReconfigRsp(result, schCfgRsp); + } + break; } MAC_FREE(ueCfg, sizeof(MacUeCfg)); ueCfg = NULLP; - return ret; } @@ -1611,7 +2600,7 @@ uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg) SchUeCfg schUeCfg; memset(&schUeCfg, 0, sizeof(SchUeCfg)); - DU_LOG("\nMAC : UE Reconfig Request for CRNTI[%d]", ueCfg->crnti); + DU_LOG("\nINFO --> MAC : UE Reconfig Request for CRNTI[%d]", ueCfg->crnti); if(ueCfg) { @@ -1620,25 +2609,25 @@ uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg) if(ret == ROK) { /*Sending Cfg Req to SCH */ - ret = fillSchUeCfg(pst, &schUeCfg, ueCfg); - if(ret != ROK) - DU_LOG("\nMAC : Failed to fill sch Ue Cfg at MacProcUeReconfigReq()"); + ret = fillSchUeCfg(pst, &schUeCfg, ueCfg); + if(ret != ROK) + DU_LOG("\nERROR --> MAC : Failed to fill sch Ue Cfg at MacProcUeReconfigReq()"); else - { + { /* Fill event and send UE create request to SCH */ ret = sendUeReqToSch(pst, &schUeCfg); - if(ret != ROK) - DU_LOG("\nMAC : Failed to send UE Reconfig Request to SCH"); - } + if(ret != ROK) + DU_LOG("\nERROR --> MAC : Failed to send UE Reconfig Request to SCH"); + } } else { - DU_LOG("\nMAC : Failed to store MAC UE Cb "); + DU_LOG("\nERROR --> MAC : Failed to store MAC UE Cb "); } } else { - DU_LOG("\nMAC : MAC UE Create request processing failed"); + DU_LOG("\nERROR --> MAC : MAC UE Create request processing failed"); ret = RFAILED; } /* FREE shared memory */ @@ -1646,6 +2635,315 @@ uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg) return ROK; } +/******************************************************************* +* +* @brief Fill and Send UE Delete response from MAC to DU APP +* +* @details +* +* Function : MacSendUeDeleteRsp +* +* Functionality: Fill and Send UE Delete response from MAC to DUAPP +* +* @params[in] MAC UE delete result +* SCH UE delete response +* @return ROK - success +* RFAILED - failure +* +* ****************************************************************/ + +uint8_t MacSendUeDeleteRsp(uint16_t cellId, uint16_t crnti, UeDeleteStatus result) +{ + MacUeDeleteRsp *deleteRsp; + Pst rspPst; + + MAC_ALLOC_SHRABL_BUF(deleteRsp, sizeof(MacUeDeleteRsp)); + if(!deleteRsp) + { + DU_LOG("\nERROR --> MAC : Memory allocation for UE delete response failed"); + return RFAILED; + } + + /* Filling UE delete response */ + deleteRsp->cellId = cellId; + GET_UE_ID(crnti, deleteRsp->ueId); + deleteRsp->result = result; + + /* Fill Post structure and send UE delete response*/ + memset(&rspPst, 0, sizeof(Pst)); + FILL_PST_MAC_TO_DUAPP(rspPst, EVENT_MAC_UE_DELETE_RSP); + return (*macDuUeDeleteRspOpts[rspPst.selector])(&rspPst, deleteRsp); +} + +/******************************************************************* +* +* @brief freeing the Pucch Resrc Cfg +* +* @details +* +* Function : deletePucchResourcesCfg +* +* Functionality: freeing the Pucch Resrc Cfg +* +* @params[in] PucchResrcCfg *resrcCfg +* @return ROK - success +* RFAILED - failure +* +* ****************************************************************/ + +void deletePucchResourcesCfg(PucchResrcCfg *resrcCfg) +{ + uint8_t resrcIdx; + for(resrcIdx =0; resrcIdx< resrcCfg->resrcToAddModListCount;resrcIdx++) + { + switch(resrcCfg->resrcToAddModList[resrcIdx].pucchFormat) + { + case PUCCH_FORMAT_0: + { + MAC_FREE(resrcCfg->resrcToAddModList[resrcIdx].PucchFormat.format0, sizeof(PucchFormat0)); + break; + } + case PUCCH_FORMAT_1: + { + MAC_FREE(resrcCfg->resrcToAddModList[resrcIdx].PucchFormat.format1, sizeof(PucchFormat1)); + break; + } + case PUCCH_FORMAT_2: + { + MAC_FREE(resrcCfg->resrcToAddModList[resrcIdx].PucchFormat.format2, sizeof(PucchFormat2_3)); + break; + } + case PUCCH_FORMAT_3: + { + MAC_FREE(resrcCfg->resrcToAddModList[resrcIdx].PucchFormat.format3, sizeof(PucchFormat2_3)); + break; + } + case PUCCH_FORMAT_4: + { + MAC_FREE(resrcCfg->resrcToAddModList[resrcIdx].PucchFormat.format4, sizeof(PucchFormat4)); + break; + } + } + } + +} + +/******************************************************************* +* +* @brief Processes UE delete response from scheduler +* +* @details +* +* Function : MacProcSchUeDeleteRsp +* +* Functionality: +* Processes UE delete from scheduler +* +* @params[in] Pst : Post structure +* schUeDelRsp : Scheduler UE delete respons +* @return ROK - success +* RFAILED - failure +* +* ****************************************************************/ + +uint8_t MacProcSchUeDeleteRsp(Pst *pst, SchUeDeleteRsp *schUeDelRsp) +{ + uint8_t ueId =0, isCrntiValid = 0, tbIdx =0, idx=0; + uint16_t cellIdx=0; + uint8_t ret = RFAILED; + UeDeleteStatus result; + DlHarqEnt *dlHarqEnt; + +#ifdef CALL_FLOW_DEBUG_LOG + DU_LOG("\nCall Flow: ENTSCH -> ENTMAC : EVENT_UE_DELETE_RSP_TO_MAC\n"); +#endif + + if(schUeDelRsp) + { + if(schUeDelRsp->rsp == RSP_OK) + { + DU_LOG("\nINFO --> MAC : SCH UE Delete response for CRNTI[%d] is successful", schUeDelRsp->crnti); + GET_CELL_IDX(schUeDelRsp->cellId, cellIdx); + if(macCb.macCell[cellIdx]) + { + CHECK_CRNTI(schUeDelRsp->crnti, isCrntiValid); + if(!isCrntiValid) + { + /*C-RNTI value is out of Acceptable range*/ + DU_LOG("\nERROR --> MAC : MacProcSchUeDeleteRsp(): Invalid crnti[%d] ",schUeDelRsp->crnti); + result = UEID_INVALID; + } + else + { + GET_UE_ID(schUeDelRsp->crnti, ueId); + if(macCb.macCell[cellIdx]->ueCb[ueId -1].crnti == schUeDelRsp->crnti) + { + + /*Commenting as S-NSSAI and PDU session will be stored in MAC DB in future scope*/ +#if 0 + /*Looping around LCs to free S-NSSAI memory*/ + for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueId -1].ulInfo.numUlLc); lcIdx++) + { + MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueId -1].ulInfo.lcCb[lcIdx].snssai, sizeof(Snssai)); + } + for(lcIdx = 0; lcIdx < (macCb.macCell[cellIdx]->ueCb[ueId -1].dlInfo.numDlLc); lcIdx++) + { + MAC_FREE(macCb.macCell[cellIdx]->ueCb[ueId -1].dlInfo.lcCb[lcIdx].snssai, sizeof(Snssai)); + } +#endif + dlHarqEnt = &macCb.macCell[cellIdx]->ueCb[ueId -1].dlInfo.dlHarqEnt; + for(idx =0 ; idxharqProcCb[idx].numTb) + { + + MAC_FREE(dlHarqEnt->harqProcCb[idx].tbInfo[tbIdx].tb, dlHarqEnt->harqProcCb[idx].tbInfo[tbIdx].tbSize); + dlHarqEnt->harqProcCb[idx].numTb--; + tbIdx++; + } + } + memset(&macCb.macCell[cellIdx]->ueCb[ueId -1], 0, sizeof(MacUeCb)); + macCb.macCell[cellIdx]->numActvUe--; + result = DEL_SUCCESSFUL; + ret = ROK; + } + else + { + DU_LOG("\nERROR --> MAC : MacProcSchUeDeleteRsp(): crnti[%d] does not exist ",schUeDelRsp->crnti); + result = UEID_INVALID; + } + } + } + else + { + DU_LOG("\nERROR --> MAC : MacProcSchUeDeleteRsp(): cellId[%d] does not exist ",schUeDelRsp->cellId); + result = CELLID_INVALID; + } + } + else + { + result = (schUeDelRsp->cause == INVALID_CELLID) ? CELLID_INVALID : UEID_INVALID; + } + if(MacSendUeDeleteRsp(schUeDelRsp->cellId, schUeDelRsp->crnti, result) != ROK) + { + DU_LOG("\nERROR --> MAC: MacProcSchUeDeleteRsp(): Failed to send UE delete response"); + } + } + else + { + DU_LOG("\nERROR --> MAC: MacProcSchUeDeleteRsp(): Failed to receive UE delete response by SCH"); + ret = RFAILED; + } + return ret; +} + +/******************************************************************* +* +* @brief Sends UE delete req to Scheduler +* +* @details +* +* Function : sendUeDelReqToSch +* +* Functionality: sends UE delete req to Scheduler +* +* @params[in] Pst *pst, MacUeDelete *ueDelete +* @return ROK - success +* RFAILED - failure +* +* ****************************************************************/ + +uint8_t sendUeDelReqToSch(Pst *pst, MacUeDelete *ueDelete) +{ + if(ueDelete != NULLP) + { + Pst schPst; + SchUeDelete schUeDel; + + memset(&schUeDel, 0, sizeof(SchUeDelete)); + schUeDel.cellId = ueDelete->cellId; + schUeDel.crnti = ueDelete->crnti; + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, ueDelete, sizeof(MacUeDelete)); + FILL_PST_MAC_TO_SCH(schPst, EVENT_UE_DELETE_REQ_TO_SCH); + return(*macSchUeDeleteReqOpts[schPst.selector])(&schPst, &schUeDel); + } + else + { + DU_LOG("\nERROR --> SCH: sendUeDelReqToSch():MAC Ue Delete is NULL"); + return RFAILED; + } + return ROK; +} + +/******************************************************************* + * + * @brief Handles UE Delete requst from DU APP + * + * @details + * + * Function : MacProcUeDeleteReq + * + * Functionality: Handles UE Delete requst from DU APP + * + * @params[in] Pst *pst, MacUeDelete *ueDelete + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ + +uint8_t MacProcUeDeleteReq(Pst *pst, MacUeDelete *ueDelete) +{ + uint8_t ret = ROK; + uint8_t cellIdx=0; + UeDeleteStatus result=DEL_SUCCESSFUL; + MacUeCb *ueCb = NULLP; + MacCellCb *cellCb = NULLP; + + DU_LOG("\nINFO --> MAC : UE Delete Request received for ueId[%d]", ueDelete->ueId); + + if(ueDelete) + { + GET_CELL_IDX(ueDelete->cellId, cellIdx); + cellCb = macCb.macCell[cellIdx]; + if(cellCb) + { + ueCb = &cellCb->ueCb[ueDelete->ueId-1]; + if(ueCb->crnti == ueDelete->crnti) + { + ret = sendUeDelReqToSch(pst, ueDelete); + if(ret != ROK) + { + DU_LOG("\nERROR --> MAC : MacProcUeDeleteReq(): Failed to send UE Delete Request to SCH"); + ret = RFAILED; + } + } + else + { + DU_LOG("\nERROR --> MAC : MacProcUeDeleteReq(): CRNTI is not matched"); + result = UEID_INVALID; + } + } + else + { + DU_LOG("\nERROR --> MAC : MacProcUeDeleteReq(): Failed to find the MacUeCb of UeId = %d",ueDelete->ueId); + result = CELLID_INVALID; + } + + if(result != DEL_SUCCESSFUL) + { + MacSendUeDeleteRsp(ueDelete->cellId, ueDelete->crnti, result); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, ueDelete, sizeof(MacUeDelete)); + ret = RFAILED; + } + } + else + { + DU_LOG("\nERROR --> MAC : MacProcUeDeleteReq(): MAC UE delete request processing failed"); + ret = RFAILED; + } + return ret; +} /********************************************************************** End of file