L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]
[o-du/l2.git] / src / 5gnrsch / rg_sch_dhm.c
index 671574f..377e6b1 100755 (executable)
@@ -60,20 +60,20 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_sch_cmn.x"
 
 #ifdef RGSCH_SPS_STATS
-extern U32 rgNumSPSSchedDropMaxRetx;
-extern U32 rgNumActDtx;
+uint32_t rgNumSPSSchedDropMaxRetx;
+uint32_t rgNumActDtx;
 #endif
-PUBLIC U32  nackSf[10];
+uint32_t  nackSf[10];
 
 
 
 #ifdef MAC_SCH_STATS
-PUBLIC RgSchNackAckStats hqFailStats;
-PUBLIC RgSchHqRetxStats  hqRetxStats;
+RgSchNackAckStats hqFailStats;
+RgSchHqRetxStats  hqRetxStats;
 #endif /* MAC_SCH_STATS */
 //Chandan Stats Collection
 #ifdef DLHQ_STATS
-U32 statsCnt;
+uint32_t statsCnt;
 RgSchDlHqStats dlHqStats[10000] = {{0,0,0}};
 #endif
 
@@ -84,7 +84,7 @@ RgSchDlHqStats dlHqStats[10000] = {{0,0,0}};
  * The below table is based on Table 7.3-X from 36.213 and 
  * table 79 from FAPIv1.1 doc
  */
-U8 rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE] = {
+uint8_t rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE] = {
 {TFU_HQFDB_ACK,     TFU_HQFDB_NACK,    TFU_HQFDB_NACK},
 {TFU_HQFDB_NACK,    TFU_HQFDB_ACK,     TFU_HQFDB_NACK},
 {TFU_HQFDB_NACK,    TFU_HQFDB_NACK,    TFU_HQFDB_ACK},
@@ -101,48 +101,48 @@ U8 rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE]
  
 /* local externs */
 
-PRIVATE Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, U8 tbIdx, U8 fdbk,
+static Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, uint8_t tbIdx, uint8_t fdbk,
             Bool maxHqRetxReached));
-PUBLIC void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP));
+void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP));
 #ifndef LTE_TDD
-PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep ARGS((
+static S16 rgSCHDhmProcHqFdbkAckNackRep ARGS((
 RgSchDlHqProcCb      *hqP,
 RgSchDlSf            *sf,
-U8                   tbCnt,
-U8                   *isAck
+uint8_t                   tbCnt,
+uint8_t                   *isAck
 ));
 #endif
 #ifdef DL_LA
-PRIVATE S16 rgSCHDhmUpdateAckNackHistory ARGS((
+static S16 rgSCHDhmUpdateAckNackHistory ARGS((
         RgSchCellCb             *cell,
         RgSchUeCb               *ueCb,
-        U8                      hqfdbk,
-        U8                      tbCnt
+        uint8_t                      hqfdbk,
+        uint8_t                      tbCnt
         ));
 #endif
 #ifdef LTE_TDD
-PRIVATE Void rgSCHDhmPrcSplBundlFdbk ARGS((
+static Void rgSCHDhmPrcSplBundlFdbk ARGS((
         RgSchCellCb  *cell,
         TfuHqInfo    *fdbk,
-        U8            hqCnt
+        uint8_t            hqCnt
         ));
 #ifdef LTE_ADV
-PRIVATE Void rgSchGetHqFdbkPosForM1 ARGS((
+static Void rgSchGetHqFdbkPosForM1 ARGS((
         RgSchUeCb            *ue,
         RgSchDlHqProcCb      *hqP,
-        U8                  *isAck, 
+        uint8_t                  *isAck, 
         RgTfuHqInfo          *fdbk,
-        U8                   tbIdx,
+        uint8_t                   tbIdx,
         RgSchTddANInfo       *anInfo
         ));
-PRIVATE Void rgSchGetHqFdbkPosForM234 ARGS((
+static Void rgSchGetHqFdbkPosForM234 ARGS((
         RgSchUeCb            *ue,
         RgSchDlHqProcCb      *hqP,
-        U8                   *isAck, 
+        uint8_t                   *isAck, 
         RgTfuHqInfo          *fdbk,
-        U8                   tbIdx,
+        uint8_t                   tbIdx,
         RgSchTddANInfo       *anInfo,
-        U8                    M,
+        uint8_t                    M,
         CmLteTimingInfo      timeInfo
         ));
 #endif/*LTE_ADV*/
@@ -150,39 +150,39 @@ PRIVATE Void rgSchGetHqFdbkPosForM234 ARGS((
 
 /* Freeing up the HARQ proc blocked for
  * indefinite time in case of Retx */
-PUBLIC S16 rgSCHDhmDlRetxAllocFail ARGS((
+S16 rgSCHDhmDlRetxAllocFail ARGS((
 RgSchUeCb        *ue, 
 RgSchDlHqProcCb  *proc
 ));
 
 #ifdef EMTC_ENABLE
-EXTERN S16 rgSCHDhmEmtcRgrCellCfg ARGS((
+S16 rgSCHDhmEmtcRgrCellCfg ARGS((
 RgSchCellCb   *cell
 ));
 #endif
 
 #ifdef CA_DBG
-extern U32 gPCellTb1AckCount,gPCellTb2AckCount,gPCellTb1NackCount,gPCellTb2NackCount;
-extern U32 gSCellSchedCount,gPrimarySchedCount;
-extern U32 gSCellTb1AckCount,gSCellTb2AckCount,gSCellTb1NackCount,gSCellTb2NackCount;
-extern U32 gPCellTb1DtxCount, gPCellTb2DtxCount, gSCellTb1DtxCount, gSCellTb2DtxCount;
-extern U32 gHqFdbkCount;
+uint32_t gPCellTb1AckCount,gPCellTb2AckCount,gPCellTb1NackCount,gPCellTb2NackCount;
+uint32_t gSCellSchedCount,gPrimarySchedCount;
+uint32_t gSCellTb1AckCount,gSCellTb2AckCount,gSCellTb1NackCount,gSCellTb2NackCount;
+uint32_t gPCellTb1DtxCount, gPCellTb2DtxCount, gSCellTb1DtxCount, gSCellTb2DtxCount;
+uint32_t gHqFdbkCount;
 
 #endif
 #ifdef EMTC_ENABLE
-EXTERN Void rgSCHEmtcUtlDlHqPTbRmvFrmTx
+Void rgSCHEmtcUtlDlHqPTbRmvFrmTx
 (
 RgSchEmtcDlSf               *subFrm,
 RgSchDlHqProcCb            *hqP,
-U8                         tbIdx,
+uint8_t                         tbIdx,
 Bool                       isRepeting
 );
-EXTERN RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet
+RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet
 (
 RgSchCellCb            *cell,
 CmLteTimingInfo        frm
 );
-EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP));
+Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP));
 #endif
 /* forward references */
 
@@ -204,18 +204,17 @@ EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP))
  **/
 /*MS_WORKAROUND for ccpu00122893*/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqEntReset
+Void rgSCHDhmHqEntReset
 (
    RgSchDlHqEnt      *hqE
 )
 #else
-PUBLIC Void rgSCHDhmHqEntReset(hqE)
+Void rgSCHDhmHqEntReset(hqE)
    RgSchDlHqEnt      *hqE;
 #endif
 {
    RgSchDlHqProcCb   *hqP;
-   U8                i;
-   TRC2(rgSCHDhmHqEntReset)
+   uint8_t                i;
    cmLListInit(&hqE->inUse);     
    cmLListInit(&hqE->free);      
    for (i=0; i < hqE->numHqPrcs; i++)
@@ -257,7 +256,7 @@ PUBLIC Void rgSCHDhmHqEntReset(hqE)
       rgSCHLaaResetDlHqProcCb(hqP);
 #endif
    }
-   RETVOID;
+   return;
 } /* rgSCHDhmHqEntReset */
 
 /**
@@ -276,18 +275,17 @@ PUBLIC Void rgSCHDhmHqEntReset(hqE)
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmAssgnUeHqEntFrmRaCb 
+Void rgSCHDhmAssgnUeHqEntFrmRaCb 
 (
 RgSchUeCb       *ue,
 RgSchRaCb       *raCb
 )
 #else
-PUBLIC Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb)
+Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb)
 RgSchUeCb       *ue;
 RgSchRaCb       *raCb;
 #endif
 {
-   TRC2(rgSCHDhmAssgnUeHqEntFrmRaCb)
 
    ue->cellInfo[0]->hqEnt = raCb->dlHqE;
    ue->cellInfo[0]->hqEnt->ue = ue;
@@ -299,7 +297,7 @@ RgSchRaCb       *raCb;
    ue->ul.ulInactvMask &= ~(RG_HQENT_INACTIVE);
    rgSCHCmnDlInitHqEnt(ue->cell, ue->cellInfo[0]->hqEnt);
    
-   RETVOID;
+   return;
 }
 
 /**
@@ -318,22 +316,21 @@ RgSchRaCb       *raCb;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmDelHqEnt 
+Void rgSCHDhmDelHqEnt 
 (
 RgSchCellCb       *cell,
 RgSchDlHqEnt      **hqE
 )
 #else
-PUBLIC Void rgSCHDhmDelHqEnt(cell, hqE)
+Void rgSCHDhmDelHqEnt(cell, hqE)
 RgSchCellCb       *cell;
 RgSchDlHqEnt      **hqE;
 #endif
 {
-   TRC2(rgSCHDhmDelHqEnt)
 
    if (!(*hqE))
    {
-      RETVOID;    
+      return;    
    }
 
    rgSCHCmnDlDeInitHqEnt(cell, *hqE);
@@ -341,24 +338,22 @@ RgSchDlHqEnt      **hqE;
    rgSCHUtlFreeSBuf(cell->instIdx, (Data **)hqE, 
        sizeof(RgSchDlHqEnt));
    
-   RETVOID;
+   return;
 }
 
 #ifdef ANSI
-PUBLIC RgSchDlHqEnt *rgSCHDhmHqEntInit
+RgSchDlHqEnt *rgSCHDhmHqEntInit
 (
 RgSchCellCb           *cell
 )
 #else
-PUBLIC RgSchDlHqEnt *rgSCHDhmHqEntInit(cell)
+RgSchDlHqEnt *rgSCHDhmHqEntInit(cell)
 RgSchCellCb           *cell;
 #endif
 {
    RgSchDlHqEnt      *hqE;
    Inst              inst = cell->instIdx;
 
-   TRC2(rgSCHDhmHqEntInit)
-
    /* Init the HARQ data structure */
    if (rgSCHUtlAllocSBuf(inst, (Data **)&hqE, sizeof(RgSchDlHqEnt)) != ROK)
    {
@@ -423,7 +418,7 @@ RgSchCellCb           *cell;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetAvlHqProc
+S16 rgSCHDhmGetAvlHqProc
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
@@ -431,7 +426,7 @@ CmLteTimingInfo         timingInfo,
 RgSchDlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP)
+S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP)
 RgSchCellCb           *cell;
 RgSchUeCb               *ue;
 CmLteTimingInfo         timingInfo;
@@ -441,7 +436,6 @@ RgSchDlHqProcCb         **hqP;
    RgSchDlHqEnt         *hqE = NULLP;
    RgSchDlHqProcCb   *tmpHqProc;
    CmLList           *tmp;
-   TRC2(rgSCHDhmGetAvlHqProc);
 
    hqE      = RG_SCH_CMN_GET_UE_HQE(ue, cell);
  
@@ -543,34 +537,33 @@ RgSchDlHqProcCb         **hqP;
  *  @param[in]  RgSchDlHqEnt     *hqE
  *  @param[in]  CmLteTimingInfo  timingInfo
  *  @param[out] RgDlHqProc       *hqP
- *  @param[in]  U8               tbIdx
+ *  @param[in]  uint8_t               tbIdx
  *  @return  Void      
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqTbRetx
+Void rgSCHDhmHqTbRetx
 (
 RgSchDlHqEnt            *hqE,
 CmLteTimingInfo         timingInfo,
 RgSchDlHqProcCb         *hqP,
-U8                      tbIdx
+uint8_t                      tbIdx
 )
 #else
-PUBLIC Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx)
+Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx)
 RgSchDlHqEnt            *hqE;
 CmLteTimingInfo         timingInfo;
 RgSchDlHqProcCb         *hqP;
-U8                      tbIdx;
+uint8_t                      tbIdx;
 #endif
 {
-   U8 othrTbIdx = tbIdx ^ 1;
-   TRC2(rgSCHDhmHqTbRetx)
+   uint8_t othrTbIdx = tbIdx ^ 1;
 
    hqP->tbInfo[tbIdx].timingInfo = timingInfo;
 
    if (hqE->msg4Proc == hqP)
    {
-       RETVOID;
+       return;
    }
    /* fix for ccpu00118633 No Hq proc Avl end*/
       
@@ -588,7 +581,7 @@ U8                      tbIdx;
 
     hqP->tbInfo[tbIdx].cntrRetxAllocFail = 0;
 
-   RETVOID;
+   return;
 } /* rgSCHDhmHqTbRetx */
 
 /**
@@ -616,16 +609,15 @@ U8                      tbIdx;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc
+RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc
 (
 RgSchDlHqEnt            *hqE
 )
 #else
-PUBLIC RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE)
+RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE)
 RgSchDlHqEnt            *hqE;
 #endif
 {
-   TRC2(rgSCHDhmLastSchedHqProc);
    /* GRPPWR_CNTRL Fix: UE context will not hold a valid hqE,
     * until RACH procedure is completed */
    if ((hqE == NULLP) || (hqE->inUse.last == NULLP))
@@ -662,14 +654,14 @@ RgSchDlHqEnt            *hqE;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetCcchSduHqProc
+S16 rgSCHDhmGetCcchSduHqProc
 (
 RgSchUeCb               *ueCb,
 CmLteTimingInfo         timingInfo,
 RgSchDlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP)
+S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP)
 RgSchUeCb               *ueCb;
 CmLteTimingInfo         timingInfo;
 RgSchDlHqProcCb         **hqP;
@@ -679,8 +671,6 @@ RgSchDlHqProcCb         **hqP;
    CmLList              *tmp;
    RgSchDlHqEnt         *hqE;
 
-   TRC2(rgSCHDhmGetCcchSduHqProc)
-
    hqE = ueCb->cellInfo[0]->hqEnt;
    CM_LLIST_FIRST_NODE(&(hqE->free), tmp);
    if (NULLP == tmp)
@@ -736,13 +726,13 @@ RgSchDlHqProcCb         **hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetMsg4HqProc
+S16 rgSCHDhmGetMsg4HqProc
 (
 RgSchRaCb               *raCb,
 CmLteTimingInfo         timingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo)
+S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo)
 RgSchRaCb               *raCb;
 CmLteTimingInfo         timingInfo;
 #endif
@@ -751,8 +741,6 @@ CmLteTimingInfo         timingInfo;
    CmLList              *tmp;
    RgSchDlHqEnt         *hqE;
 
-   TRC2(rgSCHDhmGetMsg4HqProc)
-
    hqE = raCb->dlHqE;
    CM_LLIST_FIRST_NODE(&(hqE->free), tmp);
    if (NULLP == tmp)
@@ -786,38 +774,36 @@ CmLteTimingInfo         timingInfo;
  *     Invoked by: scheduler and HARQ processing
  *     
  *  @param[in]  RgDlHqProc    *hqP
- *  @param[in]  U8            tbIdx
+ *  @param[in]  uint8_t            tbIdx
  *  @param[in]  Bool          togNdi 
  *  @return  Void      
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRlsHqpTb
+Void rgSCHDhmRlsHqpTb
 (
 RgSchDlHqProcCb         *hqP,
-U8                      tbIdx,
+uint8_t                      tbIdx,
 Bool                    togNdi
 ) 
 #else
-PUBLIC Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) 
+Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) 
 RgSchDlHqProcCb         *hqP;
-U8                      tbIdx;
+uint8_t                      tbIdx;
 Bool                    togNdi;
 #endif
 {
    RgSchDlHqEnt         *hqE;
-   U8                   othrTbIdx = tbIdx ^ 1;
+   uint8_t                   othrTbIdx = tbIdx ^ 1;
 #ifdef LTEMAC_SPS
    RgSchCmnDlHqProc        *cmnHqDl;
 #endif
    /* L2_COUNTERS */
 #ifdef LTE_L2_MEAS
    RgSchDlLcCb*         lcCb = NULLP;
-   U8                   numLch = 0;
+   uint8_t                   numLch = 0;
 #endif
 
-   TRC2(rgSCHDhmRlsHqpTb)
-
    /* Reset all tbInfo values */
 
    hqE = hqP->hqE;
@@ -828,11 +814,11 @@ Bool                    togNdi;
       RgSchUeCb      *ueCb  = hqP->hqE->ue;
       RgSchCmnUe     *cmnUe = (RgSchCmnUe*)ueCb->sch;
       RgSchCmnDlUe   *dlUe  = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/
-      U8             cqi    = dlUe->mimoInfo.cwInfo[0].cqi;
+      uint8_t             cqi    = dlUe->mimoInfo.cwInfo[0].cqi;
       /* to get retransmission, decreasing transmission counter */
-      U16            numDlRetx = hqP->tbInfo[0].txCntr-1; 
-      U8             tbs       = dlUe->mimoInfo.cwInfo[0].iTbs[0];
-      static U32 retxCnt1      = 0;
+      uint16_t            numDlRetx = hqP->tbInfo[0].txCntr-1; 
+      uint8_t             tbs       = dlUe->mimoInfo.cwInfo[0].iTbs[0];
+      static uint32_t retxCnt1      = 0;
 
       RG_SCH_CMN_DL_TBS_TO_MCS(tbs, \
             hqRetxStats.dlCqiStat[(cqi - 1)].mcs);
@@ -921,7 +907,7 @@ Bool                    togNdi;
       /* Add the proc to the free list */
       //cmLListAdd2Tail(&hqE->free, &hqP->lnk);
       rgSCHDhmHqPAdd2FreeLst(hqP);
-      RETVOID;
+      return;
    }
 #ifdef RGR_V1
    /* MS_WORKAROUND : syed The check (hqE->ccchSduProc != NULLP)
@@ -952,7 +938,7 @@ Bool                    togNdi;
       /* Add the proc to the free list */
       //cmLListAdd2Tail(&hqE->free, &hqP->lnk);
       rgSCHDhmHqPAdd2FreeLst(hqP);
-      RETVOID;
+      return;
    }
 #endif
       
@@ -1013,7 +999,7 @@ rgEmtcsetNullSubFrm(hqP);
    
    hqP->tbInfo[tbIdx].cntrRetxAllocFail = 0;
 
-   RETVOID;
+   return;
 } /* rgSCHDhmRlsHqpTb */
 
 /**
@@ -1033,18 +1019,16 @@ rgEmtcsetNullSubFrm(hqP);
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRlsHqProc
+Void rgSCHDhmRlsHqProc
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmRlsHqProc(hqP)
+Void rgSCHDhmRlsHqProc(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
 
-   TRC2(rgSCHDhmRlsHqProc)
-
 
 #ifdef MAC_SCH_STATS
     /* THIS FUNCTION IS NOT CALLED */
