X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cmn.c;fp=src%2F5gnrsch%2Frg_sch_cmn.c;h=1429bd8d156a94848326e5dd500ed2eb699afbad;hb=4cb15fba2285d3181cf3f5f50b3ca86420db6b69;hp=0c055d5d40ae17209c98b6ab2047d13990bcb04b;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git

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 */