X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_gom.c;h=b70e203a121af7a15eb61822b6e10509738dfe24;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=ad26f4939919e15b4cc826ebe2957b8e7fbdd2cb;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c
index ad26f4939..b70e203a1 100755
--- a/src/5gnrsch/rg_sch_gom.c
+++ b/src/5gnrsch/rg_sch_gom.c
@@ -38,16 +38,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=164;
 
 /* 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 "rgr.h"
 #include "tfu.h"
@@ -59,15 +50,6 @@ static int RLOG_FILE_ID=164;
 #include "rl_common.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_llist.x"      /* common linked list library */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "rgr.x"
 #include "tfu.x"
@@ -154,7 +136,7 @@ U16                     idx
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHGomHndlCfg
+S16 rgSCHGomHndlCfg
 (
 Pst           *pst,
 RgSchCb       *instCb,
@@ -162,7 +144,7 @@ RgrCfgTransId transId,
 RgrCfgReqInfo *cfgReqInfo
 )
 #else
-PUBLIC S16 rgSCHGomHndlCfg(pst, instCb, transId, cfgReqInfo)
+S16 rgSCHGomHndlCfg(pst, instCb, transId, cfgReqInfo)
 Pst           *pst;
 RgSchCb       *instCb;
 RgrCfgTransId transId;
@@ -178,13 +160,12 @@ RgrCfgReqInfo *cfgReqInfo;
    Inst          inst = (instCb->rgSchInit.inst );
 #endif
 
-   TRC2(rgSCHGomHndlCfg);
    /* Apply the configuration for Cell Configuration or Delete */
    if (cfgReqInfo->action != RGR_RECONFIG)
    {
       ret = rgSCHGomCfgReq (pst->region, pst->pool, instCb, 
             transId, cfgReqInfo);
-      RETVALUE(ret);
+      return (ret);
    }
 
    /* Fetch the cell Id for the recieved request */
@@ -196,7 +177,7 @@ RgrCfgReqInfo *cfgReqInfo;
             (Size)sizeof(*cfgReqInfo));
       cfgReqInfo = NULLP;
       schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Extract the cell and Enquee Config Request */
    if(NULLP != instCb->rgrSap[spId].cell)
@@ -210,7 +191,7 @@ RgrCfgReqInfo *cfgReqInfo;
                (Size)sizeof(*cfgReqInfo));
          cfgReqInfo = NULLP;
          schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       cell = instCb->rgrSap[spId].cell;
 
@@ -225,16 +206,16 @@ RgrCfgReqInfo *cfgReqInfo;
                (Size)sizeof(*cfgReqInfo));
          cfgReqInfo = NULLP;
          schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); 
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
-      RETVALUE(ROK);
+      return ROK;
    }
    SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
          (Size)sizeof(*cfgReqInfo));
    cfgReqInfo = NULLP;
    schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); 
-   RETVALUE(RFAILED);
+   return RFAILED;
 
 }/* rgSCHGomHndlCfg */
 
@@ -288,7 +269,6 @@ RgrCfgReqInfo *cfgReqInfo;
 #ifdef DEBUGP
    Inst            inst = (instCb->rgSchInit.inst );
 #endif
-   TRC2(rgSCHGomCfgReq);
 #ifdef EMTC_ENABLE
 printf("\n AT MAC rgSCHGomCfgReq \n");
 #endif
@@ -356,7 +336,7 @@ printf("\n AT MAC sending RGR cfg cfm \n");
 printf("\n AT MAC RGR cfg cfm sent\n");
 #endif
 
-   RETVALUE(ret);
+   return (ret);
 }  /* rgSCHGomCfgReq */
 
 
@@ -412,17 +392,15 @@ RgrCfgReqInfo *rgrCfgReq;
    CmLteTimingInfo    actvTime; 
    Inst               inst = cell->instIdx;
 
-   TRC2(rgSCHGomEnqCfgReq);
-
    /* Allocate memory for config Element */
    ret = rgSCHUtlAllocSBuf(inst, (Data **)&rgrCfgElem, sizeof(RgSchCfgElem));
    if ((ret != ROK) || ((U8 *)rgrCfgElem == NULLP))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Initialize the configuration element */
