DL RRC Message Transfer from DU APP to RLC [Issue-ID: ODUHIGH-45]
[o-du/l2.git] / src / du_app / du_f1ap_msg_hdl.c
index 18f17b6..ac1fdb8 100644 (file)
 *******************************************************************************/
 
 /* This file contains F1AP message handler functions */
-
-#include "du_mgr.h"
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "du_app_mac_inf.h"
+#include "du_cfg.h"
+#include "du_app_rlc_inf.h"
+#include "E2AP-PDU.h"
 #include "du_mgr_main.h"
-#include "du_cell_mgr.h"
-#include "du_f1ap_msg_hdl.h"
+#include "du_utils.h"
 #include "GNB-DU-System-Information.h"
 #include "CellGroupConfigRrc.h"
 #include "MAC-CellGroupConfig.h"
 #include "PhysicalCellGroupConfig.h"
 #include "SpCellConfig.h"
 #include "ServingCellConfig.h"
+#include "ControlResourceSet.h"
+#include "SearchSpace.h"
+#include "PDCCH-Config.h"
+#include "PDSCH-TimeDomainResourceAllocation.h"
+#include "PDSCH-TimeDomainResourceAllocationList.h"
+#include "DMRS-DownlinkConfig.h"
+#include "PDSCH-Config.h"
 #include "BWP-DownlinkDedicated.h"
+#include "PUSCH-TimeDomainResourceAllocation.h"
+#include "PUSCH-TimeDomainResourceAllocationList.h"
+#include "DMRS-UplinkConfig.h"
+#include "PUSCH-Config.h"
+#include "SRS-ResourceId.h"
+#include "SRS-Resource.h"
+#include "SRS-ResourceSet.h"
+#include "SRS-Config.h"
+#include "BWP-UplinkDedicated.h"
+#include "PUSCH-ServingCellConfig.h"
 #include "UplinkConfig.h"
+#include "PDSCH-ServingCellConfig.h"
 #include "DUtoCURRCContainer.h"
+#include<ProtocolIE-Field.h>
+#include "ProtocolExtensionField.h"
+#include "F1AP-PDU.h"
+#include "odu_common_codec.h"
+#include "du_mgr.h"
+#include "du_f1ap_msg_hdl.h"
 
-extern char encBuf[ENC_BUF_MAX_LEN];
 extern DuCfgParams duCfgParam;
-static S16 BuildULTnlInforet=RFAILED;
-
-S16 sctpSend(Buffer *mBuf, U8 itfType);
+uint8_t ServedCellListreturn=RFAILED;
 
+uint8_t procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg);
+uint8_t procDlRrcMsgTrans(F1AP_PDU_t *f1apMsg);
+void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg);
+uint8_t sctpSend(Buffer *mBuf, uint8_t itfType);
+uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp);
+uint8_t procUeContextSetupReq(F1AP_PDU_t *f1apMsg);
 
 /*******************************************************************
  *
@@ -65,9 +98,9 @@ S16 sctpSend(Buffer *mBuf, U8 itfType);
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildULNRInfo(NRFreqInfo_t *ulnrfreq)
+uint8_t BuildULNRInfo(NRFreqInfo_t *ulnrfreq)
 {
-   U8 idx=0;
+   uint8_t idx=0;
    ulnrfreq->nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.\
                        fdd.ulNrFreqInfo.nrArfcn;
    ulnrfreq->freqBandListNr.list.count = 1;
@@ -106,9 +139,9 @@ S16 BuildULNRInfo(NRFreqInfo_t *ulnrfreq)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildDLNRInfo(NRFreqInfo_t *dlnrfreq)
+uint8_t BuildDLNRInfo(NRFreqInfo_t *dlnrfreq)
 {
-   U8 idx=0;
+   uint8_t idx=0;
        dlnrfreq->nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.\
                        fdd.dlNrFreqInfo.nrArfcn;
    dlnrfreq->freqBandListNr.list.count = 1;
@@ -149,14 +182,14 @@ S16 BuildDLNRInfo(NRFreqInfo_t *dlnrfreq)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildNrcgi(NRCGI_t *nrcgi)
+uint8_t BuildNrcgi(NRCGI_t *nrcgi)
 {
-   S16 ret;
-   U8 unused = 4;
-   U8 byteSize = 5;
-   U8 val = 16;
+   uint8_t ret;
+   uint8_t unused = 4;
+   uint8_t byteSize = 5;
+   uint8_t val = 16;
    /* Allocate Buffer Memory */
-   nrcgi->pLMN_Identity.size = PLMN_SIZE * sizeof(U8);
+   nrcgi->pLMN_Identity.size = PLMN_SIZE * sizeof(uint8_t);
    DU_ALLOC(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
    if(nrcgi->pLMN_Identity.buf == NULLP)
        {
@@ -170,7 +203,7 @@ S16 BuildNrcgi(NRCGI_t *nrcgi)
    }
    /*nrCellIdentity*/
    //ret = BuildNrCellId(&nrcgi->nRCellIdentity);
-   nrcgi->nRCellIdentity.size = byteSize * sizeof(U8);
+   nrcgi->nRCellIdentity.size = byteSize * sizeof(uint8_t);
    DU_ALLOC(nrcgi->nRCellIdentity.buf, nrcgi->nRCellIdentity.size); 
    if(nrcgi->nRCellIdentity.buf == NULLP)
    {
@@ -198,14 +231,14 @@ S16 BuildNrcgi(NRCGI_t *nrcgi)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildFiveGSTac(Served_Cell_Information_t *servcell)
+uint8_t BuildFiveGSTac(Served_Cell_Information_t *servcell)
 {
    DU_ALLOC(servcell->fiveGS_TAC,sizeof(FiveGS_TAC_t));
    if(servcell->fiveGS_TAC == NULLP)
    {
           return RFAILED;
    }
-   servcell->fiveGS_TAC->size = 3 * sizeof(U8);
+   servcell->fiveGS_TAC->size = 3 * sizeof(uint8_t);
    DU_ALLOC(servcell->fiveGS_TAC->buf,\
          sizeof(servcell->fiveGS_TAC->size));
    if(servcell->fiveGS_TAC->buf == NULLP)
@@ -232,10 +265,10 @@ S16 BuildFiveGSTac(Served_Cell_Information_t *servcell)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildNrMode(NR_Mode_Info_t *mode)
+uint8_t BuildNrMode(NR_Mode_Info_t *mode)
 {
-   S16 BuildDLNRInforet=0;
-       S16 BuildULNRInforet=0; 
+   uint8_t BuildDLNRInforet=0;
+       uint8_t BuildULNRInforet=0; 
    /* FDD Mode */
        mode->present = NR_Mode_Info_PR_fDD;
    if(mode->present == NR_Mode_Info_PR_fDD)
@@ -285,13 +318,13 @@ S16 BuildNrMode(NR_Mode_Info_t *mode)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildExtensions(ProtocolExtensionContainer_4624P3_t **ieExtend)
+uint8_t BuildExtensions(ProtocolExtensionContainer_4624P3_t **ieExtend)
 {
-   U8 idx;
-   U8 plmnidx;
-   U8 extensionCnt=1;
-   U8 sliceId=0;
-   U8 sdId;
+   uint8_t idx;
+   uint8_t plmnidx;
+   uint8_t extensionCnt=1;
+   uint8_t sliceId=0;
+   uint8_t sdId;
    DU_ALLOC(*ieExtend,sizeof(ProtocolExtensionContainer_4624P3_t));
    if((*ieExtend) == NULLP)
    {
@@ -338,7 +371,7 @@ S16 BuildExtensions(ProtocolExtensionContainer_4624P3_t **ieExtend)
             return RFAILED;
     }
    (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-         list.array[sliceId]->sNSSAI.sST.size = sizeof(U8);
+         list.array[sliceId]->sNSSAI.sST.size = sizeof(uint8_t);
     DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
             .list.array[sliceId]->sNSSAI.sST.buf,(*ieExtend)->list.array[idx]->\
             extensionValue.choice.SliceSupportList.\
@@ -358,7 +391,7 @@ S16 BuildExtensions(ProtocolExtensionContainer_4624P3_t **ieExtend)
           return RFAILED;
    }
    (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-         list.array[sliceId]->sNSSAI.sD->size = 3*sizeof(U8);
+         list.array[sliceId]->sNSSAI.sD->size = 3*sizeof(uint8_t);
    DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
             list.array[sliceId]->sNSSAI.sD->buf,(*ieExtend)->list.array[idx]->extensionValue.choice.\
             SliceSupportList.list.array[sliceId]->sNSSAI.sD->size);
@@ -393,12 +426,12 @@ S16 BuildExtensions(ProtocolExtensionContainer_4624P3_t **ieExtend)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16  BuildServedPlmn(ServedPLMNs_List_t *srvplmn)
+uint8_t  BuildServedPlmn(ServedPLMNs_List_t *srvplmn)
 {  
-   U8  plmnidx;
-   U8  servPlmnCnt=1;
-       S16 buildPlmnIdret=0;
-       S16 BuildExtensionsret=0;
+   uint8_t  plmnidx;
+   uint8_t  servPlmnCnt=1;
+       uint8_t buildPlmnIdret=0;
+       uint8_t BuildExtensionsret=0;
    srvplmn->list.count = servPlmnCnt;
    srvplmn->list.size = \
                       servPlmnCnt*sizeof(ServedPLMNs_Item_t *);
@@ -416,7 +449,7 @@ S16  BuildServedPlmn(ServedPLMNs_List_t *srvplmn)
                   return RFAILED;
       }  
    }
-       srvplmn->list.array[0]->pLMN_Identity.size = PLMN_SIZE * sizeof(U8);
+       srvplmn->list.array[0]->pLMN_Identity.size = PLMN_SIZE * sizeof(uint8_t);
    DU_ALLOC(srvplmn->list.array[0]->pLMN_Identity.buf, srvplmn->list.array[0]->pLMN_Identity.size);
    buildPlmnIdret = buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn,\
          &srvplmn->list.array[0]->pLMN_Identity);
@@ -447,15 +480,15 @@ S16  BuildServedPlmn(ServedPLMNs_List_t *srvplmn)
  *
  * ****************************************************************/
 
-S16 BuildServedCellList(GNB_DU_Served_Cells_List_t *duServedCell)
+uint8_t BuildServedCellList(GNB_DU_Served_Cells_List_t *duServedCell)
 {
-   S16 BuildNrcgiret=0;
-   S16 BuildFiveGSTacret=0;
-       S16 BuildServedPlmnret=0;
-       S16 BuildNrModeret=0;
-   U8  idx;
-   U8  plmnidx;
-   U8  plmnCnt=1;
+   uint8_t  BuildNrcgiret=0;
+   uint8_t  BuildFiveGSTacret=0;
+       uint8_t  BuildServedPlmnret=0;
+   uint8_t  BuildNrModeret=0;
+   uint8_t  idx;
+   uint8_t  plmnidx;
+   uint8_t  plmnCnt=1;
    GNB_DU_Served_Cells_Item_t *srvCellItem;
    duServedCell->list.size = plmnCnt * sizeof(GNB_DU_Served_Cells_ItemIEs_t *);
    duServedCell->list.count = plmnCnt;
@@ -511,7 +544,7 @@ S16 BuildServedCellList(GNB_DU_Served_Cells_List_t *duServedCell)
    }
    /*Measurement timing Config*/
    srvCellItem->served_Cell_Information.measurementTimingConfiguration.\
-      size = sizeof(U8);
+      size = sizeof(uint8_t);
    DU_ALLOC(srvCellItem->served_Cell_Information.\
          measurementTimingConfiguration.buf,srvCellItem->served_Cell_Information.measurementTimingConfiguration.size);
    if(srvCellItem->served_Cell_Information.\
@@ -573,12 +606,12 @@ S16 BuildServedCellList(GNB_DU_Served_Cells_List_t *duServedCell)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildRrcVer(RRC_Version_t *rrcVer)
+uint8_t BuildRrcVer(RRC_Version_t *rrcVer)
 {
-   U8 rrcExt;
-   U8 rrcLatest;
-   rrcVer->latest_RRC_Version.size = sizeof(U8);
-   DU_ALLOC(rrcVer->latest_RRC_Version.buf,sizeof(U8));
+   uint8_t rrcExt;
+   uint8_t rrcLatest;
+   rrcVer->latest_RRC_Version.size = sizeof(uint8_t);
+   DU_ALLOC(rrcVer->latest_RRC_Version.buf,sizeof(uint8_t));
    if(rrcVer->latest_RRC_Version.buf == NULLP)
    {
           return RFAILED;
@@ -610,7 +643,7 @@ S16 BuildRrcVer(RRC_Version_t *rrcVer)
    rrcVer->iE_Extensions->list.array[rrcExt]->extensionValue.present =\
               RRC_Version_ExtIEs__extensionValue_PR_Latest_RRC_Version_Enhanced;
    rrcVer->iE_Extensions->list.array[rrcExt]->extensionValue.choice\
-             .Latest_RRC_Version_Enhanced.size = 3*sizeof(U8);
+             .Latest_RRC_Version_Enhanced.size = 3*sizeof(uint8_t);
    DU_ALLOC(rrcVer->iE_Extensions->list.array[rrcExt]->extensionValue.choice\
         .Latest_RRC_Version_Enhanced.buf,rrcVer->iE_Extensions->list.\
          array[rrcExt]->extensionValue.choice.Latest_RRC_Version_Enhanced.size);
@@ -646,30 +679,30 @@ S16 BuildRrcVer(RRC_Version_t *rrcVer)
 *         RFAILED - failure
 *
 * ****************************************************************/
-S16 SendF1APMsg(Region region, Pool pool)
+uint8_t SendF1APMsg(Region region, Pool pool)
 {
    Buffer *mBuf;
 
-   if(SGetMsg(region, pool, &mBuf) == ROK)
+   if(ODU_GET_MSG_BUF(region, pool, &mBuf) == ROK)
    {
-      if(SAddPstMsgMult((Data *)encBuf, encBufSize, mBuf) == ROK)
+      if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK)
       {
-         SPrntMsg(mBuf, 0,0);
+         ODU_PRINT_MSG(mBuf, 0,0);
  
          if(sctpSend(mBuf, F1_INTERFACE) != ROK)
          {
             DU_LOG("\nF1AP : SCTP Send failed");
-            SPutMsg(mBuf);
+            ODU_PUT_MSG_BUF(mBuf);
             return RFAILED;
          }
       }
       else
       {
-         DU_LOG("\nF1AP : SAddPstMsgMult failed");
-         SPutMsg(mBuf);
+         DU_LOG("\nF1AP : ODU_ADD_POST_MSG_MULT failed");
+         ODU_PUT_MSG_BUF(mBuf);
          return RFAILED;
       }
-      SPutMsg(mBuf);
+      ODU_PUT_MSG_BUF(mBuf);
    }
    else
    {
@@ -738,12 +771,12 @@ void FreeRrcVer(RRC_Version_t *rrcVer)
 * ****************************************************************/
 void FreeServedCellList( GNB_DU_Served_Cells_List_t *duServedCell)
 {
-   U8   plmnCnt=1;
-   U8  servId=0;
-       U8 sliceId=0;
-       U8  ieId=0;
-       U8   extensionCnt=1;
-       U8 plmnidx=0;
+   uint8_t   plmnCnt=1;
+   uint8_t  servId=0;
+       uint8_t sliceId=0;
+       uint8_t  ieId=0;
+       uint8_t   extensionCnt=1;
+       uint8_t plmnidx=0;
    GNB_DU_Served_Cells_Item_t *srvCellItem= &duServedCell->list.array[0]->value.choice.GNB_DU_Served_Cells_Item;
    if(duServedCell->list.array!=NULLP)
    {
@@ -846,7 +879,7 @@ void FreeServedCellList( GNB_DU_Served_Cells_List_t *duServedCell)
                                                                                                               }
                                                                                                          DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->\
                                                                                                               iE_Extensions->list.array[ieId]->extensionValue.choice.SliceSupportList.list.array[sliceId]->\
-                                                                                                                        sNSSAI.sST.buf,sizeof(U8));
+                                                                                                                        sNSSAI.sST.buf,sizeof(uint8_t));
                                                                                                            }
                                                                                                                 DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]->\
                                            extensionValue.choice.SliceSupportList.list.array[sliceId],sizeof(SliceSupportItem_t));
@@ -867,7 +900,7 @@ void FreeServedCellList( GNB_DU_Served_Cells_List_t *duServedCell)
                                                                     DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.\
                                                                          array[servId]->pLMN_Identity.buf,srvCellItem->served_Cell_Information.\
                                                                          servedPLMNs.list.array[servId]->pLMN_Identity.size
-                                                                         * sizeof(U8));
+                                                                         * sizeof(uint8_t));
                                                                  }
                                                             DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnidx],\
                                                                  sizeof(ServedPLMNs_Item_t *));
@@ -882,17 +915,85 @@ void FreeServedCellList( GNB_DU_Served_Cells_List_t *duServedCell)
                                  }
                             DU_FREE(srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity.buf,\
                                  srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity.size *
-                                 sizeof(U8));
+                                 sizeof(uint8_t));
                          }
                     DU_FREE(srvCellItem->served_Cell_Information.nRCGI.pLMN_Identity.buf,\
                          srvCellItem->served_Cell_Information.nRCGI.pLMN_Identity.size *
-                         sizeof(U8));
+                         sizeof(uint8_t));
                  }
             DU_FREE(duServedCell->list.array[plmnidx],sizeof(GNB_DU_Served_Cells_ItemIEs_t));
          }
      DU_FREE(duServedCell->list.array,plmnCnt*sizeof(GNB_DU_Served_Cells_ItemIEs_t*));
   }
 }
+/*******************************************************************
+ *
+ * @brief  deallocating the memory of function BuildAndSendF1SetupReq()
+ *
+ * @details
+ *
+ *    Function :  FreeF1SetupReq
+ *
+ *    Functionality:  deallocating the memory of function BuildAndSendF1SetupReq
+ *
+ * @params[in] F1AP_PDU_t *f1apMsg
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void FreeF1SetupReq(F1AP_PDU_t *f1apMsg)
+{
+    uint8_t idx =0;
+        uint8_t idx1=1;
+        F1SetupRequest_t           *f1SetupReq=NULLP;
+       
+       
+    if(f1apMsg != NULLP)
+    {
+         if(f1apMsg->choice.initiatingMessage != NULLP)
+         {
+                            f1SetupReq = &f1apMsg->choice.initiatingMessage->value.choice.F1SetupRequest;
+              if(f1SetupReq->protocolIEs.list.array != NULLP)
+                  {
+                                      if(f1SetupReq->protocolIEs.list.array[idx1]!=NULLP)
+                                                {
+                            if(f1SetupReq->protocolIEs.list.array[idx1]->value.choice.GNB_DU_ID.buf !=  NULLP)
+                            {
+                                idx1++;
+                                if(f1SetupReq->protocolIEs.list.array[idx1]->value.choice.GNB_DU_Name.buf != NULLP)
+                                {
+                                     idx1=4;
+                                                                                       if(ServedCellListreturn == ROK)
+                                     {
+                                         FreeRrcVer(&f1SetupReq->protocolIEs.list.array[idx1]->value.choice.RRC_Version);
+                                     }
+                                                                                       idx1--;
+                                     FreeServedCellList(&f1SetupReq->protocolIEs.list.array[idx1]->value.choice.GNB_DU_Served_Cells_List);
+                                     idx1--;
+                                                                                       DU_FREE(f1SetupReq->protocolIEs.list.array[idx1]->value.choice.GNB_DU_Name.buf,
+                                     strlen((char *)duCfgParam.duName));
+                                }
+                                idx1--;
+                                DU_FREE(f1SetupReq->protocolIEs.list.array[idx1]->value.choice.GNB_DU_ID.buf,\
+                                f1SetupReq->protocolIEs.list.array[idx1]->value.choice.GNB_DU_ID.size);
+                                                          }
+                       }
+                       for(idx=0; idx<f1SetupReq->protocolIEs.list.count; idx++)
+                       {
+                            if(f1SetupReq->protocolIEs.list.array[idx]!=NULLP)
+                            {
+                                 DU_FREE(f1SetupReq->protocolIEs.list.array[idx],sizeof(F1SetupRequestIEs_t));
+                             }
+                                        }
+                       DU_FREE(f1SetupReq->protocolIEs.list.array,\
+                            f1SetupReq->protocolIEs.list.size);
+                       }
+                       DU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+                  }
+                  DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+       }
+
+}
 /*******************************************************************
  *
  * @brief Builds and Send the F1SetupRequest
@@ -907,19 +1008,20 @@ void FreeServedCellList( GNB_DU_Served_Cells_List_t *duServedCell)
  *         RFAILED - failure
  *
  ******************************************************************/
-S16 BuildAndSendF1SetupReq()
+uint8_t BuildAndSendF1SetupReq()
 {
-   S16  BuildServedCellListreturn=0;
-       S16  BuildRrcVerreturn=0; 
-   U8   idx=0,idx2=0,i=0;
-   U8   ieId=0;
-   U8   elementCnt=0;
+   uint8_t   idx=0;
+       uint8_t   idx2=0;
+       uint8_t   i=0;
+   uint8_t   elementCnt=0;
    F1AP_PDU_t                 *f1apMsg = NULLP;
    F1SetupRequest_t           *f1SetupReq=NULLP;
    GNB_DU_Served_Cells_List_t *duServedCell=NULLP;
    RRC_Version_t              *rrcVer=NULLP;
    asn_enc_rval_t             encRetVal;        /* Encoder return value */
-       bool ret=false;
+       uint8_t  ret= RFAILED;
+       uint8_t  BuildRrcVerreturn=0;
+       
    DU_LOG("\nF1AP : Building F1 Setup Request\n");
    do
    {
@@ -978,7 +1080,7 @@ S16 BuildAndSendF1SetupReq()
       f1SetupReq->protocolIEs.list.array[idx2]->value.present = \
          F1SetupRequestIEs__value_PR_GNB_DU_ID;
       f1SetupReq->protocolIEs.list.array[idx2]->value.choice.GNB_DU_ID.size =\
-                                                                    sizeof(U8);
+                                                                    sizeof(uint8_t);
 
       DU_ALLOC(f1SetupReq->protocolIEs.list.array[idx2]->value.choice.GNB_DU_ID.buf,\
            f1SetupReq->protocolIEs.list.array[idx2]->value.choice.GNB_DU_ID.size);
@@ -1022,12 +1124,11 @@ S16 BuildAndSendF1SetupReq()
                             F1SetupRequestIEs__value_PR_GNB_DU_Served_Cells_List;
       duServedCell = &f1SetupReq->protocolIEs.list.\
                   array[idx2]->value.choice.GNB_DU_Served_Cells_List;
-      BuildServedCellListreturn = BuildServedCellList(duServedCell);
-      if(BuildServedCellListreturn != ROK)
+      ServedCellListreturn = BuildServedCellList(duServedCell);
+      if(ServedCellListreturn != ROK)
       {
          break;
       }
-
       /*RRC Version*/
       idx2++;
       f1SetupReq->protocolIEs.list.array[idx2]->id = \
@@ -1037,7 +1138,6 @@ S16 BuildAndSendF1SetupReq()
                                     F1SetupRequestIEs__value_PR_RRC_Version;
       rrcVer = &f1SetupReq->protocolIEs.list.array[idx2]->value.choice.RRC_Version;
       BuildRrcVerreturn = BuildRrcVer(rrcVer);
-      ieId = 0;
       if(BuildRrcVerreturn != ROK)
       {
                        break;
@@ -1045,7 +1145,7 @@ S16 BuildAndSendF1SetupReq()
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
       /* Encode the F1SetupRequest type as APER */
-      cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+      memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
       encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
          encBuf);
@@ -1072,60 +1172,14 @@ S16 BuildAndSendF1SetupReq()
            DU_LOG("\nF1AP : Sending F1 Setup request failed");
                          break;
       }
-               ret=true;
-      break;
-   }while(1);
-
-   if(f1apMsg != NULLP)
-   {
 
-      if(f1apMsg->choice.initiatingMessage != NULLP)
-      {
-         if(f1SetupReq->protocolIEs.list.array != NULLP)
-         {
-            if(idx == elementCnt-1)
-            {
-               if(f1SetupReq->protocolIEs.list.array[1]->value.choice.GNB_DU_ID.buf !=  NULLP)
-               {
-                   if(f1SetupReq->protocolIEs.list.array[2]->value.choice.GNB_DU_Name.buf != NULLP)
-                   {
-                                                    if(BuildServedCellListreturn == ROK)
-                                                         {   
-                                                             FreeRrcVer(rrcVer);
-                                                         }
-                                                         FreeServedCellList(duServedCell);
-                                                         DU_FREE(f1SetupReq->protocolIEs.list.array[2]->value.choice.GNB_DU_Name.buf, strlen((char *)duCfgParam.duName));
-                   }
-                   DU_FREE(f1SetupReq->protocolIEs.list.array[1]->value.choice.GNB_DU_ID.buf, sizeof(U8));
-                }
-                         for(idx=0; idx<elementCnt; idx++)
-                {
-                    DU_FREE(f1SetupReq->protocolIEs.list.array[idx],sizeof(F1SetupRequestIEs_t));
-                }
-            }
-            else
-            {
-                for(ieId=0 ; ieId<idx ;ieId++)
-                {
-                                           if(f1SetupReq->protocolIEs.list.array[ieId]!=NULLP)
-                   {
-                                                    DU_FREE(f1SetupReq->protocolIEs.list.array[ieId],\
-                       sizeof(F1SetupRequestIEs_t));
-                                                }
-                }
-            }
-            DU_FREE(f1SetupReq->protocolIEs.list.array,\
-               elementCnt * sizeof(F1SetupRequestIEs_t *));
-         }
-         DU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
-      }
-      DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
-   }
+               ret=ROK;
+      break;
+   }while(true);
 
