[Epic-ID: ODUHIGH-402][Task-ID: ODUHIGH-418] Harq feature changes
[o-du/l2.git] / src / 5gnrsch / sch_ue_mgr.c
index d3fbde6..8ca3bac 100644 (file)
@@ -37,6 +37,19 @@ SchUeCfgRspFunc SchUeCfgRspOpts[] =
    packSchUeCfgRsp       /* LWLC */
 };
 
+SchUeDeleteRspFunc SchUeDeleteRspOpts[] =
+{
+   packSchUeDeleteRsp,      /* LC */
+   MacProcSchUeDeleteRsp,   /* TC */
+   packSchUeDeleteRsp       /* LWLC */
+};
+
+SchCellDeleteRspFunc SchCellDeleteRspOpts[]=
+{
+   packSchCellDeleteRsp,      /* LC */
+   MacProcSchCellDeleteRsp,   /* TC */
+   packSchCellDeleteRsp       /* LWLC */
+};
 
 /*******************************************************************
  *
@@ -53,59 +66,384 @@ SchUeCfgRspFunc SchUeCfgRspOpts[] =
  *         RFAILED - failure
  *
  * ****************************************************************/
-void SchSendUeCfgRspToMac(SchUeCfg *ueCfg, Inst inst,\
+void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\
       SchMacRsp result, SchUeCfgRsp *cfgRsp)
 {
    Pst rspPst;
 
-   DU_LOG("\nSCH: Sending UE Create response to MAC");
-
    cfgRsp->cellId = ueCfg->cellId;
+   cfgRsp->ueId = ueCfg->ueId;
    cfgRsp->crnti = ueCfg->crnti;
-   GET_UE_IDX(ueCfg->crnti, cfgRsp->ueIdx);
    cfgRsp->rsp = result;   
 
    /* Filling response post */
    memset(&rspPst, 0, sizeof(Pst));
    FILL_PST_SCH_TO_MAC(rspPst, inst);
-   rspPst.event = EVENT_UE_CREATE_RSP_TO_MAC;
-
+   if(event == EVENT_ADD_UE_CONFIG_REQ_TO_SCH)
+   {
+      rspPst.event = EVENT_UE_CONFIG_RSP_TO_MAC;
+      DU_LOG("\nINFO  -->  SCH :  Sending UE Config response to MAC");
+   }
+   else if(event == EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH)
+   {
+      rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC;
+      DU_LOG("\nINFO  -->  SCH :  Sending UE Reconfig response to MAC");
+   }
    SchUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp);
 }
 
 /*******************************************************************
  *
- * @brief Hanles Ue create request from MAC
+ * @brief Function to fill Dl Lc Context in SCH Ue Cb
  *
  * @details
  *
- *    Function : MacSchUeCreateReq
+ *    Function : fillSchDlLcCtxt
  *
- *    Functionality: Hanles Ue create request from MAC
+ *    Functionality: Function to fill Dl Lc Context in SCH Ue Cb
  *
- * @params[in] 
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] SchDlLcCtxt pointer,
+ *             SchLcCfg pointer
+ * @return void
  *
  * ****************************************************************/
-uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
+
+void fillSchDlLcCtxt(SchDlLcCtxt *ueCbLcCfg, SchLcCfg *lcCfg)
 {
-   uint8_t      idx;
-   uint16_t     ueIdx;
-   SchCellCb    *cellCb;
-   SchUeCb      *ueCb;
-   SchUeCfgRsp  cfgRsp;
-   Inst         inst = pst->dstInst - 1;
+   ueCbLcCfg->lcId = lcCfg->lcId;
+   ueCbLcCfg->lcp = lcCfg->dlLcCfg.lcp;
+   ueCbLcCfg->lcState = SCH_LC_STATE_ACTIVE;
+   ueCbLcCfg->bo = 0;
+   if(lcCfg->drbQos)
+   {
+     ueCbLcCfg->pduSessionId = lcCfg->drbQos->pduSessionId;
+   }
+   if(lcCfg->snssai)
+   {
+     if(ueCbLcCfg->snssai == NULLP)/*In CONFIG_MOD case, no need to allocate SNSSAI memory*/
+     {
+        SCH_ALLOC(ueCbLcCfg->snssai, sizeof(Snssai));
+     }
+     memcpy(ueCbLcCfg->snssai, lcCfg->snssai,sizeof(Snssai));
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to fill Ul Lc Context in SCH Ue Cb
+ *
+ * @details
+ *
+ *    Function : fillSchUlLcCtxt
+ *
+ *    Functionality: Function to fill Ul Lc Context in SCH Ue Cb
+ *
+ * @params[in] SchUlLcCtxt pointer,
+ *             SchLcCfg pointer
+ * @return void
+ *
+ * ****************************************************************/
 
-   DU_LOG("\nSCH : UE Create Request for CRNTI[%d]", ueCfg->crnti);
+void fillSchUlLcCtxt(SchUlLcCtxt *ueCbLcCfg, SchLcCfg *lcCfg)
+{
+   ueCbLcCfg->lcId = lcCfg->lcId;
+   ueCbLcCfg->lcState = SCH_LC_STATE_ACTIVE;
+   ueCbLcCfg->priority = lcCfg->ulLcCfg.priority;
+   ueCbLcCfg->lcGroup = lcCfg->ulLcCfg.lcGroup;
+   ueCbLcCfg->schReqId = lcCfg->ulLcCfg.schReqId;
+   ueCbLcCfg->pbr     = lcCfg->ulLcCfg.pbr;
+   ueCbLcCfg->bsd     = lcCfg->ulLcCfg.bsd;
 
-   memset(&cfgRsp, 0, sizeof(SchUeCfgRsp));
+   if(lcCfg->drbQos)
+   {
+      ueCbLcCfg->pduSessionId = lcCfg->drbQos->pduSessionId;
+   }
+   if(lcCfg->snssai)
+   {
+     /*In CONFIG_MOD case, no need to allocate SNSSAI memory again*/
+     if(ueCbLcCfg->snssai == NULLP)
+     {
+        SCH_ALLOC(ueCbLcCfg->snssai, sizeof(Snssai));
+     }
+     memcpy(ueCbLcCfg->snssai, lcCfg->snssai,sizeof(Snssai));
+   }
+}
 
-   if(!ueCfg)
+/*******************************************************************
+ *
+ * @brief Function to update/allocate dedLC Info
+ *
+ * @details
+ *
+ *    Function : updateDedLcInfo
+ *
+ *    Functionality: Function to fill DLDedLcInfo
+ *
+ * @params[arg] scheduler instance,
+ *              snssai pointer,
+ *              SchRrmPolicy pointer,
+ *              SchLcPrbEstimate pointer , It will be filled
+ *              isDedicated pointer,(Address of isDedicated flag in LC Context)
+ *
+ * @return ROK      >> This LC is part of RRM MemberList.
+ *         RFAILED  >> FATAL Error
+ *         ROKIGNORE >> This LC is not part of this RRM MemberList 
+ *
+ * ****************************************************************/
+
+uint8_t updateDedLcInfo(Inst inst, Snssai *snssai, uint16_t *rsvdDedicatedPRB, bool *isDedicated)
+{
+   uint8_t sliceCfgIdx =0;
+   SchSliceCfg sliceCfg = schCb[inst].sliceCfg;
+
+   if(sliceCfg.numOfSliceConfigured)
    {
-      DU_LOG("\nSCH : UE create request failed");
-      return RFAILED;
+      for(sliceCfgIdx = 0; sliceCfgIdx<sliceCfg.numOfSliceConfigured; sliceCfgIdx++)
+      {
+         if(memcmp(snssai, &(sliceCfg.listOfConfirguration[sliceCfgIdx]->snssai), sizeof(Snssai)) == 0)
+         {
+            if(sliceCfg.listOfConfirguration[sliceCfgIdx]->rrmPolicyRatioInfo)
+            {
+               /*Updating latest RrmPolicy*/
+                *rsvdDedicatedPRB = \
+               (uint16_t)(((sliceCfg.listOfConfirguration[sliceCfgIdx]->rrmPolicyRatioInfo->policyDedicatedRatio)*(MAX_NUM_RB))/100);
+               *isDedicated = TRUE;
+               DU_LOG("\nINFO  -->  SCH : Updated RRM policy, reservedPOOL:%d",*rsvdDedicatedPRB);
+            }
+         }
+      }
+      /*case: This LcCtxt  is either a Default LC or this LC is part of someother RRM_MemberList*/
+      if(*isDedicated != TRUE) 
+      {
+         DU_LOG("\nINFO  -->  SCH : This SNSSAI is not a part of this RRMPolicy");
+      }
    }
+   return ROK;  
+}
+
+/*******************************************************************
+ *
+ * @brief Function to fill SchUeCb
+ *
+ * @details
+ *
+ *    Function : fillSchUeCb
+ *
+ *    Functionality: Function to fill SchUeCb
+ *
+ * @params[in] Scheduler instance,
+ *             SchUeCb pointer,
+ *             SchUeCfg pointer
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+
+uint8_t fillSchUeCb(Inst inst, SchUeCb *ueCb, SchUeCfg *ueCfg)
+{
+   uint8_t   lcIdx, ueLcIdx, idx;
+   uint8_t   freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
+   SchPdschCfgCmn pdschCfg;
+   SchPucchDlDataToUlAck *dlDataToUlAck;
+   uint8_t retDL = ROK, retUL = ROK;
+   bool isLcIdValid = FALSE;
+
+   ueCb->ueCfg.cellId = ueCfg->cellId;
+   ueCb->ueCfg.ueId = ueCfg->ueId;
+   ueCb->ueCfg.crnti = ueCfg->crnti;
+   ueCb->ueCfg.dataTransmissionAction = ueCfg->dataTransmissionInfo;
+   if(ueCfg->macCellGrpCfgPres == true)
+   {
+      memcpy(&ueCb->ueCfg.macCellGrpCfg , &ueCfg->macCellGrpCfg, sizeof(SchMacCellGrpCfg)); 
+      ueCb->ueCfg.macCellGrpCfgPres = true;
+   }
+
+   if(ueCfg->phyCellGrpCfgPres == true)
+   {
+      memcpy(&ueCb->ueCfg.phyCellGrpCfg ,  &ueCfg->phyCellGrpCfg, sizeof(SchPhyCellGrpCfg));
+      ueCb->ueCfg.phyCellGrpCfgPres = true;
+   }
+
+   if(ueCfg->spCellCfgPres == true)
+   {
+      if(ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfgPres == true)
+      {
+         if(ueCb->ueCfg.spCellCfgPres && ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfgPres == true)
+         {
+            for(idx = 0; idx < ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc; idx++)
+            {
+               if(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0 && ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0)
+               {
+                   SCH_FREE(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfg.timeDomRsrcAllociList[idx].k0, sizeof(uint8_t));  
+               }
+            }
+         }
+      }
+      memcpy(&ueCb->ueCfg.spCellCfg , &ueCfg->spCellCfg, sizeof(SchSpCellCfg));
+
+      covertFreqDomRsrcMapToIAPIFormat(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc,\
+            freqDomainResource);
+      memset(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, 0, FREQ_DOM_RSRC_SIZE);
+      memcpy(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0].freqDomainRsrc, freqDomainResource, FREQ_DOM_RSRC_SIZE);
+
+      ueCb->ueCfg.spCellCfgPres = true;
+      dlDataToUlAck = ueCfg->spCellCfg.servCellCfg.initUlBwp.pucchCfg.dlDataToUlAck;
+      if(ueCb->cellCb)
+      {
+         if(dlDataToUlAck)
+         {
+            BuildK0K1Table(ueCb->cellCb, &ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.k0K1InfoTbl, false, pdschCfg,\
+                  ueCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, dlDataToUlAck->dlDataToUlAckListCount,\
+                  dlDataToUlAck->dlDataToUlAckList);
+            ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.k0K1TblPrsnt = true;
+            BuildK2InfoTable(ueCb->cellCb, ueCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList,\
+                  ueCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
+                  NULLP, &ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.k2InfoTbl);
+                  ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.k2TblPrsnt = true;
+         }
+      }
+   }
+
+   if(ueCfg->ambrCfg)
+   {
+      SCH_FREE(ueCb->ueCfg.ambrCfg, sizeof(SchAmbrCfg));
+      ueCb->ueCfg.ambrCfg =  ueCfg->ambrCfg;
+   }
+   memcpy(&ueCb->ueCfg.dlModInfo,  &ueCfg->dlModInfo , sizeof(SchModulationInfo));
+   memcpy(&ueCb->ueCfg.ulModInfo,  &ueCfg->ulModInfo , sizeof(SchModulationInfo));
+   //Updating SchUlCb and SchDlCb DB in SchUeCb
+   for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++)
+   {
+      isLcIdValid = FALSE; /*Re-Initializing*/
+
+      ueLcIdx = ueCfg->schLcCfg[lcIdx].lcId;
+      CHECK_LCID(ueLcIdx, isLcIdValid);
+      if(isLcIdValid == FALSE)
+      {
+         DU_LOG("ERROR --> SCH: LCID:%d is not Valid",ueLcIdx);
+         continue;
+      }
+      if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_ADD)
+      {
+         fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]);
+         fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]);
+
+         /*Checking whether this LC belong to Dedicated S-NSSAI 
+          * and Create the Dedicated LC List & Update the Reserve PRB number*/
+         if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP)
+         {
+            retDL = updateDedLcInfo(inst, ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].rsvdDedicatedPRB),\
+                  &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated));
+         }
+         if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP)
+         {
+            retUL =  updateDedLcInfo(inst, ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].rsvdDedicatedPRB),\
+                  &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated));
+         }
+
+         if(retUL == RFAILED  || retDL == RFAILED)/*FATAL error*/
+         {
+            DU_LOG("\nERROR  -->  SCH : Failure in updateDedLcInfo");
+            return RFAILED;
+         }
+      }
+      else
+      {
+         if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].lcId == ueCfg->schLcCfg[lcIdx].lcId)
+         {
+            if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_MOD)
+            {
+               fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]);
+               /*Updating the RRM reserved pool PRB count*/
+               if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP)
+               {
+                  retUL =  updateDedLcInfo(inst, ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].rsvdDedicatedPRB),\
+                        &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated));
+               }
+               if(retUL == RFAILED)
+               {
+                  DU_LOG("\nERROR  -->  SCH : Failed in updating Ded Lc info");
+                  return RFAILED;
+               }
+            }
+            if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_DEL)
+            {
+               /*Delete the LC node from the UL LC List*/
+               if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated)
+               {
+                   /*Remove from HARQ Transmission or retransmission*/
+               }
+               else/*Default LC list*/
+               {
+
+               }
+               SCH_FREE(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, sizeof(Snssai));
+               memset(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], 0, sizeof(SchUlLcCtxt));
+            }
+         }/*End of UL LC Ctxt*/
+
+         if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].lcId == ueCfg->schLcCfg[lcIdx].lcId)
+         {
+            if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_MOD)
+            {
+               fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]);
+               /*Updating the RRM policy*/
+               if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP)
+               {
+                  retDL = updateDedLcInfo(inst, ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].rsvdDedicatedPRB), \
+                        &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated));
+               }
+               if(retDL == RFAILED)
+               {
+                  DU_LOG("\nERROR  -->  SCH : Failed in updating Ded Lc info");
+                  return RFAILED;
+               }
+            }
+            if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_DEL)
+            {
+               /*Delete the LC node from the DL LC List*/
+               if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated)
+               {
+                  /*Remove from HARQ Transmission or retransmission*/
+               }
+               else
+               {
+               }
+               SCH_FREE(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, sizeof(Snssai));
+               memset(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], 0, sizeof(SchDlLcCtxt));
+            }
+         }/*End of DL LC ctxt*/
+      }
+
+      SCH_FREE(ueCfg->schLcCfg[lcIdx].drbQos, sizeof(SchDrbQosInfo));
+      SCH_FREE(ueCfg->schLcCfg[lcIdx].snssai, sizeof(Snssai));
+
+   }/* End of outer for loop */
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Function to get SCH Cell Cb
+ *
+ * @details
+ *
+ *    Function : getSchCellCb
+ *
+ *    Functionality: Function to get SCH Cell Cb
+ *
+ * @params[in] event, SchUeCfg pointer 
+ * @return schUeCb pointer  - success
+ *         NULLP - failure
+ *
+ * ****************************************************************/
+
+SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg)
+{
+   uint8_t      idx;
+   SchCellCb    *cellCb = NULLP;
+   SchUeCfgRsp  cfgRsp;
+   memset(&cfgRsp, 0, sizeof(SchUeCfgRsp));
 
    /* Search of cell cb */
    for(idx = 0; idx < MAX_NUM_CELL; idx++)
@@ -116,48 +454,124 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
    }
    if(idx == MAX_NUM_CELL)
    {
-      DU_LOG("\nSCH : Ue create request failed. Invalid cell id %d", ueCfg->cellId);
-      SchSendUeCfgRspToMac(ueCfg, inst, RSP_NOK, &cfgRsp);
-      return ROK;
+      DU_LOG("\nERROR  -->  SCH : Ue create request failed. Invalid cell id %d", ueCfg->cellId);
+      SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp);
+      return NULLP;
    }
 
    /* Check if max number of UE configured */
    if(cellCb->numActvUe > MAX_NUM_UE)
    {
-      DU_LOG("SCH : Max number of UE [%d] already configured", MAX_NUM_UE);
-      SchSendUeCfgRspToMac(ueCfg, inst, RSP_NOK, &cfgRsp);
-      return ROK;
+      DU_LOG("\nERROR  -->  SCH :  Max number of UE [%d] already configured", MAX_NUM_UE);
+      SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp);
+      return NULLP;
+   }
+   return cellCb;
+}
+
+
+/*******************************************************************
+ *
+ * @brief Function to Add Ue Config Request from MAC
+ *
+ * @details
+ *
+ *    Function : MacSchAddUeConfigReq
+ *
+ *    Functionality: Function to Add Ue config request from MAC
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg)
+{
+   uint8_t      lcIdx = 0, ret = ROK, idx = 0;
+   SchCellCb    *cellCb = NULLP;
+   SchUeCb      *ueCb = NULLP;
+   SchUeCfgRsp  cfgRsp;
+   Inst         inst = pst->dstInst - SCH_INST_START;
+   memset(&cfgRsp, 0, sizeof(SchUeCfgRsp));
+  
+#ifdef CALL_FLOW_DEBUG_LOG
+   DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_ADD_UE_CONFIG_REQ_TO_SCH\n");
+#endif
+
+   if(!ueCfg)
+   {
+      DU_LOG("\nERROR  -->  SCH :  Adding UE Config Request failed at MacSchAddUeConfigReq()");
+      return RFAILED;
    }
+   DU_LOG("\nDEBUG  -->  SCH :  Adding UE Config Request for CRNTI[%d]", ueCfg->crnti);
+   cellCb = getSchCellCb(pst->event, inst, ueCfg);
 
    /* Search if UE already configured */