-   cmMemcpy((U8*)rgrCfgElem->rgrCfg.transId.trans,(U8*)transId.trans,
+   memcpy(rgrCfgElem->rgrCfg.transId.trans,transId.trans,
          sizeof(transId.trans));
    rgrCfgElem->rgrCfg.reg = reg;
    rgrCfgElem->rgrCfg.pool = pool;
@@ -442,16 +420,16 @@ RgrCfgReqInfo *rgrCfgReq;
 
       /* Check if the activation time is valid */
       if (actvTime.sfn >= RGSCH_MAX_SFN 
-            || actvTime.subframe >= RGSCH_NUM_SUB_FRAMES_5G)
+            || actvTime.slot >= RGSCH_NUM_SUB_FRAMES_5G)
       {
          RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId, "Invalid activation time for RGR "
-           "config request: activation sfn %d activation subframe %d current "
-           "sfn %d current subframe %d", actvTime.sfn, actvTime.subframe, 
-           cell->crntTime.sfn, cell->crntTime.subframe);
+           "config request: activation sfn %d activation slot %d current "
+           "sfn %d current slot %d", actvTime.sfn, actvTime.slot, 
+           cell->crntTime.sfn, cell->crntTime.slot);
          /* ccpu00117052 - MOD - Passing double pointer
          for proper NULLP assignment*/
          rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       sfDiff = RGSCH_CALC_SF_DIFF(actvTime, cell->crntTime);
@@ -459,13 +437,13 @@ RgrCfgReqInfo *rgrCfgReq;
       if (sfDiff > (RGR_ACTV_WIN_SIZE * RGSCH_NUM_SUB_FRAMES_5G))
       {
          RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId,"Invalid activation time for RGR"
-              " config request: activation sfn %d activation subframe %d "
-              "current sfn %d current subframe %d", actvTime.sfn,
-              actvTime.subframe, cell->crntTime.sfn, cell->crntTime.subframe);
+              " config request: activation sfn %d activation slot %d "
+              "current sfn %d current slot %d", actvTime.sfn,
+              actvTime.slot, cell->crntTime.sfn, cell->crntTime.slot);
          /* ccpu00117052 - MOD - Passing double pointer
          for proper NULLP assignment*/
          rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       if (sfDiff)
@@ -474,14 +452,14 @@ RgrCfgReqInfo *rgrCfgReq;
          rgrCfgElem->actvTime = actvTime; 
          rgSCHDbmInsPndngRgrCfgElem(cell, rgrCfgElem);
          /* Cfm to be sent only after applying request */
-         RETVALUE(ROK);
+         return ROK;
       }
    }
 
    /* Add to current cfgReq list */
    rgSCHDbmInsCrntRgrCfgElem(cell, rgrCfgElem);
    /* Cfm to be sent only after applying request */
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHGomEnqCfgReq */
 
 
@@ -508,20 +486,19 @@ RgrCfgReqInfo *rgrCfgReq;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHGomTtiHndlr
+S16 rgSCHGomTtiHndlr
 (
 RgSchCellCb      *cell,
 SpId             spId
 )
 #else
-PUBLIC S16 rgSCHGomTtiHndlr(cell, spId)
+S16 rgSCHGomTtiHndlr(cell, spId)
 RgSchCellCb      *cell;
 SpId             spId;
 #endif
 {
    RgSchCfgElem       *cfgElem;
    Inst               inst= cell->instIdx;
-   TRC2(rgSCHGomTtiHndlr);
 
    /* Dequeue from current config list */
    while ((cfgElem = rgSCHDbmGetNextCrntRgrCfgElem(cell, NULLP)) != NULLP)
@@ -547,7 +524,7 @@ SpId             spId;
       rgSCHUtlFreeSBuf(inst, (Data **)&cfgElem, sizeof(*cfgElem));
    } 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -595,8 +572,6 @@ RgSchErrInfo   *errInfo;
    Inst         inst = (instCb->rgSchInit.inst );
    RgSchUeCb    *ue;
 
-   TRC2(rgSCHGomHndlCfgReq);
-
    errInfo->errType = RGSCHERR_GOM_CFG_REQ;
    
    /* Validate and process the configuration request */ 
