fixed unused-function and unused variable warnings

Change-Id: I36fe79072730d04837a2e8771cf5df45fe084c44
Signed-off-by: Balaji Shankaran <balaji.shankaran@radisys.com>

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index b5c96f5..00011be 100755 (executable)
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -81,7 +81,7 @@ static int RLOG_MODULE_ID=4096;
 /* local typedefs */
  
 /* local externs */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 PRIVATE S16  rgLIMValidateSap ARGS((Inst inst,SuId suId));
 #endif
 PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
@@ -266,7 +266,7 @@ U8      status;
   *   -# ROK
   *   -# RFAILED
   */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgLIMValidateSap
 (

diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c
index c517ce7..7e217de 100755 (executable)
--- a/src/5gnrmac/rg_rom.c
+++ b/src/5gnrmac/rg_rom.c
@@ -686,17 +686,19 @@ RgRguDedStaRsp *staRsp;
    if(((cell = rgCb[inst].cell) != NULLP)
       && (cell->cellId == staRsp->cellId))
    {
-            //RgInfDedBoRpt boRpt;
             Pst        schPst;
-            /*boRpt.cellSapId  = cell->schInstMap.cellSapId;
-            boRpt.cellId  = staRsp->cellId;
-            boRpt.rnti    = staRsp->rnti; 
-            boRpt.lcId    = staRsp->lcId; 
-            boRpt.bo      = staRsp->boReport.bo;
-            boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
-            boRpt.staPduBo = staRsp->boReport.staPduBo;
-            boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;*/
-            rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
+#ifdef UNUSED_VAR
+    RgInfDedBoRpt boRpt
+        boRpt.cellSapId  = cell->schInstMap.cellSapId;
+    boRpt.cellId  = staRsp->cellId;
+        boRpt.rnti    = staRsp->rnti; 
+    boRpt.lcId    = staRsp->lcId; 
+        boRpt.bo      = staRsp->boReport.bo;
+    boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
+    boRpt.staPduBo = staRsp->boReport.staPduBo;
+    boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
+#endif
+                               rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
             schPst.event = 0;
             //TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt);
             RETVALUE(ROK);
@@ -715,18 +717,21 @@ CmLteLcId lcId,
 S32 bo 
 )
 {
-  //RgInfDedBoRpt  boRpt;
+
   RgCellCb   *cell;
   //if ((cell = rgDBMGetCellCb(cellId)) != NULLP)
   if (((cell = rgCb[inst].cell) != NULLP) &&
         (cell->cellId == cellId))
-  {
+ {
      Pst        schPst;
-    /* boRpt.cellSapId  = cell->schInstMap.cellSapId;
-     boRpt.cellId     = cellId;
-     boRpt.rnti       = rnti; 
-     boRpt.lcId       = lcId; 
-     boRpt.bo         = bo;*/
+#ifdef UNUSED_VAR
+    RgInfDedBoRpt  boRpt;
+    boRpt.cellSapId  = cell->schInstMap.cellSapId;
+    boRpt.cellId     = cellId;
+    boRpt.rnti       = rnti; 
+    boRpt.lcId       = lcId; 
+    boRpt.bo         = bo;
+#endif
      rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
      schPst.event = 0;
      //TODO: commented for compilation without SCH RgMacSchDedBoUpdtReq (&schPst,&boRpt);
@@ -898,15 +903,15 @@ RgErrInfo      *err;
    //RgInfCmnBoRpt boRpt;
 
    TRC2(rgROMHndlCcchStaRsp);
-
-/*
+#ifdef UNUSED_VAR
+   RgInfCmnBoRpt boRpt;
    boRpt.cellSapId  = cell->schInstMap.cellSapId;
    boRpt.cellId  = staRsp->cellId;
    boRpt.u.rnti    = staRsp->u.rnti; 
    boRpt.lcId    = staRsp->lcId; 
    boRpt.lcType  = staRsp->lcType; 
    boRpt.bo      = staRsp->bo;
-  */
+#endif
    rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst);
    //TODO: commented for compilation without SCH RgMacSchCmnBoUpdt(&schPst, &boRpt);
 

diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c
index 1429bd8..9f23d06 100755 (executable)
--- a/src/5gnrsch/rg_sch_cmn.c
+++ b/src/5gnrsch/rg_sch_cmn.c
@@ -157,8 +157,8 @@ PRIVATE Void rgSCHChkNUpdSiCfg ARGS((RgSchCellCb  *cell));
 PRIVATE Void rgSCHSelectSi ARGS((RgSchCellCb *cell));
 #endif /*RGR_SI_SCH*/
 /* LTE_ADV_FLAG_REMOVED_START */
+#ifdef UNUSED_FUNC
 #ifndef LTE_TDD
-#ifdef UNUSE_FUN
 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc
 (
 RgSchCellCb        *cell,
@@ -175,6 +175,72 @@ U8                  nmbRb,
 U16                 bw
 );
 #endif
+PRIVATE Void rgSCHCmnNonDlfsType0Alloc
+(
+RgSchCellCb        *cell,
+RgSchDlSf          *dlSf,
+RgSchDlRbAlloc     *allocInfo,
+RgSchUeCb          *ue
+);
+PRIVATE U8 rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29};
+PRIVATE Void rgSCHCmnUlNonadapRetx ARGS((
+RgSchCmnUlCell  *cellUl,
+RgSchUlAlloc    *alloc,
+U8               idx
+));
+PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ARGS((
+RgSchCellCb *cell,
+RgSchUlSf   *sf
+));
+
+#ifdef TFU_UPGRADE
+PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS((
+RgSchCellCb  *cell,
+RgSchUeCb    *ue,
+U32          maxRb,
+U32          *numSb,
+U8           *iTbs,
+U32          hqSz,
+U32          stepDownItbs,
+U32          effTgt
+));
+#endif
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+U8                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+U8                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+U8                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+U8                         tpc
+));
+PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS((
+RgSchCellCb                *cell,
+RgSchDlRbAlloc             *rbAllocInfo,
+RgSchDlHqProcCb            *hqP,
+RgSchPdcch                 *pdcch,
+U8                         tpc
+));
+
 #endif
 
 PUBLIC Void rgSCHCmnDlSpsSch
