[Epic-ID: ODUHIGH-406][Task-ID: ODUHIGH-423]Cleanup of hoUeCb[]
[o-du/l2.git] / src / du_app / du_ue_mgr.c
index 21c2059..f63e47d 100644 (file)
@@ -14,7 +14,7 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
- *******************************************************************************/
+*******************************************************************************/
 /* This file contains UE management handling functionality for DU APP */
 #include "common_def.h"
 #include "lrg.h"
 #include "du_app_rlc_inf.h"
 #include "du_cfg.h"
 #include "du_utils.h"
-#include<ProtocolIE-Field.h>
-#include "F1AP-PDU.h"
 #include "du_mgr.h"
 #include "du_f1ap_msg_hdl.h"
 #include "du_ue_mgr.h"
 
-#ifdef EGTP_TEST
-U32 sduId = 0;
+#ifdef O1_ENABLE
+#include "AlarmInterface.h"
+#include "CmInterface.h"
 #endif
 
 DuMacDlCcchInd packMacDlCcchIndOpts[] =
 {
-   packMacDlCcchInd,   /* Loose coupling */
-   MacProcDlCcchInd,    /* TIght coupling */
-   packMacDlCcchInd    /* Light weight-loose coupling */
+   packMacDlCcchInd,           /* Loose coupling */
+   MacProcDlCcchInd,           /* TIght coupling */
+   packMacDlCcchInd            /* Light weight-loose coupling */
 };
 
 DuMacUeCreateReq packMacUeCreateReqOpts[] =
 {
    packDuMacUeCreateReq,       /* Loose coupling */
-   MacProcUeCreateReq,          /* TIght coupling */
-   packDuMacUeCreateReq,       /* Light weight-loose coupling */
+   MacProcUeCreateReq,         /* TIght coupling */
+   packDuMacUeCreateReq        /* Light weight-loose coupling */
 };
 
-DuRlcUlUeCreateReq packRlcUlUeCreateReqOpts[] =
+DuRlcUeCreateReq packRlcUeCreateReqOpts[] =
 {
-   packDuRlcUlUeCreateReq,       /* Loose coupling */
-   RlcUlProcUeCreateReq,          /* TIght coupling */
-   packDuRlcUlUeCreateReq,       /* Light weight-loose coupling */
+   packDuRlcUeCreateReq,       /* Loose coupling */
+   RlcProcUeCreateReq,         /* TIght coupling */
+   packDuRlcUeCreateReq        /* Light weight-loose coupling */
 };
 
 DuDlRrcMsgToRlcFunc duSendDlRrcMsgToRlcOpts[] =
 {
    packDlRrcMsgToRlc,          /* Loose coupling */ 
-   RlcProcDlRrcMsgTransfer,       /* Tight coupling */
+   RlcProcDlRrcMsgTransfer,    /* Tight coupling */
    packDlRrcMsgToRlc           /* Light weight-loose coupling */
 };
 
+DuRlcUeReconfigReq packRlcUeReconfigReqOpts[] =
+{
+   packDuRlcUeReconfigReq,     /* Loose coupling */
+   RlcProcUeReconfigReq,       /* TIght coupling */
+   packDuRlcUeReconfigReq      /* Light weight-loose coupling */
+};
+
+DuMacUeReconfigReq packMacUeReconfigReqOpts[] =
+{
+   packDuMacUeReconfigReq,     /* Loose coupling */
+   MacProcUeReconfigReq,       /* TIght coupling */
+   packDuMacUeReconfigReq      /* Light weight-loose coupling */
+};
+
+DuRlcDlUserDataToRlcFunc duSendRlcDlUserDataToRlcOpts[] =
+{
+   packRlcDlUserDataToRlc,        /* Loose coupling */ 
+   RlcProcDlUserDataTransfer,  /* Tight coupling */
+   packRlcDlUserDataToRlc         /* Light weight-loose coupling */
+};
+
+DuMacUeDeleteReq packMacUeDeleteReqOpts[] =
+{
+   packDuMacUeDeleteReq,       /* Loose coupling */
+   MacProcUeDeleteReq,         /* TIght coupling */
+   packDuMacUeDeleteReq        /* Light weight-loose coupling */
+};
+
+DuRlcUeDeleteReq packRlcUeDeleteReqOpts[] =
+{
+   packDuRlcUeDeleteReq,       /* Loose coupling */
+   RlcProcUeDeleteReq,         /* TIght coupling */
+   packDuRlcUeDeleteReq        /* Light weight-loose coupling */
+};
+
+/******************************************************************
+ *
+ * @brief Function to return Drb LcId
+ *
+ * @details
+ *
+ *    Function : getDrbLcId
+ *
+ *    Functionality: Function to return Drb LcId
+ *
+ * @params[in] drbBitMap
+ *
+ * Returns: lcId - SUCCESS
+ *         RFAILED - FAILURE
+ *****************************************************************/
+
+uint8_t getDrbLcId(uint32_t *drbBitMap)
+{
+   uint8_t bitMask = 1, bitPos = 0;
+   bitPos = MIN_DRB_LCID;
+
+   while(bitPos <= MAX_DRB_LCID)
+   {
+      if((*drbBitMap & (bitMask << bitPos)) == 0)
+      {
+         *drbBitMap = ((bitMask << bitPos)| *drbBitMap);
+         return bitPos;
+      }
+      else
+      {
+         bitPos++;
+      }
+   }
+   DU_LOG("\nERROR   -->  DU_APP: Max LC Reached in getDrbLcId()");
+   return RFAILED;
+}
+
+/*******************************************************************
+ *
+ * @brief Function to fillDlUserDataInfo
+ *
+ * @details
+ *
+ *    Function : fillDlUserDataInfo
+ *
+ *    Functionality:
+ *      Function to fillDlUserDataInfo
+ *
+ * @params[in] teId,
+ *             dlDataMsgInfo
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t fillDlUserDataInfo(uint32_t teId, RlcDlUserDataInfo *dlDataMsgInfo)
+{
+   uint8_t teIdx = 0;
+
+   /*Traversing the duCb to find the CellId, UeId, LCID corresponding to TEID*/
+   for(teIdx = 0; teIdx < duCb.numTeId; teIdx++)
+   {
+      if(duCb.upTnlCfg[teIdx] && (duCb.upTnlCfg[teIdx]->tnlCfg1 != NULLP))
+      {
+         if(duCb.upTnlCfg[teIdx]->tnlCfg1->teId == teId)
+         {
+            dlDataMsgInfo->cellId = duCb.upTnlCfg[teIdx]->cellId;
+            dlDataMsgInfo->ueId = duCb.upTnlCfg[teIdx]->ueId;
+            dlDataMsgInfo->rbId = duCb.upTnlCfg[teIdx]->drbId;
+            return ROK;
+         }
+      }
+   }
+   return RFAILED;
+}
+
+ /*******************************************************************
+ *
+ * @brief Build and Send DL Data Message transfer to RLC
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendDlUserDataToRlc
+ *
+ *    Functionality:
+ *      Build and Send DL Data Message transfer to RLC
+ *
+ * @params[in] Cell ID
+ *             UE Index
+ *             Logical Channgel ID
+ *             RRC Message
+ *             RRC Message Length
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duBuildAndSendDlUserDataToRlc(uint16_t msgLen, EgtpMsg *egtpMsg)
+{
+   uint8_t ret = RFAILED;
+   Pst     pst;
+   RlcDlUserDataInfo *dlDataMsgInfo = NULLP;
+
+   DU_ALLOC_SHRABL_BUF(dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+   if(!dlDataMsgInfo)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Memory allocation failed for dlDataMsgInfo in duHdlEgtpDlData()");
+      return RFAILED;
+   }
+   memset(dlDataMsgInfo, 0, sizeof(RlcDlUserDataInfo));
+   dlDataMsgInfo->dlMsg = egtpMsg->msg;
+   dlDataMsgInfo->msgLen = msgLen;
+
+   /* Filling DL DATA Msg Info */
+   if(fillDlUserDataInfo(egtpMsg->msgHdr.teId, dlDataMsgInfo) == ROK)
+   {
+      /* Filling post structure and sending msg */ 
+      FILL_PST_DUAPP_TO_RLC(pst, RLC_DL_INST, EVENT_DL_USER_DATA_TRANS_TO_RLC);
+      DU_LOG("\nDEBUG  -->  DU_APP : Sending User Data Msg to RLC [TEID, nPDU]:[%d, %d]\n",\
+                       egtpMsg->msgHdr.teId, egtpMsg->msgHdr.nPdu.val);
+      ret = (*duSendRlcDlUserDataToRlcOpts[pst.selector])(&pst, dlDataMsgInfo);
+   }
+   if(ret != ROK)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Failed to send User Data to RLC in duHdlEgtpDlData()");
+      ODU_PUT_MSG_BUF(dlDataMsgInfo->dlMsg);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+   }
+   return ret;
+}
+
 /*******************************************************************
  *
  * @brief Handles EGTP data from CU 
@@ -86,36 +252,25 @@ DuDlRrcMsgToRlcFunc duSendDlRrcMsgToRlcOpts[] =
  * ****************************************************************/
 uint8_t duHdlEgtpDlData(EgtpMsg  *egtpMsg)
 {
+   uint16_t msgLen = 0;
 
-   /* TODO : Extract RbId/UeID/CellID/SduId from database
-      using tunnel id in egtp header */
-
-   DU_LOG("\nDU_APP : Processing DL data");
-#ifdef EGTP_TEST
-   Pst pst;
-   KwuDatReqInfo datReqInfo;
-
-   datReqInfo.rlcId.rbId = RB_ID;
-   datReqInfo.rlcId.rbType = CM_LTE_DRB;
-   datReqInfo.rlcId.ueId = UE_ID;
-   datReqInfo.rlcId.cellId = NR_CELL_ID;
-
-   datReqInfo.sduId = ++sduId;
-   datReqInfo.lcType = CM_LTE_LCH_DTCH;
-
-   /* Filling pst and Sending to RLC DL */
-   pst.selector  = ODU_SELECTOR_LWLC;
-   pst.srcEnt    = ENTDUAPP;
-   pst.dstEnt    = ENTRLC;
-   pst.dstInst   = RLC_DL_INST;
-   pst.dstProcId = DU_PROC;
-   pst.srcProcId = DU_PROC;
-   pst.region    = duCb.init.region;
-
-   cmPkKwuDatReq(&pst, &datReqInfo, egtpMsg->msg);
-#else
-   //duBuildAndSendDlRrcMsgToRlc();
+#ifdef CALL_FLOW_DEBUG_LOG
+    DU_LOG("\nCall Flow: ENTEGTP -> ENTDUAPP : EVENT_HDL_RECV_DL_DATA\n");
 #endif
+
+   DU_LOG("\nDEBUG  --> DU_APP : Processing DL data in duHdlEgtpDlData()");
+   
+   if(!egtpMsg->msg)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Recevied Dl Data is NULLP in duHdlEgtpDlData()");
+      return RFAILED;
+   }
+   ODU_GET_MSG_LEN(egtpMsg->msg, (MsgLen *)&msgLen);
+   if(duBuildAndSendDlUserDataToRlc(msgLen, egtpMsg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Failed to build DL USer Data in duHdlEgtpDlData()");
+      return RFAILED;
+   }
    return ROK;
 }
 
@@ -137,19 +292,18 @@ uint8_t duHdlEgtpDlData(EgtpMsg  *egtpMsg)
 uint8_t duBuildAndSendDlCcchInd(uint16_t *cellId, uint16_t *crnti, \
       DlCcchMsgType msgType, uint16_t dlCcchMsgSize, uint8_t *dlCcchMsg)
 {
-   uint8_t ret                  = ROK;
+   uint8_t  ret                  = ROK;
    uint16_t idx2;
    DlCcchIndInfo *dlCcchIndInfo = NULLP;
    Pst pst;
-   memset(&pst, 0, sizeof(Pst));
 
-   DU_LOG("\nDU APP : Building and Sending DL CCCH Ind to MAC");
+   DU_LOG("\nDEBUG   -->  DU APP : Building and Sending DL CCCH Ind to MAC");
 
    DU_ALLOC_SHRABL_BUF(dlCcchIndInfo, sizeof(DlCcchIndInfo));
 
    if(!dlCcchIndInfo)
    {
-      DU_LOG("\nDU APP : Memory alloc failed while building DL CCCH Ind");
+      DU_LOG("\nERROR  -->  DU APP : Memory alloc failed while building DL CCCH Ind");
       return RFAILED;
    }
 
@@ -161,7 +315,7 @@ uint8_t duBuildAndSendDlCcchInd(uint16_t *cellId, uint16_t *crnti, \
    DU_ALLOC_SHRABL_BUF(dlCcchIndInfo->dlCcchMsg, dlCcchIndInfo->dlCcchMsgLen);
    if(!dlCcchIndInfo->dlCcchMsg)
    {
-      DU_LOG("\nDU APP : Memory alloc failed while building DL CCCH Ind");
+      DU_LOG("\nERROR  -->  DU APP : Memory alloc failed while building DL CCCH Ind");
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchIndInfo, sizeof(DlCcchIndInfo));
       return RFAILED;
    }
@@ -169,14 +323,14 @@ uint8_t duBuildAndSendDlCcchInd(uint16_t *cellId, uint16_t *crnti, \
    {
       dlCcchIndInfo->dlCcchMsg[idx2] = dlCcchMsg[idx2];
    }
-   DU_FREE(dlCcchMsg, dlCcchMsgSize);
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchMsg, dlCcchMsgSize);
 
    /* Fill Pst */
    FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_DL_CCCH_IND);
    ret = (*packMacDlCcchIndOpts[pst.selector])(&pst, dlCcchIndInfo);
    if(ret != ROK)
    {
-      DU_LOG("\nDU_APP : Failure in sending DL CCCH to MAC");
+      DU_LOG("\nERROR  -->  DU_APP : Failure in sending DL CCCH to MAC");
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchIndInfo->dlCcchMsg,\
            dlCcchIndInfo->dlCcchMsgLen);
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchIndInfo, \
@@ -208,49 +362,54 @@ uint8_t duBuildAndSendDlCcchInd(uint16_t *cellId, uint16_t *crnti, \
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t duBuildAndSendDlRrcMsgToRlc(uint16_t cellId, RlcUeCfg ueCfg, \
-   uint8_t lcId, bool execDup, bool deliveryStaReq, uint16_t rrcMsgLen, uint8_t *rrcMsg)
+uint8_t duBuildAndSendDlRrcMsgToRlc(uint16_t cellId, RlcUeCfg ueCfg, F1DlRrcMsg *f1DlRrcMsg)
 {
-   Pst  pst;
+   Pst     pst;
    uint8_t ret;
    uint8_t lcIdx;
-   RlcDlRrcMsgInfo  *dlRrcMsgInfo;
+   RlcDlRrcMsgInfo  *dlRrcMsgInfo = NULLP;
+
+   if(!f1DlRrcMsg)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Received Dl RRC Msg is NULL at duBuildAndSendDlRrcMsgToRlc()");
+      return RFAILED;
+   }
 
    DU_ALLOC_SHRABL_BUF(dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo));
    if(!dlRrcMsgInfo)
    {
-      DU_LOG("\nDU APP : Memory allocation failed for dlRrcMsgInfo in \
+      DU_LOG("\nERROR  -->  DU APP : Memory allocation failed for dlRrcMsgInfo in \
          duBuildAndSendDlRrcMsgToRlc");
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rrcMsg, rrcMsgLen);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, f1DlRrcMsg->rrcMsgPdu, f1DlRrcMsg->rrcMsgSize);
       return RFAILED;
    }
-
+   
    /* Filling up the RRC msg info */
    dlRrcMsgInfo->cellId = cellId;
-   dlRrcMsgInfo->ueIdx = ueCfg.ueIdx;
+   dlRrcMsgInfo->ueId = ueCfg.ueId;
    for(lcIdx = 0; lcIdx <= MAX_NUM_LC; lcIdx++)
    {
-      if(ueCfg.rlcBearerCfg[lcIdx].lcId == lcId)
+      if(ueCfg.rlcLcCfg[lcIdx].lcId == f1DlRrcMsg->srbId)
       {
-         dlRrcMsgInfo->rbType = ueCfg.rlcBearerCfg[lcIdx].rbType;
-         dlRrcMsgInfo->rbId = ueCfg.rlcBearerCfg[lcIdx].rbId;
-        dlRrcMsgInfo->lcType = ueCfg.rlcBearerCfg[lcIdx].lcType;
-         dlRrcMsgInfo->lcId = ueCfg.rlcBearerCfg[lcIdx].lcId;
+         dlRrcMsgInfo->rbType = ueCfg.rlcLcCfg[lcIdx].rbType;
+         dlRrcMsgInfo->rbId   = ueCfg.rlcLcCfg[lcIdx].rbId;
+        dlRrcMsgInfo->lcType = ueCfg.rlcLcCfg[lcIdx].lcType;
+         dlRrcMsgInfo->lcId   = ueCfg.rlcLcCfg[lcIdx].lcId;
         break;
       }
    }
-   dlRrcMsgInfo->execDup = execDup;
-   dlRrcMsgInfo->deliveryStaRpt = deliveryStaReq;
-   dlRrcMsgInfo->rrcMsg = rrcMsg;
-   dlRrcMsgInfo->msgLen = rrcMsgLen;
+   dlRrcMsgInfo->execDup = f1DlRrcMsg->execDup;
+   dlRrcMsgInfo->deliveryStaRpt = f1DlRrcMsg->deliveryStatRpt;
+   dlRrcMsgInfo->msgLen = f1DlRrcMsg->rrcMsgSize;
+   dlRrcMsgInfo->rrcMsg = f1DlRrcMsg->rrcMsgPdu;
 
    /* Filling post structure and sending msg */ 
-   memset(&pst, 0, sizeof(Pst));
    FILL_PST_DUAPP_TO_RLC(pst, RLC_DL_INST, EVENT_DL_RRC_MSG_TRANS_TO_RLC);
+   DU_LOG("\nDEBUG   -->  DU_APP: Sending Dl RRC Msg to RLC \n");
    ret = (*duSendDlRrcMsgToRlcOpts[pst.selector])(&pst, dlRrcMsgInfo);
    if(ret != ROK)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rrcMsg, rrcMsgLen);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, f1DlRrcMsg->rrcMsgPdu, f1DlRrcMsg->rrcMsgSize);
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo));
       return RFAILED;
    }
@@ -258,296 +417,103 @@ uint8_t duBuildAndSendDlRrcMsgToRlc(uint16_t cellId, RlcUeCfg ueCfg, \
    return ROK;
 } 
 
