L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]

[o-du/l2.git] / src / 5gnrsch / rg_sch_pwr.c

diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c
index 132eb98..ba9e13a 100755 (executable)
--- a/src/5gnrsch/rg_sch_pwr.c
+++ b/src/5gnrsch/rg_sch_pwr.c
@@ -73,11 +73,11 @@ static int RLOG_FILE_ID=188;
 
 typedef S8 RgSchCmnUlPwrCqiToPwrTbl[RG_SCH_CMN_UL_NUM_CQI];
 
-PRIVATE RgSchCmnUlPwrCqiToPwrTbl rgSchPwrCqiToPwrTbl;
+static RgSchCmnUlPwrCqiToPwrTbl rgSchPwrCqiToPwrTbl;
 
 /* This table maps a given number of RBs (given by array index)
  * to the power in dB that these many RBs map to. */
-CONSTANT U8 rgSchPwrRbToPwrTbl[111] = { 0,    /* First entry is dummy */
+const uint8_t rgSchPwrRbToPwrTbl[111] = { 0,    /* First entry is dummy */
    0,  3,  4,  6,  7,  7,  8,  9,  9,  10,
    10, 10, 11, 11, 11, 12, 12, 12, 12, 13,
    13, 13, 13, 13, 14, 14, 14, 14, 14, 14,
@@ -94,261 +94,261 @@ CONSTANT U8 rgSchPwrRbToPwrTbl[111] = { 0,    /* First entry is dummy */
 
 /* This table maps power (in dB) to number of RBs */
 /* The array size comes from max power in rgSchPwrRbToPwrTbl */
-CONSTANT U8 rgSchPwrToRbTbl[20+1] = {
+const uint8_t rgSchPwrToRbTbl[20+1] = {
   1, 1, 2, 2, 3, 4, 5, 6, 7, 9, 11,
   13, 17, 21, 26, 33, 41, 52, 65, 82, 103 
 };
 
 
 
-PRIVATE S8 rgSCHPwrGetCqiPwr ARGS((
-         U8                  cqi
+static S8 rgSCHPwrGetCqiPwr ARGS((
+         uint8_t                  cqi
          ));
-PRIVATE S8 rgSCHPwrGetCqiPwrForUe ARGS((
+static S8 rgSCHPwrGetCqiPwrForUe ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb          *ue,
-         U8                  cqi
+         uint8_t                  cqi
          ));
-PRIVATE S8 rgSCHPwrCalcEfficncyPwr ARGS((
-         U32                 eff
+static S8 rgSCHPwrCalcEfficncyPwr ARGS((
+         uint32_t                 eff
          ));
-PRIVATE S8 rgSCHPwrGetDelta2FrmCqi ARGS((
-         U8                  crntCqi,
-         U8                  trgCqi,
+static S8 rgSCHPwrGetDelta2FrmCqi ARGS((
+         uint8_t                  crntCqi,
+         uint8_t                  trgCqi,
          RgSchUeCb           *ue,
          RgSchCellCb         *cell
          ));
-PRIVATE Void rgSCHPwrGetPuschTpc ARGS((
-         U8                  isAcc,
+static Void rgSCHPwrGetPuschTpc ARGS((
+         uint8_t                  isAcc,
          S8                  delta,
          S8                  availPwr,
-         U8                 *tpc,
+         uint8_t                 *tpc,
          S8                 *tpcDelta
          ));
-PRIVATE U8 rgSCHPwrGetMaxRb ARGS((
+static uint8_t rgSCHPwrGetMaxRb ARGS((
          RgSchCellCb          *cell,
          S8                  pwr
          ));
-PRIVATE U8 rgSCHPwrRbToPwr ARGS((
+static uint8_t rgSCHPwrRbToPwr ARGS((
          RgSchCellCb          *cell,
-         U8                  numRb
+         uint8_t                  numRb
          ));
-PRIVATE Void rgSCHPwrSchedPucchRnti ARGS((
+static Void rgSCHPwrSchedPucchRnti ARGS((
          RgSchCellCb          *cell,
          RgSchCmnTpcRntiCb    *cb,
          RgSchPdcch           *pdcch,
          RgSchDlSf            *dlSf,
          Bool                 *sched
          ));
-PRIVATE Void rgSCHPwrPuschCntrl ARGS((
+static Void rgSCHPwrPuschCntrl ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue
          ));
-PRIVATE Void rgSCHPwrPucchCntrl ARGS((
+static Void rgSCHPwrPucchCntrl ARGS((
          RgSchCellCb *cell,
          RgSchUeCb   *ue
          ));
-PRIVATE Void rgSCHPwrSchedPuschRnti ARGS((
+static Void rgSCHPwrSchedPuschRnti ARGS((
          RgSchCellCb          *cell,
          RgSchCmnTpcRntiCb    *cb,
          RgSchPdcch           *pdcch,
          RgSchUlSf            *ulSf,
          Bool                 *sched
          ));
-PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe ARGS((
+static Void rgSCHPwrGetPucchFmt3TpcForUe ARGS((
          RgSchUeCb            *ue,
-         U8                   *tpc,
+         uint8_t                   *tpc,
          S8                   *delta
          ));
-PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe ARGS((
+static Void rgSCHPwrGetPucchFmt3aTpcForUe ARGS((
          RgSchUeCb            *ue,
-         U8                   *tpc,
+         uint8_t                   *tpc,
          S8                   *delta
          ));
-PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe ARGS((
+static Void rgSCHPwrGetPuschFmt3TpcForUe ARGS((
          RgSchUeCb            *ue,
-         U8                   *tpc,
+         uint8_t                   *tpc,
          S8                   *delta
          ));
-PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe ARGS((
+static Void rgSCHPwrGetPuschFmt3aTpcForUe ARGS((
          RgSchUeCb            *ue,
-         U8                   *tpc,
+         uint8_t                   *tpc,
          S8                   *delta
          ));
-PRIVATE Void rgSCHPwrGetAcc1bitTpc ARGS((
+static Void rgSCHPwrGetAcc1bitTpc ARGS((
          S8                    remPwr,
-         U8                   *tpc,
+         uint8_t                   *tpc,
          S8                   *delta
          ));
-PRIVATE Void rgSCHPwrGetAcc2bitTpc ARGS((
+static Void rgSCHPwrGetAcc2bitTpc ARGS((
          S8                   remPwr,
-         U8                  *tpc,
+         uint8_t                  *tpc,
          S8                  *delta
          ));
-PRIVATE Void rgSCHPwrGetAbsTpc ARGS((
+static Void rgSCHPwrGetAbsTpc ARGS((
          S8                   remPwr,
-         U8                  *tpc,
+         uint8_t                  *tpc,
          S8                  *delta
          ));
-PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe  ARGS((
+static Void rgSCHPwrOnPucchGrpPwrForUe  ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue,
          S8                    delta
          ));
-PRIVATE Void rgSCHPwrOnPuschGrpPwrForUe  ARGS((
+static Void rgSCHPwrOnPuschGrpPwrForUe  ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue,
          S8                    delta
          ));
-PRIVATE Bool rgSCHPwrIsDlUeSched ARGS((
+static Bool rgSCHPwrIsDlUeSched ARGS((
          RgSchCellCb            *cell,
          RgSchUeCb            *ue,
          RgSchDlSf            *sf
          ));
-PRIVATE Bool rgSCHPwrIsUlUeSched ARGS((
+static Bool rgSCHPwrIsUlUeSched ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue,
          RgSchUlSf            *sf
          ));
-PRIVATE Void rgSCHPwrOnSchedPucchTpc ARGS((
+static Void rgSCHPwrOnSchedPucchTpc ARGS((
          RgSchCellCb           *cell,
          RgSchUeCb             *ue,
          S8                     delta
          ));
-PRIVATE Void rgSCHPwrOnSchedPuschTpc ARGS((
+static Void rgSCHPwrOnSchedPuschTpc ARGS((
          RgSchCellCb           *cell,
          RgSchUeCb             *ue
          ));
-PRIVATE S16 rgSCHPwrApplyUePwrCfg  ARGS((
+static S16 rgSCHPwrApplyUePwrCfg  ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue,
          RgrUeUlPwrCfg        *pwrCfg
          ));
-PRIVATE Void rgSCHPwrUeResetPucch ARGS((
+static Void rgSCHPwrUeResetPucch ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue
          ));
-PRIVATE Void rgSCHPwrUeResetPusch ARGS((
+static Void rgSCHPwrUeResetPusch ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue
          ));
-PRIVATE Void rgSCHPwrOnPuschPwrUpd ARGS((
+static Void rgSCHPwrOnPuschPwrUpd ARGS((
          RgSchCellCb          *cell,
          RgSchUeCb            *ue
          ));
-PRIVATE Void rgSCHPwrAddRntiToPucchRntiLst  ARGS((
+static Void rgSCHPwrAddRntiToPucchRntiLst  ARGS((
          RgSchCellCb          *cell,
          CmLteRnti             rnti,
          Bool                  isFmt3a
          ));
-PRIVATE Void rgSCHPwrAddRntiToPuschRntiLst  ARGS((
+static Void rgSCHPwrAddRntiToPuschRntiLst  ARGS((
          RgSchCellCb          *cell,
          CmLteRnti             rnti,
          Bool                  isFmt3a
          ));
-PRIVATE Void rgSCHPwrInitTpcRntiCb  ARGS((
+static Void rgSCHPwrInitTpcRntiCb  ARGS((
          RgSchCmnTpcRntiCb    *cb,
          CmLteRnti             rnti,
          Bool                  isFmt3a
          ));
-PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb ARGS((
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb ARGS((
          RgSchCellCb *cell,
          CmLteRnti   tpcRnti
          ));
-PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb ARGS((
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb ARGS((
          RgSchCellCb *cell,
          CmLteRnti   tpcRnti
          ));
-PRIVATE Void rgSCHPwrAddUeToPucchTpcRntiCb ARGS((
+static Void rgSCHPwrAddUeToPucchTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrDelUeFrmPucchTpcRntiCb ARGS((
+static Void rgSCHPwrDelUeFrmPucchTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb ARGS((
+static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb ARGS((
+static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrRmvSchdPucchTpcRntiCb ARGS((
+static Void rgSCHPwrRmvSchdPucchTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb
          ));
-PRIVATE Void rgSCHPwrAddSchdUeToPucchTpcRntiCb ARGS((
+static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrAddSchdPucchTpcRntiCb ARGS((
+static Void rgSCHPwrAddSchdPucchTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb
          ));
-PRIVATE Void rgSCHPwrAddUeToPuschTpcRntiCb ARGS((
+static Void rgSCHPwrAddUeToPuschTpcRntiCb ARGS((
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrAddSchdUeToPuschTpcRntiCb ARGS((
+static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrDelUeFrmPuschTpcRntiCb ARGS((
+static Void rgSCHPwrDelUeFrmPuschTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb ARGS((
+static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb ARGS((
+static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb,
          RgSchUeCb             *ue
          ));
-PRIVATE Void rgSCHPwrAddSchdPuschTpcRntiCb ARGS((
+static Void rgSCHPwrAddSchdPuschTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb
          ));
-PRIVATE Void rgSCHPwrRmvSchdPuschTpcRntiCb ARGS((
+static Void rgSCHPwrRmvSchdPuschTpcRntiCb ARGS((
          RgSchCellCb           *cell,
          RgSchCmnTpcRntiCb     *cb
          ));
-PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx ARGS((
+static S16 rgSCHPwrChkPucchTpcRntiIdx ARGS((
          RgSchCmnTpcRntiCb     *cb,
-         U8                     idx
+         uint8_t                     idx
          ));
-PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx ARGS((
+static S16 rgSCHPwrChkPuschTpcRntiIdx ARGS((
          RgSchCmnTpcRntiCb     *cb,
-         U8                     idx
+         uint8_t                     idx
          ));
-PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx ARGS((
+static S16 rgSCHPwrChkUniqPucchTpcRntiIdx ARGS((
          RgSchCmnTpcRntiCb     *cb,
-         U8                     idx
+         uint8_t                     idx
          ));
-PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx ARGS((
+static S16 rgSCHPwrChkUniqPuschTpcRntiIdx ARGS((
          RgSchCmnTpcRntiCb     *cb,
-         U8                     idx
+         uint8_t                     idx
          ));
-PRIVATE S16 rgSCHPwrChkTpcRntiIdx ARGS((
+static S16 rgSCHPwrChkTpcRntiIdx ARGS((
          RgSchCmnTpcRntiCb     *cb,
-         U8                     idx
+         uint8_t                     idx
          ));
-PRIVATE S8 rgSCHPwrGetPhValFromPhr ARGS((
-         U8                    phr
+static S8 rgSCHPwrGetPhValFromPhr ARGS((
+         uint8_t                    phr
          ));
-PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax ARGS((
-         U8                    pCMax
+static S8 rgSCHPwrGetPCMaxValFromPCMax ARGS((
+         uint8_t                    pCMax
          ));
 
 /* local defines */
@@ -377,14 +377,14 @@ Void
 Void rgSCHPwrInit()
 #endif
 {
-   U8             idx;
+   uint8_t             idx;
 
    rgSchPwrCqiToPwrTbl[0] = 0;  /* This should never be used anyway */
    for (idx = 1; idx < RG_SCH_CMN_UL_NUM_CQI; ++idx)
    {
       rgSchPwrCqiToPwrTbl[idx] = rgSCHPwrCalcEfficncyPwr(rgSchCmnUlCqiTbl[idx].eff);
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -394,7 +394,7 @@ Void rgSCHPwrInit()
  *     Desc : Returns power corresponding to coding efficiency
  *            when beta pusch is assumed 1.
  *
- *     Ret  : U8
+ *     Ret  : uint8_t
  *
  *     Notes:
  *
@@ -402,13 +402,13 @@ Void rgSCHPwrInit()
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S8 rgSCHPwrGetCqiPwr
+static S8 rgSCHPwrGetCqiPwr
 (
-U8                  cqi
+uint8_t                  cqi
 )
 #else
-PRIVATE S8 rgSCHPwrGetCqiPwr(cqi)
-U8                  cqi;
+static S8 rgSCHPwrGetCqiPwr(cqi)
+uint8_t                  cqi;
 #endif
 {
 
@@ -422,7 +422,7 @@ U8                  cqi;
  *     Desc : If MCS control is enabled for UE, returns
  *            power corresponding to CQI, else 0.
  *
- *     Ret  : U8
+ *     Ret  : uint8_t
  *
  *     Notes:
  *
@@ -430,17 +430,17 @@ U8                  cqi;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S8 rgSCHPwrGetCqiPwrForUe
+static S8 rgSCHPwrGetCqiPwrForUe
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
-U8                  cqi
+uint8_t                  cqi
 )
 #else
-PRIVATE S8 rgSCHPwrGetCqiPwrForUe(cell, ue, cqi)
+static S8 rgSCHPwrGetCqiPwrForUe(cell, ue, cqi)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
-U8                  cqi;
+uint8_t                  cqi;
 #endif
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
@@ -459,7 +459,7 @@ U8                  cqi;
  *     Desc : Computes power corresponding to a coding
  *            efficiency.
  *
- *     Ret  : U8
+ *     Ret  : uint8_t
  *
  *     Notes: Assumes beta pusch to be 1
  *
@@ -467,13 +467,13 @@ U8                  cqi;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S8 rgSCHPwrCalcEfficncyPwr
+static S8 rgSCHPwrCalcEfficncyPwr
 (
-U32                 eff
+uint32_t                 eff
 )
 #else
-PRIVATE S8 rgSCHPwrCalcEfficncyPwr(eff)
-U32                 eff;
+static S8 rgSCHPwrCalcEfficncyPwr(eff)
+uint32_t                 eff;
 #endif
 {
    F64          ks = 1.25; /* or F64 */
@@ -505,16 +505,16 @@ U32                 eff;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
- *  @return  U8
+ *  @return  uint8_t
  **/
 #ifdef ANSI
-U8 rgSCHPwrPuschTpcForUe
+uint8_t rgSCHPwrPuschTpcForUe
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue
 )
 #else
-U8 rgSCHPwrPuschTpcForUe(cell, ue)
+uint8_t rgSCHPwrPuschTpcForUe(cell, ue)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 #endif
@@ -550,13 +550,13 @@ RgSchUeCb   *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-U8 rgSCHPwrGetMaxUlRb
+uint8_t rgSCHPwrGetMaxUlRb
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue
 )
 #else
-U8 rgSCHPwrGetMaxUlRb(cell, ue)
+uint8_t rgSCHPwrGetMaxUlRb(cell, ue)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 #endif
@@ -600,13 +600,13 @@ RgSchUeCb   *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrPuschCntrl
+static Void rgSCHPwrPuschCntrl
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue
 )
 #else
-PRIVATE Void rgSCHPwrPuschCntrl(cell, ue)
+static Void rgSCHPwrPuschCntrl(cell, ue)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 #endif
@@ -616,15 +616,15 @@ RgSchUeCb   *ue;
    RgSchCmnUlCell *cellUl      = RG_SCH_CMN_GET_UL_CELL(cell);
    S8                  delta;
 #ifdef TFU_UPGRADE
-   U8                  cqi     = ueUl->validUlCqi;
+   uint8_t                  cqi     = ueUl->validUlCqi;
    S32                 tmp;
 #else
-   U8                  cqi     = ueUl->crntUlCqi[0];
+   uint8_t                  cqi     = ueUl->crntUlCqi[0];
 #endif
    Bool                isAcc   = uePwr->isAccumulated;
-   U8                  tpc;
+   uint8_t                  tpc;
    S8                  availPwr;
-   U8                  maxRb;
+   uint8_t                  maxRb;
 
    UNUSED(cell);
 
@@ -675,7 +675,7 @@ RgSchUeCb   *ue;
    uePwr->delta   = delta;
    uePwr->maxUlRbs = maxRb;
    uePwr->puschTpc = tpc;
-   RETVOID;
+   return;
 }
 
 /**
@@ -695,16 +695,16 @@ RgSchUeCb   *ue;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
- *  @return  U8
+ *  @return  uint8_t
  **/
 #ifdef ANSI
-U8 rgSCHPwrPucchTpcForUe
+uint8_t rgSCHPwrPucchTpcForUe
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue
 )
 #else
-U8 rgSCHPwrPucchTpcForUe(cell, ue)
+uint8_t rgSCHPwrPucchTpcForUe(cell, ue)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 #endif
@@ -731,20 +731,20 @@ RgSchUeCb   *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S8 rgSCHPwrGetDelta2FrmCqi
+static S8 rgSCHPwrGetDelta2FrmCqi
 (
-U8                  crntCqi,
-U8                  trgCqi,
-RgSchUeCb           *ue,
-RgSchCellCb         *cell
+uint8_t                  crntCqi,
+uint8_t                  trgCqi,
+RgSchUeCb                *ue,
+RgSchCellCb              *cell
 
 )
 #else
-PRIVATE S8 rgSCHPwrGetDelta2FrmCqi(crntCqi, trgCqi)
-U8                  crntCqi;
-U8                  trgCqi;
-RgSchUeCb           *ue;
-RgSchCellCb         *cell;
+static S8 rgSCHPwrGetDelta2FrmCqi(crntCqi, trgCqi)
+uint8_t                  crntCqi;
+uint8_t                  trgCqi;
+RgSchUeCb                *ue;
+RgSchCellCb              *cell;
 #endif
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
@@ -784,20 +784,20 @@ RgSchCellCb         *cell;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetPuschTpc
+static Void rgSCHPwrGetPuschTpc
 (
-U8                  isAcc,
+uint8_t                  isAcc,
 S8                  delta,
 S8                  availPwr,
-U8                 *tpc,
+uint8_t                 *tpc,
 S8                 *tpcDelta
 )
 #else
-PRIVATE Void rgSCHPwrGetPuschTpc(isAcc, delta, availPwr, tpc, tpcDelta)
-U8                  isAcc;
+static Void rgSCHPwrGetPuschTpc(isAcc, delta, availPwr, tpc, tpcDelta)
+uint8_t                  isAcc;
 S8                  delta;
 S8                  availPwr;
-U8                 *tpc;
+uint8_t                 *tpc;
 S8                 *tpcDelta;
 #endif
 {
@@ -814,7 +814,7 @@ S8                 *tpcDelta;
    {
       rgSCHPwrGetAbsTpc(delta, tpc, tpcDelta);
    }
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetPuschTpc */
 
 /***********************************************************
@@ -825,7 +825,7 @@ S8                 *tpcDelta;
  *            expected to be supported by the passed
  *            power headroom.
  *
- *     Ret  : U8
+ *     Ret  : uint8_t
  *
  *     Notes:
  *
@@ -833,13 +833,13 @@ S8                 *tpcDelta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE U8 rgSCHPwrGetMaxRb
+static uint8_t rgSCHPwrGetMaxRb
 (
 RgSchCellCb        *cell,
 S8                  pwr
 )
 #else
-PRIVATE U8 rgSCHPwrGetMaxRb(cell, pwr)
+static uint8_t rgSCHPwrGetMaxRb(cell, pwr)
 RgSchCellCb        *cell;
 S8                  pwr;
 #endif
@@ -858,7 +858,7 @@ S8                  pwr;
    {
       return (cellUl->maxUlBwPerUe);
    }
-   return (RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(U8)pwr]));
+   return (RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(uint8_t)pwr]));
 }  /* rgSCHPwrGetMaxRb */
 
 /***********************************************************
@@ -867,7 +867,7 @@ S8                  pwr;
  *
  *     Desc : Get the power corresponding to number of RBs
  *
- *     Ret  : U8
+ *     Ret  : uint8_t
  *
  *     Notes:
  *
@@ -875,15 +875,15 @@ S8                  pwr;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE U8 rgSCHPwrRbToPwr
+static uint8_t rgSCHPwrRbToPwr
 (
 RgSchCellCb          *cell,
-U8                  numRb
+uint8_t                  numRb
 )
 #else
-PRIVATE U8 rgSCHPwrRbToPwr(cell,numRb)
+static uint8_t rgSCHPwrRbToPwr(cell,numRb)
 RgSchCellCb          *cell;
-U8                  numRb;
+uint8_t                  numRb;
 #endif
 {
 #ifndef NO_ERRCLS
@@ -916,13 +916,13 @@ U8                  numRb;
  *  @return  Void
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrPucchCntrl
+static Void rgSCHPwrPucchCntrl
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue
 )
 #else
-PRIVATE Void rgSCHPwrPucchCntrl(cell, ue)
+static Void rgSCHPwrPucchCntrl(cell, ue)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 #endif
@@ -932,7 +932,7 @@ RgSchUeCb   *ue;
 
    rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, &uePwr->pucchTpc, &delta);
    rgSCHPwrOnSchedPucchTpc(cell, ue, delta);
-   RETVOID;
+   return;
 }
 
 /**
@@ -1016,7 +1016,7 @@ RgSchDlSf   *dlSf;
        * be scheduled again */
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -1100,7 +1100,7 @@ RgSchUlSf   *ulSf;
        * be scheduled again */
    }
 
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -1117,7 +1117,7 @@ RgSchUlSf   *ulSf;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrSchedPucchRnti
+static Void rgSCHPwrSchedPucchRnti
 (
 RgSchCellCb          *cell,
 RgSchCmnTpcRntiCb    *cb,
@@ -1126,7 +1126,7 @@ RgSchDlSf            *dlSf,
 Bool                 *sched
 )
 #else
-PRIVATE Void rgSCHPwrSchedPucchRnti(cell, cb, pdcch, dlSf, sched)
+static Void rgSCHPwrSchedPucchRnti(cell, cb, pdcch, dlSf, sched)
 RgSchCellCb          *cell;
 RgSchCmnTpcRntiCb    *cb;
 RgSchPdcch           *pdcch;
@@ -1136,8 +1136,8 @@ Bool                 *sched;
 {
    CmLListCp         *lst;
    CmLList           *lnk;
-   U8                *tpcCmds;
-   U8                 tpc;
+   uint8_t                *tpcCmds;
+   uint8_t                 tpc;
    S8                 delta;
    Bool               atleastOne;
 
@@ -1230,7 +1230,7 @@ Bool                 *sched;
        rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb);
     }
 
-   RETVOID;
+   return;
 }  /* rgSCHPwrSchedPucchRnti */
 
 /***********************************************************
@@ -1247,7 +1247,7 @@ Bool                 *sched;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrSchedPuschRnti
+static Void rgSCHPwrSchedPuschRnti
 (
 RgSchCellCb          *cell,
 RgSchCmnTpcRntiCb    *cb,
@@ -1256,7 +1256,7 @@ RgSchUlSf            *ulSf,
 Bool                 *sched
 )
 #else
-PRIVATE Void rgSCHPwrSchedPuschRnti(cell, cb, pdcch, ulSf, sched)
+static Void rgSCHPwrSchedPuschRnti(cell, cb, pdcch, ulSf, sched)
 RgSchCellCb          *cell;
 RgSchCmnTpcRntiCb    *cb;
 RgSchPdcch           *pdcch;
@@ -1266,8 +1266,8 @@ Bool                 *sched;
 {
    CmLListCp         *lst;
    CmLList           *lnk;
-   U8                *tpcCmds;
-   U8                 tpc;
+   uint8_t                *tpcCmds;
+   uint8_t                 tpc;
    S8                 delta;
    Bool               atleastOne;
 
@@ -1359,7 +1359,7 @@ Bool                 *sched;
        rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb);
     }
 
-   RETVOID;
+   return;
 }  /* rgSCHPwrSchedPuschRnti */
 
 /***********************************************************
@@ -1376,23 +1376,23 @@ Bool                 *sched;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe
+static Void rgSCHPwrGetPucchFmt3TpcForUe
 (
 RgSchUeCb            *ue,
-U8                   *tpc,
+uint8_t                   *tpc,
 S8                   *delta
 )
 #else
-PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe(ue, tpc, delta)
+static Void rgSCHPwrGetPucchFmt3TpcForUe(ue, tpc, delta)
 RgSchUeCb            *ue;
-U8                   *tpc;
+uint8_t                   *tpc;
 S8                   *delta;
 #endif
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
    rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, tpc, delta);
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetPucchFmt3TpcForUe */
 
 /***********************************************************
@@ -1409,23 +1409,23 @@ S8                   *delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe
+static Void rgSCHPwrGetPucchFmt3aTpcForUe
 (
 RgSchUeCb            *ue,
-U8                   *tpc,
+uint8_t                   *tpc,
 S8                   *delta
 )
 #else
-PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe(ue, tpc, delta)
+static Void rgSCHPwrGetPucchFmt3aTpcForUe(ue, tpc, delta)
 RgSchUeCb            *ue;
-U8                   *tpc;
+uint8_t                   *tpc;
 S8                   *delta;
 #endif
 {
    RgSchCmnUeUlPwrCb     *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
 
    rgSCHPwrGetAcc1bitTpc(uePwr->remPucchPwr, tpc, delta);
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetPucchFmt3aTpcForUe */
 
 /***********************************************************
@@ -1442,16 +1442,16 @@ S8                   *delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe
+static Void rgSCHPwrGetPuschFmt3TpcForUe
 (
 RgSchUeCb            *ue,
-U8                   *tpc,
+uint8_t                   *tpc,
 S8                   *delta
 )
 #else
-PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe(ue, tpc, delta)
+static Void rgSCHPwrGetPuschFmt3TpcForUe(ue, tpc, delta)
 RgSchUeCb            *ue;
-U8                   *tpc;
+uint8_t                   *tpc;
 S8                   *delta;
 #endif
 {
@@ -1459,7 +1459,7 @@ S8                   *delta;
    S8                     adj = RGSCH_MIN(uePwr->remPuschPwr, uePwr->phVal);
 
    rgSCHPwrGetAcc2bitTpc(adj, tpc, delta);
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetPuschFmt3TpcForUe */
 
 /***********************************************************
@@ -1476,16 +1476,16 @@ S8                   *delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe
+static Void rgSCHPwrGetPuschFmt3aTpcForUe
 (
 RgSchUeCb            *ue,
-U8                   *tpc,
+uint8_t                   *tpc,
 S8                   *delta
 )
 #else
-PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe(ue, tpc, delta)
+static Void rgSCHPwrGetPuschFmt3aTpcForUe(ue, tpc, delta)
 RgSchUeCb            *ue;
-U8                   *tpc;
+uint8_t                   *tpc;
 S8                   *delta;
 #endif
 {
@@ -1494,7 +1494,7 @@ S8                   *delta;
    /* Don't attempt to look at headroom now, power
     * adjustment is small anyway */
    rgSCHPwrGetAcc1bitTpc(uePwr->remPuschPwr, tpc, delta);
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetPuschFmt3aTpcForUe */
 
 /***********************************************************
@@ -1511,16 +1511,16 @@ S8                   *delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetAcc1bitTpc
+static Void rgSCHPwrGetAcc1bitTpc
 (
 S8                    remPwr,
-U8                   *tpc,
+uint8_t                   *tpc,
 S8                   *delta
 )
 #else
-PRIVATE Void rgSCHPwrGetAcc1bitTpc(remPwr, tpc, delta)
+static Void rgSCHPwrGetAcc1bitTpc(remPwr, tpc, delta)
 S8                    remPwr;
-U8                   *tpc;
+uint8_t                   *tpc;
 S8                   *delta;
 #endif
 {
@@ -1539,7 +1539,7 @@ S8                   *delta;
       *delta = 1;
       *tpc = 1;
    }
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetAcc1bitTpc */
 
 /***********************************************************
@@ -1556,16 +1556,16 @@ S8                   *delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetAcc2bitTpc
+static Void rgSCHPwrGetAcc2bitTpc
 (
 S8                   remPwr,
-U8                  *tpc,
+uint8_t                  *tpc,
 S8                  *delta
 )
 #else
-PRIVATE Void rgSCHPwrGetAcc2bitTpc(remPwr, tpc, delta)
+static Void rgSCHPwrGetAcc2bitTpc(remPwr, tpc, delta)
 S8                   remPwr;
-U8                  *tpc;
+uint8_t                  *tpc;
 S8                  *delta;
 #endif
 {
@@ -1576,8 +1576,8 @@ S8                  *delta;
     *  2      1
     *  3      3
     */
-   U8            tpcs[3]   = {1, 2, 2};
-   U8            deltas[3] = {0, 1, 1};
+   uint8_t            tpcs[3]   = {1, 2, 2};
+   uint8_t            deltas[3] = {0, 1, 1};
    if (remPwr <= -1)
    {
       *tpc   = 0;
@@ -1590,10 +1590,10 @@ S8                  *delta;
    }
    else
    {
-      *tpc   = tpcs[(U8)remPwr];
-      *delta = deltas[(U8)remPwr];
+      *tpc   = tpcs[(uint8_t)remPwr];
+      *delta = deltas[(uint8_t)remPwr];
    }
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetAcc2bitTpc */
 
 /***********************************************************
@@ -1610,16 +1610,16 @@ S8                  *delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrGetAbsTpc
+static Void rgSCHPwrGetAbsTpc
 (
 S8                   remPwr,
-U8                  *tpc,
+uint8_t                  *tpc,
 S8                  *delta
 )
 #else
-PRIVATE Void rgSCHPwrGetAbsTpc(remPwr, tpc, delta)
+static Void rgSCHPwrGetAbsTpc(remPwr, tpc, delta)
 S8                   remPwr;
-U8                  *tpc;
+uint8_t                  *tpc;
 S8                  *delta;
 #endif
 {
@@ -1650,7 +1650,7 @@ S8                  *delta;
       *tpc = 3;
       *delta = 4;
    }
-   RETVOID;
+   return;
 }  /* rgSCHPwrGetAbsTpc */
 
 /***********************************************************
@@ -1675,14 +1675,14 @@ S8                  *delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe 
+static Void rgSCHPwrOnPucchGrpPwrForUe 
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 S8                    delta
 )
 #else
-PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe(cell, ue, delta)
+static Void rgSCHPwrOnPucchGrpPwrForUe(cell, ue, delta)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 S8                    delta;
@@ -1712,7 +1712,7 @@ S8                    delta;
        * this will happen in the caller once this
        * function is called for every UE scheduled. */
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -1737,14 +1737,14 @@ S8                    delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrOnPuschGrpPwrForUe 
+static Void rgSCHPwrOnPuschGrpPwrForUe 
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 S8                    delta
 )
 #else
-PRIVATE Void rgSCHPwrOnPuschGrpPwrForUe(cell, ue, delta)
+static Void rgSCHPwrOnPuschGrpPwrForUe(cell, ue, delta)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 S8                    delta;
@@ -1782,7 +1782,7 @@ S8                    delta;
        * this will happen in the caller once this
        * function is called for every UE scheduled. */
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -1799,14 +1799,14 @@ S8                    delta;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Bool rgSCHPwrIsDlUeSched
+static Bool rgSCHPwrIsDlUeSched
 (
 RgSchCellCb            *cell,
 RgSchUeCb            *ue,
 RgSchDlSf            *sf
 )
 #else
-PRIVATE Bool rgSCHPwrIsDlUeSched(cell, ue, sf)
+static Bool rgSCHPwrIsDlUeSched(cell, ue, sf)
 RgSchCellCb            *cell;
 RgSchUeCb            *ue;
 RgSchDlSf            *sf;
@@ -1864,14 +1864,14 @@ RgSchDlSf            *sf;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Bool rgSCHPwrIsUlUeSched
+static Bool rgSCHPwrIsUlUeSched
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 RgSchUlSf            *sf
 )
 #else
-PRIVATE Bool rgSCHPwrIsUlUeSched(cell, ue, sf)
+static Bool rgSCHPwrIsUlUeSched(cell, ue, sf)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 RgSchUlSf            *sf;
@@ -1931,7 +1931,7 @@ RgSchUlSf            *sf;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
- *  @param[in]  U8           pwrDelta
+ *  @param[in]  uint8_t           pwrDelta
  *  @return  Void
  **/
 #ifdef ANSI
@@ -1956,7 +1956,7 @@ S8          pwrDelta;
    
    if ((cb = uePwr->tpcPucchRntiCb) == NULLP)
    {
-      RETVOID;
+      return;
    }
 
    toAdd = FALSE;
@@ -1976,7 +1976,7 @@ S8          pwrDelta;
       rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -2001,14 +2001,14 @@ S8          pwrDelta;
  *  @return  Void
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrOnSchedPucchTpc
+static Void rgSCHPwrOnSchedPucchTpc
 (
 RgSchCellCb           *cell,
 RgSchUeCb             *ue,
 S8                     delta
 )
 #else
-PRIVATE Void rgSCHPwrOnSchedPucchTpc(cell, ue, delta)
+static Void rgSCHPwrOnSchedPucchTpc(cell, ue, delta)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
 S8                     delta;
@@ -2024,7 +2024,7 @@ S8                     delta;
 
    if (uePwr->schdPucchGrpLnk.node == NULLP)
    {
-      RETVOID;
+      return;
    }
 
    /* UE was scheduled for TPC, sent TPC may
@@ -2043,7 +2043,7 @@ S8                     delta;
          rgSCHPwrRmvSchdPucchTpcRntiCb(cell, uePwr->tpcPucchRntiCb);
       }
    }
-   RETVOID;
+   return;
 }
 
 
@@ -2064,13 +2064,13 @@ S8                     delta;
  *  @return  Void
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrOnSchedPuschTpc
+static Void rgSCHPwrOnSchedPuschTpc
 (
 RgSchCellCb           *cell,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrOnSchedPuschTpc(cell, ue)
+static Void rgSCHPwrOnSchedPuschTpc(cell, ue)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
 #endif
@@ -2081,7 +2081,7 @@ RgSchUeCb             *ue;
    /* Don't do anything for the case of absolute TPC commands */
    if (!uePwr->isAccumulated)
    {
-      RETVOID;
+      return;
    }
 
    uePwr->remPuschPwr -= uePwr->delta;
@@ -2093,7 +2093,7 @@ RgSchUeCb             *ue;
 
    if (uePwr->schdPuschGrpLnk.node == NULLP)
    {
-      RETVOID;
+      return;
    }
 
    /* UE was scheduled for pusch TPC, sent TPC may
@@ -2109,7 +2109,7 @@ RgSchUeCb             *ue;
       rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -2140,7 +2140,7 @@ RgInfExtPhrCEInfo     *extPhr;
 RgSchCmnAllocRecord   *allocInfo;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
    RgInfExtPhrSCellInfo  *servCellPhr;
    S8                     pCMax;
 
@@ -2159,7 +2159,7 @@ RgSchCmnAllocRecord   *allocInfo;
       rgSCHPwrUpdPhr(ue->cellInfo[servCellPhr->sCellIdx]->cell,
             ue, servCellPhr->phr, allocInfo, pCMax);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -2194,9 +2194,9 @@ RgSchCmnAllocRecord   *allocInfo;
  *
  *  @param[in]  RgSchCellCb         *cell
  *  @param[in]  RgSchUeCb           *ue
- *  @param[in]  U8                   phr
+ *  @param[in]  uint8_t                   phr
  *  @param[in]  RgSchCmnAllocRecord  allocInfo
- *  @param[in]  U8                   maxUePwr
+ *  @param[in]  uint8_t                   maxUePwr
  *  @return  Void
  **/
 #ifdef ANSI
@@ -2204,7 +2204,7 @@ Void rgSCHPwrUpdPhr
 (
 RgSchCellCb           *cell,
 RgSchUeCb             *ue,
-U8                     phr,
+uint8_t                     phr,
 RgSchCmnAllocRecord   *allocInfo,
 S8                     maxUePwr 
 )
@@ -2212,14 +2212,14 @@ S8                     maxUePwr
 Void rgSCHPwrUpdPhr(cell, ue, phr, allocInfo, maxUePwr)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
-U8                     phr;
+uint8_t                     phr;
 RgSchCmnAllocRecord   *allocInfo;
 S8                     maxUePwr;
 #endif
 {
    RgSchCmnUeUlPwrCb     *uePwr   = RG_SCH_PWR_GETUEPWR(ue, cell);
-   U8                     rbPwr;
-   U8                     effPwr;
+   uint8_t                     rbPwr;
+   uint8_t                     effPwr;
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 
    uePwr->phVal = rgSCHPwrGetPhValFromPhr(phr);
@@ -2252,7 +2252,7 @@ S8                     maxUePwr;
             allocInfo->cqi,
             allocInfo->numRb,  
             uePwr->pwrPerRb); 
-   RETVOID;
+   return;
 }
 
 /**
@@ -2272,7 +2272,7 @@ S8                     maxUePwr;
  *
  *  @param[in]  RgSchCellCb         *cell
  *  @param[in]  RgSchUeCb           *ue
- *  @param[in]  U8                   numRb
+ *  @param[in]  uint8_t                   numRb
  *  @return  Void
  **/
 #ifdef ANSI
@@ -2329,7 +2329,7 @@ RgSchUeCb             *ue;
    }
 #endif 
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -2352,7 +2352,7 @@ RgSchUeCb             *ue;
  *
  *  @param[in]  RgSchCellCb         *cell
  *  @param[in]  RgSchUeCb           *ue
- *  @param[in]  U8                   numRb
+ *  @param[in]  uint8_t                   numRb
  *  @return  Void
  **/
 #ifdef ANSI
@@ -2360,18 +2360,18 @@ Void rgSCHPwrRecordRbAlloc
 (
 RgSchCellCb           *cell,
 RgSchUeCb             *ue,
-U8                     numRb
+uint8_t                     numRb
 )
 #else
 Void rgSCHPwrRecordRbAlloc(cell, ue, numRb)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
-U8                     numRb;
+uint8_t                     numRb;
 #endif
 {
    RgSchCmnUeUlPwrCb     *uePwr   = RG_SCH_PWR_GETUEPWR(ue, cell);
    UNUSED(cell);
-   RETVOID; 
+   return; 
 
    if (uePwr->isPhrAvail)
    {
@@ -2379,7 +2379,7 @@ U8                     numRb;
       uePwr->phVal = RGSCH_MIN(40, uePwr->phVal);
    }
    uePwr->numRb = numRb;
-   RETVOID;
+   return;
 }
 
 /**
@@ -2423,7 +2423,7 @@ RgrCellCfg           *cfg;
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
    CmLteRnti              rnti;
    CmLteRnti              startRnti;
-   U16                    size;
+   uint16_t                    size;
    Bool                   isFmt3a;
 
    /* Right now, all UEs have fixed maximum power capability. So
@@ -2545,7 +2545,7 @@ RgSchCellCb *cell;
    UNUSED(cell);
 
    /* There is no allocated memory, so do nothing */
-   RETVOID;
+   return;
 }
 
 
@@ -2760,14 +2760,14 @@ RgrUeRecfg  *recfg;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgSCHPwrApplyUePwrCfg 
+static S16 rgSCHPwrApplyUePwrCfg 
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 RgrUeUlPwrCfg        *pwrCfg
 )
 #else
-PRIVATE S16 rgSCHPwrApplyUePwrCfg(cell, ue, pwrCfg)
+static S16 rgSCHPwrApplyUePwrCfg(cell, ue, pwrCfg)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 RgrUeUlPwrCfg        *pwrCfg;
@@ -2778,8 +2778,8 @@ RgrUeUlPwrCfg        *pwrCfg;
    RgSchCmnUeUlPwrCb     *uePwr       = RG_SCH_PWR_GETUEPWR(ue, cell);
    RgSchCmnTpcRntiCb     *pucchRntiCb = NULLP;
    RgSchCmnTpcRntiCb     *puschRntiCb = NULLP;
-   U8                     pucchIdx    = 0;
-   U8                     puschIdx    = 0;
+   uint8_t                     pucchIdx    = 0;
+   uint8_t                     puschIdx    = 0;
 
    /* Validate Pucch group power control config */
    if (pwrCfg->uePucchPwr.pres)
@@ -2831,8 +2831,8 @@ RgrUeUlPwrCfg        *pwrCfg;
 #ifndef ALIGN_64BIT
       RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
                "<GRP_PWR>PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d",
-               pucchRntiCb->cfgdUes.count,((U32)pucchRntiCb->cfgdUes.first),
-               ((U32)pucchRntiCb->cfgdUes.last),ue->ueId);
+               pucchRntiCb->cfgdUes.count,((uint32_t)pucchRntiCb->cfgdUes.first),
+               ((uint32_t)pucchRntiCb->cfgdUes.last),ue->ueId);
       RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId,
                "UEID:%d isFmt3a(%u) ueNode(%ld)",
                ue->ueId,pucchRntiCb->isFmt3a,
@@ -2840,14 +2840,14 @@ RgrUeUlPwrCfg        *pwrCfg;
       RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
                "toBeSchdUes(%ld %lu %lu) tpcRnti(%u)", 
                pucchRntiCb->toBeSchdUes.count, 
-               ((U32)pucchRntiCb->toBeSchdUes.first),
-               ((U32)pucchRntiCb->toBeSchdUes.last), 
+               ((uint32_t)pucchRntiCb->toBeSchdUes.first),
+               ((uint32_t)pucchRntiCb->toBeSchdUes.last), 
                pucchRntiCb->tpcRnti);
 #else
       RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
                "<GRP_PWR>PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d",
-               pucchRntiCb->cfgdUes.count,((U64)pucchRntiCb->cfgdUes.first),
-               ((U64)pucchRntiCb->cfgdUes.last),ue->ueId);
+               pucchRntiCb->cfgdUes.count,((uint64_t)pucchRntiCb->cfgdUes.first),
+               ((uint64_t)pucchRntiCb->cfgdUes.last),ue->ueId);
       RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId,
                "UEID:%d isFmt3a(%u) ueNode(%ld)",
                ue->ueId,pucchRntiCb->isFmt3a,
@@ -2855,8 +2855,8 @@ RgrUeUlPwrCfg        *pwrCfg;
       RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
                "toBeSchdUes(%ld %lu %lu) tpcRnti(%u)", 
                pucchRntiCb->toBeSchdUes.count, 
-               ((U64)pucchRntiCb->toBeSchdUes.first),
-               ((U64)pucchRntiCb->toBeSchdUes.last), 
+               ((uint64_t)pucchRntiCb->toBeSchdUes.first),
+               ((uint64_t)pucchRntiCb->toBeSchdUes.last), 
                pucchRntiCb->tpcRnti);
 
 #endif
@@ -2945,7 +2945,7 @@ RgSchUeCb             *ue;
       rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
       uePwr->tpcPuschRntiCb = NULLP;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -2981,7 +2981,7 @@ RgSchUeCb             *ue;
 
    rgSCHPwrUeResetPucch(cell, ue);
    rgSCHPwrUeResetPusch(cell, ue);
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -2999,13 +2999,13 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrUeResetPucch 
+static Void rgSCHPwrUeResetPucch 
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue
 )
 #else
-PRIVATE Void rgSCHPwrUeResetPucch(cell, ue)
+static Void rgSCHPwrUeResetPucch(cell, ue)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 #endif
@@ -3020,7 +3020,7 @@ RgSchUeCb            *ue;
    }
 
    /* Stack Crash problem for TRACE5 changes. Added the line below */
-  RETVOID;
+  return;
  
 }
 
@@ -3039,13 +3039,13 @@ RgSchUeCb            *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrUeResetPusch 
+static Void rgSCHPwrUeResetPusch 
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue
 )
 #else
-PRIVATE Void rgSCHPwrUeResetPusch(cell, ue)
+static Void rgSCHPwrUeResetPusch(cell, ue)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 #endif
@@ -3062,7 +3062,7 @@ RgSchUeCb            *ue;
    {
       rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3080,13 +3080,13 @@ RgSchUeCb            *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrOnPuschPwrUpd 
+static Void rgSCHPwrOnPuschPwrUpd 
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue
 )
 #else
-PRIVATE Void rgSCHPwrOnPuschPwrUpd(cell, ue)
+static Void rgSCHPwrOnPuschPwrUpd(cell, ue)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 #endif
@@ -3097,7 +3097,7 @@ RgSchUeCb            *ue;
 
    if ((cb = uePwr->tpcPuschRntiCb) == NULLP)
    {
-      RETVOID;
+      return;
    }
 
    /* Not checking for uwPwr->isPhrAvail as uePwr->phVal
@@ -3120,7 +3120,7 @@ RgSchUeCb            *ue;
       rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue);
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -3141,14 +3141,14 @@ RgSchUeCb            *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddRntiToPucchRntiLst 
+static Void rgSCHPwrAddRntiToPucchRntiLst 
 (
 RgSchCellCb          *cell,
 CmLteRnti             rnti,
 Bool                  isFmt3a
 )
 #else
-PRIVATE Void rgSCHPwrAddRntiToPucchRntiLst(cell, rnti, isFmt3a)
+static Void rgSCHPwrAddRntiToPucchRntiLst(cell, rnti, isFmt3a)
 RgSchCellCb          *cell;
 CmLteRnti             rnti;
 Bool                  isFmt3a;
@@ -3158,7 +3158,7 @@ Bool                  isFmt3a;
 
    rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPucchRntiLst[cellPwr->tpcPucchRntiCnt++],
        rnti, isFmt3a);
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3178,14 +3178,14 @@ Bool                  isFmt3a;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddRntiToPuschRntiLst 
+static Void rgSCHPwrAddRntiToPuschRntiLst 
 (
 RgSchCellCb          *cell,
 CmLteRnti             rnti,
 Bool                  isFmt3a
 )
 #else
-PRIVATE Void rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a)
+static Void rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a)
 RgSchCellCb          *cell;
 CmLteRnti             rnti;
 Bool                  isFmt3a;
@@ -3195,7 +3195,7 @@ Bool                  isFmt3a;
 
    rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPuschRntiLst[cellPwr->tpcPuschRntiCnt++], 
        rnti, isFmt3a);
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3213,14 +3213,14 @@ Bool                  isFmt3a;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrInitTpcRntiCb 
+static Void rgSCHPwrInitTpcRntiCb 
 (
 RgSchCmnTpcRntiCb    *cb,
 CmLteRnti             rnti,
 Bool                  isFmt3a
 )
 #else
-PRIVATE Void rgSCHPwrInitTpcRntiCb(cb, rnti, isFmt3a)
+static Void rgSCHPwrInitTpcRntiCb(cb, rnti, isFmt3a)
 RgSchCmnTpcRntiCb    *cb;
 CmLteRnti             rnti;
 Bool                  isFmt3a;
@@ -3232,7 +3232,7 @@ Bool                  isFmt3a;
    cb->isFmt3a = isFmt3a;
    /* Not initialising lists as memset 0 takes care of it */
    /* cb->schdLnk.node is set when this rnti is to be scheduled */
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3251,19 +3251,19 @@ Bool                  isFmt3a;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb
 (
 RgSchCellCb *cell,
 CmLteRnti   tpcRnti
 )
 #else
-PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb(cell, tpcRnti)
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb(cell, tpcRnti)
 RgSchCellCb *cell;
 CmLteRnti   tpcRnti;
 #endif
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
-   U16                    idx;
+   uint16_t                    idx;
 
    if (!cellPwr->tpcPucchRntiCnt)
    {
@@ -3295,19 +3295,19 @@ CmLteRnti   tpcRnti;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb
 (
 RgSchCellCb *cell,
 CmLteRnti   tpcRnti
 )
 #else
-PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb(cell, tpcRnti)
+static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb(cell, tpcRnti)
 RgSchCellCb *cell;
 CmLteRnti   tpcRnti;
 #endif
 {
    RgSchCmnUlPwrCb       *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
-   U16                    idx;
+   uint16_t                    idx;
 
    if (!cellPwr->tpcPuschRntiCnt)
    {
@@ -3339,14 +3339,14 @@ CmLteRnti   tpcRnti;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddUeToPucchTpcRntiCb
+static Void rgSCHPwrAddUeToPucchTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrAddUeToPucchTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrAddUeToPucchTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3357,7 +3357,7 @@ RgSchUeCb             *ue;
 
    cmLListAdd2Tail(&cb->cfgdUes, &uePwr->pucchGrpLnk);
    uePwr->pucchGrpLnk.node = (PTR)ue;
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3375,14 +3375,14 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrDelUeFrmPucchTpcRntiCb
+static Void rgSCHPwrDelUeFrmPucchTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrDelUeFrmPucchTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrDelUeFrmPucchTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3393,7 +3393,7 @@ RgSchUeCb             *ue;
    rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue);
    cmLListDelFrm(&cb->cfgdUes, &uePwr->pucchGrpLnk);
    uePwr->pucchGrpLnk.node = NULLP;
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3412,14 +3412,14 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb
+static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3429,14 +3429,14 @@ RgSchUeCb             *ue;
 
    if (uePwr->schdPucchGrpLnk.node == NULLP)
    {
-      RETVOID;
+      return;
    }
    rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue);
    if (!cb->toBeSchdUes.count)
    {
       rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb);
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3456,14 +3456,14 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb
+static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3476,7 +3476,7 @@ RgSchUeCb             *ue;
       cmLListDelFrm(&cb->toBeSchdUes, &uePwr->schdPucchGrpLnk);
       uePwr->schdPucchGrpLnk.node = NULLP;
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3494,13 +3494,13 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrRmvSchdPucchTpcRntiCb
+static Void rgSCHPwrRmvSchdPucchTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb
 )
 #else
-PRIVATE Void rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb)
+static Void rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 #endif
@@ -3509,11 +3509,11 @@ RgSchCmnTpcRntiCb     *cb;
 
    if (cb->schdLnk.node == NULLP)
    {
-      RETVOID;
+      return;
    }
    cmLListDelFrm(&cellPwr->pucchGrpPwr, &cb->schdLnk);
    cb->schdLnk.node = NULLP;
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3531,14 +3531,14 @@ RgSchCmnTpcRntiCb     *cb;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddSchdUeToPucchTpcRntiCb
+static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrAddSchdUeToPucchTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3549,7 +3549,7 @@ RgSchUeCb             *ue;
    if (uePwr->schdPucchGrpLnk.node != NULLP)
    {
       /* UE is already in the list */
-      RETVOID;
+      return;
    }
    cmLListAdd2Tail(&cb->toBeSchdUes, &uePwr->schdPucchGrpLnk);
    uePwr->schdPucchGrpLnk.node = (PTR)ue;
@@ -3559,7 +3559,7 @@ RgSchUeCb             *ue;
        * for scheduling */
       rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb);
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3577,13 +3577,13 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddSchdPucchTpcRntiCb
+static Void rgSCHPwrAddSchdPucchTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb
 )
 #else
-PRIVATE Void rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb)
+static Void rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 #endif
@@ -3592,7 +3592,7 @@ RgSchCmnTpcRntiCb     *cb;
 
    cmLListAdd2Tail(&cellPwr->pucchGrpPwr, &cb->schdLnk);
    cb->schdLnk.node = (PTR)cb;
-   RETVOID;
+   return;
 }
 
 
@@ -3611,13 +3611,13 @@ RgSchCmnTpcRntiCb     *cb;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddUeToPuschTpcRntiCb
+static Void rgSCHPwrAddUeToPuschTpcRntiCb
 (
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrAddUeToPuschTpcRntiCb(cb, ue)
+static Void rgSCHPwrAddUeToPuschTpcRntiCb(cb, ue)
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
 #endif
@@ -3626,7 +3626,7 @@ RgSchUeCb             *ue;
 
    cmLListAdd2Tail(&cb->cfgdUes, &uePwr->puschGrpLnk);
    uePwr->puschGrpLnk.node = (PTR)ue;
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3644,14 +3644,14 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddSchdUeToPuschTpcRntiCb
+static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrAddSchdUeToPuschTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3662,7 +3662,7 @@ RgSchUeCb             *ue;
    if (uePwr->schdPuschGrpLnk.node != NULLP)
    {
       /* UE is already in the list */
-      RETVOID;
+      return;
    }
    cmLListAdd2Tail(&cb->toBeSchdUes, &uePwr->schdPuschGrpLnk);
    uePwr->schdPuschGrpLnk.node = (PTR)ue;
@@ -3672,7 +3672,7 @@ RgSchUeCb             *ue;
        * for scheduling */
       rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb);
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3690,14 +3690,14 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrDelUeFrmPuschTpcRntiCb
+static Void rgSCHPwrDelUeFrmPuschTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3708,7 +3708,7 @@ RgSchUeCb             *ue;
    rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue);
    cmLListDelFrm(&cb->cfgdUes, &uePwr->puschGrpLnk);
    uePwr->puschGrpLnk.node = NULLP;
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3726,14 +3726,14 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb
+static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3743,14 +3743,14 @@ RgSchUeCb             *ue;
 
    if (uePwr->schdPuschGrpLnk.node == NULLP)
    {
-      RETVOID;
+      return;
    }
    rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue);
    if (!cb->toBeSchdUes.count)
    {
       rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb);
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3770,14 +3770,14 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb
+static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb,
 RgSchUeCb             *ue
 )
 #else
-PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue)
+static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 RgSchUeCb             *ue;
@@ -3790,7 +3790,7 @@ RgSchUeCb             *ue;
       cmLListDelFrm(&cb->toBeSchdUes, &uePwr->schdPuschGrpLnk);
       uePwr->schdPuschGrpLnk.node = NULLP;
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3808,13 +3808,13 @@ RgSchUeCb             *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrAddSchdPuschTpcRntiCb
+static Void rgSCHPwrAddSchdPuschTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb
 )
 #else
-PRIVATE Void rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb)
+static Void rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 #endif
@@ -3823,7 +3823,7 @@ RgSchCmnTpcRntiCb     *cb;
 
    cmLListAdd2Tail(&cellPwr->puschGrpPwr, &cb->schdLnk);
    cb->schdLnk.node = (PTR)cb;
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3841,13 +3841,13 @@ RgSchCmnTpcRntiCb     *cb;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE Void rgSCHPwrRmvSchdPuschTpcRntiCb
+static Void rgSCHPwrRmvSchdPuschTpcRntiCb
 (
 RgSchCellCb           *cell,
 RgSchCmnTpcRntiCb     *cb
 )
 #else
-PRIVATE Void rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb)
+static Void rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb)
 RgSchCellCb           *cell;
 RgSchCmnTpcRntiCb     *cb;
 #endif
@@ -3856,11 +3856,11 @@ RgSchCmnTpcRntiCb     *cb;
 
    if (cb->schdLnk.node == NULLP)
    {
-      RETVOID;
+      return;
    }
    cmLListDelFrm(&cellPwr->puschGrpPwr, &cb->schdLnk);
    cb->schdLnk.node = NULLP;
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -3879,15 +3879,15 @@ RgSchCmnTpcRntiCb     *cb;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx
+static S16 rgSCHPwrChkPucchTpcRntiIdx
 (
 RgSchCmnTpcRntiCb     *cb,
-U8                     idx
+uint8_t                     idx
 )
 #else
-PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx(cb, idx)
+static S16 rgSCHPwrChkPucchTpcRntiIdx(cb, idx)
 RgSchCmnTpcRntiCb     *cb;
-U8                     idx;
+uint8_t                     idx;
 #endif
 {
 
@@ -3918,15 +3918,15 @@ U8                     idx;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx
+static S16 rgSCHPwrChkPuschTpcRntiIdx
 (
 RgSchCmnTpcRntiCb     *cb,
-U8                     idx
+uint8_t                     idx
 )
 #else
-PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx(cb, idx)
+static S16 rgSCHPwrChkPuschTpcRntiIdx(cb, idx)
 RgSchCmnTpcRntiCb     *cb;
-U8                     idx;
+uint8_t                     idx;
 #endif
 {
 
@@ -3955,15 +3955,15 @@ U8                     idx;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx
+static S16 rgSCHPwrChkUniqPucchTpcRntiIdx
 (
 RgSchCmnTpcRntiCb     *cb,
-U8                     idx
+uint8_t                     idx
 )
 #else
-PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx)
+static S16 rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx)
 RgSchCmnTpcRntiCb     *cb;
-U8                     idx;
+uint8_t                     idx;
 #endif
 {
    CmLList           *lnk;
@@ -3994,15 +3994,15 @@ U8                     idx;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx
+static S16 rgSCHPwrChkUniqPuschTpcRntiIdx
 (
 RgSchCmnTpcRntiCb     *cb,
-U8                     idx
+uint8_t                     idx
 )
 #else
-PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx)
+static S16 rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx)
 RgSchCmnTpcRntiCb     *cb;
-U8                     idx;
+uint8_t                     idx;
 #endif
 {
    CmLList           *lnk;
@@ -4033,15 +4033,15 @@ U8                     idx;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S16 rgSCHPwrChkTpcRntiIdx
+static S16 rgSCHPwrChkTpcRntiIdx
 (
 RgSchCmnTpcRntiCb     *cb,
-U8                     idx
+uint8_t                     idx
 )
 #else
-PRIVATE S16 rgSCHPwrChkTpcRntiIdx(cb, idx)
+static S16 rgSCHPwrChkTpcRntiIdx(cb, idx)
 RgSchCmnTpcRntiCb     *cb;
-U8                     idx;
+uint8_t                     idx;
 #endif
 {
    if (cb->isFmt3a)
@@ -4078,13 +4078,13 @@ U8                     idx;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax
+static S8 rgSCHPwrGetPCMaxValFromPCMax
 (
-U8                    pCMax
+uint8_t                    pCMax
 )
 #else
-PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax)
-U8                    pCMax;
+static S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax)
+uint8_t                    pCMax;
 #endif
 {
    return ((pCMax & 63) - 30);
@@ -4108,13 +4108,13 @@ U8                    pCMax;
  *
  **********************************************************/
 #ifdef ANSI
-PRIVATE S8 rgSCHPwrGetPhValFromPhr
+static S8 rgSCHPwrGetPhValFromPhr
 (
-U8                    phr
+uint8_t                    phr
 )
 #else
-PRIVATE S8 rgSCHPwrGetPhValFromPhr(phr)
-U8                    phr;
+static S8 rgSCHPwrGetPhValFromPhr(phr)
+uint8_t                    phr;
 #endif
 {
    return ((phr & 63) - 23);