U8, U16, U32 data type changes
[o-du/l2.git] / src / 5gnrsch / rg_sch_tom.c
index 6a076ed..5e48dd3 100755 (executable)
@@ -37,17 +37,7 @@ static int RLOG_FILE_ID=228;
 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 services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -62,15 +52,6 @@ static int RLOG_MODULE_ID=4096;
 
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -81,12 +62,14 @@ static int RLOG_MODULE_ID=4096;
 #ifdef EMTC_ENABLE
 #include "rg_sch_emtc_ext.x"
 #endif 
+uint8_t rgSCHCmnCalcPcqiBitSz(RgSchUeCb    *ueCb,uint8_t numTxAnt);
+S16 rgSCHDhm5gtfHqFdbkInd(RgSchUeCb *ue,RgSchCellCb *cell,CmLteTimingInfo timingInfo,TfuHqFdbk fdbk,RgSchErrInfo *err);
 /* local defines */
 #ifdef EMTC_ENABLE
 EXTERN  Bool rgSCHEmtcChkEmtcUe ARGS(
 (
 RgSchCellCb  *cell,
-U16          rapId
+uint16_t          rapId
 ));
 EXTERN Void rgSchTomTtiEmtcSched ARGS(
 (
@@ -95,8 +78,8 @@ EXTERN Void rgSchTomTtiEmtcSched ARGS(
 
 EXTERN S16 rgSCHEmtcRamVldtProcRaReq
 (
-U8              raRntiCnt,
-U8              raReqCnt,
+uint8_t              raRntiCnt,
+uint8_t              raReqCnt,
 RgSchCellCb     *cell, 
 TfuRaReqIndInfo *raReqInd,
 RgSchUeCb       *ue,
@@ -107,12 +90,12 @@ EXTERN Void rgSCHEmtcUpdCqiInfo
 (
 RgSchUeCb       *ue,
 RgSchUePCqiCb   *cqiCb,
-U16             *cqiIdx
+uint16_t             *cqiIdx
 );
 EXTERN Void rgSCHEmtcUpdSRInfo
 (
 RgSchUeCb       *ue,
-U16             *srIdx
+uint16_t             *srIdx
 );
 EXTERN Void rgSCHCmnEmtcHdlCrcFailInd
 (
@@ -134,7 +117,7 @@ EXTERN Void rgSCHEmtcFillPucchRecpInfo
 (
 RgSchCellCb       *cell,
 RgSchDlHqProcCb   *hqCb,
-U16               *hqRes
+uint16_t               *hqRes
 );
 EXTERN Bool rgSCHEmtcAddRecpInfoToLst
 (
@@ -163,7 +146,7 @@ EXTERN S16 rgSCHTomEmtcUtlFillDatRecpReq
 (
  TfuRecpReqInfo       *recpReqInfo,
  RgSchCellCb          *cell,
U16                  validIdx,
uint16_t                  validIdx,
  RgSchErrInfo         *err
 );
 
@@ -171,7 +154,7 @@ EXTERN S16 rgSCHEmtcTomUtlFillHqFdbkRecpReq
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
U16                  validIdx,
uint16_t                  validIdx,
  RgSchErrInfo            *err
 );
 
@@ -203,8 +186,8 @@ CmLteTimingInfo        frm
 );
 #endif
 
-EXTERN U32 gDlMpdcchBlank;
-EXTERN U32 gUlMpdcchBlank;
+EXTERN uint32_t gDlMpdcchBlank;
+EXTERN uint32_t gUlMpdcchBlank;
 EXTERN S16 rgSCHUtlIotResPrcTti
 (
 RgSchCellCb *cell
@@ -215,46 +198,46 @@ RgSchCellCb *cell
 EXTERN RgSchUeCb* rgSCHCmnGetHoUe
 (
 RgSchCellCb           *cell,
-U16                   rapId
+uint16_t                   rapId
 );
 EXTERN RgSchUeCb* rgSCHCmnGetPoUe
 (
 RgSchCellCb           *cell,
-U16                   rapId,
+uint16_t                   rapId,
 CmLteTimingInfo       timingInfo
 );
-PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq ARGS(
+S16 rgSCHTomUtlFillDatAperRecpReq ARGS(
 (
  RgSchCellCb       *cell,
U8                cqiReq,
uint8_t                cqiReq,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo,
  CmLteTimingInfo   *timeInfo,
  Bool              hqPres,
U16                validIdx
uint16_t                validIdx
  ));
 
-PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq ARGS(
+S16 rgSCHTomUtlFillDatPriRecpReq ARGS(
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo,
  CmLteTimingInfo   *timeInfo,
  Bool              hqPres,
U16               validIdx
uint16_t               validIdx
  ));
 
-PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS(
+S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS(
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo,
  CmLteTimingInfo   *timeInfo,
  Bool              hqPres, 
U16                validIdx
uint16_t                validIdx
  ));
 
-PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq ARGS(
+S16 rgSCHTomUtlFillDatSrsRecpReq ARGS(
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -263,69 +246,124 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq ARGS(
  Bool              hqPres
  ));
 
+void schFillCrntTime(
+   SlotIndInfo slotInd,
+   Inst        schInst);
 
 #ifdef CA_DBG
-EXTERN U32 delayedApiCnt;
-U32 gPCellTb1AckCount=0,gPCellTb2AckCount=0,gPCellTb1NackCount=0,gPCellTb2NackCount=0;
-U32 gSCellSchedCount=0,gPrimarySchedCount=0;
-U32 gSCellTb1AckCount=0,gSCellTb2AckCount=0,gSCellTb1NackCount=0,gSCellTb2NackCount=0;
-U32 gPCellTb1DtxCount = 0, gPCellTb2DtxCount = 0, gSCellTb1DtxCount = 0, gSCellTb2DtxCount = 0;
-U32 gHqFdbkCount = 0;
+EXTERN uint32_t delayedApiCnt;
+uint32_t gPCellTb1AckCount=0,gPCellTb2AckCount=0,gPCellTb1NackCount=0,gPCellTb2NackCount=0;
+uint32_t gSCellSchedCount=0,gPrimarySchedCount=0;
+uint32_t gSCellTb1AckCount=0,gSCellTb2AckCount=0,gSCellTb1NackCount=0,gSCellTb2NackCount=0;
+uint32_t gPCellTb1DtxCount = 0, gPCellTb2DtxCount = 0, gSCellTb1DtxCount = 0, gSCellTb2DtxCount = 0;
+uint32_t gHqFdbkCount = 0;
 
  
 
-U32 gCqiRecpCount = 0;
-U32 gCqiRecpPuschCount = 0;
-U32 gCqiRcvdCount = 0;
+uint32_t gCqiRecpCount = 0;
+uint32_t gCqiRecpPuschCount = 0;
+uint32_t gCqiRcvdCount = 0;
 Bool gF1bCsPres = FALSE;
-U32  gRiReqCount = 0;
-U32 gCqiReqCount = 0;
-U32 gF1bCsCount = 0;
-U32 gACqiRcvdCount = 0;
-U32 gCqiReptToAppCount = 0;
-U32 gRawACqiCount= 0;
-U32 gCqiDropCount,gPucchDropCount;
-U32 gCqiPucchLowSnrDropCount,gCqiPucchConfMaskDropCount,gCqiPuschConfMaskDropCount;
-U32 gDci0Count = 0;
-U32 gUlCrcFailCount = 0;
-U32 gUlCrcPassCount = 0;
-U32 gPuschCqiDropCount = 0;
-U32 gCaDbgCaFrmt = 0;
-U32 gCaDbgNonCaFrmt = 0;
-U32 gPcellZeroBoOcc=0,gScellZeroBoOcc=0, dbgDelayedDatReqInMac=0,gDropDatReqCnt=0, gIccPktRcvrMemDropCnt=0;
+uint32_t  gRiReqCount = 0;
+uint32_t gCqiReqCount = 0;
+uint32_t gF1bCsCount = 0;
+uint32_t gACqiRcvdCount = 0;
+uint32_t gCqiReptToAppCount = 0;
+uint32_t gRawACqiCount= 0;
+uint32_t gCqiDropCount,gPucchDropCount;
+uint32_t gCqiPucchLowSnrDropCount,gCqiPucchConfMaskDropCount,gCqiPuschConfMaskDropCount;
+uint32_t gDci0Count = 0;
+uint32_t gUlCrcFailCount = 0;
+uint32_t gUlCrcPassCount = 0;
+uint32_t gPuschCqiDropCount = 0;
+uint32_t gCaDbgCaFrmt = 0;
+uint32_t gCaDbgNonCaFrmt = 0;
+uint32_t gPcellZeroBoOcc=0,gScellZeroBoOcc=0, dbgDelayedDatReqInMac=0,gDropDatReqCnt=0, gIccPktRcvrMemDropCnt=0;
 #endif
 
 #ifdef EMTC_ENABLE
-U32 gUlCrcFailCounter = 0;
-U32 gUlCrcPassCounter = 0;
+uint32_t gUlCrcFailCounter = 0;
+uint32_t gUlCrcPassCounter = 0;
 #endif
 
 #ifdef RG_5GTF
-EXTERN U32 gUl5gtfPdcchSend;
+EXTERN uint32_t gUl5gtfPdcchSend;
+#endif
+
+#ifdef UNUSED_FUNC
+#ifdef TFU_UPGRADE
+PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS
+((
+RgSchCellCb       *cell,
+RgSchUeCb         *ue,
+TfuRecpReqInfo    *recpReqInfo,
+TfuUeRecpReqInfo  *pucchRecpInfo,
+uint16_t               validIdx
+));
+PRIVATE Bool rgSCHTomUtlFillDatHarqRecpReq ARGS
+((
+RgSchCellCb       *cell,
+RgSchUlAlloc      *alloc,
+TfuUeRecpReqInfo  *datRecpInfo,
+TfuRecpReqInfo    *recpReqInfo
+));
+PRIVATE S16 rgSCHTomUtlFillSrRecpReq ARGS((
+TfuRecpReqInfo   *recpReq,
+RgSchCellCb      *cell,
+uint16_t              validIdx,
+RgSchErrInfo     *err));
+PRIVATE S16 rgSCHTomUtlFillRiRecpReq ARGS((
+TfuRecpReqInfo   *recpReq,
+RgSchCellCb      *cell,
+uint16_t              validIdx,
+RgSchErrInfo     *err));
+PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq ARGS((
+TfuRecpReqInfo   *recpReq,
+RgSchCellCb      *cell,
+uint16_t              validIdx,
+RgSchErrInfo     *err));
+PRIVATE S16 rgSCHTomUtlFillSrsRecpReq ARGS((
+TfuRecpReqInfo   *recpReq,
+RgSchCellCb      *cell,
+uint16_t              validIdx,
+RgSchErrInfo     *err));
+PRIVATE S16 rgSCHTomUtlGenIndices ARGS((
+uint32_t      label,
+uint8_t        posM,
+uint8_t        valN,
+uint8_t        valK,
+TfuSubbandInfo*    sbInfo));
+#endif
 PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ARGS(
 (
  TfuRecpReqInfo       *recpReqInfo,
  RgSchCellCb          *cell,
U16                  validIdx, 
uint16_t                  validIdx, 
  RgSchErrInfo         *err
  ));
+PRIVATE Void rgSchTomFillCellTtiInfo ARGS
+((
+TfuTtiIndInfo      *ttiInd,
+Inst               schInst,
+uint8_t                 *nCell,
+RgSchCellCb        *cells[]
+));
 #endif
 
-
 /* local typedefs */
-PUBLIC U32 rgBwAlloInfo[RGSCH_NUM_SUB_FRAMES]; /* Num of Rbs Allocated in each SF */ 
-PUBLIC U32 rgBwAlcnt[RGSCH_NUM_SUB_FRAMES];   /*Num of times Allocation done in each Subframe */
+uint32_t rgBwAlloInfo[RGSCH_NUM_SUB_FRAMES]; /* Num of Rbs Allocated in each SF */ 
+uint32_t rgBwAlcnt[RGSCH_NUM_SUB_FRAMES];   /*Num of times Allocation done in each Subframe */
 
 /* local externs */
 /* rg006.201: [ccpu000111706, ccpu00112394]: Separated UL and DL TTI
  * processing */
 #ifdef LTE_L2_MEAS
-   U64     glblTtiCnt = 0;
+   uint64_t     glblTtiCnt = 0;
 #endif
-U32 ri1Cnt ;
-U32 ri2Cnt ;  
-U32 gDlNumUePerTti[20] = {0};
-U32 gUlNumUePerTti[20] = {0};
+uint32_t ri1Cnt ;
+uint32_t ri2Cnt ;  
+uint32_t gDlNumUePerTti[20] = {0};
+uint32_t gUlNumUePerTti[20] = {0};
 PRIVATE S16 rgSCHTomUtlProcDlSf ARGS((
          RgSchDlSf        *dlSf,
          RgSchDlSf        *ulSf,
@@ -370,7 +408,7 @@ PRIVATE S16 rgSCHTomUtlProcTA ARGS((
 PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS((
          TfuRecpReqInfo   *recpReq,
          RgSchCellCb      *cell,
-         U16              validIdx,
+         uint16_t              validIdx,
         RgSchErrInfo     *err));
 #else
 PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS((
@@ -380,57 +418,47 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS((
 #endif
 #ifdef TFU_UPGRADE
 
-PUBLIC S16 rgSCHTomFillOnlySrsRecpReq ARGS
+S16 rgSCHTomFillOnlySrsRecpReq ARGS
 ((
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo
  ));
-
-PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS
-((
- RgSchCellCb       *cell,
- RgSchUeCb         *ue, 
- TfuRecpReqInfo    *recpReqInfo,
- TfuUeRecpReqInfo  *pucchRecpInfo,
- U16               validIdx
- ));
-
 PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS
 ((
  RgSchCellCb         *cell,
  TfuRecpReqInfo      *recpReqInfo,
  RgSchUeCb           *ue,
  TfuUeRecpReqInfo    *pucchRecpInfo,
U16                  validIdx,
uint16_t                  validIdx,
  Bool                 isDatPresOnSecCell
  ));
 
-PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo ARGS
+S16 rgSCHTomUtlFillRiBitWidthInfo ARGS
 ((
  RgSchUeCb          *ueCb
 ));
 
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz ARGS
+uint8_t rgSCHTomUtlFetchPcqiBitSz ARGS
 ((
 RgSchUeCb          *ueCb, 
-U8                 numTxAnt,
-U8                 *ri
+uint8_t                 numTxAnt,
+uint8_t                 *ri
 ));
 
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSzPucchMode21 ARGS
+uint8_t rgSCHTomUtlFetchPcqiBitSzPucchMode21 ARGS
 ((
 RgSchUeCb          *ueCb, 
 TfuCqiPucchMode21   *mode21Info,
-U8                 numTxAnt,
-U8                 *ri
+uint8_t                 numTxAnt,
+uint8_t                 *ri
 ));
 
-PUBLIC S16 rgSCHTomUtlMoveNxtOccasion ARGS
+S16 rgSCHTomUtlMoveNxtOccasion ARGS
 ((
 RgSchCellCb        *cell,
 RgSchUeCb          *ueCb,
-U16                validIdx
+uint16_t                validIdx
 ));
 
 PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion ARGS
@@ -458,56 +486,15 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion ARGS
 RgSchCellCb     *cell,
 RgSchUeCb       *ue
 ));
-
-PRIVATE Bool rgSCHTomUtlFillDatHarqRecpReq ARGS
-((
- RgSchCellCb       *cell,
- RgSchUlAlloc      *alloc,
- TfuUeRecpReqInfo  *datRecpInfo,
- TfuRecpReqInfo    *recpReqInfo
- ));
-
-PRIVATE S16 rgSCHTomUtlFillSrRecpReq ARGS((
-         TfuRecpReqInfo   *recpReq,
-         RgSchCellCb      *cell,
-         U16              validIdx,
-         RgSchErrInfo     *err));
-
 PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ARGS((
          RgSchUeCb        *ue,
          Bool             *willueRprtCqiRii));
-
-PRIVATE S16 rgSCHTomUtlFillRiRecpReq ARGS((
-         TfuRecpReqInfo   *recpReq,
-         RgSchCellCb      *cell,
-         U16              validIdx,
-         RgSchErrInfo     *err));
-
-PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq ARGS((
-         TfuRecpReqInfo   *recpReq,
-         RgSchCellCb      *cell,
-         U16              validIdx,
-         RgSchErrInfo     *err));
-
-PRIVATE S16 rgSCHTomUtlFillSrsRecpReq ARGS((
-         TfuRecpReqInfo   *recpReq,
-         RgSchCellCb      *cell,
-         U16              validIdx,
-         RgSchErrInfo     *err));
-         
-PRIVATE S16 rgSCHTomUtlGenIndices ARGS((
-         U32      label,
-         U8        posM,
-         U8        valN,
-         U8        valK,
-         TfuSubbandInfo*    sbInfo));
-
 #endif 
 #ifdef TFU_UPGRADE
 PRIVATE S16 rgSCHTomUtlFillDatRecpReq ARGS((
          TfuRecpReqInfo   *recpReq,
          RgSchCellCb      *cell,
-         U16              validIdx,
+         uint16_t              validIdx,
          RgSchErrInfo     *err));
 #else
 PRIVATE S16 rgSCHTomUtlFillDatRecpReq ARGS((
@@ -523,11 +510,11 @@ PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk ARGS((
       RgSchCellCb    *cell,
       RgSchErrInfo   *err,
       RgSchDlSf      *dlSf,
-      U8             noFdbks,
+      uint8_t             noFdbks,
       CmMemListCp    *memCp,
-      U8             elemIdx,
+      uint8_t             elemIdx,
       RgSchDlSf      *nxtDlsf,
-      U16              validIdx
+      uint16_t              validIdx
      ));
 #else
 PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk ARGS((
@@ -535,9 +522,9 @@ PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk ARGS((
       RgSchCellCb    *cell,
       RgSchErrInfo   *err,
       RgSchDlSf      *dlSf,
-      U8             noFdbks,
+      uint8_t             noFdbks,
       CmMemListCp    *memCp,
-      U8             elemIdx,
+      uint8_t             elemIdx,
       RgSchDlSf      *nxtDlsf
      ));
 #endif
@@ -547,11 +534,11 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbk ARGS((
       RgSchCellCb    *cell,
       RgSchErrInfo   *err,
       RgSchDlSf      *dlSf,
-      U8             noFdbks,
+      uint8_t             noFdbks,
       CmMemListCp    *memCp,
-      U8             elemIdx,
+      uint8_t             elemIdx,
       RgSchDlSf      *nxtDlsf,
-      U16              validIdx
+      uint16_t              validIdx
      ));
 #else
 PRIVATE S16 rgSCHTomUtlFillSfHqFdbk ARGS((
@@ -559,9 +546,9 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbk ARGS((
       RgSchCellCb    *cell,
       RgSchErrInfo   *err,
       RgSchDlSf      *dlSf,
-      U8             noFdbks,
+      uint8_t             noFdbks,
       CmMemListCp    *memCp,
-      U8             elemIdx,
+      uint8_t             elemIdx,
       RgSchDlSf      *nxtDlsf
      ));
 #endif
@@ -572,29 +559,30 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS((
       RgSchCellCb             *cellCb,
       RgSchErrInfo            *err,
       RgSchDlSf               *dlSf,
-      U8                      noFdbks,
+      uint8_t                      noFdbks,
       CmMemListCp             *memCp,
-      U8                      elemIdx,
+      uint8_t                      elemIdx,
       RgSchDlSf               *nxtDlsf,
       CmLteRnti               rnti,
       RgrTddAckNackMode       ackNackMode,
       RgSchUePucchRecpInfo    **pucchInfoRef,
       RgSchPdcch              *pdcch,
-      TknU16                  n1PucchTkn,
+      TknUInt16                  n1PucchTkn,
       Bool                    *allocRef,
-      U8                      hqSz
+      uint8_t                      hqSz
       ));
 #endif
 #ifdef LTEMAC_SPS
-EXTERN PUBLIC Void rgSCHCmnDlSpsSch (RgSchCellCb *cell);
+EXTERN Void rgSCHCmnDlSpsSch (RgSchCellCb *cell);
 #ifndef LTE_TDD
+#ifdef UNUSED_FUNC
 #ifdef TFU_UPGRADE
 PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS
 ((
  RgSchCellCb   *cell,
  RgSchDlSf       *dlSf,
  TfuRecpReqInfo          *recpReqInfo,
U16 validIdx,
uint16_t validIdx,
  RgSchErrInfo    *err
  ));
 #else
@@ -608,6 +596,7 @@ PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS
 #endif
 #endif
 #endif
+#endif
 
 PRIVATE Void rgSchTomTtiMiscFunctions ARGS
 ((
@@ -641,14 +630,6 @@ PRIVATE Void rgSCHTomUtlSendSfnTick ARGS
 RgSchCellCb  *cell
 ));
 #endif
-
-PRIVATE Void rgSchTomFillCellTtiInfo ARGS
-((
-TfuTtiIndInfo      *ttiInd,
-Inst               schInst,
-U8                 *nCell,
-RgSchCellCb        *cells[]
-));
 #ifdef LTE_TDD
 PRIVATE Void rgSchTomUtlTddRlsSfAndHarq ARGS
 ((
@@ -661,17 +642,17 @@ RgSchCellCb        *cell
 #ifdef LTE_ADV
 PRIVATE Void rgSCHTomUtlGethqRes ARGS
 ((
-U8                      noFdbks,
+uint8_t                      noFdbks,
 RgSchDlSf               *dlSf,
 RgSchPdcch              *pdcch,
 RgSchCellCb             *cellCb,
-U16                     *hqRes
+uint16_t                     *hqRes
 ));
 PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1 ARGS
 ((
  RgSchDlHqProcCb     *hqCb,
  TfuUePucchRecpReq   *hqRecpReq,
U8                  noFdbks,
uint8_t                  noFdbks,
  RgSchDlSf           *dlSf,
  RgSchPdcch          *pdcch,
  RgSchCellCb         *cellCb
@@ -680,19 +661,19 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 ARGS
 ((
  RgSchDlHqProcCb         *hqCb,
  TfuUePucchRecpReq       *hqRecpReq,
U8                      noFdbks,
uint8_t                      noFdbks,
  RgSchDlSf               *dlSf,
  RgSchPdcch              *pdcch,
  RgSchCellCb             *cellCb,
U8                      elemIdx
uint8_t                      elemIdx
 ));
 #endif/*LTE_ADV*/
 #endif/*LTE_TDD*/
 
-PUBLIC U32 rgDlCqiRptCnt[16], rgTotDlCqiRpt;
+uint32_t rgDlCqiRptCnt[16], rgTotDlCqiRpt;
 
 #ifdef RG_5GTF
-U32 rgSch5gtfCqi2Mcs[15] = 
+uint32_t rgSch5gtfCqi2Mcs[15] = 
     {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14};
 #endif
 /* forward references */
@@ -700,9 +681,9 @@ U32 rgSch5gtfCqi2Mcs[15] =
 /*HARQ Feedback interpretation in accordance with Femto Forum.
 Note: There is no value as '0' in Femto Forum Spec but in order to retain
 the existing usage in MAC (and its Acceptance), its being considered*/
-CONSTANT PRIVATE U8 rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4};
+//CONSTANT PRIVATE uint8_t rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4};
 /*added #defines instead of magic numbers*/
-CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={
+/*CONSTANT PRIVATE uint32_t rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={
 {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28},
 {0,1,3,6,10,15,21,28,36,45,55,66,78,91,105,120,136,153,171,190,210,231,253,276,300,325,351,378},
 {0,0,1,4,10,20,35,56,84,120,165,220,286,364,455,560,680,816,969,1140,1330,1540,1771,2024,2300,2600,2925,3276},
@@ -710,13 +691,13 @@ CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_T
 {0,0,0,0,1,6,21,56,126,252,462,792,1287,2002,3003,4368,6188,8568,11628,15504,20349,26334,33649,42504,53130,65780,80730,98280},
 {0,0,0,0,0,1,7,28,84,210,462,924,1716,3003,5005,8008,12376,18564,27132,38760,54264,74613,100947,134596,177100,230230,296010,376740}
 };
-
+*/
 
 /*ccpu00116923 - ADD - SRS present support*/
 /*Tables Derived from 3GPP TS 36.211 Section 5.5.3.3 */
 /* Table 5.5.3.3-1 */
 #ifndef LTE_TDD
-CONSTANT PUBLIC RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = {
+CONSTANT RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = {
    {TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE},
    {TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE},
    {FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE},
@@ -736,7 +717,7 @@ CONSTANT PUBLIC RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = {
 };
 #else
 /* Table 5.5.3.3-2 */
-CONSTANT PUBLIC RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = {
+CONSTANT RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = {
    {FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE},
    {FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE},
    {FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE},
@@ -755,8 +736,8 @@ CONSTANT PUBLIC RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = {
    {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}
 };
 #endif
-PUBLIC S8 rgSchCmnAper20n22DiffCqi[4] = {1, 2, 3, 4};
-PUBLIC S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1};
+S8 rgSchCmnAper20n22DiffCqi[4] = {1, 2, 3, 4};
+S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1};
 #endif 
 
 /**
@@ -775,17 +756,17 @@ PUBLIC S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1};
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHGetDedPrmUe 
+S16 rgSCHGetDedPrmUe 
 (
 RgSchCellCb     *cell,
-U16             rapId,
+uint16_t             rapId,
 CmLteTimingInfo timingInfo,
 RgSchUeCb       **ue
 )
 #else
-PUBLIC S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue)
+S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue)
 RgSchCellCb     *cell; 
-U16             rapId;
+uint16_t             rapId;
 CmLteTimingInfo timingInfo;
 RgSchUeCb       **ue;
 #endif
@@ -808,7 +789,7 @@ RgSchUeCb       **ue;
       *ue = rgSCHCmnGetPoUe(cell, rapId, timingInfo);
       printf("     ==== inding UE from PDCCH Order Mapping\n");
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
  * @brief Handler for processing Random Access request indication 
@@ -834,27 +815,25 @@ RgSchUeCb       **ue;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomRaReqInd
+S16 rgSCHTomRaReqInd
 (
 RgSchCellCb     *cell,
 TfuRaReqIndInfo *raReqInd
 )
 #else
-PUBLIC S16 rgSCHTomRaReqInd(cell, raReqInd)
+S16 rgSCHTomRaReqInd(cell, raReqInd)
 RgSchCellCb     *cell; 
 TfuRaReqIndInfo *raReqInd;
 #endif
 {
    S16             ret;
-   U8              raRntiCnt;
-   U8              raReqCnt;
+   uint8_t              raRntiCnt;
+   uint8_t              raReqCnt;
    RgSchErrInfo    err;
    Bool            isEmtcUe = FALSE;
-   U16             rapId;
+   uint16_t             rapId;
    RgSchUeCb       *ue = NULLP;
 
-   TRC2(rgSCHTomRaReqInd);
-
    if(cell->cellId != raReqInd->cellId)
    {
       err.errType    = RGSCHERR_TOM_RAREQIND;
@@ -862,7 +841,7 @@ TfuRaReqIndInfo *raReqInd;
       RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, 
          "rgSCHTomRaReqInd(): No cell found with raReq cellId = (%d) errorType (%d)"
          " errorCause(%d)",raReqInd->cellId, err.errType, err.errCause);
-      RETVALUE(RFAILED);
+      return RFAILED;
    } 
    
    for (raRntiCnt = 0; raRntiCnt < raReqInd->nmbOfRaRnti; raRntiCnt++)
@@ -908,7 +887,7 @@ TfuRaReqIndInfo *raReqInd;
          }
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomRaReqInd */
 
 
@@ -934,13 +913,13 @@ TfuRaReqIndInfo *raReqInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUlCqiInd
+S16 rgSCHTomUlCqiInd
 ( 
 RgSchCellCb     *cell,
 TfuUlCqiIndInfo *ulCqiInd
 )
 #else
-PUBLIC S16 rgSCHTomUlCqiInd(cell, ulCqiInd)
+S16 rgSCHTomUlCqiInd(cell, ulCqiInd)
 RgSchCellCb     *cell; 
 TfuUlCqiIndInfo *ulCqiInd;
 #endif
@@ -948,7 +927,6 @@ TfuUlCqiIndInfo *ulCqiInd;
    RgSchUeCb    *ue;
    CmLList      *node;
    TfuUlCqiRpt  *ulCqiInfo;
-   TRC2(rgSCHTomUlCqiInd);
 
    node =  ulCqiInd->ulCqiRpt.first;
    if(cell->cellId != ulCqiInd->cellId)
@@ -956,7 +934,7 @@ TfuUlCqiIndInfo *ulCqiInd;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
          "rgSCHTomUlCqiInd() Unable to get the ulCqiInd cell with id(%d)", 
          ulCqiInd->cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    for (;node; node=node->next)
@@ -984,7 +962,7 @@ TfuUlCqiIndInfo *ulCqiInd;
       /* wideband cqi is directly reported now. and also isTxPort0 */
       rgSCHUtlUlCqiInd(cell, ue, ulCqiInfo);
    }
-   RETVALUE(ROK);
+       return ROK;
 }  /* rgSCHTomUlCqiInd */
 
 /**
@@ -1010,13 +988,13 @@ TfuUlCqiIndInfo *ulCqiInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomPucchDeltaPwrInd
+S16 rgSCHTomPucchDeltaPwrInd
 ( 
 RgSchCellCb             *cell,
 TfuPucchDeltaPwrIndInfo *pucchDeltaPwr
 )
 #else
-PUBLIC S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr)
+S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr)
 RgSchCellCb             *cell; 
 TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
 #endif
@@ -1025,14 +1003,12 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
    CmLList         *node;
    TfuPucchDeltaPwr  *ueElem;
 
-   TRC2(rgSCHTomPucchDeltaPwrInd);
-
    if(cell->cellId != pucchDeltaPwr->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
          "rgSCHTomPucchDeltaPwrInd() Unable to get the pucchDeltaPwr cell with id(%d)", 
          pucchDeltaPwr->cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    node =  pucchDeltaPwr->pucchDeltaPwrLst.first;
@@ -1053,7 +1029,7 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
       }
       rgSCHUtlPucchDeltaPwrInd(cell, ue, ueElem->pucchDeltaPwr);
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomPucchDeltaPwrInd */
 
 /**
@@ -1079,13 +1055,13 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomHarqAckInd
+S16 rgSCHTomHarqAckInd
 (
 RgSchCellCb     *cell,
 TfuHqIndInfo    *harqAckInd
 )
 #else
-PUBLIC S16 rgSCHTomHarqAckInd(cell, harqAckInd)
+S16 rgSCHTomHarqAckInd(cell, harqAckInd)
 RgSchCellCb     *cell; 
 TfuHqIndInfo    *harqAckInd;
 #endif
@@ -1096,24 +1072,20 @@ TfuHqIndInfo    *harqAckInd;
    CmLList         *node;
    TfuHqInfo       *hqInfo;
    Pst             pst;
-#ifdef TFU_UPGRADE
-   U8              tbCnt;
-#endif 
+  // uint8_t              tbCnt;
 
    RgInfRlsHqInfo  *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
-   U32            cellIdx;
+   uint32_t            cellIdx;
    RgSchCellCb     *iterCellP; 
    
-   TRC2(rgSCHTomHarqAckInd);
-
    if(cell->cellId != harqAckInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() Unable to get"
          " the cell for cellId (%d)", harqAckInd->cellId);
       err.errType = RGSCHERR_TOM_HARQACKIND;
       err.errCause = RGSCHERR_TOM_INV_CELL_ID;
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 #ifdef RG_5GTF   
    node =  harqAckInd->hqIndLst.first;
    for (;node; node=node->next)
@@ -1247,7 +1219,7 @@ TfuHqIndInfo    *harqAckInd;
       }
    }
 #endif 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomHarqAckInd */
 
 
@@ -1274,13 +1246,13 @@ TfuHqIndInfo    *harqAckInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomSrInd
+S16 rgSCHTomSrInd
 (
 RgSchCellCb     *cell,
 TfuSrIndInfo    *srInd
 )
 #else
-PUBLIC S16 rgSCHTomSrInd(cell, srInd)
+S16 rgSCHTomSrInd(cell, srInd)
 RgSchCellCb     *cell; 
 TfuSrIndInfo    *srInd;
 #endif
@@ -1291,16 +1263,14 @@ TfuSrIndInfo    *srInd;
    CmLList      *node;
    TfuSrInfo    *srInfo;
 
-   TRC2(rgSCHTomSrInd);
-
    if(cell->cellId != srInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for srcInd cellId"
          ":%d ", srInd->cellId);
       err.errType = RGSCHERR_TOM_SRIND;
       err.errCause = RGSCHERR_TOM_INV_CELL_ID;
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 
 
    node =  srInd->srLst.first;
@@ -1331,7 +1301,7 @@ TfuSrIndInfo    *srInd;
          continue;
       }
    }
-   RETVALUE(ret);
+   return ROK;
 }  /* end of rgSCHTomSrInd */
 
 /**
@@ -1357,13 +1327,13 @@ TfuSrIndInfo    *srInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomDoaInd
+S16 rgSCHTomDoaInd
 (
 RgSchCellCb     *cell,
 TfuDoaIndInfo   *doaInd
 )
 #else
-PUBLIC S16 rgSCHTomDoaInd(cell, doaInd )
+S16 rgSCHTomDoaInd(cell, doaInd )
 RgSchCellCb     *cell;
 TfuDoaIndInfo   *doaInd;
 #endif
@@ -1371,14 +1341,13 @@ TfuDoaIndInfo   *doaInd;
    RgSchUeCb    *ue;
    CmLList      *node;
    TfuDoaRpt    *doaInfo;
-   TRC2(rgSCHTomDoaInd);
 
    if(cell->cellId != doaInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for doaInd cellId"
          ":%d", doaInd->cellId);
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 
 
    node =  doaInd->doaRpt.first;
@@ -1394,7 +1363,7 @@ TfuDoaIndInfo   *doaInd;
       }
       rgSCHUtlDoaInd(cell, ue, doaInfo);
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomDoaInd */
 /**
  * @brief Handler for processing downlink CQI indication recieved from 
@@ -1419,13 +1388,13 @@ TfuDoaIndInfo   *doaInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomDlCqiInd
+S16 rgSCHTomDlCqiInd
 (
 RgSchCellCb     *cell,
 TfuDlCqiIndInfo *dlCqiInd
 )
 #else
-PUBLIC S16 rgSCHTomDlCqiInd(cell, dlCqiInd)
+S16 rgSCHTomDlCqiInd(cell, dlCqiInd)
 RgSchCellCb     *cell;
 TfuDlCqiIndInfo *dlCqiInd;
 #endif
@@ -1433,14 +1402,13 @@ TfuDlCqiIndInfo *dlCqiInd;
    RgSchUeCb    *ue;
    CmLList      *node;
    TfuDlCqiRpt  *dlCqiInfo;
-   TRC2(rgSCHTomDlCqiInd);
 
    if(cell->cellId != dlCqiInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
          ":%d", dlCqiInd->cellId);
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 
 
    node =  dlCqiInd->dlCqiRptsLst.first;
@@ -1457,7 +1425,7 @@ TfuDlCqiIndInfo *dlCqiInd;
       rgSCHUtlDlCqiInd(cell, ue, dlCqiInfo, dlCqiInd->timingInfo);
       rgSCHUtlHdlUlTransInd(cell, ue, dlCqiInd->timingInfo);
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomDlCqiInd */
 
 /**
@@ -1497,10 +1465,9 @@ PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb)
    RgSchUePCqiCb   *cqiCb;
 #endif
 {
-   U16   cqiIdx = 0;
+   uint16_t   cqiIdx = 0;
 
    CmLteTimingInfo timingInfo;
-   TRC2(rgSCHTomUtlMovePcqiNxtOccasion);
 
    if(cqiCb->cqiCfg.cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP)
    {
@@ -1530,7 +1497,7 @@ PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb)
    rgSCHUtlSCellHndlCqiCollsn(cqiCb);
 #endif
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlMovePcqiNxtOccasion */
 
 /**
@@ -1570,16 +1537,15 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb)
  RgSchUePCqiCb   *riCb;
 #endif
 {
-   U16   riIdx;
-   U16   riDist=0;
-   U16   effPeriodicity;
-   U16   riTrInsTime;  
-   U16   crntTime;
-   U16   tempIdx; 
-
-   TRC2(rgSCHTomUtlMovePriNxtOccasion);
+   uint16_t   riIdx;
+   uint16_t   riDist=0;
+   uint16_t   effPeriodicity;
+   uint16_t   riTrInsTime;  
+   uint16_t   crntTime;
+   uint16_t   tempIdx; 
+
    crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)
-      +(cell->crntTime.subframe);
+      +(cell->crntTime.slot);
 #ifdef XEON_SPECIFIC_CHANGES
    RGSCHCPYTIMEINFO(cell->crntTime, ue->riRecpTime);
 #endif
@@ -1614,8 +1580,8 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb)
    riIdx = tempIdx % RG_SCH_PCQI_SRS_SR_TRINS_SIZE;
    if (effPeriodicity >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE)
    {
-      riDist = rgSCHUtlFindDist((U16)(crntTime + TFU_RECPREQ_DLDELTA), 
-      (U16)(crntTime + TFU_RECPREQ_DLDELTA + effPeriodicity));  
+      riDist = rgSCHUtlFindDist((uint16_t)(crntTime + TFU_RECPREQ_DLDELTA), 
+      (uint16_t)(crntTime + TFU_RECPREQ_DLDELTA + effPeriodicity));  
    }
    else
    {
@@ -1653,7 +1619,7 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb)
 #ifdef LTE_ADV
    rgSCHUtlSCellHndlRiCollsn(riCb);
 #endif
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlMovePriNxtOccasion */
 
 /**
@@ -1691,9 +1657,7 @@ PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue)
    RgSchUeCb      *ue;
 #endif
 {
-   U16   srIdx = 0;
-
-   TRC2(rgSCHTomUtlMoveSrNxtOccasion);
+   uint16_t   srIdx = 0;
 
    /* Compute Next Transmission Instance */ 
    srIdx = ue->srCb.peri + ue->srCb.nSrTrIdx;
@@ -1709,7 +1673,7 @@ PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue)
    cmLListAdd2Tail(&cell->pCqiSrsSrLst[ue->srCb.nSrTrIdx].srLst, 
          &ue->srCb.srLstEnt);
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlMoveSrNxtOccasion */
 
 /**
@@ -1747,23 +1711,22 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue)
    RgSchUeCb      *ue;
 #endif
 {
-   U16   srsIdx;
-   U16   srsDist;
-   U16   tempIdx;
-   U16   crntTime; 
+   uint16_t   srsIdx;
+   uint16_t   srsDist;
+   uint16_t   tempIdx;
+   uint16_t   crntTime; 
 
 
-   TRC2(rgSCHTomUtlMoveSrsNxtOccasion);
    crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)
-      +(cell->crntTime.subframe);
+      +(cell->crntTime.slot);
 
    /* Compute Next Transmission Instance */ 
    tempIdx = ue->srsCb.peri + ue->srsCb.nSrsTrIdx;
    srsIdx = tempIdx %RG_SCH_PCQI_SRS_SR_TRINS_SIZE;  
    if (ue->srsCb.peri > RG_SCH_PCQI_SRS_SR_TRINS_SIZE)
    {
-      srsDist = rgSCHUtlFindDist((U16)(crntTime + TFU_RECPREQ_DLDELTA), 
-      (U16)(crntTime + TFU_RECPREQ_DLDELTA + ue->srsCb.peri));  
+      srsDist = rgSCHUtlFindDist((uint16_t)(crntTime + TFU_RECPREQ_DLDELTA), 
+      (uint16_t)(crntTime + TFU_RECPREQ_DLDELTA + ue->srsCb.peri));  
    }
    else
    {
@@ -1795,8 +1758,7 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue)
    }   
    ue->srsCb.nSrsTrIdx = srsIdx;
    ue->srsCb.srsDist = srsDist; 
-
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlMoveSrsNxtOccasion */
 
 
@@ -1823,13 +1785,13 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomRawCqiInd
+S16 rgSCHTomRawCqiInd
 (
  RgSchCellCb     *cell,
  TfuRawCqiIndInfo *rawCqiInd
 )
 #else
-PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
+S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
    RgSchCellCb     *cell;
    TfuRawCqiIndInfo *rawCqiInd;
 #endif
@@ -1839,27 +1801,25 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
    TfuRawCqiRpt* rawCqiInfo;
 
    RgSchErrInfo err;
-   U32          cellIdx;
+   uint32_t          cellIdx;
    RgInfRlsHqInfo  *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
    RgSchCellCb     *iterCellP;
 #if DL_LA
    RgSchCmnDlUe    *ueDl;
 #endif
-   U8              cqi;
-   U8              ri;
-   U8              hqAck;
+   uint8_t              cqi;
+   uint8_t              ri;
+   uint8_t              hqAck;
    Pst             pst;
    RgSchRaCb       *raCb;
    TfuHqInfo       hqInfo;
 
-   TRC2(rgSCHTomRawCqiInd);
-
    if(cell->cellId != rawCqiInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
             ":%d", rawCqiInd->cellId);
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 
 
    node =  rawCqiInd->rawCqiRpt.first;
@@ -1881,12 +1841,12 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
       if (rawCqiInfo->numBits >= 5)
          printf("cellId [%d] crnti [%d] numBits [%d]  uciPayload [0x%08x] sfn/sf [%d:%d]\n", 
                 cell->cellId, rawCqiInfo->crnti, rawCqiInfo->numBits, rawCqiInfo->uciPayload, 
-                rawCqiInd->timingInfo.sfn, rawCqiInd->timingInfo.subframe);
+                rawCqiInd->timingInfo.sfn, rawCqiInd->timingInfo.slot);
       */
       if (rawCqiInfo->numBits == 1)
       {
          rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
-         U8 fdbk = TFU_HQFDB_NACK;
+         uint8_t fdbk = TFU_HQFDB_NACK;
          /* Process HARQ FdbkInd */
          hqAck = (rawCqiInfo->uciPayload >> 31) & 0x1;
          if (hqAck)
@@ -1939,7 +1899,7 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
          }
          /*
          printf("rawCqiInfo->numBits [%d]  uciPayload [0x%08x] sfn/sf [%d:%d]\n", rawCqiInfo->numBits,
-                rawCqiInfo->uciPayload, rawCqiInd->timingInfo.sfn, rawCqiInd->timingInfo.subframe);
+                rawCqiInfo->uciPayload, rawCqiInd->timingInfo.sfn, rawCqiInd->timingInfo.slot);
          */
       }
       else if (rawCqiInfo->numBits == 5)
@@ -1972,7 +1932,7 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
       }
       else if (rawCqiInfo->numBits == 6)
       {
-         RgInfRlsHqInfo  *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
+         rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
          TfuHqFdbk fdbk = TFU_HQFDB_NACK;
          /* Process both HARQ and CQI-RI Ind*/
          ri = (rawCqiInfo->uciPayload >> 26) & 0x1;
@@ -2072,7 +2032,7 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
          rlsHqBufs->numUes = 0;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomRawCqiInd */
 
 /**
@@ -2098,13 +2058,13 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomSrsInd
+S16 rgSCHTomSrsInd
 (
  RgSchCellCb     *cell,
  TfuSrsIndInfo *srsInd
  )
 #else
-PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
+S16 rgSCHTomSrsInd(cell, srsInd)
    RgSchCellCb     *cell;
    TfuSrsIndInfo *srsInd;
 #endif
@@ -2113,14 +2073,12 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
    CmLList      *node;
    TfuSrsRpt* srsInfo;
 
-   TRC2(rgSCHTomSrsInd);
-
    if(cell->cellId != srsInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
          ":%d", srsInd->cellId);
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 
    node =  srsInd->srsRpt.first;
    for (;node; node=node->next)
@@ -2136,7 +2094,7 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
       rgSCHUtlSrsInd(cell, ue, srsInfo, srsInd->timingInfo);
       rgSCHUtlHdlUlTransInd(cell, ue, srsInd->timingInfo);
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomSrsInd */
 
 /*
@@ -2156,26 +2114,27 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
 *       File:  rg_sch_utl.c
 *
 */
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlGenIndices
 (
U32      label,
U8        posM,
U8        valN,
U8        valK,
uint32_t      label,
uint8_t        posM,
uint8_t        valN,
uint8_t        valK,
  TfuSubbandInfo*    sbInfo
  )
 #else
 PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo)
-   U32      label;
-   U8        posM;
-   U8        valN;
-   U8        valK;
+   uint32_t      label;
+   uint8_t        posM;
+   uint8_t        valN;
+   uint8_t        valK;
    TfuSubbandInfo*    sbInfo;
 #endif
 {
-   U8 idx, kval, xval, xmin;
-   U32 binCoe;
+   uint8_t idx, kval, xval, xmin;
+   uint32_t binCoe;
    xmin =1;
    for(kval=0; kval<posM;kval++)
    {
@@ -2195,8 +2154,9 @@ PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo)
       xmin = idx+1;
       label = label-binCoe;
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* end of rgSCHTomUtlGenIndices*/
+#endif
 #endif 
 /**
  * @brief Handler for processing decode failure indication recieved from 
@@ -2221,13 +2181,13 @@ PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomCrcInd
+S16 rgSCHTomCrcInd
 (
 RgSchCellCb       *cell,
 TfuCrcIndInfo *crcInd
 )
 #else
-PUBLIC S16 rgSCHTomCrcInd(cell, crcInd)
+S16 rgSCHTomCrcInd(cell, crcInd)
 RgSchCellCb       *cell;
 TfuCrcIndInfo *crcInd;
 #endif
@@ -2243,10 +2203,10 @@ TfuCrcIndInfo *crcInd;
    //RgSchCmnUlCell  *cellUl; 
    Inst             inst = cell->instIdx;
    TfuCntrlReqInfo  *cntrlInfo;
-   U32               ret;
+   uint32_t               ret;
 #ifdef LTE_TDD
-   U8              Mval;
-   U8              idx;
+   uint8_t              Mval;
+   uint8_t              idx;
 #endif
 #endif
 #ifdef LTE_TDD
@@ -2257,14 +2217,12 @@ TfuCrcIndInfo *crcInd;
    RgSchUlHqProcCb   *ulHqProc;
 #endif   
 
-   TRC2(rgSCHTomCrcInd);
-
    if(cell->cellId != crcInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
          ":%d", crcInd->cellId);
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 #ifdef RG_ULSCHED_AT_CRC
 #ifndef LTE_ADV
    {
@@ -2275,7 +2233,7 @@ TfuCrcIndInfo *crcInd;
          /*Removed the WA to drop 2nd CRC*/
          RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Recieved CRC "
             "twice per TTI @(%u,%u)", cell->crntTime.sfn,
-            cell->crntTime.subframe);
+            cell->crntTime.slot);
       }
       lastCrc = crntCrc;
    }
@@ -2329,7 +2287,7 @@ TfuCrcIndInfo *crcInd;
 #ifdef LTE_TDD
             /*ccpu00128820 - MOD - Msg3 alloc double delete issue*/
             hqProc = &(raCb->msg3HqProc);
-            RGSCH_UPD_PHICH(cell->ulDlCfgIdx, crcInd->timingInfo.subframe,
+            RGSCH_UPD_PHICH(cell->ulDlCfgIdx, crcInd->timingInfo.slot,
                     hqProc);
 #endif
             raCb = NULLP;
@@ -2440,7 +2398,7 @@ TfuCrcIndInfo *crcInd;
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate TfuCntrlReqInfo "
                "for cell");
-         RETVALUE(ret);
+         return ret;
       }
       rgSCHCmnUlSch(cell);
 #ifdef LTE_L2_MEAS
@@ -2454,10 +2412,10 @@ TfuCrcIndInfo *crcInd;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomCrcInd() Unable to process"
                   " downlink subframe for cellId %d", crcInd->cellId);
          err.errType = RGSCHERR_TOM_TTIIND;
-         RETVALUE(RFAILED);
-      }
+         return RFAILED;
+               }
 #endif /* RG_ULSCHED_AT_CRC */
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomCrcInd */
 
 /**
@@ -2483,13 +2441,13 @@ TfuCrcIndInfo *crcInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomTimingAdvInd
+S16 rgSCHTomTimingAdvInd
 (
 RgSchCellCb         *cell,
 TfuTimingAdvIndInfo *timingAdvInd
  )
 #else
-PUBLIC S16 rgSCHTomTimingAdvInd(cell, timingAdvInd)
+S16 rgSCHTomTimingAdvInd(cell, timingAdvInd)
 RgSchCellCb         *cell;
 TfuTimingAdvIndInfo *timingAdvInd;
 #endif
@@ -2498,15 +2456,12 @@ TfuTimingAdvIndInfo *timingAdvInd;
    CmLList          *node;
    TfuTimingAdvInfo *timingAdvInfo;
 
-
-   TRC2(rgSCHTomTimingAdvInd);
-
    if(cell->cellId != timingAdvInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
          "=(%d)", timingAdvInd->cellId);
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 
 
    node =  timingAdvInd->timingAdvLst.first;
@@ -2522,7 +2477,7 @@ TfuTimingAdvIndInfo *timingAdvInd;
       }
       rgSCHDhmUpdTa (cell, ue, timingAdvInfo->timingAdv);
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomTimingAdvInd */
 
 /**
@@ -2533,7 +2488,7 @@ TfuTimingAdvIndInfo *timingAdvInd;
  *
  *     Function: rgSCHTomTtiInd
  *
- *     Handler for processing TTI indication recieved from PHY
+ *     Handler for processing slot indication recieved from MAC
  *     for a cell. This is split into the below Steps. 
  *     
  *     1: Complete the Uplink and Common Channel Scheduling for each Cell
@@ -2542,37 +2497,37 @@ TfuTimingAdvIndInfo *timingAdvInd;
  *     4: Fill the Tfu structures for DL and UL Config requests  
  *     5: Handle the RGR Config messages per Cell
  *
- *  @param[in] TfuTtiIndInfo *ttiInd
+ *  @param[in] SlotIndInfo    *slotInd
  *  @param[in] Inst           schInst
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHTomTtiInd
+Void rgSCHTomTtiInd
 (
-TfuTtiIndInfo      *ttiInd,
+SlotIndInfo        *slotInd,
 Inst               schInst
 )
 #else
-PUBLIC Void rgSCHTomTtiInd(ttiInd, schInst)
-TfuTtiIndInfo      *ttiInd;
+Void rgSCHTomTtiInd(slotInd, schInst)
+SlotIndInfo        *slotInd;
 Inst               schInst;
 #endif
 {
    RgInfSfAlloc      *subfrmAlloc;
    RgTfuCntrlReqInfo *cntrlInfo = NULLP;
    S16               ret = ROK;
-   U8                i;
-   U8                nCell = 0;
+   uint8_t                i;
+   uint8_t                nCell = 0;
    RgSchCellCb       *cell[CM_LTE_MAX_CELLS];
    RgSchCellCb       *cellLst[CM_LTE_MAX_CELLS];
    
-   TRC2(rgSCHTomTtiInd);
-   
 #ifdef LTE_L2_MEAS
    glblTtiCnt++;
 #endif
 
-   rgSchTomFillCellTtiInfo(ttiInd, schInst, &nCell, &cell[0]);
+   //rgSchTomFillCellTtiInfo(slotInd, schInst, &nCell, &cell[0]);
+
+   schFillCrntTime(*slotInd,schInst);
    for (i = 0; i < nCell; i++)
    {
       /* Perform UL and DL Common Channel scheduling */
@@ -2650,7 +2605,7 @@ Inst               schInst;
       {     
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell[i]->cellId,"Unable to Allocate TfuCntrlReqInfo"
                " for cell");
-         RETVOID;
+         return;
       }
 
 #ifdef EMTC_ENABLE
@@ -2679,8 +2634,8 @@ Inst               schInst;
 
 #ifdef CA_DBG
    {
-      U32 dbgUeIdChngAndDatReqInClCnt = 0;
-      static U32 gTtiCount = 0;
+      uint32_t dbgUeIdChngAndDatReqInClCnt = 0;
+      static uint32_t gTtiCount = 0;
       gTtiCount++;
 
       if(gTtiCount == 3000)
@@ -2833,7 +2788,7 @@ Inst               schInst;
    }
 
 #endif
-   RETVOID;
+   return;
 }  /* rgSCHTomTtiInd */
 
 /** @brief This function does the TTI processin for the uplink subframe,
@@ -2871,19 +2826,17 @@ RgSchErrInfo       *err;
    S16             ret;
    TfuRecpReqInfo  *recpReqInfo;
 #ifdef TFU_UPGRADE
-   U16             validIdx = 0; /* Index computed from recreq's timing info*/
+   uint16_t             validIdx = 0; /* Index computed from recreq's timing info*/
 #endif 
    Inst            inst = cell->instIdx;
 
-   TRC2(rgSCHTomUtlProcUlSf)
-
    if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, 
                             sizeof(TfuRecpReqInfo))) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate TfuRecpReqInfo "
          "for cell");
       err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-      RETVALUE(ret);
+      return ret;
    }    
    recpReqInfo->cellId = cell->cellId;
    cmLListInit(&recpReqInfo->ueRecpReqLst);
@@ -2900,7 +2853,7 @@ RgSchErrInfo       *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to fill Data recption "
          "requests for cell");
       RGSCH_FREE_MEM(recpReqInfo);
-      RETVALUE(ret);
+      return ret;
    } 
    /* Filling HARQ Reception requests */
    ret = rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx,err);
