X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_utils.c;h=e1809fa86f116077e4107e5c68b9e8d83d48d468;hb=377a2d180b617d4df038e1780d4a8de98d7c125f;hp=bdc47170f0055f3566f2db70dc9b96ba3121c807;hpb=157867069170ddc00c3b21c70532bde4cc1749a6;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch_utils.c b/src/5gnrsch/sch_utils.c
index bdc47170f..e1809fa86 100644
--- a/src/5gnrsch/sch_utils.c
+++ b/src/5gnrsch/sch_utils.c
@@ -837,6 +837,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.
 *
@@ -853,36 +854,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];
    }
-   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;
+         }
+      }
+   }
    return tbSize;
-
 }
 /**
  * @brief fetching ueCb from cellCb
@@ -985,10 +1015,13 @@ void schInitDlSlot(SchDlSlotInfo *schDlSlotInfo)
  **/
 SlotConfig schGetSlotSymbFrmt(uint16_t slot, uint32_t bitMap)
 {
+   uint32_t offset = (slot)*2;
+   return (bitMap & 0x3<<offset)>>offset;
+#if 0
    SlotConfig slotFrmt;
    int mask1 = 0, mask2 = 0;
 
-   slot = (slot%10)*2;
+   slot = (slot%n)*2;//n num of slots in defined periodicity or num of symbols
    mask1 = 1<<(slot);
    mask2 = 1<<(slot+1);
    slotFrmt = ((mask1 & bitMap)>>slot) + (2*((mask2 & bitMap)>>(slot+1)));
@@ -996,6 +1029,7 @@ SlotConfig schGetSlotSymbFrmt(uint16_t slot, uint32_t bitMap)
    //printf("\n\n\n\n*****FormatType:%d Slot:%d****\n\n\n\n", slotFrmt, slot/2);
 
    return slotFrmt;
+#endif
 }
 
 #endif