U8, U16, U32 data type changes

[o-du/l2.git] / src / 5gnrmac / rg_pom_scell.c

diff --git a/src/5gnrmac/rg_pom_scell.c b/src/5gnrmac/rg_pom_scell.c
index c8245f2..5d89ba8 100755 (executable)
--- a/src/5gnrmac/rg_pom_scell.c
+++ b/src/5gnrmac/rg_pom_scell.c
@@ -33,16 +33,7 @@
 */
 
 /* 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"
 #include "crg.h"
 #include "rgu.h"
@@ -54,15 +45,6 @@
 #include "rg_err.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "crg.x"
 #include "rgu.x"
@@ -103,13 +85,13 @@ PRIVATE S16 rgPomUeSCellDedLcCfg ARGS((RgCellCb                   *cell,
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellLchModReq
+S16 RgPrgPMacSMacUeSCellLchModReq
 (
 Pst                      *pst,    
 RgPrgUeSCellLchModInfo   *lchCfgCb
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeSCellLchModReq(pst, lchCfgCb)
+S16 RgPrgPMacSMacUeSCellLchModReq(pst, lchCfgCb)
 Pst                      *pst;    
 RgPrgUeSCellLchModInfo   *lchCfgCb;
 #endif
@@ -122,8 +104,6 @@ RgPrgUeSCellLchModInfo   *lchCfgCb;
    RgUeCb           *ue;
    RgUlLcCb         *ulLc;
 
-   TRC2(RgPrgPMacSMacUeSCellLchModReq);
-   
    RGDBGPRM(inst,(rgPBuf(inst),
             "APPLYING CRG UE SCELL CONFIG: cellId %d ueId %d lcId %d lcgId %d\n",
          lchCfgCb->cellId, lchCfgCb->crnti,lchCfgCb->lcId,lchCfgCb->ulLchRecfg.lcgId));
@@ -159,7 +139,7 @@ RgPrgUeSCellLchModInfo   *lchCfgCb;
 
   /* Send positive confirmation to primary cell*/
   RgPrgSMacPMacCfg(&cfmPst, &cfgCfm);
-  RETVALUE(ROK);
+  return ROK;
 }  /* RgPrgPMacSMacUeSCellLchModReq */
 
 
@@ -190,28 +170,26 @@ RgPrgUeSCellLchModInfo   *lchCfgCb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomSndUeSCellLchDelToSmac
+S16 rgPomSndUeSCellLchDelToSmac
 (
 Inst            inst,
 CrgDel          *lcDel,
 Bool            *isCfmRqrd
 )
 #else