@@ -2909,14 +2862,14 @@ RgSchErrInfo       *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to fill Harq Feedback "
          "reception requests for cell");
       RGSCH_FREE_MEM(recpReqInfo);
-      RETVALUE(ret);
+      return ret;
    }
    /* sending the RecpReq to Phy */
    if (rgSCHUtlTfuRecpReq(inst, cell->tfuSap->sapCfg.suId, recpReqInfo) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send Cntrl info for cell");
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* end of rgSCHTomUtlProcUlSf */ 
 
 #ifdef LTE_TDD
@@ -2953,18 +2906,16 @@ RgSchErrInfo       *err;
 {
    S16             ret;
    TfuRecpReqInfo  *recpReqInfo;
-   U16             validIdx; /* Index computed from recreq's timing info*/
+   uint16_t             validIdx; /* Index computed from recreq's timing info*/
    Inst            inst = cell->instIdx;
 
-   TRC2(rgSCHTomUtlPrcUlTddSpclSf)
-
    if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, 
                             sizeof(TfuRecpReqInfo))) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to "
                "Allocate TfuRecpReqInfo for cell");
       err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-      RETVALUE(ret);
+      return ret;
    }    
    recpReqInfo->cellId = cell->cellId;
    cmLListInit(&recpReqInfo->ueRecpReqLst);