@@ -1053,10 +1037,10 @@ RgSchDlHqProcCb         *hqP;
       RgSchUeCb      *ueCb  = hqP->hqE->ue;
       RgSchCmnUe     *cmnUe = (RgSchCmnUe*)ueCb->sch;
       RgSchCmnDlUe   *dlUe  = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/
-      U8             cqi    = dlUe->mimoInfo.cwInfo[0].cqi;
+      uint8_t             cqi    = dlUe->mimoInfo.cwInfo[0].cqi;
       /* to get retransmission, decreasing transmission counter */
-      U16            numDlRetx = hqP->tbInfo[0].txCntr-1; 
-      U8             tbs       = dlUe->mimoInfo.cwInfo[0].iTbs[0];
+      uint16_t            numDlRetx = hqP->tbInfo[0].txCntr-1; 
+      uint8_t             tbs       = dlUe->mimoInfo.cwInfo[0].iTbs[0];
 
       RG_SCH_CMN_DL_TBS_TO_MCS(tbs, hqRetxStats.dlCqiStat[(cqi - 1)].mcs);
 
@@ -1093,7 +1077,7 @@ rgEmtcsetNullSubFrm(hqP);
    hqP->tbCnt = 0;
 #endif
 
-   RETVOID;
+   return;
 } /* rgSCHDhmRlsHqProc */
 
 #ifdef LTEMAC_SPS
@@ -1107,7 +1091,7 @@ rgEmtcsetNullSubFrm(hqP);
  *     Invoked by: ROM
  *     
  *  @param[in]  RgSchUeCb     *ue
- *  @param[in]  U8            idx
+ *  @param[in]  uint8_t            idx
  *  @param[in]  RgDlHqProc    **hqP
  *  @return  S16       
  *         -#   ROK     if successful
@@ -1115,23 +1099,22 @@ rgEmtcsetNullSubFrm(hqP);
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmGetHqProcFrmId
+S16 rgSCHDhmGetHqProcFrmId
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
-U8                      idx,
+uint8_t                      idx,
 RgSchDlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP)
+S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP)
 RgSchCellCb           *cell;
 RgSchUeCb               *ue;
-U8                      idx;
+uint8_t                      idx;
 RgSchDlHqProcCb         **hqP;
 #endif
 {
    RgSchDlHqEnt         *hqE;
-   TRC2(rgSCHDhmGetHqProcFrmId)
 
    hqE      = RG_SCH_CMN_GET_UE_HQE(ue, cell);
    /* Pick the proc based on the index provided */
@@ -1154,26 +1137,24 @@ RgSchDlHqProcCb         **hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc
+RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
 CmLteTimingInfo         timingInfo
 )
 #else
-PUBLIC RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo)
+RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo)
 RgSchCellCb           *cell,
 RgSchUeCb               *ue;
 CmLteTimingInfo         timingInfo;
 #endif
 {
    RgSchDlHqEnt         *hqE;
-   U8                    idx;
+   uint8_t                    idx;
    RgSchDlHqProcCb       *hqProc = NULLP;
    CmLList               *tmp = NULLP;
 
-   TRC2(rgSCHDhmSpsDlGetHqProc);
-
    hqE      = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
    CM_LLIST_FIRST_NODE(&(hqE->free), tmp);
@@ -1237,32 +1218,30 @@ CmLteTimingInfo         timingInfo;
  *     feedback indication received.
  *           
  *  @param[in]  RgSchDlHqProcCb   *hqP
- *  @param[in]  U8                tbIdx
- *  @param[in]  U8                fdbk
+ *  @param[in]  uint8_t                tbIdx
+ *  @param[in]  uint8_t                fdbk
  *  @return     Void
  *      -# None.
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHDhmFdbkIndHndlTa
+static Void rgSCHDhmFdbkIndHndlTa
 (
 RgSchDlHqProcCb   *hqP,
-U8                tbIdx,
-U8                fdbk,
+uint8_t                tbIdx,
+uint8_t                fdbk,
 Bool              maxHqRetxReached
 )
 #else
-PRIVATE Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached)
+static Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached)
 RgSchDlHqProcCb   *hqP;
-U8                tbIdx;
-U8                fdbk;
+uint8_t                tbIdx;
+uint8_t                fdbk;
 Bool              maxHqRetxReached;
 #endif
 {
    RgSchUeCb      *ueCb;
    RgSchCellCb    *cell;
 
-   TRC2(rgSCHDhmFdbkIndHndlTa)
-
    ueCb  = hqP->hqE->ue;
    cell  = ueCb->cell;
    switch(fdbk)
@@ -1317,7 +1296,7 @@ Bool              maxHqRetxReached;
          break;
    }
 
-   RETVOID;
+   return;
 } /* rgSCHDhmFdbkIndHndlTa */
 
 /* 3.1 MIMO: TA cmd details at TB level rather than Hq Level */
@@ -1336,26 +1315,24 @@ Bool              maxHqRetxReached;
  *      -# None.
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmSchdTa
+Void rgSCHDhmSchdTa
 (
 RgSchUeCb         *ueCb,
 RgSchDlHqTbCb     *tbInfo
 )
 #else
-PUBLIC Void rgSCHDhmSchdTa(ueCb, tbInfo)
+Void rgSCHDhmSchdTa(ueCb, tbInfo)
 RgSchUeCb         *ueCb;
 RgSchDlHqTbCb     *tbInfo;
 #endif
 {
 
-   TRC2(rgSCHDhmSchdTa)
-
    ueCb->dl.taCb.state = RGSCH_TA_SCHEDULED;
     ueCb->dl.taCb.numRemSf  =  2; 
    tbInfo->schdTa.pres    = PRSNT_NODEF;
    tbInfo->schdTa.val     = ueCb->dl.taCb.ta;
 
-   RETVOID;
+   return;
 } /* rgSCHDhmSchdTa */
 
 #ifdef LTE_TDD
@@ -1372,33 +1349,33 @@ RgSchDlHqTbCb     *tbInfo;
  *  @param[in]  CmLteTimingInfo    timeInfo
  *  @param[in]  Bool               *isMsg4
  *  @param[out] RgSchDlHqProcCb    **hqPrcs
- *  @param[out] U8                 *numTbs
+ *  @param[out] uint8_t                 *numTbs
  *  @param[out] S8                 *tbStrtIdx
- *  @param[out] U8                 *cntHqPrcs
+ *  @param[out] uint8_t                 *cntHqPrcs
  *  @return     S16
  **/
 #ifdef ANSI
-PRIVATE S16 rgSCHDhmHqProcByFdbkTime
+static S16 rgSCHDhmHqProcByFdbkTime
 (
 RgSchDlHqEnt            *hqE,
 CmLteTimingInfo         timeInfo,
 Bool                    *isMsg4,
 RgSchDlHqProcCb         **hqPrcs,
-U8                      *numTbs,
+uint8_t                      *numTbs,
 S8                      *tbStrtIdx,
-U8                      *cntHqPrcs,
+uint8_t                      *cntHqPrcs,
 RgSchCellCb             *cell
 )
 #else
