U8, U16, U32 data type changes
[o-du/l2.git] / src / 5gnrsch / rg_sch_cmn.c
index 75fa54a..5ddf9b5 100755 (executable)
@@ -37,16 +37,7 @@ static int RLOG_FILE_ID=187;
 static int RLOG_MODULE_ID=4096;
 
 /* 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_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
-#include "cm5.h"
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -60,15 +51,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -84,8 +66,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #ifdef EMTC_ENABLE
-EXTERN U32 emtcStatsUlTomSrInd;
-EXTERN U32 emtcStatsUlBsrTmrTxp;
+EXTERN uint32_t emtcStatsUlTomSrInd;
+EXTERN uint32_t emtcStatsUlBsrTmrTxp;
 #endif
 
 #define RG_ITBS_DIFF(_x, _y) ((_x) > (_y) ? (_x) - (_y) : (_y) - (_x))
@@ -122,12 +104,12 @@ EXTERN Void rgSCHEmtcRrUlProcRmvFrmRetx ARGS((RgSchCellCb *cell, RgSchUlHqProcCb
 EXTERN S16 rgSCHCmnPrecompEmtcMsg3Vars
 ARGS((
 RgSchCmnUlCell *cellUl,
-U8           ccchCqi,
-U16          msgSzA,
-U8           sbSize,
+uint8_t           ccchCqi,
+uint16_t          msgSzA,
+uint8_t           sbSize,
 Bool         isEcp
 ));
-PUBLIC Void rgSCHEmtcCmnUeCcchSduDel
+Void rgSCHEmtcCmnUeCcchSduDel
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb
@@ -157,25 +139,93 @@ PRIVATE Void rgSCHChkNUpdSiCfg ARGS((RgSchCellCb  *cell));
 PRIVATE Void rgSCHSelectSi ARGS((RgSchCellCb *cell));
 #endif /*RGR_SI_SCH*/
 /* LTE_ADV_FLAG_REMOVED_START */
+#ifdef UNUSED_FUNC
 #ifndef LTE_TDD
 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 RgSchDlSf          *dlSf,
-U8                 rbStrt,
-U8                 numRb
+uint8_t                 rbStrt,
+uint8_t                 numRb
 );
 PRIVATE S16 rgSCHCmnBuildRntpInfo (
 RgSchCellCb        *cell,
-U8                 *rntpPtr,
-U8                  startRb,
-U8                  nmbRb,
-U16                 bw
+uint8_t                 *rntpPtr,
+uint8_t                  startRb,
+uint8_t                  nmbRb,
+uint16_t                 bw
 );
 #endif
+PRIVATE Void rgSCHCmnNonDlfsType0Alloc
+(
+RgSchCellCb        *cell,
+RgSchDlSf          *dlSf,
+RgSchDlRbAlloc     *allocInfo,
+RgSchUeCb          *ue
+);
+PRIVATE uint8_t rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29};
+PRIVATE Void rgSCHCmnUlNonadapRetx ARGS((
+RgSchCmnUlCell  *cellUl,
+RgSchUlAlloc    *alloc,
+uint8_t               idx
+));
+PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ARGS((
+RgSchCellCb *cell,
+RgSchUlSf   *sf
+));
+
+#ifdef TFU_UPGRADE
+PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS((
+RgSchCellCb  *cell,
+RgSchUeCb    *ue,
+uint32_t          maxRb,
+uint32_t          *numSb,
+uint8_t           *iTbs,
+uint32_t          hqSz,
+uint32_t          stepDownItbs,
+uint32_t          effTgt
+));
+#endif
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+uint8_t                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+uint8_t                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+uint8_t                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+uint8_t                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+uint8_t                         tpc
+));
 
-PUBLIC Void rgSCHCmnDlSpsSch
+#endif
+
+Void rgSCHCmnDlSpsSch
 (
  RgSchCellCb        *cell
 );
@@ -233,12 +283,12 @@ PRIVATE S16 rgSCHCmnUeDlPwrCtColltCqiRept ARGS((
 PRIVATE Void rgSCHCmnGetRefreshPer ARGS((
    RgSchCellCb  *cell,
    RgSchUeCb    *ue,
-   U32          *waitPer));
+   uint32_t          *waitPer));
 PRIVATE S16 rgSCHCmnApplyUeRefresh ARGS((
 RgSchCellCb     *cell,
 RgSchUeCb       *ue));
 #ifdef DL_LA
-PUBLIC Void rgSCHCmnDlSetUeAllocLmtLa ARGS
+Void rgSCHCmnDlSetUeAllocLmtLa ARGS
 ((
 RgSchCellCb   *cell,
 RgSchUeCb     *ue
@@ -251,39 +301,32 @@ RgSchUeCb     *ue
 #endif
 
 #ifdef LTE_TDD
-PRIVATE U32 rgSCHCmnCalcDwPtsTbSz ARGS
+PRIVATE uint32_t rgSCHCmnCalcDwPtsTbSz ARGS
 ((
 RgSchCellCb    *cell,
-U32             bo,
-U8             *rb,
-U8             *iTbs,
-U8              lyr,
-U8              cfi
+uint32_t             bo,
+uint8_t             *rb,
+uint8_t             *iTbs,
+uint8_t              lyr,
+uint8_t              cfi
 ));
 
 PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw ARGS
 ((
 RgSchCellCb    *cell,
-U32             bo,
-U8             *rb,
-U8              maxRb,
-U8             *iTbs1,
-U8             *iTbs2,
-U8              lyr1,
-U8              lyr2,
-U32            *tb1Sz, 
-U32            *tb2Sz, 
-U8              cfi
+uint32_t             bo,
+uint8_t             *rb,
+uint8_t              maxRb,
+uint8_t             *iTbs1,
+uint8_t             *iTbs2,
+uint8_t              lyr1,
+uint8_t              lyr2,
+uint32_t            *tb1Sz, 
+uint32_t            *tb2Sz, 
+uint8_t              cfi
 ));
 
 #endif
-PRIVATE Void rgSCHCmnNonDlfsType0Alloc
-(
-RgSchCellCb        *cell,
-RgSchDlSf          *dlSf,
-RgSchDlRbAlloc     *allocInfo,
-RgSchUeCb          *ue
-);
 PRIVATE Void  rgSCHCmnInitRbAlloc ARGS 
 ((
 RgSchCellCb        *cell
@@ -294,7 +337,7 @@ RgSchCellCb        *cell
 
 
 /* local defines */
-PUBLIC  RgSchdApis          rgSchCmnApis;
+ RgSchdApis          rgSchCmnApis;
 PRIVATE RgUlSchdApis        rgSchUlSchdTbl[RGSCH_NUM_SCHEDULERS];
 PRIVATE RgDlSchdApis        rgSchDlSchdTbl[RGSCH_NUM_SCHEDULERS];
 #ifdef EMTC_ENABLE
@@ -315,52 +358,16 @@ PRIVATE RgDlfsSchdInits     rgSchDlfsSchdInits = RGSCH_DLFSSCHED_INITS;
 #endif
 
 typedef Void (*RgSchCmnDlAllocRbFunc) ARGS((RgSchCellCb *cell, RgSchDlSf *subFrm,
-RgSchUeCb *ue, U32 bo, U32 *effBo, RgSchDlHqProcCb *proc,
+RgSchUeCb *ue, uint32_t bo, uint32_t *effBo, RgSchDlHqProcCb *proc,
 RgSchCmnDlRbAllocInfo *cellWdAllocInfo));
-typedef U8 (*RgSchCmnDlGetPrecInfFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, 
-      U8 numLyrs, Bool bothCwEnbld));
-
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
+typedef uint8_t (*RgSchCmnDlGetPrecInfFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, 
+      uint8_t numLyrs, Bool bothCwEnbld));
 PRIVATE Void rgSCHCmnDlAllocTxRbTM1 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -368,8 +375,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM2 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -377,8 +384,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM3 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -386,8 +393,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM4 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -396,8 +403,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM5 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -406,8 +413,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM6 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -415,8 +422,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM7 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -424,8 +431,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM1 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -433,8 +440,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM2 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -442,8 +449,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM3 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -451,8 +458,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM4 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -461,8 +468,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM5 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -471,8 +478,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM6 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -480,27 +487,27 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM7 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
 
 #ifdef LTE_ADV 
-PRIVATE U8 rgSchGetN1ResCount ARGS ((
+PRIVATE uint8_t rgSchGetN1ResCount ARGS ((
  RgSchUeCb *ue,
U16       servCellId 
uint16_t       servCellId 
 ));
-PUBLIC Bool rgSchCmnChkDataOnlyOnPcell 
+Bool rgSchCmnChkDataOnlyOnPcell 
 (
  RgSchUeCb         *ue,
  RgSchDlSf         *dlSf
 );
 #endif /*LTE_ADV */
-PUBLIC U8 rgSCHCmnCalcPcqiBitSz
+uint8_t rgSCHCmnCalcPcqiBitSz
 (
  RgSchUeCb    *ueCb, 
U8           numTxAnt
uint8_t           numTxAnt
 );
 
 #ifndef LTE_ADV
@@ -527,28 +534,28 @@ NULLP, rgSCHCmnDlAllocRetxRbTM6, rgSCHCmnDlAllocRetxRbTM7, NULLP, NULLP};
 #endif
 
 
-PRIVATE U8 rgSCHCmnDlTM3PrecInf2 ARGS((
+PRIVATE uint8_t rgSCHCmnDlTM3PrecInf2 ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 ));
-PRIVATE U8 rgSCHCmnDlTM3PrecInf4 ARGS((
+PRIVATE uint8_t rgSCHCmnDlTM3PrecInf4 ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 ));
-PRIVATE U8 rgSCHCmnDlTM4PrecInf2 ARGS((
+PRIVATE uint8_t rgSCHCmnDlTM4PrecInf2 ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 ));
-PRIVATE U8 rgSCHCmnDlTM4PrecInf4 ARGS((
+PRIVATE uint8_t rgSCHCmnDlTM4PrecInf4 ARGS((
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 ));
 /* Functions specific to each transmission mode for DL RB Allocation*/
@@ -562,25 +569,25 @@ RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqTbCb              *tbInfo,
-U8                         noLyr,
-U8                         *numRb,
-U32                        *effBo
+uint8_t                         noLyr,
+uint8_t                         *numRb,
+uint32_t                        *effBo
 ));
 PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *proc,
-U8                         *numRb,
+uint8_t                         *numRb,
 Bool                       *swpFlg,
-U32                        *effBo
+uint32_t                        *effBo
 ));
 PRIVATE Void rgSCHCmnDlTM3TxTx ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -588,8 +595,8 @@ PRIVATE Void rgSCHCmnDlTM3TxRetx ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -597,8 +604,8 @@ PRIVATE Void rgSCHCmnDlTM3RetxRetx ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 ));
@@ -606,16 +613,16 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc ARGS((
 RgSchCellCb        *cell,
 RgSchDlSf          *dlSf,
-U8                 rbStrt,
-U8                 numRb
+uint8_t                 rbStrt,
+uint8_t                 numRb
 ));
 /* LTE_ADV_FLAG_REMOVED_START */
 #ifndef LTE_TDD
 PRIVATE Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc ARGS((
 RgSchCellCb        *cell,
 RgSchDlSf          *dlSf,
-U8                 rbStrt,
-U8                 numRb
+uint8_t                 rbStrt,
+uint8_t                 numRb
 ));
 #endif
 /* LTE_ADV_FLAG_REMOVED_END */
@@ -642,143 +649,131 @@ RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqTbCb              *reTxTb,
 RgSchDlHqTbCb              *txTb,
-U8                         *numRb,
-U32                        *effBo
+uint8_t                         *numRb,
+uint32_t                        *effBo
 ));
 PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *proc,
-U32                        bo,
-U8                         *numRb,
-U32                        *effBo
+uint32_t                        bo,
+uint8_t                         *numRb,
+uint32_t                        *effBo
 ));
 PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqTbCb              *tbInfo,
-U32                        bo,
-U8                         *numRb,
-U32                        *effBo
+uint32_t                        bo,
+uint8_t                         *numRb,
+uint32_t                        *effBo
 ));
 #ifndef LTEMAC_SPS
 PRIVATE Void rgSCHCmnFillHqPTb ARGS((
 RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
-U8                         tbAllocIdx,
+uint8_t                         tbAllocIdx,
 RgSchPdcch                 *pdcch
 ));
 #endif
 #ifdef LTEMAC_SPS
 PRIVATE Void rgSCHCmnDlGetBestFitHole ARGS((
-U32         *allocMask,
-U8          numMaskRbs,
-U32         *crntAllocMask,
-U8          rbsReq,
-U8          *allocStart,
-U8          *allocNumRbs,
+uint32_t         *allocMask,
+uint8_t          numMaskRbs,
+uint32_t         *crntAllocMask,
+uint8_t          rbsReq,
+uint8_t          *allocStart,
+uint8_t          *allocNumRbs,
 Bool        isPartialAlloc
 ));
 #ifdef RGSCH_SPS_UNUSED
-PRIVATE U32 rgSCHCmnGetRaType1Mask ARGS((
-U8                rbIdx,
-U8                rbgSize,
-U8                *type1Subset
+PRIVATE uint32_t rgSCHCmnGetRaType1Mask ARGS((
+uint8_t                rbIdx,
+uint8_t                rbgSize,
+uint8_t                *type1Subset
 ));
 #endif
-PRIVATE U32 rgSCHCmnGetRaType0Mask ARGS((
-U8                rbIdx,
-U8                rbgSize
+PRIVATE uint32_t rgSCHCmnGetRaType0Mask ARGS((
+uint8_t                rbIdx,
+uint8_t                rbgSize
 ));
-PRIVATE U32 rgSCHCmnGetRaType2Mask ARGS((
-U8                rbIdx,
-U8                *maskIdx
+PRIVATE uint32_t rgSCHCmnGetRaType2Mask ARGS((
+uint8_t                rbIdx,
+uint8_t                *maskIdx
 ));
 #endif
 
-PUBLIC Bool rgSCHCmnRetxAllocAvoid ARGS(( 
+Bool rgSCHCmnRetxAllocAvoid ARGS(( 
 RgSchDlSf                  *subFrm,
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *proc
 ));
 
-PUBLIC U16 rgSCHCmnGetSiSetId ARGS((
-U16    sfn,
-U8     sf,
-U16    minPeriodicity
+uint16_t rgSCHCmnGetSiSetId ARGS((
+uint16_t    sfn,
+uint8_t     sf,
+uint16_t    minPeriodicity
 ));
 
-#ifdef TFU_UPGRADE
-PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS((
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-U32          maxRb,
-U32          *numSb,
-U8           *iTbs,
-U32          hqSz,
-U32          stepDownItbs,
-U32          effTgt
-));
-#endif
 
 #ifdef RG_5GTF
 //TODO_SID: Currenly table is only for 100 Prbs. Need to modify wrt VRBG table 8.1.5.2.1-1 V5G_213
-U32 rgSch5gtfTbSzTbl[MAX_5GTF_MCS] = 
+uint32_t rgSch5gtfTbSzTbl[MAX_5GTF_MCS] = 
     {1864, 5256, 8776, 13176, 17576, 21976, 26376, 31656, 35176, 39576, 43976, 47496, 52776, 59376, 66392};
-U32 g5gtfTtiCnt = 0;
-U32 gUl5gtfSrRecv = 0;
-U32 gUl5gtfBsrRecv = 0;
-U32 gUl5gtfUeSchPick = 0;
-U32 gUl5gtfPdcchSchd = 0;
-U32 gUl5gtfAllocAllocated = 0;
-U32 gUl5gtfUeRbAllocDone = 0;
-U32 gUl5gtfUeRmvFnlzZeroBo = 0;
-U32 gUl5gtfUeFnlzReAdd = 0;
-U32 gUl5gtfPdcchSend = 0;
-U32 gUl5gtfRbAllocFail = 0;
-U32 ul5gtfsidUlMarkUl = 0;
-U32 ul5gtfsidDlSchdPass = 0;
-U32 ul5gtfsidDlAlreadyMarkUl = 0;
-U32 ul5gtfTotSchdCnt = 0;
+uint32_t g5gtfTtiCnt = 0;
+uint32_t gUl5gtfSrRecv = 0;
+uint32_t gUl5gtfBsrRecv = 0;
+uint32_t gUl5gtfUeSchPick = 0;
+uint32_t gUl5gtfPdcchSchd = 0;
+uint32_t gUl5gtfAllocAllocated = 0;
+uint32_t gUl5gtfUeRbAllocDone = 0;
+uint32_t gUl5gtfUeRmvFnlzZeroBo = 0;
+uint32_t gUl5gtfUeFnlzReAdd = 0;
+uint32_t gUl5gtfPdcchSend = 0;
+uint32_t gUl5gtfRbAllocFail = 0;
+uint32_t ul5gtfsidUlMarkUl = 0;
+uint32_t ul5gtfsidDlSchdPass = 0;
+uint32_t ul5gtfsidDlAlreadyMarkUl = 0;
+uint32_t ul5gtfTotSchdCnt = 0;
 #endif
 
 /* CQI Offset Index to Beta CQI Offset value mapping,
  * stored as parts per 1000. Reserved is set to 0.
  * Refer 36.213 sec 8.6.3 Tbl 8.6.3-3 */
-PUBLIC U32 rgSchCmnBetaCqiOffstTbl[16] = {0, 0, 1125,
+uint32_t rgSchCmnBetaCqiOffstTbl[16] = {0, 0, 1125,
    1250, 1375, 1625, 1750, 2000, 2250, 2500, 2875,
    3125, 3500, 4000, 5000, 6250};
-PUBLIC U32 rgSchCmnBetaHqOffstTbl[16] =  {2000, 2500, 3125, 
+uint32_t rgSchCmnBetaHqOffstTbl[16] =  {2000, 2500, 3125, 
    4000, 5000, 6250, 8000,10000, 12625, 15875, 20000, 
    31000, 50000,80000,126000,0};
-PUBLIC U32 rgSchCmnBetaRiOffstTbl[16] = {1250, 1625, 2000, 
+uint32_t rgSchCmnBetaRiOffstTbl[16] = {1250, 1625, 2000, 
    2500, 3125, 4000, 5000, 6250, 8000, 10000,12625,
    15875,20000,0,0,0};
-PUBLIC S8 rgSchCmnDlCqiDiffOfst[8] = {0, 1, 2, 3, -4, -3, -2, -1};
+S8 rgSchCmnDlCqiDiffOfst[8] = {0, 1, 2, 3, -4, -3, -2, -1};
 
 /* Include CRS REs while calculating Efficiency */
-CONSTANT PRIVATE U8 rgSchCmnAntIdx[5] = {0,0,1,0,2};
-CONSTANT PRIVATE U8 rgSchCmnNumResForCrs[5] = {0,6,12,0,16};
-U32 cfiSwitchCnt ;
-U32 cfiIncr ;
-U32 cfiDecr ;
+CONSTANT PRIVATE uint8_t rgSchCmnAntIdx[5] = {0,0,1,0,2};
+CONSTANT PRIVATE uint8_t rgSchCmnNumResForCrs[5] = {0,6,12,0,16};
+uint32_t cfiSwitchCnt ;
+uint32_t cfiIncr ;
+uint32_t cfiDecr ;
 
 
 #ifdef TFU_UPGRADE
-PUBLIC S8 rgSchCmnApUeSelDiffCqi[4] = {1, 2, 3, 4};
-PUBLIC S8 rgSchCmnApEnbConfDiffCqi[4] = {0, 1, 2, -1};
+S8 rgSchCmnApUeSelDiffCqi[4] = {1, 2, 3, 4};
+S8 rgSchCmnApEnbConfDiffCqi[4] = {0, 1, 2, -1};
 #endif
 
 typedef struct rgSchCmnDlUeDciFrmtOptns
 {
   TfuDciFormat spfcDciFrmt;   /* TM(Transmission Mode) specific DCI format.
                                * Search space : UE Specific by C-RNTI only. */
-  U8           spfcDciRAType; /* Resource Alloctn(RA) type for spfcDciFrmt */
+  uint8_t           spfcDciRAType; /* Resource Alloctn(RA) type for spfcDciFrmt */
   TfuDciFormat prfrdDciFrmt;  /* Preferred DCI format among the available
                                * options for TD (Transmit Diversity) */
-  U8           prfrdDciRAType; /* Resource Alloctn(RA) type for prfrdDciFrmt */
+  uint8_t           prfrdDciRAType; /* Resource Alloctn(RA) type for prfrdDciFrmt */
 }RgSchCmnDlUeDciFrmtOptns;
 #ifndef LTE_ADV
 
@@ -809,15 +804,15 @@ RgSchCmnDlUeDciFrmtOptns rgSchCmnDciFrmtOptns[9] = {
 
 typedef struct rgSchCmnDlImcsTbl
 {
-  U8   modOdr; /* Modulation Order */
-  U8   iTbs;   /* ITBS */
+  uint8_t   modOdr; /* Modulation Order */
+  uint8_t   iTbs;   /* ITBS */
 }RgSchCmnDlImcsTbl[29];
 
 CONSTANT struct rgSchCmnMult235Info
 {
-   U8   match;    /* Closest number satisfying 2^a.3^b.5^c, with a bias
+   uint8_t   match;    /* Closest number satisfying 2^a.3^b.5^c, with a bias
                   * towards the smaller number */
-   U8   prvMatch; /* Closest number not greater than array index
+   uint8_t   prvMatch; /* Closest number not greater than array index
                   * satisfying 2^a.3^b.5^c */
 } rgSchCmnMult235Tbl[110+1] = {
    {0, 0},  /* dummy */
@@ -843,7 +838,7 @@ CONSTANT struct rgSchCmnMult235Info
 /* BI table from 36.321 Table 7.2.1 */
 CONSTANT PRIVATE S16 rgSchCmnBiTbl[RG_SCH_CMN_NUM_BI_VAL] = {
       0, 10, 20, 30,40,60,80,120,160,240,320,480,960};
-PUBLIC RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = {
+RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = {
  {     0,                0              },
  {RGSCH_CMN_QM_CQI_1,RGSCH_CMN_UL_EFF_CQI_1 },
  {RGSCH_CMN_QM_CQI_2,RGSCH_CMN_UL_EFF_CQI_2 },
@@ -866,7 +861,7 @@ PUBLIC RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = {
 /* This table maps a (delta_offset * 2 + 2) to a (beta * 8)
  * where beta is 10^-(delta_offset/10) rounded off to nearest 1/8
  */
-PRIVATE U16 rgSchCmnUlBeta8Tbl[29] = {
+PRIVATE uint16_t rgSchCmnUlBeta8Tbl[29] = {
    6, RG_SCH_CMN_UL_INVALID_BETA8, 8, 9, 10, 11, 13, 14, 16, 18, 20, 23,
    25, 28, 32, RG_SCH_CMN_UL_INVALID_BETA8, 40, RG_SCH_CMN_UL_INVALID_BETA8,
    50, RG_SCH_CMN_UL_INVALID_BETA8, 64, RG_SCH_CMN_UL_INVALID_BETA8, 80,
@@ -876,7 +871,7 @@ PRIVATE U16 rgSchCmnUlBeta8Tbl[29] = {
 #endif
 
 /* QCI to SVC priority mapping. Index specifies the Qci*/
-PRIVATE U8 rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO;
+PRIVATE uint8_t rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO;
 
 /* The configuration is efficiency measured per 1024 REs.  */
 /* The first element stands for when CQI is not known      */
@@ -887,15 +882,15 @@ PRIVATE U8 rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO;
 
 /* ADD CQI to MCS mapping correction
  * single dimensional array is replaced by 2 dimensions for different CFI*/
-PRIVATE U16 rgSchCmnCqiPdschEff[4][16] = {RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI1,
+PRIVATE uint16_t rgSchCmnCqiPdschEff[4][16] = {RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI1,
     RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI2,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI3};
 
-PRIVATE U16 rgSchCmn2LyrCqiPdschEff[4][16] = {RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI1,
+PRIVATE uint16_t rgSchCmn2LyrCqiPdschEff[4][16] = {RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI1,
     RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI2, RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI3};
 
 /* This configuration determines the transalation of a UEs CQI to its    */
 /* PDCCH coding efficiency. This may be edited based on the installation */
-PRIVATE U8 rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/
+PRIVATE uint8_t rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/
 
 /* Indexed by [DciFrmt].
  * Considering the following definition in determining the dciFrmt index.
@@ -913,14 +908,14 @@ PRIVATE U8 rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/
    TFU_DCI_FORMAT_3A
 } TfuDciFormat;
 */
-PRIVATE U16 rgSchCmnDciFrmtSizes[10];
+PRIVATE uint16_t rgSchCmnDciFrmtSizes[10];
 
 
-PRIVATE U16 rgSchCmnCqiPdcchEff[16] = RG_SCH_CMN_CQI_TO_PDCCH_EFF;
+PRIVATE uint16_t rgSchCmnCqiPdcchEff[16] = RG_SCH_CMN_CQI_TO_PDCCH_EFF;
 
 #ifdef LTE_TDD
 
-PUBLIC RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl = {
+RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl = {
    {RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME,  RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_UL_SUBFRAME},
    {RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME,  RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME},
    {RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME,  RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME,  RG_SCH_TDD_DL_SUBFRAME},
@@ -932,7 +927,7 @@ PUBLIC RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl = {
 
 /* SPS_INTG_FIX */
 #ifdef LTEMAC_SPS
-PUBLIC U8 rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = {
+uint8_t rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = {
    /* 0 */ 6,
    /* 1 */ 7,
    /* 2 */ 8,
@@ -946,7 +941,7 @@ PUBLIC U8 rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = {
 
 /* Special Subframes in OFDM symbols */
 /* ccpu00134197-MOD-Correct the number of symbols */
-PUBLIC RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl = {
+RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl = {
         {3,  1, 1, 3,   1, 1},
         {9,  1, 1, 8,   1, 1},
         {10, 1, 1, 9,   1, 1},
@@ -959,7 +954,7 @@ PUBLIC RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl = {
 };
 
 /* PHICH 'm' value Table */
-PUBLIC RgSchTddPhichMValTbl rgSchTddPhichMValTbl = {
+RgSchTddPhichMValTbl rgSchTddPhichMValTbl = {
         {2, 1, 0, 0, 0, 2, 1, 0, 0, 0},
         {0, 1, 0, 0, 1, 0, 1, 0, 0, 1},
         {0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
@@ -970,7 +965,7 @@ PUBLIC RgSchTddPhichMValTbl rgSchTddPhichMValTbl = {
 };
 
 /* PHICH 'K' value Table */
-PUBLIC RgSchTddKPhichTbl rgSchTddKPhichTbl = {
+RgSchTddKPhichTbl rgSchTddKPhichTbl = {
         {0, 0, 4, 7, 6, 0, 0, 4, 7, 6},
         {0, 0, 4, 6, 0, 0, 0, 4, 6, 0},
         {0, 0, 6, 0, 0, 0, 0, 6, 0, 0},
@@ -981,7 +976,7 @@ PUBLIC RgSchTddKPhichTbl rgSchTddKPhichTbl = {
 };
 
 /* Uplink association index 'K' value Table */
-PUBLIC RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl = {
+RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl = {
         {0, 0, 6, 4, 0, 0, 0, 6, 4, 0},
         {0, 0, 4, 0, 0, 0, 0, 4, 0, 0},
         {0, 0, 4, 4, 4, 0, 0, 0, 0, 0},
@@ -992,7 +987,7 @@ PUBLIC RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl = {
 
 
 /* PUSCH 'K' value Table */
-PUBLIC RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl = {
+RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl = {
         {4, 6, 0, 0, 0, 4, 6, 0, 0, 0},
         {0, 6, 0, 0, 4, 0, 6, 0, 0, 4},
         {0, 0, 0, 4, 0, 0, 0, 0, 4, 0},
@@ -1004,7 +999,7 @@ PUBLIC RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl = {
 
 /* PDSCH to PUCCH Table for DL Harq Feed back. Based on the 
    Downlink association set index 'K' table */
-PUBLIC U8 rgSchTddPucchTxTbl[7][10] = {
+uint8_t rgSchTddPucchTxTbl[7][10] = {
         {4,  6,  0, 0, 0, 4, 6, 0, 0,  0},
         {7,  6,  0, 0, 4, 7, 6, 0, 0,  4},
         {7,  6,  0, 4, 8, 7, 6, 0, 4,  8},
@@ -1033,7 +1028,7 @@ PUBLIC U8 rgSchTddPucchTxTbl[7][10] = {
    So at sf4 the new CFI can be applied. To arrive at sf4 from
    sf0, the sfIdx has to be increased by 3 */  
                  
-PUBLIC U8 rgSchTddPdcchSfIncTbl[7][10] = {
+uint8_t rgSchTddPdcchSfIncTbl[7][10] = {
  /* A/N Bundl: 0,1,5,6*/   {2,  1,  0, 0, 0, 2, 1,  0,  0,  0},
  /* A/N Bundl: 0,4,5,9*/   {2,  2,  0, 0, 3, 2, 2,  0,  0,  3},
  /* A/N Bundl: 4,9*/       {3,  6,  0, 5, 4, 3, 6,  0,  5,  4},
@@ -1048,7 +1043,7 @@ PUBLIC U8 rgSchTddPdcchSfIncTbl[7][10] = {
 #ifdef LTEMAC_SPS
 /* subframe offset values to be used when twoIntervalsConfig is enabled in UL
  * SPS for a UE */
-PUBLIC RgSchTddSfOffTbl rgSchTddSfOffTbl = {
+RgSchTddSfOffTbl rgSchTddSfOffTbl = {
         {0, 0, 0,  0,  0, 0, 0,  0,  0, 0},
         {0, 0, 1, -1,  0, 0, 0,  1, -1, 0},
         {0, 0, 5,  0,  0, 0, 0, -5,  0, 0},
@@ -1064,7 +1059,7 @@ PUBLIC RgSchTddSfOffTbl rgSchTddSfOffTbl = {
  * as that of Msg3SubfrmTbl, indicates competition with msg3.
  * As of now, this is same as Msg3SubfrmTbl (leaving out uldlcfg 2),
  * except that all 255s are now zeros. */
-PUBLIC RgSchTddSpsUlRsrvTbl rgSchTddSpsUlRsrvTbl = {
+RgSchTddSpsUlRsrvTbl rgSchTddSpsUlRsrvTbl = {
         {0,    0,  0,  6,  8,  0, 0,  0,  6,  8},
         {0,    0,  6,  9,  0,  0, 0,  6,  9,  0},
         {0,    0,  10,  0,  0,  0, 0,  10,  0,  0},
@@ -1075,7 +1070,7 @@ PUBLIC RgSchTddSpsUlRsrvTbl rgSchTddSpsUlRsrvTbl = {
 };
 
 /* Inverse DL Assoc Set index Table */
-PUBLIC RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = {
+RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = {
        {4,  6,  0, 0, 0, 4, 6, 0, 0,  0},
        {7,  6,  0, 0, 4, 7, 6, 0, 0,  4},
        {7,  6,  0, 4, 8, 7, 6, 0, 4,  8},
@@ -1088,16 +1083,16 @@ PUBLIC RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = {
 #endif /* (LTEMAC_SPS ) */
 
 /* Number of Uplink subframes Table */
-PRIVATE U8 rgSchTddNumUlSf[] = {6, 4, 2, 3, 2, 1, 5};
+PRIVATE uint8_t rgSchTddNumUlSf[] = {6, 4, 2, 3, 2, 1, 5};
 
 /* Downlink HARQ processes Table */
-PUBLIC RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl = { 7, 4, 2, 3, 2, 1, 6};
+RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl = { 7, 4, 2, 3, 2, 1, 6};
 
 /* Uplink HARQ processes Table */
-PUBLIC RgSchTddDlNumHarqProcTbl rgSchTddDlNumHarqProcTbl = { 4, 7, 10, 9, 12, 15, 6};
+RgSchTddDlNumHarqProcTbl rgSchTddDlNumHarqProcTbl = { 4, 7, 10, 9, 12, 15, 6};
 
 /* Downlink association index set 'K' value Table */
-PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl = {
+RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl = {
         { {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}}, {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}} },
 
         { {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}}, {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}} },
@@ -1116,7 +1111,7 @@ PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl = {
  /* ccpu132282-ADD-the table rgSchTddDlAscSetIdxKTbl is rearranged in 
   * decreasing order of Km, this is used to calculate the NCE used for 
   * calculating N1Pucch Resource for Harq*/
-PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl = {
+RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl = {
         { {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}}, {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}} },
 
         { {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}}, {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}} },
@@ -1134,20 +1129,20 @@ PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl = {
 
 /* Minimum number of Ack/Nack feeback information to be
    stored for each UL-DL configuration */
-PUBLIC RgSchTddANFdbkMapTbl rgSchTddANFdbkMapTbl = {4, 4, 2, 3, 2, 1, 5};
+RgSchTddANFdbkMapTbl rgSchTddANFdbkMapTbl = {4, 4, 2, 3, 2, 1, 5};
 
 /* Uplink switch points and number of UL subframes Table */
-PUBLIC RgSchTddMaxUlSubfrmTbl rgSchTddMaxUlSubfrmTbl = {
+RgSchTddMaxUlSubfrmTbl rgSchTddMaxUlSubfrmTbl = {
      {2,3,3}, {2,2,2}, {2,1,1}, {1,3,0}, {1,2,0}, {1,1,0}, {2,3,2}
 };
 
 /* Uplink switch points and number of DL subframes Table */
-PUBLIC RgSchTddMaxDlSubfrmTbl rgSchTddMaxDlSubfrmTbl = {
+RgSchTddMaxDlSubfrmTbl rgSchTddMaxDlSubfrmTbl = {
      {2,2,2}, {2,3,3}, {2,4,4}, {1,7,0}, {1,8,0}, {1,9,0}, {2,2,3}
 };
 
 /* Number of UL subframes present before a particular subframe */
-PUBLIC RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl = {
+RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl = {
         {0, 0, 1, 2, 3, 3, 3, 4, 5, 6},
         {0, 0, 1, 2, 2, 2, 2, 3, 4, 4},
         {0, 0, 1, 1, 1, 1, 1, 2, 2, 2},
@@ -1158,7 +1153,7 @@ PUBLIC RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl = {
 };
 
 /* Number of DL subframes present till a particular subframe */
-PUBLIC RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl = {
+RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl = {
         {1, 2, 2, 2, 2, 3, 4, 4, 4, 4},
         {1, 2, 2, 2, 3, 4, 5, 5, 5, 6},
         {1, 2, 2, 3, 4, 5, 6, 6, 7, 8},
@@ -1171,7 +1166,7 @@ PUBLIC RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl = {
 
 /* Nearest possible UL subframe Index from UL subframe
  * DL Index < UL Index */
-PUBLIC RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl = {
+RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl = {
         {0, 1, 1, 1, 1, 5, 6, 6, 6, 6},
         {0, 1, 1, 1, 4, 5, 6, 6, 6, 9},
         {0, 1, 1, 3, 4, 5, 6, 6, 8, 9},
@@ -1184,7 +1179,7 @@ PUBLIC RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl = {
 /* Nearest possible DL subframe Index from UL subframe
  * DL Index > UL Index
  * 10 represents Next SFN low DL Idx */
-PUBLIC RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl = {
+RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl = {
         {0, 1, 5, 5, 5, 5, 6, 10, 10, 10},
         {0, 1, 4, 4, 4, 5, 6,  9,  9,  9},
         {0, 1, 3, 3, 4, 5, 6,  8,  8,  9},
@@ -1195,7 +1190,7 @@ PUBLIC RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl = {
 };
 
 /* RACH Message3 related information */
-PUBLIC RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl = {
+RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl = {
         {7,      6,  255,  255,  255,  7,   6,  255,  255,  255},
         {7,      6,  255,  255,    8,  7,   6,  255,  255,    8},
         {7,      6,  255,  9,      8,  7,   6,  255,    9,    8},
@@ -1211,7 +1206,7 @@ PUBLIC RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl = {
 /* DwPTS Scheduling Changes Start */
 /* Provides the number of Cell Reference Signals in DwPTS
  * region per RB */
-PRIVATE U8  rgSchCmnDwptsCrs[2][3] = {/* [Spl Sf cfg][Ant Port] */
+PRIVATE uint8_t  rgSchCmnDwptsCrs[2][3] = {/* [Spl Sf cfg][Ant Port] */
            {4, 8,  16}, /* Spl Sf cfg 1,2,3,6,7,8 */
            {6, 12, 20}, /* Spl Sf cfg 4 */
 };
@@ -1221,7 +1216,7 @@ PRIVATE S8  rgSchCmnSplSfDeltaItbs[9] = RG_SCH_DWPTS_ITBS_ADJ;
 #endif
 
 
-PRIVATE U32 rgSchCmnBsrTbl[64] = {
+PRIVATE uint32_t rgSchCmnBsrTbl[64] = {
    0, 10, 12, 14, 17, 19, 22, 26,
    31, 36, 42, 49, 57, 67, 78, 91,
    107, 125, 146, 171, 200, 234, 274, 321,
@@ -1232,7 +1227,7 @@ PRIVATE U32 rgSchCmnBsrTbl[64] = {
    58255, 68201, 79846, 93479, 109439, 128125, 150000, 220000
 };
 
-PRIVATE U32 rgSchCmnExtBsrTbl[64] = {
+PRIVATE uint32_t rgSchCmnExtBsrTbl[64] = {
    0, 10, 13, 16, 19, 23, 29, 35,
    43, 53, 65, 80, 98, 120, 147, 181,
    223, 274, 337, 414, 509, 625, 769, 945,
@@ -1243,12 +1238,9 @@ PRIVATE U32 rgSchCmnExtBsrTbl[64] = {
    867737, 1067031, 1312097, 1613447, 1984009, 2439678, 3000000, 3100000
 };
 
+uint8_t rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI];
 
-PRIVATE U8 rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29};
-
-PUBLIC U8 rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI];
-
-PUBLIC RgSchTbSzTbl rgTbSzTbl = {
+RgSchTbSzTbl rgTbSzTbl = {
  {
    {16,    32,    56,    88,    120,   152,   176,   208,   224,   256,   288,   328,   344,   376,   392,   424,   456,   488,   504,   536,   568,   600,   616,   648,   680,   712,   744,   776,   776,   808,   840,   872,   904,   936,   968,   1000,  1032,  1032,  1064,  1096,  1128,  1160,  1192,  1224,  1256,  1256,  1288,  1320,  1352,  1384,  1416,  1416,  1480,  1480,  1544,  1544,  1608,  1608,  1608,  1672,  1672,  1736,  1736,  1800,  1800,  1800,  1864,  1864,  1928,  1928,  1992,  1992,  2024,  2088,  2088,  2088,  2152,  2152,  2216,  2216,  2280,  2280,  2280,  2344,  2344,  2408,  2408,  2472,  2472,  2536,  2536,  2536,  2600,  2600,  2664,  2664,  2728,  2728,  2728,  2792,  2792,  2856,  2856,  2856,  2984,  2984,  2984,  2984,  2984,  3112},
    {24,    56,    88,    144,   176,   208,   224,   256,   328,   344,   376,   424,   456,   488,   520,   568,   600,   632,   680,   712,   744,   776,   808,   872,   904,   936,   968,   1000,  1032,  1064,  1128,  1160,  1192,  1224,  1256,  1288,  1352,  1384,  1416,  1416,  1480,  1544,  1544,  1608,  1608,  1672,  1736,  1736,  1800,  1800,  1864,  1864,  1928,  1992,  1992,  2024,  2088,  2088,  2152,  2152,  2216,  2280,  2280,  2344,  2344,  2408,  2472,  2472,  2536,  2536,  2600,  2600,  2664,  2728,  2728,  2792,  2792,  2856,  2856,  2856,  2984,  2984,  2984,  3112,  3112,  3112,  3240,  3240,  3240,  3240,  3368,  3368,  3368,  3496,  3496,  3496,  3496,  3624,  3624,  3624,  3752,  3752,  3752,  3752,  3880,  3880,  3880,  4008,  4008,  4008},
@@ -1346,9 +1338,9 @@ RgSchUeCatTbl rgUeCatTbl = {
 /* [ccpu00138532]-ADD-The below table stores the min HARQ RTT time
    in Downlink for TDD and FDD. Indices 0 to 6 map to tdd UL DL config 0-6. 
    Index 7 map to FDD */    
-U8 rgSchCmnHarqRtt[8] = {4,7,10,9,12,15,6,8};
+uint8_t rgSchCmnHarqRtt[8] = {4,7,10,9,12,15,6,8};
 /* Number of CFI Switchover Index is equals to 7 TDD Indexes + 1 FDD index */
-U8 rgSchCfiSwitchOvrWinLen[] = {7, 4, 2, 3, 2, 1, 6, 8};
+uint8_t rgSchCfiSwitchOvrWinLen[] = {7, 4, 2, 3, 2, 1, 6, 8};
 
 /* EffTbl is calculated for single layer and two layers.
   * CqiToTbs is calculated for single layer and two layers */
@@ -1386,17 +1378,17 @@ PRIVATE S16 rgSCHCmnUeIdleExdThrsld ARGS((
 RgSchCellCb     *cell,
 RgSchUeCb       *ue
 ));
-PUBLIC RgSchUeCb* rgSCHCmnGetHoUe ARGS((
+RgSchUeCb* rgSCHCmnGetHoUe ARGS((
 RgSchCellCb           *cell,
-U16                   rapId
+uint16_t                   rapId
 ));
 PRIVATE Void rgSCHCmnDelDedPreamble ARGS((
 RgSchCellCb           *cell,
-U8                    preambleId
+uint8_t                    preambleId
 ));
-PUBLIC RgSchUeCb* rgSCHCmnGetPoUe ARGS((
+RgSchUeCb* rgSCHCmnGetPoUe ARGS((
 RgSchCellCb           *cell,
-U16                   rapId,
+uint16_t                   rapId,
 CmLteTimingInfo       timingInfo
 ));
 PRIVATE Void rgSCHCmnDelRachInfo ARGS((
@@ -1407,7 +1399,7 @@ PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe ARGS((
 RgSchCellCb           *cell,
 RgSchUlSf             *sf,
 RgSchUeCb             *ue,
-U8                    maxRb
+uint8_t                    maxRb
 ));
 PRIVATE Void rgSCHCmnHdlHoPo ARGS((
 RgSchCellCb           *cell,
@@ -1424,8 +1416,8 @@ PRIVATE Void rgSCHCmnFillPdcchOdr2Sf ARGS((
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
 RgSchPdcch  *pdcc,
-U8          rapId,
-U8          prachMskIdx
+uint8_t          rapId,
+uint8_t          prachMskIdx
 ));
 PRIVATE Void rgSCHCmnDlAdd2PdcchOdrQ ARGS((
 RgSchCellCb                *cell,
@@ -1446,8 +1438,8 @@ RgSchCellCb  *cell,
 RgSchDlSf    *dlSf,
 RgSchUeCb    *ue,
 RgSchPdcch   **pdcch,
-U8           *rapId,
-U8           *prachMskIdx
+uint8_t           *rapId,
+uint8_t           *prachMskIdx
 ));
 PRIVATE Void rgSCHCmnGenPdcchOrder ARGS((
 RgSchCellCb  *cell,
@@ -1512,7 +1504,7 @@ RgSchCellCb *cell
 PRIVATE Void rgSCHCmnAddUeToRefreshQ ARGS((
 RgSchCellCb     *cell,
 RgSchUeCb       *ue,
-U32             wait
+uint32_t             wait
 ));
 PRIVATE Void rgSCHCmnDlCcchRetx ARGS((
 RgSchCellCb             *cell,
@@ -1560,11 +1552,11 @@ PRIVATE Void rgSCHCmnInitVars ARGS((
          RgSchCellCb *cell
          ));
 
-/*ccpu00117180 - DEL - Moved rgSCHCmnUpdVars to .x as its access is now PUBLIC */
+/*ccpu00117180 - DEL - Moved rgSCHCmnUpdVars to .x as its access is now */
 PRIVATE Void rgSCHCmnUlRbAllocForLst ARGS((
          RgSchCellCb           *cell,
          RgSchUlSf             *sf,
-         U32                   count,
+         uint32_t                   count,
          CmLListCp             *reqLst,
          CmLListCp             *schdLst,
          CmLListCp             *nonSchdLst,
@@ -1574,7 +1566,7 @@ PRIVATE S16 rgSCHCmnUlRbAllocForUe ARGS((
          RgSchCellCb           *cell,
          RgSchUlSf             *sf,
          RgSchUeCb             *ue,
-         U8                    maxRb,
+         uint8_t                    maxRb,
          RgSchUlHole           *hole
          ));
 PRIVATE Void rgSCHCmnMsg3GrntReq ARGS((
@@ -1583,14 +1575,8 @@ PRIVATE Void rgSCHCmnMsg3GrntReq ARGS((
          Bool            preamGrpA,
          RgSchUlHqProcCb *hqProc,
          RgSchUlAlloc    **ulAllocRef,
-         U8              *hqProcIdRef
+         uint8_t              *hqProcIdRef
          ));
-PRIVATE Void rgSCHCmnUlNonadapRetx ARGS((
-         RgSchCmnUlCell  *cellUl,
-         RgSchUlAlloc    *alloc,
-         U8               idx
-         ));
-
 PRIVATE Void rgSCHCmnDlCcchRarAlloc ARGS((
 RgSchCellCb             *cell
 ));
@@ -1603,12 +1589,12 @@ RgSchCellCb             *cell,
 RgSchCmnDlRbAllocInfo   *allocInfo,
 RgInfSfAlloc            *subfrmAlloc
 ));
-PUBLIC Bool rgSCHCmnChkInWin ARGS((
+Bool rgSCHCmnChkInWin ARGS((
 CmLteTimingInfo   frm,
 CmLteTimingInfo   start,
 CmLteTimingInfo   end
 ));
-PUBLIC Bool rgSCHCmnChkPastWin ARGS((
+Bool rgSCHCmnChkPastWin ARGS((
 CmLteTimingInfo   frm,
 CmLteTimingInfo   end
 ));
@@ -1616,17 +1602,17 @@ PRIVATE Void rgSCHCmnClcAlloc ARGS((
 RgSchCellCb             *cell,
 RgSchDlSf               *sf,
 RgSchClcDlLcCb          *lch,
-U16                     rnti,
+uint16_t                     rnti,
 RgSchCmnDlRbAllocInfo   *allocInfo
 ));
 #ifndef LTEMAC_SPS
 PRIVATE Void rgSCHCmnClcRbAlloc ARGS((
 RgSchCellCb             *cell,
-U32                     bo,
-U8                      cqi,
-U8                      *rb,
-U32                     *tbs,
-U8                      *mcs,
+uint32_t                     bo,
+uint8_t                      cqi,
+uint8_t                      *rb,
+uint32_t                     *tbs,
+uint8_t                      *mcs,
 RgSchDlSf               *sf 
 ));
 #endif
@@ -1647,9 +1633,9 @@ RgSchCmnDlRbAllocInfo      *allocInfo
 PRIVATE S16 rgSCHCmnRaRspAlloc ARGS((
 RgSchCellCb             *cell,
 RgSchDlSf               *subFrm,
-U16                     rntiIdx,
-U16                     rarnti,
-U8                      noRaRnti,
+uint16_t                     rntiIdx,
+uint16_t                     rarnti,
+uint8_t                      noRaRnti,
 RgSchCmnDlRbAllocInfo   *allocInfo
 ));
 PRIVATE Void rgSCHCmnUlUeDelAllocs ARGS((
@@ -1679,18 +1665,13 @@ RgSchCellCb *cell,
 RgSchUlSf   *sf
 ));
 /* Fix: syed Adaptive Msg3 Retx crash. */
-PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ARGS((
-RgSchCellCb *cell,
-RgSchUlSf   *sf
-));
-
 #ifdef TFU_UPGRADE
 PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS
 ((
 RgSchCellCb *cell,
 RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg,
-U8 numTxPorts
+uint8_t numTxPorts
 ));
 #else
 PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS
@@ -1722,16 +1703,16 @@ RgSchDlRbAlloc        *cmnAllocInfo));
 PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj ARGS((
 RgSchCellCb           *cell,
 RgSchDlRbAlloc        *cmnAllocInfo,
-U8                    pbchSsRsSym,
+uint8_t                    pbchSsRsSym,
 Bool                  isBcchPcch
 ));
 /* Added function to adjust TBSize*/
 PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj ARGS((
 RgSchDlRbAlloc        *allocInfo,
-U8                    numOvrlapgPbchRb,
-U8                    pbchSsRsSym,
-U8                    idx,
-U32                   bytesReq
+uint8_t                    numOvrlapgPbchRb,
+uint8_t                    pbchSsRsSym,
+uint8_t                    idx,
+uint32_t                   bytesReq
 ));
 
 /* Added function to find num of overlapping PBCH rb*/
@@ -1739,27 +1720,29 @@ PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs ARGS((
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo,
-U8                    *numOvrlapgPbchRb
+uint8_t                    *numOvrlapgPbchRb
 ));
 
-PRIVATE U8 rgSCHCmnFindNumAddtlRbsAvl ARGS((
+PRIVATE uint8_t rgSCHCmnFindNumAddtlRbsAvl ARGS((
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo
 ));
 #ifdef DEBUGP
+#ifdef UNUSED_FUNC
 PRIVATE Void rgSCHCmnFindCodeRate ARGS((
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo,
-U8                    idx
+uint8_t                    idx
 ));
 #endif
 #endif
+#endif
 PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc ARGS((
 RgSchCellCb           *cell,
 RgSchCmnMsg4RbAlloc   *msg4AllocInfo,
-U8                    isRetx
+uint8_t                    isRetx
 ));
 PRIVATE S16 rgSCHCmnNonDlfsMsg4RbAlloc ARGS((
 RgSchCellCb           *cell,
@@ -1771,12 +1754,12 @@ PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc ARGS((
 RgSchCellCb           *cell,
 RgSchUeCb             *ue,
 RgSchDlSf             *dlSf,
-U8                    *isDlBwAvail
+uint8_t                    *isDlBwAvail
 ));
 #ifndef LTEMAC_SPS
-PRIVATE U32 rgSCHCmnCalcRiv ARGS(( U8 bw,
-         U8           rbStart,
-         U8           numRb));
+PRIVATE uint32_t rgSCHCmnCalcRiv ARGS(( uint8_t bw,
+         uint8_t           rbStart,
+         uint8_t           numRb));
 #endif
 
 #ifdef LTE_TDD
@@ -1784,14 +1767,14 @@ PRIVATE Void rgSCHCmnUpdHqAndDai ARGS((
 RgSchDlHqProcCb   *hqP,
 RgSchDlSf         *subFrm,
 RgSchDlHqTbCb     *tbCb,
-U8                tbAllocIdx
+uint8_t                tbAllocIdx
 ));
 PRIVATE S16 rgSCHCmnUlCalcAvailBw ARGS((
 RgSchCellCb *cell,
 RgrCellCfg  *cellCfg,
-U8          cfi,
-U8          *rbStartRef,
-U8          *bwAvailRef
+uint8_t          cfi,
+uint8_t          *rbStartRef,
+uint8_t          *bwAvailRef
 ));
 PRIVATE S16 rgSCHCmnDlKdashUlAscInit ARGS((
 RgSchCellCb *cell
@@ -1808,7 +1791,7 @@ RgSchCellCb *cell
 PRIVATE S16 rgSCHCmnDlCpyRachInfo ARGS((
 RgSchCellCb        *cell,
 RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES],
-U8                 raArrSz
+uint8_t                 raArrSz
 ));
 PRIVATE S16 rgSCHCmnDlRachInfoInit ARGS((
 RgSchCellCb *cell
@@ -1822,36 +1805,36 @@ PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt ARGS
 ((
  RgSchCellCb          *cell,
  RgSchUeCb            *ue,
U8                          wideCqi
uint8_t                          wideCqi
  ));
  PRIVATE RgSchCmnRank rgSCHCmnComputeRank ARGS
 ((
  RgrTxMode    txMode,
U32          *pmiBitMap,
U8           numTxPorts
uint32_t          *pmiBitMap,
uint8_t           numTxPorts
  ));
 
  PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3 ARGS
 ((
U32 *pmiBitMap
uint32_t *pmiBitMap
  ));
 
   PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3 ARGS
 ((
U32 *pmiBitMap
uint32_t *pmiBitMap
  ));
 
   PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4 ARGS
 ((
U32 *pmiBitMap
uint32_t *pmiBitMap
  ));
 
   PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4 ARGS
 ((
U32 *pmiBitMap
uint32_t *pmiBitMap
  ));
 
- PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr ARGS
+ PRIVATE uint8_t rgSCHCmnCalcWcqiFrmSnr ARGS
 ((
  RgSchCellCb        *cell,
  TfuSrsRpt        *srsRpt
@@ -1872,9 +1855,9 @@ PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt ARGS
  *
  *     Invoked by: Scheduler
  *
- *  @param[in]  U8            noPdcchSym
- *  @param[in]  U8            cpType
- *  @param[in]  U8            txAntIdx
+ *  @param[in]  uint8_t            noPdcchSym
+ *  @param[in]  uint8_t            cpType
+ *  @param[in]  uint8_t            txAntIdx
  *  @param[in]  RgSchCmnTbSzEff* effTbl
  *  @return  Void
  *
@@ -1882,25 +1865,24 @@ PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt ARGS
 #ifdef ANSI
 PRIVATE Void rgSCHCmnCompEff
 (
-U8                    noPdcchSym,
-U8                    cpType,
-U8                    txAntIdx,
+uint8_t                    noPdcchSym,
+uint8_t                    cpType,
+uint8_t                    txAntIdx,
 RgSchCmnTbSzEff       *effTbl
 )
 #else
 PRIVATE Void rgSCHCmnCompEff(noPdcchSym, cpType, txAntIdx, effTbl)
-U8                    noPdcchSym;
-U8                    cpType;
-U8                    txAntIdx;
+uint8_t                    noPdcchSym;
+uint8_t                    cpType;
+uint8_t                    txAntIdx;
 RgSchCmnTbSzEff       *effTbl;
 #endif
 {
-   U8               noResPerRb;
-   U8               noSymPerRb;
-   U8               resOfCrs; /* Effective REs occupied by CRS */
-   U8               i, j;
+   uint8_t               noResPerRb;
+   uint8_t               noSymPerRb;
+   uint8_t               resOfCrs; /* Effective REs occupied by CRS */
+   uint8_t               i, j;
 
-   TRC2(rgSCHCmnCompEff);
 
    switch (cpType)
    {
@@ -1912,7 +1894,7 @@ RgSchCmnTbSzEff       *effTbl;
          break;
       default:
          /* Generate a log error. This case should never be executed */
-         RETVOID;
+         return;
    }
 
    /* Depending on the Tx Antenna Index, deduct the
@@ -1930,7 +1912,7 @@ RgSchCmnTbSzEff       *effTbl;
          break;
       default:
          /* Generate a log error. This case should never be executed */
-         RETVOID;
+         return;
    }
    noResPerRb = ((noSymPerRb - noPdcchSym) * RB_SCH_CMN_NUM_SCS_PER_RB) - resOfCrs;
    for (i = 0; i < RG_SCH_CMN_NUM_TBS; i++)
@@ -1943,7 +1925,7 @@ RgSchCmnTbSzEff       *effTbl;
       }
       (*effTbl)[i] /= RG_SCH_CMN_NUM_RBS;
    }
-   RETVOID;
+   return;
 }
 /**
  * @brief This function computes efficiency and stores in a table.
@@ -1957,9 +1939,9 @@ RgSchCmnTbSzEff       *effTbl;
  *
  *     Invoked by: Scheduler
  *
- *  @param[in]  U8            noUlRsSym
- *  @param[in]  U8            cpType
- *  @param[in]  U8            txAntIdx
+ *  @param[in]  uint8_t            noUlRsSym
+ *  @param[in]  uint8_t            cpType
+ *  @param[in]  uint8_t            txAntIdx
  *  @param[in]  RgSchCmnTbSzEff* effTbl
  *  @return  Void
  *
@@ -1967,22 +1949,21 @@ RgSchCmnTbSzEff       *effTbl;
 #ifdef ANSI
 PRIVATE Void rgSCHCmnCompUlEff
 (
-U8                    noUlRsSym,
-U8                    cpType,
+uint8_t                    noUlRsSym,
+uint8_t                    cpType,
 RgSchCmnTbSzEff       *effTbl
 )
 #else
 PRIVATE Void rgSCHCmnCompUlEff(noUlRsSym, cpType, effTbl)
-U8                    noUlRsSym;
-U8                    cpType;
+uint8_t                    noUlRsSym;
+uint8_t                    cpType;
 RgSchCmnTbSzEff       *effTbl;
 #endif
 {
-   U8               noResPerRb;
-   U8               noSymPerRb;
-   U8               i, j;
+   uint8_t               noResPerRb;
+   uint8_t               noSymPerRb;
+   uint8_t               i, j;
 
-   TRC2(rgSCHCmnCompUlEff);
 
    switch (cpType)
    {
@@ -1994,7 +1975,7 @@ RgSchCmnTbSzEff       *effTbl;
          break;
       default:
          /* Generate a log error. This case should never be executed */
-         RETVOID;
+         return;
    }
 
    noResPerRb = ((noSymPerRb - noUlRsSym) * RB_SCH_CMN_NUM_SCS_PER_RB);
@@ -2008,7 +1989,7 @@ RgSchCmnTbSzEff       *effTbl;
       }
       (*effTbl)[i] /= RG_SCH_CMN_NUM_RBS;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -2023,9 +2004,9 @@ RgSchCmnTbSzEff       *effTbl;
  *
  *     Invoked by: Scheduler
  *
- *  @param[in]  U8            noPdcchSym
- *  @param[in]  U8            cpType
- *  @param[in]  U8            txAntIdx
+ *  @param[in]  uint8_t            noPdcchSym
+ *  @param[in]  uint8_t            cpType
+ *  @param[in]  uint8_t            txAntIdx
  *  @param[in]  RgSchCmnTbSzEff* effTbl2Lyr
  *  @return  Void
  *
@@ -2033,25 +2014,24 @@ RgSchCmnTbSzEff       *effTbl;
 #ifdef ANSI
 PRIVATE Void rgSCHCmn2LyrCompEff
 (
-U8                    noPdcchSym,
-U8                    cpType,
-U8                    txAntIdx,
+uint8_t                    noPdcchSym,
+uint8_t                    cpType,
+uint8_t                    txAntIdx,
 RgSchCmnTbSzEff       *effTbl2Lyr
 )
 #else
 PRIVATE Void rgSCHCmn2LyrCompEff(noPdcchSym, cpType, txAntIdx, effTbl2Lyr)
-U8                    noPdcchSym;
-U8                    cpType;
-U8                    txAntIdx;
+uint8_t                    noPdcchSym;
+uint8_t                    cpType;
+uint8_t                    txAntIdx;
 RgSchCmnTbSzEff       *effTbl2Lyr;
 #endif
 {
-   U8               noResPerRb;
-   U8               noSymPerRb;
-   U8               resOfCrs; /* Effective REs occupied by CRS */
-   U8               i, j;
+   uint8_t               noResPerRb;
+   uint8_t               noSymPerRb;
+   uint8_t               resOfCrs; /* Effective REs occupied by CRS */
+   uint8_t               i, j;
 
-   TRC2(rgSCHCmn2LyrCompEff);
 
    switch (cpType)
    {
@@ -2063,7 +2043,7 @@ RgSchCmnTbSzEff       *effTbl2Lyr;
          break;
       default:
          /* Generate a log error. This case should never be executed */
-         RETVOID;
+         return;
    }
 
    /* Depending on the Tx Antenna Index, deduct the
@@ -2081,7 +2061,7 @@ RgSchCmnTbSzEff       *effTbl2Lyr;
          break;
       default:
          /* Generate a log error. This case should never be executed */
-         RETVOID;
+         return;
    }
 
    noResPerRb = ((noSymPerRb - noPdcchSym) * RB_SCH_CMN_NUM_SCS_PER_RB) - resOfCrs;
@@ -2095,7 +2075,7 @@ RgSchCmnTbSzEff       *effTbl2Lyr;
       }
       (*effTbl2Lyr)[i] /= RG_SCH_CMN_NUM_RBS;
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -2125,7 +2105,6 @@ RgSchCellCb *cell;
 #endif
 {
 
-   TRC2(rgSCHCmnGetDciFrmtSizes);
 
    /* DCI Format 0 size determination */
    rgSchCmnDciFrmtSizes[0] = 1 +
@@ -2243,7 +2222,7 @@ RgSchCellCb *cell;
    /* DCI Format 3A size determination */
    rgSchCmnDciFrmtSizes[9] = rgSchCmnDciFrmtSizes[0];
 
-   RETVOID;
+   return;
 }
 
 
@@ -2271,16 +2250,15 @@ RgSchCellCb *cell;
 #endif
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   U8            i;
-   U8            j;
+   uint8_t            i;
+   uint8_t            j;
 
-   TRC2(rgSCHCmnGetCqiDciFrmt2AggrLvl);
 
    for (i = 0; i < RG_SCH_CMN_MAX_CQI; i++)
    {
       for (j = 0; j < 10; j++)
       {
-         U32 pdcchBits; /* Actual number of phy bits needed for a given DCI Format
+         uint32_t pdcchBits; /* Actual number of phy bits needed for a given DCI Format
                * for a given CQI Level */
          pdcchBits = (rgSchCmnDciFrmtSizes[j] * 1024)/rgSchCmnCqiPdcchEff[i];
                        /* V5G_211 : 6.6 */
@@ -2302,7 +2280,7 @@ RgSchCellCb *cell;
          cellSch->dciAggrLvl[i][j] = CM_LTE_AGGR_LVL16;
       }
    }
-   RETVOID;
+   return;
 }
 \f
 /**
@@ -2329,14 +2307,13 @@ PRIVATE Void rgSCHCmnDlInit
 PRIVATE Void rgSCHCmnDlInit()
 #endif
 {
-   U8                   i;
+   uint8_t                   i;
    S16                  j;
    S16                  k;
-   U8                   idx;
+   uint8_t                   idx;
    RgSchCmnTbSzEff      *effTbl;
    RgSchCmnCqiToTbs     *tbsTbl;
 
-   TRC2(rgSCHCmnDlInit);
 
    /* 0 corresponds to Single layer case, 1 corresponds to 2 layers case*/
    /* Init Efficiency table for normal cyclic prefix */
@@ -2395,9 +2372,9 @@ PRIVATE Void rgSCHCmnDlInit()
       for (i = 0; i < RG_SCH_CMN_MAX_CFI; i++)
       {
          /* EfficiencyTbl calculation incase of 2 layers for normal CP  */
-         rgSCHCmnCompEff((U8)(i + 1), RG_SCH_CMN_NOR_CP, idx,\
+         rgSCHCmnCompEff((uint8_t)(i + 1), RG_SCH_CMN_NOR_CP, idx,\
                rgSchCmnEffTbl[0][RG_SCH_CMN_NOR_CP][idx][i]);
-         rgSCHCmn2LyrCompEff((U8)(i + 1), RG_SCH_CMN_NOR_CP, idx, \
+         rgSCHCmn2LyrCompEff((uint8_t)(i + 1), RG_SCH_CMN_NOR_CP, idx, \
                rgSchCmnEffTbl[1][RG_SCH_CMN_NOR_CP][idx][i]);
       }
    }
@@ -2415,7 +2392,7 @@ PRIVATE Void rgSCHCmnDlInit()
             * single dimensional array is replaced by 2 dimensions for different CFI*/
             if ((*effTbl)[j] <= rgSchCmnCqiPdschEff[i][k])
             {
-               (*tbsTbl)[k--] = (U8)j;
+               (*tbsTbl)[k--] = (uint8_t)j;
             }
          }
          for (; k > 0; --k)
@@ -2432,7 +2409,7 @@ PRIVATE Void rgSCHCmnDlInit()
             * single dimensional array is replaced by 2 dimensions for different CFI*/
             if ((*effTbl)[j] <= rgSchCmn2LyrCqiPdschEff[i][k])
             {
-               (*tbsTbl)[k--] = (U8)j;
+               (*tbsTbl)[k--] = (uint8_t)j;
             }
          }
          for (; k > 0; --k)
@@ -2498,9 +2475,9 @@ PRIVATE Void rgSCHCmnDlInit()
       for (i = 0; i < RG_SCH_CMN_MAX_CFI; i++)
       {
          /* EfficiencyTbl calculation incase of 2 layers for extendedl CP  */
-         rgSCHCmnCompEff( (U8)(i + 1 ), (U8)RG_SCH_CMN_EXT_CP, idx,\
+         rgSCHCmnCompEff( (uint8_t)(i + 1 ), (uint8_t)RG_SCH_CMN_EXT_CP, idx,\
                rgSchCmnEffTbl[0][RG_SCH_CMN_EXT_CP][idx][i]);
-         rgSCHCmn2LyrCompEff((U8)(i + 1), (U8) RG_SCH_CMN_EXT_CP,idx, \
+         rgSCHCmn2LyrCompEff((uint8_t)(i + 1), (uint8_t) RG_SCH_CMN_EXT_CP,idx, \
                rgSchCmnEffTbl[1][RG_SCH_CMN_EXT_CP][idx][i]);
       }
    }
@@ -2518,7 +2495,7 @@ PRIVATE Void rgSCHCmnDlInit()
             * single dimensional array is replaced by 2 dimensions for different CFI*/
             if ((*effTbl)[j] <= rgSchCmnCqiPdschEff[i][k])
             {
-               (*tbsTbl)[k--] = (U8)j;
+               (*tbsTbl)[k--] = (uint8_t)j;
             }
          }
          for (; k > 0; --k)
@@ -2535,7 +2512,7 @@ PRIVATE Void rgSCHCmnDlInit()
             * single dimensional array is replaced by 2 dimensions for different CFI*/
             if ((*effTbl)[j] <= rgSchCmn2LyrCqiPdschEff[i][k])
             {
-               (*tbsTbl)[k--] = (U8)j;
+               (*tbsTbl)[k--] = (uint8_t)j;
             }
          }
          for (; k > 0; --k)
@@ -2544,7 +2521,7 @@ PRIVATE Void rgSCHCmnDlInit()
          }
       }
    }
-   RETVOID;
+   return;
 }
 \f
 /**
@@ -2571,12 +2548,11 @@ PRIVATE Void rgSCHCmnUlInit
 PRIVATE Void rgSCHCmnUlInit()
 #endif
 {
-   U8              *mapTbl = &rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_NOR_CP][0];
+   uint8_t              *mapTbl = &rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_NOR_CP][0];
    RgSchCmnTbSzEff    *effTbl    = &rgSchCmnNorUlEff[0];
    CONSTANT RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0];
    S16              i;
    S16              j;
-   TRC2(rgSCHCmnUlInit);
 
    /* Initaializing new variable added for UL eff */
    rgSchCmnUlEffTbl[RG_SCH_CMN_NOR_CP] = &rgSchCmnNorUlEff[0];
@@ -2590,7 +2566,7 @@ PRIVATE Void rgSCHCmnUlInit()
    {
       if ((*effTbl)[i] <= cqiTbl[j].eff)
       {
-         mapTbl[j--] = (U8)i;
+         mapTbl[j--] = (uint8_t)i;
       }
    }
    for (; j > 0; --j)
@@ -2612,7 +2588,7 @@ PRIVATE Void rgSCHCmnUlInit()
    {
       if ((*effTbl)[i] <= cqiTbl[j].eff)
       {
-         mapTbl[j--] = (U8)i;
+         mapTbl[j--] = (uint8_t)i;
       }
    }
    for (; j > 0; --j)
@@ -2620,7 +2596,7 @@ PRIVATE Void rgSCHCmnUlInit()
       mapTbl[j] = 0;
    }
    rgSCHPwrInit();
-   RETVOID;
+   return;
 }
 
 /**
@@ -2640,15 +2616,14 @@ PRIVATE Void rgSCHCmnUlInit()
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnInit
+Void rgSCHCmnInit
 (
 )
 #else
-PUBLIC Void rgSCHCmnInit()
+Void rgSCHCmnInit()
 #endif
 {
-   U8   idx;
-   TRC2(rgSCHCmnInit);
+   uint8_t   idx;
 
    rgSCHCmnDlInit();
    rgSCHCmnUlInit();
@@ -2741,7 +2716,7 @@ PUBLIC Void rgSCHCmnInit()
    rgSchCmnApis.rgSCHRgrSCellUeCfg         = rgSCHCmnRgrSCellUeCfg;
    rgSchCmnApis.rgSCHRgrSCellUeDel         = rgSCHCmnRgrSCellUeDel;
 #endif
-   RETVOID;
+   return;
 }
 
 \f
@@ -2761,13 +2736,13 @@ PUBLIC Void rgSCHCmnInit()
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlRlsSubFrm
+Void rgSCHCmnDlRlsSubFrm
 (
 RgSchCellCb        *cell,
 CmLteTimingInfo   frm
 )
 #else
-PUBLIC Void rgSCHCmnDlRlsSubFrm(cell, frm)
+Void rgSCHCmnDlRlsSubFrm(cell, frm)
 RgSchCellCb        *cell;
 CmLteTimingInfo    frm;
 #endif
@@ -2775,7 +2750,6 @@ CmLteTimingInfo    frm;
    RgSchCmnCell        *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchDlSf           *sf;
 
-   TRC2(rgSCHCmnDlRlsSubFrm);
 
    /* Get the pointer to the subframe */
    sf = rgSCHUtlSubFrmGet(cell, frm);
@@ -2786,7 +2760,7 @@ CmLteTimingInfo    frm;
       /* Re-initialize DLFS specific information for the sub-frame */
       cellSch->apisDlfs->rgSCHDlfsReinitSf(cell, sf);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -2819,7 +2793,6 @@ RgSchCellCb             *cell;
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnDlCcchRarAlloc);
 
    rgSCHCmnDlCcchRetx(cell, &cellSch->allocInfo);
    /* LTE_ADV_FLAG_REMOVED_START */
@@ -2902,7 +2875,7 @@ RgSchCellCb             *cell;
    /* LTE_ADV_FLAG_REMOVED_END */
 #endif
 
-   RETVOID;
+   return;
 }
 
 #ifdef RGR_V1
@@ -2940,7 +2913,6 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    RgSchCmnCell       *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe       *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell);
 
-   TRC2(rgSCHCmnCcchSduAlloc);
 
    /* Return if subframe BW exhausted */
    if (allocInfo->ccchSduAlloc.ccchSduDlSf->bw <=
@@ -2948,14 +2920,14 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
          "bw<=bwAssigned for UEID:%d",ueCb->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (rgSCHDhmGetCcchSduHqProc(ueCb, cellSch->dl.time, &(ueDl->proc)) != ROK)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
          "rgSCHDhmGetCcchSduHqProc failed UEID:%d",ueCb->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    rbAllocInfo =  RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb, cell);
@@ -2967,13 +2939,13 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
       rgSCHDhmRlsHqpTb(ueDl->proc, 0, FALSE);
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
          "rgSCHCmnCcchSduDedAlloc failed UEID:%d",ueCb->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    cmLListAdd2Tail(&allocInfo->ccchSduAlloc.ccchSduTxLst, &ueDl->proc->reqLnk);
    ueDl->proc->reqLnk.node = (PTR)ueDl->proc;
    allocInfo->ccchSduAlloc.ccchSduDlSf->schdCcchUe++;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
  * @brief This function scheduler for downlink CCCH messages.
@@ -3009,7 +2981,6 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
 
    RgSchDlSf         *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf;
    
-   TRC2(rgSCHCmnDlCcchSduTx);
 
    node = cell->ccchSduUeLst.first;
    while(node)
@@ -3045,7 +3016,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
          }
       }
    }
-   RETVOID;
+   return;
 }
 #endif
 \f
@@ -3081,7 +3052,6 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchDlSf         *dlSf = allocInfo->msg4Alloc.msg4DlSf;
    
-   TRC2(rgSCHCmnDlCcchTx);
 
    node = cell->raInfo.toBeSchdLst.first;
    while(node)
@@ -3104,7 +3074,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
          }
       }
    }
-   RETVOID;
+   return;
 }
 
 #ifdef RGR_V1
@@ -3140,11 +3110,10 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchUeCb         *ueCb;
    RgSchDlHqProcCb   *hqP;
-   U8                retxBw = 0;
+   uint8_t                retxBw = 0;
    RgSchCmnDlUe      *ueDl;
    RgSchDlSf         *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf;
    
-   TRC2(rgSCHCmnDlCcchSduRetx);
 
    node = cellSch->dl.ccchSduRetxLst.first;
    while(node)
@@ -3202,7 +3171,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
       }
    }
    dlSf->bwAssigned += retxBw;
-   RETVOID;
+   return;
 }
 #endif
 \f
@@ -3237,10 +3206,9 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchRaCb         *raCb;
    RgSchDlHqProcCb   *hqP;
-   U8                retxBw = 0;
+   uint8_t                retxBw = 0;
    RgSchDlSf         *dlSf = allocInfo->msg4Alloc.msg4DlSf;
         
-   TRC2(rgSCHCmnDlCcchRetx);
 
    node = cellSch->dl.msg4RetxLst.first;
    while(node)
@@ -3293,7 +3261,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
       }
    }
    dlSf->bwAssigned += retxBw;
-   RETVOID;
+   return;
 }
 
 \f
@@ -3338,7 +3306,6 @@ RgInfSfAlloc            *subfrmAlloc;
 #endif/*RGR_SI_SCH*/
 
 
-   TRC2(rgSCHCmnDlBcchPcch);
 
    frm   = cell->crntTime;
 #ifdef LTEMAC_HDFDD
@@ -3346,7 +3313,7 @@ RgInfSfAlloc            *subfrmAlloc;
       + RG_SCH_CMN_HARQ_INTERVAL (7) subframes ahead */
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA + RG_SCH_CMN_HARQ_INTERVAL);
 #else
-   RGSCH_SUBFRAME_INDEX(frm);
+  // RGSCH_SUBFRAME_INDEX(frm);
    //RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
 #endif
 
@@ -3361,7 +3328,7 @@ RgInfSfAlloc            *subfrmAlloc;
    if (bch == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"BCCH on BCH is not configured");
-      RETVOID;
+      return;
    }
 #endif
    if (bch->boLst.first != NULLP)
@@ -3390,7 +3357,7 @@ RgInfSfAlloc            *subfrmAlloc;
    if (bcch == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"BCCH on DLSCH is not configured");
-      RETVOID;
+      return;
    }
 #endif
    if (bcch->boLst.first != NULLP)
@@ -3413,7 +3380,7 @@ RgInfSfAlloc            *subfrmAlloc;
       if (bcch == NULLP)
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"BCCH on DLSCH is not configured");
-         RETVOID;
+         return;
       }
 #endif
       lnk = bcch->boLst.first;
@@ -3453,7 +3420,7 @@ RgInfSfAlloc            *subfrmAlloc;
    if (pcch == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"PCCH on DLSCH is not configured");
-      RETVOID;
+      return;
    }
 #endif
    if (pcch->boLst.first != NULLP)
@@ -3466,7 +3433,7 @@ RgInfSfAlloc            *subfrmAlloc;
          rgSCHCmnClcAlloc(cell, sf, pcch, RGSCH_P_RNTI, allocInfo);
       }
    }
-   RETVOID;
+   return;
 }
 
 /*
@@ -3484,14 +3451,14 @@ RgInfSfAlloc            *subfrmAlloc;
 *
 */
 #ifdef ANSI
-PUBLIC Bool rgSCHCmnChkInWin
+Bool rgSCHCmnChkInWin
 (
 CmLteTimingInfo   frm,
 CmLteTimingInfo   start,
 CmLteTimingInfo   end
 )
 #else
-PUBLIC Bool rgSCHCmnChkInWin(frm, start, end)
+Bool rgSCHCmnChkInWin(frm, start, end)
 CmLteTimingInfo   frm;
 CmLteTimingInfo   start;
 CmLteTimingInfo   end;
@@ -3499,18 +3466,17 @@ CmLteTimingInfo   end;
 {
    Bool    inWin = FALSE;
 
-   TRC2(rgSCHCmnChkInWin);
 
    if (end.sfn > start.sfn)
    {
       if (frm.sfn > start.sfn
-            || (frm.sfn == start.sfn && frm.subframe >= start.subframe))
+            || (frm.sfn == start.sfn && frm.slot >= start.slot))
       {
          if (frm.sfn < end.sfn
 #ifdef EMTC_ENABLE
-               || (frm.sfn == end.sfn && frm.subframe <= end.subframe))
+               || (frm.sfn == end.sfn && frm.slot <= end.slot))
 #else
-               || (frm.sfn == end.sfn && frm.subframe <= start.subframe))
+               || (frm.sfn == end.sfn && frm.slot <= start.slot))
 #endif
          {
             inWin = TRUE;
@@ -3521,14 +3487,14 @@ CmLteTimingInfo   end;
    else if (end.sfn < start.sfn)
    {
       if (frm.sfn > start.sfn
-            || (frm.sfn == start.sfn && frm.subframe >= start.subframe))
+            || (frm.sfn == start.sfn && frm.slot >= start.slot))
       {
          inWin = TRUE;
       }
       else
       {
          if (frm.sfn < end.sfn
-               || (frm.sfn == end.sfn && frm.subframe <= end.subframe))
+               || (frm.sfn == end.sfn && frm.slot <= end.slot))
          {
             inWin = TRUE;
          }
@@ -3537,14 +3503,14 @@ CmLteTimingInfo   end;
    else  /* start.sfn == end.sfn */
    {
       if (frm.sfn == start.sfn
-            && (frm.subframe >= start.subframe
-               && frm.subframe <= end.subframe))
+            && (frm.slot >= start.slot
+               && frm.slot <= end.slot))
       {
          inWin = TRUE;
       }
    }
 
-   RETVALUE(inWin);
+   return (inWin);
 } /* end of rgSCHCmnChkInWin*/
 
 /*
@@ -3562,13 +3528,13 @@ CmLteTimingInfo   end;
 *
 */
 #ifdef ANSI
-PUBLIC Bool rgSCHCmnChkPastWin
+Bool rgSCHCmnChkPastWin
 (
 CmLteTimingInfo   frm,
 CmLteTimingInfo   end
 )
 #else
-PUBLIC Bool rgSCHCmnChkPastWin(frm, end)
+Bool rgSCHCmnChkPastWin(frm, end)
 CmLteTimingInfo   frm;
 CmLteTimingInfo   end;
 #endif
@@ -3576,13 +3542,12 @@ CmLteTimingInfo   end;
    CmLteTimingInfo  refFrm = end;
    Bool             pastWin;
 
-   TRC2(rgSCHCmnChkPastWin);
 
    RGSCH_INCR_FRAME(refFrm.sfn);
    RGSCH_INCR_SUB_FRAME(end, 1);
    pastWin = rgSCHCmnChkInWin(frm, end, refFrm);
 
-   RETVALUE(pastWin);
+   return (pastWin);
 } /* end of rgSCHCmnChkPastWin*/
 \f
 /**
@@ -3601,7 +3566,7 @@ CmLteTimingInfo   end;
  *  @param[in]  RgSchCellCb                *cell,
  *  @param[in]  RgSchDlSf                  *sf,
  *  @param[in]  RgSchClcDlLcCb             *lch,
- *  @param[in]  U16                        rnti,
+ *  @param[in]  uint16_t                        rnti,
  *  @param[out] RgSchCmnDlRbAllocInfo      *allocInfo
  *  @return     Void
  *
@@ -3612,7 +3577,7 @@ PRIVATE Void rgSCHCmnClcAlloc
 RgSchCellCb             *cell,
 RgSchDlSf               *sf,
 RgSchClcDlLcCb          *lch,
-U16                     rnti,
+uint16_t                     rnti,
 RgSchCmnDlRbAllocInfo   *allocInfo
 )
 #else
@@ -3620,21 +3585,20 @@ PRIVATE Void rgSCHCmnClcAlloc(cell, sf, lch, rnti, allocInfo)
 RgSchCellCb             *cell;
 RgSchDlSf               *sf;
 RgSchClcDlLcCb          *lch;
-U16                     rnti;
+uint16_t                     rnti;
 RgSchCmnDlRbAllocInfo   *allocInfo;
 #endif
 {
    RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchClcBoRpt        *bo;
-   U32                  rb=0;
-   U8                   mcs;
-   U32                  tbs;
+   uint32_t                  rb=0;
+   uint8_t                   mcs;
+   uint32_t                  tbs;
 #ifdef LTE_TDD   
-   U8                   lostRe;
-   U8                   cfi = cellDl->currCfi;  
+   uint8_t                   lostRe;
+   uint8_t                   cfi = cellDl->currCfi;  
 #endif
 
-   TRC2(rgSCHCmnClcAlloc);
 
    bo = (RgSchClcBoRpt *)(lch->boLst.first->node);
 
@@ -3674,7 +3638,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"BW allocation "
                 "failed for CRNTI:%d",rnti);
-      RETVOID;
+      return;
    }
 
    /* Update the subframe Allocated BW field */
@@ -3701,7 +3665,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
       allocInfo->pcchAlloc.tbInfo[0].noLyr = 1;
       allocInfo->pcchAlloc.nPrb = bo->nPrb;
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -3726,13 +3690,13 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchPdcch *rgSCHCmnCmnPdcchAlloc
+RgSchPdcch *rgSCHCmnCmnPdcchAlloc
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm
 )
 #else
-PUBLIC RgSchPdcch *rgSCHCmnCmnPdcchAlloc(cell, subFrm)
+RgSchPdcch *rgSCHCmnCmnPdcchAlloc(cell, subFrm)
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 #endif
@@ -3741,9 +3705,8 @@ RgSchDlSf                  *subFrm;
    RgSchPdcchInfo       *pdcchInfo;
    RgSchPdcch           *pdcch;
    RgSchCmnCell         *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   U8                   numCce;  /*store num CCEs based on 
+   uint8_t                   numCce;  /*store num CCEs based on 
                                   aggregation level */
-   TRC2(rgSCHCmnCmnPdcchAlloc);
 
    aggrLvl   = cellSch->dl.cmnChAggrLvl;
 
@@ -3775,7 +3738,7 @@ RgSchDlSf                  *subFrm;
         numCce = 16;
         break;
       default:
-        RETVALUE(NULLP);
+        return (NULLP);
    }
 
    if (rgSCHUtlPdcchAvail(cell, pdcchInfo, aggrLvl, &pdcch) == TRUE)
@@ -3787,7 +3750,7 @@ RgSchDlSf                  *subFrm;
       subFrm->cceCnt += numCce;
       pdcch->pdcchSearchSpace = RG_SCH_CMN_SEARCH_SPACE;
 
-      RETVALUE(pdcch);
+      return (pdcch);
    }
 
    /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */
@@ -3796,7 +3759,7 @@ RgSchDlSf                  *subFrm;
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,
            "PDCCH ERR: NO PDDCH AVAIL IN COMMON SEARCH SPACE aggr:%u", 
            aggrLvl);
-   RETVALUE(NULLP);
+   return (NULLP);
 }
 
 \f
@@ -3812,73 +3775,72 @@ RgSchDlSf                  *subFrm;
  *     Invoked by: Scheduler
  *
  *  @param[in]  RgSchCellCb*  cell
- *  @param[in]  U32           bo
- *  @param[in]  U8            cqi
- *  @param[in]  U8            *rb
- *  @param[in]  U32           *tbs
- *  @param[in]  U8            *mcs
+ *  @param[in]  uint32_t           bo
+ *  @param[in]  uint8_t            cqi
+ *  @param[in]  uint8_t            *rb
+ *  @param[in]  uint32_t           *tbs
+ *  @param[in]  uint8_t            *mcs
  *  @param[in]  RgSchDlSf     *sf
  *  @return  Void
  *
  **/
 #ifdef LTEMAC_SPS
 #ifdef ANSI
-PUBLIC Void rgSCHCmnClcRbAlloc
+Void rgSCHCmnClcRbAlloc
 (
-RgSchCellCb             *cell,
-U32                     bo,
-U8                      cqi,
-U8                      *rb,
-U32                     *tbs,
-U8                      *mcs,
-U8                      *iTbs,
-Bool                    isSpsBo,
-RgSchDlSf               *sf 
+RgSchCellCb                 *cell,
+uint32_t                     bo,
+uint8_t                      cqi,
+uint8_t                      *rb,
+uint32_t                     *tbs,
+uint8_t                      *mcs,
+uint8_t                      *iTbs,
+Bool                         isSpsBo,
+RgSchDlSf                    *sf 
 )
 #else
-PUBLIC Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, iTbs, isSpsBo)
-RgSchCellCb             *cell;
-U32                     bo;
-U8                      cqi;
-U8                      *rb;
-U32                     *tbs;
-U8                      *mcs;
-U8                      *iTbs;
-Bool                    isSpsBo;
-RgSchDlSf               *sf; 
+Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, iTbs, isSpsBo)
+RgSchCellCb                  *cell;
+uint32_t                     bo;
+uint8_t                      cqi;
+uint8_t                      *rb;
+uint32_t                     *tbs;
+uint8_t                      *mcs;
+uint8_t                      *iTbs;
+Bool                         isSpsBo;
+RgSchDlSf                    *sf; 
 #endif
 #else
 #ifdef ANSI
 PRIVATE Void rgSCHCmnClcRbAlloc
 (
-RgSchCellCb             *cell,
-U32                     bo,
-U8                      cqi,
-U8                      *rb,
-U32                     *tbs,
-U8                      *mcs,
-RgSchDlSf               *sf 
+RgSchCellCb                  *cell,
+uint32_t                     bo,
+uint8_t                      cqi,
+uint8_t                      *rb,
+uint32_t                     *tbs,
+uint8_t                      *mcs,
+RgSchDlSf                    *sf 
 )
 #else
 PRIVATE Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, sf)
-RgSchCellCb             *cell;
-U32                     bo;
-U8                      cqi;
-U8                      *rb;
-U32                     *tbs;
-U8                      *mcs;
-RgSchDlSf               *sf; 
+RgSchCellCb                  *cell;
+uint32_t                     bo;
+uint8_t                      cqi;
+uint8_t                      *rb;
+uint32_t                     *tbs;
+uint8_t                      *mcs;
+RgSchDlSf                    *sf; 
 #endif
 #endif /* LTEMAC_SPS */
 {
-   U8                   iTbsVal;
-   RgSchCmnTbSzEff      *effTbl;
-   U32                  eff;
-   U32                  noRes;
-   RgSchCmnCell         *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   U8                   cfi = cellSch->dl.currCfi;
-   U32                  tmpRb=0;
-   TRC2(rgSCHCmnClcRbAlloc);
+   uint8_t                   iTbsVal;
+   RgSchCmnTbSzEff           *effTbl;
+   uint32_t                  eff;
+   uint32_t                  noRes;
+   RgSchCmnCell              *cellSch = RG_SCH_CMN_GET_CELL(cell);
+   uint8_t                   cfi = cellSch->dl.currCfi;
+   uint32_t                  tmpRb=0;
 
    /* first get the CQI to MCS table and determine the number of RBs */
    effTbl = (RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[0][cfi]);
@@ -3907,10 +3869,10 @@ RgSchDlSf               *sf;
       RGSCH_ARRAY_BOUND_CHECK_WITH_POS_IDX(cell->instIdx, rgTbSzTbl[0][0], (tmpRb-1));
    }
    *tbs =  rgTbSzTbl[0][iTbsVal][tmpRb-1]/8;
-   *rb = (U8)tmpRb;
+   *rb = (uint8_t)tmpRb;
    RG_SCH_CMN_DL_TBS_TO_MCS(iTbsVal, *mcs);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -3947,7 +3909,6 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
 {
    RgSchCmnCell       *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnMsg4Alloc);
 
  /* SR_RACH_STATS : MSG4 TO BE TXED */
    rgNumMsg4ToBeTx++;
@@ -3957,14 +3918,14 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId ,
          "bw<=bwAssigned");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (rgSCHDhmGetMsg4HqProc(raCb, cellSch->dl.time) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
          "rgSCHDhmGetMsg4HqProc failed");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    raCb->rbAllocInfo.dlSf = allocInfo->msg4Alloc.msg4DlSf;
@@ -3975,13 +3936,13 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
       rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, FALSE);
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
          "rgSCHCmnMsg4DedAlloc failed.");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    cmLListAdd2Tail(&allocInfo->msg4Alloc.msg4TxLst, &raCb->dlHqE->msg4Proc->reqLnk);
    raCb->dlHqE->msg4Proc->reqLnk.node = (PTR)raCb->dlHqE->msg4Proc;
    allocInfo->msg4Alloc.msg4DlSf->schdCcchUe++;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -4008,21 +3969,21 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchPdcch *rgSCHCmnPdcchAlloc
+RgSchPdcch *rgSCHCmnPdcchAlloc
 (
 RgSchCellCb             *cell,
 RgSchUeCb               *ue,
 RgSchDlSf               *subFrm,
-U8                      cqi,
+uint8_t                      cqi,
 TfuDciFormat            dciFrmt,
 Bool                    isDtx
 )
 #else
-PUBLIC RgSchPdcch *rgSCHCmnPdcchAlloc(cell, subFrm, cqi, dciFrmt, isDtx)
+RgSchPdcch *rgSCHCmnPdcchAlloc(cell, subFrm, cqi, dciFrmt, isDtx)
 RgSchCellCb             *cell;
 RgSchUeCb               *ue;
 RgSchDlSf               *subFrm;
-U8                      cqi;
+uint8_t                      cqi;
 TfuDciFormat            dciFrmt;
 Bool                    isDtx;
 #endif
@@ -4031,7 +3992,6 @@ Bool                    isDtx;
    RgSchPdcchInfo   *pdcchInfo;
    RgSchPdcch       *pdcch;
 
-   TRC2(rgSCHCmnPdcchAlloc);
 
    /* 3.1 consider the selected DCI format size in determining the
     * aggregation level */
@@ -4050,7 +4010,7 @@ Bool                    isDtx;
         // prc_trace_format_string(PRC_TRACE_GROUP_PS, PRC_TRACE_INFO_LOW,"Forcing alloc in CMN search spc size %d fmt %d \n",
         // pdcch->dciNumOfBits, dciFrmt);
       }
-      RETVALUE(pdcch);
+      return (pdcch);
    }
 #endif
 
@@ -4102,7 +4062,7 @@ Bool                    isDtx;
             "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", 
             aggrLvl);
 
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
    if (rgSCHUtlPdcchAvail(cell, pdcchInfo, aggrLvl, &pdcch) == TRUE)
@@ -4138,7 +4098,7 @@ Bool                    isDtx;
          /* MSG4 */
          pdcch->dciNumOfBits = cell->dciSize.size[dciFrmt];
       }
-      RETVALUE(pdcch);
+      return (pdcch);
    }
 
    /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */
@@ -4147,7 +4107,7 @@ Bool                    isDtx;
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,
          "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)",
          aggrLvl);
-   RETVALUE(NULLP);
+   return (NULLP);
 }
 
 #ifdef RGR_V1
@@ -4179,16 +4139,15 @@ RgSchUeCb        *ueCb;
 #endif
 {
    RgSchDlHqEnt      *hqE = NULLP;
-   U32                  effBo;
+   uint32_t                  effBo;
    RgSchDlRbAlloc       *rbAllocinfo = NULLP;
    RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   U8                   iTbs;
-   U8                   numRb;
+   uint8_t                   iTbs;
+   uint8_t                   numRb;
 #ifdef LTE_TDD
-   U8                   cfi     = cellDl->currCfi;
+   uint8_t                   cfi     = cellDl->currCfi;
 #endif
 
-   TRC2(rgSCHCmnCcchSduDedAlloc);
 
    rbAllocinfo =  RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb, cell);
 
@@ -4236,7 +4195,7 @@ RgSchUeCb        *ueCb;
       }
       else
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -4248,7 +4207,7 @@ RgSchUeCb        *ueCb;
    rbAllocinfo->rnti = ueCb->ueId;
    rbAllocinfo->tbInfo[0].noLyr = 1;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 \f
@@ -4279,16 +4238,15 @@ RgSchCellCb      *cell;
 RgSchRaCb        *raCb;
 #endif
 {
-   U32                  effBo;
+   uint32_t                  effBo;
    RgSchDlRbAlloc       *rbAllocinfo = &raCb->rbAllocInfo;
-   U8                   iTbs;
-   U8                   numRb;
+   uint8_t                   iTbs;
+   uint8_t                   numRb;
 #ifdef LTE_TDD
    RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   U8                   cfi     = cellDl->currCfi;
+   uint8_t                   cfi     = cellDl->currCfi;
 #endif
 
-   TRC2(rgSCHCmnMsg4DedAlloc);
 
    effBo  = raCb->dlCcchInfo.bo + RGSCH_MSG4_HDRSIZE + RGSCH_CONT_RESID_SIZE;
 
@@ -4334,7 +4292,7 @@ RgSchRaCb        *raCb;
       }
       else
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -4346,7 +4304,7 @@ RgSchRaCb        *raCb;
    rbAllocinfo->tbInfo[0].schdlngForTb = TRUE;
    rbAllocinfo->tbInfo[0].noLyr = 1;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef LTE_TDD
@@ -4379,16 +4337,15 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    CmLteTimingInfo      frm;
    CmLteTimingInfo      schFrm;
    RgSchDlSf            *subFrm;
-   U16                  rarnti;
-   U8                   i;
-   U8                   noRaRnti=0;
-   U8                   raIdx;
+   uint16_t             rarnti;
+   uint8_t              i;
+   uint8_t              noRaRnti=0;
+   uint8_t              raIdx;
    RgSchTddRachRspLst   *rachRsp;
-   U8                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8                   sfnIdx;
-   U8                   subfrmIdx;
-   U16                  rntiIdx=0;
-   TRC2(rgSCHCmnDlRaRsp);
+   uint8_t              ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t              sfnIdx;
+   uint8_t              subfrmIdx;
+   uint16_t             rntiIdx=0;
 
    frm   = cell->crntTime;
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
@@ -4442,7 +4399,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
       }
    }
 
-   RETVOID;
+   return;
 }
 #else
 /**
@@ -4475,13 +4432,12 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    CmLteTimingInfo      frm;
    CmLteTimingInfo      winStartFrm;
    RgSchDlSf            *subFrm;
-   U8                   winStartIdx;
-   U8                   winGap;
-   U8                   rarnti;
-   U8                   raIdx;
+   uint8_t              winStartIdx;
+   uint8_t              winGap;
+   uint8_t              rarnti;
+   uint8_t              raIdx;
    RgSchCmnCell         *sched;
-   U8                   i,noRaRnti=0;
-   TRC2(rgSCHCmnDlRaRsp);
+   uint8_t              i,noRaRnti=0;
 
    frm   = cell->crntTime;
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
@@ -4501,7 +4457,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
    RGSCHDECRFRMCRNTTIME(frm, winStartFrm, winGap);
 
        //5G_TODO TIMING update. Need to check
-   winStartIdx = (winStartFrm.sfn & 1) * RGSCH_MAX_RA_RNTI+ winStartFrm.subframe;
+   winStartIdx = (winStartFrm.sfn & 1) * RGSCH_MAX_RA_RNTI+ winStartFrm.slot;
 
    for(i = 0; ((i < cell->rachCfg.raWinSize) && (noRaRnti < RG_SCH_CMN_MAX_CMN_PDCCH)); i++)
    {
@@ -4528,7 +4484,7 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
                         for response allocation */
       }
    }
-   RETVOID;
+   return;
 }
 #endif
 
@@ -4549,8 +4505,8 @@ RgSchCmnDlRbAllocInfo      *allocInfo;
  *
  *  @param[in]  RgSchCellCb             *cell,
  *  @param[in]  RgSchDlSf               *subFrm,
- *  @param[in]  U16                     rarnti,
- *  @param[in]  U8                      noRaRnti
+ *  @param[in]  uint16_t                     rarnti,
+ *  @param[in]  uint8_t                      noRaRnti
  *  @param[out] RgSchCmnDlRbAllocInfo   *allocInfo
  *  @return  S16
  *
@@ -4560,41 +4516,40 @@ PRIVATE S16 rgSCHCmnRaRspAlloc
 (
 RgSchCellCb             *cell,
 RgSchDlSf               *subFrm,
-U16                     raIndex,
-U16                     rarnti,
-U8                      noRaRnti,
+uint16_t                     raIndex,
+uint16_t                     rarnti,
+uint8_t                      noRaRnti,
 RgSchCmnDlRbAllocInfo   *allocInfo
 )
 #else
 PRIVATE S16 rgSCHCmnRaRspAlloc(cell,subFrm,raIndex,rarnti,noRaRnti,allocInfo)
 RgSchCellCb             *cell;
 RgSchDlSf               *subFrm;
-U16                     raIndex;
-U16                     rarnti;
-U8                      noRaRnti;
+uint16_t                     raIndex;
+uint16_t                     rarnti;
+uint8_t                      noRaRnti;
 RgSchCmnDlRbAllocInfo   *allocInfo;
 #endif
 {
    RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnUlCell       *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   U16                  noBytes;
-   U32                  rb = 0;
-   U32                  tbs;
+   uint16_t                  noBytes;
+   uint32_t                  rb = 0;
+   uint32_t                  tbs;
    /*ccpu00116700,ccpu00116708- Corrected the wrong type for mcs*/
-   U8                   mcs;
+   uint8_t                   mcs;
    CmLListCp            *reqLst;
    /* RACH handling related changes */
    Bool                 isAlloc = FALSE;
-   static U8            schdNumRapid = 0;
-   U8                   remNumRapid = 0;
-   U8                   nPrb = 0;
+   static uint8_t            schdNumRapid = 0;
+   uint8_t                   remNumRapid = 0;
+   uint8_t                   nPrb = 0;
    S32                  allwdTbSz = 0;
 #ifdef LTE_TDD   
-   U16                  lostRe;  
-   U8                   cfi = cellDl->currCfi;  
+   uint16_t                  lostRe;  
+   uint8_t                   cfi = cellDl->currCfi;  
 #endif   
 
-   TRC2(rgSCHCmnRaRspAlloc);
 #ifndef RGR_V1
    UNUSED(cellUl);
 #endif
@@ -4610,7 +4565,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
          "bw == bwAssigned RARNTI:%d",rarnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    reqLst = &cell->raInfo.raReqLst[raIndex];
@@ -4618,7 +4573,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
          "reqLst Count=0 RARNTI:%d",rarnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    remNumRapid = reqLst->count;
 
@@ -4645,7 +4600,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
       /* rgSCHCmnClcRbAllocForFxdTb(cell, allwdTbSz/8, cellDl->ccchCqi, &rb);*/
       if(cellDl->bitsPerRb==0)
       {
-         while ((rgTbSzTbl[0][0][rb]) <(U32) allwdTbSz)
+         while ((rgTbSzTbl[0][0][rb]) <(uint32_t) allwdTbSz)
          {
             rb++;
          }
@@ -4687,7 +4642,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    if (!isAlloc)
    {
       RLOG_ARG0(L_INFO,DBG_CELLID,cell->cellId,"BW alloc Failed");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    subFrm->bwAssigned = subFrm->bwAssigned + rb;
@@ -4705,7 +4660,7 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
    allocInfo->raRspAlloc[noRaRnti].tbInfo[0].noLyr = 1;
    allocInfo->raRspAlloc[noRaRnti].vrbgReq = RGSCH_CEIL(nPrb,MAX_5GTF_VRBG_SIZE); 
    schdNumRapid += remNumRapid; 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -4723,14 +4678,14 @@ RgSchCmnDlRbAllocInfo   *allocInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlAllocFillRbInfo
+Void rgSCHCmnUlAllocFillRbInfo
 (
 RgSchCellCb   *cell,
 RgSchUlSf      *sf,
 RgSchUlAlloc  *alloc
 )
 #else
-PUBLIC Void rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc)
+Void rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc)
 RgSchCellCb    *cell;
 RgSchUlSf      *sf;
 RgSchUlAlloc   *alloc;
@@ -4738,17 +4693,16 @@ RgSchUlAlloc   *alloc;
 {
     RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
     RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-    U8             cfi = cellDl->currCfi;
+    uint8_t             cfi = cellDl->currCfi;
 
 
-   TRC2(rgSCHCmnUlAllocFillRbInfo);
    alloc->grnt.rbStart = (alloc->sbStart * cellUl->sbSize) + 
                                     cell->dynCfiCb.bwInfo[cfi].startRb;
 
    /* Num RBs = numSbAllocated * sbSize - less RBs in the last SB */
    alloc->grnt.numRb = (alloc->numSb * cellUl->sbSize);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -4772,7 +4726,7 @@ RgSchUlAlloc   *alloc;
  *  @param[in]  Bool              preamGrpA
  *  @param[in]  RgSchUlHqProcCb   *hqProc
  *  @param[out] RgSchUlAlloc      **ulAllocRef
- *  @param[out] U8                *hqProcIdRef
+ *  @param[out] uint8_t                *hqProcIdRef
  *  @return  Void
  **/
 #ifdef ANSI
@@ -4783,7 +4737,7 @@ CmLteRnti       rnti,
 Bool            preamGrpA,
 RgSchUlHqProcCb *hqProc,
 RgSchUlAlloc    **ulAllocRef,
-U8              *hqProcIdRef
+uint8_t              *hqProcIdRef
 )
 #else
 PRIVATE Void rgSCHCmnMsg3GrntReq(cell, rnti, preamGrpA, hqProc,
@@ -4793,24 +4747,23 @@ CmLteRnti       rnti;
 Bool            preamGrpA;
 RgSchUlHqProcCb *hqProc;
 RgSchUlAlloc    **ulAllocRef;
-U8              *hqProcIdRef;
+uint8_t              *hqProcIdRef;
 #endif
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchUlSf       *sf = &cellUl->ulSfArr[cellUl->msg3SchdIdx];
    RgSchUlHole     *hole;
    RgSchUlAlloc    *alloc;
-   U8              iMcs;
-   U8              numSb;
+   uint8_t              iMcs;
+   uint8_t              numSb;
 
-   TRC2(rgSCHCmnMsg3GrntReq);
 
    *ulAllocRef = NULLP;
 
    /* Fix: ccpu00120610 Use remAllocs from subframe during msg3 allocation */
    if (*sf->allocCountRef >= cellUl->maxAllocPerUlSf)
    {
-      RETVOID;
+      return;
    }
    if (preamGrpA == FALSE)
    {
@@ -4843,7 +4796,7 @@ U8              *hqProcIdRef;
       }
       if (numSb <= hole->num)
       {
-         U8 iTbs;
+         uint8_t iTbs;
          alloc                = rgSCHUtlUlAllocGetHole(sf, numSb, hole);
          rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc);
          alloc->grnt.iMcs     = iMcs;
@@ -4867,10 +4820,10 @@ U8              *hqProcIdRef;
          alloc->pdcch         = FALSE;
          alloc->forMsg3       = TRUE;
          alloc->hqProc        = hqProc;
-         rgSCHUhmNewTx(hqProc, (U8)(cell->rachCfg.maxMsg3Tx - 1), alloc);
+         rgSCHUhmNewTx(hqProc, (uint8_t)(cell->rachCfg.maxMsg3Tx - 1), alloc);
          //RLOG_ARG4(L_DEBUG,DBG_CELLID,cell->cellId,
          printf(
-               "\nRNTI:%d MSG3 ALLOC proc(%p)procId(%d)schdIdx(%d)\n",
+               "\nRNTI:%d MSG3 ALLOC proc(%lu)procId(%d)schdIdx(%d)\n",
                alloc->rnti,
                ((PTR)alloc->hqProc),
                alloc->hqProc->procId,
@@ -4882,7 +4835,7 @@ U8              *hqProcIdRef;
       }
    }
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -4921,12 +4874,11 @@ RgSchCmnDlUe  *ueDl;
 Bool          isEmtcUe;
 #endif
 {
-   U8            modOrder;
-   U32           maxRb;
+   uint8_t            modOrder;
+   uint32_t           maxRb;
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   U8            cfi = cellSch->dl.currCfi;
+   uint8_t            cfi = cellSch->dl.currCfi;
 
-   TRC2(rgSCHCmnDlSetUeAllocLmt);
 
 #ifdef EMTC_ENABLE
    if(TRUE == isEmtcUe)
@@ -5047,7 +4999,7 @@ Bool          isEmtcUe;
       }
    }
 
-   RETVOID;
+   return;
    }
 
 #ifdef DL_LA
@@ -5086,12 +5038,11 @@ RgSchUeCb     *ue;
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe  *ueDl =  RG_SCH_CMN_GET_DL_UE(ue ,cell);
-   U8            cfi = cellSch->dl.currCfi;
-   U8            maxiTbs;
-   U8            cqiBasediTbs;
-   U8            actualiTbs;
+   uint8_t            cfi = cellSch->dl.currCfi;
+   uint8_t            maxiTbs;
+   uint8_t            cqiBasediTbs;
+   uint8_t            actualiTbs;
 
-   TRC2(rgSCHCheckAndSetTxScheme);
 
    maxiTbs      = (*(RgSchCmnCqiToTbs*)(cellSch->dl.cqiToTbsTbl[0][cfi]))\
                 [RG_SCH_CMN_MAX_CQI - 1];
@@ -5109,7 +5060,7 @@ RgSchUeCb     *ue;
       RG_SCH_CMN_UNSET_FORCE_TD(ue,cell, RG_SCH_CMN_TD_TXSCHEME_CHNG);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -5134,27 +5085,26 @@ RgSchUeCb     *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlSetUeAllocLmtLa
+Void rgSCHCmnDlSetUeAllocLmtLa
 (
 RgSchCellCb   *cell,
 RgSchUeCb     *ue
 )
 #else
-PUBLIC Void rgSCHCmnDlSetUeAllocLmtLa(cell, ue)
+Void rgSCHCmnDlSetUeAllocLmtLa(cell, ue)
 RgSchCellCb   *cell;
 RgSchUeCb     *ue;
 #endif
 {
-   U8            modOrder;
-   U32           maxRb;
-   U8            reportediTbs;
+   uint8_t            modOrder;
+   uint32_t           maxRb;
+   uint8_t            reportediTbs;
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe  *ueDl =  RG_SCH_CMN_GET_DL_UE(ue,cell);
-   U8            cfi = cellSch->dl.currCfi;
-   U8            maxiTbs;
-   U8            cwIdx = 0; 
+   uint8_t            cfi = cellSch->dl.currCfi;
+   uint8_t            maxiTbs;
+   uint8_t            cwIdx = 0; 
 
-   TRC2(rgSCHCmnDlSetUeAllocLmtLa);
 
    maxiTbs      = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1];
    if(ueDl->cqiFlag == TRUE)
@@ -5231,7 +5181,7 @@ RgSchUeCb     *ue;
    } 
 
 
-   RETVOID;
+   return;
 }
 #endif
 /***********************************************************
@@ -5249,24 +5199,23 @@ RgSchUeCb     *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlHqPResetTemp 
+Void rgSCHCmnDlHqPResetTemp 
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHCmnDlHqPResetTemp(hqP)
+Void rgSCHCmnDlHqPResetTemp(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
 
-   TRC2(rgSCHCmnDlHqPResetTemp);
 
    /* Fix: syed having a hqP added to Lists for RB assignment rather than
     * a UE, as adding UE was limiting handling some scenarios */ 
     hqP->reqLnk.node = (PTR)NULLP;
     hqP->schdLstLnk.node = (PTR)NULLP;
 
-   RETVOID;
+   return;
 }  /* rgSCHCmnDlHqPResetTemp */
 
 /***********************************************************
@@ -5284,13 +5233,13 @@ RgSchDlHqProcCb         *hqP;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlUeResetTemp
+Void rgSCHCmnDlUeResetTemp
 (
 RgSchUeCb               *ue,
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHCmnDlUeResetTemp(ue, hqP)
+Void rgSCHCmnDlUeResetTemp(ue, hqP)
 RgSchUeCb               *ue;
 RgSchDlHqProcCb         *hqP;
 #endif
@@ -5301,7 +5250,6 @@ RgSchDlHqProcCb         *hqP;
    Void           *tmpCb;
 #endif
 
-   TRC2(rgSCHCmnDlUeResetTemp);
 
    /* Fix : syed check for UE's existence was useless.
     * Instead we need to check that reset is done only for the 
@@ -5314,7 +5262,7 @@ RgSchDlHqProcCb         *hqP;
 #ifdef LTE_ADV
       tmpCb = allocInfo->laaCb;
 #endif
-      cmMemset((U8 *)allocInfo, (U8)0, sizeof(RgSchDlRbAlloc));
+      memset(allocInfo, 0, sizeof(RgSchDlRbAlloc));
       allocInfo->rnti = ue->ueId;
 #ifdef LTE_ADV
       allocInfo->laaCb = tmpCb;
@@ -5325,7 +5273,7 @@ RgSchDlHqProcCb         *hqP;
    }
    rgSCHCmnDlHqPResetTemp(hqP);
 
-   RETVOID;
+   return;
 }  /* rgSCHCmnDlUeResetTemp */
 
 /***********************************************************
@@ -5343,24 +5291,23 @@ RgSchDlHqProcCb         *hqP;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlUeResetTemp
+Void rgSCHCmnUlUeResetTemp
 (
 RgSchCellCb             *cell,
 RgSchUeCb               *ue
 )
 #else
-PUBLIC Void rgSCHCmnUlUeResetTemp(cell, ue)
+Void rgSCHCmnUlUeResetTemp(cell, ue)
 RgSchCellCb             *cell;
 RgSchUeCb               *ue;
 #endif
 {
    RgSchCmnUlUe       *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue,cell);
 
-   TRC2(rgSCHCmnUlUeResetTemp);
 
-   cmMemset((U8 *)&cmnUlUe->alloc, (U8)0, sizeof(cmnUlUe->alloc));
+   memset(&cmnUlUe->alloc, 0, sizeof(cmnUlUe->alloc));
 
-   RETVOID;
+   return;
 }  /* rgSCHCmnUlUeResetTemp */
 
 
@@ -5383,21 +5330,20 @@ RgSchUeCb               *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnFillPdcch
+Void rgSCHCmnFillPdcch
 (
 RgSchCellCb                *cell,
 RgSchPdcch                 *pdcch,
 RgSchDlRbAlloc             *rbAllocInfo
 )
 #else
-PUBLIC Void rgSCHCmnFillPdcch(cell, pdcch, rbAllocInfo)
+Void rgSCHCmnFillPdcch(cell, pdcch, rbAllocInfo)
 RgSchCellCb                *cell;
 RgSchPdcch                 *pdcch;
 RgSchDlRbAlloc             *rbAllocInfo;
 #endif
 {
 
-   TRC2(rgSCHCmnFillPdcch);
 
    /* common channel pdcch filling,
     * only 1A and Local is supported */
@@ -5517,7 +5463,7 @@ RgSchDlRbAlloc             *rbAllocInfo;
             "dciForamt Fill RNTI:%d",rbAllocInfo->rnti);
          break;
    }
-   RETVOID;
+   return;
 }
 
 #ifdef LTE_TDD
@@ -5532,9 +5478,9 @@ RgSchDlRbAlloc             *rbAllocInfo;
  *
  *     Invoked by: Scheduler
  *
- *  @param[in] U8                   splfrmCnt
- *  @param[in] U8                   curSubfrmIdx
- *  @param[in] U8                   periodicity
+ *  @param[in] uint8_t                   splfrmCnt
+ *  @param[in] uint8_t                   curSubfrmIdx
+ *  @param[in] uint8_t                   periodicity
  *  @param[in] RgSchTddSubfrmInfo   *subfrmInfo
  *  @return  Bool
  *
@@ -5542,23 +5488,22 @@ RgSchDlRbAlloc             *rbAllocInfo;
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnIsSplSubfrm
 (
-U8                   splfrmCnt,
-U8                   curSubfrmIdx,
-U8                   periodicity,
+uint8_t                   splfrmCnt,
+uint8_t                   curSubfrmIdx,
+uint8_t                   periodicity,
 RgSchTddSubfrmInfo   *subfrmInfo
 )
 #else
 PRIVATE Bool rgSCHCmnIsSplSubfrm(splfrmCnt, curSubfrmIdx, periodicity, subfrmInfo)
-U8                   splfrmCnt;
-U8                   curSubfrmIdx;
-U8                   periodicity;
+uint8_t                   splfrmCnt;
+uint8_t                   curSubfrmIdx;
+uint8_t                   periodicity;
 RgSchTddSubfrmInfo   *subfrmInfo;
 #endif
 {
-   U8 dlSfCnt = 0;
-   U8 splfrmIdx  = 0;
+   uint8_t dlSfCnt = 0;
+   uint8_t splfrmIdx  = 0;
 
-   TRC2(rgSCHCmnIsSplSubfrm);
 
    if(splfrmCnt > 0)
    {
@@ -5590,10 +5535,10 @@ RgSchTddSubfrmInfo   *subfrmInfo;
 
    if(splfrmIdx == curSubfrmIdx)
    {
-      RETVALUE(TRUE);
+      return (TRUE);
    }
 
-   RETVALUE(FALSE);
+   return (FALSE);
 }
 
 /**
@@ -5611,7 +5556,7 @@ RgSchTddSubfrmInfo   *subfrmInfo;
  *  @param[in]  RgDlHqProcCb  *hqP
  *  @param[in]  RgSchDlSf     *subFrm
  *  @param[in]  RgSchDlHqTbCb *tbCb
- *  @param[in]  U8            tbAllocIdx
+ *  @param[in]  uint8_t            tbAllocIdx
  *  @return  Void
  *
  **/
@@ -5621,19 +5566,18 @@ PRIVATE Void rgSCHCmnUpdHqAndDai
 RgSchDlHqProcCb   *hqP,
 RgSchDlSf         *subFrm,
 RgSchDlHqTbCb     *tbCb,
-U8                tbAllocIdx
+uint8_t                tbAllocIdx
 )
 #else
 PRIVATE Void rgSCHCmnUpdHqAndDai(hqP, subFrm, tbCb,tbAllocIdx)
 RgSchDlHqProcCb   *hqP;
 RgSchDlSf         *subFrm;
 RgSchDlHqTbCb     *tbCb;
-U8                tbAllocIdx;
+uint8_t                tbAllocIdx;
 #endif
 {
    RgSchUeCb      *ue = hqP->hqE->ue;
    
-   TRC2(rgSCHCmnUpdHqAndDai);
 
    if(subFrm != NULLP)
    {
@@ -5658,7 +5602,7 @@ U8                tbAllocIdx;
    if(ue && !tbAllocIdx)
    {
       Bool   havePdcch = (tbCb->hqP->pdcch ? TRUE : FALSE);
-      U8     dlDai;
+      uint8_t     dlDai;
       
       dlDai = rgSCHCmnUpdDai(ue, &tbCb->fdbkTime, tbCb->m, havePdcch,tbCb->hqP,
             &tbCb->dai);
@@ -5676,7 +5620,7 @@ U8                tbAllocIdx;
       fdbk reception */
    tbCb->pucchFdbkIdx = tbCb->hqP->ulDai;
 
-   RETVOID;
+   return;
 }
 
 
@@ -5694,35 +5638,34 @@ U8                tbAllocIdx;
  *  @param[in]  RgDlHqProcCb  *hqP
  *  @param[in]  RgSchDlSf     *subFrm
  *  @param[in]  RgSchDlHqTbCb *tbCb
- *  @return  U8 dlDai 
+ *  @return  uint8_t dlDai 
  *
  **/
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnUpdDai
+uint8_t rgSCHCmnUpdDai
 (
 RgSchUeCb         *ue,
 CmLteTimingInfo   *fdbkTime,
-U8                 m,
+uint8_t                 m,
 Bool               havePdcch,
 RgSchDlHqProcCb   *hqP,
-U8                *ulDai
+uint8_t                *ulDai
 )
 #else
-PUBLIC U8 rgSCHCmnUpdDai(ue, fdbkTime, m, havePdcch,tbCb,servCellId,hqP,ulDai)
+uint8_t rgSCHCmnUpdDai(ue, fdbkTime, m, havePdcch,tbCb,servCellId,hqP,ulDai)
 RgSchUeCb         *ue;
 CmLteTimingInfo   *fdbkTime;
-U8                 m;
+uint8_t                 m;
 Bool               havePdcch;
 RgSchDlHqProcCb   *hqP;
-U8                *ulDai;
+uint8_t                *ulDai;
 #endif
 {
    RgSchTddANInfo *anInfo;
-   U8             servCellIdx;
-   U8             ackNackFdbkArrSize;
+   uint8_t             servCellIdx;
+   uint8_t             ackNackFdbkArrSize;
   
 
-   TRC2(rgSCHCmnUpdDai);
 
    if(hqP != NULLP)
    {/* Non SPS */
@@ -5787,13 +5730,13 @@ U8                *ulDai;
       *ulDai = anInfo->ulDai;
    }
 #endif
-   RETVALUE(anInfo->dlDai);
+   return (anInfo->dlDai);
 
 }
 #endif /* ifdef LTE_TDD */
 
-PUBLIC U32 rgHqRvRetxCnt[4][2];
-PUBLIC U32 rgUlrate_grant;
+uint32_t rgHqRvRetxCnt[4][2];
+uint32_t rgUlrate_grant;
 
 /**
  * @brief This function fills the HqP TB with rbAllocInfo.
@@ -5807,25 +5750,25 @@ PUBLIC U32 rgUlrate_grant;
  *
  *  @param[in]  RgSchCellCb*      cell
  *  @param[in]  RgSchDlRbAlloc    *rbAllocInfo,
- *  @param[in]  U8                tbAllocIdx
+ *  @param[in]  uint8_t                tbAllocIdx
  *  @param[in]  RgSchPdcch        *pdcch
  *  @return  Void
  *
  **/
 #ifdef LTEMAC_SPS
 #ifdef ANSI
-PUBLIC Void rgSCHCmnFillHqPTb
+Void rgSCHCmnFillHqPTb
 (
 RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
-U8                         tbAllocIdx,
+uint8_t                         tbAllocIdx,
 RgSchPdcch                 *pdcch
 )
 #else
-PUBLIC Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch)
+Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch)
 RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
-U8                         tbAllocIdx;
+uint8_t                         tbAllocIdx;
 RgSchPdcch                 *pdcch;
 #endif
 #else
@@ -5834,14 +5777,14 @@ PRIVATE Void rgSCHCmnFillHqPTb
 (
 RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
-U8                         tbAllocIdx,
+uint8_t                         tbAllocIdx,
 RgSchPdcch                 *pdcch
 )
 #else
 PRIVATE Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch)
 RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
-U8                         tbAllocIdx;
+uint8_t                         tbAllocIdx;
 RgSchPdcch                 *pdcch;
 #endif
 #endif /* LTEMAC_SPS */
@@ -5851,7 +5794,6 @@ RgSchPdcch                 *pdcch;
    RgSchDlHqTbCb      *tbInfo = tbAllocInfo->tbCb;
    RgSchDlHqProcCb    *hqP = tbInfo->hqP;
 
-   TRC2(rgSCHCmnFillHqPTb);
 
    /*ccpu00120365-ADD-if tb is disabled, set mcs=0,rv=1.
     * Relevant for DCI format 2 & 2A as per 36.213-7.1.7.2
@@ -5913,7 +5855,7 @@ RgSchPdcch                 *pdcch;
       //tbInfo->dlGrnt.numRb = rbAllocInfo->rbsAlloc;
       rgSCHUtlDlHqPTbAddToTx(hqP->subFrm, hqP, tbInfo->tbIdx);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -5934,7 +5876,7 @@ RgSchPdcch                 *pdcch;
  *  @param[in]  RgSchDlRbAlloc*   rbAllocInfo
  *  @param[in]  RgDlHqProc*       hqP
  *  @param[out]  RgSchPdcch        *pdcch
- *  @param[in]   U8               tpc
+ *  @param[in]   uint8_t               tpc
  *  @return  Void
  *
  **/
@@ -5945,7 +5887,7 @@ RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
 RgSchDlHqProcCb            *hqP,
 RgSchPdcch                 *pdcch,
-U8                         tpc
+uint8_t                         tpc
 )
 #else
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmtB1B2(cell, rbAllocInfo, hqP, pdcch, tpc)
@@ -5953,11 +5895,10 @@ RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
 RgSchDlHqProcCb            *hqP;
 RgSchPdcch                 *pdcch;
-U8                         tpc;
+uint8_t                         tpc;
 #endif
 {
 
-   TRC2(rgSCHCmnFillHqPPdcchDciFrmtB1B2)
 
    rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch);   
    //Currently hardcoding values here.
@@ -6026,13 +5967,13 @@ U8                         tpc;
             break;
    }
    
-   RETVOID;
+   return;
 }
 
-extern U32 totPcellSCell;
-extern U32 addedForScell;
-extern U32 addedForScell1;
-extern U32 addedForScell2;
+extern uint32_t totPcellSCell;
+extern uint32_t addedForScell;
+extern uint32_t addedForScell1;
+extern uint32_t addedForScell2;
 /**
  * @brief This function fills the PDCCH information from dlProc.
  *
@@ -6054,14 +5995,14 @@ extern U32 addedForScell2;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnFillHqPPdcch
+Void rgSCHCmnFillHqPPdcch
 (
 RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
 RgSchDlHqProcCb            *hqP
 )
 #else
-PUBLIC Void rgSCHCmnFillHqPPdcch(cell, rbAllocInfo, hqP)
+Void rgSCHCmnFillHqPPdcch(cell, rbAllocInfo, hqP)
 RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
 RgSchDlHqProcCb            *hqP;
@@ -6069,9 +6010,8 @@ RgSchDlHqProcCb            *hqP;
 {
    RgSchCmnDlCell     *cmnCell = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchPdcch         *pdcch = rbAllocInfo->pdcch;
-   U8                 tpc = 1;
+   uint8_t                 tpc = 1;
 
-   TRC2(rgSCHCmnFillHqPPdcch);
 
    if (hqP->hqE->ue)
    {
@@ -6117,7 +6057,7 @@ RgSchDlHqProcCb            *hqP;
          addedForScell,
          addedForScell1,
          cell->crntTime.sfn,
-         cell->crntTime.subframe);
+         cell->crntTime.slot);
          */
       }
 #endif
@@ -6163,7 +6103,7 @@ RgSchDlHqProcCb            *hqP;
          /*
          printf ("add DL TPT is %lu  sfn:sf %d:%d \n", hqP->hqE->ue->tenbStats->stats.nonPersistent.sch[RG_SCH_CELLINDEX(hqP->hqE->cell)].dlTpt ,
          cell->crntTime.sfn,
-         cell->crntTime.subframe);
+         cell->crntTime.slot);
          */
       }
 #endif
@@ -6189,9 +6129,9 @@ RgSchDlHqProcCb            *hqP;
             "Allocator's incorrect dciForamt Fill for RNTI:%d",rbAllocInfo->rnti);
          break;
    }
-   RETVOID;
+   return;
 }
-
+#ifdef UNUSED_FUNC
 /**
  * @brief This function fills the PDCCH DCI format 1 information from dlProc.
  *
@@ -6210,10 +6150,11 @@ RgSchDlHqProcCb            *hqP;
  *  @param[in]  RgSchDlRbAlloc*   rbAllocInfo
  *  @param[in]  RgDlHqProc*       hqP
  *  @param[out]  RgSchPdcch        *pdcch
- *  @param[in]   U8               tpc
+ *  @param[in]   uint8_t               tpc
  *  @return  Void
  *
  **/
+
 #ifdef ANSI
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1
 (
@@ -6221,7 +6162,7 @@ RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
 RgSchDlHqProcCb            *hqP,
 RgSchPdcch                 *pdcch,
-U8                         tpc
+uint8_t                         tpc
 )
 #else
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1(cell, rbAllocInfo, hqP, pdcch, tpc)
@@ -6229,7 +6170,7 @@ RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
 RgSchDlHqProcCb            *hqP;
 RgSchPdcch                 *pdcch;
-U8                         tpc;
+uint8_t                         tpc;
 #endif
 {
 
@@ -6243,7 +6184,6 @@ U8                         tpc;
    RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP);
 #endif
 
-    TRC2(rgSCHCmnFillHqPPdcchDciFrmt1)
 
     rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch);
     pdcch->dci.u.format1Info.tpcCmd = tpc;
@@ -6294,7 +6234,7 @@ U8                         tpc;
        if(hqP->hqE->ue != NULLP)
        {
 #ifdef LTE_ADV
-           U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
+           uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
                                         hqP->hqE->cell->cellId,
                                         hqP->hqE->ue);
 
@@ -6328,7 +6268,7 @@ U8                         tpc;
 #endif
  
 
-       RETVOID;
+       return;
 }
 /**
  * @brief This function fills the PDCCH DCI format 1A information from dlProc.
@@ -6348,7 +6288,7 @@ U8                         tpc;
  *  @param[in]  RgSchDlRbAlloc*   rbAllocInfo
  *  @param[in]  RgDlHqProc*       hqP
  *  @param[out]  RgSchPdcch        *pdcch
- *  @param[in]   U8               tpc
+ *  @param[in]   uint8_t               tpc
  *  @return  Void
  *
  **/
@@ -6359,7 +6299,7 @@ RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
 RgSchDlHqProcCb            *hqP,
 RgSchPdcch                 *pdcch,
-U8                         tpc
+uint8_t                         tpc
 )
 #else
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A(cell, rbAllocInfo, hqP, pdcch, tpc)
@@ -6367,7 +6307,7 @@ RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
 RgSchDlHqProcCb            *hqP;
 RgSchPdcch                 *pdcch;
-U8                         tpc;
+uint8_t                         tpc;
 #endif
 {
 
@@ -6379,7 +6319,6 @@ U8                         tpc;
    RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP);
 #endif
 
-    TRC2(rgSCHCmnFillHqPPdcchDciFrmt1A)
 
     rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch);
     pdcch->dci.u.format1aInfo.isPdcchOrder = FALSE;
@@ -6422,7 +6361,7 @@ U8                         tpc;
     if(hqP->hqE->ue != NULLP)
     {
 #ifdef LTE_ADV
-       U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
+       uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
                                         hqP->hqE->cell->cellId,
                                         hqP->hqE->ue);
        anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue,
@@ -6461,8 +6400,8 @@ U8                         tpc;
     }
 #endif
  
-    RETVOID;
-}
+    return;
+}      
 /**
  * @brief This function fills the PDCCH DCI format 1B information from dlProc.
  *
@@ -6481,7 +6420,7 @@ U8                         tpc;
  *  @param[in]  RgSchDlRbAlloc*   rbAllocInfo
  *  @param[in]  RgDlHqProc*       hqP
  *  @param[out]  RgSchPdcch        *pdcch
- *  @param[in]   U8               tpc
+ *  @param[in]   uint8_t               tpc
  *  @return  Void
  *
  **/
@@ -6492,7 +6431,7 @@ RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
 RgSchDlHqProcCb            *hqP,
 RgSchPdcch                 *pdcch,
-U8                         tpc
+uint8_t                         tpc
 )
 #else
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B(cell, rbAllocInfo, hqP, pdcch, tpc)
@@ -6500,7 +6439,7 @@ RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
 RgSchDlHqProcCb            *hqP;
 RgSchPdcch                 *pdcch;
-U8                         tpc;
+uint8_t                         tpc;
 #endif
 {
 
@@ -6512,7 +6451,6 @@ U8                         tpc;
    RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP);
 #endif
 
-    TRC2(rgSCHCmnFillHqPPdcchDciFrmt1B)
 
     rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch);
     pdcch->dci.u.format1bInfo.tpcCmd  = tpc;
@@ -6556,7 +6494,7 @@ U8                         tpc;
     if(hqP->hqE->ue != NULLP)
     {
 #ifdef LTE_ADV
-       U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
+       uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
                                         hqP->hqE->cell->cellId,
                                         hqP->hqE->ue);
        anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue,
@@ -6582,7 +6520,7 @@ U8                         tpc;
     }
 #endif
        
-    RETVOID;
+    return;
 
 }
 /**
@@ -6603,7 +6541,7 @@ U8                         tpc;
  *  @param[in]  RgSchDlRbAlloc*   rbAllocInfo
  *  @param[in]  RgDlHqProc*       hqP
  *  @param[out]  RgSchPdcch        *pdcch
- *  @param[in]   U8               tpc
+ *  @param[in]   uint8_t               tpc
  *  @return  Void
  *
  **/
@@ -6614,7 +6552,7 @@ RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
 RgSchDlHqProcCb            *hqP,
 RgSchPdcch                 *pdcch,
-U8                         tpc
+uint8_t                         tpc
 )
 #else
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2(cell, rbAllocInfo, hqP, pdcch, tpc)
@@ -6622,7 +6560,7 @@ RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
 RgSchDlHqProcCb            *hqP;
 RgSchPdcch                 *pdcch;
-U8                         tpc;
+uint8_t                         tpc;
 #endif
 {
 
@@ -6636,7 +6574,6 @@ U8                         tpc;
    RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP);
 #endif
 
-    TRC2(rgSCHCmnFillHqPPdcchDciFrmt2)
 
     rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch);
     /*ccpu00120365:-ADD-call also if tb is disabled */
@@ -6715,7 +6652,7 @@ U8                         tpc;
      {
 
 #ifdef LTE_ADV
-        U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
+        uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
                                         hqP->hqE->cell->cellId,
                                         hqP->hqE->ue);
         anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue,
@@ -6740,7 +6677,7 @@ U8                         tpc;
      }
 #endif
 
-     RETVOID;
+     return;
 }
 /**
  * @brief This function fills the PDCCH DCI format 2A information from dlProc.
@@ -6760,7 +6697,7 @@ U8                         tpc;
  *  @param[in]  RgSchDlRbAlloc*   rbAllocInfo
  *  @param[in]  RgDlHqProc*       hqP
  *  @param[out]  RgSchPdcch        *pdcch
- *  @param[in]   U8               tpc
+ *  @param[in]   uint8_t               tpc
  *  @return  Void
  *
  **/
@@ -6771,7 +6708,7 @@ RgSchCellCb                *cell,
 RgSchDlRbAlloc             *rbAllocInfo,
 RgSchDlHqProcCb            *hqP,
 RgSchPdcch                 *pdcch,
-U8                         tpc
+uint8_t                         tpc
 )
 #else
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A(cell, rbAllocInfo, hqP, pdcch, tpc)
@@ -6779,7 +6716,7 @@ RgSchCellCb                *cell;
 RgSchDlRbAlloc             *rbAllocInfo;
 RgSchDlHqProcCb            *hqP;
 RgSchPdcch                 *pdcch;
-U8                         tpc;
+uint8_t                         tpc;
 #endif
 {
 #ifdef LTE_TDD
@@ -6790,7 +6727,6 @@ U8                         tpc;
    RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP);
 #endif
 
-    TRC2(rgSCHCmnFillHqPPdcchDciFrmt2A)
 
     rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch);
     /*ccpu00120365:-ADD-call also if tb is disabled */
@@ -6872,7 +6808,7 @@ U8                         tpc;
     if(hqP->hqE->ue != NULLP)
     {
 #ifdef LTE_ADV
-       U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
+       uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
                                         hqP->hqE->cell->cellId,
                                         hqP->hqE->ue);
        anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue,
@@ -6898,9 +6834,9 @@ U8                         tpc;
 #endif
 
 
-    RETVOID;
+    return;
 }
-
+#endif
 /**
  * @brief init of Sch vars.
  *
@@ -6925,7 +6861,6 @@ RgSchCellCb *cell;
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 
-   TRC2(rgSCHCmnInitVars);
 
    cellUl->idx         = RGSCH_INVALID_INFO;
    cellUl->schdIdx     = RGSCH_INVALID_INFO;
@@ -6941,7 +6876,7 @@ RgSchCellCb *cell;
    cellUl->reTxIdx[0]   = RGSCH_INVALID_INFO;
    cellUl->reTxIdx[1]   = RGSCH_INVALID_INFO;
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 
 }
 
@@ -6959,25 +6894,24 @@ RgSchCellCb *cell;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUpdVars
+Void rgSCHCmnUpdVars
 (
 RgSchCellCb *cell
 )
 #else
-PUBLIC Void rgSCHCmnUpdVars(cell)
+Void rgSCHCmnUpdVars(cell)
 RgSchCellCb *cell;
 #endif
 {
    CmLteTimingInfo   timeInfo;
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   U16 idx;
+   uint16_t idx;
 
-   TRC2(rgSCHCmnUpdVars);
 
-   idx = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe);
+   idx = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot);
    cellUl->idx     = ((idx) % (RG_SCH_CMN_UL_NUM_SF));
 #ifdef UL_ADPT_DBG     
-   printf("idx %d cellUl->idx  %d RGSCH_NUM_SUB_FRAMES_5G %d  time(%d %d) \n",idx,cellUl->idx ,RGSCH_NUM_SUB_FRAMES_5G,cell->crntTime.sfn,cell->crntTime.subframe);
+   printf("idx %d cellUl->idx  %d RGSCH_NUM_SUB_FRAMES_5G %d  time(%d %d) \n",idx,cellUl->idx ,RGSCH_NUM_SUB_FRAMES_5G,cell->crntTime.sfn,cell->crntTime.slot);
 #endif    
    /* Need to scheduler for after SCHED_DELTA */
    /* UL allocation has been advanced by 1 subframe
@@ -7017,7 +6951,7 @@ RgSchCellCb *cell;
 
    idx = ((cellUl->schdIdx) % (RG_SCH_CMN_UL_NUM_SF));
 
-   cellUl->reTxIdx[0] = (U8) idx;
+   cellUl->reTxIdx[0] = (uint8_t) idx;
 #ifdef UL_ADPT_DBG     
    printf("cellUl->hqFdbkIdx[0] %d cellUl->reTxIdx[0] %d \n",cellUl->hqFdbkIdx[0], cellUl->reTxIdx[0] );
 #endif
@@ -7025,7 +6959,7 @@ RgSchCellCb *cell;
     * mainly the prachMaskIndex */
    rgSCHCmnUpdRachParam(cell);
 
-   RETVOID;
+   return;
 }
 #endif
 
@@ -7043,49 +6977,48 @@ RgSchCellCb *cell;
  *
  *  @param[in]  CmLteTimingInfo  *timeInfo
  *  @param[in]  RgSchCellCb              *cell
- *  @return U8
+ *  @return uint8_t
  *
  **/
 #ifdef ANSI
-PUBLIC U8  rgSCHCmnGetPhichUlSfIdx
+uint8_t  rgSCHCmnGetPhichUlSfIdx
 (
 CmLteTimingInfo *timeInfo,
 RgSchCellCb *cell
 )
 #else
-PUBLIC U8  rgSCHCmnGetPhichUlSfIdx(timeInfo, cell)
+uint8_t  rgSCHCmnGetPhichUlSfIdx(timeInfo, cell)
 CmLteTimingInfo *timeInfo;
 RgSchCellCb        *cell;
 #endif
 {
    RgSchCmnUlCell       *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchDlSf            *dlsf;
-   U8                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8                   idx;
-   U16                  numUlSf;
-   U16                  sfn;
-   U8                   subframe;
+   uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t                   idx;
+   uint16_t                  numUlSf;
+   uint16_t                  sfn;
+   uint8_t                   subframe;
 
-   TRC2(rgSCHCmnGetPhichUlSfIdx);
 
    dlsf = rgSCHUtlSubFrmGet(cell, *timeInfo);
 
    if(dlsf->phichOffInfo.sfnOffset == RGSCH_INVALID_INFO)
    {
-      RETVALUE(RGSCH_INVALID_INFO);
+      return (RGSCH_INVALID_INFO);
    }
    subframe = dlsf->phichOffInfo.subframe;
 
    sfn = (RGSCH_MAX_SFN + timeInfo->sfn -
                    dlsf->phichOffInfo.sfnOffset) % RGSCH_MAX_SFN;
 
-   /* ccpu00130980: numUlSf(U16) parameter added to avoid integer
+   /* ccpu00130980: numUlSf(uint16_t) parameter added to avoid integer
     * wrap case such that idx will be proper*/
    numUlSf = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1];
    numUlSf = ((numUlSf * sfn) + rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][subframe]) - 1;
    idx = numUlSf % (cellUl->numUlSubfrms);
 
-   RETVALUE(idx);
+   return (idx);
 }
 
 /**
@@ -7098,37 +7031,36 @@ RgSchCellCb        *cell;
  *     Purpose:  Gets uplink subframe index based on SFN and subframe number.
  *
  *  @param[in]  CmLteTimingInfo  *timeInfo
- *  @param[in]  U8               ulDlCfgIdx
- *  @return U8
+ *  @param[in]  uint8_t               ulDlCfgIdx
+ *  @return uint8_t
  *
  **/
 #ifdef ANSI
-PUBLIC U8  rgSCHCmnGetUlSfIdx
+uint8_t  rgSCHCmnGetUlSfIdx
 (
 CmLteTimingInfo *timeInfo,
 RgSchCellCb *cell
 )
 #else
-PUBLIC U8  rgSCHCmnGetUlSfIdx(timeInfo, cell)
+uint8_t  rgSCHCmnGetUlSfIdx(timeInfo, cell)
 CmLteTimingInfo *timeInfo;
 RgSchCellCb *cell;
 #endif
 {
    RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   U8                ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8                idx = 0;
-   U16               numUlSf;
+   uint8_t                ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t                idx = 0;
+   uint16_t               numUlSf;
 
-   TRC2(rgSCHCmnGetUlSfIdx);
 
-   /* ccpu00130980: numUlSf(U16) parameter added to avoid integer
+   /* ccpu00130980: numUlSf(uint16_t) parameter added to avoid integer
     * wrap case such that idx will be proper*/
    numUlSf = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1];
    numUlSf = ((numUlSf * timeInfo->sfn) + \
          rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][timeInfo->subframe]) - 1;
    idx = numUlSf % (cellUl->numUlSubfrms);
 
-   RETVALUE(idx);
+   return (idx);
 }
 
 #endif
@@ -7143,37 +7075,36 @@ RgSchCellCb *cell;
  *     Purpose:  Gets uplink subframe index based on SFN and subframe number.
  *
  *  @param[in]  CmLteTimingInfo  *timeInfo
- *  @param[in]  U8               ulDlCfgIdx
- *  @return U8
+ *  @param[in]  uint8_t               ulDlCfgIdx
+ *  @return uint8_t
  *
  **/
 #ifdef ANSI
-PUBLIC U8  rgSCHCmnGetUlHqProcIdx
+uint8_t  rgSCHCmnGetUlHqProcIdx
 (
 CmLteTimingInfo *timeInfo,
 RgSchCellCb *cell
 )
 #else
-PUBLIC U8  rgSCHCmnGetUlHqProcIdx(timeInfo, cell)
+uint8_t  rgSCHCmnGetUlHqProcIdx(timeInfo, cell)
 CmLteTimingInfo *timeInfo;
 RgSchCellCb *cell;
 #endif
 {
-   U8            procId;
-   U32           numUlSf;
+   uint8_t            procId;
+   uint32_t           numUlSf;
   
 #ifndef LTE_TDD
-   numUlSf  = (timeInfo->sfn * RGSCH_NUM_SUB_FRAMES_5G + timeInfo->subframe);
+   numUlSf  = (timeInfo->sfn * RGSCH_NUM_SUB_FRAMES_5G + timeInfo->slot);
    procId   = numUlSf % RGSCH_NUM_UL_HQ_PROC;
 #else
-   U8            ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t            ulDlCfgIdx = cell->ulDlCfgIdx;
    /*ccpu00130639 - MOD - To get correct UL HARQ Proc IDs for all UL/DL Configs*/
-   U8            numUlSfInSfn;
+   uint8_t            numUlSfInSfn;
    S8            sfnCycle = cell->tddHqSfnCycle;
-   U8            numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx]
+   uint8_t            numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx]
 
    /* TRACE 5 Changes */
-   TRC2(rgSCHCmnGetUlHqProcIdx);
 
    /* Calculate the number of UL SF in one SFN */
    numUlSfInSfn = RGSCH_NUM_SUB_FRAMES -
@@ -7192,11 +7123,11 @@ RgSchCellCb *cell;
    /* Calculate the total number of UL sf */
    /*  -1 is done since uplink sf are counted from 0 */
    numUlSf = numUlSfInSfn *  (timeInfo->sfn + (sfnCycle*1024)) +
-                  rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][timeInfo->subframe] - 1;
+                  rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][timeInfo->slot] - 1;
 
    procId = numUlSf % numUlHarq;   
 #endif
-   RETVALUE(procId);
+   return (procId);
 }
 
 
@@ -7217,19 +7148,18 @@ RgSchCellCb *cell;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlFreeAlloc
+Void rgSCHCmnUlFreeAlloc
 (
 RgSchCellCb     *cell,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHCmnUlFreeAlloc(cell, alloc)
+Void rgSCHCmnUlFreeAlloc(cell, alloc)
 RgSchCellCb     *cell;
 RgSchUlAlloc    *alloc;
 #endif
 {
    RgSchUlHqProcCb *hqProc;
-   TRC2(rgSCHCmnUlFreeAllocation);
 
    if (alloc->forMsg3)
    {
@@ -7242,14 +7172,14 @@ RgSchUlAlloc    *alloc;
          rgSCHUhmFreeProc(alloc->hqProc, cell);
          rgSCHUtlUlAllocRelease(alloc);
          rgSCHRamDelRaCb(cell, raCb, TRUE);
-         RETVOID;
+         return;
       }
    }
    
    hqProc = alloc->hqProc;
    rgSCHUtlUlAllocRelease(alloc);
    rgSCHUhmFreeProc(hqProc, cell);
-   RETVOID;
+   return;
 }
 
 
@@ -7268,14 +7198,14 @@ RgSchUlAlloc    *alloc;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlFreeAllocation
+Void rgSCHCmnUlFreeAllocation
 (
 RgSchCellCb     *cell,
 RgSchUlSf       *sf,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHCmnUlFreeAllocation(cell, sf, alloc)
+Void rgSCHCmnUlFreeAllocation(cell, sf, alloc)
 RgSchCellCb     *cell;
 RgSchUlSf       *sf;
 RgSchUlAlloc    *alloc;
@@ -7283,7 +7213,6 @@ RgSchUlAlloc    *alloc;
 {
    RgSchUlHqProcCb *hqProc;
 
-   TRC2(rgSCHCmnUlFreeAllocation);
 
    if (alloc->forMsg3)
    {
@@ -7296,7 +7225,7 @@ RgSchUlAlloc    *alloc;
          rgSCHUhmFreeProc(alloc->hqProc, cell);
          rgSCHUtlUlAllocRls(sf, alloc);
          rgSCHRamDelRaCb(cell, raCb, TRUE);
-         RETVOID;
+         return;
       }
    }
    
@@ -7308,7 +7237,7 @@ RgSchUlAlloc    *alloc;
 #endif
    rgSCHUtlUlAllocRls(sf, alloc);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -7333,13 +7262,13 @@ RgSchUlAlloc    *alloc;
  *         -# NULLP when unsuccessful
  **/
 #ifdef ANSI
-PUBLIC RgSchPdcch *rgSCHCmnPdcchAllocCrntSf
+RgSchPdcch *rgSCHCmnPdcchAllocCrntSf
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(cell, ue)
+RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
@@ -7349,7 +7278,6 @@ RgSchUeCb                  *ue;
    RgSchDlSf            *sf;
    RgSchPdcch           *pdcch = NULLP;
 
-   TRC2(rgSCHCmnPdcchAllocCrntSf);
    RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA);
    sf = rgSCHUtlSubFrmGet(cell, frm);
 
@@ -7369,7 +7297,7 @@ RgSchUeCb                  *ue;
       //pdcch = rgSCHCmnPdcchAlloc(cell, ue, sf, y, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_0, FALSE);
                pdcch = rgSCHCmnPdcchAlloc(cell, ue, sf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_A1, FALSE);
    }
-   RETVALUE(pdcch);
+   return (pdcch);
 }
 
 /***********************************************************
@@ -7388,20 +7316,19 @@ RgSchUeCb                  *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlAllocFillNdmrs
+Void rgSCHCmnUlAllocFillNdmrs
 (
 RgSchCmnUlCell *cellUl,
 RgSchUlAlloc   *alloc
 )
 #else
-PUBLIC Void rgSCHCmnUlAllocFillNdmrs(cellUl, alloc)
+Void rgSCHCmnUlAllocFillNdmrs(cellUl, alloc)
 RgSchCmnUlCell *cellUl;
 RgSchUlAlloc   *alloc;
 #endif
 {
-   TRC2(rgSCHCmnUlAllocFillNdmrs);
    alloc->grnt.nDmrs = cellUl->dmrsArr[alloc->sbStart];
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -7419,7 +7346,7 @@ RgSchUlAlloc   *alloc;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlAllocLnkHqProc
+Void rgSCHCmnUlAllocLnkHqProc
 (
 RgSchUeCb       *ue,
 RgSchUlAlloc    *alloc,
@@ -7427,14 +7354,13 @@ RgSchUlHqProcCb *proc,
 Bool            isRetx
 )
 #else
-PUBLIC Void rgSCHCmnUlAllocLnkHqProc(ue, alloc, proc, isRetx)
+Void rgSCHCmnUlAllocLnkHqProc(ue, alloc, proc, isRetx)
 RgSchUeCb       *ue;
 RgSchUlAlloc    *alloc;
 RgSchUlHqProcCb *proc;
 Bool            isRetx;
 #endif
 {
-   TRC2(rgSCHCmnUlAllocLnkHqProc);
 
    if(TRUE == isRetx)
    {
@@ -7447,7 +7373,7 @@ Bool            isRetx;
 #endif
       rgSCHUhmNewTx(proc, (((RgUeUlHqCb*)proc->hqEnt)->maxHqRetx), alloc);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -7472,13 +7398,13 @@ Bool            isRetx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnPdcchRlsCrntSf
+Void rgSCHCmnPdcchRlsCrntSf
 (
 RgSchCellCb                *cell,
 RgSchPdcch                 *pdcch
 )
 #else
-PUBLIC Void rgSCHCmnPdcchRlsCrntSf(cell, pdcch)
+Void rgSCHCmnPdcchRlsCrntSf(cell, pdcch)
 RgSchCellCb                *cell;
 RgSchPdcch                 *pdcch;
 #endif
@@ -7486,12 +7412,11 @@ RgSchPdcch                 *pdcch;
    CmLteTimingInfo      frm = cell->crntTime;
    RgSchDlSf               *sf;
 
-   TRC2(rgSCHCmnPdcchRlsCrntSf);
 
    RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA);
    sf = rgSCHUtlSubFrmGet(cell, frm);
    rgSCHUtlPdcchPut(cell, &sf->pdcchInfo, pdcch);
-   RETVOID;
+   return;
 }
 /***********************************************************
  *
@@ -7507,21 +7432,20 @@ RgSchPdcch                 *pdcch;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlFillPdcchWithAlloc
+Void rgSCHCmnUlFillPdcchWithAlloc
 (
 RgSchPdcch      *pdcch,
 RgSchUlAlloc    *alloc,
 RgSchUeCb       *ue
 )
 #else
-PUBLIC Void rgSCHCmnUlFillPdcchWithAlloc(pdcch, alloc, ue)
+Void rgSCHCmnUlFillPdcchWithAlloc(pdcch, alloc, ue)
 RgSchPdcch      *pdcch;
 RgSchUlAlloc    *alloc;
 RgSchUeCb       *ue;
 #endif
 {
 
-   TRC2(rgSCHCmnUlFillPdcchWithAlloc);
 
    pdcch->ue = ue;
    pdcch->rnti = alloc->rnti;
@@ -7589,7 +7513,7 @@ RgSchUeCb       *ue;
    }   
    
 
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -7606,22 +7530,21 @@ RgSchUeCb       *ue;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlAllocFillTpc
+Void rgSCHCmnUlAllocFillTpc
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgSchUlAlloc *alloc
 )
 #else
-PUBLIC Void rgSCHCmnUlAllocFillTpc(cell, ue, alloc)
+Void rgSCHCmnUlAllocFillTpc(cell, ue, alloc)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchUlAlloc *alloc;
 #endif
 {
-   TRC2(rgSCHCmnUlAllocFillTpc);
    alloc->grnt.tpc = rgSCHPwrPuschTpcForUe(cell, ue);
-   RETVOID;
+   return;
 }
 
 
@@ -7645,23 +7568,22 @@ PRIVATE Void rgSCHCmnAddUeToRefreshQ
 (
 RgSchCellCb     *cell,
 RgSchUeCb       *ue,
-U32             wait
+uint32_t             wait
 )
 #else
 PRIVATE Void rgSCHCmnAddUeToRefreshQ(cell, ue, wait)
 RgSchCellCb     *cell;
 RgSchUeCb       *ue;
-U32             wait;
+uint32_t             wait;
 #endif
 {
    RgSchCmnCell   *sched  = RG_SCH_CMN_GET_CELL(cell);
    CmTmrArg       arg;
    RgSchCmnUeInfo *ueSchd = RG_SCH_CMN_GET_CMN_UE(ue);
 
-   TRC2(rgSCHCmnAddUeToRefreshQ);
    UNUSED(cell);
 
-   cmMemset((U8 *)&arg, 0, sizeof(arg));
+   memset(&arg, 0, sizeof(arg));
    arg.tqCp   = &sched->tmrTqCp;
    arg.tq     = sched->tmrTq;
    arg.timers = &ueSchd->tmr;
@@ -7671,7 +7593,7 @@ U32             wait;
    arg.evnt   = RG_SCH_CMN_EVNT_UE_REFRESH;
    arg.wait   = wait;
    cmPlcCbTq(&arg);
-   RETVOID;
+   return;
 }
 
 /**
@@ -7703,11 +7625,10 @@ RgSchUeCb    *ue;
 {
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnUlUe         *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
-   U8                   lcgCnt=0;
+   uint8_t                   lcgCnt=0;
    RgSchCmnLcg          *lcgCmn;
    CmLList              *node;
    RgSchCmnAllocRecord  *allRcd;
-   TRC2(rgSCHCmnUlUeReset);
 
    ue->ul.minReqBytes = 0;
    ue->ul.totalBsr = 0;
@@ -7737,7 +7658,7 @@ RgSchUeCb    *ue;
    cellSchd->apisUl->rgSCHUlUeReset(cell, ue);
 
    /* Stack Crash problem for TRACE5 changes. Added the return below */
-   RETVOID;
+   return;
 
 }
 
@@ -7773,7 +7694,6 @@ RgSchUeCb    *ue;
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
    RgSchCmnUlUe  *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
 
-   TRC2(rgSCHCmnResetRiCqi);
 
    rgSCHCmnUpdUeUlCqiInfo(cell, ue, ueUl, ueSchCmn, cellSchd, 
          cell->isCpUlExtend);
@@ -7805,7 +7725,7 @@ RgSchUeCb    *ue;
    }
 #endif   
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -7839,7 +7759,6 @@ RgSchUeCb    *ue;
    RgSchCmnDlCell       *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
    RgSchCmnDlUe         *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
-   TRC2(rgSCHCmnDlUeReset);
 
    if (ueDl->rachInfo.poLnk.node != NULLP)
    {
@@ -7884,22 +7803,21 @@ RgSchUeCb    *ue;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUeReset
+Void rgSCHCmnUeReset
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHCmnUeReset(cell, ue)
+Void rgSCHCmnUeReset(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
    Pst               pst;
    RgInfResetHqEnt   hqEntRstInfo;
 
-   TRC2(rgSCHCmnUeReset);
    /* RACHO: remove UE from pdcch, handover and rapId assoc Qs */
    rgSCHCmnDelRachInfo(cell, ue);
 
@@ -7939,7 +7857,7 @@ RgSchUeCb    *ue;
    rgSCHUtlGetPstToLyr(&pst, &rgSchCb[cell->instIdx], cell->macInst);
    RgSchMacRstHqEnt(&pst,&hqEntRstInfo);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -7959,23 +7877,22 @@ RgSchUeCb    *ue;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnActvtUlUe
+Void rgSCHCmnActvtUlUe
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHCmnActvtUlUe(cell, ue)
+Void rgSCHCmnActvtUlUe(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
 {
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnActvtUlUe);
 
    /* : take care of this in UL retransmission */
    cellSchd->apisUl->rgSCHUlActvtUe(cell, ue);
-   RETVOID;
+   return;
 }
 
 /**
@@ -7995,22 +7912,21 @@ RgSchUeCb    *ue;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnActvtDlUe
+Void rgSCHCmnActvtDlUe
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHCmnActvtDlUe(cell, ue)
+Void rgSCHCmnActvtDlUe(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
 {
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnActvtDlUe);
 
    cellSchd->apisDl->rgSCHDlActvtUe(cell, ue);
-   RETVOID;
+   return;
 }
 
 /**
@@ -8028,20 +7944,19 @@ RgSchUeCb    *ue;
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdlUlTransInd
+Void rgSCHCmnHdlUlTransInd
 (
 RgSchCellCb     *cell,
 RgSchUeCb       *ue,
 CmLteTimingInfo timingInfo
 )
 #else
-PUBLIC Void rgSCHCmnHdlUlTransInd(cell, ue, timingInfo)
+Void rgSCHCmnHdlUlTransInd(cell, ue, timingInfo)
 RgSchCellCb     *cell;
 RgSchUeCb       *ue;
 CmLteTimingInfo timingInfo;
 #endif
 {
-   TRC2(rgSCHCmnHdlUlTransInd);
 
    /* Update the latest UL dat/sig transmission time */
    RGSCHCPYTIMEINFO(timingInfo, ue->ul.ulTransTime);
@@ -8052,7 +7967,7 @@ CmLteTimingInfo timingInfo;
       RG_SCH_CMN_DL_UPDT_INACTV_MASK ( cell, ue, RG_PDCCHODR_INACTIVE);
       RG_SCH_CMN_UL_UPDT_INACTV_MASK ( cell, ue, RG_PDCCHODR_INACTIVE);
    }
-   RETVOID;
+   return;
 }
 
 #ifdef TFU_UPGRADE
@@ -8069,42 +7984,41 @@ CmLteTimingInfo timingInfo;
  *      - return the least possible Rank
  *
  *
- *  @param[in]  U32 *pmiBitMap
+ *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
 #ifdef ANSI
 PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4
 (
U32    *pmiBitMap
uint32_t    *pmiBitMap
  )
 #else
 PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap)
-   U32  *pmiBitMap;
+   uint32_t  *pmiBitMap;
 #endif
 {
-   U32 bitMap0, bitMap1;
-   TRC2(rgSCHCmnComp4TxMode4);
+   uint32_t bitMap0, bitMap1;
    bitMap0 = pmiBitMap[0];
    bitMap1 = pmiBitMap[1];
    if((bitMap1) & 0xFFFF)
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
    else if((bitMap1>>16) & 0xFFFF)
    {
-      RETVALUE (RG_SCH_CMN_RANK_2);
+      return  (RG_SCH_CMN_RANK_2);
    }
    else if((bitMap0) & 0xFFFF)
    {
-      RETVALUE (RG_SCH_CMN_RANK_3);
+      return  (RG_SCH_CMN_RANK_3);
    }
    else if((bitMap0>>16) & 0xFFFF)
    {
-      RETVALUE (RG_SCH_CMN_RANK_4);
+      return  (RG_SCH_CMN_RANK_4);
    }
    else
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
 }
 
@@ -8121,33 +8035,32 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap)
  *      - return the least possible Rank
  *
  *
- *  @param[in]  U32 *pmiBitMap
+ *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
 #ifdef ANSI
 PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4
 (
U32    *pmiBitMap
uint32_t    *pmiBitMap
  )
 #else
 PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap)
-   U32  *pmiBitMap;
+   uint32_t  *pmiBitMap;
 #endif
 {
-   U32 bitMap0;
-   TRC2(rgSCHCmnComp2TxMode4);
+   uint32_t bitMap0;
    bitMap0 = pmiBitMap[0];
    if((bitMap0>>26)& 0x0F)
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
    else if((bitMap0>>30) & 3)
    {
-      RETVALUE (RG_SCH_CMN_RANK_2);
+      return  (RG_SCH_CMN_RANK_2);
    }
    else
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
 }
 
@@ -8163,41 +8076,40 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap)
  *      - return the least possible Rank
  *
  *
- *  @param[in]  U32 *pmiBitMap
+ *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
 #ifdef ANSI
 PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3
 (
U32    *pmiBitMap
uint32_t    *pmiBitMap
  )
 #else
 PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap)
-   U32  *pmiBitMap;
+   uint32_t  *pmiBitMap;
 #endif
 {
-   U32 bitMap0;
-   TRC2(rgSCHCmnComp4TxMode3);
+   uint32_t bitMap0;
    bitMap0 = pmiBitMap[0];
    if((bitMap0>>28)& 1)
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
    else if((bitMap0>>29) &1)
    {
-      RETVALUE (RG_SCH_CMN_RANK_2);
+      return  (RG_SCH_CMN_RANK_2);
    }
    else if((bitMap0>>30) &1)
    {
-      RETVALUE (RG_SCH_CMN_RANK_3);
+      return  (RG_SCH_CMN_RANK_3);
    }
    else if((bitMap0>>31) &1)
    {
-      RETVALUE (RG_SCH_CMN_RANK_4);
+      return  (RG_SCH_CMN_RANK_4);
    }
    else
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
 }
 
@@ -8213,33 +8125,32 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap)
  *      - return the least possible Rank
  *
  *
- *  @param[in]  U32 *pmiBitMap
+ *  @param[in]  uint32_t *pmiBitMap
  *  @return  RgSchCmnRank
  **/
 #ifdef ANSI
 PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3
 (
U32 *pmiBitMap
uint32_t *pmiBitMap
  )
 #else
 PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap)
-   U32 *pmiBitMap;
+   uint32_t *pmiBitMap;
 #endif
 {
-   U32 bitMap0;
-   TRC2(rgSCHCmnComp2TxMode3);
+   uint32_t bitMap0;
    bitMap0 = pmiBitMap[0];
    if((bitMap0>>30)& 1)
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
    else if((bitMap0>>31) &1)
    {
-      RETVALUE (RG_SCH_CMN_RANK_2);
+      return  (RG_SCH_CMN_RANK_2);
    }
    else
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
 }
 
@@ -8256,45 +8167,44 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap)
  *
  *
  *  @param[in]  RgrTxMode txMode
- *  @param[in]  U32 *pmiBitMap
- *  @param[in]  U8 numTxPorts
+ *  @param[in]  uint32_t *pmiBitMap
+ *  @param[in]  uint8_t numTxPorts
  *  @return  RgSchCmnRank
  **/
 #ifdef ANSI
 PRIVATE RgSchCmnRank rgSCHCmnComputeRank
 (
  RgrTxMode    txMode,
U32          *pmiBitMap,
U8           numTxPorts
uint32_t          *pmiBitMap,
uint8_t           numTxPorts
  )
 #else
 PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts)
    RgrTxMode    txMode;
-   U32          *pmiBitMap;
-   U8           numTxPorts;
+   uint32_t          *pmiBitMap;
+   uint8_t           numTxPorts;
 #endif
 {
-   TRC2(rgSCHCmnComputeRank);
 
    if (numTxPorts ==2 && txMode == RGR_UE_TM_3)
    {
-      RETVALUE (rgSCHCmnComp2TxMode3(pmiBitMap));
+      return  (rgSCHCmnComp2TxMode3(pmiBitMap));
    }
    else if (numTxPorts ==4 && txMode == RGR_UE_TM_3)
    {
-      RETVALUE (rgSCHCmnComp4TxMode3(pmiBitMap));
+      return  (rgSCHCmnComp4TxMode3(pmiBitMap));
    }
    else if (numTxPorts ==2 && txMode == RGR_UE_TM_4)
    {
-      RETVALUE (rgSCHCmnComp2TxMode4(pmiBitMap));
+      return  (rgSCHCmnComp2TxMode4(pmiBitMap));
    }
    else if (numTxPorts ==4 && txMode == RGR_UE_TM_4)
    {
-      RETVALUE (rgSCHCmnComp4TxMode4(pmiBitMap));
+      return  (rgSCHCmnComp4TxMode4(pmiBitMap));
    }
    else
    {
-      RETVALUE (RG_SCH_CMN_RANK_1);
+      return  (RG_SCH_CMN_RANK_1);
    }
 }
 
@@ -8315,23 +8225,22 @@ PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts)
  **/
 /*KWORK_FIX:Changed function return type to void */
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlDeInitHqEnt 
+Void rgSCHCmnDlDeInitHqEnt 
 (
 RgSchCellCb  *cell,
 RgSchDlHqEnt *hqE
 )
 #else
-PUBLIC Void rgSCHCmnDlDeInitHqEnt(cell, hqE)
+Void rgSCHCmnDlDeInitHqEnt(cell, hqE)
 RgSchCellCb  *cell;
 RgSchDlHqEnt *hqE;
 #endif
 {
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
    RgSchDlHqProcCb      *hqP;
-   U8                   cnt;
+   uint8_t                   cnt;
    S16                  ret;
 
-   TRC2(rgSCHCmnDlDeInitHqEnt);
 
    ret = cellSchd->apisDl->rgSCHDlUeHqEntDeInit(cell, hqE);
    /* Free only If the Harq proc are created*/
@@ -8352,7 +8261,7 @@ RgSchDlHqEnt *hqE;
    rgSCHLaaDeInitDlHqProcCb (cell, hqE);
 #endif
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -8371,23 +8280,22 @@ RgSchDlHqEnt *hqE;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnDlInitHqEnt 
+S16 rgSCHCmnDlInitHqEnt 
 (
 RgSchCellCb  *cell,
 RgSchDlHqEnt  *hqEnt
 )
 #else
-PUBLIC S16 rgSCHCmnDlInitHqEnt(cell, hqEnt)
+S16 rgSCHCmnDlInitHqEnt(cell, hqEnt)
 RgSchCellCb  *cell;
 RgSchDlHqEnt  *hqEnt;
 #endif
 
 {
    RgSchDlHqProcCb      *hqP;
-   U8                   cnt;
+   uint8_t                   cnt;
 
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnDlInitHqEnt);
 
    for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++)
    {
@@ -8395,7 +8303,7 @@ RgSchDlHqEnt  *hqEnt;
       if (rgSCHUtlAllocSBuf(cell->instIdx,
                (Data**)&(hqP->sch), (sizeof(RgSchCmnDlHqProc))) != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 #ifdef EMTC_ENABLE
@@ -8403,7 +8311,7 @@ RgSchDlHqEnt  *hqEnt;
    {
       if(ROK != cellSchd->apisEmtcDl->rgSCHDlUeHqEntInit(cell, hqEnt))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
    }
@@ -8412,11 +8320,11 @@ RgSchDlHqEnt  *hqEnt;
    {
       if(ROK != cellSchd->apisDl->rgSCHDlUeHqEntInit(cell, hqEnt))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnDlInitHqEnt */
 
 /**
@@ -8437,22 +8345,21 @@ RgSchDlHqEnt  *hqEnt;
  *
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnGetRefreshDist 
+PRIVATE uint8_t rgSCHCmnGetRefreshDist 
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue
 )
 #else
-PRIVATE U8 rgSCHCmnGetRefreshDist(cell, ue)
+PRIVATE uint8_t rgSCHCmnGetRefreshDist(cell, ue)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 #endif
 {
-   U8   refOffst;
+   uint8_t   refOffst;
 #ifdef DEBUGP
    Inst inst = cell->instIdx;
 #endif
-   TRC2(rgSCHCmnGetRefreshDist);
 
    for(refOffst = 0; refOffst < RGSCH_MAX_REFRESH_OFFSET; refOffst++)
    {
@@ -8461,7 +8368,7 @@ RgSchUeCb          *ue;
          cell->refreshUeCnt[refOffst]++;
          ue->refreshOffset = refOffst;
          /* printf("UE[%d] refresh offset[%d]. Cell refresh ue count[%d].\n", ue->ueId, refOffst,  cell->refreshUeCnt[refOffst]); */
-         RETVALUE(refOffst);
+         return (refOffst);
       }
    }
   
@@ -8470,7 +8377,7 @@ RgSchUeCb          *ue;
    cell->refreshUeCnt[refOffst-1]++;
    ue->refreshOffset = refOffst-1;
 
-   RETVALUE(refOffst-1);
+   return (refOffst-1);
 }
 /**
  * @brief This function computes initial Refresh Wait Period.
@@ -8486,7 +8393,7 @@ RgSchUeCb          *ue;
  *
  *  @param[in]  RgSchCellCb        *cell
  *  @param[in]  RgSchUeCb          *ue
- *  @param[in]  U32                *waitPer 
+ *  @param[in]  uint32_t                *waitPer 
  *  @return  Void
  *
  **/
@@ -8495,28 +8402,27 @@ PRIVATE Void rgSCHCmnGetRefreshPer
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
-U32                *waitPer
+uint32_t                *waitPer
 )
 #else
 PRIVATE Void rgSCHCmnGetRefreshPer(cell, ue, waitPer)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
-U32                *waitPer;
+uint32_t                *waitPer;
 #endif
 {
-   U32       refreshPer;          
-   U32       crntSubFrm;
+   uint32_t       refreshPer;     
+   uint32_t       crntSubFrm;
 
-   TRC2(rgSCHCmnGetRefreshPer);     
 
    refreshPer = RG_SCH_CMN_REFRESH_TIME * RG_SCH_CMN_REFRESH_TIMERES;
-   crntSubFrm = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe;
+   crntSubFrm = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot;
    /* Fix: syed align multiple UEs to refresh at same time */
    *waitPer = refreshPer - (crntSubFrm % refreshPer);
    *waitPer = RGSCH_CEIL(*waitPer, RG_SCH_CMN_REFRESH_TIMERES);
    *waitPer = *waitPer + rgSCHCmnGetRefreshDist(cell, ue);
 
-   RETVOID;
+   return;
 }
 
 
@@ -8544,7 +8450,7 @@ U32                *waitPer;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrSCellUeCfg
+S16 rgSCHCmnRgrSCellUeCfg
 (
 RgSchCellCb  *sCell,
 RgSchUeCb    *ue,
@@ -8552,16 +8458,16 @@ RgrUeSecCellCfg  *sCellInfoCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrSCellUeCfg(sCell, ue, sCellInfoCfg, err)
+S16 rgSCHCmnRgrSCellUeCfg(sCell, ue, sCellInfoCfg, err)
 RgSchCellCb  *sCell;
 RgSchUeCb    *ue;
 RgrUeSecCellCfg  *sCellInfoCfg;
 RgSchErrInfo *err;
 #endif
 {
-   U8 i;
+   uint8_t i;
    S16                  ret;
-   U8                   cnt;
+   uint8_t                   cnt;
    RgSchCmnAllocRecord  *allRcd;
    RgSchDlRbAlloc       *allocInfo;
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell);
@@ -8574,8 +8480,7 @@ RgSchErrInfo *err;
 #ifdef DEBUGP
    Inst                 inst = ue->cell->instIdx;
 #endif
-   U32 idx = (U8)((sCell->cellId - rgSchCb[sCell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
-   TRC2(rgSCHCmnRgrSCellUeCfg);
+   uint32_t idx = (uint8_t)((sCell->cellId - rgSchCb[sCell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
 
    pCellUeSchCmn = RG_SCH_CMN_GET_UE(ue,ue->cell);
    pCellUeDl = &pCellUeSchCmn->dl;
@@ -8586,7 +8491,7 @@ RgSchErrInfo *err;
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Memory allocation FAILED\n"));
       err->errCause = RGSCHERR_SCH_CFG;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ueSchCmn = RG_SCH_CMN_GET_UE(ue,sCell);
 
@@ -8608,7 +8513,7 @@ RgSchErrInfo *err;
    RGSCH_ARRAY_BOUND_CHECK(sCell->instIdx, rgUeCatTbl, pCellUeSchCmn->cmn.ueCat);
    ueDl->maxTbBits = rgUeCatTbl[pCellUeSchCmn->cmn.ueCat].maxDlTbBits;
    /*CA dev-Start*/
-   U8 ri = 0;
+   uint8_t ri = 0;
    ri = RGSCH_MIN(ri, sCell->numTxAntPorts);
    if(((CM_LTE_UE_CAT_6 == pCellUeSchCmn->cmn.ueCat )
             ||(CM_LTE_UE_CAT_7 == pCellUeSchCmn->cmn.ueCat)) 
@@ -8647,7 +8552,7 @@ RgSchErrInfo *err;
    if ((cellSchd->apisDl->rgSCHRgrSCellDlUeCfg(sCell, ue, err)) != ROK)
    {
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Spec Sched DL UE CFG FAILED\n"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* TODO: enhance for DLFS RB Allocation for SCELLs in future dev */
@@ -8658,7 +8563,7 @@ RgSchErrInfo *err;
       if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeCfg(sCell, ue, sCellInfoCfg, err)) != ROK)
       {
          RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS UE config FAILED\n"));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -8675,7 +8580,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL UHM HARQ Ent Init "
                "Failed for CRNTI:%d", ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       ueUlPcell = RG_SCH_CMN_GET_UL_UE(ue, ue->cell);
@@ -8709,7 +8614,7 @@ RgSchErrInfo *err;
             RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL Memory allocation FAILED"
                   "for CRNTI:%d",ue->ueId);
             err->errCause = RGSCHERR_SCH_CFG;
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          allRcd->allocTime = sCell->crntTime;
          cmLListAdd2Tail(&ueUl->ulAllocLst, &allRcd->lnk);
@@ -8722,7 +8627,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Could not do "
                "power config for UE CRNTI:%d",ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
 #ifdef EMTC_ENABLE   
@@ -8732,7 +8637,7 @@ RgSchErrInfo *err;
          {
             RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED"
                   "for CRNTI:%d",ue->ueId);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
       else
@@ -8742,14 +8647,14 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED"
                "for CRNTI:%d",ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       }
    
       ue->ul.isUlCaEnabled = TRUE;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnRgrSCellUeCfg */
 
 
@@ -8770,13 +8675,13 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrSCellUeDel
+S16 rgSCHCmnRgrSCellUeDel
 (
 RgSchUeCellInfo *sCellInfo,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC S16 rgSCHCmnRgrSCellUeDel(sCellInfo, ue)
+S16 rgSCHCmnRgrSCellUeDel(sCellInfo, ue)
 RgSchUeCellInfo *sCellInfo;
 RgSchUeCb    *ue;
 #endif
@@ -8784,7 +8689,6 @@ RgSchUeCb    *ue;
    RgSchCmnCell         *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell);
    Inst                 inst = ue->cell->instIdx;
 
-   TRC2(rgSCHCmnRgrSCellUeDel);
 
    cellSchd->apisDl->rgSCHRgrSCellDlUeDel(sCellInfo, ue);
 
@@ -8808,7 +8712,7 @@ RgSchUeCb    *ue;
       if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeDel(sCellInfo->cell, ue)) != ROK)
       {
          RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS Scell del FAILED\n"));
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -8816,7 +8720,7 @@ RgSchUeCb    *ue;
          (Data**)(&(sCellInfo->sch)), (sizeof(RgSchCmnUe)));
 
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnRgrSCellUeDel */
  
 #endif
@@ -8841,20 +8745,19 @@ RgSchUeCb    *ue;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmn5gtfUeCfg
+S16 rgSCHCmn5gtfUeCfg
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
 RgrUeCfg    *cfg
 )
 #else
-PUBLIC S16 rgSCHCmn5gtfUeCfg(cell, ue, cfg)
+S16 rgSCHCmn5gtfUeCfg(cell, ue, cfg)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 RgrUeCfg    *cfg;
 #endif
 {
-   TRC2(rgSCHCmnRgrUeCfg);
 
    RgSchUeGrp *ue5gtfGrp;
    ue->ue5gtfCb.grpId = cfg->ue5gtfCfg.grpId;
@@ -8866,7 +8769,7 @@ RgrUeCfg    *cfg;
    ue->ue5gtfCb.cqiRiPer = 100;
    /* 5gtf TODO: CQIs to start from (10,0)*/
    ue->ue5gtfCb.nxtCqiRiOccn.sfn = 10;
-   ue->ue5gtfCb.nxtCqiRiOccn.subframe = 0;
+   ue->ue5gtfCb.nxtCqiRiOccn.slot = 0;
    ue->ue5gtfCb.rank = 1;
 
    printf("\nschd cfg at mac,%u,%u,%u,%u,%u\n",ue->ue5gtfCb.grpId,ue->ue5gtfCb.BeamId,ue->ue5gtfCb.numCC,
@@ -8880,11 +8783,11 @@ RgrUeCfg    *cfg;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
            "5GTF_ERROR Invalid beam id CRNTI:%d",cfg->crnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ue5gtfGrp->beamBitMask |= (1 << ue->ue5gtfCb.BeamId);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
@@ -8912,7 +8815,7 @@ RgrUeCfg    *cfg;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrUeCfg
+S16 rgSCHCmnRgrUeCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -8920,7 +8823,7 @@ RgrUeCfg     *ueCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrUeCfg(cell, ue, ueCfg, err)
+S16 rgSCHCmnRgrUeCfg(cell, ue, ueCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeCfg     *ueCfg;
@@ -8933,12 +8836,11 @@ RgSchErrInfo *err;
    RgSchCmnUe           *ueSchCmn;
    RgSchCmnUlUe         *ueUl;
    RgSchCmnDlUe         *ueDl;
-   U8                   cnt;
+   uint8_t                   cnt;
    RgSchCmnAllocRecord  *allRcd;
-   U32                  waitPer;
-   U32                  idx = (U8)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
+   uint32_t                  waitPer;
+   uint32_t                  idx = (uint8_t)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
    RgSchUeCellInfo      *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ue);
-   TRC2(rgSCHCmnRgrUeCfg);
 
 
    /* 1. Allocate Common sched control block */
@@ -8948,7 +8850,7 @@ RgSchErrInfo *err;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
             "Memory allocation FAILED for CRNTI:%d",ueCfg->crnti);
       err->errCause = RGSCHERR_SCH_CFG;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ueSchCmn   = RG_SCH_CMN_GET_UE(ue,cell);
    ue->dl.ueDlCqiCfg = ueCfg->ueDlCqiCfg;
@@ -8993,7 +8895,7 @@ RgSchErrInfo *err;
    RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, rgUeCatTbl, ueSchCmn->cmn.ueCat);
    ueDl->maxTbBits = rgUeCatTbl[ueSchCmn->cmn.ueCat].maxDlTbBits;
    /*CA dev-Start*/
-   U8 ri = 0;
+   uint8_t ri = 0;
    ri = RGSCH_MIN(ri, cell->numTxAntPorts);
    if(((CM_LTE_UE_CAT_6 == ueSchCmn->cmn.ueCat )
             ||(CM_LTE_UE_CAT_7 == ueSchCmn->cmn.ueCat)) 
@@ -9026,7 +8928,7 @@ RgSchErrInfo *err;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"UL Ambr and DL Ambr are"
          "configured as 0 for CRNTI:%d",ueCfg->crnti);
       err->errCause = RGSCHERR_SCH_CFG;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* DL ambr */
    ue->dl.ambrCfgd = (ueCfg->ueQosCfg.dlAmbr * RG_SCH_CMN_REFRESH_TIME)/100;
@@ -9043,7 +8945,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
                "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
    }
@@ -9054,7 +8956,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
                "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -9084,7 +8986,7 @@ RgSchErrInfo *err;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED"
                    "for CRNTI:%d",ueCfg->crnti);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       allRcd->allocTime = cell->crntTime;
       cmLListAdd2Tail(&ueUl->ulAllocLst, &allRcd->lnk);
@@ -9100,7 +9002,7 @@ RgSchErrInfo *err;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
             "SCH struct alloc failed for CRNTI:%d",ueCfg->crnti);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(ret);
+         return (ret);
       }
    }
    /* After initialising UL part, do power related init */
@@ -9109,7 +9011,7 @@ RgSchErrInfo *err;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do "
          "power config for UE CRNTI:%d",ueCfg->crnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifdef LTEMAC_SPS
    ret = rgSCHCmnSpsUeCfg(cell, ue, ueCfg, err);
@@ -9117,7 +9019,7 @@ RgSchErrInfo *err;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do "
          "SPS config for CRNTI:%d",ueCfg->crnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* LTEMAC_SPS */
 
@@ -9128,7 +9030,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED"
                   "for CRNTI:%d",ueCfg->crnti);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -9138,7 +9040,7 @@ RgSchErrInfo *err;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED"
                "for CRNTI:%d",ueCfg->crnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    }
 
@@ -9149,7 +9051,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DLFS UE config FAILED"
                    "for CRNTI:%d",ueCfg->crnti);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -9161,7 +9063,7 @@ RgSchErrInfo *err;
    rgSCHCmn5gtfUeCfg(cell, ue, ueCfg);
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnRgrUeCfg */
 
 /**
@@ -9185,14 +9087,14 @@ PRIVATE Void rgSCHCmnDlHdlTxModeRecfg
 RgSchCellCb *cell,
 RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg,
-U8 numTxPorts
+uint8_t numTxPorts
 )
 #else
 PRIVATE Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg, numTxPorts)
 RgSchCellCb *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
-U8 numTxPorts;
+uint8_t numTxPorts;
 #endif
 #else
 #ifdef ANSI
@@ -9211,11 +9113,10 @@ RgrUeRecfg   *ueRecfg;
 #endif
 {
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   TRC2(rgSCHCmnDlHdlTxModeRecfg);
 
    if (ueRecfg->txMode.pres != PRSNT_NODEF)
    {
-      RETVOID;
+      return;
    }
    /* ccpu00140894- Starting Timer for TxMode Transition Completion*/
    ue->txModeTransCmplt =FALSE;
@@ -9236,7 +9137,7 @@ RgrUeRecfg   *ueRecfg;
          RG_SCH_CMN_SET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_RI_1);
       }
       /* MIMO Fix End: need to set FORCE TD bitmap based on TX mode */
-      RETVOID;
+      return;
    }
    if (ueRecfg->txMode.tmTrnstnState == RGR_TXMODE_RECFG_START)
    {
@@ -9283,7 +9184,7 @@ RgrUeRecfg   *ueRecfg;
       {
          RG_SCH_CMN_SET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_RI_1);
       }
-      RETVOID;
+      return;
    }
 }
 /***********************************************************
@@ -9315,7 +9216,6 @@ RgSchCellCb  *cell;
 RgSchCmnCell *cellSchd;
 #endif
 {
-   TRC2(rgSCHCmnUpdUeMimoInfo)
 #ifdef TFU_UPGRADE
    if(ueCfg->txMode.pres)
    {
@@ -9349,7 +9249,7 @@ RgSchCmnCell *cellSchd;
    ueDl->mimoInfo.cwInfo[0].cqi = cellSchd->dl.ccchCqi;
    ueDl->mimoInfo.cwInfo[1].cqi = cellSchd->dl.ccchCqi;
 
-   RETVOID;
+   return;
 }
 /***********************************************************
  *
@@ -9385,7 +9285,6 @@ Bool          isEcp;
 #endif
 {
 
-   TRC2(rgSCHCmnUpdUeUlCqiInfo)
 
 #ifdef TFU_UPGRADE
    if(ue->srsCb.srsCfg.type  ==  RGR_SCH_SRS_SETUP)
@@ -9426,7 +9325,7 @@ Bool          isEcp;
       ueUl->maxUlCqi = RG_SCH_CMN_UL_NUM_CQI - 1;
    }
 
-   RETVOID;
+   return;
 }
 /***********************************************************
  *
@@ -9459,13 +9358,12 @@ RgSchCellCb  *cell;
    RgSchCmnUe   *ueSchCmn = RG_SCH_CMN_GET_UE(ue,cell);
    RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnUpdUeCatCfg)
 
    ueDl->maxTbBits = rgUeCatTbl[ueSchCmn->cmn.ueCat].maxDlTbBits;
    
    hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell);
    /*CA dev-Start*/
-   U8 ri = 0;
+   uint8_t ri = 0;
    ri = RGSCH_MIN(ri, cell->numTxAntPorts);
    if(((CM_LTE_UE_CAT_6 == ueSchCmn->cmn.ueCat )
             ||(CM_LTE_UE_CAT_7 == ueSchCmn->cmn.ueCat)) 
@@ -9490,7 +9388,7 @@ RgSchCellCb  *cell;
    }
    ue->ul.maxBytesPerUePerTti = rgUeCatTbl[ueSchCmn->cmn.ueCat].maxUlBits * \
                    RG_SCH_CMN_MAX_BITS_RATIO / (RG_SCH_CMN_UL_COM_DENOM*8);
-   RETVOID;
+   return;
 }
 
 /**
@@ -9512,7 +9410,7 @@ RgSchCellCb  *cell;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrUeRecfg
+S16 rgSCHCmnRgrUeRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -9520,7 +9418,7 @@ RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrUeRecfg(cell, ue, ueRecfg, err)
+S16 rgSCHCmnRgrUeRecfg(cell, ue, ueRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
@@ -9528,9 +9426,8 @@ RgSchErrInfo *err;
 #endif
 {
    RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell);
-   U32          waitPer;
+   uint32_t          waitPer;
 
-   TRC2(rgSCHCmnRgrUeRecfg);
    /* Basic validations */
    if (ueRecfg->ueRecfgTypes & RGR_UE_TXMODE_RECFG)
    {
@@ -9565,7 +9462,7 @@ RgSchErrInfo *err;
             "reporting mode %d for old CRNIT:%d", 
             (int)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->oldCrnti);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
      ue->dl.ueDlCqiCfg.prdCqiCfg = ueRecfg->prdDlCqiRecfg;
    }
@@ -9577,7 +9474,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
                "Power Reconfiguration Failed for OLD CRNTI:%d",ueRecfg->oldCrnti);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -9589,7 +9486,7 @@ RgSchErrInfo *err;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Ul Ambr and DL Ambr "
             "configured as 0 for OLD CRNTI:%d",ueRecfg->oldCrnti);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       ue->ul.cfgdAmbr = (ueRecfg->ueQosRecfg.ueBr * \
       RG_SCH_CMN_REFRESH_TIME)/100;
@@ -9611,13 +9508,13 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, 
                "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if ((cellSchCmn->apisEmtcDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK)
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, 
                "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -9627,13 +9524,13 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, 
             "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if ((cellSchCmn->apisDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK)
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, 
             "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    /* DLFS UE Config */
@@ -9644,7 +9541,7 @@ RgSchErrInfo *err;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, 
                "DLFS UE re-config FAILED for CRNTI:%d",ue->ueId);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
@@ -9654,11 +9551,11 @@ RgSchErrInfo *err;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, 
               "DL SPS ReCFG FAILED for UE CRNTI:%d", ue->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnRgrUeRecfg*/
 
 /***********************************************************
@@ -9688,11 +9585,10 @@ RgSchUeCb   *ue;
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
-   U8 i;
+   uint8_t i;
 #ifdef LTEMAC_SPS
    RgSchCmnUlUeSpsInfo   *ulSpsUe   = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell);
 #endif
-   TRC2(rgSCHCmnUlUeDelAllocs);
 
    for (i = 0; i < ueUl->hqEnt.numHqPrcs; ++i)
    {
@@ -9738,7 +9634,7 @@ RgSchUeCb   *ue;
          }
       }
    }
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -9772,7 +9668,6 @@ RgSchUeCb       *ue;
    CmTmrArg       arg;
    RgSchCmnUeInfo *ueSchd = RG_SCH_CMN_GET_CMN_UE(ue);
 
-   TRC2(rgSCHCmnDelUeFrmRefreshQ);
 
 #ifdef RGL_SPECIFIC_CHANGES
    if(ue->refreshOffset < RGSCH_MAX_REFRESH_GRPSZ)
@@ -9785,7 +9680,7 @@ RgSchUeCb       *ue;
 #endif
 
 
-   cmMemset((U8 *)&arg, 0, sizeof(arg));
+   memset(&arg, 0, sizeof(arg));
    arg.tqCp   = &sched->tmrTqCp;
    arg.tq     = sched->tmrTq;
    arg.timers = &ueSchd->tmr;
@@ -9795,7 +9690,7 @@ RgSchUeCb       *ue;
    arg.evnt   = RG_SCH_CMN_EVNT_UE_REFRESH;
 
    cmRmvCbTq(&arg);
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -9827,12 +9722,11 @@ RgSchUeCb    *ueCb;
    RgSchDlHqProcCb   *ccchSduHqP = NULLP;
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnUeCcchSduDel);
 
    hqE = RG_SCH_CMN_GET_UE_HQE(ueCb, cell);
    if (hqE == NULLP)
    {
-      RETVOID;
+      return;
    }
    ccchSduHqP = hqE->ccchSduProc;
    if(ueCb->ccchSduLnk.node != NULLP)
@@ -9867,7 +9761,7 @@ RgSchUeCb    *ueCb;
          rgSCHDhmRlsHqpTb(ccchSduHqP, 0, TRUE);
       }
    }   
-   RETVOID;
+   return;
 }
 
 
@@ -9888,13 +9782,13 @@ RgSchUeCb    *ueCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUeDel
+Void rgSCHCmnUeDel
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue
 )
 #else
-PUBLIC Void rgSCHCmnUeDel(cell, ue)
+Void rgSCHCmnUeDel(cell, ue)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 #endif
@@ -9903,15 +9797,14 @@ RgSchUeCb    *ue;
    RgSchCmnUlUe         *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    CmLList              *node;
    RgSchCmnAllocRecord  *allRcd;
-   U8                    cnt;
+   uint8_t              cnt;
    RgSchCmnCell         *cellSchCmn = RG_SCH_CMN_GET_CELL(cell);
-   U32                   idx = 0;
-   TRC2(rgSCHCmnUeDel);
+   uint32_t             idx = 0;
 
    if (RG_SCH_CMN_GET_UE(ue,cell) == NULLP)
    {
       /* Common scheduler config has not happened yet */
-      RETVOID;
+      return;
    }
    hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell);
    if(hqE)
@@ -10004,10 +9897,10 @@ RgSchUeCb    *ue;
    }
 
    /* Fix : syed Moved hqEnt deinit to rgSCHCmnDlDeInitHqEnt */
-   idx = (U8)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId) & (CM_LTE_MAX_CELLS - 1));
+   idx = (uint8_t)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId) & (CM_LTE_MAX_CELLS - 1));
    rgSCHUtlFreeSBuf(cell->instIdx,
          (Data**)(&(((ue->cellInfo[ue->cellIdToCellIdxMap[idx]])->sch))), (sizeof(RgSchCmnUe)));
-   RETVOID;
+   return;
 }  /* rgSCHCmnUeDel */
 
 \f
@@ -10041,13 +9934,12 @@ RgrDlCmnCodeRateCfg     *dlCmnCodeRate;
 #endif
 {
    RgSchCmnCell         *cellDl = RG_SCH_CMN_GET_CELL(cell);
-   U32                  bitsPerRb;
-   U32                  bitsPer2Rb;
-   U32                  bitsPer3Rb;
-   U8                   i, rbNum;
-   U32                  pdcchBits;
+   uint32_t                  bitsPerRb;
+   uint32_t                  bitsPer2Rb;
+   uint32_t                  bitsPer3Rb;
+   uint8_t                   i, rbNum;
+   uint32_t                  pdcchBits;
 
-   TRC2(rgSCHCmnDlCnsdrCmnRt);
 
    /* code rate is bits per 1024 phy bits, since modl'n scheme is 2. it is
     * bits per 1024/2 REs */
@@ -10123,13 +10015,13 @@ RgrDlCmnCodeRateCfg     *dlCmnCodeRate;
    }
    if (dlCmnCodeRate->ccchCqi == 0)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    else
    {
       cellDl->dl.ccchCqi = dlCmnCodeRate->ccchCqi;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef LTE_TDD
@@ -10166,26 +10058,25 @@ RgSchErrInfo   *err;
 #endif
 {
    RgSchCmnCell         *cellSch;
-   U8                   cp;
-   U8                   sfCount;
-   U8                   numPdcchSym;
-   U8                   noSymPerSlot;
-   U8                   maxDlSubfrms = cell->numDlSubfrms;
-   U8                   splSubfrmIdx = cfg->spclSfCfgIdx;
-   U8                   swPtCnt = 0;
+   uint8_t                   cp;
+   uint8_t                   sfCount;
+   uint8_t                   numPdcchSym;
+   uint8_t                   noSymPerSlot;
+   uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
+   uint8_t                   splSubfrmIdx = cfg->spclSfCfgIdx;
+   uint8_t                   swPtCnt = 0;
    Bool                 isSplfrm;
    RgSchTddSubfrmInfo   subfrmInfo = rgSchTddMaxUlSubfrmTbl[cell->ulDlCfgIdx];
    S16                  ret;
-   U8                   splSfIdx;
-   U8                   antPortIdx;
-   U8                   numCrs;
-   U8                   cfi;  
-   U8                   cfiIdx;
+   uint8_t                   splSfIdx;
+   uint8_t                   antPortIdx;
+   uint8_t                   numCrs;
+   uint8_t                   cfi;  
+   uint8_t                   cfiIdx;
    RgSchDlSf            *sf;
-   U8                   splSfCfi;
-   U8                   mPhich;
+   uint8_t                   splSfCfi;
+   uint8_t                   mPhich;
 
-   TRC2(rgSCHCmnDlRgrCellCfg);
    
 
    cellSch = RG_SCH_CMN_GET_CELL(cell);
@@ -10206,7 +10097,7 @@ RgSchErrInfo   *err;
    }
    if (cellSch->dl.maxUePerDlSf < cellSch->dl.maxUeNewTxPerTti)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -10320,7 +10211,7 @@ RgSchErrInfo   *err;
    /* Intialize the RACH response scheduling related infromation */
    if(rgSCHCmnDlRachInfoInit(cell) != ROK)
    {
-     RETVALUE(RFAILED);
+     return RFAILED;
    }
 
    /* Allocate PRACH preamble list */
@@ -10485,7 +10376,7 @@ RgSchErrInfo   *err;
                       "maxCcchPerDlSf %u > maxUePerDlSf %u",
                    cfg->maxCcchPerDlSf, cfg->maxUePerDlSf );
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    else if (!cfg->maxCcchPerDlSf)
    {
@@ -10502,7 +10393,7 @@ RgSchErrInfo   *err;
    }
    if (rgSCHCmnDlCnsdrCmnRt(cell, &cfg->dlCmnCodeRate) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /*ccpu00118273 - ADD - start */
@@ -10521,7 +10412,7 @@ RgSchErrInfo   *err;
       ret = cellSch->apisDlfs->rgSCHDlfsCellCfg(cell, cfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    cellSch->dl.isDlFreqSel = cfg->dlfsCfg.isDlFreqSel;
@@ -10531,7 +10422,7 @@ RgSchErrInfo   *err;
    ret = rgSCHPwrCellCfg(cell, cfg);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    cellSch->dl.bcchTxPwrOffset = cfg->bcchTxPwrOffset; 
@@ -10539,7 +10430,7 @@ RgSchErrInfo   *err;
    cellSch->dl.rarTxPwrOffset  = cfg->rarTxPwrOffset; 
    cellSch->dl.phichTxPwrOffset  = cfg->phichTxPwrOffset; 
    cellSch->dl.msg4pAVal        = cfg->msg4pAVal;
-   RETVALUE(ROK);
+   return ROK;
 }
 #else /* LTE_TDD */
 /**
@@ -10577,13 +10468,12 @@ RgSchErrInfo            *err;
 {
    S16                 ret;
    RgSchCmnCell        *cellSch;
-   U8                   cp;
-   U8                   numPdcchSym;
-   U8                   noSymPerSlot;
-   U8                   cfi;  
-   U8                   cfiIdx;
+   uint8_t                   cp;
+   uint8_t                   numPdcchSym;
+   uint8_t                   noSymPerSlot;
+   uint8_t                   cfi;  
+   uint8_t                   cfiIdx;
 
-   TRC2(rgSCHCmnDlRgrCellCfg);
 
    cellSch = RG_SCH_CMN_GET_CELL(cell);
 
@@ -10697,7 +10587,7 @@ RgSchErrInfo            *err;
             "FAILED MaxUePerDlSf(%u) < MaxDlUeNewTxPerTti(%u)",
             cellSch->dl.maxUePerDlSf,
             cellSch->dl.maxUeNewTxPerTti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*[ccpu00138609]-ADD- Configure the Max CCCH Counter */
    if (cfg->maxCcchPerDlSf > cfg->maxUePerDlSf)
@@ -10706,7 +10596,7 @@ RgSchErrInfo            *err;
             "maxCcchPerDlSf %u > maxUePerDlSf %u",
             cfg->maxCcchPerDlSf, cfg->maxUePerDlSf );
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    else if (!cfg->maxCcchPerDlSf)
    {
@@ -10725,7 +10615,7 @@ RgSchErrInfo            *err;
 
    if (rgSCHCmnDlCnsdrCmnRt(cell, &cfg->dlCmnCodeRate) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    cmLListInit(&cellSch->dl.msg4RetxLst);
 #ifdef RGR_V1
@@ -10742,7 +10632,7 @@ RgSchErrInfo            *err;
       ret = cellSch->apisDlfs->rgSCHDlfsCellCfg(cell, cfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    cellSch->dl.isDlFreqSel = cfg->dlfsCfg.isDlFreqSel;
@@ -10752,7 +10642,7 @@ RgSchErrInfo            *err;
    ret = rgSCHPwrCellCfg(cell, cfg);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    cellSch->dl.bcchTxPwrOffset = cfg->bcchTxPwrOffset; 
@@ -10760,7 +10650,7 @@ RgSchErrInfo            *err;
    cellSch->dl.rarTxPwrOffset  = cfg->rarTxPwrOffset; 
    cellSch->dl.phichTxPwrOffset  = cfg->phichTxPwrOffset; 
    RG_SCH_RESET_HCSG_DL_PRB_CNTR(&cellSch->dl);
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif /* LTE_TDD */
 
@@ -10774,7 +10664,7 @@ RgSchErrInfo            *err;
  *            is necessarily satisfied (does a 'ceiling'
  *            computation).
  *
- *     Ret  : Required RBs (U8)
+ *     Ret  : Required RBs (uint8_t)
  *
  *     Notes:
  *
@@ -10782,22 +10672,21 @@ RgSchErrInfo            *err;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnUlCalcReqRbCeil
+uint8_t rgSCHCmnUlCalcReqRbCeil
 (
-U32            bytes,
-U8             cqi,
+uint32_t            bytes,
+uint8_t             cqi,
 RgSchCmnUlCell *cellUl
 )
 #else
-PUBLIC U8 rgSCHCmnUlCalcReqRbCeil(bytes, cqi, cellUl)
-U32            bytes;
-U8             cqi;
+uint8_t rgSCHCmnUlCalcReqRbCeil(bytes, cqi, cellUl)
+uint32_t            bytes;
+uint8_t             cqi;
 RgSchCmnUlCell *cellUl;
 #endif
 {
-   U32 numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff);
-   TRC2(rgSCHCmnUlCalcReqRbCeil);
-   RETVALUE((U8)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl)));
+   uint32_t numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff);
+   return ((uint8_t)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl)));
 }
 
 /***********************************************************
@@ -10820,28 +10709,27 @@ RgSchCmnUlCell *cellUl;
 PRIVATE S16 rgSCHCmnPrecompMsg3Vars
 (
 RgSchCmnUlCell *cellUl,
-U8           ccchCqi,
-U16          msgSzA,
-U8           sbSize,
+uint8_t           ccchCqi,
+uint16_t          msgSzA,
+uint8_t           sbSize,
 Bool         isEcp
 )
 #else
 PRIVATE S16 rgSCHCmnPrecompMsg3Vars(cellUl, ccchCqi, msgSzA, sbSize, isEcp)
 RgSchCmnUlCell *cellUl;
-U8           ccchCqi;
-U16          msgSzA;
-U8           sbSize;
+uint8_t           ccchCqi;
+uint16_t          msgSzA;
+uint8_t           sbSize;
 Bool         isEcp;
 #endif
 {
-   U8 numSb;
-   U8 ccchTbs;
-   U8 ccchMcs;
-   U8   numRb = 0;
-   U8   iTbs = 0;
-   U16  msg3GrntSz = 0;
+   uint8_t numSb;
+   uint8_t ccchTbs;
+   uint8_t ccchMcs;
+   uint8_t   numRb = 0;
+   uint8_t   iTbs = 0;
+   uint16_t  msg3GrntSz = 0;
 
-   TRC2(rgSCHCmnPrecompMsg3Vars);
 
    if (ccchCqi > cellUl->max16qamCqi)
    {
@@ -10849,7 +10737,7 @@ Bool         isEcp;
    }
 /* #ifndef RG_SCH_CMN_EXP_CP_SUP For ECP Pick the index 1 */
    /* Fix */
-   ccchTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ccchCqi];
+   ccchTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ccchCqi];
    ccchMcs = rgSCHCmnUlGetIMcsFrmITbs(ccchTbs, CM_LTE_UE_CAT_1);
    
    /* MCS should fit in 4 bits in RAR */
@@ -10864,18 +10752,18 @@ Bool         isEcp;
     * Since, UE doesn't exist right now, we use CAT_1 for ue
     * category*/
    while((ccchMcs = (rgSCHCmnUlGetIMcsFrmITbs(
-                      rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ccchCqi],CM_LTE_UE_CAT_1))
+                      rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ccchCqi],CM_LTE_UE_CAT_1))
                     ) >
                  RG_SCH_CMN_MAX_MSG3_IMCS)
    {
       ccchCqi--;
    }
    
-   iTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ccchCqi];
+   iTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ccchCqi];
    
    if (msgSzA < RGSCH_MIN_MSG3_GRNT_SZ)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    numSb = RGSCH_CEIL(rgSCHCmnUlCalcReqRbCeil(msgSzA, ccchCqi, cellUl), sbSize);
    
@@ -10914,10 +10802,10 @@ Bool         isEcp;
     * Refer- TG36.321- section- 5.1.2*/
    cellUl->ra.prmblANumSb = numSb;
    cellUl->ra.prmblAIMcs  = ccchMcs;
-   RETVALUE(ROK);
+   return ROK;
 }
 
-PUBLIC U32 gPrntPucchDet=0;
+uint32_t gPrntPucchDet=0;
 
 #ifdef LTE_TDD
 /***********************************************************
@@ -10938,42 +10826,41 @@ PRIVATE S16 rgSCHCmnUlCalcAvailBw
 (
 RgSchCellCb    *cell,
 RgrCellCfg     *cellCfg,
-U8              cfi,
-U8             *rbStartRef,
-U8             *bwAvailRef
+uint8_t              cfi,
+uint8_t             *rbStartRef,
+uint8_t             *bwAvailRef
 )
 #else
 PRIVATE S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
-U8             cfi;  
-U8            *rbStartRef;
-U8            *bwAvailRef;
-#endif
-{
-   U8  c        = 3;
-   U8  ulBw     = cell->bwCfg.ulTotalBw;
-   U8  n2Rb     = cell->pucchCfg.resourceSize;
-   U8  pucchDeltaShft = cell->pucchCfg.deltaShift;
-   U16 n1Pucch  = cell->pucchCfg.n1PucchAn;
-   U8  n1Cs     = cell->pucchCfg.cyclicShift;
-
-   U8  n1PerRb;
-   U8  totalCce;
-   U16 n1Max;
-   U8  n1Rb;
-   U32 mixedRb;
-   U8  exclRb; /* RBs to exclude */
-   U8  n1RbPart;
-   U8  puschRbStart;
+uint8_t             cfi;  
+uint8_t            *rbStartRef;
+uint8_t            *bwAvailRef;
+#endif
+{
+   uint8_t  c        = 3;
+   uint8_t  ulBw     = cell->bwCfg.ulTotalBw;
+   uint8_t  n2Rb     = cell->pucchCfg.resourceSize;
+   uint8_t  pucchDeltaShft = cell->pucchCfg.deltaShift;
+   uint16_t n1Pucch  = cell->pucchCfg.n1PucchAn;
+   uint8_t  n1Cs     = cell->pucchCfg.cyclicShift;
+
+   uint8_t  n1PerRb;
+   uint8_t  totalCce;
+   uint16_t n1Max;
+   uint8_t  n1Rb;
+   uint32_t mixedRb;
+   uint8_t  exclRb; /* RBs to exclude */
+   uint8_t  n1RbPart;
+   uint8_t  puschRbStart;
    /* To avoid PUCCH and PUSCH collision issue */
-   U8  P;
-   U8  n1PlusOne;
-   U8  mi;
+   uint8_t  P;
+   uint8_t  n1PlusOne;
+   uint8_t  mi;
    /* Maximum value of M as per Table 10.1-1 */
-   U8  M[RGSCH_MAX_TDD_UL_DL_CFG] = {1, 2, 4, 3, 4, 9, 1};
+   uint8_t  M[RGSCH_MAX_TDD_UL_DL_CFG] = {1, 2, 4, 3, 4, 9, 1};
 
-   TRC2(rgSCHCmnUlCalcAvailBw);
 
    if (cell->isCpUlExtend)
    {
@@ -11021,7 +10908,7 @@ U8            *bwAvailRef;
    if (puschRbStart * 2 >= ulBw)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    *rbStartRef = puschRbStart;
@@ -11033,7 +10920,7 @@ U8            *bwAvailRef;
       cell->dynCfiCb.maxCfi = RGSCH_MIN(cfi-1, cell->dynCfiCb.maxCfi);
    }
     
-   RETVALUE(ROK);
+   return ROK;
 }
 #else
 
@@ -11055,39 +10942,38 @@ PRIVATE S16 rgSCHCmnUlCalcAvailBw
 (
 RgSchCellCb    *cell,
 RgrCellCfg     *cellCfg,
-U8              cfi,
-U8             *rbStartRef,
-U8             *bwAvailRef
+uint8_t              cfi,
+uint8_t             *rbStartRef,
+uint8_t             *bwAvailRef
 )
 #else
 PRIVATE S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
-U8             cfi;
-U8            *rbStartRef;
-U8            *bwAvailRef;
-#endif
-{
-   U8  c        = 3;
-   U8  ulBw     = cell->bwCfg.ulTotalBw;
-   U8  n2Rb     = cell->pucchCfg.resourceSize;
-   U8  pucchDeltaShft = cell->pucchCfg.deltaShift;
-   U16 n1Pucch  = cell->pucchCfg.n1PucchAn;
-   U8  n1Cs     = cell->pucchCfg.cyclicShift;
-   U8  n1PerRb;
-   U8  totalCce;
-   U16 n1Max;
-   U8  n1Rb;
-   U32 mixedRb;
-   U8  exclRb; /* RBs to exclude */
-   U8  n1RbPart;
-   U8  puschRbStart;
+uint8_t             cfi;
+uint8_t            *rbStartRef;
+uint8_t            *bwAvailRef;
+#endif
+{
+   uint8_t  c        = 3;
+   uint8_t  ulBw     = cell->bwCfg.ulTotalBw;
+   uint8_t  n2Rb     = cell->pucchCfg.resourceSize;
+   uint8_t  pucchDeltaShft = cell->pucchCfg.deltaShift;
+   uint16_t n1Pucch  = cell->pucchCfg.n1PucchAn;
+   uint8_t  n1Cs     = cell->pucchCfg.cyclicShift;
+   uint8_t  n1PerRb;
+   uint8_t  totalCce;
+   uint16_t n1Max;
+   uint8_t  n1Rb;
+   uint32_t mixedRb;
+   uint8_t  exclRb; /* RBs to exclude */
+   uint8_t  n1RbPart;
+   uint8_t  puschRbStart;
 #ifdef LTE_ADV
-   U16 numOfN3PucchRb;
+   uint16_t numOfN3PucchRb;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);  
 #endif
    
-   TRC2(rgSCHCmnUlCalcAvailBw);
 
    if (cell->isCpUlExtend)
    {
@@ -11103,7 +10989,7 @@ U8            *bwAvailRef;
    /* ccpu00129978- MOD- excluding RBs based on formula in section 5.4.3 in 
     * TS 36.211  */
    n1RbPart = (c*n1Cs)/pucchDeltaShft;
-   n1Rb = (U8)((n1Max - n1RbPart) / n1PerRb);
+   n1Rb = (uint8_t)((n1Max - n1RbPart) / n1PerRb);
    mixedRb = RGSCH_CEIL(n1Cs, 8); /* same as 'mixedRb = n1Cs ? 1 : 0' */
 
    /* get the total Number of RB's to be excluded for PUSCH */
@@ -11130,17 +11016,17 @@ U8            *bwAvailRef;
    {
 #ifndef ALIGN_64BIT
           printf("CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%ld:%d:%d:%d:%d:%d]\n",
-        cell->crntTime.sfn, cell->crntTime.subframe, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb);
+        cell->crntTime.sfn, cell->crntTime.slot, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb);
 #else
           printf("CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%d:%d:%d:%d:%d:%d]\n",
-        cell->crntTime.sfn, cell->crntTime.subframe, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb);
+        cell->crntTime.sfn, cell->crntTime.slot, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb);
 #endif
    }
 
    if (puschRbStart*2 >= ulBw)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    *rbStartRef = puschRbStart;
@@ -11152,7 +11038,7 @@ U8            *bwAvailRef;
       cell->dynCfiCb.maxCfi = RGSCH_MIN(cfi-1, cell->dynCfiCb.maxCfi);
    }
    
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
@@ -11185,41 +11071,40 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
 {
    S16            ret;
    RgSchCmnUlCell *cellUl      = RG_SCH_CMN_GET_UL_CELL(cell);
-   U8             maxUePerUlSf = cellCfg->maxUePerUlSf;
+   uint8_t             maxUePerUlSf = cellCfg->maxUePerUlSf;
 #ifdef RGR_V1
    /* Added configuration for maximum number of MSG3s */
-   U8             maxMsg3PerUlSf = cellCfg->maxMsg3PerUlSf;
-#endif
-   U8             maxUlBwPerUe = cellCfg->maxUlBwPerUe;
-   U8             sbSize       = cellCfg->puschSubBand.size;
-   U8             i;
-   U8             rbStart;
-   U8             bwAvail;
-   U8             cfi;  
-   U8             maxSbPerUe;
-   U8             numSb;
+   uint8_t             maxMsg3PerUlSf = cellCfg->maxMsg3PerUlSf;
+#endif
+   uint8_t             maxUlBwPerUe = cellCfg->maxUlBwPerUe;
+   uint8_t             sbSize       = cellCfg->puschSubBand.size;
+   uint8_t             i;
+   uint8_t             rbStart;
+   uint8_t             bwAvail;
+   uint8_t             cfi;  
+   uint8_t             maxSbPerUe;
+   uint8_t             numSb;
 #ifdef LTE_TDD
-   U16            ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint16_t            ulDlCfgIdx = cell->ulDlCfgIdx;
    /* [ccpu00127294]-MOD-Change the max Ul subfrms size in TDD */
-   U8             maxSubfrms = 2 * rgSchTddNumUlSf[ulDlCfgIdx]; 
-   U8             ulToDlMap[12] = {0}; /* maximum 6 Subframes in UL  * 2 */
-   U8             maxUlsubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
+   uint8_t             maxSubfrms = 2 * rgSchTddNumUlSf[ulDlCfgIdx]; 
+   uint8_t             ulToDlMap[12] = {0}; /* maximum 6 Subframes in UL  * 2 */
+   uint8_t             maxUlsubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
                                            [RGSCH_NUM_SUB_FRAMES-1];
-   U16             subfrm;
+   uint16_t             subfrm;
    S8             dlIdx;
 #else
-   U8             maxSubfrms = RG_SCH_CMN_UL_NUM_SF;
+   uint8_t             maxSubfrms = RG_SCH_CMN_UL_NUM_SF;
 #endif
 #ifdef LTE_L2_MEAS
-   U8             idx;
+   uint8_t             idx;
 #endif
-   U8  iTbs;
+   uint8_t  iTbs;
 #if (defined(LTE_L2_MEAS) )
    Inst           inst         = cell->instIdx;
 #endif /* #if (defined(LTE_L2_MEAS) || defined(DEBUGP) */
    RgSchCmnCell      *cellSch =  (RgSchCmnCell *)(cell->sc.sch);
    
-   TRC2(rgSCHCmnUlCellInit);
 
    cellUl->maxUeNewTxPerTti = cellCfg->maxUlUeNewTxPerTti;
    if (maxUePerUlSf == 0)
@@ -11259,7 +11144,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
             "FAILED: MaxUePerUlSf(%u) < MaxUlUeNewTxPerTti(%u)",
             cellUl->maxAllocPerUlSf,
             cellUl->maxUeNewTxPerTti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef LTE_L2_MEAS
@@ -11275,7 +11160,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
       if (ret != ROK)
       {
             RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation failed ");
-            RETVALUE(ret);
+            return (ret);
       }
    }
 #endif
@@ -11299,7 +11184,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
    if (sbSize != rgSchCmnMult235Tbl[sbSize].match)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid subband size %d", sbSize);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
        //Setting the subband size to 4 which is size of VRBG in 5GTF
 #ifdef RG_5GTF
@@ -11311,7 +11196,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlCellInit(): "
          "maxUlBwPerUe/sbSize is zero");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    cellUl->maxSbPerUe = rgSchCmnMult235Tbl[maxSbPerUe].prvMatch;
 
@@ -11321,7 +11206,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnUlCellInit(): "
          "Invalid cqi");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    cellUl->dfltUlCqi = cellCfg->ulCmnCodeRate.ccchCqi;
 
@@ -11363,7 +11248,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
          cell->rachCfg.msgSizeGrpA, sbSize, cell->isCpUlExtend);
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
 #endif   
 
@@ -11372,7 +11257,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
          cell->rachCfg.msgSizeGrpA, sbSize, cell->isCpUlExtend);
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
 
    cellUl->sbSize  = sbSize;
@@ -11386,7 +11271,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
    if (ret != ROK)
    {
       cellUl->numUlSubfrms = 0;
-      RETVALUE(ret);
+      return (ret);
    }
 
    /* store the DL subframe corresponding to the PUSCH offset
@@ -11423,7 +11308,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
 #endif
       if (ret != ROK)
       {
-         RETVALUE(ret);
+         return (ret);
       }
 
       if (cfi == 1)
@@ -11444,7 +11329,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
                cellSch->cfiCfg.cfi, cell->dynCfiCb.maxCfi, 
                cell->pucchCfg.maxPucchRb);
             
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* DMRS values */
@@ -11453,7 +11338,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
          cellUl->dmrsArrSize * sizeof(*cellUl->dmrsArr));
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
    for (i = 0; i < cellUl->dmrsArrSize; ++i)
    {
@@ -11481,11 +11366,11 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
          rgSCHUtlFreeSBuf(cell->instIdx,
             (Data **)(&(cellUl->ulSfArr)), maxSubfrms * sizeof(RgSchUlSf));
 #endif
-         RETVALUE(ret);
+         return (ret);
       }
    }
    RG_SCH_RESET_HCSG_UL_PRB_CNTR(cellUl);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -11507,14 +11392,14 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg)
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrCellCfg
+S16 rgSCHCmnRgrCellCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg,
 RgSchErrInfo  *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrCellCfg(cell, cellCfg, err)
+S16 rgSCHCmnRgrCellCfg(cell, cellCfg, err)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
 RgSchErrInfo  *err;
@@ -11522,7 +11407,6 @@ RgSchErrInfo  *err;
 {
    S16       ret;
    RgSchCmnCell *cellSch;
-   TRC2(rgSCHCmnRgrCellCfg);
 
    /* As part of RGR cell configuration, validate the CRGCellCfg
     * There is no trigger for crgCellCfg from SC1 */
@@ -11534,7 +11418,7 @@ RgSchErrInfo  *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,  
          "Memory allocation FAILED");
       err->errCause = RGSCHERR_SCH_CFG;
-      RETVALUE(ret);
+      return (ret);
    }
    cellSch = (RgSchCmnCell *)(cell->sc.sch);
    cellSch->cfiCfg = cellCfg->cfiCfg;
@@ -11563,13 +11447,13 @@ RgSchErrInfo  *err;
    {
       /* There is no downlink deinit to be performed */
       err->errCause = RGSCHERR_SCH_CFG;
-      RETVALUE(ret);
+      return (ret);
    }
    ret = rgSCHCmnDlRgrCellCfg(cell, cellCfg, err);
    if (ret != ROK)
    {
       err->errCause = RGSCHERR_SCH_CFG;
-      RETVALUE(ret);
+      return (ret);
    }
    /* DL scheduler has no initializations to make */
    /* As of now DL scheduler always returns ROK   */
@@ -11588,7 +11472,7 @@ RgSchErrInfo  *err;
       ret = cellSch->apisEmtcUl->rgSCHRgrUlCellCfg(cell, cellCfg, err);
       if (ret != ROK)
       {
-         RETVALUE(ret);
+         return (ret);
       }
    }
 #endif
@@ -11596,7 +11480,7 @@ RgSchErrInfo  *err;
    ret = cellSch->apisUl->rgSCHRgrUlCellCfg(cell, cellCfg, err);
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
 #ifdef EMTC_ENABLE   
    if(TRUE == cellCfg->emtcEnable)
@@ -11605,7 +11489,7 @@ RgSchErrInfo  *err;
       ret = cellSch->apisEmtcDl->rgSCHRgrDlCellCfg(cell, cellCfg, err);
       if (ret != ROK)
       {
-         RETVALUE(ret);
+         return (ret);
       }
    }
 #endif
@@ -11615,17 +11499,17 @@ RgSchErrInfo  *err;
    ret = rgSCHCmnSpsCellCfg(cell, cellCfg, err);
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
 #endif
    ret = cellSch->apisDl->rgSCHRgrDlCellCfg(cell, cellCfg, err);
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
    rgSCHCmnInitVars(cell);
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnRgrCellCfg*/
 
 \f
@@ -11644,14 +11528,14 @@ RgSchErrInfo  *err;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrCellRecfg
+S16 rgSCHCmnRgrCellRecfg
 (
 RgSchCellCb             *cell,
 RgrCellRecfg            *recfg,
 RgSchErrInfo            *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrCellRecfg(cell, recfg, err)
+S16 rgSCHCmnRgrCellRecfg(cell, recfg, err)
 RgSchCellCb             *cell;
 RgrCellRecfg            *recfg;
 RgSchErrInfo            *err;
@@ -11661,17 +11545,16 @@ RgSchErrInfo            *err;
    RgSchCmnCell         *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnUlCell       *cellUl  = RG_SCH_CMN_GET_UL_CELL(cell);
 
-   TRC2(rgSCHCmnRgrCellRecfg);
 
    if (recfg->recfgTypes & RGR_CELL_UL_CMNRATE_RECFG)
    {
-      U8   oldCqi = cellUl->dfltUlCqi;
+      uint8_t   oldCqi = cellUl->dfltUlCqi;
       if (!RG_SCH_CMN_UL_IS_CQI_VALID(recfg->ulCmnCodeRate.ccchCqi))
       {
          err->errCause = RGSCHERR_SCH_CFG;
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnRgrCellRecfg(): "
             "Invalid cqi");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       cellUl->dfltUlCqi = recfg->ulCmnCodeRate.ccchCqi;
       ret = rgSCHCmnPrecompMsg3Vars(cellUl, recfg->ulCmnCodeRate.ccchCqi,
@@ -11681,7 +11564,7 @@ RgSchErrInfo            *err;
          cellUl->dfltUlCqi = oldCqi;
          rgSCHCmnPrecompMsg3Vars(cellUl, recfg->ulCmnCodeRate.ccchCqi,
                cell->rachCfg.msgSizeGrpA, cellUl->sbSize, cell->isCpUlExtend);
-         RETVALUE(ret);
+         return (ret);
       }
    }
 
@@ -11690,7 +11573,7 @@ RgSchErrInfo            *err;
       if (rgSCHCmnDlCnsdrCmnRt(cell, &recfg->dlCmnCodeRate) != ROK)
       {
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
  
@@ -11701,14 +11584,14 @@ RgSchErrInfo            *err;
       ret = cellSch->apisEmtcUl->rgSCHRgrUlCellRecfg(cell, recfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 
       /* Invoke DL sched for cell Recfg */
       ret = cellSch->apisEmtcDl->rgSCHRgrDlCellRecfg(cell, recfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -11718,14 +11601,14 @@ RgSchErrInfo            *err;
    ret = cellSch->apisUl->rgSCHRgrUlCellRecfg(cell, recfg, err);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Invoke DL sched for cell Recfg */
    ret = cellSch->apisDl->rgSCHRgrDlCellRecfg(cell, recfg, err);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    }
 
@@ -11734,7 +11617,7 @@ RgSchErrInfo            *err;
       ret = cellSch->apisDlfs->rgSCHDlfsCellRecfg(cell, recfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       cellSch->dl.isDlFreqSel = recfg->dlfsRecfg.isDlFreqSel;
    }
@@ -11744,11 +11627,11 @@ RgSchErrInfo            *err;
       ret = rgSCHPwrCellRecfg(cell, recfg);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -11775,15 +11658,14 @@ RgSchCellCb *cell;
 #endif
 {
    RgSchCmnUlCell   *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   U8               ulSfIdx;
+   uint8_t               ulSfIdx;
 #ifdef LTE_TDD
-   U8        maxSubfrms = cellUl->numUlSubfrms;
+   uint8_t        maxSubfrms = cellUl->numUlSubfrms;
 #endif
 #ifdef LTE_L2_MEAS
    CmLList       *lnk = NULLP;
    RgSchL2MeasCb *measCb;
 #endif
-   TRC2(rgSCHCmnUlCellDeinit);
 #ifdef LTE_L2_MEAS
 #ifdef LTE_TDD
    for(ulSfIdx = 0; ulSfIdx < RGSCH_SF_ALLOC_SIZE; ulSfIdx++)
@@ -11843,7 +11725,7 @@ RgSchCellCb *cell;
    }
 #endif
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -11860,24 +11742,23 @@ RgSchCellCb *cell;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnCellDel
+Void rgSCHCmnCellDel
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHCmnCellDel(cell)
+Void rgSCHCmnCellDel(cell)
 RgSchCellCb  *cell;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnCellDel);
 
 #ifdef LTE_L2_MEAS
    glblTtiCnt = 0;
 #endif
    if (cellSch == NULLP)
    {
-      RETVOID;
+      return;
    }
    /* Perform the deinit for the UL scheduler */
    rgSCHCmnUlCellDeinit(cell);
@@ -11927,7 +11808,7 @@ RgSchCellCb  *cell;
    for proper NULLP assignment*/
    rgSCHUtlFreeSBuf(cell->instIdx,
       (Data**)(&(cell->sc.sch)), (sizeof(RgSchCmnCell)));
-   RETVOID;
+   return;
 }  /* rgSCHCmnCellDel */
 
 \f
@@ -11955,13 +11836,12 @@ PRIVATE S16 rgSCHCmnValidateDlQos(dlQos)
 RgrLchQosCfg            *dlQos;
 #endif
 {
-   U8 qci = dlQos->qci;
+   uint8_t qci = dlQos->qci;
 
-   TRC2(rgSCHCmnValidateDlQos);
 
    if ( qci < RG_SCH_CMN_MIN_QCI || qci > RG_SCH_CMN_MAX_QCI )
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if ((qci >= RG_SCH_CMN_GBR_QCI_START) &&
@@ -11969,10 +11849,10 @@ RgrLchQosCfg            *dlQos;
    {
       if ((dlQos->mbr == 0) || (dlQos->mbr < dlQos->gbr))
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -11996,7 +11876,7 @@ RgrLchQosCfg            *dlQos;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrLchCfg
+S16 rgSCHCmnRgrLchCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -12005,7 +11885,7 @@ RgrLchCfg *lcCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrLchCfg(cell, ue, dlLc, lcCfg, err)
+S16 rgSCHCmnRgrLchCfg(cell, ue, dlLc, lcCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchDlLcCb  *dlLc;
@@ -12017,7 +11897,6 @@ RgSchErrInfo *err;
 
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnRgrLchCfg);
 
    ret = rgSCHUtlAllocSBuf(cell->instIdx,
       (Data**)&((dlLc)->sch), (sizeof(RgSchCmnDlSvc)));
@@ -12026,7 +11905,7 @@ RgSchErrInfo *err;
       RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnRgrLchCfg(): "
          "SCH struct alloc failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId);
       err->errCause = RGSCHERR_SCH_CFG;
-      RETVALUE(ret);
+      return (ret);
    }
    if(lcCfg->lcType != CM_LTE_LCH_DCCH)
    {
@@ -12036,7 +11915,7 @@ RgSchErrInfo *err;
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSchCmnCrgLcCfg(): "
             "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(ret);
+         return (ret);
       }
       /* Perform DL service activation in the scheduler */
       ((RgSchCmnDlSvc *)(dlLc->sch))->qci = lcCfg->dlInfo.dlQos.qci;
@@ -12060,7 +11939,7 @@ RgSchErrInfo *err;
       ret = cellSch->apisEmtcDl->rgSCHRgrDlLcCfg(cell, ue,dlLc ,lcCfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -12069,7 +11948,7 @@ RgSchErrInfo *err;
       ret = cellSch->apisDl->rgSCHRgrDlLcCfg(cell, ue, dlLc, lcCfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
@@ -12079,7 +11958,7 @@ RgSchErrInfo *err;
       ret = cellSch->apisEmtcUl->rgSCHRgrUlLcCfg(cell, ue, lcCfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -12088,7 +11967,7 @@ RgSchErrInfo *err;
    ret = cellSch->apisUl->rgSCHRgrUlLcCfg(cell, ue, lcCfg, err);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    }
    
@@ -12110,12 +11989,12 @@ RgSchErrInfo *err;
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,  "rgSchCmnRgrLchCfg(): "
             "SPS configuration failed for DL LC for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -12141,7 +12020,7 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrLchRecfg
+S16 rgSCHCmnRgrLchRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -12150,7 +12029,7 @@ RgrLchRecfg  *lcRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrLchRecfg(cell, ue, dlLc, lcRecfg, err)
+S16 rgSCHCmnRgrLchRecfg(cell, ue, dlLc, lcRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchDlLcCb  *dlLc;
@@ -12161,7 +12040,6 @@ RgSchErrInfo *err;
    S16   ret;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnRgrLchRecfg)
 
    if(dlLc->lcType != CM_LTE_LCH_DCCH)
    {
@@ -12172,14 +12050,14 @@ RgSchErrInfo *err;
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,
                "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(ret);
+         return (ret);
       }
       if (((RgSchCmnDlSvc *)(dlLc->sch))->qci != lcRecfg->dlRecfg.dlQos.qci)
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Qci, hence lc Priority change "
             "not supported for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId);
          err->errCause = RGSCHERR_SCH_CFG;
-         RETVALUE(ret);
+         return (ret);
       }
       ((RgSchCmnDlSvc *)(dlLc->sch))->gbr = (lcRecfg->dlRecfg.dlQos.gbr * \
       RG_SCH_CMN_REFRESH_TIME)/100;
@@ -12198,12 +12076,12 @@ RgSchErrInfo *err;
       ret = cellSch->apisEmtcDl->rgSCHRgrDlLcRecfg(cell, ue, dlLc, lcRecfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       ret = cellSch->apisEmtcUl->rgSCHRgrUlLcRecfg(cell, ue, lcRecfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -12212,12 +12090,12 @@ RgSchErrInfo *err;
    ret = cellSch->apisDl->rgSCHRgrDlLcRecfg(cell, ue, dlLc, lcRecfg, err);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ret = cellSch->apisUl->rgSCHRgrUlLcRecfg(cell, ue, lcRecfg, err);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    }
     
@@ -12234,11 +12112,11 @@ RgSchErrInfo *err;
                   "supported for dlLC Ignore this CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId);
          }
       }
-      RETVALUE(ROK);
+      return ROK;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -12262,7 +12140,7 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrLcgCfg
+S16 rgSCHCmnRgrLcgCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -12271,7 +12149,7 @@ RgrLcgCfg    *lcgCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrLcgCfg(cell, ue, lcg, lcgCfg, err)
+S16 rgSCHCmnRgrLcgCfg(cell, ue, lcg, lcgCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -12283,7 +12161,6 @@ RgSchErrInfo *err;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnLcg  *ulLcg = ((RgSchCmnLcg *)(ue->ul.lcgArr[lcgCfg->ulInfo.lcgId].sch));
 
-   TRC2(rgSCHCmnRgrLcgCfg);
 
    ulLcg->cfgdGbr = (lcgCfg->ulInfo.gbr * RG_SCH_CMN_REFRESH_TIME)/100;
    ulLcg->effGbr  = ulLcg->cfgdGbr;
@@ -12296,7 +12173,7 @@ RgSchErrInfo *err;
       ret = cellSch->apisEmtcUl->rgSCHRgrUlLcgCfg(cell, ue, lcg, lcgCfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -12305,7 +12182,7 @@ RgSchErrInfo *err;
    ret = cellSch->apisUl->rgSCHRgrUlLcgCfg(cell, ue, lcg, lcgCfg, err);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    }
    if (RGSCH_IS_GBR_BEARER(ulLcg->cfgdGbr))
@@ -12313,7 +12190,7 @@ RgSchErrInfo *err;
       /* Indicate MAC that this LCG is GBR LCG */
       rgSCHUtlBuildNSendLcgReg(cell, ue->ueId, lcgCfg->ulInfo.lcgId, TRUE);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -12337,7 +12214,7 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrLcgRecfg
+S16 rgSCHCmnRgrLcgRecfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -12346,7 +12223,7 @@ RgrLcgRecfg  *reCfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnRgrLcgRecfg(cell, ue, lcg, reCfg, err)
+S16 rgSCHCmnRgrLcgRecfg(cell, ue, lcg, reCfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb   *lcg;
@@ -12358,7 +12235,6 @@ RgSchErrInfo *err;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnLcg  *ulLcg = ((RgSchCmnLcg *)(ue->ul.lcgArr[reCfg->ulRecfg.lcgId].sch));
    
-   TRC2(rgSCHCmnRgrLcgRecfg);
 
    ulLcg->cfgdGbr = (reCfg->ulRecfg.gbr * RG_SCH_CMN_REFRESH_TIME)/100;
    ulLcg->effGbr  = ulLcg->cfgdGbr;
@@ -12371,7 +12247,7 @@ RgSchErrInfo *err;
       ret = cellSch->apisEmtcUl->rgSCHRgrUlLcgRecfg(cell, ue, lcg, reCfg, err);
       if (ret != ROK)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    else
@@ -12380,7 +12256,7 @@ RgSchErrInfo *err;
    ret = cellSch->apisUl->rgSCHRgrUlLcgRecfg(cell, ue, lcg, reCfg, err);
    if (ret != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    }
    if (RGSCH_IS_GBR_BEARER(ulLcg->cfgdGbr))
@@ -12393,7 +12269,7 @@ RgSchErrInfo *err;
       /* In case of RAB modification */
       rgSCHUtlBuildNSendLcgReg(cell, ue->ueId, reCfg->ulRecfg.lcgId, FALSE);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -12410,23 +12286,22 @@ RgSchErrInfo *err;
  *     File :
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnRgrLchDel 
+S16 rgSCHCmnRgrLchDel 
 (
 RgSchCellCb   *cell,
 RgSchUeCb     *ue,
 CmLteLcId     lcId,
-U8            lcgId
+uint8_t            lcgId
 )
 #else
-PUBLIC S16 rgSCHCmnRgrLchDel(cell, ue, lcId, lcgId)
+S16 rgSCHCmnRgrLchDel(cell, ue, lcId, lcgId)
 RgSchCellCb   *cell;
 RgSchUeCb     *ue;
 CmLteLcId     lcId;
-U8            lcgId;
+uint8_t            lcgId;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnRgrLchDel);
 #ifdef EMTC_ENABLE
    if(TRUE == ue->isEmtcUe)
    {
@@ -12437,7 +12312,7 @@ U8            lcgId;
    {
    cellSch->apisUl->rgSCHRgrUlLchDel(cell, ue, lcId, lcgId);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -12455,14 +12330,14 @@ U8            lcgId;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnLcgDel
+Void rgSCHCmnLcgDel
 (
 RgSchCellCb   *cell,
 RgSchUeCb     *ue,
 RgSchLcgCb    *lcg
 )
 #else
-PUBLIC Void rgSCHCmnLcgDel(cell, ue, lcg)
+Void rgSCHCmnLcgDel(cell, ue, lcg)
 RgSchCellCb   *cell;
 RgSchUeCb     *ue;
 RgSchLcgCb    *lcg;
@@ -12470,11 +12345,10 @@ RgSchLcgCb    *lcg;
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnLcg  *lcgCmn = RG_SCH_CMN_GET_UL_LCG(lcg);
-   TRC2(rgSCHCmnLcgDel);
 
    if (lcgCmn == NULLP)
    {
-      RETVOID;
+      return;
    }
 
    if (RGSCH_IS_GBR_BEARER(lcgCmn->cfgdGbr))
@@ -12506,7 +12380,7 @@ RgSchLcgCb    *lcg;
    {
    cellSch->apisUl->rgSCHFreeUlLcg(cell, ue, lcg);
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -12528,24 +12402,23 @@ RgSchLcgCb    *lcg;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnFreeDlLc
+Void rgSCHCmnFreeDlLc
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHCmnFreeDlLc(cell, ue, svc)
+Void rgSCHCmnFreeDlLc(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnFreeDlLc);
    if (svc->sch == NULLP)
    {
-      RETVOID;
+      return;
    }
 #ifdef EMTC_ENABLE
     if((cell->emtcEnable)&&(TRUE == ue->isEmtcUe))
@@ -12582,7 +12455,7 @@ RgSchDlLcCb                *svc;
    rgSCHLaaDeInitDlLchCb(cell, svc);
 #endif
 
-   RETVOID;
+   return;
 }
 
 #ifdef RGR_V1
@@ -12627,7 +12500,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    RgSchDlRbAlloc    *rbAllocInfo;
    RgSchDlHqProcCb   *hqP;
    RgSchUeCb         *ue;
-   TRC2(rgSCHCmnDlCcchSduRetxFnlz);
 
    /* Traverse through the Scheduled Retx List */
    node = allocInfo->ccchSduAlloc.schdCcchSduRetxLst.first;
@@ -12658,7 +12530,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       /* reset the UE allocation Information */
       rgSCHCmnDlUeResetTemp(ue, hqP);
    }
-   RETVOID;
+   return;
 }
 #endif
 /**
@@ -12701,7 +12573,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    RgSchDlRbAlloc    *rbAllocInfo;
    RgSchDlHqProcCb   *hqP;
    RgSchRaCb         *raCb;
-   TRC2(rgSCHCmnDlCcchRetxFnlz);
 
    /* Traverse through the Scheduled Retx List */
    node = allocInfo->msg4Alloc.schdMsg4RetxLst.first;
@@ -12718,7 +12589,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       hqP->tbInfo[0].ccchSchdInfo.retxLnk.node = (PTR)NULLP;
       /* Fix: syed dlAllocCb reset should be performed.
        * zombie info in dlAllocCb leading to crash rbNum wraparound */ 
-      cmMemset((U8 *)rbAllocInfo, (U8)0, sizeof(*rbAllocInfo));
+      memset(rbAllocInfo, 0, sizeof(*rbAllocInfo));
       rgSCHCmnDlHqPResetTemp(hqP);
    }
    /* Fix: syed dlAllocCb reset should be performed.
@@ -12729,10 +12600,10 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       hqP = (RgSchDlHqProcCb *)(node->node);
       raCb = hqP->hqE->raCb;
       node = node->next;
-      cmMemset((U8 *)&raCb->rbAllocInfo, (U8)0, sizeof(raCb->rbAllocInfo));
+      memset(&raCb->rbAllocInfo, 0, sizeof(raCb->rbAllocInfo));
       rgSCHCmnDlHqPResetTemp(hqP);
    }
-   RETVOID;
+   return;
 }
 
 #ifdef RGR_V1
@@ -12776,7 +12647,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    RgSchDlRbAlloc    *rbAllocInfo;
    RgSchDlHqProcCb   *hqP;
    RgSchLchAllocInfo  lchSchdData;
-   TRC2(rgSCHCmnDlCcchSduTxFnlz);
 
    /* Traverse through the Scheduled Retx List */
    node = allocInfo->ccchSduAlloc.schdCcchSduTxLst.first;
@@ -12824,7 +12694,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       /* reset the UE allocation Information */
       rgSCHCmnDlUeResetTemp(ueCb, hqP);
    }
-   RETVOID;
+   return;
 }
 
 #endif
@@ -12868,7 +12738,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    RgSchDlRbAlloc    *rbAllocInfo;
    RgSchDlHqProcCb   *hqP;
    RgSchLchAllocInfo  lchSchdData;
-   TRC2(rgSCHCmnDlCcchTxFnlz);
 
    /* Traverse through the Scheduled Retx List */
    node = allocInfo->msg4Alloc.schdMsg4TxLst.first;
@@ -12905,7 +12774,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       }
       /* Fix: syed dlAllocCb reset should be performed.
        * zombie info in dlAllocCb leading to crash rbNum wraparound */ 
-      cmMemset((U8 *)&raCb->rbAllocInfo, (U8)0, sizeof(raCb->rbAllocInfo));
+      memset(&raCb->rbAllocInfo, 0, sizeof(raCb->rbAllocInfo));
       rgSCHCmnDlHqPResetTemp(hqP);
    }
    node = allocInfo->msg4Alloc.nonSchdMsg4TxLst.first;
@@ -12920,11 +12789,11 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       /*Fix: Removing releasing of TB1 as it will not exist for MSG4 and hence caused a crash*/
       /*      rgSCHDhmRlsHqpTb(hqP, 1, FALSE);*/
       /* reset the UE allocation Information */
-      cmMemset((U8 *)rbAllocInfo, (U8)0, sizeof(*rbAllocInfo));
+      memset(rbAllocInfo, 0, sizeof(*rbAllocInfo));
       rgSCHCmnDlHqPResetTemp(hqP);
    }
 
-   RETVOID;
+   return;
 }
 /* R8 Upgrade */
 /**
@@ -12941,28 +12810,27 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *     Invoked by: Common Scheduler
  *
  *  @param[in]  RgSchCellCb           *cell
- *  @param[in]  U32                   ueCount
- *  @return  U8
+ *  @param[in]  uint32_t                   ueCount
+ *  @return  uint8_t
  *
  **/
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnGetBiIndex
+uint8_t rgSCHCmnGetBiIndex
 (
 RgSchCellCb   *cell,
-U32           ueCount
+uint32_t           ueCount
 )
 #else
-PUBLIC U8 rgSCHCmnGetBiIndex(cell, ueCount)
+uint8_t rgSCHCmnGetBiIndex(cell, ueCount)
 RgSchCellCb   *cell;
-U32           ueCount;
+uint32_t           ueCount;
 #endif
 {
    S16  prevVal = 0;      /* To Store Intermediate Value */
-   U16  newBiVal = 0;     /* To store Bi Value in millisecond */
-   U8   idx = 0;
-   U16  timeDiff = 0;
+   uint16_t  newBiVal = 0;     /* To store Bi Value in millisecond */
+   uint8_t   idx = 0;
+   uint16_t  timeDiff = 0;
 
-   TRC2(rgSCHCmnGetBiIndex)
 
    if (cell->biInfo.prevBiTime != 0)
    {
@@ -13008,7 +12876,7 @@ U32           ueCount;
    }while(idx < RG_SCH_CMN_NUM_BI_VAL-1);
    cell->biInfo.prevBiTime = rgSchCmnBiTbl[idx];
    /* For 16 Entries in Table 7.2.1 36.321.880 - 3 reserved so total 13 Entries */
-   RETVALUE(idx); /* Returning reserved value from table UE treats it has 960 ms */
+   return (idx); /* Returning reserved value from table UE treats it has 960 ms */
 } /* rgSCHCmnGetBiIndex */
 
 
@@ -13045,7 +12913,7 @@ RgSchCellCb           *cell;
 RgSchCmnDlRbAllocInfo *allocInfo;
 #endif
 {
-   U32            rarCnt = 0;
+   uint32_t            rarCnt = 0;
    RgSchDlRbAlloc *raRspAlloc;
    RgSchDlSf      *subFrm = NULLP;
    RgSchRaCb      *raCb;
@@ -13055,14 +12923,13 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    Bool           preamGrpA;
    RgSchUlAlloc   *ulAllocRef=NULLP;
    RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   U8              allocRapidCnt = 0;
+   uint8_t              allocRapidCnt = 0;
 #ifdef LTE_TDD
-   U32            msg3SchdIdx = 0;
-   U8             ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8             msg3Subfrm;
+   uint32_t            msg3SchdIdx = 0;
+   uint8_t             ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t             msg3Subfrm;
 #endif
 
-   TRC2(rgSCHCmnDlRaRspFnlz);
 
    for (rarCnt=0; rarCnt<RG_SCH_CMN_MAX_CMN_PDCCH; rarCnt++)
    {
@@ -13148,7 +13015,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
             raCb->msg3AllocTime = cell->crntTime;
             RGSCH_INCR_SUB_FRAME(raCb->msg3AllocTime, RG_SCH_CMN_MIN_MSG3_RECP_INTRVL);
 #else
-            msg3SchdIdx = (cell->crntTime.subframe+RG_SCH_CMN_DL_DELTA) % 
+            msg3SchdIdx = (cell->crntTime.slot+RG_SCH_CMN_DL_DELTA) % 
                                  RGSCH_NUM_SUB_FRAMES;
             /*[ccpu00134666]-MOD-Modify the check to schedule the RAR in
               special subframe */                       
@@ -13158,7 +13025,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
                RGSCHCMNADDTOCRNTTIME(cell->crntTime,raCb->msg3AllocTime,
                                        RG_SCH_CMN_DL_DELTA)
                msg3Subfrm = rgSchTddMsg3SubfrmTbl[ulDlCfgIdx][
-                                       raCb->msg3AllocTime.subframe];
+                                       raCb->msg3AllocTime.slot];
                RGSCHCMNADDTOCRNTTIME(raCb->msg3AllocTime, raCb->msg3AllocTime, 
                                  msg3Subfrm);
             }
@@ -13218,16 +13085,16 @@ RgSchCmnDlRbAllocInfo *allocInfo;
             subFrm->raRsp[rarCnt].pdcch = NULLP;
             RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnRaRspAlloc(): "
                   "Not even one RaReq.");
-            RETVOID;
+            return;
          }
       }
       RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, 
             "RNTI:%d Scheduled RAR @ (%u,%u) ",
             raRspAlloc->rnti, 
             cell->crntTime.sfn,
-            cell->crntTime.subframe);
+            cell->crntTime.slot);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -13242,27 +13109,26 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *
  *  @param[in]   RgSchCellCb     *cell
  *  @param[in]   Bool            si
- *  @param[in]   U16             i
- *  @return  U8
+ *  @param[in]   uint16_t             i
+ *  @return  uint8_t
  *
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnDlCalcRvForBcch
+PRIVATE uint8_t rgSCHCmnDlCalcRvForBcch
 (
 RgSchCellCb          *cell,
 Bool                 si,
-U16                  i
+uint16_t                  i
 )
 #else
-PRIVATE U8 rgSCHCmnDlCalcRvForBcch(cell, si, i)
+PRIVATE uint8_t rgSCHCmnDlCalcRvForBcch(cell, si, i)
 RgSchCellCb          *cell;
 Bool                 si;
-U16                  i;
+uint16_t                  i;
 #endif
 {
-   U8 k, rv;
+   uint8_t k, rv;
    CmLteTimingInfo   frm;
-   TRC2(rgSCHCmnDlCalcRvForBcch);
 
    frm   = cell->crntTime;
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
@@ -13276,7 +13142,7 @@ U16                  i;
       k = (frm.sfn/2) % 4;
    }
    rv = RGSCH_CEIL(3*k, 2) % 4;
-   RETVALUE(rv);
+   return (rv);
 }
 
 /**
@@ -13316,12 +13182,12 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    RgSchDlSf      *subFrm;
 
 #ifdef LTE_TDD
-   U8             nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE;
+   uint8_t             nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE;
 #else
 #ifdef LTEMAC_HDFDD
-   U8             nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES;
+   uint8_t             nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES;
 #else
-   U8             nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES;
+   uint8_t             nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES;
 #endif
 #endif
 
@@ -13334,7 +13200,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
 #endif
    RgSchCmnDlCell       *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
 
-   TRC2(rgSCHCmnDlBcchPcchFnlz);
 
    /* handle PCCH */
    rbAllocInfo = &allocInfo->pcchAlloc;
@@ -13356,7 +13221,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnDlBcchPcchFnlz( ): "
                "No Pcch Present");
-         RETVOID;
+         return;
       }
 
       /* Added Dl TB count for paging message transmission*/
@@ -13416,7 +13281,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       }
       else
       {
-         U16   i;
+         uint16_t   i;
 #ifdef RGR_SI_SCH
          Buffer    *pdu;
 
@@ -13491,7 +13356,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
 #endif/*RGR_SI_SCH*/
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -13522,7 +13387,6 @@ RgSchCmnUlRbAllocInfo *allocInfo;
 {
    CmLList            *node;
 
-   TRC2(rgSCHCmnUlSetAllUnSched);
 
    node = allocInfo->contResLst.first;
    while (node)
@@ -13545,7 +13409,7 @@ RgSchCmnUlRbAllocInfo *allocInfo;
       node = allocInfo->ueLst.first;
    }
 
-   RETVOID;
+   return;
 }
 #endif
 
@@ -13565,22 +13429,21 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlAdd2CntResLst
+Void rgSCHCmnUlAdd2CntResLst
 (
 RgSchCmnUlRbAllocInfo *allocInfo,
 RgSchUeCb             *ue
 )
 #else
-PUBLIC Void rgSCHCmnUlAdd2CntResLst(allocInfo, ue)
+Void rgSCHCmnUlAdd2CntResLst(allocInfo, ue)
 RgSchCmnUlRbAllocInfo *allocInfo;
 RgSchUeCb             *ue;
 #endif
 {
    RgSchCmnUeUlAlloc  *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,ue->cell))->alloc);
-   TRC2(rgSCHCmnUlAdd2CntResLst);
    cmLListAdd2Tail(&allocInfo->contResLst, &ulAllocInfo->reqLnk);
    ulAllocInfo->reqLnk.node = (PTR)ue;
-   RETVOID;
+   return;
 }
 
 /**
@@ -13599,27 +13462,26 @@ RgSchUeCb             *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlAdd2UeLst
+Void rgSCHCmnUlAdd2UeLst
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo,
 RgSchUeCb             *ue
 )
 #else
-PUBLIC Void rgSCHCmnUlAdd2UeLst(cell, allocInfo, ue)
+Void rgSCHCmnUlAdd2UeLst(cell, allocInfo, ue)
 RgSchCellCb           *cell;
 RgSchCmnUlRbAllocInfo *allocInfo;
 RgSchUeCb             *ue;
 #endif
 {
    RgSchCmnUeUlAlloc  *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,cell))->alloc);
-   TRC2(rgSCHCmnUlAdd2UeLst);
    if (ulAllocInfo->reqLnk.node == NULLP)
    {
       cmLListAdd2Tail(&allocInfo->ueLst, &ulAllocInfo->reqLnk);
       ulAllocInfo->reqLnk.node = (PTR)ue;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -13637,25 +13499,24 @@ RgSchUeCb             *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnAllocUlRb
+Void rgSCHCmnAllocUlRb
 (
 RgSchCellCb           *cell,
 RgSchCmnUlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHCmnAllocUlRb(cell, allocInfo)
+Void rgSCHCmnAllocUlRb(cell, allocInfo)
 RgSchCellCb           *cell;
 RgSchCmnUlRbAllocInfo *allocInfo;
 #endif
 {
    RgSchUlSf         *sf = allocInfo->sf;
-   TRC2(rgSCHCmnAllocUlRb);
 
    /* Schedule for new transmissions */
    rgSCHCmnUlRbAllocForLst(cell, sf, allocInfo->ueLst.count,
          &allocInfo->ueLst, &allocInfo->schdUeLst,
          &allocInfo->nonSchdUeLst, (Bool)TRUE);
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -13677,7 +13538,7 @@ PRIVATE Void rgSCHCmnUlRbAllocForLst
 (
 RgSchCellCb           *cell,
 RgSchUlSf             *sf,
-U32                   count,
+uint32_t                   count,
 CmLListCp             *reqLst,
 CmLListCp             *schdLst,
 CmLListCp             *nonSchdLst,
@@ -13688,7 +13549,7 @@ PRIVATE Void rgSCHCmnUlRbAllocForLst(cell, sf, count, reqLst, schdLst,
                                      nonSchdLst, isNewTx)
 RgSchCellCb           *cell;
 RgSchUlSf             *sf;
-U32                   count;
+uint32_t                   count;
 CmLListCp             *reqLst;
 CmLListCp             *schdLst;
 CmLListCp             *nonSchdLst;
@@ -13699,11 +13560,10 @@ Bool                  isNewTx;
    RgSchUlHole      *hole;
 #ifdef LTE_L2_MEAS
 #ifdef LTE_TDD
-   U8               k;
+   uint8_t               k;
    CmLteTimingInfo  timeInfo;
 #endif    
 #endif    
-   TRC2(rgSCHCmnUlRbAllocForLst);
 
    if(schdLst->count == 0)
    {
@@ -13714,7 +13574,7 @@ Bool                  isNewTx;
 #ifdef LTE_L2_MEAS
    if(isNewTx == TRUE)
    {
-      cell->sfAllocArr[cell->crntSfIdx].ulUeInfo.numUes = (U8) count;
+      cell->sfAllocArr[cell->crntSfIdx].ulUeInfo.numUes = (uint8_t) count;
 #ifdef LTE_TDD
       RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, timeInfo, TFU_ULCNTRL_DLDELTA);
       k = rgSchTddPuschTxKTbl[cell->ulDlCfgIdx][timeInfo.subframe];
@@ -13732,7 +13592,7 @@ Bool                  isNewTx;
       RgSchUeCb             *ue = (RgSchUeCb *)lnk->node;
       RgSchCmnUlUe          *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
       S16                   ret;
-      U8                    maxRb;
+      uint8_t                    maxRb;
 
 
       if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP)
@@ -13779,9 +13639,10 @@ Bool                  isNewTx;
       rgSCHCmnUlRbAllocAddUeToLst(cell, ue, nonSchdLst);
       ue->isMsg4PdcchWithCrnti = FALSE;
    }
-   RETVOID;
+   return;
 }
 
+#ifdef UNUSED_FUNC
 #ifdef TFU_UPGRADE
 /***********************************************************
  *
@@ -13807,44 +13668,43 @@ PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
-U32          maxRb,
-U32          *numSb,
-U8           *iTbs,
-U32          hqSz,
-U32          stepDownItbs,
-U32          effTgt
+uint32_t          maxRb,
+uint32_t          *numSb,
+uint8_t           *iTbs,
+uint32_t          hqSz,
+uint32_t          stepDownItbs,
+uint32_t          effTgt
 )
 #else
 PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi(cell, ue, maxRb, numSb, iTbs, hqSz, stepDownItbs, effTgt)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
-U32          maxRb;
-U32          *numSb;
-U8           *iTbs;
-U32          hqSz;
-U32          stepDownItbs;
-U32          effTgt;
+uint32_t          maxRb;
+uint32_t          *numSb;
+uint8_t           *iTbs;
+uint32_t          hqSz;
+uint32_t          stepDownItbs;
+uint32_t          effTgt;
 #endif
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(ue->cell);
-   U32  nPrb;
-   U32  totREs;
-   U32  cqiRiREs;
-   U32  hqREs;
-   U32  remREsForPusch;
-   U32  bitsPerRe;
-   U32  tbSz;
-   U32  betaOffVal = ue->ul.betaOffstVal;
-   U32  cqiRiRptSz = ue->ul.cqiRiSz;
-   U32  betaOffHqVal = rgSchCmnBetaHqOffstTbl[ue->ul.betaHqOffst];
-   U32  resNumSb = *numSb;
-   U32  puschEff = 1000;
-   U8   modOdr;
-   U8   iMcs;
+   uint32_t  nPrb;
+   uint32_t  totREs;
+   uint32_t  cqiRiREs;
+   uint32_t  hqREs;
+   uint32_t  remREsForPusch;
+   uint32_t  bitsPerRe;
+   uint32_t  tbSz;
+   uint32_t  betaOffVal = ue->ul.betaOffstVal;
+   uint32_t  cqiRiRptSz = ue->ul.cqiRiSz;
+   uint32_t  betaOffHqVal = rgSchCmnBetaHqOffstTbl[ue->ul.betaHqOffst];
+   uint32_t  resNumSb = *numSb;
+   uint32_t  puschEff = 1000;
+   uint8_t   modOdr;
+   uint8_t   iMcs;
    Bool mdfyiTbsFlg = FALSE;
-   U8   resiTbs = *iTbs;
+   uint8_t   resiTbs = *iTbs;
 
-   TRC2(rgSCHCmnUlMdfyGrntForCqi)
 
    
    do
@@ -13864,7 +13724,7 @@ U32          effTgt;
       if ((nPrb >= maxRb) && (resiTbs <= 10))
       {
          /* Could not accomodate ACQI */
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       totREs = nPrb * RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl);
       tbSz = rgTbSzTbl[0][resiTbs][nPrb-1];
@@ -13909,9 +13769,10 @@ U32          effTgt;
    *numSb = resNumSb;
    *iTbs = resiTbs;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
+#endif
 /***********************************************************
  *
  *     Func : rgSCHCmnUlRbAllocForUe
@@ -13934,7 +13795,7 @@ PRIVATE S16 rgSCHCmnUlRbAllocForUe
 RgSchCellCb           *cell,
 RgSchUlSf             *sf,
 RgSchUeCb             *ue,
-U8                    maxRb,
+uint8_t                    maxRb,
 RgSchUlHole           *hole
 )
 #else
@@ -13942,37 +13803,36 @@ PRIVATE S16 rgSCHCmnUlRbAllocForUe(cell, sf, ue, maxRb, hole)
 RgSchCellCb           *cell;
 RgSchUlSf             *sf;
 RgSchUeCb             *ue;
-U8                    maxRb;
+uint8_t                    maxRb;
 RgSchUlHole           *hole;
 #endif
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUlUe    *ueUl    = RG_SCH_CMN_GET_UL_UE(ue, cell);
    RgSchUlAlloc     *alloc = NULLP;
-   U32              nPrb = 0;
-   U8               numVrbg;
-   U8               iMcs;
-   U8               iMcsCrnt;
+   uint32_t              nPrb = 0;
+   uint8_t               numVrbg;
+   uint8_t               iMcs;
+   uint8_t               iMcsCrnt;
 #ifndef RG_5GTF
    RgSchUlHqProcCb  *proc = &ueUl->hqEnt.hqProcCb[cellUl->schdHqProcIdx];
 #else
    RgSchUlHqProcCb  *proc = NULLP;
 #endif
    RgSchPdcch       *pdcch;
-   U32              reqVrbg;
-   U8               numVrbgTemp;
+   uint32_t              reqVrbg;
+   uint8_t               numVrbgTemp;
 #ifdef RG_5GTF
    TfuDciFormat     dciFrmt;
-   U8               numLyr;
+   uint8_t               numLyr;
 #endif
 
-   TRC2(rgSCHCmnUlRbAllocForUe);
 #ifdef RG_5GTF
    rgSCHUhmGetAvlHqProc(cell, ue, &proc);
    if (proc == NULLP)
    {
       //printf("UE [%d] HQ Proc unavailable\n", ue->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -13992,7 +13852,7 @@ RgSchUlHole           *hole;
    {
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, 
          "rgSCHCmnUlRbAllocForUe(): Could not get PDCCH for CRNTI:%d",ue->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
        gUl5gtfPdcchSchd++;
 #if defined (TENB_STATS) && defined (RG_5GTF)
@@ -14028,7 +13888,7 @@ RgSchUlHole           *hole;
       RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, 
          "rgSCHCmnUlRbAllocForUe(): Could not get UlAlloc %d CRNTI:%d",numVrbg,ue->ueId);
       rgSCHCmnPdcchRlsCrntSf(cell, pdcch);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    gUl5gtfAllocAllocated++;
 #if defined (TENB_STATS) && defined (RG_5GTF)
@@ -14089,7 +13949,7 @@ RgSchUlHole           *hole;
    ueUl->alloc.alloc = alloc;
    /*rntiwari-Adding the debug for generating the graph.*/
    /* No grant attr recorded now */
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -14107,21 +13967,20 @@ RgSchUlHole           *hole;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlRbAllocAddUeToLst
+Void rgSCHCmnUlRbAllocAddUeToLst
 (
 RgSchCellCb           *cell,
 RgSchUeCb             *ue,
 CmLListCp             *lst
 )
 #else
-PUBLIC Void rgSCHCmnUlRbAllocAddUeToLst(cell, ue, lst)
+Void rgSCHCmnUlRbAllocAddUeToLst(cell, ue, lst)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
 CmLListCp             *lst;
 #endif
 {
    RgSchCmnUlUe   *ueUl   = RG_SCH_CMN_GET_UL_UE(ue,cell);
-   TRC2(rgSCHCmnUlRbAllocAddUeToLst);
    UNUSED(cell);
 
    gUl5gtfUeRbAllocDone++;
@@ -14163,12 +14022,11 @@ RgSchCmnUlRbAllocInfo *allocInfo;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnUlAllocFnlz);
 
    /* call scheduler specific Finalization */
    cellSch->apisUl->rgSCHUlAllocFnlz(cell, allocInfo);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -14188,19 +14046,18 @@ RgSchCmnUlRbAllocInfo *allocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlAllocFnlz
+Void rgSCHCmnDlAllocFnlz
 (
 RgSchCellCb           *cell
 )
 #else
-PUBLIC Void rgSCHCmnDlAllocFnlz(cell)
+Void rgSCHCmnDlAllocFnlz(cell)
 RgSchCellCb           *cell;
 #endif
 {
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlRbAllocInfo  *allocInfo = &cellSch->allocInfo; 
 
-   TRC2(rgSCHCmnDlAllocFnlz);
 
    rgSCHCmnDlCcchRetxFnlz(cell, allocInfo);
    rgSCHCmnDlCcchTxFnlz(cell, allocInfo);
@@ -14216,7 +14073,7 @@ RgSchCellCb           *cell;
    cellSch->apisDl->rgSCHDlAllocFnlz(cell, allocInfo);
 
    /* Stack Crash problem for TRACE5 Changes. Added the return below */
-   RETVOID;
+   return;
 
 }
 
@@ -14252,7 +14109,6 @@ RgSchUlSf *sf;
 #endif
 {
    CmLList        *lnk;
-   TRC2(rgSCHCmnUlUpdSf);
 
    while ((lnk = sf->allocs.first))
    {
@@ -14288,7 +14144,7 @@ RgSchUlSf *sf;
     */
 
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -14325,9 +14181,8 @@ RgSchUlSf     *sf;
 RgSchUlAlloc  *alloc;
 #endif
 {
-   U32            bytes;
+   uint32_t            bytes;
    RgSchCmnUlUe   *ueUl;
-   TRC2(rgSCHCmnUlHndlAllocRetx);
    bytes = \
       rgTbSzTbl[0][rgSCHCmnUlGetITbsFrmIMcs(alloc->grnt.iMcs)]\
                                      [alloc->grnt.numRb-1]/8;
@@ -14347,7 +14202,7 @@ RgSchUlAlloc  *alloc;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
                "rgSCHCmnUlRbAllocForUe():Could not get UlAlloc for msg3Retx RNTI:%d",
                alloc->rnti);
-         RETVOID;
+         return;
       }
       retxAlloc->grnt.iMcs = alloc->grnt.iMcs;
       retxAlloc->grnt.iMcsCrnt = rgSchCmnUlRvIdxToIMcsTbl\
@@ -14363,7 +14218,7 @@ RgSchUlAlloc  *alloc;
       retxAlloc->hqProc        = alloc->hqProc;
       rgSCHUhmRetx(retxAlloc->hqProc);
    }
-   RETVOID;
+   return;
 }
 #endif
 
@@ -14397,11 +14252,10 @@ RgSchCellCb  *cell;
    RgSchCmnUlRbAllocInfo  allocInfo;
    RgSchCmnUlRbAllocInfo  *allocInfoRef = &allocInfo;
 #ifdef RG_5GTF
-   U8 idx;
+   uint8_t idx;
 
 #endif
 
-   TRC2(rgSCHCmnUlAlloc);
 
    /* Initializing RgSchCmnUlRbAllocInfo structure */
    rgSCHCmnInitUlRbAllocInfo(allocInfoRef);
@@ -14489,7 +14343,7 @@ RgSchCellCb  *cell;
                g5gtfTtiCnt = 0;
        }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -14508,12 +14362,12 @@ RgSchCellCb  *cell;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnSndCnsldtInfo
+Void rgSCHCmnSndCnsldtInfo
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHCmnSndCnsldtInfo(cell)
+Void rgSCHCmnSndCnsldtInfo(cell)
 RgSchCellCb  *cell;
 #endif
 {
@@ -14521,7 +14375,6 @@ RgSchCellCb  *cell;
    Pst                    pst;
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnSndCnsldtInfo);
 
    subfrmAlloc = &(cell->sfAllocArr[cell->crntSfIdx]);
 
@@ -14561,7 +14414,7 @@ RgSchCellCb  *cell;
    cell->crntSfIdx  = (cell->crntSfIdx + 1) % RGSCH_SF_ALLOC_SIZE;
 #endif
    
-   RETVOID;
+   return;
 }
 /**
  * @brief Consolidate Subframe Allocations.
@@ -14577,12 +14430,12 @@ RgSchCellCb  *cell;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnCnsldtSfAlloc
+Void rgSCHCmnCnsldtSfAlloc
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHCmnCnsldtSfAlloc(cell)
+Void rgSCHCmnCnsldtSfAlloc(cell)
 RgSchCellCb  *cell;
 #endif
 {
@@ -14594,7 +14447,6 @@ RgSchCellCb  *cell;
    CmLListCp              ulInActvLst;
    RgSchCmnCell           *cellSch = NULLP;
 
-   TRC2(rgSCHCmnCnsldtSfAlloc);
 
    cmLListInit(&dlDrxInactvTmrLst);
    cmLListInit(&dlInActvLst);
@@ -14627,7 +14479,7 @@ RgSchCellCb  *cell;
    /*re/start DRX inactivity timer for the UEs*/
    (Void)rgSCHDrxStrtInActvTmr(cell,&dlDrxInactvTmrLst,RG_SCH_DRX_DL);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -14653,11 +14505,9 @@ PRIVATE Void rgSCHCmnInitDlRbAllocInfo(allocInfo)
 RgSchCmnDlRbAllocInfo  *allocInfo;
 #endif
 {
-   TRC2(rgSCHCmnInitDlRbAllocInfo);
-   cmMemset((U8 *)&allocInfo->pcchAlloc, (U8)0, sizeof(RgSchDlRbAlloc));
-   cmMemset((U8 *)&allocInfo->bcchAlloc, (U8)0, sizeof(RgSchDlRbAlloc));
-   cmMemset((U8 *)allocInfo->raRspAlloc, (U8)0,
-         RG_SCH_CMN_MAX_CMN_PDCCH*sizeof(RgSchDlRbAlloc));
+   memset(&allocInfo->pcchAlloc, 0, sizeof(RgSchDlRbAlloc));
+   memset(&allocInfo->bcchAlloc, 0, sizeof(RgSchDlRbAlloc));
+   memset(allocInfo->raRspAlloc, 0, RG_SCH_CMN_MAX_CMN_PDCCH*sizeof(RgSchDlRbAlloc));
 
    allocInfo->msg4Alloc.msg4DlSf = NULLP;
    cmLListInit(&allocInfo->msg4Alloc.msg4TxLst);
@@ -14703,7 +14553,7 @@ RgSchCmnDlRbAllocInfo  *allocInfo;
    cmLListInit(&allocInfo->dedAlloc.errIndTxHqPLst);
    cmLListInit(&allocInfo->dedAlloc.schdErrIndTxHqPLst);
    cmLListInit(&allocInfo->dedAlloc.nonSchdErrIndTxHqPLst);
-   RETVOID;
+   return;
 }
 
 /**
@@ -14720,16 +14570,15 @@ RgSchCmnDlRbAllocInfo  *allocInfo;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnInitUlRbAllocInfo
+Void rgSCHCmnInitUlRbAllocInfo
 (
 RgSchCmnUlRbAllocInfo  *allocInfo
 )
 #else
-PUBLIC Void rgSCHCmnInitUlRbAllocInfo(allocInfo)
+Void rgSCHCmnInitUlRbAllocInfo(allocInfo)
 RgSchCmnUlRbAllocInfo  *allocInfo;
 #endif
 {
-   TRC2(rgSCHCmnInitUlRbAllocInfo);
    allocInfo->sf = NULLP;
    cmLListInit(&allocInfo->contResLst);
    cmLListInit(&allocInfo->schdContResLst);
@@ -14738,7 +14587,7 @@ RgSchCmnUlRbAllocInfo  *allocInfo;
    cmLListInit(&allocInfo->schdUeLst);
    cmLListInit(&allocInfo->nonSchdUeLst);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -14768,11 +14617,10 @@ RgSchCellCb            *cell;
 RgSchDlSf              *dlSf;
 #endif
 {
-   TRC2(rgSCHCmnGrpPwrCntrlPucch);
 
    rgSCHPwrGrpCntrlPucch(cell, dlSf);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -14806,7 +14654,6 @@ RgSchUlSf              *ulSf;
    CmLteTimingInfo        frm;
    RgSchDlSf              *dlSf;
 
-   TRC2(rgSCHCmnGrpPwrCntrlPusch);
 
    /* Got to pass DL SF corresponding to UL SF, so get that first.
     * There is no easy way of getting dlSf by having the RgSchUlSf*,
@@ -14828,7 +14675,7 @@ RgSchUlSf              *ulSf;
 
    rgSCHPwrGrpCntrlPusch(cell, dlSf, ulSf);
 
-   RETVOID;
+   return;
 }
 
 /* Fix: syed align multiple UEs to refresh at same time */
@@ -14860,11 +14707,10 @@ RgSchUeCb       *ue;
 #endif
 {
    RgSchCmnCell    *cellSch     = RG_SCH_CMN_GET_CELL(cell);
-   U32             effGbrBsr    = 0;
-   U32             effNonGbrBsr = 0;
-   U32             lcgId;
+   uint32_t             effGbrBsr    = 0;
+   uint32_t             effNonGbrBsr = 0;
+   uint32_t             lcgId;
 
-   TRC2(rgSCHCmnApplyUeRefresh);
 
    /* Reset the refresh cycle variableCAP */
    ue->ul.effAmbr = ue->ul.cfgdAmbr;
@@ -14903,7 +14749,7 @@ RgSchUeCb       *ue;
    cellSch->apisUl->rgSCHUlUeRefresh(cell, ue);
    cellSch->apisDl->rgSCHDlUeRefresh(cell, ue);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -14938,14 +14784,13 @@ S16 tmrEvnt;           /* Timer Event */
 #if (ERRCLASS & ERRCLS_DEBUG)
 #endif
 
-   TRC2(rgSCHCmnTmrExpiry);
 
 #if (ERRCLASS & ERRCLS_DEBUG)
    if (tmrEvnt != RG_SCH_CMN_EVNT_UE_REFRESH)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnTmrExpiry(): Invalid "
          "timer event CRNTI:%d",ue->ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else
    UNUSED(tmrEvnt);
@@ -14955,7 +14800,7 @@ S16 tmrEvnt;           /* Timer Event */
 
    rgSCHCmnAddUeToRefreshQ(cell, ue, RG_SCH_CMN_REFRESH_TIME);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -14987,9 +14832,8 @@ RgSchCellCb *cell;
    RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell);
    /* Moving the assignment of scheduler pointer
      to available scope for optimization */
-   TRC2(rgSCHCmnTmrProc);
 
-   if ((cell->crntTime.subframe % RGSCH_NUM_SUB_FRAMES_5G) == 0)
+   if ((cell->crntTime.slot % RGSCH_NUM_SUB_FRAMES_5G) == 0)
    {
       /* Reset the counters periodically */
       if ((cell->crntTime.sfn % RG_SCH_CMN_CSG_REFRESH_TIME) == 0)
@@ -15015,7 +14859,7 @@ RgSchCellCb *cell;
       cmPrcTmr(&sched->tmrTqCp, sched->tmrTq, (PFV)rgSCHCmnTmrExpiry);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -15036,26 +14880,25 @@ RgSchCellCb *cell;
 PRIVATE Void rgSchCmnUpdCfiVal
 (
 RgSchCellCb     *cell,
-U8              delta
+uint8_t              delta
 )
 #else
 PRIVATE Void rgSchCmnUpdCfiVal(cell, delta)
 RgSchCellCb     *cell;
-U8              delta;
+uint8_t              delta;
 #endif  
 {
    RgSchDlSf        *dlSf;
    CmLteTimingInfo  pdsch;
    RgSchCmnDlCell  *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); 
-   U8               dlIdx;
+   uint8_t               dlIdx;
 #ifdef LTE_TDD
-   U8               mPhich;
+   uint8_t               mPhich;
    RgSchDlSf        *tddSf;
-   U8               idx;
-   U8               splSfCfi = 0;
+   uint8_t               idx;
+   uint8_t               splSfCfi = 0;
 #endif    
 
-   TRC2(rgSchCmnUpdCfiVal);
 
    pdsch  = cell->crntTime;
    RGSCH_INCR_SUB_FRAME(pdsch, delta);
@@ -15070,7 +14913,7 @@ U8              delta;
 #ifdef LTE_TDD
       dlIdx = rgSCHUtlGetDlSfIdx(cell, &pdsch);
 #else
-      dlIdx = (((pdsch.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (pdsch.subframe % RGSCH_NUM_SUB_FRAMES));
+      dlIdx = (((pdsch.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (pdsch.slot % RGSCH_NUM_SUB_FRAMES));
       RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, cell->subFrms, dlIdx);
 #endif  
       /* If current downlink subframe index is same as pdcch SF index,
@@ -15117,7 +14960,7 @@ U8              delta;
       }   
    }   
 
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -15138,32 +14981,31 @@ U8              delta;
 PRIVATE Void rgSchCmnUpdtPdcchSfIdx 
 (
 RgSchCellCb     *cell,
-U8              dlIdx,
-U8              sfNum
+uint8_t              dlIdx,
+uint8_t              sfNum
 )
 #else
 PRIVATE Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx, sfNum)
 RgSchCellCb     *cell;
-U8              dlIdx;
-U8              sfNum;
+uint8_t              dlIdx;
+uint8_t              sfNum;
 #endif   
 #else
 #ifdef ANSI
 PRIVATE Void rgSchCmnUpdtPdcchSfIdx 
 (
 RgSchCellCb     *cell,
-U8              dlIdx
+uint8_t              dlIdx
 )
 #else
 PRIVATE Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx)
 RgSchCellCb     *cell;
-U8              dlIdx;
+uint8_t              dlIdx;
 #endif    
 #endif
 {
-   U8         idx;
+   uint8_t         idx;
 
-   TRC2(rgSchCmnUpdtPdcchSfIdx);
 
    /* Resetting the parameters on CFI switching */
    cell->dynCfiCb.cceUsed = 0;
@@ -15190,7 +15032,7 @@ U8              dlIdx;
       rgSchTddPdcchSfIncTbl[cell->ulDlCfgIdx][sfNum]) % cell->numDlSubfrms;
 #else
    cell->dynCfiCb.pdcchSfIdx = (dlIdx + RG_SCH_CFI_APPLY_DELTA) % \
-        RGSCH_NUM_DL_SUBFRAMES;
+        RGSCH_NUM_DL_slotS;
 #endif
 }
 
@@ -15209,32 +15051,31 @@ U8              dlIdx;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSchCmnUpdCfiDb 
+Void rgSchCmnUpdCfiDb 
 (
 RgSchCellCb     *cell,
-U8              delta 
+uint8_t              delta 
 )
 #else
-PUBLIC Void rgSchCmnUpdCfiDb(cell, delta)
+Void rgSchCmnUpdCfiDb(cell, delta)
 RgSchCellCb     *cell;
-U8              delta;
+uint8_t              delta;
 #endif 
 {
    CmLteTimingInfo        frm;
    RgSchDlSf              *dlSf;
 #ifdef LTE_TDD
-   U8                     mPhich;
+   uint8_t                     mPhich;
    Bool                   isHiDci0; 
 #endif      
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell); 
-   U8                     nCceLowerCfi = 0;
-   U8                     currCfi;
-   U8                     cceFailIdx;
-   U32                    totalCce;
-   U8                     dlIdx;
-   U16                    ttiMod;
+   uint8_t                     nCceLowerCfi = 0;
+   uint8_t                     currCfi;
+   uint8_t                     cceFailIdx;
+   uint32_t                    totalCce;
+   uint8_t                     dlIdx;
+   uint16_t                    ttiMod;
 
-   TRC2(rgSchCmnUpdCfiDb);
 
    /* Get Downlink Subframe */   
    frm   = cell->crntTime;
@@ -15247,7 +15088,7 @@ U8              delta;
 #else
    /* Changing the idexing
       so that proper subframe is selected */
-   dlIdx = (((frm.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (frm.subframe % RGSCH_NUM_SUB_FRAMES));
+   dlIdx = (((frm.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (frm.slot % RGSCH_NUM_SUB_FRAMES));
    RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, cell->subFrms, dlIdx);
    dlSf = cell->subFrms[dlIdx];
 #endif 
@@ -15406,18 +15247,17 @@ U8              delta;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlCommonChSch
+Void rgSCHCmnDlCommonChSch
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void rgSCHCmnDlCommonChSch(cell)
+Void rgSCHCmnDlCommonChSch(cell)
 RgSchCellCb  *cell;
 #endif
 {
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnDlCommonChSch);
 
    cellSch->apisDl->rgSCHDlTickForPdbTrkng(cell);
    rgSchCmnUpdCfiVal(cell, RG_SCH_CMN_DL_DELTA);
@@ -15445,7 +15285,7 @@ RgSchCellCb  *cell;
    {
       rgSCHCmnDlCcchRarAlloc(cell);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -15463,24 +15303,23 @@ RgSchCellCb  *cell;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlSch
+Void rgSCHCmnUlSch
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC Void  rgSCHCmnUlSch(cell)
+Void  rgSCHCmnUlSch(cell)
 RgSchCellCb  *cell;
 #endif
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
    
-   TRC2(rgSCHCmnUlSch);
 
 #ifdef LTE_ADV
    /* LAA_SCELL: */
    if(TRUE == rgSCHLaaSCellEnabled(cell))
    {
-      RETVOID;   
+      return;   
    }
 #endif
    
@@ -15523,7 +15362,7 @@ RgSchCellCb  *cell;
 #endif
 #endif
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -15545,21 +15384,20 @@ RgSchCellCb  *cell;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlDedBoUpd
+Void rgSCHCmnDlDedBoUpd
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlLcCb                *svc
 )
 #else
-PUBLIC Void rgSCHCmnDlDedBoUpd(cell, ue, svc)
+Void rgSCHCmnDlDedBoUpd(cell, ue, svc)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnDlDedBoUpd);
 
    /* RACHO : if UEs idle time exceeded and a BO update
     * is received, then add UE to the pdcch Order Q */
@@ -15581,7 +15419,7 @@ RgSchDlLcCb                *svc;
    {
       rgSCHCmnSpsDlDedBoUpd(cell, ue, svc);
       /* Note: Retrun from here, no update needed in other schedulers */
-      RETVOID;
+      return;
    }
 #endif
 #ifdef EMTC_ENABLE
@@ -15601,7 +15439,7 @@ RgSchDlLcCb                *svc;
       rgSCHSCellDlDedBoUpd(cell, ue, svc);
    }
 #endif
-   RETVOID;
+   return;
 }
 
 \f
@@ -15621,19 +15459,18 @@ RgSchDlLcCb                *svc;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnRmvFrmTaLst
+Void rgSCHCmnRmvFrmTaLst
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue
 )
 #else
-PUBLIC Void rgSCHCmnRmvFrmTaLst(cell, ue)
+Void rgSCHCmnRmvFrmTaLst(cell, ue)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 #endif
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   TRC2(rgSCHCmnRmvFrmTaLst);
 
 #ifdef EMTC_ENABLE
    if(cell->emtcEnable && ue->isEmtcUe)
@@ -15646,7 +15483,7 @@ RgSchUeCb                  *ue;
       cmLListDelFrm(&cellCmnDl->taLst, &ue->dlTaLnk);
       ue->dlTaLnk.node = (PTR)NULLP;
    }
-   RETVOID;
+   return;
 }
 
 /* Fix: syed Remove the msg4Proc from cell
@@ -15670,19 +15507,18 @@ RgSchUeCb                  *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlMsg4ProcRmvFrmRetx 
+Void rgSCHCmnDlMsg4ProcRmvFrmRetx 
 (
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *hqP
 )
 #else
-PUBLIC Void rgSCHCmnDlMsg4ProcRmvFrmRetx(cell, hqP)
+Void rgSCHCmnDlMsg4ProcRmvFrmRetx(cell, hqP)
 RgSchCellCb                *cell;
 RgSchDlHqProcCb            *hqP;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnDlMsg4ProcRmvFrmRetx);
 
    if (hqP->tbInfo[0].ccchSchdInfo.retxLnk.node)
    {
@@ -15701,7 +15537,7 @@ RgSchDlHqProcCb            *hqP;
       }
 #endif
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -15723,19 +15559,18 @@ RgSchDlHqProcCb            *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlProcAddToRetx
+Void rgSCHCmnDlProcAddToRetx
 (
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *hqP
 )
 #else
-PUBLIC Void rgSCHCmnDlProcAddToRetx(cell, hqP)
+Void rgSCHCmnDlProcAddToRetx(cell, hqP)
 RgSchCellCb                *cell;
 RgSchDlHqProcCb            *hqP;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnDlProcAddToRetx);
 
    if (hqP->hqE->msg4Proc == hqP) /* indicating msg4 transmission */
    {
@@ -15759,7 +15594,7 @@ RgSchDlHqProcCb            *hqP;
       {
          /* Invoke SPS module for SPS HARQ proc re-transmission handling */
          rgSCHCmnSpsDlProcAddToRetx(cell, hqP);
-         RETVOID;
+         return;
       }
 #endif /* LTEMAC_SPS */
 #ifdef EMTC_ENABLE      
@@ -15774,7 +15609,7 @@ RgSchDlHqProcCb            *hqP;
          cellSch->apisDl->rgSCHDlProcAddToRetx(cell, hqP);
       }
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -15792,7 +15627,7 @@ RgSchDlHqProcCb            *hqP;
  *
  *  @param[in]  RgSchCellCb        *cell
  *  @param[in]  RgSchUeCb          *ue
- *  @param[in]  U8                 ri
+ *  @param[in]  uint8_t                 ri
  *  @param[in]  Bool               isPeriodic
  *  @return  Void
  *
@@ -15802,20 +15637,19 @@ PRIVATE Void rgSCHCmnDlSetUeRi
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
-U8                 ri,
+uint8_t                 ri,
 Bool               isPer
 )
 #else
 PRIVATE Void rgSCHCmnDlSetUeRi(cell, ue, ri, isPer)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
-U8                 ri;
+uint8_t                 ri;
 Bool               isPer;
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
    RgSchCmnUeInfo    *ueSchCmn = RG_SCH_CMN_GET_CMN_UE(ue);
-   TRC2(rgSCHCmnDlSetUeRi);
    
 #ifdef TFU_UPGRADE
    RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ue,cell);
@@ -15828,7 +15662,7 @@ Bool               isPer;
     * specific during which SCH expecting UE can complete TX mode transition*/
    if (ue->txModeTransCmplt == FALSE)
    {
-      RETVOID;
+      return;
    }
 
    /* Restrict the Number of TX layers to cell->numTxAntPorts.
@@ -15892,7 +15726,7 @@ Bool               isPer;
       RG_SCH_CMN_SET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_RI_1);
    }
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -15910,7 +15744,7 @@ Bool               isPer;
  *
  *  @param[in]  RgSchCellCb        *cell
  *  @param[in]  RgSchUeCb          *ue
- *  @param[in]  U8                 pmi
+ *  @param[in]  uint8_t                 pmi
  *  @return  Void
  *
  **/
@@ -15919,28 +15753,27 @@ PRIVATE S16 rgSCHCmnDlSetUePmi
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
-U8                 pmi
+uint8_t                 pmi
 )
 #else
 PRIVATE S16 rgSCHCmnDlSetUePmi(cell, ue, pmi)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
-U8                 pmi;
+uint8_t                 pmi;
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   TRC2(rgSCHCmnDlSetUePmi);
 
    if (ue->txModeTransCmplt == FALSE)
    {
-       RETVALUE(RFAILED);
+       return RFAILED;
    }
  
    if (cell->numTxAntPorts == 2)
    {
       if (pmi > 3)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if (ueDl->mimoInfo.ri == 2)
       {
@@ -15948,7 +15781,7 @@ U8                 pmi;
          /* PMI 2 and 3 are invalid incase of 2 TxAnt and 2 Layered SM */
          if (pmi == 2 || pmi == 3)
          {
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
          ueDl->mimoInfo.pmi = pmi+1;
       }
@@ -15961,13 +15794,13 @@ U8                 pmi;
    {
       if (pmi > 15)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       ueDl->mimoInfo.pmi = pmi;
    }
    /* Reset the No PMI Flag in forceTD */
    RG_SCH_CMN_UNSET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_NO_PMI);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -16023,7 +15856,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   TRC2(rgSCHCmnDlProcCqiMode10);
 
    if (pucchCqi->u.mode10Info.type == TFU_RPT_CQI)
    {
@@ -16043,7 +15875,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi)
       }
       else
       {
-         RETVOID;
+         return;
       }
    }
    else if (pucchCqi->u.mode10Info.type == TFU_RPT_RI)
@@ -16057,7 +15889,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi)
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RI value(%x) CRNTI:%d",
             pucchCqi->u.mode10Info.u.ri,ue->ueId);
-         RETVOID;
+         return;
       }
    }
 }
@@ -16117,7 +15949,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   TRC2(rgSCHCmnDlProcCqiMode11);
 
    if (pucchCqi->u.mode11Info.type == TFU_RPT_CQI)
    {
@@ -16147,7 +15978,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi)
       }
       else
       {
-         RETVOID;
+         return;
       }
       rgSCHCmnDlSetUePmi(cell, ue, \
             pucchCqi->u.mode11Info.u.cqi.pmi);
@@ -16163,7 +15994,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi)
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,  "Invalid RI value(%x) CRNTI:%d",
             pucchCqi->u.mode11Info.u.ri,ue->ueId);
-         RETVOID;
+         return;
       }
    }
 }
@@ -16221,7 +16052,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   TRC2(rgSCHCmnDlProcCqiMode20);
 
    if (pucchCqi->u.mode20Info.type == TFU_RPT_CQI)
    {
@@ -16243,7 +16073,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
       }
    }
@@ -16258,7 +16088,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi)
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RI value(%x) CRNTI:%d",
             pucchCqi->u.mode20Info.u.ri,ue->ueId);
-         RETVOID;
+         return;
       }
    }
 }
@@ -16320,7 +16150,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   TRC2(rgSCHCmnDlProcCqiMode21);
 
    if (pucchCqi->u.mode21Info.type == TFU_RPT_CQI)
    {
@@ -16353,7 +16182,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
          rgSCHCmnDlSetUePmi(cell, ue, \
                pucchCqi->u.mode21Info.u.cqi.u.wideCqi.pmi);
@@ -16370,7 +16199,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi)
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,  "Invalid RI value(%x) CRNTI:%d",
             pucchCqi->u.mode21Info.u.ri,ue->ueId);
-         RETVOID;
+         return;
       }
    }
 }
@@ -16435,7 +16264,6 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   TRC2(rgSCHCmnDlCqiOnPucchInd);
 
    /* ccpu00117452 - MOD - Changed
       RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */
@@ -16493,7 +16321,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi)
          break;
    }
 
-  RETVOID;
+  return;
 }  /* rgSCHCmnDlCqiOnPucchInd */
 
 
@@ -16556,8 +16384,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   U32 prevRiVal = 0; 
-   TRC2(rgSCHCmnDlCqiOnPuschInd);
+   uint32_t prevRiVal = 0; 
    if (puschCqi->ri.pres == PRSNT_NODEF)
    {
       if (RG_SCH_CMN_IS_RI_VALID(puschCqi->ri.val))
@@ -16574,7 +16401,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RI value(%x) CRNTI:%d",
             puschCqi->ri.val,ue->ueId);
-         RETVOID;
+         return;
       }
    }
    ue->mimoInfo.puschFdbkVld  = FALSE;
@@ -16604,7 +16431,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
          break;
       case TFU_PUSCH_CQI_MODE_30:
@@ -16621,7 +16448,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
 #endif
 #ifdef CA_DBG
             {
-               extern U32 gACqiRcvdCount;
+               extern uint32_t gACqiRcvdCount;
                gACqiRcvdCount++;
             
             }
@@ -16629,7 +16456,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
          break;
       case TFU_PUSCH_CQI_MODE_12:
@@ -16646,7 +16473,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
          if((puschCqi->u.mode12Info.cqiIdx[1]) &&
                (puschCqi->u.mode12Info.cqiIdx[1] < RG_SCH_CMN_MAX_CQI))
@@ -16662,7 +16489,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
          ue->mimoInfo.puschFdbkVld  = TRUE;
          ue->mimoInfo.puschPmiInfo.mode = TFU_PUSCH_CQI_MODE_12;
@@ -16685,7 +16512,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
          if((puschCqi->u.mode22Info.wideBandCqi[1]) &&
                (puschCqi->u.mode22Info.wideBandCqi[1] < RG_SCH_CMN_MAX_CQI))
@@ -16701,7 +16528,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
          }
          else
          {
-            RETVOID;
+            return;
          }
          rgSCHCmnDlSetUePmi(cell, ue, puschCqi->u.mode22Info.wideBandPmi);
          ue->mimoInfo.puschFdbkVld  = TRUE;
@@ -16769,7 +16596,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
          break;
    }
 
-   RETVOID;
+   return;
 }  /* rgSCHCmnDlCqiOnPuschInd */
 
 \f
@@ -16790,7 +16617,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi)
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlCqiInd
+Void rgSCHCmnDlCqiInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
@@ -16799,7 +16626,7 @@ Void               *dlCqi,
 CmLteTimingInfo    timingInfo
 )
 #else
-PUBLIC Void rgSCHCmnDlCqiInd(cell, ue, isPucchInfo, dlCqi, timingInfo)
+Void rgSCHCmnDlCqiInd(cell, ue, isPucchInfo, dlCqi, timingInfo)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 Bool               isPucchInfo;
@@ -16819,7 +16646,6 @@ CmLteTimingInfo    timingInfo;
    Bool           is2ndCwCqiAvail = FALSE;
 #endif
 
-   TRC2(rgSCHCmnDlCqiInd);
 
 #ifdef RGR_CQI_REPT
    if (isPucchInfo)
@@ -16855,7 +16681,7 @@ CmLteTimingInfo    timingInfo;
       }
       else
       {
-         U8 dlCqiDeltaPrev = 0;
+         uint8_t dlCqiDeltaPrev = 0;
          dlCqiDeltaPrev = ue->prevCqi - ueDl->mimoInfo.cwInfo[0].cqi;
          if (dlCqiDeltaPrev > 3)
             dlCqiDeltaPrev = 3;
@@ -16956,7 +16782,7 @@ CmLteTimingInfo    timingInfo;
    cell->tenbStats->sch.dlNumCw0Cqi ++;
    cell->tenbStats->sch.dlNumCw1Cqi ++;
 #endif
-   RETVOID;
+   return;
 }
 
 #ifdef TFU_UPGRADE
@@ -16977,19 +16803,18 @@ CmLteTimingInfo    timingInfo;
  *
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr
+PRIVATE uint8_t rgSCHCmnCalcWcqiFrmSnr
 (
  RgSchCellCb        *cell,
  TfuSrsRpt        *srsRpt
  )
 #else
-PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt)
+PRIVATE uint8_t rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt)
    RgSchCellCb        *cell;
    TfuSrsRpt            *srsRpt;
 #endif
 {
-   U8 wideCqi=1; /*Calculated value from SNR*/
-   TRC2(rgSCHCmnCalcWcqiFrmSnr);
+   uint8_t wideCqi=1; /*Calculated value from SNR*/
    /*Need to map a certain SNR with a WideCQI value.
     * The CQI calculation is still primitive. Further, need to
     * use a improvized method for calculating WideCQI from SNR*/
@@ -17017,7 +16842,7 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt)
        {
            wideCqi=15;
        }
-   RETVALUE(wideCqi);
+   return (wideCqi);
 }/*rgSCHCmnCalcWcqiFrmSnr*/
 
 
@@ -17038,7 +16863,7 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt)
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnSrsInd
+Void rgSCHCmnSrsInd
 (
  RgSchCellCb        *cell,
  RgSchUeCb          *ue,
@@ -17046,18 +16871,17 @@ PUBLIC Void rgSCHCmnSrsInd
  CmLteTimingInfo    timingInfo
  )
 #else
-PUBLIC Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo)
+Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo)
     RgSchCellCb        *cell;
     RgSchUeCb          *ue;
     TfuSrsRpt            *srsRpt;
     CmLteTimingInfo    timingInfo;
 #endif
 {
-    U8 wideCqi; /*Calculated value from SNR*/
-    U32 recReqTime; /*Received Time in TTI*/
-    TRC2(rgSCHCmnSrsInd);
+    uint8_t wideCqi; /*Calculated value from SNR*/
+    uint32_t recReqTime; /*Received Time in TTI*/
 
-    recReqTime = (timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + timingInfo.subframe;
+    recReqTime = (timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + timingInfo.slot;
     ue->srsCb.selectedAnt = (recReqTime/ue->srsCb.peri)%2;
     if(srsRpt->wideCqiPres)
     {
@@ -17068,7 +16892,7 @@ PUBLIC Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo)
         wideCqi = rgSCHCmnCalcWcqiFrmSnr(cell, srsRpt);
     }
     rgSCHCmnFindUlCqiUlTxAnt(cell, ue, wideCqi);
-    RETVOID;
+    return;
 }/*rgSCHCmnSrsInd*/
 #endif
 
@@ -17092,13 +16916,13 @@ PUBLIC Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo)
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlTARpt
+Void rgSCHCmnDlTARpt
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue
 )
 #else
-PUBLIC Void rgSCHCmnDlTARpt(cell, ue)
+Void rgSCHCmnDlTARpt(cell, ue)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 #endif
@@ -17108,15 +16932,14 @@ RgSchUeCb          *ue;
    RgSchCmnDlUe    *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
    CmLListCp       poInactvLst;
 
-   TRC2(rgSCHCmnDlTARpt);
 
    /* RACHO: If UE idle time is more than threshold, then
     * set its poInactv pdcch order inactivity  */
    /* Fix : syed Ignore if TaTmr is not configured */
    if ((ue->dl.taCb.cfgTaTmr) && (rgSCHCmnUeIdleExdThrsld(cell, ue) == ROK))
    {
-      U32 prevDlMsk = ue->dl.dlInactvMask;
-      U32 prevUlMsk = ue->ul.ulInactvMask;
+      uint32_t prevDlMsk = ue->dl.dlInactvMask;
+      uint32_t prevUlMsk = ue->ul.ulInactvMask;
       ue->dl.dlInactvMask |= RG_PDCCHODR_INACTIVE;
       ue->ul.ulInactvMask |= RG_PDCCHODR_INACTIVE;
       /* Indicate Specific scheduler for this UEs inactivity */
@@ -17161,7 +16984,7 @@ RgSchUeCb          *ue;
                ue->ueId);
       }
    }
-   RETVOID;
+   return;
 }
 
 #ifdef TFU_UPGRADE
@@ -17177,7 +17000,7 @@ RgSchUeCb          *ue;
  *
  *  @param[in]  RgSchCellCb         *cell
  *  @param[in]  RgSchUeCb           *ue
- *  @param[in]   U8                 wideCqi
+ *  @param[in]   uint8_t                 wideCqi
  *  @return  Void
  **/
 #ifdef ANSI
@@ -17185,17 +17008,17 @@ PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt
 (
 RgSchCellCb     *cell,
 RgSchUeCb       *ue,
-U8              wideCqi
+uint8_t              wideCqi
 )
 #else
 PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt(cell, ue, wideCqi)
 RgSchCellCb     *cell;
 RgSchUeCb       *ue;
-U8              wideCqi;
+uint8_t              wideCqi;
 #endif
 {
    ue->validTxAnt = 1;
-   RETVOID;
+   return;
 }  /* rgSCHCmnFindUlCqiUlTxAnt */
 #endif
 
@@ -17215,14 +17038,14 @@ U8              wideCqi;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlCqiInd
+Void rgSCHCmnUlCqiInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 TfuUlCqiRpt          *ulCqiInfo
 )
 #else
-PUBLIC Void rgSCHCmnUlCqiInd(cell, ue, ulCqiInfo)
+Void rgSCHCmnUlCqiInd(cell, ue, ulCqiInfo)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 TfuUlCqiRpt          *ulCqiInfo;
@@ -17231,14 +17054,13 @@ TfuUlCqiRpt          *ulCqiInfo;
    RgSchCmnUlUe  *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
 #ifdef UL_LA
-   U8            iTbsNew;
+   uint8_t            iTbsNew;
    S32           previTbs;
 #endif
 #if (defined(SCH_STATS) || defined(TENB_STATS))
      CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue));
 #endif   
                  
-   TRC2(rgSCHCmnUlCqiInd);
    /*  consider inputs from SRS handlers about SRS occassions
     * in determining the UL TX Antenna selection */
    ueUl->crntUlCqi[0] = ulCqiInfo->wideCqi;
@@ -17307,7 +17129,7 @@ TfuUlCqiRpt          *ulCqiInfo;
    }
 #endif
 
-   RETVOID;
+   return;
 }  /* rgSCHCmnUlCqiInd */
 
 /**
@@ -17330,7 +17152,7 @@ TfuUlCqiRpt          *ulCqiInfo;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlHqProcForUe
+Void rgSCHCmnUlHqProcForUe
 (
 RgSchCellCb         *cell,
 CmLteTimingInfo     frm,
@@ -17338,7 +17160,7 @@ RgSchUeCb           *ue,
 RgSchUlHqProcCb     **procRef
 )
 #else
-PUBLIC Void rgSCHCmnUlHqProcForUe(cell, frm, ue, procRef)
+Void rgSCHCmnUlHqProcForUe(cell, frm, ue, procRef)
 RgSchCellCb         *cell;
 CmLteTimingInfo     frm;
 RgSchUeCb           *ue;
@@ -17346,15 +17168,14 @@ RgSchUlHqProcCb     **procRef;
 #endif
 {
 #ifndef RG_5GTF
-   U8 procId = rgSCHCmnGetUlHqProcIdx(&frm, cell);
+   uint8_t procId = rgSCHCmnGetUlHqProcIdx(&frm, cell);
 #endif
-   TRC2(rgSCHCmnUlHqProcForUe);
 #ifndef RG_5GTF
    *procRef = rgSCHUhmGetUlHqProc(cell, ue, procId);
 #else
    *procRef = rgSCHUhmGetUlProcByTime(cell, ue, frm);
 #endif
-   RETVOID;
+   return;
 }
 
 #ifdef RG_UNUSED
@@ -17377,31 +17198,30 @@ RgSchUlHqProcCb     **procRef;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnUpdUlHqProc
+S16 rgSCHCmnUpdUlHqProc
 (
 RgSchCellCb      *cell,
 RgSchUlHqProcCb  *curProc,
 RgSchUlHqProcCb  *oldProc
 )
 #else
-PUBLIC S16 rgSCHCmnUpdUlHqProc(cell, curProc, oldProc)
+S16 rgSCHCmnUpdUlHqProc(cell, curProc, oldProc)
 RgSchCellCb      *cell;
 RgSchUlHqProcCb  *curProc;
 RgSchUlHqProcCb  *oldProc;
 #endif
 {
-   TRC2(rgSCHCmnUpdUlHqProc);
 
    UNUSED(cell);
    UNUSED(oldProc);
 #if (ERRCLASS & ERRCLS_DEBUG)
    if (curProc->alloc == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
    curProc->alloc->hqProc = curProc;
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnUpdUlHqProc */
 #endif
 
@@ -17421,18 +17241,17 @@ RgSchUlHqProcCb  *oldProc;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnBsrTmrExpry
+S16 rgSCHCmnBsrTmrExpry
 (
 RgSchUeCb  *ueCb
 )
 #else
-PUBLIC S16 rgSCHCmnBsrTmrExpry(ueCb)
+S16 rgSCHCmnBsrTmrExpry(ueCb)
 RgSchUeCb  *ueCb;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ueCb->cell);
 
-   TRC2(rgSCHCmnBsrTmrExpry)
 
    ueCb->isSrGrant = TRUE;
 
@@ -17446,7 +17265,7 @@ RgSchUeCb  *ueCb;
       if(ueCb->isEmtcUe)
       {
          cellSch->apisEmtcUl->rgSCHSrRcvd(ueCb->cell, ueCb);
-         RETVALUE(ROK);
+         return ROK;
       }
    }
    else
@@ -17455,7 +17274,7 @@ RgSchUeCb  *ueCb;
       cellSch->apisUl->rgSCHSrRcvd(ueCb->cell, ueCb);
    }
 
-   RETVALUE (ROK);
+   return  (ROK);
 }
 
 /**
@@ -17470,31 +17289,31 @@ RgSchUeCb  *ueCb;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *  @param[in]  RgSchLcgCb *ulLcg
- *  @param[in]  U8           bsr
+ *  @param[in]  uint8_t           bsr
  *  @param[out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnUpdBsrShort
+S16 rgSCHCmnUpdBsrShort
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgSchLcgCb *ulLcg,
-U8           bsr,
+uint8_t           bsr,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnUpdBsrShort(cell, ue, ulLcg, bsr, err)
+S16 rgSCHCmnUpdBsrShort(cell, ue, ulLcg, bsr, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb *ulLcg;
-U8           bsr;
+uint8_t           bsr;
 RgSchErrInfo *err;
 #endif
 {
-   U8  lcgCnt;
+   uint8_t  lcgCnt;
 #ifdef LTE_L2_MEAS
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
 #endif
@@ -17502,14 +17321,13 @@ RgSchErrInfo *err;
    RgSchCmnLcg  *cmnLcg  = NULLP;
 
 #ifdef LTE_L2_MEAS
-   U8             idx;
+   uint8_t             idx;
 #endif
-   TRC2(rgSCHCmnUpdBsrShort);
 
    if (!RGSCH_LCG_ISCFGD(ulLcg))
    {
       err->errCause = RGSCHERR_SCH_LCG_NOT_CFGD;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    for (lcgCnt=0; lcgCnt<4; lcgCnt++)
    {
@@ -17610,7 +17428,7 @@ RgSchErrInfo *err;
       if(ue->isEmtcUe)
       {
          cellSch->apisEmtcUl->rgSCHUpdBsrShort(cell, ue, ulLcg, bsr);
-         RETVALUE(ROK);
+         return ROK;
       }
    }
    else
@@ -17622,7 +17440,7 @@ RgSchErrInfo *err;
 #ifdef LTE_ADV
    if (ue->ul.isUlCaEnabled  && ue->numSCells)
    {
-      for(U8 sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++)
+      for(uint8_t sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++)
       {
 #ifndef PAL_ENABLE_UL_CA
          if((ue->cellInfo[sCellIdx] != NULLP) &&
@@ -17638,7 +17456,7 @@ RgSchErrInfo *err;
    }
 #endif 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -17654,27 +17472,27 @@ RgSchErrInfo *err;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
  *  @param[in]  RgSchLcgCb *ulLcg
- *  @param[in]  U8           bsr
+ *  @param[in]  uint8_t           bsr
  *  @param[out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnUpdBsrTrunc
+S16 rgSCHCmnUpdBsrTrunc
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgSchLcgCb *ulLcg,
-U8           bsr,
+uint8_t           bsr,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnUpdBsrTrunc(cell, ue, ulLcg, bsr, err)
+S16 rgSCHCmnUpdBsrTrunc(cell, ue, ulLcg, bsr, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchLcgCb *ulLcg;
-U8           bsr;
+uint8_t           bsr;
 RgSchErrInfo *err;
 #endif
 {
@@ -17682,15 +17500,14 @@ RgSchErrInfo *err;
    RgSchCmnLcg  *cmnLcg = NULLP;
    S32          cnt;
 #ifdef LTE_L2_MEAS
-   U8     idx;
+   uint8_t     idx;
 #endif
 
-   TRC2(rgSCHCmnUpdBsrTrunc);
 
    if (!RGSCH_LCG_ISCFGD(ulLcg))
    {
       err->errCause = RGSCHERR_SCH_LCG_NOT_CFGD;
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* set all higher prio lcgs bs to 0 and update this lcgs bs and
       total bsr= sumofall lcgs bs */
@@ -17788,7 +17605,7 @@ RgSchErrInfo *err;
       if(ue->isEmtcUe)
       {
          cellSch->apisEmtcUl->rgSCHUpdBsrTrunc(cell, ue, ulLcg, bsr);
-         RETVALUE(ROK);
+         return ROK;
       }
    }
    else
@@ -17800,7 +17617,7 @@ RgSchErrInfo *err;
 #ifdef LTE_ADV
    if (ue->ul.isUlCaEnabled  && ue->numSCells)
    {
-      for(U8 sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++)
+      for(uint8_t sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++)
       {
 #ifndef PAL_ENABLE_UL_CA
          if((ue->cellInfo[sCellIdx] != NULLP) &&
@@ -17815,7 +17632,7 @@ RgSchErrInfo *err;
    }
 #endif 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -17832,38 +17649,37 @@ RgSchErrInfo *err;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
- *  @param[in]  U8 bsArr[]
+ *  @param[in]  uint8_t bsArr[]
  *  @param[out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnUpdBsrLong
+S16 rgSCHCmnUpdBsrLong
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
-U8           *bsArr,
+uint8_t           *bsArr,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnUpdBsrLong(cell, ue, bsArr, err)
+S16 rgSCHCmnUpdBsrLong(cell, ue, bsArr, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
-U8           *bsArr;
+uint8_t           *bsArr;
 RgSchErrInfo *err;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   U32           tmpBsArr[4] = {0, 0, 0, 0};
-   U32           nonGbrBs = 0;
+   uint32_t           tmpBsArr[4] = {0, 0, 0, 0};
+   uint32_t           nonGbrBs = 0;
 #ifdef LTE_L2_MEAS
-   U8            idx1;
-   U8            idx2;
+   uint8_t            idx1;
+   uint8_t            idx2;
 #endif
-   U32           lcgId;
+   uint32_t           lcgId;
 
-   TRC2(rgSCHCmnUpdBsrLong);
 
 #ifdef LTE_L2_MEAS
    for(idx1 = 1; idx1 < RGSCH_MAX_LCG_PER_UE; idx1++)
@@ -17958,7 +17774,7 @@ RgSchErrInfo *err;
       if(ue->isEmtcUe)
       {
          cellSch->apisEmtcUl->rgSCHUpdBsrLong(cell, ue, bsArr);
-         RETVALUE(ROK);
+         return ROK;
       }
    }
    else
@@ -17970,7 +17786,7 @@ RgSchErrInfo *err;
 #ifdef LTE_ADV
    if (ue->ul.isUlCaEnabled  && ue->numSCells)
    {
-      for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+      for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
       {
 #ifndef PAL_ENABLE_UL_CA
          if((ue->cellInfo[idx] != NULLP) &&
@@ -17985,7 +17801,7 @@ RgSchErrInfo *err;
    }
 #endif 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -17999,14 +17815,14 @@ RgSchErrInfo *err;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
- *  @param[in]  U8           phr
+ *  @param[in]  uint8_t           phr
  *  @param[out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnUpdExtPhr
+S16 rgSCHCmnUpdExtPhr
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
@@ -18014,7 +17830,7 @@ RgInfExtPhrCEInfo *extPhr,
 RgSchErrInfo   *err
 )
 #else
-PUBLIC S16 rgSCHCmnUpdExtPhr(cell, ue, extPhr, err)
+S16 rgSCHCmnUpdExtPhr(cell, ue, extPhr, err)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgInfExtPhrCEInfo *extPhr;
@@ -18028,7 +17844,6 @@ RgSchErrInfo   *err;
 #ifdef LTEMAC_SPS
    RgSchCmnUlUeSpsInfo   *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell);
 #endif
-   TRC2(rgSCHCmnUpdExtPhr);
 
    UNUSED(err);
 
@@ -18049,7 +17864,7 @@ RgSchErrInfo   *err;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnUpdExtPhr */
 
 
@@ -18066,25 +17881,25 @@ RgSchErrInfo   *err;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUeCb    *ue
- *  @param[in]  U8           phr
+ *  @param[in]  uint8_t           phr
  *  @param[out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnUpdPhr
+S16 rgSCHCmnUpdPhr
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
-U8             phr,
+uint8_t             phr,
 RgSchErrInfo   *err
 )
 #else
-PUBLIC S16 rgSCHCmnUpdPhr(cell, ue, phr, err)
+S16 rgSCHCmnUpdPhr(cell, ue, phr, err)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
-U8             phr;
+uint8_t             phr;
 RgSchErrInfo   *err;
 #endif
 {
@@ -18095,7 +17910,6 @@ RgSchErrInfo   *err;
 #ifdef LTEMAC_SPS
    RgSchCmnUlUeSpsInfo   *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell);
 #endif
-   TRC2(rgSCHCmnUpdPhr);
 
    UNUSED(err);
 
@@ -18116,7 +17930,7 @@ RgSchErrInfo   *err;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHCmnUpdPhr */
 
 /**
@@ -18137,21 +17951,20 @@ RgSchErrInfo   *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnContResUlGrant
+S16 rgSCHCmnContResUlGrant
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnContResUlGrant(cell, ue, err)
+S16 rgSCHCmnContResUlGrant(cell, ue, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgSchErrInfo *err;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnContResUlGrant);
 
    #ifdef EMTC_ENABLE
    if(cell->emtcEnable)
@@ -18159,7 +17972,7 @@ RgSchErrInfo *err;
       if(ue->isEmtcUe)
       {
          cellSch->apisEmtcUl->rgSCHContResUlGrant(cell, ue);
-         RETVALUE(ROK);
+         return ROK;
       }
    }
    else
@@ -18167,7 +17980,7 @@ RgSchErrInfo *err;
    {
       cellSch->apisUl->rgSCHContResUlGrant(cell, ue);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -18189,7 +18002,7 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnSrRcvd
+S16 rgSCHCmnSrRcvd
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -18197,7 +18010,7 @@ CmLteTimingInfo frm,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHCmnSrRcvd(cell, ue, frm, err)
+S16 rgSCHCmnSrRcvd(cell, ue, frm, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 CmLteTimingInfo frm;
@@ -18208,7 +18021,6 @@ RgSchErrInfo *err;
    RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
    CmLList      *node    = ueUl->ulAllocLst.last;
 
-   TRC2(rgSCHCmnSrRcvd);
 
 #ifdef EMTC_ENABLE
    emtcStatsUlTomSrInd++;
@@ -18232,7 +18044,7 @@ RgSchErrInfo *err;
       if(ue->isEmtcUe)
       {
          cellSch->apisEmtcUl->rgSCHSrRcvd(cell, ue);
-         RETVALUE(ROK);
+         return ROK;
       }
    }
    else
@@ -18240,7 +18052,7 @@ RgSchErrInfo *err;
    {
       cellSch->apisUl->rgSCHSrRcvd(cell, ue);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -18261,12 +18073,12 @@ RgSchErrInfo *err;
  *  @return  RgSchUlAlloc*
  **/
 #ifdef ANSI
-PUBLIC RgSchUlAlloc *rgSCHCmnFirstRcptnReq
+RgSchUlAlloc *rgSCHCmnFirstRcptnReq
 (
 RgSchCellCb      *cell
 )
 #else
-PUBLIC RgSchUlAlloc *rgSCHCmnFirstRcptnReq(cell)
+RgSchUlAlloc *rgSCHCmnFirstRcptnReq(cell)
 RgSchCellCb      *cell;
 #endif
 {
@@ -18274,7 +18086,6 @@ RgSchCellCb      *cell;
 /* ACC_TDD */
    RgSchUlAlloc* alloc = NULLP;
 
-   TRC2(rgSCHCmnFirstRcptnReq);
 
    if (cellUl->rcpReqIdx != RGSCH_INVALID_INFO)
    {
@@ -18287,7 +18098,7 @@ RgSchCellCb      *cell;
           }
    }
 
-   RETVALUE(alloc);
+   return (alloc);
 }
 
 /**
@@ -18308,13 +18119,13 @@ RgSchCellCb      *cell;
  *  @return  RgSchUlAlloc*
  **/
 #ifdef ANSI
-PUBLIC RgSchUlAlloc *rgSCHCmnNextRcptnReq
+RgSchUlAlloc *rgSCHCmnNextRcptnReq
 (
 RgSchCellCb      *cell,
 RgSchUlAlloc     *alloc
 )
 #else
-PUBLIC RgSchUlAlloc *rgSCHCmnNextRcptnReq(cell, alloc)
+RgSchUlAlloc *rgSCHCmnNextRcptnReq(cell, alloc)
 RgSchCellCb      *cell;
 RgSchUlAlloc     *alloc;
 #endif
@@ -18323,7 +18134,6 @@ RgSchUlAlloc     *alloc;
 /* ACC-TDD */
    //RgSchUlSf      *sf   = &cellUl->ulSfArr[cellUl->rcpReqIdx];
 
-   TRC2(rgSCHCmnNextRcptnReq);
 /* ACC-TDD */
    if (cellUl->rcpReqIdx != RGSCH_INVALID_INFO)
    {
@@ -18340,7 +18150,7 @@ RgSchUlAlloc     *alloc;
           alloc = NULLP;
    }
 
-   RETVALUE(alloc);
+   return (alloc);
 }
 /**
  * @brief Collates DRX enabled UE's scheduled in this SF
@@ -18360,12 +18170,12 @@ RgSchUlAlloc     *alloc;
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDrxStrtInActvTmrInUl
+Void rgSCHCmnDrxStrtInActvTmrInUl
 (
 RgSchCellCb      *cell
 )
 #else
-PUBLIC Void rgSCHCmnDrxStrtInActvTmrInUl(cell)
+Void rgSCHCmnDrxStrtInActvTmrInUl(cell)
 RgSchCellCb      *cell;
 #endif
 {
@@ -18376,8 +18186,6 @@ RgSchCellCb      *cell;
    RgSchUeCb       *ueCb;
 
 
-   TRC2(rgSCHCmnDrxStrtInActvTmrInUl);
-
    cmLListInit(&ulUeLst);
 
    while(alloc)
@@ -18404,7 +18212,7 @@ RgSchCellCb      *cell;
 
    (Void)rgSCHDrxStrtInActvTmr(cell,&ulUeLst,RG_SCH_DRX_UL);
 
-   RETVOID;
+   return;
 }
 
 
@@ -18423,26 +18231,25 @@ RgSchCellCb      *cell;
  *     Invoked by: TOM
  *
  *  @param[in]  RgSchCellCb      *cell
- *  @param[in]  U8               idx
+ *  @param[in]  uint8_t               idx
  *  @return  RgSchUlAlloc*
  **/
 #ifdef ANSI
-PUBLIC RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc
+RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc
 (
 RgSchCellCb      *cell,
-U8               idx 
+uint8_t               idx 
 )
 #else
-PUBLIC RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(cell, idx)
+RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(cell, idx)
 RgSchCellCb      *cell;
-U8               idx;
+uint8_t               idx;
 #endif
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 /* ACC-TDD */
    RgSchUlAlloc  *alloc = NULLP;
 
-   TRC2(rgSCHCmnFirstHqFdbkAlloc);
 
    if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO)
    {
@@ -18455,7 +18262,7 @@ U8               idx;
          }
    }
 
-   RETVALUE(alloc);
+   return (alloc);
 }
 
 /**
@@ -18474,21 +18281,20 @@ U8               idx;
  *  @return  RgSchUlAlloc*
  **/
 #ifdef ANSI
-PUBLIC RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc
+RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc
 (
 RgSchCellCb      *cell,
 RgSchUlAlloc     *alloc,
-U8               idx 
+uint8_t               idx 
 )
 #else
-PUBLIC RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(cell, alloc, idx)
+RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(cell, alloc, idx)
 RgSchCellCb      *cell;
 RgSchUlAlloc     *alloc;
-U8               idx; 
+uint8_t               idx; 
 #endif
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   TRC2(rgSCHCmnNextHqFdbkAlloc);
 
    if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO)
    {
@@ -18504,7 +18310,7 @@ U8               idx;
    {
          alloc = NULLP;
    }
-   RETVALUE(alloc);
+   return (alloc);
 }
 
 /***********************************************************
@@ -18522,18 +18328,17 @@ U8               idx;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnUlGetITbsFrmIMcs
+uint8_t rgSCHCmnUlGetITbsFrmIMcs
 (
-U8          iMcs
+uint8_t          iMcs
 )
 #else
-PUBLIC U8 rgSCHCmnUlGetITbsFrmIMcs(iMcs)
-U8          iMcs;
+uint8_t rgSCHCmnUlGetITbsFrmIMcs(iMcs)
+uint8_t          iMcs;
 #endif
 {
-   TRC2(rgSCHCmnUlGetITbsFrmIMcs);
 
-   RETVALUE(rgUlIMcsTbl[iMcs].iTbs);
+   return (rgUlIMcsTbl[iMcs].iTbs);
 }
 
 /***********************************************************
@@ -18553,19 +18358,18 @@ U8          iMcs;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnUlGetIMcsFrmITbs
+uint8_t rgSCHCmnUlGetIMcsFrmITbs
 (
-U8                iTbs,
+uint8_t                iTbs,
 CmLteUeCategory   ueCtg
 )
 #else
-PUBLIC U8 rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg)
-U8                iTbs;
+uint8_t rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg)
+uint8_t                iTbs;
 CmLteUeCategory   ueCtg;
 #endif
 {
-   U8 iMcs;
-   TRC2(rgSCHCmnUlGetIMcsFrmITbs);
+   uint8_t iMcs;
 
    if (iTbs <= 10)
    {
@@ -18598,7 +18402,7 @@ CmLteUeCategory   ueCtg;
    }
 #endif
 
-   RETVALUE(iMcs);
+   return (iMcs);
 }
 
 /***********************************************************
@@ -18616,22 +18420,21 @@ CmLteUeCategory   ueCtg;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC U32 rgSCHCmnUlMinTbBitsForITbs
+uint32_t rgSCHCmnUlMinTbBitsForITbs
 (
 RgSchCmnUlCell     *cellUl,
-U8                 iTbs
+uint8_t                 iTbs
 )
 #else
-PUBLIC U32 rgSCHCmnUlMinTbBitsForITbs(cellUl, iTbs)
+uint32_t rgSCHCmnUlMinTbBitsForITbs(cellUl, iTbs)
 RgSchCmnUlCell   *cellUl;
-U8               iTbs;
+uint8_t               iTbs;
 #endif
 {
-   TRC2(rgSCHCmnUlMinTbBitsForITbs);
 
    RGSCH_ARRAY_BOUND_CHECK(0, rgTbSzTbl[0], iTbs); 
 
-   RETVALUE(rgTbSzTbl[0][iTbs][cellUl->sbSize-1]);
+   return (rgTbSzTbl[0][iTbs][cellUl->sbSize-1]);
 }
 
 /***********************************************************
@@ -18651,22 +18454,21 @@ U8               iTbs;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC RgSchUlAlloc *rgSCHCmnUlSbAlloc
+RgSchUlAlloc *rgSCHCmnUlSbAlloc
 (
 RgSchUlSf       *sf,
-U8              numSb,
+uint8_t              numSb,
 RgSchUlHole     *hole
 )
 #else
-PUBLIC RgSchUlAlloc *rgSCHCmnUlSbAlloc(sf, numSb, hole)
+RgSchUlAlloc *rgSCHCmnUlSbAlloc(sf, numSb, hole)
 RgSchUlSf       *sf;
-U8              numSb;
+uint8_t              numSb;
 RgSchUlHole     *hole;
 #endif
 {
-   U8           holeSz; /* valid hole size */
+   uint8_t           holeSz; /* valid hole size */
    RgSchUlAlloc *alloc;
-   TRC2(rgSCHCmnUlSbAlloc);
 
    if ((holeSz = rgSchCmnMult235Tbl[hole->num].prvMatch) == hole->num)
    {
@@ -18697,7 +18499,7 @@ RgSchUlHole     *hole;
       }
       alloc = rgSCHUtlUlAllocGetPartHole(sf, numSb, hole);
    }
-   RETVALUE(alloc);
+   return (alloc);
 }
 
 /**
@@ -18716,13 +18518,13 @@ RgSchUlHole     *hole;
  *  @return   Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlUeFillAllocInfo
+Void rgSCHCmnUlUeFillAllocInfo
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue
 )
 #else
-PUBLIC Void rgSCHCmnUlUeFillAllocInfo(cell, ue)
+Void rgSCHCmnUlUeFillAllocInfo(cell, ue)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 #endif
@@ -18731,7 +18533,6 @@ RgSchUeCb        *ue;
    RgSchCmnUeUlAlloc  *ulAllocInfo;
    RgSchCmnUlUe       *ueUl;
 
-   TRC2(rgSCHCmnUlUeFillAllocInfo);
 
    ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    ulAllocInfo = &ueUl->alloc;
@@ -18753,7 +18554,7 @@ RgSchUeCb        *ue;
       rgSCHCmnUlUpdOutStndAlloc(cell, ue, ulAllocInfo->allocdBytes);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -18784,12 +18585,11 @@ RgSchUeCb *ue;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,ue->cell);
    CmLList   *node = ueUl->ulAllocLst.last;
    RgSchCmnAllocRecord *allRcd;
-   U32 outStndAlloc=0;
-   U32 nonLcg0OutStndAllocBs=0;
-   U32 nonLcg0Bsr=0;
-   U8  lcgId;
+   uint32_t outStndAlloc=0;
+   uint32_t nonLcg0OutStndAllocBs=0;
+   uint32_t nonLcg0Bsr=0;
+   uint8_t  lcgId;
    RgSchCmnLcg *cmnLcg = NULLP;
-   TRC2(rgSCHCmnUpdUlCompEffBsr);
 
    while (node)
    {
@@ -18848,7 +18648,7 @@ RgSchUeCb *ue;
    /* better be handled in individual scheduler */
    ue->ul.effBsr = nonLcg0Bsr +\
                   ((RgSchCmnLcg *)(ue->ul.lcgArr[0].sch))->bs;
-   RETVOID;
+   return;
 }
 
 /**
@@ -18868,13 +18668,13 @@ RgSchUeCb *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlRecordUeAlloc
+Void rgSCHCmnUlRecordUeAlloc
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue
 )
 #else
-PUBLIC Void rgSCHCmnUlRecordUeAlloc(cell, ue)
+Void rgSCHCmnUlRecordUeAlloc(cell, ue)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 #endif
@@ -18888,7 +18688,6 @@ RgSchUeCb   *ue;
    RgSchCmnAllocRecord *allRcd = (RgSchCmnAllocRecord *)(node->node);
    RgSchCmnUeUlAlloc  *ulAllocInfo = &ueUl->alloc;
    CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue));
-   TRC2(rgSCHCmnUlRecordUeAlloc);
 
    cmLListDelFrm(lst, &allRcd->lnk);
 #ifndef LTE_TDD
@@ -18925,7 +18724,7 @@ RgSchUeCb   *ue;
 
    cell->measurements.ulBytesCnt += ulAllocInfo->allocdBytes;
 
-   RETVOID;
+   return;
 }
 
 /** PHR handling for MSG3
@@ -18946,14 +18745,14 @@ RgSchUeCb   *ue;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlRecMsg3Alloc
+Void rgSCHCmnUlRecMsg3Alloc
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
 RgSchRaCb   *raCb
 )
 #else
-PUBLIC Void rgSCHCmnUlRecMsg3Alloc(cell, ue, raCb)
+Void rgSCHCmnUlRecMsg3Alloc(cell, ue, raCb)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 RgSchRaCb   *raCb;
@@ -18965,7 +18764,6 @@ RgSchRaCb   *raCb;
    RgSchCmnAllocRecord *allRcd = (RgSchCmnAllocRecord *)(node->node);
 
    /* Stack Crash problem for TRACE5 changes */
-   TRC2(rgSCHCmnUlRecMsg3Alloc);
 
    cmLListDelFrm(lst, node);
    allRcd->allocTime = raCb->msg3AllocTime;
@@ -18979,7 +18777,7 @@ RgSchRaCb   *raCb;
 
    rgSCHPwrRecordRbAlloc(cell, ue, allRcd->numRb);
 
-   RETVOID;
+   return;
 }
 /**
  * @brief Keeps track of the most recent RG_SCH_CMN_MAX_ALLOC_TRACK
@@ -18997,25 +18795,24 @@ RgSchRaCb   *raCb;
  *
  *  @param[in]  RgSchCellCb *cell
  *  @param[in]  RgSchUeCb   *ue
- *  @param[in]  U32 alloc
+ *  @param[in]  uint32_t alloc
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlUpdOutStndAlloc
+Void rgSCHCmnUlUpdOutStndAlloc
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
-U32 alloc
+uint32_t alloc
 )
 #else
-PUBLIC Void rgSCHCmnUlUpdOutStndAlloc(cell, ue, alloc)
+Void rgSCHCmnUlUpdOutStndAlloc(cell, ue, alloc)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
-U32 alloc;
+uint32_t alloc;
 #endif
 {
-   U32                 nonLcg0Alloc=0;
-   TRC2(rgSCHCmnUlUpdOutStndAlloc);
+   uint32_t                 nonLcg0Alloc=0;
 
    /* Update UEs LCG0's bs according to the total outstanding BSR allocation.*/
    if (((RgSchCmnLcg *)(ue->ul.lcgArr[0].sch))->bs > alloc)
@@ -19064,7 +18861,7 @@ U32 alloc;
    /* Resetting UEs lower Cap */
    ue->ul.minReqBytes = 0;
 
-   RETVOID;
+   return;
 }
 
 
@@ -19079,17 +18876,17 @@ U32 alloc;
  *     Invoked by: Scheduler
  *
  *  @param[in]  RgSchUeCb        *ue
- *  @return     U8
+ *  @return     uint8_t
  **/
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnUlGetITbs
+uint8_t rgSCHCmnUlGetITbs
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
 Bool             isEcp
 )
 #else
-PUBLIC U8 rgSCHCmnUlGetITbs(cell, ue, isEcp)
+uint8_t rgSCHCmnUlGetITbs(cell, ue, isEcp)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 Bool             isEcp;
@@ -19098,13 +18895,12 @@ Bool             isEcp;
    RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
    /* CQI will be capped to maxUlCqi for 16qam UEs */
    CmLteUeCategory  ueCtgy = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue));
-   U8            cqi;
+   uint8_t            cqi;
 #ifdef UL_LA
    S32            iTbs;
-   U8            maxiTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ueUl->maxUlCqi]; 
+   uint8_t            maxiTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ueUl->maxUlCqi]; 
 #endif
 
-   TRC2(rgSCHCmnUlGetITbs);
 
    /* #ifdef RG_SCH_CMN_EXT_CP_SUP For ECP pick index 1 */
 #ifdef TFU_UPGRADE
@@ -19134,7 +18930,7 @@ Bool             isEcp;
       iTbs = 19;
    }
 #endif
-   RETVALUE(iTbs);
+   return (iTbs);
 #endif 
 #else
    if ( (ueCtgy != CM_LTE_UE_CAT_5) && (ueUl->crntUlCqi[0] > ueUl->maxUlCqi ))
@@ -19146,7 +18942,7 @@ Bool             isEcp;
       cqi = ueUl->crntUlCqi[0];
    }
 #endif
-   RETVALUE(rgSchCmnUlCqiToTbsTbl[(U8)isEcp][cqi]);
+   return (rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][cqi]);
 }
 
 /**
@@ -19183,7 +18979,6 @@ RgSchDlHqProcCb       *hqP;
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnDlRbInfoAddUeTx);
 
    if (hqP->reqLnk.node == NULLP)
    {
@@ -19200,7 +18995,7 @@ RgSchDlHqProcCb       *hqP;
          hqP->reqLnk.node = (PTR)hqP;
       }
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -19237,7 +19032,6 @@ RgSchDlHqProcCb       *hqP;
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(ue->cell);
 
-   TRC2(rgSCHCmnDlRbInfoAddUeRetx);
 
    if (cellSch->dl.isDlFreqSel)
    {
@@ -19250,7 +19044,7 @@ RgSchDlHqProcCb       *hqP;
       cmLListAdd2Tail(&allocInfo->dedAlloc.retxHqPLst, &hqP->reqLnk);
       hqP->reqLnk.node = (PTR)hqP;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -19287,7 +19081,6 @@ RgSchDlHqProcCb       *hqP;
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(ue->cell);
 
-   TRC2(rgSCHCmnDlRbInfoAddUeRetxTx);
 
    if (cellSch->dl.isDlFreqSel)
    {
@@ -19299,7 +19092,7 @@ RgSchDlHqProcCb       *hqP;
       cmLListAdd2Tail(&allocInfo->dedAlloc.txRetxHqPLst, &hqP->reqLnk);
       hqP->reqLnk.node = (PTR)hqP;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -19337,13 +19130,12 @@ RgSchDlHqProcCb       *hqP;
 {
    CmLList         *schdLnkNode;
 
-   TRC2(rgSCHCmnDlAdd2NonSchdRetxLst);
 
 #ifdef LTEMAC_SPS
    if ( (hqP->sch != (RgSchCmnDlHqProc *)NULLP) && 
          (RG_SCH_CMN_SPS_DL_IS_SPS_HQP(hqP)))
    {
-      RETVOID;
+      return;
    }
 #endif
 
@@ -19351,7 +19143,7 @@ RgSchDlHqProcCb       *hqP;
    RG_SCH_CMN_INIT_SCHD_LNK(schdLnkNode, hqP);
    cmLListAdd2Tail(&allocInfo->dedAlloc.nonSchdRetxHqPLst, schdLnkNode);
 
-   RETVOID;
+   return;
 }
 
 
@@ -19405,19 +19197,18 @@ PRIVATE S16 rgSCHCmnDlANFdbkInit(cell)
 RgSchCellCb                *cell;
 #endif
 {
U8                   sfCount;
U8                   ulDlCfgIdx = cell->ulDlCfgIdx;
U8                   maxDlSubfrms = cell->numDlSubfrms;
U8                   sfNum;
U8                   idx;
U8                   dlIdx;
U8                   calcSfnOffset;
uint8_t                   sfCount;
uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
uint8_t                   sfNum;
uint8_t                   idx;
uint8_t                   dlIdx;
uint8_t                   calcSfnOffset;
  S8                   calcSfNum;
U8                   ulSfCnt =0;
uint8_t                   ulSfCnt =0;
  RgSchTddSubfrmInfo   ulSubfrmInfo;
U8                   maxUlSubfrms;
uint8_t                   maxUlSubfrms;
 
-   TRC2(rgSCHCmnDlANFdbkInit);
 
    ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx];
    maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1];
@@ -19484,7 +19275,7 @@ RgSchCellCb                *cell;
                                                    cell->subFrms[sfNum]->dlFdbkInfo.sfnOffset;
       cell->subFrms[dlIdx]->dlFdbkInfo.m = cell->subFrms[sfNum]->dlFdbkInfo.m;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -19515,20 +19306,19 @@ PRIVATE S16 rgSCHCmnDlKdashUlAscInit(cell)
 RgSchCellCb                *cell;
 #endif
 {
U8                   sfCount;
U8                   ulDlCfgIdx = cell->ulDlCfgIdx;
U8                   maxDlSubfrms = cell->numDlSubfrms;
U8                   sfNum;
U8                   dlIdx;
uint8_t                   sfCount;
uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
uint8_t                   sfNum;
uint8_t                   dlIdx;
  S8                   calcSfnOffset;
  S8                   calcSfNum;
U8                   ulSfCnt =0;
uint8_t                   ulSfCnt =0;
  RgSchTddSubfrmInfo   ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx];
U8                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
uint8_t                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
                                      [RGSCH_NUM_SUB_FRAMES-1];
U8                   dlPres = 0;
uint8_t                   dlPres = 0;
 
-   TRC2(rgSCHCmnDlKdashUlAscInit);
 
    /* Generate ACK/NACK offset information for each DL subframe in a radio frame
     * Calculate this information based on K` in UL Association Set table */
@@ -19602,7 +19392,7 @@ RgSchCellCb                *cell;
       cell->subFrms[dlIdx]->ulAscInfo.sfnOffset =
          cell->subFrms[sfNum]->ulAscInfo.sfnOffset;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -19632,9 +19422,8 @@ PRIVATE S16 rgSCHCmnDlNpValInit(cell)
 RgSchCellCb                *cell;
 #endif
 {
-   U8    idx;
-   U16   np;
-   TRC2(rgSCHCmnDlNpValInit);
+   uint8_t    idx;
+   uint16_t   np;
 
    /* Always Np is 0 for p=0 */
    cell->rgSchTddNpValTbl[0] = 0;
@@ -19642,10 +19431,10 @@ RgSchCellCb                *cell;
    for(idx=1; idx < RGSCH_TDD_MAX_P_PLUS_ONE_VAL; idx++)
    {
       np = cell->bwCfg.dlTotalBw * (idx * RG_SCH_CMN_NUM_SUBCAR - 4);
-      cell->rgSchTddNpValTbl[idx] = (U8) (np/36);
+      cell->rgSchTddNpValTbl[idx] = (uint8_t) (np/36);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -19676,11 +19465,10 @@ PRIVATE S16 rgSCHCmnDlCreateRachPrmLst(cell)
 RgSchCellCb                *cell;
 #endif
 {
U8       raArrSz;
uint8_t       raArrSz;
  S16       ret;
U8       lstSize;
uint8_t       lstSize;
 
-   TRC2(rgSCHCmnDlCreateRachPrmLst);
 
    RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz);
 
@@ -19691,12 +19479,12 @@ RgSchCellCb                *cell;
          (Data **)(&cell->raInfo.raReqLst), (Size)(lstSize * sizeof(CmLListCp)));
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
 
    cell->raInfo.lstSize = lstSize;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -19727,28 +19515,27 @@ PRIVATE S16 rgSCHCmnDlRachInfoInit(cell)
 RgSchCellCb                *cell;
 #endif
 {
-   U8                   sfCount;
-   U8                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8                   sfNum;
-   U8                   ulSfCnt =0;
-   U8                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
+   uint8_t                   sfCount;
+   uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t                   sfNum;
+   uint8_t                   ulSfCnt =0;
+   uint8_t                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
                                        [RGSCH_NUM_SUB_FRAMES-1];
-   U8                   raArrSz;
-   RgSchTddRachRspLst   rachRspLst[3][RGSCH_NUM_SUB_FRAMES];
-   U8                   startWin;
-   U8                   endWin;
-   U8                   sfnIdx;
-   U8                   subfrmIdx;
-   U8                   endSubfrmIdx;
-   U8                   startSubfrmIdx;
-   S16                   ret;
-   RgSchTddRachDelInfo  *delInfo;
-   S8                   sfnOffset;
-   U8                   numSubfrms;
-
-   TRC2(rgSCHCmnDlRachInfoInit);
-
-   cmMemset((U8 *)rachRspLst, 0, sizeof(rachRspLst));
+   uint8_t                   raArrSz;
+   RgSchTddRachRspLst        rachRspLst[3][RGSCH_NUM_SUB_FRAMES];
+   uint8_t                   startWin;
+   uint8_t                   endWin;
+   uint8_t                   sfnIdx;
+   uint8_t                   subfrmIdx;
+   uint8_t                   endSubfrmIdx;
+   uint8_t                   startSubfrmIdx;
+   S16                       ret;
+   RgSchTddRachDelInfo       *delInfo;
+   S8                        sfnOffset;
+   uint8_t                   numSubfrms;
+
+
+   memset(rachRspLst, 0, sizeof(rachRspLst));
 
    RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz);
 
@@ -19860,10 +19647,10 @@ RgSchCellCb                *cell;
    ret = rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz);
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -19893,20 +19680,19 @@ PRIVATE S16 rgSCHCmnDlPhichOffsetInit(cell)
 RgSchCellCb                *cell;
 #endif
 {
-   U8                   sfCount;
-   U8                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8                   maxDlSubfrms = cell->numDlSubfrms;
-   U8                   sfNum;
-   U8                   dlIdx;
-   U8                   dlPres = 0;
-   U8                   calcSfnOffset;
-   U8                   calcSfNum;
-   U8                   ulSfCnt =0;
+   uint8_t                   sfCount;
+   uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t                   maxDlSubfrms = cell->numDlSubfrms;
+   uint8_t                   sfNum;
+   uint8_t                   dlIdx;
+   uint8_t                   dlPres = 0;
+   uint8_t                   calcSfnOffset;
+   uint8_t                   calcSfNum;
+   uint8_t                   ulSfCnt =0;
    RgSchTddSubfrmInfo   ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx];
-   U8                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
+   uint8_t                   maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\
                                        [RGSCH_NUM_SUB_FRAMES-1];
 
-   TRC2(rgSCHCmnDlPhichOffsetInit);
 
    /* Generate PHICH offset information for each DL subframe in a radio frame
     * Calculate this information based on K in PHICH table */
@@ -19978,7 +19764,7 @@ RgSchCellCb                *cell;
       cell->subFrms[dlIdx]->phichOffInfo.sfnOffset =
          cell->subFrms[sfNum]->phichOffInfo.sfnOffset;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -19995,28 +19781,27 @@ RgSchCellCb                *cell;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUpdVars
+Void rgSCHCmnUpdVars
 (
 RgSchCellCb *cell
 )
 #else
-PUBLIC Void rgSCHCmnUpdVars(cell)
+Void rgSCHCmnUpdVars(cell)
 RgSchCellCb *cell;
 #endif
 {
-   RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   CmLteTimingInfo   timeInfo;
-   U8                idx;
-   U8                ulSubframe;
-   U8                ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8                msg3Subfrm;
-   U8                Mval;
-   TRC2(rgSCHCmnUpdVars);
+   RgSchCmnUlCell         *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
+   CmLteTimingInfo        timeInfo;
+   uint8_t                idx;
+   uint8_t                ulSubframe;
+   uint8_t                ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t                msg3Subfrm;
+   uint8_t                Mval;
  
    /* ccpu00132654-ADD- Initializing all the indices in every subframe*/ 
    rgSCHCmnInitVars(cell);
 
-   idx = (cell->crntTime.subframe + TFU_ULCNTRL_DLDELTA) % RGSCH_NUM_SUB_FRAMES;
+   idx = (cell->crntTime.slot + TFU_ULCNTRL_DLDELTA) % RGSCH_NUM_SUB_FRAMES;
    /* Calculate the UL scheduling subframe idx based on the 
       Pusch k table */
    if(rgSchTddPuschTxKTbl[ulDlCfgIdx][idx] != 0)
@@ -20064,13 +19849,13 @@ RgSchCellCb *cell;
       }
    }
 
-   idx = (cell->crntTime.subframe + TFU_RECPREQ_DLDELTA) % RGSCH_NUM_SUB_FRAMES;
+   idx = (cell->crntTime.slot + TFU_RECPREQ_DLDELTA) % RGSCH_NUM_SUB_FRAMES;
    if (rgSchTddUlDlSubfrmTbl[ulDlCfgIdx][idx] == RG_SCH_TDD_UL_SUBFRAME)
    {
       RGSCHCMNADDTOCRNTTIME(cell->crntTime, timeInfo, TFU_RECPREQ_DLDELTA)
       cellUl->rcpReqIdx   = rgSCHCmnGetUlSfIdx(&timeInfo, cell);
    }
-   idx = (cell->crntTime.subframe+RG_SCH_CMN_DL_DELTA) % RGSCH_NUM_SUB_FRAMES;
+   idx = (cell->crntTime.slot+RG_SCH_CMN_DL_DELTA) % RGSCH_NUM_SUB_FRAMES;
    
    /*[ccpu00134666]-MOD-Modify the check to schedule the RAR in
      special subframe */                       
@@ -20090,7 +19875,7 @@ RgSchCellCb *cell;
    else
    {
       /* introduce some reuse with above code? */
-      U8    offst;
+      uint8_t    offst;
       RGSCHCMNADDTOCRNTTIME(cell->crntTime,timeInfo,RG_SCH_CMN_DL_DELTA)
       //offst = rgSchTddMsg3SubfrmTbl[ulDlCfgIdx][timeInfo.subframe];
       offst = rgSchTddSpsUlRsrvTbl[ulDlCfgIdx][timeInfo.subframe];
@@ -20106,7 +19891,7 @@ RgSchCellCb *cell;
     * mainly the prachMaskIndex */
    rgSCHCmnUpdRachParam(cell);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -20118,33 +19903,32 @@ RgSchCellCb *cell;
  *     Purpose:  Gets 'p' value for HARQ ACK/NACK reception from CCE.
  *
  *  @param[in]  RgSchCellCb   *cell
- *  @param[in]  U8            cce
- *  @return U8
+ *  @param[in]  uint8_t            cce
+ *  @return uint8_t
  *
  **/
 #ifdef ANSI
-PUBLIC U8  rgSCHCmnGetPValFrmCCE
+uint8_t  rgSCHCmnGetPValFrmCCE
 (
 RgSchCellCb *cell,
-U8          cce
+uint8_t          cce
 )
 #else
-PUBLIC U8  rgSCHCmnGetPValFrmCCE(cell, cce)
+uint8_t  rgSCHCmnGetPValFrmCCE(cell, cce)
 RgSchCellCb *cell;
-U8          cce;
+uint8_t          cce;
 #endif
 {
-   U8 i;
-   TRC2(rgSCHCmnGetPValFrmCCE);
+   uint8_t i;
 
    for(i=1; i < RGSCH_TDD_MAX_P_PLUS_ONE_VAL; i++)
    {
       if(cce < cell->rgSchTddNpValTbl[i])
       {
-         RETVALUE(i-1);
+         return (i-1);
       }
    }
-   RETVALUE(0);
+   return (0);
 }
 #endif
 
@@ -20173,7 +19957,6 @@ RgSchUlAlloc    *alloc;
 RgSchUlHqProcCb *proc;
 #endif
 {
-   TRC2(rgSCHCmnUlAdapRetx);
 
    rgSCHUhmRetx(proc, alloc);
 #ifndef RG_5GTF
@@ -20186,7 +19969,7 @@ RgSchUlHqProcCb *proc;
    {
       alloc->grnt.iMcsCrnt = alloc->grnt.iMcs;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -20214,7 +19997,6 @@ RgSchCellCb  *cell;
 {
    RgSchCmnCell  *cellSch  = RG_SCH_CMN_GET_CELL(cell);
    CmLListCp     ulInactvLst;
-   TRC2(rgSCHCmnHdlUlInactUes);
    /* Get a List of Inactv UEs for UL*/
    cmLListInit(&ulInactvLst);
 
@@ -20223,7 +20005,7 @@ RgSchCellCb  *cell;
    /* take care of this in UL retransmission */
    cellSch->apisUl->rgSCHUlInactvtUes(cell, &ulInactvLst);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -20251,7 +20033,6 @@ RgSchCellCb  *cell;
 {
    RgSchCmnCell *cellSch  = RG_SCH_CMN_GET_CELL(cell);
    CmLListCp    dlInactvLst;
-   TRC2(rgSCHCmnHdlDlInactUes);
    /* Get a List of Inactv UEs for DL */
    cmLListInit(&dlInactvLst);
 
@@ -20259,7 +20040,7 @@ RgSchCellCb  *cell;
    rgSCHMeasGapANRepGetDlInactvUe (cell, &dlInactvLst);
 
    cellSch->apisDl->rgSCHDlInactvtUes(cell, &dlInactvLst);
-   RETVOID;
+   return;
 }
 
 /* RACHO: Rach handover functions start here */
@@ -20290,17 +20071,16 @@ RgSchUeCb       *ue;
 #endif
 {
    /* Time difference in subframes */
-   U32 sfDiff = RGSCH_CALC_SF_DIFF(cell->crntTime, ue->ul.ulTransTime);
+   uint32_t sfDiff = RGSCH_CALC_SF_DIFF(cell->crntTime, ue->ul.ulTransTime);
 
-   TRC2(rgSCHCmnUeIdleExdThrsld);
 
-   if (sfDiff > (U32)RG_SCH_CMN_UE_IDLE_THRSLD(ue))
+   if (sfDiff > (uint32_t)RG_SCH_CMN_UE_IDLE_THRSLD(ue))
    {
-      RETVALUE(ROK);
+      return ROK;
    }
    else
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 }
 
@@ -20330,14 +20110,13 @@ RgSchCellCb   *cell;
 #endif
 {
    RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   U32          gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
-   U32          sfDiff;
-   U8           cnt;
-   TRC2(rgSCHCmnCfgRachDedPrm);
+   uint32_t          gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
+   uint32_t          sfDiff;
+   uint8_t           cnt;
 
    if (cell->macPreambleSet.pres == NOTPRSNT)
    {
-      RETVOID;
+      return;
    }
    cellSch->rachCfg.numDedPrm = cell->macPreambleSet.size;
    cellSch->rachCfg.dedPrmStart = cell->macPreambleSet.start;
@@ -20383,7 +20162,7 @@ RgSchCellCb   *cell;
    {
       while (cellSch->rachCfg.prachMskIndx < cell->rachCfg.raOccasion.size)
       {
-         if (cell->crntTime.subframe <\
+         if (cell->crntTime.slot <\
                cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx])
          {
             break;
@@ -20404,12 +20183,12 @@ RgSchCellCb   *cell;
          }
          cellSch->rachCfg.prachMskIndx = 0;
       }
-      cellSch->rachCfg.applFrm.subframe = \
+      cellSch->rachCfg.applFrm.slot = \
                                           cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx];
    }
    else
    {
-      cellSch->rachCfg.applFrm.subframe = \
+      cellSch->rachCfg.applFrm.slot = \
                                           cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx];
    }
 
@@ -20421,7 +20200,7 @@ RgSchCellCb   *cell;
       sfDiff = RGSCH_CALC_SF_DIFF(cellSch->rachCfg.applFrm, cell->crntTime);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -20452,7 +20231,6 @@ RgSchCellCb  *cell;
 #endif
 {
    RgSchCmnCell    *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   TRC2(rgSCHCmnUpdNxtPrchMskIdx);
 
    /* Determine the next prach mask Index */
    if (cellSch->rachCfg.prachMskIndx == cell->rachCfg.raOccasion.size - 1)
@@ -20469,7 +20247,7 @@ RgSchCellCb  *cell;
          cellSch->rachCfg.applFrm.sfn = (cellSch->rachCfg.applFrm.sfn+2) % \
                                         RGSCH_MAX_SFN;
       }
-      cellSch->rachCfg.applFrm.subframe = cell->rachCfg.raOccasion.\
+      cellSch->rachCfg.applFrm.slot = cell->rachCfg.raOccasion.\
                                           subFrameNum[0];
    }
    else /* applFrm.sfn is still valid */
@@ -20477,11 +20255,11 @@ RgSchCellCb  *cell;
       cellSch->rachCfg.prachMskIndx += 1;
       if ( cellSch->rachCfg.prachMskIndx < RGR_MAX_SUBFRAME_NUM )
       {
-         cellSch->rachCfg.applFrm.subframe = \
+         cellSch->rachCfg.applFrm.slot = \
                                           cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx];
       }
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -20516,26 +20294,25 @@ RgSchCellCb  *cell;
 {
 
    RgSchCmnCell    *cellSch = (RgSchCmnCell *)(cell->sc.sch);
-   U32             gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
-   U32             sfDiff;
-   TRC2(rgSCHCmnUpdRachParam);
+   uint32_t             gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP;
+   uint32_t             sfDiff;
 
    if (cell->macPreambleSet.pres == NOTPRSNT)
    {
-      RETVOID;
+      return;
    }
    sfDiff = RGSCH_CALC_SF_DIFF(cellSch->rachCfg.applFrm, \
          cell->crntTime);
    if (sfDiff > gap)
    {
       /* applFrm is still a valid next Prach Oppurtunity */
-      RETVOID;
+      return;
    }
    rgSCHCmnUpdNxtPrchMskIdx(cell);
    /* Reset remDedPrm as numDedPrm */
    cellSch->rachCfg.remDedPrm = cellSch->rachCfg.numDedPrm;
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -20553,8 +20330,8 @@ RgSchCellCb  *cell;
  *  @param[in]   RgSchDlSf   *dlSf
  *  @param[in]   RgSchUeCb   *ue
  *  @param[out]  RgSchPdcch  **pdcch
- *  @param[out]  U8          *rapId
- *  @param[out]  U8          *prachMskIdx
+ *  @param[out]  uint8_t          *rapId
+ *  @param[out]  uint8_t          *prachMskIdx
  *  @return  Void
  **/
 #ifdef ANSI
@@ -20564,8 +20341,8 @@ RgSchCellCb  *cell,
 RgSchDlSf    *dlSf,
 RgSchUeCb    *ue,
 RgSchPdcch   **pdcch,
-U8           *rapId,
-U8           *prachMskIdx
+uint8_t           *rapId,
+uint8_t           *prachMskIdx
 )
 #else
 PRIVATE S16 rgSCHCmnAllocPOParam(cell, dlSf, ue, pdcch, rapId, prachMskIdx)
@@ -20573,26 +20350,25 @@ RgSchCellCb  *cell;
 RgSchDlSf    *dlSf;
 RgSchUeCb    *ue;
 RgSchPdcch   **pdcch;
-U8           *rapId;
-U8           *prachMskIdx;
+uint8_t           *rapId;
+uint8_t           *prachMskIdx;
 #endif
 {
 
    RgSchCmnCell    *cellSch = (RgSchCmnCell *)(cell->sc.sch);
    RgSchCmnDlUe    *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
-   TRC2(rgSCHCmnAllocPOParam);
 
    if (cell->macPreambleSet.pres == PRSNT_NODEF)
    {
       if (cellSch->rachCfg.remDedPrm == 0)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       /* DTX Changes: One Variable is passed to check whether it is DTX or Not */
       if ((*pdcch = rgSCHCmnPdcchAlloc(cell, ue, dlSf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_1A, FALSE)) == NULLP)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       /* The stored prachMskIdx is the index of PRACH Oppurtunities in
        * raOccasions.subframes[].
@@ -20615,13 +20391,13 @@ U8           *prachMskIdx;
       /* DTX Changes: One Variable is passed to check whether it is DTX or Not */
       if ((*pdcch = rgSCHCmnPdcchAlloc(cell, ue, dlSf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_1A, FALSE)) == NULLP)
       {
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       *prachMskIdx = 0;
       *rapId       = 0;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -20655,11 +20431,10 @@ RgSchDlSf    *dlSf;
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
    CmLList           *node = cellSch->rachCfg.pdcchOdrLst.first;
    RgSchUeCb         *ue;
-   U8                rapId;
-   U8                prachMskIdx;
+   uint8_t                rapId;
+   uint8_t                prachMskIdx;
    RgSchPdcch        *pdcch = NULLP;
 
-   TRC2(rgSCHCmnGenPdcchOrder);
 
    while (node)
    {
@@ -20698,7 +20473,7 @@ RgSchDlSf    *dlSf;
       /* Reset UE's power state */
       rgSCHPwrUeReset(cell, ue);
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -20732,14 +20507,13 @@ RgSchUeCb                  *ue;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
-   TRC2(rgSCHCmnDlAdd2PdcchOdrQ);
 
    if (ueDl->rachInfo.poLnk.node == NULLP)
    {
       cmLListAdd2Tail(&cellSch->rachCfg.pdcchOdrLst, &ueDl->rachInfo.poLnk);
       ueDl->rachInfo.poLnk.node = (PTR)ue;
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -20773,11 +20547,10 @@ RgSchUeCb                  *ue;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
-   TRC2(rgSCHCmnDlRmvFrmPdcchOdrQ);
 
    cmLListDelFrm(&cellSch->rachCfg.pdcchOdrLst, &ueDl->rachInfo.poLnk);
    ueDl->rachInfo.poLnk.node = NULLP;
-   RETVOID;
+   return;
 }
 
 /**
@@ -20792,8 +20565,8 @@ RgSchUeCb                  *ue;
  *
  *  @param[in]  RgSchUeCb   *ue
  *  @param[in]  RgSchPdcch  *pdcch
- *  @param[in]  U8          rapId
- *  @param[in]  U8          prachMskIdx
+ *  @param[in]  uint8_t          rapId
+ *  @param[in]  uint8_t          prachMskIdx
  *  @return  Void
  **/
 #ifdef ANSI
@@ -20802,21 +20575,20 @@ PRIVATE Void rgSCHCmnFillPdcchOdr2Sf
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
 RgSchPdcch  *pdcch,
-U8          rapId,
-U8          prachMskIdx
+uint8_t          rapId,
+uint8_t          prachMskIdx
 )
 #else
 PRIVATE Void rgSCHCmnFillPdcchOdr2Sf(ue, pdcch, rapId, prachMskIdx)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 RgSchPdcch  *pdcch;
-U8          rapId;
-U8          prachMskIdx;
+uint8_t          rapId;
+uint8_t          prachMskIdx;
 #endif
 {
    RgSchUeACqiCb  *acqiCb = RG_SCH_CMN_GET_ACQICB(ue,cell); 
 
-   TRC2(rgSCHCmnFillPdcchOdr2Sf);
 
    pdcch->rnti                                         = ue->ueId;
    pdcch->dci.dciFormat                                = TFU_DCI_FORMAT_1A;
@@ -20834,7 +20606,7 @@ U8          prachMskIdx;
    }
 #endif   
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -20866,9 +20638,8 @@ RgSchUeCb    *ue;
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   U8            rapIdIdx;
+   uint8_t            rapIdIdx;
 
-   TRC2(rgSCHCmnDelRachInfo);
 
    if (ueDl->rachInfo.poLnk.node)
    {
@@ -20886,7 +20657,7 @@ RgSchUeCb    *ue;
           &ueDl->rachInfo.rapIdLnk);
       ueDl->rachInfo.rapIdLnk.node = NULLP;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -20925,14 +20696,13 @@ RgSchRaReqInfo        *raReq;
 #endif
 {
    RgSchUeCb             *ue = raReq->ue;
-   TRC2(rgSCHCmnHdlHoPo);
 
    if ( ue->isDrxEnabled )
    {
       rgSCHDrxDedRa(cell,ue);
    }
    rgSCHCmnAllocPoHoGrnt(cell, raRspLst, ue, raReq);
-   RETVOID;
+   return;
 }
 
 /**
@@ -20954,15 +20724,15 @@ RgSchRaReqInfo        *raReq;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchUeCb* rgSCHCmnGetHoUe
+RgSchUeCb* rgSCHCmnGetHoUe
 (
 RgSchCellCb           *cell,
-U16                   rapId
+uint16_t                   rapId
 )
 #else
-PUBLIC RgSchUeCb* rgSCHCmnGetHoUe(cell, rapId)
+RgSchUeCb* rgSCHCmnGetHoUe(cell, rapId)
 RgSchCellCb           *cell;
-U16                   rapId
+uint16_t                   rapId
 #endif
 {
    RgSchCmnCell          *cellSch = (RgSchCmnCell *)(cell->sc.sch);
@@ -20970,7 +20740,6 @@ U16                   rapId
    CmLListCp             *ueLst;
    RgSchUeCb             *ue;
    RgSchCmnDlUe          *ueDl;
-   TRC2(rgSCHCmnGetHoUe);
 
    ueLst = &cellSch->rachCfg.hoUeLst;
    node = ueLst->first;
@@ -20981,22 +20750,22 @@ U16                   rapId
       ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
       if (ueDl->rachInfo.hoRapId == rapId)
       {
-         RETVALUE(ue);
+         return (ue);
       }
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }
 
 #ifdef ANSI
 PRIVATE Void rgSCHCmnDelDedPreamble
 (
 RgSchCellCb           *cell,
-U8                    preambleId
+uint8_t                    preambleId
 )
 #else
 PRIVATE rgSCHCmnDelDedPreamble(cell, preambleId)
 RgSchCellCb           *cell;
-U8                    preambleId;
+uint8_t                    preambleId;
 #endif
 {
    RgSchCmnCell          *cellSch = (RgSchCmnCell *)(cell->sc.sch);
@@ -21004,7 +20773,6 @@ U8                    preambleId;
    CmLListCp             *ueLst;
    RgSchUeCb             *ue;
    RgSchCmnDlUe          *ueDl;
-   TRC2(rgSCHCmnDelDedPreamble);
 
    ueLst = &cellSch->rachCfg.hoUeLst;
    node = ueLst->first;
@@ -21040,16 +20808,16 @@ U8                    preambleId;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchUeCb* rgSCHCmnGetPoUe
+RgSchUeCb* rgSCHCmnGetPoUe
 (
 RgSchCellCb           *cell,
-U16                   rapId,
+uint16_t              rapId,
 CmLteTimingInfo       timingInfo
 )
 #else
-PUBLIC RgSchUeCb* rgSCHCmnGetPoUe(cell, rapId, timingInfo)
+RgSchUeCb* rgSCHCmnGetPoUe(cell, rapId, timingInfo)
 RgSchCellCb           *cell;
-U16                   rapId;
+uint16_t              rapId;
 CmLteTimingInfo       timingInfo;
 #endif
 {
@@ -21058,8 +20826,7 @@ CmLteTimingInfo       timingInfo;
    CmLListCp             *ueLst;
    RgSchUeCb             *ue;
    RgSchCmnDlUe          *ueDl;
-   U8                    rapIdIdx;
-   TRC2(rgSCHCmnGetPoUe);
+   uint8_t                rapIdIdx;
 
    rapIdIdx = rapId -cellSch->rachCfg.dedPrmStart;
    ueLst = &cellSch->rachCfg.rapIdMap[rapIdIdx].assgndUes;
@@ -21075,11 +20842,11 @@ CmLteTimingInfo       timingInfo;
       ueDl->rachInfo.rapIdLnk.node = (PTR)NULLP;
       if (RGSCH_TIMEINFO_SAME(ueDl->rachInfo.asgnOppr, timingInfo))
       {
-         RETVALUE(ue);
+         return (ue);
       }
    }
 
-   RETVALUE(NULLP);
+   return (NULLP);
 }
 
 
@@ -21095,27 +20862,26 @@ CmLteTimingInfo       timingInfo;
  *     Invoked by: Scheduler
  *     
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8               ueCtgy
- *  @return     U8 
+ *  @param[in]  uint8_t               ueCtgy
+ *  @return     uint8_t 
  **/
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnUlGetCqi
+uint8_t rgSCHCmnUlGetCqi
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
 CmLteUeCategory  ueCtgy
 )
 #else
-PUBLIC U8 rgSCHCmnUlGetCqi(cell, ue, ueCtgy)
+uint8_t rgSCHCmnUlGetCqi(cell, ue, ueCtgy)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 CmLteUeCategory  ueCtgy;
 #endif
 {
    RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
-   U8            cqi;
+   uint8_t            cqi;
 
-   TRC2(rgSCHCmnUlGetCqi);
    
    cqi = ueUl->maxUlCqi;
 #ifdef TFU_UPGRADE
@@ -21131,7 +20897,7 @@ CmLteUeCategory  ueCtgy;
       cqi = ueUl->crntUlCqi[0];
    }
 #endif    
-   RETVALUE(cqi);
+   return (cqi);
 }/* End of rgSCHCmnUlGetCqi */
 
 /***********************************************************
@@ -21156,48 +20922,47 @@ PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe
 RgSchCellCb           *cell,
 RgSchUlSf             *sf,
 RgSchUeCb             *ue,
-U8                    maxRb
+uint8_t                    maxRb
 )
 #else
 PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe(cell, sf, ue, maxRb)
 RgSchCellCb           *cell;
 RgSchUlSf             *sf;
 RgSchUeCb             *ue;
-U8                    maxRb;
+uint8_t                    maxRb;
 #endif
 {
    RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUlUe *ueUl    = RG_SCH_CMN_GET_UL_UE(ue,cell);
-   U8           sbSize  = cellUl->sbSize;
-   U32          maxBits = ue->ul.maxBytesPerUePerTti*8;
-   U32          bits;
+   uint8_t           sbSize  = cellUl->sbSize;
+   uint32_t          maxBits = ue->ul.maxBytesPerUePerTti*8;
+   uint32_t          bits;
    RgSchUlAlloc *alloc;
-   U32          nPrb;
-   U8           iTbs;
-   U32          eff;
-   U32          numSb;
-   U8           iMcs;
-   U8           iMcsCrnt;
-   U8           cqi;
-   U8           modOdr;
+   uint32_t          nPrb;
+   uint8_t           iTbs;
+   uint32_t          eff;
+   uint32_t          numSb;
+   uint8_t           iMcs;
+   uint8_t           iMcsCrnt;
+   uint8_t           cqi;
+   uint8_t           modOdr;
    RgSchUlHole      *hole;
    RgSchUlHqProcCb  *proc = &ueUl->hqEnt.hqProcCb[cellUl->msg3SchdHqProcIdx];
    CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue));
 
-   TRC2(rgSCHCmnUlRbAllocForPoHoUe);
    if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*MS_WORKAROUND for HO ccpu00121116*/
    cqi   = rgSCHCmnUlGetCqi(cell, ue, ueCtg);
-   RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, rgSchCmnUlCqiToTbsTbl[(U8)cell->isCpUlExtend], cqi);
-   iTbs  = rgSchCmnUlCqiToTbsTbl[(U8)cell->isCpUlExtend][cqi];
+   RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, rgSchCmnUlCqiToTbsTbl[(uint8_t)cell->isCpUlExtend], cqi);
+   iTbs  = rgSchCmnUlCqiToTbsTbl[(uint8_t)cell->isCpUlExtend][cqi];
    iMcs  = rgSCHCmnUlGetIMcsFrmITbs(iTbs,ueCtg);
    while(iMcs > RG_SCH_CMN_MAX_MSG3_IMCS)
    {
        cqi--;
-       iTbs  = rgSchCmnUlCqiToTbsTbl[(U8)cell->isCpUlExtend][cqi];
+       iTbs  = rgSchCmnUlCqiToTbsTbl[(uint8_t)cell->isCpUlExtend][cqi];
        iMcs  = rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg);
    }
    /* Filling the modorder in the grant structure*/
@@ -21216,7 +20981,7 @@ U8                    maxRb;
 #if (ERRCLASS & ERRCLS_DEBUG)
    if (!bits)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -21251,13 +21016,13 @@ U8                    maxRb;
    }
    iMcsCrnt = iMcs;
 
-   alloc = rgSCHCmnUlSbAlloc(sf, (U8)RGSCH_MIN(numSb, cellUl->maxSbPerUe),\
+   alloc = rgSCHCmnUlSbAlloc(sf, (uint8_t)RGSCH_MIN(numSb, cellUl->maxSbPerUe),\
                              hole);
    if (alloc == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
          "rgSCHCmnUlRbAllocForPoHoUe(): Could not get UlAlloc");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc);
    
@@ -21285,7 +21050,7 @@ U8                    maxRb;
    RG_SCH_UL_MCS_TO_MODODR(alloc->grnt.iMcsCrnt,alloc->grnt.modOdr);
    rgSCHUhmNewTx(proc, ueUl->hqEnt.maxHqRetx, alloc);
    /* No grant attr recorded now */
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -21329,19 +21094,18 @@ RgSchRaReqInfo        *raReq;
    RgSchUlGrnt     *grnt;
    RgSchUlSf       *sf = &cellUl->ulSfArr[cellUl->msg3SchdIdx];
 
-   TRC2(rgSCHCmnAllocPoHoGrnt);
 
    /* Clearing previous allocs if any*/
    rgSCHCmnUlUeDelAllocs(cell, ue);
    /* Fix : syed allocs are limited */
    if (*sf->allocCountRef >= cellUl->maxAllocPerUlSf)
    {
-      RETVOID;
+      return;
    }
    ueUl->alloc.reqBytes = RG_SCH_MIN_GRNT_HOPO;
    if (rgSCHCmnUlRbAllocForPoHoUe(cell, sf, ue, RGSCH_MAX_UL_RB) != ROK)
    {
-      RETVOID;
+      return;
    }
 
    /* Fill grant information */
@@ -21352,7 +21116,7 @@ RgSchRaReqInfo        *raReq;
    {
       RLOG_ARG1(L_ERROR,DBG_INSTID,cell->instIdx,  "Failed to get"
         "the grant for HO/PDCCH Order. CRNTI:%d",ue->ueId);
-      RETVOID;
+      return;
    }
    ue->ul.rarGrnt.rapId = raReq->raReq.rapId;
    ue->ul.rarGrnt.hop = grnt->hop;
@@ -21366,7 +21130,7 @@ RgSchRaReqInfo        *raReq;
    if((sf->numACqiCount < RG_SCH_MAX_ACQI_PER_ULSF) && (RG_SCH_APCQI_NO != ue->dl.reqForCqi)) 
    {
 #ifdef LTE_ADV
-      U8    idx = 0; 
+      uint8_t    idx = 0; 
       /* Send two bits cqireq field if more than one cells are configured else one*/
       for (idx = 1;idx < CM_LTE_MAX_CELLS;idx++)
       {
@@ -21392,7 +21156,7 @@ RgSchRaReqInfo        *raReq;
    cmLListAdd2Tail(raRspLst, &ue->ul.rarGrnt.raRspLnk);
    ue->ul.rarGrnt.raRspLnk.node = (PTR)ue;
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -21406,25 +21170,25 @@ RgSchRaReqInfo        *raReq;
  *
  * @param[in]  RgSchCmnUlCell  *cellUl 
  * @param[out] RgSchUlAlloc    *alloc
- * @param[in]  U8              idx 
+ * @param[in]  uint8_t              idx 
  * @return  Void
  *
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlNonadapRetx
 (
 RgSchCmnUlCell  *cellUl,
 RgSchUlAlloc    *alloc,
-U8              idx
+uint8_t              idx
 )
 #else
 PRIVATE Void rgSCHCmnUlNonadapRetx(cellUl, alloc, idx)
 RgSchCmnUlCell  *cellUl;
 RgSchUlAlloc    *alloc;
-U8              idx;
+uint8_t              idx;
 #endif
 {
-   TRC2(rgSCHCmnUlNonadapRetx);
    rgSCHUhmRetx(alloc->hqProc, alloc);
 
    /* Update alloc to retx */
@@ -21441,9 +21205,8 @@ U8              idx;
    }
    alloc->grnt.isRtx = TRUE;
    alloc->pdcch = NULLP;
-   RETVOID;
+   return;
 }
-
 /**
  * @brief Check if 2 allocs overlap
  *
@@ -21470,18 +21233,16 @@ RgSchUlAlloc    *alloc2;
 #endif
 {
 
-   TRC2(rgSCHCmnUlAllocsOvrLap);
 
    if (((alloc1->sbStart >= alloc2->sbStart) &&
          (alloc1->sbStart <= alloc2->sbStart + alloc2->numSb-1)) ||
         ((alloc2->sbStart >= alloc1->sbStart) &&
          (alloc2->sbStart <= alloc1->sbStart + alloc1->numSb-1)))
    {
-      RETVALUE(TRUE);
+      return (TRUE);
    }
-   RETVALUE(FALSE);
+   return (FALSE);
 }
-
 /**
  * @brief Copy allocation Info from src to dst.
  *
@@ -21510,7 +21271,6 @@ RgSchUlAlloc    *dstAlloc;
 #endif
 {
    RgSchCmnUlUe *ueUl;
-   TRC2(rgSCHCmnUlCpyAllocInfo);
 
    dstAlloc->grnt = srcAlloc->grnt;
    dstAlloc->hqProc = srcAlloc->hqProc;
@@ -21549,10 +21309,8 @@ RgSchUlAlloc    *dstAlloc;
 #endif
    }
 
-   RETVOID;
+   return;
 }
-
-
 /**
  * @brief Update TX and RETX subframe's allocation
  *        markings.
@@ -21593,8 +21351,7 @@ RgSchUlAlloc    *srcAlloc;
 
    /* MS_WORKAROUND ccpu00120827 */
    RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch);
-   U8 remAllocs;
-   TRC2(rgSCHCmnUlInsAllocFrmNewSf2OldSf);
+   uint8_t remAllocs;
 
    if ((alloc = rgSCHUtlUlAllocFirst(oldSf)) != NULLP)
    {
@@ -21657,7 +21414,7 @@ RgSchUlAlloc    *srcAlloc;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"CRNTI:%d "
          "rgSCHUtlUlGetSpfcAlloc failed in rgSCHCmnUlInsAllocFrmNewSf2OldSf",
          srcAlloc->rnti);
-      RETVOID;
+      return;
    }
 #endif
    /* Copy the srcAlloc's state information in to dstAlloc */
@@ -21665,9 +21422,8 @@ RgSchUlAlloc    *srcAlloc;
    /* Set new Tx merged Alloc Flag to TRUE, indicating that this
     * alloc shall not be processed for non-adaptive retransmission */
    dstAlloc->mrgdNewTxAlloc = TRUE;
-   RETVOID;
+   return;
 }
-
 /**
  * @brief Merge all allocations of newSf to oldSf.
  *
@@ -21701,7 +21457,6 @@ RgSchUlSf    *newSf;
 #endif
 {
    RgSchUlAlloc    *alloc, *nxtAlloc;
-   TRC2(rgSCHCmnUlMergeSfAllocs);
    UNUSED(cell);
 
    /* Merge each alloc of newSf in to oldSf
@@ -21715,9 +21470,8 @@ RgSchUlSf    *newSf;
          rgSCHUtlUlAllocRls(newSf, alloc);
       } while((alloc = nxtAlloc) != NULLP);
    }
-   RETVOID;
+   return;
 }
-
 /**
  * @brief Swap Hole/Alloc DB context of newSf and oldSf.
  *
@@ -21748,9 +21502,8 @@ RgSchUlSf    *newSf;
 {
    RgSchUlAllocDb *tempAllocDb  = newSf->allocDb;
    RgSchUlHoleDb  *tempHoleDb   = newSf->holeDb;
-   U8              tempAvailSbs = newSf->availSubbands;
+   uint8_t              tempAvailSbs = newSf->availSubbands;
 
-   TRC2(rgSCHCmnUlSwapSfAllocs);
    UNUSED(cell);
 
    newSf->allocDb       = oldSf->allocDb;
@@ -21764,9 +21517,8 @@ RgSchUlSf    *newSf;
    /* Fix ccpu00120610*/
    newSf->allocCountRef = &newSf->allocDb->count;
    oldSf->allocCountRef = &oldSf->allocDb->count;
-   RETVOID;
+   return;
 }
-
 /**
  * @brief Perform non-adaptive RETX for non-colliding allocs.
  *
@@ -21778,7 +21530,7 @@ RgSchUlSf    *newSf;
  *
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUlSf    *newSf
- *  @param[in]  U8           idx
+ *  @param[in]  uint8_t           idx
  *  @return  Void
  **/
 #ifdef ANSI
@@ -21786,18 +21538,17 @@ PRIVATE Void rgSCHCmnUlPrcNonAdptRetx
 (
 RgSchCellCb  *cell,
 RgSchUlSf    *newSf,
-U8           idx
+uint8_t           idx
 )
 #else
 PRIVATE Void rgSCHCmnUlPrcNonAdptRetx(cell, newSf, idx)
 RgSchCellCb  *cell;
 RgSchUlSf    *newSf;
-U8           idx;
+uint8_t           idx;
 #endif
 {
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchUlAlloc    *alloc, *nxtAlloc;
-   TRC2(rgSCHCmnUlPrcNonAdptRetx);
 
    /* perform non-adaptive retx allocation(adjustment) */
    if ((alloc = rgSCHUtlUlAllocFirst(newSf)) != NULLP)
@@ -21817,7 +21568,7 @@ U8           idx;
 
       } while((alloc = nxtAlloc) != NULLP);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -21839,7 +21590,7 @@ U8           idx;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchUlSf    *oldSf
  *  @param[in]  RgSchUlSf    *newSf
- *  @param[in]  U8           idx 
+ *  @param[in]  uint8_t           idx 
  *  @return  Void
  **/
 #ifdef ANSI
@@ -21848,17 +21599,16 @@ PRIVATE Void rgSCHCmnUlPrfmSfMerge
 RgSchCellCb  *cell,
 RgSchUlSf    *oldSf,
 RgSchUlSf    *newSf,
-U8           idx
+uint8_t           idx
 )
 #else
 PRIVATE Void rgSCHCmnUlPrfmSfMerge(cell, oldSf, newSf, idx)
 RgSchCellCb  *cell;
 RgSchUlSf    *oldSf;
 RgSchUlSf    *newSf;
-U8           idx;
+uint8_t           idx;
 #endif
 {
-   TRC2(rgSCHCmnUlPrfmSfMerge);
    /* Preassigned resources for msg3 in newSf.
     * Hence do adaptive retx for all NACKED TXs */
    rgSCHCmnUlMergeSfAllocs(cell, oldSf, newSf);
@@ -21868,9 +21618,9 @@ U8           idx;
    /* Perform non-adaptive RETX for non-colliding allocs */
    rgSCHCmnUlPrcNonAdptRetx(cell, newSf, idx);
    
-   RETVOID;
+   return;
 }
-
+#endif
 /**
  * @brief Update TX and RETX subframe's allocation
  *        markings.
@@ -21901,17 +21651,16 @@ RgSchUlSf      *sf;
 #endif
 {
    RgSchUlAlloc    *alloc, *nxtAlloc;
-   TRC2(rgSCHCmnUlRmvCmpltdAllocs);
 
    if ((alloc = rgSCHUtlUlAllocFirst(sf)) == NULLP)
    {
-      RETVOID;
+      return;
    }
    do
    {
       nxtAlloc = rgSCHUtlUlAllocNxt(sf, alloc);
 #ifdef UL_ADPT_DBG      
-      printf("rgSCHCmnUlRmvCmpltdAllocs:time(%d %d) alloc->hqProc->remTx %d hqProcId(%d) \n",cell->crntTime.sfn,cell->crntTime.subframe,alloc->hqProc->remTx, alloc->grnt.hqProcId);
+      printf("rgSCHCmnUlRmvCmpltdAllocs:time(%d %d) alloc->hqProc->remTx %d hqProcId(%d) \n",cell->crntTime.sfn,cell->crntTime.slot,alloc->hqProc->remTx, alloc->grnt.hqProcId);
 #endif
       alloc->hqProc->rcvdCrcInd = TRUE;
       if ((alloc->hqProc->rcvdCrcInd) || (alloc->hqProc->remTx == 0))
@@ -21933,8 +21682,8 @@ RgSchUlSf      *sf;
        RgSchUeCb       *ueCb  = alloc->ue;
        RgSchCmnUe      *cmnUe = (RgSchCmnUe*)ueCb->sch;
        RgSchCmnUlUe    *ulUe  = &(cmnUe->ul);
-       U8              cqi    = ulUe->crntUlCqi[0];  
-       U16             numUlRetx = ueCb->ul.hqEnt.maxHqRetx - alloc->hqProc->remTx;
+       uint8_t              cqi    = ulUe->crntUlCqi[0];  
+       uint16_t             numUlRetx = ueCb->ul.hqEnt.maxHqRetx - alloc->hqProc->remTx;
 
        hqRetxStats.ulCqiStat[(cqi - 1)].mcs = alloc->grnt.iMcs;
 
@@ -21973,7 +21722,7 @@ RgSchUlSf      *sf;
       }
    } while ((alloc = nxtAlloc) != NULLP);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -21990,22 +21739,21 @@ RgSchUlSf      *sf;
  *         - Perform retransmission
  *
  *  @param[in]  RgSchUlSf *sf
- *  @param[in]  U8        idx 
+ *  @param[in]  uint8_t        idx 
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnRlsUlSf
+Void rgSCHCmnRlsUlSf
 (
 RgSchCellCb    *cell,
-U8              idx
+uint8_t              idx
 )
 #else
-PUBLIC Void rgSCHCmnRlsUlSf(cell, idx)
+Void rgSCHCmnRlsUlSf(cell, idx)
 RgSchCellCb    *cell;
-U8              idx;
+uint8_t              idx;
 #endif
 {
-   TRC2(rgSCHCmnRlsUlSf);
 
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    
@@ -22016,14 +21764,14 @@ U8              idx;
       /* Initialize the reTxLst of UL HqProcs for RETX subframe */
       if (rgSCHUtlUlAllocFirst(oldSf) == NULLP)
       {
-         RETVOID;
+         return;
       }
       /* Release all completed TX allocs from sf */
       rgSCHCmnUlRmvCmpltdAllocs(cell, oldSf);
 
       oldSf->numACqiCount = 0;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -22053,7 +21801,6 @@ RgSchUlAlloc   *alloc;
 {
    RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell);
 
-   TRC2(rgSCHCmnUlUpdAllocRetx);
 
    alloc->hqProc->reTxAlloc.rnti    =  alloc->rnti;
    alloc->hqProc->reTxAlloc.numSb   =  alloc->numSb;
@@ -22083,7 +21830,7 @@ RgSchUlAlloc   *alloc;
 #endif
    cmLListAdd2Tail(&cmnUlCell->reTxLst, &alloc->hqProc->reTxLnk);
    alloc->hqProc->reTxLnk.node = (PTR)alloc->hqProc;
-   RETVOID;
+   return;
 }
 
 /**
@@ -22101,7 +21848,7 @@ RgSchUlAlloc   *alloc;
  *  @param[in]  RgSchUlSf         *sf
  *  @param[in]  RgSchUlHqProcCb   *proc;
  *  @param[in]  RgSchUlHole       *hole;
- *  @return  U8
+ *  @return  uint8_t
  **/
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnUlAdapRetxAlloc
@@ -22119,14 +21866,13 @@ RgSchUlHqProcCb   *proc;
 RgSchUlHole       *hole;
 #endif
 {
-   U8              numSb = proc->reTxAlloc.numSb;
-   U8              iMcs  = proc->reTxAlloc.iMcs;
+   uint8_t              numSb = proc->reTxAlloc.numSb;
+   uint8_t              iMcs  = proc->reTxAlloc.iMcs;
    CmLteTimingInfo frm = cell->crntTime;
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchDlSf       *dlSf;
    RgSchPdcch      *pdcch;
    RgSchUlAlloc    *alloc;
-   TRC2(rgSCHCmnUlAdapRetxAlloc);
 
    /* Fetch PDCCH for msg3 */
    /* ccpu00116293 - Correcting relation between UL subframe and DL subframe based on RG_UL_DELTA*/
@@ -22136,7 +21882,7 @@ RgSchUlHole       *hole;
    pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf);
    if (pdcch == NULLP)
    {
-      RETVALUE(FALSE);
+      return (FALSE);
    }
 
    /* Fetch UL Alloc for msg3 */
@@ -22151,7 +21897,7 @@ RgSchUlHole       *hole;
             RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
                   "UL Alloc fail for msg3 retx for rnti: %d\n", 
                   proc->reTxAlloc.rnti);
-            RETVALUE(FALSE);
+            return (FALSE);
          }
 
       rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc);
@@ -22254,9 +22000,9 @@ RgSchUlHole       *hole;
       RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,
                "Num SB not suffiecient for adap retx for rnti: %d", 
                proc->reTxAlloc.rnti);
-      RETVALUE(FALSE);
+      return (FALSE);
    }
-   RETVALUE(TRUE);
+   return (TRUE);
 }
 
 /* Fix: syed Adaptive Msg3 Retx crash. */
@@ -22271,8 +22017,9 @@ RgSchUlHole       *hole;
  *
  *  @param[in]  RgSchCellCb *cell
  *  @param[in]  RgSchUlSf   *sf
- *  @return  U8
+ *  @return  uint8_t
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlSfRlsRetxProcs
 (
@@ -22290,7 +22037,6 @@ RgSchUlSf   *sf;
    RgSchUlHqProcCb   *proc;
    RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
 
-   TRC2(rgSCHCmnUlSfRlsRetxProcs);
 
    cp = &(cellUl->reTxLst);
    node = cp->first;
@@ -22302,9 +22048,9 @@ RgSchUlSf   *sf;
       cmLListDelFrm(&cellUl->reTxLst, &proc->reTxLnk);
       proc->reTxLnk.node = (PTR)NULLP;
    }
-   RETVOID;
+   return;
 }
-   
+#endif   
 
 /**
  * @brief Attempts allocation for UEs for which retransmissions
@@ -22319,7 +22065,7 @@ RgSchUlSf   *sf;
  *
  *  @param[in]  RgSchCellCb *cell
  *  @param[in]  RgSchUlSf   *sf
- *  @return  U8
+ *  @return  uint8_t
  **/
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlSfReTxAllocs
@@ -22340,7 +22086,6 @@ RgSchUlSf   *sf;
    RgSchUeCb         *ue;
    RgSchCmnCell      *schCmnCell = (RgSchCmnCell *)(cell->sc.sch);
    RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
-   TRC2(rgSCHCmnUlSfReTxAllocs);
 
    cp = &(cellUl->reTxLst);
    node = cp->first;
@@ -22375,7 +22120,7 @@ RgSchUlSf   *sf;
       /* Fix: syed Adaptive Msg3 Retx crash. */
       proc->reTxLnk.node = (PTR)NULLP;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -22412,7 +22157,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
 #endif
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC2(rgSCHCmnDlRbAlloc);
 
    if (cellSch->dl.isDlFreqSel)
    {
@@ -22423,7 +22167,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    {
       rgSCHCmnNonDlfsRbAlloc(cell, allocInfo);
    }
-   RETVOID;
+   return;
 }
 
 #ifdef LTEMAC_SPS
@@ -22439,40 +22183,40 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  *     Processing Steps:
  *     - Fill-up rbgInfo data structure for given DL bandwidth and rbgSize
  *
- *   @param[in]  U8             dlTotalBw
- *   @param[in]  U8             dlSubsetBw
- *   @param[in]  U8             maxRaType1SubsetBw
- *   @param[in]  U8             rbgSize
+ *   @param[in]  uint8_t             dlTotalBw
+ *   @param[in]  uint8_t             dlSubsetBw
+ *   @param[in]  uint8_t             maxRaType1SubsetBw
+ *   @param[in]  uint8_t             rbgSize
  *   @param[out] RgSchBwRbgInfo *rbgInfo
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlGetRbgInfo
+Void rgSCHCmnDlGetRbgInfo
 (
-U8             dlTotalBw,
-U8             dlSubsetBw,
-U8             maxRaType1SubsetBw,
-U8             rbgSize,
+uint8_t             dlTotalBw,
+uint8_t             dlSubsetBw,
+uint8_t             maxRaType1SubsetBw,
+uint8_t             rbgSize,
 RgSchBwRbgInfo *rbgInfo
 )
 #else
-PUBLIC Void rgSCHCmnDlGetRbgInfo(dlTotalBw, dlSubsetBw, maxRaType1SubsetBw,
+Void rgSCHCmnDlGetRbgInfo(dlTotalBw, dlSubsetBw, maxRaType1SubsetBw,
       rbgSize, rbgInfo)
-U8             dlTotalBw;
-U8             dlSubsetBw;
-U8             maxRaType1SubsetBw;
-U8             rbgSize;
+uint8_t             dlTotalBw;
+uint8_t             dlSubsetBw;
+uint8_t             maxRaType1SubsetBw;
+uint8_t             rbgSize;
 RgSchBwRbgInfo *rbgInfo;
 #endif
 {
 #ifdef RGSCH_SPS_UNUSED
-   U8    idx           = 0;
-   U8    lastRbgIdx    = ((dlTotalBw + rbgSize - 1)/rbgSize) - 1;
-   U8    currRbgSize   = rbgSize;
-   U8    subsetSizeIdx = 0;
-   U8    subsetSize[RG_SCH_NUM_RATYPE1_SUBSETS] = {0};
-   U8    lastRbgSize = rbgSize - (dlTotalBw - ((dlTotalBw/rbgSize) * rbgSize));
-   U8    numRaType1Rbgs = (maxRaType1SubsetBw + rbgSize - 1)/rbgSize;
+   uint8_t    idx           = 0;
+   uint8_t    lastRbgIdx    = ((dlTotalBw + rbgSize - 1)/rbgSize) - 1;
+   uint8_t    currRbgSize   = rbgSize;
+   uint8_t    subsetSizeIdx = 0;
+   uint8_t    subsetSize[RG_SCH_NUM_RATYPE1_SUBSETS] = {0};
+   uint8_t    lastRbgSize = rbgSize - (dlTotalBw - ((dlTotalBw/rbgSize) * rbgSize));
+   uint8_t    numRaType1Rbgs = (maxRaType1SubsetBw + rbgSize - 1)/rbgSize;
 #endif
 
    /* Compute maximum number of SPS RBGs for the cell */
@@ -22502,7 +22246,7 @@ RgSchBwRbgInfo *rbgInfo;
    rbgInfo->lastRbgSize = rbgSize - 
             (dlSubsetBw - ((dlSubsetBw/rbgSize) * rbgSize));
 #ifdef RGSCH_SPS_UNUSED
-   cmMemcpy((U8 *)rbgInfo->rbgSubsetSize, (U8 *) subsetSize, 4 * sizeof(U8));
+   memcpy(rbgInfo->rbgSubsetSize, subsetSize, 4 * sizeof(uint8_t));
 #endif
    rbgInfo->numRbs = (rbgInfo->numRbgs * rbgSize > dlTotalBw) ?
       dlTotalBw:(rbgInfo->numRbgs * rbgSize);
@@ -22526,9 +22270,9 @@ RgSchBwRbgInfo *rbgInfo;
  *     - Update RA Type 0, RA Type 1 and RA type 2 masks.
  *
  *  @param[in]   RgSchDlSfAllocInfo *allocedInfo
- *  @param[in]   U8             rbsReq
+ *  @param[in]   uint8_t             rbsReq
  *  @param[in]   RgSchBwRbgInfo *rbgInfo
- *  @param[out]  U8             *numAllocRbs
+ *  @param[out]  uint8_t             *numAllocRbs
  *  @param[out]  RgSchDlSfAllocInfo *resAllocInfo
  *  @param[in]   Bool           isPartialAlloc
  *
@@ -22536,44 +22280,44 @@ RgSchBwRbgInfo *rbgInfo;
  **/
 
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnDlRaType0Alloc
+uint8_t rgSCHCmnDlRaType0Alloc
 (
 RgSchDlSfAllocInfo *allocedInfo,
-U8                 rbsReq,
+uint8_t                 rbsReq,
 RgSchBwRbgInfo     *rbgInfo,
-U8                 *numAllocRbs,
+uint8_t                 *numAllocRbs,
 RgSchDlSfAllocInfo *resAllocInfo,
 Bool               isPartialAlloc
 )
 #else
-PUBLIC U8 rgSCHCmnDlRaType0Alloc(allocedInfo, rbsReq, rbgInfo,
+uint8_t rgSCHCmnDlRaType0Alloc(allocedInfo, rbsReq, rbgInfo,
       numAllocRbs, resAllocInfo, isPartialAlloc)
 RgSchDlSfAllocInfo *allocedInfo;
-U8                 rbsReq;
+uint8_t                 rbsReq;
 RgSchBwRbgInfo     *rbgInfo;
-U8                 *numAllocRbs;
+uint8_t                 *numAllocRbs;
 RgSchDlSfAllocInfo *resAllocInfo;
 Bool               isPartialAlloc;
 #endif
 {
    /* Note: This function atttempts allocation only full allocation */
-   U32      remNumRbs, rbgPosInRbgMask, ueRaType2Mask;
-   U8       type2MaskIdx, cnt, rbIdx;
-   U8       maskSize, rbg;
-   U8       bestNumAvailRbs = 0;
-   U8       usedRbs = 0;
-   U8       numAllocRbgs = 0;
-   U8       rbgSize = rbgInfo->rbgSize;
-   U32      *rbgMask = &(resAllocInfo->raType0Mask);
+   uint32_t      remNumRbs, rbgPosInRbgMask, ueRaType2Mask;
+   uint8_t       type2MaskIdx, cnt, rbIdx;
+   uint8_t       maskSize, rbg;
+   uint8_t       bestNumAvailRbs = 0;
+   uint8_t       usedRbs = 0;
+   uint8_t       numAllocRbgs = 0;
+   uint8_t       rbgSize = rbgInfo->rbgSize;
+   uint32_t      *rbgMask = &(resAllocInfo->raType0Mask);
 #ifdef RGSCH_SPS_UNUSED
-   U8       rbgSubset;
-   U32      ueRaType1Mask;
-   U32      *raType1Mask = resAllocInfo->raType1Mask;
-   U32      *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
+   uint8_t       rbgSubset;
+   uint32_t      ueRaType1Mask;
+   uint32_t      *raType1Mask = resAllocInfo->raType1Mask;
+   uint32_t      *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
 #endif
-   U32      *raType2Mask = resAllocInfo->raType2Mask;
+   uint32_t      *raType2Mask = resAllocInfo->raType2Mask;
 
-   U32      allocedMask = allocedInfo->raType0Mask;
+   uint32_t      allocedMask = allocedInfo->raType0Mask;
 
    maskSize = rbgInfo->numRbgs;
 
@@ -22680,7 +22424,7 @@ Bool               isPartialAlloc;
        * same */
    }
 
-   RETVALUE(numAllocRbgs);
+   return (numAllocRbgs);
 }
 
 #ifdef RGSCH_SPS_UNUSED
@@ -22701,57 +22445,57 @@ Bool               isPartialAlloc;
  *     - Update RA Type1, RA type 0 and RA type 2 masks.
  *
  *  @param[in]   RgSchDlSfAllocInfo *allocedInfo
- *  @param[in]   U8                 rbsReq
+ *  @param[in]   uint8_t                 rbsReq
  *  @param[in]   RgSchBwRbgInfo     *rbgInfo
- *  @param[in]   U8                 startRbgSubset
- *  @param[in]   U8                 *allocRbgSubset
+ *  @param[in]   uint8_t                 startRbgSubset
+ *  @param[in]   uint8_t                 *allocRbgSubset
  *  @param[out]  rgSchDlSfAllocInfo *resAllocInfo
  *  @param[in]   Bool               isPartialAlloc
  *
- *  @return  U8
+ *  @return  uint8_t
  *  Number of allocated RBs
  **/
 
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnDlRaType1Alloc
+uint8_t rgSCHCmnDlRaType1Alloc
 (
 RgSchDlSfAllocInfo *allocedInfo,
-U8                 rbsReq,
+uint8_t                 rbsReq,
 RgSchBwRbgInfo     *rbgInfo,
-U8                 startRbgSubset,
-U8                 *allocRbgSubset,
+uint8_t                 startRbgSubset,
+uint8_t                 *allocRbgSubset,
 RgSchDlSfAllocInfo *resAllocInfo,
 Bool               isPartialAlloc
 )
 #else
-PUBLIC U8 rgSCHCmnDlRaType1Alloc(allocedInfo, rbsReq,rbgInfo,startRbgSubset,
+uint8_t rgSCHCmnDlRaType1Alloc(allocedInfo, rbsReq,rbgInfo,startRbgSubset,
       allocRbgSubset, resAllocInfo, isPartialAlloc)
 RgSchDlSfAllocInfo *allocedInfo;
-U8                 rbsReq;
+uint8_t                 rbsReq;
 RgSchBwRbgInfo     *rbgInfo;
-U8                 startRbgSubset;
-U8                 *allocRbgSubset;
+uint8_t                 startRbgSubset;
+uint8_t                 *allocRbgSubset;
 RgSchDlSfAllocInfo *resAllocInfo;
 Bool               isPartialAlloc;
 #endif
 {
    /* Note: This function atttempts only full allocation */
-   U8          *rbgSubsetSzArr;
-   U8          type2MaskIdx, subsetIdx, rbIdx, rbInSubset, rbgInSubset;
-   U8          offset, rbg, maskSize, bestSubsetIdx;
-   U8          startPos = 0;
-   U8          bestNumAvailRbs = 0;
-   U8          numAllocRbs = 0;
-   U32         ueRaType2Mask, ueRaType0Mask, rbPosInSubset;
-   U32         remNumRbs, allocedMask;
-   U8          usedRbs = 0;
-   U8          rbgSize = rbgInfo->rbgSize;
-   U8          rbgSubset = startRbgSubset;
-   U32         *rbgMask = &resAllocInfo->raType0Mask;
-   U32         *raType1Mask = resAllocInfo->raType1Mask;
-   U32         *raType2Mask = resAllocInfo->raType2Mask;
-   U32         *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
-   U32         *allocMask = allocedInfo->raType1Mask;
+   uint8_t          *rbgSubsetSzArr;
+   uint8_t          type2MaskIdx, subsetIdx, rbIdx, rbInSubset, rbgInSubset;
+   uint8_t          offset, rbg, maskSize, bestSubsetIdx;
+   uint8_t          startPos = 0;
+   uint8_t          bestNumAvailRbs = 0;
+   uint8_t          numAllocRbs = 0;
+   uint32_t         ueRaType2Mask, ueRaType0Mask, rbPosInSubset;
+   uint32_t         remNumRbs, allocedMask;
+   uint8_t          usedRbs = 0;
+   uint8_t          rbgSize = rbgInfo->rbgSize;
+   uint8_t          rbgSubset = startRbgSubset;
+   uint32_t         *rbgMask = &resAllocInfo->raType0Mask;
+   uint32_t         *raType1Mask = resAllocInfo->raType1Mask;
+   uint32_t         *raType2Mask = resAllocInfo->raType2Mask;
+   uint32_t         *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
+   uint32_t         *allocMask = allocedInfo->raType1Mask;
 
    /* Initialize the subset size Array */
    rbgSubsetSzArr = rbgInfo->rbgSubsetSize;
@@ -22785,7 +22529,7 @@ Bool               isPartialAlloc;
    {
       /* Initialize alloced mask and subsetSize depending on the RBG
        * subset of allocation */
-      U8        startIdx = 0;
+      uint8_t        startIdx = 0;
       maskSize = rbgSubsetSzArr[bestSubsetIdx];
       allocedMask = allocMask[bestSubsetIdx];
       RG_SCH_CMN_DL_GET_START_POS(allocedMask, maskSize,
@@ -22833,7 +22577,7 @@ Bool               isPartialAlloc;
       *allocRbgSubset = bestSubsetIdx;
    } /* End of if (bestNumAvailRbs) */
 
-   RETVALUE(numAllocRbs);
+   return (numAllocRbs);
 }
 #endif
 /**
@@ -22853,49 +22597,49 @@ Bool               isPartialAlloc;
  *     - Update RA Type2, RA type 1 and RA type 0 masks.
  *
  *  @param[in]   RgSchDlSfAllocInfo *allocedInfo
- *  @param[in]   U8             rbsReq
+ *  @param[in]   uint8_t             rbsReq
  *  @param[in]   RgSchBwRbgInfo *rbgInfo
- *  @param[out]  U8             *rbStart
+ *  @param[out]  uint8_t             *rbStart
  *  @param[out]  rgSchDlSfAllocInfo *resAllocInfo
  *  @param[in]   Bool           isPartialAlloc
  *
- *  @return  U8
+ *  @return  uint8_t
  *  Number of allocated RBs
  **/
 
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnDlRaType2Alloc
+uint8_t rgSCHCmnDlRaType2Alloc
 (
 RgSchDlSfAllocInfo *allocedInfo,
-U8                 rbsReq,
+uint8_t                 rbsReq,
 RgSchBwRbgInfo     *rbgInfo,
-U8                 *rbStart,
+uint8_t                 *rbStart,
 RgSchDlSfAllocInfo *resAllocInfo,
 Bool               isPartialAlloc
 )
 #else
-PUBLIC U8 rgSCHCmnDlRaType2Alloc(allocedInfo, rbsReq, rbgInfo, rbStart,
+uint8_t rgSCHCmnDlRaType2Alloc(allocedInfo, rbsReq, rbgInfo, rbStart,
       resAllocInfo, isPartialAlloc)
 RgSchDlSfAllocInfo *allocedInfo;
-U8                 rbsReq;
+uint8_t                 rbsReq;
 RgSchBwRbgInfo     *rbgInfo;
-U8                 *rbStart;
+uint8_t                 *rbStart;
 RgSchDlSfAllocInfo *resAllocInfo;
 Bool               isPartialAlloc;
 #endif
 {
-   U8          numAllocRbs = 0;
-   U8          rbIdx;
-   U8          rbgSize = rbgInfo->rbgSize;
-   U32         *rbgMask = &resAllocInfo->raType0Mask;
+   uint8_t          numAllocRbs = 0;
+   uint8_t          rbIdx;
+   uint8_t          rbgSize = rbgInfo->rbgSize;
+   uint32_t         *rbgMask = &resAllocInfo->raType0Mask;
 #ifdef RGSCH_SPS_UNUSED
-   U32         *raType1Mask = resAllocInfo->raType1Mask;
+   uint32_t         *raType1Mask = resAllocInfo->raType1Mask;
 #endif
-   U32         *raType2Mask = resAllocInfo->raType2Mask;
+   uint32_t         *raType2Mask = resAllocInfo->raType2Mask;
 #ifdef RGSCH_SPS_UNUSED
-   U32         *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
+   uint32_t         *raType1UsedRbs = resAllocInfo->raType1UsedRbs;
 #endif
-   U32         *allocedMask = allocedInfo->raType2Mask;
+   uint32_t         *allocedMask = allocedInfo->raType2Mask;
 
    /* Note: This function atttempts only full allocation */
    rgSCHCmnDlGetBestFitHole(allocedMask, rbgInfo->numRbs,
@@ -22903,12 +22647,12 @@ Bool               isPartialAlloc;
    if (numAllocRbs)
    {
       /* Update the allocation in RA type 0 and RA type 1 masks */
-      U8 rbCnt = numAllocRbs;
+      uint8_t rbCnt = numAllocRbs;
 #ifdef RGSCH_SPS_UNUSED
-      U8 rbgSubset;
-      U32 ueRaType1Mask;
+      uint8_t rbgSubset;
+      uint32_t ueRaType1Mask;
 #endif
-      U32 ueRaType0Mask;
+      uint32_t ueRaType0Mask;
       rbIdx = *rbStart;
 
       while(rbCnt)
@@ -22929,7 +22673,7 @@ Bool               isPartialAlloc;
       }
    }
 
-   RETVALUE(numAllocRbs);
+   return (numAllocRbs);
 }
 
 /**
@@ -22943,29 +22687,29 @@ Bool               isPartialAlloc;
  *     Processing Steps:
  *     - Determine RA Type 0 mask for given rbIdex and rbg size.
  *
- *  @param[in]  U8          rbIdx
- *  @param[in]  U8          rbgSize
- *  @return  U32 RA type 0 mask
+ *  @param[in]  uint8_t          rbIdx
+ *  @param[in]  uint8_t          rbgSize
+ *  @return  uint32_t RA type 0 mask
  **/
 #ifdef ANSI
-PRIVATE U32 rgSCHCmnGetRaType0Mask
+PRIVATE uint32_t rgSCHCmnGetRaType0Mask
 (
-U8                rbIdx,
-U8                rbgSize
+uint8_t                rbIdx,
+uint8_t                rbgSize
 )
 #else
-PRIVATE U32 rgSCHCmnGetRaType0Mask(rbIdx, rbgSize)
-U8                rbIdx;
-U8                rbgSize;
+PRIVATE uint32_t rgSCHCmnGetRaType0Mask(rbIdx, rbgSize)
+uint8_t                rbIdx;
+uint8_t                rbgSize;
 #endif
 {
-   U8 rbg;
-   U32 rbgPosInRbgMask = 0;
+   uint8_t rbg;
+   uint32_t rbgPosInRbgMask = 0;
 
    rbg = rbIdx/rbgSize;
    rbgPosInRbgMask = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbg);
 
-   RETVALUE(rbgPosInRbgMask);
+   return (rbgPosInRbgMask);
 }
 
 #ifdef RGSCH_SPS_UNUSED
@@ -22980,27 +22724,27 @@ U8                rbgSize;
  *     Processing Steps:
  *     - Determine RA Type 1 mask for given rbIdex and rbg size.
  *
- *  @param[in]  U8          rbIdx
- *  @param[in]  U8          rbgSize
- *  @param[out] U8          *type1Subset
- *  @return  U32 RA type 1 mask
+ *  @param[in]  uint8_t          rbIdx
+ *  @param[in]  uint8_t          rbgSize
+ *  @param[out] uint8_t          *type1Subset
+ *  @return  uint32_t RA type 1 mask
  **/
 #ifdef ANSI
-PRIVATE U32 rgSCHCmnGetRaType1Mask
+PRIVATE uint32_t rgSCHCmnGetRaType1Mask
 (
-U8                rbIdx,
-U8                rbgSize,
-U8                *type1Subset
+uint8_t                rbIdx,
+uint8_t                rbgSize,
+uint8_t                *type1Subset
 )
 #else
-PRIVATE U32 rgSCHCmnGetRaType1Mask(rbIdx, rbgSize, type1Subset)
-U8                rbIdx;
-U8                rbgSize;
-U8                *type1Subset;
+PRIVATE uint32_t rgSCHCmnGetRaType1Mask(rbIdx, rbgSize, type1Subset)
+uint8_t                rbIdx;
+uint8_t                rbgSize;
+uint8_t                *type1Subset;
 #endif
 {
-   U8 rbg, rbgSubset, rbgInSubset, offset, rbInSubset;
-   U32 rbPosInSubset;
+   uint8_t rbg, rbgSubset, rbgInSubset, offset, rbInSubset;
+   uint32_t rbPosInSubset;
 
    rbg = rbIdx/rbgSize;
    rbgSubset = rbg % rbgSize;
@@ -23010,7 +22754,7 @@ U8                *type1Subset;
    rbPosInSubset =  1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbInSubset);
 
    *type1Subset = rbgSubset;
-   RETVALUE(rbPosInSubset);
+   return (rbPosInSubset);
 } 
 #endif /* RGSCH_SPS_UNUSED */
 /**
@@ -23024,28 +22768,28 @@ U8                *type1Subset;
  *     Processing Steps:
  *     - Determine RA Type 2 mask for given rbIdx and rbg size.
  *
- *  @param[in]  U8          rbIdx
- *  @param[out] U8          *maskIdx
- *  @return  U32 RA type 2 mask
+ *  @param[in]  uint8_t          rbIdx
+ *  @param[out] uint8_t          *maskIdx
+ *  @return  uint32_t RA type 2 mask
  **/
 #ifdef ANSI
-PRIVATE U32 rgSCHCmnGetRaType2Mask
+PRIVATE uint32_t rgSCHCmnGetRaType2Mask
 (
-U8                rbIdx,
-U8                *maskIdx
+uint8_t                rbIdx,
+uint8_t                *maskIdx
 )
 #else
-PRIVATE U32 rgSCHCmnGetRaType2Mask(rbIdx, maskIdx)
-U8                rbIdx;
-U8                *maskIdx;
+PRIVATE uint32_t rgSCHCmnGetRaType2Mask(rbIdx, maskIdx)
+uint8_t                rbIdx;
+uint8_t                *maskIdx;
 #endif
 {
-   U32 rbPosInType2;
+   uint32_t rbPosInType2;
 
    *maskIdx = rbIdx / 32;
    rbPosInType2 =  1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbIdx % 32);
 
-   RETVALUE(rbPosInType2);
+   return (rbPosInType2);
 }
 
 /**
@@ -23071,7 +22815,7 @@ U8                *maskIdx;
  *             RFAILED  failed
  **/
 #ifdef ANSI
-PUBLIC Bool rgSCHCmnAllocUeInSpsBw
+Bool rgSCHCmnAllocUeInSpsBw
 (
 RgSchDlSf           *dlSf,
 RgSchCellCb         *cell,
@@ -23080,7 +22824,7 @@ RgSchDlRbAlloc      *rbAllocInfo,
 Bool                isPartialAlloc
 )
 #else
-PUBLIC Bool rgSCHCmnAllocUeInSpsBw(dlSf, cell, ue, rbAllocInfo, isPartialAlloc)
+Bool rgSCHCmnAllocUeInSpsBw(dlSf, cell, ue, rbAllocInfo, isPartialAlloc)
 RgSchDlSf           *dlSf;
 RgSchCellCb         *cell;
 RgSchUeCb           *ue;
@@ -23088,11 +22832,11 @@ RgSchDlRbAlloc      *rbAllocInfo;
 Bool                isPartialAlloc;
 #endif
 {
-   U8                  rbgSize = cell->rbgSize;
-   U8                  numAllocRbs = 0;
-   U8                  numAllocRbgs = 0;
-   U8                  rbStart = 0;
-   U8                  idx, noLyr, iTbs;
+   uint8_t                  rbgSize = cell->rbgSize;
+   uint8_t                  numAllocRbs = 0;
+   uint8_t                  numAllocRbgs = 0;
+   uint8_t                  rbStart = 0;
+   uint8_t                  idx, noLyr, iTbs;
    RgSchCmnDlUe        *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell);
    RgSchDlSfAllocInfo  *dlSfAlloc = &rbAllocInfo->dlSf->dlSfAllocInfo;
    RgSchBwRbgInfo      *spsRbgInfo = &cell->spsBwRbgInfo;
@@ -23101,20 +22845,20 @@ Bool                isPartialAlloc;
    if ((0 == rbAllocInfo->tbInfo[0].schdlngForTb) &&
          (0 == rbAllocInfo->tbInfo[1].schdlngForTb))
    {
-      RETVALUE(TRUE);
+      return (TRUE);
    }
 
    /* Check if the requirement can be accomodated in SPS BW */
    if (dlSf->spsAllocdBw == spsRbgInfo->numRbs)
    {
       /* SPS Bandwidth has been exhausted: no further allocations possible */
-      RETVALUE(FALSE);
+      return (FALSE);
    }
    if (!isPartialAlloc)
    {
       if((dlSf->spsAllocdBw + rbAllocInfo->rbsReq) > spsRbgInfo->numRbs)
       {
-         RETVALUE(TRUE);
+         return (TRUE);
       }
    }
 
@@ -23133,7 +22877,7 @@ Bool                isPartialAlloc;
       /* If no RBS could be allocated, attempt RA TYPE 1 */
 
       numAllocRbs = rgSCHCmnDlRaType1Alloc(dlSfAlloc,
-            rbAllocInfo->rbsReq, spsRbgInfo, (U8)dlSfAlloc->nxtRbgSubset,
+            rbAllocInfo->rbsReq, spsRbgInfo, (uint8_t)dlSfAlloc->nxtRbgSubset,
             &rbAllocInfo->allocInfo.raType1.rbgSubset,
             &rbAllocInfo->resAllocInfo, isPartialAlloc);
 
@@ -23152,7 +22896,7 @@ Bool                isPartialAlloc;
    }
    if (!numAllocRbs)
    {
-      RETVALUE(TRUE);
+      return (TRUE);
    }
 
    if (!(rbAllocInfo->pdcch =
@@ -23160,7 +22904,7 @@ Bool                isPartialAlloc;
                rbAllocInfo->dciFormat, FALSE)))
    {
       /* Note: Returning TRUE since PDCCH might be available for another UE */
-      RETVALUE(TRUE);
+      return (TRUE);
    }
 
    /* Update Tb info for each scheduled TB */
@@ -23174,7 +22918,7 @@ Bool                isPartialAlloc;
       iTbs = rbAllocInfo->tbInfo[1].iTbs;
       noLyr = rbAllocInfo->tbInfo[1].noLyr;
       rbAllocInfo->tbInfo[1].bytesAlloc =
-         rgTbSzTbl[noLyr - 1][iTbs][numAllocRbs - 1]/8;;
+         rgTbSzTbl[noLyr - 1][iTbs][numAllocRbs - 1]/8;
    }
 
    /* Update rbAllocInfo with the allocation information */
@@ -23223,7 +22967,7 @@ Bool                isPartialAlloc;
    }
 
    dlSf->spsAllocdBw += numAllocRbs;
-   RETVALUE(TRUE);
+   return (TRUE);
 }
 
 /***********************************************************
@@ -23246,35 +22990,35 @@ Bool                isPartialAlloc;
 #ifdef ANSI
 PRIVATE Void rgSCHCmnDlGetBestFitHole
 (
-U32         *allocMask,
-U8          numMaskRbs,
-U32         *crntAllocMask,
-U8          rbsReq,
-U8          *allocStart,
-U8          *allocNumRbs,
+uint32_t         *allocMask,
+uint8_t          numMaskRbs,
+uint32_t         *crntAllocMask,
+uint8_t          rbsReq,
+uint8_t          *allocStart,
+uint8_t          *allocNumRbs,
 Bool        isPartialAlloc
 )
 #else
 PRIVATE  Void rgSCHCmnDlGetBestFitHole (allocMask, numMaskRbs,
         crntAllocMask, rbsReq, allocStart, allocNumRbs, isPartialAlloc)
-U32         *allocMask;
-U8          numMaskRbs;
-U32         *crntAllocMask;
-U8          rbsReq;
-U8          *allocStart;
-U8          *allocNumRbs;
+uint32_t         *allocMask;
+uint8_t          numMaskRbs;
+uint32_t         *crntAllocMask;
+uint8_t          rbsReq;
+uint8_t          *allocStart;
+uint8_t          *allocNumRbs;
 Bool        isPartialAlloc;
 #endif
 {
-   U8 maskSz = (numMaskRbs + 31)/32;
-   U8 maxMaskPos = (numMaskRbs % 32);
-   U8 maskIdx, maskPos;
-   U8 numAvailRbs = 0;
-   U8 bestAvailNumRbs = 0;
+   uint8_t maskSz = (numMaskRbs + 31)/32;
+   uint8_t maxMaskPos = (numMaskRbs % 32);
+   uint8_t maskIdx, maskPos;
+   uint8_t numAvailRbs = 0;
+   uint8_t bestAvailNumRbs = 0;
    S8 bestStartPos = -1;
    S8 startPos = -1;
-   U32 tmpMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0};
-   U32 bestMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0};
+   uint32_t tmpMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0};
+   uint32_t bestMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0};
 
    *allocNumRbs = numAvailRbs;
    *allocStart = 0;
@@ -23301,7 +23045,7 @@ Bool        isPartialAlloc;
             ++numAvailRbs;
             if (numAvailRbs == rbsReq)
             {
-               *allocStart = (U8)startPos;
+               *allocStart = (uint8_t)startPos;
                *allocNumRbs = rbsReq;
                break;
             }
@@ -23312,11 +23056,11 @@ Bool        isPartialAlloc;
             {
                bestAvailNumRbs = numAvailRbs;
                bestStartPos = startPos;
-               cmMemcpy((U8 *)bestMask, (U8 *) tmpMask, 4 * sizeof(U32));
+               memcpy(bestMask, tmpMask, 4 * sizeof(uint32_t));
             }
             numAvailRbs = 0;
             startPos = -1;
-            cmMemset((U8 *)tmpMask, 0, 4 * sizeof(U32));
+            memset(tmpMask, 0, 4 * sizeof(uint32_t));
          }
       }
       if (*allocNumRbs == rbsReq)
@@ -23328,22 +23072,22 @@ Bool        isPartialAlloc;
    if (*allocNumRbs == rbsReq)
    {
       /* Convert the hole into allocation */
-      cmMemcpy((U8 *)crntAllocMask, (U8 *) tmpMask, 4 * sizeof(U32));
-      RETVOID;
+      memcpy(crntAllocMask, tmpMask, 4 * sizeof(uint32_t));
+      return;
    }
    else
    {
       if (bestAvailNumRbs && isPartialAlloc)
       {
          /* Partial allocation could have been done */
-         *allocStart = (U8)bestStartPos;
+         *allocStart = (uint8_t)bestStartPos;
          *allocNumRbs = bestAvailNumRbs;
          /* Convert the hole into allocation */
-         cmMemcpy((U8 *)crntAllocMask, (U8 *) bestMask, 4 * sizeof(U32));
+         memcpy(crntAllocMask, bestMask, 4 * sizeof(uint32_t));
       }
    }
 
-   RETVOID;
+   return;
 }
 #endif /* LTEMAC_SPS */
 
@@ -23368,23 +23112,24 @@ Bool        isPartialAlloc;
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
  *  @return  void
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnFindCodeRate
 (
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo,
-U8                    idx
+uint8_t                    idx
 )
 #else
 PRIVATE Void rgSCHCmnFindCodeRate(cell,dlSf,allocInfo,idx)
 RgSchCellCb           *cell;
 RgSchDlSf             *dlSf;
 RgSchDlRbAlloc        *allocInfo;
-U8                    idx;
+uint8_t                    idx;
 #endif
 {
-    RETVOID;
+    return;
 
 }
 #endif
@@ -23403,7 +23148,7 @@ U8                    idx;
  *      - Adjust Imcs according to tbSize and ITBS.
  *
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
- *  @param[in]      U8              *idx
+ *  @param[in]      uint8_t              *idx
  *  @return  void
  **/
 #ifdef ANSI
@@ -23411,22 +23156,22 @@ PRIVATE Void rgSCHCmnNonDlfsPbchTbImcsAdj
 (
 RgSchCellCb      *cell,
 RgSchDlRbAlloc   *allocInfo,
-U8               idx,
-U8               rbsReq
+uint8_t               idx,
+uint8_t               rbsReq
 )
 #else
 PRIVATE Void rgSCHCmnNonDlfsPbchTbImcsAdj(cell,allocInfo, idx, rbsReq)
 RgSchCellCb      *cell;
 RgSchDlRbAlloc   *allocInfo;
-U8               idx;
-U8               rbsReq;
+uint8_t               idx;
+uint8_t               rbsReq;
 #endif
 {
-   U8             noLyrs = 0;
-   U8             tbs = 0;
-   U32            origBytesReq;
-   U8             noRbgs = 0;
-   U8             noRbs = 0;
+   uint8_t             noLyrs = 0;
+   uint8_t             tbs = 0;
+   uint32_t            origBytesReq;
+   uint8_t             noRbgs = 0;
+   uint8_t             noRbs = 0;
    RgSchDlSf     *dlSf = allocInfo->dlSf;
 
    RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[idx].imcs, tbs);
@@ -23445,7 +23190,7 @@ U8               rbsReq;
    /* This line will help in case if tbs is zero and reduction in MCS is not possible */
    if (allocInfo->rbsReq == 0 )
    {
-      RETVOID;
+      return;
    }
    origBytesReq = rgTbSzTbl[noLyrs - 1][tbs][rbsReq - 1]/8;
 
@@ -23470,7 +23215,7 @@ U8               rbsReq;
       RG_SCH_CMN_DL_TBS_TO_MCS(tbs,allocInfo->tbInfo[idx].imcs);
    }
 
-   RETVOID;
+   return;
 }
 /* Added funcion to adjust TBSize*/
 /**
@@ -23484,38 +23229,38 @@ U8               rbsReq;
  *     Processing Steps:
  *
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
- *  @param[in]      U8            numOvrlapgPbchRb
- *  @param[in]      U8            idx
- *  @param[in]      U8            pbchSsRsSym
+ *  @param[in]      uint8_t            numOvrlapgPbchRb
+ *  @param[in]      uint8_t            idx
+ *  @param[in]      uint8_t            pbchSsRsSym
  *  @return  void
  **/
 #ifdef ANSI
 PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj
 (
 RgSchDlRbAlloc        *allocInfo,
-U8                    numOvrlapgPbchRb,
-U8                    pbchSsRsSym,
-U8                    idx,
-U32                   bytesReq
+uint8_t                    numOvrlapgPbchRb,
+uint8_t                    pbchSsRsSym,
+uint8_t                    idx,
+uint32_t                   bytesReq
 )
 #else
 PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj(allocInfo,numOvrlapgPbchRb,pbchSsRsSym,idx,bytesReq)
 RgSchDlRbAlloc        *allocInfo;
-U8                    numOvrlapgPbchRb;
-U8                    pbchSsRsSym;
-U8                    idx;
-U32                   bytesReq;
+uint8_t                    numOvrlapgPbchRb;
+uint8_t                    pbchSsRsSym;
+uint8_t                    idx;
+uint32_t                   bytesReq;
 #endif
 {
-   U32             reducedTbs = 0;
-   U8              noLyrs = 0;
-   U8              tbs = 0;
+   uint32_t             reducedTbs = 0;
+   uint8_t              noLyrs = 0;
+   uint8_t              tbs = 0;
 
    noLyrs = allocInfo->tbInfo[idx].noLyr;
 
    RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[idx].imcs, tbs);
 
-   reducedTbs = bytesReq - (((U32)numOvrlapgPbchRb * (U32)pbchSsRsSym * 6)/8);
+   reducedTbs = bytesReq - (((uint32_t)numOvrlapgPbchRb * (uint32_t)pbchSsRsSym * 6)/8);
 
    /* find out the ITbs & Imcs by identifying first Highest
     number of bits compared with reduced bits considering the bits that are
@@ -23535,7 +23280,7 @@ U32                   bytesReq;
    allocInfo->tbInfo[idx].iTbs = tbs;
    RG_SCH_CMN_DL_TBS_TO_MCS(tbs,allocInfo->tbInfo[idx].imcs);
 
-   RETVOID;
+   return;
 }
 
 /* Added this function to find num of ovrlapping PBCH rb*/
@@ -23552,26 +23297,25 @@ U32                   bytesReq;
  *  @param[in]      RgSchCellCb     *cell
  *  @param[in]      RgSchDlSf       *dlSf
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
- *  @param[out]      U8            addtlRbsAvl
+ *  @param[out]      uint8_t            addtlRbsAvl
  *  @return  void
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnFindNumAddtlRbsAvl
+PRIVATE uint8_t rgSCHCmnFindNumAddtlRbsAvl
 (
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo
 )
 #else
-PRIVATE U8 rgSCHCmnFindNumAddtlRbsAvl(cell,dlSf,allocInfo)
+PRIVATE uint8_t rgSCHCmnFindNumAddtlRbsAvl(cell,dlSf,allocInfo)
 RgSchCellCb           *cell;
 RgSchDlSf             *dlSf;
 RgSchDlRbAlloc        *allocInfo;
 #endif
 {
-    U8 addtlRbsAvl = 0;
+    uint8_t addtlRbsAvl = 0;
 
-    TRC2(rgSCHCmnFindNumAddtlRbsAvl)
 
     if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0)
     {
@@ -23583,7 +23327,7 @@ RgSchDlRbAlloc        *allocInfo;
        addtlRbsAvl = (dlSf->bw - dlSf->bwAlloced) - allocInfo->rbsReq;
     }
 
-    RETVALUE(addtlRbsAvl);
+    return (addtlRbsAvl);
 
 }
 /* Added this function to find num of ovrlapping PBCH rb*/
@@ -23600,7 +23344,7 @@ RgSchDlRbAlloc        *allocInfo;
  *  @param[in]      RgSchCellCb     *cell
  *  @param[in]      RgSchDlSf       *dlSf
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
- *  @param[out]      U8*            numOvrlapgPbchRb
+ *  @param[out]      uint8_t*            numOvrlapgPbchRb
  *  @return  void
  **/
 #ifdef ANSI
@@ -23609,18 +23353,17 @@ PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo,
-U8                    *numOvrlapgPbchRb
+uint8_t                    *numOvrlapgPbchRb
 )
 #else
 PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs(cell,dlSf,allocInfo,numOvrlapgPbchRb)
 RgSchCellCb           *cell;
 RgSchDlSf             *dlSf;
 RgSchDlRbAlloc        *allocInfo;
-U8                    *numOvrlapgPbchRb;
+uint8_t                    *numOvrlapgPbchRb;
 #endif
 {
     *numOvrlapgPbchRb = 0;
-    TRC2(rgSCHCmnFindNumPbchOvrlapRbs)
    /*Find if we have already crossed the start boundary for PBCH 6 RBs,
     * if yes then lets find the number of RBs which are getting overlapped
     * with this allocation.*/
@@ -23657,7 +23400,7 @@ U8                    *numOvrlapgPbchRb;
          *numOvrlapgPbchRb = (cell->pbchRbEnd) - dlSf->bwAlloced;
       }
    }
-    RETVOID;
+    return;
 
 }
 /**
@@ -23672,7 +23415,7 @@ U8                    *numOvrlapgPbchRb;
  *
  *  @param[in]      RgSchCellCb     *cell
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
- *  @param[in]      U8               pbchSsRsSym
+ *  @param[in]      uint8_t               pbchSsRsSym
  *  @return  void
  **/
 #ifdef ANSI
@@ -23680,33 +23423,32 @@ PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj
 (
 RgSchCellCb      *cell,
 RgSchDlRbAlloc   *allocInfo,
-U8               pbchSsRsSym,
+uint8_t               pbchSsRsSym,
 Bool             isBcchPcch
 )
 #else
 PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj(cell, allocInfo,pbchSsRsSym)
 RgSchCellCb      *cell;
 RgSchDlRbAlloc   *allocInfo;
-U8               pbchSsRsSym;
+uint8_t               pbchSsRsSym;
 Bool             isBcchPcch;
 #endif
 {
    RgSchDlSf     *dlSf = allocInfo->dlSf;
-   U8             numOvrlapgPbchRb = 0;
-   U8             numOvrlapgAdtlPbchRb = 0;
-   U8             totSym;
-   U8             addtlRbsReq = 0;
-   U8             moreAddtlRbsReq = 0;
-   U8             addtlRbsAdd = 0;
-   U8             moreAddtlRbsAdd = 0;
-   U8             tbs;
-   U8             origRbsReq = 0;
-   U32            bytesReq;
-   U8             noLyr;
-   U8             divResult;
+   uint8_t             numOvrlapgPbchRb = 0;
+   uint8_t             numOvrlapgAdtlPbchRb = 0;
+   uint8_t             totSym;
+   uint8_t             addtlRbsReq = 0;
+   uint8_t             moreAddtlRbsReq = 0;
+   uint8_t             addtlRbsAdd = 0;
+   uint8_t             moreAddtlRbsAdd = 0;
+   uint8_t             tbs;
+   uint8_t             origRbsReq = 0;
+   uint32_t            bytesReq;
+   uint8_t             noLyr;
+   uint8_t             divResult;
 
 
-   TRC2(rgSCHCmnNonDlfsPbchRbAllocAdj);
 
 
    origRbsReq = allocInfo->rbsReq;
@@ -23775,7 +23517,7 @@ Bool             isBcchPcch;
    }
    if (isBcchPcch == TRUE)
    {
-      RETVOID;
+      return;
    }
 
    RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[0].imcs, tbs);
@@ -23848,10 +23590,10 @@ Bool             isBcchPcch;
       }
    }
 
-   RETVOID;
+   return;
 } /* end of rgSCHCmnNonDlfsPbchRbAllocAdj */
 #endif
-
+#endif
 /**
  * @brief Performs RB allocation for frequency non-selective cell.
  *
@@ -23883,18 +23625,17 @@ RgSchDlRbAlloc   *allocInfo;
 #ifndef LTE_TDD
 #ifdef LTEMAC_SPS
 #endif
-   U8 pbchSsRsSym = 0;
-   U8 pbchFrame = 0;
-   U8  tbs = 0;
+   uint8_t pbchSsRsSym = 0;
+   uint8_t pbchFrame = 0;
+   uint8_t  tbs = 0;
    RgSchCmnDlCell   *cellDl    = RG_SCH_CMN_GET_DL_CELL(cell); 
 #endif
    RgSchDlSf     *dlSf   = allocInfo->dlSf;
 #ifdef LTEMAC_SPS
-   U8                  rbStart = 0;
-   U8                  spsRbsAlloc = 0;
+   uint8_t                  rbStart = 0;
+   uint8_t                  spsRbsAlloc = 0;
    RgSchDlSfAllocInfo  *dlSfAlloc = &allocInfo->dlSf->dlSfAllocInfo;
 #endif
-   TRC2(rgSCHCmnNonDlfsCmnRbAlloc);
 
    allocInfo->tbInfo[0].noLyr = 1;
 
@@ -23902,10 +23643,10 @@ RgSchDlRbAlloc   *allocInfo;
    /* Note: Initialize the masks to 0, this might not be needed since alloInfo
     * is initialized to 0 at the beginning of allcoation */
    allocInfo->resAllocInfo.raType0Mask = 0;
-   cmMemset((U8*)allocInfo->resAllocInfo.raType1Mask, 0,
-         RG_SCH_NUM_RATYPE1_32BIT_MASK * sizeof (U32));
-   cmMemset((U8*)allocInfo->resAllocInfo.raType2Mask, 0,
-         RG_SCH_NUM_RATYPE2_32BIT_MASK * sizeof (U32));
+   memset(allocInfo->resAllocInfo.raType1Mask, 0,
+         RG_SCH_NUM_RATYPE1_32BIT_MASK * sizeof (uint32_t));
+   memset(allocInfo->resAllocInfo.raType2Mask, 0,
+         RG_SCH_NUM_RATYPE2_32BIT_MASK * sizeof (uint32_t));
 
    if ((dlSf->spsAllocdBw >= cell->spsBwRbgInfo.numRbs) &&
          (dlSf->bwAlloced == dlSf->bw))
@@ -23913,7 +23654,7 @@ RgSchDlRbAlloc   *allocInfo;
    if(dlSf->bwAlloced == dlSf->bw)
 #endif
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifndef LTE_TDD
    if (allocInfo->rbsReq > (dlSf->bw - dlSf->bwAlloced))
@@ -23946,7 +23687,7 @@ RgSchDlRbAlloc   *allocInfo;
          if (!spsRbsAlloc)
 #endif /* LTEMAC_SPS */
          {
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
    }
@@ -23956,7 +23697,7 @@ RgSchDlRbAlloc   *allocInfo;
    allocInfo->pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf);
    if (allocInfo->pdcch == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    allocInfo->dciFormat = TFU_DCI_FORMAT_1A;
    allocInfo->pdcch->dciNumOfBits = cell->dciSize.size[TFU_DCI_FORMAT_1A];
@@ -23985,7 +23726,7 @@ RgSchDlRbAlloc   *allocInfo;
             allocInfo->allocInfo.raType2.rbStart = rbStart;
 #else
             /*Fix for ccpu00123918*/
-            allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start;
+            allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start;
 #endif
          }
          else
@@ -24026,7 +23767,7 @@ RgSchDlRbAlloc   *allocInfo;
    {  
 #endif
       /*Fix for ccpu00123918*/
-      allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start;
+      allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start;
       allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq;
       allocInfo->rbsAlloc = allocInfo->rbsReq;
 
@@ -24056,7 +23797,7 @@ RgSchDlRbAlloc   *allocInfo;
 #ifdef LTEMAC_SPS
    if (spsRbsAlloc)
    {
-      U8    idx;
+      uint8_t    idx;
       /* Update type 0, 1 and 2 masks */
       dlSfAlloc->raType0Mask    |= allocInfo->resAllocInfo.raType0Mask;
 #ifdef RGSCH_SPS_UNUSED
@@ -24076,7 +23817,7 @@ RgSchDlRbAlloc   *allocInfo;
    }
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -24109,12 +23850,11 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
 #endif
 {
    RgSchDlSf     *dlSf   = allocInfo->dlSf;
-   TRC2(rgSCHCmnNonDlfsCmnRbAllocRar);
 
 
    if(dlSf->bwAlloced == dlSf->bw)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    allocInfo->tbInfo[0].noLyr = 1;
@@ -24123,7 +23863,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
    allocInfo->pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf);
    if (allocInfo->pdcch == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    allocInfo->dciFormat = TFU_DCI_FORMAT_1A;
    allocInfo->pdcch->dciNumOfBits = cell->dciSize.size[TFU_DCI_FORMAT_1A];
@@ -24131,7 +23871,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
    allocInfo->allocInfo.raType2.isLocal = TRUE;
 
    /*Fix for ccpu00123918*/
-   allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start;
+   allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start;
    allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq;
    allocInfo->rbsAlloc = allocInfo->rbsReq;
 
@@ -24142,13 +23882,13 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
    allocInfo->pdcch = rgSCHCmnPdcchAlloc(cell, NULLP, dlSf, 13, TFU_DCI_FORMAT_B1, FALSE);
    if (allocInfo->pdcch == NULLP)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    RgSchSfBeamInfo  *beamInfo = &(dlSf->sfBeamInfo[0]);
    if(beamInfo->totVrbgAllocated > MAX_5GTF_VRBG)
    {
       printf("5GTF_ERROR vrbg allocated > 25\n");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    allocInfo->tbInfo[0].cmnGrnt.vrbgStart = beamInfo->vrbgStart;
@@ -24173,7 +23913,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
    printf("\n[%s],allocInfo->tbInfo[0].bytesAlloc:%u,vrbgReq:%u\n",
          __func__,allocInfo->tbInfo[0].bytesAlloc,allocInfo->vrbgReq);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -24197,6 +23937,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
  *      -# TRUE
  *      -# FALSE
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl
 (
@@ -24222,11 +23963,11 @@ Bool               isUeCellEdge;
    RgSchSFRPoolInfo  *sfrPool;
    RgSchSFRPoolInfo  *sfrCEPool;
 
-   U8 tbs;
-   U8 noLyrs;
+   uint8_t tbs;
+   uint8_t noLyrs;
    RgSchSFRPoolInfo *poolWithMaxAvlblBw = NULLP;
-   U32 bwAvlbl = 0;
-   U32 addtnlPRBs = 0;
+   uint32_t bwAvlbl = 0;
+   uint32_t addtnlPRBs = 0;
 
    if (dlSf->bw <= dlSf->bwAlloced)
    {
@@ -24296,7 +24037,7 @@ Bool               isUeCellEdge;
                   /* Check if type0 allocation can cater to this RETX requirement */
                   if ((allocInfo->rbsReq % cell->rbgSize) != (cell->rbgSize - dlSf->lstRbgDfct))
                   {
-                     RETVALUE(FALSE);
+                     return (FALSE);
                   }
                   else
                   {
@@ -24309,7 +24050,7 @@ Bool               isUeCellEdge;
                else
                {
                   /* cannot allocate same number of required RBs */
-                  RETVALUE(FALSE);                  
+                  return (FALSE);                   
                }
             }
          }
@@ -24319,7 +24060,7 @@ Bool               isUeCellEdge;
                      cell->rbgSize) - dlSf->lstRbgDfct))
          {
             *sfrpoolInfo = sfrPool;
-            RETVALUE(TRUE);
+            return (TRUE);
          }
          else
          {
@@ -24348,7 +24089,7 @@ Bool               isUeCellEdge;
                noLyrs = allocInfo->tbInfo[0].noLyr;
                allocInfo->tbInfo[0].bytesReq = rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8;
                *sfrpoolInfo = sfrPool;
-               RETVALUE(TRUE);
+               return (TRUE);
             }
             else
             {
@@ -24365,7 +24106,7 @@ Bool               isUeCellEdge;
                continue;
             }
 
-         //   RETVALUE(FALSE);
+         //   return (FALSE);
          }
       }
       else if (allocInfo->raType == RG_SCH_CMN_RA_TYPE2)
@@ -24402,7 +24143,7 @@ Bool               isUeCellEdge;
                            cell->rbgSize);
                      sfrPool->adjCCPool->bw -= addtnlPRBs;
                      *sfrpoolInfo = sfrPool;
-                     RETVALUE(TRUE);
+                     return (TRUE);
                   }
                }
             }
@@ -24420,12 +24161,12 @@ Bool               isUeCellEdge;
             if(allocInfo->rbsReq <= (sfrCEPool->bw - sfrCEPool->bwAlloced))
             {
                *sfrpoolInfo = sfrCEPool;
-               RETVALUE(TRUE);
+               return (TRUE);
             }
             else if(allocInfo->rbsReq <= (sfrPool->bw - sfrPool->bwAlloced))  
             {
                *sfrpoolInfo = sfrPool;
-               RETVALUE(TRUE);
+               return (TRUE);
             }
             /* Check if CE and CC boundary has unallocated prbs */
             else if ((sfrPool->poolstartRB == sfrPool->type2Start) &&
@@ -24454,7 +24195,7 @@ Bool               isUeCellEdge;
                      sfrCEPool->type0End = ((sfrCEPool->poolendRB + 1 - addtnlPRBs) / cell->rbgSize) - 1;
                   }
                   *sfrpoolInfo = sfrPool;
-                  RETVALUE(TRUE);
+                  return (TRUE);
                }
                else if ( bwAvlbl < 
                      ((sfrCEPool->bw - sfrCEPool->bwAlloced) +
@@ -24476,11 +24217,11 @@ Bool               isUeCellEdge;
                      allocInfo->tbInfo[0].bytesReq = 
                         rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8;
                      *sfrpoolInfo = sfrPool;              
-                     RETVALUE(TRUE);
+                     return (TRUE);
                   }
                   else
                   {
-                     RETVALUE(FALSE);
+                     return (FALSE);
                   }
                }
             }
@@ -24496,7 +24237,7 @@ Bool               isUeCellEdge;
          if (allocInfo->rbsReq <= (sfrPool->bw - sfrPool->bwAlloced))
          {
             *sfrpoolInfo = sfrPool;
-            RETVALUE(TRUE);
+            return (TRUE);
          }
          else
          {
@@ -24534,7 +24275,7 @@ Bool               isUeCellEdge;
                      {
                         dlSf->sfrTotalPoolInfo.ccBwFull = TRUE;  
                      }
-                     RETVALUE(FALSE);
+                     return (FALSE);
                   }
                   else
                   {
@@ -24546,7 +24287,7 @@ Bool               isUeCellEdge;
                      allocInfo->tbInfo[0].bytesReq = 
                         rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8;
                      *sfrpoolInfo = poolWithMaxAvlblBw;                   
-                     RETVALUE(TRUE);
+                     return (TRUE);
                   }
                }                         
             }
@@ -24565,15 +24306,16 @@ Bool               isUeCellEdge;
 
                if (n == NULLP)
                {
-                  RETVALUE(FALSE);
+                  return (FALSE);
                }
             }
 
          }
       }   
    } 
-   RETVALUE(FALSE);
+   return (FALSE);
 }
+#endif
 #endif /* end of ifndef LTE_TDD*/
 /* LTE_ADV_FLAG_REMOVED_END */
 
@@ -24595,6 +24337,7 @@ Bool               isUeCellEdge;
  *      -# TRUE
  *      -# FALSE
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl
 (
@@ -24609,16 +24352,15 @@ RgSchDlSf          *dlSf;
 RgSchDlRbAlloc     *allocInfo;
 #endif
 {
-   U8 tbs;
-   U8 noLyrs;
-   U8 ignoredDfctRbg = FALSE;
+   uint8_t tbs;
+   uint8_t noLyrs;
+   uint8_t ignoredDfctRbg = FALSE;
 
-   TRC2(rgSCHCmnNonDlfsBwAvlbl);
    if (dlSf->bw <= dlSf->bwAlloced)
    {
       RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, "(%d:%d)FAILED CRNTI:%d",
          dlSf->bw, dlSf->bwAlloced,allocInfo->rnti);
-      RETVALUE(FALSE);
+      return (FALSE);
    }
    if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0)
    {
@@ -24650,13 +24392,13 @@ RgSchDlRbAlloc     *allocInfo;
                 /* Check if type0 allocation can cater to this RETX requirement */
                 if ((allocInfo->rbsReq % cell->rbgSize) != (cell->rbgSize - dlSf->lstRbgDfct))
                 {
-                   RETVALUE(FALSE);
+                   return (FALSE);
                 }
              }
              else
              {
                 /* cannot allocate same number of required RBs */
-                RETVALUE(FALSE);                    
+                return (FALSE);                     
              }
           }
        }
@@ -24666,7 +24408,7 @@ RgSchDlRbAlloc     *allocInfo;
       if(allocInfo->rbsReq <= (((dlSf->type0End - dlSf->type2End + 1)*\
                cell->rbgSize) - dlSf->lstRbgDfct))
       {
-         RETVALUE(TRUE);
+         return (TRUE);
       }
       /* ccpu00132358:MOD- Removing "ifndef LTE_TDD" for unblocking the RB 
        * allocation in TDD when requested RBs are more than available RBs*/
@@ -24685,7 +24427,7 @@ RgSchDlRbAlloc     *allocInfo;
             }
 
 
-            RETVALUE(FALSE);
+            return (FALSE);
          }
          /* Fix: Number of RBs in case of RETX should be same as 
           * that of initial transmission. */
@@ -24725,16 +24467,16 @@ RgSchDlRbAlloc     *allocInfo;
             RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "FAILED for CRNTI:%d",
                   allocInfo->rnti);
             printf ("RB Alloc failed for LAA TB type 0\n");
-            RETVALUE(FALSE);
+            return (FALSE);
          }
-         RETVALUE(TRUE);
+         return (TRUE);
       }
    }
    else if (allocInfo->raType == RG_SCH_CMN_RA_TYPE2)
    {
       if (allocInfo->rbsReq <= (dlSf->bw - dlSf->bwAlloced))
       {
-         RETVALUE(TRUE);
+         return (TRUE);
       }
       /* ccpu00132358:MOD- Removing "ifndef LTE_TDD" for unblocking the RB 
        * allocation in TDD when requested RBs are more than available RBs*/
@@ -24767,16 +24509,17 @@ RgSchDlRbAlloc     *allocInfo;
          {
             printf ("RB Alloc failed for LAA TB type 2\n");
             RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti);
-            RETVALUE(FALSE);
+            return (FALSE);
          }
          /* Fix: Number of RBs in case of RETX should be same as 
           * that of initial transmission. */
-         RETVALUE(TRUE);
+         return (TRUE);
       }
    }
    RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti);
-   RETVALUE(FALSE);
+   return (FALSE);
 }
+#endif
 /* LTE_ADV_FLAG_REMOVED_START */
 #ifndef LTE_TDD
 /**
@@ -24790,31 +24533,30 @@ RgSchDlRbAlloc     *allocInfo;
  *
  *  @param[in]  RgSchCellCb     *cell
  *  @param[in]  RgSchDlSf       *dlSf
- *  @param[in]  U8              rbStrt
- *  @param[in]  U8              numRb
+ *  @param[in]  uint8_t              rbStrt
+ *  @param[in]  uint8_t              numRb
  *
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc
+Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc
 (
 RgSchCellCb        *cell,
 RgSchDlSf          *dlSf,
-U8                 rbStrt,
-U8                 numRb
+uint8_t                 rbStrt,
+uint8_t                 numRb
 )
 #else
-PUBLIC Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc(cell, dlSf, rbStrt, numRb)
+Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc(cell, dlSf, rbStrt, numRb)
 RgSchCellCb        *cell;
 RgSchDlSf          *dlSf;
-U8                 rbStrt;
-U8                 numRb;
+uint8_t                 rbStrt;
+uint8_t                 numRb;
 #endif
 { 
    CmLListCp   *l;
    CmLList     *n;
    RgSchSFRPoolInfo  *sfrPool;
-   TRC2(rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc);
    
    l = &dlSf->sfrTotalPoolInfo.ccPool;
      
@@ -24853,10 +24595,10 @@ U8                 numRb;
             n = cmLListFirst(l);
          }
          else
-            RETVOID;
+            return;
       }
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -24870,27 +24612,28 @@ U8                 numRb;
  *
  *  @param[in]  RgSchCellCb     *cell
  *  @param[in]  RgSchDlSf       *dlSf
- *  @param[in]  U8              rbStrt
- *  @param[in]  U8              numRb
+ *  @param[in]  uint8_t              rbStrt
+ *  @param[in]  uint8_t              numRb
  *
  *  @return Void
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 RgSchDlSf          *dlSf,
-U8                 rbStrt,
-U8                 numRb
+uint8_t                 rbStrt,
+uint8_t                 numRb
 )
 #else
 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc(cell, ue, dlSf, rbStrt, numRb)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 RgSchDlSf          *dlSf;
-U8                 rbStrt;
-U8                 numRb;
+uint8_t                 rbStrt;
+uint8_t                 numRb;
 #endif
 {
    CmLListCp   *l;
@@ -24899,7 +24642,6 @@ U8                 numRb;
    RgSchSFRPoolInfo  *sfrCCPool2 = NULL;
    S16 ret = RFAILED;
 
-   TRC2(rgSCHCmnNonDlfsUpdDSFRTyp2Alloc);
    /* Move the type2End pivot forward */
    
    
@@ -24913,7 +24655,7 @@ U8                 numRb;
             {
                RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,  "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():"
                         "sfrCCPool1 is NULL for CRNTI:%d",ue->ueId);
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
       n = cmLListNext(l);
       if(n)
@@ -24937,7 +24679,7 @@ U8                 numRb;
                {
                     RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():"
                       "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId);
-                    RETVALUE(RFAILED);
+                    return RFAILED;
                }
            }
       }
@@ -24954,7 +24696,7 @@ U8                 numRb;
             {
                RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,   "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" 
                         "rgSCHCmnBuildRntpInfo() function returned RFAILED CRNTI:%d",ue->ueId);
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
          }
       }
@@ -24965,8 +24707,10 @@ U8                 numRb;
    /*MS_FIX for ccpu00123918*/
    dlSf->type2Start += numRb;
 #endif
-   RETVALUE(ROK);
+   return ROK;
+
 }
+#endif
 #endif /* end of ifndef LTE_TDD*/
 /* LTE_ADV_FLAG_REMOVED_END */
 /**
@@ -24980,8 +24724,8 @@ U8                 numRb;
  *
  *  @param[in]  RgSchCellCb     *cell
  *  @param[in]  RgSchDlSf       *dlSf
- *  @param[in]  U8              rbStrt
- *  @param[in]  U8              numRb
+ *  @param[in]  uint8_t              rbStrt
+ *  @param[in]  uint8_t              numRb
  *
  *  @return Void
  **/
@@ -24990,18 +24734,17 @@ PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc
 (
 RgSchCellCb        *cell,
 RgSchDlSf          *dlSf,
-U8                 rbStrt,
-U8                 numRb
+uint8_t                 rbStrt,
+uint8_t                 numRb
 )
 #else
 PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc(cell, dlSf, rbStrt, numRb)
 RgSchCellCb        *cell;
 RgSchDlSf          *dlSf;
-U8                 rbStrt;
-U8                 numRb;
+uint8_t                 rbStrt;
+uint8_t                 numRb;
 #endif
 {
-   TRC2(rgSCHCmnNonDlfsUpdTyp2Alloc);
    /* Move the type2End pivot forward */
    dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize);
 //#ifndef LTEMAC_SPS
@@ -25009,7 +24752,7 @@ U8                 numRb;
    /*Fix for ccpu00123918*/
    dlSf->type2Start += numRb;
 //#endif
-   RETVOID;
+   return;
 }
 
 /**
@@ -25031,6 +24774,7 @@ U8                 numRb;
  *
  *  @return Void
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnNonDlfsType0Alloc
 (
@@ -25047,18 +24791,17 @@ RgSchDlRbAlloc     *allocInfo;
 RgSchUeCb          *ue;
 #endif
 {
-   U32 dlAllocMsk = 0;
-   U8  rbgFiller = dlSf->lstRbgDfct;
-   U8  noRbgs = RGSCH_CEIL((allocInfo->rbsReq + rbgFiller), cell->rbgSize);
-   //U8  noRbgs = (allocInfo->rbsReq + rbgFiller)/ cell->rbgSize;
-   U8  noRbs;
-   U8  noLyr;
-   U8  iTbs;
-   U32          tb1BytesAlloc = 0;
-   U32          tb2BytesAlloc = 0;
+   uint32_t dlAllocMsk = 0;
+   uint8_t  rbgFiller = dlSf->lstRbgDfct;
+   uint8_t  noRbgs = RGSCH_CEIL((allocInfo->rbsReq + rbgFiller), cell->rbgSize);
+   //uint8_t  noRbgs = (allocInfo->rbsReq + rbgFiller)/ cell->rbgSize;
+   uint8_t  noRbs;
+   uint8_t  noLyr;
+   uint8_t  iTbs;
+   uint32_t          tb1BytesAlloc = 0;
+   uint32_t          tb2BytesAlloc = 0;
    RgSchCmnDlUe *dlUe         = RG_SCH_CMN_GET_DL_UE(ue,cell);
 
-   TRC2(rgSCHCmnNonDlfsType0Alloc);
    //if(noRbgs == 0) noRbgs = 1; /* Not required as ceilling is used above*/
 
    /* Fix for ccpu00123919*/
@@ -25067,7 +24810,7 @@ RgSchUeCb          *ue;
    {
       if (--noRbgs == 0)
       {
-         RETVOID;
+         return;
       }
       noRbs = (noRbgs * cell->rbgSize) - rbgFiller;
    }
@@ -25110,7 +24853,7 @@ RgSchUeCb          *ue;
          {
             if (--noRbgs == 0)
             {
-               RETVOID;
+               return;
             }
             noRbs = (noRbgs * cell->rbgSize) - rbgFiller;
          }
@@ -25172,7 +24915,7 @@ RgSchUeCb          *ue;
       else
       {
          allocInfo->tbInfo[1].bytesAlloc =
-            rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8;;
+            rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8;
          /* DwPts Scheduling Changes Start */
 #ifdef LTE_TDD
          if (dlSf->sfType == RG_SCH_SPL_SF_DATA)
@@ -25188,8 +24931,9 @@ RgSchUeCb          *ue;
    /* The last RBG which can be smaller than the RBG size is consedered
     * only for the first time allocation of TYPE0 UE */
    dlSf->lstRbgDfct = 0;
-   RETVOID;
+   return;
 }
+#endif
 #ifndef LTE_TDD
 
 /**
@@ -25201,36 +24945,36 @@ RgSchUeCb          *ue;
  *
  *     Processing Steps:
  *
- *  @param[in]  U8                 *rntpPtr
- *  @param[in]  U8                 startRb
- *  @param[in]  U8                 numRb
+ *  @param[in]  uint8_t                 *rntpPtr
+ *  @param[in]  uint8_t                 startRb
+ *  @param[in]  uint8_t                 numRb
  *
  *  @return Void
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnBuildRntpInfo
 (
 RgSchCellCb        *cell,
-U8                 *rntpPtr,
-U8                           startRb,
-U8                  nmbRb,
-U16                 bw
+uint8_t                 *rntpPtr,
+uint8_t                              startRb,
+uint8_t                  nmbRb,
+uint16_t                 bw
 )
 #else
 PRIVATE S16 rgSCHCmnBuildRntpInfo(cell, rntpPtr, startRb, nmbRb, bw)
 RgSchCellCb        *cell;
-U8                 *rntpPtr;
-U8                           startRb;
-U8                  nmbRb;
-U16                 bw;
+uint8_t                 *rntpPtr;
+uint8_t                              startRb;
+uint8_t                  nmbRb;
+uint16_t                 bw;
 #endif
 {
-   U16 rbPtrStartIdx;              /* Start Index of Octete Buffer to be filled */
-   U16 rbPtrEndIdx;                /* End Index of Octete Buffer to be filled */
-   U16 rbBitLoc;                   /* Bit Location to be set as 1 in the current Byte */
-   U16 nmbRbPerByte;               /* PRB's to be set in the current Byte (in case of multiple Bytes) */
+   uint16_t rbPtrStartIdx;              /* Start Index of Octete Buffer to be filled */
+   uint16_t rbPtrEndIdx;                /* End Index of Octete Buffer to be filled */
+   uint16_t rbBitLoc;                   /* Bit Location to be set as 1 in the current Byte */
+   uint16_t nmbRbPerByte;               /* PRB's to be set in the current Byte (in case of multiple Bytes) */
 
-   TRC2(rgSCHCmnBuildRntpInfo);
 
    rbPtrStartIdx = (startRb)/8;
    rbPtrEndIdx   = (startRb + nmbRb)/8;
@@ -25240,7 +24984,7 @@ U16                 bw;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
                "rgSCHCmnBuildRntpInfo():"
                "rntpPtr can't be NULLP (Memory Allocation Failed)");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    while(rbPtrStartIdx <= rbPtrEndIdx)
@@ -25271,10 +25015,9 @@ U16                 bw;
 
    /* dsfr_pal_fixes ** 25-March-2013 ** SKS ** Adding Debug logs to print RNTP */
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
-
 /**
  * @brief To update non-DLFS alloc'n parameters after TYPE2 Allocation.
  *
@@ -25286,8 +25029,8 @@ U16                 bw;
  *
  *  @param[in]  RgSchCellCb     *cell
  *  @param[in]  RgSchDlSf       *dlSf
- *  @param[in]  U8              rbStrt
- *  @param[in]  U8              numRb
+ *  @param[in]  uint8_t              rbStrt
+ *  @param[in]  uint8_t              numRb
  *
  *  @return Void
  **/
@@ -25298,8 +25041,8 @@ RgSchCellCb        *cell,
 RgSchUeCb                 *ue,
 RgSchDlSf          *dlSf,
 RgSchSFRPoolInfo   *sfrPool,
-U8                 rbStrt,
-U8                 numRb
+uint8_t                 rbStrt,
+uint8_t                 numRb
 )
 #else
 PRIVATE S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc(cell, ue, dlSf, sfrPool, rbStrt, numRb)
@@ -25307,15 +25050,14 @@ RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 RgSchDlSf          *dlSf;
 RgSchSFRPoolInfo   *sfrPool;
-U8                 rbStrt;
-U8                 numRb;
+uint8_t                 rbStrt;
+uint8_t                 numRb;
 #endif
 {
 #ifndef LTEMAC_SPS
    S16 ret;
 #endif
 
-   TRC2(rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc);
    dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize);
    sfrPool->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize);
    
@@ -25339,7 +25081,7 @@ U8                 numRb;
             {
                RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():"
                         "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId);
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
          }
       }
@@ -25351,7 +25093,7 @@ U8                 numRb;
          {
             RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():"
                      "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId);
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
    }
@@ -25359,7 +25101,7 @@ U8                 numRb;
    sfrPool->bwAlloced += numRb;
 #endif 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -25396,14 +25138,13 @@ RgSchSFRPoolInfo   *poolInfo;
 RgSchDlRbAlloc     *allocInfo;
 #endif
 {
-   U32 dlAllocMsk = 0;
-   U8  rbgFiller = 0;
-   U8  noRbgs = 0;
-   U8  noRbs;
-   U8  noLyr;
-   U8  iTbs;
+   uint32_t dlAllocMsk = 0;
+   uint8_t  rbgFiller = 0;
+   uint8_t  noRbgs = 0;
+   uint8_t  noRbs;
+   uint8_t  noLyr;
+   uint8_t  iTbs;
 
-   TRC2(rgSCHCmnNonDlfsSFRPoolType0Alloc);
 
    if (poolInfo->poolstartRB + poolInfo->bw == dlSf->bw)
    {
@@ -25425,7 +25166,7 @@ RgSchDlRbAlloc     *allocInfo;
    {
       if (--noRbgs == 0)
       {
-         RETVOID;
+         return;
       }
       noRbs = (noRbgs * cell->rbgSize) - rbgFiller;
    }
@@ -25480,16 +25221,16 @@ RgSchDlRbAlloc     *allocInfo;
       else
       {
          allocInfo->tbInfo[1].bytesAlloc =
-            rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8;;
+            rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8;
       }
    }
 
    /* The last RBG which can be smaller than the RBG size is consedered
     * only for the first time allocation of TYPE0 UE */
    dlSf->lstRbgDfct = 0;
-   RETVOID;
+   return;
 }
-
+#endif
 /**
  * @brief Computes RNTP Info for a subframe.
  *
@@ -25517,14 +25258,13 @@ RgSchCellCb       *cell;
 RgSchDlSf          *dlSf;
 #endif
 {
-   PRIVATE U16 samples = 0;
-   U16 i;
-   U16 bwBytes = (dlSf->bw-1)/8;
+   PRIVATE uint16_t samples = 0;
+   uint16_t i;
+   uint16_t bwBytes = (dlSf->bw-1)/8;
    RgrLoadInfIndInfo *rgrLoadInf;
-   U16 len;
-   U16 ret     = ROK;
+   uint16_t len;
+   uint16_t ret     = ROK;
 
-   TRC2(rgSCHCmnNonDlfsDsfrRntpComp);
 
    len = (dlSf->bw % 8 == 0) ? dlSf->bw/8 : dlSf->bw/8 + 1;
 
@@ -25545,7 +25285,7 @@ RgSchDlSf          *dlSf;
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Could not "
             "allocate memory for sending LoadInfo");
-         RETVOID;  
+         return;  
       }
      
       rgrLoadInf->u.rntpInfo.pres = cell->rntpAggrInfo.pres;
@@ -25567,7 +25307,7 @@ RgSchDlSf          *dlSf;
                   "rgSCHUtlRgrLoadInfInd() returned RFAILED");
       }
 
-      cmMemset(cell->rntpAggrInfo.val,0,len);
+      memset(cell->rntpAggrInfo.val,0,len);
       samples = 0;
    }
  } 
@@ -25587,26 +25327,27 @@ RgSchDlSf          *dlSf;
  *  @param[in]  RgSchCellCb     *cell
  *  @param[in]  RgSchUeCb       *ue
  *  @param[in]  RgSchDlSf       *dlSf
- *  @param[out] U8              *isDlBwAvail
+ *  @param[out] uint8_t              *isDlBwAvail
  *
  *  @return  S16
  *      -# ROK
  *      -# RFAILED
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 RgSchDlSf          *dlSf,
-U8                 *isDlBwAvail
+uint8_t                 *isDlBwAvail
 )
 #else
 PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 RgSchDlSf          *dlSf;
-U8                 *isDlBwAvail;
+uint8_t                 *isDlBwAvail;
 #endif
 {
    RgSchDlRbAlloc  *allocInfo;
@@ -25614,7 +25355,6 @@ U8                 *isDlBwAvail;
    Bool isUECellEdge;
    RgSchSFRPoolInfo *sfrpoolInfo = NULLP;
 
-   TRC2(rgSCHCmnSFRNonDlfsUeRbAlloc);
 
    isUECellEdge = RG_SCH_CMN_IS_UE_CELL_EDGE(ue);
 
@@ -25635,7 +25375,7 @@ U8                 *isDlBwAvail;
       {
          *isDlBwAvail = FALSE;
       }
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if (dlUe->proc->tbInfo[0].isAckNackDtx == TFU_HQFDB_DTX || dlUe->proc->tbInfo[1].isAckNackDtx)
@@ -25650,7 +25390,7 @@ U8                 *isDlBwAvail;
    if (!(allocInfo->pdcch))
    {
       /* Returning ROK since PDCCH might be available for another UE and further allocations could be done */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
 #ifdef LTEMAC_SPS
@@ -25662,7 +25402,7 @@ U8                 *isDlBwAvail;
       allocInfo->allocInfo.raType2.isLocal = TRUE;
       /* rg004.201 patch - ccpu00109921 fix end */
       /* MS_FIX for ccpu00123918*/
-      allocInfo->allocInfo.raType2.rbStart = (U8)sfrpoolInfo->type2Start;
+      allocInfo->allocInfo.raType2.rbStart = (uint8_t)sfrpoolInfo->type2Start;
       allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq;
       /* rg007.201 - Changes for MIMO feature addition */
       /* rg008.201 - Removed dependency on MIMO compile-time flag */
@@ -25691,8 +25431,9 @@ U8                 *isDlBwAvail;
    dlSf->bwAlloced += allocInfo->rbsReq;
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }
+#endif
 /* LTE_ADV_FLAG_REMOVED_END */
 #endif /* LTE_TDD */
 
@@ -25709,7 +25450,7 @@ U8                 *isDlBwAvail;
  *  @param[in]  RgSchCellCb     *cell
  *  @param[in]  RgSchUeCb       *ue
  *  @param[in]  RgSchDlSf       *dlSf
- *  @param[out] U8              *isDlBwAvail
+ *  @param[out] uint8_t              *isDlBwAvail
  *
  *  @return  S16
  *      -# ROK
@@ -25721,22 +25462,21 @@ PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 RgSchDlSf          *dlSf,
-U8                 *isDlBwAvail
+uint8_t                 *isDlBwAvail
 )
 #else
 PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 RgSchDlSf          *dlSf;
-U8                 *isDlBwAvail;
+uint8_t                 *isDlBwAvail;
 #endif
 {
    RgSchDlRbAlloc  *allocInfo;
    RgSchCmnDlUe    *dlUe;
 #ifdef LAA_DBG
-   U32            dbgRbsReq = 0;
+   uint32_t            dbgRbsReq = 0;
 #endif
-   TRC2(rgSCHCmnNonDlfsUeRbAlloc);
 
 #ifdef RG_5GTF
    RgSch5gtfUeCb  *ue5gtfCb = &(ue->ue5gtfCb);
@@ -25752,7 +25492,7 @@ U8                 *isDlBwAvail;
          "5GTF_ERROR : vrbg allocated > 25 :ue (%u)",
          ue->ueId);
           printf("5GTF_ERROR vrbg allocated > 25\n");
-               RETVALUE(RFAILED);
+               return RFAILED;
        }
 
    if (dlUe->proc->tbInfo[0].isAckNackDtx == TFU_HQFDB_DTX 
@@ -25772,7 +25512,7 @@ U8                 *isDlBwAvail;
          "5GTF_ERROR : PDCCH allocation failed :ue (%u)",
          ue->ueId);
           printf("5GTF_ERROR PDCCH allocation failed\n");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #ifdef RG_5GTF
        //maxPrb = RGSCH_MIN((allocInfo->vrbgReq * MAX_5GTF_VRBG_SIZE), ue5gtfCb->maxPrb);
@@ -25796,7 +25536,7 @@ U8                 *isDlBwAvail;
        allocInfo->tbInfo[0].bytesAlloc = allocInfo->tbInfo[0].bytesReq;
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef RGR_V1
@@ -25815,7 +25555,7 @@ U8                 *isDlBwAvail;
  *
  *  @param[in]      RgSchCellCb         *cell
  *  @param[in, out] RgSchCmnCcchSduRbAlloc *allocInfo
- *  @param[in]      U8                  isRetx
+ *  @param[in]      uint8_t                  isRetx
  *
  *  @return  Void
  **/
@@ -25824,13 +25564,13 @@ PRIVATE Void rgSCHCmnNonDlfsCcchSduAlloc
 (
 RgSchCellCb         *cell,
 RgSchCmnCcchSduRbAlloc *allocInfo,
-U8                  isRetx
+uint8_t                  isRetx
 )
 #else
 PRIVATE Void rgSCHCmnNonDlfsCcchSduAlloc(cell, allocInfo, isRetx)
 RgSchCellCb         *cell;
 RgSchCmnCcchSduRbAlloc *allocInfo;
-U8                  isRetx;
+uint8_t                  isRetx;
 #endif
 {
    S16             ret;
@@ -25842,7 +25582,6 @@ U8                  isRetx;
    RgSchDlSf       *dlSf           = allocInfo->ccchSduDlSf;
    RgSchUeCb       *ueCb           = NULLP;
    RgSchDlHqProcCb *hqP            = NULLP;
-   TRC2(rgSCHCmnNonDlfsCcchSduAlloc);
 
    if (isRetx)
    {
@@ -25881,7 +25620,7 @@ U8                  isRetx;
             cmLListAdd2Tail(nonSchdCcchSduLst, schdLnkNode);
             toBeSchdLnk = toBeSchdLnk->next;
          } while(toBeSchdLnk);
-         RETVOID;
+         return;
       }
 
       /* Allocation successful: Add UE to the scheduled list */
@@ -25889,7 +25628,7 @@ U8                  isRetx;
    }
 
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -25927,7 +25666,6 @@ RgSchDlSf          *dlSf;
    RgSchDlRbAlloc  *allocInfo;
    RgSchCmnDlUe         *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell);
 
-   TRC2(rgSCHCmnNonDlfsCcchSduRbAlloc);
 
 
    allocInfo =  RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb,cell);
@@ -25942,7 +25680,7 @@ RgSchDlSf          *dlSf;
       (allocInfo->rbsReq > (dlSf->bw - dlSf->bwAlloced)))
 #endif
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Retrieve PDCCH */
    /* DTX Changes: One Variable is passed to check whether it is DTX or Not */
@@ -25959,7 +25697,7 @@ RgSchDlSf          *dlSf;
    if (!(allocInfo->pdcch))
    {
       /* Returning RFAILED since PDCCH not available for any CCCH allocations */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Update allocation information */
@@ -25969,7 +25707,7 @@ RgSchDlSf          *dlSf;
 
       /*Fix for ccpu00123918*/
       /* Push this harq process back to the free queue */
-      allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start;
+      allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start;
       allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq;
       allocInfo->rbsAlloc = allocInfo->rbsReq;
       allocInfo->tbInfo[0].bytesAlloc = allocInfo->tbInfo[0].bytesReq;
@@ -25995,7 +25733,7 @@ RgSchDlSf          *dlSf;
    /* ccpu00131941 - bwAlloced is updated from SPS bandwidth */  
 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
@@ -26032,7 +25770,6 @@ RgSchDlSf          *dlSf;
 #endif
 {
    RgSchDlRbAlloc  *allocInfo;
-   TRC2(rgSCHCmnNonDlfsMsg4RbAlloc);
 
 
    allocInfo =  RG_SCH_CMN_GET_ALLOCCB_FRM_RACB(raCb);
@@ -26045,7 +25782,7 @@ RgSchDlSf          *dlSf;
          "5GTF_ERROR : vrbg allocated > 25 :ue (%u)",
          raCb->ue->ueId);
           printf("5GTF_ERROR vrbg allocated > 25\n");
-               RETVALUE(RFAILED);
+               return RFAILED;
        }
 #endif
 #ifdef LTEMAC_SPS
@@ -26057,7 +25794,7 @@ RgSchDlSf          *dlSf;
 #endif
    {
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* DTX Changes: One Variable is passed to check whether it is DTX or Not */
@@ -26072,7 +25809,7 @@ RgSchDlSf          *dlSf;
    if (!(allocInfo->pdcch))
    {
       /* Returning RFAILED since PDCCH not available for any CCCH allocations */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
 #ifndef RG_5GTF
@@ -26086,7 +25823,7 @@ RgSchDlSf          *dlSf;
 
 
        /*Fix for ccpu00123918*/
-       allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start;
+       allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start;
        allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq;
        /* LTE_ADV_FLAG_REMOVED_START */
 #ifndef LTE_TDD
@@ -26132,7 +25869,7 @@ RgSchDlSf          *dlSf;
 
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -26149,7 +25886,7 @@ RgSchDlSf          *dlSf;
  *
  *  @param[in]      RgSchCellCb         *cell
  *  @param[in, out] RgSchCmnMsg4RbAlloc *allocInfo
- *  @param[in]      U8                  isRetx
+ *  @param[in]      uint8_t                  isRetx
  *
  *  @return  Void
  **/
@@ -26158,13 +25895,13 @@ PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc
 (
 RgSchCellCb         *cell,
 RgSchCmnMsg4RbAlloc *allocInfo,
-U8                  isRetx
+uint8_t                  isRetx
 )
 #else
 PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc(cell, allocInfo, isRetx)
 RgSchCellCb         *cell;
 RgSchCmnMsg4RbAlloc *allocInfo;
-U8                  isRetx;
+uint8_t                  isRetx;
 #endif
 {
    S16             ret;
@@ -26176,7 +25913,6 @@ U8                  isRetx;
    RgSchDlSf       *dlSf           = allocInfo->msg4DlSf;
    RgSchRaCb       *raCb           = NULLP;
    RgSchDlHqProcCb *hqP            = NULLP;
-   TRC2(rgSCHCmnNonDlfsMsg4Alloc);
 
    if (isRetx)
    {
@@ -26215,7 +25951,7 @@ U8                  isRetx;
             cmLListAdd2Tail(nonSchdMsg4Lst, schdLnkNode);
             toBeSchdLnk = toBeSchdLnk->next;
          } while(toBeSchdLnk);
-         RETVOID;
+         return;
       }
 
       /* Allocation successful: Add UE to the scheduled list */
@@ -26226,7 +25962,7 @@ U8                  isRetx;
    }
 
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -26251,7 +25987,7 @@ U8                  isRetx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnNonDlfsDedRbAlloc
+Void rgSCHCmnNonDlfsDedRbAlloc
 (
 RgSchCellCb        *cell,
 RgSchCmnUeRbAlloc  *allocInfo,
@@ -26260,7 +25996,7 @@ CmLListCp          *schdHqPLst,
 CmLListCp          *nonSchdHqPLst
 )
 #else
-PUBLIC Void rgSCHCmnNonDlfsDedRbAlloc(cell, allocInfo, ueLst,
+Void rgSCHCmnNonDlfsDedRbAlloc(cell, allocInfo, ueLst,
         schdHqPLst, nonSchdHqPLst)
 RgSchCellCb        *cell;
 RgSchCmnUeRbAlloc  *allocInfo;
@@ -26275,8 +26011,7 @@ CmLListCp          *nonSchdHqPLst;
    RgSchDlSf       *dlSf         = allocInfo->dedDlSf;
    RgSchUeCb       *ue           = NULLP;
    RgSchDlHqProcCb *hqP          = NULLP;
-   U8              isDlBwAvail;
-   TRC2(rgSCHCmnNonDlfsDedRbAlloc);
+   uint8_t         isDlBwAvail;
 
 
    /* Perform allocaations  for the list */
@@ -26324,7 +26059,7 @@ CmLListCp          *nonSchdHqPLst;
       }
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -26356,20 +26091,19 @@ CmLListCp          *nonSchdHqPLst;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHCmnNonDlfsRbAlloc
+Void rgSCHCmnNonDlfsRbAlloc
 (
 RgSchCellCb           *cell,
 RgSchCmnDlRbAllocInfo *allocInfo
 )
 #else
-PUBLIC Void rgSCHCmnNonDlfsRbAlloc(cell, allocInfo)
+Void rgSCHCmnNonDlfsRbAlloc(cell, allocInfo)
 RgSchCellCb           *cell;
 RgSchCmnDlRbAllocInfo *allocInfo;
 #endif
 {
-   U8                 raRspCnt = 0;
+   uint8_t                 raRspCnt = 0;
    RgSchDlRbAlloc     *reqAllocInfo;
-   TRC2(rgSCHCmnNonDlfsRbAlloc);
 
    /* Allocate for MSG4 retransmissions */
    if (allocInfo->msg4Alloc.msg4RetxLst.count)
@@ -26477,7 +26211,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    }  
    /* LTE_ADV_FLAG_REMOVED_END */
 #endif /* LTE_TDD */
-   RETVOID;
+   return;
 }
 
 /***********************************************************
@@ -26495,38 +26229,37 @@ RgSchCmnDlRbAllocInfo *allocInfo;
  **********************************************************/
 #ifdef LTEMAC_SPS
 #ifdef ANSI
-PUBLIC U32 rgSCHCmnCalcRiv
+uint32_t rgSCHCmnCalcRiv
 (
-U8           bw,
-U8           rbStart,
-U8           numRb
+uint8_t           bw,
+uint8_t           rbStart,
+uint8_t           numRb
 )
 #else
-PUBLIC U32 rgSCHCmnCalcRiv(bw, rbStart, numRb)
-U8           bw;
-U8           rbStart;
-U8           numRb;
+uint32_t rgSCHCmnCalcRiv(bw, rbStart, numRb)
+uint8_t           bw;
+uint8_t           rbStart;
+uint8_t           numRb;
 #endif
 #else
 #ifdef ANSI
-PUBLIC U32 rgSCHCmnCalcRiv
+uint32_t rgSCHCmnCalcRiv
 (
-U8           bw,
-U8           rbStart,
-U8           numRb
+uint8_t           bw,
+uint8_t           rbStart,
+uint8_t           numRb
 )
 #else
-PUBLIC U32 rgSCHCmnCalcRiv(bw, rbStart, numRb)
-U8           bw;
-U8           rbStart;
-U8           numRb;
+uint32_t rgSCHCmnCalcRiv(bw, rbStart, numRb)
+uint8_t           bw;
+uint8_t           rbStart;
+uint8_t           numRb;
 #endif
 #endif
 {
-   U8           numRbMinus1 = numRb - 1;
-   U32          riv;
+   uint8_t           numRbMinus1 = numRb - 1;
+   uint32_t          riv;
 
-   TRC2(rgSCHCmnCalcRiv);
 
    if (numRbMinus1 <= bw/2)
    {
@@ -26536,7 +26269,7 @@ U8           numRb;
    {
       riv = bw * (bw - numRbMinus1) + (bw - rbStart - 1);
    }
-   RETVALUE(riv);
+   return (riv);
 } /* rgSCHCmnCalcRiv */
 
 #ifdef LTE_TDD
@@ -26556,7 +26289,7 @@ U8           numRb;
  *
  *  @param[in]  RgSchCellCb*           cell
  *  @param[in]  RgSchTddRachRspLst     rachRspLst[][RGSCH_NUM_SUB_FRAMES]
- *  @param[in]  U8                     raArrSz
+ *  @param[in]  uint8_t                     raArrSz
  *  @return     S16
  *
  **/
@@ -26565,25 +26298,24 @@ PRIVATE S16 rgSCHCmnDlCpyRachInfo
 (
 RgSchCellCb                *cell,
 RgSchTddRachRspLst         rachRspLst[][RGSCH_NUM_SUB_FRAMES],
-U8                         raArrSz
+uint8_t                         raArrSz
 )
 #else
 PRIVATE S16 rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz)
 RgSchCellCb                *cell;
 RgSchTddRachRspLst         rachRspLst[][RGSCH_NUM_SUB_FRAMES];
-U8                         raArrSz;
+uint8_t                         raArrSz;
 #endif
 {
-   U8                   ulDlCfgIdx = cell->ulDlCfgIdx;
-   U8                   sfNum;
+   uint8_t                   ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t                   sfNum;
    S16                  sfnIdx;
-   U16                  subfrmIdx;
-   U8                   numRfs;
-   U8                   numSubfrms;
-   U8                   sfcount;
+   uint16_t                  subfrmIdx;
+   uint8_t                   numRfs;
+   uint8_t                   numSubfrms;
+   uint8_t                   sfcount;
    S16                   ret;
 
-   TRC2(rgSCHCmnDlCpyRachInfo);
 
    /* Allocate RACH response information for each DL
     * subframe in a radio frame */
@@ -26592,7 +26324,7 @@ U8                         raArrSz;
          sizeof(RgSchTddRachRspLst));
    if (ret != ROK)
    {
-      RETVALUE(ret);
+      return (ret);
    }
 
    for(sfnIdx=raArrSz-1; sfnIdx>=0; sfnIdx--)
@@ -26647,7 +26379,7 @@ U8                         raArrSz;
          }
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 /**
@@ -26661,7 +26393,7 @@ U8                         raArrSz;
  *
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchCmnDlUe          *ueDl
- *  @param[in]  U8                    cqi
+ *  @param[in]  uint8_t                    cqi
  *
  *  @return S32 iTbs
  *
@@ -26673,20 +26405,20 @@ PRIVATE S32 rgSchCmnFetchItbs
 RgSchCellCb        *cell,
 RgSchCmnDlUe       *ueDl,
 RgSchDlSf          *subFrm,
-U8                 cqi,
-U8                 cfi,
-U8                 cwIdx,
-U8                 noLyr
+uint8_t                 cqi,
+uint8_t                 cfi,
+uint8_t                 cwIdx,
+uint8_t                 noLyr
 )
 #else
 PRIVATE S32 rgSchCmnFetchItbs (cell, ueDl, subFrm, cqi, cfi, cwIdx, noLyr)
 RgSchCellCb        *cell;
 RgSchCmnDlUe       *ueDl; 
 RgSchDlSf          *subFrm;
-U8                 cqi;
-U8                 cfi;
-U8                 cwIdx;
-U8                 noLyr;
+uint8_t                 cqi;
+uint8_t                 cfi;
+uint8_t                 cwIdx;
+uint8_t                 noLyr;
 #endif
 #else
 #ifdef ANSI
@@ -26694,19 +26426,19 @@ PRIVATE S32 rgSchCmnFetchItbs
 (
 RgSchCellCb        *cell,
 RgSchCmnDlUe       *ueDl,
-U8                 cqi,
-U8                 cfi,
-U8                 cwIdx,
-U8                 noLyr
+uint8_t                 cqi,
+uint8_t                 cfi,
+uint8_t                 cwIdx,
+uint8_t                 noLyr
 )
 #else
 PRIVATE S32 rgSchCmnFetchItbs (cell, ueDl, cqi, cfi, cwIdx, noLyr)
 RgSchCellCb        *cell;
 RgSchCmnDlUe       *ueDl; 
-U8                 cqi;
-U8                 cfi;
-U8                 cwIdx;
-U8                 noLyr;
+uint8_t                 cqi;
+uint8_t                 cfi;
+uint8_t                 cwIdx;
+uint8_t                 noLyr;
 #endif 
 #endif
 {
@@ -26714,7 +26446,6 @@ U8                 noLyr;
    RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    S32 iTbs = 0;
 
-   TRC2(rgSchCmnFetchItbs);
 
 #ifdef LTE_TDD      
    /* Special Handling for Spl Sf when CFI is 3 as 
@@ -26753,7 +26484,7 @@ U8                 noLyr;
       ueDl->laCb[cwIdx].deltaiTbs = 0;
    }
 
-   RETVALUE(iTbs);
+   return (iTbs);
 } 
 \f
 /**
@@ -26773,8 +26504,8 @@ U8                 noLyr;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -26786,8 +26517,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRb1Tb1Cw
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -26796,16 +26527,15 @@ PRIVATE Void rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWd
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    RgSchDlRbAlloc   *allocInfo;
    S16              ret;
-   U8               numRb;
-   TRC2(rgSCHCmnDlAllocTxRb1Tb1Cw);
+   uint8_t               numRb;
 
    ret = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -26827,7 +26557,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    if (ret == RFAILED)
    {
       /* If allocation couldn't be made then return */
-      RETVOID;
+      return;
    }
    /* Adding UE to RbAllocInfo TX Lst */
    rgSCHCmnDlRbInfoAddUeTx(cell, cellWdAllocInfo, ue, proc);
@@ -26838,7 +26568,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    allocInfo->vrbgReq = numRb/MAX_5GTF_VRBG_SIZE;
 #endif
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -26859,8 +26589,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -26872,8 +26602,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRb1Tb1Cw
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -26882,16 +26612,15 @@ PRIVATE Void rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cell
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    RgSchDlRbAlloc   *allocInfo;
    S16              ret;
-   U8               numRb;
-   TRC2(rgSCHCmnDlAllocRetxRb1Tb1Cw);
+   uint8_t               numRb;
 
    ret = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -26913,7 +26642,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
        * to the nonSchdTxRetxUeLst and let spfc scheduler take care of it during
        * finalization. */        
       rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-      RETVOID;
+      return;
    }
    rgSCHCmnDlRbInfoAddUeRetx(cell, cellWdAllocInfo, ue, proc);
    /* Fill UE alloc Info */
@@ -26923,7 +26652,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    allocInfo->vrbgReq = numRb/MAX_5GTF_VRBG_SIZE;
 #endif
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -26944,8 +26673,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -26957,8 +26686,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM1
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -26967,15 +26696,14 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAll
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocTxRbTM1);
    rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
-   RETVOID;
+   return;
 }
 
 \f
@@ -26996,8 +26724,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -27009,8 +26737,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM1
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -27019,15 +26747,14 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdA
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocRetxRbTM1);
    rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
-   RETVOID;
+   return;
 }
 
 \f
@@ -27048,8 +26775,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -27061,8 +26788,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM2
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -27071,15 +26798,14 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAll
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocTxRbTM2);
    rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
-   RETVOID;
+   return;
 }
 
 \f
@@ -27100,8 +26826,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -27113,8 +26839,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM2
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -27123,15 +26849,14 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdA
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocRetxRbTM2);
    rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
-   RETVOID;
+   return;
 }
 
 \f
@@ -27152,8 +26877,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -27165,8 +26890,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM3
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -27175,20 +26900,19 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAll
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
 
-   TRC2(rgSCHCmnDlAllocTxRbTM3);
 
    /* Both TBs free for TX allocation */
    rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo,\
          proc, cellWdAllocInfo);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -27209,8 +26933,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -27222,8 +26946,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM3
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -27232,14 +26956,13 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdA
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
 
-   TRC2(rgSCHCmnDlAllocRetxRbTM3);
 
    if ((proc->tbInfo[0].state == HQ_TB_NACKED) &&
          (proc->tbInfo[1].state == HQ_TB_NACKED))
@@ -27259,7 +26982,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
             proc, cellWdAllocInfo);
    }
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -27285,39 +27008,38 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *
  *  @param[in]  RgSchCellCb      *cell
  *  @param[in]  RgSchUeCb        *ue
- *  @param[out] U8               *raType
+ *  @param[out] uint8_t               *raType
  *  @return  TfuDciFormat
  *
  **/
 #ifdef ANSI
-PUBLIC TfuDciFormat rgSCHCmnSlctPdcchFrmt
+TfuDciFormat rgSCHCmnSlctPdcchFrmt
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         *raType
+uint8_t                         *raType
 )
 #else
-PUBLIC TfuDciFormat rgSCHCmnSlctPdcchFrmt(cell, ue, raType)
+TfuDciFormat rgSCHCmnSlctPdcchFrmt(cell, ue, raType)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
-U8                         *raType;
+uint8_t                         *raType;
 #endif
 {
    RgSchCmnCell   *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHCmnSlctPdcchFrmt);
 
    /* ccpu00140894- Selective DCI Format and RA type should be selected only 
     * after TX Mode transition is completed*/
    if ((cellSch->dl.isDlFreqSel) && (ue->txModeTransCmplt))
    {
       *raType = rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciRAType;
-      RETVALUE(rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciFrmt);
+      return (rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciFrmt);
    }
    else
    {
       *raType = rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciRAType;
-      RETVALUE(rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciFrmt);
+      return (rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciFrmt);
    }
 }
 
@@ -27345,8 +27067,8 @@ U8                         *raType;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -27358,8 +27080,8 @@ PRIVATE Void rgSCHCmnDlTM3RetxRetx
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -27368,21 +27090,20 @@ PRIVATE Void rgSCHCmnDlTM3RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllo
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    S16           ret;
    RgSchDlRbAlloc *allocInfo;
-   U8            numRb;
+   uint8_t            numRb;
    Bool          swpFlg;
-   U8            precInfo;
-   U8            noTxLyrs;
-   U8            precInfoAntIdx;
+   uint8_t            precInfo;
+   uint8_t            noTxLyrs;
+   uint8_t            precInfoAntIdx;
 
-   TRC2(rgSCHCmnDlTM3RetxRetx);
 
    ret = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -27398,7 +27119,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       {
          /* Allocation couldn't be made for Retx */
          rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-         RETVOID;
+         return;
       }
       /* Fix for ccpu00123927: Retransmit 2 codewords irrespective of current rank */
       noTxLyrs = proc->tbInfo[0].numLyrs + proc->tbInfo[1].numLyrs;
@@ -27426,7 +27147,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \
          precInfo, noTxLyrs, subFrm);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -27456,8 +27177,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -27469,8 +27190,8 @@ PRIVATE Void rgSCHCmnDlTM4RetxRetx
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -27479,23 +27200,22 @@ PRIVATE Void rgSCHCmnDlTM4RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllo
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    S16            ret;
    RgSchDlRbAlloc *allocInfo;
-   U8             numRb;
+   uint8_t             numRb;
    Bool           swpFlg = FALSE;
-   U8             precInfo;
+   uint8_t             precInfo;
 #ifdef FOUR_TX_ANTENNA
-   U8             precInfoAntIdx;
+   uint8_t             precInfoAntIdx;
 #endif
-   U8             noTxLyrs;
+   uint8_t             noTxLyrs;
 
-   TRC2(rgSCHCmnDlTM4RetxRetx);
 
    ret = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -27510,7 +27230,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    {
       /* Allocation couldn't be made for Retx */
       rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-      RETVOID;
+      return;
    }
    noTxLyrs = proc->tbInfo[0].numLyrs + proc->tbInfo[1].numLyrs;
    precInfo = 0; 
@@ -27537,7 +27257,7 @@ precInfo = (getPrecInfoFunc[1][precInfoAntIdx])(cell, ue, noTxLyrs, TRUE);
    RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \
          precInfo, noTxLyrs, subFrm);
 
-   RETVOID;
+   return;
 }
 
 
@@ -27596,7 +27316,6 @@ Bool                       *swpFlg;
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,proc->hqE->cell);
    RgSchDlRbAlloc  *allocInfo;
 
-   TRC2(rgSCHCmnDlSMGetAttrForTxRetx);
 
    if (proc->tbInfo[0].state == HQ_TB_NACKED)
    {
@@ -27632,7 +27351,7 @@ Bool                       *swpFlg;
          *frthrScp = allocInfo->mimoAllocInfo.hasNewTxData;
       }
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -27647,30 +27366,29 @@ Bool                       *swpFlg;
  *     Invoked by: rgSCHCmnDlGetAttrForTM3
  *
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8               numTxLyrs
+ *  @param[in]  uint8_t               numTxLyrs
  *  @param[in]  Bool             bothCwEnbld
- *  @return  U8
+ *  @return  uint8_t
  *
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnDlTM3PrecInf2
+PRIVATE uint8_t rgSCHCmnDlTM3PrecInf2
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 )
 #else
-PRIVATE U8 rgSCHCmnDlTM3PrecInf2(ue, numTxLyrs, bothCwEnbld)
+PRIVATE uint8_t rgSCHCmnDlTM3PrecInf2(ue, numTxLyrs, bothCwEnbld)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
-U8                         numTxLyrs;
+uint8_t                         numTxLyrs;
 Bool                       bothCwEnbld;
 #endif
 {
-   TRC2(rgSCHCmnDlTM3PrecInf2);
 
-   RETVALUE(0);
+   return (0);
 }
 
 \f
@@ -27686,31 +27404,30 @@ Bool                       bothCwEnbld;
  *     Invoked by: rgSCHCmnDlGetAttrForTM4
  *
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8               numTxLyrs
+ *  @param[in]  uint8_t               numTxLyrs
  *  @param[in]  Bool             bothCwEnbld
- *  @return  U8
+ *  @return  uint8_t
  *
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnDlTM4PrecInf2
+PRIVATE uint8_t rgSCHCmnDlTM4PrecInf2
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 )
 #else
-PRIVATE U8 rgSCHCmnDlTM4PrecInf2(ue, numTxLyrs, bothCwEnbld)
+PRIVATE uint8_t rgSCHCmnDlTM4PrecInf2(ue, numTxLyrs, bothCwEnbld)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
-U8                         numTxLyrs;
+uint8_t                         numTxLyrs;
 Bool                       bothCwEnbld;
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   U8            precIdx;
+   uint8_t            precIdx;
 
-   TRC2(rgSCHCmnDlTM4PrecInf2);
 
    if (ueDl->mimoInfo.ri == numTxLyrs)
    {
@@ -27759,7 +27476,7 @@ Bool                       bothCwEnbld;
    {
       precIdx = (ueDl->mimoInfo.pmi < 2)? 0:1;
    }
-   RETVALUE(precIdx);
+   return (precIdx);
 }
 
 \f
@@ -27775,30 +27492,29 @@ Bool                       bothCwEnbld;
  *     Invoked by: rgSCHCmnDlGetAttrForTM3
  *
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8               numTxLyrs
+ *  @param[in]  uint8_t               numTxLyrs
  *  @param[in]  Bool             bothCwEnbld
- *  @return  U8
+ *  @return  uint8_t
  *
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnDlTM3PrecInf4
+PRIVATE uint8_t rgSCHCmnDlTM3PrecInf4
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 )
 #else
-PRIVATE U8 rgSCHCmnDlTM3PrecInf4(ue, numTxLyrs, bothCwEnbld)
+PRIVATE uint8_t rgSCHCmnDlTM3PrecInf4(ue, numTxLyrs, bothCwEnbld)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
-U8                         numTxLyrs;
+uint8_t                         numTxLyrs;
 Bool                       bothCwEnbld;
 #endif
 {
-   U8            precIdx;
+   uint8_t            precIdx;
 
-   TRC2(rgSCHCmnDlTM3PrecInf4);
 
    if (bothCwEnbld)
    {
@@ -27808,7 +27524,7 @@ Bool                       bothCwEnbld;
    {
       precIdx = 1;
    }
-   RETVALUE(precIdx);
+   return (precIdx);
 }
 
 \f
@@ -27824,31 +27540,30 @@ Bool                       bothCwEnbld;
  *     Invoked by: rgSCHCmnDlGetAttrForTM4
  *
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8               numTxLyrs
+ *  @param[in]  uint8_t               numTxLyrs
  *  @param[in]  Bool             bothCwEnbld
- *  @return  U8
+ *  @return  uint8_t
  *
  **/
 #ifdef ANSI
-PRIVATE U8 rgSCHCmnDlTM4PrecInf4
+PRIVATE uint8_t rgSCHCmnDlTM4PrecInf4
 (
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
-U8                         numTxLyrs,
+uint8_t                         numTxLyrs,
 Bool                       bothCwEnbld
 )
 #else
-PRIVATE U8 rgSCHCmnDlTM4PrecInf4(cell, ue, numTxLyrs, bothCwEnbld)
+PRIVATE uint8_t rgSCHCmnDlTM4PrecInf4(cell, ue, numTxLyrs, bothCwEnbld)
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
-U8                         numTxLyrs;
+uint8_t                         numTxLyrs;
 Bool                       bothCwEnbld;
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   U8            precInfoBaseIdx, precIdx;
+   uint8_t            precInfoBaseIdx, precIdx;
 
-   TRC2(rgSCHCmnDlTM4PrecInf4);
 
    precInfoBaseIdx  = (ue->mimoInfo.puschFdbkVld)? (16):
       (ueDl->mimoInfo.pmi);
@@ -27861,7 +27576,7 @@ Bool                       bothCwEnbld;
       precInfoBaseIdx += 1;
       precIdx = precInfoBaseIdx + (numTxLyrs-1)*17;
    }
-   RETVALUE(precIdx);
+   return (precIdx);
 }
 
 \f
@@ -27892,10 +27607,10 @@ Bool                       bothCwEnbld;
  *
  *  @param[in]  RgSchUeCb        *ue
  *  @param[in]  RgSchDlHqProcCb  *proc
- *  @param[out] U8               *numTxLyrs
+ *  @param[out] uint8_t               *numTxLyrs
  *  @param[out] Bool             *isTraDiv
- *  @param[out] U8               *prcdngInf
- *  @param[out] U8               *raType
+ *  @param[out] uint8_t               *prcdngInf
+ *  @param[out] uint8_t               *raType
  *  @return  Void
  *
  **/
@@ -27905,14 +27620,14 @@ PRIVATE Void rgSCHCmnDlGetAttrForTM3
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *proc,
-U8                         *numTxLyrs,
+uint8_t                         *numTxLyrs,
 TfuDciFormat               *dciFrmt,
-U8                         *prcdngInf,
+uint8_t                         *prcdngInf,
 RgSchDlHqTbCb              **retxTb,
 RgSchDlHqTbCb              **txTb,
 Bool                       *frthrScp,
 Bool                       *swpFlg,
-U8                         *raType
+uint8_t                         *raType
 )
 #else
 PRIVATE Void rgSCHCmnDlGetAttrForTM3(cell, ue, proc, numTxLyrs, dciFrmt,\
@@ -27920,20 +27635,19 @@ PRIVATE Void rgSCHCmnDlGetAttrForTM3(cell, ue, proc, numTxLyrs, dciFrmt,\
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlHqProcCb            *proc;
-U8                         *numTxLyrs;
+uint8_t                         *numTxLyrs;
 TfuDciFormat               *dciFrmt;
-U8                         *prcdngInf;
+uint8_t                         *prcdngInf;
 RgSchDlHqTbCb              **retxTb;
 RgSchDlHqTbCb              **txTb;
 Bool                       *frthrScp;
 Bool                       *swpFlg;
-U8                         *raType;
+uint8_t                         *raType;
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   U8            precInfoAntIdx;
+   uint8_t            precInfoAntIdx;
 
-   TRC2(rgSCHCmnDlGetAttrForTM3);
 
    /* Avoiding Tx-Retx for LAA cell as firstSchedTime is associated with 
       HQP */
@@ -27969,7 +27683,7 @@ U8                         *raType;
       *numTxLyrs = 1;
       *frthrScp = FALSE;
       *prcdngInf = 0;
-      RETVOID;
+      return;
    }
 
    /* Determine the 2 TB transmission attributes */
@@ -28026,7 +27740,7 @@ U8                         *raType;
             *raType = RG_SCH_CMN_RA_TYPE0;
          }
          *prcdngInf = 0;
-         RETVOID;
+         return;
       }
       else /* NumAntPorts == 4 */
       {
@@ -28039,7 +27753,7 @@ U8                         *raType;
             *raType = RG_SCH_CMN_RA_TYPE0;
             precInfoAntIdx = cell->numTxAntPorts/2 - 1;
             *prcdngInf = (getPrecInfoFunc[0][precInfoAntIdx])(cell, ue, *numTxLyrs, *frthrScp);
-            RETVOID;
+            return;
          }
          else
          {
@@ -28056,12 +27770,12 @@ U8                         *raType;
                *raType = RG_SCH_CMN_RA_TYPE0;
             }
             *prcdngInf = 0;
-            RETVOID;
+            return;
          }
       }
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -28093,10 +27807,10 @@ U8                         *raType;
  *
  *  @param[in]  RgSchUeCb        *ue
  *  @param[in]  RgSchDlHqProcCb  *proc
- *  @param[out] U8               *numTxLyrs
+ *  @param[out] uint8_t               *numTxLyrs
  *  @param[out] Bool             *isTraDiv
- *  @param[out] U8               *prcdngInf
- *  @param[out] U8               *raType
+ *  @param[out] uint8_t               *prcdngInf
+ *  @param[out] uint8_t               *raType
  *  @return  Void
  *
  **/
@@ -28106,14 +27820,14 @@ PRIVATE Void rgSCHCmnDlGetAttrForTM4
 RgSchCellCb                *cell,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *proc,
-U8                         *numTxLyrs,
+uint8_t                         *numTxLyrs,
 TfuDciFormat               *dciFrmt,
-U8                         *prcdngInf,
+uint8_t                         *prcdngInf,
 RgSchDlHqTbCb              **retxTb,
 RgSchDlHqTbCb              **txTb,
 Bool                       *frthrScp,
 Bool                       *swpFlg,
-U8                         *raType
+uint8_t                         *raType
 )
 #else
 PRIVATE Void rgSCHCmnDlGetAttrForTM4(cell, ue, proc, numTxLyrs, dciFrmt,\
@@ -28121,20 +27835,19 @@ PRIVATE Void rgSCHCmnDlGetAttrForTM4(cell, ue, proc, numTxLyrs, dciFrmt,\
 RgSchCellCb                *cell;
 RgSchUeCb                  *ue;
 RgSchDlHqProcCb            *proc;
-U8                         *numTxLyrs;
+uint8_t                         *numTxLyrs;
 TfuDciFormat               *dciFrmt;
-U8                         *prcdngInf;
+uint8_t                         *prcdngInf;
 RgSchDlHqTbCb              **retxTb;
 RgSchDlHqTbCb              **txTb;
 Bool                       *frthrScp;
 Bool                       *swpFlg;
-U8                         *raType;
+uint8_t                         *raType;
 #endif
 {
    RgSchCmnDlUe  *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
-   U8 precInfoAntIdx;
+   uint8_t precInfoAntIdx;
 
-   TRC2(rgSCHCmnDlGetAttrForTM4);
 
    *frthrScp = FALSE;
    /* Integration_fix: SPS Proc shall always have only one Cw */
@@ -28169,7 +27882,7 @@ U8                         *raType;
       *numTxLyrs = 1;
       *frthrScp = FALSE;
       *prcdngInf = 0;
-      RETVOID;
+      return;
    }
 
    if (ueDl->mimoInfo.ri == 1)
@@ -28189,7 +27902,7 @@ U8                         *raType;
       *raType = RG_SCH_CMN_RA_TYPE0;
       *frthrScp = FALSE;
       *prcdngInf = 0; /*When RI= 1*/
-      RETVOID;
+      return;
    }
 
    /* Determine the 2 TB transmission attributes */
@@ -28221,7 +27934,7 @@ U8                         *raType;
          *numTxLyrs = 1;
          *prcdngInf = (getPrecInfoFunc[1][cell->numTxAntPorts/2 - 1])\
                       (cell, ue, *numTxLyrs, *frthrScp);
-         RETVOID;
+         return;
       }
       else /* NumAntPorts == 4 */
       {
@@ -28233,7 +27946,7 @@ U8                         *raType;
             precInfoAntIdx = cell->numTxAntPorts/2 - 1;
             *prcdngInf = (getPrecInfoFunc[1][precInfoAntIdx])\
                          (cell, ue, *numTxLyrs, *frthrScp);
-            RETVOID;
+            return;
          }
          else
          {
@@ -28243,12 +27956,12 @@ U8                         *raType;
             precInfoAntIdx = cell->numTxAntPorts/2 - 1;
             *prcdngInf = (getPrecInfoFunc[1][precInfoAntIdx])\
                          (cell, ue, *numTxLyrs, *frthrScp);
-            RETVOID;
+            return;
          }
       }
    }
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -28276,8 +27989,8 @@ U8                         *raType;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -28289,8 +28002,8 @@ PRIVATE Void rgSCHCmnDlTM3TxRetx
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28299,22 +28012,21 @@ PRIVATE Void rgSCHCmnDlTM3TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocI
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    S16              ret;
    RgSchDlRbAlloc   *allocInfo;
-   U8               numRb;
+   uint8_t               numRb;
    RgSchDlHqTbCb    *retxTb, *txTb;
    Bool             frthrScp;
    Bool             swpFlg;
-   U8               prcdngInf;
-   U8               numTxLyrs;
+   uint8_t               prcdngInf;
+   uint8_t               numTxLyrs;
 
-   TRC2(rgSCHCmnDlTM3TxRetx);
    frthrScp = FALSE;
 
    ret = ROK;
@@ -28337,7 +28049,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       {
          /* Allocation couldn't be made for Retx */
          rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-         RETVOID;
+         return;
       }
       /* Adding UE to RbAllocInfo RETX-TX Lst */
       rgSCHCmnDlRbInfoAddUeRetxTx(cell, cellWdAllocInfo, ue, proc);
@@ -28350,7 +28062,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       {
          /* Allocation couldn't be made for Retx */
          rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-         RETVOID;
+         return;
       }
 #ifdef LTEMAC_SPS
       if (!RG_SCH_CMN_SPS_DL_IS_SPS_HQP(proc))
@@ -28363,7 +28075,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \
          prcdngInf, numTxLyrs, subFrm);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -28391,8 +28103,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -28404,8 +28116,8 @@ PRIVATE Void rgSCHCmnDlTM4TxRetx
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28414,22 +28126,21 @@ PRIVATE Void rgSCHCmnDlTM4TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocI
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    S16              ret;
    RgSchDlRbAlloc   *allocInfo;
-   U8               numRb;
+   uint8_t               numRb;
    RgSchDlHqTbCb    *retxTb, *txTb;
    Bool             frthrScp;
    Bool             swpFlg;
-   U8               prcdngInf;
-   U8               numTxLyrs;
+   uint8_t               prcdngInf;
+   uint8_t               numTxLyrs;
 
-   TRC2(rgSCHCmnDlTM4TxRetx);
 
    ret = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -28450,7 +28161,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
           * with the proc to the nonSchdTxRetxUeLst and let spfc scheduler
           *  take care of it during finalization. */       
          rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-         RETVOID;
+         return;
       }
       /* Adding UE to RbAllocInfo RETX-TX Lst */
       rgSCHCmnDlRbInfoAddUeRetxTx(cell, cellWdAllocInfo, ue, proc);
@@ -28463,7 +28174,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       {
          /* Allocation couldn't be made for Retx */
          rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-         RETVOID;
+         return;
       }
 #ifdef LTEMAC_SPS
       if (!RG_SCH_CMN_SPS_DL_IS_SPS_HQP(proc))
@@ -28476,7 +28187,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \
          prcdngInf, numTxLyrs, subFrm)
 
-      RETVOID;
+      return;
 }
 
 \f
@@ -28509,8 +28220,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -28522,8 +28233,8 @@ PRIVATE Void rgSCHCmnDlTM3TxTx
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28532,21 +28243,20 @@ PRIVATE Void rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInf
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    RgSchCmnDlUe     *ueDl;
    RgSchDlRbAlloc   *allocInfo;
-   U8               numRb;
-   U8               noTxLyrs;
-   U8               precInfo;
+   uint8_t               numRb;
+   uint8_t               noTxLyrs;
+   uint8_t               precInfo;
    S16              ret;
-   U8               precInfoAntIdx;
+   uint8_t               precInfoAntIdx;
 
-   TRC2(rgSCHCmnDlTM3TxTx);
 
    ret = ROK;
    ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -28572,7 +28282,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       if (ret == RFAILED)
       {
          /* If allocation couldn't be made then return */
-         RETVOID;
+         return;
       }
       noTxLyrs = 1;
       precInfo = 0; /* TD */
@@ -28587,7 +28297,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       if (ret == RFAILED)
       {
          /* If allocation couldn't be made then return */
-         RETVOID;
+         return;
       }
       noTxLyrs = ueDl->mimoInfo.ri;
       precInfoAntIdx = cell->numTxAntPorts/2 - 1;
@@ -28606,7 +28316,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, FALSE, \
          precInfo, noTxLyrs, subFrm);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -28643,8 +28353,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -28656,8 +28366,8 @@ PRIVATE Void rgSCHCmnDlTM4TxTx
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28666,21 +28376,20 @@ PRIVATE Void rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInf
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
    RgSchCmnDlUe     *ueDl;
    RgSchDlRbAlloc   *allocInfo;
-   U8               numRb;
-   U8               precInfo;
-   U8               noTxLyrs;
-   U8               precInfoAntIdx;
+   uint8_t               numRb;
+   uint8_t               precInfo;
+   uint8_t               noTxLyrs;
+   uint8_t               precInfoAntIdx;
    S16              ret;
 
-   TRC2(rgSCHCmnDlTM4TxTx);
 
    ret       = ROK;
    ueDl      = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -28707,7 +28416,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       if (ret == RFAILED)
       {
          /* If allocation couldn't be made then return */
-         RETVOID;
+         return;
       }
       noTxLyrs = 1;
       precInfo = 0; /* TD */
@@ -28725,7 +28434,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
          if (ret == RFAILED)
          {
             /* If allocation couldn't be made then return */
-            RETVOID;
+            return;
          }
          noTxLyrs = 1;
          precInfo = 0; /* PrecInfo as 0 for RI=1*/
@@ -28737,7 +28446,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
          if (ret == RFAILED)
          {
             /* If allocation couldn't be made then return */
-            RETVOID;
+            return;
          }
          noTxLyrs = ueDl->mimoInfo.ri;
          precInfoAntIdx = cell->numTxAntPorts/2 - 1; 
@@ -28758,7 +28467,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, FALSE, \
          precInfo, noTxLyrs, subFrm);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -28780,8 +28489,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -28793,8 +28502,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM4
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28803,19 +28512,18 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAll
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocTxRbTM4);
 
    /* Both TBs free for TX allocation */
    rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo,\
          proc, cellWdAllocInfo);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -28837,8 +28545,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  Void
@@ -28850,8 +28558,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM4
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28860,13 +28568,12 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdA
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocRetxRbTM4);
 
    if ((proc->tbInfo[0].state == HQ_TB_NACKED) &&
          (proc->tbInfo[1].state == HQ_TB_NACKED))
@@ -28883,7 +28590,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
             proc, cellWdAllocInfo);
    }
 
-   RETVOID;
+   return;
 }
 
 #ifdef RG_UNUSED
@@ -28905,8 +28612,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -28918,8 +28625,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM5
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28928,17 +28635,16 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAll
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocTxRbTM5);
 #if (ERRCLASS & ERRCLS_DEBUG)
    RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId);
 #endif
-   RETVOID;
+   return;
 }
 
 \f
@@ -28959,8 +28665,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -28972,8 +28678,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM5
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -28982,17 +28688,16 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdA
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocRetxRbTM5);
 #if (ERRCLASS & ERRCLS_DEBUG)
    RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId);
 #endif
-   RETVOID;
+   return;
 }
 #endif
 
@@ -29014,8 +28719,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -29027,8 +28732,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM6
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -29037,8 +28742,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAll
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
@@ -29046,9 +28751,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    RgSchDlRbAlloc *allocInfo;
    RgSchCmnDlUe   *ueDl;
    S16            ret;
-   U8             numRb;
+   uint8_t             numRb;
 
-   TRC2(rgSCHCmnDlAllocTxRbTM6);
 
    ret       = ROK;
    ueDl      = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -29075,7 +28779,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    if (ret == RFAILED)
    {
       /* If allocation couldn't be made then return */
-      RETVOID;
+      return;
    }
    
 #ifdef LTEMAC_SPS
@@ -29088,7 +28792,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    /* Fill UE alloc Info */
    allocInfo->rbsReq = numRb;
    allocInfo->dlSf   = subFrm;
-   RETVOID;
+   return;
 }
 
 \f
@@ -29109,8 +28813,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -29122,8 +28826,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM6
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -29132,8 +28836,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdA
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
@@ -29141,9 +28845,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    RgSchDlRbAlloc *allocInfo;
    RgSchCmnDlUe   *ueDl;
    S16            ret;
-   U8             numRb;
+   uint8_t             numRb;
 
-   TRC2(rgSCHCmnDlAllocRetxRbTM6);
 
    ret       = ROK;
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -29174,14 +28877,14 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    {
       /* Allocation couldn't be made for Retx */
       rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc);
-      RETVOID;
+      return;
    }
    /* Adding UE to allocInfo RETX Lst */
    rgSCHCmnDlRbInfoAddUeRetx(cell, cellWdAllocInfo, ue, proc);
    /* Fill UE alloc Info */
    allocInfo->rbsReq = numRb;
    allocInfo->dlSf   = subFrm;
-   RETVOID;
+   return;
 }
 
 \f
@@ -29202,8 +28905,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -29215,8 +28918,8 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM7
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -29225,15 +28928,14 @@ PRIVATE Void rgSCHCmnDlAllocTxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAll
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocTxRbTM7);
    rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
-   RETVOID;
+   return;
 }
 
 \f
@@ -29254,8 +28956,8 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return Void
@@ -29267,8 +28969,8 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM7
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
@@ -29277,15 +28979,14 @@ PRIVATE Void rgSCHCmnDlAllocRetxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdA
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   TRC2(rgSCHCmnDlAllocRetxRbTM7);
    rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo);
-   RETVOID;
+   return;
 }
 
 \f
@@ -29303,40 +29004,39 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  S16
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnDlAllocTxRb
+S16 rgSCHCmnDlAllocTxRb
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
 #else
-PUBLIC S16 rgSCHCmnDlAllocTxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
+S16 rgSCHCmnDlAllocTxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   U32                     newSchBits = 0;
-   U32                     prevSchBits = 0;
+   uint32_t                     newSchBits = 0;
+   uint32_t                     prevSchBits = 0;
    RgSchDlRbAlloc          *allocInfo;
 
-   TRC2(rgSCHCmnDlAllocTxRb);
 
    if ( !RGSCH_TIMEINFO_SAME((cell->crntTime),(ue->dl.lstSchTime) ))
    {
@@ -29377,7 +29077,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /* DwPTS Scheduling Changes Start */
@@ -29401,14 +29101,14 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *
  **/
 #ifdef ANSI
-PUBLIC Bool rgSCHCmnRetxAvoidTdd 
+Bool rgSCHCmnRetxAvoidTdd 
 (
 RgSchDlSf                  *curSf,
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *proc
 )
 #else
-PUBLIC Bool rgSCHCmnRetxAvoidTdd(curSf, cell, proc)
+Bool rgSCHCmnRetxAvoidTdd(curSf, cell, proc)
 RgSchDlSf                  *curSf;
 RgSchCellCb                *cell;
 RgSchDlHqProcCb            *proc;
@@ -29416,7 +29116,6 @@ RgSchDlHqProcCb            *proc;
 {
    RgSchTddSfType   txSfType = 0;
 
-   TRC2(rgSCHCmnRetxAvoidTdd);
 
    /* Get the RBs of TB that will be retransmitted */
    if (proc->tbInfo[0].state == HQ_TB_NACKED)
@@ -29428,7 +29127,7 @@ RgSchDlHqProcCb            *proc;
       /* Avoid re-transmission on Normal SF when the corresponding TB wss transmitted on SPCL SF */
       if(txSfType <= RG_SCH_SPL_SF_DATA && curSf->sfType >= RG_SCH_DL_SF_0)
       {
-         RETVALUE(TRUE);
+         return (TRUE);
       }
 #endif
 #endif
@@ -29444,7 +29143,7 @@ RgSchDlHqProcCb            *proc;
       /* Avoid re-transmission on Normal SF when the corresponding TB wss tranmitted on SPCL SF */
       if(txSfType <= RG_SCH_SPL_SF_DATA && curSf->sfType >= RG_SCH_DL_SF_0)
       {
-        RETVALUE(TRUE);
+        return (TRUE);
       }
 #endif
 #endif
@@ -29453,11 +29152,11 @@ RgSchDlHqProcCb            *proc;
    if (txSfType > curSf->sfType)
    {
       /* Avoid retx */
-      RETVALUE(TRUE);
+      return (TRUE);
    }
    
    /* Allow Retx */
-   RETVALUE(FALSE);
+   return (FALSE);
 }
 
 #else
@@ -29482,22 +29181,21 @@ RgSchDlHqProcCb            *proc;
  *
  **/
 #ifdef ANSI
-PUBLIC Bool rgSCHCmnRetxAllocAvoid 
+Bool rgSCHCmnRetxAllocAvoid 
 (
 RgSchDlSf                  *subFrm,
 RgSchCellCb                *cell,
 RgSchDlHqProcCb            *proc
 )
 #else
-PUBLIC Bool rgSCHCmnRetxAllocAvoid(subFrm, cell, proc)
+Bool rgSCHCmnRetxAllocAvoid(subFrm, cell, proc)
 RgSchDlSf                  *subFrm;
 RgSchCellCb                *cell;
 RgSchDlHqProcCb            *proc;
 #endif
 {
-   U8          reqRbs;
+   uint8_t          reqRbs;
 
-   TRC2(rgSCHCmnRetxAllocAvoid);
 
    if (proc->tbInfo[0].state == HQ_TB_NACKED)
    {
@@ -29515,10 +29213,10 @@ RgSchDlHqProcCb            *proc;
       if ((subFrm->bwAssigned < cell->pbchRbEnd) &&
           (((subFrm->bwAssigned + reqRbs) - cell->pbchRbStart) > 0))
       {
-         RETVALUE(TRUE);
+         return (TRUE);
       }
    }
-   RETVALUE(FALSE);
+   return (FALSE);
 }
 
 #endif
@@ -29538,39 +29236,38 @@ RgSchDlHqProcCb            *proc;
  *  @param[in]  RgSchCellCb           *cell
  *  @param[in]  RgSchDlSf             *subFrm
  *  @param[in]  RgSchUeCb             *ue
- *  @param[in]  U32                   bo
- *  @param[out] U32                   *effBo
+ *  @param[in]  uint32_t                   bo
+ *  @param[out] uint32_t                   *effBo
  *  @param[in]  RgSchDlHqProcCb       *proc
  *  @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo
  *  @return  S16
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCmnDlAllocRetxRb
+S16 rgSCHCmnDlAllocRetxRb
 (
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
-U32                        bo,
-U32                        *effBo,
+uint32_t                        bo,
+uint32_t                        *effBo,
 RgSchDlHqProcCb            *proc,
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo
 )
 #else
-PUBLIC S16 rgSCHCmnDlAllocRetxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
+S16 rgSCHCmnDlAllocRetxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo)
 RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
-U32                        bo;
-U32                        *effBo;
+uint32_t                        bo;
+uint32_t                        *effBo;
 RgSchDlHqProcCb            *proc;
 RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
 #endif
 {
-   U32                     newSchBits = 0;
+   uint32_t                     newSchBits = 0;
    RgSchDlRbAlloc          *allocInfo;
 
-   TRC2(rgSCHCmnDlAllocRetxRb);
 
    if ( !RGSCH_TIMEINFO_SAME((cell->crntTime),(ue->dl.lstSchTime) ))
    {
@@ -29581,7 +29278,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
    /* Check for DL BW exhaustion */
    if (subFrm->bw <= subFrm->bwAssigned)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Call TM specific RB allocation routine */
    (dlAllocRetxRbFunc[ue->mimoInfo.txMode - 1])(cell, subFrm, ue, bo, effBo, \
@@ -29603,7 +29300,7 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
       RGSCHCPYTIMEINFO((cell->crntTime),(ue->dl.lstSchTime))
    }
    
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -29626,9 +29323,9 @@ RgSchCmnDlRbAllocInfo      *cellWdAllocInfo;
  *  @param[in]  RgSchDlSf        *subFrm
  *  @param[in]  RgSchUeCb        *ue
  *  @param[in]  RgSchDlHqTbCb    *tbInfo
- *  @param[in]  U32              bo
- *  @param[out] U8               *numRb
- *  @param[out] U32              *effBo
+ *  @param[in]  uint32_t              bo
+ *  @param[out] uint8_t               *numRb
+ *  @param[out] uint32_t              *effBo
  *  @return  S16
  *
  **/
@@ -29639,9 +29336,9 @@ RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqTbCb              *tbInfo,
-U32                        bo,
-U8                         *numRb,
-U32                        *effBo
+uint32_t                        bo,
+uint8_t                         *numRb,
+uint32_t                        *effBo
 )
 #else
 PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb(cell, subFrm, ue, tbInfo, bo, numRb, effBo)
@@ -29649,22 +29346,21 @@ RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
 RgSchDlHqTbCb              *tbInfo;
-U32                        bo;
-U8                         *numRb;
-U32                        *effBo;
+uint32_t                        bo;
+uint8_t                         *numRb;
+uint32_t                        *effBo;
 #endif
 {
-   U32                tbSz;
-   U8                 imcs;
-   U8                 iTbs;
+   uint32_t                tbSz;
+   uint8_t                 imcs;
+   uint8_t                 iTbs;
    RgSchCmnDlUe       *ueDl;
    RgSchDlRbAlloc     *allocInfo;
-   U32                oldReq;
-   U32                reqBytes;
+   uint32_t                oldReq;
+   uint32_t                reqBytes;
    /* Correcting wrap around issue.
     * This change has been done at mutliple places in this function.*/
-   U32                tempNumRb;
-   TRC2(rgSCHCmnDlAlloc1CwTxRb);
+   uint32_t                tempNumRb;
 
    reqBytes  = bo;
    ueDl      = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -29700,12 +29396,12 @@ U32                        *effBo;
 
    RG_SCH_CMN_FILL_DL_TBINFO(&allocInfo->tbInfo[0], tbSz, \
          iTbs, imcs, tbInfo, ue->ue5gtfCb.rank);
-   *numRb = (U8) tempNumRb;
+   *numRb = (uint8_t) tempNumRb;
    
    /* Update the subframe Allocated BW field */
    subFrm->bwAssigned = subFrm->bwAssigned + tempNumRb - allocInfo->rbsReq;
    
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -29725,32 +29421,31 @@ U32                        *effBo;
  *                 of specific scheduler.
  *
  *  @param[in]  RgSchDlRbAlloc   *allocInfo
- *  @param[in]  U8               tbInfoIdx
- *  @param[in]  U32              cnsmdBytes
+ *  @param[in]  uint8_t               tbInfoIdx
+ *  @param[in]  uint32_t              cnsmdBytes
  *  @return  Void
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnRdcImcsTxTb
+Void rgSCHCmnRdcImcsTxTb
 (
 RgSchDlRbAlloc   *allocInfo,
-U8               tbInfoIdx,
-U32              cnsmdBytes
+uint8_t               tbInfoIdx,
+uint32_t              cnsmdBytes
 )
 #else
-PUBLIC Void rgSCHCmnRdcImcsTxTb(allocInfo, tbInfoIdx, cnsmdBytes)
+Void rgSCHCmnRdcImcsTxTb(allocInfo, tbInfoIdx, cnsmdBytes)
 RgSchDlRbAlloc   *allocInfo;
-U8               tbInfoIdx;
-U32              cnsmdBytes;
+uint8_t               tbInfoIdx;
+uint32_t              cnsmdBytes;
 #endif
 {
-   RETVOID;
+   return;
    /*The below functionality is not needed.*/
-   U8                 noLyr;
-   U8                 iTbs;
-   U16                numRb;
+   uint8_t                 noLyr;
+   uint8_t                 iTbs;
+   uint16_t                numRb;
 
-   TRC2(rgSCHCmnRdcImcsTxTb);
 
    iTbs = allocInfo->tbInfo[tbInfoIdx].iTbs;
    noLyr = allocInfo->tbInfo[tbInfoIdx].noLyr;
@@ -29759,7 +29454,7 @@ U32              cnsmdBytes;
    {
       if ((rgTbSzTbl[noLyr-1][iTbs][numRb-1]/8) == cnsmdBytes)
       {
-         RETVOID;
+         return;
       }
    }
    /* Get iTbs as suitable for the consumed bytes */
@@ -29769,14 +29464,14 @@ U32              cnsmdBytes;
       {
          RG_SCH_CMN_DL_TBS_TO_MCS(iTbs, allocInfo->tbInfo[tbInfoIdx].\
                tbCb->dlGrnt.iMcs);
-         RETVOID;
+         return;
       }
       iTbs--;
    }
    iTbs++;
    RG_SCH_CMN_DL_TBS_TO_MCS(iTbs, allocInfo->tbInfo[tbInfoIdx].tbCb->dlGrnt.iMcs);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -29800,8 +29495,8 @@ U32              cnsmdBytes;
  *  @param[in]  RgSchUeCb        *ue
  *  @param[in]  RgSchDlHqProcCb  *proc
  *  @param[in]  RgSchDlHqProcCb  bo
- *  @param[out] U8               *numRb
- *  @param[out] U32              *effBo
+ *  @param[out] uint8_t               *numRb
+ *  @param[out] uint32_t              *effBo
  *  @return  Void
  *
  **/
@@ -29812,9 +29507,9 @@ RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *proc,
-U32                        bo,
-U8                         *numRbRef,
-U32                        *effBo
+uint32_t                        bo,
+uint8_t                         *numRbRef,
+uint32_t                        *effBo
 )
 #else
 PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb(cell, subFrm, ue, proc, bo, numRbRef, effBo)
@@ -29822,33 +29517,32 @@ RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
 RgSchDlHqProcCb            *proc;
-U32                        bo;
-U8                         *numRbRef;
-U32                        *effBo;
+uint32_t                        bo;
+uint8_t                         *numRbRef;
+uint32_t                        *effBo;
 #endif
 {
-   U32                noRes;
-   U32                eff1, eff2;
-   U32                tb1Sz, tb2Sz;
-   U8                 imcs1, imcs2;
-   U8                 noLyr1, noLyr2;
-   U8                 iTbs1, iTbs2;
+   uint32_t                noRes;
+   uint32_t                eff1, eff2;
+   uint32_t                tb1Sz, tb2Sz;
+   uint8_t                 imcs1, imcs2;
+   uint8_t                 noLyr1, noLyr2;
+   uint8_t                 iTbs1, iTbs2;
    RgSchCmnDlCell     *cellDl;
    RgSchCmnDlUe       *ueDl;
    RgSchDlRbAlloc     *allocInfo;
-   U32                oldReq;
-   U32                reqBytes;
+   uint32_t                oldReq;
+   uint32_t                reqBytes;
    /* Fix: MUE_PERTTI_DL */
-   U32                numRb;
+   uint32_t                numRb;
    RgSchCmnCell       *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   U8                 cfi = cellSch->dl.currCfi;
+   uint8_t                 cfi = cellSch->dl.currCfi;
    S16                availBw; 
-   U32                availBits = 0;
+   uint32_t                availBits = 0;
 #ifdef LTE_ADV
-   U32                boTmp = bo;
+   uint32_t                boTmp = bo;
 #endif
 
-   TRC2(rgSCHCmnDlAlloc2CwTxRb);
 
    reqBytes  = bo;
    cellDl    = RG_SCH_CMN_GET_DL_CELL(cell);
@@ -29869,7 +29563,7 @@ U32                        *effBo;
    {
       RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,
             "rgSCHCmnDlAllocRb(): UEs max allocation exceed");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    noLyr1 = ueDl->mimoInfo.cwInfo[0].noLyr;
@@ -29884,18 +29578,18 @@ U32                        *effBo;
    }
    else
    {  
-      U8 cqi = ueDl->mimoInfo.cwInfo[0].cqi;
+      uint8_t cqi = ueDl->mimoInfo.cwInfo[0].cqi;
 #ifdef LTE_TDD      
-      iTbs1 = (U8) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 0, noLyr1);
+      iTbs1 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 0, noLyr1);
 #else      
-      iTbs1 = (U8) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 0, noLyr1);
+      iTbs1 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 0, noLyr1);
 #endif         
 
       cqi = ueDl->mimoInfo.cwInfo[1].cqi;
 #ifdef LTE_TDD      
-      iTbs2 = (U8) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 1, noLyr2);
+      iTbs2 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 1, noLyr2);
 #else      
-      iTbs2 = (U8) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 1, noLyr2);
+      iTbs2 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 1, noLyr2);
 #endif         
    } 
 
@@ -30005,7 +29699,7 @@ U32                        *effBo;
    if(subFrm->sfType == RG_SCH_SPL_SF_DATA)
    { 
       /* Max Rb for Special Sf is approximated as 4/3 of maxRb */
-      rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, (U8*)&numRb,  ueDl->maxRb*4/3, 
+      rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, (uint8_t*)&numRb,  ueDl->maxRb*4/3, 
                                 &iTbs1, &iTbs2, noLyr1, 
                                 noLyr2, &tb1Sz, &tb2Sz, cfi);   
       /* Check for available Bw */
@@ -30027,7 +29721,7 @@ U32                        *effBo;
 #ifdef LTE_ADV
    if (ROK != rgSCHLaaCmn2TBPrbCheck(allocInfo, tb1Sz, tb2Sz, boTmp, effBo, iTbs1, iTbs2, numRb, proc))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -30037,10 +29731,10 @@ U32                        *effBo;
          iTbs1, imcs1, &proc->tbInfo[0], noLyr1);
    RG_SCH_CMN_FILL_DL_TBINFO(&allocInfo->tbInfo[1], tb2Sz, \
          iTbs2, imcs2, &proc->tbInfo[1], noLyr2);
-   *numRbRef = (U8)numRb;
+   *numRbRef = (uint8_t)numRb;
 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -30064,8 +29758,8 @@ U32                        *effBo;
  *  @param[in]  RgSchUeCb        *ue
  *  @param[in]  RgSchDlHqTbCb    *reTxTb
  *  @param[in]  RgSchDlHqTbCb    *txTb
- *  @param[out] U8               *numRb
- *  @param[out] U32              *effBo
+ *  @param[out] uint8_t               *numRb
+ *  @param[out] uint32_t              *effBo
  *  @return  Void
  *
  **/
@@ -30077,8 +29771,8 @@ RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqTbCb              *reTxTb,
 RgSchDlHqTbCb              *txTb,
-U8                         *numRb,
-U32                        *effBo
+uint8_t                         *numRb,
+uint32_t                        *effBo
 )
 #else
 PRIVATE S16 rgSCHCmnDlAlloc2CwTxRetxRb(cell, subFrm, ue, reTxTb, txTb, numRb,\
@@ -30088,22 +29782,21 @@ RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
 RgSchDlHqTbCb              *reTxTb;
 RgSchDlHqTbCb              *txTb;
-U8                         *numRb;
-U32                        *effBo;
+uint8_t                         *numRb;
+uint32_t                        *effBo;
 #endif
 {
    RgSchCmnDlUe       *ueDl;
    RgSchDlRbAlloc     *allocInfo;
-   U8                 imcs1, imcs2;
-   U8                  noLyr2;
-   U16                 tb2Sz;
+   uint8_t                 imcs1, imcs2;
+   uint8_t                  noLyr2;
+   uint16_t                 tb2Sz;
    RgSchCmnDlUeCwInfo *otherCw;
    S16                 availBw;
    RgSchCmnDlCell     *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   U8                 cfi = cellDl->currCfi; 
-   U8                 iTbs;
+   uint8_t                 cfi = cellDl->currCfi; 
+   uint8_t                 iTbs;
 
-   TRC2(rgSCHCmnDlAlloc2CwTxRetxRb);
 
    ueDl      = RG_SCH_CMN_GET_DL_UE(ue,cell);
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
@@ -30125,14 +29818,14 @@ U32                        *effBo;
       if(*numRb <= 3)
       {
          RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb);
-        RETVALUE(RFAILED);
+        return RFAILED;
       }
    }
 #endif
 
    if ((S16)*numRb > availBw)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Update the subframe Allocated BW field */
    subFrm->bwAssigned += *numRb;
@@ -30148,10 +29841,10 @@ U32                        *effBo;
    else
    {  
 #ifdef LTE_TDD      
-      iTbs = (U8) rgSchCmnFetchItbs(cell, ueDl, subFrm, otherCw->cqi, cfi, 
+      iTbs = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, subFrm, otherCw->cqi, cfi, 
                                       !(ueDl->mimoInfo.btrCwIdx), noLyr2);
 #else      
-      iTbs = (U8) rgSchCmnFetchItbs(cell, ueDl, otherCw->cqi, cfi, 
+      iTbs = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, otherCw->cqi, cfi, 
                                       !(ueDl->mimoInfo.btrCwIdx), noLyr2);
 #endif 
    } 
@@ -30170,7 +29863,7 @@ U32                        *effBo;
    
    *effBo = reTxTb->tbSz + tb2Sz;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -30193,9 +29886,9 @@ U32                        *effBo;
  *  @param[in]  RgSchDlSf        *subFrm
  *  @param[in]  RgSchUeCb        *ue
  *  @param[in]  RgSchDlHqProcCb  *proc
- *  @param[out] U8               *numRb
+ *  @param[out] uint8_t               *numRb
  *  @param[out] Bool             *swpFlg
- *  @param[out] U32              *effBo
+ *  @param[out] uint32_t              *effBo
  *  @return  Void
  *
  **/
@@ -30206,9 +29899,9 @@ RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqProcCb            *proc,
-U8                         *numRb,
+uint8_t                         *numRb,
 Bool                       *swpFlg,
-U32                        *effBo
+uint32_t                        *effBo
 )
 #else
 PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb(cell, subFrm, ue, proc,\
@@ -30217,17 +29910,16 @@ RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
 RgSchDlHqProcCb            *proc;
-U8                         *numRb;
+uint8_t                         *numRb;
 Bool                       *swpFlg;
-U32                        *effBo;
+uint32_t                        *effBo;
 #endif
 {
    RgSchDlRbAlloc     *allocInfo;
-   U8                 imcs1;
-   U8                 imcs2;
+   uint8_t                 imcs1;
+   uint8_t                 imcs2;
    RgSchDlHqTbCb      *lrgTbInfo, *othrTbInfo;
 
-   TRC2(rgSCHCmnDlAlloc2CwRetxRb);
 
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
 
@@ -30258,13 +29950,13 @@ U32                        *effBo;
       if(*numRb <= 3)
       {
          RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb);
-        RETVALUE(RFAILED);
+        return RFAILED;
       }
    }
 #endif
    if ((S16)*numRb > (S16)(subFrm->bw - subFrm->bwAssigned))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Update the subframe Allocated BW field */
    subFrm->bwAssigned += *numRb;
@@ -30278,7 +29970,7 @@ U32                        *effBo;
 
 
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -30299,9 +29991,9 @@ U32                        *effBo;
  *  @param[in]  RgSchDlSf        *subFrm
  *  @param[in]  RgSchUeCb        *ue
  *  @param[in]  RgSchDlHqTbCb    *tbInfo
- *  @param[in]  U8               noLyr
- *  @param[out] U8               *numRb
- *  @param[out] U32              *effBo
+ *  @param[in]  uint8_t               noLyr
+ *  @param[out] uint8_t               *numRb
+ *  @param[out] uint32_t              *effBo
  *  @return  S16
  *
  **/
@@ -30312,9 +30004,9 @@ RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
 RgSchUeCb                  *ue,
 RgSchDlHqTbCb              *tbInfo,
-U8                         noLyr,
-U8                         *numRb,
-U32                        *effBo
+uint8_t                         noLyr,
+uint8_t                         *numRb,
+uint32_t                        *effBo
 )
 #else
 PRIVATE S16 rgSCHCmnDlAlloc1CwRetxRb(cell, subFrm, ue, tbInfo, noLyr,\
@@ -30323,15 +30015,14 @@ RgSchCellCb                *cell;
 RgSchDlSf                  *subFrm;
 RgSchUeCb                  *ue;
 RgSchDlHqTbCb              *tbInfo;
-U8                         noLyr;
-U8                         *numRb;
-U32                        *effBo;
+uint8_t                         noLyr;
+uint8_t                         *numRb;
+uint32_t                        *effBo;
 #endif
 {
    RgSchDlRbAlloc  *allocInfo;
-   U8              imcs;
+   uint8_t              imcs;
 
-   TRC2(rgSCHCmnDlAlloc1CwRetxRb);
 
    allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell);
 
@@ -30342,7 +30033,7 @@ U32                        *effBo;
    *numRb = tbInfo->dlGrnt.numRb;
    if ((S16)*numRb > (S16)(subFrm->bw - subFrm->bwAssigned))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Update the subframe Allocated BW field */
    subFrm->bwAssigned += *numRb;
@@ -30353,7 +30044,7 @@ U32                        *effBo;
          0, imcs, tbInfo, tbInfo->numLyrs);
    *effBo = tbInfo->tbSz;
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef LTEMAC_SPS
@@ -30375,23 +30066,22 @@ U32                        *effBo;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlRelPdcchFbk
+Void rgSCHCmnDlRelPdcchFbk
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 Bool               isAck
 )
 #else
-PUBLIC Void rgSCHCmnDlRelPdcchFbk(cell, ue, isAck)
+Void rgSCHCmnDlRelPdcchFbk(cell, ue, isAck)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 Bool               isAck;
 #endif
 {
 
-   TRC2(rgSCHCmnDlRelPdcchFbk);
    rgSCHCmnSpsDlRelPdcchFbk(cell, ue, isAck);
-   RETVOID;
+   return;
 
 }
 
@@ -30412,29 +30102,28 @@ Bool               isAck;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlProcAck
+Void rgSCHCmnDlProcAck
 (
 RgSchCellCb        *cell,
 RgSchDlHqProcCb    *hqP
 )
 #else
-PUBLIC Void rgSCHCmnDlProcAck(cell, hqP)
+Void rgSCHCmnDlProcAck(cell, hqP)
 RgSchCellCb        *cell;
 RgSchDlHqProcCb    *hqP;
 #endif
 {
 
-   TRC2(rgSCHCmnDlProcAck);
 
    if (RG_SCH_CMN_SPS_DL_IS_SPS_HQP(hqP))
    {
       /* Invoke SPS module if SPS service was scheduled for this HARQ proc */
       rgSCHCmnSpsDlProcAck(cell, hqP);
    }
-   RETVOID;
+   return;
 }
 #ifdef RGSCH_SPS_STATS
-extern U32 rgSchStatCrntiCeRcvCnt;
+extern uint32_t rgSchStatCrntiCeRcvCnt;
 #endif
 /**
  * @brief This function is invoked to handle CRNTI CE reception for an UE
@@ -30452,19 +30141,18 @@ extern U32 rgSchStatCrntiCeRcvCnt;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnHdlCrntiCE
+Void rgSCHCmnHdlCrntiCE
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue
 )
 #else
-PUBLIC Void rgSCHCmnHdlCrntiCE(cell, ue)
+Void rgSCHCmnHdlCrntiCE(cell, ue)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 #endif
 {
 
-   TRC2(rgSCHCmnHdlCrntiCE);
 #ifdef RGSCH_SPS_STATS   
    rgSchStatCrntiCeRcvCnt++;
 #endif
@@ -30493,7 +30181,7 @@ RgSchUeCb          *ue;
       rgSCHCmnSpsUlUeReset(cell, ue);
    }
    
-   RETVOID;
+   return;
 }
 
 
@@ -30514,23 +30202,22 @@ RgSchUeCb          *ue;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlSpsRelInd
+Void rgSCHCmnUlSpsRelInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 Bool               isExplRel
 )
 #else
-PUBLIC Void rgSCHCmnUlSpsRelInd(cell, ue, isExplRel)
+Void rgSCHCmnUlSpsRelInd(cell, ue, isExplRel)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 Bool               isExplRel;
 #endif
 {
 
-   TRC2(rgSCHCmnUlSpsRelInd);
    rgSCHCmnSpsUlProcRelInd(cell, ue, isExplRel);
-   RETVOID;
+   return;
 
 } /* end of rgSCHCmnUlSpsRelInd */
 
@@ -30550,27 +30237,26 @@ Bool               isExplRel;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlSpsActInd
+Void rgSCHCmnUlSpsActInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
-U16                spsSduSize
+uint16_t                spsSduSize
 )
 #else
-PUBLIC Void rgSCHCmnUlSpsActInd(cell, ue,spsSduSize)
+Void rgSCHCmnUlSpsActInd(cell, ue,spsSduSize)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
-U16                spsSduSize;
+uint16_t                spsSduSize;
 #endif
 {
 
-   TRC2(rgSCHCmnUlSpsActInd);
 
    if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE)
    {
       rgSCHCmnSpsUlProcActInd(cell, ue,spsSduSize);
    }
-   RETVOID;
+   return;
 
 } /* end of rgSCHCmnUlSpsActInd */
 
@@ -30592,26 +30278,25 @@ U16                spsSduSize;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlCrcInd
+Void rgSCHCmnUlCrcInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 CmLteTimingInfo    crcTime
 )
 #else
-PUBLIC Void rgSCHCmnUlCrcInd(cell, ue, crcTime)
+Void rgSCHCmnUlCrcInd(cell, ue, crcTime)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 CmLteTimingInfo    crcTime;
 #endif
 {
 
-   TRC2(rgSCHCmnUlCrcInd);
    if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE)
    {
       rgSCHCmnSpsUlProcCrcInd(cell, ue, crcTime);
    }
-   RETVOID;
+   return;
 
 } /* end of rgSCHCmnUlCrcFailInd */
 
@@ -30632,26 +30317,25 @@ CmLteTimingInfo    crcTime;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUlCrcFailInd
+Void rgSCHCmnUlCrcFailInd
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ue,
 CmLteTimingInfo    crcTime
 )
 #else
-PUBLIC Void rgSCHCmnUlCrcFailInd(cell, ue, crcTime)
+Void rgSCHCmnUlCrcFailInd(cell, ue, crcTime)
 RgSchCellCb        *cell;
 RgSchUeCb          *ue;
 CmLteTimingInfo    crcTime;
 #endif
 {
 
-   TRC2(rgSCHCmnUlCrcFailInd);
    if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE)
    {
       rgSCHCmnSpsUlProcDtxInd(cell, ue, crcTime);
    }
-   RETVOID;
+   return;
 
 } /* end of rgSCHCmnUlCrcFailInd */
 
@@ -30685,19 +30369,18 @@ RgSchCellCb  *cell;
 #endif
 {
 #ifdef LTE_TDD
-   U8           nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE;
+   uint8_t           nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE;
 #else
 #ifdef LTEMAC_HDFDD
-   U8           nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES;
+   uint8_t           nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES;
 #else
-   U8           nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES;
+   uint8_t           nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES;
 #endif
 #endif
    RgInfSfAlloc *nextsfAlloc = &(cell->sfAllocArr[nextSfIdx]);
    RgSchCmnCell           *cellSch   = RG_SCH_CMN_GET_CELL(cell);
    RgSchCmnDlRbAllocInfo  *allocInfo = &cellSch->allocInfo;  
    
-   TRC2(rgSCHCmnDlBcchPcchAlloc);
 
 
    /*Reset the bitmask for BCCH/PCCH*/
@@ -30717,7 +30400,7 @@ RgSchCellCb  *cell;
    /* Finalize the Allocations for reqested Against alloced */
    rgSCHCmnDlBcchPcchFnlz(cell, allocInfo);
 #endif /* DISABLE_MIB_SIB */
-   RETVOID;
+   return;
 }
 
 /**
@@ -30755,7 +30438,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
 {
    RgSchCmnCell      *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHBcchPcchDlRbAlloc);
 
 
    if (cellSch->dl.isDlFreqSel)
@@ -30767,7 +30449,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
       rgSCHCmnNonDlfsBcchPcchRbAlloc(cell, allocInfo);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -30806,7 +30488,6 @@ RgSchCmnDlRbAllocInfo *allocInfo;
 {
    RgSchDlRbAlloc     *reqAllocInfo;
 
-   TRC2(rgSCHCmnNonDlfsBcchPcchRbAlloc);
 
    /* 143473 */
    /* Allocate for PCCH */
@@ -30821,7 +30502,7 @@ RgSchCmnDlRbAllocInfo *allocInfo;
    {
       rgSCHCmnNonDlfsCmnRbAlloc(cell, reqAllocInfo);
    }
-   RETVOID;
+   return;
 }
 
 
@@ -30855,7 +30536,6 @@ RgSchCellCb             *cell;
 {
    CmLteTimingInfo   pdSchTmInfo;
 
-   TRC2(rgSCHChkNUpdSiCfg);
 
 
    pdSchTmInfo   = cell->crntTime;
@@ -30872,7 +30552,7 @@ RgSchCellCb             *cell;
     * from application. No need to wait for next modification period.
     */
    if((pdSchTmInfo.sfn % RGSCH_SIB1_RPT_PERIODICITY == 0)
-         && (RGSCH_SIB1_TX_SF_NUM == (pdSchTmInfo.subframe % RGSCH_NUM_SUB_FRAMES)))
+         && (RGSCH_SIB1_TX_SF_NUM == (pdSchTmInfo.slot % RGSCH_NUM_SUB_FRAMES)))
    {   
       /*Check whether SIB1 with PWS has been updated*/
       if(cell->siCb.siBitMask & RGSCH_SI_SIB1_PWS_UPD)
@@ -30893,11 +30573,11 @@ RgSchCellCb             *cell;
      period. If current SFN,SF No doesn't marks the start of next
      modification period, then return. */
    if(!((pdSchTmInfo.sfn % cell->siCfg.modPrd == 0)
-            && (0 == pdSchTmInfo.subframe)))
+            && (0 == pdSchTmInfo.slot)))
    /*if(!((((pdSchTmInfo.hSfn * 1024) + pdSchTmInfo.sfn) % cell->siCfg.modPrd == 0)
-            && (0 == pdSchTmInfo.subframe)))*/
+            && (0 == pdSchTmInfo.slot)))*/
    {
-      RETVOID;
+      return;
    }
 
    /*Check whether MIB has been updated*/
@@ -30923,7 +30603,7 @@ RgSchCellCb             *cell;
    /*Check whether SIs have been updated*/
    if(cell->siCb.siBitMask & RGSCH_SI_SI_UPD)
    {
-      U8  idx;
+      uint8_t  idx;
 
       /*Check if SI cfg have been modified And Check if numSi have
         been changed, if yes then we would need to update the
@@ -30988,7 +30668,7 @@ RgSchCellCb             *cell;
       cell->siCb.siBitMask &= ~RGSCH_SI_SICFG_UPD;
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -31020,11 +30700,10 @@ RgSchCellCb             *cell;
 #endif
 {
    CmLteTimingInfo        crntTmInfo;
-   U8                     siWinSize;
-   U16                    x; 
-   U16                    windowId; 
+   uint8_t                     siWinSize;
+   uint16_t                    x; 
+   uint16_t                    windowId; 
 
-   TRC2(rgSCHSelectSi);
 
 
    crntTmInfo  = cell->crntTime;
@@ -31042,7 +30721,7 @@ RgSchCellCb             *cell;
    if(cell->siCb.inWindow)
    {
       if ((crntTmInfo.sfn % cell->siCfg.minPeriodicity) == 0 && 
-          crntTmInfo.subframe == 0)
+          crntTmInfo.slot == 0)
       {
          /* Reinit inWindow at the beginning of every SI window */
          cell->siCb.inWindow = siWinSize - 1;
@@ -31050,7 +30729,7 @@ RgSchCellCb             *cell;
       else
       {
          cell->siCb.inWindow--;
-         RETVOID;
+         return;
       }
    }
    else /* New window. Re-init the winSize counter with the window length */
@@ -31065,17 +30744,17 @@ RgSchCellCb             *cell;
       cell->siCb.inWindow = siWinSize - 1;
    }
 
-   x = rgSCHCmnGetSiSetId(crntTmInfo.sfn, crntTmInfo.subframe
+   x = rgSCHCmnGetSiSetId(crntTmInfo.sfn, crntTmInfo.slot
                                   cell->siCfg.minPeriodicity); 
 
    /* Window Id within a SI set. This window Id directly maps to a
     * unique SI Id */
    windowId = (((crntTmInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + 
-            crntTmInfo.subframe) - (x * (cell->siCfg.minPeriodicity * 10))) 
+            crntTmInfo.slot) - (x * (cell->siCfg.minPeriodicity * 10))) 
                                                                / siWinSize;
 
    if(windowId >= RGR_MAX_NUM_SI)
-      RETVOID;
+      return;
 
    /* Update the siCtx if there is a valid SI and its periodicity
     * has occurred */
@@ -31094,7 +30773,7 @@ RgSchCellCb             *cell;
          cell->siCb.siCtx.warningSiFlag = cell->siCb.siArray[windowId].
                                                            isWarningSi;
          cell->siCb.siCtx.timeToTx.sfn = crntTmInfo.sfn;
-         cell->siCb.siCtx.timeToTx.subframe = crntTmInfo.subframe;
+         cell->siCb.siCtx.timeToTx.slot = crntTmInfo.slot;
 
          RG_SCH_ADD_TO_CRNT_TIME(cell->siCb.siCtx.timeToTx,
                cell->siCb.siCtx.maxTimeToTx, (siWinSize - 1))
@@ -31105,7 +30784,7 @@ RgSchCellCb             *cell;
       cell->siCb.siCtx.siId = 0;
    }
 
-   RETVOID;
+   return;
 }
 
 
@@ -31142,19 +30821,18 @@ RgInfSfAlloc            *subfrmAlloc;
 {
    CmLteTimingInfo   crntTimInfo;
    RgSchDlSf         *sf;
-   U8                nPrb = 0;
-   U8                mcs  = 0;
+   uint8_t                nPrb = 0;
+   uint8_t                mcs  = 0;
    MsgLen            msgLen = 0;
-   U32               rb=0;
+   uint32_t               rb=0;
    RgSchCmnDlCell    *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
    /* DwPTS Scheduling Changes Start */
 #ifdef LTE_TDD   
-   U16                lostRe;  
-   U8                 cfi = cellDl->currCfi;      
+   uint16_t                lostRe;  
+   uint8_t                 cfi = cellDl->currCfi;      
 #endif
    /* DwPTS Scheduling Changes End */
 
-   TRC2(rgSCHDlSiSched);
 
 
    crntTimInfo   = cell->crntTime;
@@ -31179,14 +30857,14 @@ RgInfSfAlloc            *subfrmAlloc;
    {
 #endif
    if((crntTimInfo.sfn % RGSCH_MIB_PERIODICITY == 0)
-         && (RGSCH_MIB_TX_SF_NUM == crntTimInfo.subframe))
+         && (RGSCH_MIB_TX_SF_NUM == crntTimInfo.slot))
    {
       MsgLen  mibLen = 0;
-      U8      sfnOctet, mibOct2 = 0;
-      U8      mibOct1 = 0;
+      uint8_t      sfnOctet, mibOct2 = 0;
+      uint8_t      mibOct1 = 0;
       /*If MIB has not been yet setup by Application, return*/
       if(NULLP == cell->siCb.crntSiInfo.mib)
-         RETVOID;
+         return;
 
       SFndLenMsg(cell->siCb.crntSiInfo.mib, &mibLen);
       sf->bch.tbSize = mibLen;
@@ -31195,16 +30873,16 @@ RgInfSfAlloc            *subfrmAlloc;
 
       /*Set the bits of MIB to reflect SFN */
       /*First get the Most signficant 8 bits of SFN */
-      sfnOctet = (U8)(crntTimInfo.sfn >> 2);
+      sfnOctet = (uint8_t)(crntTimInfo.sfn >> 2);
       /*Get the first two octets of MIB, and then update them
         using the SFN octet value obtained above.*/
       if(ROK != SExamMsg((Data *)(&mibOct1),
                cell->siCb.crntSiInfo.mib, 0))
-         RETVOID;
+         return;
 
       if(ROK != SExamMsg((Data *)(&mibOct2),
                cell->siCb.crntSiInfo.mib, 1))
-         RETVOID;
+         return;
 
       /* ccpu00114572- Fix for improper way of MIB Octet setting for SFN */
       mibOct1 = (mibOct1 & 0xFC) | (sfnOctet >> 6);
@@ -31214,11 +30892,11 @@ RgInfSfAlloc            *subfrmAlloc;
       /*Now, replace the two octets in MIB */
       if(ROK != SRepMsg((Data)(mibOct1),
                cell->siCb.crntSiInfo.mib, 0))
-         RETVOID;
+         return;
 
       if(ROK != SRepMsg((Data)(mibOct2),
                cell->siCb.crntSiInfo.mib, 1))
-         RETVOID;
+         return;
 
       /*Copy the MIB msg buff into interface buffer */
       SCpyMsgMsg(cell->siCb.crntSiInfo.mib,
@@ -31242,12 +30920,12 @@ RgInfSfAlloc            *subfrmAlloc;
      is not required here since the below check takes care
      of SFNs applicable for this one too.*/
    if((crntTimInfo.sfn % RGSCH_SIB1_RPT_PERIODICITY == 0)
-         && (RGSCH_SIB1_TX_SF_NUM == crntTimInfo.subframe))
+         && (RGSCH_SIB1_TX_SF_NUM == crntTimInfo.slot))
    {
       /*If SIB1 has not been yet setup by Application, return*/
       if(NULLP == (cell->siCb.crntSiInfo.sib1Info.sib1))
       {
-         RETVOID;
+         return;
       }
 
       allocInfo->bcchAlloc.schdFirst = TRUE;
@@ -31261,7 +30939,7 @@ RgInfSfAlloc            *subfrmAlloc;
       Bool    invalid = FALSE;
 
       if(cell->siCb.siCtx.siId == 0)
-         RETVOID;
+         return;
 
       /*Check if the Si-Window for the current Si-Context is completed*/
       invalid = rgSCHCmnChkPastWin(crntTimInfo, cell->siCb.siCtx.maxTimeToTx);
@@ -31279,7 +30957,7 @@ RgInfSfAlloc            *subfrmAlloc;
             rgSCHUtlFreeWarningSiPdu(cell);
             cell->siCb.siCtx.warningSiFlag  = FALSE;
          }
-         RETVOID;
+         return;
       }
 
       /*Check the timinginfo of the current SI-Context to see if its
@@ -31288,13 +30966,13 @@ RgInfSfAlloc            *subfrmAlloc;
                   cell->siCb.siCtx.timeToTx,
                   cell->siCb.siCtx.maxTimeToTx)))
       {
-         RETVOID;
+         return;
 
       }
       /*Check if retransmission count has become 0*/
       if(0 == cell->siCb.siCtx.retxCntRem)
       {
-         RETVOID;
+         return;
       }
 
       /* LTE_ADV_FLAG_REMOVED_START */
@@ -31306,10 +30984,10 @@ RgInfSfAlloc            *subfrmAlloc;
          {
             /* Determine next scheduling subframe is ABS or not */
             if(RG_SCH_ABS_ENABLED_ABS_SF == (RgSchAbsSfEnum)(cell->lteAdvCb.absCfg.absPattern
-                  [((crntTimInfo.sfn*RGSCH_NUM_SUB_FRAMES) + crntTimInfo.subframe) % RGR_ABS_PATTERN_LEN]))
+                  [((crntTimInfo.sfn*RGSCH_NUM_SUB_FRAMES) + crntTimInfo.slot) % RGR_ABS_PATTERN_LEN]))
             {
                /* Skip the SI scheduling to next tti */
-               RETVOID;
+               return;
             }
          }
       }
@@ -31321,7 +30999,7 @@ RgInfSfAlloc            *subfrmAlloc;
        * and Other SI */
         if((rgSCHUtlGetMcsAndNPrb(cell, &nPrb, &mcs, &msgLen)) != ROK)
         {
-           RETVOID
+           return
         }
 
       cell->siCb.siCtx.i = RGSCH_CALC_SF_DIFF(crntTimInfo,
@@ -31333,7 +31011,7 @@ RgInfSfAlloc            *subfrmAlloc;
    /*rgSCHCmnClcRbAllocForFxdTb(cell, msgLen, cellDl->ccchCqi, &rb);*/
    if(cellDl->bitsPerRb==0)
    {
-      while ((rgTbSzTbl[0][0][rb]) < (U32) (msgLen*8))
+      while ((rgTbSzTbl[0][0][rb]) < (uint32_t) (msgLen*8))
       {
          rb++;
       }
@@ -31364,7 +31042,7 @@ RgInfSfAlloc            *subfrmAlloc;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,  "rgSCHDlSiSched(): "
          "BW allocation failed CRNTI:%d",RGSCH_SI_RNTI);
-      RETVOID;
+      return;
    }
 
    /* Update the subframe Allocated BW field */
@@ -31381,7 +31059,7 @@ RgInfSfAlloc            *subfrmAlloc;
    allocInfo->bcchAlloc.nPrb = nPrb;
    allocInfo->bcchAlloc.tbInfo[0].bytesReq = msgLen;
    allocInfo->bcchAlloc.tbInfo[0].noLyr = 1;
-   RETVOID;
+   return;
 }
 #endif /*RGR_SI_SCH*/
 
@@ -31427,11 +31105,10 @@ RgSchUeCb          *ue;
 RgrUeCqiRept        *ueCqiRpt;
 #endif
 {
-   U8    *cqiCount = NULLP;
+   uint8_t    *cqiCount = NULLP;
    S16   retVal;
    RgrStaIndInfo *staInfo = NULLP;
 
-   TRC2(rgSCHCmnUeDlPwrCtColltCqiRept)
 
    /* Step 1: Store the CQI in collation array */
    /* Step 2: Increament the tracking count */
@@ -31450,13 +31127,13 @@ RgrUeCqiRept        *ueCqiRpt;
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not "
             "allocate memory for sending StaInd CRNTI:%d",ue->ueId);
-         RETVALUE(retVal);
+         return (retVal);
       }
 
    /* Step 4.1: Fill StaInd for sending collated N CQI rpeorts */
 #ifdef CA_DBG
       {
-         extern U32 gCqiReptToAppCount;
+         extern uint32_t gCqiReptToAppCount;
          gCqiReptToAppCount++;
       
       }
@@ -31464,11 +31141,11 @@ RgrUeCqiRept        *ueCqiRpt;
 #endif
       retVal = rgSCHUtlFillSndStaInd(cell, ue, staInfo,
             ue->cqiReptCfgInfo.numColltdCqiRept);
-      RETVALUE(retVal);
+      return (retVal);
 
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* End of rgSCHCmnUeDlPwrCtColltCqiRept */
 
 #endif /* End of RGR_CQI_REPT */
@@ -31489,7 +31166,7 @@ RgrUeCqiRept        *ueCqiRpt;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnChkRetxAllowDtx
+Void rgSCHCmnChkRetxAllowDtx
 (
 RgSchCellCb        *cell,
 RgSchUeCb          *ueCb,
@@ -31497,14 +31174,13 @@ RgSchDlHqProcCb    *proc,
 Bool               *reTxAllwd
 )
 #else
-PUBLIC Void rgSCHCmnChkRetxAllowDtx(cell, ueCb, proc, reTxAllwd)
+Void rgSCHCmnChkRetxAllowDtx(cell, ueCb, proc, reTxAllwd)
 RgSchCellCb        *cell;
 RgSchUeCb          *ueCb;
 RgSchDlHqProcCb    *proc;
 Bool               *reTxAllwd;
 #endif
 {
-   TRC3(rgSCHCmnChkRetxAllowDtx)
 
 
    *reTxAllwd = TRUE;
@@ -31514,7 +31190,7 @@ Bool               *reTxAllwd;
        *reTxAllwd = FALSE;
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -31531,27 +31207,27 @@ Bool               *reTxAllwd;
  *   (0,0)              (8,0)              (16,0)          (SFN, SF)
  *    
  *
- *  @param[in]  U16     sfn                   
- *  @param[in]  U8      sf
- *  @return     U16     siSetId
+ *  @param[in]  uint16_t     sfn                   
+ *  @param[in]  uint8_t      sf
+ *  @return     uint16_t     siSetId
  **/
 #ifdef ANSI
-PUBLIC U16 rgSCHCmnGetSiSetId
+uint16_t rgSCHCmnGetSiSetId
 (
-U16    sfn,
-U8     sf,
-U16    minPeriodicity
+uint16_t    sfn,
+uint8_t     sf,
+uint16_t    minPeriodicity
 )
 #else
-PUBLIC U16 rgSCHCmnGetSiSetId(sfn, sf, minPeriodicity)
-U16    sfn;
-U8     sf
-U16    minPeriodicity;
+uint16_t rgSCHCmnGetSiSetId(sfn, sf, minPeriodicity)
+uint16_t    sfn;
+uint8_t     sf
+uint16_t    minPeriodicity;
 #endif
 {
    /* 80 is the minimum SI periodicity in sf. Also
     * all other SI periodicities are multiples of 80 */
-    RETVALUE (((sfn * RGSCH_NUM_SUB_FRAMES_5G) + sf) / (minPeriodicity * 10));
+    return  (((sfn * RGSCH_NUM_SUB_FRAMES_5G) + sf) / (minPeriodicity * 10));
 }
 #ifdef LTE_TDD
 /**
@@ -31562,39 +31238,38 @@ U16    minPeriodicity;
  *     Function: rgSCHCmnCalcDwPtsTbSz
  *
  *  @param[in]     RgSchCellCb    *cell                   
- *  @param[in]     U32             bo
- *  @param[in/out] U8             *rb
- *  @param[in/out] U8             *iTbs
- *  @param[in]     U8              lyr
- *  @param[in]     U8              cfi
- *  @return        U32             tbSz
+ *  @param[in]     uint32_t             bo
+ *  @param[in/out] uint8_t             *rb
+ *  @param[in/out] uint8_t             *iTbs
+ *  @param[in]     uint8_t              lyr
+ *  @param[in]     uint8_t              cfi
+ *  @return        uint32_t             tbSz
  **/
 #ifdef ANSI
-PRIVATE U32 rgSCHCmnCalcDwPtsTbSz
+PRIVATE uint32_t rgSCHCmnCalcDwPtsTbSz
 (
 RgSchCellCb    *cell,
-U32             bo,
-U8             *rb,
-U8             *iTbs,
-U8              lyr,
-U8              cfi
+uint32_t             bo,
+uint8_t             *rb,
+uint8_t             *iTbs,
+uint8_t              lyr,
+uint8_t              cfi
 )
 #else
-PRIVATE U32 rgSCHCmnCalcDwPtsTbSz(cell, bo, rb, iTbs, lyr, cfi)
+PRIVATE uint32_t rgSCHCmnCalcDwPtsTbSz(cell, bo, rb, iTbs, lyr, cfi)
 RgSchCellCb    *cell;
-U32             bo;
-U8             *rb;
-U8             *iTbs;
-U8              lyr;
-U8              cfi;
+uint32_t             bo;
+uint8_t             *rb;
+uint8_t             *iTbs;
+uint8_t              lyr;
+uint8_t              cfi;
 #endif
 {
-    U32             tbSz;
+    uint32_t             tbSz;
     RgSchCmnDlCell *cellDl     = RG_SCH_CMN_GET_DL_CELL(cell);
-    U32             numRE      = *rb * cellDl->noResPerRb[cfi];
-    U32             numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
+    uint32_t             numRE      = *rb * cellDl->noResPerRb[cfi];
+    uint32_t             numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
 
-    TRC2(rgSCHCmnCalcDwPtsTbSz);
 
     /* DwPts Rb cannot exceed the cell Bw */
     numDwPtsRb = RGSCH_MIN(numDwPtsRb, cellDl->maxDlBwPerUe);
@@ -31621,7 +31296,7 @@ U8              cfi;
     }
     *rb = numDwPtsRb;
 
-    RETVALUE(tbSz/8);
+    return (tbSz/8);
 }
 
 /**
@@ -31632,53 +31307,52 @@ U8              cfi;
  *     Function: rgSCHCmnCalcDwPtsTbSz2Cw
  *
  *  @param[in]      RgSchCellCb    *cell                   
- *  @param[in]      U32             bo
- *  @param[in/out]  U8             *rb
- *  @param[in]      U8              maxRb
- *  @param[in/out]  U8             *iTbs1
- *  @param[in/out]  U8             *iTbs2
- *  @param[in]      U8              lyr1
- *  @param[in]      U8              lyr2
- *  @return[in/out] U32            *tb1Sz
- *  @return[in/out] U32            *tb2Sz
- *  @param[in]      U8              cfi 
+ *  @param[in]      uint32_t             bo
+ *  @param[in/out]  uint8_t             *rb
+ *  @param[in]      uint8_t              maxRb
+ *  @param[in/out]  uint8_t             *iTbs1
+ *  @param[in/out]  uint8_t             *iTbs2
+ *  @param[in]      uint8_t              lyr1
+ *  @param[in]      uint8_t              lyr2
+ *  @return[in/out] uint32_t            *tb1Sz
+ *  @return[in/out] uint32_t            *tb2Sz
+ *  @param[in]      uint8_t              cfi 
  **/
 #ifdef ANSI
 PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw
 (
 RgSchCellCb    *cell,
-U32             bo,
-U8             *rb,
-U8              maxRb,
-U8             *iTbs1,
-U8             *iTbs2,
-U8              lyr1,
-U8              lyr2,
-U32            *tb1Sz, 
-U32            *tb2Sz,
-U8              cfi
+uint32_t             bo,
+uint8_t             *rb,
+uint8_t              maxRb,
+uint8_t             *iTbs1,
+uint8_t             *iTbs2,
+uint8_t              lyr1,
+uint8_t              lyr2,
+uint32_t            *tb1Sz, 
+uint32_t            *tb2Sz,
+uint8_t              cfi
 )
 #else
 PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, rb, maxRb, iTbs1, iTbs2, 
       lyr1, lyr2, tb1Sz, tb2Sz, cfi)
 RgSchCellCb    *cell;
-U32             bo;
-U8             *rb;
-U8              maxRb;
-U8             *iTbs1;
-U8             *iTbs2;
-U8              lyr1;
-U8              lyr2;
-U32            *tb1Sz; 
-U32            *tb2Sz;
-U8              cfi;
+uint32_t             bo;
+uint8_t             *rb;
+uint8_t              maxRb;
+uint8_t             *iTbs1;
+uint8_t             *iTbs2;
+uint8_t              lyr1;
+uint8_t              lyr2;
+uint32_t            *tb1Sz; 
+uint32_t            *tb2Sz;
+uint8_t              cfi;
 #endif
 {
     RgSchCmnDlCell *cellDl     = RG_SCH_CMN_GET_DL_CELL(cell);
-    U32             numRE      = *rb * cellDl->noResPerRb[cfi];
-    U32             numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
+    uint32_t             numRE      = *rb * cellDl->noResPerRb[cfi];
+    uint32_t             numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]);   
 
-    TRC2(rgSCHCmnCalcDwPtsTbSz2Cw);
 
     /* DwPts Rb cannot exceed the cell Bw */
     numDwPtsRb = RGSCH_MIN(numDwPtsRb, maxRb);
@@ -31702,7 +31376,7 @@ U8              cfi;
 
     *rb = numDwPtsRb;
 
-    RETVOID;    
+    return;    
 }
 
 #endif
@@ -31724,33 +31398,32 @@ U8              cfi;
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHCmnUpdUeDataIndLcg 
+Void rgSCHCmnUpdUeDataIndLcg 
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
 RgInfUeDatInd  *datInd
 )
 #else
-PUBLIC Void rgSCHCmnUpdUeDataIndLcg(cell, ue, datInd)
+Void rgSCHCmnUpdUeDataIndLcg(cell, ue, datInd)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgInfUeDatInd  *datInd;
 #endif
 {
-   U32 idx = 0;
+   uint32_t idx = 0;
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 #ifdef DEBUGP
    Inst                inst = cell->instIdx;
 #endif
 
-   TRC2(rgSCHCmnUpdUeDataIndLcg);
 
    for (idx = 0; (idx < RGINF_MAX_LCG_PER_UE - 1); idx++)
    {
       if (datInd->lcgInfo[idx].bytesRcvd != 0)
       {
-         U8  lcgId     = datInd->lcgInfo[idx].lcgId;
-         U32 bytesRcvd = datInd->lcgInfo[idx].bytesRcvd;
+         uint8_t  lcgId     = datInd->lcgInfo[idx].lcgId;
+         uint32_t bytesRcvd = datInd->lcgInfo[idx].bytesRcvd;
 
          if (RGSCH_LCG_ISCFGD(&ue->ul.lcgArr[lcgId]))
          {
@@ -31837,9 +31510,8 @@ RgSchCellCb        *cell;
    RgSchCmnCell           *cellSch = RG_SCH_CMN_GET_CELL(cell);
    CmLteTimingInfo        frm;
    RgSchDlSf              *dlSf;
-       U8                     idx;
+       uint8_t                     idx;
    
-   TRC2(rgSCHCmnInitRbAlloc);
 
 /* Initializing RgSchCmnUlRbAllocInfo structure.*/
    rgSCHCmnInitDlRbAllocInfo(&cellSch->allocInfo);
@@ -31867,7 +31539,7 @@ RgSchCellCb        *cell;
    if(RGR_ENABLE == cell->lteAdvCb.absCfg.status)
    {
       cell->lteAdvCb.absPatternDlIdx = 
-         ((frm.sfn*RGSCH_NUM_SUB_FRAMES_5G) + frm.subframe) % RGR_ABS_PATTERN_LEN;
+         ((frm.sfn*RGSCH_NUM_SUB_FRAMES_5G) + frm.slot) % RGR_ABS_PATTERN_LEN;
       cell->lteAdvCb.absDlSfInfo = (RgSchAbsSfEnum)(cell->lteAdvCb.absCfg.absPattern[
             cell->lteAdvCb.absPatternDlIdx]);
 
@@ -31885,7 +31557,7 @@ RgSchCellCb        *cell;
    /* Update subframe-wide allocation information with SPS allocation */
    rgSCHCmnSpsDlUpdDlSfAllocWithSps(cell, frm, dlSf);
 #endif
-   RETVOID;
+   return;
 }
 
 
@@ -31906,7 +31578,7 @@ RgSchCellCb        *cell;
  *
  *  @param[in]  RgSchCellCb      *cell
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8               newTxMode
+ *  @param[in]  uint8_t               newTxMode
  *  @return Void
  **/
 #ifdef ANSI
@@ -31914,19 +31586,18 @@ PRIVATE Void rgSCHCmnSendTxModeInd
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
-U8             newTxMode
+uint8_t             newTxMode
 )
 #else
 PRIVATE Void rgSCHCmnSendTxModeInd(cell, ue, newTxMode)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
-U8             newTxMode;
+uint8_t             newTxMode;
 #endif
 { 
    RgmTransModeInd   *txModeChgInd;
    RgSchCmnDlUe      *ueDl =  RG_SCH_CMN_GET_DL_UE(ue,cell);
 
-   TRC2(rgSCHCmnSendTxModeInd);
 
    if(!(ueDl->mimoInfo.forceTD & RG_SCH_CMN_TD_TXMODE_RECFG))
    {
@@ -31935,7 +31606,7 @@ U8             newTxMode;
                cell->rgmSap->sapCfg.sapPst.pool, (Data**)&txModeChgInd,
                sizeof(RgmTransModeInd)) != ROK)
       {
-         RETVOID;
+         return;
       }
       RG_SCH_FILL_RGM_TRANSMODE_IND(ue->ueId, cell->cellId, newTxMode, txModeChgInd);
       RgUiRgmChangeTransModeInd(&(cell->rgmSap->sapCfg.sapPst),
@@ -31946,7 +31617,7 @@ U8             newTxMode;
    ue->mimoInfo.txModDownChgFactor = 0;
    ueDl->laCb[0].deltaiTbs = 0;
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -31963,31 +31634,30 @@ U8             newTxMode;
  *
  *  @param[in]  RgSchCellCb      *cell
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8               iTbs
+ *  @param[in]  uint8_t               iTbs
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSchCheckAndTriggerModeChange
+Void rgSchCheckAndTriggerModeChange
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
-U8             reportediTbs,
-U8             previTbs,
-U8             maxiTbs
+uint8_t             reportediTbs,
+uint8_t             previTbs,
+uint8_t             maxiTbs
 )
 #else
-PUBLIC Void rgSchCheckAndTriggerModeChange(cell, ue, reportediTbs, previTbs, maxiTbs)
+Void rgSchCheckAndTriggerModeChange(cell, ue, reportediTbs, previTbs, maxiTbs)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
-U8             reportediTbs;
-U8             previTbs;
-U8             maxiTbs;
+uint8_t             reportediTbs;
+uint8_t             previTbs;
+uint8_t             maxiTbs;
 #endif
 {
    RgrTxMode          txMode;       /*!< UE's Transmission Mode */
    RgrTxMode          modTxMode;       /*!< UE's Transmission Mode */
 
-   TRC2(rgSchCheckAndTriggerModeChange);
 
    txMode = ue->mimoInfo.txMode;
 
@@ -32040,7 +31710,7 @@ U8             maxiTbs;
       }
    }
 
-   RETVOID;
+   return;
 }
 #endif
 
@@ -32061,33 +31731,32 @@ U8             maxiTbs;
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Bool rgSCHCmnIsDlCsgPrio
+Bool rgSCHCmnIsDlCsgPrio
 (
 RgSchCellCb    *cell
 )
 #else
-PUBLIC Bool rgSCHCmnIsDlCsgPrio(cell)
+Bool rgSCHCmnIsDlCsgPrio(cell)
 RgSchCellCb    *cell;
 #endif
 {
   
    RgSchCmnDlCell *cmnDlCell = RG_SCH_CMN_GET_DL_CELL(cell);
  
-   TRC2(rgSCHCmnIsDlCsgPrio)
    /* Calculating the percentage resource allocated */
    if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode)
    {
-      RETVALUE(FALSE);
+      return (FALSE);
    }
    else
    {
       if(((cmnDlCell->ncsgPrbCnt * 100) / cmnDlCell->totPrbCnt) < cell->minDlResNonCsg)
       {
-         RETVALUE(FALSE);
+         return (FALSE);
       }
       else
       {
-         RETVALUE(TRUE);
+         return (TRUE);
       }
    }
 }
@@ -32109,33 +31778,32 @@ RgSchCellCb    *cell;
  *  @return Void
  **/
 #ifdef ANSI
-PUBLIC Bool rgSCHCmnIsUlCsgPrio
+Bool rgSCHCmnIsUlCsgPrio
 (
 RgSchCellCb    *cell
 )
 #else
-PUBLIC Bool rgSCHCmnIsUlCsgPrio(cell)
+Bool rgSCHCmnIsUlCsgPrio(cell)
 RgSchCellCb    *cell;
 #endif
 {
    RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell);
  
-   TRC2(rgSCHCmnIsUlCsgPrio)
 
    /* Calculating the percentage resource allocated */
    if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode)
    {
-      RETVALUE(FALSE);
+      return (FALSE);
    }
    else
    {
       if (((cmnUlCell->ncsgPrbCnt * 100) /cmnUlCell->totPrbCnt) < cell->minUlResNonCsg)
       {
-         RETVALUE(FALSE);
+         return (FALSE);
       }
       else
       {
-         RETVALUE(TRUE);
+         return (TRUE);
       }
    }
 }
@@ -32151,28 +31819,27 @@ RgSchCellCb    *cell;
  *
  */
 #ifdef ANSI
-   PUBLIC Void rgSchCmnPreDlSch
+   Void rgSchCmnPreDlSch
 (
  RgSchCellCb        **cell,
U8                 nCell,
uint8_t                 nCell,
  RgSchCellCb        **cellLst
  )
 #else
-PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst)
+Void rgSchCmnPreDlSch(cell, nCell, cellLst)
    RgSchCellCb        **cell;
-   U8                 nCell;
+   uint8_t                 nCell;
    RgSchCellCb        **cellLst;
 #endif
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell[0]);
    RgSchDlSf     *sf;
-   U8            idx;
+   uint8_t            idx;
 
-   TRC2(rgSchCmnPreDlSch);
 
    if(nCell > CM_LTE_MAX_CELLS)
    {
-      RETVOID;
+      return;
    }
 
    if (cell[0]->isDlDataAllwd && (cell[0]->stopDlSch == FALSE))
@@ -32185,7 +31852,7 @@ PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst)
        * in that cell */
       for (idx = 0; idx < nCell; idx++)
       {
-         U8    j;
+         uint8_t    j;
          cellSch = RG_SCH_CMN_GET_CELL(cell[idx]);
          sf = cellSch->allocInfo.dedAlloc.dedDlSf;
 
@@ -32202,7 +31869,7 @@ PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst)
 
             if(sf->remUeCnt < subfrm->remUeCnt)
             {
-               U8  k;
+               uint8_t  k;
                for(k = idx; k > j; k--)
                {
                   cellLst[k] = cellLst[k-1];
@@ -32220,7 +31887,7 @@ PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst)
          cellLst[idx] = cell[idx];
       }
    }
-   RETVOID;
+   return;
 }
 
 /** @brief DL scheduler for SPS, and all other downlink data
@@ -32233,18 +31900,17 @@ PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst)
  *
  */
 #ifdef ANSI
-PUBLIC Void rgSchCmnPstDlSch
+Void rgSchCmnPstDlSch
 (
  RgSchCellCb       *cell
 )
 #else
-PUBLIC Void rgSchCmnPstDlSch(cell)
+Void rgSchCmnPstDlSch(cell)
    RgSchCellCb        *cell
 #endif
 {
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSchCmnPstDlSch);
 
    if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE))
    {
@@ -32253,23 +31919,22 @@ PUBLIC Void rgSchCmnPstDlSch(cell)
 }
 
 #ifdef ANSI
-PUBLIC U8 rgSCHCmnCalcPcqiBitSz
+uint8_t rgSCHCmnCalcPcqiBitSz
 (
  RgSchUeCb    *ueCb, 
U8           numTxAnt
uint8_t           numTxAnt
 )
 #else
-PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt)
+uint8_t rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt)
    RgSchUeCb     *ueCb;
-   U8            numTxAnt;
+   uint8_t            numTxAnt;
 #endif
 {
-   U8 confRepMode;
-   U8 pcqiSz;
-   U8 ri;
+   uint8_t confRepMode;
+   uint8_t pcqiSz;
+   uint8_t ri;
    RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb;
 
-   TRC3(rgSCHCmnCalcPcqiBitSz);
 
    confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum;
    if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && 
@@ -32388,7 +32053,7 @@ PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt)
           break;
    }
    
-   RETVALUE(pcqiSz);
+   return (pcqiSz);
 }
 
 /** @brief DL scheduler for SPS, and all other downlink data
@@ -32403,12 +32068,12 @@ PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt)
  *
  */
 #ifdef ANSI
-PUBLIC Void rgSCHCmnDlSch
+Void rgSCHCmnDlSch
 (
  RgSchCellCb        *cell
  )
 #else
-PUBLIC Void rgSCHCmnDlSch (cell)
+Void rgSCHCmnDlSch (cell)
    RgSchCellCb        *cell;
 #endif
 {
@@ -32416,10 +32081,9 @@ PUBLIC Void rgSCHCmnDlSch (cell)
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
 #ifdef RG_5GTF
    RgSchDynTddCb  *rgSchDynTddInfo = &(rgSchCb[cell->instIdx].rgSchDynTdd);
-   U16 dlCntrlSfIdx;
+   uint16_t dlCntrlSfIdx;
 #endif
 
-   TRC2(rgSCHCmnDlSch);
 
    dlSf = rgSCHUtlSubFrmGet(cell, cellSch->dl.time);
 #ifdef RG_5GTF
@@ -32435,10 +32099,10 @@ PUBLIC Void rgSCHCmnDlSch (cell)
             /*
                      printf("ul5gtfsidDlAlreadyMarkUl: %d, [sfn:sf] [%04d:%02d]\n", 
                     ul5gtfsidDlAlreadyMarkUl, cellSch->dl.time.sfn, 
-                    cellSch->dl.time.subframe);
+                    cellSch->dl.time.slot);
             */
          }
-                  RETVOID;
+                  return;
                }
    }
 #endif
@@ -32462,7 +32126,7 @@ PUBLIC Void rgSCHCmnDlSch (cell)
    /* Do group power control for PUCCH */
    rgSCHCmnGrpPwrCntrlPucch(cell, dlSf);
 
-   RETVOID;
+   return;
 }
 
 /**********************************************************************