Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[Epic-ID: ODUHIGH-488][Task-ID: ODUHIGH-492] WG8 Alignment [RAR Scheduling + Downlink...
[o-du/l2.git]
/
src
/
5gnrsch
/
sch.c
diff --git
a/src/5gnrsch/sch.c
b/src/5gnrsch/sch.c
index
3c8d5fe
..
6af8944
100644
(file)
--- a/
src/5gnrsch/sch.c
+++ b/
src/5gnrsch/sch.c
@@
-710,13
+710,7
@@
uint8_t fillSchSib1Cfg(uint8_t mu, uint8_t bandwidth, uint8_t numSlots,SchPdcchC
pdcch->dci.txPdcchPower.powerControlOffsetSS = 0;
/* Storing pdschCfg pointer here. Required to access pdsch config while
fillig up pdcch pdu */
pdcch->dci.txPdcchPower.powerControlOffsetSS = 0;
/* Storing pdschCfg pointer here. Required to access pdsch config while
fillig up pdcch pdu */
- SCH_ALLOC(pdcch->dci.pdschCfg, sizeof(PdschCfg));
- if(pdcch->dci.pdschCfg == NULLP)
- {
- DU_LOG("\nERROR --> SCH : Memory allocation failed in %s ", __func__);
- return RFAILED;
- }
- pdsch = pdcch->dci.pdschCfg;
+ pdsch = &pdcch->dci.pdschCfg;
/* fill the PDSCH PDU */
uint8_t cwCount = 0;
/* fill the PDSCH PDU */
uint8_t cwCount = 0;
@@
-975,7
+969,6
@@
void deleteSchCellCb(SchCellCb *cellCb)
SCH_FREE(cellCb->cellCfg.plmnInfoList[plmnIdx].snssai, cellCb->cellCfg.plmnInfoList[plmnIdx].numSliceSupport*sizeof(Snssai*));
}
}
SCH_FREE(cellCb->cellCfg.plmnInfoList[plmnIdx].snssai, cellCb->cellCfg.plmnInfoList[plmnIdx].numSliceSupport*sizeof(Snssai*));
}
}
- SCH_FREE(cellCb->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg, sizeof(PdschCfg));
for(uint16_t idx =0; idx<MAX_SFN; idx++)
{
for(uint16_t idx =0; idx<MAX_SFN; idx++)
{
@@
-1336,7
+1329,7
@@
uint8_t allocatePrbDl(SchCellCb *cell, SlotTimingInfo slotTime, \
if(ssbOccasion && sib1Occasion)
{
broadcastPrbStart = cell->cellCfg.dlCfgCommon.schFreqInfoDlSib.offsetToPointA;
if(ssbOccasion && sib1Occasion)
{
broadcastPrbStart = cell->cellCfg.dlCfgCommon.schFreqInfoDlSib.offsetToPointA;
- broadcastPrbEnd = broadcastPrbStart + SCH_SSB_NUM_PRB + cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
->
pdschFreqAlloc.numPrb -1;
+ broadcastPrbEnd = broadcastPrbStart + SCH_SSB_NUM_PRB + cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
.
pdschFreqAlloc.numPrb -1;
}
else if(ssbOccasion)
{
}
else if(ssbOccasion)
{
@@
-1345,8
+1338,8
@@
uint8_t allocatePrbDl(SchCellCb *cell, SlotTimingInfo slotTime, \
}
else if(sib1Occasion)
{
}
else if(sib1Occasion)
{
- broadcastPrbStart = cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
->
pdschFreqAlloc.startPrb;
- broadcastPrbEnd = broadcastPrbStart + cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
->
pdschFreqAlloc.numPrb -1;
+ broadcastPrbStart = cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
.
pdschFreqAlloc.startPrb;
+ broadcastPrbEnd = broadcastPrbStart + cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
.
pdschFreqAlloc.numPrb -1;
}
/* Iterate through all free PRB blocks */
}
/* Iterate through all free PRB blocks */
@@
-1614,7
+1607,7
@@
uint16_t searchLargestFreeBlock(SchCellCb *cell, SlotTimingInfo slotTime,uint16_
{
reservedPrbStart = cell->cellCfg.dlCfgCommon.schFreqInfoDlSib.offsetToPointA;
reservedPrbEnd = reservedPrbStart + SCH_SSB_NUM_PRB + \
{
reservedPrbStart = cell->cellCfg.dlCfgCommon.schFreqInfoDlSib.offsetToPointA;
reservedPrbEnd = reservedPrbStart + SCH_SSB_NUM_PRB + \
- cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
->
pdschFreqAlloc.numPrb -1;
+ cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
.
pdschFreqAlloc.numPrb -1;
}
else if(ssbOccasion)
{
}
else if(ssbOccasion)
{
@@
-1623,8
+1616,8
@@
uint16_t searchLargestFreeBlock(SchCellCb *cell, SlotTimingInfo slotTime,uint16_
}
else if(sib1Occasion)
{
}
else if(sib1Occasion)
{
- reservedPrbStart = cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
->
pdschFreqAlloc.startPrb;
- reservedPrbEnd = reservedPrbStart + cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
->
pdschFreqAlloc.numPrb -1;
+ reservedPrbStart = cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
.
pdschFreqAlloc.startPrb;
+ reservedPrbEnd = reservedPrbStart + cell->sib1SchCfg.sib1PdcchCfg.dci.pdschCfg
.
pdschFreqAlloc.numPrb -1;
}
else
{
}
else
{