-   GET_UE_IDX(ueCfg->crnti, ueIdx);
-   ueCb = &cellCb->ueCb[ueIdx -1];
-   if(ueCb)
+   ueCb = &cellCb->ueCb[ueCfg->ueId - 1];
+
+   if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE))
    {
-      if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE))
-      {
-        DU_LOG("\n SCH : CRNTI %d already configured ", ueCfg->crnti);
-        SchSendUeCfgRspToMac(ueCfg, inst, RSP_OK, &cfgRsp);
-        return ROK;
-      }
+      DU_LOG("\nDEBUG  -->  SCH : CRNTI %d already configured ", ueCfg->crnti);
+      SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp);
+      return ROK;
    }
 
    /* Fill received Ue Configuration in UeCb */
    memset(ueCb, 0, sizeof(SchUeCb));
 
-   GET_UE_IDX(ueCfg->crnti, ueCb->ueIdx);
+   ueCb->ueId = ueCfg->ueId;
    ueCb->crnti = ueCfg->crnti;
-   memcpy(&ueCb->ueCfg, ueCfg, sizeof(SchUeCfg));
-   ueCb->state = SCH_UE_STATE_ACTIVE;
-   cellCb->numActvUe++;
-
    ueCb->cellCb = cellCb;
-   ueCb->srRcvd = false;
-   for(idx=0; idx<MAX_NUM_LOGICAL_CHANNEL_GROUPS; idx++)
-      ueCb->bsrInfo[idx].dataVol = 0;
+   schUlHqEntInit(cellCb, &cellCb->ueCb[ueCfg->ueId-1]);
+   schDlHqEntInit(cellCb, &cellCb->ueCb[ueCfg->ueId-1]);
+   SCH_ALLOC(ueCb->hqDlmap, sizeof(SchHqDlMap*)*(ueCb->cellCb->numSlots));
+   SCH_ALLOC(ueCb->hqUlmap, sizeof(SchHqUlMap*)*(ueCb->cellCb->numSlots));
 
-   SchSendUeCfgRspToMac(ueCfg, inst, RSP_OK, &cfgRsp);
-   return ROK;
+   if ( (ueCb->hqDlmap == NULLP) || (ueCb->hqUlmap == NULLP) )
+   {
+      DU_LOG("\nINFO  -->  SCH : Memory Allocation Failed");
+      return RFAILED;
+   }
+   for (idx = 0; idx<ueCb->cellCb->numSlots; idx++)
+   {
+      SCH_ALLOC(ueCb->hqDlmap[idx], sizeof(SchHqDlMap));
+      SCH_ALLOC(ueCb->hqUlmap[idx], sizeof(SchHqUlMap));
+      
+      if ( (ueCb->hqDlmap[idx] == NULLP) || (ueCb->hqUlmap[idx] == NULLP) )
+      {
+         DU_LOG("\nINFO  -->  SCH : Memory Allocation Failed");
+         return RFAILED;
+      }
+      cmLListInit(&ueCb->hqDlmap[idx]->hqList);
+      cmLListInit(&ueCb->hqUlmap[idx]->hqList);
+   }
+   ret = fillSchUeCb(inst, ueCb, ueCfg);
+
+   if(ret == ROK)
+   {
+      /* If UE has initiated RACH and then UE context is created, it means UE is
+       * active now.
+       * Else if UE context is created before RACH, this means that UE is being
+       * handed-in from source DU */
+      if(cellCb->raCb[ueCb->ueId-1].tcrnti == ueCb->crnti)
+      {
+         cellCb->numActvUe++;
+         SET_ONE_BIT(ueCb->ueId, cellCb->actvUeBitMap);
+         ueCb->state = SCH_UE_STATE_ACTIVE;
+      }
+      else
+      {
+         ueCb->state = SCH_UE_HANDIN_IN_PROGRESS;
+      }
+
+      ueCb->srRcvd = false;
+      ueCb->bsrRcvd = false;
+      for(lcIdx=0; lcIdx<MAX_NUM_LOGICAL_CHANNEL_GROUPS; lcIdx++)
+         ueCb->bsrInfo[lcIdx].dataVol = 0;
+
+      SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp);
+   }
+   return ret;
 }
 
 /*******************************************************************
@@ -170,68 +584,207 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
 *
 *    Functionality: fills PUSCH info
 *
-* @params[in]
+* @params[in] SchUeCb *ueCb, SlotTimingInfo puschTime, uint32_t tbSize
+* @params[in] uint8_t startSymb, uint8_t symbLen, uint16_t startPrb
+* @params[in] bool isRetx, SchUlHqProcCb *hq
 * @return ROK     - success
 *         RFAILED - failure
 *
 * ****************************************************************/
-uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, SchPuschInfo *puschInfo)
+uint8_t schFillPuschAlloc(SchUeCb *ueCb, SlotTimingInfo puschTime, uint32_t tbSize, 
+                          uint8_t startSymb, uint8_t symbLen, uint16_t startPrb, bool isRetx, SchUlHqProcCb *hqP)
 {
-  uint16_t puschSlot      = 0;
-  uint16_t startRb        = 0;
   uint8_t  numRb          = 0;
-  uint8_t  mcs            = 4;
-  uint8_t  numPdschSymbols= 14;
-  uint16_t tbSize         = 0;
-  uint8_t  buffer         = 5;
-  uint8_t  idx            = 0;
-  SchCellCb *cellCb       = ueCb->cellCb;
+  SchCellCb *cellCb       = NULLP;
   SchUlSlotInfo *schUlSlotInfo = NULLP;
-  uint8_t  k2 = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].k2;
-  uint8_t  startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol;
-  uint8_t  symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength;
-
-  puschSlot = (pdcchSlot + k2) % SCH_NUM_SLOTS;
-
-  startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb;
-  tbSize  = schCalcTbSize((dataVol + buffer)/8); /*  2 bytes header + some buffer */
-  numRb   = schCalcNumPrb(tbSize, mcs, numPdschSymbols);
-  /* increment PUSCH PRB */
-
-  cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb;
-
-  puschInfo->harqProcId        = SCH_HARQ_PROC_ID;
-  puschInfo->resAllocType      = SCH_ALLOC_TYPE_1;
-  puschInfo->fdAlloc.startPrb  = startRb;
-  puschInfo->fdAlloc.numPrb    = numRb;
-  puschInfo->tdAlloc.startSymb = startSymb;
-  puschInfo->tdAlloc.numSymb   = symbLen;
-  puschInfo->tbInfo.mcs        = mcs;
-  puschInfo->tbInfo.ndi        = 1; /* new transmission */
-  puschInfo->tbInfo.rv         = 0;
-  puschInfo->tbInfo.tbSize     = tbSize;
-  puschInfo->dmrsMappingType   = DMRS_MAP_TYPE_A;  /* Setting Type-A */
-  puschInfo->nrOfDmrsSymbols   = NUM_DMRS_SYMBOLS;
-  puschInfo->dmrsAddPos        = DMRS_ADDITIONAL_POS;
-
-  /* Update pusch in cell */
-  for(idx=startSymb; idx<symbLen; idx++)
+  SchPuschInfo puschInfo;
+  
+  if(ueCb == NULLP)
   {
-     cellCb->schUlSlotInfo[puschSlot]->assignedPrb[idx] = startRb + numRb;
+    DU_LOG("\nERROR --> SCH: UE CB is empty");
+    return RFAILED;
   }
 
-  schUlSlotInfo = cellCb->schUlSlotInfo[puschSlot];
+  cellCb = ueCb->cellCb;
+  if(cellCb == NULLP)
+  {
+    DU_LOG("\nERROR --> SCH: CELL CB is empty");
+    return RFAILED;
+  }
 
+  tbSize  +=  UL_TX_BUFFER_SIZE; /*  2 bytes header + some buffer */
+  numRb   = schCalcNumPrb(tbSize, ueCb->ueCfg.ulModInfo.mcsIndex, symbLen);
+  allocatePrbUl(cellCb, puschTime, startSymb, symbLen, &startPrb, numRb);
+
+   if (isRetx == FALSE)
+   {
+      puschInfo.crnti             = ueCb->crnti;
+      puschInfo.harqProcId        = SCH_HARQ_PROC_ID;
+      puschInfo.resAllocType      = SCH_ALLOC_TYPE_1;
+      puschInfo.fdAlloc.startPrb  = startPrb;
+      puschInfo.fdAlloc.numPrb    = numRb;
+      puschInfo.tdAlloc.startSymb = startSymb;
+      puschInfo.tdAlloc.numSymb   = symbLen;
+      puschInfo.tbInfo.qamOrder   = ueCb->ueCfg.ulModInfo.modOrder;
+      puschInfo.tbInfo.mcs        = ueCb->ueCfg.ulModInfo.mcsIndex;
+      puschInfo.tbInfo.mcsTable   = ueCb->ueCfg.ulModInfo.mcsTable;
+      puschInfo.tbInfo.ndi        = 1; /* new transmission */
+      puschInfo.tbInfo.rv         = 0;
+      puschInfo.tbInfo.tbSize     = tbSize;
+      puschInfo.dmrsMappingType   = DMRS_MAP_TYPE_A;  /* Setting Type-A */
+      puschInfo.nrOfDmrsSymbols   = NUM_DMRS_SYMBOLS;
+      puschInfo.dmrsAddPos        = DMRS_ADDITIONAL_POS;
+      hqP->puschResType = puschInfo.resAllocType;
+      hqP->puschStartPrb = puschInfo.fdAlloc.startPrb;
+      hqP->puschNumPrb = puschInfo.fdAlloc.numPrb;
+      hqP->strtSymbl = puschInfo.tdAlloc.startSymb;
+      hqP->numSymbl = puschInfo.tdAlloc.numSymb;
+      hqP->tbInfo.qamOrder = puschInfo.tbInfo.qamOrder;
+      hqP->tbInfo.iMcs = puschInfo.tbInfo.mcs;
+      hqP->tbInfo.mcsTable = puschInfo.tbInfo.mcsTable;
+      hqP->tbInfo.ndi = puschInfo.tbInfo.ndi;
+      hqP->tbInfo.rv = puschInfo.tbInfo.rv;
+      hqP->tbInfo.rvIdx = 0;
+      hqP->tbInfo.tbSzReq = puschInfo.tbInfo.tbSize;
+      hqP->dmrsMappingType = puschInfo.dmrsMappingType;
+      hqP->nrOfDmrsSymbols = puschInfo.nrOfDmrsSymbols;
+      hqP->dmrsAddPos = puschInfo.dmrsAddPos;
+   }
+   else
+   {
+      puschInfo.crnti             = ueCb->crnti;
+      puschInfo.harqProcId        = hqP->procId;
+      puschInfo.resAllocType      = hqP->puschResType;
+      puschInfo.fdAlloc.startPrb  = hqP->puschStartPrb;
+      puschInfo.fdAlloc.numPrb    = hqP->puschNumPrb;
+      puschInfo.tdAlloc.startSymb = hqP->strtSymbl;
+      puschInfo.tdAlloc.numSymb   = hqP->numSymbl;
+      puschInfo.tbInfo.qamOrder   = hqP->tbInfo.qamOrder;
+      puschInfo.tbInfo.mcs        = hqP->tbInfo.iMcs;
+      puschInfo.tbInfo.mcsTable   = hqP->tbInfo.mcsTable;
+      puschInfo.tbInfo.ndi        = hqP->tbInfo.ndi; /* retransmission */
+      hqP->tbInfo.rvIdx = (hqP->tbInfo.rvIdx +1) & 0x3;
+      puschInfo.tbInfo.rv         = schCmnDlRvTbl[hqP->tbInfo.rvIdx];
+      puschInfo.tbInfo.tbSize     = hqP->tbInfo.tbSzReq;
+      puschInfo.dmrsMappingType   = hqP->dmrsMappingType;  /* Setting Type-A */
+      puschInfo.nrOfDmrsSymbols   = hqP->nrOfDmrsSymbols;
+      puschInfo.dmrsAddPos        = hqP->dmrsAddPos;
+   }
+  schUlSlotInfo = cellCb->schUlSlotInfo[puschTime.slot];
   SCH_ALLOC(schUlSlotInfo->schPuschInfo, sizeof(SchPuschInfo));
   if(!schUlSlotInfo->schPuschInfo)
   {
-     DU_LOG("SCH: Memory allocation failed in schAllocMsg3Pusch");
+     DU_LOG("\nERROR  -->  SCH: Memory allocation failed in schAllocMsg3Pusch");
      return RFAILED;
   }
-  memcpy(schUlSlotInfo->schPuschInfo, puschInfo, sizeof(SchPuschInfo));
+  memcpy(schUlSlotInfo->schPuschInfo, &puschInfo, sizeof(SchPuschInfo));
 
   return ROK;
 }
