Merge "Fix in DL PRB allocation [Issue-ID: ODUHIGH-380]"
[o-du/l2.git] / src / 5gnrsch / sch_common.c
index bde41bc..8929c33 100644 (file)
@@ -47,6 +47,7 @@ SchCb schCb[SCH_MAX_INST];
 uint16_t prachCfgIdxTable[MAX_PRACH_CONFIG_IDX][8];
 uint16_t numRbForPrachTable[MAX_RACH_NUM_RB_IDX][5];
 uint8_t pucchResourceSet[MAX_PUCCH_RES_SET_IDX][4];
+uint8_t puschDeltaTable[MAX_MU_PUSCH];
 
 SchMacUlSchInfoFunc schMacUlSchInfoOpts[] =
 {
@@ -60,69 +61,128 @@ SchMacUlSchInfoFunc schMacUlSchInfoOpts[] =
  *
  * @details
  *
- *     Function : schBroadcastAlloc
+ *     Function : schBroadcastSsbAlloc
  *     
- *     This function handles common scheduling for DL
+ *     This function handles common scheduling for SSB
  *     
  *  @param[in]  SchCellCb *cell, cell cb
  *  @param[in]  DlBrdcstAlloc *dlBrdcstAlloc, DL brdcst allocation
  *  @return  void
  **/
-uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,
-      uint16_t slot)
+uint8_t schBroadcastSsbAlloc(SchCellCb *cell, SlotTimingInfo slotTime, DlBrdcstAlloc *dlBrdcstAlloc)
 {
    /* schedule SSB */
-   uint8_t ssbStartPrb, ssbStartSymb, idx;
+   uint8_t ssbStartSymb, idx;
+   uint16_t ssbStartPrb;
    SchDlSlotInfo *schDlSlotInfo;
    SsbInfo ssbInfo;
 
-   schDlSlotInfo = cell->schDlSlotInfo[slot];
-   if(dlBrdcstAlloc->ssbTrans)
+   if(cell == NULL)
    {
-      ssbStartPrb = cell->cellCfg.ssbSchCfg.ssbOffsetPointA;
-      ssbStartSymb = cell->ssbStartSymbArr[dlBrdcstAlloc->ssbIdxSupported-1]; /*since we are
-                                                                               supporting only 1 ssb beam */
+      DU_LOG("\nERROR  -->  SCH: schBroadcastSsbAlloc() : Cell is NULL");
+      return RFAILED;
+   }
 
-      /* Assign interface structure */
-      for(idx=0; idx<dlBrdcstAlloc->ssbIdxSupported; idx++)
-      {
-        ssbInfo.ssbIdx              = idx;
-        ssbInfo.fdAlloc.startPrb    = ssbStartPrb;
-        ssbInfo.fdAlloc.numPrb      = SCH_SSB_NUM_PRB;
-        ssbInfo.tdAlloc.startSymb   = ssbStartSymb;
-        ssbInfo.tdAlloc.numSymb     = SCH_SSB_NUM_SYMB;
-        dlBrdcstAlloc->ssbInfo[idx] = ssbInfo;
-        schDlSlotInfo->ssbInfo[idx] = ssbInfo;
-      }
+   if(dlBrdcstAlloc == NULL)
+   {
+      DU_LOG("\nERROR  -->  SCH: schBroadcastSsbAlloc() : dlBrdcstAlloc is NULL");
+      return RFAILED;
+   }
 
-      schDlSlotInfo->ssbPres = true;
-      schDlSlotInfo->ssbIdxSupported = dlBrdcstAlloc->ssbIdxSupported;
-      for(idx=ssbStartSymb; idx<ssbStartSymb+SCH_SSB_NUM_SYMB; idx++)
-      {
-        schDlSlotInfo->assignedPrb[idx] = ssbStartPrb + SCH_SSB_NUM_PRB + 1; /* +1 for kSsb */
-      }
+   schDlSlotInfo = cell->schDlSlotInfo[slotTime.slot];
+   ssbStartPrb = cell->cellCfg.ssbSchCfg.ssbOffsetPointA; //+Kssb
+   ssbStartSymb = cell->ssbStartSymbArr[dlBrdcstAlloc->ssbIdxSupported-1]; /*since we are supporting only 1 ssb beam */
+
+   /* Assign interface structure */
+   for(idx=0; idx<dlBrdcstAlloc->ssbIdxSupported; idx++)
+   {
+      ssbInfo.ssbIdx              = idx;
+      ssbInfo.fdAlloc.startPrb    = ssbStartPrb;
+      ssbInfo.fdAlloc.numPrb      = SCH_SSB_NUM_PRB;
+      ssbInfo.tdAlloc.startSymb   = ssbStartSymb;
+      ssbInfo.tdAlloc.numSymb     = SCH_SSB_NUM_SYMB;
+      dlBrdcstAlloc->ssbInfo[idx] = ssbInfo;
+      schDlSlotInfo->ssbInfo[idx] = ssbInfo;
    }
 
-   /* SIB1 allocation */
-   if(dlBrdcstAlloc->sib1Trans)
+   if((allocatePrbDl(cell, slotTime, ssbStartSymb, SCH_SSB_NUM_SYMB, &ssbInfo.fdAlloc.startPrb, ssbInfo.fdAlloc.numPrb)) != ROK)
    {
-      uint16_t tbSize         = 0;
-      uint8_t numPdschSymbols = 12; /* considering pdsch region from 2 to 13 */
-      uint8_t mcs             = 4;  /* MCS fixed to 4 */
-      uint8_t numSib1Prb      = 0;
-      schDlSlotInfo->sib1Pres = true;
+       DU_LOG("\nERROR  -->  SCH: PRB allocation failed for SSB in SFN:SLOT [%d : %d]", slotTime.sfn, slotTime.slot);
+       return RFAILED;
+   }
 
-      tbSize = schCalcTbSize(cell->cellCfg.sib1SchCfg.sib1PduLen); /* send this value to the func in bytes when considering sib1 size */
-      numSib1Prb = schCalcNumPrb(tbSize,mcs,numPdschSymbols);
-      for(idx=0; idx<SCH_SYMBOL_PER_SLOT; idx++)
-      {
-        schDlSlotInfo->assignedPrb[idx] = ssbStartPrb + SCH_SSB_NUM_PRB + 1 + numSib1Prb; /* 10 PRBs for sib1 */
-      }
-      memcpy(&dlBrdcstAlloc->sib1Alloc.bwp, &cell->cellCfg.sib1SchCfg.bwp, sizeof(BwpCfg)); 
-      memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg, &cell->cellCfg.sib1SchCfg.sib1PdcchCfg, sizeof(PdcchCfg)); 
-      memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdschCfg, &cell->cellCfg.sib1SchCfg.sib1PdschCfg, sizeof(PdschCfg)); 
-      dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg.dci.pdschCfg = &dlBrdcstAlloc->sib1Alloc.sib1PdschCfg;
+
+   schDlSlotInfo->ssbPres = true;
+   schDlSlotInfo->ssbIdxSupported = dlBrdcstAlloc->ssbIdxSupported;
+   return ROK;
+}
+
+/**
+ * @brief common resource allocation for SIB1
+ *
+ * @details
+ *
+ *     Function : schBroadcastSib1Alloc
+ *     
+ *     This function handles common scheduling for SIB1
+ *     
+ *  @param[in]  SchCellCb *cell, cell cb
+ *  @param[in]  DlBrdcstAlloc *dlBrdcstAlloc, DL brdcst allocation
+ *  @return  void
+ **/
+uint8_t schBroadcastSib1Alloc(SchCellCb *cell, SlotTimingInfo slotTime, DlBrdcstAlloc *dlBrdcstAlloc)
+{
+   uint8_t dmrsStartSymbol, startSymbol, numSymbol ;
+   DmrsInfo dmrs;
+   FreqDomainAlloc freqAlloc;
+   TimeDomainAlloc timeAlloc;
+   SchDlSlotInfo *schDlSlotInfo = NULLP;
+
+   if(cell == NULL)
+   {
+      DU_LOG("\nERROR  -->  SCH: schBroadcastSsbAlloc() : Cell is NULL");
+      return RFAILED;
+   }
+
+   if(dlBrdcstAlloc == NULL)
+   {
+      DU_LOG("\nERROR  -->  SCH: schBroadcastSsbAlloc() : dlBrdcstAlloc is NULL");
+      return RFAILED;
+   }
+
+   dmrs = cell->cellCfg.sib1SchCfg.sib1PdschCfg.dmrs;
+   freqAlloc = cell->cellCfg.sib1SchCfg.sib1PdschCfg.pdschFreqAlloc.freqAlloc;
+   timeAlloc = cell->cellCfg.sib1SchCfg.sib1PdschCfg.pdschTimeAlloc.timeAlloc;
+   schDlSlotInfo = cell->schDlSlotInfo[slotTime.slot];
+
+   /* Find total symbols used including DMRS */
+   /* If there are no DRMS symbols, findDmrsStartSymbol() returns MAX_SYMB_PER_SLOT,
+    * in that case only PDSCH symbols are marked as occupied */
+   dmrsStartSymbol = findDmrsStartSymbol(dmrs.dlDmrsSymbPos);   
+   if(dmrsStartSymbol == MAX_SYMB_PER_SLOT)
+   {
+      startSymbol = timeAlloc.startSymb;
+      numSymbol = timeAlloc.numSymb;
    }
+   /* If DMRS symbol is found, mark DMRS and PDSCH symbols as occupied */
+   else
+   {
+      startSymbol = dmrsStartSymbol;
+      numSymbol = dmrs.nrOfDmrsSymbols + timeAlloc.numSymb;
+   }
+
+   /* Allocate PRB */
+   if((allocatePrbDl(cell, slotTime, startSymbol, numSymbol, &freqAlloc.startPrb, freqAlloc.numPrb)) != ROK)
+   {
+       DU_LOG("\nERROR  -->  SCH: PRB allocation failed for SIB1 in SFN:Slot [%d : %d]", slotTime.sfn, slotTime.slot);
+       return RFAILED;
+   }
+
+   memcpy(&dlBrdcstAlloc->sib1Alloc.bwp, &cell->cellCfg.sib1SchCfg.bwp, sizeof(BwpCfg)); 
+   memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg, &cell->cellCfg.sib1SchCfg.sib1PdcchCfg, sizeof(PdcchCfg)); 
+   memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdschCfg, &cell->cellCfg.sib1SchCfg.sib1PdschCfg, sizeof(PdschCfg)); 
+   dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg.dci.pdschCfg = &dlBrdcstAlloc->sib1Alloc.sib1PdschCfg;
+   schDlSlotInfo->sib1Pres = true;
    return ROK;
 }
 
