X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_scell.c;h=8c21fe76d3a5cc4b57680e7b695c93e59e1660dc;hb=694adde1a08c393a8443fd5bbd4f036f5cf85403;hp=db18f1a54d3dbfc0c6ebc1ea90c5c300e098a7eb;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c
index db18f1a54..8c21fe76d 100755
--- a/src/5gnrsch/rg_sch_scell.c
+++ b/src/5gnrsch/rg_sch_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 "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"
@@ -54,15 +45,6 @@
 #include "rg_sch_cmn.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 */
@@ -73,29 +55,29 @@
 
 #ifdef LTE_ADV
 
-PUBLIC Void rgSCHSCellActivation ARGS((
+Void rgSCHSCellActivation ARGS((
 RgSchUeCellInfo  *sCell
 ));
 
-PUBLIC Void rgSCHSCellSchdActDeactCe ARGS((
+Void rgSCHSCellSchdActDeactCe ARGS((
 RgSchUeCb         *ueCb,
 RgSchDlHqTbCb     *tbInfo
 ));
-PUBLIC Void rgSCHSCellAddToActDeactLst ARGS((
+Void rgSCHSCellAddToActDeactLst ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 ));
 
-PUBLIC Void rgSCHSCellRmvFrmActLst ARGS((
+Void rgSCHSCellRmvFrmActLst ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 ));
-PUBLIC S16 rgSCHSCellIsActive ARGS((
+S16 rgSCHSCellIsActive ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 ));
 
-PUBLIC Void rgSCHSCellHndlFdbkInd ARGS((
+Void rgSCHSCellHndlFdbkInd ARGS((
 RgSchDlHqProcCb   *hqP,
 U8                tbIdx,
 U8                fdbk,
@@ -103,23 +85,23 @@ Bool              maxHqRetxReached
 ));
 
 #ifdef LTE_ADV
-PUBLIC Void rgSCHSCellDeactTmrExpry ARGS((
+Void rgSCHSCellDeactTmrExpry ARGS((
 RgSchUeCellInfo *sCell
 ));
 #endif
 
-PUBLIC Void rgSCHSCellDelUeSCell ARGS((
+Void rgSCHSCellDelUeSCell ARGS((
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb,
 U8            sCellIdx
 ));
 
-PUBLIC S16 rgSCHSCellDelUe ARGS((
+S16 rgSCHSCellDelUe ARGS((
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb
 ));
 #ifdef TFU_UPGRADE
-PUBLIC S16 rgSCHSCellPCqiCfg ARGS((
+S16 rgSCHSCellPCqiCfg ARGS((
 RgSchCellCb  *priCellCb,
 RgSchCellCb  *secCellCb,
 RgSchUeCb    *ueCb,
@@ -151,13 +133,13 @@ U16           rnti
  *      -# None.
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellSchdActDeactCe
+Void rgSCHSCellSchdActDeactCe
 (
 RgSchUeCb         *ueCb,
 RgSchDlHqTbCb     *tbInfo
 )
 #else
-PUBLIC Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
+Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
 RgSchUeCb         *ueCb;
 RgSchDlHqTbCb     *tbInfo;
 #endif
@@ -165,7 +147,6 @@ RgSchDlHqTbCb     *tbInfo;
 
    U8   bitVal = 0;
    U8   sCellActDeactBitMask = 0;
-   TRC3(rgSCHSCellSchdActDeactCe);
 
    /* Change the state of all Scells waiting for
     * activation */
@@ -239,19 +220,18 @@ RgSchDlHqTbCb     *tbInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellAddToActDeactLst
+Void rgSCHSCellAddToActDeactLst
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC Void rgSCHSCellAddToActDeactLst(cell, ue)
+Void rgSCHSCellAddToActDeactLst(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   TRC3(rgSCHSCellAddToActDeactLst);
 
    if(NULLP == ue->sCellActLnk.node)
    {/* Ue is not present in the list */
@@ -284,19 +264,18 @@ RgSchUeCb                  *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellRmvFrmActLst
+Void rgSCHSCellRmvFrmActLst
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC Void rgSCHSCellRmvFrmActLst(cell, ue)
+Void rgSCHSCellRmvFrmActLst(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   TRC3(rgSCHSCellRmvFrmActLst);
    if (NULLP != ue->sCellActLnk.node)
    {
       cmLListDelFrm(&cellCmnDl->secCellActCeLst, &ue->sCellActLnk);
@@ -324,12 +303,12 @@ RgSchUeCb                  *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellActivation
+Void rgSCHSCellActivation
 (
 RgSchUeCellInfo  *sCellInfo
 )
 #else
-PUBLIC Void rgSCHSCellActivation(sCellInfo)
+Void rgSCHSCellActivation(sCellInfo)
 RgSchUeCellInfo  *sCellInfo
 #endif
 {
@@ -351,7 +330,6 @@ RgSchUeCellInfo  *sCellInfo
    U16    crntTime;           
 #endif
 
-   TRC3(rgSCHSCellActivation);
 
    sCellInfo->sCellState = RG_SCH_SCELL_ACTIVE;
 #ifdef TENB_STATS
@@ -543,7 +521,6 @@ RgSchUeCellInfo *sCellInfo;
 #endif
 {
 
-   TRC3(rgSCHCellClearScellLstOfCQI);
    RgSchUePCqiCb *cqiRiCb = NULLP;
    RgSchUeCb    *ueCb;
    ueCb = sCellInfo->ue;
@@ -610,11 +587,10 @@ PRIVATE S16 rgSCHSCellDeActivation(sCellInfo)
 RgSchUeCellInfo *sCellInfo
 #endif
 {
-   RETVALUE(ROK);
+   return ROK;
    RgSchCmnCell *cellSch;
    Inst inst = sCellInfo->cell->instIdx;
 
-   TRC3(rgSCHSCellDeActivation);
    /* Stop the timer if running */
 
    if(sCellInfo->deactTmr.tmrEvnt != TMR_NONE)
@@ -661,7 +637,7 @@ RgSchUeCellInfo *sCellInfo
    printf("SCELL DEATIVATED  sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId);
    //MSPD_DBG("SCELL DEATIVATED  sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId);
 #endif
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -705,7 +681,7 @@ U16           rnti;
    if((secCellCb = (RgSchCellCb *)rgSchUtlGetCellCb(inst, secCellId)) == NULLP)
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    hqEntRstInfo.cellId = secCellId;
@@ -715,7 +691,7 @@ U16           rnti;
 
    RgSchMacRstHqEnt(&pst, &hqEntRstInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 /*removed endif*/
 
@@ -742,7 +718,7 @@ U16           rnti;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellHndlFdbkInd
+Void rgSCHSCellHndlFdbkInd
 (
 RgSchDlHqProcCb   *hqP,
 U8                tbIdx,
@@ -750,7 +726,7 @@ U8                fdbk,
 Bool              maxHqRetxReached
 )
 #else
-PUBLIC Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
+Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
 RgSchDlHqProcCb   *hqP;
 U8                tbIdx;
 U8                fdbk;
@@ -762,7 +738,6 @@ Bool              maxHqRetxReached;
    RgSchCellCb    *cell;
    RgSchUeCellInfo *sCellInfo;
 
-   TRC3(rgSCHSCellHndlFdbkInd);
 
    ueCb  = hqP->hqE->ue;
    cell  = ueCb->cell;
@@ -851,17 +826,16 @@ Bool              maxHqRetxReached;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDeactTmrExpry
+Void rgSCHSCellDeactTmrExpry
 (
 RgSchUeCellInfo *sCellInfo
 )
 #else
-PUBLIC Void rgSCHSCellDeactTmrExpry(sCellInfo)
+Void rgSCHSCellDeactTmrExpry(sCellInfo)
 RgSchUeCellInfo *sCellInfo;
 #endif
 {
 
-   TRC3(rgSCHSCellDeactTmrExpry);
    if (sCellInfo->ue->isScellExplicitDeAct == TRUE)
    {
       /* Deactivation Timer is not configured (infinity), thus send deactivation CE explicitly */ 
@@ -908,7 +882,7 @@ RgSchUeCellInfo *sCellInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellTrigActDeact
+S16 rgSCHSCellTrigActDeact
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb,
@@ -916,7 +890,7 @@ U8            sCellIdx,
 U8            action
 )
 #else
-PUBLIC S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
+S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb;
 U8            sCellIdx;
@@ -926,21 +900,19 @@ U8            action;
    Inst inst = cell->instIdx;
    S16 ret   = ROK;
 
-   TRC3(rgSCHSCellTrigActDeact);
-
    if((sCellIdx < 1) ||
       (sCellIdx > RGR_MAX_SCELL_PER_UE))
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", \
                sCellIdx));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(ueCb->cellInfo[sCellIdx] == NULLP)
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d ueId %d\n", \
               sCellIdx,ueCb->ueId));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    switch (action)
@@ -1012,7 +984,7 @@ U8            action;
          break;
       }
    }
-   RETVALUE(ret);
+   return (ret);
 }
 
  
@@ -1046,17 +1018,16 @@ RgSchUeCb    *ueCb;
 U8           *sCellIdx;
 #endif
 {
-   TRC3(rgSCHSCellSelectAndAct);
 
    for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++)
    {
       if((ueCb->cellInfo[(*sCellIdx)] != NULLP) &&
             (ueCb->cellInfo[(*sCellIdx)]->sCellState == RG_SCH_SCELL_READY))
       {
-         RETVALUE(ROK);
+         return ROK;
       }
    }
-   RETVALUE(RFAILED);
+   return RFAILED;
 }
 
 /**
@@ -1077,14 +1048,14 @@ U8           *sCellIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellSelectAndActDeAct
+Void rgSCHSCellSelectAndActDeAct
 (
 RgSchCellCb  *pCell,
 RgSchUeCb    *ueCb,
 U8           action
 )
 #else
-PUBLIC Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
+Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
 RgSchCellCb  *pCell;
 RgSchUeCb    *ueCb;
 U8           action;
@@ -1136,14 +1107,14 @@ U8           action;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDelUeSCell
+Void rgSCHSCellDelUeSCell
 (
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb,
 U8            sCellIdx
 )
 #else
-PUBLIC Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
+Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
 RgSchCellCb  *cellCb;
 RgSchUeCb    *ueCb;
 U8            sCellIdx;
@@ -1154,7 +1125,6 @@ U8            sCellIdx;
    RgSchUeCellInfo *sCellInfo;
    RgSchCmnUlUe *ueUl;
 
-   TRC3(rgSCHSCellDelUeSCell);
    sCellInfo = ueCb->cellInfo[sCellIdx];
 
 
@@ -1223,26 +1193,24 @@ U8            sCellIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellDelUe
+S16 rgSCHSCellDelUe
 (
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb
 )
 #else
-PUBLIC S16 rgSCHSCellDelUe(cellCb,ueCb)
+S16 rgSCHSCellDelUe(cellCb,ueCb)
 RgSchCellCb  *cellCb;
 RgSchUeCb    *ueCb;
 #endif
 {
 
-   TRC3(rgSCHSCellDelUe);
-
    for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       rgSCHSCellDelUeSCell(cellCb,ueCb,idx);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef TFU_UPGRADE
@@ -1278,7 +1246,7 @@ RgSchUeCb    *ueCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellPCqiCfg
+S16 rgSCHSCellPCqiCfg
 (
 RgSchCellCb  *priCellCb,
 RgSchCellCb  *secCellCb,
@@ -1288,7 +1256,7 @@ CmLteUeCategory   ueCat,
 U8            sCellIdx
 )
 #else
-PUBLIC S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
+S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
 RgSchCellCb       *priCellCb;
 RgSchCellCb       *secCellCb;
 RgSchUeCb         *ueCb;
@@ -1305,8 +1273,6 @@ U8                sCellIdx;
    RgSchUeCellInfo *sCellInfo;
    RgSchUePCqiCb *cqiCb = NULLP;
 
-   TRC3(rgSCHSCellPCqiCfg);
-
    RGSCHDBGINFO(priCellCb->instIdx, (rgSchPBuf(priCellCb->instIdx), 
             "rgSCHSCellPCqiCfg cellId =%d, ueId = %d, CfgType =%d\n",
             secCellCb->cellId,  ueCb->ueId, cqiCfg->type));
@@ -1316,7 +1282,7 @@ U8                sCellIdx;
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n",
                sCellIdx));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    sCellInfo = ueCb->cellInfo[sCellIdx];
@@ -1328,7 +1294,7 @@ U8                sCellIdx;
    if (cqiCfg->type == RGR_SCH_PCQI_SETUP)
    {   
       /*  1. Copy the Received CQI Cfg parameters to ueCb  */
-      cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg, 
+      memcpy(&cqiCb->cqiCfg, cqiCfg, 
             sizeof(RgrUePrdDlCqiCfg));
 
       /*  2. Compute Periodic CQI Periodicity and subframe offset   */
@@ -1421,7 +1387,7 @@ U8                sCellIdx;
    cqiCb->riDist    = RG_SCH_INVALID_IDX; 
    cqiCb->nCqiTrIdx = RG_SCH_INVALID_IDX;
  
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
@@ -1442,19 +1408,18 @@ U8                sCellIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlUeReset
+Void rgSCHSCellDlUeReset
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC Void rgSCHSCellDlUeReset(cell, ue)
+Void rgSCHSCellDlUeReset(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
 {
    RgSchCmnCell *cellSch;
-   TRC3(rgSCHSCellDlUeReset);
 
    for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
@@ -1487,21 +1452,20 @@ RgSchUeCb                  *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlLcCfg
+Void rgSCHSCellDlLcCfg
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSCellDlLcCfg(cell, ue, svc)
+Void rgSCHSCellDlLcCfg(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC3(rgSCHSCellDlLcCfg);
    for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if(ue->cellInfo[idx] != NULLP) 
@@ -1529,21 +1493,20 @@ RgSchDlLcCb                *svc;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlLcDel
+Void rgSCHSCellDlLcDel
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSCellDlLcDel(cell, ue, svc)
+Void rgSCHSCellDlLcDel(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC3(rgSCHSCellDlLcDel);
    for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if(ue->cellInfo[idx] != NULLP) 
@@ -1571,21 +1534,20 @@ RgSchDlLcCb                *svc;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellDlDedBoUpd
+Void rgSCHSCellDlDedBoUpd
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
+Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC3(rgSCHSCellDlDedBoUpd);
 
    /* If this is not invoked by PCell, then
       invoke the call to PCell handler 
@@ -1635,7 +1597,6 @@ RgSchUePCqiCb     *cqiCb2;
 #endif
 {
    RgSchUePCqiCb     *retCqiCb;
-   TRC3(rgSCHUtlSCellCmpCqiCfg);
    /* Collision rules are defined in TS 36.213,7.2.2 */
    /* RI, WB first PMI > WB CQI >  SB CQI */
    /* As of now only taking care of RI > WB CQI > SB CQI */
@@ -1668,7 +1629,7 @@ RgSchUePCqiCb     *cqiCb2;
       }
    }
 
-   RETVALUE(retCqiCb->servCellInfo->sCellIdx);
+   return (retCqiCb->servCellInfo->sCellIdx);
 }
 
 /**
@@ -1687,12 +1648,12 @@ RgSchUePCqiCb     *cqiCb2;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn
+S16 rgSCHUtlSCellHndlCqiCollsn
 (
 RgSchUePCqiCb *cqiCb
 )
 #else
-PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
+S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
 RgSchUePCqiCb     *cqiCb;
 #endif
 {
@@ -1707,7 +1668,6 @@ RgSchUePCqiCb     *cqiCb;
    U32 sCellCnt = 0;
    CmLteTimingInfo timingInfo;
    U8 idx = 0;
-   TRC3(rgSCHUtlSCellHndlCqiCollsn);
 
 #ifdef xLTE_TDD
    RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
@@ -1778,7 +1738,7 @@ RgSchUePCqiCb     *cqiCb;
    idx = ((nPCqiServCellIdx)& (CM_LTE_MAX_CELLS -1));
    ueCb->nPCqiCb = &ueCb->cellInfo[idx]->cqiCb;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1798,12 +1758,12 @@ RgSchUePCqiCb     *cqiCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUtlSCellHndlRiCollsn
+S16 rgSCHUtlSCellHndlRiCollsn
 (
 RgSchUePCqiCb *cqiCb
 )
 #else
-PUBLIC S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
+S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
 RgSchUePCqiCb     *cqiCb;
 #endif
 {
@@ -1817,7 +1777,6 @@ RgSchUePCqiCb     *cqiCb;
    U32 cellIdx;
    U32 sCellCnt = 0;
    CmLteTimingInfo timingInfo;
-   TRC3(rgSCHUtlSCellHndlRiCollsn);
 
 #ifdef xLTE_TDD
    RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
@@ -1896,7 +1855,7 @@ RgSchUePCqiCb     *cqiCb;
    /* Set the next expected Cqi into nPCqiCb */
    ueCb->nPRiCb = &ueCb->cellInfo[nPRiServCellIdx]->cqiCb;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif/*TFU_UPGRADE*/
 
@@ -1917,19 +1876,18 @@ RgSchUePCqiCb     *cqiCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellIsActive
+S16 rgSCHSCellIsActive
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC S16 rgSCHSCellIsActive(cell, ue)
+S16 rgSCHSCellIsActive(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
 {
    S16 retVal = RFAILED;
-   TRC3(rgSCHSCellIsActive);
 
    for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
@@ -1941,7 +1899,7 @@ RgSchUeCb                  *ue;
          break;
       }
    }
-   RETVALUE(retVal);	
+   return (retVal);	
 }
 
 /**
@@ -1959,26 +1917,25 @@ RgSchUeCb                  *ue;
  *      -#  TRUE
  **/
 #ifdef ANSI
-PUBLIC Bool rgSCHIsActvReqd 
+Bool rgSCHIsActvReqd 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue
 )
 #else
-PUBLIC Bool rgSCHIsActvReqd(cell, ue)
+Bool rgSCHIsActvReqd(cell, ue)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue
 #endif
 {
-   TRC2(rgSCHIsActvReqd)
    /* Check if remBoCnt in this UE is greater than ZERO for sufficient number of
     * Scheduling TTIs. If yes then We should activate a secondary cell to handle
     * outstanding BO */
    if(ue->remBoCnt == RG_SCH_ACTIVATION_COUNT)
    {
-      RETVALUE(TRUE);
+      return (TRUE);
    }
-   RETVALUE(FALSE);
+   return (FALSE);
 }
 #endif/*LTE_ADV*/