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=75fa54a270147233e376457eee36eabfba19d985;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c index 75fa54a27..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 @@ -3504,13 +3505,13 @@ CmLteTimingInfo end; if (end.sfn > start.sfn) { if (frm.sfn > start.sfn - || (frm.sfn == start.sfn && frm.subframe >= start.subframe)) + || (frm.sfn == start.sfn && frm.slot >= start.slot)) { if (frm.sfn < end.sfn #ifdef EMTC_ENABLE - || (frm.sfn == end.sfn && frm.subframe <= end.subframe)) + || (frm.sfn == end.sfn && frm.slot <= end.slot)) #else - || (frm.sfn == end.sfn && frm.subframe <= start.subframe)) + || (frm.sfn == end.sfn && frm.slot <= start.slot)) #endif { inWin = TRUE; @@ -3521,14 +3522,14 @@ CmLteTimingInfo end; else if (end.sfn < start.sfn) { if (frm.sfn > start.sfn - || (frm.sfn == start.sfn && frm.subframe >= start.subframe)) + || (frm.sfn == start.sfn && frm.slot >= start.slot)) { inWin = TRUE; } else { if (frm.sfn < end.sfn - || (frm.sfn == end.sfn && frm.subframe <= end.subframe)) + || (frm.sfn == end.sfn && frm.slot <= end.slot)) { inWin = TRUE; } @@ -3537,8 +3538,8 @@ CmLteTimingInfo end; else /* start.sfn == end.sfn */ { if (frm.sfn == start.sfn - && (frm.subframe >= start.subframe - && frm.subframe <= end.subframe)) + && (frm.slot >= start.slot + && frm.slot <= end.slot)) { inWin = TRUE; } @@ -4501,7 +4502,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; RGSCHDECRFRMCRNTTIME(frm, winStartFrm, winGap); //5G_TODO TIMING update. Need to check - winStartIdx = (winStartFrm.sfn & 1) * RGSCH_MAX_RA_RNTI+ winStartFrm.subframe; + winStartIdx = (winStartFrm.sfn & 1) * RGSCH_MAX_RA_RNTI+ winStartFrm.slot; for(i = 0; ((i < cell->rachCfg.raWinSize) && (noRaRnti < RG_SCH_CMN_MAX_CMN_PDCCH)); i++) { @@ -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, @@ -6117,7 +6118,7 @@ RgSchDlHqProcCb *hqP; addedForScell, addedForScell1, cell->crntTime.sfn, - cell->crntTime.subframe); + cell->crntTime.slot); */ } #endif @@ -6163,7 +6164,7 @@ RgSchDlHqProcCb *hqP; /* printf ("add DL TPT is %lu sfn:sf %d:%d \n", hqP->hqE->ue->tenbStats->stats.nonPersistent.sch[RG_SCH_CELLINDEX(hqP->hqE->cell)].dlTpt , cell->crntTime.sfn, - cell->crntTime.subframe); + cell->crntTime.slot); */ } #endif @@ -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. * @@ -6974,10 +6976,10 @@ RgSchCellCb *cell; TRC2(rgSCHCmnUpdVars); - idx = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe); + idx = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot); cellUl->idx = ((idx) % (RG_SCH_CMN_UL_NUM_SF)); #ifdef UL_ADPT_DBG - printf("idx %d cellUl->idx %d RGSCH_NUM_SUB_FRAMES_5G %d time(%d %d) \n",idx,cellUl->idx ,RGSCH_NUM_SUB_FRAMES_5G,cell->crntTime.sfn,cell->crntTime.subframe); + printf("idx %d cellUl->idx %d RGSCH_NUM_SUB_FRAMES_5G %d time(%d %d) \n",idx,cellUl->idx ,RGSCH_NUM_SUB_FRAMES_5G,cell->crntTime.sfn,cell->crntTime.slot); #endif /* Need to scheduler for after SCHED_DELTA */ /* UL allocation has been advanced by 1 subframe @@ -7163,7 +7165,7 @@ RgSchCellCb *cell; U32 numUlSf; #ifndef LTE_TDD - numUlSf = (timeInfo->sfn * RGSCH_NUM_SUB_FRAMES_5G + timeInfo->subframe); + numUlSf = (timeInfo->sfn * RGSCH_NUM_SUB_FRAMES_5G + timeInfo->slot); procId = numUlSf % RGSCH_NUM_UL_HQ_PROC; #else U8 ulDlCfgIdx = cell->ulDlCfgIdx; @@ -7192,7 +7194,7 @@ RgSchCellCb *cell; /* Calculate the total number of UL sf */ /* -1 is done since uplink sf are counted from 0 */ numUlSf = numUlSfInSfn * (timeInfo->sfn + (sfnCycle*1024)) + - rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][timeInfo->subframe] - 1; + rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][timeInfo->slot] - 1; procId = numUlSf % numUlHarq; #endif @@ -8510,7 +8512,7 @@ U32 *waitPer; TRC2(rgSCHCmnGetRefreshPer); refreshPer = RG_SCH_CMN_REFRESH_TIME * RG_SCH_CMN_REFRESH_TIMERES; - crntSubFrm = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe; + crntSubFrm = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot; /* Fix: syed align multiple UEs to refresh at same time */ *waitPer = refreshPer - (crntSubFrm % refreshPer); *waitPer = RGSCH_CEIL(*waitPer, RG_SCH_CMN_REFRESH_TIMERES); @@ -8866,7 +8868,7 @@ RgrUeCfg *cfg; ue->ue5gtfCb.cqiRiPer = 100; /* 5gtf TODO: CQIs to start from (10,0)*/ ue->ue5gtfCb.nxtCqiRiOccn.sfn = 10; - ue->ue5gtfCb.nxtCqiRiOccn.subframe = 0; + ue->ue5gtfCb.nxtCqiRiOccn.slot = 0; ue->ue5gtfCb.rank = 1; printf("\nschd cfg at mac,%u,%u,%u,%u,%u\n",ue->ue5gtfCb.grpId,ue->ue5gtfCb.BeamId,ue->ue5gtfCb.numCC, @@ -11130,10 +11132,10 @@ U8 *bwAvailRef; { #ifndef ALIGN_64BIT printf("CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%ld:%d:%d:%d:%d:%d]\n", - cell->crntTime.sfn, cell->crntTime.subframe, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb); + cell->crntTime.sfn, cell->crntTime.slot, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb); #else printf("CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%d:%d:%d:%d:%d:%d]\n", - cell->crntTime.sfn, cell->crntTime.subframe, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb); + cell->crntTime.sfn, cell->crntTime.slot, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb); #endif } @@ -13148,7 +13150,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; raCb->msg3AllocTime = cell->crntTime; RGSCH_INCR_SUB_FRAME(raCb->msg3AllocTime, RG_SCH_CMN_MIN_MSG3_RECP_INTRVL); #else - msg3SchdIdx = (cell->crntTime.subframe+RG_SCH_CMN_DL_DELTA) % + msg3SchdIdx = (cell->crntTime.slot+RG_SCH_CMN_DL_DELTA) % RGSCH_NUM_SUB_FRAMES; /*[ccpu00134666]-MOD-Modify the check to schedule the RAR in special subframe */ @@ -13158,7 +13160,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; RGSCHCMNADDTOCRNTTIME(cell->crntTime,raCb->msg3AllocTime, RG_SCH_CMN_DL_DELTA) msg3Subfrm = rgSchTddMsg3SubfrmTbl[ulDlCfgIdx][ - raCb->msg3AllocTime.subframe]; + raCb->msg3AllocTime.slot]; RGSCHCMNADDTOCRNTTIME(raCb->msg3AllocTime, raCb->msg3AllocTime, msg3Subfrm); } @@ -13225,7 +13227,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; "RNTI:%d Scheduled RAR @ (%u,%u) ", raRspAlloc->rnti, cell->crntTime.sfn, - cell->crntTime.subframe); + cell->crntTime.slot); } RETVOID; } @@ -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 @@ -14989,7 +14993,7 @@ RgSchCellCb *cell; to available scope for optimization */ TRC2(rgSCHCmnTmrProc); - if ((cell->crntTime.subframe % RGSCH_NUM_SUB_FRAMES_5G) == 0) + if ((cell->crntTime.slot % RGSCH_NUM_SUB_FRAMES_5G) == 0) { /* Reset the counters periodically */ if ((cell->crntTime.sfn % RG_SCH_CMN_CSG_REFRESH_TIME) == 0) @@ -15070,7 +15074,7 @@ U8 delta; #ifdef LTE_TDD dlIdx = rgSCHUtlGetDlSfIdx(cell, &pdsch); #else - dlIdx = (((pdsch.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (pdsch.subframe % RGSCH_NUM_SUB_FRAMES)); + dlIdx = (((pdsch.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (pdsch.slot % RGSCH_NUM_SUB_FRAMES)); RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, cell->subFrms, dlIdx); #endif /* If current downlink subframe index is same as pdcch SF index, @@ -15190,7 +15194,7 @@ U8 dlIdx; rgSchTddPdcchSfIncTbl[cell->ulDlCfgIdx][sfNum]) % cell->numDlSubfrms; #else cell->dynCfiCb.pdcchSfIdx = (dlIdx + RG_SCH_CFI_APPLY_DELTA) % \ - RGSCH_NUM_DL_SUBFRAMES; + RGSCH_NUM_DL_slotS; #endif } @@ -15247,7 +15251,7 @@ U8 delta; #else /* Changing the idexing so that proper subframe is selected */ - dlIdx = (((frm.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (frm.subframe % RGSCH_NUM_SUB_FRAMES)); + dlIdx = (((frm.sfn & 1) * RGSCH_NUM_SUB_FRAMES) + (frm.slot % RGSCH_NUM_SUB_FRAMES)); RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, cell->subFrms, dlIdx); dlSf = cell->subFrms[dlIdx]; #endif @@ -17057,7 +17061,7 @@ PUBLIC Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) U32 recReqTime; /*Received Time in TTI*/ TRC2(rgSCHCmnSrsInd); - recReqTime = (timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + timingInfo.subframe; + recReqTime = (timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + timingInfo.slot; ue->srsCb.selectedAnt = (recReqTime/ue->srsCb.peri)%2; if(srsRpt->wideCqiPres) { @@ -20016,7 +20020,7 @@ RgSchCellCb *cell; /* ccpu00132654-ADD- Initializing all the indices in every subframe*/ rgSCHCmnInitVars(cell); - idx = (cell->crntTime.subframe + TFU_ULCNTRL_DLDELTA) % RGSCH_NUM_SUB_FRAMES; + idx = (cell->crntTime.slot + TFU_ULCNTRL_DLDELTA) % RGSCH_NUM_SUB_FRAMES; /* Calculate the UL scheduling subframe idx based on the Pusch k table */ if(rgSchTddPuschTxKTbl[ulDlCfgIdx][idx] != 0) @@ -20064,13 +20068,13 @@ RgSchCellCb *cell; } } - idx = (cell->crntTime.subframe + TFU_RECPREQ_DLDELTA) % RGSCH_NUM_SUB_FRAMES; + idx = (cell->crntTime.slot + TFU_RECPREQ_DLDELTA) % RGSCH_NUM_SUB_FRAMES; if (rgSchTddUlDlSubfrmTbl[ulDlCfgIdx][idx] == RG_SCH_TDD_UL_SUBFRAME) { RGSCHCMNADDTOCRNTTIME(cell->crntTime, timeInfo, TFU_RECPREQ_DLDELTA) cellUl->rcpReqIdx = rgSCHCmnGetUlSfIdx(&timeInfo, cell); } - idx = (cell->crntTime.subframe+RG_SCH_CMN_DL_DELTA) % RGSCH_NUM_SUB_FRAMES; + idx = (cell->crntTime.slot+RG_SCH_CMN_DL_DELTA) % RGSCH_NUM_SUB_FRAMES; /*[ccpu00134666]-MOD-Modify the check to schedule the RAR in special subframe */ @@ -20383,7 +20387,7 @@ RgSchCellCb *cell; { while (cellSch->rachCfg.prachMskIndx < cell->rachCfg.raOccasion.size) { - if (cell->crntTime.subframe <\ + if (cell->crntTime.slot <\ cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx]) { break; @@ -20404,12 +20408,12 @@ RgSchCellCb *cell; } cellSch->rachCfg.prachMskIndx = 0; } - cellSch->rachCfg.applFrm.subframe = \ + cellSch->rachCfg.applFrm.slot = \ cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx]; } else { - cellSch->rachCfg.applFrm.subframe = \ + cellSch->rachCfg.applFrm.slot = \ cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx]; } @@ -20469,7 +20473,7 @@ RgSchCellCb *cell; cellSch->rachCfg.applFrm.sfn = (cellSch->rachCfg.applFrm.sfn+2) % \ RGSCH_MAX_SFN; } - cellSch->rachCfg.applFrm.subframe = cell->rachCfg.raOccasion.\ + cellSch->rachCfg.applFrm.slot = cell->rachCfg.raOccasion.\ subFrameNum[0]; } else /* applFrm.sfn is still valid */ @@ -20477,7 +20481,7 @@ RgSchCellCb *cell; cellSch->rachCfg.prachMskIndx += 1; if ( cellSch->rachCfg.prachMskIndx < RGR_MAX_SUBFRAME_NUM ) { - cellSch->rachCfg.applFrm.subframe = \ + cellSch->rachCfg.applFrm.slot = \ cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx]; } } @@ -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. @@ -21911,7 +21909,7 @@ RgSchUlSf *sf; { nxtAlloc = rgSCHUtlUlAllocNxt(sf, alloc); #ifdef UL_ADPT_DBG - printf("rgSCHCmnUlRmvCmpltdAllocs:time(%d %d) alloc->hqProc->remTx %d hqProcId(%d) \n",cell->crntTime.sfn,cell->crntTime.subframe,alloc->hqProc->remTx, alloc->grnt.hqProcId); + printf("rgSCHCmnUlRmvCmpltdAllocs:time(%d %d) alloc->hqProc->remTx %d hqProcId(%d) \n",cell->crntTime.sfn,cell->crntTime.slot,alloc->hqProc->remTx, alloc->grnt.hqProcId); #endif alloc->hqProc->rcvdCrcInd = TRUE; if ((alloc->hqProc->rcvdCrcInd) || (alloc->hqProc->remTx == 0)) @@ -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 */ @@ -30872,7 +30883,7 @@ RgSchCellCb *cell; * from application. No need to wait for next modification period. */ if((pdSchTmInfo.sfn % RGSCH_SIB1_RPT_PERIODICITY == 0) - && (RGSCH_SIB1_TX_SF_NUM == (pdSchTmInfo.subframe % RGSCH_NUM_SUB_FRAMES))) + && (RGSCH_SIB1_TX_SF_NUM == (pdSchTmInfo.slot % RGSCH_NUM_SUB_FRAMES))) { /*Check whether SIB1 with PWS has been updated*/ if(cell->siCb.siBitMask & RGSCH_SI_SIB1_PWS_UPD) @@ -30893,9 +30904,9 @@ RgSchCellCb *cell; period. If current SFN,SF No doesn't marks the start of next modification period, then return. */ if(!((pdSchTmInfo.sfn % cell->siCfg.modPrd == 0) - && (0 == pdSchTmInfo.subframe))) + && (0 == pdSchTmInfo.slot))) /*if(!((((pdSchTmInfo.hSfn * 1024) + pdSchTmInfo.sfn) % cell->siCfg.modPrd == 0) - && (0 == pdSchTmInfo.subframe)))*/ + && (0 == pdSchTmInfo.slot)))*/ { RETVOID; } @@ -31042,7 +31053,7 @@ RgSchCellCb *cell; if(cell->siCb.inWindow) { if ((crntTmInfo.sfn % cell->siCfg.minPeriodicity) == 0 && - crntTmInfo.subframe == 0) + crntTmInfo.slot == 0) { /* Reinit inWindow at the beginning of every SI window */ cell->siCb.inWindow = siWinSize - 1; @@ -31065,13 +31076,13 @@ RgSchCellCb *cell; cell->siCb.inWindow = siWinSize - 1; } - x = rgSCHCmnGetSiSetId(crntTmInfo.sfn, crntTmInfo.subframe, + x = rgSCHCmnGetSiSetId(crntTmInfo.sfn, crntTmInfo.slot, cell->siCfg.minPeriodicity); /* Window Id within a SI set. This window Id directly maps to a * unique SI Id */ windowId = (((crntTmInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + - crntTmInfo.subframe) - (x * (cell->siCfg.minPeriodicity * 10))) + crntTmInfo.slot) - (x * (cell->siCfg.minPeriodicity * 10))) / siWinSize; if(windowId >= RGR_MAX_NUM_SI) @@ -31094,7 +31105,7 @@ RgSchCellCb *cell; cell->siCb.siCtx.warningSiFlag = cell->siCb.siArray[windowId]. isWarningSi; cell->siCb.siCtx.timeToTx.sfn = crntTmInfo.sfn; - cell->siCb.siCtx.timeToTx.subframe = crntTmInfo.subframe; + cell->siCb.siCtx.timeToTx.slot = crntTmInfo.slot; RG_SCH_ADD_TO_CRNT_TIME(cell->siCb.siCtx.timeToTx, cell->siCb.siCtx.maxTimeToTx, (siWinSize - 1)) @@ -31179,7 +31190,7 @@ RgInfSfAlloc *subfrmAlloc; { #endif if((crntTimInfo.sfn % RGSCH_MIB_PERIODICITY == 0) - && (RGSCH_MIB_TX_SF_NUM == crntTimInfo.subframe)) + && (RGSCH_MIB_TX_SF_NUM == crntTimInfo.slot)) { MsgLen mibLen = 0; U8 sfnOctet, mibOct2 = 0; @@ -31242,7 +31253,7 @@ RgInfSfAlloc *subfrmAlloc; is not required here since the below check takes care of SFNs applicable for this one too.*/ if((crntTimInfo.sfn % RGSCH_SIB1_RPT_PERIODICITY == 0) - && (RGSCH_SIB1_TX_SF_NUM == crntTimInfo.subframe)) + && (RGSCH_SIB1_TX_SF_NUM == crntTimInfo.slot)) { /*If SIB1 has not been yet setup by Application, return*/ if(NULLP == (cell->siCb.crntSiInfo.sib1Info.sib1)) @@ -31306,7 +31317,7 @@ RgInfSfAlloc *subfrmAlloc; { /* Determine next scheduling subframe is ABS or not */ if(RG_SCH_ABS_ENABLED_ABS_SF == (RgSchAbsSfEnum)(cell->lteAdvCb.absCfg.absPattern - [((crntTimInfo.sfn*RGSCH_NUM_SUB_FRAMES) + crntTimInfo.subframe) % RGR_ABS_PATTERN_LEN])) + [((crntTimInfo.sfn*RGSCH_NUM_SUB_FRAMES) + crntTimInfo.slot) % RGR_ABS_PATTERN_LEN])) { /* Skip the SI scheduling to next tti */ RETVOID; @@ -31867,7 +31878,7 @@ RgSchCellCb *cell; if(RGR_ENABLE == cell->lteAdvCb.absCfg.status) { cell->lteAdvCb.absPatternDlIdx = - ((frm.sfn*RGSCH_NUM_SUB_FRAMES_5G) + frm.subframe) % RGR_ABS_PATTERN_LEN; + ((frm.sfn*RGSCH_NUM_SUB_FRAMES_5G) + frm.slot) % RGR_ABS_PATTERN_LEN; cell->lteAdvCb.absDlSfInfo = (RgSchAbsSfEnum)(cell->lteAdvCb.absCfg.absPattern[ cell->lteAdvCb.absPatternDlIdx]); @@ -32435,7 +32446,7 @@ PUBLIC Void rgSCHCmnDlSch (cell) /* printf("ul5gtfsidDlAlreadyMarkUl: %d, [sfn:sf] [%04d:%02d]\n", ul5gtfsidDlAlreadyMarkUl, cellSch->dl.time.sfn, - cellSch->dl.time.subframe); + cellSch->dl.time.slot); */ } RETVOID;