X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_cfg.c;h=f7317c2b54cb780c71d214d849e37d190f99f7ff;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=c0220a0dd698a4338249bb0254ea6e4153b247a4;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c
index c0220a0dd..f7317c2b5 100755
--- a/src/5gnrmac/rg_cfg.c
+++ b/src/5gnrmac/rg_cfg.c
@@ -37,16 +37,7 @@ static int RLOG_FILE_ID=180;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"           /* Layer manager interface includes*/
 #include "crg.h"           /* CRG interface includes*/
 #include "rgu.h"           /* RGU interface includes*/
@@ -58,43 +49,35 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_err.h"       /* MAC error includes*/
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "crg.x"           /* CRG interface includes */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #include "rg_prg.x"        /* PRG (MAC-MAC) Interface typedefs */
+#include "du_app_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 #ifdef LTE_ADV
 #include "rg_pom_scell.x"
 #endif
 /* LTE-MAC Control Block Structure */
-PUBLIC RgCb rgCb[RG_MAX_INST];
+RgCb rgCb[RG_MAX_INST];
 
 /* local defines */
-PRIVATE S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
          RgUeCb **ue, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
          RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
+static S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
          CrgLchCfg *lcCfg, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
+static S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
          RgErrInfo *errInfo));
 
-PRIVATE Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
-PRIVATE Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
 /* Added support for SPS*/
 #ifdef LTEMAC_SPS
-PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
 #endif /* LTEMAC_SPS */
 
 