-/*******************************************************************
- *
- * @brief Process UE context setup request from CU
- *
- * @details
- *
- *    Function : procUeCintextSetupReq
- *
- *    Functionality: Process UE context setup request from CU
- *
- * @params[in] F1AP message
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t procUeContextSetupReq(F1AP_PDU_t *f1apMsg)
-{
-   uint8_t    ret = ROK;
-   uint8_t    ieIdx, ueIdx;
-   uint8_t    *rrcMsg = NULLP;
-   uint16_t   rrcMsgLen;
-   uint16_t   cellId, cellIdx;
-   uint32_t   gnbDuUeF1apId;    /* GNB DU UE F1AP ID */
-   uint32_t   gnbCuUeF1apId;    /* GNB CU UE F1AP ID */
-   bool       deliveryStaReq = false;   /* RRC msg delivery status request */
-   DuUeCb     *ueCb = NULLP;
-   UEContextSetupRequest_t   *ueSetReq = NULLP;
-  
-   ueSetReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
-
-   /* TODO : fetch remaining values from f1ap msg */
-   for(ieIdx=0; ieIdx < ueSetReq->protocolIEs.list.count; ieIdx++)
-   {
-      switch(ueSetReq->protocolIEs.list.array[ieIdx]->id)
-      {
-         case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
-           {
-              gnbCuUeF1apId = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
-              break;
-            }
-        case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-           {
-              gnbDuUeF1apId = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
-              break;
-           }
-         case ProtocolIE_ID_id_ServCellIndex:
-           {
-              cellIdx = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.ServCellIndex;
-              break;
-           }
-         case ProtocolIE_ID_id_RRCContainer: 
-            {
-               rrcMsgLen = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size;
-              if(rrcMsgLen <= 0)
-              {
-                 DU_LOG("\nDU APP : Invalid RRC Msg Length %d in Ue Ctxt Setup Req", rrcMsgLen);
-                 return RFAILED;
-              }
-               DU_ALLOC_SHRABL_BUF(rrcMsg, rrcMsgLen);
-              if(!rrcMsg)
-              {
-                 DU_LOG("\nDU APP : Memory allocation failed for RRC Msg in procUeCtxtSetupReq");
-                 return RFAILED;
-              }
-              memcpy(rrcMsg, ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,\
-                 rrcMsgLen);
-              break;
-            }
-         case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
-           {
-               deliveryStaReq = true;         
-              break;
-           }
-        default:
-           {
-              break;
-           }
-      }
-   }
-
-   cellId = duCb.actvCellLst[cellIdx]->cellId;
-   for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
-   {
-      if((duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId) &&
-         (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId &&
-        duCb.actvCellLst[cellIdx]->ueCb[ueIdx].ueState == UE_ACTIVE))
-      {
-         ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
-        break;
-      }
-   }
-
-   /* TODO :  send RB config to MAC/RLC */
-
-   /* Sending DL RRC Message to RLC */
-   if(ueIdx != MAX_NUM_UE)
-   {
-      ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, SRB1_LCID, \
-               false, deliveryStaReq,  rrcMsgLen, rrcMsg); 
-   }
-   else
-   {
-      DU_LOG("\nDU APP : No UE found for CuUeF1apId[%d] and DuUeF1apId[%d]", \
-         gnbCuUeF1apId, gnbDuUeF1apId);
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rrcMsg, rrcMsgLen);
-      ret = RFAILED;
-   }
 
-   return ret;
-}
 
 /******************************************************************
  *
- * @brief Processes DL RRC Message Transfer  sent by CU
+ * @brief Process DL RRC Msg recevied from F1AP
  *
  * @details
  *
- *    Function : procDlRrcMsgTrans 
+ *    Function : duProcDlRrcMsg
  *
- *    Functionality: Processes DL RRC Message Transfer sent by CU
+ *    Functionality: Process DL RRC Msg recevied from F1AP
  *
- * @params[in] F1AP_PDU_t ASN decoded F1AP message
+ * @params[in] dlCcchMsg - uint8_t*
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t procDlRrcMsgTrans(F1AP_PDU_t *f1apMsg)
-{
-   DLRRCMessageTransfer_t *dlRrcMsg = NULLP;
-   uint8_t                *rrcMsgPdu = NULLP;
-   uint8_t                ieIdx, ueIdx, cellIdx;
-   uint8_t                ret, srbId;
-   uint16_t               byteIdx, crnti, cellId, rrcMsgSize;
-   uint32_t               gnbCuUeF1apId, gnbDuUeF1apId;
-   bool                   execDup = false;
-   bool                   deliveryStaRpt = false;
-   bool                   ueFound = false;
-   bool                   ueCcchCtxtFound = false; 
-
-   DU_LOG("\nDU_APP : DL RRC message transfer Recevied");
 
-   dlRrcMsg = &f1apMsg->choice.initiatingMessage->value.choice.DLRRCMessageTransfer;
+uint8_t duProcDlRrcMsg(F1DlRrcMsg *dlRrcMsg)
+{
+   uint8_t ueIdx, ret;
+   uint16_t crnti, cellId, cellIdx;
+   bool ueCcchCtxtFound = false;
+   bool ueFound = false;
 
    ret = ROK;
 
-   for(ieIdx=0; ieIdx<dlRrcMsg->protocolIEs.list.count; ieIdx++)
-   {
-      switch(dlRrcMsg->protocolIEs.list.array[ieIdx]->id)
-      {
-        case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
-           {
-              gnbCuUeF1apId = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
-              break;
-           }
-        case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-           {
-              gnbDuUeF1apId = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
-              break;
-           }
-        case ProtocolIE_ID_id_SRBID:
-           {
-              srbId = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.SRBID;
-              break;
-           }
-        case ProtocolIE_ID_id_ExecuteDuplication:
-           {
-              execDup = true;
-              break;
-           }
-        case ProtocolIE_ID_id_RRCContainer:
-           {
-              if(dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size > 0)
-              {
-                 rrcMsgSize = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size;
-                 DU_ALLOC(rrcMsgPdu, rrcMsgSize);
-                 if(!rrcMsgPdu)
-                 {
-                     DU_LOG("\nDU_APP : Memory allocation failed in procDlRrcMsgTrans"); 
-                     return RFAILED;
-                 }
-                 for(byteIdx = 0; byteIdx < rrcMsgSize; byteIdx++)
-                 {
-                    rrcMsgPdu[byteIdx] = \
-                       dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf[byteIdx];
-                 }
-              }
-              else
-              {
-                 DU_LOG("\nDU_APP : RRC Container Size is invalid:%ld",\
-                       dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
-                  return RFAILED;
-              }
-              break;
-           }
-         case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
-           {
-              deliveryStaRpt = true;
-              break;
-           }
-        default:
-           DU_LOG("\nDU_APP : Invalid IE received in DL RRC Msg Transfer:%ld",
-                 dlRrcMsg->protocolIEs.list.array[ieIdx]->id);
-      }
-   }
-
-   if(srbId == SRB1_LCID) //RRC connection setup
+   if(dlRrcMsg->srbId == SRB0_LCID) //RRC connection setup
    {
-      for(ueIdx=0; ueIdx < duCb.numUe; ueIdx++)
+      for(ueIdx=0; ueIdx<duCb.numUe; ueIdx++)
       {
-         if(gnbDuUeF1apId == duCb.ueCcchCtxt[ueIdx].gnbDuUeF1apId)
+         if(dlRrcMsg->gnbDuUeF1apId == duCb.ueCcchCtxt[ueIdx].gnbDuUeF1apId)
          {
-           ueCcchCtxtFound = true;
-           crnti  = duCb.ueCcchCtxt[ueIdx].crnti;
-           cellId = duCb.ueCcchCtxt[ueIdx].cellId;
-           break;
+            ueCcchCtxtFound = true;
+            crnti  = duCb.ueCcchCtxt[ueIdx].crnti;
+            cellId = duCb.ueCcchCtxt[ueIdx].cellId;
+            break;
          }
       }
    }
    if(ueCcchCtxtFound)
    {
-      ret = duBuildAndSendDlCcchInd(&cellId, &crnti, RRC_SETUP, rrcMsgSize, rrcMsgPdu);
-      if(ret)
+      ret = duBuildAndSendDlCcchInd(&cellId, &crnti, RRC_SETUP, dlRrcMsg->rrcMsgSize, dlRrcMsg->rrcMsgPdu);
+      if(ret == RFAILED)
       {
-        DU_LOG("\nDU_APP: Falied at duBuildAndSendDlCcchInd()");
+         DU_LOG("\nERROR  -->  DU APP : Failed to build DlCcch Ind at procDlRrcMsgTrans()");
       }
       else
       {
-        if(duCb.actvCellLst[cellId-1]->numActvUes < MAX_NUM_UE)
-        {
-           ret = duCreateUeCb(&duCb.ueCcchCtxt[ueIdx], gnbCuUeF1apId);
-           if(ret)
-           {
-              DU_LOG("\nDU_APP: Failed at duCreateUeCb for cellId [%d]", \
-                    duCb.ueCcchCtxt[ueIdx].cellId);
-              ret = RFAILED;
-           }
-        }
-        else
-        {
-           DU_LOG("\nDU_APP: Max Active UEs has reached");
-           ret = RFAILED;
-        }
+         if(duCb.actvCellLst[cellId-1] == NULLP)
+         {
+            DU_LOG("\nERROR  -->  DU APP : cellId [%d] does not exist", cellId);
+            ret = RFAILED;
+         }
+         if(duCb.actvCellLst[cellId-1]->numActvUes < MAX_NUM_UE)
+         {
+            ret = duCreateUeCb(&duCb.ueCcchCtxt[ueIdx], dlRrcMsg->gnbCuUeF1apId);
+            if(ret == RFAILED)
+            {
+               DU_LOG("\nERROR  -->  DU APP : Failed to createUeCb for cellId [%d] at procDlRrcMsgTrans()", \
+                     duCb.ueCcchCtxt[ueIdx].cellId);
+            }
+         }
+         else
+         {
+            DU_LOG("\nERROR   -->  DU_APP: Max Active UEs has reached at procDlRrcMsgTrans()");
+            ret = RFAILED;
+         }
       }
    }
    else
    {
       for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
       {
-        for(ueIdx = 0 ; ueIdx < MAX_NUM_UE; ueIdx++)
-        {
-           if((gnbCuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId)
-                 && (gnbDuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId))
-           {
-              ueFound = true;
-              ret = duBuildAndSendDlRrcMsgToRlc(duCb.actvCellLst[cellIdx]->cellId, \
-                    duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg, srbId, \
-                    execDup, deliveryStaRpt,  rrcMsgSize, rrcMsgPdu);
-              break; 
-           }
-        }
-        if(ueFound)
-           break;
+         for(ueIdx = 0 ; ueIdx < MAX_NUM_UE; ueIdx++)
+         {
+            if(duCb.actvCellLst[cellIdx] && (dlRrcMsg->gnbCuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId)
+                  && (dlRrcMsg->gnbDuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId))
+            {
+               ueFound = true;
+               ret = duBuildAndSendDlRrcMsgToRlc(duCb.actvCellLst[cellIdx]->cellId, \
+                     duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg, dlRrcMsg);
+               break; 
+            }
+         }
+         if(ueFound)
+            break;
       }
       if(!ueFound)
-        ret = RFAILED;
+      {
+         DU_LOG("\nERROR   -->  DU_APP: UE ID [%d] not found", dlRrcMsg->gnbDuUeF1apId);
+         ret = RFAILED;
+      }
    }
    return ret;
 }
 
-/******************************************************************
- *
- * @brief Generates GNB DU Ue F1AP ID
- *
- * @details
- *
- *    Function : genGnbDuUeF1apId
- *
- *    Functionality: Generates GNB DU Ue F1AP ID
- *
- * @params[in] void
- * @return gnbDuF1apId
- *
- * ****************************************************************/
-uint32_t genGnbDuUeF1apId()
-{
-   static uint32_t gnbDuUeF1apId = 0;
-
-   return ++gnbDuUeF1apId;
-}
-
 /******************************************************************
  *
  * @brief Processes UL CCCH Ind recvd from MAC
@@ -567,12 +533,20 @@ uint8_t duProcUlCcchInd(UlCcchIndInfo *ulCcchIndInfo)
 {
 
    uint8_t ret = ROK;
-   uint32_t gnbDuUeF1apId = 0;
-
-   gnbDuUeF1apId = genGnbDuUeF1apId();
+   int32_t gnbDuUeF1apId = 0;
 
+   if(ulCcchIndInfo->crnti)
+   {
+      GET_UE_ID(ulCcchIndInfo->crnti, gnbDuUeF1apId);
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Received invalid CRNTI [%d] ", ulCcchIndInfo->crnti);
+      return RFAILED;
+   }
+   
    /* Store Ue mapping */
-   duCb.ueCcchCtxt[duCb.numUe].gnbDuUeF1apId = gnbDuUeF1apId;
+   duCb.ueCcchCtxt[duCb.numUe].gnbDuUeF1apId = (uint32_t)gnbDuUeF1apId;
    duCb.ueCcchCtxt[duCb.numUe].crnti         = ulCcchIndInfo->crnti;
    duCb.ueCcchCtxt[duCb.numUe].cellId        = ulCcchIndInfo->cellId;
 
@@ -582,7 +556,7 @@ uint8_t duProcUlCcchInd(UlCcchIndInfo *ulCcchIndInfo)
            ulCcchIndInfo->ulCcchMsg));
    if(ret != ROK)
    {
-      DU_LOG("\nDU_APP : BuildAndSendInitialRrcMsgTransfer failed");
+      DU_LOG("\nERROR  -->  DU_APP : BuildAndSendInitialRrcMsgTransfer failed");
    }
 
    DU_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, ulCcchIndInfo->ulCcchMsgLen);
@@ -592,110 +566,133 @@ uint8_t duProcUlCcchInd(UlCcchIndInfo *ulCcchIndInfo)
 
 }
 
+/******************************************************************
+ *
+ * @brief Fills Default UL LC Cfg
+ *
+ * @details
+ *
+ *    Function : fillDefaultUlLcCfg
+ *
+ *    Functionality: Fills Default UL LC Cfg
+ *
+ * @params[in]  UlLcCfg *ulLcCfg 
+ * @return void
+ *****************************************************************/
+void fillDefaultUlLcCfg(UlLcCfg *ulLcCfg)
+{
+   ulLcCfg->priority = LC_PRIORITY_1;
+   ulLcCfg->lcGroup =  0;
+   ulLcCfg->schReqId = 0;
+   ulLcCfg->pbr = PBR_KBPS_INFINITY;
+   ulLcCfg->bsd = BSD_MS_1000;
+}
+
 /******************************************************************
  *
  * @brief Fills Initial DL Bandwidth Part
  *
  * @details
  *
- *    Function : fillInitDlBwp
+ *    Function : fillDefaultInitDlBwp
  *
  *    Functionality: Fills Initial DL Bandwidth Part
  *
+ * @params[in]  InitialDlBwp *initDlBwp
+ * @return ROK - success
+ *         RFAILED - failure
  *
  *****************************************************************/
-void fillInitDlBwp(InitialDlBwp *initDlBwp)
+uint8_t fillDefaultInitDlBwp(InitialDlBwp *initDlBwp)
 {
    uint8_t idx = 0;
    uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
    uint8_t coreset0EndPrb, coreset1StartPrb, coreset1NumPrb;
 
-
    if(initDlBwp)
    {
       /* Filling PDCCH Config */
       initDlBwp->pdcchPresent = TRUE;
       if(initDlBwp->pdcchPresent)
       {
-        initDlBwp->pdcchCfg.numCRsetToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
-        memset(initDlBwp->pdcchCfg.cRSetToAddModList, 0, MAX_NUM_CRSET);
-        if(initDlBwp->pdcchCfg.numCRsetToAddMod <= MAX_NUM_CRSET)
-        {
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].cRSetId = \
-              PDCCH_CTRL_RSRC_SET_ONE_ID;
-           memset(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, 0,\
-              FREQ_DOM_RSRC_SIZE); 
-           coreset0EndPrb = CORESET0_END_PRB;
-           coreset1StartPrb = coreset0EndPrb +6;
-           coreset1NumPrb = CORESET1_NUM_PRB;
-           /* calculate the PRBs */
-           schAllocFreqDomRscType0(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
-           memcpy(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, freqDomainResource,
-              FREQ_DOM_RSRC_SIZE);
-
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].duration = \
-              PDCCH_CTRL_RSRC_SET_ONE_DURATION;
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].cceRegMappingType = \
-              CCE_REG_MAPPINGTYPE_PR_NONINTERLEAVED;
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].precoderGranularity = \
-              ALL_CONTIGUOUS_RBS;
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].dmrsScramblingId = \
-              SCRAMBLING_ID;
-        }
-        initDlBwp->pdcchCfg.numCRsetToRel = 0;
-        /* Filling Serach Space */
-        initDlBwp->pdcchCfg.numSearchSpcToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
-        memset(initDlBwp->pdcchCfg.searchSpcToAddModList, 0, MAX_NUM_CRSET);
-        if(initDlBwp->pdcchCfg.numSearchSpcToAddMod <= MAX_NUM_CRSET)
-        {
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceId =\
-              PDCCH_SRCH_SPC_TWO_ID;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].cRSetId = \
-              PDCCH_CTRL_RSRC_SET_ONE_ID;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].\
-              mSlotPeriodicityAndOffset = SLOTPERIODICITYANDOFFSET_PR_SL1;
-           memset(initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot, 0,\
-              MONITORING_SYMB_WITHIN_SLOT_SIZE);
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot[idx] =\
-              PDCCH_SYMBOL_WITHIN_SLOT;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel1 =\
-              AGGREGATIONLEVEL_N8; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel2 =\
-              AGGREGATIONLEVEL_N8; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel4 =\
-              AGGREGATIONLEVEL_N4; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel8 =\
-              AGGREGATIONLEVEL_N2; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel16 =\
-              AGGREGATIONLEVEL_N1;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceType = \
-              SEARCHSPACETYPE_PR_UE_SPECIFIC;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].ueSpecificDciFormat =\
-              PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
-
-           initDlBwp->pdcchCfg.numSearchSpcToRel = 0;
+         initDlBwp->pdcchCfg.numCRsetToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
+         memset(initDlBwp->pdcchCfg.cRSetToAddModList, 0, MAX_NUM_CRSET);
+         if(initDlBwp->pdcchCfg.numCRsetToAddMod <= MAX_NUM_CRSET)
+         {
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].cRSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+            memset(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, 0, FREQ_DOM_RSRC_SIZE); 
+            coreset0EndPrb = CORESET0_END_PRB;
+            coreset1StartPrb = coreset0EndPrb +6;
+            coreset1NumPrb = CORESET1_NUM_PRB;
+            /* calculate the PRBs */
+            fillCoresetFeqDomAllocMap(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
+            memcpy(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, freqDomainResource, FREQ_DOM_RSRC_SIZE);
+
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].cceRegMappingType = CCE_REG_MAPPINGTYPE_PR_NONINTERLEAVED;
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].precoderGranularity = ALL_CONTIGUOUS_RBS;
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].dmrsScramblingId = SCRAMBLING_ID;
+         }
+         initDlBwp->pdcchCfg.numCRsetToRel = 0;
 
-        }
+         /* Filling Serach Space */
+         initDlBwp->pdcchCfg.numSearchSpcToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
+         memset(initDlBwp->pdcchCfg.searchSpcToAddModList, 0, MAX_NUM_CRSET);
+         if(initDlBwp->pdcchCfg.numSearchSpcToAddMod <= MAX_NUM_CRSET)
+         {
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].cRSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSlotPeriodicityAndOffset = SLOTPERIODICITYANDOFFSET_PR_SL1;
+            memset(initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot, 0, MONITORING_SYMB_WITHIN_SLOT_SIZE);
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot[idx] = PDCCH_SYMBOL_WITHIN_SLOT;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel1 = AGGREGATIONLEVEL_N8; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel2 = AGGREGATIONLEVEL_N8; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel4 = AGGREGATIONLEVEL_N4; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel8 = AGGREGATIONLEVEL_N2; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel16 = AGGREGATIONLEVEL_N1;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceType = SEARCHSPACETYPE_PR_UE_SPECIFIC;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].ueSpecificDciFormat = PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+         }
+         initDlBwp->pdcchCfg.numSearchSpcToRel = 0;
       }