-       if(ret==true)
-   return ROK;  
-       else
-       return RFAILED;
+       FreeF1SetupReq(f1apMsg);
+       
+       return ret;
 }/* End of BuildAndSendF1SetupReq */
 
 /*******************************************************************
@@ -1146,26 +1200,26 @@ S16 BuildAndSendF1SetupReq()
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildAndSendDUConfigUpdate()
+uint8_t BuildAndSendDUConfigUpdate()
 {
-   U8 idx;
-       U8 idy;
-       U8 idx1;
-       U8 idy1;
-       U8 idy2;
-   U8 elementCnt;
-       U8 modifyCnt;
-       U8 servPlmnCnt;
-       U8 extensionCnt;
+   uint8_t idx;
+       uint8_t idy;
+       uint8_t idx1;
+       uint8_t idy1;
+       uint8_t idy2;
+   uint8_t elementCnt;
+       uint8_t modifyCnt;
+       uint8_t servPlmnCnt;
+       uint8_t extensionCnt;
    asn_enc_rval_t encRetVal;      /* Encoder return value */
    F1AP_PDU_t *f1apDuCfg = NULL;
    GNBDUConfigurationUpdate_t *duCfgUpdate;
    Served_Cells_To_Modify_List_t  *cellsToModify;
    Served_Cells_To_Modify_Item_t *modifyItem;
-   bool checkvar=false;
-   U8 i;
+   uint8_t ret= RFAILED;
+   uint8_t i;
 
-       while(1)
+       while(true)
        {
            DU_LOG("\nF1AP : Building DU config update\n");
                 /* Allocate the memory for F1DuCfg */
@@ -1567,7 +1621,7 @@ S16 BuildAndSendDUConfigUpdate()
        xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apDuCfg);
    
        /* Encode the DU Config Update type as APER */
-       cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+       memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
        encBufSize = 0;
        encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apDuCfg, PrepFinalEncBuf, encBuf);
 
@@ -1591,65 +1645,102 @@ S16 BuildAndSendDUConfigUpdate()
           DU_LOG("\nF1AP : Sending GND-DU Config Update failed");
                         break;
        }
-                checkvar=true;
+                
+                ret = ROK;
                 break;
-       }
+        }
+        FreeDUConfigUpdate(f1apDuCfg);
+    
+        return ret;
+}
+ /*******************************************************************
+ *
+ * @brief Deallocating memory of BuildAndSendDUConfigUpdate
+ *
+ * @details
+ *
+ *    Function : FreeDUConfigUpdate
+ *
+ *    Functionality: Deallocating memory of variables allocated in
+ *                    BuildAndSendDUConfigUpdate function
+ *
+ * @params[in]  F1AP_PDU_t *f1apDuCfg
+ *
+ * @return ROK     - void
+ *
+ * ****************************************************************/
+void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg)
+{
+   uint8_t  i;
+       uint8_t  idx;
+   GNBDUConfigurationUpdate_t *duCfgUpdate;
+   Served_Cells_To_Modify_List_t  *cellsToModify;
+   Served_Cells_To_Modify_Item_t *modifyItem;
+   idx=0;
+   i=1;
    if(f1apDuCfg != NULLP)
        {
            if(f1apDuCfg->choice.initiatingMessage != NULLP)
                 {
+                    duCfgUpdate = &f1apDuCfg->choice.initiatingMessage->\
+                         value.choice.GNBDUConfigurationUpdate;
                     if(duCfgUpdate->protocolIEs.list.array != NULLP)
                          {
-                             if(idx==elementCnt)
-                                       {
-                                           if(cellsToModify->list.array != NULLP)
-                                                {
-                                                    if(idy==modifyCnt)
-                                                         {
-                                                             if(modifyItem->oldNRCGI.pLMN_Identity.buf != NULLP)
-                           {
+                                   if(duCfgUpdate->protocolIEs.list.array[i] != NULLP)
+                                        {
+                                             cellsToModify = &duCfgUpdate->protocolIEs.list.array[i]->\
+                                                       value.choice.Served_Cells_To_Modify_List;
+                                             if(cellsToModify->list.array != NULLP)
+                                             {
+                                                          if(cellsToModify->list.array[idx] != NULLP)
+                                                               {
+                                                                        modifyItem=&cellsToModify->list.array[idx]->value.choice.\
+                                                                        Served_Cells_To_Modify_Item;
+                                                                        if(modifyItem->oldNRCGI.pLMN_Identity.buf != NULLP)
+                            {
                                                                            if(modifyItem->oldNRCGI.nRCellIdentity.buf != NULLP)
-                                                                                {
+                                                                           {
                                                                                      if(modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.buf != NULLP)
-                                                                                               {
-                                                                                                    if(modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.buf
-                                                                                                         != NULLP)
+                                                                                          {
+                                                                                                    if(modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.buf
+                                                                                                    != NULLP)
                                                                                                          { 
                                                                                                              if(modifyItem->served_Cell_Information.servedPLMNs.list.array\
                                                                                                                        != NULLP)
                                                                                                                         {
-                                                                                                                            if(idy1==servPlmnCnt)
+                                                                                                                            if(!modifyItem->served_Cell_Information.servedPLMNs.list.array[idx])
                                                                                                                                  {
-                                                                                                                                     if(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                                                                                           array[0]->pLMN_Identity.buf != NULLP)
-                                                      {
+                                                                                                                                      if(modifyItem->served_Cell_Information.servedPLMNs.list.\
+                                                                                                                                           array[idx]->pLMN_Identity.buf != NULLP)
+                                                       {
                                                            if(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                                                                                                           array[0]->iE_Extensions!= NULLP)
+                                                                                                                                                           array[idx]->iE_Extensions!= NULLP)
                                                                                                                                                                 {
                                                                                                                                                                     if(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                 array[0]->iE_Extensions->list.array != NULLP)
+                                                                 array[idx]->iE_Extensions->list.array != NULLP)
                                                                                                                                                                          {
-                                                                                                                                                                             if(idy2==extensionCnt)
-                                                                                                                                                                                       {
-                                                                                                                                                                                          if(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                               iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                               list.array !=NULLP)
+                                                                                                                                                                                          if(modifyItem->served_Cell_Information.servedPLMNs.list.\
+                                                                                                                                                                                               array[idx]->iE_Extensions->list.array[idx])
                                                                                                                                                                                                {
-                                                                                                                                                                                                  if(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                        list.array[0]!=NULLP)
-                                                                                                                                                                                                        {   
-                                                                                                                                                                                                            if(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                                 iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                                 list.array[0]->sNSSAI.sST.buf!=NULLP)
-                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                    if(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                                         iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                                         list.array[0]->sNSSAI.sD != NULLP)
-                                                                                                                                                                                                                         {
-                                                                                                                                                                                                                              if(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                                                        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                                                         list.array[0]->sNSSAI.sD->buf!=NULLP)
+                                                                                                                                                                                                  if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                  iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                  list.array !=NULLP)
+                                                                                                                                                                                                  {
+                                                                                                                                                                                                     if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                          iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                          list.array[idx]!=NULLP)
+                                                                                                                                                                                                          {   
+                                                                                                                                                                                                             if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                                  iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                                  list.array[idx]->sNSSAI.sST.buf!=NULLP)
+                                                                                                                                                                                                                  {
+                                                                                                                                                                                                                     if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                                          iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                                          list.array[idx]->sNSSAI.sD != NULLP)
+                                                                                                                                                                                                                          { 
+                                                                                                                                                                                                                              if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                                                        iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                                                         list.array[idx]->sNSSAI.sD->buf!=NULLP)
                                                                                                                                                                                                                                         {
                                                                                                                                                                                                                                             if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD
                                                                                                                                                                                                                                                  !=NULLP)
@@ -1658,26 +1749,28 @@ S16 BuildAndSendDUConfigUpdate()
                                                                                                                                                                                                                                                          fDD->uL_NRFreqInfo.freqBandListNr.list.array!=NULLP)
                                                                                                                                                                                                                                                     {
                                                                                                                                                                                                                                                              if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                                                                                                                                                                                                                       fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]!=NULLP)
+                                                                                                                                                                                                                                                                       fDD->uL_NRFreqInfo.freqBandListNr.list.array[idx]!=NULLP)
                                                                                                                                                                                                                                                                        {
                                                                                                                                                                                                                                                                            if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
                                                                                                                                                                                                                                                                                 fDD->dL_NRFreqInfo.freqBandListNr.list.array !=NULLP)
                                                                                                                                                                                                                                                                            {
                                                                                                                                                                                                                                                                                    if(modifyItem->served_Cell_Information.nR_Mode_Info.\
                                                                                                                                                                                                                                                                                         choice.fDD->dL_NRFreqInfo.freqBandListNr.list.\
-                                                                                                                                                                                                                                                                                        array[0]!= NULLP)
+                                                                                                                                                                                                                                                                                        array[idx]!= NULLP)
                                                                                                                                                                                                                                                                                         {
                                                                                                                                                                                                                                                                                            if(modifyItem->served_Cell_Information.\
                                                                                                                                                                                                                                                                                                 measurementTimingConfiguration.buf !=NULLP)
                                                                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                                                                  if(duCfgUpdate->protocolIEs.list.array[2]->value.\
+                                                                                                                                                                                                                                                                                                  idx=2;
+                                                                                                                                                                                                                                                                                                  if(duCfgUpdate->protocolIEs.list.array[idx]->value.\
                                                                                                                                                                                                                                                                                                        choice.GNB_DU_ID.buf!=NULLP)
                                                                                                                {
                                                                                                                                                                                                                                                                                                            DU_FREE(duCfgUpdate->protocolIEs.list.\
-                                                                                                                                                                                                                                                                                                                array[2]->value.choice.GNB_DU_ID.buf,\
-                                                                                                                                                                                                                                                                                                                duCfgUpdate->protocolIEs.list.array[2]->\
+                                                                                                                                                                                                                                                                                                                array[idx]->value.choice.GNB_DU_ID.buf,\
+                                                                                                                                                                                                                                                                                                                duCfgUpdate->protocolIEs.list.array[idx]->\
                                                                                                                                                                                                                                                                                                                 value.choice.GNB_DU_ID.size);
                                                                                                                                                                                                                                                                                                        }
+                                                                                                                                                                                                                                                                                                       idx=0;
                                                                                                                                                                                                                                                                                                   DU_FREE(modifyItem->served_Cell_Information.\
                                                                                                                                                                                                                                                                                                        measurementTimingConfiguration.\
                                                                                                                                                                                                                                                                                                        buf,modifyItem->served_Cell_Information.\
@@ -1685,7 +1778,7 @@ S16 BuildAndSendDUConfigUpdate()
                                                                                                                                                                                                                                                                                                 }
                                                                                                                                                                                                                                                                                            DU_FREE(modifyItem->served_Cell_Information.\
                                                                                                                                                                                                                                                                                                nR_Mode_Info.choice.fDD->dL_NRFreqInfo.freqBandListNr.\
-                                                                                                                                                                                                                                                                                          list.array[0],sizeof(FreqBandNrItem_t));
+                                                                                                                                                                                                                                                                                          list.array[idx],sizeof(FreqBandNrItem_t));
                                                                                                                                                                                                                                                                                         }
                                                                                                                                                                                                                                                                                         DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info\
                                                                                                                                                                                                                                                                                         .choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array,\
@@ -1694,141 +1787,167 @@ S16 BuildAndSendDUConfigUpdate()
                                                                                                                                                                                                                                                                                 }
                                                                                                                                                                                                                                                                                 DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.\
                                                                                                                                                                                                                                                                                 choice.fDD->uL_NRFreqInfo.freqBandListNr.list.\
-                                                                                                                                                                                                                                                                                array[0],sizeof(FreqBandNrItem_t));
+                                                                                                                                                                                                                                                                                array[idx],sizeof(FreqBandNrItem_t));
                                                                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                                                            DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                                                                                                                                                                                                                 fDD->uL_NRFreqInfo.freqBandListNr.list.\
-                                                                                                                                                                                                                                                                 array,modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                                                                                                                                                                                                                 fDD->uL_NRFreqInfo.freqBandListNr.list.size);
-                                                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                                                    DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                                                                                                                                                                                                         fDD,sizeof(FDD_Info_t));
-                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                           DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                                                                iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                                                                 list.array[0]->sNSSAI.sD->buf,modifyItem->served_Cell_Information.\
-                                                                                                                                                                                                                                                servedPLMNs.list.array[0]->iE_Extensions->list.array[0]->\
-                                                                                                                                                                                                                                                extensionValue.choice.SliceSupportList.list.array[0]->sNSSAI.sD->size);
-
-                                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                             DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                                                       iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                                                       list.array[0]->sNSSAI.sD,sizeof(OCTET_STRING_t));
-                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                    DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                                         iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                                         list.array[0]->sNSSAI.sST.buf,modifyItem->served_Cell_Information.servedPLMNs.\
-                                                                                                                                                                                                                         list.array[0]->iE_Extensions->list.array[0]->extensionValue.choice.\
-                                                                                                                                                                                                                         SliceSupportList.list.array[0]->sNSSAI.sST.size);
-                                                                                                                                                                                                                 }
-                                                                                                                                                                                                            DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                                 iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                                 list.array[0],sizeof(SliceSupportItem_t));
-                                                                                                                                                                                                        }
-                                                                                                                                                                                                  DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                       iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-                                                                                                                                                                                                   list.array,\
-                                                                                                                                                                                                        modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->\
-                                                                                                                                                                                                        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.list.size);
-                                                                                                                                                                                               }
-                                                                                                                                                                                          for(i=0;i<extensionCnt;i++)
-                                                                                                                                                                                               {
-                                                                                                                                                                                                   DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                                                                                                                                                        array[0]->iE_Extensions->list.array[i],\
-                                                                                                                                                                                                        sizeof(ServedPLMNs_ItemExtIEs_t ));
-                                                                                                                                                                                               }
+                                                                                                                                                                                                                                                             DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.\
+                                                                                                                                                                                                                                                                       choice.\
+                                                                                                                                                                                                                                                                  fDD->uL_NRFreqInfo.freqBandListNr.list.\
+                                                                                                                                                                                                                                                                  array,modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
+                                                                                                                                                                                                                                                                  fDD->uL_NRFreqInfo.freqBandListNr.list.size);
+                                                                                                                                                                                                                                                          }
+                                                                                                                                                                                                                                                     DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
+                                                                                                                                                                                                                                                          fDD,sizeof(FDD_Info_t));
+                                                                                                                                                                                                                                                  }
+                                                                                                                                                                                                                                             DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
+                                                                                                                                                                                                                                                       array[idx]->iE_Extensions->list.array[idx]->extensionValue.choice.\
+                                                                                                                                                                                                                                                       SliceSupportList.\
+                                                                                                                                                                                                                                                  list.array[idx]->sNSSAI.sD->buf,modifyItem->served_Cell_Information.\
+                                                                                                                                                                                                                                                  servedPLMNs.list.array[idx]->iE_Extensions->list.array[idx]->\
+                                                                                                                                                                                                                                                  extensionValue.choice.SliceSupportList.list.array[idx]->\
+                                                                                                                                                                                                                                                       sNSSAI.sD->size);
+
+                                                                                                                                                                                                                                          }
+                                                                                                                                                                                                                                DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
+                                                                                                                                                                                                                                               array[idx]->\
+                                                                                                                                                                                                                                          iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                                                          list.array[idx]->sNSSAI.sD,sizeof(OCTET_STRING_t));
+                                                                                                                                                                                                                            }
+                                                                                                                                                                                                                       DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                                            iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                                            list.array[idx]->sNSSAI.sST.buf,modifyItem->served_Cell_Information.\
+                                                                                                                                                                                                                                 servedPLMNs.\
+                                                                                                                                                                                                                            list.array[idx]->iE_Extensions->list.array[idx]->extensionValue.choice.\
+                                                                                                                                                                                                                            SliceSupportList.list.array[idx]->sNSSAI.sST.size);
+                                                                                                                                                                                                                   }
+                                                                                                                                                                                                              DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                                   iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                                   list.array[idx],sizeof(SliceSupportItem_t));
+                                                                                                                                                                                                     }
+                                                                                                                                                                                                     DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                     iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
+                                                                                                                                                                                                     list.array,\
+                                                                                                                                                                                                     modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
+                                                                                                                                                                                                     iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.list.size);
+                                                                                                                                                                                                }
                                                                                                                                                                                        }
-                                                                                                                                                                                       else
+                                                                                                                                                                                       for(i=0;i<modifyItem->served_Cell_Information.servedPLMNs.list.\
+                                                                                                                                                                                       array[idx]->iE_Extensions->list.count;i++)
                                                                                                                                                                                        {
-                                                                                                                                                                                           for(i=0;i<idy2;i++)
-                                                                                                                                                                                                {
                                                                                                                                                                                                    DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                                                                                                                                                         array[0]->iE_Extensions->list.array[i],\
-                                                                                                                                                                                                         sizeof(ServedPLMNs_ItemExtIEs_t));
-                                                                                                                                                                                                }
+                                                                                                                                                                                                        array[idx]->iE_Extensions->list.array[i],\
+                                                                                                                                                                                                        sizeof(ServedPLMNs_ItemExtIEs_t ));
                                                                                                                                                                                        }
                                                                                                                                                                              DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                                                                                                                                  array[0]->iE_Extensions->list.array,modifyItem->served_Cell_Information.servedPLMNs.
-                                                                                                                                                                                       list.array[0]->iE_Extensions->list.size);
+                                                                                                                                                                                  array[idx]->iE_Extensions->list.array,modifyItem->served_Cell_Information.servedPLMNs.
+                                                                                                                                                                                       list.array[idx]->iE_Extensions->list.size);
                                                                                                                                                                          }
                                                                                                                                                                     DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                                                                                                                           array[0]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
+                                                                                                                                                                           array[idx]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
                                                                                                                                                                 }
                                                                                                                                               DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                                                                                                   array[0]->pLMN_Identity.buf,
-                                                                                                                                                        modifyItem->served_Cell_Information.servedPLMNs.list.array[0]->pLMN_Identity.size);
-                                                                                                                                               }
-                                                      for(i=0;i<idy1;i++)
-                                                                                                                                               {
-                                                                                                                                                  DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[i],\
-                                                                                                                                                       sizeof(ServedPLMNs_Item_t));
-                                                                                                                                               }
-                                                                                                                                 }
-                                                                                                                                 else
-                                                                                                                                 {
-                                                                                                                                    for(i=0;i<idy1;i++)
-                                                                                                                                         {
-                                                                                                                                            DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[i],\
-                                                                                                                                                 sizeof(ServedPLMNs_Item_t));
-                                                                                                                                         }
-                                                                                                                                 }
-                                                                                                                            DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array,\
-                                                                                                                                 modifyItem->served_Cell_Information.servedPLMNs.list.size);
-                                                                                                                        }
-                                                                                                              DU_FREE(modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.buf,\
+                                                                                                                                                   array[idx]->pLMN_Identity.buf,
+                                                                                                                                                        modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->pLMN_Identity.size);
+                                                                                                                                                }
+                                                    }
+                                                    for(i=0;i<modifyItem->served_Cell_Information.servedPLMNs.list.count;i++)
+                                                                                                                                        {
+                                                                                                                                                   if(modifyItem->served_Cell_Information.servedPLMNs.list.array[i]
+                                                                                                                                                        != NULLP)
+                                                                                                                                                   {
+                                                                                                                                                            DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[i],\
+                                                                                                                                                            sizeof(ServedPLMNs_Item_t));
+                                                                                                                                                        }
+                                                                                                                                        }
+                                                                                                                              DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array,\
+                                                                                                                                   modifyItem->served_Cell_Information.servedPLMNs.list.size);
+                                                                                                                         }
+                                                                                                               DU_FREE(modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.buf,\
                                                                                                                          modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.size);               
                                                                                                          }
                                                                                                    DU_FREE(modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.buf,\
                                                                                                          modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.size);
                                                                                                }
-                                                                                    DU_FREE(modifyItem->oldNRCGI.nRCellIdentity.buf,\
+                                                                                     DU_FREE(modifyItem->oldNRCGI.nRCellIdentity.buf,\
                                                                                             modifyItem->oldNRCGI.nRCellIdentity.size);
-                               }
-                                                                           DU_FREE(modifyItem->oldNRCGI.pLMN_Identity.buf,\
-                                                                                 modifyItem->oldNRCGI.pLMN_Identity.size);
-                                                                       }
-                                                                        for(int iy=0; iy<modifyCnt ;iy++)
-                                                                        {
-                                                                           DU_FREE(cellsToModify->list.array[iy],\
-                                                                                 sizeof(Served_Cells_To_Modify_ItemIEs_t));
-                                                                        }
-                                                         }
-                                                         else
-                                                         {
-                                                            for(int iy=0; iy<idy ;iy++)
+                                 }
+                                                                             DU_FREE(modifyItem->oldNRCGI.pLMN_Identity.buf,\
+                                                                                  modifyItem->oldNRCGI.pLMN_Identity.size);
+                                                                     }
+                          }
+                                                                 for(i=0; i<cellsToModify->list.count ;i++)
                                                                  {
-                                                                    DU_FREE(cellsToModify->list.array[iy],\
-                                                                          sizeof(Served_Cells_To_Modify_ItemIEs_t));
-                                                                 }     
-                                                         }
-                                                    DU_FREE(cellsToModify->list.array,cellsToModify->list.size);
+                                                                           if(cellsToModify->list.array[i] != NULLP)
+                                                                                {
+                                                                                   DU_FREE(cellsToModify->list.array[i],\
+                                                                                   sizeof(Served_Cells_To_Modify_ItemIEs_t));
+                                                                                } 
+                                                                 }
+                                                       DU_FREE(cellsToModify->list.array,cellsToModify->list.size);
+                                                    }
                                                 }
-                                           for(i=0;i<elementCnt;i++)
+                                           for(i=0;i<duCfgUpdate->protocolIEs.list.count;i++)
                                                 {
-                                              DU_FREE(duCfgUpdate->protocolIEs.list.array[i],\
-                                                          sizeof(GNBDUConfigurationUpdateIEs_t));
+                                                     if(duCfgUpdate->protocolIEs.list.array[i] !=NULLP)
+                                                               {
+                                                    DU_FREE(duCfgUpdate->protocolIEs.list.array[i],\
+                                                              sizeof(GNBDUConfigurationUpdateIEs_t));
+                                                               }
                                                 }
-                                       }
-                                       else
-                                       {
-                                          for(i=0;i<idx;i++)
-                                               {
-                                                  DU_FREE(duCfgUpdate->protocolIEs.list.array[i],\
-                                                        sizeof(GNBDUConfigurationUpdateIEs_t));
-                                               }
-                                       }
-               DU_FREE(duCfgUpdate->protocolIEs.list.array,duCfgUpdate->protocolIEs.list.size);
-                         }
-                          DU_FREE(f1apDuCfg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-                }
+                   DU_FREE(duCfgUpdate->protocolIEs.list.array,duCfgUpdate->protocolIEs.list.size);
+                           }
+                           DU_FREE(f1apDuCfg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+                 }
                  DU_FREE(f1apDuCfg, (Size)sizeof(F1AP_PDU_t));
        }
