From 9665386af091888e0e62b83ce91c25c973eb33aa Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Tue, 11 May 2021 14:20:17 +0530 Subject: [PATCH] Change-Id: Ia0c452409d0ae69134003203f4c308ec898a86d8 Signed-off-by: sphoorthi --- src/5gnrsch/sch_rach.c | 2 +- src/5gnrsch/sch_utils.c | 70 +++++++++++++++++++++++++++++++++++-------------- src/cm/cm_math.c | 18 +++++++++++++ 3 files changed, 69 insertions(+), 21 deletions(-) diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c index 2681a0df8..0e9bd93b9 100644 --- a/src/5gnrsch/sch_rach.c +++ b/src/5gnrsch/sch_rach.c @@ -157,7 +157,7 @@ uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \ } tbSize = 0; /* since nPrb has been incremented, recalculating tbSize */ tbSize = schCalcTbSizeFromNPrb(numRb, mcs, numPdschSymbols); - + tbSize = tbSize/8;/*bits to byte conversion*/ schUlSlotInfo->schPuschInfo->crnti = crnti; schUlSlotInfo->schPuschInfo->harqProcId = SCH_HARQ_PROC_ID; schUlSlotInfo->schPuschInfo->resAllocType = SCH_ALLOC_TYPE_1; diff --git a/src/5gnrsch/sch_utils.c b/src/5gnrsch/sch_utils.c index 4cb93c66f..5e014f91f 100644 --- a/src/5gnrsch/sch_utils.c +++ b/src/5gnrsch/sch_utils.c @@ -553,6 +553,7 @@ uint16_t schCalcNumPrb(uint16_t tbSize, uint16_t mcs, uint8_t numSymbols) numPrb = ceil((float)nre / nreDash); return numPrb; } + /** * @brief calculation of transport block size. * @@ -569,36 +570,65 @@ uint16_t schCalcNumPrb(uint16_t tbSize, uint16_t mcs, uint8_t numSymbols) **/ uint16_t schCalcTbSizeFromNPrb(uint16_t numPrb, uint16_t mcs, uint8_t numSymbols) { - uint16_t tbSize = 0; - uint16_t tbsIndex = 0; - uint16_t nre = 0; - uint16_t nreDash = 0; uint8_t qm = mcsTable[mcs][1]; uint16_t rValue = mcsTable[mcs][2]; - uint8_t numLayer = 1; /* v value */ + uint16_t tbsIndex = 0; + uint32_t tbSize = 0; + uint32_t nre = 0; + uint32_t nreDash = 0; + uint32_t nInfo = 0; + uint32_t n = 0; + uint32_t nInfoDash = 0; + uint32_t c = 0; + const uint8_t numLayer = 1; + const uint16_t numRbSc = 12; + const uint16_t numDmrsRes = 12; + const uint16_t sf = 1; +// uint16_t numPrbOvrHead = 0; - /* formula used for calculation of rbSize, 38.213 section 5.1.3.2 * - * Ninfo = Nre . R . Qm . v where [ NInfo is tbSize] * + /* formula used for calculation of rbSize, 38.214 section 5.1.3.2 * + * Ninfo = Nre . R . Qm . v where [ NInfo is tbSize] * * Nre' = Nsc . NsymPdsch - NdmrsSymb - Noh * * Nre = min(156,Nre') . nPrb */ - - nreDash = ceil( (12 * numSymbols) - NUM_DMRS_SYMBOLS - 0); - - if(nreDash > 156) - nreDash = 156; + nreDash = MIN(156, ceil( (numRbSc * numSymbols) - numDmrsRes - 0)); nre = nreDash * numPrb; - tbSize = ceil(nre * qm * numLayer * rValue/1024.0); - tbSize = ceil(tbSize/8.0); - - while(tbSize > tbSizeTable[tbsIndex]) + nInfo = ceil(nre * qm * numLayer * rValue/(1024.0 * sf)); + + if(nInfo <= 3824) { - tbsIndex++; + n = MAX(3, (uint32_t)cmLog2(nInfo) - 6); + nInfoDash = MAX(24, (1< tbSizeTable[tbsIndex]) + { + tbsIndex++; + } + tbSize = tbSizeTable[tbsIndex]; + } + else + { + n = (uint32_t)cmLog2(nInfo - 24) - 5; + nInfoDash = MAX(3840, (1< 8424) + { + c = ceil((nInfoDash + 24)/8424); + tbSize = 8 * c * ceil((nInfoDash + 24)/(8 * c)) - 24; + } + else + { + tbSize = 8 * ceil((nInfoDash + 24)/(8)) - 24; + } + } } - tbSize = tbSizeTable[tbsIndex]; - return tbSize; - } /** * @brief fetching ueCb from cellCb diff --git a/src/cm/cm_math.c b/src/cm/cm_math.c index 3a2e272da..3c65dd684 100755 --- a/src/cm/cm_math.c +++ b/src/cm/cm_math.c @@ -161,6 +161,24 @@ F64 cmLog10(F64 x) } /* end of cmLog10 */ #endif /* SS_FLOAT */ +/* +* +* Fun: cmLog +* +* Desc: common primitive for computing the base 2 logrithm of x. +* +* Ret: log2(x) +* +* Notes: None +* +* File: cm_math.c +* +*/ +float cmLog2(uint32_t x) +{ + return ((float) log2(x)); +} + /********************************************************************** End of file **********************************************************************/ -- 2.16.6