+
       /* Filling PDSCH Config */
       initDlBwp->pdschPresent = TRUE;
       if(initDlBwp->pdschPresent)
       {
-        initDlBwp->pdschCfg.dmrsDlCfgForPdschMapTypeA.addPos = ADDITIONALPOSITION_POS0;
-        initDlBwp->pdschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1;
-        initDlBwp->pdschCfg.numTimeDomRsrcAlloc = 1;
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].mappingType = \
-           MAPPING_TYPEA;
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbol = PDSCH_START_SYMBOL; 
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].symbolLength = PDSCH_LENGTH_SYMBOL;
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbolAndLength = \
-           calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
-        initDlBwp->pdschCfg.rbgSize = RBG_SIZE_CONFIG1;
-        initDlBwp->pdschCfg.numCodeWordsSchByDci = CODEWORDS_SCHED_BY_DCI_N1;
-        initDlBwp->pdschCfg.bundlingType = TYPE_STATIC_BUNDLING;
+         initDlBwp->pdschCfg.dmrsDlCfgForPdschMapTypeA.addPos = ADDITIONALPOSITION_POS0;
+         initDlBwp->pdschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1;
+
+         initDlBwp->pdschCfg.numTimeDomRsrcAlloc = NUM_TIME_DOM_RSRC_ALLOC;
+
+         idx = 0; 
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].mappingType = MAPPING_TYPEA;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbol = PDSCH_START_SYMBOL; 
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].symbolLength = PDSCH_LENGTH_SYMBOL;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbolAndLength = calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+
+         idx++;
+         DU_ALLOC_SHRABL_BUF(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0, sizeof(uint8_t));
+         if(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0 == NULLP)
+         {
+            DU_LOG("\nERROR  -->  DUAPP : Failed to allocate memory to K0 in fillDefaultInitDlBwp");
+            return RFAILED;
+         }
+         if(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0)
+            *(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0) = 1;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].mappingType = MAPPING_TYPEA;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbol = PDSCH_START_SYMBOL; 
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].symbolLength = PDSCH_LENGTH_SYMBOL;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbolAndLength = calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+
+         initDlBwp->pdschCfg.rbgSize = RBG_SIZE_CONFIG1;
+         initDlBwp->pdschCfg.numCodeWordsSchByDci = CODEWORDS_SCHED_BY_DCI_N1;
+         initDlBwp->pdschCfg.bundlingType = TYPE_STATIC_BUNDLING;
+         initDlBwp->pdschCfg.bundlingInfo.StaticBundling.size = 0;
       }
    }
 
+   return ROK;
 }
 
 /******************************************************************
@@ -704,13 +701,15 @@ void fillInitDlBwp(InitialDlBwp *initDlBwp)
  *
  * @details
  *
- *    Function : fillInitUlBwp
+ *    Function : fillDefaultInitUlBwp
  *
  *    Functionality: Fills Initial UL Bandwidth Part
  *
+ * @params[in]  InitialUlBwp *initUlBwp
+ * @return void
  *
  *****************************************************************/
-void fillInitUlBwp(InitialUlBwp *initUlBwp)
+void fillDefaultInitUlBwp(InitialUlBwp *initUlBwp)
 {
    uint8_t idx;
    if(initUlBwp)
@@ -721,28 +720,37 @@ void fillInitUlBwp(InitialUlBwp *initUlBwp)
       initUlBwp->puschPresent = TRUE;
       if(initUlBwp->puschPresent)
       {
+         initUlBwp->puschCfg.dataScramblingId = SCRAMBLING_ID;
         initUlBwp->puschCfg.dmrsUlCfgForPuschMapTypeA.addPos = ADDITIONALPOSITION_POS0; 
         initUlBwp->puschCfg.dmrsUlCfgForPuschMapTypeA.transPrecodDisabled. \
            scramblingId0 = SCRAMBLING_ID; 
         initUlBwp->puschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1;
-        initUlBwp->puschCfg.numTimeDomRsrcAlloc = 1;
+        initUlBwp->puschCfg.numTimeDomRsrcAlloc = 2;
         idx = 0;
         if(initUlBwp->puschCfg.numTimeDomRsrcAlloc <= MAX_NUM_UL_ALLOC)
         {
-           initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2;
+           initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG1;
            initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType =\
               MAPPING_TYPEA;
            initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL;
            initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL;
            initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\
               calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL);
+
+       idx++;
+       initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG2;
+       initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType = MAPPING_TYPEA;
+       initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL;
+       initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL;
+       initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\
+          calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL);
         }
         initUlBwp->puschCfg.transformPrecoder = TRANSFORM_PRECODER_DISABLED;
       }
    }
    else
    {
-      DU_LOG("\n DUAPP: Memory is NULL of InitalUlBwp");
+      DU_LOG("\nERROR  -->  DU APP : Memory is NULL of InitalUlBwp");
    }
 
 }
@@ -752,19 +760,33 @@ void fillInitUlBwp(InitialUlBwp *initUlBwp)
  *
  * @details
  *
- *    Function : fillSpCellGrpInfo
+ *    Function : fillDefaultSpCellGrpInfo
  *
  *    Functionality: Fills Sp Cell Group Info
  *
+ * @params[in]  MacUeCfg *macUeCfg
+ * @return ROK - Success
+ *         RFAILED - Failure
  *
  *****************************************************************/
-void fillSpCellGrpInfo(SpCellCfg *spCell)
+uint8_t fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg)
 {
+   SpCellCfg *spCell = NULL;
+
+   if(macUeCfg)
+      spCell = &macUeCfg->spCellCfg;
+
    if(spCell)
    {
+      macUeCfg->spCellCfgPres = true;
+
       spCell->servCellIdx = SERV_CELL_IDX;
       /* Filling Initial Dl Bwp */
-      fillInitDlBwp(&spCell->servCellCfg.initDlBwp);
+      if((fillDefaultInitDlBwp(&spCell->servCellCfg.initDlBwp)) != ROK)
+      {
+         DU_LOG("\nERROR  -->  DUAPP : Failed in fillDefaultInitDlBwp");
+         return RFAILED;
+      }
 
       spCell->servCellCfg.numDlBwpToAdd    = 0; 
       spCell->servCellCfg.firstActvDlBwpId = ACTIVE_DL_BWP_ID;
@@ -774,17 +796,19 @@ void fillSpCellGrpInfo(SpCellCfg *spCell)
       spCell->servCellCfg.pdschServCellCfg.maxCodeBlkGrpPerTb = NULLP;
       spCell->servCellCfg.pdschServCellCfg.codeBlkGrpFlushInd = NULLP;
       spCell->servCellCfg.pdschServCellCfg.xOverhead = NULLP;
-      spCell->servCellCfg.pdschServCellCfg.numHarqProcForPdsch =\
-         NUM_HARQ_PROC_FOR_PDSCH_N_16;
+      spCell->servCellCfg.pdschServCellCfg.numHarqProcForPdsch = NUM_HARQ_PROC_FOR_PDSCH_N_16;
+
       /* Filling Initial UL Bwp*/
-      fillInitUlBwp(&spCell->servCellCfg.initUlBwp);
+      fillDefaultInitUlBwp(&spCell->servCellCfg.initUlBwp);
       spCell->servCellCfg.numUlBwpToAdd     = 0; 
       spCell->servCellCfg.firstActvUlBwpId  = ACTIVE_DL_BWP_ID; 
    }
    else
    {
-      DU_LOG("\n DU_APP: Memory is NULL for SpCellGrp");
+      DU_LOG("\nERROR  -->  DU APP : Memory is NULL for SpCellGrp");
+      return RFAILED;
    }
+   return ROK;
 }
 
 /******************************************************************
@@ -793,22 +817,30 @@ void fillSpCellGrpInfo(SpCellCfg *spCell)
  *
  * @details
  *
- *    Function : fillPhyCellGrpInfo
+ *    Function : fillDefaultPhyCellGrpInfo
  *
  *    Functionality: Fills Physical Cell Group Info
  *
+ * @params[in]  MacUeCfg *macUeCfg
+ * @return void
  *
  *****************************************************************/
-void fillPhyCellGrpInfo(PhyCellGrpCfg *cellGrp)
+void fillDefaultPhyCellGrpInfo(MacUeCfg *macUeCfg)
 {
+   PhyCellGrpCfg *cellGrp = NULL;
+
+   if(macUeCfg)
+      cellGrp = &macUeCfg->phyCellGrpCfg;
+
    if(cellGrp)
    {
+      macUeCfg->phyCellGrpCfgPres = true;
       cellGrp->pdschHarqAckCodebook = PDSCH_HARQ_ACK_CODEBOOK_DYNAMIC;
       cellGrp->pNrFr1 = P_NR_FR1;
    }
    else
    {
-      DU_LOG("\nDUAPP: Memory is NULL for Physical Cell Group");
+      DU_LOG("\nERROR  -->  DU APP : Memory is NULL for Physical Cell Group");
    }
 }
 
@@ -818,18 +850,26 @@ void fillPhyCellGrpInfo(PhyCellGrpCfg *cellGrp)
  *
  * @details
  *
- *    Function : fillMacCellGrpInfo
+ *    Function : fillDefaultMacCellGrpInfo
  *
  *    Functionality: Fills Mac Cell Group Info
  *
+ * @params[in]  MacUeCfg *macUeCfg
+ * @return void
  *
  *****************************************************************/
-void fillMacCellGrpInfo(MacCellGrpCfg *cellGrp)
+void fillDefaultMacCellGrpInfo(MacUeCfg *macUeCfg)
 {
    uint8_t idx;
+   MacCellGrpCfg *cellGrp = NULL;
+
+   if(macUeCfg)
+      cellGrp = &macUeCfg->macCellGrpCfg;
 
    if(cellGrp)
    {
+      macUeCfg->macCellGrpCfgPres = true;
+
       /* Filling Scheduling Request Config */
       cellGrp->schReqCfg.addModListCount = 1;
       if(cellGrp->schReqCfg.addModListCount <= MAX_NUM_SR_CFG_PER_CELL_GRP)
@@ -856,9 +896,9 @@ void fillMacCellGrpInfo(MacCellGrpCfg *cellGrp)
       cellGrp->tagCfg.relListCount = 0;
 
       /* Filling BSR config */
-      cellGrp->bsrTmrCfg.periodicTimer = PERIODIC_BSR_TMR;
-      cellGrp->bsrTmrCfg.retxTimer = RETX_BSR_TMR;
-      cellGrp->bsrTmrCfg.srDelayTimer = SR_DELAY_TMR;
+      cellGrp->bsrTmrCfg.periodicTimer = BSR_PERIODIC_TIMER_SF_10;
+      cellGrp->bsrTmrCfg.retxTimer = BSR_RETX_TIMER_SF_320;
+      cellGrp->bsrTmrCfg.srDelayTimer = BSR_SR_DELAY_TMR_2560;
 
       /* Filling PHR config */
       cellGrp->phrCfgSetupPres = true;
@@ -873,73 +913,240 @@ void fillMacCellGrpInfo(MacCellGrpCfg *cellGrp)
    }
    else
    {
-      DU_LOG("\nDUAPP: Memory is NULL for Master Cell Group");
+      DU_LOG("\nERROR  -->  DU APP : Memory is NULL for Master Cell Group");
    }
 }
 
+/*******************************************************************
+ *
+ * @brief Fills default modulation info for a UE
+ *
+ * @details
+ *
+ *    Function : fillDefaultModulation
+ *
+ *    Functionality: Fills default modulation info for a UE
+ *
+ * @params[in] Pointer to MAC UE configuration
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void fillDefaultModulation(MacUeCfg *ueCfg)
+{
+   ueCfg->dlModInfo.modOrder = MOD_ORDER_QPSK;
+   ueCfg->dlModInfo.mcsIndex = DEFAULT_MCS;
+   ueCfg->dlModInfo.mcsTable = MCS_TABLE_QAM64; /* Spec 38.214-Table 5.1.3.1-1 */
+
+   ueCfg->ulModInfo.modOrder = MOD_ORDER_QPSK;
+   ueCfg->ulModInfo.mcsIndex = DEFAULT_MCS;
+   ueCfg->ulModInfo.mcsTable = MCS_TABLE_QAM64; /* Spec 38.214-Table 5.1.3.1-1 */
+}
+
+/******************************************************************
+ *
+ * @brief Function to fill Mac Lc Cfg for SRB1
+ *
+ * @details
+ *
+ *    Function : fillMacSrb1LcCfg
+ *
+ *    Functionality: Function to fill Mac Lc cfg for SRB1
+ *
+ * @params[in]  LcCfg *lcCfg, LcCfg *ueSetReqDb
+ * @return void
+ *****************************************************************/
+
+void fillMacSrb1LcCfg(LcCfg *macLcCfg)
+{
+   macLcCfg->lcId   = SRB1_LCID;
+   macLcCfg->configType = CONFIG_ADD;
+   macLcCfg->drbQos = NULLP;
+   macLcCfg->snssai = NULLP;
+   macLcCfg->ulLcCfgPres = true;
+   fillDefaultUlLcCfg(&macLcCfg->ulLcCfg);
+}
+
 /******************************************************************
  *
- * @brief Fills Logical Channel Config List
+ * @brief Function to fill the Lc cfg from ueSetupReqDb
  *
  * @details
  *
- *    Function : fillLcCfgList
+ *    Function : fillMacLcCfgToAddMod
  *
- *    Functionality: Fills Logical channel Config List
+ *    Functionality: Function to fill the Lc cfg from ueSetupReqDb
  *
+ * @params[in]  LcCfg *lcCfg, LcCfg *ueSetReqDb
+ * @return ROK/RFAILED
  *
  *****************************************************************/
-void fillLcCfgList(LcCfg *lcCfgInfo)
-{
-   if(lcCfgInfo)
-   {
-      lcCfgInfo->lcId = SRB1_LCID;
-      lcCfgInfo->drbQos = NULLP;
-      lcCfgInfo->snssai = NULLP;
-      lcCfgInfo->ulLcCfg = NULLP;
-      lcCfgInfo->dlLcCfg.lcp = LC_PRIORITY_1;
-
-#if 0
-      /* TODO: To be filled on receving UE CONTEXT SETUP from CU */
-      /* Filling Qos characteristics */
-      lcCfgInfo->drbQos.fiveQiType = QoS_Characteristics_PR_non_Dynamic_5QI;
-      lcCfgInfo->drbQos.u.nonDyn5Qi.fiveQi = 0;
-      lcCfgInfo->drbQos.u.nonDyn5Qi.priorLevel = 0;
-      lcCfgInfo->drbQos.u.nonDyn5Qi.avgWindow = 0;
-      lcCfgInfo->drbQos.u.nonDyn5Qi.maxDataBurstVol = 0;
-
-      /* Filling NgRAN */
-      lcCfgInfo->drbQos.ngRanRetPri.priorityLevel = PriorityLevel_highest;
-      lcCfgInfo->drbQos.ngRanRetPri.preEmptionCap = \
-                                                   Pre_emptionCapability_may_trigger_pre_emption;
-      lcCfgInfo->drbQos.ngRanRetPri.preEmptionVul = \
-                                                   Pre_emptionVulnerability_not_pre_emptable;
-
-      /* Filling Grb Qos */
-      lcCfgInfo->drbQos.grbQosInfo.maxFlowBitRateDl  = 0;
-      lcCfgInfo->drbQos.grbQosInfo.maxFlowBitRateUl  = 0;
-      lcCfgInfo->drbQos.grbQosInfo.guarFlowBitRateDl = 0;
-      lcCfgInfo->drbQos.grbQosInfo.guarFlowBitRateUl = 0;
-
-      /* Filling S-NSSAI */
-      /* TODO :To be filled when UE Context Setup Request is sent from CU */
-      /* Filling UL Logical Channel Config */
-      lcCfgInfo->ulLcCfg.priority = 0;
-      lcCfgInfo->ulLcCfg.lcGroup  = 0;
-      lcCfgInfo->ulLcCfg.schReqId = 0;
-      lcCfgInfo->ulLcCfg.pbr = 0;
-      lcCfgInfo->ulLcCfg.bsd = 0;
-
-      /* Filling DL Logical Channel Config */
-      lcCfgInfo->dlLcCfg.lcp = 0;
-#endif
+
+uint8_t fillMacLcCfgToAddMod(LcCfg *macLcCfgToSend, LcCfg *ueLcCfgDb, LcCfg *oldLcCfg, Bool toUpdate)
+{
+   if(!toUpdate)
+   {
+      if(macLcCfgToSend)
+      {
+         macLcCfgToSend->lcId = ueLcCfgDb->lcId;
+         macLcCfgToSend->configType = ueLcCfgDb->configType;
+
+         if(ueLcCfgDb->drbQos)
+            macLcCfgToSend->drbQos = ueLcCfgDb->drbQos;
+         else if(oldLcCfg)
+            macLcCfgToSend->drbQos = oldLcCfg->drbQos;
+         else
+            macLcCfgToSend->drbQos = NULL;
+
+         if(ueLcCfgDb->snssai)
+            macLcCfgToSend->snssai = ueLcCfgDb->snssai;
+         else if(oldLcCfg)
+            macLcCfgToSend->snssai = oldLcCfg->snssai;
+         else
+            macLcCfgToSend->snssai = NULL;
+
+         macLcCfgToSend->ulLcCfgPres = ueLcCfgDb->ulLcCfgPres;
+         memcpy(&macLcCfgToSend->ulLcCfg, &ueLcCfgDb->ulLcCfg, sizeof(UlLcCfg));
+         memcpy(&macLcCfgToSend->dlLcCfg, &ueLcCfgDb->dlLcCfg, sizeof(DlLcCfg));
+      }
+   }
+   else
+   {
+      oldLcCfg->lcId = ueLcCfgDb->lcId;
+      oldLcCfg->configType = ueLcCfgDb->configType;
+
+      if(ueLcCfgDb->drbQos)
+      {
+         if(oldLcCfg->drbQos)
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->drbQos, sizeof(DrbQosInfo));
+
+         DU_ALLOC_SHRABL_BUF(oldLcCfg->drbQos, sizeof(DrbQosInfo));
+         if(oldLcCfg->drbQos == NULL)
+         {
+            DU_LOG("\nERROR  -->  DU APP : Memory Alloc Failed at fillMacLcCfgToAddMod()");
+            return RFAILED;
+         }
+         memcpy(oldLcCfg->drbQos, ueLcCfgDb->drbQos, sizeof(DrbQosInfo));
+      }
+
+      if(ueLcCfgDb->snssai)
+      {
+         if(oldLcCfg->snssai)
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->snssai, sizeof(Snssai));
+
+         DU_ALLOC_SHRABL_BUF(oldLcCfg->snssai, sizeof(Snssai));
+         if(oldLcCfg->snssai == NULL)
+         {
+            DU_LOG("\nERROR  -->  DU APP : Memory Alloc Failed at fillMacLcCfgToAddMod()");
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->drbQos, sizeof(DrbQosInfo));
+            return RFAILED;
+         }
+         memcpy(oldLcCfg->snssai, ueLcCfgDb->snssai, sizeof(Snssai));
+      }
+
+      oldLcCfg->ulLcCfgPres = ueLcCfgDb->ulLcCfgPres;
+      memcpy(&oldLcCfg->ulLcCfg, &ueLcCfgDb->ulLcCfg, sizeof(UlLcCfg));
+      memcpy(&oldLcCfg->dlLcCfg, &ueLcCfgDb->dlLcCfg, sizeof(DlLcCfg));
+   }
+   return ROK;
+}
+
+/******************************************************************
+ *
+ * @brief Function to copy the Bit rate from ueSetupReqDb
+ *
+ * @details
+ *
+ *    Function : fillAmbr
+ *
+ *    Functionality: Function to copy bit Rate from ueSetupReqDb
+ *
+ * @params[in]  AmbrCfg **macAmbr, AmbrCfg  *ueDbAmbr
+ * @return ROK/RFAILED
+ *
+ *****************************************************************/
+
+uint8_t fillAmbr(AmbrCfg **macAmbrCfgToSend, AmbrCfg *ueDbAmbr, AmbrCfg **oldMacAmbrCfg, Bool toUpdate)
+{
+   if(!toUpdate)
+   {
+      if(ueDbAmbr)
+      {
+         *macAmbrCfgToSend = ueDbAmbr;
+      }
+      else if(oldMacAmbrCfg)
+         *macAmbrCfgToSend = *oldMacAmbrCfg;       
+   }
+   else
+   {
+      if(ueDbAmbr)
+      {
+         if(oldMacAmbrCfg)
+         {
+            if(*oldMacAmbrCfg)
+            {
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, *oldMacAmbrCfg, sizeof(AmbrCfg));
+            }
+            DU_ALLOC_SHRABL_BUF(*oldMacAmbrCfg, sizeof(AmbrCfg));
+            if(*oldMacAmbrCfg == NULLP)
+            {
+               DU_LOG("\nERROR  -->  DU APP : Memory Alloc Failed at fillAmbr()");
+               return RFAILED;
+            }
+            memset(*oldMacAmbrCfg, 0, sizeof(AmbrCfg));
+            (*oldMacAmbrCfg)->ulBr = ueDbAmbr->ulBr;
+         }
+      }
+   }
+
+   return ROK;
+}
+
+/******************************************************************
+ *
+ * @brief Builds and Send UE ReConfig Request to MAC
+ *
+ * @details
+ *
+ *    Function : sendUeReCfgReqToMac
+ *
+ *    Functionality: Builds and Send UE ReConfig Request to MAC
+ *
+ * @Params[in]  MacUeCfg pointer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t sendUeReCfgReqToMac(MacUeCfg *macUeCfg)
+{
+   uint8_t ret = ROK;
+   Pst pst;
+   
+   /* Fill Pst */
+   FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_UE_RECONFIG_REQ);
+   
+   if(macUeCfg)
+   {
+      /* Processing one Ue at a time to MAC */
+      DU_LOG("\nDEBUG   -->  DU_APP: Sending Ue Reconfig Request to MAC");
+      ret = (*packMacUeReconfigReqOpts[pst.selector])(&pst, macUeCfg);
+      if(ret == RFAILED)
+      {
+         DU_LOG("\nERROR  -->  DU APP : Failed to send Reconfig Request to MAC at sendUeReCfgReqToMac()");
+        DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macUeCfg, sizeof(MacUeCfg));
+      }
    }
    else
    {
-      DU_LOG("\n Memory is null for LcCfgList");
+      DU_LOG("\nERROR  -->  DU_APP: Received macUeCfg is NULLP at sendUeReCfgReqToMac()");
+      ret = RFAILED;
    }
