X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_pwr.c;h=132eb98af6cf93e78f96643f315445ffa113fe79;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=41faf57fbe035cf0a93d98d55e2d2eb30d1d45eb;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c index 41faf57fb..132eb98af 100755 --- a/src/5gnrsch/rg_sch_pwr.c +++ b/src/5gnrsch/rg_sch_pwr.c @@ -369,16 +369,15 @@ PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax ARGS(( * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrInit +Void rgSCHPwrInit ( Void ) #else -PUBLIC Void rgSCHPwrInit() +Void rgSCHPwrInit() #endif { U8 idx; - TRC2(rgSCHPwrInit); rgSchPwrCqiToPwrTbl[0] = 0; /* This should never be used anyway */ for (idx = 1; idx < RG_SCH_CMN_UL_NUM_CQI; ++idx) @@ -412,9 +411,8 @@ PRIVATE S8 rgSCHPwrGetCqiPwr(cqi) U8 cqi; #endif { - TRC2(rgSCHPwrGetCqiPwr); - RETVALUE(rgSchPwrCqiToPwrTbl[cqi]); + return (rgSchPwrCqiToPwrTbl[cqi]); } /* rgSCHPwrGetCqiPwr */ /*********************************************************** @@ -446,13 +444,12 @@ U8 cqi; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrGetCqiPwrForUe); if (!uePwr->deltaMcsEnbld) { - RETVALUE(0); + return (0); } - RETVALUE(rgSCHPwrGetCqiPwr(cqi)); + return (rgSCHPwrGetCqiPwr(cqi)); } /* rgSCHPwrGetCqiPwrForUe */ /*********************************************************** @@ -481,11 +478,10 @@ U32 eff; { F64 ks = 1.25; /* or F64 */ F64 tmp = cmPow(2, ks*eff/1024) - 1; - TRC2(rgSCHPwrCalcEfficncyPwr); if (tmp <= 0) - RETVALUE(0); - RETVALUE((S8)(10 * cmLog10(tmp))); + return (0); + return ((S8)(10 * cmLog10(tmp))); } /* rgSCHPwrCalcEfficncyPwr */ @@ -512,13 +508,13 @@ U32 eff; * @return U8 **/ #ifdef ANSI -PUBLIC U8 rgSCHPwrPuschTpcForUe +U8 rgSCHPwrPuschTpcForUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC U8 rgSCHPwrPuschTpcForUe(cell, ue) +U8 rgSCHPwrPuschTpcForUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -526,10 +522,9 @@ RgSchUeCb *ue; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue,cell); UNUSED(cell); - TRC2(rgSCHPwrPuschTpcForUe); rgSCHPwrOnSchedPuschTpc(cell, ue); - RETVALUE(uePwr->puschTpc); + return (uePwr->puschTpc); } /** @@ -555,23 +550,22 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC U8 rgSCHPwrGetMaxUlRb +U8 rgSCHPwrGetMaxUlRb ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC U8 rgSCHPwrGetMaxUlRb(cell, ue) +U8 rgSCHPwrGetMaxUlRb(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrGetMaxUlRb); rgSCHPwrPuschCntrl(cell, ue); /* This stores tpc, delta and maxRb * in uePwr */ - RETVALUE(uePwr->maxUlRbs); + return (uePwr->maxUlRbs); } /** @@ -634,8 +628,6 @@ RgSchUeCb *ue; UNUSED(cell); - TRC2(rgSCHPwrPuschCntrl); - if (!uePwr->isPhrAvail) { availPwr = 60; /* setting a large value so that availPwr does @@ -706,22 +698,21 @@ RgSchUeCb *ue; * @return U8 **/ #ifdef ANSI -PUBLIC U8 rgSCHPwrPucchTpcForUe +U8 rgSCHPwrPucchTpcForUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC U8 rgSCHPwrPucchTpcForUe(cell, ue) +U8 rgSCHPwrPucchTpcForUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrPucchTpcForUe); rgSCHPwrPucchCntrl(cell, ue); - RETVALUE(uePwr->pucchTpc); + return (uePwr->pucchTpc); } /*********************************************************** @@ -757,7 +748,6 @@ RgSchCellCb *cell; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrGetDelta2FrmCqi); if (uePwr->isPhrAvail) { @@ -772,9 +762,9 @@ RgSchCellCb *cell; if (uePwr->maxPwrDeltaByPhr < 0 && (trgCqi - crntCqi) * RG_SCH_UL_CQI_DB_STEP_2 > 0) { - RETVALUE(0); + return (0); } - RETVALUE(RGSCH_MIN(uePwr->maxPwrDeltaByPhr, + return (RGSCH_MIN(uePwr->maxPwrDeltaByPhr, (trgCqi - crntCqi) * RG_SCH_UL_CQI_DB_STEP_2)); } /* rgSCHPwrGetDelta2FrmCqi */ @@ -811,7 +801,6 @@ U8 *tpc; S8 *tpcDelta; #endif { - TRC2(rgSCHPwrGetPuschTpc); delta = RGSCH_MIN(delta, availPwr); @@ -857,21 +846,19 @@ S8 pwr; { RgSchCmnUlCell *cellUl; - TRC2(rgSCHPwrGetMaxRb); - cellUl = RG_SCH_CMN_GET_UL_CELL(cell); if (pwr <= 0) { /* Give 4 RBS so that UE can report changed power status*/ /* [ccpu00119916] Mod -return 0th index of rgSchPwrToRbTbl when pwr <=0 * Change the Macros from RGSCH_MAX_DL_BW to RGSCH_MAX_UL_BW*/ - RETVALUE(rgSchPwrToRbTbl[0]); + return (rgSchPwrToRbTbl[0]); } if (pwr > rgSchPwrRbToPwrTbl[cellUl->maxUlBwPerUe]) { - RETVALUE(cellUl->maxUlBwPerUe); + return (cellUl->maxUlBwPerUe); } - RETVALUE(RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(U8)pwr])); + return (RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(U8)pwr])); } /* rgSCHPwrGetMaxRb */ /*********************************************************** @@ -902,7 +889,6 @@ U8 numRb; #ifndef NO_ERRCLS RgSchCmnUlCell *cellUl; #endif - TRC2(rgSCHPwrRbToPwr); #if (ERRCLASS & ERRCLS_DEBUG) cellUl = RG_SCH_CMN_GET_UL_CELL(cell); if (numRb > cellUl->maxUlBwPerUe) @@ -910,7 +896,7 @@ U8 numRb; numRb = cellUl->maxUlBwPerUe; } #endif - RETVALUE(rgSchPwrRbToPwrTbl[numRb]); + return (rgSchPwrRbToPwrTbl[numRb]); } /* rgSCHPwrRbToPwr */ @@ -943,7 +929,6 @@ RgSchUeCb *ue; { S8 delta; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrPucchCntrl); rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, &uePwr->pucchTpc, &delta); rgSCHPwrOnSchedPucchTpc(cell, ue, delta); @@ -999,13 +984,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrGrpCntrlPucch +Void rgSCHPwrGrpCntrlPucch ( RgSchCellCb *cell, RgSchDlSf *dlSf ) #else -PUBLIC Void rgSCHPwrGrpCntrlPucch(cell, dlSf) +Void rgSCHPwrGrpCntrlPucch(cell, dlSf) RgSchCellCb *cell; RgSchDlSf *dlSf; #endif @@ -1014,7 +999,6 @@ RgSchDlSf *dlSf; CmLListCp *lst; CmLList *lnk; RgSchPdcch *pdcch; - TRC2(rgSCHPwrGrpCntrlPucch); lst = &cellPwr->pucchGrpPwr; lnk = lst->first; @@ -1082,14 +1066,14 @@ RgSchDlSf *dlSf; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrGrpCntrlPusch +Void rgSCHPwrGrpCntrlPusch ( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchUlSf *ulSf ) #else -PUBLIC Void rgSCHPwrGrpCntrlPusch(cell, dlSf, ulSf) +Void rgSCHPwrGrpCntrlPusch(cell, dlSf, ulSf) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchUlSf *ulSf; @@ -1099,7 +1083,6 @@ RgSchUlSf *ulSf; CmLListCp *lst; CmLList *lnk; RgSchPdcch *pdcch; - TRC2(rgSCHPwrGrpCntrlPusch); lst = &cellPwr->puschGrpPwr; lnk = lst->first; @@ -1157,7 +1140,6 @@ Bool *sched; U8 tpc; S8 delta; Bool atleastOne; - TRC2(rgSCHPwrSchedPucchRnti); pdcch->rnti = cb->tpcRnti; @@ -1209,7 +1191,7 @@ Bool *sched; pdcch->dci.u.format3Info.isPucch = TRUE; /* Fill TPC 1 (corresponding to no power change) initially */ - cmMemset((U8 *)tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); + memset(tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next) { @@ -1288,7 +1270,6 @@ Bool *sched; U8 tpc; S8 delta; Bool atleastOne; - TRC2(rgSCHPwrSchedPuschRnti); pdcch->rnti = cb->tpcRnti; @@ -1339,7 +1320,7 @@ Bool *sched; tpcCmds = pdcch->dci.u.format3Info.tpcCmd; /* Fill TPC 1 (corresponding to no power change) initially */ - cmMemset((U8 *)tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); + memset(tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd)); for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next) { @@ -1409,7 +1390,6 @@ S8 *delta; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrGetPucchFmt3TpcForUe); rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, tpc, delta); RETVOID; @@ -1443,7 +1423,6 @@ S8 *delta; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrGetPucchFmt3aTpcForUe); rgSCHPwrGetAcc1bitTpc(uePwr->remPucchPwr, tpc, delta); RETVOID; @@ -1478,7 +1457,6 @@ S8 *delta; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); S8 adj = RGSCH_MIN(uePwr->remPuschPwr, uePwr->phVal); - TRC2(rgSCHPwrGetPuschFmt3TpcForUe); rgSCHPwrGetAcc2bitTpc(adj, tpc, delta); RETVOID; @@ -1512,7 +1490,6 @@ S8 *delta; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrGetPuschFmt3aTpcForUe); /* Don't attempt to look at headroom now, power * adjustment is small anyway */ @@ -1547,7 +1524,6 @@ U8 *tpc; S8 *delta; #endif { - TRC2(rgSCHPwrGetAcc1bitTpc); /* * TPC delta * 0 -1 @@ -1602,7 +1578,6 @@ S8 *delta; */ U8 tpcs[3] = {1, 2, 2}; U8 deltas[3] = {0, 1, 1}; - TRC2(rgSCHPwrGetAcc2bitTpc); if (remPwr <= -1) { *tpc = 0; @@ -1648,7 +1623,6 @@ U8 *tpc; S8 *delta; #endif { - TRC2(rgSCHPwrGetAbsTpc); /* * TPC delta * 0 -4 @@ -1719,8 +1693,6 @@ S8 delta; UNUSED(cell); - TRC2(rgSCHPwrOnPucchGrpPwrForUe); - uePwr->remPucchPwr -= delta; /* UE was already scheduled for PUCCH group power @@ -1782,7 +1754,6 @@ S8 delta; Bool rmvUe = FALSE; UNUSED(cell); - TRC2(rgSCHPwrOnPuschGrpPwrForUe); uePwr->delta = delta; uePwr->remPuschPwr -= delta; @@ -1844,11 +1815,9 @@ RgSchDlSf *sf; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); RgSchDlHqProcCb *proc = rgSCHDhmLastSchedHqProc(hqEnt); - TRC2(rgSCHPwrIsDlUeSched); - if (proc == NULLP) { - RETVALUE(FALSE); + return (FALSE); } /* @@ -1873,11 +1842,11 @@ RgSchDlSf *sf; * Checking for PDCCH would have to be in common proc * the way things are now. */ - RETVALUE(TRUE); + return (TRUE); } else { - RETVALUE(FALSE); + return (FALSE); } } /* rgSCHPwrIsDlUeSched */ @@ -1911,24 +1880,22 @@ RgSchUlSf *sf; RgSchCmnUlCell *cmnCell = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlHqProcCb *proc = rgSCHUhmGetUlHqProc(cell, ue, cmnCell->schdHqProcIdx); - TRC2(rgSCHPwrIsUlUeSched); - UNUSED(sf); #if (ERRCLASS & ERRCLS_DEBUG) if( proc == NULLP ) { - RETVALUE (FALSE); + return (FALSE); } #endif if (proc->alloc) { - RETVALUE(TRUE); + return (TRUE); } else { - RETVALUE(FALSE); + return (FALSE); } } /* rgSCHPwrIsUlUeSched */ @@ -1968,14 +1935,14 @@ RgSchUlSf *sf; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrPucchDeltaInd +Void rgSCHPwrPucchDeltaInd ( RgSchCellCb *cell, RgSchUeCb *ue, S8 pwrDelta ) #else -PUBLIC Void rgSCHPwrPucchDeltaInd(cell, ue, pwrDelta) +Void rgSCHPwrPucchDeltaInd(cell, ue, pwrDelta) RgSchCellCb *cell; RgSchUeCb *ue; S8 pwrDelta; @@ -1984,7 +1951,6 @@ S8 pwrDelta; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); RgSchCmnTpcRntiCb *cb; Bool toAdd; - TRC2(rgSCHPwrPucchDeltaInd); uePwr->remPucchPwr = pwrDelta; @@ -2053,7 +2019,6 @@ S8 delta; * improved its remPwr as part of power control. */ RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); Bool rmvUe = FALSE; - TRC2(rgSCHPwrOnSchedPucchTpc); uePwr->remPucchPwr -= delta; @@ -2112,7 +2077,6 @@ RgSchUeCb *ue; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); Bool rmvUe = FALSE; - TRC2(rgSCHPwrOnSchedPuschTpc); /* Don't do anything for the case of absolute TPC commands */ if (!uePwr->isAccumulated) @@ -2161,7 +2125,7 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrUpdExtPhr +Void rgSCHPwrUpdExtPhr ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2169,7 +2133,7 @@ RgInfExtPhrCEInfo *extPhr, RgSchCmnAllocRecord *allocInfo ) #else -PUBLIC Void rgSCHPwrUpdExtPhr(cell, ue, extPhr, allocInfo) +Void rgSCHPwrUpdExtPhr(cell, ue, extPhr, allocInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgInfExtPhrCEInfo *extPhr; @@ -2180,8 +2144,6 @@ RgSchCmnAllocRecord *allocInfo; RgInfExtPhrSCellInfo *servCellPhr; S8 pCMax; - TRC2(rgSCHPwrUpdExtPhr); - for (idx = 0; idx < extPhr->numServCells; idx++) { servCellPhr = &extPhr->servCellPhr[idx]; @@ -2238,7 +2200,7 @@ RgSchCmnAllocRecord *allocInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrUpdPhr +Void rgSCHPwrUpdPhr ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2247,7 +2209,7 @@ RgSchCmnAllocRecord *allocInfo, S8 maxUePwr ) #else -PUBLIC Void rgSCHPwrUpdPhr(cell, ue, phr, allocInfo, maxUePwr) +Void rgSCHPwrUpdPhr(cell, ue, phr, allocInfo, maxUePwr) RgSchCellCb *cell; RgSchUeCb *ue; U8 phr; @@ -2260,8 +2222,6 @@ S8 maxUePwr; U8 effPwr; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHPwrUpdPhr); - uePwr->phVal = rgSCHPwrGetPhValFromPhr(phr); if (maxUePwr == RG_SCH_CMN_PWR_USE_CFG_MAX_PWR) @@ -2316,13 +2276,13 @@ S8 maxUePwr; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrUlCqiInd +Void rgSCHPwrUlCqiInd ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHPwrUlCqiInd(cell, ue) +Void rgSCHPwrUlCqiInd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2332,7 +2292,6 @@ RgSchUeCb *ue; #ifdef TFU_UPGRADE S32 tmp; #endif - TRC2(rgSCHPwrUlCqiInd); /* * For absolute power cmd case, we could look at the time @@ -2397,14 +2356,14 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrRecordRbAlloc +Void rgSCHPwrRecordRbAlloc ( RgSchCellCb *cell, RgSchUeCb *ue, U8 numRb ) #else -PUBLIC Void rgSCHPwrRecordRbAlloc(cell, ue, numRb) +Void rgSCHPwrRecordRbAlloc(cell, ue, numRb) RgSchCellCb *cell; RgSchUeCb *ue; U8 numRb; @@ -2412,7 +2371,6 @@ U8 numRb; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); UNUSED(cell); - TRC2(rgSCHPwrRecordRbAlloc); RETVOID; if (uePwr->isPhrAvail) @@ -2451,13 +2409,13 @@ U8 numRb; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHPwrCellCfg +S16 rgSCHPwrCellCfg ( RgSchCellCb *cell, RgrCellCfg *cfg ) #else -PUBLIC S16 rgSCHPwrCellCfg(cell, cfg) +S16 rgSCHPwrCellCfg(cell, cfg) RgSchCellCb *cell; RgrCellCfg *cfg; #endif @@ -2467,7 +2425,6 @@ RgrCellCfg *cfg; CmLteRnti startRnti; U16 size; Bool isFmt3a; - TRC2(rgSCHPwrCellCfg); /* Right now, all UEs have fixed maximum power capability. So * we store cell wide pMax as minimum of configured pMax and @@ -2483,7 +2440,7 @@ RgrCellCfg *cfg; || (cfg->pwrCfg.puschPwrFmt3.size + cfg->pwrCfg.puschPwrFmt3a.size > RG_SCH_CMN_MAX_NUM_TPC_PUSCH_RNTI)) { - RETVALUE(RFAILED); + return RFAILED; } /* Now initialise TPC RNTIs */ @@ -2524,7 +2481,7 @@ RgrCellCfg *cfg; rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a); } - RETVALUE(ROK); + return ROK; } /** @@ -2543,24 +2500,23 @@ RgrCellCfg *cfg; * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgSCHPwrCellRecfg +S16 rgSCHPwrCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *recfg ) #else -PUBLIC S16 rgSCHPwrCellRecfg(cell, recfg) +S16 rgSCHPwrCellRecfg(cell, recfg) RgSchCellCb *cell; RgrCellRecfg *recfg; #endif { UNUSED(cell); UNUSED(recfg); - TRC2(rgSCHPwrCellRecfg); /* Not doing anything for power reconfig, so such structure * in RGR */ - RETVALUE(ROK); + return ROK; } /** @@ -2577,17 +2533,16 @@ RgrCellRecfg *recfg; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrCellDel +Void rgSCHPwrCellDel ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHPwrCellDel(cell) +Void rgSCHPwrCellDel(cell) RgSchCellCb *cell; #endif { UNUSED(cell); - TRC2(rgSCHPwrCellDel); /* There is no allocated memory, so do nothing */ RETVOID; @@ -2610,14 +2565,14 @@ RgSchCellCb *cell; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHPwrUeSCellCfg +S16 rgSCHPwrUeSCellCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeSecCellCfg *sCellInfoCfg ) #else -PUBLIC S16 rgSCHPwrUeSCellCfg(cell, ue, sCellInfoCfg) +S16 rgSCHPwrUeSCellCfg(cell, ue, sCellInfoCfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeSecCellCfg *sCellInfoCfg; @@ -2630,7 +2585,6 @@ RgrUeSecCellCfg *sCellInfoCfg; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHPwrUeSCellCfg); uePwr->maxUePwr = cellPwr->pMax; uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */ @@ -2658,7 +2612,7 @@ RgrUeSecCellCfg *sCellInfoCfg; } uePwr->p0UePusch = sCellInfoCfg->ueSCellUlDedPwrCfg.p0UePusch; - RETVALUE(ROK); + return ROK; } #endif @@ -2699,14 +2653,14 @@ RgrUeSecCellCfg *sCellInfoCfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHPwrUeCfg +S16 rgSCHPwrUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *cfg ) #else -PUBLIC S16 rgSCHPwrUeCfg(cell, ue, cfg) +S16 rgSCHPwrUeCfg(cell, ue, cfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCfg *cfg; @@ -2718,8 +2672,6 @@ RgrUeCfg *cfg; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHPwrUeCfg); - uePwr->maxUePwr = cellPwr->pMax; uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */ uePwr->numRb = 1; @@ -2733,7 +2685,7 @@ RgrUeCfg *cfg; * config happens in the function below */ ret = rgSCHPwrApplyUePwrCfg(cell, ue, &cfg->ueUlPwrCfg); - RETVALUE(ret); + return (ret); } /** @@ -2762,14 +2714,14 @@ RgrUeCfg *cfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHPwrUeRecfg +S16 rgSCHPwrUeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *recfg ) #else -PUBLIC S16 rgSCHPwrUeRecfg(cell, ue, recfg) +S16 rgSCHPwrUeRecfg(cell, ue, recfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *recfg; @@ -2778,7 +2730,6 @@ RgrUeRecfg *recfg; S16 ret; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); RgrUeUlPwrCfg *pwrCfg = &recfg->ueUlPwrRecfg; - TRC2(rgSCHPwrUeRecfg); if (pwrCfg->p0UePucch != uePwr->p0UePucch) { @@ -2791,7 +2742,7 @@ RgrUeRecfg *recfg; } ret = rgSCHPwrApplyUePwrCfg(cell, ue, &recfg->ueUlPwrRecfg); - RETVALUE(ret); + return (ret); } /*********************************************************** @@ -2829,7 +2780,6 @@ RgrUeUlPwrCfg *pwrCfg; RgSchCmnTpcRntiCb *puschRntiCb = NULLP; U8 pucchIdx = 0; U8 puschIdx = 0; - TRC2(rgSCHPwrApplyUePwrCfg); /* Validate Pucch group power control config */ if (pwrCfg->uePucchPwr.pres) @@ -2838,13 +2788,13 @@ RgrUeUlPwrCfg *pwrCfg; rgSCHPwrGetPucchRntiCb(cell, pwrCfg->uePucchPwr.tpcRnti); if (pucchRntiCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } pucchIdx = pwrCfg->uePucchPwr.idx; ret = rgSCHPwrChkPucchTpcRntiIdx(pucchRntiCb, pucchIdx); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } @@ -2855,13 +2805,13 @@ RgrUeUlPwrCfg *pwrCfg; rgSCHPwrGetPuschRntiCb(cell, pwrCfg->uePuschPwr.tpcRnti); if (puschRntiCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } puschIdx = pwrCfg->uePuschPwr.idx; ret = rgSCHPwrChkPuschTpcRntiIdx(puschRntiCb, puschIdx); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } @@ -2941,7 +2891,7 @@ RgrUeUlPwrCfg *pwrCfg; uePwr->p0UePusch = pwrCfg->p0UePusch; uePwr->p0UePucch = pwrCfg->p0UePucch; - RETVALUE(ROK); + return ROK; } @@ -2972,19 +2922,18 @@ RgrUeUlPwrCfg *pwrCfg; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrUeDel +Void rgSCHPwrUeDel ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHPwrUeDel(cell, ue) +Void rgSCHPwrUeDel(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrUeDel); if (uePwr->tpcPucchRntiCb) { @@ -3018,18 +2967,17 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHPwrUeReset +Void rgSCHPwrUeReset ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHPwrUeReset(cell, ue) +Void rgSCHPwrUeReset(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHPwrUeReset); rgSCHPwrUeResetPucch(cell, ue); rgSCHPwrUeResetPusch(cell, ue); @@ -3063,7 +3011,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrUeResetPucch); uePwr->pucchTpc = 1; uePwr->remPucchPwr = 0; @@ -3104,7 +3051,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); - TRC2(rgSCHPwrUeResetPusch); uePwr->isPhrAvail = FALSE; uePwr->phVal = 40; @@ -3148,7 +3094,6 @@ RgSchUeCb *ue; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); RgSchCmnTpcRntiCb *cb; Bool toAdd; - TRC2(rgSCHPwrOnPuschPwrUpd); if ((cb = uePwr->tpcPuschRntiCb) == NULLP) { @@ -3210,7 +3155,6 @@ Bool isFmt3a; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddRntiToPucchRntiLst); rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPucchRntiLst[cellPwr->tpcPucchRntiCnt++], rnti, isFmt3a); @@ -3248,7 +3192,6 @@ Bool isFmt3a; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddRntiToPuschRntiLst); rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPuschRntiLst[cellPwr->tpcPuschRntiCnt++], rnti, isFmt3a); @@ -3283,9 +3226,8 @@ CmLteRnti rnti; Bool isFmt3a; #endif { - TRC2(rgSCHPwrInitTpcRntiCb); - cmMemset((U8 *)cb, 0, sizeof(*cb)); + memset(cb, 0, sizeof(*cb)); cb->tpcRnti = rnti; cb->isFmt3a = isFmt3a; /* Not initialising lists as memset 0 takes care of it */ @@ -3322,20 +3264,19 @@ CmLteRnti tpcRnti; { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); U16 idx; - TRC2(rgSCHPwrGetPucchRntiCb); if (!cellPwr->tpcPucchRntiCnt) { - RETVALUE(NULLP); + return (NULLP); } for (idx = 0; idx < cellPwr->tpcPucchRntiCnt; ++idx) { if (cellPwr->tpcPucchRntiLst[idx].tpcRnti == tpcRnti) { - RETVALUE(&cellPwr->tpcPucchRntiLst[idx]); + return (&cellPwr->tpcPucchRntiLst[idx]); } } - RETVALUE(NULLP); + return (NULLP); } /*********************************************************** @@ -3367,20 +3308,19 @@ CmLteRnti tpcRnti; { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); U16 idx; - TRC2(rgSCHPwrGetPuschRntiCb); if (!cellPwr->tpcPuschRntiCnt) { - RETVALUE(NULLP); + return (NULLP); } for (idx = 0; idx < cellPwr->tpcPuschRntiCnt; ++idx) { if (cellPwr->tpcPuschRntiLst[idx].tpcRnti == tpcRnti) { - RETVALUE(&cellPwr->tpcPuschRntiLst[idx]); + return (&cellPwr->tpcPuschRntiLst[idx]); } } - RETVALUE(NULLP); + return (NULLP); } @@ -3414,7 +3354,6 @@ RgSchUeCb *ue; { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); UNUSED(cell); - TRC2(rgSCHPwrAddUeToPucchTpcRntiCb); cmLListAdd2Tail(&cb->cfgdUes, &uePwr->pucchGrpLnk); uePwr->pucchGrpLnk.node = (PTR)ue; @@ -3450,7 +3389,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrDelUeFrmPucchTpcRntiCb); rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue); cmLListDelFrm(&cb->cfgdUes, &uePwr->pucchGrpLnk); @@ -3488,7 +3426,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb); if (uePwr->schdPucchGrpLnk.node == NULLP) { @@ -3533,7 +3470,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb); if (uePwr->schdPucchGrpLnk.node != NULLP) { @@ -3570,7 +3506,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrRmvSchdPucchTpcRntiCb); if (cb->schdLnk.node == NULLP) { @@ -3610,7 +3545,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrAddSchdUeToPucchTpcRntiCb); if (uePwr->schdPucchGrpLnk.node != NULLP) { @@ -3655,7 +3589,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddSchdPucchTpcRntiCb); cmLListAdd2Tail(&cellPwr->pucchGrpPwr, &cb->schdLnk); cb->schdLnk.node = (PTR)cb; @@ -3690,7 +3623,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrAddUeToPuschTpcRntiCb); cmLListAdd2Tail(&cb->cfgdUes, &uePwr->puschGrpLnk); uePwr->puschGrpLnk.node = (PTR)ue; @@ -3726,7 +3658,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrAddSchdUeToPuschTpcRntiCb); if (uePwr->schdPuschGrpLnk.node != NULLP) { @@ -3773,7 +3704,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrDelUeFrmPuschTpcRntiCb); rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue); cmLListDelFrm(&cb->cfgdUes, &uePwr->puschGrpLnk); @@ -3810,7 +3740,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb); if (uePwr->schdPuschGrpLnk.node == NULLP) { @@ -3855,7 +3784,6 @@ RgSchUeCb *ue; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); - TRC2(rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb); if (uePwr->schdPuschGrpLnk.node != NULLP) { @@ -3892,7 +3820,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrAddSchdPuschTpcRntiCb); cmLListAdd2Tail(&cellPwr->puschGrpPwr, &cb->schdLnk); cb->schdLnk.node = (PTR)cb; @@ -3926,7 +3853,6 @@ RgSchCmnTpcRntiCb *cb; #endif { RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell); - TRC2(rgSCHPwrRmvSchdPuschTpcRntiCb); if (cb->schdLnk.node == NULLP) { @@ -3964,17 +3890,16 @@ RgSchCmnTpcRntiCb *cb; U8 idx; #endif { - TRC2(rgSCHPwrChkPucchTpcRntiIdx); if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4004,17 +3929,16 @@ RgSchCmnTpcRntiCb *cb; U8 idx; #endif { - TRC2(rgSCHPwrChkPuschTpcRntiIdx); if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4043,7 +3967,6 @@ U8 idx; #endif { CmLList *lnk; - TRC2(rgSCHPwrChkUniqPucchTpcRntiIdx); for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next) { @@ -4051,10 +3974,10 @@ U8 idx; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); if (uePwr->pucchIdx == idx) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4083,7 +4006,6 @@ U8 idx; #endif { CmLList *lnk; - TRC2(rgSCHPwrChkUniqPuschTpcRntiIdx); for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next) { @@ -4091,10 +4013,10 @@ U8 idx; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); if (uePwr->puschIdx == idx) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4122,23 +4044,21 @@ RgSchCmnTpcRntiCb *cb; U8 idx; #endif { - TRC2(rgSCHPwrChkTpcRntiIdx); - if (cb->isFmt3a) { if (idx >= TFU_MAX_1BIT_TPC) { - RETVALUE(RFAILED); + return RFAILED; } } else { if (idx >= TFU_MAX_2BIT_TPC) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* Warning Fix: Commenting out as not used */ @@ -4167,8 +4087,7 @@ PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax) U8 pCMax; #endif { - TRC2(rgSCHPwrGetPCMaxValFromPCMax); - RETVALUE((pCMax & 63) - 30); + return ((pCMax & 63) - 30); } @@ -4198,8 +4117,7 @@ PRIVATE S8 rgSCHPwrGetPhValFromPhr(phr) U8 phr; #endif { - TRC2(rgSCHPwrGetPhValFromPhr); - RETVALUE((phr & 63) - 23); + return ((phr & 63) - 23); }