@@ -609,7 +584,7 @@ RgSchErrInfo   *errInfo;
             {
                RLOG1(L_ERROR,"Rgr Cell configuration "
                   "validation FAILED: Cell %d", cfg->u.cellCfg.cellId);
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
          ret = rgSCHCfgRgrCellCfg(instCb, spId, &cfg->u.cellCfg, errInfo);
          break;
@@ -622,7 +597,7 @@ RgSchErrInfo   *errInfo;
          {
             RLOG1(L_ERROR,"Ue configuration validation"
                " FAILED: CRNTI:%d", cfg->u.ueCfg.crnti);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrUeCfg(cell, &cfg->u.ueCfg, errInfo);
          break;
@@ -634,7 +609,7 @@ RgSchErrInfo   *errInfo;
          {
             RLOG1(L_ERROR,"LC configuration validation "
               "FAILED: LCID:%d", cfg->u.lchCfg.lcId);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrLchCfg(cell, ue, &cfg->u.lchCfg, errInfo); 
          break;
@@ -646,7 +621,7 @@ RgSchErrInfo   *errInfo;
          {
             RLOG1(L_ERROR,"LCG configuration validation "
               "FAILED: LCGID:%d", cfg->u.lcgCfg.ulInfo.lcgId);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrLcgCfg(cell, ue, &cfg->u.lcgCfg, errInfo); 
          break;
@@ -658,7 +633,7 @@ RgSchErrInfo   *errInfo;
          {
             RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCH ENB configuration validation "
               "FAILED: \n" ));
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrSchedEnbCfg(inst, spId, &cfg->u.schedEnbCfg, errInfo); 
          break;
@@ -669,11 +644,11 @@ RgSchErrInfo   *errInfo;
             RLOG1(L_ERROR,"Should never come here: "
                 "cfgType %d", cfg->cfgType);
 #endif
-            RETVALUE(RFAILED);
+            return RFAILED;
       }
    }
    
-   RETVALUE(ret);
+   return (ret);
 }  /* rgSCHGomHndlCfgReq */
 
 #ifdef LTE_ADV
@@ -724,7 +699,6 @@ U8                    action;
    RgSchCellCb  *cell = instCb->rgrSap[spId].cell;
    Inst         inst = (instCb->rgSchInit.inst);
 
-   TRC2(rgSCHGomHndlSCellActDeactReq);
    RGSCHDBGPRM(inst,(rgSchPBuf(inst), "Processing RGR SCell Actication request:"
                   "%d\n", sCellActDeactEvnt->crnti));
 
@@ -735,7 +709,7 @@ U8                    action;
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]UE: does not exist\n", 
             sCellActDeactEvnt->crnti));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    for(idx = 0; idx < sCellActDeactEvnt->numOfSCells; idx++)
@@ -747,13 +721,13 @@ U8                    action;
             RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCell Actication failed"
                      "for UE [%d] with SCellIdx [%d]\n", 
                      sCellActDeactEvnt->crnti, idx));
-            RETVALUE(RFAILED);
+            return RFAILED;
 
       }
 
    }
    RGSCHDBGINFO(inst,(rgSchPBuf(inst), "RGR Reconfiguration processed\n"));
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHGomHndlSCellActDeactReq */
 
 #endif /* LTE_ADV */
@@ -802,8 +776,6 @@ RgSchErrInfo  *errInfo;
    RgSchCellCb  *cell = instCb->rgrSap[spId].cell;
    Inst         inst = (instCb->rgSchInit.inst );
 
-   TRC2(rgSCHGomHndlRecfgReq);
-
    errInfo->errType = RGSCHERR_GOM_RECFG_REQ;
    
    /* Validate and process the re-configuration request */