@@ -2975,7 +2926,7 @@ RgSchErrInfo       *err;
 
    /*ccpu00130768  */ 
    if(cell->srsCfg.isSrsCfgPres && 
-      rgSchTddCellSpSrsSubfrmTbl[cell->srsCfg.srsSubFrameCfg][recpReqInfo->timingInfo.subframe])
+      rgSchTddCellSpSrsSubfrmTbl[cell->srsCfg.srsSubFrameCfg][recpReqInfo->timingInfo.slot])
    {
       recpReqInfo->srsPres = TRUE;
    }
@@ -2989,9 +2940,9 @@ RgSchErrInfo       *err;
    if (ret != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to fill"
-            " SRS recption requests for cell");;
+            " SRS recption requests for cell");
       RGSCH_FREE_MEM(recpReqInfo);
-      RETVALUE(ret);
+      return ret;
    }
    /* sending the RecpReq to Phy */
    if (rgSCHUtlTfuRecpReq(inst, cell->tfuSap->sapCfg.suId, recpReqInfo) != ROK)
@@ -2999,7 +2950,7 @@ RgSchErrInfo       *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to send "
                                "Cntrl info for cell");
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* end of rgSCHTomUtlPrcUlTddSpclSf */ 
 #endif
 #endif
@@ -3040,9 +2991,7 @@ RgSchErrInfo         *err;
 {
    Inst              inst = cell->instIdx;
    S16               ret;
-   U8                sfTyp = 1; /* Dl Subframe */
-
-   TRC2(rgSCHTomUtlProcDlSf);
+   uint8_t                sfTyp = 1; /* Dl Subframe */
 
       cmLListInit(&cntrlInfo->phichLst);
       cmLListInit(&cntrlInfo->dlPdcchLst);
@@ -3054,7 +3003,7 @@ RgSchErrInfo         *err;
       cntrlInfo->dlTiming = cell->dlDciTime;
       cntrlInfo->cellId   = cell->cellId;
       cntrlInfo->ulTiming = cell->hiDci0Time;
-      if((0 == (cntrlInfo->dlTiming.sfn % 30)) && (0 == cntrlInfo->dlTiming.subframe))
+      if((0 == (cntrlInfo->dlTiming.sfn % 30)) && (0 == cntrlInfo->dlTiming.slot))
       {
         //printf("5GTF_CHECK rgSCHTomUtlProcDlSf Cntrl dl (%d : %d) ul (%d : %d)\n", cntrlInfo->dlTiming.sfn, cntrlInfo->dlTiming.subframe, cntrlInfo->ulTiming.sfn, cntrlInfo->ulTiming.subframe);
       }
@@ -3065,7 +3014,7 @@ RgSchErrInfo         *err;
        */
       cntrlInfo->cfi = dlSf->pdcchInfo.currCfi;
 #ifndef RG_ULSCHED_AT_CRC
-      U8                Mval  = 1;
+      uint8_t                Mval  = 1;
 #ifdef LTE_TDD
       Mval = rgSchTddPhichMValTbl[cell->ulDlCfgIdx]
                                  [cell->hiDci0Time.subframe];
@@ -3082,7 +3031,7 @@ RgSchErrInfo         *err;
             RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PHICH info "
                      "for cellId (%d)\n", cell->cellId));
             RGSCH_FREE_MEM(cntrlInfo);
