Moving all common header file into common_def.h file
[o-du/l2.git] / src / 5gnrsch / sch_common.c
index 6c00b57..a8bb0b7 100644 (file)
@@ -31,29 +31,10 @@ File:     sch_common.c
 /** @file sch_common.c
   @brief This module performs common scheduling
  */
-#include "stdbool.h"
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"
 #include "lrg.h"
 
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"
 #include "lrg.x"
 #include "du_log.h"
@@ -65,6 +46,7 @@ File:     sch_common.c
 extern SchCb schCb[SCH_MAX_INST];
 extern uint16_t prachCfgIdxTable[MAX_PRACH_CONFIG_IDX][8];
 extern uint16_t numRbForPrachTable[MAX_RACH_NUM_RB_IDX][5];
+extern uint8_t pucchResourceSet[MAX_PUCCH_RES_SET_IDX][4];
 
 SchMacUlSchInfoFunc schMacUlSchInfoOpts[] =
 {
@@ -73,41 +55,6 @@ SchMacUlSchInfoFunc schMacUlSchInfoOpts[] =
        packSchMacUlSchInfo
 };
 
-/**
- * @brief Time domain allocation for SSB
- *
- * @details
- *
- *     Function : ssbDlTdAlloc 
- *     
- *     This function handles common scheduling for DL
- *     
- *  @param[in]  uint8_t scs, uint8_t *ssbStartSym
- *  @return  void
- **/
-void ssbDlTdAlloc(uint8_t scs, uint8_t *ssbStartSymb)
-{
-   uint8_t n;
-       /* Determine value of "n" based on Section 4.1 of 3GPP TS 38.213 */
-       switch(scs)
-       {
-               case SCH_SCS_15KHZ:
-                       {
-                          uint8_t symbIdx=0;
-                          n = 2;/* n = 0, 1 for SCS = 15KHz */
-                               for(uint8_t idx=0; idx<n; idx++)
-                               {
-               /* start symbol determined using {2, 8} + 14n */
-                                       ssbStartSymb[symbIdx++] = 2 + SCH_SYMBOL_PER_SLOT*idx;
-                                       ssbStartSymb[symbIdx++] = 8 + SCH_SYMBOL_PER_SLOT*idx;
-                               }
-                       }
-                       break;
-               default:
-                       DU_LOG("\nSCS %d is currently not supported", scs);
-       }
-}
-
 /**
  * @brief common resource allocation for SSB
  *
@@ -125,50 +72,46 @@ uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,
         uint16_t slot)
 {
        /* schedule SSB */
-       uint8_t scs, ssbStartPrb, ssbStartSymb, idx;
-       uint8_t ssbStartSymbArr[SCH_MAX_SSB_BEAM];
-       SchDlAlloc *dlAlloc;
+       uint8_t ssbStartPrb, ssbStartSymb, idx;
+       SchDlSlotInfo *schDlSlotInfo;
        SsbInfo ssbInfo;
 
-       dlAlloc = cell->dlAlloc[slot];
+       schDlSlotInfo = cell->schDlSlotInfo[slot];
        if(dlBrdcstAlloc->ssbTrans)
        {
-               scs = cell->cellCfg.ssbSchCfg.scsCommon;
                ssbStartPrb = cell->cellCfg.ssbSchCfg.ssbOffsetPointA;
+      ssbStartSymb = cell->ssbStartSymbArr[dlBrdcstAlloc->ssbIdxSupported-1]; /*since we are
+               supporting only 1 ssb beam */
 
-               memset(ssbStartSymbArr, 0, SCH_MAX_SSB_BEAM);
-               ssbDlTdAlloc(scs, ssbStartSymbArr);
-               ssbStartSymb = 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_PRB_DURATION;
-                       ssbInfo.tdAlloc.startSymb = ssbStartSymb;
-                       ssbInfo.tdAlloc.numSymb   = SCH_SSB_SYMB_DURATION;
+                       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;
-                       dlAlloc->ssbInfo[idx] = ssbInfo;
-
+                       schDlSlotInfo->ssbInfo[idx] = ssbInfo;
                }
 
