From: Balaji Shankaran <balaji.shankaran@radisys.com>
Date: Thu, 9 Apr 2020 12:53:48 +0000 (+0530)
Subject: fixed unused-function and unused variable warnings
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=4cb15fba2285d3181cf3f5f50b3ca86420db6b69;p=o-du%2Fl2.git

fixed unused-function and unused variable warnings

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

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index 4c177b16f..b5c96f5b5 100755
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -81,7 +81,9 @@ static int RLOG_MODULE_ID=4096;
 /* local typedefs */
  
 /* local externs */
+#ifdef UNUSE_FUN
 PRIVATE S16  rgLIMValidateSap ARGS((Inst inst,SuId suId));
+#endif
 PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
                                           Bool error));
 
@@ -264,6 +266,7 @@ U8      status;
   *   -# ROK
   *   -# RFAILED
   */
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgLIMValidateSap
 (
@@ -297,7 +300,7 @@ PRIVATE S16 rgLIMValidateSap(inst,suId)
    }
    RETVALUE(ROK);
 } /* end of rgLIMValidateSap */
-
+#endif
 /** @brief This function frees up the TfuDatIndInfo structure
  *
  * @details
diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c
index 6e78ce536..c517ce71c 100755
--- a/src/5gnrmac/rg_rom.c
+++ b/src/5gnrmac/rg_rom.c
@@ -686,16 +686,16 @@ RgRguDedStaRsp *staRsp;
    if(((cell = rgCb[inst].cell) != NULLP)
       && (cell->cellId == staRsp->cellId))
    {
-            RgInfDedBoRpt boRpt;
+            //RgInfDedBoRpt boRpt;
             Pst        schPst;
-            boRpt.cellSapId  = cell->schInstMap.cellSapId;
+            /*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;
+            boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;*/
             rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
             schPst.event = 0;
             //TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt);
@@ -715,18 +715,18 @@ CmLteLcId lcId,
 S32 bo 
 )
 {
-  RgInfDedBoRpt  boRpt;
+  //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.cellSapId  = cell->schInstMap.cellSapId;
      boRpt.cellId     = cellId;
      boRpt.rnti       = rnti; 
      boRpt.lcId       = lcId; 
-     boRpt.bo         = bo;
+     boRpt.bo         = bo;*/
      rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
      schPst.event = 0;
      //TODO: commented for compilation without SCH RgMacSchDedBoUpdtReq (&schPst,&boRpt);
@@ -895,17 +895,18 @@ RgErrInfo      *err;
 {
    Pst      schPst;
    Inst     macInst = cell->macInst - RG_INST_START;
-   RgInfCmnBoRpt boRpt;
+   //RgInfCmnBoRpt boRpt;
 
    TRC2(rgROMHndlCcchStaRsp);
 
-
+/*
    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;
+  */
    rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst);
    //TODO: commented for compilation without SCH RgMacSchCmnBoUpdt(&schPst, &boRpt);
 
@@ -945,7 +946,7 @@ RgErrInfo      *err;
 #endif
 {
    Pst      schPst;
-   RgInfCmnBoRpt boRpt;
+   //RgInfCmnBoRpt boRpt;
    Inst     macInst = cell->macInst - RG_INST_START;
 
    TRC2(rgROMHndlBcchPcchStaRsp);
@@ -971,13 +972,13 @@ RgErrInfo      *err;
         RETVALUE(ROK);
       }
    }
-
+/*
    boRpt.cellSapId     = cell->schInstMap.cellSapId;
    boRpt.cellId     = staRsp->cellId;
    boRpt.u.timeToTx = staRsp->u.timeToTx; 
    boRpt.lcId       = staRsp->lcId; 
    boRpt.lcType     = staRsp->lcType; 
-   boRpt.bo         = staRsp->bo;
+   boRpt.bo         = staRsp->bo;*/	
 #ifdef EMTC_ENABLE
   if(cell->emtcEnable)
   {
diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c
index 0c055d5d4..1429bd8d1 100755
--- a/src/5gnrsch/rg_sch_cmn.c
+++ b/src/5gnrsch/rg_sch_cmn.c
@@ -158,6 +158,7 @@ PRIVATE Void rgSCHSelectSi ARGS((RgSchCellCb *cell));
 #endif /*RGR_SI_SCH*/
 /* LTE_ADV_FLAG_REMOVED_START */
 #ifndef LTE_TDD
+#ifdef UNUSE_FUN
 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc
 (
 RgSchCellCb        *cell,
@@ -174,6 +175,7 @@ U8                  nmbRb,
 U16                 bw
 );
 #endif
+#endif
 
 PUBLIC Void rgSCHCmnDlSpsSch
 (
@@ -277,6 +279,7 @@ U8              cfi
 ));
 
 #endif
