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
[JIRA ID - ODUHIGH-275] Part -4 classifying of logs of sch folder
[o-du/l2.git]
/
src
/
5gnrsch
/
sch_ue_mgr.c
diff --git
a/src/5gnrsch/sch_ue_mgr.c
b/src/5gnrsch/sch_ue_mgr.c
index
bb76ede
..
3e50010
100644
(file)
--- a/
src/5gnrsch/sch_ue_mgr.c
+++ b/
src/5gnrsch/sch_ue_mgr.c
@@
-384,7
+384,6
@@
uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S
uint16_t puschSlot = 0;
uint16_t startRb = 0;
uint8_t numRb = 0;
uint16_t puschSlot = 0;
uint16_t startRb = 0;
uint8_t numRb = 0;
- uint8_t mcs = 4;
uint8_t numPdschSymbols= 14;
uint16_t tbSize = 0;
uint8_t buffer = 5;
uint8_t numPdschSymbols= 14;
uint16_t tbSize = 0;
uint8_t buffer = 5;
@@
-395,11
+394,11
@@
uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S
uint8_t startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol;
uint8_t symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength;
uint8_t startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol;
uint8_t symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength;
- puschSlot = (pdcchSlot + k2) %
SCH_NUM_SLOTS
;
+ puschSlot = (pdcchSlot + k2) %
cellCb->numSlots
;
startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb;
tbSize = schCalcTbSize(dataVol + buffer); /* 2 bytes header + some buffer */
startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb;
tbSize = schCalcTbSize(dataVol + buffer); /* 2 bytes header + some buffer */
- numRb = schCalcNumPrb(tbSize,
mcs
, numPdschSymbols);
+ numRb = schCalcNumPrb(tbSize,
ueCb->ueCfg.ulModInfo.mcsIndex
, numPdschSymbols);
/* increment PUSCH PRB */
cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb;
/* increment PUSCH PRB */
cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb;
@@
-411,7
+410,9
@@
uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S
puschInfo->fdAlloc.numPrb = numRb;
puschInfo->tdAlloc.startSymb = startSymb;
puschInfo->tdAlloc.numSymb = symbLen;
puschInfo->fdAlloc.numPrb = numRb;
puschInfo->tdAlloc.startSymb = startSymb;
puschInfo->tdAlloc.numSymb = symbLen;
- puschInfo->tbInfo.mcs = mcs;
+ puschInfo->tbInfo.qamOrder = ueCb->ueCfg.ulModInfo.modOrder;
+ puschInfo->tbInfo.mcs = ueCb->ueCfg.ulModInfo.mcsIndex;
+ puschInfo->tbInfo.mcsTable = ueCb->ueCfg.ulModInfo.mcsTable;
puschInfo->tbInfo.ndi = 1; /* new transmission */
puschInfo->tbInfo.rv = 0;
puschInfo->tbInfo.tbSize = tbSize;
puschInfo->tbInfo.ndi = 1; /* new transmission */
puschInfo->tbInfo.rv = 0;
puschInfo->tbInfo.tbSize = tbSize;