X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_ue_mgr.c;h=0f389874c1bbd7b357eca6f8c9c4004b547b9676;hb=ba2574ac618b40905509604da8d3a2b1b9e39664;hp=6def8e393e6e3bac7cfaff730a166b41c272678b;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_ue_mgr.c b/src/5gnrmac/mac_ue_mgr.c index 6def8e393..0f389874c 100644 --- a/src/5gnrmac/mac_ue_mgr.c +++ b/src/5gnrmac/mac_ue_mgr.c @@ -29,18 +29,25 @@ #include "mac_utils.h" /* function pointers for packing slot ind from mac to sch */ -MacSchUeCreateReqFunc macSchUeCreateReqOpts[] = +MacSchAddUeConfigReqFunc macSchAddUeConfigReqOpts[] = { - packMacSchUeCreateReq, /* packing for loosely coupled */ - macSchUeCreateReq, /* packing for tightly coupled */ - packMacSchUeCreateReq /* packing for light weight loosely coupled */ + packMacSchAddUeConfigReq, /* packing for loosely coupled */ + MacSchAddUeConfigReq, /* packing for tightly coupled */ + packMacSchAddUeConfigReq /* packing for light weight loosely coupled */ }; -DuMacUeCreateRspFunc DuMacUeCreateRspOpts[] = +MacDuUeCfgRspFunc macDuUeCfgRspOpts[] = { - packDuMacUeCreateRsp, /* packing for loosely coupled */ - duHandleMacUeCreateRsp, /* packing for tightly coupled */ - packDuMacUeCreateRsp, /* packing for light weight loosly coupled */ + packDuMacUeCfgRsp, /* packing for loosely coupled */ + DuProcMacUeCfgRsp, /* packing for tightly coupled */ + packDuMacUeCfgRsp /* packing for light weight loosly coupled */ +}; + +MacSchModUeConfigReqFunc macSchModUeConfigReqOpts[] = +{ + packMacSchModUeConfigReq, /* packing for loosely coupled */ + MacSchModUeConfigReq, /* packing for tightly coupled */ + packMacSchModUeConfigReq /* packing for light weight loosely coupled */ }; /******************************************************************* @@ -160,31 +167,79 @@ uint8_t fillPhyCellGroupCfg(PhyCellGrpCfg macUeCfg, SchPhyCellGrpCfg *schPhyCell * ****************************************************************/ uint8_t fillPdschServCellCfg(PdschServCellCfg macPdschCfg, SchPdschServCellCfg *schPdschCfg) { - schPdschCfg->maxMimoLayers = NULL; if(macPdschCfg.maxMimoLayers) { - /* TODO : Optional parameter */ + if(!schPdschCfg->maxMimoLayers) + { + MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxMimoLayers, sizeof(uint8_t)); + if(!schPdschCfg->maxMimoLayers) + { + DU_LOG("\nMAC :Memory Alloc MimoLayers Failed at fillPdschServCellCfg()"); + return RFAILED; + } + } + *schPdschCfg->maxMimoLayers = *macPdschCfg.maxMimoLayers; + } + else + { + schPdschCfg->maxMimoLayers = NULLP; } schPdschCfg->numHarqProcForPdsch = \ macPdschCfg.numHarqProcForPdsch; - schPdschCfg->maxCodeBlkGrpPerTb = NULL; if(macPdschCfg.maxCodeBlkGrpPerTb) { - /* TODO : Optional parameter */ + if(!schPdschCfg->maxCodeBlkGrpPerTb) + { + MAC_ALLOC_SHRABL_BUF(schPdschCfg->maxCodeBlkGrpPerTb, sizeof(SchMaxCodeBlkGrpPerTB)); + if(!schPdschCfg->maxCodeBlkGrpPerTb) + { + DU_LOG("\nMAC :Memory Alloc for code Block Failed at fillPdschServCellCfg()"); + return RFAILED; + } + } + *schPdschCfg->maxCodeBlkGrpPerTb = *macPdschCfg.maxCodeBlkGrpPerTb; + } + else + { + schPdschCfg->maxCodeBlkGrpPerTb = NULLP; } - schPdschCfg->codeBlkGrpFlushInd = NULL; if(macPdschCfg.codeBlkGrpFlushInd) { - /* TODO : Optional parameter */ + if(!schPdschCfg->codeBlkGrpFlushInd) + { + MAC_ALLOC_SHRABL_BUF(schPdschCfg->codeBlkGrpFlushInd, sizeof(bool)); + if(!schPdschCfg->codeBlkGrpFlushInd) + { + DU_LOG("\nMAC :Memory Alloc for Flush Ind Failed at fillPdschServCellCfg()"); + return RFAILED; + } + } + *schPdschCfg->codeBlkGrpFlushInd = *macPdschCfg.codeBlkGrpFlushInd; + } + else + { + schPdschCfg->codeBlkGrpFlushInd = NULLP; } - schPdschCfg->xOverhead = NULL; if(macPdschCfg.xOverhead) { - /* TODO : Optional parameter */ + if(!schPdschCfg->xOverhead) + { + MAC_ALLOC_SHRABL_BUF(schPdschCfg->xOverhead, sizeof(SchPdschXOverhead)); + if(!schPdschCfg->xOverhead) + { + DU_LOG("\nMAC :Memory Alloc for xOverHead Failed at fillPdschServCellCfg()"); + return RFAILED; + } + } + *schPdschCfg->xOverhead = *macPdschCfg.xOverhead; + } + else + { + schPdschCfg->xOverhead = NULLP; } return ROK; @@ -211,6 +266,7 @@ uint8_t fillInitalUlBwpPuschCfg(PuschCfg macPuschCfg, SchPuschCfg *schPuschCfg) { uint8_t idx; + schPuschCfg->dataScramblingId = macPuschCfg.dataScramblingId; schPuschCfg->dmrsUlCfgForPuschMapTypeA.addPos = \ macPuschCfg.dmrsUlCfgForPuschMapTypeA.addPos; schPuschCfg->dmrsUlCfgForPuschMapTypeA.transPrecodDisabled.scramblingId0 = \ @@ -242,454 +298,1697 @@ uint8_t fillInitalUlBwpPuschCfg(PuschCfg macPuschCfg, SchPuschCfg *schPuschCfg) /******************************************************************* * - * @brief Fills initail UL BWP config to send to scheduler + * @brief Function to fillResrcSetList sent by DU * * @details * - * Function : fillInitialUlBwp + * Function : fillResrcSetList * - * Functionality: Fills initail UL BWP config to send to sch + * Functionality: Function to fillResrcSetList sent by DU * - * @params[in] macInitUlBwp : Initial UL BWP cfg at MAC - * schInitUlBwp : Initial UL BWP cfg to be filled - * @return ROK - success - * RFAILED - failure + * @params[in] PucchResrcSetCfg pointer, + * SchPucchResrcSetCfg pointer + * @return void * * ****************************************************************/ -uint8_t fillInitialUlBwp(InitialUlBwp macInitUlBwp, SchInitialUlBwp *schInitUlBwp) + +void fillResrcSetList(PucchResrcSetCfg *macRsrcSetList, SchPucchResrcSetCfg *schRsrcSetList) { - schInitUlBwp->pucchCfgPres = macInitUlBwp.pucchPresent; - if(schInitUlBwp->pucchCfgPres) - { - /* TODO : Optional parameter */ - } + uint8_t arrIdx, rsrcListIdx; - schInitUlBwp->puschCfgPres = macInitUlBwp.puschPresent; - if(schInitUlBwp->puschCfgPres) + /* ResrcSetToAddModList */ + schRsrcSetList->resrcSetToAddModListCount = macRsrcSetList->resrcSetToAddModListCount; + for(arrIdx = 0; arrIdx < macRsrcSetList->resrcSetToAddModListCount; arrIdx++) { - if(fillInitalUlBwpPuschCfg(macInitUlBwp.puschCfg, &schInitUlBwp->puschCfg) != ROK) + 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++) { - DU_LOG("\nMAC : fillInitalUlBwpPuschCfg() failed"); - return RFAILED; + schRsrcSetList->resrcSetToAddModList[arrIdx].resrcList[rsrcListIdx] =\ + macRsrcSetList->resrcSetToAddModList[arrIdx].resrcList[rsrcListIdx]; } } - return ROK; + /* ResrcSetToRelList */ + schRsrcSetList->resrcSetToRelListCount = macRsrcSetList->resrcSetToRelListCount; + for(arrIdx = 0; arrIdx < macRsrcSetList->resrcSetToRelListCount; arrIdx++) + { + schRsrcSetList->resrcSetToRelList[arrIdx] = macRsrcSetList->resrcSetToRelList[arrIdx]; + } } /******************************************************************* * - * @brief Fill PDCCH cfg in Initial DL BWP for UE Cfg in Scheduler + * @brief Function to fillResrcList sent by DU * * @details * - * Function : fillInitDlBwpPdcchCfg + * Function : fillResrcList * - * Functionality: - * Fill PDCCH cfg in Initial DL BWP for UE Cfg in Scheduler + * Functionality: Function to fillResrcList sent by DU * - * @params[in] macPdcchCfg : Inital DL BWP PDCCH cfg in MAC - * schPdcchCfg : Inital DL BWP PDCCH cfg to be filled - * @return ROK - success - * RFAILED - failure + * @params[in] PucchResrcCfg pointer, + * SchPucchResrcCfg pointer + * @return ROK/RFAILED; * * ****************************************************************/ -uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchCfg) +uint8_t fillResrcList(PucchResrcCfg *macResrcCfg, SchPucchResrcCfg *schResrcCfg) { - uint8_t idx; - - /* Fill CORESET info */ - schPdcchCfg->numCRsetToAddMod = macPdcchCfg.numCRsetToAddMod; - if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET) - { - DU_LOG("\nMAC : Number of CORESET to ADD/MOD [%d] exceeds max limit [%d]",\ - schPdcchCfg->numCRsetToAddMod, MAX_NUM_CRSET); - return RFAILED; - } - - for(idx = 0; idx < schPdcchCfg->numCRsetToAddMod; idx++) + uint8_t arrIdx; + + schResrcCfg->resrcToAddModListCount = macResrcCfg->resrcToAddModListCount; + for(arrIdx=0; arrIdx < macResrcCfg->resrcToAddModListCount; arrIdx++) { - schPdcchCfg->cRSetToAddModList[idx].cRSetId = \ - macPdcchCfg.cRSetToAddModList[idx].cRSetId; - memcpy(&schPdcchCfg->cRSetToAddModList[idx].freqDomainRsrc,\ - &macPdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, FREQ_DOM_RSRC_SIZE); - schPdcchCfg->cRSetToAddModList[idx].duration = \ - macPdcchCfg.cRSetToAddModList[idx].duration; - schPdcchCfg->cRSetToAddModList[idx].cceRegMappingType = \ - macPdcchCfg.cRSetToAddModList[idx].cceRegMappingType; - schPdcchCfg->cRSetToAddModList[idx].precoderGranularity = \ - macPdcchCfg.cRSetToAddModList[idx].precoderGranularity; - schPdcchCfg->cRSetToAddModList[idx].dmrsScramblingId = \ - macPdcchCfg.cRSetToAddModList[idx].dmrsScramblingId; - } + 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; + } - schPdcchCfg->numCRsetToRel = macPdcchCfg.numCRsetToRel; - if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET) - { - DU_LOG("\nMAC : Number of CORESET to release [%d] exceeds max limit [%d]",\ - schPdcchCfg->numCRsetToRel, MAX_NUM_CRSET); - return RFAILED; - } + 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; + } - for(idx = 0; idx < schPdcchCfg->numCRsetToRel; idx++) - { - /* TODO */ - } + 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; + } - /* Fill Search space info */ - 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]", \ - schPdcchCfg->numSearchSpcToAddMod, MAX_NUM_SEARCH_SPC); - return RFAILED; - } - for(idx = 0; idx < schPdcchCfg->numSearchSpcToAddMod; idx++) - { - schPdcchCfg->searchSpcToAddModList[idx].searchSpaceId = \ - macPdcchCfg.searchSpcToAddModList[idx].searchSpaceId; - schPdcchCfg->searchSpcToAddModList[idx].cRSetId = \ - macPdcchCfg.searchSpcToAddModList[idx].cRSetId; - schPdcchCfg->searchSpcToAddModList[idx].mSlotPeriodicityAndOffset = \ - macPdcchCfg.searchSpcToAddModList[idx].mSlotPeriodicityAndOffset; - memcpy(&schPdcchCfg->searchSpcToAddModList[idx].mSymbolsWithinSlot, - &macPdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot, \ - MONITORING_SYMB_WITHIN_SLOT_SIZE); - schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel1 = \ - macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel1; - schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel2 = \ - macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel2; - schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel4 = \ - macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel4; - schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel8 = \ - macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel8; - schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel16 = \ - macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel16; - schPdcchCfg->searchSpcToAddModList[idx].searchSpaceType = \ - macPdcchCfg.searchSpcToAddModList[idx].searchSpaceType; - schPdcchCfg->searchSpcToAddModList[idx].ueSpecificDciFormat = \ - macPdcchCfg.searchSpcToAddModList[idx].ueSpecificDciFormat; + 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; +} - schPdcchCfg->numSearchSpcToRel = macPdcchCfg.numSearchSpcToRel; - if(schPdcchCfg->numSearchSpcToRel > MAX_NUM_SEARCH_SPC) - { - DU_LOG("\nMAC : Number of search space to release [%d] exceeds max [%d]", \ - schPdcchCfg->numSearchSpcToRel, MAX_NUM_SEARCH_SPC); - return RFAILED; - } - for(idx = 0; idx < schPdcchCfg->numSearchSpcToRel; idx++) - { - /* TODO */ - } +/******************************************************************* + * + * @brief Function to fillPucchFormatCfg sent by DU + * + * @details + * + * Function : fillPucchFormatCfg + * + * Functionality: Function to fillPucchFormatCfg + * + * @params[in] PucchFormatCfg pointer, + * SchPucchFormatCfg pointer + * @return void + * + * ****************************************************************/ - return ROK; +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 Fill PDSCH cfg in Initial DL BWP for UE Cfg in Scheduler + * @brief Function to fillPucchSchedReqCfg sent by DU * * @details * - * Function : fillInitDlBwpPdschCfg + * Function : fillPucchSchedReqCfg * - * Functionality: - * Fill PDSCH cfg in Initial DL BWP for UE Cfg in Scheduler + * Functionality: Function to fillPucchSchedReqCfg * - * @params[in] macPdschCfg : Inital DL BWP PDSCH cfg at MAC - * schPdschCfg : Inital DL BWP PDSCH cfg to be filled - * @return ROK - success - * RFAILED - failure + * @params[in] PucchSchedReqCfg pointer, + * SchPucchSchedReqCfg pointer + * @return void * * ****************************************************************/ -uint8_t fillInitDlBwpPdschCfg(PdschConfig macPdschCfg, SchPdschConfig *schPdschCfg) +void fillPucchSchedReqCfg(PucchSchedReqCfg *macSchedReqCfg, SchPucchSchedReqCfg *schSchedReqCfg) { - uint8_t idx; + uint8_t arrIdx; - schPdschCfg->dmrsDlCfgForPdschMapTypeA.addPos = \ - macPdschCfg.dmrsDlCfgForPdschMapTypeA.addPos; - schPdschCfg->resourceAllocType = macPdschCfg.resourceAllocType; - schPdschCfg->numTimeDomRsrcAlloc = macPdschCfg.numTimeDomRsrcAlloc; - if(schPdschCfg->numTimeDomRsrcAlloc > MAX_NUM_DL_ALLOC) + schSchedReqCfg->schedAddModListCount = macSchedReqCfg->schedAddModListCount; + for(arrIdx=0; arrIdx < schSchedReqCfg->schedAddModListCount; arrIdx++) { - DU_LOG("\nMAC : Number of time domain resource allocation [%d], exceeds\ - max limit [%d]", schPdschCfg->numTimeDomRsrcAlloc, MAX_NUM_DL_ALLOC); - return RFAILED; + 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; } - - for(idx = 0; idx < schPdschCfg->numTimeDomRsrcAlloc; idx++) + schSchedReqCfg->schedRelListCount = macSchedReqCfg->schedRelListCount; + for(arrIdx=0; arrIdx < schSchedReqCfg->schedRelListCount; arrIdx++) { - schPdschCfg->timeDomRsrcAllociList[idx].mappingType = \ - macPdschCfg.timeDomRsrcAllociList[idx].mappingType; - schPdschCfg->timeDomRsrcAllociList[idx].startSymbol = \ - macPdschCfg.timeDomRsrcAllociList[idx].startSymbol; - schPdschCfg->timeDomRsrcAllociList[idx].symbolLength = \ - macPdschCfg.timeDomRsrcAllociList[idx].symbolLength; + schSchedReqCfg->schedRelList[arrIdx] = macSchedReqCfg->schedRelList[arrIdx]; } +} - schPdschCfg->rbgSize = macPdschCfg.rbgSize; - schPdschCfg->numCodeWordsSchByDci = macPdschCfg.numCodeWordsSchByDci; - schPdschCfg->bundlingType = macPdschCfg.bundlingType; +/******************************************************************* + * + * @brief Function to fillMultiCsiCfg sent by DU + * + * @details + * + * Function : fillMultiCsiCfg + * + * Functionality: Function to fillMultiCsiCfg + * + * @params[in] PucchMultiCsiCfg pointer, + * SchPucchMultiCsiCfg pointer + * @return void + * + * ****************************************************************/ - return ROK; -} + 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 Fill Initial DL BWP for SCH UE config + * @brief Function to fillDlToUlAck sent by DU * * @details * - * Function : fillInitialDlBwp + * Function : fillDlToUlAck * - * Functionality: Fill Initial DL BWP for SCH UE config + * Functionality: Function to fillDlToUlAck * - * @params[in] macInitDlBwp : Inital DL BWP cfg at MAC - * schInitDlBwp : Inital DL BWP cfg to be filled - * @return ROK - success - * RFAILED - failure + * @params[in] PucchDlDataToUlAck pointer, + * SchPucchDlDataToUlAck pointer + * @return void * * ****************************************************************/ -uint8_t fillInitialDlBwp(InitialDlBwp macInitDlBwp, SchInitalDlBwp *schInitDlBwp) + +void fillDlToUlAck(PucchDlDataToUlAck *macUlAck, SchPucchDlDataToUlAck *schUlAck) { - schInitDlBwp->pdcchCfgPres = macInitDlBwp.pdcchPresent; - if(schInitDlBwp->pdcchCfgPres) - { - if(fillInitDlBwpPdcchCfg(macInitDlBwp.pdcchCfg, &schInitDlBwp->pdcchCfg) != ROK) - { - DU_LOG("\nMAC : fillInitDlBwpPdcchCfg() failed"); - return RFAILED; - } - } + uint8_t arrIdx; - schInitDlBwp->pdschCfgPres = macInitDlBwp.pdschPresent; - if(schInitDlBwp->pdschCfgPres) + schUlAck->dlDataToUlAckListCount = macUlAck->dlDataToUlAckListCount; + for(arrIdx =0; arrIdx < macUlAck->dlDataToUlAckListCount; arrIdx++) { - if(fillInitDlBwpPdschCfg(macInitDlBwp.pdschCfg,&schInitDlBwp->pdschCfg) != ROK) - { - DU_LOG("\nMAC : fillInitDlBwpPdschCfg() failed"); - return RFAILED; - } + schUlAck->dlDataToUlAckList[arrIdx] = macUlAck->dlDataToUlAckList[arrIdx]; } - return ROK; } /******************************************************************* * - * @brief Fills Sp Cell config to be sent to scheduler + * @brief Function to fillPucchPowerControl sent by DU * * @details * - * Function : fillSpCellCfg + * Function : fillPucchPowerControl * - * Functionality: Fills Sp Cell config to be sent to scheduler + * Functionality: Function to fillPucchPowerControl * - * @params[in] macSpCellCfg : SP cell cfg at MAC - * schSpCellCfg : SP cell cfg to be filled - * @return ROK - success - * RFAILED - failure + * @params[in] PucchPowerControl pointer, + * SchPucchPowerControl pointer + * @return void * * ****************************************************************/ -uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg) -{ - uint8_t idx; - SchServCellCfgInfo *servCellCfg; - - schSpCellCfg->servCellIdx = macSpCellCfg.servCellIdx; - servCellCfg = &schSpCellCfg->servCellCfg; - /* Fill initial DL BWP */ - if(fillInitialDlBwp(macSpCellCfg.servCellCfg.initDlBwp, \ - &servCellCfg->initDlBwp) != ROK ) +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++) { - DU_LOG("\nMAC : fillInitialDlBwp() failed"); - return RFAILED; + schPwrCtrl->p0Set[arrIdx].p0PucchId = macPwrCtrl->p0Set[arrIdx].p0PucchId; + schPwrCtrl->p0Set[arrIdx].p0PucchVal = macPwrCtrl->p0Set[arrIdx].p0PucchVal; } - - servCellCfg->numDlBwpToAdd = macSpCellCfg.servCellCfg.numDlBwpToAdd; - if(servCellCfg->numDlBwpToAdd > MAX_NUM_BWP) + schPwrCtrl->pathLossRefRSListCount = macPwrCtrl->pathLossRefRSListCount; + for(arrIdx = 0; arrIdx < macPwrCtrl->pathLossRefRSListCount; arrIdx++) { - DU_LOG("\nMAC : Number of DL BWP to ADD/MOD [%d] exceeds max limit [%d]",\ - servCellCfg->numDlBwpToAdd, MAX_NUM_BWP); + 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 + * + * @details + * + * Function : fillInitialUlBwp + * + * Functionality: Fills initail UL BWP config to send to sch + * + * @params[in] macInitUlBwp : Initial UL BWP cfg at MAC + * schInitUlBwp : Initial UL BWP cfg to be filled + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillInitialUlBwp(InitialUlBwp macInitUlBwp, SchInitialUlBwp *schInitUlBwp) +{ + schInitUlBwp->pucchCfgPres = macInitUlBwp.pucchPresent; + if(schInitUlBwp->pucchCfgPres) + { + 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("\nERROR --> MAC : Failed to fill Pusch Cfg in fillInitalUlBwpPuschCfg()"); + return RFAILED; + } + } + return ROK; +} + +/******************************************************************* + * + * @brief Fill PDCCH cfg in Initial DL BWP for UE Cfg in Scheduler + * + * @details + * + * Function : fillInitDlBwpPdcchCfg + * + * Functionality: + * Fill PDCCH cfg in Initial DL BWP for UE Cfg in Scheduler + * + * @params[in] macPdcchCfg : Inital DL BWP PDCCH cfg in MAC + * schPdcchCfg : Inital DL BWP PDCCH cfg to be filled + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillInitDlBwpPdcchCfg(PdcchConfig macPdcchCfg, SchPdcchConfig *schPdcchCfg) +{ + uint8_t idx; + + /* Fill CORESET info */ + schPdcchCfg->numCRsetToAddMod = macPdcchCfg.numCRsetToAddMod; + if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET) + { + DU_LOG("\nMAC : Number of CORESET to ADD/MOD [%d] exceeds max limit [%d]",\ + schPdcchCfg->numCRsetToAddMod, MAX_NUM_CRSET); + return RFAILED; + } + + for(idx = 0; idx < schPdcchCfg->numCRsetToAddMod; idx++) + { + schPdcchCfg->cRSetToAddModList[idx].cRSetId = \ + macPdcchCfg.cRSetToAddModList[idx].cRSetId; + memcpy(&schPdcchCfg->cRSetToAddModList[idx].freqDomainRsrc,\ + &macPdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, FREQ_DOM_RSRC_SIZE); + schPdcchCfg->cRSetToAddModList[idx].duration = \ + macPdcchCfg.cRSetToAddModList[idx].duration; + schPdcchCfg->cRSetToAddModList[idx].cceRegMappingType = \ + macPdcchCfg.cRSetToAddModList[idx].cceRegMappingType; + schPdcchCfg->cRSetToAddModList[idx].precoderGranularity = \ + macPdcchCfg.cRSetToAddModList[idx].precoderGranularity; + schPdcchCfg->cRSetToAddModList[idx].dmrsScramblingId = \ + macPdcchCfg.cRSetToAddModList[idx].dmrsScramblingId; + } + + schPdcchCfg->numCRsetToRel = macPdcchCfg.numCRsetToRel; + if(schPdcchCfg->numCRsetToAddMod > MAX_NUM_CRSET) + { + DU_LOG("\nMAC : Number of CORESET to release [%d] exceeds max limit [%d]",\ + schPdcchCfg->numCRsetToRel, MAX_NUM_CRSET); + return RFAILED; + } + + for(idx = 0; idx < schPdcchCfg->numCRsetToRel; idx++) + { + /* TODO */ + } + + /* Fill Search space info */ + 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]", \ + schPdcchCfg->numSearchSpcToAddMod, MAX_NUM_SEARCH_SPC); + return RFAILED; + } + for(idx = 0; idx < schPdcchCfg->numSearchSpcToAddMod; idx++) + { + schPdcchCfg->searchSpcToAddModList[idx].searchSpaceId = \ + macPdcchCfg.searchSpcToAddModList[idx].searchSpaceId; + schPdcchCfg->searchSpcToAddModList[idx].cRSetId = \ + macPdcchCfg.searchSpcToAddModList[idx].cRSetId; + schPdcchCfg->searchSpcToAddModList[idx].mSlotPeriodicityAndOffset = \ + macPdcchCfg.searchSpcToAddModList[idx].mSlotPeriodicityAndOffset; + memcpy(&schPdcchCfg->searchSpcToAddModList[idx].mSymbolsWithinSlot, + &macPdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot, \ + MONITORING_SYMB_WITHIN_SLOT_SIZE); + schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel1 = \ + macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel1; + schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel2 = \ + macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel2; + schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel4 = \ + macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel4; + schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel8 = \ + macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel8; + schPdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel16 = \ + macPdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel16; + schPdcchCfg->searchSpcToAddModList[idx].searchSpaceType = \ + macPdcchCfg.searchSpcToAddModList[idx].searchSpaceType; + schPdcchCfg->searchSpcToAddModList[idx].ueSpecificDciFormat = \ + macPdcchCfg.searchSpcToAddModList[idx].ueSpecificDciFormat; + } + + schPdcchCfg->numSearchSpcToRel = macPdcchCfg.numSearchSpcToRel; + if(schPdcchCfg->numSearchSpcToRel > MAX_NUM_SEARCH_SPC) + { + DU_LOG("\nMAC : Number of search space to release [%d] exceeds max [%d]", \ + schPdcchCfg->numSearchSpcToRel, MAX_NUM_SEARCH_SPC); + return RFAILED; + } + for(idx = 0; idx < schPdcchCfg->numSearchSpcToRel; idx++) + { + /* TODO */ + } + + return ROK; +} + +/******************************************************************* + * + * @brief Fill PDSCH cfg in Initial DL BWP for UE Cfg in Scheduler + * + * @details + * + * Function : fillInitDlBwpPdschCfg + * + * Functionality: + * Fill PDSCH cfg in Initial DL BWP for UE Cfg in Scheduler + * + * @params[in] macPdschCfg : Inital DL BWP PDSCH cfg at MAC + * schPdschCfg : Inital DL BWP PDSCH cfg to be filled + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillInitDlBwpPdschCfg(PdschConfig macPdschCfg, SchPdschConfig *schPdschCfg) +{ + uint8_t idx; + + schPdschCfg->dmrsDlCfgForPdschMapTypeA.addPos = \ + macPdschCfg.dmrsDlCfgForPdschMapTypeA.addPos; + schPdschCfg->resourceAllocType = macPdschCfg.resourceAllocType; + schPdschCfg->numTimeDomRsrcAlloc = macPdschCfg.numTimeDomRsrcAlloc; + if(schPdschCfg->numTimeDomRsrcAlloc > MAX_NUM_DL_ALLOC) + { + DU_LOG("\nMAC : 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++) + { + schPdschCfg->timeDomRsrcAllociList[idx].mappingType = \ + macPdschCfg.timeDomRsrcAllociList[idx].mappingType; + schPdschCfg->timeDomRsrcAllociList[idx].startSymbol = \ + macPdschCfg.timeDomRsrcAllociList[idx].startSymbol; + schPdschCfg->timeDomRsrcAllociList[idx].symbolLength = \ + macPdschCfg.timeDomRsrcAllociList[idx].symbolLength; + } + + schPdschCfg->rbgSize = macPdschCfg.rbgSize; + schPdschCfg->numCodeWordsSchByDci = macPdschCfg.numCodeWordsSchByDci; + schPdschCfg->bundlingType = macPdschCfg.bundlingType; + if(schPdschCfg->bundlingType == STATIC_BUNDLING_TYPE) + { + schPdschCfg->bundlingInfo.SchStaticBundling.size = macPdschCfg.bundlingInfo.StaticBundling.size; + } + else if(schPdschCfg->bundlingType == DYNAMIC_BUNDLING_TYPE) + { + schPdschCfg->bundlingInfo.SchDynamicBundling.sizeSet1 = macPdschCfg.bundlingInfo.DynamicBundling.sizeSet1; + schPdschCfg->bundlingInfo.SchDynamicBundling.sizeSet2 = macPdschCfg.bundlingInfo.DynamicBundling.sizeSet2; + } + return ROK; +} + +/******************************************************************* + * + * @brief Fill Initial DL BWP for SCH UE config + * + * @details + * + * Function : fillInitialDlBwp + * + * Functionality: Fill Initial DL BWP for SCH UE config + * + * @params[in] macInitDlBwp : Inital DL BWP cfg at MAC + * schInitDlBwp : Inital DL BWP cfg to be filled + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillInitialDlBwp(InitialDlBwp macInitDlBwp, SchInitalDlBwp *schInitDlBwp) +{ + schInitDlBwp->pdcchCfgPres = macInitDlBwp.pdcchPresent; + if(schInitDlBwp->pdcchCfgPres) + { + if(fillInitDlBwpPdcchCfg(macInitDlBwp.pdcchCfg, &schInitDlBwp->pdcchCfg) != ROK) + { + DU_LOG("\nMAC : fillInitDlBwpPdcchCfg() failed"); + return RFAILED; + } + } + + schInitDlBwp->pdschCfgPres = macInitDlBwp.pdschPresent; + if(schInitDlBwp->pdschCfgPres) + { + if(fillInitDlBwpPdschCfg(macInitDlBwp.pdschCfg,&schInitDlBwp->pdschCfg) != ROK) + { + DU_LOG("\nMAC : fillInitDlBwpPdschCfg() failed"); + return RFAILED; + } + } + return ROK; +} + +/******************************************************************* + * + * @brief Fills Sp Cell config to be sent to scheduler + * + * @details + * + * Function : fillSpCellCfg + * + * Functionality: Fills Sp Cell config to be sent to scheduler + * + * @params[in] macSpCellCfg : SP cell cfg at MAC + * schSpCellCfg : SP cell cfg to be filled + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillSpCellCfg(SpCellCfg macSpCellCfg, SchSpCellCfg *schSpCellCfg) +{ + uint8_t idx; + SchServCellCfgInfo *servCellCfg; + + schSpCellCfg->servCellIdx = macSpCellCfg.servCellIdx; + servCellCfg = &schSpCellCfg->servCellCfg; + + /* Fill initial DL BWP */ + if(fillInitialDlBwp(macSpCellCfg.servCellCfg.initDlBwp, \ + &servCellCfg->initDlBwp) != ROK ) + { + DU_LOG("\nMAC : 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]",\ + servCellCfg->numDlBwpToAdd, MAX_NUM_BWP); + return RFAILED; + } + for(idx = 0; idx < servCellCfg->numDlBwpToAdd; idx++) + { + /* TODO : As of now numDlBwpToAdd = 0 */ + } + + servCellCfg->firstActvDlBwpId = macSpCellCfg.servCellCfg.firstActvDlBwpId; + servCellCfg->defaultDlBwpId = macSpCellCfg.servCellCfg.defaultDlBwpId; + servCellCfg->bwpInactivityTmr = NULL; + if(macSpCellCfg.servCellCfg.bwpInactivityTmr) + { + /* TODO : This is an optional parameter, not filled currently */ + } + + /* Fill PDSCH serving cell config */ + if(fillPdschServCellCfg(macSpCellCfg.servCellCfg.pdschServCellCfg, \ + &servCellCfg->pdschServCellCfg) != ROK) + { + DU_LOG("\nMAC : fillPdschServCellCfg() failed"); + return RFAILED; + } + + /* Fill Initail UL BWP */ + if(fillInitialUlBwp(macSpCellCfg.servCellCfg.initUlBwp, \ + &servCellCfg->initUlBwp) != ROK) + { + DU_LOG("\nMAC : 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]",\ + servCellCfg->numUlBwpToAdd, MAX_NUM_BWP); return RFAILED; } - for(idx = 0; idx < servCellCfg->numDlBwpToAdd; idx++) + for(idx = 0; idx < servCellCfg->numUlBwpToAdd; idx++) + { + /* TODO : As of now numDlBwpToAdd = 0 */ + } + servCellCfg->firstActvUlBwpId = macSpCellCfg.servCellCfg.firstActvUlBwpId; + + return ROK; +} + +/******************************************************************* + * + * @brief Sends UE configuration to Scheduler + * + * @details + * + * Function : sendUeReqToSch + * + * Functionality: sends UE configuration to Scheduler + * + * @params[in] Pst and Ue configuration + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ + +uint8_t sendUeReqToSch(Pst *pst, SchUeCfg *schUeCfg) +{ + Pst schPst; + switch(pst->event) + { + case EVENT_MAC_UE_CREATE_REQ: + FILL_PST_MAC_TO_SCH(schPst, EVENT_ADD_UE_CONFIG_REQ_TO_SCH); + return(*macSchAddUeConfigReqOpts[schPst.selector])(&schPst, schUeCfg); + + case EVENT_MAC_UE_RECONFIG_REQ: + 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); + return RFAILED; + } +} + +/******************************************************************* + * + * @brief Fills Sch Drb Qos Information + * + * @details + * + * Function : fillSchDrbQosInfo + * + * Functionality: Fills Sch Drb Qos Information + * + * @params[in] macLcCfg : Logical channel Cfg at MAC + * schLcCfg : LC cfg to fill at scheduler + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +void fillSchDrbQosInfo(DrbQosInfo *macDrbQos, SchDrbQosInfo *schDrbQos) +{ + schDrbQos->fiveQiType = macDrbQos->fiveQiType; + if(schDrbQos->fiveQiType == SCH_QOS_NON_DYNAMIC) + { + schDrbQos->u.nonDyn5Qi.fiveQi = macDrbQos->u.nonDyn5Qi.fiveQi; + schDrbQos->u.nonDyn5Qi.avgWindow = macDrbQos->u.nonDyn5Qi.avgWindow; + schDrbQos->u.nonDyn5Qi.maxDataBurstVol = macDrbQos->u.nonDyn5Qi.maxDataBurstVol; + schDrbQos->u.nonDyn5Qi.priorLevel = macDrbQos->u.nonDyn5Qi.priorLevel; + } + else if(schDrbQos->fiveQiType == SCH_QOS_DYNAMIC) { - /* TODO : As of now numDlBwpToAdd = 0 */ + schDrbQos->u.dyn5Qi.priorLevel = macDrbQos->u.dyn5Qi.priorLevel; + schDrbQos->u.dyn5Qi.packetDelayBudget = macDrbQos->u.dyn5Qi.packetDelayBudget; + schDrbQos->u.dyn5Qi.packetErrRateScalar= macDrbQos->u.dyn5Qi.packetErrRateScalar; + schDrbQos->u.dyn5Qi.packetErrRateExp = macDrbQos->u.dyn5Qi.packetErrRateExp; + schDrbQos->u.dyn5Qi.fiveQi = macDrbQos->u.dyn5Qi.fiveQi; + schDrbQos->u.dyn5Qi.delayCritical = macDrbQos->u.dyn5Qi.delayCritical; + schDrbQos->u.dyn5Qi.avgWindow = macDrbQos->u.dyn5Qi.avgWindow; + schDrbQos->u.dyn5Qi.maxDataBurstVol = macDrbQos->u.dyn5Qi.maxDataBurstVol; } + schDrbQos->ngRanRetPri.priorityLevel = macDrbQos->ngRanRetPri.priorityLevel; + schDrbQos->ngRanRetPri.preEmptionCap = macDrbQos->ngRanRetPri.preEmptionCap; + schDrbQos->ngRanRetPri.preEmptionVul = macDrbQos->ngRanRetPri.preEmptionVul; + schDrbQos->grbQosFlowInfo.maxFlowBitRateDl = macDrbQos->grbQosInfo.maxFlowBitRateDl; + schDrbQos->grbQosFlowInfo.maxFlowBitRateUl = macDrbQos->grbQosInfo.maxFlowBitRateUl; + schDrbQos->grbQosFlowInfo.guarFlowBitRateDl= macDrbQos->grbQosInfo.guarFlowBitRateDl; + schDrbQos->grbQosFlowInfo.guarFlowBitRateUl= macDrbQos->grbQosInfo.guarFlowBitRateUl; + schDrbQos->pduSessionId = macDrbQos->pduSessionId; + schDrbQos->ulPduSessAggMaxBitRate = macDrbQos->ulPduSessAggMaxBitRate; +} - servCellCfg->firstActvDlBwpId = macSpCellCfg.servCellCfg.firstActvDlBwpId; - servCellCfg->defaultDlBwpId = macSpCellCfg.servCellCfg.defaultDlBwpId; - servCellCfg->bwpInactivityTmr = NULL; - if(macSpCellCfg.servCellCfg.bwpInactivityTmr) +/******************************************************************* + * + * @brief Fill SCH UL logical channel configuration + * + * @details + * + * Function : fillSchUlLcCfg + * + * Functionality: Fills Sch Ul Lc configuration + * + * @params[in] macLcCfg : Logical channel Cfg at MAC + * schLcCfg : LC cfg to fill at scheduler + * @return void + * + * ****************************************************************/ + +void fillSchUlLcCfg(SchUlLcCfg *schUlLcCfg, UlLcCfg *macUlLcCfg) +{ + schUlLcCfg->priority= macUlLcCfg->priority; + schUlLcCfg->lcGroup = macUlLcCfg->lcGroup; + schUlLcCfg->schReqId= macUlLcCfg->schReqId; + schUlLcCfg->pbr = macUlLcCfg->pbr; + schUlLcCfg->bsd = macUlLcCfg->bsd; +} + +/******************************************************************* + * + * @brief Fill logical channel configuration + * + * @details + * + * Function : fillLogicalChannelCfg + * + * Functionality: Fill logical channel configuration + * + * @params[in] macLcCfg : Logical channel Cfg at MAC + * schLcCfg : LC cfg to fill at scheduler + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillLogicalChannelCfg(SchLcCfg *schLcCfg, LcCfg *macLcCfg) +{ + uint8_t sdIdx; + uint8_t ret = ROK; + schLcCfg->lcId = macLcCfg->lcId; + schLcCfg->configType = macLcCfg->configType; + schLcCfg->dlLcCfg.lcp = macLcCfg->dlLcCfg.lcp; + fillSchUlLcCfg(&schLcCfg->ulLcCfg, &macLcCfg->ulLcCfg); + + if(macLcCfg->drbQos) { - /* TODO : This is an optional parameter, not filled currently */ + 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; + } + else + { + schLcCfg->drbQos = NULLP; } - /* Fill PDSCH serving cell config */ - if(fillPdschServCellCfg(macSpCellCfg.servCellCfg.pdschServCellCfg, \ - &servCellCfg->pdschServCellCfg) != ROK) + if(ret == ROK) { - DU_LOG("\nMAC : fillPdschServCellCfg() failed"); + if(macLcCfg->snssai) + { + if(!schLcCfg->snssai) + { + MAC_ALLOC(schLcCfg->snssai, sizeof(SchSnssai)); + if(!schLcCfg->snssai) + { + DU_LOG("\nMAC : Memory alloc failed at snssai at fillLogicalChannelCfg()"); + ret = RFAILED; + } + } + if(ret == ROK) + { + schLcCfg->snssai->sst = macLcCfg->snssai->sst; + for(sdIdx = 0; sdIdx < SD_SIZE; 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 + { + schLcCfg->snssai = NULLP; + } + } + + return ret; +} + +/******************************************************************* + * + * @brief Fills Logical channel Cfg List to Add/Mod/Del + * + * @details + * + * Function : fillSchLcCfgList + * + * Functionality: Fills Logical channel Cfg List to Add/Mod/Del + * + * @params[in] MAC UE Cb Cfg , MAC UE Configuration + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ + +uint8_t fillSchLcCfgList(SchUeCfg *schUeCfg, MacUeCfg *ueCfg) +{ + uint8_t lcIdx; + + for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++) + { + if(fillLogicalChannelCfg(&schUeCfg->schLcCfg[lcIdx], &ueCfg->lcCfgList[lcIdx]) != ROK) + { + DU_LOG("\nMAC : fillLogicalChannelCfg() failed for lc Idx[%d]", lcIdx); + return RFAILED; + } + schUeCfg->numLcs++; + } + return ROK; +} + +/******************************************************************* + * + * @brief Fills and sends UE configuration to Scheduler + * + * @details + * + * Function : fillSchUeCfg + * + * Functionality: Fills and sends UE configuration to Scheduler + * + * @params[in] Ue configuration from DU APP + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillSchUeCfg(Pst *pst, SchUeCfg *schUeCfg, MacUeCfg *ueCfg) +{ + uint8_t ret = ROK; + + schUeCfg->cellId = ueCfg->cellId; + schUeCfg->crnti = ueCfg->crnti; + + /* Copy MAC cell group config */ + memset(&schUeCfg->macCellGrpCfg, 0, sizeof(SchMacCellGrpCfg)); + if(fillMacCellGroupCfg(ueCfg->macCellGrpCfg, &schUeCfg->macCellGrpCfg) != ROK) + { + DU_LOG("\nMAC : fillMacCellGroupCfg() failed"); return RFAILED; } - /* Fill Initail UL BWP */ - if(fillInitialUlBwp(macSpCellCfg.servCellCfg.initUlBwp, \ - &servCellCfg->initUlBwp) != ROK) + /* Copy Physical cell group config */ + memset(&schUeCfg->phyCellGrpCfg, 0,sizeof(SchPhyCellGrpCfg)); + if(fillPhyCellGroupCfg(ueCfg->phyCellGrpCfg, &schUeCfg->phyCellGrpCfg) != ROK) { - DU_LOG("\nMAC : fillInitialUlBwp() failed"); + DU_LOG("\nMAC : fillPhyCellGroupCfg() failed"); return RFAILED; } - servCellCfg->numUlBwpToAdd = macSpCellCfg.servCellCfg.numUlBwpToAdd; - if(servCellCfg->numUlBwpToAdd > MAX_NUM_BWP) + /* Copy sp cell config */ + memset(&schUeCfg->spCellCfg, 0, sizeof(SchSpCellCfg)); + if(fillSpCellCfg(ueCfg->spCellCfg, &schUeCfg->spCellCfg) != ROK) { - DU_LOG("\nMAC : Number of UL BWP to ADD/MOD [%d] exceeds max limit [%d]",\ - servCellCfg->numUlBwpToAdd, MAX_NUM_BWP); + DU_LOG("\nMAC : fillSpCellCfg() failed"); return RFAILED; } - for(idx = 0; idx < servCellCfg->numUlBwpToAdd; idx++) + + if(ueCfg->ambrCfg != NULLP) + { + MAC_ALLOC(schUeCfg->ambrCfg, sizeof(SchAmbrCfg)); + if(!schUeCfg->ambrCfg) + { + DU_LOG("\nMAC : 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()"); + return ret; + } + return ret; +} + +/******************************************************************* + * + * @brief Update UeUlCb Lc List + * + * @details + * + * Function : updateMacUlCb + * + * Functionality: Update UeUlCb Lc List + * + * @params[in] delIdx, UeUlCb pointer + * @return void + * + * ****************************************************************/ + +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)); + } +} + +/******************************************************************* + * + * @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)); + } +} + +/******************************************************************* + * + * @brief Fills Logical channel Cfg List to Add/Mod/Del + * + * @details + * + * Function : fillMacLcCfgList + * + * Functionality: Fills Logical channel Cfg List to Add/Mod/Del + * + * @params[in] MAC UE Cb Cfg , MAC UE Configuration + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ + +uint8_t fillMacLcCfgList(MacUeCb *ueCb, MacUeCfg *ueCfg) +{ + uint8_t lcIdx, ueLcIdx; + + for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++) + { + if(ueCb->dlInfo.numDlLc < MAX_NUM_LC) + { + if(ueCfg->lcCfgList[lcIdx].configType == CONFIG_ADD) + { + /*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 */ + 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; + } + } + } + }/*End of Mod Config */ + } + } + return ROK; +} + +/******************************************************************* + * + * @brief Fills MAC UE Cb Cfg + * + * @details + * + * Function : fillMacUeCb + * + * Functionality: Fills MAC UE Cb Cfg + * + * @params[in] MAC UE Cb Cfg , MAC UE Configuration + * cellIdx + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ + +uint8_t fillMacUeCb(MacUeCb *ueCb, MacUeCfg *ueCfg, uint8_t cellIdx) +{ + uint8_t ret = ROK; + + ueCb->ueIdx = ueCfg->ueIdx; + ueCb->crnti = ueCfg->crnti; + ueCb->cellCb = macCb.macCell[cellIdx]; + 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; + ret = fillMacLcCfgList(ueCb, ueCfg); + if(ret == RFAILED) + { + DU_LOG("\nMAC: Failed while filing MAC LC List at fillMacUeCb()"); + } + return ret; +} + +/******************************************************************* + * + * @brief Function to update Mac Ra Cb + * + * @details + * + * Function : updateMacRaCb + * + * Functionality: Function to update Mac Ra Cb + * + * @params[in] cellIdx, Mac Ue Cb + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ + +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[ueIdx].crnti == ueCb->crnti) + { + ueCb->raCb = &macCb.macCell[cellIdx]->macRaCb[ueIdx]; + break; + } + } + return ROK; +} + +/******************************************************************* + * + * @brief Function to delete Mac Ra Cb + * + * @details + * + * Function : deleteMacRaCb + * + * Functionality: Function to delete Mac Ra Cb + * + * @params[in] cellIdx, Mac Ue Cb + * @return void + * + * ****************************************************************/ + +void deleteMacRaCb(uint16_t cellIdx, MacUeCb *ueCb) +{ + uint8_t ueIdx; + + for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++) { - /* TODO : As of now numDlBwpToAdd = 0 */ + if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == ueCb->crnti) + { + 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; + } } - servCellCfg->firstActvUlBwpId = macSpCellCfg.servCellCfg.firstActvUlBwpId; - - return ROK; + } - /******************************************************************* * - * @brief Fill logical channel configuration + * @brief Creates UE Cb * * @details * - * Function : fillLogicalChannelCfg + * Function : createUeCb * - * Functionality: Fill logical channel configuration + * Functionality: Creates UE Cb * - * @params[in] macLcCfg : Logical channel Cfg at MAC - * schLcCfg : LC cfg to fill at scheduler + * @params[in] MAC UE Configuration * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t fillLogicalChannelCfg(LcCfg macLcCfg, SchLcCfg *schLcCfg) +uint8_t createUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg) { - schLcCfg->lcId = macLcCfg.lcId; - schLcCfg->dlLcCfg.lcp = macLcCfg.dlLcCfg.lcp; - - schLcCfg->drbQos = NULL; - if(macLcCfg.drbQos) - { - /* TODO : Optional Parameter */ - } + uint8_t ret =ROK; - schLcCfg->snssai = NULL; - if(macLcCfg.snssai) + if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\ + &&(ueCb->state == UE_STATE_ACTIVE)) { - /* TODO : Optional Parameter */ + DU_LOG("\n MAC : CRNTI %d already configured ", ueCfg->crnti); + return ROKDUP; } - - schLcCfg->ulLcCfg = NULL; - if(macLcCfg.ulLcCfg) + else { - /* TODO : Optional Parameter */ + memset(ueCb, 0, sizeof(MacUeCb)); + ret = fillMacUeCb(ueCb, ueCfg, cellIdx); + if(ret != ROK) + { + DU_LOG("\nMAC : Failed to create Ue Cb at createUeCb()"); + return ret; + } + else + { + macCb.macCell[cellIdx]->numActvUe++; + updateMacRaCb(cellIdx, ueCb); + return ROK; + } + } - return ROK; } /******************************************************************* * - * @brief Fills and sends UE configuration to Scheduler + * @brief Modify UE Cb Cfg * * @details * - * Function : sendAddUeCreateReqToSch + * Function : modifyUeCb * - * Functionality: Fills and sends UE configuration to Scheduler + * Functionality: modify UE Cb * - * @params[in] Ue configuration from DU APP + * @params[in] MAC UE Configuration * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t sendAddUeCreateReqToSch(MacUeCfg *ueCfg) +uint8_t modifyUeCb(uint8_t cellIdx, MacUeCb *ueCb, MacUeCfg *ueCfg) { - Pst pst; - uint8_t idx; - SchUeCfg schUeCfg; - - schUeCfg.cellId = ueCfg->cellId; - schUeCfg.crnti = ueCfg->crnti; - - /* Copy MAC cell group config */ - memset(&schUeCfg.macCellGrpCfg, 0, sizeof(SchMacCellGrpCfg)); - if(fillMacCellGroupCfg(ueCfg->macCellGrpCfg, &schUeCfg.macCellGrpCfg) != ROK) - { - DU_LOG("\nMAC : fillMacCellGroupCfg() failed"); - return RFAILED; - } - - /* Copy Physical cell group config */ - memset(&schUeCfg.phyCellGrpCfg, 0,sizeof(SchPhyCellGrpCfg)); - if(fillPhyCellGroupCfg(ueCfg->phyCellGrpCfg, &schUeCfg.phyCellGrpCfg) != ROK) - { - DU_LOG("\nMAC : fillPhyCellGroupCfg() failed"); - return RFAILED; - } - - /* Copy sp cell config */ - memset(&schUeCfg.spCellCfg, 0, sizeof(SchSpCellCfg)); - if(fillSpCellCfg(ueCfg->spCellCfg, &schUeCfg.spCellCfg) != ROK) - { - DU_LOG("\nMAC : fillSpCellCfg() failed"); - return RFAILED; - } + uint8_t ret = ROK; - schUeCfg.aggrMaxBitRate = NULL; - if(ueCfg->maxAggrBitRate != NULL) + if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti)\ + &&(ueCb->state == UE_STATE_ACTIVE)) { - - MAC_ALLOC(schUeCfg.aggrMaxBitRate, sizeof(SchAggrMaxBitRate)); - if(!schUeCfg.aggrMaxBitRate) + DU_LOG("\n MAC : Modifying Ue config Req for CRNTI %d ", ueCfg->crnti); + ret = fillMacUeCb(ueCb, ueCfg, cellIdx); + if(ret != ROK) { - DU_LOG("\nMAC : Memory allocation failed in sendAddUeCreateReqToSch"); - return RFAILED; + DU_LOG("\nMAC : Failed to modify MacUeCb at modifyUeCb()"); + return ret; } - schUeCfg.aggrMaxBitRate->ulBitRate = ueCfg->maxAggrBitRate->ulBits; - schUeCfg.aggrMaxBitRate->dlBitRate = ueCfg->maxAggrBitRate->dlBits; - } - - schUeCfg.numLc = ueCfg->numLcs; - if(schUeCfg.numLc > MAX_NUM_LOGICAL_CHANNELS) - { - DU_LOG("\nMAC : Number of Logical channels %d exceeds max limit %d",\ - schUeCfg.numLc, MAX_NUM_LOGICAL_CHANNELS); - } - for(idx = 0; idx < schUeCfg.numLc; idx++) - { - if(fillLogicalChannelCfg(ueCfg->lcCfgList[idx], &schUeCfg.lcCfgList[idx]) != ROK) + else { - DU_LOG("\nMAC : fillLogicalChannelCfg() failed"); - return RFAILED; + deleteMacRaCb(cellIdx, ueCb); + return ROK; } } - - /* Fill event and send UE create request to SCH */ - FILL_PST_MAC_TO_SCH(pst, EVENT_UE_CREATE_REQ_TO_SCH); - return(*macSchUeCreateReqOpts[pst.selector])(&pst, &schUeCfg); + return RFAILED; } + /******************************************************************* * * @brief Creates UE Cb and fills ueCfg * * @details * - * Function : createUeCb + * Function : procMacUeCfgData * * Functionality: Creates UE Cb and fills ueCfg * @@ -698,10 +1997,13 @@ uint8_t sendAddUeCreateReqToSch(MacUeCfg *ueCfg) * RFAILED - failure * * ****************************************************************/ -uint8_t createUeCb(MacUeCfg *ueCfg) + +uint8_t procMacUeCfgData(Pst *pst, MacUeCfg *ueCfg) { - uint16_t ueIdx, lcIdx, cellIdx; - MacUeCb *ueCb; + uint8_t ret = ROK; + uint16_t cellIdx; + MacUeCb *ueCb = NULLP; + GET_CELL_IDX(ueCfg->cellId, cellIdx); @@ -720,174 +2022,56 @@ uint8_t createUeCb(MacUeCfg *ueCfg) } /* Check if UE already configured */ - ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx]; - if(ueCb) - { - if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti) &&\ - (ueCb->state == UE_STATE_ACTIVE)) - { - DU_LOG("\n MAC : CRNTI %d already configured ", ueCfg->crnti); - return ROKDUP; - } - } - - /* Fill received Ue Configuration in UeCb */ - memset(ueCb, 0, sizeof(MacUeCb)); - - ueCb->crnti = ueCfg->crnti; - ueCb->cellCb = macCb.macCell[cellIdx]; - ueCb->dlInfo.dlHarqEnt.numHarqProcs = \ - ueCfg->spCellCfg.servCellCfg.pdschServCellCfg.numHarqProcForPdsch; - ueCb->state = UE_STATE_ACTIVE; - - /* Fill BSR info */ - switch(ueCfg->macCellGrpCfg.bsrTmrCfg.periodicTimer) + ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx -1]; + switch(pst->event) { - case 0: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_1MS; - break; - case 1: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_5MS; - break; - case 2: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_10MS; - break; - case 3: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_16MS; - break; - case 4: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_20MS; - break; - case 5: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_32MS; - break; - case 6: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_40MS; - break; - case 7: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_60MS; - break; - case 8: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_80MS; - break; - case 9: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_128MS; - break; - case 10: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_160MS; - break; - case 11: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_320MS; - break; - case 12: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_640MS; - break; - case 13: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_1280MS; - break; - case 14: - ueCb->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR_2560MS; - break; - default: - DU_LOG("\nMAC : Invalid BSR Periodic Timer"); - return RFAILED; - } - - switch(ueCfg->macCellGrpCfg.bsrTmrCfg.retxTimer) - { - case 0: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_10MS; - break; - case 1: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_20MS; - break; - case 2: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_40MS; - break; - case 3: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_80MS; - break; - case 4: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_160MS; - break; - case 5: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_320MS; - break; - case 6: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_640MS; - break; - case 7: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_1280MS; - break; - case 8: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_2560MS; - break; - case 9: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_5120MS; + 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; - case 10: - ueCb->bsrTmrCfg.retxTimer = RETX_BSR_TMR_10240MS; + 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; default: - DU_LOG("\nMAC : Invalid BSR retransmission timer"); break; } - switch(ueCfg->macCellGrpCfg.bsrTmrCfg.srDelayTimer) - { - case 0: - ueCb->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR_20MS; - break; - case 1: - ueCb->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR_40MS; - break; - case 2: - ueCb->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR_64MS; - break; - case 3: - ueCb->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR_128MS; - break; - case 4: - ueCb->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR_512MS; - break; - case 5: - ueCb->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR_1024MS; - break; - case 6: - ueCb->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR_2560MS; - break; - default: - DU_LOG("\nMAC : Invalid SR delay timer"); - return RFAILED; - } + return ret; +} - /* Fill SRB1 info */ - if(ueCfg->numLcs > MAX_NUM_LOGICAL_CHANNELS) - { - DU_LOG("\nMAC : Number of LC to configure[%d] exceeds limit[%d]",\ - ueCfg->numLcs, MAX_NUM_LOGICAL_CHANNELS); - return RFAILED; - } +/******************************************************************* + * + * @brief Function to store the UeCfg Data + * + * @details + * + * Function : copyToTmpData + * + * Functionality: Function to store the UeCfg Data + * + * @params[in] MacUeCfg pointer + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ - for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++) - { - ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcId = ueCfg->lcCfgList[lcIdx].lcId; - ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcState = LC_STATE_ACTIVE; - ueCb->dlInfo.numDlLc++; - } +uint8_t copyToTmpData(MacUeCfg *ueCfg) +{ + uint8_t cellIdx; + MacUeCfg *tmpData = NULLP; - /* Copy RA Cb */ - for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++) + MAC_ALLOC(tmpData, sizeof(MacUeCfg)); + if(!tmpData) { - if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == ueCb->crnti) - { - ueCb->raCb = &macCb.macCell[cellIdx]->macRaCb[ueIdx]; - break; - } + DU_LOG("\nMAC: Memory Alloc Failed at copyToTmpData()"); + return RFAILED; } - - macCb.macCell[cellIdx]->numActvUe++; - + memcpy(tmpData, ueCfg, sizeof(MacUeCfg)); + GET_CELL_IDX(ueCfg->cellId, cellIdx); + macCb.macCell[cellIdx]->ueCfgTmpData[ueCfg->ueIdx-1] = tmpData; return ROK; } @@ -908,24 +2092,33 @@ uint8_t createUeCb(MacUeCfg *ueCfg) * ****************************************************************/ uint8_t MacProcUeCreateReq(Pst *pst, MacUeCfg *ueCfg) { - uint8_t ret; + uint8_t ret = ROK; + SchUeCfg schUeCfg; + memset(&schUeCfg, 0, sizeof(SchUeCfg)); DU_LOG("\nMAC : UE Create Request for CRNTI[%d]", ueCfg->crnti); if(ueCfg) { - ret = createUeCb(ueCfg); + /*Storing received ueCfg in ueCfgTmpData */ + ret = copyToTmpData(ueCfg); if(ret == ROK) { - ret = sendAddUeCreateReqToSch(ueCfg); + /*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 { - DU_LOG("\nMAC : Failed to send UE Create request to scheduler"); + /* 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"); } } else { - DU_LOG("\nMAC : Failed to create MAC UE Cb "); + DU_LOG("\nMAC : Failed to store MAC UE CFG "); } } else @@ -976,10 +2169,80 @@ uint8_t MacSendUeCreateRsp(MacRsp result, SchUeCfgRsp *schCfgRsp) /* Fill Post structure and send UE Create response*/ memset(&rspPst, 0, sizeof(Pst)); FILL_PST_MAC_TO_DUAPP(rspPst, EVENT_MAC_UE_CREATE_RSP); - return DuMacUeCreateRspOpts[rspPst.selector](&rspPst, cfgRsp); + return (*macDuUeCfgRspOpts[rspPst.selector])(&rspPst, cfgRsp); +} + +/******************************************************************* + * + * @brief Fill and Send UE Reconfig response from MAC to DU APP + * + * @details + * + * Function : MacSendUeReconfigRsp + * + * Functionality: Fill and Send UE Reconfig response from MAC to DUAPP + * + * @params[in] MAC UE create result + * SCH UE create response + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t MacSendUeReconfigRsp(MacRsp result, SchUeCfgRsp *schCfgRsp) +{ + MacUeCfgRsp *cfgRsp; + Pst rspPst; + + MAC_ALLOC_SHRABL_BUF(cfgRsp, sizeof(MacUeCfgRsp)); + if(!cfgRsp) + { + DU_LOG("\nMAC: 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->result = result; + /* Fill Post structure and send UE Create response*/ + memset(&rspPst, 0, sizeof(Pst)); + FILL_PST_MAC_TO_DUAPP(rspPst, EVENT_MAC_UE_RECONFIG_RSP); + return (*macDuUeCfgRspOpts[rspPst.selector])(&rspPst, cfgRsp); } +/******************************************************************* + * + * @brief Function to return Mac Ue Cfg pointer + * + * @details + * + * Function : getMacUeCfg + * + * Functionality: + * Function to return Mac Ue Cfg pointer + * + * @params[in] cellIdx, ueIdx + * + * @return MacUeCfg pointer - success + * NULLP - failure + * + * ****************************************************************/ + +MacUeCfg *getMacUeCfg(uint16_t cellIdx, uint8_t ueIdx) +{ + MacUeCfg *ueCfg = NULLP; + if(macCb.macCell[cellIdx]) + { + ueCfg = macCb.macCell[cellIdx]->ueCfgTmpData[ueIdx-1]; + } + else + { + DU_LOG("\nMAC: Failed to get macCellCb in getMacUeCfg()"); + } + return ueCfg; +} /******************************************************************* * @@ -1004,23 +2267,125 @@ uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp) uint8_t result = MAC_DU_APP_RSP_NOK; uint8_t ret = ROK; uint16_t cellIdx; + MacUeCfg *ueCfg = NULLP; GET_CELL_IDX(schCfgRsp->cellId, cellIdx); + ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueIdx); + if(ueCfg == NULLP) + { + DU_LOG("\nMAC : 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; + } + } + } + else + { + DU_LOG("\nMAC: 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; + } + } + } + else + { + DU_LOG("\nMAC: SCH UeReconfigRsp for CRNTI[%d] is failed in MacProcSchUeCfgRsp()", schCfgRsp->crnti); + } + ret = MacSendUeReconfigRsp(result, schCfgRsp); + } + break; + + default: + break; + } + MAC_FREE(ueCfg, sizeof(MacUeCfg)); + ueCfg = NULLP; + + return ret; +} + +/******************************************************************* + * + * @brief Handles UE Reconfig requst from DU APP + * + * @details + * + * Function : MacProcUeReconfigReq + * + * Functionality: Handles UE Reconfig requst from DU APP + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg) +{ + uint8_t ret = ROK; + SchUeCfg schUeCfg; + memset(&schUeCfg, 0, sizeof(SchUeCfg)); + + DU_LOG("\nMAC : UE Reconfig Request for CRNTI[%d]", ueCfg->crnti); - if(schCfgRsp->rsp == RSP_NOK) + if(ueCfg) { - DU_LOG("\nMAC : SCH UE Create Response : FAILURE [CRNTI %d]", schCfgRsp->crnti); - memset(&macCb.macCell[cellIdx]->ueCb[schCfgRsp->ueIdx], 0, sizeof(MacUeCb)); - macCb.macCell[cellIdx]->numActvUe--; - result = MAC_DU_APP_RSP_NOK; + /*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 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"); + } + } + else + { + DU_LOG("\nMAC : Failed to store MAC UE Cb "); + } } else { - DU_LOG("\nMAC : SCH UE Create Response : SUCCESS [CRNTI %d]", schCfgRsp->crnti); - result = MAC_DU_APP_RSP_OK; + DU_LOG("\nMAC : MAC UE Create request processing failed"); + ret = RFAILED; } - ret = MacSendUeCreateRsp(result, schCfgRsp); - return ret; + /* FREE shared memory */ + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, ueCfg, sizeof(MacUeCfg)); + return ROK; }