@@ -278,15 +344,6 @@ U32            *tb2Sz,
 U8              cfi
 ));
 
-#endif
-#ifdef UNUSE_FUN
-PRIVATE Void rgSCHCmnNonDlfsType0Alloc
-(
-RgSchCellCb        *cell,
-RgSchDlSf          *dlSf,
-RgSchDlRbAlloc     *allocInfo,
-RgSchUeCb          *ue
-);
 #endif
 PRIVATE Void  rgSCHCmnInitRbAlloc ARGS 
 ((
@@ -323,43 +380,6 @@ RgSchUeCb *ue, U32 bo, U32 *effBo, RgSchDlHqProcCb *proc,
 RgSchCmnDlRbAllocInfo *cellWdAllocInfo));
 typedef U8 (*RgSchCmnDlGetPrecInfFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, 
       U8 numLyrs, Bool bothCwEnbld));
-#ifdef UNUSE_FUN
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS((
-RgSchCellCb                *cell,
-RgSchDlRbAlloc             *rbAllocInfo,
-RgSchDlHqProcCb            *hqP,
-RgSchPdcch                 *pdcch,
-U8                         tpc
-));
-#endif
 PRIVATE Void rgSCHCmnDlAllocTxRbTM1 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
@@ -715,20 +735,6 @@ U8     sf,
 U16    minPeriodicity
 ));
 
-#ifdef TFU_UPGRADE
-#ifdef UNUSE_FUN
-PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS((
-RgSchCellCb  *cell,
-RgSchUeCb    *ue,
-U32          maxRb,
-U32          *numSb,
-U8           *iTbs,
-U32          hqSz,
-U32          stepDownItbs,
-U32          effTgt
-));
-#endif
-#endif
 
 #ifdef RG_5GTF
 //TODO_SID: Currenly table is only for 100 Prbs. Need to modify wrt VRBG table 8.1.5.2.1-1 V5G_213