+#ifdef UNUSE_FUN
 PRIVATE Void rgSCHCmnNonDlfsType0Alloc
 (
 RgSchCellCb        *cell,
@@ -284,6 +287,7 @@ RgSchDlSf          *dlSf,
 RgSchDlRbAlloc     *allocInfo,
 RgSchUeCb          *ue
 );
+#endif
 PRIVATE Void  rgSCHCmnInitRbAlloc ARGS 
 ((
 RgSchCellCb        *cell
@@ -319,7 +323,7 @@ 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,
@@ -355,6 +359,7 @@ RgSchDlHqProcCb            *hqP,
 RgSchPdcch                 *pdcch,
 U8                         tpc
 ));
+#endif
 PRIVATE Void rgSCHCmnDlAllocTxRbTM1 ARGS((
 RgSchCellCb                *cell,
 RgSchDlSf                  *subFrm,
@@ -711,6 +716,7 @@ U16    minPeriodicity
 ));
 
 #ifdef TFU_UPGRADE
+#ifdef UNUSE_FUN
 PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS((
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -722,6 +728,7 @@ 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
@@ -1243,9 +1250,9 @@ 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 = {
@@ -1585,12 +1592,13 @@ 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
 ));
@@ -1679,11 +1687,12 @@ 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
 ((
@@ -1748,6 +1757,7 @@ RgSchDlSf             *dlSf,
 RgSchDlRbAlloc        *allocInfo
 ));
 #ifdef DEBUGP
+#ifdef UNUSE_FUN
 PRIVATE Void rgSCHCmnFindCodeRate ARGS((
 RgSchCellCb           *cell,
 RgSchDlSf             *dlSf,
@@ -1756,6 +1766,7 @@ U8                    idx
 ));
 #endif
 #endif
+#endif
 PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc ARGS((
 RgSchCellCb           *cell,
 RgSchCmnMsg4RbAlloc   *msg4AllocInfo,
@@ -3346,7 +3357,7 @@ RgInfSfAlloc            *subfrmAlloc;
       + RG_SCH_CMN_HARQ_INTERVAL (7) subframes ahead */
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA + RG_SCH_CMN_HARQ_INTERVAL);
 #else
-   RGSCH_SUBFRAME_INDEX(frm);
+  // RGSCH_SUBFRAME_INDEX(frm);
    //RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
 #endif
 
@@ -6191,7 +6202,7 @@ RgSchDlHqProcCb            *hqP;
    }
    RETVOID;
 }
-
+#ifdef UNUSE_FUN
 /**
  * @brief This function fills the PDCCH DCI format 1 information from dlProc.
  *
@@ -6214,6 +6225,7 @@ RgSchDlHqProcCb            *hqP;
  *  @return  Void
  *
  **/
+
 #ifdef ANSI
 PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1
 (
@@ -6462,7 +6474,7 @@ U8                         tpc;
 #endif
  
     RETVOID;
-}
+}	
 /**
  * @brief This function fills the PDCCH DCI format 1B information from dlProc.
  *
@@ -6900,7 +6912,7 @@ U8                         tpc;
 
     RETVOID;
 }
-
+#endif
 /**
  * @brief init of Sch vars.
  *
@@ -13802,6 +13814,7 @@ Bool                  isNewTx;
  *     File :
  *
  **********************************************************/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi
 (
@@ -13912,6 +13925,7 @@ U32          effTgt;
    RETVALUE(ROK);
 }
 #endif