-            RETVALUE(ret);
+            return ret;
          }
          if ((ret = rgSCHTomUtlFillUlPdcch (cell, cntrlInfo, ulSf, err)) != 
                         ROK)
@@ -3090,7 +3039,7 @@ RgSchErrInfo         *err;
             RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PDCCH info "
                      "for cellId (%d)\n", cell->cellId));
             RGSCH_FREE_MEM(cntrlInfo);
-            RETVALUE(ret);
+            return ret;
          }
       }
 #ifdef EMTC_ENABLE
@@ -3112,7 +3061,7 @@ RgSchErrInfo         *err;
             RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PDCCH info "
                      "for cellId (%d)\n", cell->cellId));
             RGSCH_FREE_MEM(cntrlInfo);
-            RETVALUE(ret);
+            return ret;
          }
          rgBwAlloInfo[dlSf->sfNum] += dlSf->bwAssigned;
          rgBwAlcnt[dlSf->sfNum] ++;
@@ -3137,8 +3086,8 @@ if(0 == cntrlInfo->dlMpdcchLst.count)
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send Cntrl info "
             "for cell");
       }
+   return ROK;
 
-   RETVALUE(ROK);
 } 
 
 
@@ -3184,7 +3133,6 @@ RgSchErrInfo       *err;
    RgSchCmnDlCell   *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
 #endif
 
-   TRC2(rgSCHTomUtlFillPhich)
    ret = ROK;
    /* Traversing the list of Phichs */
    node =  dlSf->phichInfo.phichs.first;
@@ -3195,7 +3143,7 @@ RgSchErrInfo       *err;
                                 &(cntrlInfo->memCp))) != ROK)
       {
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
       harqAck->txPower = 0;
@@ -3218,7 +3166,7 @@ RgSchErrInfo       *err;
       harqAck->lnk.node = (PTR)harqAck;
       node = node->next;
    } /* end of while */
-   RETVALUE(ret);
+   return ret;
 } /* end of */ 
 
 
@@ -3292,7 +3240,7 @@ PRIVATE Void rgSCHTmrRestartScellDeactTmr (cell, ueCb)
  *      -# ROK 
  *      -# RFAILED 
  */
-EXTERN U32 numdlSpsRelSentToTf;
+EXTERN uint32_t numdlSpsRelSentToTf;
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillDlPdcch
 (
@@ -3313,10 +3261,9 @@ RgSchErrInfo    *err;
    CmLList      *node;
    RgSchPdcch   *pdcch;
    TfuPdcchInfo *tfuPdcch;
-   U8 isDcivld = FALSE;
-   U8            numUePerTti = 0;
+   uint8_t isDcivld = FALSE;
+   uint8_t            numUePerTti = 0;
 
-   TRC2(rgSCHTomUtlFillDlPdcch)
    ret = ROK;
    /* Traversing the scheduled Harq processes */
    node =  dlSf->pdcchInfo.pdcchs.first;
@@ -3367,7 +3314,7 @@ RgSchErrInfo    *err;
                                 &(cntrlInfo->memCp))) != ROK)
       {
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
 #ifdef LTEMAC_SPS
       tfuPdcch->crnti       = pdcch->crnti;
@@ -3411,12 +3358,12 @@ RgSchErrInfo    *err;
          gDlNumUePerTti[numUePerTti-1]++;
       }
    }
-   RETVALUE(ret);
+   return ret;
 } /* end of rgSCHTomUtlFillDlPdcch*/ 
 
 #ifdef RGSCH_SPS_STATS
-extern U32 rgSchSpsRelSentToTf;
-extern U32 rgSchSpsRelPdcchAllocd; 
+extern uint32_t rgSchSpsRelSentToTf;
+extern uint32_t rgSchSpsRelPdcchAllocd; 
 #endif
 /** @brief This function will send all the UL PDCCH's for the given
  * subframe.
@@ -3456,9 +3403,8 @@ RgSchErrInfo    *err;
    CmLList      *node;
    RgSchPdcch   *pdcch;
    TfuPdcchInfo *tfuPdcch;
-   U8 isDcivld = FALSE;
+   uint8_t isDcivld = FALSE;
 
-   TRC2(rgSCHTomUtlFillUlPdcch)
    ret = ROK;
    /* Traversing the scheduled Harq processes */
    node =  dlSf->pdcchInfo.pdcchs.first;
@@ -3504,7 +3450,7 @@ RgSchErrInfo    *err;
                   &(cntrlInfo->memCp))) != ROK)
       {
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
       tfuPdcch->rnti       = pdcch->rnti;
 #ifdef LTE_ADV
@@ -3536,7 +3482,7 @@ RgSchErrInfo    *err;
      //   abort();
    }
 #endif
-   RETVALUE(ret);
+   return ret;
 } /* end of rgSCHTomUtlFillUlPdcch*/ 
 
 /** @brief This function does the processing for Timing adjustment.
@@ -3568,8 +3514,6 @@ RgSchCellCb    *cell;
    CmLList     *node;
    RgSchUeCb   *ue;
 
-   TRC2(rgSCHTomUtlProcTA);
-
    node =  cell->taUeLst.first;
    while (node)
    {
@@ -3603,8 +3547,7 @@ RgSchCellCb    *cell;
          ue->dl.taCb.numRemSf--;
       }
    } /* end of taUeLst */
-
-   RETVALUE(ROK);
+   return ROK;
 } /* end of rgSCHTomUtlProcTA */ 
 
 /** @brief This function handles filling of Hq reception request to
@@ -3622,11 +3565,11 @@ RgSchCellCb    *cell;
  */
 #ifdef TFU_UPGRADE
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo
+S16 rgSCHTomUtlFillHqFdbkInfo
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
U16                     validIdx,
uint16_t                     validIdx,
  RgSchDlHqProcCb         *hqCb,
  RgSchDlSf               *nxtDlsf,
  TfuUeRecpReqInfo        *pucchRecpInfo,
@@ -3634,10 +3577,10 @@ PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo
  RgSchErrInfo            *err
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
+S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
    TfuRecpReqInfo          *recpReqInfo;
    RgSchCellCb             *cell;
-   U16                     validIdx; 
+   uint16_t                     validIdx; 
    RgSchDlHqProcCb         *hqCb;
    RgSchDlSf               *nxtDlsf;
    TfuUeRecpReqInfo        *pucchRecpInfo;
@@ -3646,7 +3589,7 @@ PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo
+S16 rgSCHTomUtlFillHqFdbkInfo
 (
 TfuRecpReqInfo          *recpReqInfo,
 RgSchCellCb             *cell,
@@ -3657,7 +3600,7 @@ RgSchDlHqProcCb         *prvHqCb,
 RgSchErrInfo            *err
 )
 #else
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
+S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
 TfuRecpReqInfo          *recpReqInfo;
 RgSchCellCb             *cell;
 RgSchDlHqProcCb         *hqCb;
@@ -3670,7 +3613,7 @@ RgSchErrInfo            *err;
 { 
    S16                  ret;
    RgSchDlHqTbCb        *tbCb;
-   U32                  idx;
+   uint32_t                  idx;
    Bool                 isAddToLst = FALSE;
 
    for (idx = 0 ;idx < 2; idx++)
@@ -3717,7 +3660,7 @@ RgSchErrInfo            *err;
                RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
                         "TfuUeRecpReqInfo for cell");
                err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-               RETVALUE(ret);
+               return ret;
             }
             pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
             if ((hqCb->hqE->ue != NULLP) /*&& 
@@ -3816,7 +3759,7 @@ RgSchErrInfo            *err;
          break;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillHqFdbkInfo */
 
 #ifdef RG_5GTF 
@@ -3831,7 +3774,7 @@ RgSchErrInfo            *err;
  *
  * @param  [out] TfuRecpReqInfo   *recpReqInfo
  * @param  [in]  RgSchCellCb      *cell
- * @param  [in]  U16              validIdx,
+ * @param  [in]  uint16_t              validIdx,
  * @param  [in]  RgSchDlHqInfo    *dlSfHqInfo,
  * @param  [in]  RgSchDlSf        *dlSf,
  * @param  [in]  TfuUeRecpReqInfo *pucchRecpInfo,
@@ -3846,7 +3789,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
U16                     validIdx,
uint16_t                     validIdx,
  RgSchDlHqInfo           *dlSfHqInfo,
  RgSchDlSf               *dlSf,
  TfuUeRecpReqInfo        *pucchRecpInfo,
@@ -3856,7 +3799,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf
 PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err)
    TfuRecpReqInfo          *recpReqInfo;
    RgSchCellCb             *cell;
-   U16                     validIdx; 
+   uint16_t                     validIdx; 
    RgSchDlHqInfo           *dlSfHqInfo;
    RgSchDlSf               *dlSf;
    TfuUeRecpReqInfo        *pucchRecpInfo;
@@ -3867,17 +3810,15 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS
    Inst                 inst = cell->instIdx;
 #endif
    S16                  ret;
-   CmLList              *hqPNode;
    RgSchUeCb            *ue;
    TfuUePucchRecpReq    *pucchReqInfo = NULLP;
 
-   hqPNode = dlSfHqInfo->hqPLst.first;
    ue = (RgSchUeCb*)dlSfHqInfo->dlSfUeLnk.node;
    
    if (ue == NULLP)
    {
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
    ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo,
          sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp));
    if (ret != ROK)
@@ -3885,7 +3826,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS
       RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate "
                "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId));
       err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-      RETVALUE(ret);
+      return ret;
    }
    pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
    pucchRecpInfo->rnti = ue->ueId; /* Even for Rel pdcch also setting CRNTI
@@ -3910,7 +3851,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS
    
    cmLListAdd2Tail(&recpReqInfo->ueRecpReqLst, &(pucchRecpInfo->lnk));
    pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo;
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillHqFdbkForFrmt1B */
 #endif
 
@@ -3927,7 +3868,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS
  *
  * @param  [out] TfuRecpReqInfo   *recpReqInfo
  * @param  [in]  RgSchCellCb      *cell
- * @param  [in]  U16              validIdx,
+ * @param  [in]  uint16_t              validIdx,
  * @param  [in]  RgSchDlHqInfo    *dlSfHqInfo,
  * @param  [in]  RgSchDlSf        *dlSf,
  * @param  [in]  TfuUeRecpReqInfo *pucchRecpInfo,
@@ -3943,7 +3884,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
U16                     validIdx,
uint16_t                     validIdx,
  RgSchDlHqInfo           *dlSfHqInfo,
  RgSchDlSf               *dlSf,
  TfuUeRecpReqInfo        *pucchRecpInfo,
@@ -3953,7 +3894,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B
 PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err)
    TfuRecpReqInfo          *recpReqInfo;
    RgSchCellCb             *cell;
-   U16                     validIdx; 
+   uint16_t                     validIdx; 
    RgSchDlHqInfo           *dlSfHqInfo;
    RgSchDlSf               *dlSf;
    TfuUeRecpReqInfo        *pucchRecpInfo;
@@ -3990,15 +3931,15 @@ RgSchErrInfo            *err;
    RgSchUeCb            *ue;
    TfuUePucchRecpReq    *pucchReqInfo = NULLP;
    Bool                 isDatPresOnSecCell = FALSE;
-   U8                   primCellTbCount = 0;
+   uint8_t                   primCellTbCount = 0;
 
    hqPNode = dlSfHqInfo->hqPLst.first;
    ue = (RgSchUeCb*)dlSfHqInfo->dlSfUeLnk.node;
    
    if (ue == NULLP)
    {
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
    ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo,
          sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp));
    if (ret != ROK)
@@ -4006,7 +3947,7 @@ RgSchErrInfo            *err;
       RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate "
                "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId));
       err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-      RETVALUE(ret);