-   if(checkvar==true)
-      return ROK;
-       else 
-          return RFAILED;
-}/* End of BuildAndSendDUConfigUpdate */
+}
+ /*******************************************************************
+ *
+ * @brief free the ULRRCMessageTransfer
+ *
+ * @details
+ *
+ *    Function : FreeULRRCMessageTransfer
+ *
+ *    Functionality: Deallocating the memory of variable allocated in
+ *                      FreeULRRCMessageTransfer
+ *
+ * @params[in]
+ *
+ * @return ROK     - void
+ *
+ ******************************************************************/
+void FreeULRRCMessageTransfer( F1AP_PDU_t *f1apMsg)
+{
+     uint8_t idx1;
+     ULRRCMessageTransfer_t  *ulRRCMsg;
 
+     if(f1apMsg != NULLP)
+     { 
+         if(f1apMsg->choice.initiatingMessage != NULLP)
+         {
+             ulRRCMsg = &f1apMsg->choice.initiatingMessage->value.choice.ULRRCMessageTransfer;
+                                if(ulRRCMsg->protocolIEs.list.array != NULLP)
+             {
+                 for(idx1=0;idx1<ulRRCMsg->protocolIEs.list.count;idx1++)
+                 {
+                     if(ulRRCMsg->protocolIEs.list.array[idx1] != NULLP)
+                     {
+                        if(ulRRCMsg->protocolIEs.list.array[idx1]->value.present ==
+                           ULRRCMessageTransferIEs__value_PR_RRCContainer)
+                        {
+                           DU_FREE(ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf,
+                              ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size);
+                        }
+                         DU_FREE(ulRRCMsg->protocolIEs.list.array[idx1],sizeof(ULRRCMessageTransferIEs_t));
+                     }
+                 }
+                 DU_FREE(ulRRCMsg->protocolIEs.list.array,ulRRCMsg->protocolIEs.list.size );
+             }
+             DU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+         }
+         DU_FREE(f1apMsg,sizeof(F1AP_PDU_t));
+      }
+}
 /*******************************************************************
  *
  * @brief Builds and sends the ULRRCMessageTransfer 
@@ -1846,149 +1965,138 @@ S16 BuildAndSendDUConfigUpdate()
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildAndSendULRRCMessageTransfer()
+uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb  ueCb, uint8_t lcId, \
+    uint16_t msgLen, uint8_t *rrcMsg)
 {
-       U8   elementCnt;
-       U8   idx1;
-       U8   idx;
-       F1AP_PDU_t                              *f1apMsg = NULL;
+   uint8_t   elementCnt;
+   uint8_t   idx1;
+   uint8_t   idx;
+   F1AP_PDU_t                  *f1apMsg = NULL;
    ULRRCMessageTransfer_t      *ulRRCMsg;
-       asn_enc_rval_t                          encRetVal;        /* Encoder return value */
-   bool checkvar=false;
-       while(1)
-       {
-          DU_LOG("\n F1AP : Building UL RRC Message Transfer Message\n");
+   asn_enc_rval_t              encRetVal;        /* Encoder return value */
+   uint8_t ret =RFAILED;
+   while(true)
+   {
+      DU_LOG("\n F1AP : Building UL RRC Message Transfer Message\n");
 
-          DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
-          if(f1apMsg == NULLP)
-          {
-                  DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
-                       break;
-          }
+      DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+        DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
+        break;
+      }
 
-          f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
-       DU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-          if(f1apMsg->choice.initiatingMessage == NULLP)
-          {
-                  DU_LOG(" F1AP : Memory allocation for        F1AP-PDU failed");
-                       break;
-          }
-       f1apMsg->choice.initiatingMessage->procedureCode = \
-                                                                                               ProcedureCode_id_ULRRCMessageTransfer;
-          f1apMsg->choice.initiatingMessage->criticality = Criticality_ignore;
-          f1apMsg->choice.initiatingMessage->value.present = \
-                                                               InitiatingMessage__value_PR_ULRRCMessageTransfer;
-          ulRRCMsg =
-                   &f1apMsg->choice.initiatingMessage->value.choice.ULRRCMessageTransfer;
-          elementCnt = 3;
-       ulRRCMsg->protocolIEs.list.count = elementCnt;
-          ulRRCMsg->protocolIEs.list.size = \
-                                                                       elementCnt * sizeof(ULRRCMessageTransferIEs_t *);
-
-           /* Initialize the F1Setup members */
-          DU_ALLOC(ulRRCMsg->protocolIEs.list.array, ulRRCMsg->protocolIEs.list.size);
-          if(ulRRCMsg->protocolIEs.list.array == NULLP)
-          {
-                   DU_LOG(" F1AP : Memory allocation for UL RRC MessageTransferIEs failed");
-                        break;
-       }
-          for(idx=0; idx<elementCnt; idx++)
-          {
-                  DU_ALLOC(ulRRCMsg->protocolIEs.list.array[idx],sizeof(ULRRCMessageTransferIEs_t));
-               if(ulRRCMsg->protocolIEs.list.array[idx] == NULLP)
-                  {
-                          break;
-                  }
-          }
+      f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
+      DU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+      if(f1apMsg->choice.initiatingMessage == NULLP)
+      {
+        DU_LOG(" F1AP : Memory allocation for  F1AP-PDU failed");
+        break;
+      }
+      f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_ULRRCMessageTransfer;
+      f1apMsg->choice.initiatingMessage->criticality = Criticality_ignore;
+      f1apMsg->choice.initiatingMessage->value.present = \
+       InitiatingMessage__value_PR_ULRRCMessageTransfer;
+      ulRRCMsg =
+        &f1apMsg->choice.initiatingMessage->value.choice.ULRRCMessageTransfer;
+      elementCnt = 4;
+      ulRRCMsg->protocolIEs.list.count = elementCnt;
+      ulRRCMsg->protocolIEs.list.size = \
+       elementCnt * sizeof(ULRRCMessageTransferIEs_t *);
 
-          idx1 = 0;
-
-           /*GNB CU UE F1AP ID*/
-          ulRRCMsg->protocolIEs.list.array[idx1]->id   = \
-                                                                                ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
-          ulRRCMsg->protocolIEs.list.array[idx1]->criticality  =       Criticality_reject;
-          ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
-                               ULRRCMessageTransferIEs__value_PR_GNB_CU_UE_F1AP_ID;
-       ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_CU_UE_F1AP_ID = CU_ID;
-
-          /*GNB DU UE F1AP ID*/
-          idx1++;
-       ulRRCMsg->protocolIEs.list.array[idx1]->id      = \
-                                                                                ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
-          ulRRCMsg->protocolIEs.list.array[idx1]->criticality  =       Criticality_reject;
-          ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
-                               ULRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
-          ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_DU_UE_F1AP_ID = DU_ID;
-
-          /*SRBID*/
-          idx1++;
-          ulRRCMsg->protocolIEs.list.array[idx1]->id   = \
-                                                                                                                ProtocolIE_ID_id_SRBID;
-          ulRRCMsg->protocolIEs.list.array[idx1]->criticality  =       Criticality_reject;
-          ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
-                                                               ULRRCMessageTransferIEs__value_PR_SRBID;
-          ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.SRBID = UL_SRBID;
-
-          /*RRCContainer*/
-          //YET TO FILL
-
-          xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
-
-          /* Encode the F1SetupRequest type as APER */
-          cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
-          encBufSize = 0;
-          encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
-                       encBuf);
-          /* Encode results */
-          if(encRetVal.encoded == ENCODE_FAIL)
-          {
-                    DU_LOG( "\n F1AP : Could not encode ULRRCMessageTransfer structure (at %s)\n",\
-                               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-                         break;
-          }
-          else
-          {
-                   DU_LOG("\n F1AP : Created APER encoded buffer for ULRRCMessageTransfer\n");
-                   for(int i=0; i< encBufSize; i++)
-                   {
-                            printf("%x",encBuf[i]);
-                   }
-          }
+      /* Initialize the F1Setup members */
+      DU_ALLOC(ulRRCMsg->protocolIEs.list.array, ulRRCMsg->protocolIEs.list.size);
+      if(ulRRCMsg->protocolIEs.list.array == NULLP)
+      {
+        DU_LOG(" F1AP : Memory allocation for UL RRC MessageTransferIEs failed");
+        break;
+      }
+      for(idx=0; idx<elementCnt; idx++)
+      {
+        DU_ALLOC(ulRRCMsg->protocolIEs.list.array[idx],sizeof(ULRRCMessageTransferIEs_t));
+        if(ulRRCMsg->protocolIEs.list.array[idx] == NULLP)
+        {
+           break;
+        }
+      }
 
-          /* Sending  msg  */
-          if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL)    !=      ROK)
-          {
-                   DU_LOG("\n F1AP : Sending   UL RRC Message Transfer Failed");
-                        break;
-               }
-      checkvar=true;
-               break;
-       }
+      idx1 = 0;
+
+      /*GNB CU UE F1AP ID*/
+      ulRRCMsg->protocolIEs.list.array[idx1]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+      ulRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
+       ULRRCMessageTransferIEs__value_PR_GNB_CU_UE_F1AP_ID;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_CU_UE_F1AP_ID = ueCb.gnbCuUeF1apId;
+
+      /*GNB DU UE F1AP ID*/
+      idx1++;
+      ulRRCMsg->protocolIEs.list.array[idx1]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      ulRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
+         ULRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_DU_UE_F1AP_ID = ueCb.gnbDuUeF1apId;
+
+      /*SRBID*/
+      idx1++;
+      ulRRCMsg->protocolIEs.list.array[idx1]->id = ProtocolIE_ID_id_SRBID;
+      ulRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
+       ULRRCMessageTransferIEs__value_PR_SRBID;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.SRBID = lcId;
+
+      /*RRCContainer*/
+      idx1++;
+      ulRRCMsg->protocolIEs.list.array[idx1]->id  = ProtocolIE_ID_id_RRCContainer;
+      ulRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
+         ULRRCMessageTransferIEs__value_PR_RRCContainer;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size = msgLen;
+      DU_ALLOC(ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf,
+         ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size)
+      if(!ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf)
+      {
+         DU_LOG(" F1AP : Memory allocation for BuildAndSendULRRCMessageTransfer failed");
+         break;
+      }
+      memcpy(ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf, \
+         rrcMsg, ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size);
 
-       if(f1apMsg != NULLP)
-       {
-          if(f1apMsg->choice.initiatingMessage != NULLP) 
-          {
-                  if(ulRRCMsg->protocolIEs.list.array != NULLP)
-                       {
-                                for(idx1=0;idx1<idx;idx1++)
-                                {
-                                     if(ulRRCMsg->protocolIEs.list.array[idx1] != NULLP)
-                                         {
-                                                 DU_FREE(ulRRCMsg->protocolIEs.list.array[idx1],sizeof(ULRRCMessageTransferIEs_t));
-                                         }
-                                }
-                           DU_FREE(ulRRCMsg->protocolIEs.list.array,ulRRCMsg->protocolIEs.list.size ); 
-                       }
-                  DU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-               }
-          DU_FREE(f1apMsg,sizeof(F1AP_PDU_t));
-       }
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
-       if(checkvar==true)
-      return ROK;
-       else
-          return RFAILED;
+      /* Encode the F1SetupRequest type as APER */
+      memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
+           encBuf);
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+        DU_LOG( "\n F1AP : Could not encode ULRRCMessageTransfer structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\n F1AP : Created APER encoded buffer for ULRRCMessageTransfer\n");
+        for(int i=0; i< encBufSize; i++)
+        {
+           printf("%x",encBuf[i]);
+        }
+      }
+
+      /* Sending  msg  */
+      if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL)        !=      ROK)
+      {
+        DU_LOG("\n F1AP : Sending      UL RRC Message Transfer Failed");
+        break;
+      }
+      ret = ROK;
+      break;
+   }
+   FreeULRRCMessageTransfer(f1apMsg);
+
+       return ret;
 }/* End of BuildAndSendULRRCMessageTransfer*/
 
 /*******************************************************************
@@ -2395,1617 +2503,2786 @@ uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddMod
 
 /*******************************************************************
  *
- * @brief Builds intitial DL BWP
- * @details
- *
- *    Function : BuildInitialDlBWP 
- *
- *    Functionality: Builds intitial DL BWP in spCellCfgDed
- *
- * @params[in] BWP_DownlinkDedicated_t *dlBwp
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
-{
-
-   return ROK;
-}
-
-/*******************************************************************
+ * @brief Build Control resource set to add/modify list 
  *
- * @brief Builds UL config
  * @details
  *
- *    Function : BuildUlCfg 
+ *    Function : BuildControlRSetToAddModList
  *
- *    Functionality: Builds UL config in spCellCfgDed
+ *    Functionality: Build Control resource set to add/modify list
  *
- * @params[in] UplinkConfig_t *ulCfg
+ * @params[in] 
+ * struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
+uint8_t BuildControlRSetToAddModList
+(
+struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
+)
 {
+   uint8_t idx;
+   uint8_t elementCnt;
+   uint8_t numBytes, bitsUnused;
+   struct ControlResourceSet *controlRSet;
+   uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
+   uint8_t coreset0EndPrb, coreset1StartPrb, coreset1NumPrb;
 
-   return ROK;
-}
 
-/*******************************************************************
- *
- * @brief Builds PDSCH serving cell config
- * @details
- *
- *    Function : BuildPdschSrvCellCfg
- *
- *    Functionality: Builds PDSCH serving cell config in spCellCfgDed
- *
- * @params[in] struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg 
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildPdschSrvCellCfg(struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
-{
+   elementCnt = 1;
+   controlRSetList->list.count = elementCnt;
+   controlRSetList->list.size = \
+       elementCnt * sizeof(struct ControlResourceSet *);
 
-   return ROK;
-}
+   controlRSetList->list.array = NULLP;
+   DU_ALLOC(controlRSetList->list.array, controlRSetList->list.size);
+   if(!controlRSetList->list.array)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      controlRSetList->list.array[idx] = NULLP;
+      DU_ALLOC(controlRSetList->list.array[idx], sizeof(struct ControlResourceSet));
+      if(!controlRSetList->list.array[idx])
+      {
+         DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+         return RFAILED;
+      }
+   }
+
+   idx=0;
+   controlRSet = controlRSetList->list.array[idx];
+
+   controlRSet->controlResourceSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+
+       /* Values taken from reference logs :
+        * size 6 bytes
+        * 3 LSBs unsued
+        * Bit string stored ff0000000000
+        */
+   numBytes = 6;
+   bitsUnused = 3;
+   controlRSet->frequencyDomainResources.size = numBytes * sizeof(uint8_t);
+
+   controlRSet->frequencyDomainResources.buf = NULLP;
+       DU_ALLOC(controlRSet->frequencyDomainResources.buf, \
+          controlRSet->frequencyDomainResources.size);
+       if(!controlRSet->frequencyDomainResources.buf)
+       {
+          DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+               return RFAILED;
+   }
+
+   memset(controlRSet->frequencyDomainResources.buf, 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(controlRSet->frequencyDomainResources.buf, freqDomainResource, FREQ_DOM_RSRC_SIZE);
+   controlRSet->frequencyDomainResources.bits_unused = bitsUnused;
+
+   controlRSet->duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
+   controlRSet->cce_REG_MappingType.present = \
+      ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
+
+   controlRSet->precoderGranularity = PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY;
+   controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
+       controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
+       controlRSet->tci_PresentInDCI = NULLP;
+#if 0
+   uint8_t tciStateIdx;
+
+   DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList, \
+      sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
+   if(!controlRset->tci_StatesPDCCH_ToAddList)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
+   }
+
+   elementCnt = 1;
+   controlRset->tci_StatesPDCCH_ToAddList->list.count = elementCnt;
+   controlRset->tci_StatesPDCCH_ToAddList->list.size = elementCnt * sizeof(TCI_StateId_t *);
+   DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array, \
+      controlRset->tci_StatesPDCCH_ToAddList->list.size)
+   if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
+   }
+   
+   for(tciStateIdx = 0; tciStateIdx <elementCntl; tciStateIdx++)
+   {
+      DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx], sizeof(TCI_StateId_t));
+      if(!controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx])
+      {
+         DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+         return RFAILED;
+      }
+   }
+
+   tciStateIdx = 0;
+   /* TODO */
+   *(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx]);
+
+   DU_ALLOC(controlRset->tci_PresentInDCI, sizeof(long));
+   if(!controlRset->tci_PresentInDCI)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
+   }
+   /* TODO */
+   *(controlRset->tci_PresentInDCI);
+#endif
+
+   controlRSet->pdcch_DMRS_ScramblingID = NULLP;
+   DU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
+   if(!controlRSet->pdcch_DMRS_ScramblingID)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
+   }
+   *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
+
+   return ROK;
+} /* End BuildControlRSetToAddModList */
 
 /*******************************************************************
  *
- * @brief Builds CSI Meas config
- * @details
+ * @brief Build search space to add/modify list
  *
- *    Function : BuildCsiMeasCfg 
+ * @details
  *
- *    Functionality: Builds CSI Meas config in spCellCfgDed
+ *    Function : BuildSearchSpcToAddModList
  *
- * @params[in] struct ServingCellConfig__csi_MeasConfig *csiMeasCfg
+ *    Functionality: Build search space to add/modify list
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildCsiMeasCfg(struct ServingCellConfig__csi_MeasConfig *csiMeasCfg)
+uint8_t BuildSearchSpcToAddModList
+(
+struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+)
 {
+   uint8_t idx;
+       uint8_t numBytes;
+       uint8_t byteIdx;
+       uint8_t bitsUnused;
+   uint8_t elementCnt;
+   struct SearchSpace *searchSpc;
+
+   elementCnt = 1;
+   searchSpcList->list.count = elementCnt;
+   searchSpcList->list.size = elementCnt * sizeof(struct SearchSpace *);
+
+       searchSpcList->list.array = NULLP;
+   DU_ALLOC(searchSpcList->list.array, searchSpcList->list.size);
+   if(!searchSpcList->list.array)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+          searchSpcList->list.array[idx] = NULLP;
+      DU_ALLOC(searchSpcList->list.array[idx], sizeof(struct SearchSpace));
+      if(!searchSpcList->list.array[idx])
+      {
+         DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
+   }
+
+   idx = 0;
+   searchSpc = searchSpcList->list.array[idx];
+
+   searchSpc->searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
+
+   searchSpc->controlResourceSetId = NULLP;
+   DU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
+   if(!searchSpc->controlResourceSetId)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+   *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
+
+   searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
+   DU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, \
+      sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+   if(!searchSpc->monitoringSlotPeriodicityAndOffset)
+       {
+          DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+               return RFAILED;
+       }
+   searchSpc->monitoringSlotPeriodicityAndOffset->present = \
+          SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+  
+   searchSpc->duration = NULLP;
+   searchSpc->monitoringSymbolsWithinSlot = NULLP;
+       DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
+       if(!searchSpc->monitoringSymbolsWithinSlot)
+       {
+          DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+               return RFAILED;
+       }
+   
+       /* Values taken from reference logs :
+        * size 2 bytes
+        * 2 LSBs unsued
+        * Bit string stores 8000
+        */
+   numBytes = 2;
+       bitsUnused = 2;
+
+   searchSpc->monitoringSymbolsWithinSlot->size = numBytes * sizeof(uint8_t);
+       searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
+       DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, \
+          searchSpc->monitoringSymbolsWithinSlot->size);
+       if(!searchSpc->monitoringSymbolsWithinSlot->buf)
+       {
+          DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+               return RFAILED;
+       }
+
+       byteIdx = 0;
+       searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = \
+        PDCCH_SYMBOL_WITHIN_SLOT /* setting MSB to 128 i.e. 0x80 */;
+       searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = 0;
+       searchSpc->monitoringSymbolsWithinSlot->bits_unused = bitsUnused;
+
+   searchSpc->nrofCandidates = NULLP;
+   DU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
+   if(!searchSpc->nrofCandidates)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+
+   searchSpc->nrofCandidates->aggregationLevel1 = \
+          PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE;
+   searchSpc->nrofCandidates->aggregationLevel2 = \
+          PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE;
+   searchSpc->nrofCandidates->aggregationLevel4 = \
+          PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE;
+   searchSpc->nrofCandidates->aggregationLevel8 = \
+          PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE;
+   searchSpc->nrofCandidates->aggregationLevel16 = \
+          PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE;
+
+   searchSpc->searchSpaceType = NULLP;
+   DU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
+   if(!searchSpc->searchSpaceType)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+   
+   searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
+
+   searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
+   DU_ALLOC(searchSpc->searchSpaceType->choice.ue_Specific, \
+      sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+   if(!searchSpc->searchSpaceType->choice.ue_Specific)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }  
+   searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = \
+          PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
 
    return ROK;