+#endif
 /***********************************************************
  *
  *     Func : rgSCHCmnUlRbAllocForUe
@@ -21410,6 +21424,7 @@ RgSchRaReqInfo        *raReq;
  * @return  Void
  *
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlNonadapRetx
 (
@@ -21443,7 +21458,7 @@ U8              idx;
    alloc->pdcch = NULLP;
    RETVOID;
 }
-
+#endif
 /**
  * @brief Check if 2 allocs overlap
  *
@@ -21457,6 +21472,7 @@ U8              idx;
  *  @param[in]  RgSchUlAlloc  *alloc2
  *  @return  Bool
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnUlAllocsOvrLap
 (
@@ -21481,7 +21497,7 @@ RgSchUlAlloc    *alloc2;
    }
    RETVALUE(FALSE);
 }
-
+#endif
 /**
  * @brief Copy allocation Info from src to dst.
  *
@@ -21495,6 +21511,7 @@ RgSchUlAlloc    *alloc2;
  *  @param[in]  RgSchUlAlloc  *dstAlloc
  *  @return  Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlCpyAllocInfo
 (
@@ -21551,7 +21568,7 @@ RgSchUlAlloc    *dstAlloc;
 
    RETVOID;
 }
-
+#endif
 
 /**
  * @brief Update TX and RETX subframe's allocation
@@ -21573,6 +21590,7 @@ RgSchUlAlloc    *dstAlloc;
  *  @param[in]  RgSchUlAlloc  *srcAlloc
  *  @return  Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlInsAllocFrmNewSf2OldSf
 (
@@ -21667,7 +21685,7 @@ RgSchUlAlloc    *srcAlloc;
    dstAlloc->mrgdNewTxAlloc = TRUE;
    RETVOID;
 }
-
+#endif
 /**
  * @brief Merge all allocations of newSf to oldSf.
  *
@@ -21686,6 +21704,7 @@ RgSchUlAlloc    *srcAlloc;
  *  @param[in]  RgSchUlSf    *newSf
  *  @return  Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlMergeSfAllocs
 (
@@ -21717,7 +21736,7 @@ RgSchUlSf    *newSf;
    }
    RETVOID;
 }
-
+#endif
 /**
  * @brief Swap Hole/Alloc DB context of newSf and oldSf.
  *
@@ -21732,6 +21751,7 @@ RgSchUlSf    *newSf;
  *  @param[in]  RgSchUlSf    *newSf
  *  @return  Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlSwapSfAllocs
 (
@@ -21766,7 +21786,7 @@ RgSchUlSf    *newSf;
    oldSf->allocCountRef = &oldSf->allocDb->count;
    RETVOID;
 }
-
+#endif
 /**
  * @brief Perform non-adaptive RETX for non-colliding allocs.
  *
@@ -21781,6 +21801,7 @@ RgSchUlSf    *newSf;
  *  @param[in]  U8           idx
  *  @return  Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlPrcNonAdptRetx
 (
@@ -21819,7 +21840,7 @@ U8           idx;
    }
    RETVOID;
 }
-
+#endif
 /**
  * @brief Update TX and RETX subframe's allocation
  *        markings.
@@ -21842,6 +21863,7 @@ U8           idx;
  *  @param[in]  U8           idx 
  *  @return  Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlPrfmSfMerge
 (
@@ -21870,7 +21892,7 @@ U8           idx;
    
    RETVOID;
 }
-
+#endif
 /**
  * @brief Update TX and RETX subframe's allocation
  *        markings.
@@ -22273,6 +22295,7 @@ RgSchUlHole       *hole;
  *  @param[in]  RgSchUlSf   *sf
  *  @return  U8
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnUlSfRlsRetxProcs
 (
@@ -22304,7 +22327,7 @@ RgSchUlSf   *sf;
    }
    RETVOID;
 }
-   
+#endif   
 
 /**
  * @brief Attempts allocation for UEs for which retransmissions
@@ -23368,6 +23391,7 @@ Bool        isPartialAlloc;
  *  @param[in,out]  RgSchDlRbAlloc  *allocInfo
  *  @return  void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnFindCodeRate
 (
@@ -23851,7 +23875,7 @@ Bool             isBcchPcch;
    RETVOID;
 } /* end of rgSCHCmnNonDlfsPbchRbAllocAdj */
 #endif
