macCellCfg

Change-Id: I09a27b3beb1ec43e13f3fc3d498f42493686913d
Signed-off-by: balajihands <balaji.shankaran@radisys.com>

diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h
index ea9cd95..422adbf 100644 (file)
--- a/src/5gnrmac/lwr_mac.h
+++ b/src/5gnrmac/lwr_mac.h
@@ -31,7 +31,7 @@
 #include "ssi.x"
 #include "cm_hash.x"
 #include "cm_lib.x"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 
 typedef enum
 {

diff --git a/src/5gnrmac/rg_cl_cfg.c b/src/5gnrmac/lwr_mac_cfg.c
similarity index 99%
rename from src/5gnrmac/rg_cl_cfg.c
rename to src/5gnrmac/lwr_mac_cfg.c
index e08d724..3500814 100644 (file)
--- a/src/5gnrmac/rg_cl_cfg.c
+++ b/src/5gnrmac/lwr_mac_cfg.c
@@ -28,7 +28,7 @@
 #include "cm_hash.x"
 #include "cm_lib.x"
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "lwr_mac.h"
 
 EXTERN S16 rgClBldAndSndFAPICfgReq ARGS((ClCellCb *cellCb));

diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c
index f0cea9c..9dc81b3 100755 (executable)
--- a/src/5gnrmac/rg_cfg.c
+++ b/src/5gnrmac/rg_cfg.c
@@ -73,7 +73,7 @@ static int RLOG_MODULE_ID=4096;
 #include "crg.x"           /* CRG interface includes */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #include "rg_prg.x"        /* PRG (MAC-MAC) Interface typedefs */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 #ifdef LTE_ADV
 #include "rg_pom_scell.x"

diff --git a/src/5gnrmac/rg_cl.h b/src/5gnrmac/rg_cl.h
index 79c3491..278c11c 100644 (file)
--- a/src/5gnrmac/rg_cl.h
+++ b/src/5gnrmac/rg_cl.h
@@ -31,7 +31,7 @@
 #include "ssi.x"
 #include "cm_hash.x"
 #include "cm_lib.x"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 
 typedef enum
 {

diff --git a/src/5gnrmac/rg_cl_li.c b/src/5gnrmac/rg_cl_li.c
index 30104d5..95eab81 100644 (file)
--- a/src/5gnrmac/rg_cl_li.c
+++ b/src/5gnrmac/rg_cl_li.c
@@ -27,7 +27,7 @@
 #include "ssi.x"
 #include "cm_hash.x"
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "lwr_mac.h"
 #include "rg_cl_phy.h"
 #include "fapi.h"

diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c
index 46b72c0..5957f39 100755 (executable)
--- a/src/5gnrmac/rg_com.c
+++ b/src/5gnrmac/rg_com.c
@@ -73,7 +73,7 @@ static int RLOG_MODULE_ID=4096;
 #include "tfu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"       /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"
 #ifdef LTE_ADV
 #include "rg_pom_scell.x"

diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c
index b250513..76bf324 100755 (executable)
--- a/src/5gnrmac/rg_dbm.c
+++ b/src/5gnrmac/rg_dbm.c
@@ -67,7 +67,7 @@
 #include "tfu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"       /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"
 
 

diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c
index 493a4e5..5185d56 100755 (executable)
--- a/src/5gnrmac/rg_dhm.c
+++ b/src/5gnrmac/rg_dhm.c
@@ -78,7 +78,7 @@ static int RLOG_MODULE_ID=4096;
 #include "tfu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"        /* PRG interface typedefs */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"
 
 #ifdef L2_OPTMZ

diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c
index b2b58b8..4b38e82 100755 (executable)
--- a/src/5gnrmac/rg_dux.c
+++ b/src/5gnrmac/rg_dux.c
@@ -79,7 +79,7 @@ static int RLOG_MODULE_ID=4096;
 #include "rgu.x"           /* RGU Interface includes */
 #include "lrg.x"           /* LRG Interface includes */
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 
 /* local defines */

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index b24e3e0..743acca 100755 (executable)
--- a/src/5gnrmac/rg_ex_ms.c
+++ b/src/5gnrmac/rg_ex_ms.c
@@ -73,7 +73,7 @@ registered with SSI during the LTE MAC Task initialization.
 #include "crg.x"           /* CRG interface typedes */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #include "rg_prg.x"        /*PRG interface includes*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 
@@ -134,7 +134,7 @@ Buffer  *mBuf;                      /* message buffer       */
 #endif /* LCRGMILRG */
       case EVENT_MAC_CELL_CONFIG_REQ:
          /* Process MAC cell config */
-         unpackDuMacCellCfg(handleMacCellCfgReq, pst, mBuf);
+         unpackDuMacCellCfg(MacHdlCellCfgReq, pst, mBuf);
          break;
       default:
          RG_FREE_MSG(mBuf);

diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c
index 7ecdafa..4d07226 100755 (executable)
--- a/src/5gnrmac/rg_l2m.c
+++ b/src/5gnrmac/rg_l2m.c
@@ -69,7 +69,7 @@
 #include "crg.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"    /* typedefs for Scheduler */
 #include "rg_prg.x"        /* typedefs for PRG interface */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC types */
 
 #ifdef LTE_L2_MEAS

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index 44c0451..ccead37 100755 (executable)
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -72,7 +72,7 @@ static int RLOG_MODULE_ID=4096;
 #include "crg.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #include "rg_prg.x"    /* PRG interface typedefs */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 /* local defines */

diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c
index aa68fd5..7205c6f 100755 (executable)
--- a/src/5gnrmac/rg_lmm.c
+++ b/src/5gnrmac/rg_lmm.c
@@ -75,7 +75,7 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_prg.x"    /* PRG Interface includes */
 #include "lrg.x"           /* LRG Interface includes */
 #include "rgr.x"           /* LRG Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 #ifdef SS_DIAG
 #include "ss_diag.h"        /* Common log file */
@@ -133,7 +133,7 @@ Pst           *cfmPst
 extern U16 cmPackLcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm);
 extern U16 cmPackLwlcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm);
 
