X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_sc1.c;h=320c145acd0e80706d6b8e08a4617778acd4207d;hb=2193e4cf01012809495be026097e8d7eacb9f0ac;hp=d2e56d89f9ee868dedbfb4610304ee5f4da8de87;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c
index d2e56d89f..320c145ac 100755
--- a/src/5gnrsch/rg_sch_sc1.c
+++ b/src/5gnrsch/rg_sch_sc1.c
@@ -37,16 +37,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=173;
 
 /* 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 "cm5.h"           /* common timers */
-#include "cm_hash.h"       /* common hash list */
-#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 "rgr.h"
 #include "rgm.h"
@@ -61,15 +52,6 @@ static int RLOG_FILE_ID=173;
 #include "rl_common.h"
 
 /* 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 "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -188,10 +170,10 @@ RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *hqP
 ));
-PUBLIC Void rgSCHSc1DlScanUpdPdbPrio ARGS((
+Void rgSCHSc1DlScanUpdPdbPrio ARGS((
 RgSchCellCb *cell
 ));
-PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo ARGS(( 
+S16 rgSCHSc1DlFillFlowCntrlInfo ARGS(( 
 RgSchCellCb    *cell,
 RgInfSfAlloc   *sfAlloc
 ));
@@ -227,13 +209,13 @@ PRIVATE Void rgSCHSc1DlPstSchd ARGS ((
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlUeReset 
+Void rgSCHSc1DlUeReset 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlUeReset(cell, ue)
+Void rgSCHSc1DlUeReset(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
@@ -262,13 +244,13 @@ RgSchUeCb      *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlActvtUe 
+Void rgSCHSc1DlActvtUe 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlActvtUe(cell, ue)
+Void rgSCHSc1DlActvtUe(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
@@ -329,13 +311,13 @@ RgSchUeCb      *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlUeRefresh
+Void rgSCHSc1DlUeRefresh
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlUeRefresh(cell, ue)
+Void rgSCHSc1DlUeRefresh(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
@@ -533,13 +515,13 @@ RgSchDlHqProcCb            *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlProcAddToCellRetx
+Void rgSCHSc1DlProcAddToCellRetx
 (
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *hqP
 )
 #else
-PUBLIC Void rgSCHSc1DlProcAddToCellRetx(cell, hqP)
+Void rgSCHSc1DlProcAddToCellRetx(cell, hqP)
 RgSchCellCb                *cell;
 RgSchDlHqProcCb            *hqP;
 #endif
@@ -797,7 +779,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
          rgSCHCmnHdFddChkDlAllow ( cell, ue, &dlAllowed);
          if (dlAllowed == FALSE)
          {
-            RETVALUE(ROK);
+            return ROK;
          }
       }
 #endif
@@ -811,7 +793,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    RGSCH_INCR_SUB_FRAME(schdTime, RG_SCH_CMN_DL_DELTA);
    if (RG_SCH_CMN_IS_UE_SPS_SCHDLD(ue, cell, schdTime))
    {
-      RETVALUE(ROK);
+      return ROK;
    }
 #endif
    if (RG_SCH_CMN_IS_UE_SCHDLD(ue, cell))
@@ -823,7 +805,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"CRNTI:%d rgSCHSc1DlDedSvcAlloc():"
             "Ue retransmitting",ue->ueId);
-         RETVALUE(ROK);
+         return ROK;
       }
       /* UE is scheduled for either other services or TA */
       sc1HqDl = RG_GET_SC1_HQP_DL(proc);
@@ -839,7 +821,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "CRNTI:%d rgSCHSc1DlDedSvcAlloc():"
             " No HARQ Proc available", ue->ueId);
-         RETVALUE(ROK);
+         return ROK;
       }
       sc1HqDl = RG_GET_SC1_HQP_DL(proc);
       cmnHqDl = RG_SCH_CMN_GET_DL_HQP(proc);
@@ -872,7 +854,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
          /* ccpu00126519: proc should be set to NULLP in UE's DL scratch pad info as well. */
          ueDl->proc = NULLP;
       }