+      return ret;
    }
    pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
    pucchRecpInfo->rnti = ue->ueId; /* Even for Rel pdcch also setting CRNTI
@@ -4028,7 +3969,7 @@ RgSchErrInfo            *err;
    pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal;
    pucchReqInfo->hqInfo.pucchResCnt = ue->f1bCsAVal;
 
-  cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
+  memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(uint16_t)*TFU_MAX_HQ_RES);
 #ifdef LTEMAC_SPS
    /* Two Resources needs to be configured if the 
     * serving cell is in mimo mode else single
@@ -4112,7 +4053,7 @@ RgSchErrInfo            *err;
                 * mode should be in 2 indices */
                if(RG_SCH_IS_CELL_SEC(ue,hqCb->hqE->cell))
                {
-                   U8 cellIdx = ue->cellIdToCellIdxMap[RG_SCH_CELLINDEX(hqCb->hqE->cell)];
+                   uint8_t cellIdx = ue->cellIdToCellIdxMap[RG_SCH_CELLINDEX(hqCb->hqE->cell)];
                    if(rgSCHUtlGetMaxTbSupp(ue->cellInfo[cellIdx]->txMode.txModeEnum) > 1)
                    {/* Sec cell is in mimo mode, use 0 and 1 */
                       pucchReqInfo->hqInfo.hqRes[0] = 
@@ -4243,7 +4184,7 @@ RgSchErrInfo            *err;
 #endif/*TFU_UPGRADE*/
    cmLListAdd2Tail(&recpReqInfo->ueRecpReqLst, &(pucchRecpInfo->lnk));
    pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo;
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillHqFdbkForFrmt1B */
 /** @brief This function handles filling of Hq reception request to
  *   Per Hq Proc.
@@ -4257,7 +4198,7 @@ RgSchErrInfo            *err;
  *
  * @param  [out] TfuRecpReqInfo   *recpReqInfo
  * @param  [in]  RgSchCellCb      *cell
- * @param  [in]  U16              validIdx,
+ * @param  [in]  uint16_t              validIdx,
  * @param  [in]  RgSchDlHqInfo    *dlSfHqInfo,
  * @param  [in]  RgSchDlSf        *dlSf,
  * @param  [in]  TfuUeRecpReqInfo *pucchRecpInfo,
@@ -4273,7 +4214,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
U16                     validIdx,
uint16_t                     validIdx,
  RgSchDlHqInfo           *dlSfHqInfo,
  RgSchDlSf               *dlSf,
  TfuUeRecpReqInfo        *pucchRecpInfo,
@@ -4283,7 +4224,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3
 PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err)
    TfuRecpReqInfo          *recpReqInfo;
    RgSchCellCb             *cell;
-   U16                     validIdx; 
+   uint16_t                     validIdx; 
    RgSchDlHqInfo           *dlSfHqInfo;
    RgSchDlSf               *dlSf;
    TfuUeRecpReqInfo        *pucchRecpInfo;
@@ -4324,8 +4265,8 @@ RgSchErrInfo            *err;
    
    if (ue == NULLP)
    {
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
    ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo,
          sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp));
    if (ret != ROK)
@@ -4333,7 +4274,7 @@ RgSchErrInfo            *err;
       RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate "
                "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId));
       err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-      RETVALUE(ret);
+      return ret;
    }
    pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
    pucchRecpInfo->rnti = ue->ueId; /* Even for Rel pdcch also setting CRNTI
@@ -4355,7 +4296,7 @@ RgSchErrInfo            *err;
    pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal;
    pucchReqInfo->hqInfo.pucchResCnt = 1;
 
-  cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
+  memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(uint16_t)*TFU_MAX_HQ_RES);
 #endif/*TFU_UPGRADE*/
    pucchReqInfo->hqInfo.hqRes[0] = dlSfHqInfo->n3ScellPucch.n3PucchIdx; 
 #ifdef TFU_UPGRADE
@@ -4364,7 +4305,7 @@ RgSchErrInfo            *err;
 #endif/*TFU_UPGRADE*/
    cmLListAdd2Tail(&recpReqInfo->ueRecpReqLst, &(pucchRecpInfo->lnk));
    pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo;
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillHqFdbkForFrmt3 */
 
 #endif/*LTE_ADV*/
@@ -4391,14 +4332,14 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
U16                  validIdx,
uint16_t                  validIdx,
  RgSchErrInfo            *err
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx, err)
    TfuRecpReqInfo          *recpReqInfo;
    RgSchCellCb             *cell;
-   U16                  validIdx; 
+   uint16_t                  validIdx; 
    RgSchErrInfo            *err;
 #endif
 #else
@@ -4426,8 +4367,6 @@ RgSchErrInfo            *err;
    RgSchUeCb            *ue;
    RgSchDlHqProcCb      *prvHqCb=NULLP;
 
-   TRC2(rgSCHTomUtlFillHqFdbkRecpReq);
-
 #ifdef CA_DBG
    {
       gF1bCsPres = FALSE;
@@ -4479,7 +4418,7 @@ RgSchErrInfo            *err;
 
    /* Check with TDD Code */
    /* FOR ACK NACK REP */
-   RETVALUE(ROK);
+   return ROK;
 } /* end of rgSCHTomUtlFillHqFdbkRecpReq */ 
 #ifdef TFU_UPGRADE 
 /** @brief This function handles filling of SR reception request to
@@ -4498,19 +4437,20 @@ RgSchErrInfo            *err;
  *      -# ROK 
  *      -# RFAILED 
  */
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillSrRecpReq
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
U16                  validIdx,
uint16_t                  validIdx,
  RgSchErrInfo            *err
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
    TfuRecpReqInfo          *recpReqInfo;
    RgSchCellCb             *cell;
-   U16                  validIdx; 
+   uint16_t                  validIdx; 
    RgSchErrInfo            *err;
 #endif
 {
@@ -4525,8 +4465,6 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
 #endif
 
 
-   TRC2(rgSCHTomUtlFillSrRecpReq);
-
    isAddToLst = FALSE;
 
    node = cell->pCqiSrsSrLst[validIdx].srLst.first;
@@ -4545,10 +4483,10 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
             "TfuUeRecpReqInfo for cell RNTI:%d",ue->ueId);
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-     cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+     memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
       pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
 #endif      
       /*Fill SR params*/
@@ -4584,10 +4522,10 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
       }
       pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo;
    }
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillSrRecpReq */
-
-
+#endif
+#endif
 /** @brief This function tells will the UE has a periodic CQI/PMI/RI 
  *  reporting
  *
@@ -4616,8 +4554,6 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
  Bool             *willueRprtCqiRi;
 #endif
 {
-   TRC2(rgSCHTomUtlWillUeRprtCqiRi);
-  
    /* Intialising Reporting probability as TRUE */ 
    *willueRprtCqiRi = TRUE; 
 
@@ -4632,8 +4568,8 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
          {/*onDuration NOT running, do not expect cqi/pmi/ri*/
             *willueRprtCqiRi = FALSE;
          }
-         RETVALUE(ROK);
-      }
+         return ROK;
+               }
 #endif /*end of LTEMAC_R9*/
       /* ccpu00134258: Fix for CQI DRX issue*/
       if(ue->drxCb->onDurTmrLen > 2)
@@ -4644,8 +4580,7 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
          }
       }
    }/*ue->isDrxEnabled*/
-   
-   RETVALUE(ROK);
+   return ROK; 
 } /*End of rgSCHTomUtlWillUeRprtCqiRi*/
 
 /** @brief This function handles filling of RI reception request to
@@ -4659,25 +4594,26 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
  *
  * @param  [out] TfuRecpReqInfo *recpReqInfo
  * @param  [in]  RgSchCellCb   *cell
- * @param  [in]  U16           validIdx
+ * @param  [in]  uint16_t           validIdx
  * @param  [out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
  */
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillRiRecpReq
 (
  TfuRecpReqInfo       *recpReqInfo,
  RgSchCellCb          *cell,
U16                  validIdx,
uint16_t                  validIdx,
  RgSchErrInfo         *err
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
    TfuRecpReqInfo       *recpReqInfo;
    RgSchCellCb          *cell;
-   U16                  validIdx; 
+   uint16_t                  validIdx; 
    RgSchErrInfo         *err;
 #endif
 {
@@ -4688,7 +4624,6 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
    Bool                  willUeRprtCqi; /* Flag set due to CQI Mask
                                        and UE inactive state (DRX) */
    RgSchUePCqiCb *riCb = NULLP;
-   TRC2(rgSCHTomUtlFillRiRecpReq);
 
    node = cell->pCqiSrsSrLst[validIdx].riLst.first;
    while(node)
@@ -4731,10 +4666,10 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
             RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
                "TfuUeRecpReqInfo for cell RNTI:%d",ue->ueId);
             err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-            RETVALUE(ret);
+            return ret;
          }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-         cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+         memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
          pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
 #endif
          /*Fill RI params*/
@@ -4766,9 +4701,9 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
          riCb->riDist--; 
       }     
    }
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillRiRecpReq */
-
+#endif
 #ifdef RG_5GTF
 /** @brief This function handles filling of 5GTF CQI-RI reception request to
  * PHY.
@@ -4781,33 +4716,33 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
  *
  * @param  [out] TfuRecpReqInfo *recpReqInfo
  * @param  [in]  RgSchCellCb   *cell
- * @param  [in]  U16           validIdx
+ * @param  [in]  uint16_t           validIdx
  * @param  [out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
  */
+
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq
 (
  TfuRecpReqInfo       *recpReqInfo,
  RgSchCellCb          *cell,
U16                  validIdx, 
uint16_t                  validIdx, 
  RgSchErrInfo         *err
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
    TfuRecpReqInfo     *recpReqInfo;
    RgSchCellCb        *cell;
-   U16                validIdx; 
+   uint16_t                validIdx; 
    RgSchErrInfo       *err;
 #endif
 {
    TfuUeRecpReqInfo     *pucchRecpInfo;
    RgSchUeCb            *ue = NULLP;
-   U16                  ret;
-
-   TRC2(rgSCHTomUtlFillCqiRiRecpReq);
+   uint16_t                  ret;
 
    while ((ue = rgSCHDbmGetNextUeCb(cell, ue)) != NULLP)
    {
@@ -4819,10 +4754,10 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
             RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
                "TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId);
             err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-            RETVALUE(ret);
+            return ret;
          }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-         cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+         memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
          pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;     
 #endif
          pucchRecpInfo->rnti =  ue->ueId; 
@@ -4836,11 +4771,10 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
          pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo;
       }
    }
-
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillCqiRiRecpReq */
 #endif
-
+#endif
 /** @brief This function handles filling of PCQI reception request to
  * PHY.
  *
@@ -4852,25 +4786,26 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
  *
  * @param  [out] TfuRecpReqInfo *recpReqInfo
  * @param  [in]  RgSchCellCb   *cell
- * @param  [in]  U16           validIdx
+ * @param  [in]  uint16_t           validIdx
  * @param  [out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
  */
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq
 (
  TfuRecpReqInfo       *recpReqInfo,
  RgSchCellCb          *cell,
U16                  validIdx, 
uint16_t                  validIdx, 
  RgSchErrInfo         *err
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
    TfuRecpReqInfo     *recpReqInfo;
    RgSchCellCb        *cell;
-   U16                validIdx; 
+   uint16_t                validIdx; 
    RgSchErrInfo       *err;
 #endif
 {
@@ -4879,15 +4814,13 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
    S16                  ret;
 
    RgSchUeCb            *ue;
-   U8                    ri; /*RI value*/
+   uint8_t                    ri; /*RI value*/
    Bool                  willUeRprtCqi;   /* Flag set due to CQI Mask 
                                         and UE Inactive state (DRX)*/
-   U8                    cqiPmiSz; 
+   uint8_t                    cqiPmiSz; 
    RgSchUePCqiCb        *cqiCb = NULLP;
    Bool                 isAddToLst = FALSE;
 
-   TRC2(rgSCHTomUtlFillPcqiRecpReq);
-
    node = cell->pCqiSrsSrLst[validIdx].cqiLst.first;
    while(node)
    {
@@ -4926,10 +4859,10 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
             "TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId);
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-      cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+      memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
       pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;     
 #endif
       
@@ -4953,9 +4886,8 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
       }
       pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo;
    }
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillPcqiRecpReq */
-
 /** @brief This function handles filling of SRS reception request to
  * PHY.
  *
@@ -4967,7 +4899,7 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
  *
  * @param  [out] TfuRecpReqInfo *recpReqInfo
  * @param  [in]  RgSchCellCb   *cell
- * @param  [in]  U16           validIdx
+ * @param  [in]  uint16_t           validIdx
  * @param  [out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK 
@@ -4978,14 +4910,14 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq
 (
  TfuRecpReqInfo       *recpReqInfo,
  RgSchCellCb          *cell,
U16                  validIdx,
uint16_t                  validIdx,
  RgSchErrInfo         *err
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err)
    TfuRecpReqInfo       *recpReqInfo;
    RgSchCellCb          *cell;
-   U16                  validIdx; 
+   uint16_t                  validIdx; 
    RgSchErrInfo         *err;
 #endif
 {
@@ -4994,8 +4926,6 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err)
    S16                  ret;
    RgSchUeCb            *ue;
 
-   TRC2(rgSCHTomUtlFillSrsRecpReq);
-
    node = cell->pCqiSrsSrLst[validIdx].srsLst.first;
    while(node)
    {
@@ -5020,7 +4950,7 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err)
             RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
                "TfuUeRecpReqInfo for RNTI:%d ",ue->ueId);
             err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-            RETVALUE(ret);
+            return ret;
          }
 
 #ifdef TFU_ALLOC_EVENT_NO_INIT
@@ -5052,7 +4982,7 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err)
          ue->srsCb.srsDist--; 
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }/* end of rgSCHTomUtlFillSrsRecpReq */
 #endif 
 #ifndef TFU_UPGRADE
@@ -5090,7 +5020,6 @@ RgSchErrInfo         *err;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
 
-   TRC2(rgSCHTomUtlFillDatRecpReq)
 
    /* processing steps are 
     * - Run through the UL allocations going out in this subframe.
@@ -5118,7 +5047,7 @@ RgSchErrInfo         *err;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
             "TfuUeRecpReqInfo for RNTI:%d ", alloc->ue->ueId);
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
       if (!alloc->forMsg3)
       {
@@ -5163,7 +5092,7 @@ RgSchErrInfo         *err;
       
       alloc = rgSCHUtlNextRcptnReq (cell, alloc);
    } /* end of while */
-   RETVALUE(ROK); 
+   return ROK;
 } /* end of rgSCHTomUtlFillDatRecpReq */
 
 #else
@@ -5178,7 +5107,7 @@ RgSchErrInfo         *err;
  *
  * @param  [out] TfuRecpReqInfo *recpReqInfo
  * @param  [in]  RgSchCellCb   *cell
- * @param  [in]  U16           validIdx
+ * @param  [in]  uint16_t           validIdx
  * @param  [out] RgSchErrInfo *err
  *  @return  S16
  *      -# ROK 