+   return ret;
 }
 
+
+
 /******************************************************************
  *
  * @brief Fills MacUeCfg structure
@@ -950,33 +1157,149 @@ void fillLcCfgList(LcCfg *lcCfgInfo)
  *
  *    Functionality: Fills MacUeCfg
  *
+ * @params[in]  cellId, ueId, crnti, 
+ *              DuUeCfg  pointer,
+ *              MacUeCfg pointer
+ * @return ROK/RFAILED
  *
  *****************************************************************/
-void fillMacUeCfg(uint16_t cellId, uint8_t ueIdx,\
-  uint16_t crnti, MacUeCfg *ueCfg)
+uint8_t fillMacUeCfg(uint16_t cellId, uint8_t gnbDuUef1apId, uint16_t crnti, DuUeCfg *ueCfgDb, MacUeCfg *macUeCfg)
 {
-   uint8_t idx;
-   ueCfg->cellId       = cellId;
-   ueCfg->ueIdx        = ueIdx;
-   ueCfg->crnti        = crnti;
-   /* Filling MacCellGroup Config */ 
-   fillMacCellGrpInfo(&ueCfg->macCellGrpCfg);
-   /* Filling PhyCellGroup Config */ 
-   fillPhyCellGrpInfo(&ueCfg->phyCellGrpCfg);
-   /* Filling SpCellGroup Config */ 
-   fillSpCellGrpInfo(&ueCfg->spCellCfg);
-   /* Filling AMBR for UL and DL */ 
-   ueCfg->maxAggrBitRate = NULLP;
-   /* Filling LC Context */
-   ueCfg->numLcs = SRB1_LCID;
-   if(ueCfg->numLcs < MAX_NUM_LC)
+   uint8_t ret = ROK, dbIdx = 0, lcIdx = 0, cellIdx = 0;
+   bool lcIdFound = false;
+   MacUeCfg *duMacDb = NULLP;
+
+   macUeCfg->cellId = cellId;
+   macUeCfg->ueId = gnbDuUef1apId;
+   macUeCfg->crnti = crnti;
+
+   if(!ueCfgDb)
    {
-      for(idx = 0; idx < ueCfg->numLcs; idx++)
-      {   
-        fillLcCfgList(&ueCfg->lcCfgList[idx]);
+      fillDefaultMacCellGrpInfo(macUeCfg);
+      fillDefaultPhyCellGrpInfo(macUeCfg);
+
+      if((fillDefaultSpCellGrpInfo(macUeCfg)) != ROK)
+      {
+         DU_LOG("\nERROR  --> DUAPP : Failed in fillDefaultSpCellGrpInfo");
+         return RFAILED;
       }
+
+      macUeCfg->ambrCfg = NULLP;
+      fillDefaultModulation(macUeCfg);
+      fillMacSrb1LcCfg(&macUeCfg->lcCfgList[0]);
+      macUeCfg->numLcs++;
    }
+   else
+   {
+      if(ueCfgDb->dataTransmissionAction == STOP_TRANSMISSION)
+      {
+         macUeCfg->transmissionAction = ueCfgDb->dataTransmissionAction; 
+         return ROK;
+      }
+      
+      /* Fetching MacDb from DuUeCb.
+       * In case of UE hand-in, UE context is created before RRC setup. Hence
+       * crnti is not known yet. Thus, passing crnti=0 to this function.
+       * In such a case actvCellLst doesnt yet have any entry for this UE. So
+       * duMacDb will be NULL.
+       */
+      
+      if(crnti != 0)
+      {
+         GET_CELL_IDX(cellId, cellIdx);
+         if(duCb.actvCellLst[cellIdx])
+            duMacDb = &duCb.actvCellLst[cellIdx]->ueCb[macUeCfg->ueId-1].macUeCfg;
+         else
+         {
+            DU_LOG("\nERROR  -->  DU APP : Cell Id [%d] does not exist", cellId);
+            return RFAILED;
+         }
+         duMacDb->macUeCfgState = UE_CFG_INPROGRESS;
+      }
+      
+      if(ueCfgDb->cellGrpCfg)
+      {
+         ret = procUeReCfgCellInfo(macUeCfg, duMacDb, ueCfgDb->cellGrpCfg);
+         if(ret == ROK)
+         {
+            if(macUeCfg->spCellCfgPres == true)
+            {
+               if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent)
+               {
+                  fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\
+                        &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL);
+               }
+               if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent)
+               {
+                  fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
+                        NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
+               }
+            }
+
+            if(duMacDb)
+               ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg , &duMacDb->ambrCfg, FALSE);
+            else
+               ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg , NULL, FALSE);
+
+            duFillModulationDetails(macUeCfg, duMacDb, ueCfgDb->ueNrCapability);
+         }
+      }
+      else
+      {
+         fillDefaultMacCellGrpInfo(macUeCfg);
+         fillDefaultPhyCellGrpInfo(macUeCfg);
+         fillDefaultSpCellGrpInfo(macUeCfg);
+         fillDefaultModulation(macUeCfg);
+      }
+
+      /* Filling LC Context */
+      for(dbIdx = 0; (dbIdx < ueCfgDb->numMacLcs && ret == ROK); dbIdx++)
+      {
+         if(!ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres)
+         {
+            /* Filling default UL LC config in MAC if not present */
+            ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres = true;
+            fillDefaultUlLcCfg(&ueCfgDb->macLcCfg[dbIdx].ulLcCfg);
+         }
+
+         if(duMacDb)
+         {
+            for(lcIdx = 0; lcIdx < duMacDb->numLcs; lcIdx++)
+            {
+               if(ueCfgDb->macLcCfg[dbIdx].lcId == duMacDb->lcCfgList[lcIdx].lcId)
+               {
+                  lcIdFound = true;
+                  if((ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_UNKNOWN) ||
+                        (ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_MOD))
+                  {
+                     ueCfgDb->macLcCfg[dbIdx].configType = CONFIG_MOD;
+                     ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx],\
+                           &duMacDb->lcCfgList[lcIdx], FALSE);
+                  }
+               }
+               else
+                  lcIdFound = false;
+            }
+         }
 
+         if(!lcIdFound)
+         {
+            /* ADD/DEL CONFIG */
+            ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx], NULL, FALSE);
+         }
+         if(ret == ROK)
+         {
+            macUeCfg->numLcs++;
+         }
+         else
+         {
+            DU_LOG("\nERROR  -->  DU APP : Failed to add Lc at Idx %d in fillMacUeCfg()", dbIdx); 
+            break;
+         }
+      }/*End of Outer FOR loop */
+      memcpy(&ueCfgDb->copyOfmacUeCfg, macUeCfg, sizeof(MacUeCfg));
+   }
+   return ret;
 }
 
 /******************************************************************
@@ -985,26 +1308,27 @@ void fillMacUeCfg(uint16_t cellId, uint8_t ueIdx,\
  *
  * @details
  *
- *    Function : fillAmInfo
+ *    Function : fillDefaultAmInfo
  *
  *    Functionality: Fills Rlc AM Information
  *
+ * @params[in]  AmBearerCfg *amCfg
+ * @return void
  *
  *****************************************************************/
-void fillAmInfo(AmBearerCfg *amCfg)
+void fillDefaultAmInfo(AmBearerCfg *amCfg)
 {
    /* DL AM */
    amCfg->dlAmCfg.snLenDl     = AM_SIZE_12;
-   amCfg->dlAmCfg.pollRetxTmr = POLL_RETX_TMR_45MS;
-   amCfg->dlAmCfg.pollPdu     = POLL_PDU_TMR_INFINITY;
-   amCfg->dlAmCfg.pollByte    = POLL_BYTES_INFINITY;
-   amCfg->dlAmCfg.maxRetxTh   = RETX_TH_8;   
+   amCfg->dlAmCfg.pollRetxTmr = T_POLL_RETRANSMIT_VAL;
+   amCfg->dlAmCfg.pollPdu     = POLL_PDU_VAL;
+   amCfg->dlAmCfg.pollByte    = POLL_BYTE_VAL;
+   amCfg->dlAmCfg.maxRetxTh   = MAX_RETX_THRESHOLD_VAL;   
  
    /* UL AM */
    amCfg->ulAmCfg.snLenUl     = AM_SIZE_12;
-   amCfg->ulAmCfg.reAssemTmr  = RE_ASM_40MS; 
-   amCfg->ulAmCfg.statProhTmr = PROH_35MS;
-
+   amCfg->ulAmCfg.reAssemTmr  = T_REASSEMBLY_VAL; 
+   amCfg->ulAmCfg.statProhTmr = T_STATUS_PROHIBHIT_VAL;
 }
 
 /******************************************************************
@@ -1013,21 +1337,22 @@ void fillAmInfo(AmBearerCfg *amCfg)
  *
  * @details
  *
- *    Function : fillUmBiDirInfo
+ *    Function : fillDefaultUmBiInfo
  *
  *    Functionality: Fills RLC UM Bi Directional Information
  *
+ * @params[in]  UmBiDirBearerCfg *umBiDirCfg
+ * @return void
  *
  *****************************************************************/
-void fillUmBiDirInfo(UmBiDirBearerCfg *umBiDirCfg)
+void fillDefaultUmBiInfo(UmBiDirBearerCfg *umBiDirCfg)
 {
    /* UL UM BI DIR INFO */
    umBiDirCfg->ulUmCfg.snLenUlUm = UM_SIZE_12;
-   umBiDirCfg->ulUmCfg.reAssemTmr = RE_ASM_40MS;
+   umBiDirCfg->ulUmCfg.reAssemTmr = T_REASSEMBLY_VAL;
 
    /* DL UM BI DIR INFO */
    umBiDirCfg->dlUmCfg.snLenDlUm  = UM_SIZE_12;
-
 }
 
 /******************************************************************
@@ -1036,16 +1361,18 @@ void fillUmBiDirInfo(UmBiDirBearerCfg *umBiDirCfg)
  *
  * @details
  *
- *    Function : fillUmUniDirUlInfo
+ *    Function : fillDefaultUmUlInfo
  *
  *    Functionality: Fills RLC UM Uni Directional Info
  *
+ * @params[in]  UmUniDirUlBearerCfg *UmUlCfg
+ * @return void
  *
  *****************************************************************/
-void fillUmUniDirUlInfo(UmUniDirUlBearerCfg *umUniDirUlCfg)
+void fillDefaultUmUlInfo(UmUniDirUlBearerCfg *UmUlCfg)
 {
-   umUniDirUlCfg->ulUmCfg.snLenUlUm = UM_SIZE_12;
-   umUniDirUlCfg->ulUmCfg.reAssemTmr = RE_ASM_40MS;
+   UmUlCfg->ulUmCfg.snLenUlUm = UM_SIZE_12;
+   UmUlCfg->ulUmCfg.reAssemTmr = T_REASSEMBLY_VAL;
 }
 
 /******************************************************************
@@ -1054,172 +1381,1687 @@ void fillUmUniDirUlInfo(UmUniDirUlBearerCfg *umUniDirUlCfg)
  *
  * @details
  *
- *    Function : fillUmUniDirDlInfo
+ *    Function : fillDefaultUmDlInfo
  *
  *    Functionality: Fills RLC UM Uni Directional DL Info
  *
+ * @params[in]  UmUniDirDlBearerCfg *UmDlCfg
+ * @return void
  *
  *****************************************************************/
-void fillUmUniDirDlInfo(UmUniDirDlBearerCfg *umUniDirDlCfg)
+void fillDefaultUmDlInfo(UmUniDirDlBearerCfg *UmDlCfg)
 {
-   umUniDirDlCfg->dlUmCfg.snLenDlUm  = UM_SIZE_12;
+   UmDlCfg->dlUmCfg.snLenDlUm  = UM_SIZE_12;
 }
 
 /******************************************************************
  *
- * @brief Fills RlcBearerCfg structure
+ * @brief Builds Rlc Mode Default Configuration
  *
  * @details
  *
- *    Function : fillRlcBearerCfg
+ *    Function : fillDefaultRlcModeCfg
  *
- *    Functionality: Fills Rlc Bearer Cfg
+ *    Functionality: Builds Rlc Mode Default Configuration
  *
+ * @params[in]  rlcMode, RlcBearerCfg *lcCfg
+ * @return ROK/RFAILED
  *
  *****************************************************************/