-packMacCellCfgCfm packMacCellCfmMt[] =
+packMacCellCfgCfm packMacCellCfmOpts[] =
 {
    cmPackLcMacCellCfgCfm,      /* packing for loosely coupled */
    duHandleMacCellCfgCfm,      /* packing for tightly coupled */
@@ -2110,7 +2110,7 @@ Pst           *cfmPst
  *
  * @details
  *
- *     Function : handleMacCellCfgReq 
+ *     Function : MacHdlCellCfgReq 
  *     
  *     This function handles the gNB and cell configuration
  *     request received from DU APP.
@@ -2121,7 +2121,7 @@ Pst           *cfmPst
  *  @return  S16
  *      -# ROK
  **/
-S16 handleMacCellCfgReq
+S16 MacHdlCellCfgReq
 (
  Pst           *pst,
  MacCellCfg    *macCellCfg
@@ -2140,9 +2140,9 @@ S16 handleMacCellCfgReq
 
    macCellCfgCfm.transId = macCellCfg->transId;
    //ret = cmPackLcMacCellCfgCfm(&cnfPst,&macCellCfgCfm);
-   ret = (*packMacCellCfmMt[cnfPst.selector])(&cnfPst,&macCellCfgCfm);
+   ret = (*packMacCellCfmOpts[cnfPst.selector])(&cnfPst,&macCellCfgCfm);
    return ret;
-} /* end of handleMacCellCfgReq */
+} /* end of MacHdlCellCfgReq */
 
 \f
 /**********************************************************************

diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c
index 748ccd1..edb57c2 100755 (executable)
--- a/src/5gnrmac/rg_mux.c
+++ b/src/5gnrmac/rg_mux.c
@@ -79,7 +79,7 @@ static int RLOG_MODULE_ID=4096;
 #include "rgu.x"           /* RGU Interface includes */
 #include "lrg.x"           /* LRG Interface includes */
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 #include "ss_queue.h"
 #include "ss_queue.x"

