X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_scell.c;h=4e4dd7376717f07fe201c73f40ad40d1ecc0ca15;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=c026375119f5238326e490c708f062a1fae1dd54;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c
index c02637511..4e4dd7376 100755
--- a/src/5gnrsch/rg_sch_scell.c
+++ b/src/5gnrsch/rg_sch_scell.c
@@ -79,8 +79,8 @@ RgSchUeCb                  *ue
 
 Void rgSCHSCellHndlFdbkInd ARGS((
 RgSchDlHqProcCb   *hqP,
-U8                tbIdx,
-U8                fdbk,
+uint8_t                tbIdx,
+uint8_t                fdbk,
 Bool              maxHqRetxReached
 ));
 
@@ -93,7 +93,7 @@ RgSchUeCellInfo *sCell
 Void rgSCHSCellDelUeSCell ARGS((
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb,
-U8            sCellIdx
+uint8_t            sCellIdx
 ));
 
 S16 rgSCHSCellDelUe ARGS((
@@ -107,13 +107,13 @@ RgSchCellCb  *secCellCb,
 RgSchUeCb    *ueCb,
 RgrUePrdDlCqiCfg  *cqiCfg,
 CmLteUeCategory   ueCat,
-U8            sCellIdx
+uint8_t            sCellIdx
 ));
 #endif
 PRIVATE S16 rgSCHSCellTrgMacHqEReset ARGS((
 Inst          inst,
-U16           secCellId,
-U16           rnti
+uint16_t           secCellId,
+uint16_t           rnti
 ));
 
 
@@ -145,9 +145,8 @@ RgSchDlHqTbCb     *tbInfo;
 #endif
 {
 
-   U8   bitVal = 0;
-   U8   sCellActDeactBitMask = 0;
-   TRC3(rgSCHSCellSchdActDeactCe);
+   uint8_t   bitVal = 0;
+   uint8_t   sCellActDeactBitMask = 0;
 
    /* Change the state of all Scells waiting for
     * activation */
@@ -159,7 +158,7 @@ RgSchDlHqTbCb     *tbInfo;
      * 0 for deactivation
      * */
 
-   for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+   for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if(ueCb->cellInfo[idx] != NULLP)
       {
@@ -201,7 +200,7 @@ RgSchDlHqTbCb     *tbInfo;
    tbInfo->schdSCellActCe.pres    = PRSNT_NODEF;
    tbInfo->schdSCellActCe.val     = sCellActDeactBitMask;
 
-   RETVOID;
+   return;
 } /* rgSCHSCellSchdActDeactCe */
 
 
@@ -233,7 +232,6 @@ RgSchUeCb                  *ue;
 #endif
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   TRC3(rgSCHSCellAddToActDeactLst);
 
    if(NULLP == ue->sCellActLnk.node)
    {/* Ue is not present in the list */
@@ -246,7 +244,7 @@ RgSchUeCb                  *ue;
             "SCell is already added in the Act List: ueId(%u)\n", ue->ueId));
    }
    
-   RETVOID;
+   return;
 }
 
 