-               dlAlloc->ssbPres = true;
-               dlAlloc->ssbIdxSupported = dlBrdcstAlloc->ssbIdxSupported;
-               for(idx=ssbStartSymb; idx<ssbStartSymb+SCH_SSB_SYMB_DURATION; idx++)
+               schDlSlotInfo->ssbPres = true;
+               schDlSlotInfo->ssbIdxSupported = dlBrdcstAlloc->ssbIdxSupported;
+               for(idx=ssbStartSymb; idx<ssbStartSymb+SCH_SSB_NUM_SYMB; idx++)
                {
-                       dlAlloc->assignedPrb[idx] = ssbStartPrb + SCH_SSB_PRB_DURATION + 1; /* +1 for kSsb */
+                       schDlSlotInfo->assignedPrb[idx] = ssbStartPrb + SCH_SSB_NUM_PRB + 1; /* +1 for kSsb */
                }
-
        }
 
        /* SIB1 allocation */
        if(dlBrdcstAlloc->sib1Trans)
        {
-               dlAlloc->sib1Pres = true;
+               schDlSlotInfo->sib1Pres = true;
                for(idx=0; idx<SCH_SYMBOL_PER_SLOT; idx++)
                {
-                       dlAlloc->assignedPrb[idx] = ssbStartPrb + SCH_SSB_PRB_DURATION + 1 + 10; /* 10 PRBs for sib1 */
+                       schDlSlotInfo->assignedPrb[idx] = ssbStartPrb + SCH_SSB_NUM_PRB + 1 + 10; /* 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)); 
        }
@@ -191,7 +134,7 @@ uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,
  *         RFAILED - failure
  *
  * ****************************************************************/
-int sendUlSchInfoToMac(UlSchInfo *ulSchInfo, Inst inst)
+int sendUlSchInfoToMac(UlSchedInfo *ulSchedInfo, Inst inst)
 {
        Pst pst;
 
@@ -199,8 +142,7 @@ int sendUlSchInfoToMac(UlSchInfo *ulSchInfo, Inst inst)
    SCH_FILL_RSP_PST(pst, inst);
        pst.event = EVENT_UL_SCH_INFO;
 
-       return(*schMacUlSchInfoOpts[pst.selector])(&pst, ulSchInfo);
-
+       return(*schMacUlSchInfoOpts[pst.selector])(&pst, ulSchedInfo);
 }
 /**
  * @brief resource allocation for PRACH
@@ -212,16 +154,15 @@ int sendUlSchInfoToMac(UlSchInfo *ulSchInfo, Inst inst)
  *     This function handles PRACH allocation
  *     
  *  @param[in]  SchCellCb *cell, cell cb
- *  @param[in]  UlSchInfo *ulSchInfo, UL scheduling info
+ *  @param[in]  UlSchedInfo *ulSchedInfo, UL scheduling info
  *  @return  void
  **/
-int schPrachResAlloc(SchCellCb *cell, UlSchInfo *ulSchInfo)
+void schPrachResAlloc(SchCellCb *cell, UlSchedInfo *ulSchedInfo, SlotIndInfo prachOccasionTimingInfo)
 {
+   uint8_t  puschScs;
    uint8_t  numPrachRb = 0;
        uint8_t  numRa = 0;
        uint8_t  freqStart = 0;
-       uint16_t sfn = 0;
-       uint16_t slot = 0;
        uint8_t  prachCfgIdx = 0;
        uint8_t  prachFormat = 0;
        uint8_t  x = 0;
@@ -231,62 +172,84 @@ int schPrachResAlloc(SchCellCb *cell, UlSchInfo *ulSchInfo)
        uint8_t  prachOcas = 0;
        uint8_t  dataType = 0;
        uint8_t  idx = 0;
-       SchUlAlloc *ulAlloc = NULLP;
+       SchUlSlotInfo *schUlSlotInfo = NULLP;
 
-       sfn  = cell->slotInfo.sfn;
-       slot = cell->slotInfo.slot; 
-       ulAlloc = cell->ulAlloc[cell->slotInfo.slot];
-       prachCfgIdx = cell->cellCfg.schRachCfg.prachCfgIdx;
+   puschScs      = cell->cellCfg.schInitialUlBwp.bwp.scs;
+       schUlSlotInfo = cell->schUlSlotInfo[prachOccasionTimingInfo.slot];
+       prachCfgIdx   = cell->cellCfg.schRachCfg.prachCfgIdx;
 
     /* derive the prachCfgIdx table paramters */
        x                = prachCfgIdxTable[prachCfgIdx][1];
        y                = prachCfgIdxTable[prachCfgIdx][2];
        prachSubframe    = prachCfgIdxTable[prachCfgIdx][3];
        
-       if((sfn%x) != y)
+       if((prachOccasionTimingInfo.sfn%x) == y)
        {
-          /* prach occasion does not lie in this SFN */
-               DU_LOG("\nPRACH ocassion doesn't lie in this SFN");
-          return RFAILED;
-       }
-       /* check for subFrame number */
-       if ((1 << slot) & 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.rootSeqIdx)
-                          break;
-               }
-               numPrachRb = numRbForPrachTable[idx][3];
-               dataType |= SCH_DATATYPE_PRACH;
-               /* Considering first slot in the frame for PRACH */
-               idx = 0;
-               ulAlloc->assignedPrb[idx] = freqStart+numPrachRb;
+          /* check for subFrame number */
+          if ((1 << prachOccasionTimingInfo.slot) & 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)
+                       {
+                               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;
        }
+}
 
-       /* Fill UL SCH Info */
-       ulSchInfo->cellId = cell->cellId;
-       ulSchInfo->slotIndInfo.sfn = sfn;
-   ulSchInfo->slotIndInfo.slot = slot;
-       ulSchInfo->dataType = dataType;
-       /* prach info */
-       ulSchInfo->prachSchInfo.numPrachOcas   = prachOcas;
-       ulSchInfo->prachSchInfo.prachFormat    = prachFormat;
-       ulSchInfo->prachSchInfo.numRa          = numRa;
-       ulSchInfo->prachSchInfo.prachStartSymb = prachStartSymbol;
+uint16_t fillPucchResourceInfo(SchPucchInfo *schPucchInfo, Inst inst)
+{
+   /* derive pucchResourceSet from schCellCfg */
+   SchCellCb  *cell = schCb[inst].cells[inst];
+   SchPucchCfgCmn *pucchCfg = &cell->cellCfg.schInitialUlBwp.pucchCommon;
+       uint8_t pucchIdx = pucchCfg->pucchResourceCommon;
+       SchBwpParams *ulBwp = &cell->cellCfg.schInitialUlBwp.bwp;
+
+   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];
+
+   /* set HARQ flag to true */
+   schPucchInfo->harqFlag = true;
+   schPucchInfo->numHarqBits = 1; /* 1 bit for HARQ */
+
+   /* set SR and UCI flag to false */
+   schPucchInfo->srFlag  = false;
+   schPucchInfo->uciFlag = false;
 
-       return ROK;
+   return ROK;
 }
 
 /**
@@ -304,29 +267,49 @@ int schPrachResAlloc(SchCellCb *cell, UlSchInfo *ulSchInfo)
 uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
 {
    int ret = ROK;
-   UlSchInfo ulSchInfo;
-       SchUlAlloc *ulAlloc;
+       UlSchedInfo ulSchedInfo;
+   SchUlSlotInfo  *schUlSlotInfo = NULLP;
+   SlotIndInfo ulTimingInfo;
+       memset(&ulSchedInfo, 0, sizeof(UlSchedInfo));
+
+   /* add PHY delta */
+   ADD_DELTA_TO_TIME(cell->slotInfo,ulTimingInfo,PHY_DELTA+SCHED_DELTA);
+
+       ulSchedInfo.cellId = cell->cellId;
+       ulSchedInfo.slotIndInfo.sfn = ulTimingInfo.sfn;
+   ulSchedInfo.slotIndInfo.slot = ulTimingInfo.slot;
 
    /* Schedule resources for PRACH */