-PRIVATE S16 rgSCHDhmHqProcByFdbkTime(hqE, timeInfo, isMsg4, hqPrcs,
+static S16 rgSCHDhmHqProcByFdbkTime(hqE, timeInfo, isMsg4, hqPrcs,
                                      numTbs, tbStrtIdx, cntHqPrcs)
 RgSchDlHqEnt            *hqE;
 CmLteTimingInfo         timeInfo;
 Bool                    *isMsg4;
 RgSchDlHqProcCb         **hqPrcs;
-U8                      *numTbs;
+uint8_t                      *numTbs;
 S8                      *tbStrtIdx;
-U8                      *cntHqPrcs;
+uint8_t                      *cntHqPrcs;
 RgSchCellCb             *cell;
 #endif
 {
@@ -1406,10 +1383,10 @@ RgSchCellCb             *cell;
    RgSchDlHqProcCb      *hqP;
    CmLteTimingInfo      schdSfTime;
    RgSchTddDlAscSetIdxK ascIdx;
-   U8                   noFdbks;
-   U8                   i;
-   U8                   idx;
-   U8                   dlIdx;
+   uint8_t                   noFdbks;
+   uint8_t                   i;
+   uint8_t                   idx;
+   uint8_t                   dlIdx;
    CmLListCp            *lnk;
    CmLList              *node;
 
@@ -1514,14 +1491,14 @@ RgSchCellCb             *cell;
  *  @param[in]  RgSchDlHqEnt    *hqE
  *  @param[in]  CmLteTimingInfo timeInfo
  *  @param[in]  Bool            *isMsg4
- *  @param[out] U8              *numTbs
+ *  @param[out] uint8_t              *numTbs
  *  @param[out] S8              *tbStrtIdx 
  *  @return     RgSchDlHqProcCb*
  *      -# RgSchDlHqProcCb* 
  *      -# NULLP 
  **/
 #ifdef ANSI
-PUBLIC RgSchDlHqProcCb *rgSCHDhmHqProcByTime
+RgSchDlHqProcCb *rgSCHDhmHqProcByTime
 (
 RgSchDlHqEnt            *hqE,
 CmLteTimingInfo         timeInfo,
@@ -1529,7 +1506,7 @@ Bool                    *isMsg4,
 RgSchDlSf               *sf
 )
 #else
-PUBLIC RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo,
+RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo,
                                               isMsg4,sf)
 RgSchDlHqEnt            *hqE;
 CmLteTimingInfo         timeInfo;
@@ -1562,32 +1539,30 @@ RgSchDlSf               *sf;
  *           
  *  @param[in]  RgSchCellCb             *cell
  *  @param[in]  RgSchDlHqProcCb         *hqP
- *  @param[in]  U8                      tbCnt
+ *  @param[in]  uint8_t                      tbCnt
  *  @param[out] Bool                    *isMaxRetx
  *  @return    Void
  *             -#None.
  *      
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqTbTrnsFail
+Void rgSCHDhmHqTbTrnsFail
 (
 RgSchCellCb             *cell,
 RgSchDlHqProcCb         *hqP,
-U8                      tbCnt,
+uint8_t                      tbCnt,
 Bool                    *isMaxRetx
 )
 #else
-PUBLIC Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx)
+Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx)
 RgSchCellCb             *cell;
 RgSchDlHqProcCb         *hqP;
-U8                      tbCnt;
+uint8_t                      tbCnt;
 Bool                    *isMaxRetx;
 #endif
 {
    RgSchDlHqEnt         *hqE;
-   U8                   maxHqTx;
-
-   TRC2(rgSCHDhmHqTbTrnsFail)
+   uint8_t                   maxHqTx;
 
    hqE = hqP->hqE;
 
@@ -1601,7 +1576,7 @@ Bool                    *isMaxRetx;
                "rgSCHDhmHqTbTrnsFail contRes exp(): tmpCRNTI = %u",
                hqP->hqE->raCb->tmpCrnti);
          rgSCHRamMsg4Done(cell, (RgSchRaCb *)hqP->hqE->raCb);
-         RETVOID;
+         return;
       }
 #endif
       maxHqTx  = cell->dlHqCfg.maxMsg4HqTx;
@@ -1617,8 +1592,8 @@ Bool                    *isMaxRetx;
       RgSchUeCb      *ueCb  = hqE->ue;
       RgSchCmnUe     *cmnUe = (RgSchCmnUe*)ueCb->sch;
       RgSchCmnDlUe   *dlUe  = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/
-      U8             tbs    = dlUe->mimoInfo.cwInfo[0].iTbs[0];
-      static U32 retxCnt    = 0;
+      uint8_t             tbs    = dlUe->mimoInfo.cwInfo[0].iTbs[0];
+      static uint32_t retxCnt    = 0;
 
       {
          ++retxCnt;
@@ -1683,7 +1658,7 @@ Bool                    *isMaxRetx;
                /* CA Dev End*/
                break;
          }
-         RETVOID;
+         return;
       }
       /* extra:check if already removed as part of other TB processing
        * then donot remove from InUse Q */
@@ -1744,10 +1719,10 @@ Bool                    *isMaxRetx;
       *isMaxRetx = TRUE; 
    }
 
-   RETVOID;
+   return;
 } /* rgSCHDhmHqTbTrnsFail */
 
-PUBLIC U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, 
+uint32_t rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, 
                                    {{0, 0}, {0, 0}, {0, 0}, {0, 0}}};
 #ifdef LTE_TDD
 #ifdef LTE_ADV
@@ -1759,29 +1734,29 @@ PUBLIC U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}},
  *           
  *  @param[in]  RgSchUeCb            *ue,
  *  @param[in]  RgSchDlHqProcCb      *hqP,
- *  @param[in]  U8                 *isAck, 
+ *  @param[in]  uint8_t                 *isAck, 
  *  @param[in]  RgTfuHqInfo          *fdbk,
- *  @param[in]  U8                   tbIdx,
+ *  @param[in]  uint8_t                   tbIdx,
  *  @param[in]  RgSchTddANInfo       *anInfo;
- *  @return     RETVOID
+ *  @return     void
  **/
 #ifdef ANSI
-PRIVATE Void rgSchGetHqFdbkPosForM1
+static Void rgSchGetHqFdbkPosForM1
 (
  RgSchUeCb            *ue,
  RgSchDlHqProcCb      *hqP,
U8                  *isAck, 
uint8_t                  *isAck, 
  RgTfuHqInfo          *fdbk,
U8                   tbIdx,
uint8_t                   tbIdx,
  RgSchTddANInfo       *anInfo
  )
 #else
-PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo)
+static Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo)
  RgSchUeCb            *ue;
  RgSchDlHqProcCb      *hqP;
U8                   *isAck;
uint8_t                   *isAck;
  RgTfuHqInfo          *fdbk;
U8                   tbIdx;
uint8_t                   tbIdx;
  RgSchTddANInfo       *anInfo;
 #endif
 {
@@ -1808,7 +1783,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo)
             {
                   if(RG_SCH_IS_CELL_SEC(ue,hqP->hqE->cell)) 
                   {
-                     U8 cellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
+                     uint8_t cellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
                            hqP->hqE->cell->cellId,
                            hqP->hqE->ue);
 
@@ -1865,7 +1840,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo)
             break;
       }
    }
-   RETVOID;
+   return;
 }/* End of rgSchGetHqFdbkPosForM1 */
 
 /** * @brief Function to decode the position of HarqFb for M>=2 cases.
@@ -1876,41 +1851,41 @@ PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo)
  *           
  *  @param[in]  RgSchUeCb            *ue,
  *  @param[in]  RgSchDlHqProcCb      *hqP,
- *  @param[in]  U8                   *isAck, 
+ *  @param[in]  uint8_t                   *isAck, 
  *  @param[in]  RgTfuHqInfo          *fdbk,
- *  @param[in]  U8                   tbIdx,
+ *  @param[in]  uint8_t                   tbIdx,
  *  @param[in]  RgSchTddANInfo       *anInfo;
  *  @param[in]  CmLteTimingInfo      timeInfo;
- *  @return     RETVOID
+ *  @return     void
  **/
 #ifdef ANSI
-PRIVATE Void rgSchGetHqFdbkPosForM234
+static Void rgSchGetHqFdbkPosForM234
 (
  RgSchUeCb            *ue,
  RgSchDlHqProcCb      *hqP,
U8                   *isAck, 
uint8_t                   *isAck, 
  RgTfuHqInfo          *fdbk,
U8                   tbIdx,
uint8_t                   tbIdx,
  RgSchTddANInfo       *anInfo,
U8                   M,
uint8_t                   M,
  CmLteTimingInfo      timeInfo
  )
 #else
-PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
+static Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
  RgSchUeCb            *ue;
  RgSchDlHqProcCb      *hqP;
U8                  *isAck;
uint8_t                  *isAck;
  RgTfuHqInfo          *fdbk;
U8                   tbIdx;
uint8_t                   tbIdx;
  RgSchTddANInfo       *anInfo;
U8                    M;
uint8_t                    M;
  CmLteTimingInfo      timeInfo;
 #endif
 {
-   U8                   fdbkIdx;
+   uint8_t                   fdbkIdx;
    Bool                 isSCell;
    RgSchTddANInfo       *pCellAnInfo;
-   U8                   incr = 0;
+   uint8_t                   incr = 0;
 
    if(NULLP != ue)
    {
@@ -2003,7 +1978,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
          dlHqStats[statsCnt].sf = hqP->tbInfo[tbIdx].timingInfo.slot; 
          dlHqStats[statsCnt].ack = *isAck;
          dlHqStats[statsCnt].fdbkIdx = fdbkIdx;
-         dlHqStats[statsCnt].ue = hqP->hqE->ue->ueId;;
+         dlHqStats[statsCnt].ue = hqP->hqE->ue->ueId;
          if (anInfo)
             dlHqStats[statsCnt].ulDai = incr;
          if(TRUE == fdbk->isPusch)
@@ -2030,7 +2005,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
       }
 #endif
    }/*ue*/
-   RETVOID;
+   return;
 }/*rgSchGetHqFdbkPosForM234*/
 #endif/*LTE_ADV*/
 