-      RETVALUE(ret);
+      return (ret);
    }
    svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell);
    svcSc1->hdrEstimate = rlcHdrEstmt;
@@ -883,7 +865,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc);
    /* 3.1 MIMO moving this call to cmn scheduler */
    /*rgSCHCmnDlRbInfoAddUeTx(allocInfo, ue); */
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -1055,7 +1037,7 @@ PRIVATE Void rgSCHSc1DlPreSchd
  RgSchCellCb   *cell
 )
 #else
-PUBLIC Void rgSCHSc1DlPreSchd(cell)
+Void rgSCHSc1DlPreSchd(cell)
  RgSchCellCb   *cell;
 #endif
 {
@@ -1082,7 +1064,7 @@ PRIVATE Void rgSCHSc1DlPstSchd
  Inst       schInst
 )
 #else
-PUBLIC Void rgSCHSc1DlPstSchd(schInst)
+Void rgSCHSc1DlPstSchd(schInst)
  Inst       schInst
 #endif
 {
@@ -1554,14 +1536,14 @@ RgrDlLchCfg             *cfg;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlLcRmv
+Void rgSCHSc1DlLcRmv
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSc1DlLcRmv(cell, ue, svc)
+Void rgSCHSc1DlLcRmv(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
@@ -1859,14 +1841,14 @@ RgSchDlLcCb                *svc;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlLcBoUpd
+Void rgSCHSc1DlLcBoUpd
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSc1DlLcBoUpd(cell, ue, svc)
+Void rgSCHSc1DlLcBoUpd(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
@@ -2053,14 +2035,14 @@ RgSchDlLcCb                *svc;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrDlCellCfg
+S16 rgSCHSc1RgrDlCellCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg,
 RgSchErrInfo  *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err)
+S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
 RgSchErrInfo  *err;
@@ -2078,13 +2060,13 @@ RgSchErrInfo  *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
          "Memory allocation FAILED");
       err->errCause = RGSCHERR_SCH_SC1_DL_CFG;
-      RETVALUE(ret);
+      return (ret);
    }
 
    cellDl = RG_GET_SC1_CELL_DL(cell);
    /* Now perform downlink Queues related initializations  */
    rgSCHSc1DlInitQueues(cellDl);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrDlCellCfg */
 
 /***********************************************************
@@ -2136,12 +2118,12 @@ RgSchSc1DlCell *cellDl;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlCellDel
+Void rgSCHSc1DlCellDel
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHSc1DlCellDel(cell)
+Void rgSCHSc1DlCellDel(cell)
 RgSchCellCb  *cell;
 #endif
 {
@@ -2182,7 +2164,7 @@ RgSchCellCb  *cell;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrDlUeCfg
+S16 rgSCHSc1RgrDlUeCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2190,7 +2172,7 @@ RgrUeCfg     *ueCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err)
+S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeCfg     *ueCfg;
@@ -2209,7 +2191,7 @@ RgSchErrInfo *err;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"
                "CRNTI:%d",ue->ueId);
       err->errCause = RGSCHERR_SCH_SC1_DL_CFG;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ueDl = (RgSchSc1DlUe *)ueSchCmn->dl.schSpfc;
    if (ue->dl.ambrCfgd)
@@ -2225,7 +2207,7 @@ RgSchErrInfo *err;
    cmLListInit(&ueDl->ambrLst);
    cmLListInit(&ueDl->schdSvcs);
    cmLListInit(&ueDl->retxHqProcs);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrDlUeCfg */
 
 
@@ -2246,13 +2228,13 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1DlUeHqEntInit
+S16 rgSCHSc1DlUeHqEntInit
 (
  RgSchCellCb      *cell,
  RgSchDlHqEnt     *hqEnt
  )
 #else
-PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
+S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
    RgSchCellCb      *cell;
    RgSchDlHqEnt     *hqEnt
 #endif
@@ -2269,7 +2251,7 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
                "Memory allocation FAILED CRNTI:%d",hqEnt->ue->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    hqSpcSch = (RgSchSc1DlHqProc *)(hqEnt->sch);
    for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++)