-       schPrachResAlloc(cell, &ulSchInfo);
+       schPrachResAlloc(cell, &ulSchedInfo, ulTimingInfo);
 
-       ulAlloc = cell->ulAlloc[cell->slotInfo.slot]; 
-       
-       if(ulAlloc->schPuschInfo)
+       schUlSlotInfo = cell->schUlSlotInfo[ulTimingInfo.slot]; 
+       if(schUlSlotInfo->schPuschInfo)
        {
-               ulSchInfo.dataType |= SCH_DATATYPE_PUSCH;
-               memcpy(&ulSchInfo.schPuschInfo, ulAlloc->schPuschInfo,
+      ulSchedInfo.crnti = cell->raCb[0].tcrnti;
+               ulSchedInfo.dataType |= SCH_DATATYPE_PUSCH;
+               memcpy(&ulSchedInfo.schPuschInfo, schUlSlotInfo->schPuschInfo,
                                sizeof(SchPuschInfo));
-               SCH_FREE(ulAlloc->schPuschInfo, sizeof(SchPuschInfo));
+               SCH_FREE(schUlSlotInfo->schPuschInfo, sizeof(SchPuschInfo));
+               schUlSlotInfo->schPuschInfo = NULL;
+       }
+
+       if(schUlSlotInfo->pucchPres)
+       {
+               ulSchedInfo.dataType |= SCH_DATATYPE_UCI;
+               fillPucchResourceInfo(&schUlSlotInfo->schPucchInfo, schInst);
+               memcpy(&ulSchedInfo.schPucchInfo, &schUlSlotInfo->schPucchInfo,
+                               sizeof(SchPucchInfo));
+               memset(&schUlSlotInfo->schPucchInfo, 0, sizeof(SchPucchInfo));
        }
 
        //send msg to MAC
-   ret = sendUlSchInfoToMac(&ulSchInfo, schInst);
+   ret = sendUlSchInfoToMac(&ulSchedInfo, schInst);
    if(ret != ROK)
    {
       DU_LOG("\nSending UL Sch info from SCH to MAC failed");
    }
-    
+       memset(cell->schUlSlotInfo[ulTimingInfo.slot], 0, sizeof(SchUlSlotInfo));
+
        return ret;
 }
 