-}
+}/* End BuildSearchSpcToAddModList */
 
 /*******************************************************************
  *
- * @brief Builds Spcell config dedicated
+ * @brief Builds BWP DL dedicated PDCCH config
+ *
  * @details
  *
- *    Function : BuildSpCellCfgDed
+ *    Function : BuildBWPDlDedPdcchCfg
  *
- *    Functionality: Builds sp cell config dedicated in spCellCfg
+ *    Functionality: Builds BWP DL dedicated PDCCH config
  *
- * @params[in] ServingCellConfig_t srvCellCfg
+ * @params[in] struct PDCCH_Config *pdcchCfg
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSpCellCfgDed(ServingCellConfig_t *srvCellCfg)
+uint8_t BuildBWPDlDedPdcchCfg(struct PDCCH_Config *pdcchCfg)
 {
-#if 0
-   srvCellCfg->initialDownlinkBWP = NULLP;
-   DU_ALLOC(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
-       if(!srvCellCfg->initialDownlinkBWP)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
+   pdcchCfg->controlResourceSetToAddModList = NULLP;
+   DU_ALLOC(pdcchCfg->controlResourceSetToAddModList, \
+      sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+   if(!pdcchCfg->controlResourceSetToAddModList)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      return RFAILED;
+   }
 
-   if(BuildInitialDlBWP(srvCellCfg->initialDownlinkBWP) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildInitialDlBWP failed");
-               return RFAILED;
-       }
-#endif
-   srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
-       DU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
-       if(!srvCellCfg->firstActiveDownlinkBWP_Id)
+       if(BuildControlRSetToAddModList(pdcchCfg->controlResourceSetToAddModList) != ROK)
        {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
+          return RFAILED;
        }
-       *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+  
+   pdcchCfg->controlResourceSetToReleaseList = NULLP;
 
-   srvCellCfg->defaultDownlinkBWP_Id = NULLP;
-       DU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
-       if(!srvCellCfg->defaultDownlinkBWP_Id)
+   pdcchCfg->searchSpacesToAddModList = NULLP;
+       DU_ALLOC(pdcchCfg->searchSpacesToAddModList, \
+          sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+       if(!pdcchCfg->searchSpacesToAddModList)
        {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+          DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
                return RFAILED;
        }
-       *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
-#if 0
-   srvCellCfg->uplinkConfig = NULLP;
-   DU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
-       if(!srvCellCfg->uplinkConfig)
+  
+       if(BuildSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList) != ROK)
        {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
+          return RFAILED;
        }
+   
+   pdcchCfg->searchSpacesToReleaseList = NULLP;
+       pdcchCfg->downlinkPreemption = NULLP;
+       pdcchCfg->tpc_PUSCH = NULLP;
+       pdcchCfg->tpc_PUCCH = NULLP;
+       pdcchCfg->tpc_SRS = NULLP;
 
-   if(BuildUlCfg(srvCellCfg->uplinkConfig) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildUlCfg failed");
-               return RFAILED;
-       }
+   return ROK;
+}
 
-   srvCellCfg->pdsch_ServingCellConfig = NULLP;
-       DU_ALLOC(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct     ServingCellConfig__pdsch_ServingCellConfig));
-       if(!srvCellCfg->pdsch_ServingCellConfig)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
+/*******************************************************************
+ *
+ * @brief Builds DMRS DL PDSCH Mapping type A
+ *
+ * @details
+ *
+ *    Function : BuildDMRSDLPdschMapTypeA
+ *
+ *    Functionality: Builds DMRS DL PDSCH Mapping type A
+ *
+ * @params[in]
+ * struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildDMRSDLPdschMapTypeA
+(
+struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
+)
+{
+   dmrsDlCfg->present = PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup;
+       dmrsDlCfg->choice.setup = NULLP;
+   DU_ALLOC(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
+   if(!dmrsDlCfg->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
+        
+       dmrsDlCfg->choice.setup->dmrs_Type = NULLP;
+       dmrsDlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
+   DU_ALLOC(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
+   if(!dmrsDlCfg->choice.setup->dmrs_AdditionalPosition)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
+      return RFAILED;
+   }
+   *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
+         
+       dmrsDlCfg->choice.setup->maxLength = NULLP;
+       dmrsDlCfg->choice.setup->scramblingID0 = NULLP;
+       dmrsDlCfg->choice.setup->scramblingID1 = NULLP;
+       dmrsDlCfg->choice.setup->phaseTrackingRS = NULLP;
 
-   if(BuildPdschSrvCellCfg(srvCellCfg->pdsch_ServingCellConfig) != ROK)
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds TCI states to add/modify list
+ *
+ * @details
+ *
+ *    Function : BuildTCIStatesToAddModList
+ *
+ *    Functionality:Builds TCI states to add/modify list
+ *
+ * @params[in] 
+ * struct PDSCH_Config__tci_StatesToAddModList *tciStatesList
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *tciStatesList)
+{
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PDSCH time domain allocation list
+ *
+ * @details
+ *
+ *    Function : BuildPdschTimeDomAllocList
+ *
+ *    Functionality: Builds PDSCH time domain allocation list
+ *
+ * @params[in] 
+ * struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPdschTimeDomAllocList
+(
+struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
+)
+{
+   uint8_t idx;
+   uint8_t elementCnt;
+       struct PDSCH_TimeDomainResourceAllocation *timeDomAlloc;
+
+   timeDomAllocList->present = \
+          PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
+
+   timeDomAllocList->choice.setup = NULLP;
+   DU_ALLOC(timeDomAllocList->choice.setup, \
+          sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+   if(!timeDomAllocList->choice.setup)
        {
-               DU_LOG("\nF1AP : BuildPdschSrvCellCfg failed");
+          DU_LOG("\nF1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
                return RFAILED;
        }
-
-   srvCellCfg->csi_MeasConfig = NULLP;
-       DU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct      ServingCellConfig__csi_MeasConfig))
-       if(!srvCellCfg->csi_MeasConfig)
+         
+       elementCnt = 1;
+       timeDomAllocList->choice.setup->list.count = elementCnt;
+       timeDomAllocList->choice.setup->list.size = \
+          elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
+
+       timeDomAllocList->choice.setup->list.array = NULLP;
+       DU_ALLOC(timeDomAllocList->choice.setup->list.array, \
+          timeDomAllocList->choice.setup->list.size);
+       if(!timeDomAllocList->choice.setup->list.array)
        {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+          DU_LOG("\nF1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
                return RFAILED;
        }
 
-   if(BuildCsiMeasCfg(srvCellCfg->csi_MeasConfig) != ROK)
+       for(idx = 0; idx < elementCnt; idx++)
        {
-               DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
-               return RFAILED;
+          timeDomAllocList->choice.setup->list.array[idx] = NULLP;
+          DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], \
+                  sizeof(struct PDSCH_TimeDomainResourceAllocation));
+               if(!timeDomAllocList->choice.setup->list.array[idx])
+               {
+                  DU_LOG("\nF1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+                       return RFAILED;
+               }
        }
-#endif
-       srvCellCfg->tag_Id = TAG_ID;
 
-       return ROK;
+       idx = 0;
+       timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+
+   timeDomAlloc->k0 = NULLP;
+       timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
+       timeDomAlloc->startSymbolAndLength = \
+          calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+
+   return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds Spcell config 
+ * @brief Builds PDSCH PRB Bundling type
  *
  * @details
  *
- *    Function : BuildSpCellCfg 
+ *    Function : BuildPdschPrbBundlingType
  *
- *    Functionality: Builds sp cell config in DuToCuRrcContainer
+ *    Functionality: Builds PDSCH PRB Bundling type
  *
- * @params[in] SpCellConfig_t spCellCfg
+ * @params[in] 
+ * struct PDSCH_Config__prb_BundlingType *prbBndlType
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSpCellCfg(SpCellConfig_t *spCellCfg)
+uint8_t BuildPdschPrbBundlingType
+(
+struct PDSCH_Config__prb_BundlingType *prbBndlType
+)
 {
+   prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
 
-   spCellCfg->servCellIndex = NULLP;
-       DU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
-       if(!spCellCfg->servCellIndex)
+   prbBndlType->choice.staticBundling = NULLP;
+       DU_ALLOC(prbBndlType->choice.staticBundling, \
+          sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
+       if(!prbBndlType->choice.staticBundling)
        {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
+          DU_LOG("\nF1AP : Memory allocation failed in BuildPdschPrbBundlingType");
                return RFAILED;
        }
-   *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
+       prbBndlType->choice.staticBundling->bundleSize = NULLP;
 
-   spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
-       DU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
-       if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
-               return RFAILED;
-       }
-   *(spCellCfg->rlmInSyncOutOfSyncThreshold) = RLM_SYNC_OUT_SYNC_THRESHOLD;
+   return ROK;
+}
 
-   spCellCfg->spCellConfigDedicated = NULLP;
-   DU_ALLOC(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
-       if(!spCellCfg->spCellConfigDedicated)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
-               return RFAILED;
-       }
-   if(BuildSpCellCfgDed(spCellCfg->spCellConfigDedicated) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildSpCellCfgDed failed");
-               return RFAILED;
-       }
-       return ROK;
-}
 /*******************************************************************
-*
-* @brief Builds Phy cell group config 
-*
-* @details
-*
-*    Function : BuildPhyCellGrpCfg 
-*
-*    Functionality: Builds Phy cell group config in DuToCuRrcContainer
-*
-* @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-uint8_t BuildPhyCellGrpCfg(PhysicalCellGroupConfig_t *phyCellGrpCfg)
+ *
+ * @brief Builds BWP DL dedicated PDSCH config 
+ *
+ * @details
+ *
+ *    Function : BuildBWPDlDedPdschCfg
+ *
+ *    Functionality: Builds BWP DL dedicated PDSCH config
+ *
+ * @params[in] struct PDSCH_Config *pdschCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
 {
-   phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
-       phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
+   pdschCfg->dataScramblingIdentityPDSCH = NULLP;
 
-   phyCellGrpCfg->p_NR_FR1 = NULLP;
-       DU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
-       if(!phyCellGrpCfg->p_NR_FR1)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildPhyCellGrpCfg");
-               return RFAILED;
-       }
-   *(phyCellGrpCfg->p_NR_FR1)             = P_NR_FR1;
-       phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
-       phyCellGrpCfg->tpc_SRS_RNTI = NULLP;
-       phyCellGrpCfg->tpc_PUCCH_RNTI = NULLP;
-       phyCellGrpCfg->tpc_PUSCH_RNTI = NULLP;
-       phyCellGrpCfg->sp_CSI_RNTI = NULLP;
-       phyCellGrpCfg->cs_RNTI = NULLP;
-       phyCellGrpCfg->ext1 = NULLP;
-       phyCellGrpCfg->ext2 = NULLP;
+   pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA = NULLP;
+   DU_ALLOC(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
+      sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+   if(!pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
 
-       return ROK;
-}
-/*******************************************************************
-*
-* @brief Builds Mac cell group config 
-*
-* @details
-*
-*    Function : BuildMacCellGrpCfg 
-*
-*    Functionality: Builds Mac cell group config in DuToCuRrcContainer
-*
-* @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
-{
-   macCellGrpCfg->drx_Config = NULLP;
-   macCellGrpCfg->schedulingRequestConfig = NULLP;
-       DU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
-       if(!macCellGrpCfg->schedulingRequestConfig)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
-               return RFAILED;
-       }
+   if(BuildDMRSDLPdschMapTypeA(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA) != ROK)
+   {
+      return RFAILED;
+   }
 
-       if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
-       {
-          DU_LOG("\nF1AP : BuildSchedulingReqConfig failed");
-               return RFAILED;
-       }
+   pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeB = NULLP;
+   pdschCfg->tci_StatesToAddModList = NULLP;
+   pdschCfg->tci_StatesToReleaseList = NULLP;
+       pdschCfg->vrb_ToPRB_Interleaver = NULLP;
+#if 0
+   DU_ALLOC(pdschCfg->tci_StatesToAddModList, sizeof(struct PDSCH_Config__tci_StatesToAddModList));
+   if(!pdschCfg->tci_StatesToAddModList)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
+   if(BuildTCIStatesToAddModList(pdschCfg->tci_StatesToAddModList) != ROK)
+   {
+      return RFAILED;
+   }
+#endif
 
-   macCellGrpCfg->bsr_Config = NULLP;
-   DU_ALLOC(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
-       if(!macCellGrpCfg->bsr_Config)
+       pdschCfg->resourceAllocation = RES_ALLOC_TYPE;
+
+   pdschCfg->pdsch_TimeDomainAllocationList = NULLP;
+       DU_ALLOC(pdschCfg->pdsch_TimeDomainAllocationList, \
+          sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
+   if(!pdschCfg->pdsch_TimeDomainAllocationList)
        {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
                return RFAILED;
        }
 
-   if(BuildBsrConfig(macCellGrpCfg->bsr_Config) != ROK)
+       if(BuildPdschTimeDomAllocList(pdschCfg->pdsch_TimeDomainAllocationList) != ROK)
        {
-      DU_LOG("\nF1AP : BuildBsrConfig failed");
           return RFAILED;
        }
 
-   macCellGrpCfg->tag_Config = NULLP;
-   DU_ALLOC(macCellGrpCfg->tag_Config, sizeof(struct TAG_Config));
-       if(!macCellGrpCfg->tag_Config)
+   pdschCfg->pdsch_AggregationFactor = NULLP;
+       pdschCfg->rateMatchPatternToAddModList = NULLP;
+       pdschCfg->rateMatchPatternToReleaseList = NULLP;
+       pdschCfg->rateMatchPatternGroup1 = NULLP;
+       pdschCfg->rateMatchPatternGroup2 = NULLP;
+       pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
+       pdschCfg->mcs_Table = NULLP;
+
+       pdschCfg->maxNrofCodeWordsScheduledByDCI = NULLP;
+       DU_ALLOC(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
+       if(!pdschCfg->maxNrofCodeWordsScheduledByDCI)
        {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
+          DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
                return RFAILED;
        }
-
-   if(BuildTagConfig(macCellGrpCfg->tag_Config) != ROK)
+       *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
+       
+       if(BuildPdschPrbBundlingType(&pdschCfg->prb_BundlingType) != ROK)
        {
-          DU_LOG("\nF1AP : BuildTagConfig failed");
           return RFAILED;
-   }
-
-   macCellGrpCfg->phr_Config = NULLP;
-   DU_ALLOC(macCellGrpCfg->phr_Config, sizeof(struct MAC_CellGroupConfig__phr_Config));
-       if(!macCellGrpCfg->phr_Config)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
-               return RFAILED;
        }
 
-   if(BuildPhrConfig(macCellGrpCfg->phr_Config) != ROK)
-       {
-          DU_LOG("\nF1AP : BuildPhrConfig failed");
-          return RFAILED;
-   }
-
-   macCellGrpCfg->skipUplinkTxDynamic = false;
-       macCellGrpCfg->ext1 = NULLP;
+       pdschCfg->zp_CSI_RS_ResourceToAddModList = NULLP;
+       pdschCfg->zp_CSI_RS_ResourceToReleaseList = NULLP;
+       pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
+       pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
+       pdschCfg->sp_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
+       pdschCfg->sp_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
+   pdschCfg->p_ZP_CSI_RS_ResourceSet = NULLP;
 
-       return ROK;
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Frees emmory allocated for DUToCURRCContainer 
- *
+ * @brief Builds intitial DL BWP
  * @details
  *
- *    Function : FreeMemDuToCuRrcCont
+ *    Function : BuildInitialDlBWP 
  *
- *    Functionality: Builds DuToCuRrcContainer
+ *    Functionality: Builds intitial DL BWP in spCellCfgDed
  *
- * @params[in] DuToCuRRCContainer, DuToCuRRCContainer
+ * @params[in] BWP_DownlinkDedicated_t *dlBwp
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
-* ****************************************************************/
-uint8_t FreeMemDuToCuRrcCont(CellGroupConfigRrc_t *cellGrpCfg)
+ * ****************************************************************/
+uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
 {
-   uint8_t idx;
-       struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList;
-       struct RLC_Config *rlcConfig;
-       struct LogicalChannelConfig *macLcConfig;
-       MAC_CellGroupConfig_t *macCellGrpCfg;
-       struct SchedulingRequestConfig *schedulingRequestConfig;
-       struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList;
-       struct TAG_Config *tagConfig;
-       struct TAG_Config__tag_ToAddModList *tagList;
-       struct MAC_CellGroupConfig__phr_Config *phrConfig;
-       PhysicalCellGroupConfig_t *phyCellGrpCfg;
-       SpCellConfig_t *spCellCfg;
-       ServingCellConfig_t *srvCellCfg;
-
-       rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
-       if(rlcBearerList)
+   dlBwp->pdcch_Config = NULLP;
+   DU_ALLOC(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
+       if(!dlBwp->pdcch_Config)
        {
-               if(rlcBearerList->list.array)
-               {
-                       for(idx=0; idx<rlcBearerList->list.count; idx++)
-                       {
-                               rlcConfig   = rlcBearerList->list.array[idx]->rlc_Config;
-                               macLcConfig = rlcBearerList->list.array[idx]->mac_LogicalChannelConfig;
-                               if(rlcConfig)
-                               {
-                                  if(rlcConfig->choice.am)
-                                       {
-                                     DU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
-                                     DU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
-                                     DU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
-                                       }
-                                  DU_FREE(rlcConfig, sizeof(struct RLC_Config));
-                               }
-                               DU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
-                               if(macLcConfig)
-                               {
-                                  if(macLcConfig->ul_SpecificParameters)
-                                       {
-                                     DU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID,  sizeof(SchedulingRequestId_t));
-                                     DU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup,  sizeof(long));
-                                     DU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
-                                  }
-                                  DU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
-                               }
-                               DU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
-                       }
-                       DU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
-               }
-               DU_FREE(cellGrpCfg->rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
+          DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
        }
+       dlBwp->pdcch_Config->present = BWP_DownlinkDedicated__pdcch_Config_PR_setup; 
 
-       macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
-       if(macCellGrpCfg)
+   dlBwp->pdcch_Config->choice.setup = NULLP;
+       DU_ALLOC(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
+   if(!dlBwp->pdcch_Config->choice.setup)
+   {
+          DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
+               return RFAILED;
+       }
+   if(BuildBWPDlDedPdcchCfg(dlBwp->pdcch_Config->choice.setup) != ROK)
        {
-               schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig; 
-               schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
-
-      if(schedulingRequestConfig)
-               {
-                  if(schReqList)
-                       {
-                          if(schReqList->list.array)
-                               {
-                        for(idx=0;idx<schReqList->list.count; idx++)
-                        {
-                                          if(schReqList->list.array[idx])
-                                               {
-                                   DU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
-                                   DU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
-                           }
-                                       }
-                        DU_FREE(schReqList->list.array, schReqList->list.size);
-                               }
-                     DU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
-                               sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));    }
-                  DU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
-      }
-      
-               if(macCellGrpCfg->bsr_Config)
-               {
-                  DU_FREE(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
-               }
-
-               tagConfig = macCellGrpCfg->tag_Config;
-               tagList = tagConfig->tag_ToAddModList;
-               if(tagConfig)
-               {
-                  if(tagList)
-                       {
-                          if(tagList->list.array)
-                               {
-                        for(idx=0; idx<tagList->list.count; idx++)
-                        {
-                  DU_FREE(tagList->list.array[idx], sizeof(struct TAG));
-                                       }
-                        DU_FREE(tagList->list.array, tagList->list.size);
-            }
-                     DU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
-                       }
-               DU_FREE(tagConfig, sizeof(struct TAG_Config));
-               }
-
-               phrConfig = macCellGrpCfg->phr_Config;
-               if(phrConfig)
-               {
-                  DU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
-                  DU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
-      }
-
-               DU_FREE(macCellGrpCfg, sizeof(MAC_CellGroupConfig_t));
+          return RFAILED;
        }
 
-       phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
-       if(phyCellGrpCfg)
+   dlBwp->pdsch_Config = NULLP;
+       DU_ALLOC(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
+       if(!dlBwp->pdsch_Config)
        {
-               DU_FREE(phyCellGrpCfg->p_NR_FR1, sizeof(long));
-               DU_FREE(phyCellGrpCfg, sizeof(PhysicalCellGroupConfig_t));
+          DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
+               return RFAILED;
        }
+       dlBwp->pdsch_Config->present = BWP_DownlinkDedicated__pdsch_Config_PR_setup;
 
-       spCellCfg = cellGrpCfg->spCellConfig;
-       if(spCellCfg)
-       {
-               DU_FREE(spCellCfg->servCellIndex, sizeof(long));
-      DU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+   dlBwp->pdsch_Config->choice.setup = NULLP;
+   DU_ALLOC(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
+   if(!dlBwp->pdsch_Config->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
+               return RFAILED;
+       }
 
-               srvCellCfg = spCellCfg->spCellConfigDedicated;
-      if(srvCellCfg)
-               {
-                  DU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
-                  DU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
-                  DU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
-                  DU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
-                  DU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct   ServingCellConfig__pdsch_ServingCellConfig));
-                  DU_FREE(srvCellCfg->csi_MeasConfig, sizeof(struct ServingCellConfig__csi_MeasConfig));
-                  DU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
-               }
-               DU_FREE(spCellCfg, sizeof(SpCellConfig_t));
+   if(BuildBWPDlDedPdschCfg(dlBwp->pdsch_Config->choice.setup) != ROK)
+       {
+          return RFAILED;
        }
-       return ROK;
+
+   dlBwp->sps_Config = NULLP;
+   dlBwp->radioLinkMonitoringConfig = NULLP; 
+   return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds DU To CU RRC Container 
+ * @brief Builds DMRS UL Pusch Mapping type A
  *
  * @details
  *
- *    Function : BuildDuToCuRrcContainer 
- *
- *    Functionality: Builds DuToCuRrcContainer
+ *    Function : BuildDMRSULPuschMapTypeA
  *
- * @params[in] idx, index in F1AP msg
- *             DuToCuRRCContainer, DuToCuRRCContainer
+ *    Functionality: Builds DMRS UL Pusch Mapping type A
  *
+ * @params[in] 
+ *    struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildDuToCuRrcContainer(DUtoCURRCContainer_t *duToCuRrcContainer)
+uint8_t BuildDMRSULPuschMapTypeA
+(
+struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
+)
 {
-       CellGroupConfigRrc_t  cellGrpCfg;
-       asn_enc_rval_t        encRetVal;
-       uint8_t               ret = RFAILED;
-
-       while(1)
-       {
-               cellGrpCfg.cellGroupId = CELL_GRP_ID;
-
-               cellGrpCfg.rlc_BearerToAddModList = NULLP;
-               DU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
-               if(!cellGrpCfg.rlc_BearerToAddModList)
-               {
-                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-                       break;
-               }
-               if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK)
-               {
-                       DU_LOG("\nF1AP : BuildRlcBearerToAddModList failed");
-                       break;
-               }
-
-      cellGrpCfg.rlc_BearerToReleaseList = NULLP;
-               cellGrpCfg.mac_CellGroupConfig = NULLP;
-               DU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
-               if(!cellGrpCfg.mac_CellGroupConfig)
-               {
-                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-                       break;
-               }
-               if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK)
-               {
-                       DU_LOG("\nF1AP : BuildMacCellGrpCfg failed");
-                       break;
-               }
-
-
-               cellGrpCfg.physicalCellGroupConfig = NULLP;
-               DU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
-               if(!cellGrpCfg.physicalCellGroupConfig)
-               {
-                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-                       break;
-               }
-               if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK)
-               {
-                       DU_LOG("\nF1AP : BuildPhyCellGrpCfg failed");
-                       break;
-               }
-
-               cellGrpCfg.spCellConfig = NULLP;
-               DU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
-               if(!cellGrpCfg.spCellConfig)
-               {
-                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-                       break;
-               }
-               if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK)
-               {
-                       DU_LOG("\nF1AP : BuildSpCellCfg failed");
-                       break;
-               }
-
-      cellGrpCfg.sCellToAddModList = NULLP;
-               cellGrpCfg.sCellToReleaseList = NULLP;
-               cellGrpCfg.ext1 = NULLP;
+   dmrsUlCfg->present = PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA_PR_setup;
+   dmrsUlCfg->choice.setup= NULLP;
+   DU_ALLOC(dmrsUlCfg->choice.setup, sizeof(DMRS_UplinkConfig_t));
+   if(!dmrsUlCfg->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
+         
+   dmrsUlCfg->choice.setup->dmrs_Type = NULLP;
+       dmrsUlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
+   DU_ALLOC(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
+   if(!dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
+   *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS; 
+
+       dmrsUlCfg->choice.setup->phaseTrackingRS = NULLP;
+       dmrsUlCfg->choice.setup->maxLength = NULLP;
+   dmrsUlCfg->choice.setup->transformPrecodingDisabled = NULLP;
+   DU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, \
+      sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+   if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
 
-               /* encode cellGrpCfg into duToCuRrcContainer */
-               xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg);
-               cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
-               encBufSize = 0;
-               encRetVal = aper_encode(&asn_DEF_CellGroupConfigRrc, 0, &cellGrpCfg, PrepFinalEncBuf, encBuf);
-               /* Encode results */
-               if(encRetVal.encoded == ENCODE_FAIL)
-               {
-                       DU_LOG( "\n F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
-                                       encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-                       break;
-               }
-               else
-               {
-                       DU_LOG("\n F1AP : Created APER encoded buffer for DuToCuRrcContainer\n");
-                       for(int i=0; i< encBufSize; i++)
-                       {
-                               printf("%x",encBuf[i]);
-                       }
-               }
+   dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0 = NULLP;
+   DU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
+      sizeof(long));
+   if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
+   *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
 
-          duToCuRrcContainer->size = encBufSize;
-               DU_ALLOC(duToCuRrcContainer->buf, duToCuRrcContainer->size);
-               if(!duToCuRrcContainer->buf)
-               {
-         DU_LOG("\nF1AP : Memory allocation failed in BuildDuToCuRrcContainer");
-                       break;
-               }
-               memcpy(duToCuRrcContainer->buf, encBuf, duToCuRrcContainer->size);
-               ret = ROK;
-               break;
-       }
-   FreeMemDuToCuRrcCont(&cellGrpCfg);
-       return ret;
+       dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID1 = NULLP;
+       dmrsUlCfg->choice.setup->transformPrecodingEnabled = NULLP;
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds and sends the InitialULRRCMessage 
+ * @brief Build PUSCH time domain allocation list
  *
  * @details
  *
- *    Function : BuildAndSendInitialRrcMsgTransfer 
+ *    Function : BuildPuschTimeDomAllocList
  *
- *    Functionality: Constructs the Initial UL RRC Message Transfer and sends
- *                   it to the CU through SCTP.
+ *    Functionality: Build PUSCH time domain allocation list
  *
  * @params[in] 
+ * struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti,
-               uint8_t *rrcContainer)
+uint8_t BuildPuschTimeDomAllocList
+(
+struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
+)
 {
-   S16  ret;
-       U8   elementCnt;
-   U8   ieId;
-       U8   idx;
-       U8   idx1;
-       F1AP_PDU_t  *f1apMsg = NULLP;
-       InitialULRRCMessageTransfer_t *initULRRCMsg=NULLP;
-   asn_enc_rval_t                encRetVal;
-       bool  checkvar=false;
-       while(1)
-       {
-            DU_LOG("\n F1AP : Building RRC Setup Request\n");
-                 DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
-                 if(f1apMsg == NULLP)
-                 {
-                     DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
-                          break;
-                 }
-                 f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
-                 DU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-                 if(f1apMsg->choice.initiatingMessage == NULLP)
-                 {
-                    DU_LOG(" F1AP : Memory allocation for  F1AP-PDU failed");
-                         break;
-                 }
-                 f1apMsg->choice.initiatingMessage->procedureCode =\
-                        ProcedureCode_id_InitialULRRCMessageTransfer;
-                 f1apMsg->choice.initiatingMessage->criticality = Criticality_ignore;
-                 f1apMsg->choice.initiatingMessage->value.present = \
-                        InitiatingMessage__value_PR_InitialULRRCMessageTransfer;
-                 initULRRCMsg =\
-                        &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer;
-        elementCnt = 5;
-                 initULRRCMsg->protocolIEs.list.count = elementCnt;
-                 initULRRCMsg->protocolIEs.list.size = \
-                        elementCnt * sizeof(InitialULRRCMessageTransferIEs_t *);
-                 /* Initialize the F1Setup members */
-                  DU_ALLOC(initULRRCMsg->protocolIEs.list.array,initULRRCMsg->protocolIEs.list.size);
-                  if(initULRRCMsg->protocolIEs.list.array == NULLP)
-                  {
-                     DU_LOG(" F1AP : Memory allocation for\
-                               RRCSetupRequestMessageTransferIEs failed");
-                               break;
-                  }
-                  for(idx=0; idx<elementCnt; idx++)
-             {
-                          DU_ALLOC(initULRRCMsg->protocolIEs.list.array[idx],\
-                                sizeof(InitialULRRCMessageTransferIEs_t));
-                                if(initULRRCMsg->protocolIEs.list.array[idx] == NULLP)
-                                {
-                                    break;
-                                }
-                  }
-                  idx1 = 0;
-                  /*GNB DU UE F1AP ID*/
-                  initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
-                                     ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality  = Criticality_reject;
-                  initULRRCMsg->protocolIEs.list.array[idx1]->value.present = \
-                                     InitialULRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
-                  initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
+   uint8_t idx;
+   uint8_t elementCnt;
+   PUSCH_TimeDomainResourceAllocation_t  *timeDomAlloc;
+
+   timeDomAllocList->present = PUSCH_Config__pusch_TimeDomainAllocationList_PR_setup;
+   timeDomAllocList->choice.setup = NULLP;
+   DU_ALLOC(timeDomAllocList->choice.setup, \
+      sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+   if(!timeDomAllocList->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      return RFAILED;
+   }
+         
+   elementCnt = 1;
+   timeDomAllocList->choice.setup->list.count = elementCnt;
+   timeDomAllocList->choice.setup->list.size = \
+      elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
+       timeDomAllocList->choice.setup->list.array = NULLP;
+   DU_ALLOC(timeDomAllocList->choice.setup->list.array, \
+      timeDomAllocList->choice.setup->list.size);
+   if(!timeDomAllocList->choice.setup->list.array)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      return RFAILED;
+   }
 
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+          timeDomAllocList->choice.setup->list.array[idx] = NULLP;
+      DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx],\
+         sizeof(PUSCH_TimeDomainResourceAllocation_t));
+      if(!timeDomAllocList->choice.setup->list.array[idx])
+      {
+         DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+         return RFAILED;
+      }
+   }
 
-                       /*NRCGI*/
-                       idx1++;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
-                                ProtocolIE_ID_id_NRCGI;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality  =Criticality_reject;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present = \
-                       InitialULRRCMessageTransferIEs__value_PR_NRCGI;
-                  
-                       ret =\
-                       BuildNrcgi(&initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI);
-             if(ret!=ROK)
-                       {
-                           break;
-                       }
+   idx = 0;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   DU_ALLOC(timeDomAlloc->k2, sizeof(long));
+   if(!timeDomAlloc->k2)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      return RFAILED;
+   }
+   *(timeDomAlloc->k2) = PUSCH_K2;
+   timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
+   timeDomAlloc->startSymbolAndLength = calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL);
+   return ROK;
+}
 