+/*******************************************************************
+*
+* @brief Fills UL DCI information for MSG3 retransmission
+*
+* @details
+*
+*    Function : schFillUlDciForMsg3Retx
+*
+*    Functionality: fills UL DCI information for MSG3 retransmission
+*
+* @params[in]
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t schFillUlDciForMsg3Retx(SchRaCb *raCb, SchPuschInfo *puschInfo, DciInfo *dciInfo)
+{
+   SchCellCb         *cellCb  = raCb->cell;
+   dciInfo->cellId = cellCb->cellId;
+   dciInfo->crnti  = raCb->tcrnti;
+   SchUlHqProcCb *msg3HqProc = &raCb->msg3HqProc;
+   if (msg3HqProc == NULLP)
+   {
+      return RFAILED;
+   }
+
+   /* fill bwp cfg */
+   dciInfo->bwpCfg.subcarrierSpacing  = cellCb->cellCfg.sib1SchCfg.bwp.subcarrierSpacing;
+   dciInfo->bwpCfg.cyclicPrefix       = cellCb->cellCfg.sib1SchCfg.bwp.cyclicPrefix;
+   dciInfo->bwpCfg.freqAlloc.startPrb = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.startPrb;
+   dciInfo->bwpCfg.freqAlloc.numPrb   = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.numPrb; 
+
+   /*fill coreset cfg */
+   //Considering number of RBs in coreset1 is same as coreset0
+   dciInfo->coresetCfg.coreSetSize      = coresetIdxTable[0][1];
+   //Considering coreset1 also starts from same symbol as coreset0
+   dciInfo->coresetCfg.startSymbolIndex = searchSpaceIdxTable[0][3];
+   dciInfo->coresetCfg.durationSymbols  = coresetIdxTable[0][2];
+   memcpy(dciInfo->coresetCfg.freqDomainResource, cellCb->cellCfg.schInitialDlBwp.pdcchCommon.commonSearchSpace.freqDomainRsrc, FREQ_DOM_RSRC_SIZE);
+   
+   dciInfo->coresetCfg.cceRegMappingType   = 1; /* coreset0 is always interleaved */
+   dciInfo->coresetCfg.regBundleSize       = 6; /* spec-38.211 sec 7.3.2.2 */
+   dciInfo->coresetCfg.interleaverSize     = 2; /* spec-38.211 sec 7.3.2.2 */
+   dciInfo->coresetCfg.coreSetType         = 0;
+   dciInfo->coresetCfg.coreSetSize         = coresetIdxTable[0][1];
+   dciInfo->coresetCfg.shiftIndex          = cellCb->cellCfg.phyCellId;
+   dciInfo->coresetCfg.precoderGranularity = 0;
+   dciInfo->coresetCfg.cceIndex            = 0; /* 0-3 for UL and 4-7 for DL */
+   dciInfo->coresetCfg.aggregationLevel    = 4; /* same as for sib1 */
+   
+   dciInfo->formatType = FORMAT0_0;
+   msg3HqProc->tbInfo.rvIdx++;
+   msg3HqProc->tbInfo.rv = schCmnDlRvTbl[msg3HqProc->tbInfo.rvIdx & 0x03];
+   /* fill UL grant */
+   dciInfo->format.format0_0.resourceAllocType   = msg3HqProc->puschResType;
+   dciInfo->format.format0_0.freqAlloc.startPrb  = msg3HqProc->puschStartPrb;
+   dciInfo->format.format0_0.freqAlloc.numPrb    = msg3HqProc->puschNumPrb;
+   dciInfo->format.format0_0.timeAlloc.startSymb = msg3HqProc->strtSymbl;
+   dciInfo->format.format0_0.timeAlloc.numSymb   = msg3HqProc->numSymbl;
+   dciInfo->format.format0_0.rowIndex            = 0; /* row Index */
+   dciInfo->format.format0_0.mcs                 = msg3HqProc->tbInfo.iMcs;
+   dciInfo->format.format0_0.harqProcId          = msg3HqProc->procId;
+   dciInfo->format.format0_0.puschHopFlag        = FALSE; /* disabled */
+   dciInfo->format.format0_0.freqHopFlag         = FALSE; /* disabled */
+   dciInfo->format.format0_0.ndi                 = msg3HqProc->tbInfo.ndi; /* new transmission */
+   dciInfo->format.format0_0.rv                  = msg3HqProc->tbInfo.rv;
+   dciInfo->format.format0_0.tpcCmd              = 0; //Sphoorthi TODO: check
+   dciInfo->format.format0_0.sUlCfgd             = FALSE; /* SUL not configured */
+   
+   /* Fill DCI Structure */
+   dciInfo->dciInfo.rnti                              = raCb->tcrnti;
+   dciInfo->dciInfo.scramblingId                      = cellCb->cellCfg.phyCellId;
+   dciInfo->dciInfo.scramblingRnti                    = 0;
+   dciInfo->dciInfo.cceIndex                          = 0; /* 0-3 for UL and 4-7 for DL */
+   dciInfo->dciInfo.aggregLevel                       = 4;
+   dciInfo->dciInfo.beamPdcchInfo.numPrgs             = 1;
+   dciInfo->dciInfo.beamPdcchInfo.prgSize             = 1;
+   dciInfo->dciInfo.beamPdcchInfo.digBfInterfaces     = 0;
+   dciInfo->dciInfo.beamPdcchInfo.prg[0].pmIdx        = 0;
+   dciInfo->dciInfo.beamPdcchInfo.prg[0].beamIdx[0]   = 0;
+   dciInfo->dciInfo.txPdcchPower.powerValue           = 0;
+   dciInfo->dciInfo.txPdcchPower.powerControlOffsetSS = 0;
+   dciInfo->dciInfo.pdschCfg                          = NULL; /* No DL data being sent */
+   msg3HqProc->tbInfo.txCntr++;
+
+  puschInfo->crnti             = raCb->tcrnti;
+  puschInfo->harqProcId        = msg3HqProc->procId;
+  puschInfo->resAllocType      = msg3HqProc->puschResType;
+  puschInfo->fdAlloc.startPrb  = msg3HqProc->puschStartPrb;
+  puschInfo->fdAlloc.numPrb    = msg3HqProc->puschNumPrb;
+  puschInfo->tdAlloc.startSymb = msg3HqProc->strtSymbl;
+  puschInfo->tdAlloc.numSymb   = msg3HqProc->numSymbl;
+  puschInfo->tbInfo.qamOrder   = msg3HqProc->tbInfo.qamOrder;
+  puschInfo->tbInfo.mcs        = msg3HqProc->tbInfo.iMcs;
+  puschInfo->tbInfo.mcsTable   = msg3HqProc->tbInfo.mcsTable;
+  puschInfo->tbInfo.ndi        = msg3HqProc->tbInfo.ndi; /* retransmission */
+  puschInfo->tbInfo.rv         = msg3HqProc->tbInfo.rvIdx;
+  puschInfo->tbInfo.tbSize     = msg3HqProc->tbInfo.tbSzReq;
+  puschInfo->dmrsMappingType   = msg3HqProc->dmrsMappingType;  /* Setting Type-A */
+  puschInfo->nrOfDmrsSymbols   = msg3HqProc->nrOfDmrsSymbols;
+  puschInfo->dmrsAddPos        = msg3HqProc->dmrsAddPos;
+
+   return ROK;
+}
 
 /*******************************************************************
  *
@@ -243,24 +796,31 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S
  *
  *    Functionality: fills DCI for UL grant in response to BSR
  *
- * @params[in]
+ * @params[in] SchUeCb *ueCb, SchPuschInfo *puschInfo, DciInfo *dciInfo,
+ * @params[in] bool isRetx, SchUlHqProcCb *hqP 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo)
+uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo *puschInfo, DciInfo *dciInfo, bool isRetx, SchUlHqProcCb *hqP)
 {
    SchCellCb         *cellCb  = ueCb->cellCb;
-   SchControlRsrcSet coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0];
-
+   SchControlRsrcSet coreset1 ;
+  
+   memset(&coreset1, 0, sizeof(SchControlRsrcSet));
+   if(ueCb->ueCfg.spCellCfgPres == true)
+   {
+     coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0];
+   }
+   
    dciInfo->cellId = cellCb->cellId;
    dciInfo->crnti  = ueCb->crnti;
 
    /* fill bwp cfg */
    dciInfo->bwpCfg.subcarrierSpacing  = cellCb->cellCfg.sib1SchCfg.bwp.subcarrierSpacing;
    dciInfo->bwpCfg.cyclicPrefix       = cellCb->cellCfg.sib1SchCfg.bwp.cyclicPrefix;
-   dciInfo->bwpCfg.freqAlloc.startPrb = 0;
-   dciInfo->bwpCfg.freqAlloc.numPrb   = MAX_NUM_RB; /* whole of BW */
+   dciInfo->bwpCfg.freqAlloc.startPrb = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.startPrb;
+   dciInfo->bwpCfg.freqAlloc.numPrb   = cellCb->cellCfg.schInitialDlBwp.bwp.freqAlloc.numPrb; 
 
    /*fill coreset cfg */
    //Considering number of RBs in coreset1 is same as coreset0
@@ -282,18 +842,18 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo)
    dciInfo->formatType = FORMAT0_0;
    
    /* fill UL grant */