@@ -2047,7 +2022,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
  *
  *
  *  @param[in]  Void                *cb
- *  @param[in]  U8                  cbType
+ *  @param[in]  uint8_t                  cbType
  *  @param[in]  RgSchCellCb         cellCb
  *  @param[in]  CmLteTimingInfo     timeInfo 
  *  @param[in]  TfuHqInfo           *fdbk
@@ -2058,10 +2033,10 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmHqFdbkInd
+S16 rgSCHDhmHqFdbkInd
 (
 Void                 *cb,
-U8                   cbType,
+uint8_t                   cbType,
 RgSchCellCb          *cellCb,
 CmLteTimingInfo      timeInfo,
 TfuHqInfo            *fdbk,
@@ -2069,9 +2044,9 @@ RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err)
+S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err)
 Void                    *cb;
-U8                      cbType;
+uint8_t                      cbType;
 RgSchCellCb             *cellCb;
 CmLteTimingInfo         timeInfo;
 TfuHqInfo               *fdbk;
@@ -2086,21 +2061,21 @@ RgSchErrInfo            *err;
    RgSchDlSf         *sf;
    Bool              isMsg4 = FALSE;
    RgSchRaCb         *raCb = NULLP;
-   U16               rnti=0;
+   uint16_t               rnti=0;
    /* Maximum possible HARQ processes in UL-DL configuration 5 that is
     * given feedback at a time */
    RgSchDlHqProcCb   *hqPrcs[(RGSCH_NUM_SUB_FRAMES-1)*5];  /*MAX 5 Cells*/
-   U8                numTb[(RGSCH_NUM_SUB_FRAMES-1)*5];
+   uint8_t                numTb[(RGSCH_NUM_SUB_FRAMES-1)*5];
    S8                tbStrtIdx[(RGSCH_NUM_SUB_FRAMES-1)*5];
-   U8                hqCnt;
-   U8                idx;
+   uint8_t                hqCnt;
+   uint8_t                idx;
    RgSchTddANInfo    *anInfo = NULLP;
-   U8                isAck = 0;
-   U8                tbCnt;
+   uint8_t                isAck = 0;
+   uint8_t                tbCnt;
    RgrTddAckNackMode ackNackMode;
    Bool              hqRls = FALSE;
    RgSchDlSf         *nxtDlsf = NULLP;
-   /* U8                rcvCnt = 0; */
+   /* uint8_t                rcvCnt = 0; */
    CmLteTimingInfo   nxtfrm = {0,0};
    Bool              anUpd = FALSE;
    Bool              maxHqRetxReached;
@@ -2110,13 +2085,13 @@ RgSchErrInfo            *err;
 
 #if ((defined LTEMAC_SPS_AN_MUX) || (defined LTE_ADV))
    RgSchTddDlAscSetIdxK    ascIdx;
-   U8                      noFdbks;
+   uint8_t                      noFdbks;
 #endif
 
 #ifdef LTEMAC_SPS_AN_MUX
    Bool                    isPusch   = FALSE;   
-   U8                      tmpIdx;
-   U8                      hIdx;   
+   uint8_t                      tmpIdx;
+   uint8_t                      hIdx;   
    /* Subframes in which transmissions are scheduled and whose feedback can come
     * in this subframe. Used only for Multiplexing mode */
    CmLteTimingInfo         schdSfTime[RGSCH_TDD_MAX_FDBK];
@@ -2125,11 +2100,10 @@ RgSchErrInfo            *err;
 #endif
 #endif
 #ifdef LTE_ADV
-   U8                  sCellActCePres = 0;
+   uint8_t                  sCellActCePres = 0;
 #endif
 /* LTEMAC_SPS_AN_MUX*/
    RgrSchFrmt1b3TypEnum uciFrmtTyp  = RG_SCH_UCI_FORMAT1A_1B; 
-   TRC2(rgSCHDhmHqFdbkInd)
 
    if (cbType == RGSCH_HQ_FDB_IND_CB_TYPE_RA_CB)
    {
@@ -2250,7 +2224,7 @@ RgSchErrInfo            *err;
      if(ue)
      {
 #ifdef LTE_ADV
-        U8 servCellIdx = rgSchUtlGetServCellIdx(hqPrcs[idx]->hqE->cell->instIdx,
+        uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqPrcs[idx]->hqE->cell->instIdx,
         hqPrcs[idx]->hqE->cell->cellId,ue);
 
         if(ue->cellInfo[servCellIdx]->sCellState != RG_SCH_SCELL_ACTIVE)  
@@ -2621,9 +2595,9 @@ RgSchErrInfo            *err;
       if(ackNackMode == RGR_TDD_ACKNACK_MODE_MULT)
       {
          CmLteTimingInfo txTime;
-         U8   ulDlCfgIdx = 0;
-         U8   maxFdbks   = 0;
-         U8   itr        = 0;
+         uint8_t   ulDlCfgIdx = 0;
+         uint8_t   maxFdbks   = 0;
+         uint8_t   itr        = 0;
 
          ulDlCfgIdx  = cellCb->ulDlCfgIdx;
 
@@ -2757,31 +2731,31 @@ RgSchErrInfo            *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmPrcFdbkForTb
+S16 rgSCHDhmPrcFdbkForTb
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 RgSchDlHqProcCb      *hqP,
 RgSchDlSf            *sf,
 Bool                 isMsg4,
-U16                  rnti,
-U8                   tbCnt,
+uint16_t                  rnti,
+uint8_t                   tbCnt,
 CmLteTimingInfo      timingInfo,
-U8                   isAck,
+uint8_t                   isAck,
 RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err)
+S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err)
 RgSchCellCb             *cell;
 RgSchUeCb               *ue;
 RgSchDlHqProcCb         *hqP;
 RgSchDlSf               *sf;
 Bool                    isMsg4;
-U16                     rnti;
-U8                      tbCnt;
+uint16_t                     rnti;
+uint8_t                      tbCnt;
 CmLteTimingInfo         timingInfo;
-U8                      isAck;
+uint8_t                      isAck;
 RgInfRlsHqInfo          *rlsHqBufs;
 RgSchErrInfo            *err;
 #endif
@@ -2804,7 +2778,6 @@ RgSchErrInfo            *err;
    CmLteTimingInfo      frm = timingInfo;
 #endif
 
-   TRC2(rgSCHDhmPrcFdbkForTb)
    if (ue)
    {
       ueDl     = RG_SCH_CMN_GET_DL_UE(ue,cell);
@@ -3036,25 +3009,25 @@ RgSchErrInfo            *err;
  *  @param[in]  RgrSchFrmt1b3TypEnum uciFrmtTyp, 
  *  @param[in]  Bool                 *isAck, 
  *  @param[in]  RgTfuHqInfo          *fdbk,
- *  @return     RETVOID
+ *  @return     void
  **/
 #ifdef ANSI
-PUBLIC Void rgSchGetHqFdbkPos
+Void rgSchGetHqFdbkPos
 (
  RgSchCellCb          *cell,
  RgSchUeCb            *ue,
  RgSchDlHqProcCb      *hqP,
  RgrSchFrmt1b3TypEnum uciFrmtTyp, 
U8                  *isAck, 
uint8_t                  *isAck, 
  RgTfuHqInfo          *fdbk
  )
 #else
-PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
+Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
  RgSchCellCb          *cell;
  RgSchUeCb            *ue;
  RgSchDlHqProcCb      *hqP;
  RgrSchFrmt1b3TypEnum uciFrmtTyp;
U8                  *isAck;
uint8_t                  *isAck;
  RgTfuHqInfo          *fdbk;
 #endif
 {
@@ -3062,7 +3035,7 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
    {
       isAck[0] = fdbk->isAck[0];
       isAck[1] = fdbk->isAck[1];
-      RETVOID;
+      return;
    }
 #ifdef LTE_ADV
    /* LAA Making all ack for LAA CELL */
@@ -3071,7 +3044,7 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
    {
       isAck[0] = TRUE;
       isAck[1] = TRUE;
-      RETVOID;
+      return;
    }
 
    if((ue != NULLP))
@@ -3099,7 +3072,7 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
                if(RG_SCH_IS_CELL_SEC(ue,hqP->hqE->cell)) 
                {
 #ifdef LTE_ADV
-                  U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
+                  uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx,
                         hqP->hqE->cell->cellId,
                         ue);
 
@@ -3216,26 +3189,26 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
       }
    }
 #endif
-   RETVOID;
+   return;
 }/* End of rgSchGetHqFdbkPos */
 #ifdef LTE_ADV
 #ifdef ANSI
-PUBLIC Void rgSchGetHqFdbkPosFormat3
+Void rgSchGetHqFdbkPosFormat3
 (
  RgSchDlHqProcCb      *hqP,
U8                   *isAck,
uint8_t                   *isAck,
  TfuHqFdbk            *fdbk
  )
 #else
-PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
+Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
  RgSchDlHqProcCb      *hqP;