@@ -130,27 +113,25 @@ PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgCellCfg
+S16 rgCFGVldtCrgCellCfg
 (
 Inst        inst,
 CrgCellCfg  *cellCfg,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGVldtCrgCellCfg(inst,cellCfg, errInfo)
+S16 rgCFGVldtCrgCellCfg(inst,cellCfg, errInfo)
 Inst        inst;
 CrgCellCfg  *cellCfg;
 RgErrInfo   *errInfo;
 #endif
 {
-   TRC2(rgCFGVldtCrgCellCfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG;
    if ((rgCb[inst].cell != NULLP)
          || rgCb[inst].inactiveCell != NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Cell already exists");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if ((cellCfg->bwCfg.dlTotalBw < RG_MIN_DL_BW
             || cellCfg->bwCfg.dlTotalBw > RG_MAX_DL_BW)
@@ -160,13 +141,13 @@ RgErrInfo   *errInfo;
       RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, 
             "Invalid Bandwidth configuration: ul %d dl %d",
             cellCfg->bwCfg.ulTotalBw, cellCfg->bwCfg.dlTotalBw);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (cellCfg->rachCfg.maxMsg3Tx < RG_MIN_HQ_TX)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId,
                 "Invalid RACH configuration: maxMsg3Tx %d",cellCfg->rachCfg.maxMsg3Tx);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifdef TENB_MULT_CELL_SUPPRT
    if((cellCfg->rguDlSapId > rgCb[inst].numRguSaps) ||
@@ -176,11 +157,11 @@ RgErrInfo   *errInfo;
                cellCfg->rguDlSapId,
                cellCfg->rguUlSapId,
                cellCfg->cellId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgCellCfg */
 
 
@@ -208,7 +189,7 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgUeCfg
+S16 rgCFGVldtCrgUeCfg
 (
 Inst      inst,
 CrgUeCfg  *ueCfg,
@@ -216,22 +197,20 @@ RgCellCb  **cell,
 RgErrInfo *errInfo
 )
 #else
-PUBLIC S16 rgCFGVldtCrgUeCfg(inst,ueCfg, cell, errInfo)
+S16 rgCFGVldtCrgUeCfg(inst,ueCfg, cell, errInfo)
 Inst      inst;
 CrgUeCfg  *ueCfg;
 RgCellCb  **cell;
 RgErrInfo *errInfo;
 #endif
 {
-   TRC2(rgCFGVldtCrgUeCfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_CFG;
    if ((ueCfg->txMode.pres == PRSNT_NODEF) && 
        (ueCfg->txMode.tm == CRG_UE_TM_5))
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Transmission Mode=%d not supported",
             ueCfg->txMode.tm);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    /* Fetch the Active cell */
@@ -240,20 +219,20 @@ RgErrInfo *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Active Cell does not exist for cellId%d",
             ueCfg->cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Check if Ue already configured */
    if (rgDBMGetUeCb(*cell, ueCfg->crnti) != NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Ue already exists");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (ueCfg->ueUlHqCfg.maxUlHqTx < RG_MIN_HQ_TX)
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti, "Invalid Uplink HARQ config %d ",
             ueCfg->ueUlHqCfg.maxUlHqTx);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifdef TENB_MULT_CELL_SUPPRT
    if((ueCfg->rguDlSapId > rgCb[inst].numRguSaps) ||
@@ -263,12 +242,12 @@ RgErrInfo *errInfo;
                ueCfg->rguDlSapId,
                ueCfg->rguUlSapId,
                ueCfg->crnti));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgUeCfg */
 
 
@@ -298,7 +277,7 @@ RgErrInfo *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgLcCfg
+S16 rgCFGVldtCrgLcCfg
 (
 Inst       inst, 
 CrgLchCfg  *lcCfg,
@@ -307,7 +286,7 @@ RgUeCb     **ue,
 RgErrInfo  *errInfo
 )
 #else
-PUBLIC S16 rgCFGVldtCrgLcCfg(inst,lcCfg, cell, ue, errInfo)
+S16 rgCFGVldtCrgLcCfg(inst,lcCfg, cell, ue, errInfo)
 Inst       inst;
 CrgLchCfg  *lcCfg;
 RgCellCb   **cell;
@@ -316,15 +295,13 @@ RgErrInfo  *errInfo;
 #endif
 {
 
-   TRC2(rgCFGVldtCrgLcCfg);
-
    if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
    {
       /* Dedicated logical channels */
       if ((rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)) != ROK)
       {
          RLOG_ARG0(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Validation for dedicated LC failed");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else if (lcCfg->lcType == CM_LTE_LCH_BCCH
@@ -334,14 +311,14 @@ RgErrInfo  *errInfo;
       if ((rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)) != ROK)
       {
          RLOG_ARG0(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Validation for common logical channels failed");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid logical channel type %d",
                 lcCfg->lcType);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifdef LTE_L2_MEAS
    if ( lcCfg->qci <  RG_QCI_MIN ||
@@ -349,13 +326,13 @@ RgErrInfo  *errInfo;
       )
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid qci %x",lcCfg->qci);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*validate qci */
 #endif /*LTE_L2_MEAS */
 
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgLcCfg */
 
 
@@ -386,7 +363,7 @@ RgErrInfo  *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgCellRecfg
+S16 rgCFGVldtCrgCellRecfg
 (
 Inst          inst,
 CrgCellRecfg  *cellRecfg,
@@ -394,37 +371,35 @@ RgCellCb      **cell,
 RgErrInfo     *errInfo
 )
 #else
-PUBLIC S16 rgCFGVldtCrgCellRecfg(inst,cellRecfg, cell, errInfo)
+S16 rgCFGVldtCrgCellRecfg(inst,cellRecfg, cell, errInfo)
 Inst          inst;
 CrgCellRecfg  *cellRecfg;
 RgCellCb      **cell;
 RgErrInfo     *errInfo;
 #endif
 {
-   TRC2(rgCFGVldtCrgCellRecfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG;
    
    if (((*cell = rgCb[inst].cell) == NULLP)
          && ((*cell = rgCb[inst].inactiveCell) == NULLP))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Cell does not exist");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if((*cell)->cellId != cellRecfg->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId, "Cell does not exist %d\n",cellRecfg->cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (cellRecfg->rachRecfg.maxMsg3Tx < RG_MIN_HQ_TX)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId,
                 "Invalid RACH configuration: maxMsg3Tx %d",cellRecfg->rachRecfg.maxMsg3Tx);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgCellRecfg */
 
 
@@ -456,7 +431,7 @@ RgErrInfo     *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgUeRecfg
+S16 rgCFGVldtCrgUeRecfg
 (
 Inst        inst,
 CrgUeRecfg  *ueRecfg,
@@ -465,7 +440,7 @@ RgUeCb      **ue,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGVldtCrgUeRecfg(inst,ueRecfg, cell, ue, errInfo)
+S16 rgCFGVldtCrgUeRecfg(inst,ueRecfg, cell, ue, errInfo)
 Inst        inst;
 CrgUeRecfg  *ueRecfg;
 RgCellCb    **cell;
@@ -473,8 +448,6 @@ RgUeCb      **ue;
 RgErrInfo   *errInfo;
 #endif
 {
-   TRC2(rgCFGVldtCrgUeRecfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG;
    
    if ((ueRecfg->txMode.pres == PRSNT_NODEF) && 
@@ -482,7 +455,7 @@ RgErrInfo   *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Transmission Mode=%d not supported",
                 ueRecfg->txMode.tm);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
     /* Fetch the Active cell */
@@ -490,7 +463,7 @@ RgErrInfo   *errInfo;
         || ((*cell)->cellId != ueRecfg->cellId))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,ueRecfg->cellId, "Active Cell does not exist\n");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
  
    /* Fix : syed UE ID change at MAC will now be controlled
@@ -498,16 +471,16 @@ RgErrInfo   *errInfo;
    if ((*ue = rgDBMGetUeCb(*cell, ueRecfg->oldCrnti)) == NULLP)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"[%d]Old Ue does not exist", ueRecfg->oldCrnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (ueRecfg->ueUlHqRecfg.maxUlHqTx < RG_MIN_HQ_TX)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid Uplink HARQ config for UE %d",
             ueRecfg->ueUlHqRecfg.maxUlHqTx);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgUeRecfg */
 
 
@@ -542,7 +515,7 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgLcRecfg
+S16 rgCFGVldtCrgLcRecfg
 (
 Inst        inst,
 CrgLchRecfg *lcRecfg,
@@ -552,7 +525,7 @@ RgUlLcCb    **ulLc,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGVldtCrgLcRecfg(inst,lcRecfg, cell, ue, ulLc, errInfo)
+S16 rgCFGVldtCrgLcRecfg(inst,lcRecfg, cell, ue, ulLc, errInfo)
 Inst        inst;
 CrgLchRecfg  *lcRecfg;
 RgCellCb     **cell;
@@ -561,8 +534,6 @@ RgUlLcCb     **ulLc;
 RgErrInfo    *errInfo;
 #endif
 {
-   TRC2(rgCFGVldtCrgLcRecfg);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG;
 
    /* Fetch the cell */
@@ -570,30 +541,30 @@ RgErrInfo    *errInfo;
       || ((*cell)->cellId != lcRecfg->cellId))
    {
       RLOG_ARG2(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Active Cell %u does not exist for UE %u", lcRecfg->cellId, lcRecfg->crnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Fetch the Ue for dedicated channels */
    if ((*ue = rgDBMGetUeCb(*cell, lcRecfg->crnti)) == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Ue does not exist for dedicated logical channel");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if ((*ulLc = rgDBMGetUlDedLcCb((*ue), lcRecfg->lcId)) == NULLP)
    {
       RLOG_ARG1(L_ERROR, DBG_CRNTI,lcRecfg->crnti,"Dedicated UL LC does not exist %d",lcRecfg->lcId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (lcRecfg->ulRecfg.lcgId > (RG_MAX_LCG_PER_UE - 1))
    {
       RLOG_ARG2(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Invalid lcgId for uplink logical channel lcg %d lc %d",
                 lcRecfg->ulRecfg.lcgId, lcRecfg->lcId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgLcRecfg */
 
 /* Start: LTEMAC_2.1_DEV_CFG */
@@ -622,25 +593,23 @@ RgErrInfo    *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGVldtCrgUeReset
+S16 rgCFGVldtCrgUeReset
 (
-Inst       inst,
-CrgRst     *reset,
+Inst        inst,
+CrgRst      *reset,
 RgCellCb    **cell,
 RgUeCb      **ue,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
-Inst       inst;
-CrgRst     *reset;
+S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
+Inst        inst;
+CrgRst      *reset;
 RgCellCb    **cell;
 RgUeCb      **ue;
 RgErrInfo   *errInfo;
 #endif
 {
-   TRC2(rgCFGVldtCrgUeReset);
-
    errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET;
    
    /* Fetch the Active cell */
@@ -649,18 +618,18 @@ RgErrInfo   *errInfo;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",reset->crnti, reset->cellId));
       RLOG_ARG1(L_ERROR,DBG_CRNTI,reset->crnti,"Active Cell does not exist %d",reset->cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Fetch the Ue */
    if ((*ue = rgDBMGetUeCb(*cell, reset->crnti)) == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CRNTI,reset->crnti,"UE does not exist");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgUeReset*/
 /* End: LTEMAC_2.1_DEV_CFG */
 
@@ -689,14 +658,14 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgCellCfg
+S16 rgCFGCrgCellCfg
 (
 Inst        inst,
 CrgCellCfg  *cellCfg,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGCrgCellCfg(inst,cellCfg, errInfo)
+S16 rgCFGCrgCellCfg(inst,cellCfg, errInfo)
 Inst        inst;
 CrgCellCfg  *cellCfg;
 RgErrInfo   *errInfo;
@@ -704,26 +673,24 @@ RgErrInfo   *errInfo;
 {
    S16        ret;
    RgCellCb   *cell = NULLP;
-   U8         idx;
+   uint8_t    idx;
    SuId       rguUlSapId = 0;
    SuId       rguDlSapId = 0;
    /* RLC SAP to allocate flowCntrlInd buffer*/
    Pst        *pst ;
 
-   TRC2(rgCFGCrgCellCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_CELL_CFG;
    
    /* Allocate the cell control block */
    if((ret = rgAllocSBuf(inst,(Data**)&cell, sizeof(RgCellCb))) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (cell == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Memory allocation FAILED for cell");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Initialize the cell */
@@ -747,14 +714,14 @@ RgErrInfo   *errInfo;
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"DBM initialization for cell failed");
       rgCFGFreeInactvCellCb(cell);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef LTE_ADV
    if (RFAILED == RgLaaCellCbInit(cell))
    {
       rgCFGFreeInactvCellCb(cell);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -784,10 +751,10 @@ RgErrInfo   *errInfo;
    cmLListInit(&cell->l2mList);
    for(idx = 0; idx < RG_NUM_UL_SUB_FRAMES; idx++)
    {
-      cmMemset((U8 *)&cell->ulSf[idx], 0, sizeof(RgUlSf));
+      memset(&cell->ulSf[idx], 0, sizeof(RgUlSf));
    }
 
-   cell->ttiCycle = (U32)RG_TTI_CYCLE_INVLD;   
+   cell->ttiCycle = (uint32_t)RG_TTI_CYCLE_INVLD;   
 #endif
    /* Update Statistics */
    rgUpdtCellCnt(inst,RG_CFG_ADD);
@@ -797,7 +764,7 @@ RgErrInfo   *errInfo;
    /* Allocate a buffer for flowCntrlInd.*/
    SGetSBuf(pst->region, pst->pool, (Data **)&cell->flowCntrlInd, 
               sizeof(RguFlowCntrlInd));
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgCellCfg */
 
 #ifdef LTE_ADV
@@ -824,14 +791,14 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCfgAddUeSCellCfg
+S16 rgCfgAddUeSCellCfg
 (
 Inst        dstMacInst,    
 RgPrgUeSCellCfgInfo *ueSCellCb,
 RgCellCb    *cell
 )
 #else
-PUBLIC S16 rgCfgAddUeSCellCfg(dstMacInst, ueSCellCb, cell)
+S16 rgCfgAddUeSCellCfg(dstMacInst, ueSCellCb, cell)
 Inst        dstMacInst;    
 RgPrgUeSCellCfgInfo *ueSCellCb;
 RgCellCb    *cell;
@@ -840,11 +807,9 @@ RgCellCb    *cell;
    RgUeCb     *ueCb = NULLP;
    SuId       rguUlSapId = 0;
    SuId       rguDlSapId = 0;
-   U8 	     idx;
+   uint8_t    idx;
    RgErrInfo  errInfo;
 
-   TRC2(rgCfgAddUeSCellCfg);
-   
 #ifdef LTE_ADV
    rguDlSapId              = ueSCellCb->rguDlSapId;
    rguUlSapId              = ueSCellCb->rguUlSapId;
@@ -862,7 +827,7 @@ RgCellCb    *cell;
                "[%d]Ue already exist in scell %d during scell addition\n", 
                ueSCellCb->ueId,
                cell->cellId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Create UeCb */
@@ -871,7 +836,7 @@ RgCellCb    *cell;
    {
       RGDBGERRNEW(dstMacInst, (rgPBuf(dstMacInst),
                "[%d]UeCb creation failed\n", ueSCellCb->ueId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(rgDHMHqEntInit(dstMacInst, &ueCb->dl.hqEnt, 
@@ -879,7 +844,7 @@ RgCellCb    *cell;
    {
       RGDBGERRNEW(dstMacInst,(rgPBuf(dstMacInst), 
                "[%d]UeCb Harq Entity Initialization failed\n", ueSCellCb->ueId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    rgDBMInsUeCb(cell, ueCb);
 
@@ -911,7 +876,7 @@ RgCellCb    *cell;
       ueCb->ul.lcgArr[idx].lcCount = ueSCellCb->lcgInfo[idx].lcCount;
       ueCb->ul.lcgArr[idx].isGbr = ueSCellCb->lcgInfo[idx].isGbr;
    }
-   RETVALUE(ROK);
+   return ROK;
 }/* rgCfgAddUeSCellCfg */
 
 /**
@@ -938,7 +903,7 @@ RgCellCb    *cell;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgFillAndAddSCellCfg
+S16 rgFillAndAddSCellCfg
 (
 Inst            inst,
 RgCellCb        *cell,
@@ -947,7 +912,7 @@ CrgCfgTransId   transId,
 Bool            *isCfmRqrd
 )
 #else
-PUBLIC S16 rgFillAndAddSCellCfg(inst, cell, ueRecfg, transId, isCfmRqrd)
+S16 rgFillAndAddSCellCfg(inst, cell, ueRecfg, transId, isCfmRqrd)
 Inst            inst;
 RgCellCb        *cell;
 CrgUeRecfg      *ueRecfg;
@@ -956,13 +921,11 @@ Bool            *isCfmRqrd;
 #endif
 {
    RgUeCb     *ue = NULLP;
-   U8          idx = 0;
+   uint8_t     idx = 0;
    Inst        dstMacInst;
    RgPrgUeSCellCfgInfo ueSCellCb;
    Pst          dstInstPst;
 
-   TRC2(rgFillAndAddSCellCfg);
-  
   /* Fetch the Active cell */
    if(((cell = rgCb[inst].cell) == NULLP) ||
        (cell->cellId != ueRecfg->cellId))
@@ -970,7 +933,7 @@ Bool            *isCfmRqrd;
       RGDBGERRNEW(inst,(rgPBuf(inst), 
                        "[%d]Active Cell does not exist %d\n",
                                   ueRecfg->oldCrnti, ueRecfg->cellId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGDBGPRM(inst,(rgPBuf(inst), 
@@ -981,7 +944,7 @@ Bool            *isCfmRqrd;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), 
                "[%d]Ue does not exist\n", ueRecfg->oldCrnti));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Initialize cfgCfmInfo in the ueCb. This is used while processing SCellAdd
@@ -990,13 +953,13 @@ Bool            *isCfmRqrd;
    ue->cfgCfmInfo.cfgCfgCount = 0;
    ue->cfgCfmInfo.mask = 0x0;
 
-   cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+   memcpy(&(ue->cfgCfmInfo.transId), &transId,
          sizeof(CrgCfgTransId));
    ueSCellCb.ueId = ueRecfg->oldCrnti;
    ueSCellCb.txMode = ue->txMode;
    ueSCellCb.maxUlHqRetx = ue->ul.hqEnt.maxHqRetx;
-   cmMemcpy((U8 *)ueSCellCb.ulLcInfo, (U8 *)ue->ul.lcCb, sizeof(ue->ul.lcCb));
-   cmMemcpy((U8 *)ueSCellCb.dlLcInfo, (U8 *)ue->dl.lcCb, sizeof(ue->dl.lcCb));
+   memcpy(ueSCellCb.ulLcInfo, ue->ul.lcCb, sizeof(ue->ul.lcCb));
+   memcpy(ueSCellCb.dlLcInfo, ue->dl.lcCb, sizeof(ue->dl.lcCb));
    for (idx =0; idx < RG_MAX_LCG_PER_UE; idx++)
    {
       ueSCellCb.lcgInfo[idx].lcgId = ue->ul.lcgArr[idx].lcgId;
@@ -1021,7 +984,7 @@ Bool            *isCfmRqrd;
    } /*end of for loop */
    *isCfmRqrd = FALSE;
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgFillAndAddSCellCfg */
 #endif /* LTE_ADV */
 
@@ -1051,7 +1014,7 @@ Bool            *isCfmRqrd;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgUeCfg
+S16 rgCFGCrgUeCfg
 (
 Inst      inst,
 RgCellCb  *cell,
@@ -1059,7 +1022,7 @@ CrgUeCfg  *ueCfg,
 RgErrInfo *errInfo
 )
 #else
-PUBLIC S16 rgCFGCrgUeCfg(inst,cell, ueCfg, errInfo)
+S16 rgCFGCrgUeCfg(inst,cell, ueCfg, errInfo)
 Inst      inst;
 RgCellCb  *cell;
 CrgUeCfg  *ueCfg;
@@ -1071,8 +1034,6 @@ RgErrInfo *errInfo;
    SuId       rguUlSapId = 0;
    SuId       rguDlSapId = 0;
 
-   TRC2(rgCFGCrgUeCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_UE_CFG;
 
 /* Start: LTEMAC_2.1_DEV_CFG */
@@ -1082,12 +1043,12 @@ RgErrInfo *errInfo;
       if((ue=rgRAMCreateUeCb(cell, ueCfg->crnti, FALSE, errInfo)) == NULLP)
       {
          RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"UeCb creation failed");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if(rgDHMHqEntInit(inst,&ue->dl.hqEnt, cell->maxDlHqProcPerUe) != ROK)
       {
          RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"UeCb Harq Entity Initialization failed");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       handover = TRUE;
    }
@@ -1122,7 +1083,7 @@ RgErrInfo *errInfo;
    /* Update satistics */
    rgUpdtUeCnt(inst,RG_CFG_ADD);
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgUeCfg */
 
 
@@ -1156,7 +1117,7 @@ RgErrInfo *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgLcCfg
+S16 rgCFGCrgLcCfg
 (
 Inst            inst,
 RgCellCb        *cell,
@@ -1167,7 +1128,7 @@ Bool            *isCfmRqrd,
 CrgCfgTransId   transId
 )
 #else
-PUBLIC S16 rgCFGCrgLcCfg(inst,cell, ue, lcCfg, errInfo, isCfmRqrd,transId)
+S16 rgCFGCrgLcCfg(inst,cell, ue, lcCfg, errInfo, isCfmRqrd,transId)
 Inst        inst;
 RgCellCb    *cell;
 RgUeCb      *ue;
@@ -1178,8 +1139,6 @@ CrgCfgTransId   transId;
 #endif
 {
 
-   TRC2(rgCFGCrgLcCfg);
-   
    /* Handle Config for dedicated/common logical channels */
    if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
    {
@@ -1188,11 +1147,11 @@ CrgCfgTransId   transId;
       {
          RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,
                "Dedicated logical channel configuration failed %d",lcCfg->lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #ifdef LTE_ADV
       /*ERAB Multl Cell fix*/
-       cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+       memcpy(&(ue->cfgCfmInfo.transId), &transId,
             sizeof(CrgCfgTransId));
        rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lcCfg,isCfmRqrd);
 #endif
@@ -1203,13 +1162,13 @@ CrgCfgTransId   transId;
       {
          RLOG_ARG1(L_ERROR, DBG_CRNTI, lcCfg->crnti, "Common logical channel configuration"
                   "failed %d\n", lcCfg->lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
    errInfo->errCause = RGERR_NONE;
    RLOG_ARG1(L_INFO, DBG_CRNTI,lcCfg->crnti, "CRG LC config done for UE: lcId %d\n", lcCfg->lcId);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgLcCfg */
 
 
@@ -1235,7 +1194,7 @@ CrgCfgTransId   transId;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgCellRecfg
+S16 rgCFGCrgCellRecfg
 (
 Inst          inst,
 RgCellCb      *cell,
@@ -1243,20 +1202,18 @@ CrgCellRecfg  *cellRecfg,
 RgErrInfo     *errInfo
 )
 #else
-PUBLIC S16 rgCFGCrgCellRecfg(inst,cell, cellRecfg, errInfo)
+S16 rgCFGCrgCellRecfg(inst,cell, cellRecfg, errInfo)
 Inst          inst;
 RgCellCb      *cell;
 CrgCellRecfg  *cellRecfg;
 RgErrInfo     *errInfo;
 #endif
 {
-   TRC2(rgCFGCrgCellRecfg);
-
    /* Store the given rachCfg */
    cell->rachCfg = cellRecfg->rachRecfg;
 
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgCellRecfg */
 
 
@@ -1288,7 +1245,7 @@ RgErrInfo     *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgUeRecfg
+S16 rgCFGCrgUeRecfg
 (
 Inst        inst,
 RgCellCb    *cell,
@@ -1297,7 +1254,7 @@ CrgUeRecfg  *ueRecfg,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGCrgUeRecfg(inst,cell, ue, ueRecfg, errInfo)
+S16 rgCFGCrgUeRecfg(inst,cell, ue, ueRecfg, errInfo)
 Inst        inst;
 RgCellCb    *cell;
 RgUeCb      *ue;
@@ -1305,8 +1262,6 @@ CrgUeRecfg  *ueRecfg;
 RgErrInfo   *errInfo;
 #endif
 {
-   TRC2(rgCFGCrgUeRecfg);
-
    errInfo->errCause = RGERR_CFG_CRG_UE_RECFG;
 
    /* Fix : syed UE ID change at MAC will now be controlled
@@ -1316,7 +1271,7 @@ RgErrInfo   *errInfo;
    rgUHMCrgUeRecfg(cell, ue, ueRecfg);
 
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgUeRecfg */
 
 
@@ -1346,7 +1301,7 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgLcRecfg
+S16 rgCFGCrgLcRecfg
 (
 Inst        inst,
 RgCellCb    *cell,
@@ -1357,7 +1312,7 @@ RgErrInfo   *errInfo,
 Bool        *isCfmRqrd
 )
 #else
-PUBLIC S16 rgCFGCrgLcRecfg(inst,cell, ue, ulLc, lcRecfg, errInfo, isCfmRqrd)
+S16 rgCFGCrgLcRecfg(inst,cell, ue, ulLc, lcRecfg, errInfo, isCfmRqrd)
 Inst        inst;
 RgCellCb    *cell;
 RgUeCb      *ue;
@@ -1367,7 +1322,6 @@ RgErrInfo   *errInfo;
 Bool        *isCfmRqrd;
 #endif
 {
-   TRC2(rgCFGCrgLcRecfg);
 
    if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId)
    {
@@ -1378,7 +1332,7 @@ Bool        *isCfmRqrd;
    }
 
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgLcRecfg */
 
 /* Start: LTEMAC_2.1_DEV_CFG */
@@ -1401,29 +1355,28 @@ Bool        *isCfmRqrd;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgUeReset
+S16 rgCFGCrgUeReset
 (
 RgCellCb    *cell,
 RgUeCb      *ue,
-CrgRst     *reset,
+CrgRst      *reset,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
+S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
 RgCellCb    *cell;
 RgUeCb      *ue;
-CrgRst     *reset;
+CrgRst      *reset;
 RgErrInfo   *errInfo;
 #endif
 {
-   TRC2(rgCFGCrgUeReset);
 
    RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId);
    rgDHMUeReset(cell, &ue->dl.hqEnt);
 
    errInfo->errCause = RGERR_NONE;
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgUeReset */
 /* End: LTEMAC_2.1_DEV_CFG */
 
@@ -1448,23 +1401,22 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgCellDel
+S16 rgCFGCrgCellDel
 (
 Inst        inst,
 CrgDel      *cellDelInfo,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGCrgCellDel(inst,cellDelInfo, errInfo)
+S16 rgCFGCrgCellDel(inst,cellDelInfo, errInfo)
 Inst        inst,
 CrgDel      *cellDelInfo;
 RgErrInfo   *errInfo;
 #endif
 {
-   RgCellCb      *cell;
-   U8 idx;
+   RgCellCb *cell;
+   uint8_t  idx;
 
-   TRC2(rgCFGCrgCellDel);
 
    errInfo->errCause = RGERR_CFG_CRG_CELL_DEL;
    if (((cell = rgCb[inst].cell) == NULLP)
@@ -1476,7 +1428,7 @@ RgErrInfo   *errInfo;
 
          
          RLOG_ARG0(L_ERROR,DBG_CELLID,cellDelInfo->u.cellDel.cellId,"Cell does not exist");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* Delete cell from inactive list */
@@ -1486,7 +1438,7 @@ RgErrInfo   *errInfo;
       rgCFGFreeInactvCellCb(cell);
 
       errInfo->errCause = RGERR_NONE;
-      RETVALUE(ROK);
+      return ROK;
    }
 
    /* Delete from the cell list */
@@ -1503,7 +1455,7 @@ RgErrInfo   *errInfo;
 
    errInfo->errCause    = RGERR_NONE;
    RGDBGINFO(inst,(rgPBuf(inst), "Cell %d deleted\n", cellDelInfo->u.cellDel.cellId));
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgCellDel */
 
 
@@ -1528,20 +1480,19 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgUeDel
+S16 rgCFGCrgUeDel
 (
 Inst        inst,
 CrgDel      *ueDelInfo,
 RgErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgCFGCrgUeDel(inst,ueDelInfo, errInfo)
+S16 rgCFGCrgUeDel(inst,ueDelInfo, errInfo)
 Inst        inst;
 CrgDel      *ueDelInfo;
 RgErrInfo   *errInfo;
 #endif
 {
-   TRC2(rgCFGCrgUeDel);
 
    errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
 
@@ -1552,12 +1503,12 @@ RgErrInfo   *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,ueDelInfo->u.ueDel.crnti,"Cell does not exist %d",
                 ueDelInfo->u.ueDel.cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    errInfo->errCause = RGERR_NONE;
    /* Fix: syed Context Deletion is relied upon SCH indication */
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgUeDel */
 
 
@@ -1582,7 +1533,7 @@ RgErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgCFGCrgLcDel
+S16 rgCFGCrgLcDel
 (
 Inst        inst,
 CrgDel      *lcDelInfo,
@@ -1591,7 +1542,7 @@ Bool        *isCfmRqrd,
 CrgCfgTransId transId
 )
 #else
-PUBLIC S16 rgCFGCrgLcDel(inst,lcDelInfo, errInfo,isCfmRqrd,transId)
+S16 rgCFGCrgLcDel(inst,lcDelInfo, errInfo,isCfmRqrd,transId)
 Inst        inst;
 CrgDel      *lcDelInfo;
 RgErrInfo   *errInfo;
@@ -1604,8 +1555,6 @@ CrgCfgTransId transId;
    RgUlLcCb  *ulLc;
    RgDlLcCb  *dlLc;
 
-   TRC2(rgCFGCrgLcDel);
-
    errInfo->errCause = RGERR_CFG_CRG_LC_DEL;
 
    /* Fetch the Active cell */
@@ -1614,7 +1563,7 @@ CrgCfgTransId transId;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"Cell does not exist %d",
                 lcDelInfo->u.lchDel.cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Fetch the Ue */
@@ -1622,7 +1571,7 @@ CrgCfgTransId transId;
    {
       RLOG_ARG0(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,
                 "UE does not exist for dedicated logical channel");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Validate downlink info */
@@ -1633,7 +1582,7 @@ CrgCfgTransId transId;
       {
          RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"DL LC %d does not exist",
                    lcDelInfo->u.lchDel.lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       rgDBMDelDlDedLcCb(ue, dlLc);
       dirVld = TRUE;
@@ -1647,7 +1596,7 @@ CrgCfgTransId transId;
       {
          RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"UL LC %d does not exist",
                    lcDelInfo->u.lchDel.lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       rgDBMDelUlDedLcCb(ue, ulLc);
       dirVld = TRUE;
@@ -1657,16 +1606,16 @@ CrgCfgTransId transId;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"Invalid direction %d for LC Delete",
             lcDelInfo->u.lchDel.dir);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifdef LTE_ADV
    /*ERAB - multicell fix*/
-   cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+   memcpy( &(ue->cfgCfmInfo.transId), &transId,
          sizeof(CrgCfgTransId));
    rgPomSndUeSCellLchDelToSmac(inst, lcDelInfo, isCfmRqrd);
 #endif
    errInfo->errCause = RGERR_NONE;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgLcDel */
 
 /***********************************************************
@@ -1686,7 +1635,7 @@ CrgCfgTransId transId;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgDedLcCfg
+static S16 rgCFGVldtCrgDedLcCfg
 (
 Inst          inst, 
 CrgLchCfg     *lcCfg,
@@ -1695,7 +1644,7 @@ RgUeCb        **ue,
 RgErrInfo     *errInfo
 )
 #else
-PRIVATE S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)
+static S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)
 Inst          inst;
 CrgLchCfg     *lcCfg;
 RgCellCb      **cell;
@@ -1703,8 +1652,7 @@ RgUeCb        **ue;
 RgErrInfo     *errInfo;
 #endif
 {
-   U8         dirVld   = FALSE;
-   TRC2(rgCFGVldtCrgDedLcCfg);
+   uint8_t         dirVld   = FALSE;
 
    errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
 
@@ -1714,7 +1662,7 @@ RgErrInfo     *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Active Cell does not exist: Cell %d",
                 lcCfg->cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Fetch the Ue */
@@ -1722,7 +1670,7 @@ RgErrInfo     *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE  does not exist for dedicated logical channel %d",
                 lcCfg->lcId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Validate logical channel Id */
@@ -1731,7 +1679,7 @@ RgErrInfo     *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid logical channel Id %d",
                 lcCfg->lcId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Validate downlink info */
@@ -1741,7 +1689,7 @@ RgErrInfo     *errInfo;
       {
          RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Dedicated DL LC %d already configured",
                     lcCfg->lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       dirVld = TRUE;
    }
@@ -1753,13 +1701,13 @@ RgErrInfo     *errInfo;
       {
          RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Invalid lcgId for uplink logical channel %d",
                    lcCfg->ulInfo.lcgId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if (rgDBMGetUlDedLcCb((*ue), lcCfg->lcId) != NULLP)
       {
          RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Dedicated UL LC %d already configured",
                    lcCfg->lcId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       dirVld = TRUE;
    }
@@ -1768,10 +1716,10 @@ RgErrInfo     *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid Direction %d",
                lcCfg->dir);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgDedLcCfg */
 
 
@@ -1792,7 +1740,7 @@ RgErrInfo     *errInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg
+static S16 rgCFGVldtCrgCmnLcCfg
 (
 Inst          inst,
 CrgLchCfg     *lcCfg,
@@ -1800,16 +1748,14 @@ RgCellCb      **cell,
 RgErrInfo     *errInfo
 )
 #else
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)
+static S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)
 Inst          inst;
 CrgLchCfg     *lcCfg;
 RgCellCb      **cell;
 RgErrInfo     *errInfo;
 #endif
 {
-   U8         dirVld  = FALSE;
-
-   TRC2(rgCFGVldtCrgCmnLcCfg);
+   uint8_t dirVld  = FALSE;
 
    errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
 
@@ -1818,7 +1764,7 @@ RgErrInfo     *errInfo;
       && ((*cell)->cellId != lcCfg->cellId))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"Active Cell exists for common channels");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Fetch the inactive cell for common logical channels */
@@ -1827,7 +1773,7 @@ RgErrInfo     *errInfo;
    {
       
       RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"Inactive Cell does not exist for common channels");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Validate downlink info */
    if (lcCfg->dir & CRG_DIR_TX)
@@ -1839,7 +1785,7 @@ RgErrInfo     *errInfo;
             if (rgDBMGetBcchOnDlsch(*cell,lcCfg->lcId) != NULLP)
             {
                RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"BCCH on DLSCH already configured for cell");
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
          }
          else if (lcCfg->dlInfo.dlTrchType == CM_LTE_TRCH_BCH)
@@ -1847,14 +1793,14 @@ RgErrInfo     *errInfo;
             if (rgDBMGetBcchOnBch(*cell) != NULLP)
             {
                RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"BCCH on BCH already configured for cell %d");
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
          }
          else
          {
             RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid transport channel %d for cell",
                   lcCfg->dlInfo.dlTrchType);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
       else if (lcCfg->lcType == CM_LTE_LCH_PCCH)
@@ -1862,13 +1808,13 @@ RgErrInfo     *errInfo;
          if (rgDBMGetPcch(*cell) != NULLP)
          {
             RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"PCCH already configured for cell");
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
       else if (RG_DLCCCH_ISCFGD(*cell))
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"DL CCCH already configured for cell %d");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       dirVld = TRUE;
    }
@@ -1881,12 +1827,12 @@ RgErrInfo     *errInfo;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid UL common lcType %d for cell ",
                   lcCfg->lcType);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if (RG_ULCCCH_ISCFGD(*cell))
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"UL CCCH already configured for cell ");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       dirVld = TRUE;
    }
@@ -1895,10 +1841,10 @@ RgErrInfo     *errInfo;
    if (!dirVld)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid Direction %d", lcCfg->dir);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGVldtCrgCmnLcCfg */
 
 /***********************************************************
@@ -1919,7 +1865,7 @@ RgErrInfo     *errInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgCFGCrgDedLcCfg
+static S16 rgCFGCrgDedLcCfg
 (
 RgCellCb      *cell,
 RgUeCb        *ue,
@@ -1927,7 +1873,7 @@ CrgLchCfg     *lcCfg,
 RgErrInfo     *errInfo
 )
 #else
-PRIVATE S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
+static S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
 RgCellCb      *cell;
 RgUeCb        *ue;
 CrgLchCfg     *lcCfg;
@@ -1935,8 +1881,6 @@ RgErrInfo     *errInfo;
 #endif
 {
    //Inst     inst = cell->macInst - RG_INST_START;
-   TRC2(rgCFGCrgDedLcCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG;
 
    /* Uplink/Bi-directional logical channel */
@@ -1959,7 +1903,7 @@ RgErrInfo     *errInfo;
    {
       rgDBMInsDlDedLcCb(ue, lcCfg->lcId);
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgDedLcCfg */
 
 
@@ -1981,7 +1925,7 @@ RgErrInfo     *errInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgCFGCrgCmnLcCfg
+static S16 rgCFGCrgCmnLcCfg
 (
 Inst          inst,
 RgCellCb      *cell,
@@ -1989,15 +1933,13 @@ CrgLchCfg     *lcCfg,
 RgErrInfo     *errInfo
 )
 #else
-PRIVATE S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)
+static S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)
 Inst          inst;
 RgCellCb      *cell;
 CrgLchCfg     *lcCfg;
 RgErrInfo     *errInfo;
 #endif
 {
-   TRC2(rgCFGCrgCmnLcCfg);
-
    errInfo->errCause = RGERR_CFG_CRG_CMN_LC_CFG;
 
    /* Handle configuration for CCCH/BCCH/PCCH */
@@ -2056,7 +1998,7 @@ RgErrInfo     *errInfo;
                config\n", lcCfg->lcId);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgCFGCrgCmnLcCfg */
 #ifdef LTE_L2_MEAS
 /***********************************************************
@@ -2076,20 +2018,18 @@ RgErrInfo     *errInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgCFGFreeUeUlAlloc
+static Void rgCFGFreeUeUlAlloc
 (
 RgCellCb      *cell
 )
 #else
-PRIVATE Void rgCFGFreeUeUlAlloc(cell)
+static Void rgCFGFreeUeUlAlloc(cell)
 RgCellCb      *cell;
 #endif
 {
-   U8    sfIdx;
+   uint8_t    sfIdx;
    Inst inst = cell->macInst - RG_INST_START;
    
-   TRC2(rgCFGFreeUeUlAlloc);
-
    for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++)
    {
       if(cell->ulSf[sfIdx].ueUlAllocInfo != NULLP)
@@ -2119,17 +2059,16 @@ RgCellCb      *cell;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgCFGFreeCellCb
+Void rgCFGFreeCellCb
 (
 RgCellCb      *cell
 )
 #else
-PUBLIC Void rgCFGFreeCellCb(cell)
+Void rgCFGFreeCellCb(cell)
 RgCellCb      *cell;
 #endif
 {
    Inst inst = cell->macInst - RG_INST_START;
-   TRC2(rgCFGFreeCellCb);
 
 #ifdef LTE_ADV
    RgLaaCellCbDeInit(cell);
@@ -2159,7 +2098,7 @@ RgCellCb      *cell;
    RGDBGINFO(inst,(rgPBuf(inst), "Cell freed\n"));
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeCellCb */
 
 
@@ -2180,18 +2119,16 @@ RgCellCb      *cell;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgCFGFreeInactvCellCb
+Void rgCFGFreeInactvCellCb
 (
 RgCellCb      *cell
 )
 #else
-PUBLIC Void rgCFGFreeInactvCellCb(cell)
+Void rgCFGFreeInactvCellCb(cell)
 RgCellCb      *cell;
 #endif
 {
    Inst      inst = cell->macInst - RG_INST_START;
-   TRC2(rgCFGFreeInactvCellCb);
-   
    /* De-initialize the Ue list */
    rgDBMDeInitUeCbLst(cell);
 #ifdef LTEMAC_SPS
@@ -2211,7 +2148,7 @@ RgCellCb      *cell;
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeInactvCellCb */
 
 
@@ -2232,21 +2169,19 @@ RgCellCb      *cell;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgCFGFreeUeCb
+Void rgCFGFreeUeCb
 (
 RgCellCb    *cell,
 RgUeCb      *ue
 )
 #else
-PUBLIC Void rgCFGFreeUeCb(cell, ue)
+Void rgCFGFreeUeCb(cell, ue)
 RgCellCb    *cell;
 RgUeCb      *ue;
 #endif
 {
    Inst inst = cell->macInst - RG_INST_START;
 
-   TRC2(rgCFGFreeUeCb);
-
    rgDHMFreeUe(inst,&ue->dl.hqEnt);
 
    /* ccpu00117052 - MOD - Passing double pointer for proper NULLP
@@ -2259,7 +2194,7 @@ RgUeCb      *ue;
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeUeCb */
 
 /***********************************************************
@@ -2279,22 +2214,20 @@ RgUeCb      *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgCFGFreeCmnLcLst
+static Void rgCFGFreeCmnLcLst
 (
 RgCellCb      *cell
 )
 #else
-PRIVATE Void rgCFGFreeCmnLcLst(cell)
+static Void rgCFGFreeCmnLcLst(cell)
 RgCellCb      *cell;
 #endif
 {
-   TRC2(rgCFGFreeCmnLcLst);
-
    rgDBMFreeCmnLcLst(cell);
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeCmnLcLst */
 
 
@@ -2315,19 +2248,17 @@ RgCellCb      *cell;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgCFGFreeUeLst
+static Void rgCFGFreeUeLst
 (
 RgCellCb      *cell
 )
 #else
-PRIVATE Void rgCFGFreeUeLst(cell)
+static Void rgCFGFreeUeLst(cell)
 RgCellCb      *cell;
 #endif
 {
    RgUeCb     *ue;
 
-   TRC2(rgCFGFreeUeLst);
-
    /* Free Ues in the list */
    while ((ue = rgDBMGetNextUeCb(cell, NULLP)) != NULLP)
    {
@@ -2343,7 +2274,7 @@ RgCellCb      *cell;
 
 
   /* Stack Crash Problem for TRACE5 Changes. Added return below */
-  RETVOID; 
+  return; 
 }  /* rgCFGFreeUeLst */
 
 #ifdef LTEMAC_SPS
@@ -2364,19 +2295,17 @@ RgCellCb      *cell;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgCFGFreeSpsUeLst
+static Void rgCFGFreeSpsUeLst
 (
 RgCellCb      *cell
 )
 #else
-PRIVATE Void rgCFGFreeSpsUeLst(cell)
+static Void rgCFGFreeSpsUeLst(cell)
 RgCellCb      *cell;
 #endif
 {
    RgUeCb     *ue;
 
-   TRC2(rgCFGFreeSpsUeLst);
-
    /* Free Ues in the list */
    while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP)))
    {
@@ -2412,13 +2341,13 @@ RgCellCb      *cell;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacCellRegReq
+S16 RgSchMacCellRegReq
 (
 Pst*                pst,
 RgInfCellReg*       regReq 
 )
 #else
-PUBLIC S16 RgSchMacCellRegReq(pst, regReq)
+S16 RgSchMacCellRegReq(pst, regReq)
 Pst*                pst;
 RgInfCellReg*       regReq;
 #endif
@@ -2426,43 +2355,41 @@ RgInfCellReg*       regReq;
    Inst      inst;
    RgCellCb *cell = NULLP;
 
-   TRC3(RgSchMacCellRegReq)
-
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
    cell = rgCb[inst].cell;
 
    if(NULLP == regReq)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
       
    if((cell  == NULLP) || (cell->cellId != regReq->cellId))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if(regReq->maxDlHqProcPerUe > RG_MAX_DL_HARQ_NUM) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Initialize */
    cell->schInstMap.cellSapId = regReq->cellSapId;
    cell->schInstMap.schInst   = pst->srcInst;
    cell->maxDlHqProcPerUe = regReq->maxDlHqProcPerUe;
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of RgSchMacCellRegReq */
 
 /*Added Ue for Onging L2 Meas*/
 #ifdef LTE_L2_MEAS
 /*LTE_L2_MEAS_PHASE2*/
-PUBLIC S16 rgAddToL2MeasPerQci(RgCellCb  *cell,U8 qci)
+S16 rgAddToL2MeasPerQci(RgCellCb  *cell,uint8_t qci)
 {
- S16      ret = ROK;	
- CmLList   *lnk;
- RgL2MeasCb  *measCb;
- U16          idx;
+ S16        ret = ROK;	
+ CmLList    *lnk;
+ RgL2MeasCb *measCb;
+ uint16_t   idx;
  
  lnk = cell->l2mList.first;
   while(lnk != NULLP )
@@ -2488,7 +2415,7 @@ PUBLIC S16 rgAddToL2MeasPerQci(RgCellCb  *cell,U8 qci)
  
 		 
        
- RETVALUE(ret);
+ return (ret);
 }