-                       /*CRNTI*/
-                       idx1++;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
-                                      ProtocolIE_ID_id_C_RNTI;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present =\
-                                InitialULRRCMessageTransferIEs__value_PR_C_RNTI;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.C_RNTI = crnti;
+/*******************************************************************
+ *
+ * @brief Builds BWP UL dedicated PUSCH Config
+ *
+ * @details
+ *
+ *    Function : BuildBWPUlDedPuschCfg
+ *
+ *    Functionality:
+ *      Builds BWP UL dedicated PUSCH Config
+ *
+ * @params[in] : PUSCH_Config_t *puschCfg
+ *    
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
+{
+   puschCfg->dataScramblingIdentityPUSCH = NULLP;
+   DU_ALLOC(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+   if(!puschCfg->dataScramblingIdentityPUSCH)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      return RFAILED;
+   }
+   *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
 
-         /*RRCContainer*/
-                       idx1++;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
-                                      ProtocolIE_ID_id_RRCContainer;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present =\
-                                InitialULRRCMessageTransferIEs__value_PR_RRCContainer;
-                                                               
-                       initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size =\
-                                                     strlen((const char*)rrcContainer);
-         DU_ALLOC(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf,
-                                       initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size)
-                       if(!initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf)
-                       {
-                     DU_LOG(" F1AP : Memory allocation for RRCSetupRequestMessageTransferIEs failed");
-                               break;
+   puschCfg->txConfig = NULLP;
+       puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
+   DU_ALLOC(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
+      sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+   if(!puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      return RFAILED;
+   }
 
-                       }
-         memcpy(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf, rrcContainer,
-                                       initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size);
+   if(BuildDMRSULPuschMapTypeA(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) != ROK)
+   {
+      return RFAILED;
+   }
 
+   puschCfg->dmrs_UplinkForPUSCH_MappingTypeB = NULLP;
+       puschCfg->pusch_PowerControl = NULLP;
+       puschCfg->frequencyHopping = NULLP;
+       puschCfg->frequencyHoppingOffsetLists = NULLP;
+   puschCfg->resourceAllocation = RES_ALLOC_TYPE;
 
-                       /*DUtoCURRCContainer*/
-                       idx1++;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
-                                      ProtocolIE_ID_id_DUtoCURRCContainer;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
-                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present =\
-                                InitialULRRCMessageTransferIEs__value_PR_DUtoCURRCContainer;
+   puschCfg->pusch_TimeDomainAllocationList = NULLP;
+   DU_ALLOC(puschCfg->pusch_TimeDomainAllocationList, \
+      sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+   if(!puschCfg->pusch_TimeDomainAllocationList)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      return RFAILED;
+   }
 
-                       ret = BuildDuToCuRrcContainer(&initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer);
-         if(ret != ROK)
-                       {
-                          break;
-                       }
-
-                       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+   if(BuildPuschTimeDomAllocList(puschCfg->pusch_TimeDomainAllocationList) != ROK)
+   {
+      return RFAILED;
+   }
 
-                       /* Encode the F1SetupRequest type as APER */
-                       cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
-                       encBufSize = 0;
-                       encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
-                       /* Encode results */
-                       if(encRetVal.encoded == ENCODE_FAIL)
-                       {
-                           DU_LOG( "\n F1AP : Could not encode Initial UL RRC Message Transfer\
-                                   structure (at %s)\n",encRetVal.failed_type ? \
-                                        encRetVal.failed_type->name : "unknown");
-                                break;
-                       }
-                       else
-                       {
-                           
-                                 DU_LOG("\n F1AP : Created APER encoded buffer for Initial UL RRC\
-                                 Message transfer\n");
-                                  for(int i=0; i< encBufSize; i++)
-                                       {
-                                           printf("%x",encBuf[i]);
-                                       }
-                       }
-                       /* Sending  msg  */
-                       if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL) != ROK)
-                       {
-                           DU_LOG("\n F1AP : Sending Initial UL RRC Message Transfer Failed");
-                                break;
-                       }
-                       checkvar=true;
-                       break;
-       }
-   
-       if(f1apMsg != NULLP)
+   puschCfg->pusch_AggregationFactor = NULLP;
+       puschCfg->mcs_Table = NULLP;
+       puschCfg->mcs_TableTransformPrecoder = NULLP;
+   puschCfg->transformPrecoder = NULLP;
+   DU_ALLOC(puschCfg->transformPrecoder, sizeof(long));
+   if(!puschCfg->transformPrecoder)
    {
-           if(f1apMsg->choice.initiatingMessage != NULLP)
-                {
-                    if(initULRRCMsg->protocolIEs.list.array != NULLP)
-                         {
-                        if(idx == elementCnt)
-                             {
-                                      idx1=1;
-                                 if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.pLMN_Identity.buf!=NULLP)
-                                      {
-                                          if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.nRCellIdentity.buf!=NULLP)
-                                               {
-                                                   DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.nRCellIdentity.buf,
-                                                        initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.nRCellIdentity.size);
-                                               }
-                                               DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.pLMN_Identity.buf,\
-                                                initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.pLMN_Identity.size);
-                                       }
+      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      return RFAILED;
+   }
+   *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
 
-                                                 idx1=3;
-                                                 if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf)
-                                                 {
-                                                         DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf,
-                                                                         initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size)
-                                                 }
+       puschCfg->codebookSubset = NULLP;
+       puschCfg->maxRank = NULLP;
+       puschCfg->rbg_Size = NULLP;
+       puschCfg->uci_OnPUSCH = NULLP;
+       puschCfg->tp_pi2BPSK = NULLP;
 
-                                                 idx1 = 4;
-                                                 if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer.buf)
-                                                 {
-                                                    DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer.buf,
-                                                         initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer.size);
-                                                 }
-                                       for(ieId=0; ieId<elementCnt; ieId++)
-                                       {
-                                          DU_FREE(initULRRCMsg->protocolIEs.list.array[ieId],sizeof(InitialULRRCMessageTransferIEs_t));
-                                       }
-                              }
-                              else
-                              {
-                                   for(ieId=0; ieId<idx; ieId++)
-                                             {
-                                                 DU_FREE(initULRRCMsg->protocolIEs.list.array[ieId],sizeof(InitialULRRCMessageTransferIEs_t));
-                                             }
-                              }
-                                        DU_FREE(initULRRCMsg->protocolIEs.list.array,initULRRCMsg->protocolIEs.list.size);
-                        }
-                        DU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-                }
-                DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
-       }
-       if(checkvar==true)
-          return ROK;
-       else
-          return RFAILED;
-}/* End of BuildAndSendInitialRrcMsgTransfer*/
+   return ROK;
+}
 
 /*******************************************************************
  *
- * @brief Builds Special cell list for UE Setup Request 
+ * @brief Fills SRS resource to add/modify list 
  *
  * @details
  *
- *    Function : BuildSplCellList
+ *    Function : BuildSrsRsrcAddModList
  *
- *    Functionality: Constructs the Special Cell list for UESetReq
- *
- * @params[in] SCell_ToBeSetup_List_t *spCellLst
+ *    Functionality: Fills SRS resource to add/modify list
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildSplCellList(SCell_ToBeSetup_List_t *spCellLst)
+uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *resourceList)
 {
-       U8  cellCnt;
-       U8  idx;
-       S16 ret;
-       cellCnt = 1;
-       spCellLst->list.count = cellCnt;
-       spCellLst->list.size = cellCnt * sizeof(SCell_ToBeSetup_ItemIEs_t *);
-       DU_ALLOC(spCellLst->list.array,spCellLst->list.size);
-       if(spCellLst->list.array == NULLP)
-       {
-               return RFAILED;
-       }
-       for(idx=0; idx<cellCnt; idx++)
-       {
-               DU_ALLOC(spCellLst->list.array[idx],sizeof(SCell_ToBeSetup_ItemIEs_t));
-               if(spCellLst->list.array[idx] == NULLP)
-               {
-                       return RFAILED;
-               }
-       }
-       idx = 0;
-       spCellLst->list.array[idx]->id = ProtocolIE_ID_id_SCell_ToBeSetup_Item;
-       spCellLst->list.array[idx]->criticality = Criticality_ignore;
-       spCellLst->list.array[idx]->value.present =\
-               SCell_ToBeSetup_ItemIEs__value_PR_SCell_ToBeSetup_Item;
-       /* Special Cell ID -NRCGI */
-       ret = BuildNrcgi(&spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCell_ID);
-       if(ret != ROK)
-       {
-               return RFAILED;
-       }
-       /*Special Cell Index*/
-       spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCellIndex = 1;
-  return ROK;  
-}/* End of BuildSplCellList*/
+   uint8_t   elementCnt;
+   uint8_t   rsrcIdx;
+
+   elementCnt = 1;
+   resourceList->list.count = elementCnt;
+   resourceList->list.size = elementCnt * sizeof(SRS_Resource_t *);
+   resourceList->list.array = NULLP;
+   DU_ALLOC(resourceList->list.array, resourceList->list.size);
+   if(!resourceList->list.array)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      return RFAILED;
+   }
+   for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+   {
+      DU_ALLOC(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
+      if(!resourceList->list.array[rsrcIdx])
+      {
+         DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+         return RFAILED;
+      }
+   }
+
+   rsrcIdx = 0;
+   resourceList->list.array[rsrcIdx]->srs_ResourceId = SRS_RSRC_ID;
+   resourceList->list.array[rsrcIdx]->nrofSRS_Ports = SRS_Resource__nrofSRS_Ports_port1;
+   resourceList->list.array[rsrcIdx]->transmissionComb.present = SRS_Resource__transmissionComb_PR_n2;
+
+   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2 = NULLP;
+   DU_ALLOC(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2, \
+      sizeof(struct SRS_Resource__transmissionComb__n2));
+   if(!resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      return RFAILED;
+   }
+   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->combOffset_n2\
+          = SRS_COMB_OFFSET_N2;
+   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->cyclicShift_n2\
+          = SRS_CYCLIC_SHIFT_N2;
+
+   resourceList->list.array[rsrcIdx]->resourceMapping.startPosition = \
+          PUSCH_START_SYMBOL;
+   resourceList->list.array[rsrcIdx]->resourceMapping.nrofSymbols =  \
+      SRS_Resource__resourceMapping__nrofSymbols_n1;
+   resourceList->list.array[rsrcIdx]->resourceMapping.repetitionFactor = \
+      SRS_Resource__resourceMapping__repetitionFactor_n1;
+
+   resourceList->list.array[rsrcIdx]->freqDomainPosition = SRS_FREQ_DOM_POS;
+   resourceList->list.array[rsrcIdx]->freqDomainShift = SRS_FREQ_DOM_SHIFT;
+   resourceList->list.array[rsrcIdx]->freqHopping.c_SRS = C_SRS;
+   resourceList->list.array[rsrcIdx]->freqHopping.b_SRS = B_SRS;
+   resourceList->list.array[rsrcIdx]->freqHopping.b_hop = B_HOP;
+   resourceList->list.array[rsrcIdx]->groupOrSequenceHopping = \
+      SRS_Resource__groupOrSequenceHopping_neither;
+
+   /* Setting resource type to aperiodic for intergration purposes */
+   resourceList->list.array[rsrcIdx]->resourceType.present = \
+          SRS_Resource__resourceType_PR_aperiodic;
+   resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic = NULLP;
+   DU_ALLOC(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,
+      sizeof(struct SRS_Resource__resourceType__aperiodic));
+   if(!resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      return RFAILED;
+   }
+   resourceList->list.array[rsrcIdx]->sequenceId = SRS_SEQ_ID;
 
-/*******************************************************************
- *
- * @brief Builds SRBS to be setup 
- *
- * @details
- *
- *    Function : BuildSRBSetup
- *
- *    Functionality: Constructs the SRB's for UESetReq
- *
- * @params[in] SRBs_ToBeSetup_List_t *srbSet
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-S16 BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
-{
-       U8 idx;
-       U8 srbCnt;
-       srbCnt = 1;
-       srbSet->list.count = srbCnt;
-       srbSet->list.size = srbCnt*sizeof(SRBs_ToBeSetup_ItemIEs_t *);
-       DU_ALLOC(srbSet->list.array,srbSet->list.size);
-       if(srbSet->list.array == NULLP)
-       {
-               return RFAILED;
-       }
-       for(idx=0; idx<srbCnt; idx++)
-       {
-               DU_ALLOC(srbSet->list.array[idx],sizeof(SRBs_ToBeSetup_ItemIEs_t));
-               if(srbSet->list.array[idx] == NULLP)
-          {
-                  return RFAILED;
-               }
-       }
-       idx = 0;
-       srbSet->list.array[idx]->id = ProtocolIE_ID_id_SRBs_ToBeSetup_Item;
-       srbSet->list.array[idx]->criticality = Criticality_ignore;
-       srbSet->list.array[idx]->value.present = \
-                       SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item;
-   srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = 2;
    return ROK;
-}/* End of BuildSRBSetup*/
+}
 
 /*******************************************************************
  *
- * @brief Builds QOS Info for DRB Setum Item 
+ * @brief Build SRS resource set Add/mod list
  *
  * @details
  *
- *    Function : BuildQOSInfo
- *
- *    Functionality: Constructs the QOS Info for DRB Setup Item
+ *    Function : BuildSrsRsrcSetAddModList
  *
- * @params[in] QoSInformation_t *qosinfo
+ *    Functionality: Build SRS resource set Add/mod list
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildQOSInfo(QoSFlowLevelQoSParameters_t *drbQos)
+uint8_t BuildSrsRsrcSetAddModList
+(
+struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
+)
 {
-       /* NonDynamic5QIDescriptor */
-       drbQos->qoS_Characteristics.present = QoS_Characteristics_PR_non_Dynamic_5QI;
-       DU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI,sizeof(NonDynamic5QIDescriptor_t));
-       if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI == NULLP)
-       {
-               return RFAILED;
-       }
-       /*FiveQI*/
-       drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = 0;
-       /*AveragingWindow*/
-       DU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,\
-                                                                                               sizeof(AveragingWindow_t));
-       if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow == \
-                                                                                                                                                                                                       NULLP)
-       {
-               return RFAILED;
-       }
-       *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow) = 0;
-       /*MaxDataBurstVolume*/
-       DU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
-                                                                                               sizeof(MaxDataBurstVolume_t));
-       if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume == \
-                                                                                                                                                                                                       NULLP)
-       {
-               return RFAILED;
-       }
-       *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume) = 0;
+   uint8_t  elementCnt;
+   uint8_t  rSetIdx;
+       uint8_t  rsrcIdx;
+       struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList;
 
-       /*nRGRAN Allocation Retention Priority*/
-       drbQos->nGRANallocationRetentionPriority.priorityLevel =        \
-                                                                                               PriorityLevel_highest;
-       drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = \
-                                                       Pre_emptionCapability_may_trigger_pre_emption;
-       drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = \
-                                                               Pre_emptionVulnerability_not_pre_emptable;
+   elementCnt = 1;
+   rsrcSetList->list.count = elementCnt;
+   rsrcSetList->list.size = elementCnt * sizeof(SRS_ResourceSet_t *);
+   rsrcSetList->list.array = NULLP;
+   DU_ALLOC(rsrcSetList->list.array, rsrcSetList->list.size);
+   if(!rsrcSetList->list.array)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+      return RFAILED;
+   }
 
-       /* TO DO: GBR_QoSFlowInformation */
-        return ROK;
-}/*End of BuildQOSInfo*/
+   for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+   {
+      DU_ALLOC(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+      if(!rsrcSetList->list.array[rSetIdx])
+      {
+         DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+         return RFAILED;
+      }
+   }
 
-/*******************************************************************
- *
- * @brief Builds SNSSAI  
- *
- * @details
- *
- *    Function : BuildSNSSAI
- *
- *    Functionality: Constructs the SNSSAI For DRB list
- *
- * @params[in] SNSSAI_t *snssai
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-S16 BuildSNSSAI(SNSSAI_t *snssai)
-{
-       /*SNSSAI*/
-         /*ssT*/
-       snssai->sST.size = sizeof(U8);
-       DU_ALLOC(snssai->sST.buf,snssai->sST.size);
-       if(snssai->sST.buf == NULLP)
-       {
-               return RFAILED;
-       }
-       snssai->sST.buf[0] = 3;
-         /*sD*/
-       DU_ALLOC(snssai->sD,sizeof(OCTET_STRING_t));
-       if(snssai->sD == NULLP)
-       {
-               return RFAILED;
-       }
-       snssai->sD->size = 3*sizeof(U8);
-       DU_ALLOC(snssai->sD->buf,snssai->sD->size);
-       if(snssai->sD->buf == NULLP)
+   rSetIdx = 0;
+   rsrcSetList->list.array[rSetIdx]->srs_ResourceSetId = SRS_RSET_ID;
+
+       /* Fill Resource Id list in resource set */
+       rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList = NULLP;
+       DU_ALLOC(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+          sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+       if(!rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
        {
+          DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
                return RFAILED;
        }
-               snssai->sD->buf[0] = 3;
-               snssai->sD->buf[1] = 6;
-               snssai->sD->buf[2] = 9;
-   return ROK;
-}/*End of BuildSNSSAI*/
 
-/*******************************************************************
- *
- * @brief Builds the flow map.  
- *
- * @details
- *
- *    Function : BuildFlowsMap
- *
- *    Functionality: Constructs the flowmap For DRB list
- *
- * @params[in] Flows_Mapped_To_DRB_List_t *flowMap
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-S16 BuildFlowsMap(Flows_Mapped_To_DRB_List_t *flowMap)
-{
-       S16 ret;
-       U8  idx;
-       U8 flowCnt;
-       flowCnt = 1;
-       flowMap->list.count = flowCnt;
-       flowMap->list.size = flowCnt * sizeof(Flows_Mapped_To_DRB_Item_t *);
-       DU_ALLOC(flowMap->list.array,flowMap->list.size);
-       if(flowMap->list.array == NULLP)
+       elementCnt = 1;
+       rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+       rsrcIdList->list.count = elementCnt;
+       rsrcIdList->list.size = elementCnt * sizeof(SRS_ResourceId_t *);
+       rsrcIdList->list.array = NULLP;
+       DU_ALLOC(rsrcIdList->list.array, rsrcIdList->list.size);
+       if(!rsrcIdList->list.array)
        {
+          DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
                return RFAILED;
        }
-       for(idx=0; idx<flowCnt; idx++)
+
+       for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
        {
-               DU_ALLOC(flowMap->list.array[idx],sizeof(Flows_Mapped_To_DRB_Item_t));
-               if(flowMap->list.array[idx] == NULLP)
+          DU_ALLOC(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+               if(!rsrcIdList->list.array[rsrcIdx])
                {
-                  return RFAILED;
+                  DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+                       return RFAILED;
                }
        }
-       idx = 0;
-       flowMap->list.array[idx]->qoSFlowIdentifier = 0;
-       ret = BuildQOSInfo(&flowMap->list.array[idx]->qoSFlowLevelQoSParameters);
-       if(ret != ROK)
-       {
+
+       rsrcIdx = 0;
+       *rsrcIdList->list.array[rsrcIdx] = SRS_RSRC_ID;
+
+       /* Fill resource type */
+   rsrcSetList->list.array[rSetIdx]->resourceType.present = \
+      SRS_ResourceSet__resourceType_PR_aperiodic;
+
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic = NULLP;
+   DU_ALLOC(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+      sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+   if(!rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic)
+   {
+          DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
                return RFAILED;
        }
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->aperiodicSRS_ResourceTrigger \
+          = APERIODIC_SRS_RESRC_TRIGGER;
+
+       /* TODO : Fill values for below IEs as expected by Viavi */
+       rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->csi_RS = NULLP;
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->slotOffset = NULLP;
+  
+
+   rsrcSetList->list.array[rSetIdx]->usage = SRS_ResourceSet__usage_codebook;
+       rsrcSetList->list.array[rSetIdx]->alpha = NULLP;
+       rsrcSetList->list.array[rSetIdx]->p0 = NULLP;
+       rsrcSetList->list.array[rSetIdx]->pathlossReferenceRS = NULLP;
+       rsrcSetList->list.array[rSetIdx]->srs_PowerControlAdjustmentStates = NULLP;
+
    return ROK;
-}/*End of BuildFlowsMap*/
+}
 
 /*******************************************************************
  *
- * @brief Builds the Uplink Tunnel Info  
+ * @brief Builds BWP UL dedicated SRS Config
  *
  * @details
  *
- *    Function : BuildULTnlInfo
- *
- *    Functionality: Constructs the UL TnlInfo For DRB list
+ *    Function : BuildBWPUlDedSrsCfg
  *
- * @params[in] ULUPTNLInformation_ToBeSetup_List_t *ulInfo
+ *    Functionality: Builds BWP UL dedicated SRS Config
  *
+ * @params[in] SRS Config 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
+uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
 {
-       U8 idx;
-       U8 ulCnt;
-       ulCnt = 1;
-       ulInfo->list.count = ulCnt;
-       ulInfo->list.size = ulCnt * sizeof(ULUPTNLInformation_ToBeSetup_Item_t *);
-       DU_ALLOC(ulInfo->list.array,ulInfo->list.size);
-       if(ulInfo->list.array == NULLP)
-       {
-               return RFAILED;
-       }
-       for(idx=0; idx<ulCnt; idx++)
-       {
-               DU_ALLOC(ulInfo->list.array[idx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
-               if(ulInfo->list.array[idx] == NULLP)
-               {
-                       return RFAILED;
-               }
-       }
-       idx = 0;
-       ulInfo->list.array[idx]->uLUPTNLInformation.present = \
-                                                               UPTransportLayerInformation_PR_gTPTunnel;
-       /*GTP TUNNEL*/
-       DU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel,\
-                               sizeof(GTPTunnel_t));
-       if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel == NULLP)
-       {
-               return RFAILED;
-       }
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.size      = 4*sizeof(U8);
-   DU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.buf,ulInfo->list.array[idx]->\
-               uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
-       if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.buf == NULLP)
-       {
-               return RFAILED;
-       }
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.buf[0] = 4;
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.buf[1] = 4;
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.buf[2] = 4;
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.buf[3] = 5;
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               transportLayerAddress.bits_unused = 0;
-       /*GTP TEID*/
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size\
-                                       = 4 * sizeof(U8);
-       DU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-                               gTP_TEID.buf,ulInfo->list.array[idx]->uLUPTNLInformation.choice.\
-                               gTPTunnel->gTP_TEID.size);
-       if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
-                               == NULLP)
-       {
-               return RFAILED;
-       }
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               gTP_TEID.buf[0] = 11;
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               gTP_TEID.buf[1] = 0;
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               gTP_TEID.buf[2] = 0;
-       ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-               gTP_TEID.buf[3] = 1;
+   srsCfg->srs_ResourceSetToReleaseList = NULLP;
+   srsCfg->srs_ResourceSetToAddModList = NULLP;
+   DU_ALLOC(srsCfg->srs_ResourceSetToAddModList, \
+      sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
+   if(!srsCfg->srs_ResourceSetToAddModList)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
+      return RFAILED;
+   }
+   if(BuildSrsRsrcSetAddModList(srsCfg->srs_ResourceSetToAddModList) != ROK)
+   {
+      return RFAILED;
+   }
+
+   srsCfg->srs_ResourceToReleaseList = NULLP;
+
+   /* Resource to Add/Modify list */
+   srsCfg->srs_ResourceToAddModList = NULLP;
+   DU_ALLOC(srsCfg->srs_ResourceToAddModList, \
+      sizeof(struct SRS_Config__srs_ResourceToAddModList));
+   if(!srsCfg->srs_ResourceToAddModList)
+   {
+      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
+      return RFAILED;
+   }
+
+   if(BuildSrsRsrcAddModList(srsCfg->srs_ResourceToAddModList) != ROK)
+   {
+      return RFAILED;
+   }
+
+   srsCfg->tpc_Accumulation = NULLP;
 
    return ROK;