U8                  *isAck;
uint8_t                  *isAck;
  TfuHqFdbk           *fdbk;
 #endif
 {
-   U8 cellIdx = RG_SCH_CMN_GET_CELL_IDX_FROM_HQP(hqP);
-   isAck[0] = (U8)fdbk[cellIdx]; 
-   isAck[1] = (U8)fdbk[cellIdx + 1]; 
+   uint8_t cellIdx = RG_SCH_CMN_GET_CELL_IDX_FROM_HQP(hqP);
+   isAck[0] = (uint8_t)fdbk[cellIdx]; 
+   isAck[1] = (uint8_t)fdbk[cellIdx + 1]; 
 }
 #endif
 /** * @brief Handler for HARQ feedback received for DL transmission.
@@ -3250,7 +3223,7 @@ PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
  *     
  *           
  *  @param[in]  Void                *cb
- *  @param[in]  U8                  cbType
+ *  @param[in]  uint8_t                  cbType
  *  @param[in]  RgSchCellCb         *cell
  *  @param[in]  RgTfuHarqAckIndInfo *fdbk
  *  @param[in]  RgInfRlsHqInfo      *rlsHqBufs
@@ -3260,7 +3233,7 @@ PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhm5gtfHqFdbkInd 
+S16 rgSCHDhm5gtfHqFdbkInd 
 (
 RgSchUeCb            *ue,
 RgSchCellCb          *cell,
@@ -3269,7 +3242,7 @@ TfuHqFdbk            fdbk,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err)
+S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err)
 RgSchUeCb            *ue;
 RgSchCellCb          *cell;
 CmLteTimingInfo      timingInfo;
@@ -3283,13 +3256,11 @@ RgSchErrInfo         *err;
    S16                  ret = ROK;
    RgSchDlSf            *sf;
    Bool                 isMsg4 = FALSE;
-   U16                  rnti=0;
-   U16                  procId=0;
-   U8                   hqPCount = 0;
+   uint16_t                  rnti=0;
+   uint16_t                  procId=0;
+   uint8_t                   hqPCount = 0;
    RgInfRlsHqInfo       *rlsHqBufs = NULLP;
 
-   TRC2(rgSCHDhm5gtfHqFdbkInd)
-
    RGSCHDECRFRMCRNTTIME(timingInfo, timingInfo, 4); 
 
    sf = rgSCHUtlSubFrmGet(cell, timingInfo);
@@ -3317,7 +3288,7 @@ RgSchErrInfo         *err;
       {
          rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti;
          rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = 
-            (U8)procId;
+            (uint8_t)procId;
          rlsHqBufs->numUes++;
       }
       hqPCount--;
@@ -3338,7 +3309,7 @@ RgSchErrInfo         *err;
  *     
  *           
  *  @param[in]  Void                *cb
- *  @param[in]  U8                  cbType
+ *  @param[in]  uint8_t                  cbType
  *  @param[in]  RgSchCellCb         *cell
  *  @param[in]  RgTfuHarqAckIndInfo *fdbk
  *  @param[in]  RgInfRlsHqInfo      *rlsHqBufs
@@ -3348,10 +3319,10 @@ RgSchErrInfo         *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmHqFdbkInd
+S16 rgSCHDhmHqFdbkInd
 (
 Void                 *cb, 
-U8                   cbType,
+uint8_t                   cbType,
 RgSchCellCb          *cell,
 CmLteTimingInfo      timingInfo,
 RgTfuHqInfo          *fdbk,
@@ -3359,9 +3330,9 @@ RgInfRlsHqInfo       *rlsHqBufs,
 RgSchErrInfo         *err
 )
 #else
-PUBLIC S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err)
+S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err)
 Void                    *cb;
-U8                      cbType;
+uint8_t                      cbType;
 RgSchCellCb             *cell;
 CmLteTimingInfo         timingInfo;
 RgTfuHqInfo             *fdbk;
@@ -3381,13 +3352,13 @@ RgSchErrInfo            *err;
    RgSchDlSf            *sf;
    Bool                 isMsg4 = FALSE;
    RgSchRaCb            *raCb = NULLP;
-   U16                  rnti=0;
+   uint16_t                  rnti=0;
   /* Added Insure Fixes Of UR.Initialized procId  */
-   U16                  procId=0;
-   /* DTX Change: Bool is converted into U8*/
-   U8                   isAck[2]={0}; /*Changed to Array of 2*/
-   U8                   tbCnt;
-   U8                   hqPCount = 0;
+   uint16_t                  procId=0;
+   /* DTX Change: Bool is converted into uint8_t*/
+   uint8_t                   isAck[2]={0}; /*Changed to Array of 2*/
+   uint8_t                   tbCnt;
+   uint8_t                   hqPCount = 0;
 
 #ifdef LTEMAC_SPS
    CmLteTimingInfo      fdbkRcptTime = timingInfo;
@@ -3400,8 +3371,6 @@ RgSchErrInfo            *err;
 #endif
    RgrSchFrmt1b3TypEnum uciFrmtTyp = RG_SCH_UCI_FORMAT1A_1B;
 
-   TRC2(rgSCHDhmHqFdbkInd)
-
    /* Get the subframe associated with the feedback */
    /* ccpu00133109: Removed RGSCHSUBFRMCRNTTIME as it is not giving proper output 
     * if diff is more than 10. Instead using RGSCHDECRFRMCRNTTIME() as it is 
@@ -3458,8 +3427,8 @@ RgSchErrInfo            *err;
       RgSchUeCb      *ueCb  = hqE->ue;
       RgSchCmnUe     *cmnUe = (RgSchCmnUe*)ueCb->sch;
       RgSchCmnDlUe   *dlUe  = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/
-      U8             tbs    = dlUe->mimoInfo.cwInfo[0].iTbs[0];
-      static U32 retxCnt    = 0;
+      uint8_t             tbs    = dlUe->mimoInfo.cwInfo[0].iTbs[0];
+      static uint32_t retxCnt    = 0;
 
       if (fdbk->isAck[0] == TFU_HQFDB_ACK)
       {
@@ -3578,7 +3547,7 @@ RgSchErrInfo            *err;
       {
          rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti;
          rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = 
-            (U8)procId;
+            (uint8_t)procId;
          rlsHqBufs->numUes++;
       }
       hqPCount--;
@@ -3604,7 +3573,7 @@ RgSchErrInfo            *err;
       {
          rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti;
          rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = 
-            (U8)procId;
+            (uint8_t)procId;
          rlsHqBufs->numUes++;
       }
       hqPCount--;
@@ -3636,7 +3605,7 @@ RgSchErrInfo            *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRgrUeCfg
+Void rgSCHDhmRgrUeCfg
 (
 RgSchCellCb       *cell,
 RgSchUeCb         *ueCb,
@@ -3644,14 +3613,13 @@ RgrUeCfg          *ueCfg,
 RgSchErrInfo      *err
 )
 #else
-PUBLIC Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err)
+Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err)
 RgSchCellCb       *cell;
 RgSchUeCb         *ueCb;
 RgrUeCfg          *ueCfg;
 RgSchErrInfo      *err;
 #endif
 {
-   TRC2(rgSCHDhmRgrUeCfg)
 
    UNUSED(err);
 
@@ -3680,7 +3648,7 @@ RgSchErrInfo      *err;
       }
       rgSCHTmrStartTmr (cell, ueCb, RG_SCH_TMR_TA, ueCb->dl.taCb.cfgTaTmr);
    }
-   RETVOID;
+   return;
 }  /* rgSCHDhmRgrUeCfg */
 
 
@@ -3704,14 +3672,14 @@ RgSchErrInfo      *err;
  *                -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRgrCellCfg
+Void rgSCHDhmRgrCellCfg
 (
 RgSchCellCb    *cell,
 RgrCellCfg     *cellCfg,
 RgSchErrInfo   *err
 )
 #else
-PUBLIC Void rgSCHDhmRgrCellCfg(cell, cellCfg, err)
+Void rgSCHDhmRgrCellCfg(cell, cellCfg, err)
 RgSchCellCb    *cell;
 RgrCellCfg     *cellCfg;
 RgSchErrInfo   *err;
@@ -3721,9 +3689,7 @@ RgSchErrInfo   *err;
    PTR         pUeCb;/* previous UE Control block */
    PTR         nUeCb;/* next UE control block */
    S16         ret;
-   U8          idx;
-
-   TRC2(rgSCHDhmRgrCellCfg)
+   uint8_t          idx;
 
    UNUSED(err);
 
@@ -3768,7 +3734,7 @@ RgSchErrInfo   *err;
      cell->tq[idx].first = NULLP;
      cell->tq[idx].tail  = NULLP;
    }
-   RETVOID;
+   return;
 }  /* rgSCHDhmRgrCellCfg */
 
 /**
@@ -3791,14 +3757,14 @@ RgSchErrInfo   *err;
  *                -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmRgrCellRecfg
+Void rgSCHDhmRgrCellRecfg
 (
 RgSchCellCb    *cell,
 RgrCellRecfg   *cellRecfg,
 RgSchErrInfo   *err
 )
 #else
-PUBLIC Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err)
+Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err)
 RgSchCellCb    *cell;
 RgrCellRecfg   *cellRecfg;
 RgSchErrInfo   *err;
@@ -3809,8 +3775,6 @@ RgSchErrInfo   *err;
    PTR         nUeCb;/* next UE control block */
    S16         ret;
 