@@ -817,7 +789,7 @@ RgSchErrInfo  *errInfo;
          {
             RLOG_ARG0(L_ERROR,DBG_CELLID,recfg->u.cellRecfg.cellId,"Rgr Cell Recfg Validation "
                      "FAILED");
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrCellRecfg(cell, &recfg->u.cellRecfg, errInfo);
          break;
@@ -830,7 +802,7 @@ RgSchErrInfo  *errInfo;
          {
             RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.ueRecfg.cellId,"Ue Recfg Validation FAILED"
                       "OLD CRNTI:%d",recfg->u.ueRecfg.oldCrnti);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrUeRecfg(cell, ue, &recfg->u.ueRecfg, errInfo);
          break;
@@ -843,7 +815,7 @@ RgSchErrInfo  *errInfo;
          {
             RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lchRecfg.cellId,"Lc Recfg Validation FAILED"
                       "LCID:%d",recfg->u.lchRecfg.lcId);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrLchRecfg(cell, ue, dlLc, &recfg->u.lchRecfg, errInfo);
          break;
@@ -856,7 +828,7 @@ RgSchErrInfo  *errInfo;
          {
             RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lcgRecfg.cellId, "Lcg Recfg Validation FAILED"
                       "LCGID:%d",recfg->u.lcgRecfg.ulRecfg.lcgId);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ret = rgSCHCfgRgrLcgRecfg(cell, ue, &recfg->u.lcgRecfg, errInfo);
          break;
@@ -866,11 +838,11 @@ RgSchErrInfo  *errInfo;
 #if(ERRCLASS & ERRCLS_INT_PAR)
          RLOG1(L_ERROR,"Should never come here: recfgType %d", recfg->recfgType);
 #endif
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
-   RETVALUE(ret);
+   return (ret);
 }  /* rgSCHGomHndlRecfgReq */
 
 /**
@@ -915,9 +887,6 @@ RgSchErrInfo  *errInfo;
    Inst         inst = (instCb->rgSchInit.inst );
    RgSchUeCb    *ue = NULLP;
 
-   TRC2(rgSCHGomHndlResetReq);
-
-
    errInfo->errType = RGSCHERR_GOM_RESET_REQ;
    
    /* Validate and process the UE reset request */
@@ -926,7 +895,7 @@ RgSchErrInfo  *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset Validation FAILED"
                "CRNTI:%d",reset->crnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    ret = rgSCHCfgRgrUeReset(cell, ue, reset, errInfo);
@@ -934,10 +903,10 @@ RgSchErrInfo  *errInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset FAILED"
                "CRNTI:%d",reset->crnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ret);
+   return (ret);
 }  /* rgSCHGomHndlResetReq */
 
 
@@ -986,14 +955,12 @@ RgSchErrInfo  *errInfo;
 #endif
    VOLATILE U32     startTime=0;
 
-   TRC2(rgSCHGomHndlDelReq);
-   
    errInfo->errType = RGSCHERR_GOM_DEL_REQ;
 
    if(instCb->rgrSap[spId].cell == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"Cell doesnt exist");
-      RETVALUE(RFAILED); 
+      return RFAILED; 
    }
    
    /* Process the delete request */ 
@@ -1042,11 +1009,11 @@ RgSchErrInfo  *errInfo;
 #if(ERRCLASS & ERRCLS_INT_PAR)
          RLOG1(L_ERROR,"Should never come here: delType %d", del->delType);
 #endif
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
-   RETVALUE(ret);
+   return (ret);
 }  /* rgSCHGomHndlDelReq */
 
 
@@ -1084,9 +1051,6 @@ CmLteCellId   *cellId;
 #endif
 {
 
-   TRC2(rgSCHGomGetCellIdFrmCfgReq);
-
-
    /* Extract CellId depending on the action and Config Type in the Request 
     * As of now this function is called for only re configuration so removed
     * othe CASES below if needed we can add them*/
@@ -1113,17 +1077,17 @@ CmLteCellId   *cellId;
             }
             else
             {
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
             break;
          }
       default:
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }  /* End of Switch */
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHGomGetCellIdFrmCfgReq */
 
 #ifdef RGR_SI_SCH
@@ -1153,7 +1117,7 @@ CmLteCellId   *cellId;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHGomHndlSiCfg
+S16 rgSCHGomHndlSiCfg
 (
 Region        reg,
 Pool          pool,
@@ -1163,7 +1127,7 @@ RgrCfgTransId transId,
 RgrSiCfgReqInfo *cfgReqInfo
 )
 #else
-PUBLIC S16 rgSCHGomHndlSiCfg(reg, pool, instCb, spId, transId, cfgReqInfo)
+S16 rgSCHGomHndlSiCfg(reg, pool, instCb, spId, transId, cfgReqInfo)
 Region        reg;
 Pool          pool;
 RgSchCb       *instCb;
@@ -1182,8 +1146,6 @@ RgrSiCfgReqInfo *cfgReqInfo;
    U8           nPrb   = 0; 
    U8           mcs    = 0;
 