-PUBLIC S16 rgPomSndUeSCellLchDelToSmac(inst,lcDel,isCfmRqrd)
+S16 rgPomSndUeSCellLchDelToSmac(inst,lcDel,isCfmRqrd)
 Inst            inst;
 CrgDel          *lcDel;
 Bool            *isCfmRqrd;
 #endif
 {
-   U8                         idx = 0;
+   uint8_t                    idx = 0;
    Inst                       dstMacInst;
    Pst                        dstInstPst;
    RgPrgUeSCellLchDelInfo     delLcCb;
    RgCellCb                   *cell;
    RgUeCb                     *ue;
 
-   TRC2(rgPomSndUeSCellLchDelToSmac);
-  
   /* Fetch the Active cell */
    if(((cell = rgCb[inst].cell) == NULLP) ||
        (cell->cellId != lcDel->u.lchDel.cellId))
@@ -219,7 +197,7 @@ Bool            *isCfmRqrd;
       RGDBGERRNEW(inst,(rgPBuf(inst), 
                        "[%d]Active Cell does not exist %d\n",
                                   lcDel->u.lchDel.crnti, lcDel->u.lchDel.cellId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGDBGPRM(inst,(rgPBuf(inst), 
@@ -230,7 +208,7 @@ Bool            *isCfmRqrd;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), 
                "[%d]Ue does not exist\n", lcDel->u.lchDel.crnti));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++)
    {
@@ -249,7 +227,7 @@ Bool            *isCfmRqrd;
          *isCfmRqrd = FALSE;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -282,7 +260,7 @@ Bool            *isCfmRqrd;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomSndUeSCellLchModToSmac
+S16 rgPomSndUeSCellLchModToSmac
 (
 Inst           inst,
 RgCellCb       *cell,
@@ -291,7 +269,7 @@ CrgLchRecfg    *lchRecfg,
 Bool           *isCfmRqrd
 )
 #else
-PUBLIC S16 rgPomSndUeSCellLchModToSmac(inst, cell, ue, lchRecfg, isCfmRqrd)
+S16 rgPomSndUeSCellLchModToSmac(inst, cell, ue, lchRecfg, isCfmRqrd)
 Inst           inst;
 RgCellCb       *cell;
 RgUeCb         *ue;
@@ -299,13 +277,11 @@ CrgLchRecfg    *lchRecfg;
 Bool           *isCfmRqrd;
 #endif
 {
-   U8                        idx = 0;
+   uint8_t                   idx = 0;
    Inst                      dstMacInst;
    RgPrgUeSCellLchModInfo    lchCfgCb; 
    Pst                       dstInstPst;
 
-   TRC2(rgPomSndUeSCellLchModToSmac);
-  
    for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++)
    {
       if(TRUE == ue->sCelInfo[idx].isSCellAdded)
@@ -323,7 +299,7 @@ Bool           *isCfmRqrd;
          *isCfmRqrd = FALSE;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -351,7 +327,7 @@ Bool           *isCfmRqrd;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomSndUeSCellLchAddToSmac
+S16 rgPomSndUeSCellLchAddToSmac
 (
 Inst           inst,
 RgCellCb       *cell,
@@ -360,7 +336,7 @@ CrgLchCfg      *lchCfg,
 Bool           *isCfmRqrd
 )
 #else
-PUBLIC S16 rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lchCfg, isCfmRqrd)
+S16 rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lchCfg, isCfmRqrd)
 Inst           inst;
 RgCellCb       *cell;
 RgUeCb         *ue;
@@ -368,13 +344,11 @@ CrgLchCfg      *lchCfg;
 Bool           *isCfmRqrd;
 #endif
 {
-   U8                        idx = 0;
+   uint8_t                   idx = 0;
    Inst                      dstMacInst;
    RgPrgUeSCellLchAddInfo    lchCfgCb; 
    Pst                       dstInstPst;
 
-   TRC2(rgPomSndUeSCellLchAddToSmac);
-  
    for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++)
    {
       if(TRUE == ue->sCelInfo[idx].isSCellAdded)
@@ -399,7 +373,7 @@ Bool           *isCfmRqrd;
          *isCfmRqrd = FALSE;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgPomSndUeSCellLchAddToSmac */
 
 /**
@@ -421,13 +395,13 @@ Bool           *isCfmRqrd;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellLchDelReq
+S16 RgPrgPMacSMacUeSCellLchDelReq
 (
 Pst                       *pst,    
 RgPrgUeSCellLchDelInfo    *delLcCb
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
+S16 RgPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
 Pst                       *pst;    
 RgPrgUeSCellLchDelInfo    *delLcCb;
 #endif
@@ -441,8 +415,6 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
    RgUlLcCb         *ulLc;
    RgDlLcCb         *dlLc;
 
-   TRC2(RgPrgPMacSMacUeSCellLchDelReq);
-   
    RGDBGPRM(inst,(rgPBuf(inst),
             "APPLYING CRG UE SCELL CONFIG: cellId %d ueId %d\n",
          lchCfgCb->cellId, lchCfgCb->crnti));
@@ -478,7 +450,7 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
 
   /* Send positive confirmation to primary cell*/
   RgPrgSMacPMacCfg(&cfmPst, &cfgCfm);
-  RETVALUE(ROK);
+  return ROK;
 }  /* RgPrgPMacSMacUeSCellLchDelReq */
 
 
@@ -502,13 +474,13 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellLchAddReq
+S16 RgPrgPMacSMacUeSCellLchAddReq
 (
 Pst                      *pst,    
 RgPrgUeSCellLchAddInfo   *lchCfgCb
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeSCellLchAddReq(pst, lchCfgCb)
+S16 RgPrgPMacSMacUeSCellLchAddReq(pst, lchCfgCb)
 Pst                      *pst;    
 RgPrgUeSCellLchAddInfo   *lchCfgCb;
 #endif
@@ -520,8 +492,6 @@ RgPrgUeSCellLchAddInfo   *lchCfgCb;
    Pst               cfmPst;    
    RgUeCb            *ue;
 
-   TRC2(RgPrgPMacSMacUeSCellLchAddReq);
-   
    RGDBGPRM(inst,(rgPBuf(inst),
             "APPLYING UE SCELL CONFIG AT SMAC : cellId %d ueId %d\n",
          lchCfgCb->cellId, lchCfgCb->crnti));
@@ -557,7 +527,7 @@ RgPrgUeSCellLchAddInfo   *lchCfgCb;
 
   /* Send positive confirmation to primary cell*/
   RgPrgSMacPMacCfg(&cfmPst, &cfgCfm);
-  RETVALUE(ROK);
+  return ROK;
 }  /* RgPrgPMacSMacUeSCellLchAddReq */
 /**
  * @brief Validates the logical channel configuration request from PMAC to SMAC.
@@ -583,7 +553,7 @@ RgPrgUeSCellLchAddInfo   *lchCfgCb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomVldtAddLch
+S16 rgPomVldtAddLch
 (
 Inst                    inst, 
 RgPrgUeSCellLchAddInfo  *lcCfg,
@@ -591,7 +561,7 @@ RgCellCb                **cell,
 RgUeCb                  **ue
 )
 #else
-PUBLIC S16 rgPomVldtAddLch(inst,lcCfg, cell, ue)
+S16 rgPomVldtAddLch(inst,lcCfg, cell, ue)
 Inst                    inst;
 RgPrgUeSCellLchAddInfo  *lcCfg;
 RgCellCb                **cell;
@@ -599,7 +569,6 @@ RgUeCb                  **ue;
 #endif
 {
 
-   TRC2(rgPomVldtAddLch);
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC CONFIG: cellId %d ueId %d lcId %d\
             cell %p ue %p\n", lcCfg->cellId, lcCfg->crnti, lcCfg->lcId,
             (void*)*cell, (void*)*ue));
@@ -611,14 +580,14 @@ RgUeCb                  **ue;
       {
          RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Validation for dedicated LC failed\n",
                   lcCfg->crnti));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Invalid logical channel type %d\n",\
                lcCfg->crnti, lcCfg->lcType));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifdef LTE_L2_MEAS
    if ( lcCfg->qci <  RG_QCI_MIN ||
@@ -627,14 +596,14 @@ RgUeCb                  **ue;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Invalid qci %x\n",
                lcCfg->crnti, lcCfg->qci));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*validate qci */
 #endif /*LTE_L2_MEAS */
 
    RGDBGINFONEW(inst,(rgPBuf(inst),"[%d]UEID CRG LCconfig validation done:cellId:%d lcId:%d\n",
             lcCfg->crnti, lcCfg->cellId, lcCfg->lcId));
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
  * @brief Handler for the logical channel configuration request from
@@ -658,7 +627,7 @@ RgUeCb                  **ue;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomUeSCellLcAdd
+S16 rgPomUeSCellLcAdd
 (
 Inst                     inst,
 RgCellCb                 *cell,
@@ -666,7 +635,7 @@ RgUeCb                   *ue,
 RgPrgUeSCellLchAddInfo   *lcCfg
 )
 #else
-PUBLIC S16 rgPomUeSCellLcAdd(inst,cell, ue, lcCfg)
+S16 rgPomUeSCellLcAdd(inst,cell, ue, lcCfg)
 Inst                     inst;
 RgCellCb                 *cell;
 RgUeCb                   *ue;
@@ -674,7 +643,6 @@ RgPrgUeSCellLchAddInfo   *lcCfg;
 #endif
 {
 
-   TRC2(rgPomUeSCellLcAdd);
    RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC CONFIG: cellId %d ueId %d\
             lcId %d dir %d cell %p ue %p\n", lcCfg->cellId, lcCfg->crnti,
             lcCfg->lcId, lcCfg->dir, (void*)cell, (void*)ue));