-   dciInfo->format.format0_0.resourceAllocType   = puschInfo.resAllocType;
-   dciInfo->format.format0_0.freqAlloc.startPrb  = puschInfo.fdAlloc.startPrb;
-   dciInfo->format.format0_0.freqAlloc.numPrb    = puschInfo.fdAlloc.numPrb;
-   dciInfo->format.format0_0.timeAlloc.startSymb = puschInfo.tdAlloc.startSymb;
-   dciInfo->format.format0_0.timeAlloc.numSymb   = puschInfo.tdAlloc.numSymb;
+   dciInfo->format.format0_0.resourceAllocType   = puschInfo->resAllocType;
+   dciInfo->format.format0_0.freqAlloc.startPrb  = puschInfo->fdAlloc.startPrb;
+   dciInfo->format.format0_0.freqAlloc.numPrb    = puschInfo->fdAlloc.numPrb;
+   dciInfo->format.format0_0.timeAlloc.startSymb = puschInfo->tdAlloc.startSymb;
+   dciInfo->format.format0_0.timeAlloc.numSymb   = puschInfo->tdAlloc.numSymb;
    dciInfo->format.format0_0.rowIndex            = 0; /* row Index */
-   dciInfo->format.format0_0.mcs                 = puschInfo.tbInfo.mcs;
-   dciInfo->format.format0_0.harqProcId          = puschInfo.harqProcId;
+   dciInfo->format.format0_0.mcs                 = puschInfo->tbInfo.mcs;
+   dciInfo->format.format0_0.harqProcId          = puschInfo->harqProcId;
    dciInfo->format.format0_0.puschHopFlag        = FALSE; /* disabled */
    dciInfo->format.format0_0.freqHopFlag         = FALSE; /* disabled */
-   dciInfo->format.format0_0.ndi                 = puschInfo.tbInfo.ndi; /* new transmission */
-   dciInfo->format.format0_0.rv                  = puschInfo.tbInfo.rv;
+   dciInfo->format.format0_0.ndi                 = puschInfo->tbInfo.ndi; /* new transmission */
+   dciInfo->format.format0_0.rv                  = puschInfo->tbInfo.rv;
    dciInfo->format.format0_0.tpcCmd              = 0; //Sphoorthi TODO: check
    dciInfo->format.format0_0.sUlCfgd             = FALSE; /* SUL not configured */
    
@@ -310,12 +870,595 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo)
    dciInfo->dciInfo.beamPdcchInfo.prg[0].beamIdx[0]   = 0;
    dciInfo->dciInfo.txPdcchPower.powerValue           = 0;
    dciInfo->dciInfo.txPdcchPower.powerControlOffsetSS = 0;
-   dciInfo->dciInfo.pdschCfg                          = NULLP; /* No DL data being sent */
+   dciInfo->dciInfo.pdschCfg                          = NULL; /* No DL data being sent */
 
    return ROK;
 }
 