-   TRC2(rgSCHGomHndlSiCfg);
-
 
    /* check if cell does not exists */
    if (((U8 *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId))
@@ -1194,7 +1156,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
       SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); 
       cfgReqInfo = NULLP;
       rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /*Validate the received SI configuration */
@@ -1207,7 +1169,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
       SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); 
       cfgReqInfo = NULLP;
       rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*ccpu00140789: Stopping SI scheduling*/
    if(RGR_SI_STOP == cfgReqInfo->cfgType)
@@ -1227,14 +1189,14 @@ RgrSiCfgReqInfo *cfgReqInfo;
          cfgReqInfo = NULLP;   
          cfmStatus = RGR_CFG_CFM_OK;
          rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus);
-         RETVALUE(ROK); 
+         return ROK; 
        }
        else
        {
           SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo));
           cfgReqInfo = NULLP;
           rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus);
-          RETVALUE(RFAILED); 
+          return RFAILED; 
        }
    }
 
@@ -1267,10 +1229,10 @@ RgrSiCfgReqInfo *cfgReqInfo;
             cfgReqInfo = NULLP;
             rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, 
                                                            cfmStatus); 
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
 
-         cmMemset((U8*)padding,(U8)0,nmPadBytes);
+         memset(padding,0,nmPadBytes);
 
 #ifdef MS_MBUF_CORRUPTION 
    MS_BUF_ADD_ALLOC_CALLER();
@@ -1285,7 +1247,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
             padding = NULLP;
             rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, 
                                                             cfmStatus); 
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          SPutSBuf(reg, pool, (Data* )padding,(Size)nmPadBytes);
          padding = NULLP;
@@ -1315,7 +1277,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
                cfgReqInfo = NULLP;
                rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, 
                      cfmStatus); 
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
 
             RGSCHCHKNUPDSIPDU(cell->siCb.crntSiInfo.sib1Info.sib1, 
@@ -1337,7 +1299,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
             cfgReqInfo = NULLP;
             rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, 
                                                                  cfmStatus); 
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          RGSCHCHKNUPDSIPDU(cell->siCb.crntSiInfo.sib1Info.sib1, 
                cell->siCb.newSiInfo.sib1Info.sib1, 
@@ -1358,7 +1320,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
             cfgReqInfo = NULLP;
             rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, 
                                                                  cfmStatus); 
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          /* Si recfg, where numSi changes */
          if (cell->siCb.siBitMask & RGSCH_SI_SICFG_UPD) 
@@ -1406,7 +1368,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
             cfgReqInfo = NULLP;
             rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, 
                                                                  cfmStatus); 
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          /* No need to wait for Modification period boundary */
          cell->siCb.siArray[cfgReqInfo->siId-1].si = cfgReqInfo->pdu;
@@ -1423,7 +1385,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
          cfgReqInfo = NULLP;
          rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, 
                cfmStatus); 
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
 
    SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); 
@@ -1432,7 +1394,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
    rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); 
 
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHGomHndlSiCfg */
 
 
@@ -1457,7 +1419,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHGomHndlWarningSiCfg
+S16 rgSCHGomHndlWarningSiCfg
 (
 Region        reg,
 Pool          pool,
@@ -1467,7 +1429,7 @@ RgrCfgTransId transId,
 RgrWarningSiCfgReqInfo *warningSiCfgReqInfo
 )
 #else
-PUBLIC S16 rgSCHGomHndlWarningSiCfg(reg, pool, instCb, spId, transId, 
+S16 rgSCHGomHndlWarningSiCfg(reg, pool, instCb, spId, transId, 
 warningSiCfgReqInfo)
 Region        reg;
 Pool          pool;
@@ -1493,8 +1455,6 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
    U8                 isEmtc = warningSiCfgReqInfo->emtcEnable;
 #endif
 
-   TRC2(rgSCHGomHndlWarningSiCfg);
-
 #ifdef EMTC_ENABLE
    if(TRUE == isEmtc)
    {
@@ -1520,7 +1480,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
       warningSiCfgReqInfo = NULLP;
       rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId, siId, transId, 
             cfmStatus); 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Search for free index in WarningSi */
@@ -1574,7 +1534,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
                      warningSiCfgReqInfo = NULLP;
                      rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId,
                            siId, transId,cfmStatus); 