-
+#endif
 /**
  * @brief Performs RB allocation for frequency non-selective cell.
  *
@@ -24197,6 +24221,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo)
  *      -# TRUE
  *      -# FALSE
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl
 (
@@ -24574,6 +24599,7 @@ Bool               isUeCellEdge;
    } 
    RETVALUE(FALSE);
 }
+#endif
 #endif /* end of ifndef LTE_TDD*/
 /* LTE_ADV_FLAG_REMOVED_END */
 
@@ -24595,6 +24621,7 @@ Bool               isUeCellEdge;
  *      -# TRUE
  *      -# FALSE
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl
 (
@@ -24777,6 +24804,7 @@ RgSchDlRbAlloc     *allocInfo;
    RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti);
    RETVALUE(FALSE);
 }
+#endif
 /* LTE_ADV_FLAG_REMOVED_START */
 #ifndef LTE_TDD
 /**
@@ -24875,6 +24903,7 @@ U8                 numRb;
  *
  *  @return Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc
 (
@@ -24966,7 +24995,9 @@ U8                 numRb;
    dlSf->type2Start += numRb;
 #endif
    RETVALUE(ROK);
+
 }
+#endif
 #endif /* end of ifndef LTE_TDD*/
 /* LTE_ADV_FLAG_REMOVED_END */
 /**
@@ -25031,6 +25062,7 @@ U8                 numRb;
  *
  *  @return Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnNonDlfsType0Alloc
 (
@@ -25190,6 +25222,7 @@ RgSchUeCb          *ue;
    dlSf->lstRbgDfct = 0;
    RETVOID;
 }
+#endif
 #ifndef LTE_TDD
 
 /**
@@ -25207,6 +25240,7 @@ RgSchUeCb          *ue;
  *
  *  @return Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnBuildRntpInfo
 (
@@ -25273,7 +25307,7 @@ U16                 bw;
 
    RETVALUE(ROK);
 }
-
+#endif
 
 /**
  * @brief To update non-DLFS alloc'n parameters after TYPE2 Allocation.
@@ -25291,6 +25325,7 @@ U16                 bw;
  *
  *  @return Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc
 (
@@ -25361,7 +25396,7 @@ U8                 numRb;
 
    RETVALUE(ROK);
 }
-
+#endif
 /**
  * @brief To do DL allocation using TYPE0 RA.
  *
@@ -25380,6 +25415,7 @@ U8                 numRb;
  *
  *  @return Void
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHCmnNonDlfsSFRPoolType0Alloc
 (
@@ -25489,7 +25525,7 @@ RgSchDlRbAlloc     *allocInfo;
    dlSf->lstRbgDfct = 0;
    RETVOID;
 }
-
+#endif
 /**
  * @brief Computes RNTP Info for a subframe.
  *
@@ -25593,6 +25629,7 @@ RgSchDlSf          *dlSf;
  *      -# ROK
  *      -# RFAILED
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc
 (
@@ -25693,6 +25730,7 @@ U8                 *isDlBwAvail;
 
    RETVALUE(ROK);
 }
+#endif
 /* LTE_ADV_FLAG_REMOVED_END */
 #endif /* LTE_TDD */
 
diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c
index 34e10d094..37c2f665b 100755
--- a/src/5gnrsch/rg_sch_lmm.c
+++ b/src/5gnrsch/rg_sch_lmm.c
@@ -87,14 +87,14 @@ PUBLIC Void rgSCHCmnInit ARGS((Void));
 #endif 
 /* forward references */
 
-
+#ifdef UNUSE_FUN
 PRIVATE U16 rgSCHLmmSapCfg ARGS((
    Inst           inst,
    RgCfg          *cfg,
    U8             sapIdx,
    Elmnt          sapType
 ));
-
+#endif
 PRIVATE Void rgSCHLmmShutdown ARGS((
    Inst inst
 ));
