X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_scell.c;h=2990c0f3e0e4aa01551b8a42ed42ffcc9b0a1d40;hb=2bd852089c3226f721d83b30f816b90f803237f6;hp=c026375119f5238326e490c708f062a1fae1dd54;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c index c02637511..2990c0f3e 100755 --- a/src/5gnrsch/rg_sch_scell.c +++ b/src/5gnrsch/rg_sch_scell.c @@ -79,8 +79,8 @@ RgSchUeCb *ue Void rgSCHSCellHndlFdbkInd ARGS(( RgSchDlHqProcCb *hqP, -U8 tbIdx, -U8 fdbk, +uint8_t tbIdx, +uint8_t fdbk, Bool maxHqRetxReached )); @@ -93,7 +93,7 @@ RgSchUeCellInfo *sCell Void rgSCHSCellDelUeSCell ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, -U8 sCellIdx +uint8_t sCellIdx )); S16 rgSCHSCellDelUe ARGS(( @@ -107,13 +107,13 @@ RgSchCellCb *secCellCb, RgSchUeCb *ueCb, RgrUePrdDlCqiCfg *cqiCfg, CmLteUeCategory ueCat, -U8 sCellIdx +uint8_t sCellIdx )); #endif -PRIVATE S16 rgSCHSCellTrgMacHqEReset ARGS(( +static S16 rgSCHSCellTrgMacHqEReset ARGS(( Inst inst, -U16 secCellId, -U16 rnti +uint16_t secCellId, +uint16_t rnti )); @@ -132,22 +132,11 @@ U16 rnti * @return Void * -# None. **/ -#ifdef ANSI -Void rgSCHSCellSchdActDeactCe -( -RgSchUeCb *ueCb, -RgSchDlHqTbCb *tbInfo -) -#else -Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo) -RgSchUeCb *ueCb; -RgSchDlHqTbCb *tbInfo; -#endif +Void rgSCHSCellSchdActDeactCe(RgSchUeCb *ueCb,RgSchDlHqTbCb *tbInfo) { - U8 bitVal = 0; - U8 sCellActDeactBitMask = 0; - TRC3(rgSCHSCellSchdActDeactCe); + uint8_t bitVal = 0; + uint8_t sCellActDeactBitMask = 0; /* Change the state of all Scells waiting for * activation */ @@ -159,7 +148,7 @@ RgSchDlHqTbCb *tbInfo; * 0 for deactivation * */ - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ueCb->cellInfo[idx] != NULLP) { @@ -201,7 +190,7 @@ RgSchDlHqTbCb *tbInfo; tbInfo->schdSCellActCe.pres = PRSNT_NODEF; tbInfo->schdSCellActCe.val = sCellActDeactBitMask; - RETVOID; + return; } /* rgSCHSCellSchdActDeactCe */ @@ -220,20 +209,9 @@ RgSchDlHqTbCb *tbInfo; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellAddToActDeactLst -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHSCellAddToActDeactLst(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHSCellAddToActDeactLst(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC3(rgSCHSCellAddToActDeactLst); if(NULLP == ue->sCellActLnk.node) {/* Ue is not present in the list */ @@ -242,11 +220,10 @@ RgSchUeCb *ue; } else { - RGSCHDBGINFONEW(cell->instIdx,(rgSchPBuf(cell->instIdx), - "SCell is already added in the Act List: ueId(%u)\n", ue->ueId)); + DU_LOG("\nINFO --> SCH : SCell is already added in the Act List: ueId(%u)\n", ue->ueId); } - RETVOID; + return; } @@ -265,27 +242,16 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellRmvFrmActLst -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHSCellRmvFrmActLst(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHSCellRmvFrmActLst(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC3(rgSCHSCellRmvFrmActLst); if (NULLP != ue->sCellActLnk.node) { cmLListDelFrm(&cellCmnDl->secCellActCeLst, &ue->sCellActLnk); } ue->sCellActLnk.node = (PTR)NULLP; - RETVOID; + return; } /** @@ -305,15 +271,7 @@ RgSchUeCb *ue; * @return ROK/RFAILED * **/ -#ifdef ANSI -Void rgSCHSCellActivation -( -RgSchUeCellInfo *sCellInfo -) -#else -Void rgSCHSCellActivation(sCellInfo) -RgSchUeCellInfo *sCellInfo -#endif +Void rgSCHSCellActivation(RgSchUeCellInfo *sCellInfo) { RgSchCellCb *sCell = sCellInfo->cell; RgSchUeCb *ueCb = sCellInfo->ue; @@ -322,18 +280,17 @@ RgSchUeCellInfo *sCellInfo #ifdef DEBUGP Inst inst = ueCb->cell->instIdx; #endif - U16 tempIdx; + uint16_t tempIdx; RgrUePrdDlCqiCfg *cqiCfg; - U8 j; /*Bandwidth Parts*/ - U16 riTrInsTime; - U16 periodicity; - U16 cqiTrInstTime; + uint8_t j; /*Bandwidth Parts*/ + uint16_t riTrInsTime; + uint16_t periodicity; + uint16_t cqiTrInstTime; RgSchUePCqiCb *cqiCb = NULLP; CmLteTimingInfo timingInfo; - U16 crntTime; + uint16_t crntTime; #endif - TRC3(rgSCHSCellActivation); sCellInfo->sCellState = RG_SCH_SCELL_ACTIVE; #ifdef TENB_STATS @@ -341,7 +298,8 @@ RgSchUeCellInfo *sCellInfo #endif #ifdef CA_DBG - printf("ueId is SCELL_ACTIVE\n ueCb->ueId = %d sCell->sCellIdx =%d, sCell->sCellId=%d, sCell->sCellState=%d \n", ueCb->ueId, sCellInfo->sCellIdx, sCellInfo->sCellId, sCellInfo->sCellState); + DU_LOG("\nDEBUG --> SCH : ueId is SCELL_ACTIVE\n ueCb->ueId = %d sCell->sCellIdx =%d,\ + sCell->sCellId=%d, sCell->sCellState=%d \n", ueCb->ueId, sCellInfo->sCellIdx, sCellInfo->sCellId, sCellInfo->sCellState); #endif /* Start the sCellDeactivation timer if cfgd */ if(PRSNT_NODEF == ueCb->sCellDeactTmrVal.pres) @@ -379,19 +337,18 @@ RgSchUeCellInfo *sCellInfo cqiCb->nCqiTrIdx = cqiCb->nCqiTrIdx %RG_SCH_PCQI_SRS_SR_TRINS_SIZE; - RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "CQI Config: idx(%u) Periodicity %u" + DU_LOG("\nINFO --> SCH : CQI Config: idx(%u) Periodicity %u" "Offset %u uePosInQ (%u)\n", cqiCfg->cqiSetup.cqiPCfgIdx, - cqiCb->cqiPeri, cqiCb->cqiOffset,cqiCb->nCqiTrIdx)); + cqiCb->cqiPeri, cqiCb->cqiOffset,cqiCb->nCqiTrIdx); cmLListAdd2Tail(&ueCb->cell->pCqiSrsSrLst[cqiCb->nCqiTrIdx].cqiLst, &cqiCb->cqiLstEnt); rgSCHUtlSCellHndlCqiCollsn(cqiCb); - RGSCHDBGINFO(inst,(rgSchPBuf(inst), - "\n rgSCHCfgPCqiUeCfg():" + DU_LOG("\nINFO --> SCH : rgSCHCfgPCqiUeCfg():" " CrntTime=%d Next CqiTrInstTime=%d Index Stored at=%d ", - crntTime, cqiTrInstTime, cqiCb->nCqiTrIdx)); + crntTime, cqiTrInstTime, cqiCb->nCqiTrIdx); if(cqiCfg->cqiSetup.riEna) { @@ -450,8 +407,8 @@ RgSchUeCellInfo *sCellInfo % RG_SCH_PCQI_SRS_SR_TRINS_SIZE; if(periodicity >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE) { - cqiCb->riDist = rgSCHUtlFindDist((U16)(crntTime + TFU_RECPREQ_DLDELTA), - (U16) tempIdx); + cqiCb->riDist = rgSCHUtlFindDist((uint16_t)(crntTime + TFU_RECPREQ_DLDELTA), + (uint16_t) tempIdx); } else { @@ -468,25 +425,24 @@ RgSchUeCellInfo *sCellInfo rgSCHUtlSCellHndlRiCollsn(cqiCb); /*werror*/ #ifndef BIT_64 - RGSCHDBGINFONEW(inst,(rgSchPBuf(inst), "SCel RI cfg:" + DU_LOG("\nINFO --> SCH : SCel RI cfg:" "idx %u period %u Offset %u posInQ(%u) riDist(%u)lst count" "%lu\n", cqiCfg->cqiSetup.riCfgIdx, cqiCb->riPeri, cqiCb->riOffset, cqiCb->nRiTrIdx, cqiCb->riDist, - ueCb->cell->pCqiSrsSrLst[cqiCb->nRiTrIdx].riLst.count)); + ueCb->cell->pCqiSrsSrLst[cqiCb->nRiTrIdx].riLst.count); #else - RGSCHDBGINFONEW(inst,(rgSchPBuf(inst), "SCel RI cfg:" + DU_LOG("\nINFO --> SCH : SCel RI cfg:" "idx %u period %u Offset %u posInQ(%u) riDist(%u)lst count" "%u\n", cqiCfg->cqiSetup.riCfgIdx, cqiCb->riPeri, cqiCb->riOffset, cqiCb->nRiTrIdx, cqiCb->riDist, - ueCb->cell->pCqiSrsSrLst[cqiCb->nRiTrIdx].riLst.count)); + ueCb->cell->pCqiSrsSrLst[cqiCb->nRiTrIdx].riLst.count); #endif - RGSCHDBGINFO(inst,(rgSchPBuf(inst), - "\n rgSCHSCellActivation(): CrntTime=%d Next RiTrInstTime=%d" + DU_LOG("\nINFO --> SCH : \n rgSCHSCellActivation(): CrntTime=%d Next RiTrInstTime=%d" "Index Stored at=%d riDis=%d ", - crntTime, riTrInsTime, cqiCb->nRiTrIdx, cqiCb->riDist)); + crntTime, riTrInsTime, cqiCb->nRiTrIdx, cqiCb->riDist); } } #endif @@ -494,7 +450,7 @@ RgSchUeCellInfo *sCellInfo cellSch = RG_SCH_CMN_GET_CELL(sCellInfo->cell); cellSch->apisDl->rgSCHDlSCellActv(sCellInfo->cell, sCellInfo->ue); - RETVOID; + return; } #ifdef TFU_UPGRADE @@ -514,18 +470,9 @@ RgSchUeCellInfo *sCellInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCellClearScellLstOfCQI -( -RgSchUeCellInfo *sCellInfo -) -#else -PRIVATE Void rgSCHCellClearScellLstOfCQI(sCellInfo) -RgSchUeCellInfo *sCellInfo; -#endif +static Void rgSCHCellClearScellLstOfCQI(RgSchUeCellInfo *sCellInfo) { - TRC3(rgSCHCellClearScellLstOfCQI); RgSchUePCqiCb *cqiRiCb = NULLP; RgSchUeCb *ueCb; ueCb = sCellInfo->ue; @@ -558,7 +505,7 @@ RgSchUeCellInfo *sCellInfo; } } - RETVOID; + return; } #endif/*TFU_UPGRADE*/ @@ -582,21 +529,12 @@ RgSchUeCellInfo *sCellInfo; * @return ROK/RFAILED * **/ -#ifdef ANSI -PRIVATE S16 rgSCHSCellDeActivation -( -RgSchUeCellInfo *sCellInfo -) -#else -PRIVATE S16 rgSCHSCellDeActivation(sCellInfo) -RgSchUeCellInfo *sCellInfo -#endif +static S16 rgSCHSCellDeActivation(RgSchUeCellInfo *sCellInfo) { return ROK; RgSchCmnCell *cellSch; Inst inst = sCellInfo->cell->instIdx; - TRC3(rgSCHSCellDeActivation); /* Stop the timer if running */ if(sCellInfo->deactTmr.tmrEvnt != TMR_NONE) @@ -640,7 +578,8 @@ RgSchUeCellInfo *sCellInfo cellSch->apisDl->rgSCHDlSCellDeactv(sCellInfo->cell, sCellInfo->ue); #ifdef CA_DBG - printf("SCELL DEATIVATED sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId); + DU_LOG("\nDEBUG --> SCH : SCELL DEATIVATED sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n",\ + sCellInfo->ue->ueId, sCellInfo->sCellId); //MSPD_DBG("SCELL DEATIVATED sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId); #endif return ROK; @@ -661,24 +600,12 @@ RgSchUeCellInfo *sCellInfo * * Invoked by: CommonScheduler * - * @param[in] U16 sCellId - * @param[in] U16 rnti + * @param[in] uint16_t sCellId + * @param[in] uint16_t rnti * @return Void * **/ -#ifdef ANSI -PRIVATE S16 rgSCHSCellTrgMacHqEReset -( -Inst inst, -U16 secCellId, -U16 rnti -) -#else -PRIVATE S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti) -Inst inst; -U16 secCellId; -U16 rnti; -#endif +static S16 rgSCHSCellTrgMacHqEReset(Inst inst,uint16_t secCellId,uint16_ rnti) { Pst pst; RgSchCellCb *secCellCb = NULLP; @@ -686,7 +613,7 @@ U16 rnti; if((secCellCb = (RgSchCellCb *)rgSchUtlGetCellCb(inst, secCellId)) == NULLP) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists")); + DU_LOG("\nERROR --> SCH : SCell doesnt exists"); return RFAILED; } @@ -723,28 +650,13 @@ U16 rnti; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellHndlFdbkInd -( -RgSchDlHqProcCb *hqP, -U8 tbIdx, -U8 fdbk, -Bool maxHqRetxReached -) -#else -Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached) -RgSchDlHqProcCb *hqP; -U8 tbIdx; -U8 fdbk; -Bool maxHqRetxReached; -#endif +Void rgSCHSCellHndlFdbkInd(RgSchDlHqProcCb *hqP,uint8_t tbIdx,uint8_t fdbk,Bool maxHqRetxReached) { RgSchUeCb *ueCb; RgSchCellCb *cell; RgSchUeCellInfo *sCellInfo; - TRC3(rgSCHSCellHndlFdbkInd); ueCb = hqP->hqE->ue; cell = ueCb->cell; @@ -754,14 +666,14 @@ Bool maxHqRetxReached; { hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE; - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ueCb->cellInfo[idx] != NULLP) { if(ueCb->cellInfo[idx]->sCellState == RG_SCH_SCELL_ACTVTN_IN_PROG) { #ifdef CA_DBG - printf("\n starting delay timer...\n"); + DU_LOG("\nINFO --> SCH : starting delay timer...\n"); #endif rgSCHTmrStartTmr (cell,ueCb->cellInfo[idx] ,RG_SCH_TMR_SCELL_ACT_DELAY, RG_SCH_CMN_SCELL_ACT_DELAY_TMR); @@ -784,7 +696,7 @@ Bool maxHqRetxReached; if(TRUE == maxHqRetxReached) { hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE; - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ueCb->cellInfo[idx] != NULLP) { @@ -809,7 +721,7 @@ Bool maxHqRetxReached; default: break; } - RETVOID; + return; } #ifdef LTE_ADV @@ -832,18 +744,9 @@ Bool maxHqRetxReached; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellDeactTmrExpry -( -RgSchUeCellInfo *sCellInfo -) -#else -Void rgSCHSCellDeactTmrExpry(sCellInfo) -RgSchUeCellInfo *sCellInfo; -#endif +Void rgSCHSCellDeactTmrExpry(RgSchUeCellInfo *sCellInfo) { - TRC3(rgSCHSCellDeactTmrExpry); if (sCellInfo->ue->isScellExplicitDeAct == TRUE) { /* Deactivation Timer is not configured (infinity), thus send deactivation CE explicitly */ @@ -854,7 +757,7 @@ RgSchUeCellInfo *sCellInfo; } else { - printf (" !!!!!! Avoiding DEACT for UE %d because of LAA Cell !!!!!!!!!!!!! \n", + DU_LOG("\nERROR --> SCH : !!!!!! Avoiding DEACT for UE %d because of LAA Cell !!!!!!!!!!!!! \n", sCellInfo->ue->ueId); } @@ -864,7 +767,7 @@ RgSchUeCellInfo *sCellInfo; /* Deactivation Timer is configured, thus assume that UE has deactivated */ rgSCHSCellDeActivation(sCellInfo); } - RETVOID; + return; } #endif @@ -883,45 +786,28 @@ RgSchUeCellInfo *sCellInfo; * * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb - * @param[in] U8 sCellIdx - * @param[in] U8 action + * @param[in] uint8_t sCellIdx + * @param[in] uint8_t action * * @return ROK/RFAILED * **/ -#ifdef ANSI -S16 rgSCHSCellTrigActDeact -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -U8 sCellIdx, -U8 action -) -#else -S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action) -RgSchCellCb *cell, -RgSchUeCb *ueCb; -U8 sCellIdx; -U8 action; -#endif +S16 rgSCHSCellTrigActDeact(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t sCellIdx,uint8_t action) { Inst inst = cell->instIdx; S16 ret = ROK; - TRC3(rgSCHSCellTrigActDeact); - if((sCellIdx < 1) || (sCellIdx > RGR_MAX_SCELL_PER_UE)) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", \ - sCellIdx)); + DU_LOG("\nERROR --> SCH : Invalid Serv Cell Idx %d\n", sCellIdx); return RFAILED; } if(ueCb->cellInfo[sCellIdx] == NULLP) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d ueId %d\n", \ - sCellIdx,ueCb->ueId)); + DU_LOG("\nERROR --> SCH : Serv Cell not added to this Ue Scell Idx %d ueId %d\n", \ + sCellIdx,ueCb->ueId); return RFAILED; } @@ -931,8 +817,8 @@ U8 action; { if(ueCb->cellInfo[sCellIdx]->sCellState != RG_SCH_SCELL_INACTIVE) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid state %u for preparing SCell Idx %u for UE %u\n", \ - ueCb->cellInfo[sCellIdx]->sCellState, sCellIdx, ueCb->ueId)); + DU_LOG("\nERROR --> SCH : Invalid state %u for preparing SCell Idx %u for UE %u\n", \ + ueCb->cellInfo[sCellIdx]->sCellState, sCellIdx, ueCb->ueId); ret = RFAILED; } else @@ -943,8 +829,10 @@ U8 action; /* Setting allocCmnUlPdcch flag to FALSE, So that PDCCH allocation will be done from UE Searchspace */ ueCb->allocCmnUlPdcch = FALSE; - printf("\n***** SCellIdx=%d state Changed to %d State \n",sCellIdx, ueCb->cellInfo[sCellIdx]->sCellState); - printf("\n***** SCellInfo Addr=%p state Changed to RG_SCH_SCELL_READY\n",(void*)ueCb->cellInfo[sCellIdx]); + DU_LOG("\nINFO --> SCH : ***** SCellIdx=%d state Changed to %d State \n",sCellIdx,\ + ueCb->cellInfo[sCellIdx]->sCellState); + DU_LOG("\nINFO --> SCH : ***** SCellInfo Addr=%p state Changed to RG_SCH_SCELL_READY\n",\ + (void*)ueCb->cellInfo[sCellIdx]); } break; } @@ -952,8 +840,8 @@ U8 action; { if(ueCb->cellInfo[sCellIdx]->sCellState != RG_SCH_SCELL_READY) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid state %u for activating SCell Idx %u for UE %u\n", \ - ueCb->cellInfo[sCellIdx]->sCellState, sCellIdx, ueCb->ueId)); + DU_LOG("\nERROR --> SCH : Invalid state %u for activating SCell Idx %u for UE %u\n", \ + ueCb->cellInfo[sCellIdx]->sCellState, sCellIdx, ueCb->ueId); ret = RFAILED; } else @@ -971,8 +859,8 @@ U8 action; { if(ueCb->cellInfo[sCellIdx]->sCellState != RG_SCH_SCELL_ACTIVE) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid state %u for deactivating SCell Idx %u for UE %u\n", \ - ueCb->cellInfo[sCellIdx]->sCellState, sCellIdx, ueCb->ueId)); + DU_LOG("\nERROR --> SCH : Invalid state %u for deactivating SCell Idx %u for UE %u\n", \ + ueCb->cellInfo[sCellIdx]->sCellState, sCellIdx, ueCb->ueId); ret = RFAILED; } else @@ -988,8 +876,8 @@ U8 action; } default: { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid action received for SCell Idx %u for UE %u\n", \ - sCellIdx, ueCb->ueId)); + DU_LOG("\nERROR --> SCH : Invalid action received for SCell Idx %u for UE %u\n", \ + sCellIdx, ueCb->ueId); ret = RFAILED; break; } @@ -1014,21 +902,8 @@ U8 action; * @return ROK/RFAILED * **/ -#ifdef ANSI -PRIVATE S16 rgSCHSCellSelectForAct -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -U8 *sCellIdx -) -#else -PRIVATE S16 rgSCHSCellSelectForAct(cell, ueCb) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -U8 *sCellIdx; -#endif +static S16 rgSCHSCellSelectForAct(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t *sCellIdx) { - TRC3(rgSCHSCellSelectAndAct); for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++) { @@ -1053,26 +928,14 @@ U8 *sCellIdx; * * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb - * @param[in] U8 action + * @param[in] uint8_t action * * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellSelectAndActDeAct -( -RgSchCellCb *pCell, -RgSchUeCb *ueCb, -U8 action -) -#else -Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action) -RgSchCellCb *pCell; -RgSchUeCb *ueCb; -U8 action; -#endif +Void rgSCHSCellSelectAndActDeAct(RgSchCellCb *pCell,RgSchUeCb *ueCb,uint8_t action) { - U8 sCellIdx = 0; + uint8_t sCellIdx = 0; S16 ret = ROK; switch (action) @@ -1082,19 +945,19 @@ U8 action; if(((ret = rgSCHSCellSelectForAct(pCell, ueCb, &sCellIdx)) == ROK) && (sCellIdx == 0)) - RETVOID; + return; break; } default: - RETVOID; + return; } if ((ret != ROK) || (ROK != (rgSCHSCellTrigActDeact(pCell, ueCb, sCellIdx, action)))) { - RGSCHDBGERR(pCell->instIdx,(rgSchPBuf(pCell->instIdx), "SCell Actication failed" - "for UE [%d] with SCellIdx [%d]\n", ueCb->ueId, sCellIdx)); + DU_LOG("\nERROR --> SCH : SCell Actication failed" + "for UE [%d] with SCellIdx [%d]\n", ueCb->ueId, sCellIdx); } - RETVOID; + return; } @@ -1113,39 +976,26 @@ U8 action; * * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb - * @param[in] U8 idx + * @param[in] uint8_t idx * @return ROK/RFAILED * **/ -#ifdef ANSI -Void rgSCHSCellDelUeSCell -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb, -U8 sCellIdx -) -#else -Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -U8 sCellIdx; -#endif +Void rgSCHSCellDelUeSCell(RgSchCellCb *cellCb,RgSchUeCb *ueCb,uint8_t sCellIdx) { RgUeUlHqCb *ulHqEnt; Inst inst = cellCb->instIdx; RgSchUeCellInfo *sCellInfo; RgSchCmnUlUe *ueUl; - TRC3(rgSCHSCellDelUeSCell); sCellInfo = ueCb->cellInfo[sCellIdx]; if(sCellInfo == NULLP) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d\ + DU_LOG("\nERROR --> SCH : Serv Cell not added to this Ue Scell Idx %d\ ueId %d\n", - sCellIdx,ueCb->ueId)); - RETVOID; + sCellIdx,ueCb->ueId); + return; } rgSCHDbmDelUeCb(sCellInfo->cell, ueCb); @@ -1182,7 +1032,7 @@ U8 sCellIdx; ueCb->cellInfo[sCellIdx] = NULLP; - RETVOID; + return; } /** @@ -1204,22 +1054,11 @@ U8 sCellIdx; * @return ROK/RFAILED * **/ -#ifdef ANSI -S16 rgSCHSCellDelUe -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb -) -#else -S16 rgSCHSCellDelUe(cellCb,ueCb) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -#endif +S16 rgSCHSCellDelUe(RgSchCellCb *cellCb,RgSchUeCb *ueCb) { - TRC3(rgSCHSCellDelUe); - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { rgSCHSCellDelUeSCell(cellCb,ueCb,idx); } @@ -1259,7 +1098,6 @@ RgSchUeCb *ueCb; * @return ROK/RFAILED * **/ -#ifdef ANSI S16 rgSCHSCellPCqiCfg ( RgSchCellCb *priCellCb, @@ -1267,37 +1105,25 @@ RgSchCellCb *secCellCb, RgSchUeCb *ueCb, RgrUePrdDlCqiCfg *cqiCfg, CmLteUeCategory ueCat, -U8 sCellIdx +uint8_t sCellIdx ) -#else -S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx) -RgSchCellCb *priCellCb; -RgSchCellCb *secCellCb; -RgSchUeCb *ueCb; -RgrUePrdDlCqiCfg *cqiCfg; -CmLteUeCategory ueCat; -U8 sCellIdx; -#endif { - U8 j; /*Bandwidth Parts*/ - U8 temp; + uint8_t j; /*Bandwidth Parts*/ + uint8_t temp; #ifdef DEBUGP Inst inst = priCellCb->instIdx; #endif RgSchUeCellInfo *sCellInfo; RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHSCellPCqiCfg); - - RGSCHDBGINFO(priCellCb->instIdx, (rgSchPBuf(priCellCb->instIdx), - "rgSCHSCellPCqiCfg cellId =%d, ueId = %d, CfgType =%d\n", - secCellCb->cellId, ueCb->ueId, cqiCfg->type)); + DU_LOG("\nINFO --> SCH : rgSCHSCellPCqiCfg cellId =%d, ueId = %d, CfgType =%d\n", + secCellCb->cellId, ueCb->ueId, cqiCfg->type); if((sCellIdx < 1) || (sCellIdx > RGR_MAX_SCELL_PER_UE)) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", - sCellIdx)); + DU_LOG("\nERROR --> SCH : Invalid Serv Cell Idx %d\n", + sCellIdx); return RFAILED; } @@ -1310,7 +1136,7 @@ U8 sCellIdx; if (cqiCfg->type == RGR_SCH_PCQI_SETUP) { /* 1. Copy the Received CQI Cfg parameters to ueCb */ - cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg, + memcpy(&cqiCb->cqiCfg, cqiCfg, sizeof(RgrUePrdDlCqiCfg)); /* 2. Compute Periodic CQI Periodicity and subframe offset */ @@ -1324,13 +1150,12 @@ U8 sCellIdx; #endif - RGSCHDBGINFO(priCellCb->instIdx,(rgSchPBuf(priCellCb->instIdx), - "\n rgSCHSCellPCqiCfg(): CQI Peri=%d, CQI Offset=%d", - cqiCb->cqiPeri,cqiCb->cqiOffset)); + DU_LOG("\nDEBUG --> SCH : rgSCHSCellPCqiCfg(): CQI Peri=%d, CQI Offset=%d", + cqiCb->cqiPeri,cqiCb->cqiOffset); if(RGR_UE_PCQI_SB_REP == cqiCfg->cqiSetup.cqiRepType) { - U8 k; /*SubBand Size (RB) */ + uint8_t k; /*SubBand Size (RB) */ RG_SCH_GET_CQI_J_VAL(secCellCb->bwCfg.dlTotalBw, j); RG_SCH_GET_CQI_K_VAL(secCellCb->bwCfg.dlTotalBw, k); cqiCb->J = j; /*Number of Bandwidth Parts*/ @@ -1359,9 +1184,8 @@ U8 sCellIdx; cqiCfg->cqiSetup.riCfgIdx, &cqiCb->riPeri, &cqiCb->riOffset); - RGSCHDBGINFO(priCellCb->instIdx,(rgSchPBuf(priCellCb->instIdx), - "\n rgSCHSCellPCqiCfg(): RI Peri=%d, RI Offset=%d", - cqiCb->riPeri,cqiCb->riOffset)); + DU_LOG("\nDEBUG --> SCH : rgSCHSCellPCqiCfg(): RI Peri=%d, RI Offset=%d", + cqiCb->riPeri,cqiCb->riOffset); if(ueCb->cellInfo[sCellIdx]->txMode.txModeEnum == RGR_UE_TM_3 || ueCb->cellInfo[sCellIdx]->txMode.txModeEnum == RGR_UE_TM_4) @@ -1423,22 +1247,11 @@ U8 sCellIdx; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellDlUeReset -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHSCellDlUeReset(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHSCellDlUeReset(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSch; - TRC3(rgSCHSCellDlUeReset); - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) { @@ -1448,7 +1261,7 @@ RgSchUeCb *ue; ue->cellInfo[idx]->sCellState = RG_SCH_SCELL_INACTIVE; } } - RETVOID; + return; } @@ -1468,30 +1281,17 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellDlLcCfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *svc -) -#else -Void rgSCHSCellDlLcCfg(cell, ue, svc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *svc; -#endif +Void rgSCHSCellDlLcCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC3(rgSCHSCellDlLcCfg); - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) { cellSch->apisDl->rgSCHRgrDlLcCfg(ue->cellInfo[idx]->cell, ue, svc,NULLP,NULLP); } } - RETVOID; + return; } /** @@ -1510,30 +1310,17 @@ RgSchDlLcCb *svc; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellDlLcDel -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *svc -) -#else -Void rgSCHSCellDlLcDel(cell, ue, svc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *svc; -#endif +Void rgSCHSCellDlLcDel(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC3(rgSCHSCellDlLcDel); - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) { cellSch->apisDl->rgSCHFreeDlLc(ue->cellInfo[idx]->cell, ue, svc); } } - RETVOID; + return; } /** @@ -1552,22 +1339,9 @@ RgSchDlLcCb *svc; * @return Void * **/ -#ifdef ANSI -Void rgSCHSCellDlDedBoUpd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *svc -) -#else -Void rgSCHSCellDlDedBoUpd(cell, ue, svc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *svc; -#endif +Void rgSCHSCellDlDedBoUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC3(rgSCHSCellDlDedBoUpd); /* If this is not invoked by PCell, then invoke the call to PCell handler @@ -1576,7 +1350,7 @@ RgSchDlLcCb *svc; { cellSch->apisDl->rgSCHDlDedBoUpd(ue->cell, ue, svc); } - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if((ue->cellInfo[idx] != NULLP) && (ue->cellInfo[idx]->sCellState == RG_SCH_SCELL_ACTIVE) && @@ -1585,7 +1359,7 @@ RgSchDlLcCb *svc; cellSch->apisDl->rgSCHDlDedBoUpd(ue->cellInfo[idx]->cell, ue, svc); } } - RETVOID; + return; } #ifdef TFU_UPGRADE /** @@ -1601,23 +1375,12 @@ RgSchDlLcCb *svc; * * @param[in] RgSchUePCqiCb *cqiCb1 * @param[in] RgSchUePCqiCb *cqiCb2 - * @return U8 cqiCb cell idx which has the higher priority + * @return uint8_t cqiCb cell idx which has the higher priority * **/ -#ifdef ANSI -PRIVATE U8 rgSCHUtlSCellCmpCqiCfg -( -RgSchUePCqiCb *cqiCb1, -RgSchUePCqiCb *cqiCb2 -) -#else -PRIVATE U8 rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2) -RgSchUePCqiCb *cqiCb1; -RgSchUePCqiCb *cqiCb2; -#endif +static uint8_t rgSCHUtlSCellCmpCqiCfg(RgSchUePCqiCb *cqiCb1,RgSchUePCqiCb *cqiCb2) { RgSchUePCqiCb *retCqiCb; - TRC3(rgSCHUtlSCellCmpCqiCfg); /* Collision rules are defined in TS 36.213,7.2.2 */ /* RI, WB first PMI > WB CQI > SB CQI */ /* As of now only taking care of RI > WB CQI > SB CQI */ @@ -1668,28 +1431,19 @@ RgSchUePCqiCb *cqiCb2; * @return ROK/RFAILED * **/ -#ifdef ANSI -S16 rgSCHUtlSCellHndlCqiCollsn -( -RgSchUePCqiCb *cqiCb -) -#else -S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb) -RgSchUePCqiCb *cqiCb; -#endif +S16 rgSCHUtlSCellHndlCqiCollsn(RgSchUePCqiCb *cqiCb) { - U32 nPCqiServCellIdx; - U32 minPCqiTrIdx; - U32 scellPCqiTrIdx; - U32 pCqiTrIdx; + uint32_t nPCqiServCellIdx; + uint32_t minPCqiTrIdx; + uint32_t scellPCqiTrIdx; + uint32_t pCqiTrIdx; RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell; RgSchUeCb *ueCb = cqiCb->servCellInfo->ue; - U16 crntSfIdx; - U32 cellIdx; - U32 sCellCnt = 0; + uint16_t crntSfIdx; + uint32_t cellIdx; + uint32_t sCellCnt = 0; CmLteTimingInfo timingInfo; - U8 idx = 0; - TRC3(rgSCHUtlSCellHndlCqiCollsn); + uint8_t idx = 0; #ifdef xLTE_TDD RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA); @@ -1779,27 +1533,18 @@ RgSchUePCqiCb *cqiCb; * @return ROK/RFAILED * **/ -#ifdef ANSI -S16 rgSCHUtlSCellHndlRiCollsn -( -RgSchUePCqiCb *cqiCb -) -#else -S16 rgSCHUtlSCellHndlRiCollsn(cqiCb) -RgSchUePCqiCb *cqiCb; -#endif +S16 rgSCHUtlSCellHndlRiCollsn(RgSchUePCqiCb *cqiCb) { - U32 nPRiServCellIdx; - U32 minPRiTrIdx; - U32 scellPRiTrIdx; - U32 pRiTrIdx; + uint32_t nPRiServCellIdx; + uint32_t minPRiTrIdx; + uint32_t scellPRiTrIdx; + uint32_t pRiTrIdx; RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell; RgSchUeCb *ueCb = cqiCb->servCellInfo->ue; - U16 crntSfIdx; - U32 cellIdx; - U32 sCellCnt = 0; + uint16_t crntSfIdx; + uint32_t cellIdx; + uint32_t sCellCnt = 0; CmLteTimingInfo timingInfo; - TRC3(rgSCHUtlSCellHndlRiCollsn); #ifdef xLTE_TDD RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA); @@ -1898,22 +1643,11 @@ RgSchUePCqiCb *cqiCb; * @return Void * **/ -#ifdef ANSI -S16 rgSCHSCellIsActive -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -S16 rgSCHSCellIsActive(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +S16 rgSCHSCellIsActive(RgSchCellCb *cell,RgSchUeCb *ue) { S16 retVal = RFAILED; - TRC3(rgSCHSCellIsActive); - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if((ue->cellInfo[idx] != NULLP) && (ue->cellInfo[idx]->cell->cellId == cell->cellId)&& @@ -1940,19 +1674,8 @@ RgSchUeCb *ue; * @return BOOL * -# TRUE **/ -#ifdef ANSI -Bool rgSCHIsActvReqd -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Bool rgSCHIsActvReqd(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue -#endif +Bool rgSCHIsActvReqd(RgSchCellCb *cell,RgSchUeCb *ue) { - TRC2(rgSCHIsActvReqd) /* Check if remBoCnt in this UE is greater than ZERO for sufficient number of * Scheduling TTIs. If yes then We should activate a secondary cell to handle * outstanding BO */