X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cmn.c;h=7398c2006b3ef31533ec5720cf98dcb810f00d55;hb=f56e7aa2f07c03f3b30eda22a2260d038e0214e9;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..7398c2006 100755 --- a/src/5gnrsch/rg_sch_cmn.c +++ b/src/5gnrsch/rg_sch_cmn.c @@ -157,6 +157,7 @@ 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 PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc ( @@ -173,6 +174,73 @@ U8 startRb, 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 @@ -277,13 +345,6 @@ U8 cfi )); #endif -PRIVATE Void rgSCHCmnNonDlfsType0Alloc -( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -RgSchDlRbAlloc *allocInfo, -RgSchUeCb *ue -); PRIVATE Void rgSCHCmnInitRbAlloc ARGS (( RgSchCellCb *cell @@ -319,42 +380,6 @@ RgSchUeCb *ue, U32 bo, U32 *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo)); typedef U8 (*RgSchCmnDlGetPrecInfFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, U8 numLyrs, Bool bothCwEnbld)); - -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 -)); PRIVATE Void rgSCHCmnDlAllocTxRbTM1 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -710,18 +735,6 @@ U8 sf, U16 minPeriodicity )); -#ifdef TFU_UPGRADE -PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS(( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 maxRb, -U32 *numSb, -U8 *iTbs, -U32 hqSz, -U32 stepDownItbs, -U32 effTgt -)); -#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 +1256,6 @@ PRIVATE U32 rgSchCmnExtBsrTbl[64] = { 867737, 1067031, 1312097, 1613447, 1984009, 2439678, 3000000, 3100000 }; - -PRIVATE U8 rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29}; - PUBLIC U8 rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI]; PUBLIC RgSchTbSzTbl rgTbSzTbl = { @@ -1585,12 +1595,6 @@ PRIVATE Void rgSCHCmnMsg3GrntReq ARGS(( RgSchUlAlloc **ulAllocRef, U8 *hqProcIdRef )); -PRIVATE Void rgSCHCmnUlNonadapRetx ARGS(( - RgSchCmnUlCell *cellUl, - RgSchUlAlloc *alloc, - U8 idx - )); - PRIVATE Void rgSCHCmnDlCcchRarAlloc ARGS(( RgSchCellCb *cell )); @@ -1679,11 +1683,6 @@ RgSchCellCb *cell, RgSchUlSf *sf )); /* Fix: syed Adaptive Msg3 Retx crash. */ -PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ARGS(( -RgSchCellCb *cell, -RgSchUlSf *sf -)); - #ifdef TFU_UPGRADE PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS (( @@ -1748,6 +1747,7 @@ RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo )); #ifdef DEBUGP +#ifdef UNUSED_FUNC PRIVATE Void rgSCHCmnFindCodeRate ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -1756,6 +1756,7 @@ U8 idx )); #endif #endif +#endif PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc ARGS(( RgSchCellCb *cell, RgSchCmnMsg4RbAlloc *msg4AllocInfo, @@ -3346,7 +3347,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 @@ -4870,7 +4871,7 @@ U8 *hqProcIdRef; rgSCHUhmNewTx(hqProc, (U8)(cell->rachCfg.maxMsg3Tx - 1), alloc); //RLOG_ARG4(L_DEBUG,DBG_CELLID,cell->cellId, printf( - "\nRNTI:%d MSG3 ALLOC proc(%p)procId(%d)schdIdx(%d)\n", + "\nRNTI:%d MSG3 ALLOC proc(%lu)procId(%d)schdIdx(%d)\n", alloc->rnti, ((PTR)alloc->hqProc), alloc->hqProc->procId, @@ -6191,7 +6192,7 @@ RgSchDlHqProcCb *hqP; } RETVOID; } - +#ifdef UNUSED_FUNC /** * @brief This function fills the PDCCH DCI format 1 information from dlProc. * @@ -6214,6 +6215,7 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ + #ifdef ANSI PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 ( @@ -6462,7 +6464,7 @@ U8 tpc; #endif RETVOID; -} +} /** * @brief This function fills the PDCCH DCI format 1B information from dlProc. * @@ -6900,7 +6902,7 @@ U8 tpc; RETVOID; } - +#endif /** * @brief init of Sch vars. * @@ -13782,6 +13784,7 @@ Bool isNewTx; RETVOID; } +#ifdef UNUSED_FUNC #ifdef TFU_UPGRADE /*********************************************************** * @@ -13912,6 +13915,7 @@ U32 effTgt; RETVALUE(ROK); } #endif +#endif /*********************************************************** * * Func : rgSCHCmnUlRbAllocForUe @@ -21410,6 +21414,7 @@ RgSchRaReqInfo *raReq; * @return Void * **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Void rgSCHCmnUlNonadapRetx ( @@ -21443,7 +21448,6 @@ U8 idx; alloc->pdcch = NULLP; RETVOID; } - /** * @brief Check if 2 allocs overlap * @@ -21481,7 +21485,6 @@ RgSchUlAlloc *alloc2; } RETVALUE(FALSE); } - /** * @brief Copy allocation Info from src to dst. * @@ -21551,8 +21554,6 @@ RgSchUlAlloc *dstAlloc; RETVOID; } - - /** * @brief Update TX and RETX subframe's allocation * markings. @@ -21667,7 +21668,6 @@ RgSchUlAlloc *srcAlloc; dstAlloc->mrgdNewTxAlloc = TRUE; RETVOID; } - /** * @brief Merge all allocations of newSf to oldSf. * @@ -21717,7 +21717,6 @@ RgSchUlSf *newSf; } RETVOID; } - /** * @brief Swap Hole/Alloc DB context of newSf and oldSf. * @@ -21766,7 +21765,6 @@ RgSchUlSf *newSf; oldSf->allocCountRef = &oldSf->allocDb->count; RETVOID; } - /** * @brief Perform non-adaptive RETX for non-colliding allocs. * @@ -21870,7 +21868,7 @@ U8 idx; RETVOID; } - +#endif /** * @brief Update TX and RETX subframe's allocation * markings. @@ -22273,6 +22271,7 @@ RgSchUlHole *hole; * @param[in] RgSchUlSf *sf * @return U8 **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ( @@ -22304,7 +22303,7 @@ RgSchUlSf *sf; } RETVOID; } - +#endif /** * @brief Attempts allocation for UEs for which retransmissions @@ -23368,6 +23367,7 @@ Bool isPartialAlloc; * @param[in,out] RgSchDlRbAlloc *allocInfo * @return void **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Void rgSCHCmnFindCodeRate ( @@ -23851,7 +23851,7 @@ Bool isBcchPcch; RETVOID; } /* end of rgSCHCmnNonDlfsPbchRbAllocAdj */ #endif - +#endif /** * @brief Performs RB allocation for frequency non-selective cell. * @@ -24197,6 +24197,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) * -# TRUE * -# FALSE **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl ( @@ -24574,6 +24575,7 @@ Bool isUeCellEdge; } RETVALUE(FALSE); } +#endif #endif /* end of ifndef LTE_TDD*/ /* LTE_ADV_FLAG_REMOVED_END */ @@ -24595,6 +24597,7 @@ Bool isUeCellEdge; * -# TRUE * -# FALSE **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl ( @@ -24777,6 +24780,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 +24879,7 @@ U8 numRb; * * @return Void **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc ( @@ -24966,7 +24971,9 @@ U8 numRb; dlSf->type2Start += numRb; #endif RETVALUE(ROK); + } +#endif #endif /* end of ifndef LTE_TDD*/ /* LTE_ADV_FLAG_REMOVED_END */ /** @@ -25031,6 +25038,7 @@ U8 numRb; * * @return Void **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE Void rgSCHCmnNonDlfsType0Alloc ( @@ -25190,6 +25198,7 @@ RgSchUeCb *ue; dlSf->lstRbgDfct = 0; RETVOID; } +#endif #ifndef LTE_TDD /** @@ -25207,6 +25216,7 @@ RgSchUeCb *ue; * * @return Void **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHCmnBuildRntpInfo ( @@ -25274,7 +25284,6 @@ U16 bw; RETVALUE(ROK); } - /** * @brief To update non-DLFS alloc'n parameters after TYPE2 Allocation. * @@ -25489,7 +25498,7 @@ RgSchDlRbAlloc *allocInfo; dlSf->lstRbgDfct = 0; RETVOID; } - +#endif /** * @brief Computes RNTP Info for a subframe. * @@ -25593,6 +25602,7 @@ RgSchDlSf *dlSf; * -# ROK * -# RFAILED **/ +#ifdef UNUSED_FUNC #ifdef ANSI PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc ( @@ -25693,6 +25703,7 @@ U8 *isDlBwAvail; RETVALUE(ROK); } +#endif /* LTE_ADV_FLAG_REMOVED_END */ #endif /* LTE_TDD */