@@ -165,7 +225,7 @@ int sendUlSchInfoToMac(UlSchedInfo *ulSchedInfo, Inst inst)
  *  @param[in]  UlSchedInfo *ulSchedInfo, UL scheduling info
  *  @return  void
  **/
-void schPrachResAlloc(SchCellCb *cell, UlSchedInfo *ulSchedInfo, SlotIndInfo prachOccasionTimingInfo)
+void schPrachResAlloc(SchCellCb *cell, UlSchedInfo *ulSchedInfo, SlotTimingInfo prachOccasionTimingInfo)
 {
    uint8_t  puschScs;
    uint8_t  numPrachRb = 0;
@@ -180,6 +240,7 @@ void schPrachResAlloc(SchCellCb *cell, UlSchedInfo *ulSchedInfo, SlotIndInfo pra
    uint8_t  prachOcas = 0;
    uint8_t  dataType = 0;
    uint8_t  idx = 0;
+   uint8_t  subFrame = 0;
    SchUlSlotInfo *schUlSlotInfo = NULLP;
 
    puschScs      = cell->cellCfg.schInitialUlBwp.bwp.scs;
@@ -193,70 +254,286 @@ void schPrachResAlloc(SchCellCb *cell, UlSchedInfo *ulSchedInfo, SlotIndInfo pra
 
    if((prachOccasionTimingInfo.sfn%x) == y)
    {
+#ifdef NR_TDD
+      subFrame = prachOccasionTimingInfo.slot/2;
+#else
+      subFrame = prachOccasionTimingInfo.slot;
+#endif
       /* check for subFrame number */
-      if ((1 << prachOccasionTimingInfo.slot) & prachSubframe)
+      if ((1 << subFrame) & prachSubframe)
       {
-        /* prach ocassion present in this subframe */
-
-        prachFormat      = prachCfgIdxTable[prachCfgIdx][0];
-        prachStartSymbol = prachCfgIdxTable[prachCfgIdx][4];
-        prachOcas        = prachCfgIdxTable[prachCfgIdx][6];
-
-        /* freq domain resource determination for RACH*/
-        freqStart = cell->cellCfg.schRachCfg.msg1FreqStart;
-        /* numRa determined as 𝑛 belonging {0,1,.., M − 1}, 
-         * where M is given by msg1Fdm */
-        numRa = (cell->cellCfg.schRachCfg.msg1Fdm - 1);
-        for(idx=0; idx<MAX_RACH_NUM_RB_IDX; idx++)
-        {
-           if(numRbForPrachTable[idx][0] == cell->cellCfg.schRachCfg.rootSeqLen)
+         /* prach ocassion present in this subframe */
+#ifdef NR_TDD
+         if(UL_SLOT != schGetSlotSymbFrmt(prachOccasionTimingInfo.slot%cell->numSlotsInPeriodicity,\
+         cell->slotFrmtBitMap))
+         {
+            DU_LOG("\nERROR  --> SCH : PrachCfgIdx %d doesn't support UL slot", prachCfgIdx);
+         }
+         else
+#endif
+         {
+            prachFormat      = prachCfgIdxTable[prachCfgIdx][0];
+            prachStartSymbol = prachCfgIdxTable[prachCfgIdx][4];
+            prachOcas        = prachCfgIdxTable[prachCfgIdx][6];
+
+            /* freq domain resource determination for RACH*/
+            freqStart = cell->cellCfg.schRachCfg.msg1FreqStart;
+            /* numRa determined as 𝑛 belonging {0,1,.., M − 1}, 
+             * where M is given by msg1Fdm */
+            numRa = (cell->cellCfg.schRachCfg.msg1Fdm - 1);
+            for(idx=0; idx<MAX_RACH_NUM_RB_IDX; idx++)
+            {
+               if(numRbForPrachTable[idx][0] == cell->cellCfg.schRachCfg.rootSeqLen)
+               {
+                  if(numRbForPrachTable[idx][1] == cell->cellCfg.schRachCfg.prachSubcSpacing)
+                  {
+                     if(numRbForPrachTable[idx][2] == puschScs)
+                     {
+                        break;
+                     }
+                  }
+               }
+            }
+            numPrachRb = numRbForPrachTable[idx][3];
+            dataType |= SCH_DATATYPE_PRACH;
+            /* Considering first slot in the frame for PRACH */
+            idx = 0;
+            //schUlSlotInfo->assignedPrb[idx] = freqStart+numPrachRb;
+         }
+         ulSchedInfo->dataType = dataType;
+         /* prach info */
+         ulSchedInfo->prachSchInfo.numPrachOcas   = prachOcas;
+         ulSchedInfo->prachSchInfo.prachFormat    = prachFormat;
+         ulSchedInfo->prachSchInfo.numRa          = numRa;
+         ulSchedInfo->prachSchInfo.prachStartSymb = prachStartSymbol;
+         DU_LOG("\nINFO  --> SCH : RACH occassion set for slot %d", prachOccasionTimingInfo.slot);
+      }
+   }
+}
+
+
+/**
+ * @brief Function to fill Pucch Format 0
+ *
+ * @details
+ *
+ *     Function : fillPucchFormat0
+ *     
+ *     Function to fill Pucch format 0
+ *     
+ *  @param[in]  SchPucchInfo pointer, SchPucchResrcInfo pointer
+ *  @return  void
+ **/
+
+void fillPucchFormat0(SchPucchInfo *ulSchedPucch, SchPucchResrcInfo *resrcInfo)
+{
+   if(resrcInfo->SchPucchFormat.format0)
+   {
+      ulSchedPucch->fdAlloc.numPrb = PUCCH_NUM_PRB_FORMAT_0_1_4;
+      ulSchedPucch->pucchFormat  = PUCCH_FORMAT_0;
+      ulSchedPucch->initialCyclicShift =  resrcInfo->SchPucchFormat.format0->initialCyclicShift;
+      ulSchedPucch->tdAlloc.numSymb = resrcInfo->SchPucchFormat.format0->numSymbols;
+      ulSchedPucch->tdAlloc.startSymb = resrcInfo->SchPucchFormat.format0->startSymbolIdx;
+   }
+}
+
+/**
+ * @brief Function to fill Pucch Format 1
+ *
+ * @details
+ *
+ *     Function : fillPucchFormat1
+ *     
+ *     Function to fill Pucch format 1
+ *     
+ *  @param[in]  SchPucchInfo pointer, SchPucchResrcInfo pointer
+ *  @return  void
+ **/
+
+void fillPucchFormat1(SchPucchInfo *ulSchedPucch, SchPucchResrcInfo *resrcInfo)
+{
+   if(resrcInfo->SchPucchFormat.format1)
+   {
+      ulSchedPucch->fdAlloc.numPrb = PUCCH_NUM_PRB_FORMAT_0_1_4;
+      ulSchedPucch->pucchFormat  = PUCCH_FORMAT_1;
+      ulSchedPucch->initialCyclicShift =  resrcInfo->SchPucchFormat.format1->initialCyclicShift;
+      ulSchedPucch->tdAlloc.numSymb = resrcInfo->SchPucchFormat.format1->numSymbols;
+      ulSchedPucch->tdAlloc.startSymb = resrcInfo->SchPucchFormat.format1->startSymbolIdx;
+      ulSchedPucch->timeDomOCC =  resrcInfo->SchPucchFormat.format1->timeDomOCC;
+  }
+}
+
+/**
+ * @brief Function to fill Pucch format for UL Sched Info
+ *
+ * @details
+ *
+ *     Function : fillUlSchedPucchFormat
+ *     
+ *     Function to fill Pucch format for UL Sched Info
+ *     
+ *  @param[in]  pucchFormat , SchPucchInfo pointer,
+ *  @param[in]  SchPucchFormatCfg pointer, SchPucchResrcInfo pointer
+ *  @return  void
+ **/
+
+uint8_t fillUlSchedPucchFormat(uint8_t pucchFormat, SchPucchInfo *ulSchedPucch,\
+   SchPucchResrcInfo *resrcInfo, SchPucchFormatCfg *formatCfg)
+{
+   uint8_t ret = ROK;
+
+   switch(pucchFormat)
+   {
+      case PUCCH_FORMAT_0:
+         {
+           if(resrcInfo)
+               fillPucchFormat0(ulSchedPucch, resrcInfo);
+            return ret;
+        }
+      case PUCCH_FORMAT_1:
+         {
+           if(resrcInfo)
            {
-              if(numRbForPrachTable[idx][1] == cell->cellCfg.schRachCfg.prachSubcSpacing)
-              {
-                 if(numRbForPrachTable[idx][2] == puschScs)
-                 {
-                    break;
-                 }
-              }
+               fillPucchFormat1(ulSchedPucch, resrcInfo);
            }
-        }
-        numPrachRb = numRbForPrachTable[idx][3];
-        dataType |= SCH_DATATYPE_PRACH;
-        /* Considering first slot in the frame for PRACH */
-        idx = 0;
-        schUlSlotInfo->assignedPrb[idx] = freqStart+numPrachRb;
+           if(formatCfg)
+           {
+               memcpy(&ulSchedPucch->cmnFormatCfg, formatCfg, sizeof(SchPucchFormatCfg));
+           }
+           return ret;
+        }/* To Add support for more Pucch Format */
+      
+      default:
+         DU_LOG("\nERROR  --> SCH : Invalid PUCCH format[%d] in fillUlSchedPucchFormatCfg()", pucchFormat);
+        ret = RFAILED;
+         return ret;
+   }
+   return ret;
+}
+
+/**
+ * @brief Function to fill Pucch Dedicated Cfg for UL Sched Info
+ *
+ * @details
+ *
+ *     Function : fillUlSchedPucchDedicatedCfg
+ *     
+ *     Function to fill Pucch Dedicated Cfg for UL Sched Info
+ *     
+ *  @param[in]  pucchFormat to be filled
+ *  @param[in]  SchPucchFormatCfg pointer, SchPucchCfg pointer
+ *  @return  void
+ **/
+
+uint8_t fillUlSchedPucchDedicatedCfg(uint16_t numSlots, SchPucchCfg *pucchDedCfg,\
+   SlotTimingInfo *slotInfo, SchPucchInfo *ulSchedPucch)
+{
+   uint8_t ret, resrcSetIdx, resrcIdx, schedReqIdx, srPeriodicity = 0;
+   uint16_t srOffset = 0;
+
+   ret = ROK;
+   if(pucchDedCfg->resrcSet && pucchDedCfg->resrc)
+   {
+      //Assuming one entry in the list
+      for(resrcSetIdx = 0; resrcSetIdx < pucchDedCfg->resrcSet->resrcSetToAddModListCount; resrcSetIdx++)
+      {
+         for(resrcIdx = 0; resrcIdx < pucchDedCfg->resrc->resrcToAddModListCount; resrcIdx++)
+         {
+            if(pucchDedCfg->resrcSet->resrcSetToAddModList[resrcSetIdx].resrcList[resrcSetIdx] ==\
+              pucchDedCfg->resrc->resrcToAddModList[resrcIdx].resrcId)
+           {
+               ulSchedPucch->intraFreqHop = pucchDedCfg->resrc->resrcToAddModList[resrcIdx].intraFreqHop;
+               ulSchedPucch->secondPrbHop = pucchDedCfg->resrc->resrcToAddModList[resrcIdx].secondPrbHop;
+               ulSchedPucch->fdAlloc.startPrb = pucchDedCfg->resrc->resrcToAddModList[resrcIdx].startPrb;
+              ulSchedPucch->pucchFormat = pucchDedCfg->resrc->resrcToAddModList[resrcIdx].pucchFormat;
+              ret = fillUlSchedPucchFormat(ulSchedPucch->pucchFormat, ulSchedPucch,\
+                       &pucchDedCfg->resrc->resrcToAddModList[resrcIdx], NULLP);
+              if(ret == RFAILED)
+                 return ret;
+           }
+         }
       }
-      ulSchedInfo->dataType = dataType;
-      /* prach info */
-      ulSchedInfo->prachSchInfo.numPrachOcas   = prachOcas;
-      ulSchedInfo->prachSchInfo.prachFormat    = prachFormat;
-      ulSchedInfo->prachSchInfo.numRa          = numRa;
-      ulSchedInfo->prachSchInfo.prachStartSymb = prachStartSymbol;
    }
+   if(pucchDedCfg->format1)
+   {
+      memset(&ulSchedPucch->cmnFormatCfg, 0, sizeof(SchPucchFormatCfg));
+      ret = fillUlSchedPucchFormat(ulSchedPucch->pucchFormat, ulSchedPucch, NULLP, pucchDedCfg->format1);
+      if(ret == RFAILED)
+         return ret;
+   }
+   
+   /* setting SR and UCI flag */
+   if(pucchDedCfg->schedReq)
+   {
+      for(schedReqIdx = 0; schedReqIdx < pucchDedCfg->schedReq->schedAddModListCount; schedReqIdx++)
+      {
+         srPeriodicity = pucchDedCfg->schedReq->schedAddModList[schedReqIdx].periodicity;
+         srOffset      = pucchDedCfg->schedReq->schedAddModList[schedReqIdx].offset;
+        break;
+      }
+      if(((numSlots * slotInfo->sfn + slotInfo->slot - srOffset) % srPeriodicity) == 0)
+      {
+         ulSchedPucch->srFlag  = true;
+         ulSchedPucch->uciFlag = true;
+      }
+   }
+   return ret;
 }
 
+/**
+ * @brief Function to fill Pucch Resource Info
+ *
+ * @details
+ *
+ *     Function : fillPucchResourceInfo
+ *     
+ *     Function to fill Pucch Resource Info
+ *     
+ *  @param[in]  SchPucchInfo *schPucchInfo, Inst inst
+ *  @return  ROK/RFAILED
+ **/
+
 uint16_t fillPucchResourceInfo(SchPucchInfo *schPucchInfo, Inst inst)
 {
-   /* derive pucchResourceSet from schCellCfg */
+   uint8_t ret = ROK, ueIdx = 0, pucchIdx = 0;
    SchCellCb  *cell = schCb[inst].cells[inst];
-   SchPucchCfgCmn *pucchCfg = &cell->cellCfg.schInitialUlBwp.pucchCommon;
-   uint8_t pucchIdx = pucchCfg->pucchResourceCommon;
-   SchBwpParams *ulBwp = &cell->cellCfg.schInitialUlBwp.bwp;
+   SchPucchCfgCmn *pucchCfg = NULLP;
+   SchBwpParams *ulBwp = NULLP;
 
-   schPucchInfo->fdAlloc.startPrb = ulBwp->freqAlloc.startPrb + pucchResourceSet[pucchIdx][3];
-   schPucchInfo->fdAlloc.numPrb = PUCCH_NUM_PRB_FORMAT_0;
-   schPucchInfo->tdAlloc.startSymb = pucchResourceSet[pucchIdx][1];
-   schPucchInfo->tdAlloc.numSymb = pucchResourceSet[pucchIdx][2];
-   schPucchInfo->pucchFormat = pucchResourceSet[pucchIdx][0];
+   GET_UE_IDX(schPucchInfo->rnti, ueIdx);
+   if(cell->ueCb[ueIdx].ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfgPres)
+   {
+      /* fill pucch dedicated cfg */
+      ret = fillUlSchedPucchDedicatedCfg(cell->numSlots,\
+       &cell->ueCb[ueIdx].ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfg, &cell->slotInfo, schPucchInfo);
+      if(ret == RFAILED)
+      {
+         memset(schPucchInfo, 0, sizeof(SchPucchInfo));
+         DU_LOG("\nERROR  --> SCH : Filling PUCCH dedicated cfg failed at fillPucchResourceInfo()");
+        return ret;
+      }
+   }
+   else
+   {
+      /* fill pucch common cfg */
+      /* derive pucchResourceSet from schCellCfg */
+      pucchCfg = &cell->cellCfg.schInitialUlBwp.pucchCommon;
+      pucchIdx = pucchCfg->pucchResourceCommon;
+      ulBwp = &cell->cellCfg.schInitialUlBwp.bwp;
+      schPucchInfo->fdAlloc.startPrb = ulBwp->freqAlloc.startPrb + pucchResourceSet[pucchIdx][3];
+      schPucchInfo->fdAlloc.numPrb = PUCCH_NUM_PRB_FORMAT_0_1_4;
+      schPucchInfo->tdAlloc.startSymb = pucchResourceSet[pucchIdx][1];
+      schPucchInfo->tdAlloc.numSymb = pucchResourceSet[pucchIdx][2];
+      schPucchInfo->pucchFormat = pucchResourceSet[pucchIdx][0];
 
+      /* set SR and UCI flag to false */
+      schPucchInfo->srFlag  = true;
+      schPucchInfo->uciFlag = true;
+   }
    /* set HARQ flag to true */
    schPucchInfo->harqFlag = true;
    schPucchInfo->numHarqBits = 1; /* 1 bit for HARQ */
 
-   /* set SR and UCI flag to false */
-   schPucchInfo->srFlag  = true;
-   schPucchInfo->uciFlag = true;
-
    return ROK;
 }
 
@@ -277,11 +554,11 @@ uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
    int ret = ROK;
    UlSchedInfo ulSchedInfo;
    SchUlSlotInfo  *schUlSlotInfo = NULLP;
-   SlotIndInfo ulTimingInfo;
+   SlotTimingInfo ulTimingInfo;
    memset(&ulSchedInfo, 0, sizeof(UlSchedInfo));
 
    /* add PHY delta */
-   ADD_DELTA_TO_TIME(cell->slotInfo,ulTimingInfo,PHY_DELTA+SCHED_DELTA);
+   ADD_DELTA_TO_TIME(cell->slotInfo,ulTimingInfo,PHY_DELTA_UL+SCHED_DELTA);
 
    ulSchedInfo.cellId = cell->cellId;
    ulSchedInfo.slotIndInfo.cellId = ulSchedInfo.cellId;
@@ -289,7 +566,8 @@ uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
    ulSchedInfo.slotIndInfo.slot = ulTimingInfo.slot;
 
    /* Schedule resources for PRACH */
-   schPrachResAlloc(cell, &ulSchedInfo, ulTimingInfo);
+   if(cell->firstSib1Transmitted)
+    schPrachResAlloc(cell, &ulSchedInfo, ulTimingInfo);
 
    schUlSlotInfo = cell->schUlSlotInfo[ulTimingInfo.slot]; 
    if(schUlSlotInfo->schPuschInfo)
@@ -315,7 +593,7 @@ uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
    ret = sendUlSchInfoToMac(&ulSchedInfo, schInst);
    if(ret != ROK)
    {
-      DU_LOG("\nSending UL Sch info from SCH to MAC failed");
+      DU_LOG("\nERROR  -->  SCH : Sending UL Sch info from SCH to MAC failed");
    }
 
    schInitUlSlot(schUlSlotInfo);
@@ -338,36 +616,45 @@ uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
+uint8_t schDlRsrcAllocMsg4(SchCellCb *cell, SlotTimingInfo slotTime, DlMsgAlloc *msg4Alloc)
 {
    uint8_t coreset0Idx = 0;
-   uint8_t numRbs = 0;
    uint8_t firstSymbol = 0;
    uint8_t numSymbols = 0;
-   uint8_t offset = 0;
-   uint8_t offsetPointA;
-   uint8_t FreqDomainResource[6] = {0};
+   uint8_t mcs = 4;                         /* MCS fixed to 4 */
+   uint8_t dmrsStartSymbol = 0, startSymbol = 0, numSymbol = 0;
    uint16_t tbSize = 0;
-   uint8_t numPdschSymbols = 12; /* considering pdsch region from 2 to 13 */
-   uint8_t mcs = 4;  /* MCS fixed to 4 */
-   SchBwpDlCfg *initialBwp;
+   uint16_t numRbs;
+   SchBwpDlCfg *initialBwp = NULLP;
+   PdcchCfg *pdcch = NULLP;
+   PdschCfg *pdsch = NULLP;
+   BwpCfg *bwp = NULLP;
 
-   PdcchCfg *pdcch = &msg4Alloc->dlMsgPdcchCfg;
-   PdschCfg *pdsch = &msg4Alloc->dlMsgPdschCfg;
-   BwpCfg *bwp = &msg4Alloc->bwp;
+   if(cell == NULL)
+   {
+      DU_LOG("\nERROR  -->  SCH: schDlRsrcAllocMsg4() : Cell is NULL");
+      return RFAILED;
+   }
+
+   if(msg4Alloc == NULL)
+   {
+      DU_LOG("\nERROR  -->  SCH: schDlRsrcAllocMsg4() :  msg4Alloc is NULL");
+      return RFAILED;
+   }
 
+   pdcch = &msg4Alloc->dlMsgPdcchCfg;
+   pdsch = &msg4Alloc->dlMsgPdschCfg;
+   bwp = &msg4Alloc->bwp;
    initialBwp   = &cell->cellCfg.schInitialDlBwp;
-   offsetPointA = cell->cellCfg.ssbSchCfg.ssbOffsetPointA;
    coreset0Idx  = initialBwp->pdcchCommon.commonSearchSpace.coresetId;
 
    /* derive the sib1 coreset0 params from table 13-1 spec 38.213 */
-   numRbs        = coresetIdxTable[coreset0Idx][1];
-   numSymbols    = coresetIdxTable[coreset0Idx][2];
-   offset        = coresetIdxTable[coreset0Idx][3];
+   numRbs     = coresetIdxTable[coreset0Idx][1];
+   numSymbols = coresetIdxTable[coreset0Idx][2];
 
    /* calculate time domain parameters */
    uint16_t mask = 0x2000;
-   for(firstSymbol=0; firstSymbol<14;firstSymbol++)
+   for(firstSymbol=0; firstSymbol<MAX_SYMB_PER_SLOT; firstSymbol++)
    {
       if(initialBwp->pdcchCommon.commonSearchSpace.monitoringSymbol & mask)
         break;
@@ -375,9 +662,6 @@ uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot
         mask = mask>>1;
    }
 
-   /* calculate the PRBs */
-   freqDomRscAllocType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource);
-
    /* fill BWP */
    bwp->freqAlloc.numPrb   = initialBwp->bwp.freqAlloc.numPrb;
    bwp->freqAlloc.startPrb = initialBwp->bwp.freqAlloc.startPrb;
@@ -387,7 +671,9 @@ uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot
    /* fill the PDCCH PDU */
    pdcch->coresetCfg.startSymbolIndex = firstSymbol;
    pdcch->coresetCfg.durationSymbols = numSymbols;
-   memcpy(pdcch->coresetCfg.freqDomainResource,FreqDomainResource,6);
+   memcpy(pdcch->coresetCfg.freqDomainResource, \
+      cell->cellCfg.schInitialDlBwp.pdcchCommon.commonSearchSpace.freqDomainRsrc, FREQ_DOM_RSRC_SIZE);
+
    pdcch->coresetCfg.cceRegMappingType = 1; /* coreset0 is always interleaved */
    pdcch->coresetCfg.regBundleSize = 6;    /* spec-38.211 sec 7.3.2.2 */
    pdcch->coresetCfg.interleaverSize = 2;  /* spec-38.211 sec 7.3.2.2 */
@@ -396,7 +682,7 @@ uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot
    pdcch->coresetCfg.shiftIndex = cell->cellCfg.phyCellId;
    pdcch->coresetCfg.precoderGranularity = 0; /* sameAsRegBundle */
    pdcch->numDlDci = 1;
-   pdcch->dci.rnti = cell->schDlSlotInfo[slot]->dlMsgInfo->crnti;
+   pdcch->dci.rnti = cell->schDlSlotInfo[slotTime.slot]->dlMsgInfo->crnti;
    pdcch->dci.scramblingId = cell->cellCfg.phyCellId;
    pdcch->dci.scramblingRnti = 0;
    pdcch->dci.cceIndex = 4; /* considering SIB1 is sent at cce 0-1-2-3 */
@@ -412,7 +698,7 @@ uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot
    /* fill the PDSCH PDU */
    uint8_t cwCount = 0;
    pdsch->pduBitmap = 0; /* PTRS and CBG params are excluded */
-   pdsch->rnti = cell->schDlSlotInfo[slot]->dlMsgInfo->crnti;
+   pdsch->rnti = cell->schDlSlotInfo[slotTime.slot]->dlMsgInfo->crnti;
    pdsch->pduIndex = 0;
    pdsch->numCodewords = 1;
    for(cwCount = 0; cwCount < pdsch->numCodewords; cwCount++)
@@ -422,16 +708,14 @@ uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot
       pdsch->codeword[cwCount].mcsIndex = mcs; /* mcs configured to 4 */
       pdsch->codeword[cwCount].mcsTable = 0; /* notqam256 */
       pdsch->codeword[cwCount].rvIndex = 0;
-      /* 38.214: Table 5.1.3.2-1,  divided by 8 to get the value in bytes */
-      /* TODO : Calculate tbSize based of DL CCCH msg size */
-      tbSize = schCalcTbSize(2664/8); /* send this value to the func in bytes when considering msg4 size */
+      tbSize = schCalcTbSize(msg4Alloc->dlMsgInfo.dlMsgPduLen + TX_PAYLOAD_HDR_LEN); /* MSG4 size + FAPI header size*/
       pdsch->codeword[cwCount].tbSize = tbSize;
    }
    pdsch->dataScramblingId = cell->cellCfg.phyCellId;
    pdsch->numLayers = 1;
    pdsch->transmissionScheme = 0;
    pdsch->refPoint = 0;
-   pdsch->dmrs.dlDmrsSymbPos = 2;
+   pdsch->dmrs.dlDmrsSymbPos = 4; /* Bitmap value 00000000000100 i.e. using 3rd symbol for PDSCH DMRS */
    pdsch->dmrs.dmrsConfigType = 0; /* type-1 */
    pdsch->dmrs.dlDmrsScramblingId = cell->cellCfg.phyCellId;
    pdsch->dmrs.scid = 0;
@@ -440,13 +724,39 @@ uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot
    pdsch->dmrs.mappingType      = DMRS_MAP_TYPE_A; /* Setting to Type-A */
    pdsch->dmrs.nrOfDmrsSymbols  = NUM_DMRS_SYMBOLS;
    pdsch->dmrs.dmrsAddPos       = DMRS_ADDITIONAL_POS;
+
+   pdsch->pdschTimeAlloc.timeAlloc.startSymb = 3; /* spec-38.214, Table 5.1.2.1-1 */
+   pdsch->pdschTimeAlloc.timeAlloc.numSymb = NUM_PDSCH_SYMBOL;
+
    pdsch->pdschFreqAlloc.resourceAllocType = 1; /* RAT type-1 RIV format */
-   /* the RB numbering starts from coreset0, and PDSCH is always above SSB */
-   pdsch->pdschFreqAlloc.freqAlloc.startPrb = offset + SCH_SSB_NUM_PRB;
-   pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize,mcs,numPdschSymbols);
+   pdsch->pdschFreqAlloc.freqAlloc.startPrb = MAX_NUM_RB;
+   pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize, mcs, NUM_PDSCH_SYMBOL);
    pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */
