X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_ue_mgr.c;h=d009614f9d6ed8d837d361e9a408be151a1867ce;hb=ca0353e5cb5699aecb6840efe9572934a1150e2b;hp=d55defdc5fba6cc4741160fef6fe896235882204;hpb=9eb621804acfc1798221e10cd96edf3fa9ea897c;p=o-du%2Fl2.git diff --git a/src/du_app/du_ue_mgr.c b/src/du_app/du_ue_mgr.c index d55defdc5..d009614f9 100644 --- a/src/du_app/du_ue_mgr.c +++ b/src/du_app/du_ue_mgr.c @@ -735,31 +735,31 @@ void fillDefaultInitUlBwp(InitialUlBwp *initUlBwp) if(initUlBwp->puschPresent) { initUlBwp->puschCfg.dataScramblingId = SCRAMBLING_ID; - initUlBwp->puschCfg.dmrsUlCfgForPuschMapTypeA.addPos = ADDITIONALPOSITION_POS0; - initUlBwp->puschCfg.dmrsUlCfgForPuschMapTypeA.transPrecodDisabled. \ - scramblingId0 = SCRAMBLING_ID; - initUlBwp->puschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1; - initUlBwp->puschCfg.numTimeDomRsrcAlloc = 2; - idx = 0; - if(initUlBwp->puschCfg.numTimeDomRsrcAlloc <= MAX_NUM_UL_ALLOC) - { - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG1; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType =\ - MAPPING_TYPEA; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\ - calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL); - - idx++; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG2; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType = MAPPING_TYPEA; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL; - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\ - calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL); - } - initUlBwp->puschCfg.transformPrecoder = TRANSFORM_PRECODER_DISABLED; + initUlBwp->puschCfg.dmrsUlCfgForPuschMapTypeA.addPos = ADDITIONALPOSITION_POS0; + initUlBwp->puschCfg.dmrsUlCfgForPuschMapTypeA.transPrecodDisabled. \ + scramblingId0 = SCRAMBLING_ID; + initUlBwp->puschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1; + initUlBwp->puschCfg.numTimeDomRsrcAlloc = 2; + idx = 0; + if(initUlBwp->puschCfg.numTimeDomRsrcAlloc <= MAX_NUM_UL_ALLOC) + { + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG1; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType =\ + MAPPING_TYPEA; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\ + calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL); + + idx++; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG2; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType = MAPPING_TYPEA; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\ + calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL); + } + initUlBwp->puschCfg.transformPrecoder = TRANSFORM_PRECODER_DISABLED; } } else @@ -778,14 +778,14 @@ void fillDefaultInitUlBwp(InitialUlBwp *initUlBwp) * * Functionality: Fills Sp Cell Group Info * - * @params[in] MacUeCfg *macUeCfg + * @params[in] DuMacUeCfg *macUeCfg * @return ROK - Success * RFAILED - Failure * *****************************************************************/ -uint8_t fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg) +uint8_t fillDefaultSpCellGrpInfo(DuMacUeCfg *macUeCfg) { - SpCellCfg *spCell = NULL; + SpCellRecfg *spCell = NULL; if(macUeCfg) spCell = &macUeCfg->spCellCfg; @@ -802,7 +802,8 @@ uint8_t fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg) return RFAILED; } - spCell->servCellCfg.numDlBwpToAdd = 0; + spCell->servCellCfg.numDlBwpToAddOrMod = 0; + spCell->servCellCfg.numDlBwpToRel = 0; spCell->servCellCfg.firstActvDlBwpId = ACTIVE_DL_BWP_ID; spCell->servCellCfg.defaultDlBwpId = ACTIVE_DL_BWP_ID; spCell->servCellCfg.bwpInactivityTmr = NULLP; @@ -814,8 +815,9 @@ uint8_t fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg) /* Filling Initial UL Bwp*/ fillDefaultInitUlBwp(&spCell->servCellCfg.initUlBwp); - spCell->servCellCfg.numUlBwpToAdd = 0; - spCell->servCellCfg.firstActvUlBwpId = ACTIVE_DL_BWP_ID; + spCell->servCellCfg.numUlBwpToAddOrMod = 0; + spCell->servCellCfg.numUlBwpToRel = 0; + spCell->servCellCfg.firstActvUlBwpId = ACTIVE_DL_BWP_ID; } else { @@ -835,11 +837,11 @@ uint8_t fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg) * * Functionality: Fills Physical Cell Group Info * - * @params[in] MacUeCfg *macUeCfg + * @params[in] DuMacUeCfg *macUeCfg * @return void * *****************************************************************/ -void fillDefaultPhyCellGrpInfo(MacUeCfg *macUeCfg) +void fillDefaultPhyCellGrpInfo(DuMacUeCfg *macUeCfg) { PhyCellGrpCfg *cellGrp = NULL; @@ -868,11 +870,11 @@ void fillDefaultPhyCellGrpInfo(MacUeCfg *macUeCfg) * * Functionality: Fills Mac Cell Group Info * - * @params[in] MacUeCfg *macUeCfg + * @params[in] DuMacUeCfg *macUeCfg * @return void * *****************************************************************/ -void fillDefaultMacCellGrpInfo(MacUeCfg *macUeCfg) +void fillDefaultMacCellGrpInfo(DuMacUeCfg *macUeCfg) { uint8_t idx; MacCellGrpCfg *cellGrp = NULL; @@ -971,7 +973,7 @@ void fillDefaultMacCellGrpInfo(MacUeCfg *macUeCfg) * RFAILED - failure * * ****************************************************************/ -void fillDefaultModulation(MacUeCfg *ueCfg) +void fillDefaultModulation(DuMacUeCfg *ueCfg) { ueCfg->dlModInfo.modOrder = MOD_ORDER_QPSK; ueCfg->dlModInfo.mcsIndex = DEFAULT_MCS; @@ -996,14 +998,14 @@ void fillDefaultModulation(MacUeCfg *ueCfg) * @return void *****************************************************************/ -void fillMacSrb1LcCfg(LcCfg *macLcCfg) +void fillMacSrb1LcCfg(DuLcCfg *macLcCfg) { - macLcCfg->lcId = SRB1_LCID; + macLcCfg->lcConfig.lcId = SRB1_LCID; macLcCfg->configType = CONFIG_ADD; - macLcCfg->drbQos = NULLP; - macLcCfg->snssai = NULLP; - macLcCfg->ulLcCfgPres = true; - fillDefaultUlLcCfg(&macLcCfg->ulLcCfg); + macLcCfg->lcConfig.drbQos = NULLP; + macLcCfg->lcConfig.snssai = NULLP; + macLcCfg->lcConfig.ulLcCfgPres = true; + fillDefaultUlLcCfg(&macLcCfg->lcConfig.ulLcCfg); } /****************************************************************** @@ -1021,71 +1023,71 @@ void fillMacSrb1LcCfg(LcCfg *macLcCfg) * *****************************************************************/ -uint8_t fillMacLcCfgToAddMod(LcCfg *macLcCfgToSend, LcCfg *ueLcCfgDb, LcCfg *oldLcCfg, Bool toUpdate) +uint8_t fillMacLcCfgToAddMod(DuLcCfg *macLcCfgToSend, DuLcCfg *ueLcCfgDb, DuLcCfg *oldLcCfg, Bool toUpdate) { if(!toUpdate) { if(macLcCfgToSend) { - macLcCfgToSend->lcId = ueLcCfgDb->lcId; + macLcCfgToSend->lcConfig.lcId = ueLcCfgDb->lcConfig.lcId; macLcCfgToSend->configType = ueLcCfgDb->configType; - if(ueLcCfgDb->drbQos) - macLcCfgToSend->drbQos = ueLcCfgDb->drbQos; + if(ueLcCfgDb->lcConfig.drbQos) + macLcCfgToSend->lcConfig.drbQos = ueLcCfgDb->lcConfig.drbQos; else if(oldLcCfg) - macLcCfgToSend->drbQos = oldLcCfg->drbQos; + macLcCfgToSend->lcConfig.drbQos = oldLcCfg->lcConfig.drbQos; else - macLcCfgToSend->drbQos = NULL; + macLcCfgToSend->lcConfig.drbQos = NULL; - if(ueLcCfgDb->snssai) - macLcCfgToSend->snssai = ueLcCfgDb->snssai; + if(ueLcCfgDb->lcConfig.snssai) + macLcCfgToSend->lcConfig.snssai = ueLcCfgDb->lcConfig.snssai; else if(oldLcCfg) - macLcCfgToSend->snssai = oldLcCfg->snssai; + macLcCfgToSend->lcConfig.snssai = oldLcCfg->lcConfig.snssai; else - macLcCfgToSend->snssai = NULL; + macLcCfgToSend->lcConfig.snssai = NULL; - macLcCfgToSend->ulLcCfgPres = ueLcCfgDb->ulLcCfgPres; - memcpy(&macLcCfgToSend->ulLcCfg, &ueLcCfgDb->ulLcCfg, sizeof(UlLcCfg)); - memcpy(&macLcCfgToSend->dlLcCfg, &ueLcCfgDb->dlLcCfg, sizeof(DlLcCfg)); + macLcCfgToSend->lcConfig.ulLcCfgPres = ueLcCfgDb->lcConfig.ulLcCfgPres; + memcpy(&macLcCfgToSend->lcConfig.ulLcCfg, &ueLcCfgDb->lcConfig.ulLcCfg, sizeof(UlLcCfg)); + memcpy(&macLcCfgToSend->lcConfig.dlLcCfg, &ueLcCfgDb->lcConfig.dlLcCfg, sizeof(DlLcCfg)); } } else { - oldLcCfg->lcId = ueLcCfgDb->lcId; + oldLcCfg->lcConfig.lcId = ueLcCfgDb->lcConfig.lcId; oldLcCfg->configType = ueLcCfgDb->configType; - if(ueLcCfgDb->drbQos) + if(ueLcCfgDb->lcConfig.drbQos) { - if(oldLcCfg->drbQos) - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->drbQos, sizeof(DrbQosInfo)); + if(oldLcCfg->lcConfig.drbQos) + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->lcConfig.drbQos, sizeof(DrbQosInfo)); - DU_ALLOC_SHRABL_BUF(oldLcCfg->drbQos, sizeof(DrbQosInfo)); - if(oldLcCfg->drbQos == NULL) + DU_ALLOC_SHRABL_BUF(oldLcCfg->lcConfig.drbQos, sizeof(DrbQosInfo)); + if(oldLcCfg->lcConfig.drbQos == NULL) { DU_LOG("\nERROR --> DU APP : Memory Alloc Failed at fillMacLcCfgToAddMod()"); return RFAILED; } - memcpy(oldLcCfg->drbQos, ueLcCfgDb->drbQos, sizeof(DrbQosInfo)); + memcpy(oldLcCfg->lcConfig.drbQos, ueLcCfgDb->lcConfig.drbQos, sizeof(DrbQosInfo)); } - if(ueLcCfgDb->snssai) + if(ueLcCfgDb->lcConfig.snssai) { - if(oldLcCfg->snssai) - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->snssai, sizeof(Snssai)); + if(oldLcCfg->lcConfig.snssai) + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->lcConfig.snssai, sizeof(Snssai)); - DU_ALLOC_SHRABL_BUF(oldLcCfg->snssai, sizeof(Snssai)); - if(oldLcCfg->snssai == NULL) + DU_ALLOC_SHRABL_BUF(oldLcCfg->lcConfig.snssai, sizeof(Snssai)); + if(oldLcCfg->lcConfig.snssai == NULL) { DU_LOG("\nERROR --> DU APP : Memory Alloc Failed at fillMacLcCfgToAddMod()"); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->drbQos, sizeof(DrbQosInfo)); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->lcConfig.drbQos, sizeof(DrbQosInfo)); return RFAILED; } - memcpy(oldLcCfg->snssai, ueLcCfgDb->snssai, sizeof(Snssai)); + memcpy(oldLcCfg->lcConfig.snssai, ueLcCfgDb->lcConfig.snssai, sizeof(Snssai)); } - oldLcCfg->ulLcCfgPres = ueLcCfgDb->ulLcCfgPres; - memcpy(&oldLcCfg->ulLcCfg, &ueLcCfgDb->ulLcCfg, sizeof(UlLcCfg)); - memcpy(&oldLcCfg->dlLcCfg, &ueLcCfgDb->dlLcCfg, sizeof(DlLcCfg)); + oldLcCfg->lcConfig.ulLcCfgPres = ueLcCfgDb->lcConfig.ulLcCfgPres; + memcpy(&oldLcCfg->lcConfig.ulLcCfg, &ueLcCfgDb->lcConfig.ulLcCfg, sizeof(UlLcCfg)); + memcpy(&oldLcCfg->lcConfig.dlLcCfg, &ueLcCfgDb->lcConfig.dlLcCfg, sizeof(DlLcCfg)); } return ROK; } @@ -1147,38 +1149,38 @@ uint8_t fillAmbr(AmbrCfg **macAmbrCfgToSend, AmbrCfg *ueDbAmbr, AmbrCfg **oldMac * * @details * - * Function : sendUeReCfgReqToMac + * Function : sendUeRecfgReqToMac * * Functionality: Builds and Send UE ReConfig Request to MAC * - * @Params[in] MacUeCfg pointer + * @Params[in] MacUeRecfg pointer * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t sendUeReCfgReqToMac(MacUeCfg *macUeCfg) +uint8_t sendUeRecfgReqToMac(MacUeRecfg *macUeRecfg) { uint8_t ret = ROK; Pst pst; - + /* Fill Pst */ FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_UE_RECONFIG_REQ); - - if(macUeCfg) + + if(macUeRecfg) { /* Processing one Ue at a time to MAC */ DU_LOG("\nDEBUG --> DU_APP: Sending Ue Reconfig Request to MAC"); - ret = (*packMacUeReconfigReqOpts[pst.selector])(&pst, macUeCfg); + ret = (*packMacUeReconfigReqOpts[pst.selector])(&pst, macUeRecfg); if(ret == RFAILED) { - DU_LOG("\nERROR --> DU APP : Failed to send Reconfig Request to MAC at sendUeReCfgReqToMac()"); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macUeCfg, sizeof(MacUeCfg)); + DU_LOG("\nERROR --> DU APP : Failed to send Reconfig Request to MAC at sendUeRecfgReqToMac()"); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macUeRecfg, sizeof(MacUeRecfg)); } } else { - DU_LOG("\nERROR --> DU_APP: Received macUeCfg is NULLP at sendUeReCfgReqToMac()"); + DU_LOG("\nERROR --> DU_APP: Received macUeRecfg is NULLP at sendUeRecfgReqToMac()"); ret = RFAILED; } return ret; @@ -1188,57 +1190,57 @@ uint8_t sendUeReCfgReqToMac(MacUeCfg *macUeCfg) /****************************************************************** * - * @brief Fills MacUeCfg structure + * @brief update DuMacUeCfg structure * * @details * - * Function : fillMacUeCfg + * Function : updateDuMacUeCfg * - * Functionality: Fills MacUeCfg + * Functionality: Fills DuMacUeCfg * * @params[in] cellId, ueId, crnti, * DuUeCfg pointer, - * MacUeCfg pointer + * DuMacUeCfg pointer * @return ROK/RFAILED * *****************************************************************/ -uint8_t fillMacUeCfg(uint16_t cellId, uint8_t gnbDuUef1apId, uint16_t crnti, DuUeCfg *ueCfgDb, MacUeCfg *macUeCfg) +uint8_t updateDuMacUeCfg(uint16_t cellId, uint8_t gnbDuUef1apId, uint16_t crnti, DuUeCfg *ueCfgDb, DuMacUeCfg *duMacUeCfg) { uint8_t ret = ROK, dbIdx = 0, lcIdx = 0, cellIdx = 0; bool lcIdFound = false; - MacUeCfg *duMacDb = NULLP; + DuMacUeCfg *duMacDb = NULLP; - macUeCfg->cellId = cellId; - macUeCfg->ueId = gnbDuUef1apId; - macUeCfg->crnti = crnti; + duMacUeCfg->cellId = cellId; + duMacUeCfg->ueId = gnbDuUef1apId; + duMacUeCfg->crnti = crnti; if(!ueCfgDb) { - fillDefaultMacCellGrpInfo(macUeCfg); - fillDefaultPhyCellGrpInfo(macUeCfg); + fillDefaultMacCellGrpInfo(duMacUeCfg); + fillDefaultPhyCellGrpInfo(duMacUeCfg); - if((fillDefaultSpCellGrpInfo(macUeCfg)) != ROK) + if((fillDefaultSpCellGrpInfo(duMacUeCfg)) != ROK) { DU_LOG("\nERROR --> DUAPP : Failed in fillDefaultSpCellGrpInfo"); return RFAILED; } - macUeCfg->ambrCfg = NULLP; - fillDefaultModulation(macUeCfg); - fillMacSrb1LcCfg(&macUeCfg->lcCfgList[0]); - macUeCfg->numLcs++; + duMacUeCfg->ambrCfg = NULLP; + fillDefaultModulation(duMacUeCfg); + fillMacSrb1LcCfg(&duMacUeCfg->lcCfgList[0]); + duMacUeCfg->numLcs++; } else { if(ueCfgDb->dataTransmissionAction == STOP_TRANSMISSION) { - macUeCfg->transmissionAction = ueCfgDb->dataTransmissionAction; + duMacUeCfg->transmissionAction = ueCfgDb->dataTransmissionAction; return ROK; } GET_CELL_IDX(cellId, cellIdx); if(duCb.actvCellLst[cellIdx]) - duMacDb = &duCb.actvCellLst[cellIdx]->ueCb[macUeCfg->ueId-1].macUeCfg; + duMacDb = &duCb.actvCellLst[cellIdx]->ueCb[duMacUeCfg->ueId-1].duMacUeCfg; else { DU_LOG("\nERROR --> DU APP : Cell Id [%d] does not exist", cellId); @@ -1248,56 +1250,56 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t gnbDuUef1apId, uint16_t crnti, DuU if(ueCfgDb->cellGrpCfg) { - ret = procUeReCfgCellInfo(macUeCfg, duMacDb, ueCfgDb->cellGrpCfg); + ret = procUeRecfgCellInfo(duMacUeCfg, duMacDb, ueCfgDb->cellGrpCfg); if(ret == ROK) { - if(macUeCfg->spCellCfgPres == true) + if(duMacUeCfg->spCellCfgPres == true) { - if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent) + if(duMacUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent) { - fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\ - &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL); + fillStartSymbolAndLen(duMacUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\ + &duMacUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL); } - if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent) + if(duMacUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent) { - fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\ - NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg); + fillStartSymbolAndLen(duMacUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\ + NULL, &duMacUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg); } } if(duMacDb) - ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg , &duMacDb->ambrCfg, FALSE); + ret = fillAmbr(&duMacUeCfg->ambrCfg, ueCfgDb->ambrCfg , &duMacDb->ambrCfg, FALSE); else - ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg , NULL, FALSE); + ret = fillAmbr(&duMacUeCfg->ambrCfg, ueCfgDb->ambrCfg , NULL, FALSE); - duFillModulationDetails(macUeCfg, duMacDb, ueCfgDb->ueNrCapability); + duFillModulationDetails(duMacUeCfg, duMacDb, ueCfgDb->ueNrCapability); } } else { - fillDefaultMacCellGrpInfo(macUeCfg); - fillDefaultPhyCellGrpInfo(macUeCfg); - fillDefaultSpCellGrpInfo(macUeCfg); - fillDefaultModulation(macUeCfg); - macUeCfg->ambrCfg = NULLP; + fillDefaultMacCellGrpInfo(duMacUeCfg); + fillDefaultPhyCellGrpInfo(duMacUeCfg); + fillDefaultSpCellGrpInfo(duMacUeCfg); + fillDefaultModulation(duMacUeCfg); + duMacUeCfg->ambrCfg = NULLP; } #ifdef NR_DRX - macUeCfg->drxConfigIndicatorRelease = ueCfgDb->drxConfigIndicatorRelease; + duMacUeCfg->drxConfigIndicatorRelease = ueCfgDb->drxConfigIndicatorRelease; if(ueCfgDb->drxCyclePres) { - macUeCfg->macCellGrpCfg.drxCfg.drxLongCycleStartOffset.drxLongCycleStartOffsetChoice = ueCfgDb->drxCycle.drxLongCycleLength; + duMacUeCfg->macCellGrpCfg.drxCfg.drxLongCycleStartOffset.drxLongCycleStartOffsetChoice = ueCfgDb->drxCycle.drxLongCycleLength; if(ueCfgDb->drxCycle.shortDrxCyclePres) { - macUeCfg->macCellGrpCfg.drxCfg.shortDrxPres = true; - macUeCfg->macCellGrpCfg.drxCfg.shortDrx.drxShortCycle = ueCfgDb->drxCycle.shortDrxCycle.drxShortCycle; - macUeCfg->macCellGrpCfg.drxCfg.shortDrx.drxShortCycleTimer = ueCfgDb->drxCycle.shortDrxCycle.drxShortCycleTimer; + duMacUeCfg->macCellGrpCfg.drxCfg.shortDrxPres = true; + duMacUeCfg->macCellGrpCfg.drxCfg.shortDrx.drxShortCycle = ueCfgDb->drxCycle.shortDrxCycle.drxShortCycle; + duMacUeCfg->macCellGrpCfg.drxCfg.shortDrx.drxShortCycleTimer = ueCfgDb->drxCycle.shortDrxCycle.drxShortCycleTimer; } else { - macUeCfg->macCellGrpCfg.drxCfg.shortDrxPres = false; + duMacUeCfg->macCellGrpCfg.drxCfg.shortDrxPres = false; } } #endif @@ -1305,25 +1307,25 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t gnbDuUef1apId, uint16_t crnti, DuU /* Filling LC Context */ for(dbIdx = 0; (dbIdx < ueCfgDb->numMacLcs && ret == ROK); dbIdx++) { - if(!ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres) + if(!ueCfgDb->macLcCfg[dbIdx].lcConfig.ulLcCfgPres) { /* Filling default UL LC config in MAC if not present */ - ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres = true; - fillDefaultUlLcCfg(&ueCfgDb->macLcCfg[dbIdx].ulLcCfg); + ueCfgDb->macLcCfg[dbIdx].lcConfig.ulLcCfgPres = true; + fillDefaultUlLcCfg(&ueCfgDb->macLcCfg[dbIdx].lcConfig.ulLcCfg); } if(duMacDb) { for(lcIdx = 0; lcIdx < duMacDb->numLcs; lcIdx++) { - if(ueCfgDb->macLcCfg[dbIdx].lcId == duMacDb->lcCfgList[lcIdx].lcId) + if(ueCfgDb->macLcCfg[dbIdx].lcConfig.lcId == duMacDb->lcCfgList[lcIdx].lcConfig.lcId) { lcIdFound = true; if((ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_UNKNOWN) || (ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_MOD)) { ueCfgDb->macLcCfg[dbIdx].configType = CONFIG_MOD; - ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx],\ + ret = fillMacLcCfgToAddMod(&duMacUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx],\ &duMacDb->lcCfgList[lcIdx], FALSE); } } @@ -1335,19 +1337,19 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t gnbDuUef1apId, uint16_t crnti, DuU if(!lcIdFound) { /* ADD/DEL CONFIG */ - ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx], NULL, FALSE); + ret = fillMacLcCfgToAddMod(&duMacUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx], NULL, FALSE); } if(ret == ROK) { - macUeCfg->numLcs++; + duMacUeCfg->numLcs++; } else { - DU_LOG("\nERROR --> DU APP : Failed to add Lc at Idx %d in fillMacUeCfg()", dbIdx); + DU_LOG("\nERROR --> DU APP : Failed to add Lc at Idx %d in updateDuMacUeCfg()", dbIdx); break; } }/*End of Outer FOR loop */ - memcpy(&ueCfgDb->copyOfmacUeCfg, macUeCfg, sizeof(MacUeCfg)); + memcpy(&ueCfgDb->copyOfmacUeCfg, duMacUeCfg, sizeof(DuMacUeCfg)); } return ret; } @@ -1576,7 +1578,7 @@ uint8_t fillRlcSrb1LcCfg(RlcBearerCfg *rlcLcCfg) * * @details * - * Function : sendUeReCfgReqToRlc + * Function : sendUeRecfgReqToRlc * * Functionality: * Processes UE Reconfig Req to RLC UL @@ -1587,7 +1589,7 @@ uint8_t fillRlcSrb1LcCfg(RlcBearerCfg *rlcLcCfg) * *****************************************************************/ -uint8_t sendUeReCfgReqToRlc(RlcUeCfg *rlcUeCfg) +uint8_t sendUeRecfgReqToRlc(RlcUeCfg *rlcUeCfg) { uint8_t ret; Pst pst; @@ -1600,13 +1602,13 @@ uint8_t sendUeReCfgReqToRlc(RlcUeCfg *rlcUeCfg) ret = (*packRlcUeReconfigReqOpts[pst.selector])(&pst, rlcUeCfg); if(ret == RFAILED) { - DU_LOG("\nERROR --> DU_APP : Failed to send Ue Reconfig Req to RLC at sendUeReCfgReqToRlc()"); + DU_LOG("\nERROR --> DU_APP : Failed to send Ue Reconfig Req to RLC at sendUeRecfgReqToRlc()"); DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rlcUeCfg, sizeof(RlcUeCfg)); } } else { - DU_LOG("\nERROR --> DU_APP: Received RlcUeCfg is NULL at sendUeReCfgReqToRlc()"); + DU_LOG("\nERROR --> DU_APP: Received RlcUeCfg is NULL at sendUeRecfgReqToRlc()"); ret = RFAILED; } return ret; @@ -1778,9 +1780,9 @@ uint8_t duCreateUeCb(UeCcchCtxt *ueCcchCtxt, uint32_t gnbCuUeF1apId) duCb.actvCellLst[cellIdx]->ueCb[ueIdx].ueState = UE_ACTIVE; /* Filling Mac Ue Config */ - memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx].macUeCfg, 0, sizeof(MacUeCfg)); + memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx].duMacUeCfg, 0, sizeof(DuMacUeCfg)); ret = duBuildAndSendUeCreateReqToMac(ueCcchCtxt->cellId, ueCcchCtxt->gnbDuUeF1apId, ueCcchCtxt->crnti, NULL, - &duCb.actvCellLst[cellIdx]->ueCb[ueIdx].macUeCfg); + &duCb.actvCellLst[cellIdx]->ueCb[ueIdx].duMacUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed to send UE create request to MAC"); @@ -1799,6 +1801,84 @@ uint8_t duCreateUeCb(UeCcchCtxt *ueCcchCtxt, uint32_t gnbCuUeF1apId) return ret; } +/********************************************************************************** + * + * @brief Fills Ue Cfg from DU DB to MacUeCfg + * + * @details + * + * Function : fillMacUeCfg + * + * Functionality: fills ue Cfg to be sent to MAC + * + * @params[in] DuMacUeCfg Pointer + * MacUeCfg Pointer + * + * @return ROK - success + * RFAILED - failure + * *******************************************************************************/ +void fillMacUeCfg(DuMacUeCfg *duMacUeCfg, MacUeCfg *macUeCfg) +{ + uint8_t lcIdx = 0; + + macUeCfg->cellId = duMacUeCfg->cellId; + macUeCfg->ueId = duMacUeCfg->ueId; + macUeCfg->crnti = duMacUeCfg->crnti; + macUeCfg->macCellGrpCfgPres = duMacUeCfg->macCellGrpCfgPres; + if(macUeCfg->macCellGrpCfgPres) + { + memcpy(&macUeCfg->macCellGrpCfg, &duMacUeCfg->macCellGrpCfg, sizeof(MacCellGrpCfg)); + } + macUeCfg->phyCellGrpCfgPres = duMacUeCfg->phyCellGrpCfgPres; + if(macUeCfg->phyCellGrpCfgPres) + { + memcpy(&macUeCfg->phyCellGrpCfg, &duMacUeCfg->phyCellGrpCfg, sizeof(PhyCellGrpCfg)); + } + macUeCfg->spCellCfgPres = duMacUeCfg->spCellCfgPres; + if(macUeCfg->spCellCfgPres) + { + macUeCfg->spCellCfg.servCellIdx = duMacUeCfg->spCellCfg.servCellIdx; + macUeCfg->spCellCfg.servCellCfg.initDlBwp = duMacUeCfg->spCellCfg.servCellCfg.initDlBwp; + macUeCfg->spCellCfg.servCellCfg.numDlBwpToAdd = duMacUeCfg->spCellCfg.servCellCfg.numDlBwpToAddOrMod; + if(macUeCfg->spCellCfg.servCellCfg.numDlBwpToAdd > 0) + { + memcpy(macUeCfg->spCellCfg.servCellCfg.dlBwpToAddList, duMacUeCfg->spCellCfg.servCellCfg.dlBwpToAddOrModList, \ + (sizeof(DlBwpInfo) * MAX_NUM_BWP)); + } + macUeCfg->spCellCfg.servCellCfg.firstActvDlBwpId = duMacUeCfg->spCellCfg.servCellCfg.firstActvDlBwpId; + macUeCfg->spCellCfg.servCellCfg.defaultDlBwpId = duMacUeCfg->spCellCfg.servCellCfg.defaultDlBwpId; + macUeCfg->spCellCfg.servCellCfg.bwpInactivityTmr = duMacUeCfg->spCellCfg.servCellCfg.bwpInactivityTmr; + memcpy(&macUeCfg->spCellCfg.servCellCfg.pdschServCellCfg, &duMacUeCfg->spCellCfg.servCellCfg.pdschServCellCfg, sizeof(PdschServCellCfg)); + memcpy(&macUeCfg->spCellCfg.servCellCfg.initUlBwp, &duMacUeCfg->spCellCfg.servCellCfg.initUlBwp, sizeof(InitialUlBwp)); + macUeCfg->spCellCfg.servCellCfg.numUlBwpToAdd = duMacUeCfg->spCellCfg.servCellCfg.numUlBwpToAddOrMod; + if(macUeCfg->spCellCfg.servCellCfg.numUlBwpToAdd > 0) + { + memcpy(macUeCfg->spCellCfg.servCellCfg.ulBwpToAddList, duMacUeCfg->spCellCfg.servCellCfg.ulBwpToAddOrModList,\ + (sizeof(UlBwpInfo) * MAX_NUM_BWP)); + } + macUeCfg->spCellCfg.servCellCfg.firstActvUlBwpId = duMacUeCfg->spCellCfg.servCellCfg.firstActvUlBwpId; + } + if(duMacUeCfg->ambrCfg != NULLP) + { + memcpy(macUeCfg->ambrCfg, duMacUeCfg->ambrCfg, sizeof(AmbrCfg)); + } + memcpy(&macUeCfg->dlModInfo, &duMacUeCfg->dlModInfo, sizeof(ModulationInfo)); + memcpy(&macUeCfg->ulModInfo, &duMacUeCfg->ulModInfo, sizeof(ModulationInfo)); + if(duMacUeCfg->numLcs > 0) + { + macUeCfg->numLcs = 0; + for(lcIdx = 0; lcIdx < duMacUeCfg->numLcs; lcIdx++) + { + if(duMacUeCfg->lcCfgList[lcIdx].configType == CONFIG_ADD) + { + //VS: To thoroughly check + memcpy(&macUeCfg->lcCfgList[macUeCfg->numLcs], &duMacUeCfg->lcCfgList[lcIdx].lcConfig, sizeof(LcCfg)); + macUeCfg->numLcs++; + } + } + } +} + /****************************************************************** * * @brief Builds and Send UE Create Request to MAC @@ -1819,7 +1899,7 @@ uint8_t duCreateUeCb(UeCcchCtxt *ueCcchCtxt, uint32_t gnbCuUeF1apId) * * ****************************************************************/ -uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t gnbDuUeF1apId, uint16_t crnti, DuUeCfg *ueCfgDb, MacUeCfg *duMacUeCfg) +uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t gnbDuUeF1apId, uint16_t crnti, DuUeCfg *ueCfgDb, DuMacUeCfg *duMacUeCfg) { uint8_t ret = ROK; MacUeCfg *macUeCfg = NULLP; @@ -1827,7 +1907,7 @@ uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t gnbDuUeF1apId, u memset(&pst, 0, sizeof(Pst)); - ret = fillMacUeCfg(cellId, gnbDuUeF1apId, crnti, ueCfgDb, duMacUeCfg); + ret = updateDuMacUeCfg(cellId, gnbDuUeF1apId, crnti, ueCfgDb, duMacUeCfg); if(ret == RFAILED) { DU_LOG("\nERROR --> DU APP : Failed to fill MacUeCfg at duBuildAndSendUeCreateReqToMac()"); @@ -1842,7 +1922,7 @@ uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t gnbDuUeF1apId, u if(macUeCfg) { memset(macUeCfg, 0, sizeof(MacUeCfg)); - memcpy(macUeCfg, duMacUeCfg, sizeof(MacUeCfg)); + fillMacUeCfg(duMacUeCfg, macUeCfg); DU_LOG("\nDEBUG --> DU_APP: Sending UE create request to MAC"); /* Processing one Ue at a time to MAC */ @@ -2000,22 +2080,22 @@ uint8_t DuProcMacRachRsrcRsp(Pst *pst, MacRachRsrcRsp *rachRsrcRsp) * RFAILED - failure * * ****************************************************************/ -uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) +uint8_t duUpdateMacCfg(DuMacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) { uint8_t ret, lcIdx, dbIdx, numLcs, lcDelIdx, cellIdx; - MacUeCfg *oldMacUeCfg; + DuMacUeCfg *oldMacUeCfg; ret = ROK; - + GET_CELL_IDX(macUeCfg->cellId, cellIdx); if(duCb.actvCellLst[cellIdx] == NULLP) { DU_LOG("\nERROR --> DU APP: CellId[%d] not found", macUeCfg->cellId); return RFAILED; } - oldMacUeCfg = &duCb.actvCellLst[cellIdx]->ueCb[macUeCfg->ueId-1].macUeCfg; + oldMacUeCfg = &duCb.actvCellLst[cellIdx]->ueCb[macUeCfg->ueId-1].duMacUeCfg; /*Filling Cell Group Cfg*/ - ret = procUeReCfgCellInfo(macUeCfg, &f1UeDb->duUeCfg.copyOfmacUeCfg, f1UeDb->duUeCfg.cellGrpCfg); + ret = procUeRecfgCellInfo(macUeCfg, &f1UeDb->duUeCfg.copyOfmacUeCfg, f1UeDb->duUeCfg.cellGrpCfg); #ifdef NR_DRX memcpy(&macUeCfg->macCellGrpCfg.drxCfg, &f1UeDb->duUeCfg.copyOfmacUeCfg.macCellGrpCfg.drxCfg, sizeof(DrxCfg)); #endif @@ -2024,12 +2104,12 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent) { fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\ - &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL); + &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL); } if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent) { fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\ - NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg); + NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg); } ret = fillAmbr(NULL, f1UeDb->duUeCfg.ambrCfg, &oldMacUeCfg->ambrCfg, true); duFillModulationDetails(macUeCfg, oldMacUeCfg, f1UeDb->duUeCfg.ueNrCapability); @@ -2041,42 +2121,42 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) numLcs = macUeCfg->numLcs; for(lcIdx = 0; lcIdx < numLcs; lcIdx++) { - if(f1UeDb->duUeCfg.macLcCfg[dbIdx].lcId == macUeCfg->lcCfgList[lcIdx].lcId) - { - if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_MOD) - { - ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[lcIdx], true); - } - else if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_DEL) - { - /* Free memory at matched lcIdx index */ - freeMacLcCfg(&macUeCfg->lcCfgList[lcIdx]); - macUeCfg->numLcs--; - for(lcDelIdx = lcIdx; lcDelIdx < macUeCfg->numLcs; lcDelIdx++) - { - /* moving all elements one index ahead */ - ret = fillMacLcCfgToAddMod(NULL, &macUeCfg->lcCfgList[lcDelIdx+1], &macUeCfg->lcCfgList[lcDelIdx], true); - freeMacLcCfg(&macUeCfg->lcCfgList[lcDelIdx+1]); - if(ret == RFAILED) - { + if(f1UeDb->duUeCfg.macLcCfg[dbIdx].lcConfig.lcId == macUeCfg->lcCfgList[lcIdx].lcConfig.lcId) + { + if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_MOD) + { + ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[lcIdx], true); + } + else if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_DEL) + { + /* Free memory at matched lcIdx index */ + freeMacLcCfg(&macUeCfg->lcCfgList[lcIdx].lcConfig); + macUeCfg->numLcs--; + for(lcDelIdx = lcIdx; lcDelIdx < macUeCfg->numLcs; lcDelIdx++) + { + /* moving all elements one index ahead */ + ret = fillMacLcCfgToAddMod(NULL, &macUeCfg->lcCfgList[lcDelIdx+1], &macUeCfg->lcCfgList[lcDelIdx], true); + freeMacLcCfg(&macUeCfg->lcCfgList[lcDelIdx+1].lcConfig); + if(ret == RFAILED) + { DU_LOG("\nERROR --> DU APP : Failed to delete LC at Idx %d in duUpdateMacCfg()", lcDelIdx); - break; - } - } - } - } + break; + } + } + } + } } if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_ADD) { - ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[numLcs], true); - if(ret == RFAILED) - { - DU_LOG("\nERROR --> DU APP : Failed to add LC at Idx %d in duUpdateMacCfg()", numLcs); - break; - } - macUeCfg->numLcs++; + ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[numLcs], true); + if(ret == RFAILED) + { + DU_LOG("\nERROR --> DU APP : Failed to add LC at Idx %d in duUpdateMacCfg()", numLcs); + break; + } + macUeCfg->numLcs++; } - + } return ret; } @@ -2433,8 +2513,6 @@ uint8_t duUpdateTunnelCfgDb(uint8_t ueId, uint8_t cellId, DuUeCfg *duUeCfg) break; } } - else - break; } return ret; } @@ -2472,10 +2550,10 @@ uint8_t duUpdateDuUeCbCfg(uint8_t ueId, uint8_t cellId) { /*Filling MAC Ue Cfg */ GET_CRNTI(crnti, ueId); - ueCb->macUeCfg.cellId = cellId; - ueCb->macUeCfg.ueId = ueId; - ueCb->macUeCfg.crnti = crnti; - ret = duUpdateMacCfg(&ueCb->macUeCfg, ueCb->f1UeDb); + ueCb->duMacUeCfg.cellId = cellId; + ueCb->duMacUeCfg.ueId = ueId; + ueCb->duMacUeCfg.crnti = crnti; + ret = duUpdateMacCfg(&ueCb->duMacUeCfg, ueCb->f1UeDb); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed while updating MAC LC Config at duUpdateDuUeCbCfg()"); else @@ -2523,10 +2601,10 @@ uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp) if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].gnbDuUeF1apId == cfgRsp->ueId)) { - duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState = UE_CREATE_COMPLETE; + duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].duMacUeCfg.macUeCfgState = UE_CREATE_COMPLETE; if((duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].ueState == UE_HANDIN_IN_PROGRESS) && - (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState == UE_CREATE_COMPLETE) && + (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].duMacUeCfg.macUeCfgState == UE_CREATE_COMPLETE) && (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState == UE_CREATE_COMPLETE)) { if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK) @@ -2549,29 +2627,70 @@ uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp) } } } - else if(pst->event == EVENT_MAC_UE_RECONFIG_RSP) + } + else + { + DU_LOG("\nERROR --> DU APP : MAC UE CFG Response for EVENT[%d]: FAILURE [DU UE F1AP ID : %d]", pst->event, cfgRsp->ueId); + ret = RFAILED; + } + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacUeCfgRsp)); + } + else + { + DU_LOG("\nERROR --> DU APP : Received MAC Ue Config Response is NULL at DuProcMacUeCfgRsp()"); + ret = RFAILED; + } + return ret; +} + +/******************************************************************* + * + * @brief Handle UE Reconfig response from MAC + * + * @details + * + * Function : DuProcMacUeRecfgRsp + * + * Functionality: Handle UE ReConfig response from MAC + * + * @params[in] Pointer to MacUeRecfgRsp and Pst + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t DuProcMacUeRecfgRsp(Pst *pst, MacUeRecfgRsp *reCfgRsp) +{ + uint8_t ret = ROK; + uint16_t cellIdx; + + if(reCfgRsp) + { + GET_CELL_IDX(reCfgRsp->cellId, cellIdx); + if(reCfgRsp->result == MAC_DU_APP_RSP_OK) + { + if(pst->event == EVENT_MAC_UE_RECONFIG_RSP) { - DU_LOG("\nINFO --> DU APP : MAC UE Reconfig Response : SUCCESS [DU UE F1AP ID : %d]", cfgRsp->ueId); + DU_LOG("\nINFO --> DU APP : MAC UE Reconfig Response : SUCCESS [DU UE F1AP ID : %d]", reCfgRsp->ueId); if(duCb.actvCellLst[cellIdx] && - (duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].gnbDuUeF1apId == cfgRsp->ueId)) + (duCb.actvCellLst[cellIdx]->ueCb[reCfgRsp->ueId -1].gnbDuUeF1apId == reCfgRsp->ueId)) { - duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState = UE_RECFG_COMPLETE; - if((duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState == UE_RECFG_COMPLETE) && - (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState == UE_RECFG_COMPLETE)) + duCb.actvCellLst[cellIdx]->ueCb[reCfgRsp->ueId -1].duMacUeCfg.macUeCfgState = UE_RECFG_COMPLETE; + if((duCb.actvCellLst[cellIdx]->ueCb[reCfgRsp->ueId -1].duMacUeCfg.macUeCfgState == UE_RECFG_COMPLETE) && + (duCb.actvCellLst[reCfgRsp->cellId -1]->ueCb[reCfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState == UE_RECFG_COMPLETE)) { - if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK) + if((ret = duUpdateDuUeCbCfg(reCfgRsp->ueId, reCfgRsp->cellId)) == ROK) { - if((BuildAndSendUeCtxtRsp(cfgRsp->cellId, cfgRsp->ueId)) != ROK) + if((BuildAndSendUeCtxtRsp(reCfgRsp->cellId, reCfgRsp->ueId)) != ROK) { DU_LOG("\nERROR -> DU APP : Failure in BuildAndSendUeCtxtRsp()"); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacUeCfgRsp)); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, reCfgRsp, sizeof(MacUeRecfgRsp)); return RFAILED; } } else { DU_LOG("\nERROR -> DU APP : Failure in updating DU UE CB"); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacUeCfgRsp)); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, reCfgRsp, sizeof(MacUeRecfgRsp)); return RFAILED; } } @@ -2580,24 +2699,23 @@ uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp) } else { - DU_LOG("\nERROR --> DU APP : MAC UE CFG Response for EVENT[%d]: FAILURE [DU UE F1AP ID : %d]", pst->event, cfgRsp->ueId); + DU_LOG("\nERROR --> DU APP : MAC UE RECFG Response for EVENT[%d]: FAILURE [DU UE F1AP ID : %d]", pst->event, reCfgRsp->ueId); if(pst->event == EVENT_MAC_UE_RECONFIG_RSP) { //TODO: Send the failure case in Ue Context Setup Response } ret = RFAILED; } - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacUeCfgRsp)); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, reCfgRsp, sizeof(MacUeRecfgRsp)); } else { - DU_LOG("\nERROR --> DU APP : Received MAC Ue Config Response is NULL at DuProcMacUeCfgRsp()"); + DU_LOG("\nERROR --> DU APP : Received MAC Ue ReConfig Response is NULL at DuProcMacUeRecfgRsp()"); ret = RFAILED; } return ret; } - /******************************************************************* * * @brief Processes UE create Req to RLC UL @@ -2687,7 +2805,7 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp) duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState = UE_CREATE_COMPLETE; if((duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].ueState == UE_HANDIN_IN_PROGRESS) && - (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState == UE_CREATE_COMPLETE) && + (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].duMacUeCfg.macUeCfgState == UE_CREATE_COMPLETE) && (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState == UE_CREATE_COMPLETE)) { if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK) @@ -2715,7 +2833,7 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp) DU_LOG("\nINFO --> DU_APP: RLC UE Reconfig Response : SUCCESS [UE IDX:%d]", cfgRsp->ueId); duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE; - if((duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState == UE_RECFG_COMPLETE) && + if((duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].duMacUeCfg.macUeCfgState == UE_RECFG_COMPLETE) && (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState == UE_RECFG_COMPLETE)) { if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK) @@ -2762,7 +2880,7 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp) * * @details * - * Function : duBuildAndSendUeReCfgReqToRLC + * Function : duBuildAndSendUeRecfgReqToRLC * * Functionality: Builds and Send Ue Reconfig Req to RLC * @@ -2774,7 +2892,7 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp) * * ****************************************************************/ -uint8_t duBuildAndSendUeReCfgReqToRlc(uint8_t cellId, uint8_t gnbDuUeF1apId, uint8_t crnti, DuUeCfg *ueCfgDb) +uint8_t duBuildAndSendUeRecfgReqToRlc(uint8_t cellId, uint8_t gnbDuUeF1apId, uint8_t crnti, DuUeCfg *ueCfgDb) { uint8_t ret = ROK; RlcUeCfg *rlcUeCfg = NULLP; @@ -2785,56 +2903,139 @@ uint8_t duBuildAndSendUeReCfgReqToRlc(uint8_t cellId, uint8_t gnbDuUeF1apId, uin memset(rlcUeCfg, 0, sizeof(RlcUeCfg)); ret = fillRlcUeCfg(cellId, gnbDuUeF1apId, ueCfgDb, rlcUeCfg); if(ret == RFAILED) - DU_LOG("\nERROR --> DU APP : Failed at duBuildAndSendUeReCfgReqToRlc()"); + DU_LOG("\nERROR --> DU APP : Failed at duBuildAndSendUeRecfgReqToRlc()"); else - ret = sendUeReCfgReqToRlc(rlcUeCfg); + ret = sendUeRecfgReqToRlc(rlcUeCfg); } else { - DU_LOG("\nERROR --> DU APP : Memory Alloc failed at duBuildAndSendUeReCfgReqToRlc()"); + DU_LOG("\nERROR --> DU APP : Memory Alloc failed at duBuildAndSendUeRecfgReqToRlc()"); ret = RFAILED; } return ret; } +/********************************************************************************** + * + * @brief Fills Ue ReCfg from DU DB to MacUeRecfg + * + * @details + * + * Function : fillMacUeRecfg + * + * Functionality: fills ue ReCfg to be sent to MAC + * + * @params[in] DuMacUeCfg Pointer + * MacUeRecfg Pointer + * + * @return void + * *******************************************************************************/ +void fillMacUeRecfg(DuMacUeCfg *duMacUeCfg, MacUeRecfg *macUeRecfg) +{ + uint8_t lcIdx = 0; + + macUeRecfg->cellId = duMacUeCfg->cellId; + macUeRecfg->ueId = duMacUeCfg->ueId; + macUeRecfg->crnti = duMacUeCfg->crnti; + macUeRecfg->macCellGrpRecfgPres = duMacUeCfg->macCellGrpCfgPres; + if(macUeRecfg->macCellGrpRecfgPres) + { + memcpy(&macUeRecfg->macCellGrpRecfg, &duMacUeCfg->macCellGrpCfg, sizeof(MacCellGrpCfg)); + } + macUeRecfg->phyCellGrpRecfgPres = duMacUeCfg->phyCellGrpCfgPres; + if(macUeRecfg->phyCellGrpRecfgPres) + { + memcpy(&macUeRecfg->phyCellGrpRecfg, &duMacUeCfg->phyCellGrpCfg, sizeof(PhyCellGrpCfg)); + } + macUeRecfg->spCellRecfgPres = duMacUeCfg->spCellCfgPres; + if(macUeRecfg->spCellRecfgPres) + { + memcpy(&macUeRecfg->spCellRecfg, &duMacUeCfg->spCellCfg, sizeof(SpCellRecfg)); + } + if(duMacUeCfg->ambrCfg != NULLP) + { + DU_ALLOC_SHRABL_BUF(macUeRecfg->ambrRecfg, sizeof(AmbrCfg)); + memcpy(macUeRecfg->ambrRecfg, duMacUeCfg->ambrCfg, sizeof(AmbrCfg)); + } + memcpy(&macUeRecfg->dlModInfo, &duMacUeCfg->dlModInfo, sizeof(ModulationInfo)); + memcpy(&macUeRecfg->ulModInfo, &duMacUeCfg->ulModInfo, sizeof(ModulationInfo)); + if(duMacUeCfg->numLcs > 0) + { + macUeRecfg->numLcsToAdd = 0; + macUeRecfg->numLcsToDel = 0; + macUeRecfg->numLcsToMod = 0; + + for(lcIdx = 0; lcIdx < duMacUeCfg->numLcs; lcIdx++) + { + if(duMacUeCfg->lcCfgList[lcIdx].configType == CONFIG_ADD) + { + /*VS: To thoroughly check*/ + memcpy(&macUeRecfg->lcCfgAdd[macUeRecfg->numLcsToAdd], &duMacUeCfg->lcCfgList[lcIdx].lcConfig, sizeof(LcCfg)); + macUeRecfg->numLcsToAdd++; + } + if(duMacUeCfg->lcCfgList[lcIdx].configType == CONFIG_DEL) + { + /*VS: To thoroughly check*/ + macUeRecfg->lcIdToDel[macUeRecfg->numLcsToDel] = duMacUeCfg->lcCfgList[lcIdx].lcConfig.lcId; + macUeRecfg->numLcsToDel++; + } + if(duMacUeCfg->lcCfgList[lcIdx].configType == CONFIG_MOD) + { + /*VS: To thoroughly check*/ + memcpy(&macUeRecfg->lcCfgMod[macUeRecfg->numLcsToMod], &duMacUeCfg->lcCfgList[lcIdx].lcConfig, sizeof(LcCfg)); + macUeRecfg->numLcsToMod++; + } + } + } + macUeRecfg->transmissionAction = duMacUeCfg->transmissionAction; +#ifdef NR_DRX + macUeRecfg->drxConfigIndicatorRelease = duMacUeCfg->drxConfigIndicatorRelease; +#endif +} + /******************************************************************* * * @brief Builds and Send Ue Reconfig Req to MAC * * @details * - * Function : duBuildAndSendUeReCfgReqToMac + * Function : duBuildAndSendUeRecfgReqToMac * * Functionality: Builds and Send Ue Reconfig Req to MAC * * @params[in] CellGroupConfigRrc_t *macCellGrpCfg * DuUeCfg *ueCfgDb - * MacUeCfg *macUeCfg * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t duBuildAndSendUeReCfgReqToMac(uint8_t cellId, uint8_t duUeF1apId, uint8_t crnti, DuUeCfg *ueCfgDb) +uint8_t duBuildAndSendUeRecfgReqToMac(uint8_t cellId, uint8_t duUeF1apId, uint8_t crnti, DuUeCfg *ueCfgDb) { uint8_t ret = ROK; - MacUeCfg *macUeCfg = NULLP; + DuMacUeCfg *duMacUeCfg = NULLP; + MacUeRecfg *macUeRecfg = NULLP; - DU_ALLOC_SHRABL_BUF(macUeCfg, sizeof(MacUeCfg)); - if(macUeCfg) + DU_ALLOC(duMacUeCfg, sizeof(DuMacUeCfg)); + DU_ALLOC_SHRABL_BUF(macUeRecfg, sizeof(MacUeRecfg)); + if(macUeRecfg && duMacUeCfg) { - memset(macUeCfg, 0, sizeof(MacUeCfg)); - ret = fillMacUeCfg(cellId, duUeF1apId, crnti, ueCfgDb, macUeCfg); + memset(duMacUeCfg, 0, sizeof(DuMacUeCfg)); + memset(macUeRecfg, 0, sizeof(MacUeRecfg)); + ret = updateDuMacUeCfg(cellId, duUeF1apId, crnti, ueCfgDb, duMacUeCfg); + fillMacUeRecfg(duMacUeCfg, macUeRecfg); if(ret == RFAILED) - DU_LOG("\nERROR --> DU APP : Failed to fill Mac Ue Cfg at duBuildAndSendUeReCfgReqToMac()"); + DU_LOG("\nERROR --> DU APP : Failed to fill Mac Ue Cfg at duBuildAndSendUeRecfgReqToMac()"); else - ret = sendUeReCfgReqToMac(macUeCfg); + ret = sendUeRecfgReqToMac(macUeRecfg); } else { - DU_LOG("\nERROR --> DU APP : Memory alloc failed for macUeCfg at duBuildAndSendUeReCfgReqToMac()"); + DU_LOG("\nERROR --> DU APP : Memory alloc failed for macUeCfg at duBuildAndSendUeRecfgReqToMac()"); ret = RFAILED; } + DU_FREE(duMacUeCfg, sizeof(DuMacUeCfg)); + return ret; } @@ -2881,10 +3082,10 @@ uint8_t duBuildAndSendUeContextSetupReq(uint16_t cellId, DuUeCb *ueCb) if(ueCb->ueState == UE_HANDIN_IN_PROGRESS) { /* Filling MAC UE Config */ - memset(&ueCb->macUeCfg, 0, sizeof(MacUeCfg)); + memset(&ueCb->duMacUeCfg, 0, sizeof(DuMacUeCfg)); /* Since UE attach has not yet happened, crnti is unknow. Hence passing 0 */ - ret = duBuildAndSendUeCreateReqToMac(cellId, ueCb->gnbDuUeF1apId, 0, duUeCfg, &ueCb->macUeCfg); + ret = duBuildAndSendUeCreateReqToMac(cellId, ueCb->gnbDuUeF1apId, 0, duUeCfg, &ueCb->duMacUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed to send UE create request to MAC"); @@ -2896,12 +3097,12 @@ uint8_t duBuildAndSendUeContextSetupReq(uint16_t cellId, DuUeCb *ueCb) else { /* Filling RLC UE Reconfig */ - ret = duBuildAndSendUeReCfgReqToRlc(cellId, ueCb->gnbDuUeF1apId, crnti, duUeCfg); + ret = duBuildAndSendUeRecfgReqToRlc(cellId, ueCb->gnbDuUeF1apId, crnti, duUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed to build ctxt setup req for RLC at duBuildAndSendUeContextSetupReq()"); /* Filling MAC UE Reconfig */ - ret = duBuildAndSendUeReCfgReqToMac(cellId, ueCb->gnbDuUeF1apId, crnti, duUeCfg); + ret = duBuildAndSendUeRecfgReqToMac(cellId, ueCb->gnbDuUeF1apId, crnti, duUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed at build ctxt setup req for MAC at duBuildAndSendUeContextSetupReq()"); } @@ -3057,12 +3258,12 @@ uint8_t duBuildAndSendUeContextModReq(uint16_t cellId, uint8_t gnbDuUeF1apId, ui DU_LOG("\nDEBUG --> DU_APP: Processing Ue Context Mod Request for cellId [%d]", cellId); /* Filling RLC Ue Reconfig */ - ret = duBuildAndSendUeReCfgReqToRlc(cellId, gnbDuUeF1apId, crnti, duUeCfg); + ret = duBuildAndSendUeRecfgReqToRlc(cellId, gnbDuUeF1apId, crnti, duUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed to build ctxt setup req for RLC at duBuildAndSendUeContextModReq()"); /* Filling MAC Ue Reconfig */ - ret = duBuildAndSendUeReCfgReqToMac(cellId, gnbDuUeF1apId, crnti, duUeCfg); + ret = duBuildAndSendUeRecfgReqToMac(cellId, gnbDuUeF1apId, crnti, duUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed at build ctxt setup req for MAC at duBuildAndSendUeContextModReq()"); @@ -3188,34 +3389,37 @@ uint8_t duBuildAndSendRachRsrcRelToMac(uint16_t cellId, DuUeCb *ueCb) /******************************************************************* * -* @brief delete MacUeCfg from duCb +* @brief delete DuMacUeCfg from duCb * * @details * * Function : deleteMacUeCfg * -* Functionality: delete MacUeCfg from duCb +* Functionality: delete DuMacUeCfg from duCb * -* @params[in] Pointer to MacUeCfg +* @params[in] Pointer to DuMacUeCfg * @return ROK - success * RFAILED - failure * *******************************************************************/ -void deleteMacUeCfg(MacUeCfg *ueCfg) +void deleteMacUeCfg(DuMacUeCfg *ueCfg) { uint8_t lcCfgIdx=0; - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,ueCfg->ambrCfg, sizeof(AmbrCfg)); if(ueCfg->spCellCfgPres) { - freeUeReCfgCellGrpInfo(ueCfg); + freeUeRecfgCellGrpInfo(ueCfg); + } + if(ueCfg->ambrCfg) + { + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,ueCfg->ambrCfg, sizeof(AmbrCfg)); } for(lcCfgIdx=0; lcCfgIdx< ueCfg->numLcs; lcCfgIdx++) { - freeMacLcCfg(&ueCfg->lcCfgList[lcCfgIdx]); + freeMacLcCfg(&ueCfg->lcCfgList[lcCfgIdx].lcConfig); } - memset(ueCfg, 0, sizeof(MacUeCfg)); + memset(ueCfg, 0, sizeof(DuMacUeCfg)); } /******************************************************************* @@ -3242,11 +3446,11 @@ uint8_t deleteUeCfg(uint16_t cellId, uint8_t ueId) GET_CELL_IDX(cellId, cellIdx); if(duCb.actvCellLst[cellIdx] != NULLP) { - if((duCb.actvCellLst[cellIdx]->ueCb[ueId-1].macUeCfg.macUeCfgState == UE_DELETE_COMPLETE)\ + if((duCb.actvCellLst[cellIdx]->ueCb[ueId-1].duMacUeCfg.macUeCfgState == UE_DELETE_COMPLETE)\ &&(duCb.actvCellLst[cellIdx]->ueCb[ueId-1].rlcUeCfg.rlcUeCfgState == UE_DELETE_COMPLETE)) { ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueId-1]; - deleteMacUeCfg(&ueCb->macUeCfg); + deleteMacUeCfg(&ueCb->duMacUeCfg); deleteRlcUeCfg(&ueCb->rlcUeCfg); if(ueCb->f1UeDb !=NULLP) { @@ -3310,7 +3514,7 @@ uint8_t DuProcMacUeDeleteRsp(Pst *pst, MacUeDeleteRsp *deleteRsp) GET_CELL_IDX(deleteRsp->cellId, cellIdx); if(duCb.actvCellLst[cellIdx]) { - duCb.actvCellLst[cellIdx]->ueCb[deleteRsp->ueId -1].macUeCfg.macUeCfgState = UE_DELETE_COMPLETE; + duCb.actvCellLst[cellIdx]->ueCb[deleteRsp->ueId -1].duMacUeCfg.macUeCfgState = UE_DELETE_COMPLETE; ueId = deleteRsp->ueId; gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbCuUeF1apId; gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbDuUeF1apId;