-}/*End of BuildULTnlInfo*/
+}
 
 /*******************************************************************
  *
- * @brief Builds DRBS to be setup 
+ * @brief Builds inital UL BWP
  *
  * @details
  *
- *    Function : BuildDRBSetup
- *
- *    Functionality: Constructs the DRB's for UESetReq
+ *    Function : BuildInitialUlBWP
  *
- * @params[in] DRBs_ToBeSetup_List_t *drbSet
+ *    Functionality: Builds initial UL BWP
  *
+ * @params[in] BWP_UplinkDedicated_t *ulBwp
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
+uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
 {
-       S16 BuildQOSInforet;
-       S16 BuildSNSSAIret;
-       S16 BuildFlowsMapret;
-       U8       idx;
-       U8  drbCnt;
-       DRBs_ToBeSetup_Item_t *drbSetItem;
-       drbCnt = 1;
-       drbSet->list.count = drbCnt;
-       drbSet->list.size = drbCnt*sizeof(DRBs_ToBeSetup_ItemIEs_t *);
-       DU_ALLOC(drbSet->list.array,drbSet->list.size);
-       if(drbSet->list.array == NULLP)
-       {
-               return RFAILED;
-       }
-       for(idx=0; idx<drbCnt; idx++)
-       {
-               DU_ALLOC(drbSet->list.array[idx],sizeof(DRBs_ToBeSetup_ItemIEs_t));
-               if(drbSet->list.array[idx] == NULLP)
-               {
-                       return RFAILED;
-               }
-       }
-       idx = 0;
-       drbSet->list.array[idx]->id = ProtocolIE_ID_id_DRBs_ToBeSetup_Item;
-       drbSet->list.array[idx]->criticality = Criticality_ignore;
-       drbSet->list.array[idx]->value.present = \
-                       DRBs_ToBeSetup_ItemIEs__value_PR_DRBs_ToBeSetup_Item;
-   drbSetItem = &drbSet->list.array[idx]->value.choice.DRBs_ToBeSetup_Item;    
-       /*dRBID*/
-       drbSetItem->dRBID = 1;  
-       /*qoSInformation*/
-       drbSetItem->qoSInformation.present = QoSInformation_PR_choice_extension;
-       DU_ALLOC(drbSetItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
-       if(drbSetItem->qoSInformation.choice.choice_extension == NULLP)
-       {       
-               return RFAILED;
-       }
-       drbSetItem->qoSInformation.choice.choice_extension->id = \
-                                                       ProtocolIE_ID_id_DRB_Information;
-       drbSetItem->qoSInformation.choice.choice_extension->criticality = \
-                                                       Criticality_ignore;
-       drbSetItem->qoSInformation.choice.choice_extension->value.present = \
-                                                       QoSInformation_ExtIEs__value_PR_DRB_Information;
-       BuildQOSInforet = BuildQOSInfo(&drbSetItem->qoSInformation.choice.\
-                                                       choice_extension->value.choice.DRB_Information.dRB_QoS);
-       if(BuildQOSInforet != ROK)
-       {
-               return RFAILED;
-       }
-       /*SNSSAI*/
-       BuildSNSSAIret = BuildSNSSAI(&drbSetItem->qoSInformation.choice.\
-                                                       choice_extension->value.choice.DRB_Information.sNSSAI);
-       if(BuildSNSSAIret != ROK)
-       {       
-               return RFAILED;
-       }
-       /*Flows mapped to DRB List*/
-       BuildFlowsMapret = BuildFlowsMap(&drbSetItem->qoSInformation.choice.\
-                               choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List);
-       if(BuildFlowsMapret != ROK)
-       {
-               return RFAILED;
-       }
-       /*ULUPTNLInformation To Be Setup List*/
-   BuildULTnlInforet = BuildULTnlInfo(&drbSetItem->uLUPTNLInformation_ToBeSetup_List);
-       if(BuildULTnlInforet != ROK)
-       {
-               return RFAILED;
-       }
-       /*RLCMode*/
-       drbSetItem->rLCMode = RLCMode_rlc_um_bidirectional;
+   ulBwp->pucch_Config = NULLP;
+
+   /* Fill BWP UL dedicated PUSCH config */
+       ulBwp->pusch_Config = NULLP;
+   DU_ALLOC(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
+   if(!ulBwp->pusch_Config)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
+   
+   ulBwp->pusch_Config->present = BWP_UplinkDedicated__pusch_Config_PR_setup;
+   ulBwp->pusch_Config->choice.setup = NULLP;
+   DU_ALLOC(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+   if(!ulBwp->pusch_Config->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
+
+   if(BuildBWPUlDedPuschCfg(ulBwp->pusch_Config->choice.setup) != ROK)
+   {
+      return RFAILED;
+   }
+
+       ulBwp->configuredGrantConfig = NULLP;
+
+   /* Fill BPW UL dedicated SRS config */
+       ulBwp->srs_Config = NULLP;
+   DU_ALLOC(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
+   if(!ulBwp->srs_Config)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
+
+   ulBwp->srs_Config->present = BWP_UplinkDedicated__srs_Config_PR_setup;
+   ulBwp->srs_Config->choice.setup = NULLP;
+   DU_ALLOC(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+   if(!ulBwp->srs_Config->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
+
+   if(BuildBWPUlDedSrsCfg(ulBwp->srs_Config->choice.setup) != ROK)
+   {
+      return RFAILED;   
+   }
+
+       ulBwp->beamFailureRecoveryConfig = NULLP;
+   
+   return ROK;
+}
 
-       /*UL Configuration*/
-       DU_ALLOC(drbSetItem->uLConfiguration,sizeof(ULConfiguration_t));
-       if(drbSetItem->uLConfiguration == NULLP)
-       {
-          return RFAILED;
-       }
-       drbSetItem->uLConfiguration->uLUEConfiguration = ULUEConfiguration_no_data;
-        return ROK;
-}/* End of BuildDRBSetup*/
 /*******************************************************************
 *
-* @brief Deallocating memory of function BuildAndSendUESetReq
+* @brief Builds Pusch Serving cell Config
 *
 * @details
 *
-*    Function : FreeNrcgi
+*    Function : BuildPuschSrvCellCfg
 *
-*    Functionality: Deallocating memory for function BuildNrcgi
+*    Functionality: Builds Pusch Serving cell Config
 *
-* @params[in] NRCGI_t *nrcgi
+* @params[in] struct UplinkConfig__pusch_ServingCellConfig *puschCfg
 *
-* @return void
+* @return ROK     - success
+*         RFAILED - failure
 *
-*******************************************************************/
-void FreeNrcgi(NRCGI_t *nrcgi)
+* ****************************************************************/
+uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *puschCfg)
 {
-       if(nrcgi->pLMN_Identity.buf != NULLP)
-       {
-            if(nrcgi->nRCellIdentity.buf != NULLP)
-            {
-           DU_FREE(nrcgi->nRCellIdentity.buf, nrcgi->nRCellIdentity.size); 
-                 }
-            DU_FREE(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
-       }
+   puschCfg->present = UplinkConfig__pusch_ServingCellConfig_PR_setup;
+   puschCfg->choice.setup = NULLP;
+   DU_ALLOC(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
+   if(!puschCfg->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
+
+   puschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
+       puschCfg->choice.setup->rateMatching = NULLP;
+       puschCfg->choice.setup->xOverhead = NULLP;
+   puschCfg->choice.setup->ext1 = NULLP;
+   DU_ALLOC(puschCfg->choice.setup->ext1, sizeof(struct PUSCH_ServingCellConfig__ext1));
+   if(!puschCfg->choice.setup->ext1)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
+
+   puschCfg->choice.setup->ext1->maxMIMO_Layers = NULLP;
+   DU_ALLOC(puschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
+   if(!puschCfg->choice.setup->ext1->maxMIMO_Layers)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
+   *(puschCfg->choice.setup->ext1->maxMIMO_Layers) = PUSCH_MAX_MIMO_LAYERS;
+
+   puschCfg->choice.setup->ext1->processingType2Enabled= NULLP;
+   DU_ALLOC(puschCfg->choice.setup->ext1->processingType2Enabled,sizeof(BOOLEAN_t));
+   if(!puschCfg->choice.setup->ext1->processingType2Enabled)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
+   *(puschCfg->choice.setup->ext1->processingType2Enabled) = PUSCH_PROCESS_TYPE2_ENABLED;
+   return ROK;
 }
+
 /*******************************************************************
-*
-* @brief  Deallocating memory of function BuildAndSendUESetReq
-*
-* @details
-*
-*    Function : FreeSplCellList
-*
-*    Functionality: Deallocating memory for function BuildSplCellList
-*
-* @params[in] SCell_ToBeSetup_List_t *spCellLst
-*
-* @return void
-*      
-*
-* *****************************************************************/
-void FreeSplCellList(SCell_ToBeSetup_List_t *spCellLst)
+ *
+ * @brief Builds UL config
+ * @details
+ *
+ *    Function : BuildUlCfg 
+ *
+ *    Functionality: Builds UL config in spCellCfgDed
+ *
+ * @params[in] UplinkConfig_t *ulCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
 {
-    U8  cellidx;
-    if(spCellLst->list.array != NULLP)
-        {
-             for(cellidx=0; cellidx<spCellLst->list.count; cellidx++)
-                       {
-                           if(cellidx==0&&spCellLst->list.array[cellidx]!=NULLP)
-                                {
-                                   FreeNrcgi(&spCellLst->list.array[cellidx]->value.choice.SCell_ToBeSetup_Item.sCell_ID);
-                                }
-                                if(spCellLst->list.array[cellidx]!=NULLP)
-                                {
-                                    DU_FREE(spCellLst->list.array[cellidx],sizeof(SCell_ToBeSetup_ItemIEs_t));
-                                }
-                       }
-                       DU_FREE(spCellLst->list.array,spCellLst->list.size);
-        }
+   ulCfg->initialUplinkBWP = NULLP;
+   DU_ALLOC(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
+       if(!ulCfg->initialUplinkBWP)
+       {
+          DU_LOG("\nF1AP : Memory Allocation failed in BuildUlCfg");
+               return RFAILED;
+       }
+
+   if(BuildInitialUlBWP(ulCfg->initialUplinkBWP) != ROK)
+       {
+          return RFAILED;
+       }
+
+   ulCfg->uplinkBWP_ToReleaseList = NULLP;
+       ulCfg->uplinkBWP_ToAddModList = NULLP;
+       ulCfg->firstActiveUplinkBWP_Id = NULLP;
+   DU_ALLOC(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
+   if(!ulCfg->firstActiveUplinkBWP_Id)
+   {
+      DU_LOG("\nF1AP : Memory Allocation failed in BuildUlCfg");
+      return RFAILED;
+   }
+   *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
+
+   ulCfg->pusch_ServingCellConfig = NULLP;
+   DU_ALLOC(ulCfg->pusch_ServingCellConfig, \
+      sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+   if(!ulCfg->pusch_ServingCellConfig)
+   {
+      DU_LOG("\nF1AP : Memory Allocation failed in BuildUlCfg");
+      return RFAILED;
+   }
+
+   if(BuildPuschSrvCellCfg(ulCfg->pusch_ServingCellConfig) != ROK)
+   {
+      return RFAILED;
+   }
+   
+       ulCfg->carrierSwitching = NULLP;
+       ulCfg->ext1 = NULLP;
+       return ROK;
 }
- /*******************************************************************
- *
- * @brief Deallocating memory of function BuildAndSendUESetReq
+
+/*******************************************************************
  *
+ * @brief Builds PDSCH serving cell config
  * @details
  *
- *    Function : FreeSRBSetup
+ *    Function : BuildPdschSrvCellCfg
  *
- *    Functionality: Deallocating memory for function BuildSRBSetup
+ *    Functionality: Builds PDSCH serving cell config in spCellCfgDed
  *
- * @params[in] SRBs_ToBeSetup_List_t *srbSet
+ * @params[in] struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg 
  *
- * @return void
- *        
+ * @return ROK     - success
+ *         RFAILED - failure
  *
- * ******************************************************************/
-void FreeSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
+ * ****************************************************************/
+uint8_t BuildPdschSrvCellCfg(struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
 {
-    U8 srbidx;
-        if(srbSet->list.array != NULLP)
-        {
-            for(srbidx=0; srbidx<srbSet->list.count; srbidx++)
-                 {
-                     if(srbSet->list.array[srbidx]!=NULLP)
-                               {
-                                   DU_FREE(srbSet->list.array[srbidx],sizeof(SRBs_ToBeSetup_ItemIEs_t));
-                               }
-                 }
-                 DU_FREE(srbSet->list.array,srbSet->list.size);
-        }
+   pdschCfg->present =  ServingCellConfig__pdsch_ServingCellConfig_PR_setup;
+   pdschCfg->choice.setup = NULLP;
+   DU_ALLOC(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
+   if(!pdschCfg->choice.setup)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+      return RFAILED;
+   }
+
+   pdschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
+       pdschCfg->choice.setup->xOverhead = NULLP;
+   pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH = NULLP;
+   DU_ALLOC(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH, sizeof(long));
+   if(!pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)
+   {
+      DU_LOG("\nF1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+      return RFAILED;
+   }
+   *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)= PDSCH_NUM_HARQ_PROC;
+       pdschCfg->choice.setup->pucch_Cell = NULLP;
+       pdschCfg->choice.setup->ext1 = NULLP;
+
+   return ROK;
 }
- /*******************************************************************
-  *
-  * @brief Deallocating memory of function BuildAndSendUESetReq
-  *
-  * @details
-  *
-  *    Function : FreeQOSInfo
-  *
-  *    Functionality:  Deallocating memory for function BuildQOSInfo
-  *
-  * @params[in] QoSFlowLevelQoSParameters_t *drbQos
-  *
-  * @return void
-  *          
-  * ****************************************************************/
-void FreeQOSInfo(QoSFlowLevelQoSParameters_t *drbQos)
+
+/*******************************************************************
+ *
+ * @brief Builds CSI Meas config
+ * @details
+ *
+ *    Function : BuildCsiMeasCfg 
+ *
+ *    Functionality: Builds CSI Meas config in spCellCfgDed
+ *
+ * @params[in] struct ServingCellConfig__csi_MeasConfig *csiMeasCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildCsiMeasCfg(struct ServingCellConfig__csi_MeasConfig *csiMeasCfg)
 {
-    if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI != NULLP)
-        {
-            if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
-                 {
-                     if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
-                               {
-                                   DU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
-                                        sizeof(MaxDataBurstVolume_t));
-                               }
-                                DU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,\
-                                sizeof(AveragingWindow_t));
-                 }
-                 DU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI,\
-                 sizeof(NonDynamic5QIDescriptor_t));
-        }
+
+   return ROK;
 }
- /*******************************************************************
-  *
-  * @brief Deallocating memory of function BuildAndSendUESetReq
-  *
 * @details
 *
-  *    Function : FreeULTnlInfo
 *
-  *    Functionality:  Deallocating memory for function BuildULTnlInfo
 *
-  * @params[in] ULUPTNLInformation_ToBeSetup_List_t *ulInfo
 *
-  * @return void
-  *         
+
+/*******************************************************************
+ *
+ * @brief Builds Spcell config dedicated
+ * @details
+ *
+ *    Function : BuildSpCellCfgDed
+ *
+ *    Functionality: Builds sp cell config dedicated in spCellCfg
+ *
+ * @params[in] ServingCellConfig_t srvCellCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
  * ****************************************************************/
-void FreeULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
+uint8_t BuildSpCellCfgDed(ServingCellConfig_t *srvCellCfg)
 {
-    U8 ulidx=0;
-        if(ulInfo->list.array != NULLP)
-        {
-            for(ulidx=0; ulidx<ulInfo->list.count; ulidx++)
-                 {
-                     if(ulidx==0&&ulInfo->list.array[ulidx]!=NULLP)
-                               {
-                                   if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel!=NULLP)
-                                        {
-                                            if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
-                                                 transportLayerAddress.buf != NULLP)
+   srvCellCfg->tdd_UL_DL_ConfigurationDedicated = NULLP;
+
+   srvCellCfg->initialDownlinkBWP = NULLP;
+   DU_ALLOC(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
+       if(!srvCellCfg->initialDownlinkBWP)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+               return RFAILED;
+       }
+
+   if(BuildInitialDlBWP(srvCellCfg->initialDownlinkBWP) != ROK)
+       {
+               DU_LOG("\nF1AP : BuildInitialDlBWP failed");
+               return RFAILED;
+       }
+   srvCellCfg->downlinkBWP_ToReleaseList = NULLP;
+       srvCellCfg->downlinkBWP_ToAddModList = NULLP;
+
+   srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
+       DU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+       if(!srvCellCfg->firstActiveDownlinkBWP_Id)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+               return RFAILED;
+       }
+       *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+
+       srvCellCfg->bwp_InactivityTimer = NULLP;
+
+   srvCellCfg->defaultDownlinkBWP_Id = NULLP;
+       DU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+       if(!srvCellCfg->defaultDownlinkBWP_Id)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+               return RFAILED;
+       }
+       *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+
+   srvCellCfg->uplinkConfig = NULLP;
+   DU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
+       if(!srvCellCfg->uplinkConfig)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+               return RFAILED;
+       }
+
+   if(BuildUlCfg(srvCellCfg->uplinkConfig) != ROK)
+       {
+               DU_LOG("\nF1AP : BuildUlCfg failed");
+               return RFAILED;
+       }
+       srvCellCfg->supplementaryUplink = NULLP;
+       srvCellCfg->pdcch_ServingCellConfig = NULLP;
+
+   srvCellCfg->pdsch_ServingCellConfig = NULLP;
+       DU_ALLOC(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct     ServingCellConfig__pdsch_ServingCellConfig));
+       if(!srvCellCfg->pdsch_ServingCellConfig)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+               return RFAILED;
+       }
+
+   if(BuildPdschSrvCellCfg(srvCellCfg->pdsch_ServingCellConfig) != ROK)
+       {
+               DU_LOG("\nF1AP : BuildPdschSrvCellCfg failed");
+               return RFAILED;
+       }
+
+   srvCellCfg->csi_MeasConfig = NULLP;
+#if 0
+       DU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct      ServingCellConfig__csi_MeasConfig))
+       if(!srvCellCfg->csi_MeasConfig)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
+               return RFAILED;
+       }
+
+   if(BuildCsiMeasCfg(srvCellCfg->csi_MeasConfig) != ROK)
+       {
+               DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
+               return RFAILED;
+       }
+#endif
+   srvCellCfg->sCellDeactivationTimer = NULLP;
+       srvCellCfg->crossCarrierSchedulingConfig = NULLP;
+       srvCellCfg->tag_Id = TAG_ID;
+   srvCellCfg->dummy = NULLP;
+   srvCellCfg->pathlossReferenceLinking = NULLP;
+   srvCellCfg->servingCellMO = NULLP;
+   srvCellCfg->ext1 = NULLP;
+
+       return ROK;
+}
+/*******************************************************************
+ *
+ * @brief Builds Spcell config 
+ *
+ * @details
+ *
+ *    Function : BuildSpCellCfg 
+ *
+ *    Functionality: Builds sp cell config in DuToCuRrcContainer
+ *
+ * @params[in] SpCellConfig_t spCellCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildSpCellCfg(SpCellConfig_t *spCellCfg)
+{
+
+   spCellCfg->servCellIndex = NULLP;
+       DU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
+       if(!spCellCfg->servCellIndex)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
+               return RFAILED;
+       }
+   *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
+
+   spCellCfg->reconfigurationWithSync = NULLP;
+       spCellCfg->rlf_TimersAndConstants = NULLP;
+   spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
+       DU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+       if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
+               return RFAILED;
+       }
+   *(spCellCfg->rlmInSyncOutOfSyncThreshold) = RLM_SYNC_OUT_SYNC_THRESHOLD;
+
+   spCellCfg->spCellConfigDedicated = NULLP;
+   DU_ALLOC(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
+       if(!spCellCfg->spCellConfigDedicated)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
+               return RFAILED;
+       }
+   if(BuildSpCellCfgDed(spCellCfg->spCellConfigDedicated) != ROK)
+       {
+               DU_LOG("\nF1AP : BuildSpCellCfgDed failed");
+               return RFAILED;
+       }
+       return ROK;
+}
+/*******************************************************************
+*
+* @brief Builds Phy cell group config 
+*
+* @details
+*
+*    Function : BuildPhyCellGrpCfg 
+*
+*    Functionality: Builds Phy cell group config in DuToCuRrcContainer
+*
+* @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t BuildPhyCellGrpCfg(PhysicalCellGroupConfig_t *phyCellGrpCfg)
+{
+   phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
+       phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
+
+   phyCellGrpCfg->p_NR_FR1 = NULLP;
+       DU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
+       if(!phyCellGrpCfg->p_NR_FR1)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildPhyCellGrpCfg");
+               return RFAILED;
+       }
+   *(phyCellGrpCfg->p_NR_FR1)             = P_NR_FR1;
+       phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
+       phyCellGrpCfg->tpc_SRS_RNTI = NULLP;
+       phyCellGrpCfg->tpc_PUCCH_RNTI = NULLP;
+       phyCellGrpCfg->tpc_PUSCH_RNTI = NULLP;
+       phyCellGrpCfg->sp_CSI_RNTI = NULLP;
+       phyCellGrpCfg->cs_RNTI = NULLP;
+       phyCellGrpCfg->ext1 = NULLP;
+       phyCellGrpCfg->ext2 = NULLP;
+
+       return ROK;
+}
+/*******************************************************************
+*
+* @brief Builds Mac cell group config 
+*
+* @details
+*
+*    Function : BuildMacCellGrpCfg 
+*
+*    Functionality: Builds Mac cell group config in DuToCuRrcContainer
+*
+* @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
+{
+   macCellGrpCfg->drx_Config = NULLP;
+   macCellGrpCfg->schedulingRequestConfig = NULLP;
+       DU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
+       if(!macCellGrpCfg->schedulingRequestConfig)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
+               return RFAILED;
+       }
+
+       if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
+       {
+          DU_LOG("\nF1AP : BuildSchedulingReqConfig failed");
+               return RFAILED;
+       }
+
+   macCellGrpCfg->bsr_Config = NULLP;
+   DU_ALLOC(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
+       if(!macCellGrpCfg->bsr_Config)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
+               return RFAILED;
+       }
+
+   if(BuildBsrConfig(macCellGrpCfg->bsr_Config) != ROK)
+       {
+      DU_LOG("\nF1AP : BuildBsrConfig failed");
+          return RFAILED;
+       }
+
+   macCellGrpCfg->tag_Config = NULLP;
+   DU_ALLOC(macCellGrpCfg->tag_Config, sizeof(struct TAG_Config));
+       if(!macCellGrpCfg->tag_Config)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
+               return RFAILED;
+       }
+
+   if(BuildTagConfig(macCellGrpCfg->tag_Config) != ROK)
+       {
+          DU_LOG("\nF1AP : BuildTagConfig failed");
+          return RFAILED;
+   }
+
+   macCellGrpCfg->phr_Config = NULLP;
+   DU_ALLOC(macCellGrpCfg->phr_Config, sizeof(struct MAC_CellGroupConfig__phr_Config));
+       if(!macCellGrpCfg->phr_Config)
+       {
+               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
+               return RFAILED;
+       }
+
+   if(BuildPhrConfig(macCellGrpCfg->phr_Config) != ROK)
+       {
+          DU_LOG("\nF1AP : BuildPhrConfig failed");
+          return RFAILED;
+   }
+
+   macCellGrpCfg->skipUplinkTxDynamic = false;
+       macCellGrpCfg->ext1 = NULLP;
+
+       return ROK;
+}
+ /*******************************************************************
+ *
+ * @brief Frees memeory allocated for SearchSpcToAddModList
+ *
+ * @details
+ *
+ *    Function : FreeSearchSpcToAddModList
+ *
+ *    Functionality: Deallocating memory of SearchSpcToAddModList
+ *
+ * @params[in] struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+ *
+ * @return void
+ *
+ 4221 * ****************************************************************/
+void FreeSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
+{
+    uint8_t idx1=0;
+    uint8_t idx2=0;
+    struct  SearchSpace *searchSpc=NULLP;
+
+    if(searchSpcList->list.array)
+        {
+           if(searchSpcList->list.array[idx2])
+           {
+          searchSpc = searchSpcList->list.array[idx2];
+              if(searchSpc->controlResourceSetId)
+              {
+                 if(searchSpc->monitoringSlotPeriodicityAndOffset)
+                 {
+                    if(searchSpc->monitoringSymbolsWithinSlot)
+                    {
+                       if(searchSpc->monitoringSymbolsWithinSlot->buf)
+                       {
+                          if(searchSpc->nrofCandidates)
+                          {
+                             if(searchSpc->searchSpaceType)
+                             {
+                                DU_FREE(searchSpc->searchSpaceType->choice.ue_Specific,\
+                                sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+                                DU_FREE(searchSpc->searchSpaceType, sizeof(struct
+                                                                        SearchSpace__searchSpaceType));
+                             }
+                             DU_FREE(searchSpc->nrofCandidates,
+                             sizeof(struct SearchSpace__nrofCandidates));
+                          }
+                          DU_FREE(searchSpc->monitoringSymbolsWithinSlot->buf, \
+                          searchSpc->monitoringSymbolsWithinSlot->size);
+                       }
+                       DU_FREE(searchSpc->monitoringSymbolsWithinSlot,
+                       sizeof(BIT_STRING_t));
+                    }
+                    DU_FREE(searchSpc->monitoringSlotPeriodicityAndOffset, \
+                    sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+                 }
+                 DU_FREE(searchSpc->controlResourceSetId,
+                 sizeof(ControlResourceSetId_t));
+                    }
+                 }
+                 for(idx1 = 0; idx1 < searchSpcList->list.count; idx1++)
+            {
+                DU_FREE(searchSpcList->list.array[idx1],
+                               sizeof(struct SearchSpace));
+                 }
+                 DU_FREE(searchSpcList->list.array,searchSpcList->list.size);
+        }
+}
+ /*******************************************************************
+ *
+ * @brief Frees memory allocated for PdschTimeDomAllocList
+ *
+ * @details
+ *
+ *    Function : FreePdschTimeDomAllocList
+ *
+ *    Functionality: Deallocating memory of PdschTimeDomAllocList
+ *
+ * @params[in] struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
+ *
+ * @return void
+ *
+ 4221 * ****************************************************************/
+void FreePdschTimeDomAllocList( struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
+{
+   uint8_t idx1=0;
+       
+       if(timeDomAllocList->choice.setup)
+   {
+      if(timeDomAllocList->choice.setup->list.array)
+      {
+          for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
+          {
+             DU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
+             sizeof(struct PDSCH_TimeDomainResourceAllocation));
+          }
+          DU_FREE(timeDomAllocList->choice.setup->list.array, \
+          timeDomAllocList->choice.setup->list.size);
+      }
+      DU_FREE(timeDomAllocList->choice.setup,\
+      sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+   }
+}
+ /*******************************************************************
+ *
+ * @brief Frees memory allocated for PuschTimeDomAllocList
+ *
+ *@details
+ *
+ *    Function : FreePuschTimeDomAllocList
+ *
+ *    Functionality: Deallocating memory of PuschTimeDomAllocList
+ *
+ * @params[in] PUSCH_Config_t *puschCfg
+ *
+ * @return void
+ *
+ 4221 * ****************************************************************/
+void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
+{
+    uint8_t idx1=0;
+        uint8_t idx2=0;
+    struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
+
+    if(puschCfg->pusch_TimeDomainAllocationList)
+    {
+       timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
+       if(timeDomAllocList_t->choice.setup)
+       {
+          if(timeDomAllocList_t->choice.setup->list.array)
+          {
+             DU_FREE(timeDomAllocList_t->choice.setup->list.array[idx2]->k2, sizeof(long));
+             for(idx1 = 0; idx1<timeDomAllocList_t->choice.setup->list.count; idx1++)
+             {
+                DU_FREE(timeDomAllocList_t->choice.setup->list.array[idx1],\
+                                   sizeof(PUSCH_TimeDomainResourceAllocation_t));
+                                }
+                                DU_FREE(timeDomAllocList_t->choice.setup->list.array, \
+             timeDomAllocList_t->choice.setup->list.size);
+          }
+          DU_FREE(timeDomAllocList_t->choice.setup, \
+              sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+       }
+                DU_FREE(puschCfg->transformPrecoder, sizeof(long));
+       DU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
+                sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+    }
+
+}
+ /*******************************************************************
+ *
+ * @brief Frees memory allocated for InitialUlBWP
+ *
+ * @details
+ *
+ *    Function : FreeInitialUlBWP
+ *
+ *    Functionality: Deallocating memory of InitialUlBWP
+ *
+ * @params[in] BWP_UplinkDedicated_t *ulBwp
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void FreeInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
+{
+    uint8_t  rSetIdx, rsrcIdx;
+    SRS_Config_t   *srsCfg = NULLP;
+    PUSCH_Config_t *puschCfg = NULLP;
+    struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg = NULLP;
+        struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList = NULLP;
+        struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
+        struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
+
+        if(ulBwp->pusch_Config)
+    {
+       if(ulBwp->pusch_Config->choice.setup)
+       {
+          puschCfg=ulBwp->pusch_Config->choice.setup;
+          if(puschCfg->dataScramblingIdentityPUSCH)
+          {
+             if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+             {
+                FreePuschTimeDomAllocList(puschCfg);
+                dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
+                                        if(dmrsUlCfg->choice.setup)
+                {
+                   if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
+                   {
+                      if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
+                      {
+                         DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
+                                                                sizeof(long));
+                                                                DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
+                         sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+                                                        }
+                                                        DU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
+                                                        sizeof(long));
+                                                }
+                                                DU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
+                }
+                                        DU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
+                                        sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+                                }
+             DU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+          }
+          DU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+           }
+                DU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
+
+                /* Free SRS-Config */
+                if(ulBwp->srs_Config)
+                {
+                   if(ulBwp->srs_Config->choice.setup)
+                        {
+                           srsCfg = ulBwp->srs_Config->choice.setup;
+
+                                /* Free Resource Set to add/mod list */
+                           if(srsCfg->srs_ResourceSetToAddModList)
+                                {
+                                   rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
+                                        if(rsrcSetList->list.array)
+                                        {
+                                           rSetIdx = 0;
+
+                                                /* Free SRS resource Id list in this SRS resource set */
+                                                if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
+                                                {
+                                                   rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+
+                                                   if(rsrcIdList->list.array)
+                                                        {
+                                                           for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+                                                                {
+                                                                   DU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+                                                           }
+                                                           DU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
+                                                        }
+                                                   DU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+                                                           sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+                                                }
+
+                                                /* Free resource type info for this SRS resource set */
+                                                DU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+                                                   sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+
+                                                /* Free memory for each resource set */
+                                           for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+                                                {
+                                                   DU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+                                                }
+                                           DU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); 
+                                        }
+                                   DU_FREE(srsCfg->srs_ResourceSetToAddModList, \
+                                           sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
+                                }
+
+                                /* Free resource to add/modd list */
+                                if(srsCfg->srs_ResourceToAddModList)
+                                {
+                                   resourceList = srsCfg->srs_ResourceToAddModList;
+                                        if(resourceList->list.array)
+                                        {
+                                           rsrcIdx = 0;
+                                                DU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
+                                                   sizeof(struct SRS_Resource__transmissionComb__n2));
+                                           DU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
+                                                   sizeof(struct SRS_Resource__resourceType__aperiodic));
+
+                                           for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+                                                {
+                                                   DU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
+                   }
+                                           DU_FREE(resourceList->list.array, resourceList->list.size);
+                                        }
+                                   DU_FREE(srsCfg->srs_ResourceToAddModList, \
+                                           sizeof(struct SRS_Config__srs_ResourceToAddModList));
+                                }
+
+                           DU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+                        }
+                   DU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
+       }
+        }
+}      
+ /*******************************************************************
+ *
+ * @brief Frees memory allocated for initialUplinkBWP
+ *
+ * @details
+ *
+ *    Function : FreeinitialUplinkBWP
+ *
+ *    Functionality: Deallocating memory of initialUplinkBWP
+ *
+ * @params[in] UplinkConfig_t *ulCfg
+ *
+ * @return void
+ *         
+ *
+ * ****************************************************************/
+void FreeinitialUplinkBWP(UplinkConfig_t *ulCfg)
+{
+   BWP_UplinkDedicated_t *ulBwp=NULLP; 
+   struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
+   
+       if(ulCfg->initialUplinkBWP)
+       {
+          ulBwp=ulCfg->initialUplinkBWP;
+          if(ulCfg->firstActiveUplinkBWP_Id)
+          {
+             if(ulCfg->pusch_ServingCellConfig)
+             {
+                puschCfg=ulCfg->pusch_ServingCellConfig;
+                if(puschCfg->choice.setup)
+                {
+                   if(puschCfg->choice.setup->ext1)
+                   {
+                       DU_FREE(puschCfg->choice.setup->ext1->\
+                                                processingType2Enabled,sizeof(BOOLEAN_t));
+                       DU_FREE(puschCfg->choice.setup->ext1->\
+                                                maxMIMO_Layers,sizeof(long));
+                                                DU_FREE(puschCfg->choice.setup->ext1, \
+                                                sizeof(struct PUSCH_ServingCellConfig__ext1));
+                                       }
+                   DU_FREE(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
+                }
+                DU_FREE(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+             }
+             DU_FREE(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
+          }
+          FreeInitialUlBWP(ulBwp);
+          DU_FREE(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
+       }
+}
+ /*******************************************************************
+ *
+ * @brief Frees emmory allocated for BWPDlDedPdschCfg
+ *
+ * @details
+ *
+ *    Function : FreeBWPDlDedPdschCfg
+ *
+ *    Functionality: Deallocating memory of BWPDlDedPdschCfg
+ *
+ * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *
+ * @return void
+ *
+ *
+ * ****************************************************************/
+void FreeBWPDlDedPdschCfg(BWP_DownlinkDedicated_t *dlBwp)
+{
+   struct PDSCH_Config *pdschCfg=NULLP;
+       struct PDSCH_Config__prb_BundlingType *prbBndlType=NULLP;
+   struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList=NULLP;
+   struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg=NULLP;
+
+       if(dlBwp->pdsch_Config->choice.setup)
+   {
+      pdschCfg=dlBwp->pdsch_Config->choice.setup;
+      if(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
+      {
+          if(pdschCfg->pdsch_TimeDomainAllocationList)
+          {
+             timeDomAllocList=pdschCfg->pdsch_TimeDomainAllocationList;
+             if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
+             {
+                prbBndlType=&pdschCfg->prb_BundlingType;
+                DU_FREE(prbBndlType->choice.staticBundling,\
+                sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
+                DU_FREE(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
+             }
+             FreePdschTimeDomAllocList(timeDomAllocList);
+             DU_FREE(pdschCfg->pdsch_TimeDomainAllocationList, \
+             sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
+          }
+          dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
+          if(dmrsDlCfg->choice.setup)
+          {
+             DU_FREE(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition,
+             sizeof(long));
+             DU_FREE(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
+          }
+          DU_FREE(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
+          sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+       }
+       DU_FREE(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
+    }
+}
+ /*******************************************************************
+ *
+ * @brief Frees emmory allocated for BWPDlDedPdcchCfg
+ *
+ * @details
+ *
+ *    Function : FreeBWPDlDedPdcchCfg
+ *
+ *    Functionality: Deallocating memory of BWPDlDedPdcchCfg
+ *
+ * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *
+ * @return void
+ *         
+ *
+ * ****************************************************************/
+void FreeBWPDlDedPdcchCfg(BWP_DownlinkDedicated_t *dlBwp)
+{
+   uint8_t idx1=0;
+       uint8_t idx2=0;
+       struct PDCCH_Config *pdcchCfg=NULLP;
+   struct ControlResourceSet *controlRSet=NULLP;
+       struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
+
+       if(dlBwp->pdcch_Config->choice.setup)
+   {
+      pdcchCfg=dlBwp->pdcch_Config->choice.setup;
+      if(pdcchCfg->controlResourceSetToAddModList)
+      {
+         controlRSetList = pdcchCfg->controlResourceSetToAddModList;
+         if(controlRSetList->list.array)
+         {
+            controlRSet = controlRSetList->list.array[idx2];
+            if(controlRSet)
+            {
+               if(controlRSet->frequencyDomainResources.buf)
+               {
+                  if(controlRSet->pdcch_DMRS_ScramblingID)
+                  {
+                     if(pdcchCfg->searchSpacesToAddModList)
+                     {
+                         FreeSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList);
+                         DU_FREE(pdcchCfg->searchSpacesToAddModList, \
+                         sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+                     }
+                     DU_FREE(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
+                  }
+                                               DU_FREE(controlRSet->frequencyDomainResources.buf, \
+                                               controlRSet->frequencyDomainResources.size);
+                                       }
+                               }
+            for(idx1 = 0; idx1 <controlRSetList->list.count; idx1++)
+            {
+               DU_FREE(controlRSetList->list.array[idx1], sizeof(struct ControlResourceSet));
+            }
+                               DU_FREE(controlRSetList->list.array, controlRSetList->list.size);
+                       }
+                       DU_FREE(pdcchCfg->controlResourceSetToAddModList, \
+                       sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+               }
+               DU_FREE(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
+       }
+}      
+
+/*******************************************************************
+ *
+ * @brief Frees emmory allocated for DUToCURRCContainer 
+ *
+ * @details
+ *
+ *    Function : FreeMemDuToCuRrcCont
+ *
+ *    Functionality: Deallocating memory of DuToCuRrcContainer
+ *
+ * @params[in] DuToCuRRCContainer, DuToCuRRCContainer
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+* ****************************************************************/
+uint8_t FreeMemDuToCuRrcCont(CellGroupConfigRrc_t *cellGrpCfg)
+{
+   uint8_t idx=0;
+       SpCellConfig_t *spCellCfg=NULLP;
+       ServingCellConfig_t *srvCellCfg=NULLP;
+       BWP_DownlinkDedicated_t *dlBwp=NULLP;
+       MAC_CellGroupConfig_t *macCellGrpCfg=NULLP;
+       PhysicalCellGroupConfig_t *phyCellGrpCfg=NULLP;
+       struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList=NULLP;
+       struct RLC_Config *rlcConfig=NULLP;
+       struct LogicalChannelConfig *macLcConfig=NULLP;
+       struct SchedulingRequestConfig *schedulingRequestConfig=NULLP;
+       struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList=NULLP;
+       struct TAG_Config *tagConfig=NULLP;
+       struct TAG_Config__tag_ToAddModList *tagList=NULLP;
+       struct MAC_CellGroupConfig__phr_Config *phrConfig=NULLP;
+       struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg=NULLP;
+
+       rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
+       if(rlcBearerList)
+       {
+               if(rlcBearerList->list.array)
+               {
+                       for(idx=0; idx<rlcBearerList->list.count; idx++)
+                       {
+                               if(rlcBearerList->list.array[idx])
+                               {  
+                                  rlcConfig   = rlcBearerList->list.array[idx]->rlc_Config;
+                                  macLcConfig = rlcBearerList->list.array[idx]->mac_LogicalChannelConfig;
+                                  if(rlcConfig)
+                                  {
+                                     if(rlcConfig->choice.am)
+                                          {
+                                        DU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
+                                        DU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
+                                        DU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
+                                               }       
+                                     DU_FREE(rlcConfig, sizeof(struct RLC_Config));
+               }
+                                  DU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+                               if(macLcConfig)
+                                  {
+                                     if(macLcConfig->ul_SpecificParameters)
+                                          {
+                                        DU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID,       sizeof(SchedulingRequestId_t));
+                                        DU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup,       sizeof(long));
+                                        DU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+                                     }
+                                     DU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+                                  }
+                                  DU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
+                               }       
+                       }
+                       DU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
+               }
+               DU_FREE(cellGrpCfg->rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
+       }
+
+       macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
+       if(macCellGrpCfg)
+       {
+               schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig; 
+      if(schedulingRequestConfig)
+               {
+                  schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
+                       if(schReqList)
+                       {
+                          if(schReqList->list.array)
+                               {
+                        for(idx=0;idx<schReqList->list.count; idx++)
+                        {
+                                          if(schReqList->list.array[idx])
+                                               {
+                                   DU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+                                   DU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
+                           }
+                                       }
+                        DU_FREE(schReqList->list.array, schReqList->list.size);
+                               }
+                     DU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
+                               sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));    }
+                  DU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
+      }
+               if(macCellGrpCfg->bsr_Config)
+               {
+                  DU_FREE(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
+               }
+               tagConfig = macCellGrpCfg->tag_Config;
+               if(tagConfig)
+               {
+                  tagList = tagConfig->tag_ToAddModList;
+                       if(tagList)
+                       {
+                          if(tagList->list.array)
+                               {
+                        for(idx=0; idx<tagList->list.count; idx++)
+                        {
+                  DU_FREE(tagList->list.array[idx], sizeof(struct TAG));
+                                       }
+                        DU_FREE(tagList->list.array, tagList->list.size);
+            }
+                     DU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
+                       }
+                  DU_FREE(tagConfig, sizeof(struct TAG_Config));
+               }
+
+               phrConfig = macCellGrpCfg->phr_Config;
+               if(phrConfig)
+               {
+                  DU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
+                  DU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
+      }
+
+               DU_FREE(macCellGrpCfg, sizeof(MAC_CellGroupConfig_t));
+       }
+
+       phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
+       if(phyCellGrpCfg)
+       {
+               DU_FREE(phyCellGrpCfg->p_NR_FR1, sizeof(long));
+               DU_FREE(phyCellGrpCfg, sizeof(PhysicalCellGroupConfig_t));
+       }
+
+       spCellCfg = cellGrpCfg->spCellConfig;
+       if(spCellCfg)
+       {
+          if(spCellCfg->servCellIndex)
+               {
+                  if(spCellCfg->rlmInSyncOutOfSyncThreshold)
+                       {
+                          if(spCellCfg->spCellConfigDedicated)
+                               {
+                                  srvCellCfg = spCellCfg->spCellConfigDedicated;
+               if(srvCellCfg->initialDownlinkBWP)
+                                       {
+                                          dlBwp = srvCellCfg->initialDownlinkBWP;
+                                          if(srvCellCfg->firstActiveDownlinkBWP_Id)
+                                               {
+                                                  if(srvCellCfg->defaultDownlinkBWP_Id)
+                                                  {
+                                                          if(srvCellCfg->uplinkConfig)
+                                                               {
+                                                             if(srvCellCfg->pdsch_ServingCellConfig)
+                                                                  {
+                                                                                pdschCfg= srvCellCfg->pdsch_ServingCellConfig;
+                                                                           if(pdschCfg->choice.setup)
+                                                                           {
+                                                                                DU_FREE(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH,sizeof(long));
+                                                                                   DU_FREE(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
+                                                                                }
+                                                                                DU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct
+                                                                                ServingCellConfig__pdsch_ServingCellConfig));
+                                                                        }
+                                                                   FreeinitialUplinkBWP(srvCellCfg->uplinkConfig);
+                                                                        DU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));     
+                                                               }
+                                                          DU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+                                                       }
+                                                  DU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+                                               }
+                  if(dlBwp->pdcch_Config)
+                                          {
+                                                   if(dlBwp->pdsch_Config)
+                                                   {
+                                                      FreeBWPDlDedPdschCfg(dlBwp);
+                                                           DU_FREE(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
+                                              }
+                                                   FreeBWPDlDedPdcchCfg(dlBwp);
+                                                   DU_FREE(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
+                                          }
+                                               DU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
+                                       }
+                                       DU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
+                               }
+                          DU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+                       }
+                  DU_FREE(spCellCfg->servCellIndex, sizeof(long));
+      }
+               DU_FREE(spCellCfg,sizeof(SpCellConfig_t));
+       }
+       return ROK;
+}
+/*******************************************************************
+ *
+ * @brief Builds DU To CU RRC Container 
+ *
+ * @details
+ *
+ *    Function : BuildDuToCuRrcContainer 
+ *
+ *    Functionality: Builds DuToCuRrcContainer
+ *
+ * @params[in] idx, index in F1AP msg
+ *             DuToCuRRCContainer, DuToCuRRCContainer
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildDuToCuRrcContainer(DUtoCURRCContainer_t *duToCuRrcContainer)
+{
+       CellGroupConfigRrc_t  cellGrpCfg;
+       asn_enc_rval_t        encRetVal;
+       uint8_t               ret = RFAILED;
+
+       while(true)
+       {
+               cellGrpCfg.cellGroupId = CELL_GRP_ID;
+
+               cellGrpCfg.rlc_BearerToAddModList = NULLP;
+               DU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
+               if(!cellGrpCfg.rlc_BearerToAddModList)
+               {
+                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+                       break;
+               }
+               if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK)
+               {
+                       DU_LOG("\nF1AP : BuildRlcBearerToAddModList failed");
+                       break;
+               }
+
+      cellGrpCfg.rlc_BearerToReleaseList = NULLP;
+               cellGrpCfg.mac_CellGroupConfig = NULLP;
+               DU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
+               if(!cellGrpCfg.mac_CellGroupConfig)
+               {
+                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+                       break;
+               }
+               if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK)
+               {
+                       DU_LOG("\nF1AP : BuildMacCellGrpCfg failed");
+                       break;
+               }
+
+
+               cellGrpCfg.physicalCellGroupConfig = NULLP;
+               DU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
+               if(!cellGrpCfg.physicalCellGroupConfig)
+               {
+                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+                       break;
+               }
+               if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK)
+               {
+                       DU_LOG("\nF1AP : BuildPhyCellGrpCfg failed");
+                       break;
+               }
+
+               cellGrpCfg.spCellConfig = NULLP;
+               DU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
+               if(!cellGrpCfg.spCellConfig)
+               {
+                       DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+                       break;
+               }
+               if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK)
+               {
+                       DU_LOG("\nF1AP : BuildSpCellCfg failed");
+                       break;
+               }
+
+      cellGrpCfg.sCellToAddModList = NULLP;
+               cellGrpCfg.sCellToReleaseList = NULLP;
+               cellGrpCfg.ext1 = NULLP;
+
+               /* encode cellGrpCfg into duToCuRrcContainer */
+               xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg);
+               memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+               encBufSize = 0;
+               encRetVal = aper_encode(&asn_DEF_CellGroupConfigRrc, 0, &cellGrpCfg, PrepFinalEncBuf, encBuf);
+               /* Encode results */
+               if(encRetVal.encoded == ENCODE_FAIL)
+               {
+                       DU_LOG( "\n F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
+                                       encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+                       break;
+               }
+               else
+               {
+                       DU_LOG("\n F1AP : Created APER encoded buffer for DuToCuRrcContainer\n");
+                       for(int i=0; i< encBufSize; i++)
+                       {
+                               printf("%x",encBuf[i]);
+                       }
+               }
+
+          duToCuRrcContainer->size = encBufSize;
+               DU_ALLOC(duToCuRrcContainer->buf, duToCuRrcContainer->size);
+               if(!duToCuRrcContainer->buf)
+               {
+         DU_LOG("\nF1AP : Memory allocation failed in BuildDuToCuRrcContainer");
+                       break;
+               }
+               memcpy(duToCuRrcContainer->buf, encBuf, duToCuRrcContainer->size);
+               ret = ROK;
+               break;
+       }
+   FreeMemDuToCuRrcCont(&cellGrpCfg);
+       return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds and sends the InitialULRRCMessage 
+ *
+ * @details
+ *
+ *    Function : BuildAndSendInitialRrcMsgTransfer 
+ *
+ *    Functionality: Constructs the Initial UL RRC Message Transfer and sends
+ *                   it to the CU through SCTP.
+ *
+ * @params[in] 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti,
+       uint16_t rrcContSize, uint8_t *rrcContainer)
+{
+   uint8_t   ret;
+       uint8_t   elementCnt;
+   uint8_t   ieId;
+       uint8_t   idx;
+       uint8_t   idx1;
+       F1AP_PDU_t  *f1apMsg = NULLP;
+       InitialULRRCMessageTransfer_t *initULRRCMsg=NULLP;
+   asn_enc_rval_t                encRetVal;
+       bool  checkvar=false;
+       while(true)
+       {
+            DU_LOG("\n F1AP : Building RRC Setup Request\n");
+                 DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+                 if(f1apMsg == NULLP)
+                 {
+                     DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
+                          break;
+                 }
+                 f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
+                 DU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+                 if(f1apMsg->choice.initiatingMessage == NULLP)
+                 {
+                    DU_LOG(" F1AP : Memory allocation for  F1AP-PDU failed");
+                         break;
+                 }
+                 f1apMsg->choice.initiatingMessage->procedureCode =\
+                        ProcedureCode_id_InitialULRRCMessageTransfer;
+                 f1apMsg->choice.initiatingMessage->criticality = Criticality_ignore;
+                 f1apMsg->choice.initiatingMessage->value.present = \
+                        InitiatingMessage__value_PR_InitialULRRCMessageTransfer;
+                 initULRRCMsg =\
+                        &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer;
+        elementCnt = 5;
+                 initULRRCMsg->protocolIEs.list.count = elementCnt;
+                 initULRRCMsg->protocolIEs.list.size = \
+                        elementCnt * sizeof(InitialULRRCMessageTransferIEs_t *);
+                 /* Initialize the F1Setup members */
+                  DU_ALLOC(initULRRCMsg->protocolIEs.list.array,initULRRCMsg->protocolIEs.list.size);
+                  if(initULRRCMsg->protocolIEs.list.array == NULLP)
+                  {
+                     DU_LOG(" F1AP : Memory allocation for\
+                               RRCSetupRequestMessageTransferIEs failed");
+                               break;
+                  }
+                  for(idx=0; idx<elementCnt; idx++)
+             {
+                          DU_ALLOC(initULRRCMsg->protocolIEs.list.array[idx],\
+                                sizeof(InitialULRRCMessageTransferIEs_t));
+                                if(initULRRCMsg->protocolIEs.list.array[idx] == NULLP)
+                                {
+                                    break;
+                                }
+                  }
+                  idx1 = 0;
+                  /*GNB DU UE F1AP ID*/
+                  initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
+                                     ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality  = Criticality_reject;
+                  initULRRCMsg->protocolIEs.list.array[idx1]->value.present = \
+                                     InitialULRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
+                  initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
+
+
+                       /*NRCGI*/
+                       idx1++;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
+                                ProtocolIE_ID_id_NRCGI;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality  =Criticality_reject;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present = \
+                       InitialULRRCMessageTransferIEs__value_PR_NRCGI;
+                  
+                       ret =\
+                       BuildNrcgi(&initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI);
+             if(ret!=ROK)
+                       {
+                           break;
+                       }
+
+                       /*CRNTI*/
+                       idx1++;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
+                                      ProtocolIE_ID_id_C_RNTI;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present =\
+                                InitialULRRCMessageTransferIEs__value_PR_C_RNTI;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.C_RNTI = crnti;
+
+         /*RRCContainer*/
+                       idx1++;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
+                                      ProtocolIE_ID_id_RRCContainer;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present =\
+                                InitialULRRCMessageTransferIEs__value_PR_RRCContainer;
+                                                               
+                       initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size = rrcContSize;
+                       DU_ALLOC(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf,
+                             initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size)
+                       if(!initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf)
+                       {
+                          DU_LOG(" F1AP : Memory allocation for RRCSetupRequestMessageTransferIEs failed");
+                               break;
+
+                       }
+                       memcpy(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf, rrcContainer,
+                             initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size);
+
+
+                       /*DUtoCURRCContainer*/
+                       idx1++;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->id  = \
+                                      ProtocolIE_ID_id_DUtoCURRCContainer;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
+                       initULRRCMsg->protocolIEs.list.array[idx1]->value.present =\
+                                InitialULRRCMessageTransferIEs__value_PR_DUtoCURRCContainer;
+
+                       ret = BuildDuToCuRrcContainer(&initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer);
+         if(ret != ROK)
+                       {
+                          break;
+                       }
+
+                       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+                       /* Encode the F1SetupRequest type as APER */
+                       memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+                       encBufSize = 0;
+                       encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
+                       /* Encode results */
+                       if(encRetVal.encoded == ENCODE_FAIL)
+                       {
+                           DU_LOG( "\n F1AP : Could not encode Initial UL RRC Message Transfer\
+                                   structure (at %s)\n",encRetVal.failed_type ? \
+                                        encRetVal.failed_type->name : "unknown");
+                                break;
+                       }
+                       else
+                       {
+                           
+                                 DU_LOG("\n F1AP : Created APER encoded buffer for Initial UL RRC\
+                                 Message transfer\n");
+                                  for(int i=0; i< encBufSize; i++)
+                                       {
+                                           printf("%x",encBuf[i]);
+                                       }
+                       }
+                       /* Sending  msg  */
+                       if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL) != ROK)
+                       {
+                           DU_LOG("\n F1AP : Sending Initial UL RRC Message Transfer Failed");
+                                break;
+                       }
+                       checkvar=true;
+                       break;
+       }
+   
+       if(f1apMsg != NULLP)
+   {
+           if(f1apMsg->choice.initiatingMessage != NULLP)
+                {
+                    if(initULRRCMsg->protocolIEs.list.array != NULLP)
+                         {
+                        if(idx == elementCnt)
+                             {
+                                      idx1=1;
+                                 if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.pLMN_Identity.buf!=NULLP)
+                                      {
+                                          if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.nRCellIdentity.buf!=NULLP)
+                                               {
+                                                   DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.nRCellIdentity.buf,
+                                                        initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.nRCellIdentity.size);
+                                               }
+                                               DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.pLMN_Identity.buf,\
+                                                initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.NRCGI.pLMN_Identity.size);
+                                       }
+
+                                                 idx1=3;
+                                                 if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf)
                                                  {
-                                                     if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
-                                                               !=NULLP)
-                                                               {
-                                                                    DU_ALLOC(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
-                                                                         gTP_TEID.buf,ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.\
-                                                                         gTPTunnel->gTP_TEID.size);
-                                                               }
-                                                               DU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
-                                                               transportLayerAddress.buf,ulInfo->list.array[ulidx]->\
-                                                               uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
+                                                         DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.buf,
+                                                                         initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.RRCContainer.size)
                                                  }
-                                                 DU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel,\
-                                                 sizeof(GTPTunnel_t));
-                                        }
-                               }
-                               if(ulInfo->list.array[ulidx]!=NULLP)
-                               {
-                                   DU_FREE(ulInfo->list.array[ulidx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
-                               }
-                 }
-                 DU_FREE(ulInfo->list.array,ulInfo->list.size);
-        }
-}
+
+                                                 idx1 = 4;
+                                                 if(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer.buf)
+                                                 {
+                                                    DU_FREE(initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer.buf,
+                                                         initULRRCMsg->protocolIEs.list.array[idx1]->value.choice.DUtoCURRCContainer.size);
+                                                 }
+                                       for(ieId=0; ieId<elementCnt; ieId++)
+                                       {
+                                          DU_FREE(initULRRCMsg->protocolIEs.list.array[ieId],sizeof(InitialULRRCMessageTransferIEs_t));
+                                       }
+                              }
+                              else
+                              {
+                                   for(ieId=0; ieId<idx; ieId++)
+                                             {
+                                                 DU_FREE(initULRRCMsg->protocolIEs.list.array[ieId],sizeof(InitialULRRCMessageTransferIEs_t));
+                                             }
+                              }
+                                        DU_FREE(initULRRCMsg->protocolIEs.list.array,initULRRCMsg->protocolIEs.list.size);
+                        }
+                        DU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+                }
+                DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+       }
+       if(checkvar==true)
+          return ROK;
+       else
+          return RFAILED;
+}/* End of BuildAndSendInitialRrcMsgTransfer*/
+
 /*******************************************************************
  *
- * @brief Deallocating memory for BuildAndSendUESetReq
+ * @brief Free the memory allocated for UE Setup response
  *
  * @details
  *
- *    Function : FreeDRBSetup
+ *    Function : FreeUeSetupRsp
  *
- *    Functionality:  Deallocating memory for BuildDRBSetup
+ *    Functionality:
+ *       Free the memory allocated for UE Setup response
  *
- * @params[in] DRBs_ToBeSetup_List_t *drbSet
- *
- * @return void
+ * @params[in] F1AP PDU for UE setup response
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreeDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
+void FreeUeSetupRsp(F1AP_PDU_t *f1apMsg)
 {
-    DRBs_ToBeSetup_Item_t *drbSetItem;
-        U8  flowidx;
-        U8  drbidx;
-    if(drbSet->list.array == NULLP)
+   uint8_t idx;
+   UEContextSetupResponse_t     *ueSetRsp;
+
+   if(f1apMsg)
+   {
+      if(f1apMsg->choice.successfulOutcome)
+      {
+         ueSetRsp = &f1apMsg->choice.successfulOutcome->value.choice.\
+           UEContextSetupResponse;
+         if(ueSetRsp->protocolIEs.list.array)
         {
-            for(drbidx=0; drbidx<drbSet->list.count; drbidx++)
-                 {
-                      if(drbidx==0&&drbSet->list.array[drbidx] != NULLP)
-                                {
-                                   drbSetItem =&drbSet->list.array[drbidx]->value.choice.DRBs_ToBeSetup_Item;
-                                   if(drbSetItem->qoSInformation.choice.choice_extension != NULLP)
-                                        {
-                                              if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                                        qoS_Characteristics.choice.non_Dynamic_5QI !=NULLP)
-                                                        {
-                                                            if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                                                 qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
-                                                                 {
-                                                                      if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                                                                qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
-                                                                                {
-                                                                                    if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.buf!=NULLP)
-                                                                                         {
-                                                                                             if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD!=NULLP)
-                                                                                                       {
-                                                                                                           if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->buf!=NULLP)
-                                                                                                                {
-                                                                                                                     if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
-                                                                                                                               flows_Mapped_To_DRB_List.list.array != NULLP)
-                                                                                                                               {
-                                                                                                                                   for(flowidx=0;flowidx<drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
-                                                                                                                                        flows_Mapped_To_DRB_List.list.count; flowidx++)
-                                                                                                                                        {
-                                                                                                                                            if(flowidx==0&&drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                 DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]!=NULLP)
-                                                                                                                                                 {
-                                                                                                                                                     if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                               DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                                                                                                qoS_Characteristics.choice.non_Dynamic_5QI!=NULLP)
-                                                                                                                                                               {
-                                                                                                                                                                    if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                                         DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                                                                                                          qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
-                                                                                                                                                                         {
-                                                                                                                                                                             if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                                                       DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                                                                                                                       qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
-                                                                                                                                                                                  {    
-                                                                                                                                                                                                if((BuildULTnlInforet==ROK)&&(drbSetItem->uLConfiguration!=NULLP))
-                                                                                                                                                                                                {
-                                                                                                                                                                                                    DU_FREE(drbSetItem->uLConfiguration,sizeof(ULConfiguration_t));
-                                                                                                                                                                                                }
-                                                                                                                                                                                                FreeULTnlInfo(&drbSetItem->uLUPTNLInformation_ToBeSetup_List);
-                                                                         DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                                                                DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                                                                                                                      qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
-                                                                                                                                                                                                sizeof(MaxDataBurstVolume_t));   
-                                                                                                                                                                                  }
-                                                                                                                                                                                       DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                                                       DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                                                                                                                       qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,sizeof(AveragingWindow_t));
-                                                                                                                                                                         }
-                                                                                                                                                                         DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                                         DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                 qoS_Characteristics.choice.non_Dynamic_5QI,sizeof(NonDynamic5QIDescriptor_t));
-                                                                                                                                                               }
-                                                                                                                                                 }
-                                                                                                                                                 if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                 DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]!=NULLP)
-                                                                                                                                                 {
-                                                                                                                                                     DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                                                                               DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx],sizeof(Flows_Mapped_To_DRB_Item_t));
-                                                                                                                                                 }
-                                                                                                                                        }
-                                                                                                                                   DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
-                                                                                                                                        flows_Mapped_To_DRB_List.list.array,drbSetItem->qoSInformation.choice.choice_extension->value.\
-                                                                                                                                        choice.DRB_Information.flows_Mapped_To_DRB_List.list.size);
-                                                                                                                               }
-                                                                                                                     DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->buf,\
-                                                                                                                       drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->size);
-                                                                                                                }
-                                                                                                                DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD,\
-                                                                                                                sizeof(OCTET_STRING_t));
-                                                                                                       }
-                                                                                                        DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.buf,\
-                                                                                                        drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.size);
-                                                                                         }
-                                                                                         DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                                                                    qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,sizeof(MaxDataBurstVolume_t));
-                                                                                }
-                                                                      DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                                                                qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,sizeof(AveragingWindow_t));
-                                                                 }
-                                                            DU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                                                 qoS_Characteristics.choice.non_Dynamic_5QI, sizeof(NonDynamic5QIDescriptor_t));
-                                                        }
-                                                  DU_FREE(drbSetItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
-                                        }
-                                }
-                      if(drbSet->list.array[drbidx]!=NULLP)
-                                {
-                                    DU_FREE(drbSet->list.array[drbidx],sizeof(DRBs_ToBeSetup_ItemIEs_t));
-                               }
-                 }
-            DU_FREE(drbSet->list.array,drbSet->list.size);
+           for(idx = 0; idx < ueSetRsp->protocolIEs.list.size; idx++)
+           {
+             DU_FREE(ueSetRsp->protocolIEs.list.array[idx],\
+                sizeof(UEContextSetupResponseIEs_t));
+           }
+            DU_FREE(ueSetRsp->protocolIEs.list.array, \
+              ueSetRsp->protocolIEs.list.size);
         }
+         DU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
+      }
+      DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
 }
+
 /*******************************************************************
  *
- * @brief Builds and sends the UE Setup Request 
+ * @brief Builds and sends the UE Setup Response
  *
  * @details
  *
- *    Function : BuildAndSendUESetReq
+ *    Function : BuildAndSendUESetRsp
  *
- *    Functionality: Constructs the UE Setup Request and sends
- *                   it to the CU through SCTP.
+ *    Functionality: Constructs the UE Setup Response and sends
+ *                   it to the DU through SCTP.
  *
  * @params[in] 
  *
@@ -4013,247 +5290,125 @@ void FreeDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 BuildAndSendUESetReq()
+uint8_t BuildAndSendUESetRsp()
 {
-       S16  ret;
-       U8   elementCnt;
-       S16  BuildNrcgiret;
-       S16  BuildSplCellListret;
-       S16  BuildSRBSetupret;
-       U8   idx;
-       U8   idx1;
-       U8   ieId;
-       F1AP_PDU_t                                              *f1apMsg = NULL;
-   UEContextSetupRequest_t                     *ueSetReq;
-       asn_enc_rval_t                                          encRetVal;        /* Encoder return value */
-   bool checkvar=false;
-       while(1)
-       {
-           DU_LOG("\n F1AP : Building UE Context Setup Request\n");
+   uint8_t   ret = RFAILED;
+   uint8_t   elementCnt;
+   uint8_t   idx;
+   F1AP_PDU_t   *f1apMsg = NULL;
+   UEContextSetupResponse_t    *ueSetRsp;
+   asn_enc_rval_t  encRetVal;        /* Encoder return value */
 
-           DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
-           if(f1apMsg == NULLP)
-           {
-                   DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
-                        break;
-           }
+   DU_LOG("\n F1AP : Building UE Context Setup Response\n");
 
-           f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
-           DU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-           if(f1apMsg->choice.initiatingMessage == NULLP)
-           {
-                    DU_LOG(" F1AP : Memory allocation for      F1AP-PDU failed");
-                         break;
-           }
+   while(true)
+   {
+      DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+        DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
+        break;
+      }
 
-           f1apMsg->choice.initiatingMessage->procedureCode = \
-                                                                                                       ProcedureCode_id_UEContextSetup;
-           f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
-           f1apMsg->choice.initiatingMessage->value.present = \
-                                  InitiatingMessage__value_PR_UEContextSetupRequest;
-           ueSetReq =
-                 &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
-           elementCnt = 9;
-           ueSetReq->protocolIEs.list.count = elementCnt;
-           ueSetReq->protocolIEs.list.size = \
-                                                                       elementCnt * sizeof(UEContextSetupRequestIEs_t *);
-
-           /* Initialize the UESetup members */
-           DU_ALLOC(ueSetReq->protocolIEs.list.array,ueSetReq->protocolIEs.list.size);
-           
-                if(ueSetReq->protocolIEs.list.array == NULLP)
-           {
-                    DU_LOG(" F1AP : Memory allocation for UE Context SetupRequest failed");
-                         break;
-           }
+      f1apMsg->present = F1AP_PDU_PR_successfulOutcome;
+      DU_ALLOC(f1apMsg->choice.successfulOutcome,
+           sizeof(SuccessfulOutcome_t));
+      if(f1apMsg->choice.successfulOutcome == NULLP)
+      {
+        DU_LOG(" F1AP : Memory allocation for  F1AP-PDU failed");
+        break;
+      }
 
-           for(idx1=0; idx1<elementCnt; idx1++)
-           {
-                    DU_ALLOC(ueSetReq->protocolIEs.list.array[idx1],sizeof(UEContextSetupRequestIEs_t));
-                    if(ueSetReq->protocolIEs.list.array[idx1] == NULLP)
-                    {
-                            break;
-                    }
-           }
+      f1apMsg->choice.successfulOutcome->procedureCode = \
+        ProcedureCode_id_UEContextSetup;
+      f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
+      f1apMsg->choice.successfulOutcome->value.present = \
+        SuccessfulOutcome__value_PR_UEContextSetupResponse;
+
+      ueSetRsp =
+        &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
+      elementCnt = 2;
+      ueSetRsp->protocolIEs.list.count = elementCnt;
+      ueSetRsp->protocolIEs.list.size = \
+       elementCnt * sizeof(UEContextSetupResponse_t *);
+
+      /* Initialize the UESetup members */
+      DU_ALLOC(ueSetRsp->protocolIEs.list.array, \
+           ueSetRsp->protocolIEs.list.size);
+      if(ueSetRsp->protocolIEs.list.array == NULLP)
+      {
+        DU_LOG(" F1AP : Memory allocation for UE Setup Response failed");
+        break;
+      }
 
-           idx = 0;
-
-           /*GNB CU UE F1AP ID*/
-           ueSetReq->protocolIEs.list.array[idx]->id   = \
-                                                                                ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
-        ueSetReq->protocolIEs.list.array[idx]->criticality     =       Criticality_reject;
-           ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                               UEContextSetupRequestIEs__value_PR_GNB_CU_UE_F1AP_ID;
-           ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = CU_ID;
-
-           /*GNB DU UE F1AP ID*/
-           idx++;
-           ueSetReq->protocolIEs.list.array[idx]->id   = \
-                                                                                ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
-           ueSetReq->protocolIEs.list.array[idx]->criticality  =       Criticality_ignore;
-           ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                               UEContextSetupRequestIEs__value_PR_GNB_DU_UE_F1AP_ID;
-           ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = DU_ID;
-
-           /*Special Cell ID*/
-           idx++;
-           ueSetReq->protocolIEs.list.array[idx]->id   = \
-                                                                                                        ProtocolIE_ID_id_SpCell_ID;
-           ueSetReq->protocolIEs.list.array[idx]->criticality  =       Criticality_reject;
-           ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                                               UEContextSetupRequestIEs__value_PR_NRCGI;
-           BuildNrcgiret = BuildNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI);
-           if(BuildNrcgiret != ROK)
-           {
-                   break;
-           }
+      for(idx=0; idx<elementCnt; idx++)
+      {
+        DU_ALLOC(ueSetRsp->protocolIEs.list.array[idx],\
+              sizeof(UEContextSetupResponseIEs_t));
+        if(ueSetRsp->protocolIEs.list.array[idx] == NULLP)
+        {
+            DU_LOG(" F1AP : Memory allocation for UE Setup Response failed");
+            break;
+        }
+      }
 
-           /*Served Cell Index*/
-           idx++;
-           ueSetReq->protocolIEs.list.array[idx]->id   = \
-                                                                                                ProtocolIE_ID_id_ServCellIndex;
-           ueSetReq->protocolIEs.list.array[idx]->criticality  =       Criticality_reject;
-           ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                               UEContextSetupRequestIEs__value_PR_ServCellIndex;
-           ueSetReq->protocolIEs.list.array[idx]->value.choice.ServCellIndex = \
-           CELL_INDEX;
-
-           /*CellULConfigured*/
-           idx++;
-           ueSetReq->protocolIEs.list.array[idx]->id   = \
-                                                                                       ProtocolIE_ID_id_SpCellULConfigured;
-           ueSetReq->protocolIEs.list.array[idx]->criticality  =       Criticality_ignore;
-           ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                                                       UEContextSetupRequestIEs__value_PR_CellULConfigured;
-           ueSetReq->protocolIEs.list.array[idx]->value.choice.CellULConfigured = \
-                                                                                                                                                       CellULConfigured_none;
-
-
-            /*CUtoDURRCContainer*/
-            idx++;
-            ueSetReq->protocolIEs.list.array[idx]->id  = \
-                                                                                                 ProtocolIE_ID_id_CUtoDURRCInformation;
-            ueSetReq->protocolIEs.list.array[idx]->criticality =       Criticality_reject;
-            ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                               UEContextSetupRequestIEs__value_PR_CUtoDURRCInformation;
-
-            /*Special Cells to be SetupList*/
-            idx++;
-            ueSetReq->protocolIEs.list.array[idx]->id  = \
-                                                                                                 ProtocolIE_ID_id_SCell_ToBeSetup_List;
-            ueSetReq->protocolIEs.list.array[idx]->criticality =       Criticality_ignore;
-            ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                               UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List;
-            BuildSplCellListret = BuildSplCellList(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
-            if(BuildSplCellListret != ROK)
-            {  
-                    break;
-            }
-            /*SRBs To Be Setup List*/
-            idx++;
-            ueSetReq->protocolIEs.list.array[idx]->id  = \
-                                                                                ProtocolIE_ID_id_SRBs_ToBeSetup_List;
-            ueSetReq->protocolIEs.list.array[idx]->criticality =       Criticality_reject;
-            ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                               UEContextSetupRequestIEs__value_PR_SRBs_ToBeSetup_List;
-            BuildSRBSetupret = BuildSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
-            if(BuildSRBSetupret != ROK)
-            {        
-                    break;
-            }
-            /*DRBs to Be Setup List*/
-            idx++;
-            ueSetReq->protocolIEs.list.array[idx]->id  = \
-                                                                                ProtocolIE_ID_id_DRBs_ToBeSetup_List;
-            ueSetReq->protocolIEs.list.array[idx]->criticality =       Criticality_reject;
-            ueSetReq->protocolIEs.list.array[idx]->value.present = \
-                                               UEContextSetupRequestIEs__value_PR_DRBs_ToBeSetup_List;
-            ret = BuildDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
-            if(ret != ROK)
-            {  
-                    break;
-            }
+      idx = 0;
 
-            xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+      /*GNB CU UE F1AP ID*/
+      ueSetRsp->protocolIEs.list.array[idx]->id        = \
+        ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+      ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
+      ueSetRsp->protocolIEs.list.array[idx]->value.present = \
+        UEContextSetupResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
+      ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = CU_ID;
 
-            /* Encode the F1SetupRequest type as APER */
-            cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
-            encBufSize = 0;
-            encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
-                       encBuf);
-            /* Encode results */
-            if(encRetVal.encoded == ENCODE_FAIL)
-            {
-               DU_LOG( "\n F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\
-                               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-                     break;
-            }
-            else
-            {
-                     DU_LOG("\n F1AP : Created APER encoded buffer for UE Context Setup Request\n");
-                     for(int i=0; i< encBufSize; i++)
-                     {
-                       printf("%x",encBuf[i]);
-                     }
-           }
+      /*GNB DU UE F1AP ID*/
+      idx++;
+      ueSetRsp->protocolIEs.list.array[idx]->id        = \
+         ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
+      ueSetRsp->protocolIEs.list.array[idx]->value.present = \
+         UEContextSetupResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = DU_ID;
 
-           /* Sending  msg  */
-           if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL)   !=      ROK)
-           {
-               DU_LOG("\n F1AP : Sending       UE Context Setup Request Failed");
-                     break;
-           }
-                checkvar=true;
-                break;
+
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the UE context setup response type as APER */
+      memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
+           encBuf);
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+        DU_LOG( "\n F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\n F1AP : Created APER encoded buffer for UE Context Setup Request\n");
+        for(int i=0; i< encBufSize; i++)
+        {
+           printf("%x",encBuf[i]);
+        }
+      }
+
+      /* Sending  msg  */
+      if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL)        !=      ROK)
+      {
+        DU_LOG("\n F1AP : Sending UE Context Setup Request Failed");
+        break;
+      }
+      ret = ROK;
+      break;
    }