-   pdsch->pdschTimeAlloc.timeAlloc.startSymb = 2; /* spec-38.214, Table 5.1.2.1-1 */
-   pdsch->pdschTimeAlloc.timeAlloc.numSymb = 12;
+
+   /* Find total symbols occupied including DMRS */
+   dmrsStartSymbol = findDmrsStartSymbol(pdsch->dmrs.dlDmrsSymbPos);
+   /* If there are no DRMS symbols, findDmrsStartSymbol() returns MAX_SYMB_PER_SLOT,
+    * in that case only PDSCH symbols are marked as occupied */
+   if(dmrsStartSymbol == MAX_SYMB_PER_SLOT)
+   {
+      startSymbol = pdsch->pdschTimeAlloc.timeAlloc.startSymb;
+      numSymbol = pdsch->pdschTimeAlloc.timeAlloc.numSymb;
+   }
+   /* If DMRS symbol is found, mark DMRS and PDSCH symbols as occupied */
+   else
+   {
+      startSymbol = dmrsStartSymbol;
+      numSymbol = pdsch->dmrs.nrOfDmrsSymbols + pdsch->pdschTimeAlloc.timeAlloc.numSymb;
+   }
+
+   /* Allocate the number of PRBs required for RAR PDSCH */
+   if((allocatePrbDl(cell, slotTime, startSymbol, numSymbol,\
+      &pdsch->pdschFreqAlloc.freqAlloc.startPrb, pdsch->pdschFreqAlloc.freqAlloc.numPrb)) != ROK)
+   {
+      DU_LOG("\nERROR  --> SCH : Resource allocation failed for MSG4");
+      return RFAILED;
+   }
+
    pdsch->beamPdschInfo.numPrgs = 1;
    pdsch->beamPdschInfo.prgSize = 1;
    pdsch->beamPdschInfo.digBfInterfaces = 0;