@@ -683,12 +651,12 @@ RgPrgUeSCellLchAddInfo   *lcCfg;
       {
          RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated logical channel configuration"
                   "failed in SCell%d\n", lcCfg->crnti, lcCfg->lcId));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
    RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]SCell LC config done: cellId %d lcId %d\n",
           lcCfg->crnti, lcCfg->cellId, lcCfg->lcId));
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgPomUeSCellLcAdd */
 
 /***********************************************************
@@ -728,7 +696,6 @@ RgCellCb                   **cell;
 RgUeCb                     **ue;
 #endif
 {
-   TRC2(rgPomVldtSCellDedLchCfg);
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATING CRG DEDICATED LC CONFIG \n"));
 
 
@@ -738,7 +705,7 @@ RgUeCb                     **ue;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist: Cell %d\n",
                lcCfg->crnti, lcCfg->cellId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Fetch the Ue */
@@ -746,7 +713,7 @@ RgUeCb                     **ue;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE  does not exist for dedicated logical"
                "channel %d\n", lcCfg->crnti, lcCfg->lcId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Validate logical channel Id */
@@ -755,7 +722,7 @@ RgUeCb                     **ue;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid logical channel Id %d\n",
                 lcCfg->crnti, lcCfg->lcId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }*/
    /* Validate downlink info */
    if (lcCfg->dir & PRG_DIR_TX)