-   if(f1apMsg != NULLP)
-       {
-           if(f1apMsg->choice.initiatingMessage != NULLP)
-                {
-                     if(ueSetReq->protocolIEs.list.array != NULLP)
-                               {
-                              if(idx1==elementCnt)
-                                        {
-                                                 if(BuildNrcgiret==ROK)
-                                                 {
-                                                                if(BuildSplCellListret==ROK)
-                                                                {
-                                                                          if(BuildSRBSetupret == ROK)
-                                                                               {
-                                                                                  FreeDRBSetup(&ueSetReq->protocolIEs.list.array[idx--]->value.choice.DRBs_ToBeSetup_List); 
-                                                                               }
-                                                                               FreeSRBSetup(&ueSetReq->protocolIEs.list.array[idx--]->value.choice.SRBs_ToBeSetup_List);
-                                                                }    
-                                                                FreeSplCellList(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List); 
-                                                 }
-                                                 idx=2;
-                                                 FreeNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI);   
-                                                 for(ieId=0; ieId<idx1; ieId++)
-                                                 {
-                                                     DU_FREE(ueSetReq->protocolIEs.list.array[ieId],sizeof(UEContextSetupRequestIEs_t));
-                                                 }
-                                        }
-                                        else
-                                        {
-                                            for(ieId=0; ieId<idx; ieId++)
-                                                 {
-                                                     if(ueSetReq->protocolIEs.list.array[ieId] != NULLP)
-                                                               {
-                                                         DU_FREE(ueSetReq->protocolIEs.list.array[ieId],sizeof(UEContextSetupRequestIEs_t));
-                                                               }
-                                                 }
-                                        }
-                                        DU_FREE(ueSetReq->protocolIEs.list.array,ueSetReq->protocolIEs.list.size);        
-                               }
-                     DU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-                }
-           DU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); 
-       }
-       if(checkvar==true)
-        return ROK;
-       else
-            return RFAILED;
-}/* End of BuildAndSendUESetReq*/
+
+   FreeUeSetupRsp(f1apMsg);
+   return ret;;
+}/* End of BuildAndSendUESetRsp */
+
 
 /*******************************************************************
 *
@@ -4281,18 +5436,20 @@ void F1APMsgHdlr(Buffer *mBuf)
    F1AP_PDU_t *f1apMsg;
    asn_dec_rval_t rval; /* Decoder return value */
    F1AP_PDU_t f1apasnmsg ;
