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
Merge "Implementation of function for filling k0 and k1 table [Issue-ID: ODUHIGH...
[o-du/l2.git]
/
src
/
5gnrsch
/
sch_rach.c
diff --git
a/src/5gnrsch/sch_rach.c
b/src/5gnrsch/sch_rach.c
index
bd9b65a
..
3339e4e
100644
(file)
--- a/
src/5gnrsch/sch_rach.c
+++ b/
src/5gnrsch/sch_rach.c
@@
-120,8
+120,8
@@
uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \
uint16_t tbSize = 0;
cell = schCb[schInst].cells[schInst];
uint16_t tbSize = 0;
cell = schCb[schInst].cells[schInst];
- startSymb = cell->cellCfg.schInitialUlBwp.puschCommon.startSymbol;
- symbLen = cell->cellCfg.schInitialUlBwp.puschCommon.
lengthSymbol
;
+ 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 */
startRb = cell->schUlSlotInfo[msg3SlotAlloc]->puschCurrentPrb;
tbSize = schCalcTbSize(8); /* 6 bytes msg3 and 2 bytes header */
@@
-203,7
+203,7
@@
uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst)
//puschMu = cell->cellCfg.puschMu;
delta = puschDeltaTable[puschMu];
//puschMu = cell->cellCfg.puschMu;
delta = puschDeltaTable[puschMu];
- k2 = cell->cellCfg.schInitialUlBwp.puschCommon.k2;
+ k2 = cell->cellCfg.schInitialUlBwp.puschCommon.
timeDomRsrcAllocList[0].
k2;
/* RAR will sent with a delay of RAR_DELAY */
rarSlot = (rachInd->timingInfo.slot+RAR_DELAY+PHY_DELTA_DL)%cell->numSlots;
#ifdef NR_TDD
/* RAR will sent with a delay of RAR_DELAY */
rarSlot = (rachInd->timingInfo.slot+RAR_DELAY+PHY_DELTA_DL)%cell->numSlots;
#ifdef NR_TDD
@@
-394,10
+394,11
@@
bool ssbPresent, bool sib1Present)
sib1PdschFreqAlloc = &schCb[inst].cells[inst]->cellCfg.sib1SchCfg.sib1PdschCfg.pdschFreqAlloc.freqAlloc;
pdsch->pdschFreqAlloc.freqAlloc.startPrb = sib1PdschFreqAlloc->startPrb + sib1PdschFreqAlloc->numPrb + 1;
}
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.lengthSymbol);
+ pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize, mcs, \
+ initialBwp->pdschCommon.timeDomRsrcAllocList[0].lengthSymbol);
pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */
pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */
- pdsch->pdschTimeAlloc.timeAlloc.startSymb = initialBwp->pdschCommon.startSymbol;
- pdsch->pdschTimeAlloc.timeAlloc.numSymb = initialBwp->pdschCommon.lengthSymbol;
+ 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;
pdsch->beamPdschInfo.numPrgs = 1;
pdsch->beamPdschInfo.prgSize = 1;
pdsch->beamPdschInfo.digBfInterfaces = 0;