@@ -764,7 +731,7 @@ RgUeCb                     **ue;
       {
          RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Dedicated DL LC %d already configured\n",
                    lcCfg->crnti, lcCfg->lcId));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 /*      dirVld = TRUE;*/
    }
@@ -776,13 +743,13 @@ RgUeCb                     **ue;
       {
          RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Invalid lcgId for uplink logical"
                   "channel %d\n", lcCfg->crnti, lcCfg->ulInfo.lcgId));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if (rgDBMGetUlDedLcCb((*ue), lcCfg->lcId) != NULLP)
       {
          RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Dedicated UL LC %d already configured\n",
                    lcCfg->crnti, lcCfg->lcId));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 /*      dirVld = TRUE;*/
    }
@@ -791,12 +758,12 @@ RgUeCb                     **ue;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid Direction %d \n",
                lcCfg->crnti, lcCfg->dir));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 */
    RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]Dedicated logical channel %d validated"
             "for cell %d\n", lcCfg->crnti, lcCfg->lcId, lcCfg->cellId));
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgPomVldtSCellDedLchCfg */
 /***********************************************************
  *
@@ -833,7 +800,6 @@ RgPrgUeSCellLchAddInfo     *lcCfg;
 #endif
 {
    //Inst     inst = cell->macInst - RG_INST_START;
-   TRC2(rgPomUeSCellDedLcCfg);
    //RGDBGPRM(inst,(rgPBuf(inst), "APPLYING DEDICATED LC CONFIG\n"));
 
    /* Uplink/Bi-directional logical channel */
@@ -857,7 +823,7 @@ RgPrgUeSCellLchAddInfo     *lcCfg;
       rgDBMInsDlDedLcCb(ue, lcCfg->lcId);
    }
    RGDBGINFO(inst,(rgPBuf(inst), "Dedicated LC config done\n"));
-   RETVALUE(ROK);
+   return ROK;
 
   }  /* rgPomUeSCellDedLcCfg */
 /**
@@ -878,7 +844,7 @@ RgPrgUeSCellLchAddInfo     *lcCfg;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomVltdModLch
+S16 rgPomVltdModLch
 (
  Inst                     inst,
  RgPrgUeSCellLchModInfo   *lchCfgCb,
@@ -887,7 +853,7 @@ PUBLIC S16 rgPomVltdModLch
  RgUlLcCb                 **ulLc
 )
 #else
-PUBLIC S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
+S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
  Inst                     inst;
  RgPrgUeSCellLchModInfo   *lchCfgCb;
  RgCellCb                 **cell;
@@ -895,7 +861,6 @@ PUBLIC S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
  RgUlLcCb                 **ulLc;
 #endif
 {
-   TRC2(rgPomVltdModLch);
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
             lcId %d cell %p ue %p ulLc %p\n",lchCfgCb->cellId,
             lchCfgCb->crnti,lchCfgCb->lcId, (void*)*cell, (void*)*ue,
@@ -905,28 +870,28 @@ PUBLIC S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
          || ((*cell)->cellId != lchCfgCb->cellId))
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",lchCfgCb->crnti, lchCfgCb->cellId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Fetch the Ue for dedicated channels */
    if ((*ue = rgDBMGetUeCb(*cell, lchCfgCb->crnti)) == NULLP)
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist for dedicated logical channel\n",
                lchCfgCb->crnti));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if ((*ulLc = rgDBMGetUlDedLcCb((*ue), lchCfgCb->lcId)) == NULLP)
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated UL LC does not exist %d\n",
                lchCfgCb->crnti, lchCfgCb->lcId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
   /* if (lchCfgCb->ulLchRecfg.lcgId > (RG_MAX_LCG_PER_UE - 1))
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid lcgId for uplink logical channel: lcg %d"
                "lc %d\n",lchCfgCb->crnti, lchCfgCb->ulLchRecfg.lcgId, lchCfgCb->lcId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }*/
