X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_rach.c;h=62d38e8a5f37a2e6a8ab205a25cddb328e8d4939;hb=18376996c17ece8306c1fe9539a00010bea607d5;hp=6ff50ac88dd2821b9fd2925c278b9efb24d6f165;hpb=069ae37558afd5aee2d1072bbf5b517cf665bdd8;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c index 6ff50ac88..62d38e8a5 100644 --- a/src/5gnrsch/sch_rach.c +++ b/src/5gnrsch/sch_rach.c @@ -67,6 +67,20 @@ extern SchCb schCb[SCH_MAX_INST]; extern int8_t coresetIdxTable[MAX_CORESET_INDEX][4]; extern int8_t searchSpaceIdxTable[MAX_SEARCH_SPACE_INDEX][4]; +/** + * @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; @@ -75,47 +89,50 @@ uint16_t calculateRaRnti(uint8_t symbolIdx, uint8_t slotIdx, uint8_t freqIdx) 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; } -int schProcessRachInd(RachIndInfo *rachInd, Inst schInst) +/** + * @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]; + uint16_t raRnti = 0; - 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; - } - - slot = ((slot + rarDelay) % SCH_NUM_SLOTS); - - SchDlAlloc *dlAlloc = cell->dlAlloc[slot]; /* RAR will sent in the next slot */ + SchDlAlloc *dlAlloc = + cell->dlAlloc[(rachInd->timingInfo.slot+SCHED_DELTA+RAR_DELAY)%SCH_NUM_SLOTS]; /* RAR will sent in the next slot */ RarInfo *rarInfo = &(dlAlloc->rarInfo); /* rar message presense in next slot ind and will be scheduled */ dlAlloc->rarPres = true; /* calculate the ra-rnti value */ - uint16_t raRnti = 0; raRnti = calculateRaRnti(rachInd->symbolIdx,rachInd->slotIdx,rachInd->freqIdx); /* create raCb at SCH */ @@ -132,46 +149,61 @@ int schProcessRachInd(RachIndInfo *rachInd, Inst schInst) 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) { + 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}; + SchBwpDlCfg *initialBwp = &schCb[inst].cells[inst]->cellCfg.schInitialBwp; PdcchCfg *pdcch = &rarAlloc->rarPdcchCfg; PdschCfg *pdsch = &rarAlloc->rarPdschCfg; - coreset0Idx = 0; - searchSpace0Idx = 0; + coreset0Idx = initialBwp->pdcchCommon.raSearchSpace.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.raSearchSpace.monitoringSymbol & mask) + break; + else + mask = mask>>1; + } /* calculate the PRBs */ freqDomResourceAlloc( ((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource); /* 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->pdcchBwpCfg.BWPSize = initialBwp->bwp.numPrb; + pdcch->pdcchBwpCfg.BWPStart = initialBwp->bwp.firstPrb; + pdcch->pdcchBwpCfg.subcarrierSpacing = initialBwp->bwp.scs; + pdcch->pdcchBwpCfg.cyclicPrefix = initialBwp->bwp.cyclicPrefix; pdcch->coreset0Cfg.startSymbolIndex = firstSymbol; pdcch->coreset0Cfg.durationSymbols = numSymbols; memcpy(pdcch->coreset0Cfg.freqDomainResource,FreqDomainResource,6); @@ -185,7 +217,7 @@ int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offse 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; @@ -201,17 +233,18 @@ int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offse 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->pdschBwpCfg.BWPSize = initialBwp->bwp.numPrb; + pdsch->pdschBwpCfg.BWPStart = initialBwp->bwp.firstPrb; pdsch->numCodewords = 1; 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].mcsIndex = 4; /* mcs configured to 4 */ pdsch->codeword[cwCount].mcsTable = 0; /* notqam256 */ pdsch->codeword[cwCount].rvIndex = 0; - pdsch->codeword[cwCount].tbSize = 768; + pdsch->codeword[cwCount].tbSize = 80/8; /* 38.214: Table 5.1.3.2-1, + devided by 8 to get the value in bytes */ } pdsch->dataScramblingId = pci; pdsch->numLayers = 1;