-void fillRlcBearerCfg(uint16_t cellId, uint8_t ueIdx, RlcUeCfg *ueCfg)
+
+uint8_t fillDefaultRlcModeCfg(uint8_t rlcMode, RlcBearerCfg *lcCfg)
 {
-   uint8_t idx;
-   ueCfg->cellId       = cellId;
-   ueCfg->ueIdx        = ueIdx;
-   ueCfg->numLcs       = SRB1_LCID; 
-
-   for(idx = 0; idx < ueCfg->numLcs; idx++)
-   {
-      ueCfg->rlcBearerCfg[idx].rbId         = RB_ID_SRB;
-      ueCfg->rlcBearerCfg[idx].rbType       = RB_TYPE_SRB;
-      ueCfg->rlcBearerCfg[idx].lcId         = SRB1_LCID;
-      ueCfg->rlcBearerCfg[idx].lcType       = LCH_DCCH;
-      ueCfg->rlcBearerCfg[idx].rlcMode      = RLC_AM;
-      switch(ueCfg->rlcBearerCfg[idx].rlcMode)
-      {
-         case RLC_AM:
-           memset(&ueCfg->rlcBearerCfg[idx].u.amCfg, 0, sizeof(AmBearerCfg));
-            fillAmInfo(&ueCfg->rlcBearerCfg[idx].u.amCfg);
-            break;
-         case RLC_UM_BI_DIRECTIONAL:
-           memset(&ueCfg->rlcBearerCfg[idx].u.umBiDirCfg, 0, sizeof(UmBiDirBearerCfg));
-            fillUmBiDirInfo(&ueCfg->rlcBearerCfg[idx].u.umBiDirCfg);
-            break;
-         case RLC_UM_UNI_DIRECTIONAL_UL:
-           memset(&ueCfg->rlcBearerCfg[idx].u.umUniDirUlCfg, 0, sizeof(UmUniDirUlBearerCfg));
-            fillUmUniDirUlInfo(&ueCfg->rlcBearerCfg[idx].u.umUniDirUlCfg);
-            break;
-         case RLC_UM_UNI_DIRECTIONAL_DL:
-           memset(&ueCfg->rlcBearerCfg[idx].u.umUniDirDlCfg, 0, sizeof(UmUniDirDlBearerCfg));
-            fillUmUniDirDlInfo(&ueCfg->rlcBearerCfg[idx].u.umUniDirDlCfg);
-            break;
-         default :
-            DU_LOG("\nDU_APP: Rlc Mode invalid %d", ueCfg->rlcBearerCfg[idx].rlcMode);
-            break;
+   if(lcCfg)
+   {
+      switch(rlcMode)
+      {
+         case RLC_AM :
+            {
+               if(!lcCfg->u.amCfg)
+               {
+                  DU_ALLOC_SHRABL_BUF(lcCfg->u.amCfg, sizeof(AmBearerCfg));
+                  if(lcCfg->u.amCfg)
+                     fillDefaultAmInfo(lcCfg->u.amCfg);
+                  else
+                  {
+                     DU_LOG("\n ERROR  -->  DU APP : Memory Alloc failed at AmCfg at fillDefaultRlcModeCfg()");
+                     return RFAILED;
+                  }
+               }
+               break;
+            }
+         case RLC_UM_BI_DIRECTIONAL :
+            {
+               if(!lcCfg->u.umBiDirCfg)
+               {
+                  DU_ALLOC_SHRABL_BUF(lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
+                  if(lcCfg->u.umBiDirCfg)
+                     fillDefaultUmBiInfo(lcCfg->u.umBiDirCfg);
+                  else
+                  {
+                     DU_LOG("\n ERROR  -->  DU APP : Memory Alloc failed at UmBiDirCfg at fillDefaultRlcModeCfg()");
+                     return RFAILED;
+                  }
+               }
+               break;
+            }
+         case RLC_UM_UNI_DIRECTIONAL_UL :
+            {
+               if(!lcCfg->u.umUniDirUlCfg)
+               {
+                  DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
+                  if(lcCfg->u.umUniDirUlCfg)
+                     fillDefaultUmUlInfo(lcCfg->u.umUniDirUlCfg);
+                  else
+                  {
+                     DU_LOG("\n ERROR  -->  DU APP : Memory Alloc failed at UmUniDirUlCfg at fillDefaultRlcModeCfg()");
+                     return RFAILED;
+                  }
+               }
+               break;
+            }
+         case RLC_UM_UNI_DIRECTIONAL_DL :
+            {
+               if(!lcCfg->u.umUniDirDlCfg)
+               {
+                  DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
+                  if(lcCfg->u.umUniDirDlCfg)
+                     fillDefaultUmDlInfo(lcCfg->u.umUniDirDlCfg);
+                  else
+                  {
+                     DU_LOG("\n ERROR  -->  DU APP : Memory Alloc failed at UmUniDirDlCfg at fillDefaultRlcModeCfg()");
+                     return RFAILED;
+                  }
+               }
+               break;
+            }
+         default:
+            DU_LOG("\nERROR  -->  DUAPP: Invalid rlcMode %d at extractRlcCfgToAddMod()", rlcMode);
+            return RFAILED;
       }
+
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DUAPP: Received LC Config is NULL");
+      return RFAILED;
    }
+   return ROK;
 }
 
-/******************************************************************
+/*******************************************************************
  *
- * @brief creates UE context
+ * @brief Function to fill Rlc Lc Cfg for SRB1
  *
  * @details
  *
- *    Function : duCreateUeCb
- *
- *    Functionality: Creates UE Conetxt
- *
- * @params[in] UeCcchCtxt Pointer
- *             UeIdx Pointer
+ *    Function : fillRlcSrb1LcCfg
  *
- * @return ROK     - success
- *         RFAILED - failure
- * ****************************************************************/
-uint8_t duCreateUeCb(UeCcchCtxt *ueCcchCtxt, uint32_t gnbCuUeF1apId)
-{
-   uint8_t cellIdx = 0;
-   uint8_t ret     = ROK;
-   uint8_t ueIdx;
-
-   for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
-   {
-      if(ueCcchCtxt->cellId == duCb.actvCellLst[cellIdx]->cellId)
-      {
-        GET_UE_IDX(ueCcchCtxt->crnti, ueIdx);
-        DU_LOG("\nDU_APP: Filling UeCb for ueIdx [%d]", ueIdx);
-
-        duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId = ueCcchCtxt->gnbDuUeF1apId;
-        duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId = gnbCuUeF1apId;
-        duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].ueState       = UE_ACTIVE;
+ *    Functionality: 
+ *     Function to fill Rlc Lc Cfg for SRB1
+ * 
+ *  @params[in]     Pointer to RlcBearerCfg
+ *  @return ROK/RFAILED
+ * 
+ *****************************************************************/
 
-        /* Filling Mac Ue Config */ 
-        memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].macUeCfg, 0, sizeof(MacUeCfg));
-         ret = duBuildAndSendUeCreateReqToMac(ueCcchCtxt->cellId, ueIdx, ueCcchCtxt->crnti,\
-                &duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].macUeCfg);
-         if(ret)
-            DU_LOG("\nDU_APP: Failed to send UE create request to MAC");
-         
-        /* Filling Rlc Ue Config */
-         memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].rlcUeCfg, 0, sizeof(RlcUeCfg));
-         ret = duBuildAndSendUeCreateReqToRlc(ueCcchCtxt->cellId, ueIdx, \
-                &duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].rlcUeCfg);
-         if(ret)
-            DU_LOG("\nDU_APP: Failed to send UE create request to RLC");
+uint8_t fillRlcSrb1LcCfg(RlcBearerCfg *rlcLcCfg)
+{
+   uint8_t ret = ROK;
 
-        duCb.actvCellLst[cellIdx]->numActvUes++;
-        memset(ueCcchCtxt, 0, sizeof(UeCcchCtxt));
-      }
-   }
+   rlcLcCfg->rbId   = SRB1_LCID;
+   rlcLcCfg->rbType = RB_TYPE_SRB;
+   rlcLcCfg->lcId   = SRB1_LCID;
+   rlcLcCfg->lcType = LCH_DCCH;
+   rlcLcCfg->rlcMode = RLC_AM;
+   rlcLcCfg->configType = CONFIG_ADD;
+   ret = fillDefaultRlcModeCfg(rlcLcCfg->rlcMode, rlcLcCfg);
+   rlcLcCfg->isLcAddModRspSent = true;
    return ret;
 }
 
-/******************************************************************
+/*******************************************************************
  *
- * @brief Builds and Send UE Create Request to MAC
+ * @brief Processes UE ReConfig Req to RLC UL
  *
  * @details
  *
- *    Function : duBuildAndSendUeCreateReqToMac
- *
- *    Functionality: Builds and Send UE Create Request to MAC
- *
- * @Params[in]  cellId,
- *              ueIdx
- * @return ROK     - success
- *         RFAILED - failure
+ *    Function : sendUeReCfgReqToRlc
  *
- * ****************************************************************/
+ *    Functionality: 
+ *     Processes UE Reconfig Req to RLC UL
+ * 
+ *  @params[in]     Pointer to RlcUeCfg
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
 
-uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t ueIdx,\
-   uint16_t crnti, MacUeCfg *duMacUeCfg)
+uint8_t sendUeReCfgReqToRlc(RlcUeCfg *rlcUeCfg)
 {
-   uint8_t ret = ROK;
-   MacUeCfg *macUeCfg = NULLP;
+   uint8_t ret;
    Pst pst;
+   
+   FILL_PST_DUAPP_TO_RLC(pst, RLC_UL_INST, EVENT_RLC_UE_RECONFIG_REQ);
+   if(rlcUeCfg)
+   {
+      /* Processing one Ue at a time to RLC */
+      DU_LOG("\nDEBUG   -->  DU_APP: Sending Ue Reconfig Request to RLC UL");
+      ret = (*packRlcUeReconfigReqOpts[pst.selector])(&pst, rlcUeCfg);
+      if(ret == RFAILED)
+      {
+         DU_LOG("\nERROR  -->  DU_APP : Failed to send Ue Reconfig Req to RLC at sendUeReCfgReqToRlc()");
+         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rlcUeCfg, sizeof(RlcUeCfg));
+      }
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->   DU_APP: Received RlcUeCfg is NULL at sendUeReCfgReqToRlc()");
+      ret = RFAILED;
+   }
+   return ret;
+}
+
+/******************************************************************
+ *
+ * @brief Fills Snssai information
+ *
+ * @details
+ *
+ *    Function : fillSnssaiInfo
+ *
+ *    Functionality: Fills Snssai information
+ *
+ *  @params[in]    LcCfg *snssaiTobeSend, LcCfg *snssaiDb, LcCfg *oldSnssai,
+ *  Bool toUpdateg
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+uint8_t fillSnssaiInfo(Snssai *snssaiTobeSend, Snssai *snssaiDb, Snssai **oldSnssai, Bool toUpdate)
+{
+   if(!toUpdate)
+   {
+      if(snssaiDb)
+         snssaiTobeSend = snssaiDb;
+      else if(oldSnssai)
+         snssaiTobeSend = *oldSnssai;
+      else
+         snssaiTobeSend = NULL;
+   }
+   else
+   {
+      if(snssaiDb)
+      {
+         if(*oldSnssai)
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, *oldSnssai, sizeof(Snssai));
+
+         DU_ALLOC_SHRABL_BUF(*oldSnssai, sizeof(Snssai));
+         if(*oldSnssai == NULL)
+         {
+            DU_LOG("\nERROR  -->  DU APP : Memory Alloc Failed at fillSnssaiInfo()");
+            return RFAILED;
+         }
+         memcpy(*oldSnssai, snssaiDb, sizeof(Snssai));
+      }
+   }
+   return ROK;
+}
+/******************************************************************
+ *
+ * @brief Fills RlcBearerCfg structure
+ *
+ * @details
+ *
+ *    Function : fillRlcUeCfg
+ *
+ *    Functionality: Fills Rlc Bearer Cfg
+ *
+ *
+ *****************************************************************/
+uint8_t fillRlcUeCfg(uint16_t cellId, uint8_t ueId, DuUeCfg *ueCfgDb, RlcUeCfg *rlcUeCfg)
+{
+   uint8_t ret, dbIdx, lcIdx, cellIdx;
+   bool lcIdFound = false;
+   RlcUeCfg *duRlcDb = NULLP;
+
+   ret = ROK;
+   if(!ueCfgDb)
+   {
+      /* Initial RB being Added */ 
+      rlcUeCfg->cellId       = cellId;
+      rlcUeCfg->ueId         = ueId;
+      ret = fillRlcSrb1LcCfg(&rlcUeCfg->rlcLcCfg[0]);
+      if(ret == ROK)
+         rlcUeCfg->numLcs++;
+      else
+         memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
+   }
+   else
+   {
+      /* Fetch RlcDb from DuUeCb */ 
+      GET_CELL_IDX(cellId, cellIdx);
+      duRlcDb = &duCb.actvCellLst[cellIdx]->ueCb[ueId-1].rlcUeCfg;
+      duRlcDb->rlcUeCfgState = UE_CFG_INPROGRESS;
+      /*Filling RlcUeCfg */
+      rlcUeCfg->cellId       = cellId;
+      rlcUeCfg->ueId         = ueId;
+
+      for(dbIdx = 0; (dbIdx < ueCfgDb->numRlcLcs && ret == ROK); dbIdx++)
+      {
+         ret = fillDefaultRlcModeCfg(ueCfgDb->rlcLcCfg[dbIdx].rlcMode, &ueCfgDb->rlcLcCfg[dbIdx]);
+         if(ret == RFAILED)
+         {
+            DU_LOG("\n ERROR  -->  DU APP : Failed to fill Rlc Mode at fillRlcUeCfg()");
+            memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
+            return ret;
+         }
+         /* Fill Rlc Ue Cfg List for ADD/MOD/DEL */
+         for(lcIdx = 0; lcIdx < duRlcDb->numLcs; lcIdx++)
+         { 
+            if(ueCfgDb->rlcLcCfg[dbIdx].lcId == duRlcDb->rlcLcCfg[lcIdx].lcId)
+            {
+               lcIdFound = true;
+               if((ueCfgDb->rlcLcCfg[dbIdx].configType == CONFIG_UNKNOWN)||
+                     (ueCfgDb->rlcLcCfg[dbIdx].configType == CONFIG_MOD))
+               {
+                  /* MOD */ 
+                  ueCfgDb->rlcLcCfg[dbIdx].configType = CONFIG_MOD; /* update Db for MOD type */
+                  memcpy(&rlcUeCfg->rlcLcCfg[dbIdx], &ueCfgDb->rlcLcCfg[dbIdx], sizeof(RlcBearerCfg));
+                  fillSnssaiInfo(rlcUeCfg->rlcLcCfg[dbIdx].snssai, ueCfgDb->rlcLcCfg[dbIdx].snssai,\
+                  &duRlcDb->rlcLcCfg[lcIdx].snssai,false);
+               }
+            }
+            else
+               lcIdFound = false;
+         }
+         if(!lcIdFound)
+         {
+            /* ADD/ DEL Config Type */
+            memcpy(&rlcUeCfg->rlcLcCfg[dbIdx], &ueCfgDb->rlcLcCfg[dbIdx], sizeof(RlcBearerCfg));
+            fillSnssaiInfo(rlcUeCfg->rlcLcCfg[dbIdx].snssai, ueCfgDb->rlcLcCfg[dbIdx].snssai, NULL, false);
+         }
+         rlcUeCfg->numLcs++;
+      }
+   }
+   return ret;
+}
+
+/******************************************************************
+ *
+ * @brief creates UE context
+ *
+ * @details
+ *
+ *    Function : duCreateUeCb
+ *
+ *    Functionality: Creates UE Conetxt
+ *
+ * @params[in] UeCcchCtxt Pointer
+ *             UeIdx Pointer
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ * ****************************************************************/
+uint8_t duCreateUeCb(UeCcchCtxt *ueCcchCtxt, uint32_t gnbCuUeF1apId)
+{
+   uint8_t cellIdx = 0;
+   uint8_t ret     = ROK;
+   uint8_t ueId = 0, ueIdx = 0;
+
+   for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
+   {
+      if(duCb.actvCellLst[cellIdx] && (ueCcchCtxt->cellId == duCb.actvCellLst[cellIdx]->cellId))
+      {
+         GET_UE_ID(ueCcchCtxt->crnti, ueId);
+         DU_LOG("\nDEBUG   -->  DU_APP: Filling UeCb for ueId [%d]", ueId);
+
+         ueIdx = ueId-1;
+         duCb.actvCellLst[cellIdx]->ueCb[ueIdx].f1UeDb        = NULLP;
+         duCb.actvCellLst[cellIdx]->ueCb[ueIdx].crnti         = ueCcchCtxt->crnti;
+         duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId = ueCcchCtxt->gnbDuUeF1apId;
+         duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId = gnbCuUeF1apId;
+         duCb.actvCellLst[cellIdx]->ueCb[ueIdx].drbBitMap     = NULLP;
+         duCb.actvCellLst[cellIdx]->ueCb[ueIdx].ueState       = UE_ACTIVE;
+
+         /* Filling Mac Ue Config */ 
+         memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx].macUeCfg, 0, sizeof(MacUeCfg));
+         ret = duBuildAndSendUeCreateReqToMac(ueCcchCtxt->cellId, ueCcchCtxt->gnbDuUeF1apId, ueCcchCtxt->crnti, NULL, 
+               &duCb.actvCellLst[cellIdx]->ueCb[ueIdx].macUeCfg);
+         if(ret == RFAILED)
+            DU_LOG("\nERROR  -->  DU APP : Failed to send UE create request to MAC");
+
+         /* Filling Rlc Ue Config */
+         memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg, 0, sizeof(RlcUeCfg));
+         ret = duBuildAndSendUeCreateReqToRlc(ueCcchCtxt->cellId, ueId, \
+               &duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg);
+         if(ret == RFAILED)
+            DU_LOG("\nERROR  -->  DU APP : Failed to send UE create request to RLC");
+
+         duCb.actvCellLst[cellIdx]->numActvUes++;
+         memset(ueCcchCtxt, 0, sizeof(UeCcchCtxt));
+         duCb.numUe--;
+      }
+   }
+   return ret;
+}
+
+/******************************************************************
+ *
+ * @brief Builds and Send UE Create Request to MAC
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendUeCreateReqToMac
+ *
+ *    Functionality: Builds and Send UE Create Request to MAC
+ *
+ * @Params[in]  cellId,
+ *              ueId,
+ *              crnti,
+ *              UE config extracted from F1AP msg
+ *              MAC UE config struct to be filled
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t gnbDuUeF1apId, uint16_t crnti, DuUeCfg *ueCfgDb, MacUeCfg *duMacUeCfg)
+{
+   uint8_t  ret = ROK;
+   MacUeCfg *macUeCfg = NULLP;
+   Pst       pst;
    memset(&pst, 0, sizeof(Pst));
 
-   fillMacUeCfg(cellId, ueIdx, crnti, duMacUeCfg);
 
-   /* Fill Pst */
-   FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_UE_CREATE_REQ);
+   ret = fillMacUeCfg(cellId, gnbDuUeF1apId, crnti, ueCfgDb, duMacUeCfg);
+   if(ret == RFAILED)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Failed to fill MacUeCfg at duBuildAndSendUeCreateReqToMac()");
+      return RFAILED;
+   }
+
+   /* Fill Pst */
+   FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_UE_CREATE_REQ);
+
+   /* Copying ueCb to a sharable buffer */
+   DU_ALLOC_SHRABL_BUF(macUeCfg, sizeof(MacUeCfg));
+   if(macUeCfg)
+   {
+      memset(macUeCfg, 0, sizeof(MacUeCfg));
+      memcpy(macUeCfg, duMacUeCfg, sizeof(MacUeCfg));
+      DU_LOG("\nDEBUG   -->  DU_APP: Sending UE create request to MAC");
+
+      /* Processing one Ue at a time to MAC */
+      ret = (*packMacUeCreateReqOpts[pst.selector])(&pst, macUeCfg);
+      if(ret == RFAILED)
+      {
+         DU_LOG("\nERROR  -->  DU_APP : Failure in sending Ue Create Req to MAC at duBuildAndSendUeCreateReqToMac()");
+         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macUeCfg, sizeof(MacUeCfg));
+      }
+   }
+   else
+   {
+      DU_LOG("\n ERROR  -->  DU APP : Memory alloc failed at duBuildAndSendUeCreateReqToMac()");
+      ret = RFAILED;
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief To update DuUeCb Mac Cfg
+ *
+ * @details
+ *
+ *    Function : duUpdateMacCfg
+ *    Functionality:  update DuUeCb MAC Cfg
+ *
+ * @params[in] DuUeCb Pointer
+ *             F1UeContextSetupDb pointer 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) 
+{
+   uint8_t ret, lcIdx, dbIdx, numLcs, lcDelIdx, cellIdx;
+   MacUeCfg *oldMacUeCfg;
+   ret = ROK;
+   
+   GET_CELL_IDX(macUeCfg->cellId, cellIdx);
+   if(duCb.actvCellLst[cellIdx] == NULLP)
+   {
+      DU_LOG("\nERROR  --> DU APP: CellId[%d] not found", macUeCfg->cellId);
+      return RFAILED;
+   }
+   oldMacUeCfg = &duCb.actvCellLst[cellIdx]->ueCb[macUeCfg->ueId-1].macUeCfg;
+
+   /*Filling Cell Group Cfg*/
+   ret =  procUeReCfgCellInfo(macUeCfg, &f1UeDb->duUeCfg.copyOfmacUeCfg, f1UeDb->duUeCfg.cellGrpCfg);
+   if(ret == ROK)
+   {
+      if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent)
+      {
+         fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\
+              &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL);
+      }
+      if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent)
+      {
+         fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
+              NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
+      }
+      ret = fillAmbr(NULL, f1UeDb->duUeCfg.ambrCfg, &oldMacUeCfg->ambrCfg, true);
+      duFillModulationDetails(macUeCfg, oldMacUeCfg, f1UeDb->duUeCfg.ueNrCapability);
+   }
+
+   /* Filling LC Context */
+   for(dbIdx = 0; (dbIdx < f1UeDb->duUeCfg.numMacLcs && ret == ROK); dbIdx++)
+   {
+      numLcs = macUeCfg->numLcs;
+      for(lcIdx = 0; lcIdx < numLcs; lcIdx++)
+      {
+        if(f1UeDb->duUeCfg.macLcCfg[dbIdx].lcId ==  macUeCfg->lcCfgList[lcIdx].lcId)
+        {
+           if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_MOD)
+           {
+              ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[lcIdx], true);
+           }
+           else if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_DEL)
+           {
+              /* Free memory at matched  lcIdx index */
+              freeMacLcCfg(&macUeCfg->lcCfgList[lcIdx]);
+              macUeCfg->numLcs--;
+              for(lcDelIdx = lcIdx; lcDelIdx < macUeCfg->numLcs; lcDelIdx++)
+              {
+                 /* moving all elements one index ahead */
+                 ret = fillMacLcCfgToAddMod(NULL,  &macUeCfg->lcCfgList[lcDelIdx+1], &macUeCfg->lcCfgList[lcDelIdx], true);
+                 freeMacLcCfg(&macUeCfg->lcCfgList[lcDelIdx+1]);
+                 if(ret == RFAILED)
+                 {
+                     DU_LOG("\nERROR  -->  DU APP : Failed to delete LC at Idx %d in duUpdateMacCfg()", lcDelIdx);
+                    break;
+                 }
+              }
+           }
+        }
+      } 
+      if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_ADD)
+      {
+        ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[numLcs], true);
+        if(ret == RFAILED)
+        {
+           DU_LOG("\nERROR  -->  DU APP : Failed to add LC at Idx %d in duUpdateMacCfg()", numLcs);
+           break;
+        }
+        macUeCfg->numLcs++;
+      }
+               
+   }
+   return ret;
+}
+
+/******************************************************************
+ *
+ * @brief Function to fill the RLC Lc cfg from ueSetupReqDb
+ *
+ * @details
+ *
+ *    Function : fillRlcCfgToAddMod
+ *
+ *    Functionality: Function to fill the RLC Lc cfg from ueSetupReqDb
+ *
+ *
+ *****************************************************************/
+
+uint8_t fillRlcCfgToAddMod(RlcBearerCfg *lcCfg, RlcBearerCfg *f1UeDbLcCfg)
+{
+   lcCfg->configType = f1UeDbLcCfg->configType;
+   lcCfg->rbId       = f1UeDbLcCfg->rbId;
+   lcCfg->rbType     = f1UeDbLcCfg->rbType;
+   lcCfg->lcId       = f1UeDbLcCfg->lcId;
+   lcCfg->lcType     = f1UeDbLcCfg->lcType;
+   lcCfg->rlcMode    = f1UeDbLcCfg->rlcMode;
+   
+   switch(lcCfg->rlcMode)
+   {
+      case RLC_AM :
+         {
+            if(!lcCfg->u.amCfg)
+            {
+               DU_ALLOC_SHRABL_BUF(lcCfg->u.amCfg, sizeof(AmBearerCfg));
+               if(!lcCfg->u.amCfg)
+                  return RFAILED;
+            }
+            /* DL AM */
+            lcCfg->u.amCfg->dlAmCfg.snLenDl     = f1UeDbLcCfg->u.amCfg->dlAmCfg.snLenDl;    
+            lcCfg->u.amCfg->dlAmCfg.pollRetxTmr = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollRetxTmr;
+            lcCfg->u.amCfg->dlAmCfg.pollPdu     = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollPdu;
+            lcCfg->u.amCfg->dlAmCfg.pollByte    = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollByte;   
+            lcCfg->u.amCfg->dlAmCfg.maxRetxTh   = f1UeDbLcCfg->u.amCfg->dlAmCfg.maxRetxTh;   
+
+            /* UL AM */
+            lcCfg->u.amCfg->ulAmCfg.snLenUl     = f1UeDbLcCfg->u.amCfg->ulAmCfg.snLenUl;
+            lcCfg->u.amCfg->ulAmCfg.reAssemTmr  = f1UeDbLcCfg->u.amCfg->ulAmCfg.reAssemTmr; 
+            lcCfg->u.amCfg->ulAmCfg.statProhTmr = f1UeDbLcCfg->u.amCfg->ulAmCfg.statProhTmr;
+            break;
+         }
+      case RLC_UM_BI_DIRECTIONAL :
+         {
+            if(!lcCfg->u.umBiDirCfg)
+            {
+               DU_ALLOC_SHRABL_BUF(lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
+               if(!lcCfg->u.umBiDirCfg)
+                  return RFAILED;
+            }
+            /* UL UM BI DIR INFO */
+            lcCfg->u.umBiDirCfg->ulUmCfg.snLenUlUm  = f1UeDbLcCfg->u.umBiDirCfg->ulUmCfg.snLenUlUm;  
+            lcCfg->u.umBiDirCfg->ulUmCfg.reAssemTmr = f1UeDbLcCfg->u.umBiDirCfg->ulUmCfg.reAssemTmr;
+            /* DL UM BI DIR INFO */
+            lcCfg->u.umBiDirCfg->dlUmCfg.snLenDlUm  = f1UeDbLcCfg->u.umBiDirCfg->dlUmCfg.snLenDlUm;
+            break;
+         }
+      case RLC_UM_UNI_DIRECTIONAL_UL :
+         {
+            if(!lcCfg->u.umUniDirUlCfg)
+            {
+               DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
+               if(!lcCfg->u.umUniDirUlCfg)
+                  return RFAILED;
+            }
+            lcCfg->u.umUniDirUlCfg->ulUmCfg.snLenUlUm  = f1UeDbLcCfg->u.umUniDirUlCfg->ulUmCfg.snLenUlUm;  
+            lcCfg->u.umUniDirUlCfg->ulUmCfg.reAssemTmr = f1UeDbLcCfg->u.umUniDirUlCfg->ulUmCfg.reAssemTmr;
+            break;
+
+         }
+      case RLC_UM_UNI_DIRECTIONAL_DL :
+         {
+            if(!lcCfg->u.umUniDirDlCfg)
+            {
+               DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
+               if(!lcCfg->u.umUniDirDlCfg)
+                  return RFAILED;
+            }
+            lcCfg->u.umUniDirDlCfg->dlUmCfg.snLenDlUm  = f1UeDbLcCfg->u.umUniDirDlCfg->dlUmCfg.snLenDlUm;
+            break;
+         }
+      default:
+         DU_LOG("\nERROR  -->  DU_APP: Invalid Rlc Mode %d at fillRlcCfgToAddMod()", lcCfg->rlcMode);
+         return RFAILED;
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief To update DuUeCb Rlc Lc Cfg
+ *
+ * @details
+ *
+ *    Function : duUpdateRlcLcCfg
+ *    Functionality:  update DuUeCb Rlc Lc Cfg
+ *
+ * @params[in] DuUeCb Pointer
+ *             F1UeContextSetupDb pointer 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duUpdateRlcLcCfg(RlcUeCfg *rlcUeCfg, F1UeContextSetupDb *f1UeDb)
+{
+   uint8_t ret, lcIdx, dbIdx, numLcs, lcDelIdx;
+
+   ret = ROK;
+   for(dbIdx = 0; (dbIdx < f1UeDb->duUeCfg.numRlcLcs && ret ==ROK); dbIdx++)
+   {
+      numLcs = rlcUeCfg->numLcs;
+      for(lcIdx = 0; lcIdx < numLcs; lcIdx++)
+      {
+         if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].lcId == rlcUeCfg->rlcLcCfg[lcIdx].lcId)
+         {
+            if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_MOD)
+            {
+               ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcIdx], &f1UeDb->duUeCfg.rlcLcCfg[dbIdx]);
+               if(ret == RFAILED)
+               {
+                  DU_LOG("\nERROR  -->  DU APP : Failed to modify LC at Idx %d in duUpdateRlcCfg()", lcDelIdx);
+                  break;
+               }
+               fillSnssaiInfo(NULL, f1UeDb->duUeCfg.rlcLcCfg[dbIdx].snssai, &rlcUeCfg->rlcLcCfg[lcIdx].snssai, true);
+            }
+            else if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_DEL)
+            {
+               /* Free memory at matched lcIdx index */
+               freeRlcLcCfg(&rlcUeCfg->rlcLcCfg[lcIdx]);
+               rlcUeCfg->numLcs--;
+               for(lcDelIdx = lcIdx; lcDelIdx < rlcUeCfg->numLcs; lcDelIdx++)
+               {
+                  ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcDelIdx], &rlcUeCfg->rlcLcCfg[lcDelIdx+1]);
+                  fillSnssaiInfo(NULL, rlcUeCfg->rlcLcCfg[lcDelIdx+1].snssai, &rlcUeCfg->rlcLcCfg[lcDelIdx].snssai,\
+                  true);
+                  freeRlcLcCfg(&rlcUeCfg->rlcLcCfg[lcDelIdx+1]);
+                  if(ret == RFAILED)
+                  {
+                     DU_LOG("\nERROR  -->  DU APP : Failed to delete LC at Idx %d in duUpdateRlcCfg()", lcDelIdx);
+                     break;
+                  }
+               }
+            }
+         }
+      }
+      if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_ADD)
+      {
+         ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcIdx], &f1UeDb->duUeCfg.rlcLcCfg[dbIdx]);
+         if(ret == ROK)
+         {    
+            fillSnssaiInfo(NULL, f1UeDb->duUeCfg.rlcLcCfg[dbIdx].snssai, &rlcUeCfg->rlcLcCfg[ rlcUeCfg->numLcs].snssai,\
+                  true);
+            rlcUeCfg->numLcs++;
+         }
+      }
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Function to fill Tunnel Config to Add/Mod
+ * 
+ *
+ * @details
+ *
+ *    Function : fillTnlCfgToAddMod
+ *
+ *    Functionality: Function to fill tunnel Config to Add/Mod
+ *
+ * @params[in] Pointer to tnlCfgDb,
+ *             pointer to f1TnlCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillTnlCfgToAddMod(UpTnlCfg **ueCbTnlCfg, UpTnlCfg *f1TnlCfg)
+{
+   if(*ueCbTnlCfg)
+   {
+      DU_FREE((*ueCbTnlCfg)->tnlCfg1, sizeof(GtpTnlCfg));
+      DU_FREE(*ueCbTnlCfg, sizeof(UpTnlCfg));
+   }
+
+   if(*ueCbTnlCfg == NULLP)
+   {
+      /* copying to DuCb Tnl Cfg */
+      DU_ALLOC(*ueCbTnlCfg, sizeof(UpTnlCfg));
+      if(*ueCbTnlCfg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  DU_APP : fillTnlCfgToAddMod: Memory Alloc failed for drbId[%d]", f1TnlCfg->drbId);
+         return RFAILED;
+      }
+   }
+   memset(*ueCbTnlCfg, 0, sizeof(UpTnlCfg));
+   (*ueCbTnlCfg)->configType = f1TnlCfg->configType;
+   (*ueCbTnlCfg)->cellId    = f1TnlCfg->cellId;
+   (*ueCbTnlCfg)->ueId      = f1TnlCfg->ueId;
+   (*ueCbTnlCfg)->drbId     = f1TnlCfg->drbId;
+   if(f1TnlCfg->tnlCfg1)
+   {
+      if((*ueCbTnlCfg)->tnlCfg1 == NULLP)
+      {
+         DU_ALLOC((*ueCbTnlCfg)->tnlCfg1, sizeof(GtpTnlCfg));
+         if((*ueCbTnlCfg)->tnlCfg1 == NULLP)
+         {
+            DU_LOG("\nERROR  -->  DU_APP : fillTnlCfgToAddMod: Memory Alloc failed for tnlCfg1 for drbId[%d]", f1TnlCfg->drbId);
+            return RFAILED;
+         }
+      }
+      memset((*ueCbTnlCfg)->tnlCfg1, 0, sizeof(GtpTnlCfg));
+      (*ueCbTnlCfg)->tnlCfg1->teId = f1TnlCfg->tnlCfg1->teId;
+      (*ueCbTnlCfg)->tnlCfg1->ulTnlAddress = f1TnlCfg->tnlCfg1->ulTnlAddress;
+      (*ueCbTnlCfg)->tnlCfg1->dlTnlAddress = f1TnlCfg->tnlCfg1->dlTnlAddress;
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Processing the tunnel Request to EGTP
+ *        
+ * @details
+ *
+ *    Function : duProcEgtpTunnelCfg
+ *
+ *    Functionality: Processing the tunnel Request to EGTP
+ *
+ * @params[in] UptnlCfg *duTnlCfg, UpTnlCfg *f1TnlCfg 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duProcEgtpTunnelCfg(uint8_t ueCbIdx, UpTnlCfg *duTnlCfg, UpTnlCfg *f1TnlCfg)
+{
+   uint8_t ret = RFAILED, delIdx;
+
+   if(f1TnlCfg->tnlCfg1 == NULLP)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Tunnel config not found");
+      return ret;
+   }
+
+   if(f1TnlCfg->configType == CONFIG_ADD)
+   {
+      if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_ADD, NULLP, f1TnlCfg->tnlCfg1) == ROK)
+      {
+         if(fillTnlCfgToAddMod(&duCb.upTnlCfg[duCb.numTeId], f1TnlCfg) == ROK)
+         {
+            duCb.numTeId++;
+            ret = ROK;
+         }
+      }      
+   }
+   else if(f1TnlCfg->configType == CONFIG_MOD)
+   {
+      if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_MOD, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK)
+      {
+         if(fillTnlCfgToAddMod(&duTnlCfg, f1TnlCfg) == ROK)
+         {
+            ret = ROK;
+         }
+      }   
+   }
+   else if(f1TnlCfg->configType == CONFIG_DEL)
+   {
+      if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_DEL, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK)
+      {           
+         /* Free memory at drbIdx */
+         duCb.numTeId--;
+         for(delIdx = ueCbIdx; delIdx < duCb.numTeId; delIdx++)
+         {
+            /* moving all elements one index ahead */
+            ret = fillTnlCfgToAddMod(&duCb.upTnlCfg[delIdx], duCb.upTnlCfg[delIdx+1]);
+            if(ret != ROK)
+            {
+               return ret;
+            }
+         }
+         if(duCb.upTnlCfg[delIdx])
+         {
+            DU_FREE(duCb.upTnlCfg[delIdx]->tnlCfg1, sizeof(GtpTnlCfg));
+            DU_FREE(duCb.upTnlCfg[delIdx], sizeof(UpTnlCfg));
+         }
+      }   
+   }
+   return ret;
+}
+
+/***********************************************************************
+ *
+ * @brief Function to fill Tunnel Config
+ *        and sends tunnel Req to EGTP
+ * 
+ *
+ * @details
+ *
+ *    Function : duUpdateTunnelCfgDb
+ *
+ *    Functionality: Function to fill tunnel Config
+ *                   and sends tunnel Cfg Req to EGTP
+ *
+ * @params[in] ueId, cellId, DuUeCfg 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duUpdateTunnelCfgDb(uint8_t ueId, uint8_t cellId, DuUeCfg *duUeCfg)
+{
+   uint8_t ret = ROK, drbIdx, teIdx;
+   bool drbFound = false;
+
+   /*If Add/Mod tunnels request for that DRB is successful in EGTP */
+   /*then update drbId and tunnel Info in duCb */
+   for(drbIdx=0; drbIdx < duUeCfg->numDrb; drbIdx++)
+   {
+      duUeCfg->upTnlInfo[drbIdx].cellId = cellId;
+      duUeCfg->upTnlInfo[drbIdx].ueId = ueId;
+      for(teIdx = 0; teIdx < duCb.numTeId; teIdx++)
+      {
+         if((duCb.upTnlCfg[teIdx]->ueId == duUeCfg->upTnlInfo[drbIdx].ueId) && \
+            (duCb.upTnlCfg[teIdx]->drbId == duUeCfg->upTnlInfo[drbIdx].drbId))
+         {
+            drbFound = true; /* existing DRB */
+            if(duProcEgtpTunnelCfg(teIdx, duCb.upTnlCfg[teIdx], &duUeCfg->upTnlInfo[drbIdx]) != ROK)
+            {
+               DU_LOG("\nERROR  -> DU_APP : duUpdateTunnelCfgDb: Failed to modify tunnel req for Drb id[%d]",
+                     duUeCfg->upTnlInfo[drbIdx].drbId);
+               ret = RFAILED;
+            }
+            break;
+         }
+         else
+            drbFound = false;
+      }
+
+      if(!drbFound && ret == ROK)/* new DRB to Add */
+      {
+         if(duProcEgtpTunnelCfg(NULLP, NULLP, &duUeCfg->upTnlInfo[drbIdx]) != ROK)
+         {
+            DU_LOG("\nERROR  -> DU_APP : duUpdateTunnelCfgDb: Failed to add tunnel req for Drb id[%d]",
+                  duUeCfg->upTnlInfo[drbIdx].drbId);
+            ret = RFAILED;
+            break;
+         }
+      }
+      else
+         break;
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief @brief To update DuUeCb Mac and Rlc Ue Cfg
+ * 
+ *
+ * @details
+ *
+ *    Function : duUpdateDuUeCbCfg
+ *
+ *    Functionality: update DuUeCb Mac and Rlc Ue Cfg
+ *
+ * @params[in] ueId, cellIdx 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duUpdateDuUeCbCfg(uint8_t ueId, uint8_t cellId)
+{
+   uint8_t ret = ROK, cellIdx = 0, crnti=0;
+   DuUeCb *ueCb = NULLP;
+
+   GET_CELL_IDX(cellId, cellIdx);
+   
+   if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[ueId-1].macUeCfg.macUeCfgState == UE_RECFG_COMPLETE) &&
+      (duCb.actvCellLst[cellIdx]->ueCb[ueId-1].rlcUeCfg.rlcUeCfgState == UE_RECFG_COMPLETE))
+   {
+      ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueId-1];
+
+      /*Filling RLC Ue Cfg */
+      ueCb->rlcUeCfg.cellId = cellId;
+      ueCb->rlcUeCfg.ueId   = ueId;
+      ret = duUpdateRlcLcCfg(&ueCb->rlcUeCfg, ueCb->f1UeDb);
+      if(ret == ROK)
+      {
+         /*Filling MAC Ue Cfg */
+         GET_CRNTI(crnti, ueId);
+         ueCb->macUeCfg.cellId = cellId;
+         ueCb->macUeCfg.ueId  = ueId;
+         ueCb->macUeCfg.crnti  = crnti;
+         ret = duUpdateMacCfg(&ueCb->macUeCfg, ueCb->f1UeDb);
+         if(ret == RFAILED)
+            DU_LOG("\nERROR  -->  DU APP : Failed while updating MAC LC Config at duUpdateDuUeCbCfg()");
+         else
+        {
+           if(duUpdateTunnelCfgDb(ueId, cellId, &ueCb->f1UeDb->duUeCfg) != ROK)
+           {
+               DU_LOG("\nERROR  -->  DU_APP : Failed to establish tunnel in duUpdateDuUeCbCfg()");
+                   return RFAILED;
+           }
+        }
+      }
+      else
+         DU_LOG("\nERROR  -->  DU APP : Failed while updating RLC LC Config at duUpdateDuUeCbCfg()");
+   }
+   else
+      ret = RFAILED;
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Handle UE config response from MAC
+ *
+ * @details
+ *
+ *    Function : DuProcMacUeCfgRsp
+ *
+ *    Functionality: Handle UE Config response from MAC
+ *
+ * @params[in] Pointer to MacUeCfgRsp and Pst 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp)
+{
+   uint8_t ret = ROK;
+   uint16_t cellIdx;
+
+   if(cfgRsp)
+   {
+      GET_CELL_IDX(cfgRsp->cellId, cellIdx);
+      if(cfgRsp->result == MAC_DU_APP_RSP_OK)
+      {
+         if(pst->event == EVENT_MAC_UE_CREATE_RSP)
+         {
+            DU_LOG("\nINFO   -->  DU APP : MAC UE Create Response : SUCCESS [DU UE F1AP ID : %d]", cfgRsp->ueId);
+
+            if(duCb.actvCellLst[cellIdx] && 
+                  (duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].gnbDuUeF1apId == cfgRsp->ueId))
+            {
+               duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState = UE_CREATE_COMPLETE;
+
+               /* TODO : IF UE state is HANDIN_IN_PROGRESS, then send UE Context Setup Response */
+            }
+         }
+         else if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
+         {
+            DU_LOG("\nINFO   -->  DU APP : MAC UE Reconfig Response : SUCCESS [DU UE F1AP ID : %d]", cfgRsp->ueId);
+            if(duCb.actvCellLst[cellIdx] && 
+                  (duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].gnbDuUeF1apId == cfgRsp->ueId))
+            {
+               duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState = UE_RECFG_COMPLETE;
+               if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK)
+               {  
+                  BuildAndSendUeCtxtRsp(cfgRsp->cellId, cfgRsp->ueId);
+               }
+            }
+         }
+      }
+      else
+      {
+         DU_LOG("\nERROR  -->  DU APP : MAC UE CFG Response for EVENT[%d]: FAILURE [DU UE F1AP ID : %d]", pst->event, cfgRsp->ueId);
+         if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
+         {
+            //TODO: Send the failure case in Ue Context Setup Response
+         }
+         ret = RFAILED;
+      }
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacUeCfgRsp));
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DU APP : Received MAC Ue Config Response is NULL at DuProcMacUeCfgRsp()");
+      ret = RFAILED;
+   }
+   return ret;
+}
+
+
+/*******************************************************************
+ *
+ * @brief Processes UE create Req to RLC UL
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendUeCreateReqToRlc
+ *
+ *    Functionality: 
+ *     Processes UE create Req to RLC UL
+ * 
+ *  @params[in]  cellId,
+ *               ueId,
+ *               Pointer to RlcUeCfg
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+
+uint8_t duBuildAndSendUeCreateReqToRlc(uint16_t cellId, uint8_t ueId, RlcUeCfg *duRlcUeCfg)
+{
+   uint8_t  ret = ROK;
+   RlcUeCfg *rlcUeCfg = NULLP;
+   Pst       pst;
+  
+   ret = fillRlcUeCfg(cellId, ueId, NULL, duRlcUeCfg);
+   if(ret == RFAILED)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Failed to fill Rlc Ue Cfg at duBuildAndSendUeCreateReqToRlc()");
+      return ret;
+   }
+
+   FILL_PST_DUAPP_TO_RLC(pst, RLC_UL_INST, EVENT_RLC_UE_CREATE_REQ);
+   /* Copying ueCfg to a sharable buffer */
+   DU_ALLOC_SHRABL_BUF(rlcUeCfg, sizeof(RlcUeCfg));
+   if(rlcUeCfg)
+   {
+      memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
+      memcpy(rlcUeCfg, duRlcUeCfg, sizeof(RlcUeCfg));
+      /* Processing one Ue at a time to RLC */
+      DU_LOG("\nDEBUG   -->  DU_APP: Sending UE create request to RLC UL");
+      ret = (*packRlcUeCreateReqOpts[pst.selector])(&pst, rlcUeCfg);
+      if(ret == RFAILED)
+      {
+         DU_LOG("\nERROR  -->  DU_APP : Failure in sending Ue Create Req to RLC");
+         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rlcUeCfg, sizeof(RlcUeCfg));
+         ret = RFAILED;
+      }
+   }
+   else
+   {
+      DU_LOG("\n ERROR  -->  DU APP : Memory alloc failed at duBuildAndSendUeCreateReqToRlc()");
+      ret = RFAILED;
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Processes UE create Rsp received from RLC UL
+ *
+ * @details
+ *
+ *    Function : DuProcRlcUeCfgRsp
+ *
+ *    Functionality: 
+ *     Processes UE create Rsp received from RLC UL
+ * 
+ *  @params[in]  Post structure
+ *               Pointer to RlcCfgCfm
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp)
+{
+   uint8_t ret = ROK;
+
+   if(cfgRsp)
+   {
+      if(cfgRsp->result == RLC_DU_APP_RSP_OK)
+      {
+         if(pst->event == EVENT_RLC_UE_CREATE_RSP)
+         {
+            DU_LOG("\nINFO   -->  DU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueId);
+            duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].\
+               rlcUeCfg.rlcUeCfgState = UE_CREATE_COMPLETE;
+         }
+         else if(pst->event == EVENT_RLC_UE_RECONFIG_RSP)
+         {
+            DU_LOG("\nINFO   -->  DU_APP: RLC UE Reconfig Response : SUCCESS [UE IDX:%d]", cfgRsp->ueId);
+            duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].\
+               rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE;
+            if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK)
+            {
+               BuildAndSendUeCtxtRsp(cfgRsp->cellId, cfgRsp->ueId);
+            }   
+         }
+      }
+      else
+      {
+         DU_LOG("\nERROR  -->  DU_APP: RLC UE CFG Response for EVENT[%d] : FAILED [UE IDX : %d, REASON :%d]",\
+               pst->event, cfgRsp->ueId, cfgRsp->reason);
+         if((pst->event == EVENT_RLC_UE_RECONFIG_RSP))
+         {
+            //TODO: update failure case in ue Context setup Response
+         }
+         ret = RFAILED;
+      }
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(RlcUeCfgRsp));
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DU_APP: Received RLC Ue Config Response is NULL at DuProcRlcUeCfgRsp()");
+      ret = RFAILED;
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds and Send Ue Reconfig Req to RLC
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendUeReCfgReqToRLC
+ *
+ *    Functionality: Builds and Send Ue Reconfig Req to RLC
+ *
+ * @params[in] cellId, crnti
+ *             DuUeCfg *ueCfgDb
+ *             RlcUeCfg *rlcUeCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duBuildAndSendUeReCfgReqToRlc(uint8_t cellId, uint8_t crnti, DuUeCfg *ueCfgDb)
+{
+   uint8_t ret = ROK, ueId = 0;
+   RlcUeCfg *rlcUeCfg = NULLP;
+
+   GET_UE_ID(crnti, ueId);
+   DU_ALLOC_SHRABL_BUF(rlcUeCfg, sizeof(RlcUeCfg));
+   if(rlcUeCfg)
+   {
+      memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
+      ret = fillRlcUeCfg(cellId, ueId, ueCfgDb, rlcUeCfg);
+      if(ret == RFAILED)
+         DU_LOG("\nERROR  -->  DU APP : Failed at duBuildAndSendUeReCfgReqToRlc()");
+      else
+         ret = sendUeReCfgReqToRlc(rlcUeCfg);
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DU APP : Memory Alloc failed at duBuildAndSendUeReCfgReqToRlc()");
+      ret = RFAILED;
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds and Send Ue Reconfig Req to MAC
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendUeReCfgReqToMac
+ *
+ *    Functionality: Builds and Send Ue Reconfig Req to MAC
+ *
+ * @params[in] CellGroupConfigRrc_t *macCellGrpCfg
+ *             DuUeCfg *ueCfgDb
+ *             MacUeCfg    *macUeCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duBuildAndSendUeReCfgReqToMac(uint8_t cellId, uint8_t duUeF1apId, uint8_t crnti, DuUeCfg *ueCfgDb)
+{
+   uint8_t ret = ROK;
+   MacUeCfg *macUeCfg = NULLP;
+
+   DU_ALLOC_SHRABL_BUF(macUeCfg, sizeof(MacUeCfg));
+   if(macUeCfg)
+   {
+      memset(macUeCfg, 0, sizeof(MacUeCfg));
+      ret = fillMacUeCfg(cellId, duUeF1apId, crnti, ueCfgDb, macUeCfg);
+      if(ret == RFAILED)
+         DU_LOG("\nERROR  -->  DU APP : Failed to fill Mac Ue Cfg at duBuildAndSendUeReCfgReqToMac()");
+      else
+         ret = sendUeReCfgReqToMac(macUeCfg);
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DU APP : Memory alloc failed for macUeCfg at duBuildAndSendUeReCfgReqToMac()");
+      ret = RFAILED;
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Build and Send Ue context setup request
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendUeContextSetupReq
+ *
+ *    Functionality: 
+ *     Build and Send Ue context setup request
+ * 
+ *  @params[in]  cellId, crnti, DuUeCfg pointer
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+
+uint8_t duBuildAndSendUeContextSetupReq(uint16_t cellId, DuUeCb *ueCb)
+{
+   uint8_t ret = ROK;
+   uint16_t crnti; 
+   DuUeCfg *duUeCfg = NULLP;
+
+   DU_LOG("\nDEBUG   -->  DU_APP: Processing Ue Context Setup Request for cellId [%d]", cellId);
+
+   if(!ueCb)
+   {
+      DU_LOG("\nERROR  -->  DU APP : UE Cb is NULL");
+      return RFAILED;
+   }
+
+   crnti = ueCb->crnti;
+   duUeCfg = &ueCb->f1UeDb->duUeCfg;
+
+   /* If UE is being handed-in to this DU, UE context setup request will create
+    * new UE context at MAC/SCH and RLC.
+    * If UE is in active state, UE contex setup request will lead to
+    * reconfiguration of UE at MAC/SCH and RLC
+    */
+   if(ueCb->ueState == UE_HANDIN_IN_PROGRESS)
+   {
+      /* Filling MAC UE Config */
+      memset(&ueCb->macUeCfg, 0, sizeof(MacUeCfg));
+
+      /* Since UE attach has not yet happened, ueId and crnti is unknow. Hence
+       * passing 0 */
+      ret = duBuildAndSendUeCreateReqToMac(cellId, ueCb->gnbDuUeF1apId, 0, duUeCfg, &ueCb->macUeCfg);
+      if(ret == RFAILED)
+         DU_LOG("\nERROR  -->  DU APP : Failed to send UE create request to MAC");
+   }
+   else
+   {
+      /* Filling RLC UE Reconfig */ 
+      ret = duBuildAndSendUeReCfgReqToRlc(cellId, crnti, duUeCfg);
+      if(ret == RFAILED)
+         DU_LOG("\nERROR  -->  DU APP : Failed to build ctxt setup req for RLC at duBuildAndSendUeContextSetupReq()");
+
+      /* Filling MAC UE Reconfig */
+      ret = duBuildAndSendUeReCfgReqToMac(cellId, ueCb->gnbDuUeF1apId, crnti, duUeCfg);
+      if(ret == RFAILED)
+         DU_LOG("\nERROR  -->  DU APP : Failed at build ctxt setup req for MAC at duBuildAndSendUeContextSetupReq()");
+   }
+
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Processes DL Rsp received from RLC DL
+ *
+ * @details
+ *
+ *    Function : DuProcRlcDlRrcMsgRsp
+ *
+ *    Functionality: 
+ *     Processes UE Rsp received from RLC DL
+ * 
+ *  @params[in]  Post structure
+ *               Pointer to RlcCfgCfm
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+uint8_t DuProcRlcDlRrcMsgRsp(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg)
+{
+   uint8_t ret = ROK, ueId = 0;
+   uint16_t cellId, crnti;
+   DuUeCb *ueCb = NULLP;
+   DlMsgState state;
+
+   state = dlRrcMsg->state;
+   cellId = dlRrcMsg->cellId;
+   crnti = dlRrcMsg->crnti;
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsg, sizeof(RlcDlRrcMsgRsp));
+
+   if(state == TRANSMISSION_COMPLETE)
+   {
+      GET_UE_ID(crnti, ueId);
+      ueCb = &duCb.actvCellLst[cellId -1]->ueCb[ueId -1];
+
+      if(ueCb->f1UeDb && ueCb->f1UeDb->dlRrcMsgPres)
+      {
+         if(ueCb->f1UeDb->actionType == UE_CTXT_SETUP)
+         {
+            ret = duBuildAndSendUeContextSetupReq(cellId, ueCb);
+            if(ret == RFAILED)
+               DU_LOG("\nERROR  -->  DU APP : Failed to process UE Context Setup Request in DuProcRlcDlRrcMsgRsp()");
+         }
+         
+         if(ueCb->f1UeDb->actionType == UE_CTXT_MOD)
+         {
+            ret = duBuildAndSendUeContextModReq(cellId, ueCb->gnbDuUeF1apId, crnti, &ueCb->f1UeDb->duUeCfg);
+            if(ret == RFAILED)
+               DU_LOG("\nERROR  -->  DU APP : Failed to process UE Context Mod Request in DuProcRlcDlRrcMsgRsp()");
+         }
+
+         if(ueCb->f1UeDb->actionType == UE_CTXT_RELEASE && ueCb->ueState == UE_ACTIVE)
+         {
+            ret = duBuildAndSendUeDeleteReq(cellId, crnti);
+            if(ret == RFAILED)
+            {
+               DU_LOG("\nERROR  -->  DU APP : Failed to process UE Context Release Request in DuProcRlcDlRrcMsgRsp()");
+            }
+         }
+      }
+   }
+   else
+      DU_LOG("\nERROR  -->  DU APP : Failed to transmit DL RRC Msg");
+
+   return ret;
+}
+/*******************************************************************
+ *
+ * @brief Process UE context setup request from CU
+ *
+ * @details
+ *
+ *    Function : duProcUeContextSetupRequest 
+ *
+ *    Functionality: Process UE context setup request from CU
+ *
+ * @params[in] F1AP message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duProcUeContextSetupRequest(DuUeCb *ueCb)
+{
+   uint8_t ret, cellId;
+
+   ret = ROK;
+   if(ueCb)
+   {
+      cellId = duCb.actvCellLst[ueCb->f1UeDb->cellIdx]->cellId;
+
+      /* Send DL RRC msg for security Mode */
+      if(ueCb->f1UeDb->dlRrcMsg)
+      {
+         if(ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+         {
+            /* Sending DL RRC Message to RLC */
+            ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, ueCb->f1UeDb->dlRrcMsg);
+            if(ret == RFAILED)
+            {
+               DU_LOG("\nERROR  -->  DU APP : Failed to send DL RRC msg in duProcUeContextSetupRequest()");
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
+                     ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+            }
+         }
+      }
+      else if(ueCb->f1UeDb->actionType == UE_CTXT_SETUP)
+      {
+         ret = duBuildAndSendUeContextSetupReq(cellId, ueCb);
+         if(ret == RFAILED)
+         {
+            DU_LOG("\nERROR  -->  DU APP : Failed to build ue context setup Req in duProcUeContextSetupRequest()");
+         }
+      }
+   }
+   else
+   {
+      //TODO: To send the failure cause in UeContextSetupRsp
+      DU_LOG("ERROR  -->  DU APP : Failed to process UE CNTXT SETUP REQ at duProcUeContextSetupRequest()");
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Build and Send Ue context mod request
+ *
+ * @details
+ *
+ *
+ *    Function : duBuildAndSendUeContextModReq
+ *
+ *    Functionality: 
+ *     Build and Send Ue context mod request
+ * 
+ *  @params[in]  cellId, crnti, DuUeCfg pointer
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
 
-   /* Copying ueCb to a sharable buffer */
-   DU_ALLOC_SHRABL_BUF(macUeCfg, sizeof(MacUeCfg));
-   if(macUeCfg)
+uint8_t duBuildAndSendUeContextModReq(uint16_t cellId, uint8_t gnbDuUeF1apId, uint16_t crnti, DuUeCfg *duUeCfg)
+{
+   uint8_t ret = ROK;
+
+   DU_LOG("\nDEBUG   -->  DU_APP: Processing Ue Context Mod Request for cellId [%d]", cellId);
+   /* Filling RLC Ue Reconfig */ 
+   ret = duBuildAndSendUeReCfgReqToRlc(cellId, crnti, duUeCfg);
+   if(ret == RFAILED)
+      DU_LOG("\nERROR  -->  DU APP : Failed to build ctxt setup req for RLC at duBuildAndSendUeContextModReq()");
+   
+   /* Filling MAC Ue Reconfig */
+   ret = duBuildAndSendUeReCfgReqToMac(cellId, gnbDuUeF1apId, crnti, duUeCfg);
+   if(ret == RFAILED)
+      DU_LOG("\nERROR  -->  DU APP : Failed at build ctxt setup req for MAC at duBuildAndSendUeContextModReq()");
+
+   return ret;
+}
+/*******************************************************************
+ *
+ * @brief Processing Ue context mod request
+ *
+ * @details
+ *
+ *
+ *    Function : duProcUeContextModReq 
+ *
+ *    Functionality:
+ *        Processing  Ue context mod request
+ *
+ *  @params[in] DuUeCb *ueCb 
+ *  @return ROK     - success
+ *          RFAILED - failure
+ *
+ *****************************************************************/
+
+uint8_t duProcUeContextModReq(DuUeCb *ueCb)
+{
+   uint8_t ret, cellId;
+
+   ret = ROK;
+   if(ueCb)
    {
-      memset(macUeCfg, 0, sizeof(MacUeCfg));
-      memcpy(macUeCfg, &duCb.actvCellLst[cellId - 1]->ueCb[ueIdx -1].macUeCfg, sizeof(MacUeCfg));
-      DU_LOG("\nDU_APP: Sending UE create request to MAC");
+      cellId = duCb.actvCellLst[ueCb->f1UeDb->cellIdx]->cellId;
+      /* Send DL RRC msg for security Mode */
+      if(ueCb->f1UeDb->dlRrcMsg)
+      {
+         if(ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+         {
+            /* Sending DL RRC Message to RLC */
+            ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, ueCb->f1UeDb->dlRrcMsg);
+            if(ret == RFAILED)
+            {
+               DU_LOG("\nERROR  -->  DU APP : Failed to send DL RRC msg in duProcUeContextModReq()");
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
+                     ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+            }
+         }
+      }
+      else if(ueCb->f1UeDb->actionType == UE_CTXT_MOD)
+      {
+         ret = duBuildAndSendUeContextModReq(cellId, ueCb->gnbDuUeF1apId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
+         if(ret == RFAILED)
+         {
+            DU_LOG("\nERROR  -->  DU APP : Failed to build ue context setup Req in duProcUeContextModReq()");
+            return RFAILED;
+         }
+      }
+      else if((ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY) || (ueCb->f1UeDb->actionType == UE_CTXT_RRC_RECFG_COMPLETE))
+      {
+         if((BuildAndSendUeContextModRsp(ueCb) != ROK))
+         {
+            DU_LOG("\nERROR  -->  DU APP : Failed to build UE Context modification response");
+            return RFAILED;
+         }
+      }
+   }
+   else
+   {
+      //TODO: To send the failure cause in UeContextModRsp
+      
+      DU_LOG("ERROR  -->  DU APP : Failed to process UE CNTXT MOD REQ at duProcUeContextModReq()");
+      return RFAILED;
+   }
+   return ROK;
+}
 
-      /* Processing one Ue at a time to MAC */
-      ret = (*packMacUeCreateReqOpts[pst.selector])(&pst, macUeCfg);
-      if(ret)
+/*******************************************************************
+*
+* @brief Function to delete Pdsch ServCellCfg
+*
+* @details
+*
+*    Function : deletePdschServCellCfg
+*
+*    Functionality: Function to delete Pdsch ServCellCfg
+*
+* @params[in] PdschServCellCfg *pdschServCellCfg
+* @return void
+*
+* ****************************************************************/
+
+void deletePdschServCellCfg(PdschServCellCfg *pdschServCellCfg)
+{
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->maxMimoLayers, sizeof(uint8_t));
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->maxCodeBlkGrpPerTb, sizeof(MaxCodeBlkGrpPerTB));
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->codeBlkGrpFlushInd, sizeof(bool));
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->xOverhead, sizeof(PdschXOverhead));
+}
+
+/*******************************************************************
+ *
+* @brief delete MacUeCfg from duCb
+*
+* @details
+*
+*    Function : deleteMacUeCfg 
+*
+*    Functionality: delete MacUeCfg from duCb
+*
+* @params[in] Pointer to MacUeCfg 
+* @return ROK     - success
+*         RFAILED - failure
+*
+*******************************************************************/
+
+void deleteMacUeCfg(MacUeCfg *ueCfg)
+{
+   uint8_t lcCfgIdx=0;
+   
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,ueCfg->ambrCfg, sizeof(AmbrCfg));
+   if(ueCfg->spCellCfgPres)
+   {
+      freeUeReCfgCellGrpInfo(ueCfg);
+   }
+   for(lcCfgIdx=0; lcCfgIdx< ueCfg->numLcs; lcCfgIdx++)
+   {
+      freeMacLcCfg(&ueCfg->lcCfgList[lcCfgIdx]);
+   }
+   memset(ueCfg, 0, sizeof(MacUeCfg));
+}
+
+/*******************************************************************
+*
+* @brief delete UE Configuration of a particular UE
+*
+* @details
+*
+*    Function : deleteUeCfg 
+*
+*    Functionality: delete UE Configuration of a particular UE 
+*
+* @params[in] uint16_t cellIdx, uint8_t ueId
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t  deleteUeCfg(uint16_t cellId, uint8_t ueId)
+{
+   uint8_t tnlIdx = 0;
+   uint16_t cellIdx = 0;
+   DuUeCb *ueCb = NULLP;
+   
+   GET_CELL_IDX(cellId, cellIdx);
+   if(duCb.actvCellLst[cellIdx] != NULLP)
+   {
+      if((duCb.actvCellLst[cellIdx]->ueCb[ueId-1].macUeCfg.macUeCfgState == UE_DELETE_COMPLETE)\
+            &&(duCb.actvCellLst[cellIdx]->ueCb[ueId-1].rlcUeCfg.rlcUeCfgState == UE_DELETE_COMPLETE))
       {
-        DU_LOG("\nDU_APP : Failure in sending Ue Create Req to MAC");
-        DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macUeCfg, sizeof(MacUeCfg));
-        ret = RFAILED;
+         ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueId-1];
+         deleteMacUeCfg(&ueCb->macUeCfg);
+         deleteRlcUeCfg(&ueCb->rlcUeCfg);
+         if(ueCb->f1UeDb !=NULLP)
+         {
+            freeF1UeDb(ueCb->f1UeDb);
+         }
+         for(tnlIdx = 0; tnlIdx < duCb.numTeId; )
+         {
+            if(duCb.upTnlCfg[tnlIdx]->ueId == ueId)
+            {
+               duCb.upTnlCfg[tnlIdx]->configType = CONFIG_DEL;
+               duProcEgtpTunnelCfg(tnlIdx, duCb.upTnlCfg[tnlIdx], duCb.upTnlCfg[tnlIdx]);
+            }
+            else
+               tnlIdx++;
+         }
+         unsetBitInUeBitMap(cellId, ueId-1);
+         duCb.actvCellLst[cellIdx]->numActvUes--;
+         memset(ueCb, 0, sizeof(DuUeCb));
+      }
+      else
+      {
+         return RFAILED;
+      }
+   }
+   else
+   {
+      DU_LOG("\nERROR  --> DU APP : deleteUeCfg(): CellIdx[%d] is not found", cellIdx);
+      return RFAILED;
+   }
+   return ROK;
+}
+
+
+/*******************************************************************
+*
+* @brief Handle UE delete response from MAC
+*
+* @details
+*
+*    Function : DuProcMacUeDeleteRsp
+*
+*    Functionality: Handle UE delete response from MAC
+*
+* @params[in] Pointer to MacUeDeleteRsp and Pst
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+
+uint8_t DuProcMacUeDeleteRsp(Pst *pst, MacUeDeleteRsp *deleteRsp)
+{
+   uint8_t  ret =ROK,ueId=0;
+   uint16_t cellIdx=0;
+   uint32_t gnbCuUeF1apId =0 , gnbDuUeF1apId =0;
+   
+   if(deleteRsp)
+   {
+      if(deleteRsp->result == SUCCESS)
+      {
+         DU_LOG("\nINFO   -->  DU APP : MAC UE Delete Response : SUCCESS [UE IDX : %d]", deleteRsp->ueId);
+         GET_CELL_IDX(deleteRsp->cellId, cellIdx);
+         if(duCb.actvCellLst[cellIdx])
+         {
+            duCb.actvCellLst[cellIdx]->ueCb[deleteRsp->ueId -1].macUeCfg.macUeCfgState = UE_DELETE_COMPLETE;
+            ueId = deleteRsp->ueId;
+            gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbCuUeF1apId;
+            gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbDuUeF1apId;
+            if(deleteUeCfg(deleteRsp->cellId, ueId) == ROK)
+            {
+               ret = BuildAndSendUeContextReleaseComplete(deleteRsp->cellId, gnbCuUeF1apId, gnbDuUeF1apId);
+               if(ret != ROK)
+               {
+                  DU_LOG("\nERROR  -->  DU APP : DuProcMacUeDeleteRsp(): failed to send UE context release complete");
+               }
+            }
+
+         }
       }
+      else
+      {
+         DU_LOG("\nERROR  -->  DU APP : DuProcMacUeDeleteRsp(): MAC UE Delete Response : FAILURE [UE IDX : %d]",\
+         deleteRsp->ueId);
+         ret =  RFAILED;
+      }
+      DU_FREE_SHRABL_BUF(pst->region, pst->pool, deleteRsp, sizeof(MacUeDeleteRsp));
    }
    else
    {
-      DU_LOG("\n DU_APP: Memory alloc failed at duBuildAndSendUeCreateReqToMac()");
+      DU_LOG("\nERROR  -->  DU APP : DuProcMacUeDeleteRsp(): MAC UE Delete Response is null");
       ret = RFAILED;
    }
    return ret;
@@ -1227,131 +3069,312 @@ uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t ueIdx,\
 
 /*******************************************************************
  *
- * @brief Handle UE create response from MAC
+ * @brief Processes UE Delete Rsp received from RLC 
  *
  * @details
  *
- *    Function : DuHandleMacUeCreateRsp
+ *    Function : DuProcRlcUeDeleteRsp
  *
- *    Functionality: Handle UE create response from MAC
+ *    Functionality:
+ *     Processes UE Delete Rsp received from RLC 
  *
- * @params[in] Pointer to MacUeCfgRsp and Pst 
- * @return ROK     - success
- *         RFAILED - failure
+ *  @params[in]  Post structure
+ *               Pointer to RlcUeDeleteRsp
+ *  @return ROK     - success
+ *          RFAILED - failure
  *
- * ****************************************************************/
-uint8_t DuHandleMacUeCreateRsp(Pst *pst, MacUeCfgRsp *cfgRsp)
+ * *****************************************************************/
+
+uint8_t DuProcRlcUeDeleteRsp(Pst *pst, RlcUeDeleteRsp *delRsp)
+{
+   uint8_t  ueId = 0, ret = ROK;
+   uint16_t cellIdx = 0,crnti=0;
+
+   if(delRsp)
+   {
+      ueId = delRsp->ueId;
+      GET_CELL_IDX(delRsp->cellId, cellIdx);
+
+      if(delRsp->result == SUCCESSFUL)
+      {
+         DU_LOG("\nINFO   -->  DU_APP: RLC UE Delete Response : SUCCESS [UE IDX:%d]", ueId);
+         if(duCb.actvCellLst[cellIdx]!=NULLP)
+         {
+            duCb.actvCellLst[cellIdx]->ueCb[ueId-1].rlcUeCfg.rlcUeCfgState = UE_DELETE_COMPLETE;
+            GET_CRNTI(crnti, ueId);
+            if(sendUeDeleteReqToMac(delRsp->cellId, ueId, crnti) == RFAILED)
+            {
+               DU_LOG("\nERROR  -->  DU APP : duBuildAndSendUeDeleteReq(): Failed to build UE  delete req for MAC ");
+               return RFAILED;
+            }
+
+         }
+      }
+      else
+      {
+         DU_LOG("\nERROR   -->  DU_APP: RLC UE Delete Response : FAILED [UE IDX:%d]", ueId);
+         ret = RFAILED;
+      }
+      DU_FREE_SHRABL_BUF(pst->region, pst->pool, delRsp, sizeof(RlcUeDeleteRsp));
+
+   }
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Sending UE Delete Req To Mac
+*
+* @details
+*
+*    Function : sendUeDeleteReqToMac
+*
+*    Functionality:
+*     sending UE Delete Req To Mac
+*
+*  @params[in]    cellId, ueId, crnti 
+*  @return ROK     - success
+*          RFAILED - failure
+*
+*****************************************************************/
+
+uint8_t sendUeDeleteReqToMac(uint16_t cellId, uint8_t ueId, uint16_t crnti)
 {
-   if(cfgRsp->result == MAC_DU_APP_RSP_OK)
+   Pst pst;
+   uint8_t ret=ROK;
+   MacUeDelete *ueDelete = NULLP;
+
+   DU_ALLOC_SHRABL_BUF(ueDelete, sizeof(MacUeDelete));
+   if(ueDelete)
    {
-      DU_LOG("\nDU APP : MAC UE Create Response : SUCCESS [UE IDX : %d]", cfgRsp->ueIdx);
+      ueDelete->cellId = cellId;
+      ueDelete->ueId   = ueId;
+      ueDelete->crnti  = crnti;
+      FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_UE_DELETE_REQ);
+
+      DU_LOG("\nDEBUG  -->  DU_APP: Sending UE delete Request to MAC ");
+      ret = (*packMacUeDeleteReqOpts[pst.selector])(&pst, ueDelete);
+      if(ret == RFAILED)
+      {
+         DU_LOG("\nERROR  -->  DU_APP: sendUeDeleteReqToMac(): Failed to send UE delete Req to MAC");
+         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueDelete, sizeof(MacUeDelete));
+      }
    }
    else
    {
-      DU_LOG("\nDU APP : MAC UE Create Response : FAILURE [UE IDX : %d]", cfgRsp->ueIdx);
+      DU_LOG("\nERROR  -->   DU_APP: sendUeDeleteReqToMac(): Failed to allocate memory"); 
+      ret = RFAILED;
    }