@@ -1250,9 +1256,6 @@ PRIVATE U32 rgSchCmnExtBsrTbl[64] = {
    867737, 1067031, 1312097, 1613447, 1984009, 2439678, 3000000, 3100000
 };
 
-#ifdef UNUSE_FUN
-PRIVATE U8 rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29};
-#endif
 PUBLIC U8 rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI];
 
 PUBLIC RgSchTbSzTbl rgTbSzTbl = {
@@ -1592,13 +1595,6 @@ PRIVATE Void rgSCHCmnMsg3GrntReq ARGS((
          RgSchUlAlloc    **ulAllocRef,
          U8              *hqProcIdRef
          ));
-#ifdef UNUSE_FUN
-PRIVATE Void rgSCHCmnUlNonadapRetx ARGS((
-         RgSchCmnUlCell  *cellUl,
-         RgSchUlAlloc    *alloc,
-         U8               idx
-         ));
-#endif
 PRIVATE Void rgSCHCmnDlCcchRarAlloc ARGS((
 RgSchCellCb             *cell
 ));
@@ -1687,12 +1683,6 @@ RgSchCellCb *cell,
 RgSchUlSf   *sf
 ));
 /* Fix: syed Adaptive Msg3 Retx crash. */
-#ifdef UNUSE_FUN
-PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ARGS((
-RgSchCellCb *cell,
-RgSchUlSf   *sf
-));
-#endif
 #ifdef TFU_UPGRADE
 PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS
 ((
@@ -1757,7 +1747,7 @@ RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo
 ));
 #ifdef DEBUGP
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 PRIVATE Void rgSCHCmnFindCodeRate ARGS((
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
@@ -6202,7 +6192,7 @@ RgSchDlHqProcCb            *hqP;
    }
    RETVOID;
 }
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 /**
  * @brief This function fills the PDCCH DCI format 1 information from dlProc.
  *
@@ -13794,6 +13784,7 @@ Bool                  isNewTx;
    RETVOID;
 }
 
+#ifdef UNUSED_FUNC
 #ifdef TFU_UPGRADE
 /***********************************************************
  *
@@ -13814,7 +13805,6 @@ Bool                  isNewTx;
  *     File :
  *
  **********************************************************/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi
 (
@@ -21424,7 +21414,7 @@ RgSchRaReqInfo        *raReq;
  * @return  Void
  *
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlNonadapRetx
 (
@@ -21458,7 +21448,6 @@ U8              idx;
    alloc->pdcch = NULLP;
    RETVOID;
 }
-#endif
 /**
  * @brief Check if 2 allocs overlap
  *
@@ -21472,7 +21461,6 @@ U8              idx;
  *  @param[in]  RgSchUlAlloc  *alloc2
  *  @return  Bool
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnUlAllocsOvrLap
 (
@@ -21497,7 +21485,6 @@ RgSchUlAlloc    *alloc2;
    }
    RETVALUE(FALSE);
 }
-#endif
 /**
  * @brief Copy allocation Info from src to dst.
  *
@@ -21511,7 +21498,6 @@ RgSchUlAlloc    *alloc2;
  *  @param[in]  RgSchUlAlloc  *dstAlloc
  *  @return  Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlCpyAllocInfo
 (
@@ -21568,8 +21554,6 @@ RgSchUlAlloc    *dstAlloc;
 
    RETVOID;
 }
-#endif
-
 /**
  * @brief Update TX and RETX subframe's allocation
  *        markings.
@@ -21590,7 +21574,6 @@ RgSchUlAlloc    *dstAlloc;
  *  @param[in]  RgSchUlAlloc  *srcAlloc
  *  @return  Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlInsAllocFrmNewSf2OldSf
 (
@@ -21685,7 +21668,6 @@ RgSchUlAlloc    *srcAlloc;
    dstAlloc->mrgdNewTxAlloc = TRUE;
    RETVOID;
 }
-#endif
 /**
  * @brief Merge all allocations of newSf to oldSf.
  *
@@ -21704,7 +21686,6 @@ RgSchUlAlloc    *srcAlloc;
  *  @param[in]  RgSchUlSf    *newSf
  *  @return  Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlMergeSfAllocs
 (
@@ -21736,7 +21717,6 @@ RgSchUlSf    *newSf;
    }
    RETVOID;
 }
-#endif
 /**
  * @brief Swap Hole/Alloc DB context of newSf and oldSf.
  *
@@ -21751,7 +21731,6 @@ RgSchUlSf    *newSf;
  *  @param[in]  RgSchUlSf    *newSf
  *  @return  Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlSwapSfAllocs
 (
@@ -21786,7 +21765,6 @@ RgSchUlSf    *newSf;
    oldSf->allocCountRef = &oldSf->allocDb->count;
    RETVOID;
 }
-#endif
 /**
  * @brief Perform non-adaptive RETX for non-colliding allocs.
  *
@@ -21801,7 +21779,6 @@ RgSchUlSf    *newSf;
  *  @param[in]  U8           idx
  *  @return  Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlPrcNonAdptRetx
 (
@@ -21840,7 +21817,7 @@ U8           idx;
    }
    RETVOID;
 }
-#endif
+
 /**
  * @brief Update TX and RETX subframe's allocation
  *        markings.
@@ -21863,7 +21840,6 @@ U8           idx;
  *  @param[in]  U8           idx 
  *  @return  Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlPrfmSfMerge
 (
@@ -22295,7 +22271,7 @@ RgSchUlHole       *hole;
  *  @param[in]  RgSchUlSf   *sf
  *  @return  U8
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlSfRlsRetxProcs
 (
@@ -23391,7 +23367,7 @@ Bool        isPartialAlloc;
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
  *  @return  void
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnFindCodeRate
 (
@@ -24221,7 +24197,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
  *      -# TRUE
  *      -# FALSE
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl
 (
@@ -24621,7 +24597,7 @@ Bool               isUeCellEdge;
  *      -# TRUE
  *      -# FALSE
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl
 (
@@ -24903,7 +24879,7 @@ U8                 numRb;
  *
  *  @return Void
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc
 (
@@ -25062,7 +25038,7 @@ U8                 numRb;
  *
  *  @return Void
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHCmnNonDlfsType0Alloc
 (
@@ -25240,7 +25216,7 @@ RgSchUeCb          *ue;
  *
  *  @return Void
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnBuildRntpInfo
 (
@@ -25307,7 +25283,6 @@ U16                 bw;
 
    RETVALUE(ROK);
 }
-#endif
 
 /**
  * @brief To update non-DLFS alloc'n parameters after TYPE2 Allocation.
@@ -25325,7 +25300,6 @@ U16                 bw;
  *
  *  @return Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc
 (
@@ -25396,7 +25370,7 @@ U8                 numRb;
 
    RETVALUE(ROK);
 }
-#endif
+
 /**
  * @brief To do DL allocation using TYPE0 RA.
  *
@@ -25415,7 +25389,6 @@ U8                 numRb;
  *
  *  @return Void
  **/
-#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnNonDlfsSFRPoolType0Alloc
 (
@@ -25629,7 +25602,7 @@ RgSchDlSf          *dlSf;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc
 (

diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c
index 827464f..afabf28 100755 (executable)
--- a/src/5gnrsch/rg_sch_tom.c
+++ b/src/5gnrsch/rg_sch_tom.c
@@ -305,7 +305,52 @@ U32 gUlCrcPassCounter = 0;
 
 #ifdef RG_5GTF
 EXTERN U32 gUl5gtfPdcchSend;
-#ifdef UNUSE_FUN
+#endif
+
+#ifdef UNUSED_FUNC
+#ifdef TFU_UPGRADE
+PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS
+((
+RgSchCellCb       *cell,
+RgSchUeCb         *ue,
+TfuRecpReqInfo    *recpReqInfo,
+TfuUeRecpReqInfo  *pucchRecpInfo,
+U16               validIdx
+));
+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 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
 PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ARGS(
 (
  TfuRecpReqInfo       *recpReqInfo,
@@ -313,10 +358,15 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ARGS(
  U16                  validIdx, 
  RgSchErrInfo         *err
  ));
-#endif
+PRIVATE Void rgSchTomFillCellTtiInfo ARGS
+((
+TfuTtiIndInfo      *ttiInd,
+Inst               schInst,
+U8                 *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 */
@@ -391,16 +441,6 @@ PUBLIC S16 rgSCHTomFillOnlySrsRecpReq ARGS
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo
  ));
-#ifdef UNUSE_FUN
-PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS
-((
- RgSchCellCb       *cell,
- RgSchUeCb         *ue, 
- TfuRecpReqInfo    *recpReqInfo,
- TfuUeRecpReqInfo  *pucchRecpInfo,
- U16               validIdx
- ));
-#endif
 PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS
 ((
  RgSchCellCb         *cell,
@@ -463,46 +503,9 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion ARGS
 RgSchCellCb     *cell,
 RgSchUeCb       *ue
 ));
-#ifdef UNUSE_FUN
-PRIVATE Bool rgSCHTomUtlFillDatHarqRecpReq ARGS
-((
- RgSchCellCb       *cell,
- RgSchUlAlloc      *alloc,
- TfuUeRecpReqInfo  *datRecpInfo,
- TfuRecpReqInfo    *recpReqInfo
- ));
-PRIVATE S16 rgSCHTomUtlFillSrRecpReq ARGS((
-         TfuRecpReqInfo   *recpReq,
-         RgSchCellCb      *cell,
-         U16              validIdx,
-         RgSchErrInfo     *err));
-#endif
 PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ARGS((
          RgSchUeCb        *ue,
          Bool             *willueRprtCqiRii));
-#ifdef UNUSE_FUN
-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
 #endif 
 #ifdef TFU_UPGRADE
 PRIVATE S16 rgSCHTomUtlFillDatRecpReq ARGS((
@@ -589,7 +592,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS((
 #ifdef LTEMAC_SPS
 EXTERN PUBLIC Void rgSCHCmnDlSpsSch (RgSchCellCb *cell);
 #ifndef LTE_TDD
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef TFU_UPGRADE
 PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS
 ((
@@ -644,15 +647,6 @@ PRIVATE Void rgSCHTomUtlSendSfnTick ARGS
 RgSchCellCb  *cell
 ));
 #endif
-#ifdef UNUSE_FUN
-PRIVATE Void rgSchTomFillCellTtiInfo ARGS
-((
-TfuTtiIndInfo      *ttiInd,
-Inst               schInst,
-U8                 *nCell,
-RgSchCellCb        *cells[]
-));
-#endif
 #ifdef LTE_TDD
 PRIVATE Void rgSchTomUtlTddRlsSfAndHarq ARGS
 ((
@@ -1100,9 +1094,7 @@ TfuHqIndInfo    *harqAckInd;
    CmLList         *node;
    TfuHqInfo       *hqInfo;
    Pst             pst;
-#ifdef TFU_UPGRADE
   // U8              tbCnt;
-#endif 
 
    RgInfRlsHqInfo  *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
    U32            cellIdx;
@@ -2160,7 +2152,7 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
 *       File:  rg_sch_utl.c
 *
 */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlGenIndices
 (
@@ -4506,7 +4498,7 @@ RgSchErrInfo            *err;
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillSrRecpReq
 (
@@ -4674,7 +4666,7 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillRiRecpReq
 (
@@ -4798,7 +4790,7 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# RFAILED 
  */
 
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq
 (
@@ -4870,7 +4862,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# ROK 
  *      -# RFAILED 
  */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq
 (
@@ -6663,7 +6655,7 @@ Bool              isDatPresOnSecCell;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr
 (
@@ -8305,7 +8297,7 @@ RgSchCellCb          *cell;
  *  @param[in]  Inst   schInst
  *  @RETVALUE   None
  */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSCHDynTDDMrkCrntSfIdx
 (
@@ -8345,7 +8337,7 @@ Inst   schInst;
  * Returns: Void  
  *  
  */
-#ifdef UNUSE_FUN
+#ifdef UNUSED_FUNC
 #ifdef ANSI
 PRIVATE Void rgSchTomFillCellTtiInfo
 (