@@ -355,14 +338,18 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
    uint8_t offset = 0;
    uint8_t offsetPointA;
    uint8_t FreqDomainResource[6] = {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;
 
    PdcchCfg *pdcch = &msg4Alloc->msg4PdcchCfg;
    PdschCfg *pdsch = &msg4Alloc->msg4PdschCfg;
+   BwpCfg *bwp = &msg4Alloc->bwp;
 
    initialBwp   = &cell->cellCfg.schInitialDlBwp;
    offsetPointA = cell->cellCfg.ssbSchCfg.ssbOffsetPointA;
-   coreset0Idx  = initialBwp->pdcchCommon.raSearchSpace.coresetId;
+   coreset0Idx  = initialBwp->pdcchCommon.commonSearchSpace.coresetId;
 
    /* derive the sib1 coreset0 params from table 13-1 spec 38.213 */
    numRbs        = coresetIdxTable[coreset0Idx][1];
@@ -373,20 +360,22 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
    uint16_t mask = 0x2000;
    for(firstSymbol=0; firstSymbol<14;firstSymbol++)
    {
-      if(initialBwp->pdcchCommon.raSearchSpace.monitoringSymbol & mask)
+      if(initialBwp->pdcchCommon.commonSearchSpace.monitoringSymbol & mask)
          break;
       else
          mask = mask>>1;
    }
 
    /* calculate the PRBs */
-   calculatePRB( ((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource);
+   schAllocFreqDomRscType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource);
+
+   /* fill BWP */
+   bwp->freqAlloc.numPrb   = initialBwp->bwp.freqAlloc.numPrb;
+   bwp->freqAlloc.startPrb = initialBwp->bwp.freqAlloc.startPrb;
+   bwp->subcarrierSpacing  = initialBwp->bwp.scs;
+   bwp->cyclicPrefix       = initialBwp->bwp.cyclicPrefix;
 
    /* fill the PDCCH PDU */
-   pdcch->pdcchBwpCfg.BWPSize = initialBwp->bwp.numPrb;
-   pdcch->pdcchBwpCfg.BWPStart = initialBwp->bwp.firstPrb;
-   pdcch->pdcchBwpCfg.subcarrierSpacing = initialBwp->bwp.scs;
-   pdcch->pdcchBwpCfg.cyclicPrefix = initialBwp->bwp.cyclicPrefix;
    pdcch->coreset0Cfg.startSymbolIndex = firstSymbol;
    pdcch->coreset0Cfg.durationSymbols = numSymbols;
    memcpy(pdcch->coreset0Cfg.freqDomainResource,FreqDomainResource,6);
@@ -398,7 +387,7 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
    pdcch->coreset0Cfg.shiftIndex = cell->cellCfg.phyCellId;
    pdcch->coreset0Cfg.precoderGranularity = 0; /* sameAsRegBundle */
    pdcch->numDlDci = 1;
-   pdcch->dci.rnti = cell->dlAlloc[slot]->msg4Info->crnti;
+   pdcch->dci.rnti = cell->schDlSlotInfo[slot]->msg4Info->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 */
@@ -414,21 +403,20 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *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->dlAlloc[slot]->msg4Info->crnti;
+   pdsch->rnti = cell->schDlSlotInfo[slot]->msg4Info->crnti;
    pdsch->pduIndex = 0;
-   pdsch->pdschBwpCfg.BWPSize = initialBwp->bwp.numPrb;
-   pdsch->pdschBwpCfg.BWPStart = initialBwp->bwp.firstPrb;
    pdsch->numCodewords = 1;
    for(cwCount = 0; cwCount < pdsch->numCodewords; cwCount++)
    {
       pdsch->codeword[cwCount].targetCodeRate = 308;
       pdsch->codeword[cwCount].qamModOrder = 2;
-      pdsch->codeword[cwCount].mcsIndex = 4; /* mcs configured to 4 */
+      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 */
-      pdsch->codeword[cwCount].tbSize = 2664/8;
+               tbSize = schCalcTbSize(2664/8); /* send this value to the func in bytes when considering msg4 size */
+      pdsch->codeword[cwCount].tbSize = tbSize;
    }
    pdsch->dataScramblingId = cell->cellCfg.phyCellId;
    pdsch->numLayers = 1;
@@ -440,18 +428,13 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
    pdsch->dmrs.scid = 0;
    pdsch->dmrs.numDmrsCdmGrpsNoData = 1;
    pdsch->dmrs.dmrsPorts = 0;
-   pdsch->freqAlloc.resourceAlloc = 1; /* RAT type-1 RIV format */
+   pdsch->pdschFreqAlloc.resourceAllocType = 1; /* RAT type-1 RIV format */
    /* the RB numbering starts from coreset0, and PDSCH is always above SSB */
-   pdsch->freqAlloc.rbStart = offset + SCH_SSB_PRB_DURATION;
-   /* formula used for calculation of rbSize, 38.213 section 5.1.3.2 *
-    * Ninfo = S . Nre . R . Qm . v                                   *
-    * Nre' = Nsc . NsymPdsch - NdmrsSymb - Noh                       *
-    * Nre = min(156,Nre') . nPrb                                     */
-   /* TODO : Calculate rbSize based on tbSize calculated */
-   pdsch->freqAlloc.rbSize = 34;
-   pdsch->freqAlloc.vrbPrbMapping = 0; /* non-interleaved */
-   pdsch->timeAlloc.startSymbolIndex = 2; /* spec-38.214, Table 5.1.2.1-1 */
-   pdsch->timeAlloc.numSymbols = 12;
+   pdsch->pdschFreqAlloc.freqAlloc.startPrb = offset + SCH_SSB_NUM_PRB;
+   pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize,mcs,numPdschSymbols);
+   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;
    pdsch->beamPdschInfo.numPrgs = 1;
    pdsch->beamPdschInfo.prgSize = 1;
    pdsch->beamPdschInfo.digBfInterfaces = 0;
@@ -464,6 +447,21 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
    return ROK;
 }
 
+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)  % SCH_NUM_SLOTS;
+       SchUlSlotInfo  *schUlSlotInfo = NULLP;
+   
+       schUlSlotInfo = cell->schUlSlotInfo[pucchSlot];
+       memset(&schUlSlotInfo->schPucchInfo, 0, sizeof(SchPucchInfo));
+
+       schUlSlotInfo->pucchPres = true;
+       schUlSlotInfo->schPucchInfo.rnti = crnti;
+
+   return ROK;
+}
+
 /**********************************************************************
   End of file
  **********************************************************************/