-   RETVALUE(ROK);
+   return ROK;
 } /*rgPomVltdModLch*/
 /**
  * @brief Handler for the logical channel re-configuration request from
@@ -950,7 +915,7 @@ PUBLIC S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomUeSCellLcMod
+S16 rgPomUeSCellLcMod
 (
 Inst                    inst,
 RgUeCb                  *ue,
@@ -958,14 +923,13 @@ RgUlLcCb                *ulLc,
 RgPrgUeSCellLchModInfo  *lchCfgCb
 )
 #else
-PUBLIC S16 rgPomUeSCellLcMod(inst,cell, ue, ulLc, lchCfgCb)
+S16 rgPomUeSCellLcMod(inst,cell, ue, ulLc, lchCfgCb)
 Inst                    inst;
 RgUeCb                  *ue;
 RgUlLcCb                *ulLc;
 RgPrgUeSCellLchModInfo  *lchCfgCb;
 #endif
 {
-   TRC2(rgPomUeSCellLcMod);
    RGDBGPRM(inst,(rgPBuf(inst), "APPLYING SMAC LC RECONFIG: cellId %d ueId %d\
             lcId %d  \n",
             lchCfgCb->cellId, lchCfgCb->crnti, lchCfgCb->lcId));
@@ -977,7 +941,7 @@ RgPrgUeSCellLchModInfo  *lchCfgCb;
 
    RGDBGINFO(inst,(rgPBuf(inst), "LC %d of Ue %d of cell %d Reconfigured\n", 
             lchCfgCb->lcId, ue->ueId, cell->cellId));
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgPomUeSCellLcMod */
 /**
  * @brief Function to validate SCellLchDel.
@@ -997,7 +961,7 @@ RgPrgUeSCellLchModInfo  *lchCfgCb;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomVltdDelLch
+S16 rgPomVltdDelLch
 (
  Inst                      inst,
  RgPrgUeSCellLchDelInfo    *delLcCb,
@@ -1007,7 +971,7 @@ PUBLIC S16 rgPomVltdDelLch
  RgDlLcCb                  **dlLc
 )
 #else
-PUBLIC S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
+S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
  Inst                      inst;
  RgPrgUeSCellLchDelInfo    *delLcCb;
  RgCellCb                  **cell;
@@ -1016,7 +980,6 @@ PUBLIC S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
  RgDlLcCb                  **dlLc;
 #endif
 {
-   TRC2(rgPomVltdDelLch);
    RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
             lcId %d cell %p ue %p ulLc %p\n",delLcCb->cellId,
             delLcCb->crnti,delLcCb->lcId, (void*)*cell, (void*)*ue,
@@ -1026,28 +989,28 @@ PUBLIC S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
          || ((*cell)->cellId != delLcCb->cellId))
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",delLcCb->crnti, delLcCb->cellId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Fetch the Ue for dedicated channels */
    if ((*ue = rgDBMGetUeCb(*cell, delLcCb->crnti)) == NULLP)
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist for dedicated logical channel\n",
                delLcCb->crnti));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if ((*ulLc = rgDBMGetUlDedLcCb((*ue), delLcCb->lcId)) == NULLP)
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated UL LC does not exist %d\n",
                delLcCb->crnti, delLcCb->lcId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if ((*dlLc = rgDBMGetDlDedLcCb((*ue), delLcCb->lcId)) == NULLP)
    {
          RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]DL LC %d does not exist\n",
                delLcCb->crnti, delLcCb->lcId));
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
-   RETVALUE(ROK);
+   return ROK;
 } /*rgPomVltdDelLch*/
 /**
  * @brief Handler for the logical channel delete request from
@@ -1071,7 +1034,7 @@ PUBLIC S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgPomUeSCellLcDel
+S16 rgPomUeSCellLcDel
 (
 Inst                      inst,
 RgPrgUeSCellLchDelInfo    *delLcCb,
@@ -1080,7 +1043,7 @@ RgUlLcCb                  *ulLc,
 RgDlLcCb                  *dlLc
 )
 #else
-PUBLIC S16 rgPomUeSCellLcDel(inst,delLcCb,ue,ulLc,dlLc)
+S16 rgPomUeSCellLcDel(inst,delLcCb,ue,ulLc,dlLc)
 Inst                      inst;
 RgPrgUeSCellLchDelInfo    *delLcCb;
 RgUeCb                    *ue;
@@ -1089,7 +1052,6 @@ RgDlLcCb                  *dlLc;
 #endif
 {
 
-   TRC2(rgPomUeSCellLcDel);
    RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC DELETE: cellId %d ueId %d\
             lcId %d dir %d\n", delLcCb->cellId,
             delLcCb->crnti, delLcCb->lcId,
@@ -1114,12 +1076,12 @@ RgDlLcCb                  *dlLc;
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid direction %d for LC Delete\n",
             delLcCb->crnti, delLcCb->dir));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }*/
    RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]UE's Logical channel %d deleted from cell %d\n",
          delLcCb->crnti, delLcCb->lcId,
          delLcCb->cellId));
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgPomUeSCellLcDel */
 #endif /*LTE_ADV */
 /**********************************************************************