@@ -278,14 +276,13 @@ RgSchUeCb                  *ue;
 #endif
 {
    RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
-   TRC3(rgSCHSCellRmvFrmActLst);
    if (NULLP != ue->sCellActLnk.node)
    {
       cmLListDelFrm(&cellCmnDl->secCellActCeLst, &ue->sCellActLnk);
    }
    ue->sCellActLnk.node = (PTR)NULLP;
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -322,18 +319,17 @@ RgSchUeCellInfo  *sCellInfo
 #ifdef DEBUGP
    Inst   inst = ueCb->cell->instIdx;
 #endif
-   U16    tempIdx; 
+   uint16_t    tempIdx; 
    RgrUePrdDlCqiCfg  *cqiCfg;
-   U8     j;  /*Bandwidth Parts*/
-   U16    riTrInsTime; 
-   U16    periodicity; 
-   U16    cqiTrInstTime; 
+   uint8_t     j;  /*Bandwidth Parts*/
+   uint16_t    riTrInsTime; 
+   uint16_t    periodicity; 
+   uint16_t    cqiTrInstTime; 
    RgSchUePCqiCb *cqiCb = NULLP;
    CmLteTimingInfo timingInfo;
-   U16    crntTime;           
+   uint16_t    crntTime;           
 #endif
 
-   TRC3(rgSCHSCellActivation);
 
    sCellInfo->sCellState = RG_SCH_SCELL_ACTIVE;
 #ifdef TENB_STATS
@@ -450,8 +446,8 @@ RgSchUeCellInfo  *sCellInfo
             % RG_SCH_PCQI_SRS_SR_TRINS_SIZE;
          if(periodicity >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE)
          {  
-            cqiCb->riDist = rgSCHUtlFindDist((U16)(crntTime + TFU_RECPREQ_DLDELTA),
-                  (U16) tempIdx);
+            cqiCb->riDist = rgSCHUtlFindDist((uint16_t)(crntTime + TFU_RECPREQ_DLDELTA),
+                  (uint16_t) tempIdx);
          }
          else
          {
@@ -494,7 +490,7 @@ RgSchUeCellInfo  *sCellInfo
    cellSch = RG_SCH_CMN_GET_CELL(sCellInfo->cell);
    cellSch->apisDl->rgSCHDlSCellActv(sCellInfo->cell, sCellInfo->ue);
 
-   RETVOID;
+   return;
 }
 
 #ifdef TFU_UPGRADE
@@ -525,7 +521,6 @@ RgSchUeCellInfo *sCellInfo;
 #endif
 {
 
-   TRC3(rgSCHCellClearScellLstOfCQI);
    RgSchUePCqiCb *cqiRiCb = NULLP;
    RgSchUeCb    *ueCb;
    ueCb = sCellInfo->ue;
@@ -558,7 +553,7 @@ RgSchUeCellInfo *sCellInfo;
       }
    }
 
-   RETVOID;
+   return;
 }
 #endif/*TFU_UPGRADE*/
 
@@ -596,7 +591,6 @@ RgSchUeCellInfo *sCellInfo
    RgSchCmnCell *cellSch;
    Inst inst = sCellInfo->cell->instIdx;
 
-   TRC3(rgSCHSCellDeActivation);
    /* Stop the timer if running */
 
    if(sCellInfo->deactTmr.tmrEvnt != TMR_NONE)
@@ -661,8 +655,8 @@ RgSchUeCellInfo *sCellInfo
  *
  *     Invoked by: CommonScheduler
  *
- *  @param[in]  U16        sCellId
- *  @param[in]  U16        rnti
+ *  @param[in]  uint16_t        sCellId
+ *  @param[in]  uint16_t        rnti
  *  @return  Void
  *
  **/
@@ -670,14 +664,14 @@ RgSchUeCellInfo *sCellInfo
 PRIVATE S16 rgSCHSCellTrgMacHqEReset
 (
 Inst          inst,
-U16           secCellId,
-U16           rnti
+uint16_t           secCellId,
+uint16_t           rnti
 )
 #else
 PRIVATE S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti)
 Inst          inst;