@@ -2278,7 +2260,7 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
       ((RgSchCmnDlHqProc *)((hqP)->sch))->schSpfc = \
                                                     hqSpcSch++;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -2296,13 +2278,13 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt)
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1DlUeHqEntDeInit 
+S16 rgSCHSc1DlUeHqEntDeInit 
 (
 RgSchCellCb      *cell,
 RgSchDlHqEnt     *hqE
 )
 #else
-PUBLIC S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE)
+S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE)
 RgSchCellCb      *cell;
 RgSchDlHqEnt     *hqE;
 #endif
@@ -2317,9 +2299,9 @@ RgSchDlHqEnt     *hqE;
    }
    else
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
  * @brief UE reconfiguration for scheduler
@@ -2340,7 +2322,7 @@ RgSchDlHqEnt     *hqE;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrDlUeRecfg
+S16 rgSCHSc1RgrDlUeRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2348,7 +2330,7 @@ RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err)
+S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
@@ -2416,7 +2398,7 @@ RgSchErrInfo *err;
          RgSchMacRlsHq (&pst, rlsHqBufs);
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrDlUeRecfg */
 
 /**
@@ -2618,12 +2600,12 @@ RgSchUeCb    *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlScanUpdPdbPrio
+Void rgSCHSc1DlScanUpdPdbPrio
 (
 RgSchCellCb *cell
 )
 #else
-PUBLIC Void rgSCHSc1DlScanUpdPdbPrio (cell)
+Void rgSCHSc1DlScanUpdPdbPrio (cell)
 RgSchCellCb *cell;
 #endif
 {
@@ -2653,19 +2635,19 @@ RgSchCellCb *cell;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo
+S16 rgSCHSc1DlFillFlowCntrlInfo
 (
 RgSchCellCb    *cell,
 RgInfSfAlloc   *sfAlloc
 )
 #else
-PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc)
+S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc)
 RgSchCellCb    *cell;
 RgInfSfAlloc   *sfAlloc;
 #endif
 {
   TRC2(rgSCHSc1DlFillFlowCntrlInfo);
-  RETVALUE(ROK);
+  return ROK;
 }
 /**
  * @brief UE deletion for scheduler
@@ -2682,13 +2664,13 @@ RgInfSfAlloc   *sfAlloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlUeDel
+Void rgSCHSc1DlUeDel
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1DlUeDel(cell, ue)
+Void rgSCHSc1DlUeDel(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -2745,7 +2727,7 @@ RgSchUeCb    *ue;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcCfg
+S16 rgSCHSc1RgrLcCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2754,7 +2736,7 @@ RgrLchCfg *lcCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err)
+S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchDlLcCb  *dlLc;
@@ -2773,11 +2755,11 @@ RgSchErrInfo *err;
       RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHSc1CrgLcCfg():"
       "SCH struct alloc failed CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId);
       err->errCause = RGSCHERR_SCH_SC1_DL_CFG;
-      RETVALUE(ret);
+      return (ret);
    }
 
    rgSCHSc1DlSvcAdd(cell, ue, dlLc, &lcCfg->dlInfo);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrLcCfg */
 
 