-   TRC2(rgSCHDhmRgrCellRecfg)
-
    UNUSED(err);
 
    pUeCb = NULLP;
@@ -3836,7 +3800,7 @@ RgSchErrInfo   *err;
          }
       }
    }
-   RETVOID;
+   return;
 }  /* rgSCHDhmRgrCellRecfg */
 
 /**
@@ -3854,18 +3818,16 @@ RgSchErrInfo   *err;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmFreeUe
+Void rgSCHDhmFreeUe
 (
 RgSchUeCb          *ueCb
 )
 #else
-PUBLIC Void rgSCHDhmFreeUe(ueCb)
+Void rgSCHDhmFreeUe(ueCb)
 RgSchUeCb          *ueCb;
 #endif
 {
 
-   TRC2(rgSCHDhmFreeUe)
-
    /* If TA Timer is running. Stop it */
    if (ueCb->taTmr.tmrEvnt != TMR_NONE)
    {
@@ -3903,7 +3865,7 @@ RgSchUeCb          *ueCb;
       rgSCHCmnRmvFrmTaLst(ueCb->cell, ueCb);
    }
 
-   RETVOID;
+   return;
 
 }  /* rgSCHDhmFreeUe */
 
@@ -3918,26 +3880,25 @@ RgSchUeCb          *ueCb;
  *           
  *  @param[in]  RgSchCellCb   *cell 
  *  @param[in]  RgSchUeCb     *ueCb 
- *  @param[in]  U8         ta
+ *  @param[in]  uint8_t         ta
  *
  *  @return     None.
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmUpdTa
+Void rgSCHDhmUpdTa
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ueCb,
-U8             ta
+uint8_t             ta
 )
 #else
-PUBLIC Void rgSCHDhmUpdTa(cell, ueCb, ta)
+Void rgSCHDhmUpdTa(cell, ueCb, ta)
 RgSchCellCb    *cell;
 RgSchUeCb      *ueCb;
-U8             ta;
+uint8_t             ta;
 #endif
 {
-   TRC2(rgSCHDhmUpdTa)
 
    if (ueCb->dl.taCb.state == RGSCH_TA_IDLE)
    {
@@ -3968,7 +3929,7 @@ U8             ta;
       ueCb->dl.taCb.outStndngTaval =  ta;
    }
 
-   RETVOID;
+   return;
 }  /* rgSCHDhmUpdTa */
 
  /** @brief This function handles the TA timer expiry.
@@ -3987,21 +3948,19 @@ U8             ta;
   *      -#None.
   */
 #ifdef ANSI
-PUBLIC Void rgSCHDhmProcTAExp 
+Void rgSCHDhmProcTAExp 
 (
  RgSchUeCb  *ueCb
  )
 #else
-PUBLIC Void rgSCHDhmProcTAExp (ueCb)
+Void rgSCHDhmProcTAExp (ueCb)
  RgSchUeCb  *ueCb;
 #endif
 {
-   TRC2(rgSCHDhmProcTAExp);
-
    /* Ask scheduler to schedule this UE */
    ueCb->dl.taCb.state     =  RGSCH_TA_TOBE_SCHEDULED;
    rgSCHUtlDlTARpt(ueCb->cell, ueCb);  
-   RETVOID;
+   return;
 } /* end of rgSCHDhmProcTAExp */ 
 
 /* 3.1 MIMO: LC details at TB level rather than Hq Level */
@@ -4023,22 +3982,20 @@ PUBLIC Void rgSCHDhmProcTAExp (ueCb)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmAddLcData
+S16 rgSCHDhmAddLcData
 (
 Inst               inst,
 RgSchLchAllocInfo  *lchData,
 RgSchDlHqTbCb      *tbInfo
 )
 #else
-PUBLIC S16 rgSCHDhmAddLcData(inst, lchData, tbInfo)
+S16 rgSCHDhmAddLcData(inst, lchData, tbInfo)
 Inst               inst;
 RgSchLchAllocInfo  *lchData;
 RgSchDlHqTbCb      *tbInfo;
 #endif
 {
 
-   TRC2(rgSCHDhmAddLcData)
-
    if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC)
    {
      return RFAILED;
@@ -4070,23 +4027,21 @@ RgSchDlHqTbCb      *tbInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmTddRlsSubFrm
+S16 rgSCHDhmTddRlsSubFrm
 (
 RgSchCellCb          *cellCb,
 CmLteTimingInfo      uciTimingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo)
+S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo)
 RgSchCellCb          *cellCb;
 CmLteTimingInfo      uciTimingInfo;
 #endif
 {
    CmLteTimingInfo         dlSfTime;
    RgSchTddDlAscSetIdxK    ascIdx;
-   U8                      noFdbks;
-   U8                      i;
-
-   TRC2(rgSCHDhmTddRlsSubFrm)
+   uint8_t                      noFdbks;
+   uint8_t                      i;
 
    ascIdx = 
       rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot];
@@ -4106,7 +4061,7 @@ CmLteTimingInfo      uciTimingInfo;
 }/* rgSCHDhmTddRlsSubFrm */
 
 #ifdef TFU_TDD
-U32 macDtx = 0;
+uint32_t macDtx = 0;
 #endif
 /**
  * @brief Handler for Removing the HARQ process from a dlsf.
@@ -4127,13 +4082,13 @@ U32 macDtx = 0;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc
+S16 rgSCHDhmRlsDlsfHqProc
 (
 RgSchCellCb          *cellCb,
 CmLteTimingInfo      uciTimingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo)
+S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo)
 RgSchCellCb          *cellCb;
 CmLteTimingInfo      uciTimingInfo;
 #endif
@@ -4143,18 +4098,17 @@ CmLteTimingInfo      uciTimingInfo;
    CmLteTimingInfo         nxtfrm = {0,0};
    RgSchDlHqProcCb         *tmpHqProc;
    RgSchTddDlAscSetIdxK    ascIdx;
-   U8                      noFdbks;
+   uint8_t                      noFdbks;
    S16                     i;
    RgSchDlSf               *nxtDlsf = NULLP;
    CmLList                 *node;
    CmLList                 *hqPNode;
-   U8                      idx;
+   uint8_t                      idx;
    /*ccpu00130018 -MOD -Initiatizing with FALSE*/ 
-   U8                      maxRetx=FALSE;
+   uint8_t                      maxRetx=FALSE;
    RgSchTddANInfo          *anInfo = NULLP;
    RgSchDlHqTbCb           *tbCb;
    RgSchUeCb               *ue = NULLP;
-   TRC2(rgSCHDhmRlsDlsfHqProc)
 
    ascIdx = 
       rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot];
@@ -4247,7 +4201,7 @@ CmLteTimingInfo      uciTimingInfo;
                      /* Update feedback time for this process so that 
                       * next subframe its picked up */
 #ifdef LTE_ADV
-                     U8 servCellIdx = rgSchUtlGetServCellIdx(
+                     uint8_t servCellIdx = rgSchUtlGetServCellIdx(
                            tmpHqProc->hqE->cell->instIdx,
                            tmpHqProc->hqE->cell->cellId,
                            ue);
@@ -4334,7 +4288,7 @@ CmLteTimingInfo      uciTimingInfo;
             /* Update feedback time for this process so that 
              * next subframe its picked up */
 #ifdef LTE_ADV
-            U8 servCellIdx = rgSchUtlGetServCellIdx(
+            uint8_t servCellIdx = rgSchUtlGetServCellIdx(
                   tmpHqProc->hqE->cell->instIdx,
                   tmpHqProc->hqE->cell->cellId,
                   ue);
@@ -4414,13 +4368,13 @@ CmLteTimingInfo      uciTimingInfo;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc
+S16 rgSCHDhmRlsDlsfHqProc
 (
 RgSchCellCb          *cell,
 CmLteTimingInfo      timingInfo
 )
 #else
-PUBLIC S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo)
+S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo)
 RgSchCellCb          *cell;
 CmLteTimingInfo      timingInfo;
 #endif
@@ -4431,12 +4385,10 @@ CmLteTimingInfo      timingInfo;
    Bool              maxRetx;
    CmLList           *node;
    CmLList           *hqPNode;
-   U8                idx;
+   uint8_t                idx;
    RgSchDlHqTbCb     *tbCb;
    RgSchUeCb         *ue;
 
-   TRC2(rgSCHDhmRlsDlsfHqProc)
-
    /* Fetch the current timing info. Modify it to Last sf to be rlsd.*/
    /* ccpu00133109: Removed RGSCHSUBFRMCRNTTIME as it is not giving proper 
     * output if diff is more than 10. Instead using RGSCHDECRFRMCRNTTIME() 
@@ -4573,26 +4525,25 @@ CmLteTimingInfo      timingInfo;
  *     - Set isSpsHqProc = TRUE
  *     
  *  @param[in]  RgSchUeCb        *ue
- *  @param[in]  U8            idx
+ *  @param[in]  uint8_t            idx
  *  @return  S16       
  *         -#   ROK     if successful
  *         -#   RFAILED otherwise
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmMarkSpsHqProc
+S16 rgSCHDhmMarkSpsHqProc
 (
 RgSchUeCb               *ue,
-U8                      idx
+uint8_t                      idx
 )
 #else
-PUBLIC S16 rgSCHDhmMarkSpsHqProc(ue, idx)
+S16 rgSCHDhmMarkSpsHqProc(ue, idx)
 RgSchUeCb               *ue;
-U8                      idx;
+uint8_t                      idx;
 #endif
 {
    RgSchDlHqProcCb      *hqP;
-   TRC2(rgSCHDhmMarkSpsHqProc)
 
    /* Pick the proc based on the index provided */
    rgSCHDhmGetHqProcFrmId(ue->cell, ue, idx, &hqP);