-   return ROK;
+   return ret;
 }
 
 /*******************************************************************
  *
- * @brief Processes UE create Req to RLC UL
+ * @brief Sending UE Delete Req To Rlc
  *
  * @details
  *
- *    Function : duBuildAndSendUeCreateReqToRlc
+ *    Function : sendUeDeleteReqToRlc
  *
- *    Functionality: 
- *     Processes UE create Req to RLC UL
- * 
- *  @params[in]  cellId,
- *               ueIdx,
- *               Pointer to RlcUeCfg
+ *    Functionality:
+ *     Sending UE Delete Req To Rlc
+ *
+ *  @params[in]  cellId, ueId 
  *  @return ROK     - success
  *          RFAILED - failure
- * 
+ *
  *****************************************************************/
 
-uint8_t duBuildAndSendUeCreateReqToRlc(uint16_t cellId, uint8_t ueIdx, RlcUeCfg *duRlcUeCfg)
+uint8_t sendUeDeleteReqToRlc(uint16_t cellId, uint8_t ueId)
 {
-   uint8_t ret = ROK;
-   RlcUeCfg *rlcUeCfg = NULLP;
+   uint8_t ret;
    Pst pst;
-   memset(&pst, 0, sizeof(Pst));
-  
-   fillRlcBearerCfg(cellId, ueIdx, duRlcUeCfg);
-   FILL_PST_DUAPP_TO_RLC(pst, RLC_UL_INST, EVENT_RLC_UL_UE_CREATE_REQ);
+   RlcUeDelete *ueDelete;
 
-   /* Copying ueCfg to a sharable buffer */
-   DU_ALLOC_SHRABL_BUF(rlcUeCfg, sizeof(RlcUeCfg));
-   if(rlcUeCfg)
+   DU_ALLOC_SHRABL_BUF(ueDelete, sizeof(RlcUeDelete));
+   if(ueDelete !=NULLP)
    {
-      memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
-      memcpy(rlcUeCfg, duRlcUeCfg, sizeof(RlcUeCfg));
-      /* Processing one Ue at a time to RLC */
-      DU_LOG("\nDU_APP: Sending UE create request to RLC UL");
-      ret = (*packRlcUlUeCreateReqOpts[pst.selector])(&pst, rlcUeCfg);
-      if(ret)
+      ueDelete->cellId = cellId;
+      ueDelete->ueId = ueId;
+      FILL_PST_DUAPP_TO_RLC(pst, RLC_UL_INST, EVENT_RLC_UE_DELETE_REQ);
+
+      ret = (*packRlcUeDeleteReqOpts[pst.selector])(&pst, ueDelete);
+      if(ret == RFAILED)
       {
-         DU_LOG("\nDU_APP : Failure in sending Ue Create Req to RLC");
-         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rlcUeCfg, sizeof(RlcUeCfg));
-         ret = RFAILED;
+         DU_LOG("\nERROR  -->  DU_APP : sendUeDeleteReqToRlc():Failed to send UE Delete  Req to RLC"); 
+         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueDelete, sizeof(RlcUeDelete));
       }
    }
    else
    {
-      DU_LOG("\n DU_APP: Memory alloc failed at duBuildAndSendUeCreateReqToRlc()");
+      DU_LOG("\nERROR  -->   DU_APP: sendUeDeleteReqToRlc():Memory allocation failed");
       ret = RFAILED;
    }
    return ret;
 }
 