@@ -2804,7 +2786,7 @@ RgSchErrInfo *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcRecfg
+S16 rgSCHSc1RgrLcRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -2813,7 +2795,7 @@ RgrLchRecfg  *lcRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err)
+S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchDlLcCb  *dlLc;
@@ -2827,7 +2809,7 @@ RgSchErrInfo *err;
 
    rgSCHSc1DlSvcMod(cell,ue,dlLc, lcRecfg);
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrLcRecfg */
 
 
@@ -2860,7 +2842,7 @@ RgSchErrInfo            *err;
 #endif
 {
    TRC2(rgSCHSc1DlUeReset);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2989,13 +2971,13 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlHndlInActUes
+Void rgSCHSc1DlHndlInActUes
 (
 RgSchCellCb           *cell,
 CmLListCp             *inactvLst
 )
 #else
-PUBLIC Void rgSCHSc1DlHndlInActUes(cell, inactvLst)
+Void rgSCHSc1DlHndlInActUes(cell, inactvLst)
 RgSchCellCb           *cell;
 CmLListCp             *inactvLst;
 #endif
@@ -3035,12 +3017,12 @@ CmLListCp             *inactvLst;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlInit
+Void rgSCHSc1DlInit
 (
 RgDlSchdApis *rgSchDlApis
 )
 #else
-PUBLIC Void rgSCHSc1DlInit(rgSchDlApis)
+Void rgSCHSc1DlInit(rgSchDlApis)
 RgDlSchdApis *rgSchDlApis;
 #endif
 {
@@ -3808,13 +3790,13 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlAllocFnlz
+Void rgSCHSc1DlAllocFnlz
 (
 RgSchCellCb           *cell,
 RgSchCmnDlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHSc1DlAllocFnlz(cell, allocInfo)
+Void rgSCHSc1DlAllocFnlz(cell, allocInfo)
 RgSchCellCb           *cell;
 RgSchCmnDlRbAllocInfo *allocInfo;
 #endif
@@ -3850,7 +3832,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlCqiInd
+Void rgSCHSc1DlCqiInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
@@ -3858,7 +3840,7 @@ Bool               isPucchInfo,
 Void               *dlCqi
 )
 #else
-PUBLIC Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi)
+Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 Bool               isPucchInfo;
@@ -4012,7 +3994,7 @@ RgSchDlLcCb                *svc;
  *  @return  S16
  *      -# ROK
  **/
-PUBLIC S16 rgSCHSc1UlLchCfg 
+S16 rgSCHSc1UlLchCfg 
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -4020,7 +4002,7 @@ RgrLchCfg        *cfg,
 RgSchErrInfo     *err
 )
 {
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
  * @brief UE Lc Reconfig for RR 
@@ -4038,7 +4020,7 @@ RgSchErrInfo     *err
  *  @return  S16
  *      -# ROK
  **/
-PUBLIC S16 rgSCHSc1UlLchRecfg 
+S16 rgSCHSc1UlLchRecfg 
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -4046,7 +4028,7 @@ RgrLchRecfg      *recfg,
 RgSchErrInfo     *err
 )
 {
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
  * @brief LC deletion for PFS
@@ -4064,7 +4046,7 @@ RgSchErrInfo     *err
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1UlLchDel
+S16 rgSCHSc1UlLchDel
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -4072,14 +4054,14 @@ CmLteLcId        lcId,
 U8               lcgId
 )
 #else
-PUBLIC S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId)
+S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 CmLteLcId        lcId;
 U8               lcgId;
 #endif
 {
-  RETVALUE (ROK);
+  return  (ROK);
 }
 
 /**
@@ -4100,12 +4082,12 @@ U8               lcgId;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlInit
+Void rgSCHSc1UlInit
 (
 RgUlSchdApis *rgSchUlApis
 )
 #else
-PUBLIC Void rgSCHSc1UlInit(rgSchUlApis)
+Void rgSCHSc1UlInit(rgSchUlApis)
 RgUlSchdApis *rgSchUlApis;
 #endif
 {
@@ -4158,7 +4140,7 @@ RgUlSchdApis *rgSchUlApis;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlUeCfg
+S16 rgSCHSc1RgrUlUeCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4166,7 +4148,7 @@ RgrUeCfg     *ueCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err)
+S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeCfg     *ueCfg;
@@ -4183,10 +4165,10 @@ RgSchErrInfo *err;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
       "Memory allocation FAILED CRNTI:%d",ue->ueId);
       err->errCause = RGSCHERR_SCH_SC1_UL_CFG;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrUlUeCfg */
 
 /**
@@ -4208,7 +4190,7 @@ RgSchErrInfo *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlUeRecfg
+S16 rgSCHSc1RgrUlUeRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4216,7 +4198,7 @@ RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err)
+S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
@@ -4224,7 +4206,7 @@ RgSchErrInfo *err;
 #endif
 {
    TRC2(rgSCHSc1RgrUlUeRecfg);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrUeRecfg */
 
 /**
@@ -4242,13 +4224,13 @@ RgSchErrInfo *err;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlUeDel
+Void rgSCHSc1UlUeDel
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlUeDel(cell, ue)
+Void rgSCHSc1UlUeDel(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -4294,13 +4276,13 @@ RgSchUeCb    *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlUeReset 
+Void rgSCHSc1UlUeReset 
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlUeReset(cell, ue)
+Void rgSCHSc1UlUeReset(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -4345,14 +4327,14 @@ RgSchUeCb    *ue;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlCellCfg
+S16 rgSCHSc1RgrUlCellCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg,
 RgSchErrInfo  *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err)
+S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
 RgSchErrInfo  *err;
@@ -4369,14 +4351,14 @@ RgSchErrInfo  *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
       "Memory allocation FAILED");
       err->errCause = RGSCHERR_SCH_SC1_UL_CFG;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    cellUl = RG_GET_SC1_CELL_UL(cell);
    cmLListInit(&cellUl->contResLst);
    cmLListInit(&cellUl->ueTxLst[0]);
    cmLListInit(&cellUl->ueTxLst[1]);
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrUlCellCfg */
 
 
@@ -4395,21 +4377,21 @@ RgSchErrInfo  *err;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrUlCellRecfg
+S16 rgSCHSc1RgrUlCellRecfg
 (
 RgSchCellCb             *cell,
 RgrCellRecfg            *recfg,
 RgSchErrInfo            *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err)