@@ -135,6 +135,7 @@ PUBLIC void printSchCellInfo(void)
  *      -# LCM_REASON_INVALID_SAP
  *      -# LCM_REASON_NOT_APPL
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE U16 rgSCHLmmSapCfg
 (
@@ -276,6 +277,7 @@ Elmnt sapType;            /* SAP Type */
    }
    RETVALUE(ret);
 }
+#endif
 
 /***********************************************************
  *
diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c
index 7ab88af4d..827464f0a 100755
--- a/src/5gnrsch/rg_sch_tom.c
+++ b/src/5gnrsch/rg_sch_tom.c
@@ -305,6 +305,7 @@ U32 gUlCrcPassCounter = 0;
 
 #ifdef RG_5GTF
 EXTERN U32 gUl5gtfPdcchSend;
+#ifdef UNUSE_FUN
 PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ARGS(
 (
  TfuRecpReqInfo       *recpReqInfo,
@@ -313,6 +314,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ARGS(
  RgSchErrInfo         *err
  ));
 #endif
+#endif
 
 
 /* local typedefs */
@@ -389,7 +391,7 @@ PUBLIC S16 rgSCHTomFillOnlySrsRecpReq ARGS
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo
  ));
-
+#ifdef UNUSE_FUN
 PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS
 ((
  RgSchCellCb       *cell,
@@ -398,7 +400,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS
  TfuUeRecpReqInfo  *pucchRecpInfo,
  U16               validIdx
  ));
-
+#endif
 PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS
 ((
  RgSchCellCb         *cell,
@@ -461,7 +463,7 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion ARGS
 RgSchCellCb     *cell,
 RgSchUeCb       *ue
 ));
-
+#ifdef UNUSE_FUN
 PRIVATE Bool rgSCHTomUtlFillDatHarqRecpReq ARGS
 ((
  RgSchCellCb       *cell,
@@ -469,42 +471,38 @@ PRIVATE Bool rgSCHTomUtlFillDatHarqRecpReq ARGS
  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));
