X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_utils.c;h=5e014f91f4f53318b8005eb7bf21bede523ad2b6;hb=9665386af091888e0e62b83ce91c25c973eb33aa;hp=4cb93c66f53651e0ea734434c3226e89f1e8ce38;hpb=2dc9d6735bc5ff973a761b7d6b3f71f97e95d60e;p=o-du%2Fl2.git

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<<n)*(nInfo/(1<<n)));
+      while(nInfoDash > tbSizeTable[tbsIndex])
+      {
+         tbsIndex++;
+      }
+      tbSize = tbSizeTable[tbsIndex];
+   }
+   else
+   {
+      n = (uint32_t)cmLog2(nInfo - 24) - 5;
+      nInfoDash = MAX(3840, (1<<n)*ceil((nInfo - 24)/(1<<n)));
+
+      if(rValue<256)
+      {
+         c = ceil((nInfoDash + 24)/3816);
+         tbSize = 8 * c * ceil((nInfoDash + 24)/(8 * c)) - 24;
+      }
+      else
+      {
+         if(nInfoDash > 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