-U16           secCellId;
-U16           rnti;
+uint16_t           secCellId;
+uint16_t           rnti;
 #endif
 {
    Pst               pst;
@@ -727,15 +721,15 @@ U16           rnti;
 Void rgSCHSCellHndlFdbkInd
 (
 RgSchDlHqProcCb   *hqP,
-U8                tbIdx,
-U8                fdbk,
+uint8_t                tbIdx,
+uint8_t                fdbk,
 Bool              maxHqRetxReached
 )
 #else
 Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
 RgSchDlHqProcCb   *hqP;
-U8                tbIdx;
-U8                fdbk;
+uint8_t                tbIdx;
+uint8_t                fdbk;
 Bool              maxHqRetxReached;
 #endif
 {
@@ -744,7 +738,6 @@ Bool              maxHqRetxReached;
    RgSchCellCb    *cell;
    RgSchUeCellInfo *sCellInfo;
 
-   TRC3(rgSCHSCellHndlFdbkInd);
 
    ueCb  = hqP->hqE->ue;
    cell  = ueCb->cell;
@@ -754,7 +747,7 @@ Bool              maxHqRetxReached;
          {
             hqP->tbInfo[tbIdx].schdSCellActCe.pres =  FALSE;
 
-            for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+            for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
             {
                if(ueCb->cellInfo[idx] != NULLP) 
                {
@@ -784,7 +777,7 @@ Bool              maxHqRetxReached;
             if(TRUE == maxHqRetxReached)
             {
                hqP->tbInfo[tbIdx].schdSCellActCe.pres =  FALSE;
-               for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+               for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
                {
                   if(ueCb->cellInfo[idx] != NULLP) 
                   {
@@ -809,7 +802,7 @@ Bool              maxHqRetxReached;
       default:
          break;
    }
-   RETVOID;
+   return;
 }
 
 #ifdef LTE_ADV
@@ -843,7 +836,6 @@ RgSchUeCellInfo *sCellInfo;
 #endif
 {
 
-   TRC3(rgSCHSCellDeactTmrExpry);
    if (sCellInfo->ue->isScellExplicitDeAct == TRUE)
    {
       /* Deactivation Timer is not configured (infinity), thus send deactivation CE explicitly */ 
@@ -864,7 +856,7 @@ RgSchUeCellInfo *sCellInfo;
       /* Deactivation Timer is configured, thus assume that UE has deactivated */ 
       rgSCHSCellDeActivation(sCellInfo);
    }
-   RETVOID;
+   return;
 }
 #endif
 
@@ -883,8 +875,8 @@ RgSchUeCellInfo *sCellInfo;
  *
  *  @param[in]  RgSchCellCb *cellCb
  *  @param[in]  RgSchUeCb   *ueCb
- *  @param[in]  U8           sCellIdx
- *  @param[in]  U8           action
+ *  @param[in]  uint8_t           sCellIdx
+ *  @param[in]  uint8_t           action
  *
  *  @return  ROK/RFAILED
  *
@@ -894,22 +886,20 @@ S16 rgSCHSCellTrigActDeact
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb,
-U8            sCellIdx,
-U8            action
+uint8_t            sCellIdx,
+uint8_t            action
 )
 #else
 S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb;
-U8            sCellIdx;
-U8            action;
+uint8_t            sCellIdx;
+uint8_t            action;
 #endif
 {
    Inst inst = cell->instIdx;
    S16 ret   = ROK;
 
-   TRC3(rgSCHSCellTrigActDeact);
-
    if((sCellIdx < 1) ||
       (sCellIdx > RGR_MAX_SCELL_PER_UE))
    {
@@ -1019,16 +1009,15 @@ PRIVATE S16 rgSCHSCellSelectForAct
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ueCb,
-U8           *sCellIdx
+uint8_t           *sCellIdx
 )
 #else
 PRIVATE S16 rgSCHSCellSelectForAct(cell, ueCb)
 RgSchCellCb  *cell;
 RgSchUeCb    *ueCb;
-U8           *sCellIdx;
+uint8_t           *sCellIdx;
 #endif
 {
-   TRC3(rgSCHSCellSelectAndAct);
 
    for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++)
    {
@@ -1053,7 +1042,7 @@ U8           *sCellIdx;
  *
  *  @param[in]  RgSchCellCb *cellCb
  *  @param[in]  RgSchUeCb   *ueCb
- *  @param[in]  U8          action
+ *  @param[in]  uint8_t          action
  *
  *  @return  Void
  *
@@ -1063,16 +1052,16 @@ Void rgSCHSCellSelectAndActDeAct
 (
 RgSchCellCb  *pCell,
 RgSchUeCb    *ueCb,
-U8           action
+uint8_t           action
 )
 #else
 Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
 RgSchCellCb  *pCell;
 RgSchUeCb    *ueCb;
-U8           action;
+uint8_t           action;
 #endif
 {
-   U8  sCellIdx = 0;
+   uint8_t  sCellIdx = 0;
    S16 ret = ROK;
 
    switch (action)
@@ -1082,11 +1071,11 @@ U8           action;
 
             if(((ret = rgSCHSCellSelectForAct(pCell, ueCb, &sCellIdx)) == ROK)
                   && (sCellIdx == 0))
-               RETVOID;
+               return;
             break;
          }
          default:
-         RETVOID;
+         return;
    }
    if ((ret != ROK) || 
          (ROK != (rgSCHSCellTrigActDeact(pCell, ueCb, sCellIdx, action))))
@@ -1094,7 +1083,7 @@ U8           action;
       RGSCHDBGERR(pCell->instIdx,(rgSchPBuf(pCell->instIdx), "SCell Actication failed"
                "for UE [%d] with SCellIdx [%d]\n", ueCb->ueId, sCellIdx));
    }
-   RETVOID;
+   return;
 }
 
  
@@ -1113,7 +1102,7 @@ U8           action;
  *
  *  @param[in]  RgSchCellCb  *cellCb
  *  @param[in]  RgSchUeCb    *ueCb
- *  @param[in]  U8            idx
+ *  @param[in]  uint8_t            idx
  *  @return  ROK/RFAILED
  *
  **/
@@ -1122,13 +1111,13 @@ Void rgSCHSCellDelUeSCell
 (
 RgSchCellCb  *cellCb,
 RgSchUeCb    *ueCb,
-U8            sCellIdx
+uint8_t            sCellIdx
 )
 #else
 Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
 RgSchCellCb  *cellCb;
 RgSchUeCb    *ueCb;
-U8            sCellIdx;
+uint8_t            sCellIdx;
 #endif
 {
    RgUeUlHqCb       *ulHqEnt;
@@ -1136,7 +1125,6 @@ U8            sCellIdx;
    RgSchUeCellInfo *sCellInfo;
    RgSchCmnUlUe *ueUl;
 
-   TRC3(rgSCHSCellDelUeSCell);
    sCellInfo = ueCb->cellInfo[sCellIdx];
 
 
@@ -1145,7 +1133,7 @@ U8            sCellIdx;
       RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d\
                ueId %d\n",
                sCellIdx,ueCb->ueId));
-      RETVOID;
+      return;
    }
 
    rgSCHDbmDelUeCb(sCellInfo->cell, ueCb);
@@ -1182,7 +1170,7 @@ U8            sCellIdx;
 
    ueCb->cellInfo[sCellIdx] = NULLP;
    
-   RETVOID;
+   return;
 }
 
 /**
@@ -1217,9 +1205,8 @@ RgSchUeCb    *ueCb;
 #endif
 {
 
-   TRC3(rgSCHSCellDelUe);
 
-   for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+   for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       rgSCHSCellDelUeSCell(cellCb,ueCb,idx);
    }
@@ -1267,7 +1254,7 @@ RgSchCellCb  *secCellCb,
 RgSchUeCb    *ueCb,
 RgrUePrdDlCqiCfg  *cqiCfg,
 CmLteUeCategory   ueCat,
-U8            sCellIdx
+uint8_t            sCellIdx
 )
 #else
 S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
@@ -1276,19 +1263,17 @@ RgSchCellCb       *secCellCb;
 RgSchUeCb         *ueCb;
 RgrUePrdDlCqiCfg  *cqiCfg;
 CmLteUeCategory    ueCat;
-U8                sCellIdx;
+uint8_t                sCellIdx;
 #endif
 {
-   U8     j;  /*Bandwidth Parts*/
-   U8     temp; 
+   uint8_t     j;  /*Bandwidth Parts*/
+   uint8_t     temp; 
 #ifdef DEBUGP
    Inst   inst = priCellCb->instIdx;
 #endif
    RgSchUeCellInfo *sCellInfo;
    RgSchUePCqiCb *cqiCb = NULLP;
 
-   TRC3(rgSCHSCellPCqiCfg);
-
    RGSCHDBGINFO(priCellCb->instIdx, (rgSchPBuf(priCellCb->instIdx), 
             "rgSCHSCellPCqiCfg cellId =%d, ueId = %d, CfgType =%d\n",
             secCellCb->cellId,  ueCb->ueId, cqiCfg->type));
@@ -1310,7 +1295,7 @@ U8                sCellIdx;
    if (cqiCfg->type == RGR_SCH_PCQI_SETUP)
    {   
       /*  1. Copy the Received CQI Cfg parameters to ueCb  */
-      cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg, 
+      memcpy(&cqiCb->cqiCfg, cqiCfg, 
             sizeof(RgrUePrdDlCqiCfg));
 
       /*  2. Compute Periodic CQI Periodicity and subframe offset   */
@@ -1330,7 +1315,7 @@ U8                sCellIdx;
 
       if(RGR_UE_PCQI_SB_REP == cqiCfg->cqiSetup.cqiRepType)
       {
-         U8     k;  /*SubBand Size (RB) */
+         uint8_t     k;  /*SubBand Size (RB) */
          RG_SCH_GET_CQI_J_VAL(secCellCb->bwCfg.dlTotalBw, j);
          RG_SCH_GET_CQI_K_VAL(secCellCb->bwCfg.dlTotalBw, k);
          cqiCb->J = j; /*Number of Bandwidth Parts*/
@@ -1436,9 +1421,8 @@ RgSchUeCb                  *ue;
 #endif
 {
    RgSchCmnCell *cellSch;
-   TRC3(rgSCHSCellDlUeReset);
 
-   for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+   for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if(ue->cellInfo[idx] != NULLP) 
       {
@@ -1448,7 +1432,7 @@ RgSchUeCb                  *ue;
          ue->cellInfo[idx]->sCellState = RG_SCH_SCELL_INACTIVE;
       }
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1483,15 +1467,14 @@ RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC3(rgSCHSCellDlLcCfg);
-   for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+   for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if(ue->cellInfo[idx] != NULLP) 
       {
          cellSch->apisDl->rgSCHRgrDlLcCfg(ue->cellInfo[idx]->cell, ue, svc,NULLP,NULLP);
       }
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -1525,15 +1508,14 @@ RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC3(rgSCHSCellDlLcDel);
-   for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+   for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if(ue->cellInfo[idx] != NULLP) 
       {
          cellSch->apisDl->rgSCHFreeDlLc(ue->cellInfo[idx]->cell, ue, svc);
       }
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -1567,7 +1549,6 @@ RgSchDlLcCb                *svc;
 #endif
 {
    RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
-   TRC3(rgSCHSCellDlDedBoUpd);
 
    /* If this is not invoked by PCell, then
       invoke the call to PCell handler 
@@ -1576,7 +1557,7 @@ RgSchDlLcCb                *svc;
    {
       cellSch->apisDl->rgSCHDlDedBoUpd(ue->cell, ue, svc);
    }
-   for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+   for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if((ue->cellInfo[idx] != NULLP) &&
             (ue->cellInfo[idx]->sCellState == RG_SCH_SCELL_ACTIVE) &&
@@ -1585,7 +1566,7 @@ RgSchDlLcCb                *svc;
          cellSch->apisDl->rgSCHDlDedBoUpd(ue->cellInfo[idx]->cell, ue, svc);
       }
    }
-   RETVOID;
+   return;
 }
 #ifdef TFU_UPGRADE
 /**
@@ -1601,23 +1582,22 @@ RgSchDlLcCb                *svc;
  *
  *  @param[in] RgSchUePCqiCb *cqiCb1
  *  @param[in] RgSchUePCqiCb *cqiCb2
- *  @return U8 cqiCb cell idx which has the higher priority
+ *  @return uint8_t cqiCb cell idx which has the higher priority
  *
  **/
 #ifdef ANSI
-PRIVATE U8  rgSCHUtlSCellCmpCqiCfg
+PRIVATE uint8_t  rgSCHUtlSCellCmpCqiCfg
 (
 RgSchUePCqiCb *cqiCb1,
 RgSchUePCqiCb *cqiCb2
 )
 #else
-PRIVATE U8  rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2)
+PRIVATE uint8_t  rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2)
 RgSchUePCqiCb     *cqiCb1;
 RgSchUePCqiCb     *cqiCb2;
 #endif
 {
    RgSchUePCqiCb     *retCqiCb;
-   TRC3(rgSCHUtlSCellCmpCqiCfg);
    /* Collision rules are defined in TS 36.213,7.2.2 */
    /* RI, WB first PMI > WB CQI >  SB CQI */
    /* As of now only taking care of RI > WB CQI > SB CQI */
@@ -1678,18 +1658,17 @@ S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
 RgSchUePCqiCb     *cqiCb;
 #endif
 {
-   U32 nPCqiServCellIdx;
-   U32 minPCqiTrIdx;
-   U32 scellPCqiTrIdx;
-   U32 pCqiTrIdx;
+   uint32_t nPCqiServCellIdx;
+   uint32_t minPCqiTrIdx;
+   uint32_t scellPCqiTrIdx;
+   uint32_t pCqiTrIdx;
    RgSchCellCb       *priCellCb = cqiCb->servCellInfo->ue->cell;
    RgSchUeCb         *ueCb = cqiCb->servCellInfo->ue;
-   U16 crntSfIdx;
-   U32 cellIdx;
-   U32 sCellCnt = 0;
+   uint16_t crntSfIdx;
+   uint32_t cellIdx;
+   uint32_t sCellCnt = 0;
    CmLteTimingInfo timingInfo;
-   U8 idx = 0;
-   TRC3(rgSCHUtlSCellHndlCqiCollsn);
+   uint8_t idx = 0;
 
 #ifdef xLTE_TDD
    RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
@@ -1789,17 +1768,16 @@ S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
 RgSchUePCqiCb     *cqiCb;
 #endif
 {
-   U32 nPRiServCellIdx;
-   U32 minPRiTrIdx;
-   U32 scellPRiTrIdx;
-   U32 pRiTrIdx;
+   uint32_t nPRiServCellIdx;
+   uint32_t minPRiTrIdx;
+   uint32_t scellPRiTrIdx;
+   uint32_t pRiTrIdx;
    RgSchCellCb       *priCellCb = cqiCb->servCellInfo->ue->cell;
    RgSchUeCb         *ueCb = cqiCb->servCellInfo->ue;
-   U16 crntSfIdx;
-   U32 cellIdx;
-   U32 sCellCnt = 0;
+   uint16_t crntSfIdx;
+   uint32_t cellIdx;
+   uint32_t sCellCnt = 0;
    CmLteTimingInfo timingInfo;
-   TRC3(rgSCHUtlSCellHndlRiCollsn);
 
 #ifdef xLTE_TDD
    RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
@@ -1911,9 +1889,8 @@ RgSchUeCb                  *ue;
 #endif
 {
    S16 retVal = RFAILED;
-   TRC3(rgSCHSCellIsActive);
 
-   for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+   for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
    {
       if((ue->cellInfo[idx] != NULLP) &&
          (ue->cellInfo[idx]->cell->cellId == cell->cellId)&&
@@ -1952,7 +1929,6 @@ RgSchCellCb    *cell;
 RgSchUeCb      *ue
 #endif
 {
-   TRC2(rgSCHIsActvReqd)
    /* Check if remBoCnt in this UE is greater than ZERO for sufficient number of
     * Scheduling TTIs. If yes then We should activate a secondary cell to handle
     * outstanding BO */