+S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err)
 RgSchCellCb             *cell;
 RgrCellRecfg            *recfg;
 RgSchErrInfo            *err;
 #endif
 {
    TRC2(rgSCHSc1RgrUlCellRecfg);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -4426,12 +4408,12 @@ RgSchErrInfo            *err;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlCellDel
+Void rgSCHSc1UlCellDel
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHSc1UlCellDel(cell)
+Void rgSCHSc1UlCellDel(cell)
 RgSchCellCb  *cell;
 #endif
 {
@@ -4472,7 +4454,7 @@ RgSchCellCb  *cell;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcgCfg
+S16 rgSCHSc1RgrLcgCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4481,7 +4463,7 @@ RgrLcgCfg    *lcgCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err)
+S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -4490,7 +4472,7 @@ RgSchErrInfo *err;
 #endif
 {
    TRC2(rgSCHSc1RgrLcgCfg);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrLcgCfg */
 
 /**
@@ -4516,7 +4498,7 @@ RgSchErrInfo *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1RgrLcgRecfg
+S16 rgSCHSc1RgrLcgRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -4525,7 +4507,7 @@ RgrLcgRecfg  *reCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err)
+S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -4534,7 +4516,7 @@ RgSchErrInfo *err;
 #endif
 {
    TRC2(rgSCHSc1RgrLcgRecfg);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHSc1RgrLcgRecfg */
 
 /***********************************************************
@@ -4552,14 +4534,14 @@ RgSchErrInfo *err;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1LcgDel
+Void rgSCHSc1LcgDel
 (
 RgSchCellCb   *cell,
 RgSchUeCb     *ue,
 RgSchLcgCb    *lcg
 )
 #else
-PUBLIC Void rgSCHSc1LcgDel(cell, ue, lcg)
+Void rgSCHSc1LcgDel(cell, ue, lcg)
 RgSchCellCb   *cell;
 RgSchUeCb     *ue;
 RgSchLcgCb    *lcg;
@@ -4875,13 +4857,13 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlSched 
+Void rgSCHSc1UlSched 
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHSc1UlSched(cell, allocInfo)
+Void rgSCHSc1UlSched(cell, allocInfo)
 RgSchCellCb           *cell;
 RgSchCmnUlRbAllocInfo *allocInfo;
 #endif
@@ -5059,7 +5041,7 @@ RgSchUeCb           *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UpdBsrShort
+Void rgSCHSc1UpdBsrShort
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -5067,7 +5049,7 @@ RgSchLcgCb   *lcg,
 U8           bsr
 )
 #else
-PUBLIC Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr)
+Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -5096,7 +5078,7 @@ U8           bsr;
  *  @return  Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UpdBsrTrunc
+Void rgSCHSc1UpdBsrTrunc
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -5104,7 +5086,7 @@ RgSchLcgCb   *lcg,
 U8           bsr
 )
 #else
-PUBLIC Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr)
+Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -5132,14 +5114,14 @@ U8           bsr;
  *  @return  Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UpdBsrLong
+Void rgSCHSc1UpdBsrLong
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 U8           *bsArr
 )
 #else
-PUBLIC Void rgSCHSc1UpdBsrLong(cell, ue, bsArr)
+Void rgSCHSc1UpdBsrLong(cell, ue, bsArr)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 U8           *bsArr;
@@ -5166,13 +5148,13 @@ U8           *bsArr;
  *  @return Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1ContResUlGrant
+Void rgSCHSc1ContResUlGrant
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1ContResUlGrant(cell, ue)
+Void rgSCHSc1ContResUlGrant(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -5213,13 +5195,13 @@ RgSchUeCb    *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1SrRcvd
+Void rgSCHSc1SrRcvd
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHSc1SrRcvd(cell, ue)
+Void rgSCHSc1SrRcvd(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -5263,14 +5245,14 @@ RgSchUeCb    *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlCqiInd
+Void rgSCHSc1UlCqiInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 TfuUlCqiRpt          *ulCqiInfo
 )
 #else
-PUBLIC Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo)
+Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 TfuUlCqiRpt          *ulCqiInfo;
@@ -5298,14 +5280,14 @@ TfuUlCqiRpt          *ulCqiInfo;
  *  @return  S16
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSc1UlLcgUpd
+S16 rgSCHSc1UlLcgUpd
 (
 RgSchCellCb         *cell,
 RgSchUeCb           *ue,
 RgInfUeDatInd       *datInd
 )
 #else
-PUBLIC S16 rgSCHSc1UlLcgUpd(cell, ue)
+S16 rgSCHSc1UlLcgUpd(cell, ue)
 RgSchCellCb         *cell;
 RgSchUeCb           *ue;
 RgInfUeDatInd       *datInd;
@@ -5314,7 +5296,7 @@ RgInfUeDatInd       *datInd;
 
    TRC2(rgSCHSc1UlLcgUpd);
 
-   RETVALUE(ROK);  
+   return ROK;  
 }
 
 
@@ -5334,13 +5316,13 @@ RgInfUeDatInd       *datInd;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlUeRefresh
+Void rgSCHSc1UlUeRefresh
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlUeRefresh(cell, ue)
+Void rgSCHSc1UlUeRefresh(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
@@ -5527,13 +5509,13 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlAllocFnlz
+Void rgSCHSc1UlAllocFnlz
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHSc1UlAllocFnlz(cell, allocInfo)
+Void rgSCHSc1UlAllocFnlz(cell, allocInfo)
 RgSchCellCb           *cell;
 RgSchCmnUlRbAllocInfo *allocInfo;
 #endif
@@ -5562,13 +5544,13 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlActvtUe 
+Void rgSCHSc1UlActvtUe 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Void rgSCHSc1UlActvtUe(cell, ue)
+Void rgSCHSc1UlActvtUe(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 #endif
@@ -5599,13 +5581,13 @@ RgSchUeCb      *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSc1UlHndlInActUes
+Void rgSCHSc1UlHndlInActUes
 (
 RgSchCellCb           *cell,
 CmLListCp             *inactvLst
 )
 #else
-PUBLIC Void rgSCHSc1UlHndlInActUes(cell, inactvLst)
+Void rgSCHSc1UlHndlInActUes(cell, inactvLst)
 RgSchCellCb           *cell;
 CmLListCp             *inactvLst;
 #endif
@@ -5652,13 +5634,13 @@ CmLListCp             *inactvLst;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHSc1DlProcRmvFrmRetx(
+Void rgSCHSc1DlProcRmvFrmRetx(
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *hqP
 )
 #else
-PUBLIC Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP)
+Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlHqProcCb            *hqP;