-         
+         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((
@@ -591,6 +589,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS((
 #ifdef LTEMAC_SPS
 EXTERN PUBLIC Void rgSCHCmnDlSpsSch (RgSchCellCb *cell);
 #ifndef LTE_TDD
+#ifdef UNUSE_FUN
 #ifdef TFU_UPGRADE
 PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS
 ((
@@ -611,6 +610,7 @@ PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS
 #endif
 #endif
 #endif
+#endif
 
 PRIVATE Void rgSchTomTtiMiscFunctions ARGS
 ((
@@ -644,7 +644,7 @@ PRIVATE Void rgSCHTomUtlSendSfnTick ARGS
 RgSchCellCb  *cell
 ));
 #endif
-
+#ifdef UNUSE_FUN
 PRIVATE Void rgSchTomFillCellTtiInfo ARGS
 ((
 TfuTtiIndInfo      *ttiInd,
@@ -652,6 +652,7 @@ Inst               schInst,
 U8                 *nCell,
 RgSchCellCb        *cells[]
 ));
+#endif
 #ifdef LTE_TDD
 PRIVATE Void rgSchTomUtlTddRlsSfAndHarq ARGS
 ((
@@ -1100,7 +1101,7 @@ TfuHqIndInfo    *harqAckInd;
    TfuHqInfo       *hqInfo;
    Pst             pst;
 #ifdef TFU_UPGRADE
-   U8              tbCnt;
+  // U8              tbCnt;
 #endif 
 
    RgInfRlsHqInfo  *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]);
@@ -2159,6 +2160,7 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
 *       File:  rg_sch_utl.c
 *
 */
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlGenIndices
 (
@@ -2200,6 +2202,7 @@ PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo)
    }
    RETVALUE(ROK);
 } /* end of rgSCHTomUtlGenIndices*/
+#endif
 #endif 
 /**
  * @brief Handler for processing decode failure indication recieved from 
@@ -4503,6 +4506,7 @@ RgSchErrInfo            *err;
  *      -# ROK 
  *      -# RFAILED 
  */
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillSrRecpReq
 (
@@ -4591,8 +4595,8 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
    }
    RETVALUE(ROK);
 }/* end of rgSCHTomUtlFillSrRecpReq */
-
-
+#endif
+#endif
 /** @brief This function tells will the UE has a periodic CQI/PMI/RI 
  *  reporting
  *
@@ -4670,6 +4674,7 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
  *      -# ROK 
  *      -# RFAILED 
  */
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillRiRecpReq
 (
@@ -4773,7 +4778,7 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
    }
    RETVALUE(ROK);
 }/* end of rgSCHTomUtlFillRiRecpReq */
-
+#endif
 #ifdef RG_5GTF
 /** @brief This function handles filling of 5GTF CQI-RI reception request to
  * PHY.
@@ -4792,6 +4797,8 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# ROK 
  *      -# RFAILED 
  */
+
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq
 (
@@ -4845,7 +4852,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
    RETVALUE(ROK);
 }/* end of rgSCHTomUtlFillCqiRiRecpReq */
 #endif
-
+#endif
 /** @brief This function handles filling of PCQI reception request to
  * PHY.
  *
@@ -4863,6 +4870,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
  *      -# ROK 
  *      -# RFAILED 
  */
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq
 (
@@ -4960,7 +4968,6 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
    }
    RETVALUE(ROK);
 }/* end of rgSCHTomUtlFillPcqiRecpReq */
-
 /** @brief This function handles filling of SRS reception request to
  * PHY.
  *
@@ -6656,6 +6663,7 @@ Bool              isDatPresOnSecCell;
  *      -# ROK 
  *      -# RFAILED 
  **/
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr
 (
@@ -6816,7 +6824,7 @@ U16               validIdx;
 }  /* rgSCHTomUtlFillCqiSrsWithSr */
 
 #endif 
-
+#endif
 
 #ifdef LTE_TDD
 /** @brief This function handles filling of HARQ feedback repetition
@@ -8297,6 +8305,7 @@ RgSchCellCb          *cell;
  *  @param[in]  Inst   schInst
  *  @RETVALUE   None
  */
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSCHDynTDDMrkCrntSfIdx
 (
@@ -8320,7 +8329,7 @@ Inst   schInst;
 
    RETVOID;
 }
-
+#endif
 #endif
 /** @brief This function fills the TTI timinig info for each cell  
  *
@@ -8336,6 +8345,7 @@ Inst   schInst;
  * Returns: Void  
  *  
  */
+#ifdef UNUSE_FUN
 #ifdef ANSI
 PRIVATE Void rgSchTomFillCellTtiInfo
 (
@@ -8475,7 +8485,7 @@ RgSchCellCb        *cells[];
 #endif
    } 
 }
-
+#endif
 void schFillCrntTime(
    SlotIndInfo slotInd,
    Inst        schInst)
diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c
index 5f39b7a0e..cbf459889 100755
--- a/src/5gnrsch/rg_sch_utl.c
+++ b/src/5gnrsch/rg_sch_utl.c
@@ -236,6 +236,7 @@ PRIVATE S16 rgSCHChkBoUpdate ARGS((
          RgSchCellCb    *cell,
          RgInfCmnBoRpt  *boUpdt
          ));
+#ifdef UNUSE_FUN
 #ifdef TFU_UPGRADE
 PRIVATE U8 rgSCHUtlFetchPcqiBitSz ARGS((
  RgSchCellCb    *cell,
@@ -243,6 +244,7 @@ PRIVATE U8 rgSCHUtlFetchPcqiBitSz ARGS((
  U8           numTxAnt
  ));
 #endif
+#endif
 /* sorted in ascending order of tbSz */
 CONSTANT struct rgSchUtlBcchPcchTbSz
 {
@@ -11240,6 +11242,7 @@ U32           *prbReqrd;
 
    RETVOID;
 } /* rgSchUtlCalcTotalPrbReq */
+#ifdef UNUSE_FUN
 #ifdef TFU_UPGRADE
 /***********************************************************
  *
@@ -11397,6 +11400,7 @@ U8            numTxAnt;
    RETVALUE(pcqiSz);
 }
 #endif
+#endif
 /**
  * @brief  Utility function to returns the number of subbands based on the 
  *         requested bytes.