+
    DU_LOG("\nF1AP : Received F1AP message buffer");
-   SPrntMsg(mBuf, 0,0);
+   ODU_PRINT_MSG(mBuf, 0,0);
  
    /* Copy mBuf into char array to decode it */
-   SFndLenMsg(mBuf, &recvBufLen);
-   if(SGetSBuf(DFLT_REGION, DFLT_POOL, (Data **)&recvBuf, (Size)recvBufLen) != ROK)
+   ODU_FIND_MSG_LEN(mBuf, &recvBufLen);
+   DU_ALLOC(recvBuf, (Size)recvBufLen);
+
+   if(recvBuf == NULLP)
    {
       DU_LOG("\nF1AP : Memory allocation failed");
       return;
    }
-   if(SCpyMsgFix(mBuf, 0, recvBufLen, (Data *)recvBuf, &copyCnt) != ROK)
+   if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, &copyCnt) != ROK)
    {
       DU_LOG("\nF1AP : Failed while copying %d", copyCnt);
       return;
@@ -4301,15 +5458,16 @@ void F1APMsgHdlr(Buffer *mBuf)
    printf("\nF1AP : Received flat buffer to be decoded : ");
    for(i=0; i< recvBufLen; i++)
    {
-        printf("%x",recvBuf[i]);
+      printf("%x",recvBuf[i]);
    }
 
    /* Decoding flat buffer into F1AP messsage */
    f1apMsg = &f1apasnmsg;
    memset(f1apMsg, 0, sizeof(F1AP_PDU_t));
+
    rval = aper_decode(0, &asn_DEF_F1AP_PDU, (void **)&f1apMsg, recvBuf, recvBufLen, 0, 0);
-   SPutSBuf(DFLT_REGION, DFLT_POOL, (Data *)recvBuf, (Size)recvBufLen);
+   DU_FREE(recvBuf, (Size)recvBufLen);
+
    if(rval.code == RC_FAIL || rval.code == RC_WMORE)
    {
       DU_LOG("\nF1AP : ASN decode failed");
@@ -4321,59 +5479,64 @@ void F1APMsgHdlr(Buffer *mBuf)
    switch(f1apMsg->present)
    {
       case F1AP_PDU_PR_successfulOutcome:
-      {
-         switch(f1apMsg->choice.successfulOutcome->value.present)
-         {
-            case SuccessfulOutcome__value_PR_F1SetupResponse:
-            {                          
+        {
+           switch(f1apMsg->choice.successfulOutcome->value.present)
+           {
+              case SuccessfulOutcome__value_PR_F1SetupResponse:
+                 {                             
 #ifndef ODU_TEST_STUB
-               procF1SetupRsp(f1apMsg);
+                    procF1SetupRsp(f1apMsg);
 #endif
-               break;
-            }
-            
-            case SuccessfulOutcome__value_PR_GNBDUConfigurationUpdateAcknowledge:
-            {
-               procGNBDUCfgUpdAck(f1apMsg);
-               break;
-            }
+                    break;
+                 }
 
-            default:
-            {
-               DU_LOG("\nF1AP : Invalid type of successful outcome [%d]", f1apMsg->choice.successfulOutcome->value.present);
-               return;
-            }
-         }/* End of switch(successfulOutcome) */
-         break;
-      }
-               case F1AP_PDU_PR_initiatingMessage:
-               {
-                       switch(f1apMsg->choice.initiatingMessage->value.present)
-                       {
-                               case InitiatingMessage__value_PR_DLRRCMessageTransfer:
-                                       {
-                                               procDlRrcMsgTrans(f1apMsg);
-                                               break;
-                                       }
+              case SuccessfulOutcome__value_PR_GNBDUConfigurationUpdateAcknowledge:
+                 {
+                    procGNBDUCfgUpdAck(f1apMsg);
+                    break;
+                 }
 
-                               default:
-                                       {
-                                               DU_LOG("\nF1AP : Invalid type of initiating message[%d]",
-                                                               f1apMsg->choice.initiatingMessage->value.present);
-                                               return;
-                                       }
-                       }/* End of switch(initiatingMessage) */
-                       break;
-               }
+              default:
+                 {
+                    DU_LOG("\nF1AP : Invalid type of successful outcome [%d]", f1apMsg->choice.successfulOutcome->value.present);
+                    return;
+                 }
+           }/* End of switch(successfulOutcome) */
+           break;
+        }
+      case F1AP_PDU_PR_initiatingMessage:
+        {
+           switch(f1apMsg->choice.initiatingMessage->value.present)
+           {
+              case InitiatingMessage__value_PR_DLRRCMessageTransfer:
+                 {
+                    procDlRrcMsgTrans(f1apMsg);
+                    break;
+                 }
+              case InitiatingMessage__value_PR_UEContextSetupRequest:
+                 {
+                    procUeContextSetupReq(f1apMsg);
+                    break;
+                  }
+
+              default:
+                 {
+                    DU_LOG("\nF1AP : Invalid type of initiating message[%d]",
+                          f1apMsg->choice.initiatingMessage->value.present);
+                    return;
+                 }
+           }/* End of switch(initiatingMessage) */
+           break;
+        }
 
       default:
-      {
-         DU_LOG("\nF1AP : Invalid type of f1apMsg->present [%d]",f1apMsg->present);
-         return;
-      }
+        {
+           DU_LOG("\nF1AP : Invalid type of f1apMsg->present [%d]",f1apMsg->present);
+           return;
+        }
 
    }/* End of switch(f1apMsg->present) */
+
 } /* End of F1APMsgHdlr */
  
 /**********************************************************************