diff --git a/src/5gnrmac/rg_pom_scell.c b/src/5gnrmac/rg_pom_scell.c
index 199cf5c..021777d 100755 (executable)
--- a/src/5gnrmac/rg_pom_scell.c
+++ b/src/5gnrmac/rg_pom_scell.c
@@ -69,7 +69,7 @@
 #include "tfu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"       /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"
 #ifdef LTE_ADV
 #include "rg_pom_scell.x"

diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c
index 716c626..85d5318 100755 (executable)
--- a/src/5gnrmac/rg_prg.c
+++ b/src/5gnrmac/rg_prg.c
@@ -65,7 +65,7 @@
 #include "crg.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"           /* layer management typedefs for MAC */
 #include "rg_prg.x"           /* Prg(MAC-MAC)interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 #ifdef LTE_ADV

diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c
index 140142f..0b15ccd 100755 (executable)
--- a/src/5gnrmac/rg_prg_pt.c
+++ b/src/5gnrmac/rg_prg_pt.c
@@ -65,7 +65,7 @@
 #include "crg.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"    /* layer management typedefs for MAC */
 #include "rg_prg.x"        /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 #ifdef LTE_ADV

diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c
index fbfd01f..c06b9b4 100755 (executable)
--- a/src/5gnrmac/rg_ram.c
+++ b/src/5gnrmac/rg_ram.c
@@ -78,7 +78,7 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_prg.x"        /* PRG Interface includes */
 #include "lrg.x"           /* LRG Interface includes */
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 
 /* local defines */

diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c
index d775b07..3352731 100755 (executable)
--- a/src/5gnrmac/rg_rom.c
+++ b/src/5gnrmac/rg_rom.c
@@ -78,7 +78,7 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_prg.x"        /* PRG Interface includes */
 #include "lrg.x"           /* LRG Interface includes */
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 
 /* local defines */

diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c
index 673cc24..ce4dd60 100755 (executable)
--- a/src/5gnrmac/rg_tom.c
+++ b/src/5gnrmac/rg_tom.c
@@ -75,7 +75,7 @@ invoked by PHY towards MAC
 #include "rg_prg.x"        /* PRG interface typedefs */
 #include "rgm.x"           /* layer management typedefs for MAC */
 #include "rgm.h"           /* layer management typedefs for MAC */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 #ifdef MAC_RLC_UL_RBUF

diff --git a/src/5gnrmac/rg_uhm.c b/src/5gnrmac/rg_uhm.c
index dd2c187..e795ef6 100755 (executable)
--- a/src/5gnrmac/rg_uhm.c
+++ b/src/5gnrmac/rg_uhm.c
@@ -74,7 +74,7 @@
 #include "rg_prg.x"        /* PRG Interface defines */
 #include "lrg.x"           /* LRG Interface includes */
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 
 /* local defines */

diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c
index 0c7c5c2..cd47827 100755 (executable)
--- a/src/5gnrmac/rg_uim.c
+++ b/src/5gnrmac/rg_uim.c
@@ -78,7 +78,7 @@ static int RLOG_FILE_ID=178;
 #include "rgu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"        /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 #include "ss_rbuf.h"

diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c
index 8171c4c..e1b074f 100755 (executable)
--- a/src/5gnrmac/rg_utl.c
+++ b/src/5gnrmac/rg_utl.c
@@ -78,7 +78,7 @@ static int RLOG_FILE_ID=179;
 #include "lrg.x"           /* LRG Interface includes */
 #include "rg_prg.x"        /* PRG(MAC-MAC) Interface includes */
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 
 /* local defines */