-                     RETVALUE(RFAILED);
+                     return RFAILED;
 
                   }
                }
@@ -1628,13 +1588,13 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
       warningSiCfgReqInfo = NULLP;
       rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId, siId, transId, 
             cfmStatus); 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo, 
          sizeof(RgrWarningSiCfgReqInfo)); 
    warningSiCfgReqInfo = NULLP;
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1654,7 +1614,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
  *  @return  void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHGomHndlWarningSiStopReq 
+Void rgSCHGomHndlWarningSiStopReq 
 (
 Region        reg,
 Pool          pool,
@@ -1664,7 +1624,7 @@ RgrCfgTransId transId,
 SpId          spId
 )
 #else
-PUBLIC Void rgSCHGomHndlWarningSiStopReq(reg, pool, instCb, siId, transId, spId)
+Void rgSCHGomHndlWarningSiStopReq(reg, pool, instCb, siId, transId, spId)
 Region        reg;
 Pool          pool;
 RgSchCb       *instCb;
@@ -1679,8 +1639,6 @@ SpId          spId;
    RgSchWarningSiPdu  *warningSiPdu;
    Buffer             *pdu;
 
-   TRC3(rgSCHGomHndlWarningSiStopReq)
-
    for(idx = 0; idx < RGR_MAX_NUM_WARNING_SI; idx++)
    {
       if(cell->siCb.warningSi[idx].siId == siId)
@@ -1728,7 +1686,7 @@ SpId          spId;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSchUpdtRNTPInfo
+S16 rgSchUpdtRNTPInfo
 (
  RgSchCellCb             *cell,
  RgSchDlSf               *sf,
@@ -1748,8 +1706,6 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf)
    CmLList     *n;
    S16 ret = RFAILED;
 
-   TRC2(rgSchUpdtRNTPInfo);
-
    l = &sf->sfrTotalPoolInfo.ccPool;
 
    /*Get the first node from the CC Pool*/
@@ -1761,14 +1717,14 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf)
       {
          sfrCCPool->pwrHiCCRange.endRb   = loadInfReq->rgrCcPHighEndRb;
          sfrCCPool->pwrHiCCRange.startRb = loadInfReq->rgrCcPHighStartRb;
-         RETVALUE(ROK);
+         return ROK;
       }
       else
       {
          n = cmLListNext(l);
       }
    }
-   RETVALUE(ret);
+   return (ret);
 }
 /**
  * @brief Handler to handle LOAD INF request from RRM to MAC.
@@ -1795,7 +1751,7 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf)
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHGomHndlLoadInf
+S16 rgSCHGomHndlLoadInf
 (
  Region            reg,
  Pool              pool,
@@ -1805,7 +1761,7 @@ PUBLIC S16 rgSCHGomHndlLoadInf
  RgrLoadInfReqInfo *loadInfReq
  )
 #else
-PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq)
+S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq)
    Region            reg;
    Pool              pool;
    RgSchCb           *instCb;
@@ -1820,23 +1776,20 @@ PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq)
    RgSchErrInfo errInfo;
    U16 i;
 
-   TRC2(rgSCHGomHndlLoadInf);
-
-
    /* check if cell does not exists */
    if (((U8 *)cell == NULLP) || (cell->cellId != loadInfReq->cellId))
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,loadInfReq->cellId,"Cell Control block does not exist"
              "for load cellId:%d",loadInfReq->cellId);
       SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (cell->lteAdvCb.dsfrCfg.status == RGR_DISABLE)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHGomHndlLoadInf(): DSFR Feature not enabled");
       SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Validate the received LOAD INF Configuration */
    ret = rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, &errInfo);
@@ -1845,22 +1798,22 @@ PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq)
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Rgr LOAD INF Configuration "
                "validation FAILED");
       SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Update the RNTP info rcvd in the respective cell centre pool so that Phigh can be
       sent for the UEs scheduled in that particular RB range*/
-   for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++)
+   for(i = 0; i < RGSCH_NUM_DL_slotS; i++)
    {
       if((rgSchUpdtRNTPInfo(cell, cell->subFrms[i], loadInfReq) != ROK))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
    SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq));
 
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHGomHndlLoadInf */
 /* LTE_ADV_FLAG_REMOVED_END */