@@ -5189,32 +5118,29 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq
 (
  TfuRecpReqInfo       *recpReqInfo,
  RgSchCellCb          *cell,
U16                  validIdx,
uint16_t                  validIdx,
  RgSchErrInfo         *err
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
    TfuRecpReqInfo       *recpReqInfo;
    RgSchCellCb          *cell;
-   U16                  validIdx;
+   uint16_t                  validIdx;
    RgSchErrInfo         *err;
 #endif
 {
    CmLteTimingInfo   dci0Time;
-   U8                idx;
+   uint8_t                idx;
    S16               ret;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
 
-   Bool              hqPres;   /*Set when HARQ Rec Req is present*/
    Bool              isAperiodic = FALSE; /*Set when Aperiodic CQI is expected */
-   U8                numUePerTti = 0;
-
-   TRC2(rgSCHTomUtlFillDatRecpReq);
+   uint8_t                numUePerTti = 0;
 
-   if((0 == (recpReqInfo->timingInfo.sfn % 30)) && (0 == recpReqInfo->timingInfo.subframe))
+   if((0 == (recpReqInfo->timingInfo.sfn % 30)) && (0 == recpReqInfo->timingInfo.slot))
    {
-      //printf("5GTF_CHECK rgSCHTomUtlFillDatRecpReq (%d : %d)\n", recpReqInfo->timingInfo.sfn, recpReqInfo->timingInfo.subframe);
+      //printf("5GTF_CHECK rgSCHTomUtlFillDatRecpReq (%d : %d)\n", recpReqInfo->timingInfo.sfn, recpReqInfo->timingInfo.slot);
    }
    /* processing steps are 
     * - Run through the UL allocations going out in this subframe.
@@ -5232,15 +5158,13 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
          RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate "
             "TfuUeRecpReqInfo for RNTI:%d ", alloc->rnti);
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
       datRecpInfo->t.puschRecpReq.initialNSrs.pres = FALSE;
       datRecpInfo->t.puschRecpReq.initialNumRbs.pres = FALSE;
 #endif
       datRecpInfo->type = TFU_RECP_REQ_PUSCH;
-      /* ccpu00131944 - Intializing hqPres in each iteration*/
-      hqPres = FALSE;
       /* Check if this if for MSG3 - no scope for feedback along with it. */
       if ((FALSE == alloc->forMsg3))
       {
@@ -5252,7 +5176,7 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
          {
             RGSCHDECRFRMCRNTTIME(cell->crntTime,dci0Time,(RGSCH_ULCTRL_RECP_DIST));
             
-            idx = (dci0Time.sfn * RGSCH_NUM_SUB_FRAMES_5G + dci0Time.subframe)%
+            idx = (dci0Time.sfn * RGSCH_NUM_SUB_FRAMES_5G + dci0Time.slot)%
                      RGSCH_ULCTRL_RECP_DIST; 
             UNUSED(idx);
             datRecpInfo->t.puschRecpReq.rcpInfo = TFU_PUSCH_DATA;
@@ -5300,7 +5224,7 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
       cell->ulNumUeSchedPerTti[numUePerTti-1]++;
       gUlNumUePerTti[numUePerTti - 1]++;
    }
-   RETVALUE(ROK); 
+   return ROK;
 } /* end of rgSCHTomUtlFillDatRecpReq */
 #endif
 /* rg009.201. Added changes of TFU_UPGRADE */
@@ -5321,23 +5245,22 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo
+S16 rgSCHTomUtlFillRiBitWidthInfo
 (
  RgSchUeCb     *ueCb
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
+S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
    RgSchUeCb   *ueCb;
 #endif
 {
    RgSchUePCqiCb *riCb = ueCb->nPRiCb;
-   TRC2(rgSCHTomUtlFillRiBitWidthInfo);
    
    if (ueCb->mimoInfo.txMode != RGR_UE_TM_3 &&
              ueCb->mimoInfo.txMode != RGR_UE_TM_4)
    {
-      RETVALUE(RFAILED);
-   }
+      return RFAILED;
+       }
 
    ueCb->rawCqiBitW[ueCb->cqiRiWritIdx].type = TFU_RECP_REQ_PUCCH;
    ueCb->rawCqiBitW[ueCb->cqiRiWritIdx].u.pucch.pucchRawCqiInfo.mode= 
@@ -5369,7 +5292,7 @@ PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
    }
    
    RG_SCH_INCR_CQIRI_INDEX(ueCb->cqiRiWritIdx);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -5379,7 +5302,7 @@ PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
  *
  *     Desc : Fetch the CQI/PMI bits for a UE based on the mode, periodicity.
  *
- *     Ret  : U8
+ *     Ret  : uint8_t
  *            ROK - Success
  *
  *     Notes:
@@ -5388,28 +5311,27 @@ PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz
+uint8_t rgSCHTomUtlFetchPcqiBitSz
 (
  RgSchUeCb    *ueCb, 
U8           numTxAnt,
U8           *ri
uint8_t           numTxAnt,
uint8_t           *ri
  )
 #else
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
+uint8_t rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
    RgSchUeCb     *ueCb;
-   U8            numTxAnt;
-   U8            *ri;
+   uint8_t            numTxAnt;
+   uint8_t            *ri;
 #endif
 {
-   U8 confRepMode;
-   U8 pcqiSz;
+   uint8_t confRepMode;
+   uint8_t pcqiSz;
    TfuCqiPucchMode10   *mode10Info;    
    TfuCqiPucchMode11   *mode11Info;    
    TfuCqiPucchMode20   *mode20Info;   
    TfuCqiPucchMode21   *mode21Info;    
    RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb;
 
-   TRC3(rgSCHTomUtlFetchPcqiBitSz);
 
    confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum;
    if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && 
@@ -5519,7 +5441,7 @@ PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
    }
    
    RG_SCH_INCR_CQIRI_INDEX(ueCb->cqiRiWritIdx);
-   RETVALUE(pcqiSz);
+   return pcqiSz;
 }
 
 
@@ -5539,23 +5461,22 @@ PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx
+S16 rgSCHTomUtlPcqiSbCalcBpIdx
 (
  CmLteTimingInfo    crntTimInfo,
  RgSchUeCb          *ueCb,
  RgSchUePCqiCb   *cqiCb
  )
 #else
-PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
+S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
    CmLteTimingInfo  crntTimInfo;
    RgSchUeCb        *ueCb;
    RgSchUePCqiCb   *cqiCb;
 #endif
 {
-   U16 tti = (crntTimInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTimInfo.subframe);
-   U16  prdNum = tti/cqiCb->cqiPeri;
+   uint16_t tti = (crntTimInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTimInfo.slot);
+   uint16_t  prdNum = tti/cqiCb->cqiPeri;
 
-   TRC2(rgSCHTomUtlPcqiSbCalcBpIdx);
    if((prdNum % cqiCb->h) == 0)
    {
       cqiCb->isWb = TRUE;
@@ -5571,7 +5492,7 @@ PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
       cqiCb->prioLvl = RG_SCH_CQI_PRIO_LVL_0;
 #endif
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -5596,28 +5517,27 @@ PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
  *           
  *  @param[in]   RgSchCellCb    *cell,
  *               RgSchUeCb      *ue,
- *               U16            validIdx
+ *               uint16_t            validIdx
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlMoveNxtOccasion
+S16 rgSCHTomUtlMoveNxtOccasion
 (
  RgSchCellCb    *cell,
  RgSchUeCb      *ue,
U16            validIdx
uint16_t            validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
+S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
    RgSchCellCb    *cell;
    RgSchUeCb      *ue;
-   U16            validIdx;
+   uint16_t            validIdx;
 #endif
 {
    RgSchUePCqiCb *cqiCb = ue->nPCqiCb;
    RgSchUePCqiCb *riCb = ue->nPRiCb;
-   TRC2(rgSCHTomUtlMoveNxtOccasion);
  
    /* ccpu00140578::Skip the UE if already RI recpetion 
     * is processed in the same subframe */
@@ -5670,7 +5590,7 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
    {
       rgSCHTomUtlMoveSrNxtOccasion(cell, ue); 
    }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlMoveNxtOccasion */
 
 
@@ -5684,7 +5604,7 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
  *            to aid decoding of Aperiodic CQI. 
  *
  *     Ret  : Void
- *            ROK - RETVOID
+ *            ROK - void
  *
  *     Notes:
  *
@@ -5692,34 +5612,32 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHTomPrepareAcqiRecp
+Void rgSCHTomPrepareAcqiRecp
 (
  RgSchUeCb                        *ueCb, 
  RgSchCellCb                   *cell,
  TfuUePuschCqiRecpInfo *cqiRecpReqInfo,
U8                    ccIdx
uint8_t                    ccIdx
  )
 #else
-PUBLIC  Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
+ Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
  RgSchUeCb                        *ueCb;
  RgSchCellCb              *cell;
  TfuUePuschCqiRecpInfo *cqiRecpReqInfo;
U8                    ccIdx;
uint8_t                    ccIdx;
 #endif
 {
-   U8 confRepMode;
+   uint8_t confRepMode;
    RgSchCqiRawPuschMode12   *mode12Info;   
    RgSchCqiRawPuschMode20   *mode20Info;    
    RgSchCqiRawPuschMode22   *mode22Info;    
    RgSchCqiRawPuschMode30   *mode30Info;   
    RgSchCqiRawPuschMode31   *mode31Info;    
-   U8           numTxAnt   = cell->numTxAntPorts;
-   U8            sCellIdx   = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)];
-   U8            numOfCells = 0;
+   uint8_t              numTxAnt   = cell->numTxAntPorts;
+   uint8_t            sCellIdx   = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)];
+   uint8_t            numOfCells = 0;
    RgSchUeACqiCb *acqiCb  = &ueCb->cellInfo[sCellIdx]->acqiCb;
 
-   TRC2(rgSCHTomPrepareAcqiRecp);
-
    /* Fill TFU Recp */
    cqiRecpReqInfo->reportType = TFU_APERIODIC_CQI_TYPE; /* Aperiodic */
    if (ueCb->mimoInfo.txMode == RGR_UE_TM_3 ||
@@ -5855,7 +5773,7 @@ PUBLIC  Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
       default:
          break;
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -5885,34 +5803,33 @@ PUBLIC  Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq
+S16 rgSCHTomUtlFillDatAperRecpReq
 (
  RgSchCellCb       *cell,
U8                cqiReq,
uint8_t                cqiReq,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo,
  CmLteTimingInfo   *timeInfo,
  Bool              hqPres,
U16                validIdx
uint16_t                validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx)
+S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx)
    RgSchCellCb       *cell;
-   U8                cqiReq;
+   uint8_t                cqiReq;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
    CmLteTimingInfo   *timeInfo;
    Bool              hqPres;
-   U16                validIdx; 
+   uint16_t                validIdx; 
 #endif
 {
    TfuUePuschCqiRecpInfo  *cqiRecpReqInfo;
    RgSchUeCb                     *ueCb = alloc->ue;
 #ifdef LTE_ADV
-   U8                     triggerSet = 0;
-   U8                     sIdx = 0;
+   uint8_t                     triggerSet = 0;
+   uint8_t                     sIdx = 0;
 #endif
-   TRC2(rgSCHTomUtlFillDatAperRecpReq);
 
    /*Fill RI Reception Params*/
    cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo;   
@@ -5965,7 +5882,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeI
    datRecpInfo->rnti = alloc->rnti;
    rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo,
             &datRecpInfo->t.puschRecpReq.ulSchInfo);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlFillDatAperRecpReq */
 
 
@@ -5997,28 +5914,27 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeI
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq
+S16 rgSCHTomUtlFillDatPriRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo,
  CmLteTimingInfo   *timeInfo,
  Bool              hqPres,
U16               validIdx
uint16_t               validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, 
+S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, 
 hqPres, validIdx)
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
    CmLteTimingInfo   *timeInfo;
    Bool              hqPres; 
-   U16                validIdx;
+   uint16_t                validIdx;
 #endif
 {
    TfuUePuschCqiRecpInfo  *cqiRecpReqInfo;
-   TRC2(rgSCHTomUtlFillDatPriRecpReq);
 
    /*Fill RI Reception Params*/
    cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo;   
@@ -6061,7 +5977,7 @@ hqPres, validIdx)
    datRecpInfo->rnti = alloc->rnti;
    rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo,
          &datRecpInfo->t.puschRecpReq.ulSchInfo);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlFillDatPriRecpReq */
 
 
@@ -6093,32 +6009,29 @@ hqPres, validIdx)
  **/
 
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq
+S16 rgSCHTomUtlFillDatPCqiRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo,
  CmLteTimingInfo   *timeInfo,
  Bool              hqPres, 
U16                validIdx
uint16_t                validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, 
+S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, 
       timeInfo, hqPres, validIdx)
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
    CmLteTimingInfo   *timeInfo;
    Bool              hqPres; 
-   U16                validIdx;
+   uint16_t                validIdx;
 #endif
 {
    TfuUePuschCqiRecpInfo  *cqiRecpReqInfo;
-   U8                 cqiPmiSz; /*Raw CQI/PMI Size*/
-   U8                 ri;
-
-   TRC2(rgSCHTomUtlFillDatPCqiRecpReq);
-
+   uint8_t                 cqiPmiSz; /*Raw CQI/PMI Size*/
+   uint8_t                 ri;
 
    /*Fill CQI Reception Params*/
    cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo;
@@ -6131,7 +6044,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo,
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Fill "
          "CqiPmi size RNTI:%d",alloc->rnti);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Fill only the first RI index since Periodic can come 
@@ -6178,7 +6091,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo,
    datRecpInfo->rnti = alloc->rnti;
    rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo,
             &datRecpInfo->t.puschRecpReq.ulSchInfo);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlFillDatPCqiRecpReq */
 
 /**
@@ -6208,7 +6121,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo,
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq
+S16 rgSCHTomUtlFillDatSrsRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -6217,7 +6130,7 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq
  Bool              hqPres
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, 
+S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, 
       hqPres)
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
@@ -6226,7 +6139,6 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo,
    Bool              hqPres; 
 #endif
 {
-   TRC2(rgSCHTomUtlFillDatSrsRecpReq);
    datRecpInfo->rnti = alloc->rnti;
    rgSCHTomFillOnlySrsRecpReq(cell,alloc, datRecpInfo); 
    if(hqPres)
@@ -6240,7 +6152,7 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo,
    datRecpInfo->rnti = alloc->rnti;
    rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo, 
             &datRecpInfo->t.puschRecpReq.ulSchInfo);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlFillDatSrsRecpReq */
 
 /**
@@ -6268,21 +6180,20 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo,
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomFillOnlySrsRecpReq
+S16 rgSCHTomFillOnlySrsRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo
  )
 #else
-PUBLIC S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)  
+S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)  
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
 #endif
 {
    TfuUePuschSrsRecpInfo  *srsRecpReqInfo;
-   TRC2(rgSCHTomFillOnlySrsRecpReq);
 
    srsRecpReqInfo = &datRecpInfo->t.puschRecpReq.srsInfo;
    srsRecpReqInfo->srsBw = (TfuUlSrsBwInfo)alloc->ue->srsCb.srsCfg.srsSetup.srsBw;
@@ -6296,7 +6207,7 @@ PUBLIC S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)
     * Refer Section 5.2.2.6 of TS 36.212 V8.5.0*/
    datRecpInfo->t.puschRecpReq.ulSchInfo.nSrs = 1;
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomFillOnlySrsRecpReq */
 
 /**
@@ -6324,7 +6235,7 @@ PUBLIC S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)
  *               TfuRecpReqInfo    *recpReqInfo,
  *               RgSchDlHqProcCb   *hqCb,
  *  @param[out]  TfuUeRecpReqInfo  *pucchRecpInfo
- *  @param[in]   U16               validIdx
+ *  @param[in]   uint16_t               validIdx
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
@@ -6336,7 +6247,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq
  TfuRecpReqInfo    *recpReqInfo,
  RgSchUeCb         *ue,
  TfuUeRecpReqInfo  *pucchRecpInfo,
U16                validIdx,
uint16_t                validIdx,
  Bool               isDatPresOnSecCell
  )
 #else
@@ -6346,19 +6257,19 @@ RgSchCellCb       *cell;
 TfuRecpReqInfo    *recpReqInfo;
 RgSchUeCb         *ue;
 TfuUeRecpReqInfo  *pucchRecpInfo;
-U16               validIdx;
+uint16_t               validIdx;
 Bool              isDatPresOnSecCell;
 #endif
 {
    RgSchUePCqiCb   *cqiCb;
    RgSchUePCqiCb   *riCb;
-   U8                 ri; /*To fetch RI value*/
+   uint8_t                 ri; /*To fetch RI value*/
    Bool               willUeRprtCqi;   /* Flag set due to CQI Mask and 
                                       UE Inactive state (DRX)*/
    Bool               willUeRprtSr = TRUE;   
    TfuAckNackMode     hqFdbkMode;
-   U8                 numCqiBit;
-   U8                 totalPucchBits;
+   uint8_t                 numCqiBit;
+   uint8_t                 totalPucchBits;
    Bool               dropCqi = FALSE;
 #ifdef LTEMAC_SPS
    RgSchCmnUlUeSpsInfo   *ulSpsUe = NULL;
@@ -6367,8 +6278,6 @@ Bool              isDatPresOnSecCell;
    RgSchEmtcUeInfo *emtcUe = NULLP;
 #endif
 
-   TRC2(rgSCHTomUtlFillCqiSrSrsWithHq);
-    
    if(ue)
    {
       /*Changes for PUCCH Format3 */
@@ -6535,7 +6444,7 @@ Bool              isDatPresOnSecCell;
             {
                RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d "
                   "Unable to Fill CqiPmi size", ue->ueId);
-               RETVALUE(RFAILED);
+               return RFAILED;
             }
             if(pucchRecpInfo->t.pucchRecpReq.uciInfo == TFU_PUCCH_HARQ_SR)
             {
@@ -6619,7 +6528,7 @@ Bool              isDatPresOnSecCell;
       }
    }            
    UNUSED(dropCqi);
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlFillCqiSrSrsWithHq */
 
 /**
@@ -6646,11 +6555,12 @@ Bool              isDatPresOnSecCell;
  *               RgSchUeCb         *ue
  *               TfuRecpReqInfo    *recpReqInfo,
  *  @param[out]  TfuUeRecpReqInfo  *pucchRecpInfo
- *  @param[in]   U16               validIdx
+ *  @param[in]   uint16_t               validIdx
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
  **/
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr
 (
@@ -6658,7 +6568,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr
  RgSchUeCb         *ue, 
  TfuRecpReqInfo    *recpReqInfo,
  TfuUeRecpReqInfo  *pucchRecpInfo,
U16               validIdx
uint16_t               validIdx
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr(cell, ue, recpReqInfo,  
@@ -6667,16 +6577,14 @@ RgSchCellCb       *cell;
 RgSchUeCb         *ue; 
 TfuRecpReqInfo    *recpReqInfo;
 TfuUeRecpReqInfo  *pucchRecpInfo;
-U16               validIdx;
+uint16_t               validIdx;
 #endif
 {
    RgSchUePCqiCb   *cqiCb;
    RgSchUePCqiCb   *riCb;
-   U8                 ri; /*To fetch RI value*/
+   uint8_t                 ri; /*To fetch RI value*/
    Bool               willUeRprtCqi;   /* Flag set due to CQI Mask and 
                                       UE Inactive state (DRX)*/
-   TRC2(rgSCHTomUtlFillCqiSrsWithSr);
-   
    riCb = ue->nPRiCb;
    cqiCb = ue->nPCqiCb;
    rgSCHTomUtlWillUeRprtCqiRi(ue, &willUeRprtCqi);
@@ -6745,8 +6653,8 @@ U16               validIdx;
             {
                RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d"
                   " Unable to Fill CqiPmi size", ue->ueId);
-               RETVALUE(RFAILED);
-            }
+               return RFAILED;
+                               }
 
             pucchRecpInfo->t.pucchRecpReq.uciInfo = TFU_PUCCH_SR_CQI;
          }
@@ -6807,11 +6715,11 @@ U16               validIdx;
 
          }
       }
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHTomUtlFillCqiSrsWithSr */
 
 #endif 
-
+#endif
 
 #ifdef LTE_TDD
 /** @brief This function handles filling of HARQ feedback repetition
@@ -6827,9 +6735,9 @@ U16               validIdx;
  * @param  [in]  RgSchCellCb     *cell
  * @param  [out] RgSchErrInfo    *err
  * @param  [in]  RgSchDlSf       *dlSf
- * @param  [in]  U8              noFdbks
+ * @param  [in]  uint8_t              noFdbks
  * @param  [in]  CmMemListCp     *memCp
- * @param  [in]  U8              elemIdx
+ * @param  [in]  uint8_t              elemIdx
  * @param  [in]  RgSchDlSf       *nxtDlsf
  *  @return  S16
  *      -# ROK 
@@ -6843,11 +6751,11 @@ PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk
  RgSchCellCb             *cellCb,
  RgSchErrInfo            *err,
  RgSchDlSf               *dlSf,
U8                      noFdbks,
uint8_t                      noFdbks,
  CmMemListCp             *memCp,
U8                      elemIdx,
uint8_t                      elemIdx,
  RgSchDlSf               *nxtDlsf,
U16                     validIdx
uint16_t                     validIdx
  )
 #else
 PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, 
@@ -6856,11 +6764,11 @@ noFdbks, memCp, elemIdx, nxtDlsf, validIdx)
    RgSchCellCb             *cellCb;
    RgSchErrInfo            *err;
    RgSchDlSf               *dlSf;
-   U8                      noFdbks;
+   uint8_t                      noFdbks;
    CmMemListCp             *memCp;
-   U8                      elemIdx;
+   uint8_t                      elemIdx;
    RgSchDlSf               *nxtDlsf;
-   U16                     validIdx; 
+   uint16_t                     validIdx; 
 #endif
 #else
 #ifdef ANSI
@@ -6870,9 +6778,9 @@ TfuRecpReqInfo          *recpReqInfo,
 RgSchCellCb             *cellCb,
 RgSchErrInfo            *err,
 RgSchDlSf               *dlSf,
-U8                      noFdbks,
+uint8_t                      noFdbks,
 CmMemListCp             *memCp,
-U8                      elemIdx,
+uint8_t                      elemIdx,
 RgSchDlSf               *nxtDlsf
 )
 #else
@@ -6882,9 +6790,9 @@ noFdbks, memCp, elemIdx, nxtDlsf)
    RgSchCellCb             *cellCb;
    RgSchErrInfo            *err;
    RgSchDlSf               *dlSf;
-   U8                      noFdbks;
+   uint8_t                      noFdbks;
    CmMemListCp             *memCp;
-   U8                      elemIdx;
+   uint8_t                      elemIdx;
    RgSchDlSf               *nxtDlsf;
 #endif
 #endif 
@@ -6900,8 +6808,6 @@ noFdbks, memCp, elemIdx, nxtDlsf)
    RgSchDlHqTbCb           *tbCb;
    RgSchDlHqProcCb         *prvHqCb = NULLP;
 
-   TRC2(rgSCHTomUtlFillSfRepHqFdbk)
-
    node =  dlSf->ackNakRepQ.first;
    while (node)
    {
@@ -6943,7 +6849,7 @@ noFdbks, memCp, elemIdx, nxtDlsf)
             RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to"
                "Allocate TfuUeRecpReqInfo for RNTI:%d ", ueCb->ueId);
             err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-            RETVALUE(ret);
+            return ret;
          }
          pucchRecpInfo->rnti    =  ueCb->ueId;
 #ifndef TFU_UPGRADE
@@ -6993,8 +6899,7 @@ noFdbks, memCp, elemIdx, nxtDlsf)
       /* Go to the next node */
       node = node->next;
    }