@@ -459,13 +769,30 @@ uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot
 
    return ROK;
 }
-
-uint16_t schAllocPucchResource(SchCellCb *cell,uint16_t crnti, uint16_t slot)
+uint16_t schAllocPucchResource(SchCellCb *cell, uint16_t crnti, uint16_t slot)
 {
-   uint8_t k1 = 1; /* dl-DataToUL-ACK RRC parameter will received from DU-APP msg4-pucch config */
-   uint16_t pucchSlot = (slot + k1)  % cell->numSlots;
+   uint8_t k1 = SCH_DEFAULT_K1, ueIdx = 0, dlToUlAckIdx;
+   uint16_t pucchSlot = 0;
    SchUlSlotInfo  *schUlSlotInfo = NULLP;
+   SchPucchCfg    *schPucchCfg = NULLP;
 
+   GET_UE_IDX(crnti, ueIdx);
+   if(cell->ueCb[ueIdx].ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfgPres)
+   {
+      schPucchCfg = &(cell->ueCb[ueIdx].ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfg);
+     if(schPucchCfg->dlDataToUlAck)
+     {
+        for(dlToUlAckIdx = 0; dlToUlAckIdx < schPucchCfg->dlDataToUlAck->dlDataToUlAckListCount; dlToUlAckIdx++)
+       {
+           //For now considering only the first value in the list
+           k1 = schPucchCfg->dlDataToUlAck->dlDataToUlAckList[dlToUlAckIdx];
+          break;
+       }
+     }
+   }
+   
+   pucchSlot = (slot + k1)  % cell->numSlots;
    schUlSlotInfo = cell->schUlSlotInfo[pucchSlot];
    memset(&schUlSlotInfo->schPucchInfo, 0, sizeof(SchPucchInfo));
 
@@ -491,18 +818,18 @@ uint16_t schAllocPucchResource(SchCellCb *cell,uint16_t crnti, uint16_t slot)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t schDlRsrcAllocDlMsg(DlMsgAlloc *dlMsgAlloc, SchCellCb *cell, uint16_t crnti,
-      uint16_t accumalatedSize, uint16_t slot)
+uint8_t schDlRsrcAllocDlMsg(SchCellCb *cell, SlotTimingInfo slotTime, uint16_t crnti,
+      uint32_t *accumalatedSize, DlMsgAlloc *dlMsgAlloc)
 {
    uint8_t ueIdx;
    uint16_t tbSize = 0;
-   uint8_t numPdschSymbols = 12; /* considering pdsch region from 2 to 13 */
    PdcchCfg *pdcch = NULLP;
    PdschCfg *pdsch = NULLP;
    BwpCfg *bwp = NULLP;
    SchUeCb ueCb;
    SchControlRsrcSet coreset1;
    SchPdschConfig pdschCfg;
+   uint8_t dmrsStartSymbol, startSymbol, numSymbol;
 
    pdcch = &dlMsgAlloc->dlMsgPdcchCfg;
    pdsch = &dlMsgAlloc->dlMsgPdschCfg;
@@ -559,14 +886,16 @@ uint8_t schDlRsrcAllocDlMsg(DlMsgAlloc *dlMsgAlloc, SchCellCb *cell, uint16_t cr
       pdsch->codeword[cwCount].mcsIndex = ueCb.ueCfg.dlModInfo.mcsIndex;
       pdsch->codeword[cwCount].mcsTable = ueCb.ueCfg.dlModInfo.mcsTable;
       pdsch->codeword[cwCount].rvIndex = 0;
-      tbSize = schCalcTbSize(accumalatedSize);
+      tbSize = schCalcTbSize(*accumalatedSize + TX_PAYLOAD_HDR_LEN);
+      if(tbSize < *accumalatedSize)
+         *accumalatedSize = tbSize - TX_PAYLOAD_HDR_LEN;
       pdsch->codeword[cwCount].tbSize = tbSize;
    }
    pdsch->dataScramblingId = cell->cellCfg.phyCellId;
    pdsch->numLayers = 1;
    pdsch->transmissionScheme = 0;
    pdsch->refPoint = 0;
-   pdsch->dmrs.dlDmrsSymbPos = 2;
+   pdsch->dmrs.dlDmrsSymbPos = 4; /* Bitmap value 00000000000100 i.e. using 3rd symbol for PDSCH DMRS */
    pdsch->dmrs.dmrsConfigType = 0; /* type-1 */
    pdsch->dmrs.dlDmrsScramblingId = cell->cellCfg.phyCellId;
    pdsch->dmrs.scid = 0;
@@ -575,12 +904,40 @@ uint8_t schDlRsrcAllocDlMsg(DlMsgAlloc *dlMsgAlloc, SchCellCb *cell, uint16_t cr
    pdsch->dmrs.mappingType      = DMRS_MAP_TYPE_A; /* Setting to Type-A */
    pdsch->dmrs.nrOfDmrsSymbols  = NUM_DMRS_SYMBOLS;
    pdsch->dmrs.dmrsAddPos       = pdschCfg.dmrsDlCfgForPdschMapTypeA.addPos;
-   pdsch->pdschFreqAlloc.resourceAllocType = 1; /* RAT type-1 RIV format */
-   pdsch->pdschFreqAlloc.freqAlloc.startPrb = 1;
-   pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize, ueCb.ueCfg.dlModInfo.mcsIndex, numPdschSymbols);
-   pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */
+
    pdsch->pdschTimeAlloc.timeAlloc.startSymb = pdschCfg.timeDomRsrcAllociList[0].startSymbol;
    pdsch->pdschTimeAlloc.timeAlloc.numSymb = pdschCfg.timeDomRsrcAllociList[0].symbolLength;
+
+   pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */
+   pdsch->pdschFreqAlloc.resourceAllocType = 1; /* RAT type-1 RIV format */
+   pdsch->pdschFreqAlloc.freqAlloc.startPrb = MAX_NUM_RB;
+   pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize, ueCb.ueCfg.dlModInfo.mcsIndex, \
+                  pdschCfg.timeDomRsrcAllociList[0].symbolLength);
+
+   /* Find total symbols occupied including DMRS */
+   dmrsStartSymbol = findDmrsStartSymbol(pdsch->dmrs.dlDmrsSymbPos);
+   /* If there are no DRMS symbols, findDmrsStartSymbol() returns MAX_SYMB_PER_SLOT,
+    * in that case only PDSCH symbols are marked as occupied */
+   if(dmrsStartSymbol == MAX_SYMB_PER_SLOT)
+   {
+      startSymbol = pdsch->pdschTimeAlloc.timeAlloc.startSymb;
+      numSymbol = pdsch->pdschTimeAlloc.timeAlloc.numSymb;
+   }
+   /* If DMRS symbol is found, mark DMRS and PDSCH symbols as occupied */
+   else
+   {
+      startSymbol = dmrsStartSymbol;
+      numSymbol = pdsch->dmrs.nrOfDmrsSymbols + pdsch->pdschTimeAlloc.timeAlloc.numSymb;
+   }
+
+   /* Allocate the number of PRBs required for DL PDSCH */
+   if((allocatePrbDl(cell, slotTime, startSymbol, numSymbol,\
+      &pdsch->pdschFreqAlloc.freqAlloc.startPrb, pdsch->pdschFreqAlloc.freqAlloc.numPrb)) != ROK)
+   {
+      DU_LOG("\nERROR  --> SCH : allocatePrbDl() failed for DL MSG");
+      return RFAILED;
+   }
+
    pdsch->beamPdschInfo.numPrgs = 1;
    pdsch->beamPdschInfo.prgSize = 1;
    pdsch->beamPdschInfo.digBfInterfaces = 0;
@@ -593,6 +950,491 @@ uint8_t schDlRsrcAllocDlMsg(DlMsgAlloc *dlMsgAlloc, SchCellCb *cell, uint16_t cr
    return ROK;
 }
 
+/*******************************************************************
+ *
+ * @brief Fills k0 and k1 information table for FDD 
+ *
+ * @details
+ *
+ *    Function : BuildK0K1TableForFdd 
+ *
+ *    Functionality:
+ *      Fills k0 and k1 information table for FDD
+ *
+ * @params[in] SchCellCb *cell,SchK0K1TimingInfoTbl *k0K1InfoTbl,bool
+ * pdschCfgCmnPres,uint8_t numTimeDomAlloc, SchPdschCfgCmnTimeDomRsrcAlloc
+ * cmnTimeDomRsrcAllocList[], SchPdschTimeDomRsrcAlloc
+ * dedTimeDomRsrcAllocList[], uint8_t ulAckListCount, uint8_t *UlAckTbl
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void BuildK0K1TableForFdd(SchCellCb *cell, SchK0K1TimingInfoTbl *k0K1InfoTbl, bool pdschCfgCmnPres,SchPdschCfgCmn pdschCmnCfg,\
+SchPdschConfig pdschDedCfg, uint8_t ulAckListCount, uint8_t *UlAckTbl)
+{
+   
+   uint8_t k1TmpVal =0, cfgIdx=0;
+   uint8_t slotIdx=0, k0Index=0, k1Index=0, numK0=0, numK1=0, numTimeDomAlloc=0;
+   
+   /* TODO Commented these below lines for resolving warnings. Presently these variable are not 
+    * required but this will require for harq processing */
+   // uint8_t k0TmpVal = 0; 
+   // SchPdschCfgCmnTimeDomRsrcAlloc cmnTimeDomRsrcAllocList[MAX_NUM_DL_ALLOC];
+   // SchPdschTimeDomRsrcAlloc dedTimeDomRsrcAllocList[MAX_NUM_DL_ALLOC];
+
+   /* Initialization the structure and storing the total slot values. */
+   memset(k0K1InfoTbl, 0, sizeof(SchK0K1TimingInfoTbl));
+   k0K1InfoTbl->tblSize = cell->numSlots;
+   
+   /* Storing time domain resource allocation list based on common or dedicated configuration. */
+   if(pdschCfgCmnPres == true)
+   {
+      numTimeDomAlloc = pdschCmnCfg.numTimeDomAlloc;
+      for(cfgIdx = 0; cfgIdx<numTimeDomAlloc; cfgIdx++)
+      {
+         /*TODO uncomment this line during harq processing */
+         //cmnTimeDomRsrcAllocList[cfgIdx] = pdschCmnCfg.timeDomRsrcAllocList[cfgIdx];
+      }
+   }
+   else
+   {
+      numTimeDomAlloc = pdschDedCfg.numTimeDomRsrcAlloc;
+      for(cfgIdx = 0; cfgIdx<numTimeDomAlloc; cfgIdx++)
+      {
+         /*TODO uncomment this line during harq processing */
+         //dedTimeDomRsrcAllocList[cfgIdx] = pdschDedCfg.timeDomRsrcAllociList[cfgIdx];
+      }
+   }
+   
+   /* Checking all the slots for K0 and K1 values. */
+   for(slotIdx = 0; slotIdx < cell->numSlots; slotIdx++)
+   {
+      numK0 = 0;
+      /* Storing the values of k0 based on time domain resource
+       * allocation list. If the value is unavailable then fill default values,
+       * As per 38.331 PDSCH-TimeDomainResourceAllocation field descriptions. */
+      for(k0Index = 0; ((k0Index < numTimeDomAlloc) && (k0Index < MAX_NUM_K0_IDX));  k0Index++)
+      {
+         /* TODO These if 0 we will remove during harq processing */
+#if 0
+         if(pdschCfgCmnPres == true)
+         {
+            k0TmpVal = cmnTimeDomRsrcAllocList[k0Index].k0;
+         }
+         else
+         {
+            if(dedTimeDomRsrcAllocList[k0Index].k0 != NULLP)
+            {
+               k0TmpVal = *(dedTimeDomRsrcAllocList[k0Index].k0);
+            }
+            else
+            { 
+               k0TmpVal = DEFAULT_K0_VALUE;
+            }
+         }
+#endif         
+         /* Checking all the Ul Alloc values. If value is less than MIN_NUM_K1_IDX
+          * then skip else continue storing the values. */
+         numK1 = 0;
+         for(k1Index = 0; k1Index < ulAckListCount; k1Index++)
+         {
+            k1TmpVal = UlAckTbl[k1Index];
+            if(k1TmpVal <= MIN_NUM_K1_IDX)
+            {
+               continue;
+            }
+
+            k0K1InfoTbl->k0k1TimingInfo[slotIdx].k0Indexes[numK0].k1TimingInfo.k1Indexes[numK1++] = k1Index;
+            /* TODO Store K1 index where harq feedback will be received in harq table. */ 
+         }
+         if(numK1)
+         {
+            k0K1InfoTbl->k0k1TimingInfo[slotIdx].k0Indexes[numK0].k1TimingInfo.numK1 = numK1;
+            k0K1InfoTbl->k0k1TimingInfo[slotIdx].k0Indexes[numK0].k0Index = k0Index;
+            numK0++;
+         }
+      }
+      if(numK0)
+      {
+         k0K1InfoTbl->k0k1TimingInfo[slotIdx].numK0 = numK0;
+      }
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Fills k0 and k1 information table  
+ *
+ * @details
+ *
+ *    Function : BuildK0K1Table
+ *
+ *    Functionality:
+ *       Fills K0 and k1 information table 
+ *
+ * @params[in] SchCellCb *cell,SchK0K1TimingInfoTbl *k0K1InfoTbl,bool
+ * pdschCfgCmnPres,uint8_t numTimeDomAlloc, SchPdschCfgCmnTimeDomRsrcAlloc
+ * cmnTimeDomRsrcAllocList[], SchPdschTimeDomRsrcAlloc
+ * dedTimeDomRsrcAllocList[], uint8_t ulAckListCount, uint8_t *UlAckTbl
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void BuildK0K1Table(SchCellCb *cell, SchK0K1TimingInfoTbl *k0K1InfoTbl, bool pdschCfgCmnPres, SchPdschCfgCmn pdschCmnCfg,\
+SchPdschConfig pdschDedCfg, uint8_t ulAckListCount, uint8_t *UlAckTbl)
+{
+
+#ifdef NR_TDD
+   SlotConfig  slotCfg;
+   bool ulSlotPresent = false;
+   uint8_t k0TmpVal = 0, k1TmpVal =0, tmpSlot=0, startSymbol=0, endSymbol=0, checkSymbol=0;
+   uint8_t slotIdx=0, k0Index=0, k1Index=0, numK0=0, numK1=0, cfgIdx=0, numTimeDomAlloc =0, totalCfgSlot =0;
+   SchPdschCfgCmnTimeDomRsrcAlloc cmnTimeDomRsrcAllocList[MAX_NUM_DL_ALLOC];
+   SchPdschTimeDomRsrcAlloc dedTimeDomRsrcAllocList[MAX_NUM_DL_ALLOC];
+#endif
+
+   if(cell->cellCfg.dupMode == DUPLEX_MODE_FDD)
+   {
+      BuildK0K1TableForFdd(cell, k0K1InfoTbl, pdschCfgCmnPres, pdschCmnCfg, pdschDedCfg, ulAckListCount, UlAckTbl);
+   }
+   else
+   {
+#ifdef NR_TDD
+      
+      /* Initialization the K0K1 structure, total num of slot and calculating the slot pattern length. */
+      memset(k0K1InfoTbl, 0, sizeof(SchK0K1TimingInfoTbl));
+      k0K1InfoTbl->tblSize = cell->numSlots;
+      totalCfgSlot = calculateSlotPatternLength(cell->cellCfg.ssbSchCfg.scsCommon, cell->cellCfg.tddCfg.tddPeriod);
+      
+      /* Storing time domain resource allocation list based on common or 
+       * dedicated configuration availability. */
+      if(pdschCfgCmnPres == true)
+      {
+         numTimeDomAlloc = pdschCmnCfg.numTimeDomAlloc;
+         for(cfgIdx = 0; cfgIdx<numTimeDomAlloc; cfgIdx++)
+         {
+            cmnTimeDomRsrcAllocList[cfgIdx] = pdschCmnCfg.timeDomRsrcAllocList[cfgIdx];
+         }
+      }
+      else
+      {
+         numTimeDomAlloc = pdschDedCfg.numTimeDomRsrcAlloc;
+         for(cfgIdx = 0; cfgIdx<numTimeDomAlloc; cfgIdx++)
+         {
+            dedTimeDomRsrcAllocList[cfgIdx] = pdschDedCfg.timeDomRsrcAllociList[cfgIdx];
+         }
+      }
+
+      /* Checking all possible indexes for K0 and K1 values. */
+      for(slotIdx = 0; slotIdx < cell->numSlots; slotIdx++)
+      {
+         /* If current slot is UL or FLEXI then Skip because PDCCH is sent only in DL slots. */
+         slotCfg = schGetSlotSymbFrmt(slotIdx%totalCfgSlot, cell->slotFrmtBitMap);
+         if(slotCfg == UL_SLOT || slotCfg == FLEXI_SLOT)
+         {
+            continue;
+         }
+         
+         /* Storing K0 , start symbol and length symbol for further processing.
+          * If K0 value is not available then we can fill the default values
+          * given in spec 38.331. */
+         numK0 = 0;
+         for(k0Index = 0; ((k0Index < numTimeDomAlloc) && (k0Index < MAX_NUM_K0_IDX)); k0Index++)
+         {
+            if(pdschCfgCmnPres == true)
+            {
+               k0TmpVal = cmnTimeDomRsrcAllocList[k0Index].k0;
+               startSymbol = cmnTimeDomRsrcAllocList[k0Index].startSymbol;
+               endSymbol = startSymbol + cmnTimeDomRsrcAllocList[k0Index].lengthSymbol;
+            }
+            else
+            {
+               if(dedTimeDomRsrcAllocList[k0Index].k0 != NULLP)
+               {
+                  k0TmpVal =  *(dedTimeDomRsrcAllocList[k0Index].k0);
+               }
+               else
+               {
+                  k0TmpVal = DEFAULT_K0_VALUE;
+               }
+               startSymbol = dedTimeDomRsrcAllocList[k0Index].startSymbol;
+               endSymbol = startSymbol + dedTimeDomRsrcAllocList[k0Index].symbolLength;
+            }
+            
+            /* If current slot + k0 is UL then skip the slot
+             * else if it is DL slot then continue the next steps
+             * else if it is a FLEXI slot then check symbols of slot, It should not
+             * contain any UL slot. */
+            tmpSlot = (slotIdx+k0TmpVal) % totalCfgSlot;
+            slotCfg = schGetSlotSymbFrmt(tmpSlot, cell->slotFrmtBitMap);
+            if(slotCfg == UL_SLOT)
+            {
+               continue;
+            }
+            if(slotCfg == FLEXI_SLOT)
+            {
+               for(checkSymbol = startSymbol; checkSymbol<endSymbol; checkSymbol ++)
+               {
+                  slotCfg = cell->cellCfg.tddCfg.slotCfg[tmpSlot][checkSymbol];
+                  if(slotCfg == UL_SLOT)
+                  {
+                     continue;
+                  }
+               }
+            }
+
+            /* If current slot + k0 + k1 is a DL slot then skip the slot
+             * else if it is UL slot then store the information 
+             * else if it is FLEXI slot then check the symbols, it must have
+             * at least one UL symbol. */
+            numK1 = 0;
+            for(k1Index = 0; k1Index < ulAckListCount; k1Index++)
+            {
+               k1TmpVal = UlAckTbl[k1Index];
+               if(k1TmpVal > MIN_NUM_K1_IDX)
+               {
+                  tmpSlot = (slotIdx+k0TmpVal+k1TmpVal) % totalCfgSlot;
+                  slotCfg =  schGetSlotSymbFrmt(tmpSlot, cell->slotFrmtBitMap);
+                  if(slotCfg == DL_SLOT) 
+                  {
+                     continue;
+                  }   
+                  if(slotCfg == FLEXI_SLOT)
+                  {
+                     for(checkSymbol = 0; checkSymbol< MAX_SYMB_PER_SLOT;checkSymbol++)
+                     {
+                        if(cell->cellCfg.tddCfg.slotCfg[tmpSlot][checkSymbol] == UL_SLOT)
+                        {
+                           ulSlotPresent = true;
+                           break;
+                        }
+                     }
+                  }
+                  if(ulSlotPresent == true || slotCfg ==  UL_SLOT)
+                  {
+                     k0K1InfoTbl->k0k1TimingInfo[slotIdx].k0Indexes[numK0].k1TimingInfo.k1Indexes[numK1++] = k1Index;
+                     /* TODO Store K1 index where harq feedback will be received
+                      * in harq table. */
+                  }
+               }
+            }
+            
+            /* Store all the values if all condition satisfies. */
+            if(numK1)
+            {
+               k0K1InfoTbl->k0k1TimingInfo[slotIdx].k0Indexes[numK0].k1TimingInfo.numK1 = numK1;
+               k0K1InfoTbl->k0k1TimingInfo[slotIdx].k0Indexes[numK0].k0Index = k0Index;
+               numK0++;
+            }
+         }
+         if(numK0)
+         {
+            k0K1InfoTbl->k0k1TimingInfo[slotIdx].numK0 = numK0;
+         }
+      }
+#endif
+   }
+}
+
+/*******************************************************************
+*
+* @brief Fills K2 information table for FDD
+*
+* @details
+*
+*    Function : BuildK2InfoTableForFdd 
+*
+*    Functionality:
+*       Fills K2 information table for FDD
+*
+* @params[in] SchCellCb *cell,SchPuschTimeDomRsrcAlloc timeDomRsrcAllocList[],
+* uint16_t puschSymTblSize,SchK2TimingInfoTbl *k2InfoTbl
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+void BuildK2InfoTableForFdd(SchCellCb *cell, SchPuschTimeDomRsrcAlloc timeDomRsrcAllocList[], uint16_t puschSymTblSize,\
+SchK2TimingInfoTbl *msg3K2InfoTbl, SchK2TimingInfoTbl *k2InfoTbl)
+{
+   uint16_t slotIdx=0, k2Index=0, k2TmpIdx=0, msg3K2TmpIdx=0;
+
+   /* Initialization the structure and storing the total slot values. */
+   memset(k2InfoTbl, 0, sizeof(SchK2TimingInfoTbl));
+   k2InfoTbl->tblSize = cell->numSlots;
+   if(msg3K2InfoTbl)
+      msg3K2InfoTbl->tblSize = cell->numSlots;
+   
+   /* Checking all possible indexes for K2. */
+   for(slotIdx = 0; slotIdx < cell->numSlots; slotIdx++)
+   {
+      /* Storing K2 values. */
+      for(k2Index = 0; ((k2Index < puschSymTblSize) && (k2Index < MAX_NUM_K2_IDX)); k2Index++)
+      {
+         k2TmpIdx= k2InfoTbl->k2TimingInfo[slotIdx].numK2;
+         k2InfoTbl->k2TimingInfo[slotIdx].k2Indexes[k2TmpIdx] = k2Index;
+         k2InfoTbl->k2TimingInfo[slotIdx].numK2++;
+
+         /* Updating K2 values for MSG3 */
+         if(msg3K2InfoTbl)
+         {
+            msg3K2TmpIdx = msg3K2InfoTbl->k2TimingInfo[slotIdx].numK2;
+            msg3K2InfoTbl->k2TimingInfo[slotIdx].k2Indexes[msg3K2TmpIdx] = k2Index;
+            msg3K2InfoTbl->k2TimingInfo[slotIdx].numK2++;
+         }
+      }
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Fills K2 information table
+ *
+ * @details
+ *
+ *    Function : BuildK2InfoTable 
+ *
+ *    Functionality:
+ *       Fills K2 information table
+ *
+ * @params[in] SchCellCb *cell,SchPuschTimeDomRsrcAlloc timeDomRsrcAllocList[],
+ * uint16_t puschSymTblSize, SchK2TimingInfoTbl *k2InfoTbl
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void BuildK2InfoTable(SchCellCb *cell, SchPuschTimeDomRsrcAlloc timeDomRsrcAllocList[], uint16_t puschSymTblSize,\
+SchK2TimingInfoTbl *msg3K2InfoTbl, SchK2TimingInfoTbl *k2InfoTbl)
+{
+
+#ifdef NR_TDD
+   bool dlSymbolPresent = false;
+   uint8_t slotIdx=0, k2Index=0, k2Val=0, k2TmpVal=0, msg3K2TmpVal=0, msg3Delta=0, numK2 =0, currentSymbol =0;
+   uint8_t startSymbol =0, endSymbol =0, checkSymbol=0, totalCfgSlot=0, slotCfg=0;
+   SlotConfig currentSlot;
+#endif
+
+   if(cell->cellCfg.dupMode == DUPLEX_MODE_FDD)
+   {
+      BuildK2InfoTableForFdd(cell, timeDomRsrcAllocList, puschSymTblSize, msg3K2InfoTbl, k2InfoTbl);
+   }
+   else
+   {
+#ifdef NR_TDD
+
+      /* Initialization the structure and storing the total slot values. */
+      memset(k2InfoTbl, 0, sizeof(SchK2TimingInfoTbl));
+      k2InfoTbl->tblSize = cell->numSlots;
+      if(msg3K2InfoTbl)
+         msg3K2InfoTbl->tblSize = cell->numSlots;
+      totalCfgSlot = calculateSlotPatternLength(cell->cellCfg.ssbSchCfg.scsCommon, cell->cellCfg.tddCfg.tddPeriod);
+
+      /* Checking all possible indexes for K2. */
+      for(slotIdx = 0; slotIdx < cell->numSlots; slotIdx++)
+      {
+         currentSlot = schGetSlotSymbFrmt(slotIdx % totalCfgSlot, cell->slotFrmtBitMap);
+         
+         /* If current slot is UL then skip because PDCCH is sent only in DL slots */
+         if(currentSlot != UL_SLOT)
+         {
+            for(k2Index = 0; ((k2Index < puschSymTblSize) && (k2Index < MAX_NUM_K2_IDX)); k2Index++)
+            {
+               /* Storing k2, startSymbol, endSymbol information for further processing.
+                * If k2 is absent then fill the default values given in spec 38.331
+                * PUSCH-TimeDomainResourceAllocationList field descriptions */
+               k2Val = timeDomRsrcAllocList[k2Index].k2;
+               if(!k2Val)
+               {
+                  switch(cell->cellCfg.ssbSchCfg.scsCommon)
+                  {
+                     case SCS_15KHZ:
+                        k2Val = DEFAULT_K2_VALUE_FOR_SCS15;
+                        break;
+                     case SCS_30KHZ:
+                        k2Val = DEFAULT_K2_VALUE_FOR_SCS30;
+                        break;
+                     case SCS_60KHZ:
+                        k2Val = DEFAULT_K2_VALUE_FOR_SCS60;
+                        break;
+                     case SCS_120KHZ:
+                        k2Val = DEFAULT_K2_VALUE_FOR_SCS120;
+                        break;
+                  }
+               }
+               
+               /* Current slot + k2 should be either UL or FLEXI slot.
+                * If slot is FLEXI then check all the symbols of that slot,
+                * it should not contain any DL or FLEXI slot */
+               k2TmpVal = (slotIdx + k2Val) % totalCfgSlot;
+               slotCfg = schGetSlotSymbFrmt(k2TmpVal, cell->slotFrmtBitMap);
+               if(slotCfg != DL_SLOT)
+               {
+                  if(slotCfg == FLEXI_SLOT)
+                  {
+                     startSymbol =  timeDomRsrcAllocList[k2Index].startSymbol;
+                     endSymbol   =  startSymbol+ timeDomRsrcAllocList[k2Index].symbolLength;
+                     dlSymbolPresent = false;
+                     for(checkSymbol= startSymbol; checkSymbol<endSymbol; checkSymbol++)
+                     {
+                        currentSymbol = cell->cellCfg.tddCfg.slotCfg[k2TmpVal][checkSymbol];
+                        if(currentSymbol == DL_SLOT || currentSymbol == FLEXI_SLOT)
+                        {
+                           dlSymbolPresent = true;
+                           break;
+                        }
+                     }
+                  }
+                  /* Store all the values if all condition satisfies. */
+                  if(dlSymbolPresent != true || slotCfg == UL_SLOT)
+                  {
+                     numK2 = k2InfoTbl->k2TimingInfo[slotIdx].numK2;
+                     k2InfoTbl->k2TimingInfo[slotIdx].k2Indexes[numK2] = k2Index;
+                     k2InfoTbl->k2TimingInfo[slotIdx].numK2++;
+                  }
+               }
+
+               if(msg3K2InfoTbl)
+               {
+                   msg3Delta = puschDeltaTable[cell->cellCfg.numerology];
+
+                  /* Check for K2 for MSG3 */
+                  /* Current slot + k2 should be either UL or FLEXI slot.
+                   * If slot is FLEXI then check all the symbols of that slot,
+                   * it should not contain any DL or FLEXI slot */
+                  msg3K2TmpVal = (slotIdx + k2Val + msg3Delta) % totalCfgSlot;
+                  slotCfg = schGetSlotSymbFrmt(msg3K2TmpVal, cell->slotFrmtBitMap);
+                  if(slotCfg != DL_SLOT)
+                  {
+                     if(slotCfg == FLEXI_SLOT)
+                     {
+                        startSymbol =  timeDomRsrcAllocList[k2Index].startSymbol;
+                        endSymbol   =  startSymbol+ timeDomRsrcAllocList[k2Index].symbolLength;
+                        dlSymbolPresent = false;
+                        for(checkSymbol= startSymbol; checkSymbol<endSymbol; checkSymbol++)
+                        {
+                           currentSymbol = cell->cellCfg.tddCfg.slotCfg[msg3K2TmpVal][checkSymbol];
+                           if(currentSymbol == DL_SLOT || currentSymbol == FLEXI_SLOT)
+                           {
+                              dlSymbolPresent = true;
+                              break;
+                           }
+                        }
+                     }
+                     /* Store all the values if all condition satisfies. */
+                     if(dlSymbolPresent != true || slotCfg == UL_SLOT)
+                     {
+                        numK2 = msg3K2InfoTbl->k2TimingInfo[slotIdx].numK2;
+                        msg3K2InfoTbl->k2TimingInfo[slotIdx].k2Indexes[numK2] = k2Index;
+                        msg3K2InfoTbl->k2TimingInfo[slotIdx].numK2++;
+                     }
+                  }
+               }
+            }
+         }
+      }
+#endif
+   }
+}
+
 /**********************************************************************
   End of file
  **********************************************************************/