+/*******************************************************************
+ *
+ * @brief Function to Modify Ue Config request from MAC
+ *
+ * @details
+ *
+ *    Function : MacSchModUeConfigReq
+ *
+ *    Functionality: Function to modify Ue Config request from MAC
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg)
+{
+   uint8_t ueId, lcIdx, ret = ROK;
+   SchCellCb    *cellCb = NULLP;
+   SchUeCb      *ueCb = NULLP;
+   SchUeCfgRsp  cfgRsp;
+   Inst         inst = pst->dstInst - SCH_INST_START;
+   memset(&cfgRsp, 0, sizeof(SchUeCfgRsp));
+  
+#ifdef CALL_FLOW_DEBUG_LOG
+   DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH\n");
+#endif
+
+   if(!ueCfg)
+   {
+      DU_LOG("\nERROR  -->  SCH : Modifying Ue Config request failed at MacSchModUeConfigReq()");
+      return RFAILED;
+   }
+   DU_LOG("\nDEBUG  -->  SCH : Modifying Ue Config Request for CRNTI[%d]", ueCfg->crnti);
+   cellCb = getSchCellCb(pst->event, inst, ueCfg);
+
+   /* Search if UE already configured */
+   GET_UE_ID(ueCfg->crnti, ueId);
+   ueCb = &cellCb->ueCb[ueId -1];
+   
+   if(!ueCb)
+   {
+      DU_LOG("\nERROR  -->  SCH : SchUeCb not found at MacSchModUeConfigReq() ");
+      SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp);
+      return RFAILED;
+   }
+   if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE))
+   {
+      /* Found the UeCb to Reconfig */
+      ret = fillSchUeCb(inst, ueCb, ueCfg);
+      if(ret == ROK)
+      {
+         ueCb->cellCb = cellCb;
+         ueCb->srRcvd = false;
+         ueCb->bsrRcvd = false;
+         for(lcIdx=0; lcIdx<MAX_NUM_LOGICAL_CHANNEL_GROUPS; lcIdx++)
+            ueCb->bsrInfo[lcIdx].dataVol = 0;
+
+         SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp);
+      }
+   }
+   return ret;
+}
+
+/*******************************************************************
+*
+* @brief Fill and send UE delete response to MAC
+*
+* @details
+*
+*    Function :  SchSendUeDeleteRspToMac
+*
+*    Functionality: Fill and send UE delete response to MAC
+*
+* @params[in] Inst inst, SchUeDelete  *ueDelete, SchMacRsp result, 
+*              ErrorCause cause
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+void SchSendUeDeleteRspToMac(Inst inst, SchUeDelete  *ueDelete, SchMacRsp result, ErrorCause cause)
+{
+    Pst rspPst;
+    SchUeDeleteRsp  delRsp;
+    
+    memset(&delRsp, 0, sizeof(SchUeDeleteRsp));
+    delRsp.cellId = ueDelete->cellId;
+    delRsp.crnti = ueDelete->crnti;
+    delRsp.rsp = result; 
+    delRsp.cause = cause; 
+
+    /* Filling response post */
+    memset(&rspPst, 0, sizeof(Pst));
+    FILL_PST_SCH_TO_MAC(rspPst, inst);
+    rspPst.event = EVENT_UE_DELETE_RSP_TO_MAC;
+    SchUeDeleteRspOpts[rspPst.selector](&rspPst, &delRsp);
+}
+
+/*******************************************************************
+*
+* @brief Function to delete Sch Pucch ResrcCfg
+*
+* @details
+*
+*    Function : deleteSchPucchResrcCfg 
+*
+*    Functionality: Function to delete Sch Pucch ResrcCfg
+*
+* @params[in] SchPucchResrcCfg *resrc
+* @return void 
+*
+* ****************************************************************/
+
+void deleteSchPucchResrcCfg(SchPucchResrcCfg *resrc)
+{
+   uint8_t rsrcIdx=0;
+   for(rsrcIdx=0; rsrcIdx < resrc->resrcToAddModListCount; rsrcIdx++)
+   {
+      switch(resrc->resrcToAddModList[rsrcIdx].pucchFormat)
+      {
+         case PUCCH_FORMAT_0:
+         {
+            SCH_FREE(resrc->resrcToAddModList[rsrcIdx].SchPucchFormat.format0,\
+            sizeof(SchPucchFormat0));
+            break;
+         }
+         case PUCCH_FORMAT_1:
+         {
+            SCH_FREE(resrc->resrcToAddModList[rsrcIdx].SchPucchFormat.format1,\
+            sizeof(SchPucchFormat1));
+            break;
+         }
+         case PUCCH_FORMAT_2:
+         {
+            SCH_FREE(resrc->resrcToAddModList[rsrcIdx].SchPucchFormat.format2,\
+            sizeof(SchPucchFormat2_3));
+            break;
+         }
+         case PUCCH_FORMAT_3:
+         {
+            SCH_FREE(resrc->resrcToAddModList[rsrcIdx].SchPucchFormat.format3,\
+            sizeof(SchPucchFormat2_3));
+            break;
+         }
+         case PUCCH_FORMAT_4:
+         {
+            SCH_FREE(resrc->resrcToAddModList[rsrcIdx].SchPucchFormat.format4,\
+            sizeof(SchPucchFormat4));
+            break;
+         }
+      }
+   }
+}
+
+/*******************************************************************
+*
+* @brief Function to delete SCH Pdsch ServCellCfg
+*
+* @details
+*
+*    Function : deleteSchPdschServCellCfg
+*
+*    Functionality: Function to delete SCH Pdsch ServCellCfg
+*
+* @params[in] SchPdschServCellCfg *pdschServCellCfg
+* @return void 
+*
+* ****************************************************************/
+
+void deleteSchPdschServCellCfg(SchPdschServCellCfg *pdschServCellCfg)
+{
+   SCH_FREE(pdschServCellCfg->maxMimoLayers, sizeof(uint8_t));
+   SCH_FREE(pdschServCellCfg->maxCodeBlkGrpPerTb, sizeof(SchMaxCodeBlkGrpPerTB));
+   SCH_FREE(pdschServCellCfg->codeBlkGrpFlushInd, sizeof(bool));
+   SCH_FREE(pdschServCellCfg->xOverhead, sizeof(SchPdschXOverhead));
+}
+
+/*******************************************************************
+*
+* @brief Function to  delete SCH UeCb
+*
+* @details
+*
+*    Function : deleteSchUeCb 
+*
+*    Functionality: Function to delete SCH UeCb
+*
+* @params[in]
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+void deleteSchUeCb(SchUeCb *ueCb) 
+{
+   uint8_t timeDomRsrcIdx = 0, ueLcIdx = 0;
+   SchPucchCfg *pucchCfg = NULLP;
+   SchPdschConfig *pdschCfg = NULLP;
+
+   if(ueCb)
+   {
+      SCH_FREE(ueCb->ueCfg.ambrCfg, sizeof(SchAmbrCfg));
+      if(ueCb->ueCfg.spCellCfgPres)
+      {
+         if(ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfgPres == true)
+         {
+            pdschCfg = &ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdschCfg;
+            for(timeDomRsrcIdx = 0; timeDomRsrcIdx < pdschCfg->numTimeDomRsrcAlloc; timeDomRsrcIdx++)
+               SCH_FREE(pdschCfg->timeDomRsrcAllociList[timeDomRsrcIdx].k0, sizeof(uint8_t));
+         }
+
+         if(ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfgPres == true)
+         {
+            pucchCfg = &ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.pucchCfg;
+            SCH_FREE(pucchCfg->resrcSet,sizeof(SchPucchResrcSetCfg));
+            if(pucchCfg->resrc)
+            {
+               deleteSchPucchResrcCfg(pucchCfg->resrc);
+               SCH_FREE(pucchCfg->resrc, sizeof(SchPucchResrcCfg));
+            }
+            SCH_FREE(pucchCfg->format1, sizeof(SchPucchFormatCfg));
+            SCH_FREE(pucchCfg->format2, sizeof(SchPucchFormatCfg));
+            SCH_FREE(pucchCfg->format3, sizeof(SchPucchFormatCfg));
+            SCH_FREE(pucchCfg->format4, sizeof(SchPucchFormatCfg));
+            SCH_FREE(pucchCfg->schedReq, sizeof(SchPucchSchedReqCfg));
+            SCH_FREE(pucchCfg->multiCsiCfg, sizeof(SchPucchMultiCsiCfg));
+            SCH_FREE(pucchCfg->spatialInfo, sizeof(SchPucchSpatialCfg));  
+            SCH_FREE(pucchCfg->dlDataToUlAck, sizeof(SchPucchDlDataToUlAck));
+            SCH_FREE(pucchCfg->powerControl,sizeof(SchPucchPowerControl));
+         }
+         SCH_FREE(ueCb->ueCfg.spCellCfg.servCellCfg.bwpInactivityTmr, sizeof(uint8_t));
+         deleteSchPdschServCellCfg(&ueCb->ueCfg.spCellCfg.servCellCfg.pdschServCellCfg);
+      }
+      /*Need to Free the memory allocated for S-NSSAI*/
+      for(ueLcIdx = 0; ueLcIdx < MAX_NUM_LC; ueLcIdx++)
+      {
+         SCH_FREE(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, sizeof(Snssai));
+         SCH_FREE(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, sizeof(Snssai));
+      }
+
+      memset(ueCb, 0, sizeof(SchUeCb));
+   }
+}
+
+/*******************************************************************
+*
+* @brief Function for Ue Delete request from MAC to SCH
+*
+* @details
+*
+*    Function : MacSchUeDeleteReq 
+*
+*    Functionality: Function for Ue Delete request from MAC to SCH
+*
+* @params[in] Pst *pst, SchUeDelete  *ueDelete
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete  *ueDelete)
+{
+    uint8_t      idx=0, ueId=0, ueIdToDel=0, ret=ROK;
+    ErrorCause   result;
+    SchCellCb    *cellCb = NULLP;
+    Inst         inst = pst->dstInst - SCH_INST_START;
+    CmLList      *node = NULL, *next = NULL;
+   
+#ifdef CALL_FLOW_DEBUG_LOG
+    DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_UE_DELETE_REQ_TO_SCH\n");
+#endif
+
+    if(!ueDelete)
+    {
+       DU_LOG("\nERROR  -->  SCH : MacSchUeDeleteReq(): Ue Delete request failed");
+       ret = RFAILED;
+    }
+    DU_LOG("\nDEBUG  -->  SCH : Ue Delete request received for crnti[%d]", ueDelete->crnti);
+    
+    cellCb = schCb[inst].cells[idx];
+
+    if(cellCb->cellId != ueDelete->cellId)
+    {
+       DU_LOG("\nERROR  -->  SCH : MacSchUeDeleteReq(): cell Id is not available");
+       result =  INVALID_CELLID;
+    }
+    else
+    {
+       GET_UE_ID(ueDelete->crnti, ueId);
+       if(( cellCb->ueCb[ueId-1].crnti == ueDelete->crnti) && ( cellCb->ueCb[ueId-1].state == SCH_UE_STATE_ACTIVE))
+       {
+          deleteSchUeCb(&cellCb->ueCb[ueId-1]);
+          ueIdToDel  = ueId;
+          /* Remove UE from ueToBeScheduled list */
+          node = cellCb->ueToBeScheduled.first;
+          while(node)
+          {
+             next = node->next;
+             ueId = *(uint8_t *)node->node;
+             if(ueId == ueIdToDel)
+             {
+                SCH_FREE(node->node, sizeof(uint8_t));
+                deleteNodeFromLList(&cellCb->ueToBeScheduled, node);
+                break;
+             }
+             node = next;
+          }
+          cellCb->numActvUe--;
+          result = NOT_APPLICABLE;
+       }
+       else
+       {
+          DU_LOG("\nERROR  -->  SCH : MacSchUeDeleteReq(): SchUeCb not found");
+          result =  INVALID_UEID;
+       }
+    }
+    
+    if(result == NOT_APPLICABLE)
+    {
+       SchSendUeDeleteRspToMac(inst, ueDelete, RSP_OK, result);
+    }
+    else
+    {
+       SchSendUeDeleteRspToMac(inst, ueDelete, RSP_NOK, result);
+       ret = RFAILED;
+    }
+    return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill and send Cell delete response to MAC
+ *
+ * @details
+ *
+ *    Function :  SchSendCellDeleteRspToMac
+ *
+ *    Functionality: Fill and send Cell delete response to MAC
+ *
+ * @params[in] SchCellDelete  *ueDelete, Inst inst, SchMacRsp result
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t SchSendCellDeleteRspToMac(SchCellDelete  *ueDelete, Inst inst, SchMacRsp result)
+{
+   Pst rspPst;
+   uint8_t ret=0;
+   
+   SchCellDeleteRsp  delRsp;
+
+   DU_LOG("\nINFO   --> SCH : Filling Cell Delete response");
+   memset(&delRsp, 0, sizeof(SchCellDeleteRsp));
+   delRsp.cellId = ueDelete->cellId;
+   delRsp.rsp = result;
+
+   /* Filling response post */
+   memset(&rspPst, 0, sizeof(Pst));
+   FILL_PST_SCH_TO_MAC(rspPst, inst);
+   rspPst.event = EVENT_CELL_DELETE_RSP_TO_MAC;
+   ret =  SchCellDeleteRspOpts[rspPst.selector](&rspPst, &delRsp);
+   if(ret == RFAILED)
+   {
+      DU_LOG("\nERROR  -->  SCH : SchSendCellDeleteRspToMac(): failed to send the Cell Delete response");
+      return ret;
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Function for cellCb Deletion 
+ *
+ * @details
+ *
+ *    Function : deleteSchCellCb 
+ *
+ *    Functionality: Function for cellCb Deletion 
+ *
+ * @params[in] SchCellDelete  *cellDelete
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void deleteSchCellCb(SchCellCb *cellCb)
+{
+   uint8_t sliceIdx=0, slotIdx=0;
+   CmLListCp *list=NULL;
+   CmLList *node=NULL, *next=NULL;
+   SchPageInfo *tempNode = NULLP;
+
+   if(cellCb->schDlSlotInfo)
+   {
+      for(slotIdx=0; slotIdx<cellCb->numSlots; slotIdx++)
+      {
+         list = &cellCb->schDlSlotInfo[slotIdx]->prbAlloc.freePrbBlockList;
+         node = list->first;
+         while(node)
+         {
+            next = node->next;
+            SCH_FREE(node->node, sizeof(FreePrbBlock));
+            deleteNodeFromLList(list, node);
+            node = next;
+         }
+         SCH_FREE(cellCb->schDlSlotInfo[slotIdx], sizeof(SchDlSlotInfo));
+      }
+      SCH_FREE(cellCb->schDlSlotInfo, cellCb->numSlots *sizeof(SchDlSlotInfo*));
+   }
+
+   if(cellCb->schUlSlotInfo)
+   {
+      for(slotIdx=0; slotIdx<cellCb->numSlots; slotIdx++)
+      {
+         list = &cellCb->schUlSlotInfo[slotIdx]->prbAlloc.freePrbBlockList;
+         node = list->first;
+         while(node)
+         {
+            next = node->next;
+            SCH_FREE(node->node, sizeof(FreePrbBlock));
+            deleteNodeFromLList(list, node);
+            node = next;
+         }
+         SCH_FREE(cellCb->schUlSlotInfo[slotIdx], sizeof(SchUlSlotInfo));  
+      }
+      SCH_FREE(cellCb->schUlSlotInfo,  cellCb->numSlots * sizeof(SchUlSlotInfo*));
+   }
+
+   if(cellCb->cellCfg.plmnInfoList.snssai)
+   {
+      for(sliceIdx=0; sliceIdx<cellCb->cellCfg.plmnInfoList.numSliceSupport; sliceIdx++)
+      {
+         SCH_FREE(cellCb->cellCfg.plmnInfoList.snssai[sliceIdx], sizeof(Snssai));
+      }
+      SCH_FREE(cellCb->cellCfg.plmnInfoList.snssai, cellCb->cellCfg.plmnInfoList.numSliceSupport*sizeof(Snssai*));
+   }
+   
+   for(uint16_t idx =0; idx<MAX_SFN; idx++)
+   {
+      list = &cellCb->pageCb.pageIndInfoRecord[idx];
+      node = list->first;
+      while(node)
+      {
+         next = node->next;
+         if(node->node)
+         {
+            tempNode = (SchPageInfo*)(node->node);
+            SCH_FREE(tempNode->pagePdu, tempNode->msgLen);
+            SCH_FREE(node->node,  sizeof(SchPageInfo));
+         }
+         deleteNodeFromLList(list, node);
+         node = next;
+      }
+   }
+
+   /* Remove all UE from ueToBeScheduled list and deallocate */
+   node = cellCb->ueToBeScheduled.first;
+   while(node)
+   {
+      next = node->next;
+      SCH_FREE(node->node, sizeof(uint8_t));
+      cmLListDelFrm(&cellCb->ueToBeScheduled, node);
+      SCH_FREE(node, sizeof(CmLList));
+      node = next;
+   }
+
+   memset(cellCb, 0, sizeof(SchCellCb));
+
+}
+
+/*******************************************************************
+ *
+ * @brief Function for cell Delete request from MAC to SCH
+ *
+ * @details
+ *
+ *    Function : MacSchCellDeleteReq
+ *
+ *    Functionality: Function for cell Delete request from MAC to SCH
+ *
+ * @params[in] Pst *pst, SchCellDelete  *cellDelete
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t MacSchCellDeleteReq(Pst *pst, SchCellDelete  *cellDelete)
+{
+   uint8_t   cellIdx=0, ret = RFAILED;
+   Inst      inst = pst->dstInst - SCH_INST_START;
+   SchMacRsp result= RSP_OK;
+   
+#ifdef CALL_FLOW_DEBUG_LOG
+   DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_CELL_DELETE_REQ_TO_SCH\n");
+#endif   
+
+   if(!cellDelete)
+   {
+      DU_LOG("\nERROR  -->  SCH : MacSchCellDeleteReq(): Ue Delete request failed");
+   }
+   else
+   {
+      GET_CELL_IDX(cellDelete->cellId, cellIdx);
+      if(schCb[inst].cells[cellIdx] == NULLP)
+      { 
+         DU_LOG("\nERROR  -->  SCH : MacSchCellDeleteReq(): cell Id[%d] is not available", cellDelete->cellId);
+         result = RSP_NOK;
+      }
+      else
+      {
+         if(schCb[inst].cells[cellIdx]->cellId == cellDelete->cellId)
+         {
+            deleteSchCellCb(schCb[inst].cells[cellIdx]);
+            result = RSP_OK;
+            ret = ROK;
+            SCH_FREE(schCb[inst].cells[cellIdx], sizeof(SchCellCb));
+            DU_LOG("\nINFO   -->  SCH : Sending Cell Delete response to MAC");
+         }
+         else
+         {
+            DU_LOG("\nERROR  -->  SCH : MacSchCellDeleteReq(): cell Id[%d] is not available",cellDelete->cellId);
+            result = RSP_NOK;
+         }
+      }
+
+      if(SchSendCellDeleteRspToMac(cellDelete, inst, result)!=ROK)
+      {
+         DU_LOG("\nERROR  -->  SCH : MacSchCellDeleteReq(): failed to send Cell Delete response");
+         ret =  RFAILED;
+      }
+   }
+   return ret;   
+}
+/*******************************************************************
+ *
+ * @brief Function updates DL HARQ Feedback
+ *
+ * @details
+ *
+ *    Function : schUpdateHarqFdbk
+ *
+ *    Functionality: Function updates DL HARQ feedback
+ *
+ * @params[in] SchUeCb *ueCb, UE cb struct pointer
+ * @params[in] uint8_t numHarq, number of HARQ processes in feedback 
+ * @params[in] uint8_t *harqPayload, harq feedback payload received
+ * @params[in] SlotTimingInfo *slotInd, slot timing information
+ * @return void
+ *
+ * ****************************************************************/
+void schUpdateHarqFdbk(SchUeCb *ueCb, uint8_t numHarq, uint8_t *harqPayload, SlotTimingInfo *slotInd)
+{
+   SchDlHqProcCb *hqP;
+   SchHqDlMap *hqDlMap;
+   CmLList  *node;
+   uint8_t fdbkPos = 0;
+
+   hqDlMap = ueCb->hqDlmap[slotInd->slot];
 
+   if (ueCb->cellCb->raCb[ueCb->ueId-1].raState == SCH_RA_STATE_MSG2_HANDLE)
+   {
+      return;
+   }
+   if (ueCb->cellCb->raCb[ueCb->ueId-1].raState != SCH_RA_STATE_MSG4_PENDING)
+   {
+      node = hqDlMap->hqList.first;
+      while(node)
+      {
+         hqP = (SchDlHqProcCb*)node->node;
+         node = node->next;
+         cmLListDelFrm(&hqDlMap->hqList, &hqP->ulSlotLnk);
+         /* 
+            Decode harq feedback if needed post FAPI message decoding also or check how to decode this FAPI msg.
+            case 1 semi static harq Ack/Nack codebook //Supported
+            case 2 dynamic harq ACK/NACK codebook //Not supported
+         */
+         schDlHqFeedbackUpdate(hqP, harqPayload[fdbkPos++], HQ_TB_ACKED);//Marking 2nd TB as ACKED for now as only one TB to be used
+      }
+   }
+   else
+   {
+      node = hqDlMap->hqList.first;
+      hqP = (SchDlHqProcCb*)node->node;
+      cmLListDelFrm(&hqDlMap->hqList, &hqP->ulSlotLnk);
+      schMsg4FeedbackUpdate(hqP, harqPayload[fdbkPos++]);
+   }
+}
 /**********************************************************************
   End of file
  **********************************************************************/