+/*******************************************************************
+ *
+ * @brief DU processes UE delete req from CU and sends to MAC and RLC 
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendUeDeleteReq
+ *
+ *    Functionality: DU processes UE delete req from CU and sends to MAC 
+ *                   and RLC 
+ *
+ * @params[in] cellId, crnti 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duBuildAndSendUeDeleteReq(uint16_t cellId, uint16_t crnti)
+{
+   uint8_t  ueId =0;
+   uint16_t cellIdx = 0;
+
+   DU_LOG("\nDEBUG  -->  DU_APP: Processing UE Delete Request ");
+   GET_CELL_IDX(cellId, cellIdx);
+   GET_UE_ID(crnti, ueId);
 
+   if(duCb.actvCellLst[cellIdx] != NULLP)
+   {
+      if(crnti != duCb.actvCellLst[cellIdx]->ueCb[ueId - 1].crnti)
+      {
+         DU_LOG("\nERROR  -->  DU APP : duBuildAndSendUeDeleteReq(): CRNTI [%d] not found", crnti);
+         return RFAILED;
+      }
+
+      duCb.actvCellLst[cellIdx]->ueCb[ueId - 1].ueState = UE_DELETION_IN_PROGRESS; 
+      if(sendUeDeleteReqToRlc(cellId, ueId) == RFAILED)
+      {
+         DU_LOG("\nERROR  -->  DU APP : DuProcMacUeDeleteRsp():Failed to build UE  delete req for RLC ");
+         return RFAILED;
+      }
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DU APP : duBuildAndSendUeDeleteReq(): Cell Id is not found");
+      return RFAILED;
+   }
+
+   return ROK;
+}
 
 /*******************************************************************
  *
- * @brief Processes UE create Rsp received from RLC UL
+ * @brief delete RlcUeCfg from duCb
  *
  * @details
  *
- *    Function : DuProcRlcUlUeCfgRsp
+ *    Function : deleteRlcUeCfg
  *
- *    Functionality: 
- *     Processes UE create Rsp received from RLC UL
- * 
- *  @params[in]  Post structure
- *               Pointer to RlcCfgCfm
+ *    Functionality:
+ *       delete  RlcUeCfg from duCb
+ *
+ *  @params[in] RlcUeCfg *ueCfg 
+ *               
  *  @return ROK     - success
  *          RFAILED - failure
- * 
+ *
  *****************************************************************/
 
-uint8_t DuProcRlcUlUeCreateRsp(Pst *pst, RlcUeCfgRsp *cfgRsp)
+void deleteRlcUeCfg(RlcUeCfg *ueCfg)
 {
-   uint8_t ret = ROK;
+   uint8_t lcIdx = 0;
+   RlcBearerCfg *lcCfg= NULLP;
+   if(ueCfg)
+   {
+      for(lcIdx =0 ; lcIdx < ueCfg->numLcs ; lcIdx++)
+      {
+         lcCfg = &ueCfg->rlcLcCfg[lcIdx];
+         switch(lcCfg->rlcMode)
+         {
+            case RLC_AM :
+               {
+                  DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.amCfg, sizeof(AmBearerCfg));
+                  break;
+               }
+            case RLC_UM_BI_DIRECTIONAL :
+               {
+                  DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
+                  break;
+               }
+            case RLC_UM_UNI_DIRECTIONAL_UL :
+               {
+                  DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
+                  break;
+               }
+            case RLC_UM_UNI_DIRECTIONAL_DL :
+               {
+                  DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
+                  break;
+               }
+         }
+         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai));
+      }
+      memset(ueCfg, 0, sizeof(RlcUeCfg));
+   }
+}
 
-   if(cfgRsp)
+/*******************************************************************
+*
+* @brief Du process Ue Context Release Command
+*
+* @details
+*
+*    Function : duProcUeContextReleaseCommand 
+*
+*    Functionality: Du process Ue Context Release Command 
+*
+* @params[in] DuUeCb *duUeCb 
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t duProcUeContextReleaseCommand(uint16_t cellId, DuUeCb *duUeCb)
+{
+   uint8_t ret =ROK, ueId=0;
+   uint16_t crnti = 0;
+
+   if(duUeCb != NULLP)
    {
-      if(cfgRsp->result == RLC_DU_APP_RSP_OK)
+      crnti = duUeCb->crnti;
+      GET_UE_ID(crnti, ueId);
+      
+      if(duUeCb->f1UeDb)
       {
-         DU_LOG("\nDU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
+         /* Send DL RRC msg for RRC release */
+         if(duUeCb->f1UeDb->dlRrcMsg)
+         {
+            if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu != NULLP)
+            {
+               ret = duBuildAndSendDlRrcMsgToRlc(cellId, duCb.actvCellLst[duUeCb->f1UeDb->cellIdx]->ueCb[ueId-1].rlcUeCfg,\
+                     duUeCb->f1UeDb->dlRrcMsg);
+               if(ret == RFAILED)
+               {
+                  DU_LOG("\nERROR  -->  DU APP : duProcUeContextReleaseCommand() : Failed to send DL RRC msg");
+                  DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
+                        duUeCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+                  DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, duUeCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+               }
+            }
+         }
       }
       else
       {
-         DU_LOG("\nDU_APP: RLC UE Create Response : FAILED [UE IDX:%d, REASON :%d]",\
-           cfgRsp->ueIdx, cfgRsp->reason);
-        ret = RFAILED;
+         ret = duBuildAndSendUeDeleteReq(cellId,crnti);
+         if(ret == RFAILED)
+         {
+            DU_LOG("\nERROR  -->  DU APP : duProcUeContextReleaseCommand(): Failed to build and send Ue Delete request");
+         }
       }
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(RlcUeCfgRsp));
-   }
-   else
-   {
-      DU_LOG("\nDU_APP: Received RLC Ue Create Response is NULL");
-      ret = RFAILED;
    }
    return ret;
 }
 
 /**********************************************************************
   End of file
- ***********************************************************************/
+***********************************************************************/