X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_ue_mgr.c;h=097e0808cde91d645c96af998acf178f5b245850;hb=7ebfb1f80967fe83bf169c2915cedf2c9fb5cbf7;hp=e4612afd02744e9288a847fe2560a0f2407c8b42;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c index e4612afd0..097e0808c 100644 --- a/src/5gnrsch/sch_ue_mgr.c +++ b/src/5gnrsch/sch_ue_mgr.c @@ -58,8 +58,6 @@ void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\ { Pst rspPst; - DU_LOG("\nSCH: Sending UE Create response to MAC"); - cfgRsp->cellId = ueCfg->cellId; cfgRsp->crnti = ueCfg->crnti; GET_UE_IDX(ueCfg->crnti, cfgRsp->ueIdx); @@ -68,18 +66,21 @@ void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\ /* Filling response post */ memset(&rspPst, 0, sizeof(Pst)); FILL_PST_SCH_TO_MAC(rspPst, inst); - if(event == EVENT_UE_CREATE_REQ_TO_SCH) + if(event == EVENT_ADD_UE_CONFIG_REQ_TO_SCH) { - rspPst.event = EVENT_UE_CREATE_RSP_TO_MAC; + rspPst.event = EVENT_UE_CONFIG_RSP_TO_MAC; + DU_LOG("\nINFO --> SCH : Sending UE Config response to MAC"); } - else if(event == EVENT_UE_RECONFIG_REQ_TO_SCH) + else if(event == EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH) { rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC; + DU_LOG("\nINFO --> SCH : Sending UE Reconfig response to MAC"); } SchUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp); } /******************************************************************* + * * @brief Function to fill Dl Lc Context in SCH Ue Cb * @@ -200,41 +201,67 @@ void updateSchDlCb(uint8_t delIdx, SchDlCb *dlInfo) uint8_t fillSchUeCb(SchUeCb *ueCb, SchUeCfg *ueCfg) { uint8_t lcIdx, ueLcIdx; + + ueCb->ueCfg.cellId = ueCfg->cellId; + ueCb->ueCfg.crnti = ueCfg->crnti; + if(ueCfg->macCellGrpCfgPres == true) + { + memcpy(&ueCb->ueCfg.macCellGrpCfg , &ueCfg->macCellGrpCfg, sizeof(SchMacCellGrpCfg)); + ueCb->ueCfg.macCellGrpCfgPres = true; + } + + if(ueCfg->phyCellGrpCfgPres == true) + { + memcpy(&ueCb->ueCfg.phyCellGrpCfg , &ueCfg->phyCellGrpCfg, sizeof(SchPhyCellGrpCfg)); + ueCb->ueCfg.phyCellGrpCfgPres = true; + } - memset(&ueCb->ueCfg, 0, sizeof(SchUeCfg)); - memcpy(&ueCb->ueCfg, ueCfg, sizeof(SchUeCfg)); + if(ueCfg->spCellCfgPres == true) + { + memcpy(&ueCb->ueCfg.spCellCfg , &ueCfg->spCellCfg, sizeof(SchSpCellCfg)); + ueCb->ueCfg.spCellCfgPres = true; + } ueCb->state = SCH_UE_STATE_ACTIVE; + if(ueCfg->ambrCfg != NULLP) + { + SCH_ALLOC(ueCb->ueCfg.ambrCfg , sizeof(SchAmbrCfg)); + memcpy(&ueCb->ueCfg.ambrCfg->ulBr , &ueCfg->ambrCfg->ulBr, sizeof(SchAmbrCfg)); + } + + memcpy(&ueCb->ueCfg.dlModInfo, &ueCfg->dlModInfo , sizeof(SchModulationInfo)); + memcpy(&ueCb->ueCfg.ulModInfo, &ueCfg->ulModInfo , sizeof(SchModulationInfo)); + //Updating SchUlCb and SchDlCb DB in SchUeCb for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++) { if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_ADD) { - fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueCb->ulInfo.numUlLc], &ueCfg->schLcCfg[lcIdx]); - ueCb->ulInfo.numUlLc++; - fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueCb->dlInfo.numDlLc], &ueCfg->schLcCfg[lcIdx]); - ueCb->dlInfo.numDlLc++; + fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueCb->ulInfo.numUlLc], &ueCfg->schLcCfg[lcIdx]); + ueCb->ulInfo.numUlLc++; + fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueCb->dlInfo.numDlLc], &ueCfg->schLcCfg[lcIdx]); + ueCb->dlInfo.numDlLc++; } else { - for(ueLcIdx = 0; ueLcIdx < ueCb->ulInfo.numUlLc; ueLcIdx++) //searching for Lc to be Mod + for(ueLcIdx = 0; ueLcIdx < ueCb->ulInfo.numUlLc; ueLcIdx++) //searching for Lc to be Mod { - if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].lcId == ueCfg->schLcCfg[lcIdx].lcId) - { - if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_MOD) - { - fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); - fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); - break; - } + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].lcId == ueCfg->schLcCfg[lcIdx].lcId) + { + if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_MOD) + { + fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); + fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); + break; + } if(ueCfg->schLcCfg[ueLcIdx].configType == CONFIG_DEL) { - memset(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], 0, sizeof(SchUlLcCtxt)); - ueCb->ulInfo.numUlLc--; - updateSchUlCb(ueLcIdx, &ueCb->ulInfo); //moving arr elements one idx ahead - memset(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], 0, sizeof(SchDlLcCtxt)); - ueCb->dlInfo.numDlLc--; - updateSchDlCb(ueLcIdx, &ueCb->dlInfo); //moving arr elements one idx ahead - break; + memset(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], 0, sizeof(SchUlLcCtxt)); + ueCb->ulInfo.numUlLc--; + updateSchUlCb(ueLcIdx, &ueCb->ulInfo); //moving arr elements one idx ahead + memset(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], 0, sizeof(SchDlLcCtxt)); + ueCb->dlInfo.numDlLc--; + updateSchDlCb(ueLcIdx, &ueCb->dlInfo); //moving arr elements one idx ahead + break; } } }/*End of inner for loop */ @@ -275,7 +302,7 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) } if(idx == MAX_NUM_CELL) { - DU_LOG("\nSCH : Ue create request failed. Invalid cell id %d", ueCfg->cellId); + DU_LOG("\nERROR --> SCH : Ue create request failed. Invalid cell id %d", ueCfg->cellId); SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp); return NULLP; } @@ -283,7 +310,7 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) /* Check if max number of UE configured */ if(cellCb->numActvUe > MAX_NUM_UE) { - DU_LOG("SCH : Max number of UE [%d] already configured", MAX_NUM_UE); + DU_LOG("\nERROR --> SCH : Max number of UE [%d] already configured", MAX_NUM_UE); SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp); return NULLP; } @@ -293,20 +320,20 @@ SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) /******************************************************************* * - * @brief Hanles Ue create request from MAC + * @brief Function to Add Ue Config Request from MAC * * @details * - * Function : MacSchUeCreateReq + * Function : MacSchAddUeConfigReq * - * Functionality: Hanles Ue create request from MAC + * Functionality: Function to Add Ue config request from MAC * * @params[in] * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) +uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) { uint8_t ueIdx, lcIdx, ret = ROK; SchCellCb *cellCb = NULLP; @@ -317,10 +344,10 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) if(!ueCfg) { - DU_LOG("\nSCH : UE create request failed at MacSchUeCreateReq()"); + DU_LOG("\nERROR --> SCH : Adding UE Config Request failed at MacSchAddUeConfigReq()"); return RFAILED; } - DU_LOG("\nSCH : UE Create Request for CRNTI[%d]", ueCfg->crnti); + DU_LOG("\nDEBUG --> SCH : Adding UE Config Request for CRNTI[%d]", ueCfg->crnti); cellCb = getSchCellCb(pst->event, inst, ueCfg); /* Search if UE already configured */ @@ -330,14 +357,14 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) { if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) { - DU_LOG("\n SCH : CRNTI %d already configured ", ueCfg->crnti); + DU_LOG("\nDEBUG --> SCH : CRNTI %d already configured ", ueCfg->crnti); SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); return ROK; } } else { - DU_LOG("\n SCH : SchUeCb not found at MacSchUeCreateReq() "); + DU_LOG("\nERROR --> SCH : SchUeCb not found at MacSchAddUeConfigReq() "); SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp); return RFAILED; } @@ -383,22 +410,25 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S uint16_t puschSlot = 0; uint16_t startRb = 0; uint8_t numRb = 0; - uint8_t mcs = 4; uint8_t numPdschSymbols= 14; uint16_t tbSize = 0; uint8_t buffer = 5; uint8_t idx = 0; SchCellCb *cellCb = ueCb->cellCb; SchUlSlotInfo *schUlSlotInfo = NULLP; - uint8_t k2 = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].k2; - uint8_t startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol; - uint8_t symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength; - - puschSlot = (pdcchSlot + k2) % SCH_NUM_SLOTS; + uint8_t k2=0, startSymb=0 , symbLen=0; + + if(ueCb->ueCfg.spCellCfgPres == true) + { + k2 = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].k2; + startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol; + symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength; + } + puschSlot = (pdcchSlot + k2) % cellCb->numSlots; startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb; tbSize = schCalcTbSize(dataVol + buffer); /* 2 bytes header + some buffer */ - numRb = schCalcNumPrb(tbSize, mcs, numPdschSymbols); + numRb = schCalcNumPrb(tbSize, ueCb->ueCfg.ulModInfo.mcsIndex, numPdschSymbols); /* increment PUSCH PRB */ cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb; @@ -410,7 +440,9 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S puschInfo->fdAlloc.numPrb = numRb; puschInfo->tdAlloc.startSymb = startSymb; puschInfo->tdAlloc.numSymb = symbLen; - puschInfo->tbInfo.mcs = mcs; + puschInfo->tbInfo.qamOrder = ueCb->ueCfg.ulModInfo.modOrder; + puschInfo->tbInfo.mcs = ueCb->ueCfg.ulModInfo.mcsIndex; + puschInfo->tbInfo.mcsTable = ueCb->ueCfg.ulModInfo.mcsTable; puschInfo->tbInfo.ndi = 1; /* new transmission */ puschInfo->tbInfo.rv = 0; puschInfo->tbInfo.tbSize = tbSize; @@ -429,7 +461,7 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S SCH_ALLOC(schUlSlotInfo->schPuschInfo, sizeof(SchPuschInfo)); if(!schUlSlotInfo->schPuschInfo) { - DU_LOG("SCH: Memory allocation failed in schAllocMsg3Pusch"); + DU_LOG("\nERROR --> SCH: Memory allocation failed in schAllocMsg3Pusch"); return RFAILED; } memcpy(schUlSlotInfo->schPuschInfo, puschInfo, sizeof(SchPuschInfo)); @@ -455,8 +487,14 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo) { SchCellCb *cellCb = ueCb->cellCb; - SchControlRsrcSet coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; - + SchControlRsrcSet coreset1 ; + + memset(&coreset1, 0, sizeof(SchControlRsrcSet)); + if(ueCb->ueCfg.spCellCfgPres == true) + { + coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; + } + dciInfo->cellId = cellCb->cellId; dciInfo->crnti = ueCb->crnti; @@ -521,20 +559,20 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo) /******************************************************************* * - * @brief Hanles Ue Reconfig request from MAC + * @brief Function to Modify Ue Config request from MAC * * @details * - * Function : MacSchUeReconfigReq + * Function : MacSchModUeConfigReq * - * Functionality: Hanles Ue Reconfig request from MAC + * Functionality: Function to modify Ue Config request from MAC * * @params[in] * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg) +uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg) { uint8_t ueIdx, lcIdx, ret = ROK; SchCellCb *cellCb = NULLP; @@ -545,10 +583,10 @@ uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg) if(!ueCfg) { - DU_LOG("\nSCH : Reconfig request failed at MacSchUeReconfigReq()"); + DU_LOG("\nERROR --> SCH : Modifying Ue Config request failed at MacSchModUeConfigReq()"); return RFAILED; } - DU_LOG("\nSCH : Reconfig Request for CRNTI[%d]", ueCfg->crnti); + DU_LOG("\nDEBUG --> SCH : Modifying Ue Config Request for CRNTI[%d]", ueCfg->crnti); cellCb = getSchCellCb(pst->event, inst, ueCfg); /* Search if UE already configured */ @@ -557,7 +595,7 @@ uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg) if(!ueCb) { - DU_LOG("\n SCH : SchUeCb not found at MacSchUeReconfigReq() "); + DU_LOG("\nERROR --> SCH : SchUeCb not found at MacSchModUeConfigReq() "); SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp); return RFAILED; }