-
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /** @brief This function handles filling of HARQ feedback recption request
@@ -7010,11 +6915,11 @@ noFdbks, memCp, elemIdx, nxtDlsf)
  * @param  [in]  RgSchCellCb     *cell
  * @param  [out] RgSchErrInfo    *err
  * @param  [in]  RgSchDlSf       *dlSf
- * @param  [in]  U8              noFdbks
+ * @param  [in]  uint8_t              noFdbks
  * @param  [in]  CmMemListCp     *memCp
- * @param  [in]  U8              elemIdx
+ * @param  [in]  uint8_t              elemIdx
  * @param  [in]  RgSchDlSf       *nxtDlsf
-*  @param  [in]  U16             validIdx; 
+*  @param  [in]  uint16_t             validIdx; 
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
@@ -7027,11 +6932,11 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo
  RgSchCellCb             *cellCb,
  RgSchErrInfo            *err,
  RgSchDlSf               *dlSf,
U8                      noFdbks,
uint8_t                      noFdbks,
  CmMemListCp             *memCp,
U8                      elemIdx,
uint8_t                      elemIdx,
  RgSchDlSf               *nxtDlsf,
U16                     validIdx,
uint16_t                     validIdx,
  RgSchDlHqProcCb         *hqCb,
  RgSchUePucchRecpInfo    *pucchInfo,
  Bool                    alloc,
@@ -7044,11 +6949,11 @@ TfuRecpReqInfo          *recpReqInfo;
 RgSchCellCb             *cellCb;
 RgSchErrInfo            *err;
 RgSchDlSf               *dlSf;
-U8                      noFdbks;
+uint8_t                      noFdbks;
 CmMemListCp             *memCp;
-U8                      elemIdx;
+uint8_t                      elemIdx;
 RgSchDlSf               *nxtDlsf;
-U16                     validIdx; 
+uint16_t                     validIdx; 
 RgSchDlHqProcCb         *hqCb;
 RgSchUePucchRecpInfo    *pucchInfo;
 Bool                    alloc;
@@ -7062,9 +6967,9 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo
  RgSchCellCb             *cellCb,
  RgSchErrInfo            *err,
  RgSchDlSf               *dlSf,
U8                      noFdbks,
uint8_t                      noFdbks,
  CmMemListCp             *memCp,
U8                      elemIdx,
uint8_t                      elemIdx,
  RgSchDlSf               *nxtDlsf,
  RgSchDlHqProcCb         *hqCb,
  RgSchUePucchRecpInfo    *pucchInfo,
@@ -7078,9 +6983,9 @@ TfuRecpReqInfo          *recpReqInfo;
 RgSchCellCb             *cellCb;
 RgSchErrInfo            *err;
 RgSchDlSf               *dlSf;
-U8                      noFdbks;
+uint8_t                      noFdbks;
 CmMemListCp             *memCp;
-U8                      elemIdx;
+uint8_t                      elemIdx;
 RgSchDlSf               *nxtDlsf;
 RgSchDlHqProcCb         *hqCb;
 RgSchUePucchRecpInfo    *pucchInfo;
@@ -7099,10 +7004,8 @@ RgSchDlHqProcCb         *prvHqCb;
    RgrTddAckNackMode       ackNackMode;
    RgSchDlHqTbCb           *tbCb;
    CmLteRnti               rnti;
-   U8                      hqSz = 0;
-   U32                     idx = 0;
-
-   TRC2(rgSCHTomUtlFillSfHqFdbkInfo)
+   uint8_t                      hqSz = 0;
+   uint32_t                     idx = 0;
 
 #ifndef TFU_UPGRADE
    RG_SCH_ADD_TO_CRNT_TIME(cellCb->crntTime, futTime, TFU_RECPREQ_DLDELTA);
@@ -7128,18 +7031,18 @@ RgSchDlHqProcCb         *prvHqCb;
                if((anInfo == NULLP) || 
                      (anInfo->latestMIdx != dlSf->dlFdbkInfo.m))
                {
-                  RETVALUE(ROK);
-               }
+                                          return ROK; 
+                                       }
             }
             else
             {
                /* Get the TFU reception request pointer, if present */
-               cmHashListFind(&cellCb->ueTfuPendLst, (U8*) &ueCb->ueId,
+               cmHashListFind(&cellCb->ueTfuPendLst, (uint8_t*) &ueCb->ueId,
                      sizeof(ueCb->ueId), 0, (PTR *) &pucchInfo);
             }
 #else
             /* For upgrade we shall use the existing logic of pending list. */
-            cmHashListFind(&cellCb->ueTfuPendLst, (U8*) &ueCb->ueId,
+            cmHashListFind(&cellCb->ueTfuPendLst, (uint8_t*) &ueCb->ueId,
                   sizeof(ueCb->ueId), 0, (PTR *) &pucchInfo);
 #endif
          }
@@ -7151,7 +7054,7 @@ RgSchDlHqProcCb         *prvHqCb;
          }
          else
          {
-            RETVALUE(ROK);
+                          return ROK;
          }
 
          /* Do not proceed if PUSCH
@@ -7168,9 +7071,9 @@ RgSchDlHqProcCb         *prvHqCb;
                &&(hqCb != prvHqCb)
            )
          {
-            TknU16       n1PucchTkn = {FALSE, 0};
+            TknUInt16       n1PucchTkn = {FALSE, 0};
             RgSchPdcch   *pdcch;
-            U8            tbIndx;
+            uint8_t            tbIndx;
             pdcch = tbCb->hqP->pdcch;
 #ifdef LTEMAC_SPS
             n1PucchTkn = hqCb->spsN1PucchRes;
@@ -7190,7 +7093,7 @@ RgSchDlHqProcCb         *prvHqCb;
                   n1PucchTkn, &alloc, hqSz);
             if (ret != ROK)
             {
-               RETVALUE(ret);
+               return ret;
             }
             /* TODO:: In case of F1BCS and CSI in same subframe
              * UE shall drop the CSI if there was at least one 
@@ -7246,7 +7149,7 @@ RgSchDlHqProcCb         *prvHqCb;
             //if((elemIdx != (noFdbks - 1)))
             {
                cmHashListInsert(&cellCb->ueTfuPendLst, (PTR) pucchInfo,
-                     (U8 *)&rnti ,(U16) sizeof(CmLteRnti));
+                     (uint8_t *)&rnti ,(uint16_t) sizeof(CmLteRnti));
                alloc = FALSE;
             }
 
@@ -7270,7 +7173,7 @@ RgSchDlHqProcCb         *prvHqCb;
          prvHqCb = hqCb;
       }
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef LTE_ADV
@@ -7286,37 +7189,37 @@ RgSchDlHqProcCb         *prvHqCb;
  *           Harq Reception Request for Format 1B with
  *           Channel Selection
  *
- * @param  [in] U8                      noFdbks
+ * @param  [in] uint8_t                      noFdbks
  * @param  [in] RgSchDlSf               *dlSf
  * @param  [in] RgSchPdcch              *pdcch
  * @param  [in] RgSchCellCb             *cellCb
- * @param  [out]U16                     *hqRes
+ * @param  [out]uint16_t                     *hqRes
  * @return void
  */
 #ifdef ANSI
 PRIVATE Void rgSCHTomUtlGethqRes
 (
-U8                      noFdbks,
+uint8_t                      noFdbks,
 RgSchDlSf               *dlSf,
 RgSchPdcch              *pdcch,
 RgSchCellCb             *cellCb,
-U16                     *hqRes
+uint16_t                     *hqRes
 )
 #else
 PRIVATE Void rgSCHTomUtlGethqRes(noFdbks,dlSf,pdcch,cellCb,hqRes)
-U8                      noFdbks;
+uint8_t                      noFdbks;
 RgSchDlSf               *dlSf;
 RgSchPdcch              *pdcch;
 RgSchCellCb             *cellCb;
-U16                     *hqRes;
+uint16_t                     *hqRes;
 #endif
 {
-   U8                      M;
-   U8                      P;
-   U8                      m;
-   U8                      nP;
-   U8                      nPlusOne;
-   U8                      nCce;
+   uint8_t                      M;
+   uint8_t                      P;
+   uint8_t                      m;
+   uint8_t                      nP;
+   uint8_t                      nPlusOne;
+   uint8_t                      nCce;
    
    M = noFdbks;
    m = dlSf->dlFdbkInfo.m;
@@ -7327,7 +7230,7 @@ U16                     *hqRes;
    *hqRes = (M - m - 1)* nP + (m * nPlusOne) + pdcch->nCce + 
       cellCb->pucchCfg.n1PucchAn;
 
-   RETVOID;
+   return;
 }
 
 /** @brief This function fills the harq reception request for
@@ -7343,7 +7246,7 @@ U16                     *hqRes;
  *
  * @param  [in] RgSchDlHqProcCb         *hqCb
  * @param  [in] TfuUePucchRecpReq       *hqRecpReq
- * @param  [in] U8                      noFdbks
+ * @param  [in] uint8_t                      noFdbks
  * @param  [in] RgSchDlSf               *dlSf
  * @param  [in] RgSchPdcch              *pdcch
  * @param  [in] RgSchCellCb             *cellCb
@@ -7354,7 +7257,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1
 (
  RgSchDlHqProcCb     *hqCb,
  TfuUePucchRecpReq   *hqRecpReq,
U8                  noFdbks,
uint8_t                  noFdbks,
  RgSchDlSf           *dlSf,
  RgSchPdcch          *pdcch,
  RgSchCellCb         *cellCb
@@ -7364,7 +7267,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
       noFdbks,dlSf,pdcch,cellCb)
  RgSchDlHqProcCb     *hqCb;
  TfuUePucchRecpReq   *hqRecpReq;
U8                  noFdbks;
uint8_t                  noFdbks;
  RgSchDlSf           *dlSf;
  RgSchPdcch          *pdcch;
  RgSchCellCb         *cellCb;
@@ -7372,7 +7275,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
 {
    RgSchUeCb           *ue = NULLP;
    Bool                 isCellSec = FALSE;
-   U16                  hqRes;
+   uint16_t                  hqRes;
 
    /*ccpu00147920: UeCb is NULL for SPS activation*/
    if(pdcch && pdcch->ue)
@@ -7387,7 +7290,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
           * Error case. hqCB has to be ter
           * when pdcch is present . Adding 
           * if check bcs of kwork*/
-         RETVOID;
+         return;
       }
 #endif
       ue = hqCb->hqE->ue;
@@ -7426,7 +7329,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
                    * Error case. hqCB has to be ter
                    * when pdcch is present . Adding 
                    * if check bcs of kwork*/
-                  RETVOID;
+                  return;
                }
 #endif
  
@@ -7442,7 +7345,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
              * mode should be in 2 indices */
             if(isCellSec)
             {
-               U8 servCellIdx = rgSchUtlGetServCellIdx(hqCb->hqE->cell->instIdx,
+               uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqCb->hqE->cell->instIdx,
                      hqCb->hqE->cell->cellId,
                      hqCb->hqE->ue);
 
@@ -7479,7 +7382,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
                          * Error case. hqCB has to be ter
                          * when pdcch is present . Adding 
                          * if check bcs of kwork*/
-                        RETVOID;
+                        return;
                      }
 #endif
 
@@ -7506,7 +7409,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
                          * Error case. hqCB has to be ter
                          * when pdcch is present . Adding 
                          * if check bcs of kwork*/
-                        RETVOID;
+                        return;
                      }
 #endif
 
@@ -7543,7 +7446,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
                       * Error case. hqCB has to be ter
                       * when pdcch is present . Adding 
                       * if check bcs of kwork*/
-                     RETVOID;
+                     return;
                   }
 #endif
 
@@ -7557,7 +7460,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
       default:
          break;
    }
-   RETVOID;
+   return;
 }
 
 /** @brief This function fills the harq reception request for
@@ -7573,11 +7476,11 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq,
  *
  * @param  [in] RgSchDlHqProcCb         *hqCb
  * @param  [in] TfuUePucchRecpReq       *hqRecpReq
- * @param  [in] U8                      noFdbks
+ * @param  [in] uint8_t                      noFdbks
  * @param  [in] RgSchDlSf               *dlSf
  * @param  [in] RgSchPdcch              *pdcch
  * @param  [in] RgSchCellCb             *cellCb
- * @param  [in] U8                      elemIdx
+ * @param  [in] uint8_t                      elemIdx
  * @return void
  */
 #ifdef ANSI
@@ -7585,28 +7488,28 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234
 (
  RgSchDlHqProcCb         *hqCb,
  TfuUePucchRecpReq       *hqRecpReq,
U8                      noFdbks,
uint8_t                      noFdbks,
  RgSchDlSf               *dlSf,
  RgSchPdcch              *pdcch,
  RgSchCellCb             *cellCb,
U8                      elemIdx
uint8_t                      elemIdx
 )
 #else
 PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234(
       hqCb,hqRecpReq,noFdbks,dlSf,pdcch,cellCb,elemIdx)
  RgSchDlHqProcCb         *hqCb;
  TfuUePucchRecpReq       *hqRecpReq;
U8                      noFdbks;
uint8_t                      noFdbks;
  RgSchDlSf               *dlSf;
  RgSchPdcch              *pdcch;
  RgSchCellCb             *cellCb;
U8                      elemIdx;
uint8_t                      elemIdx;
 #endif
 {
    RgSchUeCb            *ue;
    Bool                 isCellSec = FALSE;
-   U16                  hqRes = 0;
-   U8                   servCellIdx;
+   uint16_t                  hqRes = 0;
+   uint8_t                   servCellIdx;
 
    if(pdcch)
    {/* SPS Release pdcch or dynamic data */
@@ -7620,7 +7523,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234(
           * Error case. hqCB has to be ter
           * when pdcch is present . Adding 
           * if check bcs of kwork*/
-         RETVOID;
+         return;
       }
 #endif
       ue = hqCb->hqE->ue;
@@ -7722,7 +7625,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234(
          }
       }
    }
-   RETVOID;
+   return;
 }
 
 /** @brief This function fills the harq reception request for
@@ -7746,10 +7649,10 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS
 (
  RgSchDlHqProcCb         *hqCb,
  TfuUePucchRecpReq       *hqRecpReq,
U8                      noFdbks,
uint8_t                      noFdbks,
  RgSchDlSf               *dlSf,
  RgSchPdcch              *pdcch,
U8                      elemIdx,
uint8_t                      elemIdx,
  RgSchCellCb             *cellCb
 )
 #else
@@ -7757,10 +7660,10 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch
       n1PucchTkn,elemIdx,cellCb)
  RgSchDlHqProcCb         *hqCb;
  TfuUePucchRecpReq       *hqRecpReq;
U8                      noFdbks;
uint8_t                      noFdbks;
  RgSchDlSf               *dlSf;
  RgSchPdcch              *pdcch;
U8                      elemIdx;
uint8_t                      elemIdx;
  RgSchCellCb             *cellCb;
 #endif
 {
@@ -7789,7 +7692,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch
       default:
          break;
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
@@ -7814,17 +7717,17 @@ TfuRecpReqInfo          *recpReqInfo,
 RgSchCellCb             *cellCb,
 RgSchErrInfo            *err,
 RgSchDlSf               *dlSf,
-U8                      noFdbks,
+uint8_t                      noFdbks,
 CmMemListCp             *memCp,
-U8                      elemIdx,
+uint8_t                      elemIdx,
 RgSchDlSf               *nxtDlsf,
 CmLteRnti               rnti,
 RgrTddAckNackMode       ackNackMode,
 RgSchUePucchRecpInfo    **pucchInfoRef,
 RgSchPdcch              *pdcch,
-TknU16                  n1PucchTkn,
+TknUInt16                  n1PucchTkn,
 Bool                    *allocRef,
-U8                      hqSz  
+uint8_t                      hqSz  
 )
 #else
 PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe(hqCb,recpReqInfo, cellCb, err, dlSf,
@@ -7835,17 +7738,17 @@ TfuRecpReqInfo          *recpReqInfo;
 RgSchCellCb             *cellCb;
 RgSchErrInfo            *err;
 RgSchDlSf               *dlSf;
-U8                      noFdbks;
+uint8_t                      noFdbks;
 CmMemListCp             *memCp;
-U8                      elemIdx;
+uint8_t                      elemIdx;
 RgSchDlSf               *nxtDlsf;
 CmLteRnti               rnti;
 RgrTddAckNackMode       ackNackMode;
 RgSchUePucchRecpInfo    **pucchInfoRef;
 RgSchPdcch              *pdcch;
-TknU16                  n1PucchTkn;
+TknUInt16                  n1PucchTkn;
 Bool                    *allocRef;
-U8                      hqSz;
+uint8_t                      hqSz;
 #endif
 {
    RgSchUePucchRecpInfo    *pucchInfo = *pucchInfoRef;
@@ -7853,17 +7756,17 @@ U8                      hqSz;
    S16                     ret;
    TfuUePucchRecpReq       *hqRecpReq;
 #ifdef TFU_UPGRADE
-   U8                      M;
-   U8                      P;
-   U8                      m;
-   U8                      nP;
-   U8                      nPlusOne;
-   U16                     pucchRes;
-   U8                      resIdx;
-   U8                     nCce;
-   U8                      prevHqSize;
+   uint8_t                      M;
+   uint8_t                      P;
+   uint8_t                      m;
+   uint8_t                      nP;
+   uint8_t                      nPlusOne;
+   uint16_t                     pucchRes;
+   uint8_t                      resIdx;
+   uint8_t                     nCce;
+   uint8_t                      prevHqSize;
 #else
-   U8                      multCnt;
+   uint8_t                      multCnt;
 #endif
 #ifdef LTEMAC_SPS
    Bool                    isFirstFdbk = FALSE;
@@ -7876,7 +7779,7 @@ U8                      hqSz;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to "
             "Allocate TfuUeRecpReqInfo for cell RNTI:%d",rnti);
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
       alloc = TRUE;
 #ifdef TFU_ALLOC_EVENT_NO_INIT
@@ -7891,11 +7794,11 @@ U8                      hqSz;
          RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to "
             "Allocate TfuUeRecpReqInfo for cell RNTI:%d",rnti);
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
-         RETVALUE(ret);
+         return ret;
       }
-      cmMemset((U8 *)pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
+      memset(pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(uint16_t)*TFU_MAX_HQ_RES);
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-      cmMemset((U8 *)&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+      memset(&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
 #endif
       pucchInfo->pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
       pucchInfo->pucchRecpInfo->rnti = rnti;
@@ -7956,8 +7859,7 @@ U8                      hqSz;
                     because of kworks*/
                    RGSCHDBGERRNEW(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx),
                             "ANInfo should not be NULL for cellId=%d \n", cellCb->cellId));
