X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_tom.c;h=ac3cb3c9a713859386ad38af51a68896a4634181;hb=8d9ebf64c8a64bf1346685833fe79970c4ef3d14;hp=7ab88af4d28811da7adc96e3c9b79237c5694628;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c index 7ab88af4d..ac3cb3c9a 100755 --- a/src/5gnrsch/rg_sch_tom.c +++ b/src/5gnrsch/rg_sch_tom.c @@ -81,6 +81,8 @@ static int RLOG_MODULE_ID=4096; #ifdef EMTC_ENABLE #include "rg_sch_emtc_ext.x" #endif +U8 rgSCHCmnCalcPcqiBitSz(RgSchUeCb *ueCb,U8 numTxAnt); +PUBLIC S16 rgSCHDhm5gtfHqFdbkInd(RgSchUeCb *ue,RgSchCellCb *cell,CmLteTimingInfo timingInfo,TfuHqFdbk fdbk,RgSchErrInfo *err); /* local defines */ #ifdef EMTC_ENABLE EXTERN Bool rgSCHEmtcChkEmtcUe ARGS( @@ -305,6 +307,52 @@ U32 gUlCrcPassCounter = 0; #ifdef RG_5GTF EXTERN U32 gUl5gtfPdcchSend; +#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, @@ -312,9 +360,15 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ARGS( U16 validIdx, RgSchErrInfo *err )); +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 */ @@ -389,16 +443,6 @@ PUBLIC S16 rgSCHTomFillOnlySrsRecpReq ARGS RgSchUlAlloc *alloc, TfuUeRecpReqInfo *datRecpInfo )); - -PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS -(( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuRecpReqInfo *recpReqInfo, - TfuUeRecpReqInfo *pucchRecpInfo, - U16 validIdx - )); - PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS (( RgSchCellCb *cell, @@ -461,50 +505,9 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion ARGS RgSchCellCb *cell, RgSchUeCb *ue )); - -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 rgSCHTomUtlWillUeRprtCqiRi ARGS(( RgSchUeCb *ue, Bool *willueRprtCqiRii)); - -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 #ifdef TFU_UPGRADE PRIVATE S16 rgSCHTomUtlFillDatRecpReq ARGS(( @@ -591,6 +594,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS(( #ifdef LTEMAC_SPS EXTERN PUBLIC Void rgSCHCmnDlSpsSch (RgSchCellCb *cell); #ifndef LTE_TDD +#ifdef UNUSED_FUNC #ifdef TFU_UPGRADE PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS (( @@ -611,6 +615,7 @@ PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS #endif #endif #endif +#endif PRIVATE Void rgSchTomTtiMiscFunctions ARGS (( @@ -644,14 +649,6 @@ PRIVATE Void rgSCHTomUtlSendSfnTick ARGS RgSchCellCb *cell )); #endif - -PRIVATE Void rgSchTomFillCellTtiInfo ARGS -(( -TfuTtiIndInfo *ttiInd, -Inst schInst, -U8 *nCell, -RgSchCellCb *cells[] -)); #ifdef LTE_TDD PRIVATE Void rgSchTomUtlTddRlsSfAndHarq ARGS (( @@ -1099,9 +1096,7 @@ TfuHqIndInfo *harqAckInd; CmLList *node; TfuHqInfo *hqInfo; Pst pst; -#ifdef TFU_UPGRADE - U8 tbCnt; -#endif + // U8 tbCnt; RgInfRlsHqInfo *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]); U32 cellIdx; @@ -2159,6 +2154,7 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd) * File: rg_sch_utl.c * */ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHTomUtlGenIndices ( @@ -2200,6 +2196,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 +4500,7 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED */ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHTomUtlFillSrRecpReq ( @@ -4591,8 +4589,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 +4668,7 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) * -# ROK * -# RFAILED */ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHTomUtlFillRiRecpReq ( @@ -4773,7 +4772,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 +4791,8 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) * -# ROK * -# RFAILED */ + +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ( @@ -4845,7 +4846,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 +4864,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) * -# ROK * -# RFAILED */ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq ( @@ -4960,7 +4962,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 +6657,7 @@ Bool isDatPresOnSecCell; * -# ROK * -# RFAILED **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ( @@ -6816,7 +6818,7 @@ U16 validIdx; } /* rgSCHTomUtlFillCqiSrsWithSr */ #endif - +#endif #ifdef LTE_TDD /** @brief This function handles filling of HARQ feedback repetition @@ -8297,6 +8299,7 @@ RgSchCellCb *cell; * @param[in] Inst schInst * @RETVALUE None */ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Void rgSCHDynTDDMrkCrntSfIdx ( @@ -8320,7 +8323,7 @@ Inst schInst; RETVOID; } - +#endif #endif /** @brief This function fills the TTI timinig info for each cell * @@ -8336,6 +8339,7 @@ Inst schInst; * Returns: Void * */ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Void rgSchTomFillCellTtiInfo ( @@ -8475,7 +8479,7 @@ RgSchCellCb *cells[]; #endif } } - +#endif void schFillCrntTime( SlotIndInfo slotInd, Inst schInst)