X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_ue_mgr.c;h=d3fbde649023d4c29b6b77aba41aeddb4a10bc13;hb=6b44407d464a5a4e060999255233a7cfe78bb0fa;hp=ee6cdb1e8e7c41166bf7fa3e4505be5c85e049b4;hpb=45d134510deb6902b870b4a0fb574b6075fba601;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c index ee6cdb1e8..d3fbde649 100644 --- a/src/5gnrsch/sch_ue_mgr.c +++ b/src/5gnrsch/sch_ue_mgr.c @@ -79,7 +79,7 @@ void SchSendUeCfgRspToMac(SchUeCfg *ueCfg, Inst inst,\ * * @details * - * Function : macSchUeCreateReq + * Function : MacSchUeCreateReq * * Functionality: Hanles Ue create request from MAC * @@ -88,7 +88,7 @@ void SchSendUeCfgRspToMac(SchUeCfg *ueCfg, Inst inst,\ * RFAILED - failure * * ****************************************************************/ -uint8_t macSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) +uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) { uint8_t idx; uint16_t ueIdx; @@ -131,7 +131,7 @@ uint8_t macSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) /* Search if UE already configured */ GET_UE_IDX(ueCfg->crnti, ueIdx); - ueCb = &cellCb->ueCb[ueIdx]; + ueCb = &cellCb->ueCb[ueIdx -1]; if(ueCb) { if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) @@ -151,10 +151,171 @@ uint8_t macSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) ueCb->state = SCH_UE_STATE_ACTIVE; cellCb->numActvUe++; + ueCb->cellCb = cellCb; + ueCb->srRcvd = false; + for(idx=0; idxbsrInfo[idx].dataVol = 0; + SchSendUeCfgRspToMac(ueCfg, inst, RSP_OK, &cfgRsp); return ROK; } +/******************************************************************* +* +* @brief Fills PUSCH UL allocation +* +* @details +* +* Function : schFillPuschAlloc +* +* Functionality: fills PUSCH info +* +* @params[in] +* @return ROK - success +* RFAILED - failure +* +* ****************************************************************/ +uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, SchPuschInfo *puschInfo) +{ + 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; + + startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb; + tbSize = schCalcTbSize((dataVol + buffer)/8); /* 2 bytes header + some buffer */ + numRb = schCalcNumPrb(tbSize, mcs, numPdschSymbols); + /* increment PUSCH PRB */ + + cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb; + + puschInfo->harqProcId = SCH_HARQ_PROC_ID; + puschInfo->resAllocType = SCH_ALLOC_TYPE_1; + puschInfo->fdAlloc.startPrb = startRb; + puschInfo->fdAlloc.numPrb = numRb; + puschInfo->tdAlloc.startSymb = startSymb; + puschInfo->tdAlloc.numSymb = symbLen; + puschInfo->tbInfo.mcs = mcs; + puschInfo->tbInfo.ndi = 1; /* new transmission */ + puschInfo->tbInfo.rv = 0; + puschInfo->tbInfo.tbSize = tbSize; + puschInfo->dmrsMappingType = DMRS_MAP_TYPE_A; /* Setting Type-A */ + puschInfo->nrOfDmrsSymbols = NUM_DMRS_SYMBOLS; + puschInfo->dmrsAddPos = DMRS_ADDITIONAL_POS; + + /* Update pusch in cell */ + for(idx=startSymb; idxschUlSlotInfo[puschSlot]->assignedPrb[idx] = startRb + numRb; + } + + schUlSlotInfo = cellCb->schUlSlotInfo[puschSlot]; + + SCH_ALLOC(schUlSlotInfo->schPuschInfo, sizeof(SchPuschInfo)); + if(!schUlSlotInfo->schPuschInfo) + { + DU_LOG("SCH: Memory allocation failed in schAllocMsg3Pusch"); + return RFAILED; + } + memcpy(schUlSlotInfo->schPuschInfo, puschInfo, sizeof(SchPuschInfo)); + + return ROK; +} + +/******************************************************************* + * + * @brief Fills DCI for UL grant + * + * @details + * + * Function : schFillUlDci + * + * Functionality: fills DCI for UL grant in response to BSR + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo) +{ + SchCellCb *cellCb = ueCb->cellCb; + SchControlRsrcSet coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; + + dciInfo->cellId = cellCb->cellId; + dciInfo->crnti = ueCb->crnti; + + /* fill bwp cfg */ + dciInfo->bwpCfg.subcarrierSpacing = cellCb->cellCfg.sib1SchCfg.bwp.subcarrierSpacing; + dciInfo->bwpCfg.cyclicPrefix = cellCb->cellCfg.sib1SchCfg.bwp.cyclicPrefix; + dciInfo->bwpCfg.freqAlloc.startPrb = 0; + dciInfo->bwpCfg.freqAlloc.numPrb = MAX_NUM_RB; /* whole of BW */ + + /*fill coreset cfg */ + //Considering number of RBs in coreset1 is same as coreset0 + dciInfo->coresetCfg.coreSetSize = coresetIdxTable[0][1]; + //Considering coreset1 also starts from same symbol as coreset0 + dciInfo->coresetCfg.startSymbolIndex = searchSpaceIdxTable[0][3]; + dciInfo->coresetCfg.durationSymbols = coreset1.duration; + memcpy(dciInfo->coresetCfg.freqDomainResource, coreset1.freqDomainRsrc, FREQ_DOM_RSRC_SIZE); + + dciInfo->coresetCfg.cceRegMappingType = coreset1.cceRegMappingType; /* non-interleaved */ + dciInfo->coresetCfg.regBundleSize = 6; /* must be 6 for non-interleaved */ + dciInfo->coresetCfg.interleaverSize = 0; /* NA for non-interleaved */ + dciInfo->coresetCfg.coreSetType = 1; /* non PBCH coreset */ + dciInfo->coresetCfg.shiftIndex = cellCb->cellCfg.phyCellId; + dciInfo->coresetCfg.precoderGranularity = coreset1.precoderGranularity; + dciInfo->coresetCfg.cceIndex = 0; /* 0-3 for UL and 4-7 for DL */ + dciInfo->coresetCfg.aggregationLevel = 4; /* same as for sib1 */ + + dciInfo->formatType = FORMAT0_0; + + /* fill UL grant */ + dciInfo->format.format0_0.resourceAllocType = puschInfo.resAllocType; + dciInfo->format.format0_0.freqAlloc.startPrb = puschInfo.fdAlloc.startPrb; + dciInfo->format.format0_0.freqAlloc.numPrb = puschInfo.fdAlloc.numPrb; + dciInfo->format.format0_0.timeAlloc.startSymb = puschInfo.tdAlloc.startSymb; + dciInfo->format.format0_0.timeAlloc.numSymb = puschInfo.tdAlloc.numSymb; + dciInfo->format.format0_0.rowIndex = 0; /* row Index */ + dciInfo->format.format0_0.mcs = puschInfo.tbInfo.mcs; + dciInfo->format.format0_0.harqProcId = puschInfo.harqProcId; + dciInfo->format.format0_0.puschHopFlag = FALSE; /* disabled */ + dciInfo->format.format0_0.freqHopFlag = FALSE; /* disabled */ + dciInfo->format.format0_0.ndi = puschInfo.tbInfo.ndi; /* new transmission */ + dciInfo->format.format0_0.rv = puschInfo.tbInfo.rv; + dciInfo->format.format0_0.tpcCmd = 0; //Sphoorthi TODO: check + dciInfo->format.format0_0.sUlCfgd = FALSE; /* SUL not configured */ + + /* Fill DCI Structure */ + dciInfo->dciInfo.rnti = ueCb->crnti; + dciInfo->dciInfo.scramblingId = cellCb->cellCfg.phyCellId; + dciInfo->dciInfo.scramblingRnti = 0; + dciInfo->dciInfo.cceIndex = 0; /* 0-3 for UL and 4-7 for DL */ + dciInfo->dciInfo.aggregLevel = 4; + dciInfo->dciInfo.beamPdcchInfo.numPrgs = 1; + dciInfo->dciInfo.beamPdcchInfo.prgSize = 1; + dciInfo->dciInfo.beamPdcchInfo.digBfInterfaces = 0; + dciInfo->dciInfo.beamPdcchInfo.prg[0].pmIdx = 0; + dciInfo->dciInfo.beamPdcchInfo.prg[0].beamIdx[0] = 0; + dciInfo->dciInfo.txPdcchPower.powerValue = 0; + dciInfo->dciInfo.txPdcchPower.powerControlOffsetSS = 0; + dciInfo->dciInfo.pdschCfg = NULLP; /* No DL data being sent */ + + return ROK; +} + + /********************************************************************** End of file **********************************************************************/