-                   RETVALUE(RFAILED);
-
+                   return RFAILED;
                 }
 #endif
              }
@@ -7966,7 +7868,7 @@ U8                      hqSz;
        {/* This needs to be revisited while
            adding support for PUCCH format 3 */
           RGSCHDBGERRNEW(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx),"Invalid Pucch format configured.."));
-          RETVALUE(RFAILED);
+          return RFAILED;
        }
     }
     else
@@ -8099,7 +8001,7 @@ U8                      hqSz;
           if((elemIdx != noFdbks) && alloc)
           {
              cmHashListInsert(&cellCb->ueTfuPendLst, (PTR) pucchInfo,
-                   (U8 *)&rnti, (U16) sizeof(rnti));
+                   (uint8_t *)&rnti, (uint16_t) sizeof(rnti));
              alloc = FALSE;
           }
           else
@@ -8118,7 +8020,7 @@ U8                      hqSz;
 
    *pucchInfoRef = pucchInfo;
    *allocRef     = alloc;
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
@@ -8161,9 +8063,6 @@ RgSchErrInfo         *err;
    Inst              inst = cell->instIdx;
    S16               ret;
 
-   TRC2(rgSCHTomUtlProcDlSfAtCrc);
-
-
    cntrlInfo->numDlActvUes = 0;
    cmLListInit(&cntrlInfo->phichLst);
    cmLListInit(&cntrlInfo->dlPdcchLst);
@@ -8183,7 +8082,7 @@ RgSchErrInfo         *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send PHICH info for "
             "cell");
       RGSCH_FREE_MEM(cntrlInfo);
-      RETVALUE(ret);
+      return ret;
    }
 
    /* Fill UL Pdcch */
@@ -8192,7 +8091,7 @@ RgSchErrInfo         *err;
       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send PDCCH info for "
             "cell");
       RGSCH_FREE_MEM(cntrlInfo);
-      RETVALUE(ret);
+      return ret;
    }
    
 #ifdef EMTC_ENABLE
@@ -8219,8 +8118,7 @@ RgSchErrInfo         *err;
    {
       RGSCH_FREE_MEM(cntrlInfo);
    }
-
-   RETVALUE(ROK);
+   return ROK;
 } /* end of */ 
 #endif /* #ifdef RG_ULSCHED_AT_CRC*/
 
@@ -8246,13 +8144,11 @@ RgSchCellCb          *cell;
 {
    RgrTtiIndInfo     *rgrTtiInd;
    
-   TRC2(rgSCHTomUtlSendSfnTick);
-
    /* TTI to be sent to RRM only once per system frame */
    /* Added support for period = 0 to disable tick to RRM */
    if ((cell->rrmTtiIndPrd != 0) && 
          ((cell->crntTime.sfn % cell->rrmTtiIndPrd) == 0) && 
-         (cell->crntTime.subframe == 0))
+         (cell->crntTime.slot == 0))
    {
       /* Allocate a TTI indication structure and send to RRM over RGR interface */
       if (rgSCHUtlAllocSBuf (cell->instIdx,
@@ -8261,10 +8157,10 @@ RgSchCellCb          *cell;
          RGSCHDBGERRNEW(cell->instIdx,(rgSchPBuf(cell->instIdx),
                   "Mem alloc failed for RGR TTI ind, cellId (%d))\n", 
                   cell->cellId));
-         RETVOID;
+         return;
       }
       rgrTtiInd->cellId = cell->cellId;
-      rgrTtiInd->hSfn = cell->crntTime.hSfn;
+      //rgrTtiInd->hSfn = cell->crntTime.hSfn;
       rgrTtiInd->sfn    = cell->crntTime.sfn;
 
       if (rgSCHUtlRgrTtiInd (cell, rgrTtiInd) != ROK)
@@ -8274,10 +8170,10 @@ RgSchCellCb          *cell;
                   cell->cellId));
          rgSCHUtlFreeSBuf(cell->instIdx, (Data**)&rgrTtiInd,
                sizeof(RgrTtiIndInfo));
-         RETVOID;
+         return;
       }
    }
-   RETVOID;
+   return;
 }
 #endif
 
@@ -8290,8 +8186,9 @@ RgSchCellCb          *cell;
  *     Function: rgSCHDynTDDMrkCrntSfIdx 
  *     Purpose:  update the dyn tdd sunframe index
  *  @param[in]  Inst   schInst
- *  @RETVALUE   None
+ *  @return    None
  */
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHDynTDDMrkCrntSfIdx
 (
@@ -8304,7 +8201,6 @@ Inst   schInst;
 {
    RgSchDynTddCb  *rgSchDynTddInfo = &(rgSchCb[schInst].rgSchDynTdd);
 
-   TRC2(rgSCHDynTDDMrkCrntSfIdx)
 
        RG_SCH_DYN_TDD_MARKTYPE(rgSchDynTddInfo, rgSchDynTddInfo->crntDTddSfIdx, 
                              RG_SCH_DYNTDD_NOTDEF);
@@ -8313,9 +8209,9 @@ Inst   schInst;
 
    //printf("Initializing Index %d \n", rgSchDynTddInfo->crntDTddSfIdx);
 
-   RETVOID;
+   return;
 }
-
+#endif
 #endif
 /** @brief This function fills the TTI timinig info for each cell  
  *
@@ -8325,41 +8221,40 @@ Inst   schInst;
  *
  * @param  [in]  TfuTtiIndInfo  *ttiInd
  * @param  [in]  Inst           schInst
- * @param  [out] U8             *nCell
+ * @param  [out] uint8_t             *nCell
  * @param  [out] RgSchCellCb    *cell[]
  *
  * Returns: Void  
  *  
  */
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSchTomFillCellTtiInfo
 (
 TfuTtiIndInfo      *ttiInd,
 Inst               schInst,
-U8                 *nCell,
+uint8_t                 *nCell,
 RgSchCellCb        *cells[]
 )
 #else
 PRIVATE Void rgSchTomFillCellTtiInfo (ttiInd, schInst, nCell, cells)
 TfuTtiIndInfo      *ttiInd;
 Inst               schInst;
-U8                 *nCell;
+uint8_t                 *nCell;
 RgSchCellCb        *cells[];
 #endif
 {
-   U8             i = 0;
-   U8             strtCellId;
+   uint8_t             i = 0;
+   uint8_t             strtCellId;
    TfuTtiCellInfo *cellInfo;
    RgSchCellCb    *cell; 
-   U32            Idx1;
+   uint32_t            Idx1;
  
    CmLteTimingInfo frm;
      
-   TRC2 (rgSchTomFillCellTtiInfo);
-
    if (CM_LTE_MAX_CELLS < ttiInd->numCells)
    {
-      RETVOID;
+      return;
    }
        
 #ifdef RG_5GTF
@@ -8370,7 +8265,7 @@ RgSchCellCb        *cells[];
    {
       cellInfo   = &ttiInd->cells[i];
       strtCellId = rgSchCb[schInst].genCfg.startCellId;
-      Idx1 = (U8)((cellInfo->cellId - strtCellId)&(CM_LTE_MAX_CELLS-1));
+      Idx1 = (uint8_t)((cellInfo->cellId - strtCellId)&(CM_LTE_MAX_CELLS-1));
       cell = rgSchCb[schInst].cells[Idx1];
       /* Validate the cell */
       if (cell == NULLP) 
@@ -8403,9 +8298,9 @@ RgSchCellCb        *cells[];
       {
          cell->stopDlSch = TRUE;
       }
-      if((0 == (cellInfo->timingInfo.sfn % 30)) && (0 == cellInfo->timingInfo.subframe))
+      if((0 == (cellInfo->timingInfo.sfn % 30)) && (0 == cellInfo->timingInfo.slot))
       {
-        //printf("5GTF_CHECK rgSCHTOMTtiInd (%d : %d)\n", cellInfo->timingInfo.sfn, cellInfo->timingInfo.subframe);
+        //printf("5GTF_CHECK rgSCHTOMTtiInd (%d : %d)\n", cellInfo->timingInfo.sfn, cellInfo->timingInfo.slot);
       }
 #ifndef EMTC_ENABLE 
       RGSCHCPYTIMEINFO(cellInfo->timingInfo, cell->crntTime);
@@ -8448,13 +8343,13 @@ RgSchCellCb        *cells[];
       cell->totalTime++;
 #endif
 #ifdef LTE_TDD
-      U8 idx = (cell->crntTime.subframe + RG_SCH_CMN_DL_DELTA) %
+      uint8_t idx = (cell->crntTime.slot + RG_SCH_CMN_DL_DELTA) %
          RGSCH_NUM_SUB_FRAMES_5G;       
       
       cell->isDlDataAllwd = RG_SCH_CMN_CHK_DL_DATA_ALLOWED(cell, idx);
       
       /*ccpu00130639 -ADD - used in UL HARQ proc id calculation*/
-      if((cell->crntTime.sfn == 0) && (cell->crntTime.subframe == 0))
+      if((cell->crntTime.sfn == 0) && (cell->crntTime.slot == 0))
       {
          /* sfn Cycle used for Tdd UL Harq Proc Determination. 
             This sfn Cycle will have values from 0 to numUl Harq-1. */
@@ -8470,6 +8365,36 @@ RgSchCellCb        *cells[];
 #endif
    } 
 }
+#endif
+void schFillCrntTime(
+   SlotIndInfo slotInd,
+   Inst        schInst)
+{
+   uint8_t cellCount = 0;
+   for(cellCount = 0; cellCount < CM_LTE_MAX_CELLS; cellCount++)
+   {
+      RgSchCellCb    *cell;
+      cell = rgSchCb[schInst].cells[cellCount];
+
+      RGSCHCPYTIMEINFO(slotInd, cell->crntTime);
+
+      RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, cell->hiDci0Time, 
+                           TFU_ULCNTRL_DLDELTA);
+      RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, cell->dlDciTime, 
+                           TFU_DLCNTRL_DLDELTA);
+      RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, cell->rcpReqTime, 
+                           TFU_RECPREQ_DLDELTA);
+      RGSCHDECRFRMCRNTTIME(cell->crntTime, cell->hqRlsTime, 
+                           TFU_HQFBKIND_ULDELTA); 
+      RGSCHDECRFRMCRNTTIME(cell->crntTime, cell->dlSfRlsTime, 
+                           RGSCH_RLS_SF_IDX);
+
+      RGSCH_INCR_SUB_FRAME(cell->crntTime, RG_SCH_CMN_DL_DELTA);
+
+      RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
+      cellSch->dl.time = cell->crntTime; 
+   }
+}
 
 /** @brief This function prepares the TTI for scheduling and 
  *         invokes the Common channel scheduler. Uplink scheduler
@@ -8495,8 +8420,6 @@ RgSchCellCb        *cell;
 #endif
 {
 
-   TRC2(rgSchTomTtiUlAndDlCmnChSch);
-
    cell->rlsHqArr[cell->crntHqIdx].numUes = 0;
    cell->crntHqIdx++;
    cell->crntHqIdx  = cell->crntHqIdx % RGSCH_NUM_SUB_FRAMES;
@@ -8511,8 +8434,8 @@ RgSchCellCb        *cell;
     */
 #ifndef RG_ULSCHED_AT_CRC
    {
-      U8   Mval = 1;
-      U8   idx; /* Index into Uplink Sf array */ 
+      uint8_t   Mval = 1;
+      uint8_t   idx; /* Index into Uplink Sf array */ 
 #ifdef LTE_TDD      
       Mval = rgSchTddPhichMValTbl[cell->ulDlCfgIdx]
                                  [cell->hiDci0Time.subframe];
@@ -8548,7 +8471,7 @@ RgSchCellCb        *cell;
    /* Perform DL scheduling  for Common channels */
    rgSCHCmnDlCommonChSch(cell);
       
-   RETVOID;
+   return;
 }
 
 /** @brief This function invokes the Non critical procedures like measurements,
@@ -8573,10 +8496,8 @@ PRIVATE Void rgSchTomTtiMiscFunctions (cell)
 RgSchCellCb        *cell;
 #endif
 {
-   U8   suId = cell->tfuSap->sapCfg.suId;
+   uint8_t   suId = cell->tfuSap->sapCfg.suId;
     
-   TRC2(rgSchTomTtiMiscFunctions);
-
    /* Invoke RAM Tti Handler  */
    rgSCHRamTtiHndlr(cell);
 
@@ -8597,7 +8518,7 @@ RgSchCellCb        *cell;
                     (cell->lteAdvCb.absCfg.absLoadPeriodicity))
    {
       RgrLoadInfIndInfo *rgrLoadInf;
-      U8                 idx;
+      uint8_t                 idx;
 
       cell->lteAdvCb.absLoadTtiCnt++;
       if(cell->lteAdvCb.absLoadTtiCnt >= cell->lteAdvCb.absCfg.absLoadPeriodicity)
@@ -8608,7 +8529,7 @@ RgSchCellCb        *cell;
          {
             RGSCHDBGERRNEW(cell->instIdx,(rgSchPBuf(cell->instIdx),"Could not "
                      "allocate memory for sending LoadInfo\n"));
-            RETVOID;
+            return;
          }
          cell->lteAdvCb.absLoadTtiCnt = 0;
          rgrLoadInf->cellId = cell->cellId;
@@ -8642,7 +8563,7 @@ RgSchCellCb        *cell;
 #endif   
 
    /* LTE_ADV_FLAG_REMOVED_END */
-   RETVOID;
+   return;
 }
 
 
@@ -8667,14 +8588,13 @@ PRIVATE Void rgSchTomTtiDlSch (cell)
 RgSchCellCb        *cell;
 #endif
 {
-   TRC2(rgSchTomTtiDlSch);
 
    if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE))
    {
       rgSCHCmnDlSch(cell);
    }
 
-   RETVOID;
+   return;
 }
 
 /** @brief This function invokes Consolidates the allocations
@@ -8704,8 +8624,6 @@ RgSchCellCb        *cell;
    
    dlSf = rgSCHUtlSubFrmGet(cell, cellSch->dl.time);
    
-   TRC2(rgSchTomTtiCnsldtSfAlloc);
-
    /* Prepare Subframe allocation info and send to MAC */
    rgSCHCmnCnsldtSfAlloc(cell); 
    
@@ -8714,7 +8632,7 @@ RgSchCellCb        *cell;
       
    rgSCHTomUtlProcTA(cell);
   
-   RETVOID;
+   return;
 }
 
 /** @brief This function prepares the DL and UL Config requests
@@ -8745,8 +8663,6 @@ RgTfuCntrlReqInfo  *cntrlInfo;
    RgSchDlSf *ulSf = rgSCHUtlSubFrmGet (cell, cell->hiDci0Time);
    RgSchErrInfo    err;
 
-   TRC2(rgSchTomTtiL1DlAndUlCfg);
-
    rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, &err);
    /* Mark this frame as sent */
    dlSf->txDone = TRUE;
@@ -8761,7 +8677,7 @@ RgTfuCntrlReqInfo  *cntrlInfo;
    rgSCHTomUtlProcUlSf (cell, &err);
 #endif   
    
-   RETVOID;
+   return;
 }
 #ifdef LTE_TDD
 /** @brief This function prepares does the Downlink subframe re-init and 
@@ -8786,7 +8702,6 @@ PRIVATE Void rgSchTomUtlTddRlsSfAndHarq (cell)
 RgSchCellCb        *cell;
 #endif
 {
-   TRC2(rgSchTomUtlTddRlsSfAndHarq); 
 
    /* ccpu00132341-MOD- rgSchTddRlsDlSubfrmTbl is dependent on DELTA(=2).
     * Instead rgSchTddDlAscSetIdxKTbl can be used as the K set gives proper
@@ -8802,7 +8717,7 @@ RgSchCellCb        *cell;
       rgSCHDhmTddRlsSubFrm(cell, cell->hqRlsTime);
       rgSCHDhmRlsDlsfHqProc(cell, cell->hqRlsTime);
    }
-   RETVOID;
+   return;
 }
 
 /** @brief This function processes the UL subframe and fills TFU reception
@@ -8829,8 +8744,6 @@ RgSchCellCb        *cell;
 {
    RgSchErrInfo    err;
    
-   TRC2(rgSCHTomUtlProcTddUlSf); 
-
    if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx]
          [cell->rcpReqTime.subframe] == RG_SCH_TDD_UL_SUBFRAME)
    {
@@ -8855,7 +8768,7 @@ RgSchCellCb        *cell;
       }
    }
 
-   RETVOID;
+   return;
 }
 #endif