if((prachOccasionTimingInfo.sfn%x) == y)
{
- subFrame = prachOccasionTimingInfo.slot/pow(2, cell->cellCfg.numerology);
+ subFrame = prachOccasionTimingInfo.slot/pow(2, cell->numerology);
/* check for subFrame number */
if ((1 << subFrame) & prachSubframe)
ulSchedInfo->prachSchInfo.prachFormat = prachFormat;
ulSchedInfo->prachSchInfo.numRa = numRa;
ulSchedInfo->prachSchInfo.prachStartSymb = prachStartSymbol;
- DU_LOG("\nINFO --> SCH : RACH occassion set for slot %d", prachOccasionTimingInfo.slot);
+ DU_LOG("\nINFO --> SCH : RACH occassion set for slot %d", prachOccasionTimingInfo.slot);
}
/**
RaRspWindowStatus windowStatus=0;
#ifdef NR_TDD
- totalCfgSlot = calculateSlotPatternLength(cell->cellCfg.scsCommon, cell->cellCfg.tddCfg.tddPeriod);
+ totalCfgSlot = calculateSlotPatternLength(cell->cellCfg.ssbScs, cell->cellCfg.tddCfg.tddPeriod);
#endif
k0K1InfoTbl = &cell->k0K1InfoTbl;
if(cell->raReq[ueId-1]->isCFRA == false)
{
msg3K2InfoTbl = &cell->msg3K2InfoTbl;
- puschMu = cell->cellCfg.numerology;
+ puschMu = cell->numerology;
msg3Delta = puschDeltaTable[puschMu];
- msg3MinSchTime = minMsg3SchTime[cell->cellCfg.numerology];
+ msg3MinSchTime = minMsg3SchTime[cell->numerology];
}
/* Calculating time frame to send DCI for RAR */
if((schFillRar(cell, rarTime, ueId, dciSlotAlloc, k0Index)) != ROK)
{
DU_LOG("\nERROR --> SCH: Scheduling of RAR failed in slot [%d]", rarSlot);
- SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
- cell->schDlSlotInfo[dciSlot]->rarAlloc[ueId-1] = NULLP;
+ if(!dciSlotAlloc->rarPdschCfg)
+ {
+ SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
+ cell->schDlSlotInfo[dciSlot]->rarAlloc[ueId-1] = NULLP;
+ }
return false;
}
/* Fill RAR info */
- dciSlotAlloc->rarInfo.raRnti = cell->raReq[ueId-1]->raRnti;
+ dciSlotAlloc->raRnti = cell->raReq[ueId-1]->raRnti;
dciSlotAlloc->rarInfo.tcrnti = cell->raReq[ueId-1]->rachInd->crnti;
dciSlotAlloc->rarInfo.RAPID = cell->raReq[ueId-1]->rachInd->preambleIdx;
dciSlotAlloc->rarInfo.ta = cell->raReq[ueId-1]->rachInd->timingAdv;
* If not, allocate memory RAR PDSCH slot to store RAR info
*/
if(dciSlot == rarSlot)
- dciSlotAlloc->pduPres = BOTH;
+ {
+ SCH_ALLOC(dciSlotAlloc->rarPdschCfg, sizeof(PdschCfg));
+ if(dciSlotAlloc->rarPdschCfg)
+ {
+ memcpy(dciSlotAlloc->rarPdschCfg, &dciSlotAlloc->rarPdcchCfg->dci.pdschCfg, sizeof(PdschCfg));
+ }
+ else
+ {
+ SCH_FREE(dciSlotAlloc->rarPdcchCfg, sizeof(PdcchCfg));
+ SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
+ cell->schDlSlotInfo[dciSlot]->rarAlloc[ueId-1] = NULLP;
+ DU_LOG("\nERROR --> SCH : Memory Allocation failed for dciSlotAlloc->rarPdschCfg");
+ return false;
+ }
+
+ }
else
{
/* Allocate memory to schedule rarSlot to send RAR, pointer will be checked at schProcessSlotInd() */
if(rarSlotAlloc == NULLP)
{
DU_LOG("\nERROR --> SCH : Memory Allocation failed for rarSlotAlloc");
- SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
- cell->schDlSlotInfo[dciSlot]->rarAlloc[ueId-1] = NULLP;
+ SCH_FREE(dciSlotAlloc->rarPdcchCfg, sizeof(PdcchCfg));
+ if(!dciSlotAlloc->rarPdschCfg)
+ {
+ SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
+ cell->schDlSlotInfo[dciSlot]->rarAlloc[ueId-1] = NULLP;
+ }
return false;
}
cell->schDlSlotInfo[rarSlot]->rarAlloc[ueId-1] = rarSlotAlloc;
/* Copy all RAR info */
- memcpy(rarSlotAlloc, dciSlotAlloc, sizeof(RarAlloc));
- rarSlotAlloc->rarPdcchCfg.dci.pdschCfg = &rarSlotAlloc->rarPdschCfg;
-
- /* Assign correct PDU types in corresponding slots */
- rarSlotAlloc->pduPres = PDSCH_PDU;
- dciSlotAlloc->pduPres = PDCCH_PDU;
- dciSlotAlloc->pdschSlot = rarSlot;
+ rarSlotAlloc->raRnti = dciSlotAlloc->raRnti;
+ rarSlotAlloc->bwp = dciSlotAlloc->bwp;
+ SCH_ALLOC(rarSlotAlloc->rarPdschCfg, sizeof(PdschCfg));
+ if(rarSlotAlloc->rarPdschCfg)
+ {
+ memcpy(rarSlotAlloc->rarPdschCfg, &dciSlotAlloc->rarPdcchCfg->dci.pdschCfg,sizeof(PdschCfg));
+ }
+ else
+ {
+ DU_LOG("\nERROR --> SCH : Memory Allocation failed for rarSlotAlloc->rarPdschCfg");
+ SCH_FREE(dciSlotAlloc->rarPdcchCfg, sizeof(PdcchCfg));
+ if(!dciSlotAlloc->rarPdschCfg)
+ {
+ SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
+ cell->schDlSlotInfo[dciSlot]->rarAlloc[ueId-1] = NULLP;
+ }
+ SCH_FREE(rarSlotAlloc, sizeof(RarAlloc));
+ cell->schDlSlotInfo[rarSlot]->rarAlloc[ueId-1] = NULLP;
+ return false;
+ }
}
cell->schDlSlotInfo[dciSlot]->pdcchUe = ueId;
raReq->winStartTime.slot = rachInd->timingInfo.slot;
/* Converting window size from ms to number of slots */
- slotDuration = (1 / pow(2, cell->cellCfg.numerology));
+ slotDuration = (1 / pow(2, cell->numerology));
winNumSlots = (float)cell->cellCfg.ulCfgCommon.schInitialUlBwp.schRachCfg.prachCfgGeneric.raRspWindow / slotDuration;
/* Adding window size to window start time to get window end time */
uint8_t dmrsStartSymbol, startSymbol, numSymbol ;
uint16_t numRbs = 0;
uint16_t tbSize = 0;
+ PdschCfg *pdsch;
SchBwpDlCfg *initialBwp = &cell->cellCfg.dlCfgCommon.schInitialDlBwp;
- PdcchCfg *pdcch = &rarAlloc->rarPdcchCfg;
- PdschCfg *pdsch = &rarAlloc->rarPdschCfg;
+ SCH_ALLOC(rarAlloc->rarPdcchCfg, sizeof(PdcchCfg));
+ if(rarAlloc->rarPdcchCfg == NULLP)
+ {
+ DU_LOG("\nERROR --> SCH : Memory allocation failed in %s",__func__);
+ return RFAILED;
+ }
+ PdcchCfg *pdcch = rarAlloc->rarPdcchCfg;
BwpCfg *bwp = &rarAlloc->bwp;
/* derive the sib1 coreset0 params from table 13-1 spec 38.213 */
pdcch->dci.beamPdcchInfo.prg[0].beamIdx[0] = 0;
pdcch->dci.txPdcchPower.beta_pdcch_1_0 = 0;
pdcch->dci.txPdcchPower.powerControlOffsetSS = 0;
- pdcch->dci.pdschCfg = pdsch;
+ pdsch = &pdcch->dci.pdschCfg;
/* fill the PDSCH PDU */
uint8_t cwCount = 0;
pdsch->pduBitmap = 0; /* PTRS and CBG params are excluded */
&pdsch->pdschFreqAlloc.startPrb, pdsch->pdschFreqAlloc.numPrb)) != ROK)
{
DU_LOG("\nERROR --> SCH : allocatePrbDl() failed for RAR");
+ SCH_FREE(rarAlloc->rarPdcchCfg, sizeof(PdcchCfg));
return RFAILED;
}