@@ -4615,29 +4566,28 @@ U8                      idx;
  *           
  *  @param[in]  RgSchDlHqProcCb     *hqP
  *  @param[in]  RgSchDlSf           *sf                  
- *  @param[in]  U8                  tbCnt
- *  @param[in]  U8                  *isAck
+ *  @param[in]  uint8_t                  tbCnt
+ *  @param[in]  uint8_t                  *isAck
  *  @return     S16
  *      -# ROK 
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep
+static S16 rgSCHDhmProcHqFdbkAckNackRep
 (
 RgSchDlHqProcCb      *hqP,
 RgSchDlSf            *sf,
-U8                   tbCnt,
-U8                   *isAck
+uint8_t                   tbCnt,
+uint8_t                   *isAck
 )
 #else
-PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck)
+static S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck)
 RgSchDlHqProcCb      *hqP;
 RgSchDlSf            *sf;
-U8                   tbCnt;
-U8                   *isAck;
+uint8_t                   tbCnt;
+uint8_t                   *isAck;
 #endif
 {
-    TRC2(rgSCHDhmProcHqFdbkAckNackRep)
       /* Check if this is repeating UE */
     rgSCHUtlDlHqPTbRmvFrmTx(sf, hqP, tbCnt, TRUE);
     /* Check if last repetition */
@@ -4692,13 +4642,13 @@ U8                   *isAck;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmDlRetxAllocFail 
+S16 rgSCHDhmDlRetxAllocFail 
 (
 RgSchUeCb               *ue,
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC S16 rgSCHDhmDlRetxAllocFail(ue, hqP)
+S16 rgSCHDhmDlRetxAllocFail(ue, hqP)
 RgSchUeCb               *ue;
 RgSchDlHqProcCb         *hqP;
 #endif
@@ -4709,8 +4659,6 @@ RgSchDlHqProcCb         *hqP;
    Bool             maxRetx = FALSE;
    RgSchCmnCell           *cellSch;
 
-   TRC2(rgSCHDhmDlRetxAllocFail);
-
    cell = hqP->hqE->cell;
    cellSch = RG_SCH_CMN_GET_CELL(cell);
    rlsHqInfo = &(cell->rlsHqArr[cell->crntHqIdx]);
@@ -4812,20 +4760,20 @@ RgSchDlHqProcCb         *hqP;
 
 #ifdef DL_LA
 #ifdef ANSI
-PRIVATE S16 rgSCHDhmUpdateAckNackHistory
+static S16 rgSCHDhmUpdateAckNackHistory
 (
 RgSchCellCb             *cell,
 RgSchUeCb               *ueCb,
-U8                      hqfdbk,
-U8                      tbCnt
+uint8_t                      hqfdbk,
+uint8_t                      tbCnt
 )
 #else
-PRIVATE S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt)
+static S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt)
 (
 RgSchCellCb             *cell;
 RgSchUeCb               *ueCb;
-U8                      hqfdbk;
-U8                      tbCnt;
+uint8_t                      hqfdbk;
+uint8_t                      tbCnt;
 )
 #endif
 {
@@ -4857,26 +4805,26 @@ U8                      tbCnt;
 }
 
 #ifdef ANSI
-PUBLIC S16 rgSCHDhmUpdBlerBasediTbsEff
+S16 rgSCHDhmUpdBlerBasediTbsEff
 (
 RgSchCellCb             *cell,
 RgSchUeCb               *ueCb,
-U8                      tbCnt
+uint8_t                      tbCnt
 )
 #else
-PUBLIC S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt)
+S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt)
 (
 RgSchCellCb             *cell;
 RgSchUeCb               *ueCb;
-U8                      tbCnt;
+uint8_t                      tbCnt;
 )
 #endif
 {
    S32            iTbs;
    RgSchCmnDlUe  *ueDl;
    RgSchCmnCell  *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   U8             cfi = cellSch->dl.currCfi;
-   U8             maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1];
+   uint8_t             cfi = cellSch->dl.currCfi;
+   uint8_t             maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1];
    maxiTbs                = RG_SCH_DL_MAX_ITBS;
 
    ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell);
@@ -4935,30 +4883,28 @@ U8                      tbCnt;
  *          4 = DTX (UE did not transmit anything)
  *                
  *  @param[in]  TfuHqInfo    *fdbk
- *  @param[in]  U8            hqCnt 
+ *  @param[in]  uint8_t            hqCnt 
  *  @return  Void 
  *
  **/
 #ifdef ANSI
-PRIVATE Void rgSCHDhmPrcSplBundlFdbk
+static Void rgSCHDhmPrcSplBundlFdbk
 (
 RgSchCellCb  *cell,
 TfuHqInfo    *fdbk,
-U8            hqCnt
+uint8_t            hqCnt
 )
 #else
-PRIVATE Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt)
+static Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt)
 (
 RgSchCellCb  *cell;
 TfuHqInfo    *fdbk;
-U8            hqCnt;
+uint8_t            hqCnt;
 )
 #endif
 {
-   U8       numOfAcks;
+   uint8_t       numOfAcks;
    
-   TRC2(rgSCHDhmPrcSplBundlFdbk);
-
    /* Num of ACKs reported by UE */
    numOfAcks = fdbk->isAck[0];
 
@@ -4979,7 +4925,7 @@ U8            hqCnt;
       the PDSCH trasnmission (spatial bundling). So we have 
       to assume same feedback for both codewords */ 
 #ifdef LTE_ADV
-   for(U8 idx = 1 ; idx < TFU_MAX_HARQ_FDBKS; idx++)
+   for(uint8_t idx = 1 ; idx < TFU_MAX_HARQ_FDBKS; idx++)
    {
       fdbk->isAck[idx] = fdbk->isAck[0]; 
    }
@@ -4987,7 +4933,7 @@ U8            hqCnt;
    fdbk->isAck[1] = fdbk->isAck[0]; 
 #endif
    
-   RETVOID;
+   return;
 }
 #endif
 
@@ -5006,16 +4952,15 @@ U8            hqCnt;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPAdd2FreeLst
+Void rgSCHDhmHqPAdd2FreeLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPAdd2FreeLst(hqP)
+Void rgSCHDhmHqPAdd2FreeLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPAdd2FreeLst)
 
 #ifdef LAA_DBG
    if (hqP->hqPLst)
@@ -5044,7 +4989,7 @@ RgSchDlHqProcCb         *hqP;
    rgSCHLaaHndlHqProcFree(hqP);
 #endif
 
-   RETVOID;
+   return;
 } /* rgSCHDhmHqPAdd2FreeLst */
 
 
@@ -5063,16 +5008,15 @@ RgSchDlHqProcCb         *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPAdd2InUseLst
+Void rgSCHDhmHqPAdd2InUseLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPAdd2InUseLst(hqP)
+Void rgSCHDhmHqPAdd2InUseLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPAdd2InUseLst)
 
 #ifdef LAA_DBG
    if (hqP->hqPLst)
@@ -5097,7 +5041,7 @@ RgSchDlHqProcCb         *hqP;
    }
 #endif
 
-   RETVOID;
+   return;
 } /* rgSCHDhmHqPAdd2InUseLst */
 
 /**
@@ -5115,16 +5059,15 @@ RgSchDlHqProcCb         *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPDelFrmFreeLst
+Void rgSCHDhmHqPDelFrmFreeLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPDelFrmFreeLst(hqP)
+Void rgSCHDhmHqPDelFrmFreeLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPDelFrmFreeLst)
 
 #ifdef LAA_DBG
    if (!hqP->hqPLst)
@@ -5158,7 +5101,7 @@ RgSchDlHqProcCb         *hqP;
    }
 #endif
 
-   RETVOID;
+   return;
 } /* rgSCHDhmHqPDelFrmFreeLst */
 
 
@@ -5178,16 +5121,15 @@ RgSchDlHqProcCb         *hqP;
  *
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDhmHqPDelFrmInUseLst
+Void rgSCHDhmHqPDelFrmInUseLst
 (
 RgSchDlHqProcCb         *hqP
 )
 #else
-PUBLIC Void rgSCHDhmHqPDelFrmInUseLst(hqP)
+Void rgSCHDhmHqPDelFrmInUseLst(hqP)
 RgSchDlHqProcCb         *hqP;
 #endif
 {
-   TRC2(rgSCHDhmHqPDelFrmInUseLst)
 
 #ifdef LAA_DBG
    if (!hqP->hqPLst)
@@ -5222,7 +5164,7 @@ RgSchDlHqProcCb         *hqP;
    }
 #endif
 
-   RETVOID;
+   return;
 } /* rgSCHDhmHqPDelFrmInUseLst */
 
 \f