uint8_t updateDedLcInfo(Inst inst, Snssai *snssai, uint16_t *rsvdDedicatedPRB, bool *isDedicated)
{
- uint8_t sliceCfgIdx =0;
- SchSliceCfg sliceCfg = schCb[inst].sliceCfg;
+ CmLList *sliceCfg = schCb[inst].sliceCfg.first;
+ SchRrmPolicyOfSlice *rrmPolicyOfSlices;
- if(sliceCfg.numOfSliceConfigured)
+ while(sliceCfg)
{
- for(sliceCfgIdx = 0; sliceCfgIdx<sliceCfg.numOfSliceConfigured; sliceCfgIdx++)
+ rrmPolicyOfSlices = (SchRrmPolicyOfSlice*)sliceCfg->node;
+ if(rrmPolicyOfSlices && (memcmp(snssai, &(rrmPolicyOfSlices->snssai), sizeof(Snssai)) == 0))
{
- if(memcmp(snssai, &(sliceCfg.listOfSlices[sliceCfgIdx]->snssai), sizeof(Snssai)) == 0)
- {
- /*Updating latest RrmPolicy*/
- *rsvdDedicatedPRB = \
- (uint16_t)(((sliceCfg.listOfSlices[sliceCfgIdx]->rrmPolicyRatioInfo.dedicatedRatio)*(MAX_NUM_RB))/100);
- *isDedicated = TRUE;
- DU_LOG("\nINFO --> SCH : Updated RRM policy, reservedPOOL:%d",*rsvdDedicatedPRB);
- }
- }
- /*case: This LcCtxt is either a Default LC or this LC is part of someother RRM_MemberList*/
- if(*isDedicated != TRUE)
- {
- DU_LOG("\nINFO --> SCH : This SNSSAI is not a part of this RRMPolicy");
+ /*Updating latest RrmPolicy*/
+ *rsvdDedicatedPRB = \
+ (uint16_t)(((rrmPolicyOfSlices->rrmPolicyRatioInfo.dedicatedRatio)*(MAX_NUM_RB))/100);
+ *isDedicated = TRUE;
+ DU_LOG("\nINFO --> SCH : Updated RRM policy, reservedPOOL:%d",*rsvdDedicatedPRB);
+ break;
}
+ sliceCfg = sliceCfg->next;
+ }
+ /*case: This LcCtxt is either a Default LC or this LC is part of someother RRM_MemberList*/
+ if(*isDedicated != TRUE)
+ {
+ DU_LOG("\nINFO --> SCH : This SNSSAI is not a part of this RRMPolicy");
}
return ROK;
}
uint8_t schFillUlDciForMsg3Retx(SchRaCb *raCb, SchPuschInfo *puschInfo, DciInfo *dciInfo)
{
SchCellCb *cellCb = raCb->cell;
- dciInfo->cellId = cellCb->cellId;
+
dciInfo->crnti = raCb->tcrnti;
SchUlHqProcCb *msg3HqProc = &raCb->msg3HqProc;
if (msg3HqProc == NULLP)
}
/* fill bwp cfg */
- dciInfo->bwpCfg.subcarrierSpacing = cellCb->cellCfg.sib1SchCfg.bwp.subcarrierSpacing;
- dciInfo->bwpCfg.cyclicPrefix = cellCb->cellCfg.sib1SchCfg.bwp.cyclicPrefix;
- dciInfo->bwpCfg.freqAlloc.startPrb = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.startPrb;
- dciInfo->bwpCfg.freqAlloc.numPrb = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.numPrb;
+ dciInfo->bwpCfg.subcarrierSpacing = cellCb->sib1SchCfg.bwp.subcarrierSpacing;
+ dciInfo->bwpCfg.cyclicPrefix = cellCb->sib1SchCfg.bwp.cyclicPrefix;
+ dciInfo->bwpCfg.freqAlloc.startPrb = cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.bwp.freqAlloc.startPrb;
+ dciInfo->bwpCfg.freqAlloc.numPrb = cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.bwp.freqAlloc.numPrb;
/*fill coreset cfg */
//Considering number of RBs in coreset1 is same as coreset0
//Considering coreset1 also starts from same symbol as coreset0
dciInfo->coresetCfg.startSymbolIndex = searchSpaceIdxTable[0][3];
dciInfo->coresetCfg.durationSymbols = coresetIdxTable[0][2];
- memcpy(dciInfo->coresetCfg.freqDomainResource, cellCb->cellCfg.schInitialDlBwp.pdcchCommon.commonSearchSpace.freqDomainRsrc, FREQ_DOM_RSRC_SIZE);
+ memcpy(dciInfo->coresetCfg.freqDomainResource, cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.pdcchCommon.commonSearchSpace.freqDomainRsrc, FREQ_DOM_RSRC_SIZE);
dciInfo->coresetCfg.cceRegMappingType = 1; /* coreset0 is always interleaved */
dciInfo->coresetCfg.regBundleSize = 6; /* spec-38.211 sec 7.3.2.2 */
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;
+ dciInfo->dciFormatInfo.formatType = FORMAT0_0;
msg3HqProc->tbInfo.rvIdx++;
msg3HqProc->tbInfo.rv = schCmnDlRvTbl[msg3HqProc->tbInfo.rvIdx & 0x03];
/* fill UL grant */
- dciInfo->format.format0_0.resourceAllocType = msg3HqProc->puschResType;
- dciInfo->format.format0_0.freqAlloc.startPrb = msg3HqProc->puschStartPrb;
- dciInfo->format.format0_0.freqAlloc.numPrb = msg3HqProc->puschNumPrb;
- dciInfo->format.format0_0.timeAlloc.startSymb = msg3HqProc->strtSymbl;
- dciInfo->format.format0_0.timeAlloc.numSymb = msg3HqProc->numSymbl;
- dciInfo->format.format0_0.rowIndex = 0; /* row Index */
- dciInfo->format.format0_0.mcs = msg3HqProc->tbInfo.iMcs;
- dciInfo->format.format0_0.harqProcId = msg3HqProc->procId;
- dciInfo->format.format0_0.puschHopFlag = FALSE; /* disabled */
- dciInfo->format.format0_0.freqHopFlag = FALSE; /* disabled */
- dciInfo->format.format0_0.ndi = msg3HqProc->tbInfo.ndi; /* new transmission */
- dciInfo->format.format0_0.rv = msg3HqProc->tbInfo.rv;
- dciInfo->format.format0_0.tpcCmd = 0; //Sphoorthi TODO: check
- dciInfo->format.format0_0.sUlCfgd = FALSE; /* SUL not configured */
+ dciInfo->dciFormatInfo.format.format0_0.resourceAllocType = msg3HqProc->puschResType;
+ dciInfo->dciFormatInfo.format.format0_0.freqAlloc.resAllocType = msg3HqProc->puschResType;
+ dciInfo->dciFormatInfo.format.format0_0.freqAlloc.resAlloc.type1.startPrb = msg3HqProc->puschStartPrb;
+ dciInfo->dciFormatInfo.format.format0_0.freqAlloc.resAlloc.type1.numPrb = msg3HqProc->puschNumPrb;
+ dciInfo->dciFormatInfo.format.format0_0.timeAlloc.startSymb = msg3HqProc->strtSymbl;
+ dciInfo->dciFormatInfo.format.format0_0.timeAlloc.numSymb = msg3HqProc->numSymbl;
+ dciInfo->dciFormatInfo.format.format0_0.rowIndex = 0; /* row Index */
+ dciInfo->dciFormatInfo.format.format0_0.mcs = msg3HqProc->tbInfo.iMcs;
+ dciInfo->dciFormatInfo.format.format0_0.harqProcId = msg3HqProc->procId;
+ dciInfo->dciFormatInfo.format.format0_0.freqHopFlag = FALSE; /* disabled */
+ dciInfo->dciFormatInfo.format.format0_0.ndi = msg3HqProc->tbInfo.ndi; /* new transmission */
+ dciInfo->dciFormatInfo.format.format0_0.rvIndex = msg3HqProc->tbInfo.rv;
+ dciInfo->dciFormatInfo.format.format0_0.tpcCmd = 0; //Sphoorthi TODO: check
+ dciInfo->dciFormatInfo.format.format0_0.sulIndicator = FALSE; /* SUL not configured */
/* Fill DCI Structure */
dciInfo->dciInfo.rnti = raCb->tcrnti;
dciInfo->dciInfo.beamPdcchInfo.prg[0].beamIdx[0] = 0;
dciInfo->dciInfo.txPdcchPower.beta_pdcch_1_0 = 0;
dciInfo->dciInfo.txPdcchPower.powerControlOffsetSS = 0;
- dciInfo->dciInfo.pdschCfg = NULL; /* No DL data being sent */
+ memset(&dciInfo->dciInfo.pdschCfg, 0, sizeof(PdschCfg));
msg3HqProc->tbInfo.txCntr++;
puschInfo->harqProcId = msg3HqProc->procId;
coreset1 = ueCb->ueCfg.spCellCfg.servCellRecfg.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 = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.startPrb;
- dciInfo->bwpCfg.freqAlloc.numPrb = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.numPrb;
+ dciInfo->bwpCfg.subcarrierSpacing = cellCb->sib1SchCfg.bwp.subcarrierSpacing;
+ dciInfo->bwpCfg.cyclicPrefix = cellCb->sib1SchCfg.bwp.cyclicPrefix;
+ dciInfo->bwpCfg.freqAlloc.startPrb = cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.bwp.freqAlloc.startPrb;
+ dciInfo->bwpCfg.freqAlloc.numPrb = cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.bwp.freqAlloc.numPrb;
/*fill coreset cfg */
//Considering number of RBs in coreset1 is same as coreset0
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;
+ dciInfo->dciFormatInfo.formatType = FORMAT0_0;
/* fill UL grant */
- dciInfo->format.format0_0.resourceAllocType = puschInfo->fdAlloc.resAllocType;
- dciInfo->format.format0_0.freqAlloc.startPrb = puschInfo->fdAlloc.resAlloc.type1.startPrb;
- dciInfo->format.format0_0.freqAlloc.numPrb = puschInfo->fdAlloc.resAlloc.type1.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 */
+ dciInfo->dciFormatInfo.format.format0_0.resourceAllocType = puschInfo->fdAlloc.resAllocType;
+ dciInfo->dciFormatInfo.format.format0_0.freqAlloc.resAllocType = puschInfo->fdAlloc.resAllocType;
+ dciInfo->dciFormatInfo.format.format0_0.freqAlloc.resAlloc.type1.startPrb = \
+ puschInfo->fdAlloc.resAlloc.type1.startPrb;
+ dciInfo->dciFormatInfo.format.format0_0.freqAlloc.resAlloc.type1.numPrb = \
+ puschInfo->fdAlloc.resAlloc.type1.numPrb;
+ dciInfo->dciFormatInfo.format.format0_0.timeAlloc.startSymb = puschInfo->tdAlloc.startSymb;
+ dciInfo->dciFormatInfo.format.format0_0.timeAlloc.numSymb = puschInfo->tdAlloc.numSymb;
+ dciInfo->dciFormatInfo.format.format0_0.rowIndex = 0; /* row Index */
+ dciInfo->dciFormatInfo.format.format0_0.mcs = puschInfo->tbInfo.mcs;
+ dciInfo->dciFormatInfo.format.format0_0.harqProcId = puschInfo->harqProcId;
+ dciInfo->dciFormatInfo.format.format0_0.freqHopFlag = FALSE; /* disabled */
+ dciInfo->dciFormatInfo.format.format0_0.ndi = puschInfo->tbInfo.ndi; /* new transmission */
+ dciInfo->dciFormatInfo.format.format0_0.rvIndex = puschInfo->tbInfo.rv;
+ dciInfo->dciFormatInfo.format.format0_0.tpcCmd = 0; //Sphoorthi TODO: check
+ dciInfo->dciFormatInfo.format.format0_0.sulIndicator = FALSE; /* SUL not configured */
/* Fill DCI Structure */
dciInfo->dciInfo.rnti = ueCb->crnti;
dciInfo->dciInfo.beamPdcchInfo.prg[0].beamIdx[0] = 0;
dciInfo->dciInfo.txPdcchPower.beta_pdcch_1_0 = 0;
dciInfo->dciInfo.txPdcchPower.powerControlOffsetSS = 0;
- dciInfo->dciInfo.pdschCfg = NULL; /* No DL data being sent */
+ memset(&dciInfo->dciInfo.pdschCfg, 0, sizeof(PdschCfg));
return ROK;
}