X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_rach.c;h=77e736f1b50a501c77a9b69acf58f806c4ebfe20;hb=c54639b00f6dbf6b737d6345f19b0d0a8febabc0;hp=6ff50ac88dd2821b9fd2925c278b9efb24d6f165;hpb=8340c342ebcfc82193c3f66e7f15047c1e37399b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c index 6ff50ac88..77e736f1b 100644 --- a/src/5gnrsch/sch_rach.c +++ b/src/5gnrsch/sch_rach.c @@ -31,30 +31,9 @@ /** @file sch_rach.c @brief This file implements the rach handling. */ - -#include "stdbool.h" -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system service interface */ -#include "cm_tkns.h" /* Common Token Defines */ -#include "cm_llist.h" /* Common Link List Defines */ -#include "cm_hash.h" /* Common Hash List Defines */ -#include "cm_mblk.h" /* common memory link list library */ -#include "cm_lte.h" /* Common LTE Defines */ +#include "common_def.h" #include "tfu.h" #include "lrg.h" - -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* system services */ -#include "cm_tkns.x" /* Common Token Definitions */ -#include "cm_llist.x" /* Common Link List Definitions */ -#include "cm_lib.x" /* Common Library Definitions */ -#include "cm_hash.x" /* Common Hash List Definitions */ -#include "cm_mblk.x" /* common memory link list library */ -#include "cm_lte.x" /* Common LTE Defines */ #include "tfu.x" #include "lrg.x" #include "du_log.h" @@ -63,129 +42,364 @@ #include "sch.h" #include "sch_utils.h" -extern SchCb schCb[SCH_MAX_INST]; -extern int8_t coresetIdxTable[MAX_CORESET_INDEX][4]; -extern int8_t searchSpaceIdxTable[MAX_SEARCH_SPACE_INDEX][4]; +SchCb schCb[SCH_MAX_INST]; +uint8_t puschDeltaTable[MAX_MU_PUSCH]; +/** + * @brief calculate ra-rnti function. + * + * @details + * + * Function : calculateRaRnti + * + * This function calculates ra-rnti + * + * @param[in] symbol index + * @param[in] slot index + * @param[in] frequency index + * @return ra-rnti + **/ uint16_t calculateRaRnti(uint8_t symbolIdx, uint8_t slotIdx, uint8_t freqIdx) { uint16_t raRnti = 0; - uint8_t ulCarrierIdx = 0; /* configured to 0 */ - raRnti = (1+symbolIdx+(14*slotIdx)+(14*80*freqIdx)+(14*80*8*ulCarrierIdx)); - return raRnti; + uint8_t ulCarrierIdx = 0; /* Uplink carrier used for MSG1 transmission. 0:NUL carrier; 1:SUL carrier */ + + /* Refer to spec 38.321, section 5.1.3 */ + raRnti = (1 + symbolIdx + (14*slotIdx) + (14*80*freqIdx) + (14*80*8*ulCarrierIdx)); + return raRnti; } +/** + * @brief create raCb function. + * + * @details + * + * Function : createSchRaCb + * + * This function create raCb + * + * @param[in] tcrnti + * @param[in] shed instance + * @return void + **/ void createSchRaCb(uint16_t tcrnti, Inst schInst) { - schCb[schInst].cells[schInst]->raCb[0].tcrnti = tcrnti; + uint8_t ueIdx = 0; + + GET_UE_IDX(tcrnti, ueIdx); + schCb[schInst].cells[schInst]->raCb[ueIdx -1].tcrnti = tcrnti; } -int schProcessRachInd(RachIndInfo *rachInd, Inst schInst) +/** + * @brief resource allocation for msg3 PUSCH + * + * @details + * + * Function : schAllocMsg3Pusch + * + * This function handles msg3 PUSCH allocation + * + * @param[in] Inst schInst, SCH instance + * @param[in] slot, current slot + * @param[out] msg3StartRb + * @param[out] msg3NumRb + * @return void + **/ +SchPuschInfo* schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, uint16_t msg3SlotAlloc) { - SchCellCb *cell = schCb[schInst].cells[schInst]; + SchCellCb *cell = NULLP; + SchUlSlotInfo *schUlSlotInfo = NULLP; + uint8_t startSymb = 0; + uint8_t symbLen = 0; + uint8_t startRb = 0; + uint8_t numRb = 0; + uint8_t idx = 0; + uint8_t mcs = 4; + uint8_t numPdschSymbols= 14; + uint16_t tbSize = 0; + + cell = schCb[schInst].cells[schInst]; + startSymb = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[0].startSymbol; + symbLen = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[0].symbolLength; + + startRb = cell->schUlSlotInfo[msg3SlotAlloc]->puschCurrentPrb; + tbSize = schCalcTbSize(8); /* 6 bytes msg3 and 2 bytes header */ + numRb = schCalcNumPrb(tbSize, mcs, numPdschSymbols); + + /* allocating 1 extra RB for now */ + numRb++; + /* increment PUSCH PRB */ + cell->schUlSlotInfo[msg3SlotAlloc]->puschCurrentPrb += numRb; + + for(idx=startSymb; idxschUlSlotInfo[msg3SlotAlloc]->assignedPrb[idx] = startRb + numRb; + } + schUlSlotInfo = cell->schUlSlotInfo[msg3SlotAlloc]; - uint16_t sfn = rachInd->timingInfo.sfn; /* get the current timing info */ - uint16_t slot = rachInd->timingInfo.slot; - uint16_t sfnSlot = ((sfn * 10) + slot + 1); /* scheduled in the next slot */ - uint8_t rarDelay = 0; - - if(sfnSlot % cell->cellCfg.sib1SchCfg.sib1RepetitionPeriod == 0) - { - /* the next slot has SIB1 occasion, so send it after 2 slot */ - rarDelay = 2; - } - else - { - /* send RAR in the next slot */ - //rarDelay = 1; - rarDelay = 2; - } - - if((slot+rarDelay) % SCH_NUM_SLOTS == 0) - { - sfn = (sfn+1) % SCH_MAX_SFN; + SCH_ALLOC(schUlSlotInfo->schPuschInfo, sizeof(SchPuschInfo)); + if(!schUlSlotInfo->schPuschInfo) + { + DU_LOG("\nERROR --> SCH : Memory allocation failed in schAllocMsg3Pusch"); + return NULLP; } + tbSize = 0; /* since nPrb has been incremented, recalculating tbSize */ + tbSize = schCalcTbSizeFromNPrb(numRb, mcs, numPdschSymbols); + tbSize = tbSize/8;/*bits to byte conversion*/ + schUlSlotInfo->schPuschInfo->crnti = crnti; + schUlSlotInfo->schPuschInfo->harqProcId = SCH_HARQ_PROC_ID; + schUlSlotInfo->schPuschInfo->resAllocType = SCH_ALLOC_TYPE_1; + schUlSlotInfo->schPuschInfo->fdAlloc.startPrb = startRb; + schUlSlotInfo->schPuschInfo->fdAlloc.numPrb = numRb; + schUlSlotInfo->schPuschInfo->tdAlloc.startSymb = startSymb; + schUlSlotInfo->schPuschInfo->tdAlloc.numSymb = symbLen; + schUlSlotInfo->schPuschInfo->tbInfo.qamOrder = 2; /* QPSK modulation */ + schUlSlotInfo->schPuschInfo->tbInfo.mcs = mcs; + schUlSlotInfo->schPuschInfo->tbInfo.mcsTable = SCH_MCS_TABLE_QAM_64; + schUlSlotInfo->schPuschInfo->tbInfo.ndi = 1; /* new transmission */ + schUlSlotInfo->schPuschInfo->tbInfo.rv = 0; + schUlSlotInfo->schPuschInfo->tbInfo.tbSize = tbSize; /*Considering 2 PRBs */ + schUlSlotInfo->schPuschInfo->dmrsMappingType = DMRS_MAP_TYPE_A; /* Setting Type-A */ + schUlSlotInfo->schPuschInfo->nrOfDmrsSymbols = NUM_DMRS_SYMBOLS; + schUlSlotInfo->schPuschInfo->dmrsAddPos = DMRS_ADDITIONAL_POS; + + return schUlSlotInfo->schPuschInfo; +} + +/** + * @brief Processes any pending RA request + * + * @details + * + * Function : schProcessRaReq + * + * This function process pending RA request + * + * @param[in] Current timing of the cell + * @return ROK + **/ +void schProcessRaReq(SlotTimingInfo currTime, SchCellCb *cell) +{ + uint8_t ueIdx = 0; + SchPuschInfo *msg3PuschInfo; + RarInfo *rarInfo = NULLP; + uint8_t delta = 0; + uint8_t k2Index = 0, k2 = 0; + uint8_t puschMu = 0; + uint16_t rarSlot = 0; + uint16_t msg3Slot = 0; +#ifdef NR_TDD + uint16_t slotIdx = 0; +#endif + + while(ueIdx < MAX_NUM_UE) + { + if(cell->raReq[ueIdx] == NULLP) + { + ueIdx++; + continue; + } + + //puschMu = cell->cellCfg.puschMu; + delta = puschDeltaTable[puschMu]; + k2 = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[k2Index].k2; + + /* RAR will sent with a delay of RAR_DELAY */ + rarSlot = (currTime.slot + RAR_DELAY + PHY_DELTA_DL) % cell->numSlots; +#ifdef NR_TDD + for(slotIdx=0; slotIdxnumSlots;slotIdx++) + { + /* Slot allocation for msg3 based on 38.214 section 6.1.2.1 */ + msg3Slot = (rarSlot+delta+k2)%cell->numSlots; + + if((schGetSlotSymbFrmt(rarSlot, cell->slotFrmtBitMap) != DL_SLOT) &&\ + (schGetSlotSymbFrmt(msg3Slot, cell->slotFrmtBitMap) != UL_SLOT)) + { + rarSlot = (rarSlot + 1) % cell->numSlots; + continue; + } + break; + } + if(slotIdx>=cell->numSlots) + { + DU_LOG("\nERROR --> SCH : NO Slot for Msg2 with Msg3 Grant\n"); + return RFAILED; + } +#else + /* Slot allocation for msg3 based on 38.214 section 6.1.2.1 */ + msg3Slot = rarSlot + k2 + delta; + msg3Slot = msg3Slot % cell->numSlots; +#endif - slot = ((slot + rarDelay) % SCH_NUM_SLOTS); + SchDlSlotInfo *schDlSlotInfo = cell->schDlSlotInfo[rarSlot]; /* RAR will sent in the next slot */ - SchDlAlloc *dlAlloc = cell->dlAlloc[slot]; /* RAR will sent in the next slot */ - RarInfo *rarInfo = &(dlAlloc->rarInfo); + /* Allocate the rarInfo, this pointer will be checked at schProcessSlotInd function */ + SCH_ALLOC(rarInfo, sizeof(RarInfo)); + if(rarInfo == NULLP) + { + DU_LOG("\nERROR --> SCH : Memory Allocation failed for rarInfo"); + return RFAILED; + } - /* rar message presense in next slot ind and will be scheduled */ - dlAlloc->rarPres = true; + schDlSlotInfo->rarInfo = rarInfo; + + /* create raCb at SCH */ + createSchRaCb(cell->raReq[ueIdx]->rachInd->crnti, cell->instIdx); + + /* allocate resources for msg3 */ + msg3PuschInfo = schAllocMsg3Pusch(cell->instIdx, rarSlot, cell->raReq[ueIdx]->rachInd->crnti, msg3Slot); + if(msg3PuschInfo) + { + /* fill RAR info */ + rarInfo->raRnti = cell->raReq[ueIdx]->raRnti; + rarInfo->tcrnti = cell->raReq[ueIdx]->rachInd->crnti; + rarInfo->RAPID = cell->raReq[ueIdx]->rachInd->preambleIdx; + rarInfo->ta = cell->raReq[ueIdx]->rachInd->timingAdv; + rarInfo->ulGrant.bwpSize = cell->cellCfg.schInitialUlBwp.bwp.freqAlloc.numPrb; + /* Spec 38.213, section 8.2, 0 : MSG3 PUSCH will be transmitted without frequency hopping */ + rarInfo->ulGrant.freqHopFlag = 0; + rarInfo->ulGrant.msg3FreqAlloc.startPrb = msg3PuschInfo->fdAlloc.startPrb; + rarInfo->ulGrant.msg3FreqAlloc.numPrb = msg3PuschInfo->fdAlloc.numPrb; + rarInfo->ulGrant.k2Index = k2Index; + rarInfo->ulGrant.mcs = msg3PuschInfo->tbInfo.mcs; + rarInfo->ulGrant.tpc = 3; /* TODO : Check appropriate value to be filled */ + /* Spec 38.213, section 8.2 : In a contention based random access + * procedure, the CSI request field is reserved. */ + rarInfo->ulGrant.csiReq = 0; + } + + SCH_FREE(cell->raReq[ueIdx]->rachInd, sizeof(RachIndInfo)); + SCH_FREE(cell->raReq[ueIdx], sizeof(SchRaReq)); + ueIdx++; + + } /* End of while(ueIdx < MAX_NUM_UE) */ +} + +/** + * @brief process rach indication function. + * + * @details + * + * Function : schProcessRachInd + * + * This function process rach indication + * + * @param[in] rachInd parameters + * @param[in] shed instance + * @return ROK + **/ +uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst) +{ + SchCellCb *cell = schCb[schInst].cells[schInst]; + SchRaReq *raReq = NULLP; + float slotDuration; + uint8_t winNumSlots; + uint8_t ueIdx; + + SCH_ALLOC(raReq, sizeof(SchRaReq)); + if(!raReq) + { + DU_LOG("\nERROR --> SCH : Memory allocation failure in schProcessRachInd"); + SCH_FREE(rachInd, sizeof(RachIndInfo)); + return RFAILED; + } /* calculate the ra-rnti value */ - uint16_t raRnti = 0; - raRnti = calculateRaRnti(rachInd->symbolIdx,rachInd->slotIdx,rachInd->freqIdx); + raReq->raRnti = calculateRaRnti(rachInd->symbolIdx, rachInd->slotIdx, rachInd->freqIdx); + raReq->rachInd = rachInd; + raReq->winStartTime.sfn = rachInd->timingInfo.sfn; + raReq->winStartTime.slot = rachInd->timingInfo.slot; + + /* Converting window size from ms to number of slots */ + slotDuration = (1 / pow(2, cell->cellCfg.numerology)); + winNumSlots = (float)cell->cellCfg.schRachCfg.raRspWindow / slotDuration; - /* create raCb at SCH */ - createSchRaCb(rachInd->crnti,schInst); + /* Adding window size to window start time to get window end time */ + ADD_DELTA_TO_TIME(raReq->winStartTime, raReq->winEndTime, winNumSlots); - /* fill RAR info */ - rarInfo->raRnti = raRnti; - rarInfo->tcrnti = rachInd->crnti; - rarInfo->RAPID = rachInd->preambleIdx; - rarInfo->ta = rachInd->timingAdv; - rarInfo->msg3StartRb = 0; /* will be set during implementation of msg3 */ - rarInfo->msg3NumRb = 0; /* will be set during implementation of msg3 */ + /* Storing RA request in cellCb */ + GET_UE_IDX(rachInd->crnti, ueIdx); + cell->raReq[ueIdx] = raReq; return ROK; } -int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offsetPointA) +/** + * @brief fill RAR info function. + * + * @details + * + * Function : calculateRaRnti + * + * This function fills pdcch and pdsch info for RAR + * + * @param[in] rar Allocation info + * @param[in] ra-rnti + * @param[in] PCI + * @param[in] offset to pointA to determine freq alloc + * @return ROK + **/ +uint8_t schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offsetPointA, \ +bool ssbPresent, bool sib1Present) { + Inst inst = 0; uint8_t coreset0Idx = 0; - uint8_t searchSpace0Idx = 0; - //uint8_t ssbMuxPattern = 0; uint8_t numRbs = 0; + uint8_t firstSymbol = 0; uint8_t numSymbols = 0; uint8_t offset = 0; - //uint8_t oValue = 0; - //uint8_t numSearchSpacePerSlot = 0; - //uint8_t mValue = 0; - uint8_t firstSymbol = 0; /* need to calculate using formula mentioned in 38.213 */ uint8_t FreqDomainResource[6] = {0}; + uint16_t tbSize = 0; + uint8_t mcs = 4; /* MCS fixed to 4 */ - PdcchCfg *pdcch = &rarAlloc->rarPdcchCfg; - PdschCfg *pdsch = &rarAlloc->rarPdschCfg; + SchBwpDlCfg *initialBwp = &schCb[inst].cells[inst]->cellCfg.schInitialDlBwp; + PdcchCfg *pdcch = &rarAlloc->rarPdcchCfg; + PdschCfg *pdsch = &rarAlloc->rarPdschCfg; + BwpCfg *bwp = &rarAlloc->bwp; + FreqDomainAlloc *sib1PdschFreqAlloc = NULL; - coreset0Idx = 0; - searchSpace0Idx = 0; + coreset0Idx = initialBwp->pdcchCommon.commonSearchSpace.coresetId; /* derive the sib1 coreset0 params from table 13-1 spec 38.213 */ - //ssbMuxPattern = coresetIdxTable[coreset0Idx][0]; numRbs = coresetIdxTable[coreset0Idx][1]; numSymbols = coresetIdxTable[coreset0Idx][2]; offset = coresetIdxTable[coreset0Idx][3]; - /* derive the search space params from table 13-11 spec 38.213 */ - //oValue = searchSpaceIdxTable[searchSpace0Idx][0]; - //numSearchSpacePerSlot = searchSpaceIdxTable[searchSpace0Idx][1]; - //mValue = searchSpaceIdxTable[searchSpace0Idx][2]; - firstSymbol = searchSpaceIdxTable[searchSpace0Idx][3]; + /* calculate time domain parameters */ + // note: since slot value is made sl1, RAR can be sent at all slots + uint16_t mask = 0x2000; + for(firstSymbol=0; firstSymbol<14;firstSymbol++) + { + if(initialBwp->pdcchCommon.commonSearchSpace.monitoringSymbol & mask) + break; + else + mask = mask>>1; + } /* calculate the PRBs */ - freqDomResourceAlloc( ((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource); + freqDomRscAllocType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource); + + /* fill BWP */ + bwp->freqAlloc.numPrb = initialBwp->bwp.freqAlloc.numPrb; + bwp->freqAlloc.startPrb = initialBwp->bwp.freqAlloc.startPrb; + bwp->subcarrierSpacing = initialBwp->bwp.scs; + bwp->cyclicPrefix = initialBwp->bwp.cyclicPrefix; /* fill the PDCCH PDU */ - pdcch->pdcchBwpCfg.BWPSize = MAX_NUM_RB; /* whole of BW */ - pdcch->pdcchBwpCfg.BWPStart = 0; - pdcch->pdcchBwpCfg.subcarrierSpacing = 0; /* 15Khz */ - pdcch->pdcchBwpCfg.cyclicPrefix = 0; /* normal */ - pdcch->coreset0Cfg.startSymbolIndex = firstSymbol; - pdcch->coreset0Cfg.durationSymbols = numSymbols; - memcpy(pdcch->coreset0Cfg.freqDomainResource,FreqDomainResource,6); - pdcch->coreset0Cfg.cceRegMappingType = 1; /* coreset0 is always interleaved */ - pdcch->coreset0Cfg.regBundleSize = 6; /* spec-38.211 sec 7.3.2.2 */ - pdcch->coreset0Cfg.interleaverSize = 2; /* spec-38.211 sec 7.3.2.2 */ - pdcch->coreset0Cfg.coreSetType = 0; - pdcch->coreset0Cfg.shiftIndex = pci; - pdcch->coreset0Cfg.precoderGranularity = 0; /* sameAsRegBundle */ + pdcch->coresetCfg.startSymbolIndex = firstSymbol; + pdcch->coresetCfg.durationSymbols = numSymbols; + memcpy(pdcch->coresetCfg.freqDomainResource, FreqDomainResource, FREQ_DOM_RSRC_SIZE); + pdcch->coresetCfg.cceRegMappingType = 1; /* coreset0 is always interleaved */ + pdcch->coresetCfg.regBundleSize = 6; /* spec-38.211 sec 7.3.2.2 */ + pdcch->coresetCfg.interleaverSize = 2; /* spec-38.211 sec 7.3.2.2 */ + pdcch->coresetCfg.coreSetType = 0; + pdcch->coresetCfg.shiftIndex = pci; + pdcch->coresetCfg.precoderGranularity = 0; /* sameAsRegBundle */ pdcch->numDlDci = 1; pdcch->dci.rnti = raRnti; /* RA-RNTI */ pdcch->dci.scramblingId = pci; pdcch->dci.scramblingRnti = 0; - pdcch->dci.cceIndex = 0; + pdcch->dci.cceIndex = 4; /* considering SIB1 is sent at cce 0-1-2-3 */ pdcch->dci.aggregLevel = 4; pdcch->dci.beamPdcchInfo.numPrgs = 1; pdcch->dci.beamPdcchInfo.prgSize = 1; @@ -194,45 +408,57 @@ int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offse pdcch->dci.beamPdcchInfo.prg[0].beamIdx[0] = 0; pdcch->dci.txPdcchPower.powerValue = 0; pdcch->dci.txPdcchPower.powerControlOffsetSS = 0; - pdcch->dci.pdschCfg = pdsch; + pdcch->dci.pdschCfg = pdsch; /* fill the PDSCH PDU */ - uint8_t cwCount = 0; + uint8_t cwCount = 0; pdsch->pduBitmap = 0; /* PTRS and CBG params are excluded */ pdsch->rnti = raRnti; /* RA-RNTI */ pdsch->pduIndex = 0; - pdsch->pdschBwpCfg.BWPSize = MAX_NUM_RB; /* whole of BW */ - pdsch->pdschBwpCfg.BWPStart = 0; pdsch->numCodewords = 1; - for(cwCount = 0; cwCount < pdsch->numCodewords; cwCount++) - { + for(cwCount = 0; cwCount < pdsch->numCodewords; cwCount++) + { pdsch->codeword[cwCount].targetCodeRate = 308; pdsch->codeword[cwCount].qamModOrder = 2; - pdsch->codeword[cwCount].mcsIndex = 4; /* msc configured to 4 */ - pdsch->codeword[cwCount].mcsTable = 0; /* notqam256 */ + pdsch->codeword[cwCount].mcsIndex = mcs; /* mcs configured to 4 */ + pdsch->codeword[cwCount].mcsTable = 0; /* notqam256 */ pdsch->codeword[cwCount].rvIndex = 0; - pdsch->codeword[cwCount].tbSize = 768; + /* RAR PDU length and FAPI payload header length */ + tbSize = schCalcTbSize(RAR_PAYLOAD_SIZE + TX_PAYLOAD_HDR_LEN); + pdsch->codeword[cwCount].tbSize = tbSize; } pdsch->dataScramblingId = pci; pdsch->numLayers = 1; pdsch->transmissionScheme = 0; pdsch->refPoint = 0; - pdsch->dmrs.dlDmrsSymbPos = 2; + pdsch->dmrs.dlDmrsSymbPos = 4; /* Bitmap value 00000000000100 i.e. using 3rd symbol for PDSCH DMRS */ pdsch->dmrs.dmrsConfigType = 0; /* type-1 */ pdsch->dmrs.dlDmrsScramblingId = pci; pdsch->dmrs.scid = 0; pdsch->dmrs.numDmrsCdmGrpsNoData = 1; pdsch->dmrs.dmrsPorts = 0; - pdsch->freqAlloc.resourceAlloc = 1; /* RAT type-1 RIV format */ - pdsch->freqAlloc.rbStart = offset + SCH_SSB_PRB_DURATION; /* the RB numbering starts from coreset0, and PDSCH is always above SSB */ - /* formula used for calculation of rbSize, 38.213 section 5.1.3.2 * - * Ninfo = S . Nre . R . Qm . v * - * Nre' = Nsc . NsymPdsch - NdmrsSymb - Noh * - * Nre = min(156,Nre') . nPrb */ - pdsch->freqAlloc.rbSize = 1; /* This value is calculated from above formulae */ - pdsch->freqAlloc.vrbPrbMapping = 0; /* non-interleaved */ - pdsch->timeAlloc.startSymbolIndex = 2; /* spec-38.214, Table 5.1.2.1-1 */ - pdsch->timeAlloc.numSymbols = 12; + pdsch->dmrs.mappingType = DMRS_MAP_TYPE_A; /* Type-A */ + pdsch->dmrs.nrOfDmrsSymbols = NUM_DMRS_SYMBOLS; + pdsch->dmrs.dmrsAddPos = DMRS_ADDITIONAL_POS; + pdsch->pdschFreqAlloc.resourceAllocType = 1; /* RAT type-1 RIV format */ + /* The RB numbering starts from coreset0 */ + pdsch->pdschFreqAlloc.freqAlloc.startPrb = PDSCH_START_RB; + if(ssbPresent) + { + /* PDSCH is always above SSB */ + pdsch->pdschFreqAlloc.freqAlloc.startPrb = offsetPointA + SCH_SSB_NUM_PRB + 1; + } + if(sib1Present) + { + /* Must not overlap with SIB1 */ + sib1PdschFreqAlloc = &schCb[inst].cells[inst]->cellCfg.sib1SchCfg.sib1PdschCfg.pdschFreqAlloc.freqAlloc; + pdsch->pdschFreqAlloc.freqAlloc.startPrb = sib1PdschFreqAlloc->startPrb + sib1PdschFreqAlloc->numPrb + 1; + } + pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize, mcs, \ + initialBwp->pdschCommon.timeDomRsrcAllocList[0].lengthSymbol); + pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */ + pdsch->pdschTimeAlloc.timeAlloc.startSymb = initialBwp->pdschCommon.timeDomRsrcAllocList[0].startSymbol; + pdsch->pdschTimeAlloc.timeAlloc.numSymb = initialBwp->pdschCommon.timeDomRsrcAllocList[0].lengthSymbol; pdsch->beamPdschInfo.numPrgs = 1; pdsch->beamPdschInfo.prgSize = 1; pdsch->beamPdschInfo.digBfInterfaces = 0; @@ -240,8 +466,8 @@ int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offse pdsch->beamPdschInfo.prg[0].beamIdx[0] = 0; pdsch->txPdschPower.powerControlOffset = 0; pdsch->txPdschPower.powerControlOffsetSS = 0; - - return ROK; + + return ROK; } /**********************************************************************