diff --git a/src/cm/mac_interface.c b/src/cm/du_mgr_mac_inf.c
similarity index 85%
rename from src/cm/mac_interface.c
rename to src/cm/du_mgr_mac_inf.c
index e579c2f..1bfc529 100644 (file)
--- a/src/cm/mac_interface.c
+++ b/src/cm/du_mgr_mac_inf.c
@@ -34,7 +34,7 @@
 #include "cm_hash.x"       /* Common Hash List Definitions */
 #include "cm_lte.x"        /* Common LTE Defines */
 
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 
 /**************************************************************************
  * @brief Function to pack Loose Coupled 
@@ -42,7 +42,7 @@
  *
  * @details
  *
- *      Function : packLcMacCellCfg
+ *      Function : packMacCellCfg
  *
  *      Functionality:
  *           packs the macCellCfg parameters
@@ -53,42 +53,28 @@
  *         RFAILED - failure
  *
  ***************************************************************************/
-S16 packLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
+S16 packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
 {
-   /* we are now implemented only light wieght lossely coupled interface */
-   return ROK;
-}
-
-/**************************************************************************
- * @brief Function to pack light weight Loose Coupled 
- *        MAC cell config parameters required by MAC
- *
- * @details
- *
- *      Function : packLwLcMacCellCfg
- *
- *      Functionality:
- *           packs the macCellCfg parameters
- *
- * @param[in] Pst     *pst, Post structure of the primitive.
- * @param[in] MacCellCfg  *macCellCfg, mac cell config parameters.
- * @return ROK     - success
- *         RFAILED - failure
- *
- ***************************************************************************/
-S16 packLwLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
-{
-   Buffer *mBuf = NULLP;
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+   if(pst->selector == DU_SELECTOR_LC)
    {
-      RETVALUE(RFAILED);
+      /* we are now implemented only light wieght lossely coupled interface */
+      return ROK;
    }
+   else if(pst->selector == DU_SELECTOR_LWLC)
+   {
+      Buffer *mBuf = NULLP;
 
-   /* pack the address of the structure */
-   CMCHKPK(cmPkPtr,(PTR)macCellCfg, mBuf);
+      if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+      {
+         RETVALUE(RFAILED);
+      }
 
-   RETVALUE(SPstTsk(pst,mBuf));
+      /* pack the address of the structure */
+      CMCHKPK(cmPkPtr,(PTR)macCellCfg, mBuf);
+
+      RETVALUE(SPstTsk(pst,mBuf));
+      
+   } 
 }
 
 /**************************************************************************
@@ -221,3 +207,7 @@ S16 unpackMacCellCfgCfm(
       /* only loose coupling is suported */
    }
 }
+
+/**********************************************************************
+         End of file
+**********************************************************************/

diff --git a/src/cm/mac_interface.h b/src/cm/du_mgr_mac_inf.h
similarity index 97%
rename from src/cm/mac_interface.h
rename to src/cm/du_mgr_mac_inf.h
index 87b1f94..335c182 100644 (file)
--- a/src/cm/mac_interface.h
+++ b/src/cm/du_mgr_mac_inf.h
@@ -197,11 +197,9 @@ typedef S16 (*DuMacCellCfgCfm)     ARGS((
         MacCellCfgCfm *macCellCfgCfm         /* Config Structure */
      ));
 
-S16 packLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg);
-S16 packLwLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg);
+S16 packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg);
 
-
-EXTERN S16 handleMacCellCfgReq
+EXTERN S16 MacHdlCellCfgReq
 (
  Pst           *pst,
  MacCellCfg    *macCellCfg

diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h
index 9191273..6dbee75 100644 (file)
--- a/src/du_app/du_cfg.h
+++ b/src/du_app/du_cfg.h
@@ -20,7 +20,7 @@
 #define __DU_CONFIG_H__
 
 #include "du_mgr.h"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 #include "du_log.h"
 #include "BIT_STRING.h"
 

diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h
index c51cc8a..910154c 100644 (file)
--- a/src/du_app/du_mgr.h
+++ b/src/du_app/du_mgr.h
@@ -37,7 +37,7 @@
 #include "lkw.h"
 #include "lrg.h"
 #include "legtp.h"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 
 #include "gen.x"           /* General */
 #include "ssi.x"           /* System services */
@@ -177,7 +177,7 @@ typedef struct duCb
    CmHashListCp  cellLst;     /* List of cells at DU APP of type DuCellCb */
    CmHashListCp  actvCellLst; /* List of cells activated/to be activated of type DuCellCb */
    /* pointer to store the address of macCellCfg params used to send du-app to MAC */
-   MacCellCfg     *ptrMacCellCfg;     /* pointer to store params while sending DU-APP to MAC */
+   MacCellCfg     *duMacCellCfg;     /* pointer to store params while sending DU-APP to MAC */
 }DuCb;
 
 

diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c
index a7653fc..d2240b3 100644 (file)
--- a/src/du_app/du_mgr_ex_ms.c
+++ b/src/du_app/du_mgr_ex_ms.c
@@ -22,7 +22,7 @@
 #include "du_f1ap_msg_hdl.h"
 #include "lsctp.h"
 #include "legtp.h"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
 
 extern S16 cmUnpkLkwCfgCfm(LkwCfgCfm func,Pst *pst, Buffer *mBuf);
 extern S16 cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf);

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index e8f712d..2fae37a 100644 (file)
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -37,11 +37,11 @@ extern S16 cmPkLkwCfgReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
 
-packMacCellCfgReq packMacCellCfgMt[] =
+packMacCellCfgReq packMacCellCfgOpts[] =
 {
-   packLcMacCellCfg, /* packing for loosely coupled */
-   handleMacCellCfgReq, /* packing for tightly coupled */
-   packLwLcMacCellCfg, /* packing for light weight loosly coupled */
+   packMacCellCfg, /* packing for loosely coupled */
+   MacHdlCellCfgReq, /* packing for tightly coupled */
+   packMacCellCfg, /* packing for light weight loosly coupled */
 };
 
 /**************************************************************************
@@ -1513,21 +1513,21 @@ S16 duBuildAndSendMacCellCfg()
 {
    Pst pst;
    DU_SET_ZERO(&pst, sizeof(Pst));
-   MacCellCfg *pMacCellCfg = NULLP;
+   MacCellCfg *duMacCellCfg = NULLP;
 
-   DU_ALLOC(pMacCellCfg, sizeof(MacCellCfg));
-   if(pMacCellCfg == NULLP)
+   DU_ALLOC(duMacCellCfg, sizeof(MacCellCfg));
+   if(duMacCellCfg == NULLP)
    {
       return RFAILED;
    }
 
    /* store the address in the duCb so that we can free on confirm msg */
-   duCb.ptrMacCellCfg = pMacCellCfg;
+   duCb.duMacCellCfg = duMacCellCfg;
 
    /* copy the mac config structure from duCfgParams */
-   memcpy(pMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
+   memcpy(duMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
 
-   pMacCellCfg->transId = getTransId(); /* transaction ID */
+   duMacCellCfg->transId = getTransId(); /* transaction ID */
    
    /* Fill Pst */
    pst.selector  = DU_SELECTOR_LWLC;
@@ -1541,7 +1541,7 @@ S16 duBuildAndSendMacCellCfg()
    pst.event = EVENT_MAC_CELL_CONFIG_REQ;
 
    /* Send MAC cell config to MAC */
-   return (*packMacCellCfgMt[pst.selector])(&pst, pMacCellCfg);
+   return (*packMacCellCfgOpts[pst.selector])(&pst, duMacCellCfg);
 }
 
 /**************************************************************************
@@ -1563,11 +1563,11 @@ S16 duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
 {
    S16 ret = ROK;
 
-   if(macCellCfgCfm->transId == duCb.ptrMacCellCfg->transId)
+   if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
    {
       /* free the memory allocated during sending macCellCfg request */
-      DU_FREE(duCb.ptrMacCellCfg,sizeof(MacCellCfg));
-      duCb.ptrMacCellCfg = NULLP;
+      DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
+      duCb.duMacCellCfg = NULLP;
 
       /* Build and send GNB-DU config update */
       ret = BuildAndSendDUConfigUpdate();