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_rach.c
diff --git
a/src/5gnrsch/sch_rach.c
b/src/5gnrsch/sch_rach.c
index
16bb970
..
3db3816
100644
(file)
--- a/
src/5gnrsch/sch_rach.c
+++ b/
src/5gnrsch/sch_rach.c
@@
-42,8
+42,8
@@
#include "sch.h"
#include "sch_utils.h"
#include "sch.h"
#include "sch_utils.h"
-
extern
SchCb schCb[SCH_MAX_INST];
-
extern
uint8_t puschDeltaTable[MAX_MU_PUSCH];
+SchCb schCb[SCH_MAX_INST];
+uint8_t puschDeltaTable[MAX_MU_PUSCH];
/**
* @brief calculate ra-rnti function.
/**
* @brief calculate ra-rnti function.
@@
-132,7
+132,7
@@
uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \
/* Slot allocation for msg3 based on 38.214 section 6.1.2.1 */
msg3SlotAlloc = slot + k2 + delta;
/* Slot allocation for msg3 based on 38.214 section 6.1.2.1 */
msg3SlotAlloc = slot + k2 + delta;
- msg3SlotAlloc = msg3SlotAlloc %
SCH_NUM_SLOTS
;
+ msg3SlotAlloc = msg3SlotAlloc %
cell->numSlots
;
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 */
@@
-165,7
+165,9
@@
uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \
schUlSlotInfo->schPuschInfo->fdAlloc.numPrb = numRb;
schUlSlotInfo->schPuschInfo->tdAlloc.startSymb = startSymb;
schUlSlotInfo->schPuschInfo->tdAlloc.numSymb = symbLen;
schUlSlotInfo->schPuschInfo->fdAlloc.numPrb = numRb;
schUlSlotInfo->schPuschInfo->tdAlloc.startSymb = startSymb;
schUlSlotInfo->schPuschInfo->tdAlloc.numSymb = symbLen;
- schUlSlotInfo->schPuschInfo->tbInfo.mcs = mcs;
+ schUlSlotInfo->schPuschInfo->tbInfo.qamOrder = 2; /* QPSK modulation */
+ schUlSlotInfo->schPuschInfo->tbInfo.mcs = mcs;
+ schUlSlotInfo->schPuschInfo->tbInfo.mcsTable = SCH_MCS_TABLE_QAM_64;
schUlSlotInfo->schPuschInfo->tbInfo.ndi = 1; /* new transmission */
schUlSlotInfo->schPuschInfo->tbInfo.rv = 0;
schUlSlotInfo->schPuschInfo->tbInfo.tbSize = tbSize; /*Considering 2 PRBs */
schUlSlotInfo->schPuschInfo->tbInfo.ndi = 1; /* new transmission */
schUlSlotInfo->schPuschInfo->tbInfo.rv = 0;
schUlSlotInfo->schPuschInfo->tbInfo.tbSize = tbSize; /*Considering 2 PRBs */
@@
-175,7
+177,6
@@
uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \
*msg3StartRb = startRb;
*msg3NumRb = numRb;
*msg3StartRb = startRb;
*msg3NumRb = numRb;
-
return ROK;
}
return ROK;
}
@@
-205,7
+206,7
@@
uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst)
uint8_t ret = ROK;
/* RAR will sent with a delay of RAR_DELAY */
uint8_t ret = ROK;
/* RAR will sent with a delay of RAR_DELAY */
- rarSlot = (rachInd->timingInfo.slot+RAR_DELAY+PHY_DELTA)%
SCH_NUM_SLOTS
;
+ rarSlot = (rachInd->timingInfo.slot+RAR_DELAY+PHY_DELTA)%
cell->numSlots
;
SchDlSlotInfo *schDlSlotInfo = cell->schDlSlotInfo[rarSlot]; /* RAR will sent in the next slot */
SchDlSlotInfo *schDlSlotInfo = cell->schDlSlotInfo[rarSlot]; /* RAR will sent in the next slot */