X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_utl.c;h=bde585b3deb92739628d616b689eab4566aaa2d6;hb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;hp=5f39b7a0e583770eef76becc25ed2f7de84d9d7d;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c index 5f39b7a0e..bde585b3d 100755 --- a/src/5gnrsch/rg_sch_utl.c +++ b/src/5gnrsch/rg_sch_utl.c @@ -37,15 +37,7 @@ static int RLOG_MODULE_ID=4096; static int RLOG_FILE_ID=177; /* header include files -- defines (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system service interface */ -#include "cm_hash.h" /* common hash list */ -#include "cm_llist.h" /* common linked list library */ -#include "cm_err.h" /* common error */ -#include "cm_lte.h" /* common LTE */ +#include "common_def.h" #include "lrg.h" #include "rgr.h" #include "tfu.h" @@ -59,15 +51,6 @@ static int RLOG_FILE_ID=177; #include "rl_common.h" /* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common tokens */ #include "tfu.x" /* TFU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "rgr.x" /* layer management typedefs for MAC */ @@ -125,66 +108,66 @@ PRIVATE U8 rgSchDciAmbigSizeTbl[61] = {0,0,0,0,0,0,0,0,0,0,0, EXTERN U32 rgSchCmnBetaCqiOffstTbl[16]; EXTERN U32 rgSchCmnBetaRiOffstTbl[16]; EXTERN RgSchdApis rgSchCmnApis; -EXTERN PUBLIC S16 RgUiRgmSendPrbRprtInd ARGS(( +EXTERN S16 RgUiRgmSendPrbRprtInd ARGS(( Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd )); -EXTERN PUBLIC S16 RgUiRgmSendTmModeChangeInd ARGS(( +EXTERN S16 RgUiRgmSendTmModeChangeInd ARGS(( Pst* pst, SuId suId, RgmTransModeInd *txModeChngInd )); #ifdef EMTC_ENABLE -EXTERN PUBLIC S16 rgSCHEmtcUtlGetSfAlloc ARGS(( +EXTERN S16 rgSCHEmtcUtlGetSfAlloc ARGS(( RgSchCellCb *cell )); -EXTERN PUBLIC S16 rgSCHEmtcUtlPutSfAlloc ARGS(( +EXTERN S16 rgSCHEmtcUtlPutSfAlloc ARGS(( RgSchCellCb *cell )); -EXTERN PUBLIC Void rgSCHEmtcUtlUpdUeDciSize ARGS(( +EXTERN Void rgSCHEmtcUtlUpdUeDciSize ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb )); -EXTERN PUBLIC Void rgSCHEmtcGetDciFrmt61ASize ARGS(( +EXTERN Void rgSCHEmtcGetDciFrmt61ASize ARGS(( RgSchCellCb *cell )); -EXTERN PUBLIC Void rgSCHEmtcGetDciFrmt60ASize ARGS(( +EXTERN Void rgSCHEmtcGetDciFrmt60ASize ARGS(( RgSchCellCb *cell )); -EXTERN PUBLIC S16 rgSCHEmtcUtlFillPdschDciInfo ARGS(( +EXTERN S16 rgSCHEmtcUtlFillPdschDciInfo ARGS(( TfuPdschDciInfo *pdsch, TfuDciInfo *pdcchDci )); -EXTERN PUBLIC Void rgSCHEmtcUtlRlsRnti ARGS(( +EXTERN Void rgSCHEmtcUtlRlsRnti ARGS(( RgSchCellCb *cell, RgSchRntiLnk *rntiLnk, U8 *isLegacy )); -EXTERN PUBLIC S16 rgSCHEmtcPdcchAlloc ARGS(( +EXTERN S16 rgSCHEmtcPdcchAlloc ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch )); -EXTERN PUBLIC Void rgSCHEmtcPdcchFree ARGS(( +EXTERN Void rgSCHEmtcPdcchFree ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch )); #endif /* Functions specific to TM1/TM2/TM6/TM7 for PRB calculation*/ -PUBLIC Void rgSchUtlDlCalc1CwPrb ARGS(( RgSchCellCb *cell, +Void rgSchUtlDlCalc1CwPrb ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, U32 bo, U32 *prbReqrd)); /* Functions specific to TM3/TM4 for PRB calculation*/ -PUBLIC Void rgSchUtlDlCalc2CwPrb ARGS(( RgSchCellCb *cell, +Void rgSchUtlDlCalc2CwPrb ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, U32 bo, U32 *prbReqrd)); #ifdef LTE_ADV -PUBLIC RgSchCellCb* rgSchUtlGetCellCb ARGS(( Inst inst, +RgSchCellCb* rgSchUtlGetCellCb ARGS(( Inst inst, U16 cellId )); #endif @@ -236,6 +219,7 @@ PRIVATE S16 rgSCHChkBoUpdate ARGS(( RgSchCellCb *cell, RgInfCmnBoRpt *boUpdt )); +#ifdef UNUSE_FUN #ifdef TFU_UPGRADE PRIVATE U8 rgSCHUtlFetchPcqiBitSz ARGS(( RgSchCellCb *cell, @@ -243,6 +227,7 @@ PRIVATE U8 rgSCHUtlFetchPcqiBitSz ARGS(( U8 numTxAnt )); #endif +#endif /* sorted in ascending order of tbSz */ CONSTANT struct rgSchUtlBcchPcchTbSz { @@ -329,28 +314,28 @@ for proper NULLP assignment*/ * */ #ifdef ANSI -PUBLIC F64 rgSCHUtlPower +F64 rgSCHUtlPower ( F64 x, F64 n ) #else -PUBLIC F64 rgSCHUtlPower(x, n) +F64 rgSCHUtlPower(x, n) F64 x; F64 n; #endif { if( n==0 ) { - RETVALUE( 1 ); + return ( 1 ); } else if ( n>0 ) { - RETVALUE( x * rgSCHUtlPower( x, n-1 ) ); + return ( x * rgSCHUtlPower( x, n-1 ) ); } else { - RETVALUE( (1/x) * rgSCHUtlPower( x, n+1 ) ); + return ( (1/x) * rgSCHUtlPower( x, n+1 ) ); } } /* end of rgSCHUtlPower*/ @@ -369,7 +354,7 @@ F64 n; * */ #ifdef ANSI -PUBLIC U32 rgSCHUtlParse +U32 rgSCHUtlParse ( U8 *buff, U8 startPos, @@ -377,7 +362,7 @@ U8 endPos, U8 buffSize ) #else -PUBLIC U32 rgSCHUtlParse(buff, startPos, endPos, buffSize) +U32 rgSCHUtlParse(buff, startPos, endPos, buffSize) U8 *buff; U8 startPos; U8 endPos; @@ -387,7 +372,6 @@ U8 buffSize; U8 pointToChar,pointToEnd, loop; U8 size = endPos - startPos; F64 result = 0; - TRC2(rgSCHUtlParse); pointToEnd = (startPos)%8; for ( loop=0; loopmap[0]; @@ -540,7 +522,7 @@ RgSchPdcch **pdcch; if ((offset >= ((pdcchInfo->nCce + 7) >> 3)) || ((aggrLvl == CM_LTE_AGGR_LVL16) && (offset > 0))) { - RETVALUE(FALSE); + return (FALSE); } byte = &pdcchInfo->map[offset]; @@ -555,7 +537,7 @@ RgSchPdcch **pdcch; ret = rgSCHUtlAllocSBuf(inst, (Data **)pdcch, sizeof(RgSchPdcch)); if(ROK != ret) { - RETVALUE(FALSE); + return (FALSE); } } @@ -573,7 +555,7 @@ RgSchPdcch **pdcch; (*pdcch)->nCce = aggrLvl; (*pdcch)->ue = NULLP; } - RETVALUE(TRUE); + return (TRUE); } @@ -600,14 +582,14 @@ RgSchPdcch **pdcch; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlPdcchPut +Void rgSCHUtlPdcchPut ( RgSchCellCb *cell, RgSchPdcchInfo *pdcchInfo, RgSchPdcch *pdcch ) #else -PUBLIC Void rgSCHUtlPdcchPut(cell, pdcchInfo, pdcch) +Void rgSCHUtlPdcchPut(cell, pdcchInfo, pdcch) RgSchCellCb *cell; RgSchPdcchInfo *pdcchInfo; RgSchPdcch *pdcch; @@ -615,9 +597,7 @@ RgSchPdcch *pdcch; { U8 *byte; U8 offset; - U8 mask; - - TRC2(rgSCHUtlPdcchPut); + uint16_t mask; switch(pdcch->aggrLvl) { @@ -670,14 +650,14 @@ RgSchPdcch *pdcch; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlPdcchInit +Void rgSCHUtlPdcchInit ( RgSchCellCb *cell, RgSchDlSf *subFrm, U16 nCce ) #else -PUBLIC Void rgSCHUtlPdcchInit(cell, subFrm, nCce) +Void rgSCHUtlPdcchInit(cell, subFrm, nCce) RgSchCellCb *cell; RgSchDlSf *subFrm; U16 nCce; @@ -689,8 +669,6 @@ U16 nCce; U8 extraBits; U32 cceMapSz; - TRC2(rgSCHUtlPdcchInit); - pdcchInfo = &subFrm->pdcchInfo; while(pdcchInfo->pdcchs.first != NULLP) { @@ -728,7 +706,7 @@ U16 nCce; } } - cmMemset(subFrm->pdcchInfo.map, 0, cceMapSz); + memset(subFrm->pdcchInfo.map, 0, cceMapSz); /* If nCce is not exactly same as the bitMap size(no of bits allocated * to represent the Cce's, then mark the extra bits as unavailable extra bits = (((pdcchInfo->nCce + 7) >> 3)*8) - pdcchInfo->nCce @@ -755,20 +733,19 @@ U16 nCce; * **/ #ifdef ANSI -PUBLIC Void rgSchSFRTotalPoolFree +Void rgSchSFRTotalPoolFree ( RgSchSFRTotalPoolInfo *sfrTotalPoolInfo, RgSchCellCb *cell ) #else -PUBLIC Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell) +Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell) RgSchSFRTotalPoolInfo *sfrTotalPoolInfo; RgSchCellCb *cell; #endif { CmLListCp *l; CmLList *n; - TRC2(rgSchSFRTotalPoolFree); /*Deinitialise if these cc pools and ce pools are already existent*/ l = &sfrTotalPoolInfo->ccPool; @@ -817,7 +794,7 @@ PUBLIC Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell) * **/ #ifdef ANSI -PUBLIC S16 rgSchSFRTotalPoolInit +S16 rgSchSFRTotalPoolInit ( RgSchCellCb *cell, RgSchDlSf *sf @@ -836,8 +813,6 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) CmLList *temp = NULLP; S16 ret = 0; - TRC2(rgSchSFRTotalPoolInit); - rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo, cell); sf->sfrTotalPoolInfo.CCPool1BwAvlbl = 0; sf->sfrTotalPoolInfo.CCPool2BwAvlbl = 0; @@ -853,7 +828,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CE Pool memory allocation FAILED for cell"); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo, cell); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); @@ -862,7 +837,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CE Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } l = &sf->sfrTotalPoolInfo.cePool; @@ -896,7 +871,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); @@ -905,7 +880,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } l = &sf->sfrTotalPoolInfo.ccPool; @@ -958,7 +933,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); @@ -967,7 +942,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } cmLListAdd2Tail(l, temp); @@ -996,7 +971,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) sf->sfrTotalPoolInfo.ccBwFull = FALSE; sf->sfrTotalPoolInfo.ceBwFull = FALSE; sf->sfrTotalPoolInfo.isUeCellEdge = FALSE; - RETVALUE(ROK); + return ROK; } /** * @brief This function resets temporary variables in RNTP Prepration @@ -1012,7 +987,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) * **/ #ifdef ANSI -PUBLIC S16 rgSchDSFRRntpInfoInit +S16 rgSchDSFRRntpInfoInit ( TknStrOSXL *rntpPtr, RgSchCellCb *cell, @@ -1028,8 +1003,6 @@ PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) Inst inst = cell->instIdx; U16 len; - TRC2(rgSchDSFRRntpInfoInit); - rntpPtr->pres = PRSNT_NODEF; len = (bw % 8 == 0) ? (bw/8) : (bw/8 + 1); @@ -1041,10 +1014,10 @@ PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) (len * sizeof(U8)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for RNTP Alloc"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -1061,7 +1034,7 @@ PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) * **/ #ifdef ANSI -PUBLIC S16 rgSchDSFRRntpInfoFree +S16 rgSchDSFRRntpInfoFree ( TknStrOSXL *rntpPtr, RgSchCellCb *cell, @@ -1077,8 +1050,6 @@ PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) Inst inst = cell->instIdx; U16 len; - TRC2(rgSchDSFRRntpInfoFree); - len = (bw % 8 == 0) ? (bw/8) : (bw/8 + 1); if(rntpPtr->pres == PRSNT_NODEF) @@ -1088,7 +1059,7 @@ PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) rntpPtr->len = 0; } - RETVALUE(ROK); + return ROK; } /** @@ -1118,7 +1089,6 @@ PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) #endif { - TRC2(rgSchSFRResetPoolVariables); pool->bwAlloced = 0; /*type0end will be the last RBG in pool with all available RBs*/ @@ -1164,8 +1134,6 @@ PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) CmLList *node = NULLP; RgSchSFRPoolInfo *tempPool = NULLP; - TRC2(rgSCHSFRUtlTotalPoolReset); - totalPoolInfo->ccBwFull = FALSE; totalPoolInfo->ceBwFull = FALSE; totalPoolInfo->isUeCellEdge = FALSE; @@ -1221,7 +1189,7 @@ PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) **/ #ifdef LTE_TDD #ifdef ANSI -PUBLIC S16 rgSCHUtlAddPhich +S16 rgSCHUtlAddPhich ( RgSchCellCb *cell, CmLteTimingInfo frm, @@ -1231,7 +1199,7 @@ U8 rbStart, U8 iPhich ) #else -PUBLIC S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, iPhich) +S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, iPhich) RgSchCellCb *cell; CmLteTimingInfo frm; U8 hqFeedBack; @@ -1241,7 +1209,7 @@ U8 iPhich; #endif #else #ifdef ANSI -PUBLIC S16 rgSCHUtlAddPhich +S16 rgSCHUtlAddPhich ( RgSchCellCb *cell, CmLteTimingInfo frm, @@ -1251,7 +1219,7 @@ U8 rbStart, Bool isForMsg3 ) #else -PUBLIC S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, isForMsg3) +S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, isForMsg3) RgSchCellCb *cell; CmLteTimingInfo frm; U8 hqFeedBack; @@ -1265,7 +1233,6 @@ Bool isForMsg3; RgSchPhich *phich; RgSchDlSf *dlSf; Inst inst = cell->instIdx; - TRC2(rgSCHUtlAddPhich); dlSf = rgSCHUtlSubFrmGet(cell, frm); RGSCH_PHICH_ALLOC(inst, phich,sizeof(RgSchPhich), ret); @@ -1274,7 +1241,7 @@ Bool isForMsg3; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, " rgSCHUtlAddPhich(): " "Allocation of RgSchPhich failed"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD RGSCH_INITPHICH(phich, hqFeedBack, nDmrs, rbStart, iPhich); @@ -1282,7 +1249,7 @@ Bool isForMsg3; RGSCH_INITPHICH(phich, hqFeedBack, nDmrs, rbStart, isForMsg3); /*SR_RACH_STATS */ #endif cmLListAdd2Tail(&dlSf->phichInfo.phichs, &phich->lnk); - RETVALUE(ROK); + return ROK; } /* rgSCHUtlAddPhich */ /** @@ -1319,8 +1286,6 @@ RgSchDlSf *subFrm; UNUSED(cell); - TRC2(rgSCHUtlPhichReset); - phichInfo = &subFrm->phichInfo; while(phichInfo->phichs.first != NULLP) { @@ -1349,13 +1314,13 @@ RgSchDlSf *subFrm; * **/ #ifdef ANSI -PUBLIC RgSchDlSf* rgSCHUtlSubFrmGet +RgSchDlSf* rgSCHUtlSubFrmGet ( RgSchCellCb *cell, CmLteTimingInfo frm ) #else -PUBLIC RgSchDlSf* rgSCHUtlSubFrmGet(cell, frm) +RgSchDlSf* rgSCHUtlSubFrmGet(cell, frm) RgSchCellCb *cell; CmLteTimingInfo frm; #endif @@ -1363,8 +1328,6 @@ CmLteTimingInfo frm; RgSchDlSf *sf; U8 dlIdx; - TRC2(rgSCHUtlSubFrmGet); - #ifdef LTE_TDD dlIdx = rgSCHUtlGetDlSfIdx(cell, &frm); //RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, cell->subFrms, dlIdx); @@ -1379,7 +1342,7 @@ CmLteTimingInfo frm; /* CA dev Start */ sf->dlIdx = dlIdx; /* CA dev End */ - RETVALUE(sf); + return (sf); } @@ -1399,13 +1362,13 @@ CmLteTimingInfo frm; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlSubFrmPut +Void rgSCHUtlSubFrmPut ( RgSchCellCb *cell, RgSchDlSf *sf ) #else -PUBLIC Void rgSCHUtlSubFrmPut(cell, sf) +Void rgSCHUtlSubFrmPut(cell, sf) RgSchCellCb *cell; RgSchDlSf *sf; #endif @@ -1413,8 +1376,6 @@ RgSchDlSf *sf; U8 i; U8 noRaRsps; - TRC2(rgSCHUtlSubFrmPut); - #ifdef LTE_TDD /* Release all the held PDCCH information */ rgSCHUtlPdcchInit(cell, sf, sf->nCce); @@ -1436,7 +1397,7 @@ RgSchDlSf *sf; } sf->spsAllocdBw = 0; sf->type2Start = sf->bwAlloced; - cmMemset((U8*) &sf->dlSfAllocInfo, 0, sizeof(RgSchDlSfAllocInfo)); + memset( &sf->dlSfAllocInfo, 0, sizeof(RgSchDlSfAllocInfo)); #else sf->bwAlloced = 0; /* Fix for ccpu00123918*/ @@ -1445,7 +1406,7 @@ RgSchDlSf *sf; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ if (cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) { - cmMemset((U8*) sf->rntpInfo.val, 0, sf->rntpInfo.len); + memset(sf->rntpInfo.val, 0, sf->rntpInfo.len); } /* LTE_ADV_FLAG_REMOVED_END */ #endif @@ -1523,12 +1484,12 @@ RgSchDlSf *sf; * **/ #ifdef ANSI -PUBLIC U8 rgSCHUtlLog32bitNbase2 +U8 rgSCHUtlLog32bitNbase2 ( U32 n ) #else -PUBLIC U8 rgSCHUtlLog32bitNbase2(n) +U8 rgSCHUtlLog32bitNbase2(n) U32 n; #endif { @@ -1537,8 +1498,6 @@ U32 n; S16 i; U8 ret = 0; - TRC2(rgSCHUtlLog32bitNbase2) - for (i=4; i >= 0; i--) { if (n & b[i]) @@ -1547,7 +1506,7 @@ U32 n; ret |= s[i]; } } - RETVALUE(ret); + return (ret); } #ifdef LTEMAC_SPS @@ -1570,20 +1529,19 @@ U32 n; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlRelPdcchFbk +Void rgSCHUtlDlRelPdcchFbk ( RgSchCellCb *cell, RgSchUeCb *ue, U8 isAck ) #else -PUBLIC Void rgSCHUtlDlRelPdcchFbk(cell, ue, isAck) +Void rgSCHUtlDlRelPdcchFbk(cell, ue, isAck) RgSchCellCb *cell; RgSchUeCb *ue; U8 isAck; #endif { - TRC2(rgSCHUtlDlRelPdcchFbk); cell->sc.apis->rgSCHDlRelPdcchFbk(cell, ue, isAck); RETVOID; } @@ -1607,18 +1565,17 @@ U8 isAck; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlProcAck +Void rgSCHUtlDlProcAck ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHUtlDlProcAck(cell, hqP) +Void rgSCHUtlDlProcAck(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHUtlDlProcAck); cell->sc.apis->rgSCHDlProcAck(cell, hqP); RETVOID; } @@ -1639,18 +1596,17 @@ RgSchDlHqProcCb *hqP; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlHdlCrntiCE +Void rgSCHUtlHdlCrntiCE ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHUtlHdlCrntiCE(cell, ue) +Void rgSCHUtlHdlCrntiCE(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlHdlCrntiCE); cell->sc.apis->rgSCHHdlCrntiCE(cell, ue); RETVOID; @@ -1692,7 +1648,6 @@ Bool isEcp; #endif { U16 regs = 0; - TRC2(rgSCHUtlCalcTotalRegs); /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1726,7 +1681,7 @@ Bool isEcp; default: /* case 1 */ regs += bw * RGSCH_NUM_REGS_1ST_SYM; } - RETVALUE(regs); + return (regs); } /*********************************************************** @@ -1754,9 +1709,8 @@ U8 bw; U8 ng6; #endif { - TRC2(rgSCHUtlCalcPhichRegs); /* ccpu00115330: Corrected the calculation for number of PHICH groups*/ - RETVALUE(RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP); + return (RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP); } #ifdef LTE_TDD @@ -1783,7 +1737,7 @@ U8 ng6; * **/ #ifdef ANSI -PUBLIC U8 rgSCHUtlCalcNCce +U8 rgSCHUtlCalcNCce ( U8 bw, RgrPhichNg ng, @@ -1793,7 +1747,7 @@ U8 numAntna, Bool isEcp ) #else -PUBLIC U8 rgSCHUtlCalcNCce(bw, ng, cfi, mPhich, numAntna, isEcp) +U8 rgSCHUtlCalcNCce(bw, ng, cfi, mPhich, numAntna, isEcp) U8 bw; RgrPhichNg ng; U8 cfi; @@ -1806,7 +1760,6 @@ Bool isEcp; U16 phichRegs; U16 cceRegs; U8 ng6; - TRC2(rgSCHUtlCalcNCce); /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1831,7 +1784,7 @@ Bool isEcp; phichRegs = rgSCHUtlCalcPhichRegs(bw, ng6); cceRegs = totalRegs - mPhich*phichRegs - RGSCH_NUM_PCFICH_REG; - RETVALUE((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); + return ((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); } #else @@ -1856,7 +1809,7 @@ Bool isEcp; * **/ #ifdef ANSI -PUBLIC U8 rgSCHUtlCalcNCce +U8 rgSCHUtlCalcNCce ( U8 bw, RgrPhichNg ng, @@ -1865,7 +1818,7 @@ U8 numAntna, Bool isEcp ) #else -PUBLIC U8 rgSCHUtlCalcNCce(bw, ng, cfi, numAntna, isEcp) +U8 rgSCHUtlCalcNCce(bw, ng, cfi, numAntna, isEcp) U8 bw; RgrPhichNg ng; U8 cfi; @@ -1877,7 +1830,6 @@ Bool isEcp; U16 phichRegs; U16 cceRegs; U8 ng6; - TRC2(rgSCHUtlCalcNCce); /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1902,7 +1854,7 @@ Bool isEcp; phichRegs = rgSCHUtlCalcPhichRegs(bw, ng6); cceRegs = totalRegs - phichRegs - RGSCH_NUM_PCFICH_REG; - RETVALUE((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); + return ((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); } #endif @@ -1924,7 +1876,7 @@ Bool isEcp; **/ #ifdef LTE_TDD #ifdef ANSI -PUBLIC S16 rgSCHUtlGetPhichInfo +S16 rgSCHUtlGetPhichInfo ( RgSchUlHqProcCb *hqProc, U8 *rbStartRef, @@ -1932,7 +1884,7 @@ U8 *nDmrsRef, U8 *iPhich ) #else -PUBLIC S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef, iPhich) +S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef, iPhich) RgSchUlHqProcCb *hqProc; U8 *rbStartRef; U8 *nDmrsRef; @@ -1940,14 +1892,14 @@ U8 *iPhich; #endif #else #ifdef ANSI -PUBLIC S16 rgSCHUtlGetPhichInfo +S16 rgSCHUtlGetPhichInfo ( RgSchUlHqProcCb *hqProc, U8 *rbStartRef, U8 *nDmrsRef ) #else -PUBLIC S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef) +S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef) RgSchUlHqProcCb *hqProc; U8 *rbStartRef; U8 *nDmrsRef; @@ -1957,8 +1909,6 @@ U8 *nDmrsRef; /* ACC-TDD */ S16 ret = RFAILED; - TRC2(rgSCHUtlGetPhichInfo); - if ((hqProc != NULLP) && (hqProc->alloc != NULLP)) { *rbStartRef = hqProc->alloc->grnt.rbStart; @@ -1968,7 +1918,7 @@ U8 *nDmrsRef; #endif ret = ROK; } - RETVALUE(ret); + return (ret); } #ifndef TFU_UPGRADE /** @@ -1998,7 +1948,7 @@ U8 *nDmrsRef; * @return S16 **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlAllocRcptInfo +S16 rgSCHUtlAllocRcptInfo ( RgSchUlAlloc *alloc, CmLteRnti *rnti, @@ -2014,7 +1964,7 @@ Bool *ndi, U8 *hqPId ) #else -PUBLIC S16 rgSCHUtlAllocRcptInfo(alloc, rnti, iMcsRef, rbStartRef, numRbRef, +S16 rgSCHUtlAllocRcptInfo(alloc, rnti, iMcsRef, rbStartRef, numRbRef, rvRef, size, modType, isRtx, nDmrs, ndi, hqPId) RgSchUlAlloc *alloc; @@ -2035,11 +1985,10 @@ U8 *hqPId; * min(4,modulation order in grant). Please refer to 36.213-8.6.1*/ CmLteUeCategory ueCtgy; - TRC2(rgSCHUtlAllocRcptInfo); #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2050,7 +1999,7 @@ U8 *hqPId; RLOG_ARG2(L_ERROR,DBG_CELLID,alloc->ue->cell->cellId, "Failed: ue->sch is null RNTI:%d,isRetx=%d", alloc->rnti, alloc->grnt.isRtx); - RETVALUE(RFAILED); + return RFAILED; } ueCtgy = (RG_SCH_CMN_GET_UE_CTGY(alloc->ue)); } @@ -2070,7 +2019,7 @@ U8 *hqPId; *ndi = alloc->hqProc->ndi; *hqPId = alloc->hqProc->procId; - RETVALUE(ROK); + return ROK; } #else /** @@ -2096,7 +2045,7 @@ U8 *hqPId; * @return S16 **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlAllocRcptInfo +S16 rgSCHUtlAllocRcptInfo ( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -2104,18 +2053,17 @@ CmLteTimingInfo *timeInfo, TfuUeUlSchRecpInfo *recpReq ) #else -PUBLIC S16 rgSCHUtlAllocRcptInfo(cell, alloc, timeInfo, recpReq) +S16 rgSCHUtlAllocRcptInfo(cell, alloc, timeInfo, recpReq) RgSchCellCb *cell; RgSchUlAlloc *alloc; CmLteTimingInfo *timeInfo; TfuUeUlSchRecpInfo *recpReq; #endif { - TRC2(rgSCHUtlAllocRcptInfo); #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif recpReq->size = alloc->grnt.datSz; @@ -2188,7 +2136,7 @@ TfuUeUlSchRecpInfo *recpReq; } #endif /* ccpu00117050 - DEL - nSrs setting at rgSCHUtlAllocRcptInfo */ - RETVALUE(ROK); + return ROK; } #endif @@ -2227,8 +2175,6 @@ RgrTddPrachInfo *cellCfg; U8 startIdx; U8 endIdx; - TRC2(rgSCHUtlUpdPrachOcc) - /* In the 1st half frame */ if(cellCfg->halfFrm == 0) { @@ -2276,13 +2222,13 @@ RgrTddPrachInfo *cellCfg; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlPrachCfgInit +Void rgSCHUtlPrachCfgInit ( RgSchCellCb *cell, RgrCellCfg *cellCfg ) #else -PUBLIC Void rgSCHUtlPrachCfgInit(cell, cellCfg) +Void rgSCHUtlPrachCfgInit(cell, cellCfg) RgSchCellCb *cell; RgrCellCfg *cellCfg; #endif @@ -2291,7 +2237,6 @@ RgrCellCfg *cellCfg; U8 subfrmIdx; U8 splFrm; - TRC2(rgSCHUtlPrachCfgInit) if(cellCfg->prachRscInfo.numRsc <= 0) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid" @@ -2353,14 +2298,14 @@ RgrCellCfg *cellCfg; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrCellCfg +S16 rgSCHUtlRgrCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo) +S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo) RgSchCellCb *cell; RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; @@ -2377,9 +2322,7 @@ RgSchErrInfo *errInfo; S16 ret = ROK; U16 bw; /*!< Number of RBs in the cell */ - TRC2(rgSCHUtlRgrCellCfg); - - cmMemset((U8 *)&frm,0,sizeof(CmLteTimingInfo)); + memset(&frm,0,sizeof(CmLteTimingInfo)); /* ccpu00132657-MOD- Determining DLSF array size independent of DELTAS */ maxDlslots = rgSchTddNumDlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -2420,7 +2363,7 @@ RgSchErrInfo *errInfo; (Data **)&cell->subFrms, sizeof(RgSchDlSf *) * maxslots); if (cell->subFrms == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* Create memory for each frame. */ @@ -2437,7 +2380,7 @@ RgSchErrInfo *errInfo; { break; } - cmMemset((U8 *)sf, 0, sizeof(*sf)); + memset(sf, 0, sizeof(*sf)); #ifdef LTE_ADV if (ROK != rgSCHLaaInitDlSfCb(cell, sf)) @@ -2482,7 +2425,7 @@ RgSchErrInfo *errInfo; rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(cell->subFrms)), sizeof(RgSchDlSf *) * maxslots); - RETVALUE(RFAILED); + return RFAILED; } if (cell->sc.apis == NULLP) @@ -2496,7 +2439,7 @@ RgSchErrInfo *errInfo; /* ccpu00132286- Removed deletion of sf nodes as the deletion will be * happening during CellDelete. Added return handling to provide negative * confirm*/ - RETVALUE(ret); + return (ret); } /* Release the slots and thereby perform the initialization */ @@ -2511,7 +2454,7 @@ RgSchErrInfo *errInfo; rgSCHUtlDlRlsSubFrm(cell, frm); } - RETVALUE(ret); + return (ret); } #else @@ -2535,14 +2478,14 @@ RgSchErrInfo *errInfo; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrCellCfg +S16 rgSCHUtlRgrCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo) +S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo) RgSchCellCb *cell; RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; @@ -2557,9 +2500,8 @@ RgSchErrInfo *errInfo; U16 len; len = (U16)((cell->bwCfg.dlTotalBw % 8 == 0) ? (cell->bwCfg.dlTotalBw/8) : (cell->bwCfg.dlTotalBw/8 + 1)); /*KW fix for LTE_ADV */ /* LTE_ADV_FLAG_REMOVED_END */ - TRC2(rgSCHUtlRgrCellCfg); - cmMemset((U8 *)&frm,0,sizeof(CmLteTimingInfo)); + memset(&frm,0,sizeof(CmLteTimingInfo)); /* determine the RBG size and no of RBGs for the configured * DL BW */ @@ -2590,7 +2532,7 @@ RgSchErrInfo *errInfo; { break; } - cmMemset((U8 *)sf, 0, sizeof(*sf)); + memset(sf, 0, sizeof(*sf)); #ifdef LTE_ADV if (ROK != rgSCHLaaInitDlSfCb(cell, sf)) @@ -2612,7 +2554,7 @@ RgSchErrInfo *errInfo; /*initialize the RNTP Buffer*/ if(rgSchDSFRRntpInfoInit(&sf->rntpInfo, cell, sf->bw)) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -2621,7 +2563,7 @@ RgSchErrInfo *errInfo; /*initialise the pools of CC and CE*/ if(rgSchSFRTotalPoolInit(cell, sf)) { - RETVALUE(RFAILED); + return RFAILED; } } /* LTE_ADV_FLAG_REMOVED_END */ @@ -2635,7 +2577,7 @@ RgSchErrInfo *errInfo; (len * sizeof(U8)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for RNTP Alloc"); - RETVALUE(RFAILED); + return RFAILED; } cell->rntpAggrInfo.pres = PRSNT_NODEF; cell->rntpAggrInfo.len = len; @@ -2656,7 +2598,7 @@ RgSchErrInfo *errInfo; rgSCHLaaDeInitDlSfCb(cell, sf); #endif } - RETVALUE(RFAILED); + return RFAILED; } if (cell->sc.apis == NULLP) @@ -2682,7 +2624,7 @@ RgSchErrInfo *errInfo; if (ret != ROK) { errInfo->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE if(cell->emtcEnable) @@ -2695,12 +2637,12 @@ RgSchErrInfo *errInfo; RGSCH_IOT_PUCCH_POOLSZ, RGSCH_IOT_PUCCH_DELTA, RGSCH_IOT_PUCCH_MAXFREQSZ) != ROK) { errInfo->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ret); + return (ret); } #endif @@ -2723,21 +2665,20 @@ RgSchErrInfo *errInfo; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrCellRecfg +S16 rgSCHUtlRgrCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlRgrCellRecfg(cell, recfg, err) +S16 rgSCHUtlRgrCellRecfg(cell, recfg, err) RgSchCellCb *cell; RgrCellRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrCellRecfg); - RETVALUE(cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err)); + return (cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err)); } @@ -2759,12 +2700,12 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlFreeCell +S16 rgSCHUtlFreeCell ( RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHUtlFreeCell(cell) +S16 rgSCHUtlFreeCell(cell) RgSchCellCb *cell; #endif { @@ -2780,7 +2721,6 @@ RgSchCellCb *cell; RgSchRaReqInfo *raReqInfo; U8 idx; #endif - TRC2(rgSCHUtlFreeCell); #ifdef LTE_TDD maxslots = cell->numDlSubfrms; @@ -2885,7 +2825,7 @@ RgSchCellCb *cell; rgSchDSFRRntpInfoFree(&cell->rntpAggrInfo, cell, cell->bwCfg.dlTotalBw); /* LTE_ADV_FLAG_REMOVED_END */ - RETVALUE(ROK); + return ROK; } @@ -2909,7 +2849,7 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrUeCfg +S16 rgSCHUtlRgrUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2917,14 +2857,13 @@ RgrUeCfg *cfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlRgrUeCfg(cell, ue, cfg, err) +S16 rgSCHUtlRgrUeCfg(cell, ue, cfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCfg *cfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrUeCfg); /* Assign TM 1 as UE's default TM */ ue->mimoInfo.txMode = RGR_UE_TM_1; @@ -2936,7 +2875,7 @@ RgSchErrInfo *err; if (cfg->txMode.txModeEnum == RGR_UE_TM_5) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->mimoInfo.txMode = cfg->txMode.txModeEnum; } @@ -2949,7 +2888,7 @@ RgSchErrInfo *err; (cfg->puschDedCfg.bRIIdx > 15)) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->ul.betaHqOffst = cfg->puschDedCfg.bACKIdx; ue->ul.betaCqiOffst = cfg->puschDedCfg.bCQIIdx; @@ -2957,10 +2896,10 @@ RgSchErrInfo *err; #endif ue->csgMmbrSta = cfg->csgMmbrSta; #ifdef RG_PFS_STATS - cmMemset((U8 *)&ue->pfsStats, 0, sizeof(RgSchPfsStats)); + memset(&ue->pfsStats, 0, sizeof(RgSchPfsStats)); #endif /* Call the handler of the scheduler based on cell configuration */ - RETVALUE(cell->sc.apis->rgSCHRgrUeCfg(cell, ue, cfg, err)); + return (cell->sc.apis->rgSCHRgrUeCfg(cell, ue, cfg, err)); } /* Start : LTEMAC_2.1_DEV_CFG */ @@ -2985,7 +2924,7 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrLcCfg +S16 rgSCHUtlRgrLcCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2994,7 +2933,7 @@ RgrLchCfg *cfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHUtlRgrLcCfg(cell, ue, dlLc, cfg, errInfo) +S16 rgSCHUtlRgrLcCfg(cell, ue, dlLc, cfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -3002,8 +2941,7 @@ RgrLchCfg *cfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHUtlRgrLcCfg); - RETVALUE(cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo)); + return (cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo)); } @@ -3028,7 +2966,7 @@ RgSchErrInfo *errInfo; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrLcRecfg +S16 rgSCHUtlRgrLcRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3037,7 +2975,7 @@ RgrLchRecfg *recfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlRgrLcRecfg(cell, ue, dlLc, recfg, err) +S16 rgSCHUtlRgrLcRecfg(cell, ue, dlLc, recfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -3045,8 +2983,7 @@ RgrLchRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrLcRecfg); - RETVALUE(cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err)); + return (cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err)); } /** @@ -3067,7 +3004,7 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrLcDel +S16 rgSCHUtlRgrLcDel ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3075,17 +3012,16 @@ CmLteLcId lcId, U8 lcgId ) #else -PUBLIC S16 rgSCHUtlRgrLcDel(cell, ue, lcId, lcgId) +S16 rgSCHUtlRgrLcDel(cell, ue, lcId, lcgId) RgSchCellCb *cell; RgSchUeCb *ue; CmLteLcId lcId; U8 lcgId; #endif { - TRC2(rgSCHUtlRgrLcDel); cell->sc.apis->rgSCHRgrLchDel(cell, ue, lcId, lcgId); - RETVALUE (ROK); + return (ROK); } /* rgSCHUtlRgrLcDel */ /** @@ -3108,7 +3044,7 @@ U8 lcgId; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrLcgCfg +S16 rgSCHUtlRgrLcgCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3116,15 +3052,14 @@ RgrLcgCfg *cfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHUtlRgrLcgCfg(cell, ue, cfg, errInfo) +S16 rgSCHUtlRgrLcgCfg(cell, ue, cfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrLcgCfg *cfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHUtlRgrLcgCfg); - RETVALUE(cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo)); + return (cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo)); } @@ -3148,7 +3083,7 @@ RgSchErrInfo *errInfo; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrLcgRecfg +S16 rgSCHUtlRgrLcgRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3156,15 +3091,14 @@ RgrLcgRecfg *recfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlRgrLcgRecfg(cell, ue, recfg, err) +S16 rgSCHUtlRgrLcgRecfg(cell, ue, recfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrLcgRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrLcgRecfg); - RETVALUE(cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err)); + return (cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err)); } /* rgSCHUtlRgrLcRecfg */ /** @@ -3186,20 +3120,19 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlRgrLcgDel +Void rgSCHUtlRgrLcgDel ( RgSchCellCb *cell, RgSchUeCb *ue, U8 lcgId ) #else -PUBLIC Void rgSCHUtlRgrLcgDel(cell, ue, lcgId) +Void rgSCHUtlRgrLcgDel(cell, ue, lcgId) RgSchCellCb *cell; RgSchUeCb *ue; U8 lcgId; #endif { - TRC2(rgSCHUtlRgrLcgDel); cell->sc.apis->rgSCHFreeLcg(cell, ue, &ue->ul.lcgArr[lcgId]); /* Stack Crash problem for TRACE5 changes. added the return below . */ @@ -3227,20 +3160,19 @@ U8 lcgId; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDoaInd +Void rgSCHUtlDoaInd ( RgSchCellCb *cell, RgSchUeCb *ue, TfuDoaRpt *doaRpt ) #else -PUBLIC Void rgSCHUtlDoaInd(cell, ue, doaRpt) +Void rgSCHUtlDoaInd(cell, ue, doaRpt) RgSchCellCb *cell; RgSchUeCb *ue; TfuDoaRpt *doaRpt; #endif { - TRC2(rgSCHUtlDoaInd); ue->mimoInfo.doa.pres = PRSNT_NODEF; ue->mimoInfo.doa.val = doaRpt->doa; RETVOID; @@ -3264,7 +3196,7 @@ TfuDoaRpt *doaRpt; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlCqiInd +Void rgSCHUtlDlCqiInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3272,7 +3204,7 @@ TfuDlCqiRpt *dlCqiRpt, CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHUtlDlCqiInd(cell, ue, dlCqiRpt, timingInfo) +Void rgSCHUtlDlCqiInd(cell, ue, dlCqiRpt, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiRpt *dlCqiRpt; @@ -3280,7 +3212,6 @@ CmLteTimingInfo timingInfo; #endif { RgSchCellCb *sCellCb = NULLP; - TRC2(rgSCHUtlDlCqiInd); if (dlCqiRpt->isPucchInfo) { sCellCb = ue->cellInfo[dlCqiRpt->dlCqiInfo.pucchCqi.cellIdx]->cell; @@ -3320,7 +3251,7 @@ CmLteTimingInfo timingInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlSrsInd +Void rgSCHUtlSrsInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3328,14 +3259,13 @@ TfuSrsRpt *srsRpt, CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHUtlSrsInd(cell, ue, srsRpt, timingInfo) +Void rgSCHUtlSrsInd(cell, ue, srsRpt, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; TfuSrsRpt *srsRpt; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlSrsInd); cell->sc.apis->rgSCHSrsInd(cell, ue, srsRpt, timingInfo); RETVOID; } @@ -3357,18 +3287,17 @@ CmLteTimingInfo timingInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlTARpt +Void rgSCHUtlDlTARpt ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHUtlDlTARpt(cell, ue) +Void rgSCHUtlDlTARpt(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlDlTARpt); cell->sc.apis->rgSCHDlTARpt(cell, ue); RETVOID; } @@ -3390,18 +3319,17 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlRlsSubFrm +Void rgSCHUtlDlRlsSubFrm ( RgSchCellCb *cell, CmLteTimingInfo subFrm ) #else -PUBLIC Void rgSCHUtlDlRlsSubFrm(cell, subFrm) +Void rgSCHUtlDlRlsSubFrm(cell, subFrm) RgSchCellCb *cell; CmLteTimingInfo subFrm; #endif { - TRC2(rgSCHUtlDlRlsSubFrm); cell->sc.apis->rgSCHDlRlsSubFrm(cell, subFrm); RETVOID; } @@ -3427,14 +3355,14 @@ CmLteTimingInfo subFrm; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUpdACqiTrigWt +Void rgSCHUtlUpdACqiTrigWt ( RgSchUeCb *ue, RgSchUeCellInfo *cellInfo, U8 isAck ) #else -PUBLIC Void rgSCHUtlUpdACqiTrigWt(ue,cellInfo, isAck) +Void rgSCHUtlUpdACqiTrigWt(ue,cellInfo, isAck) RgSchUeCb *ue; RgSchUeCellInfo *cellInfo; U8 isAck; @@ -3445,8 +3373,6 @@ U8 isAck; U8 sIdx = 0; #endif - TRC2(rgSCHUtlUpdACqiTrigWt); - if (isAck == TFU_HQFDB_ACK) { cellInfo->acqiCb.aCqiTrigWt += RG_APER_CQI_ACK_WGT; @@ -3510,20 +3436,19 @@ U8 isAck; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlHdlUlTransInd +Void rgSCHUtlHdlUlTransInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHUtlHdlUlTransInd(cell, ue, timingInfo) +Void rgSCHUtlHdlUlTransInd(cell, ue, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlUlTransInd); cell->sc.apis->rgSCHHdlUlTransInd(cell, ue, timingInfo); RETVOID; } @@ -3543,20 +3468,19 @@ CmLteTimingInfo timingInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlHdlCrcInd +Void rgSCHUtlHdlCrcInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHUtlHdlCrcInd(cell, ue, timingInfo) +Void rgSCHUtlHdlCrcInd(cell, ue, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlCrcFail); cell->sc.apis->rgSCHUlCrcInd(cell, ue, timingInfo); RETVOID; } /* end of rgSCHUtlHdlCrcFailInd */ @@ -3576,20 +3500,19 @@ CmLteTimingInfo timingInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlHdlCrcFailInd +Void rgSCHUtlHdlCrcFailInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHUtlHdlCrcFailInd(cell, ue, timingInfo) +Void rgSCHUtlHdlCrcFailInd(cell, ue, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlCrcFail); cell->sc.apis->rgSCHUlCrcFailInd(cell, ue, timingInfo); RETVOID; } /* end of rgSCHUtlHdlCrcFailInd */ @@ -3614,18 +3537,17 @@ CmLteTimingInfo timingInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlProcAddToRetx +Void rgSCHUtlDlProcAddToRetx ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHUtlDlProcAddToRetx(cell, hqP) +Void rgSCHUtlDlProcAddToRetx(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHUtlDlProcAddToRetx); cell->sc.apis->rgSCHDlProcAddToRetx(cell, hqP); RETVOID; } @@ -3649,14 +3571,14 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlHqPTbAddToTx +Void rgSCHUtlDlHqPTbAddToTx ( RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP, U8 tbIdx ) #else -PUBLIC Void rgSCHUtlDlHqPTbAddToTx(subFrm, hqP, tbIdx) +Void rgSCHUtlDlHqPTbAddToTx(subFrm, hqP, tbIdx) RgSchDlSf *subFrm; RgSchDlHqProcCb *hqP; U8 tbIdx; @@ -3743,7 +3665,7 @@ U8 tbIdx; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlHqPTbRmvFrmTx +Void rgSCHUtlDlHqPTbRmvFrmTx ( RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP, @@ -3751,7 +3673,7 @@ U8 tbIdx, Bool isRepeting ) #else -PUBLIC Void rgSCHUtlDlHqPTbRmvFrmTx(subFrm, hqP, tbIdx, isRepeting) +Void rgSCHUtlDlHqPTbRmvFrmTx(subFrm, hqP, tbIdx, isRepeting) RgSchDlSf *subFrm; RgSchDlHqProcCb *hqP; U8 tbIdx; @@ -3814,13 +3736,13 @@ Bool isRepeting; * @return RgSchUeCb* **/ #ifdef ANSI -PUBLIC RgSchCellCb* rgSchUtlGetCellCb +RgSchCellCb* rgSchUtlGetCellCb ( Inst inst, U16 cellId ) #else -PUBLIC RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) +RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) Inst inst; U16 cellId; #endif @@ -3828,12 +3750,10 @@ PUBLIC RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) RgSchCellCb *cellCb = NULLP; U8 strtCellId; - TRC2(rgSchUtlGetCellCb); - strtCellId = rgSchCb[inst].genCfg.startCellId; cellCb = rgSchCb[inst].cells[cellId - strtCellId]; - RETVALUE(cellCb); + return (cellCb); } /* rgSchUtlGetCellCb */ @@ -3850,14 +3770,14 @@ PUBLIC RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) * @return U8 servCellIdx **/ #ifdef ANSI -PUBLIC U8 rgSchUtlGetServCellIdx +U8 rgSchUtlGetServCellIdx ( Inst inst, U16 cellId, RgSchUeCb *ue ) #else -PUBLIC U8 rgSchUtlGetServCellIdx(inst,cellId,ue) +U8 rgSchUtlGetServCellIdx(inst,cellId,ue) Inst inst; U16 cellId; RgSchUeCb *ue; @@ -3866,13 +3786,11 @@ PUBLIC U8 rgSchUtlGetServCellIdx(inst,cellId,ue) U8 servCellIdx; U16 strtCellId; - TRC2(rgSchUtlGetCellCb); - strtCellId = rgSchCb[inst].genCfg.startCellId; servCellIdx = ue->cellIdToCellIdxMap[cellId - strtCellId]; - RETVALUE(servCellIdx); + return (servCellIdx); } /* rgSchUtlGetCellCb */ @@ -3889,27 +3807,25 @@ PUBLIC U8 rgSchUtlGetServCellIdx(inst,cellId,ue) * @return RgSchUeCb* **/ #ifdef ANSI -PUBLIC S16 rgSchUtlVldtCellId +S16 rgSchUtlVldtCellId ( Inst inst, U16 cellId ) #else -PUBLIC S16 rgSchUtlVldtCellId(inst, cellId) +S16 rgSchUtlVldtCellId(inst, cellId) Inst inst; U16 cellId; #endif { U8 strtCellId; - TRC2(rgSchUtlVldtCellId); - strtCellId = rgSchCb[inst].genCfg.startCellId; if((cellId >= strtCellId) && ((cellId - strtCellId) < CM_LTE_MAX_CELLS)) { - RETVALUE(ROK); + return ROK; } - RETVALUE(RFAILED); + return RFAILED; } /* rgSchUtlVldtCellId */ #endif /* LTE_ADV*/ @@ -3932,7 +3848,7 @@ PUBLIC S16 rgSchUtlVldtCellId(inst, cellId) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrUeRecfg +S16 rgSCHUtlRgrUeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3940,7 +3856,7 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlRgrUeRecfg(cell, ue, ueRecfg, err) +S16 rgSCHUtlRgrUeRecfg(cell, ue, ueRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -3950,8 +3866,6 @@ RgSchErrInfo *err; /* Changes for UE Category Reconfiguration feature addition */ RgSchCmnUe *ueSch = RG_SCH_CMN_GET_UE(ue, cell); - TRC2(rgSCHUtlRgrUeRecfg); - /* Changes for UE Category Reconfiguration feature addition */ if (ueRecfg->ueRecfgTypes & RGR_UE_UECAT_RECFG) { @@ -3970,7 +3884,7 @@ RgSchErrInfo *err; if (ueRecfg->txMode.txModeEnum == RGR_UE_TM_5) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV if(ue->mimoInfo.txMode != ueRecfg->txMode.txModeEnum) @@ -4010,7 +3924,7 @@ RgSchErrInfo *err; /* Commenting here to assign garbage value when it is not set in APP. */ //ue->accessStratumRls = ueRecfg->accessStratumRls; - RETVALUE(cell->sc.apis->rgSCHRgrUeRecfg(cell, ue, ueRecfg, err)); + return (cell->sc.apis->rgSCHRgrUeRecfg(cell, ue, ueRecfg, err)); } /* rgSCHUtlRgrUeRecfg */ /** @@ -4030,20 +3944,19 @@ RgSchErrInfo *err; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlFreeDlLc +Void rgSCHUtlFreeDlLc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PUBLIC Void rgSCHUtlFreeDlLc(cell, ue, svc) +Void rgSCHUtlFreeDlLc(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { - TRC2(rgSCHUtlFreeDlLc); cell->sc.apis->rgSCHFreeDlLc(cell, ue, svc); /* Stack Crash problem for TRACE5 changes. added the return below . */ @@ -4066,18 +3979,17 @@ RgSchDlLcCb *svc; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlFreeUe +Void rgSCHUtlFreeUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHUtlFreeUe(cell, ue) +Void rgSCHUtlFreeUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlFreeUe); #ifdef LTE_TDD rgSCHUtlDelUeANFdbkInfo(ue,RGSCH_PCELL_INDEX); #endif @@ -4105,20 +4017,19 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDlDedBoUpd +Void rgSCHUtlDlDedBoUpd ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *lc ) #else -PUBLIC Void rgSCHUtlDlDedBoUpd(cell, ue, lc) +Void rgSCHUtlDlDedBoUpd(cell, ue, lc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *lc; #endif { - TRC2(rgSCHUtlDlDedBoUpd); cell->sc.apis->rgSCHDlDedBoUpd(cell, ue, lc); RETVOID; } @@ -4138,20 +4049,19 @@ RgSchDlLcCb *lc; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlRecMsg3Alloc +Void rgSCHUtlRecMsg3Alloc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchRaCb *raCb ) #else -PUBLIC Void rgSCHUtlRecMsg3Alloc(cell, ue, raCb) +Void rgSCHUtlRecMsg3Alloc(cell, ue, raCb) RgSchCellCb *cell; RgSchUeCb *ue; RgSchRaCb *raCb; #endif { - TRC2(rgSCHUtlRecMsg3Alloc) cell->sc.apis->rgSCHUlRecMsg3Alloc(cell, ue, raCb); RETVOID; @@ -4177,21 +4087,20 @@ RgSchRaCb *raCb; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUpdUlHqProc +S16 rgSCHUtlUpdUlHqProc ( RgSchCellCb *cell, RgSchUlHqProcCb *curProc, RgSchUlHqProcCb *oldProc ) #else -PUBLIC S16 rgSCHUtlUpdUlHqProc(cell, curProc, oldProc) +S16 rgSCHUtlUpdUlHqProc(cell, curProc, oldProc) RgSchCellCb *cell; RgSchUlHqProcCb *curProc; RgSchUlHqProcCb *oldProc; #endif { - TRC2(rgSCHUtlUpdUlHqProc); - RETVALUE(cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc)); + return (cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc)); } /* rgSCHUtlUpdUlHqProc */ #endif /** @@ -4212,25 +4121,23 @@ RgSchUlHqProcCb *oldProc; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlContResUlGrant +S16 rgSCHUtlContResUlGrant ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlContResUlGrant(cell, ue, err) +S16 rgSCHUtlContResUlGrant(cell, ue, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlContResUlGrant); - ue->isMsg4PdcchWithCrnti = TRUE; - RETVALUE(cell->sc.apis->rgSCHContResUlGrant(cell, ue, err)); + return (cell->sc.apis->rgSCHContResUlGrant(cell, ue, err)); } /* rgSCHUtlContResUlGrant */ /** @@ -4250,7 +4157,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlSrRcvd +S16 rgSCHUtlSrRcvd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4258,15 +4165,14 @@ CmLteTimingInfo frm, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlSrRcvd(cell, ue, frm, err) +S16 rgSCHUtlSrRcvd(cell, ue, frm, err) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo frm; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlSrRcvd); - RETVALUE(cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err)); + return (cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err)); } /* rgSCHUtlSrRcvd */ /** @@ -4288,7 +4194,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUpdBsrShort +Void rgSCHUtlUpdBsrShort ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4297,7 +4203,7 @@ U8 bsr, RgSchErrInfo *err ) #else -PUBLIC Void rgSCHUtlUpdBsrShort(cell, ue, lcgId, bsr, err) +Void rgSCHUtlUpdBsrShort(cell, ue, lcgId, bsr, err) RgSchCellCb *cell; RgSchUeCb *ue; U8 lcgId; @@ -4305,7 +4211,6 @@ U8 bsr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdBsrShort); cell->sc.apis->rgSCHUpdBsrShort(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); RETVOID; } /* rgSCHUtlUpdBsrShort */ @@ -4331,7 +4236,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUpdBsrTrunc +Void rgSCHUtlUpdBsrTrunc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4340,7 +4245,7 @@ U8 bsr, RgSchErrInfo *err ) #else -PUBLIC Void rgSCHUtlUpdBsrTrunc(cell, ue, lcgId, bsr, err) +Void rgSCHUtlUpdBsrTrunc(cell, ue, lcgId, bsr, err) RgSchCellCb *cell; RgSchUeCb *ue; U8 lcgId; @@ -4348,7 +4253,6 @@ U8 bsr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdBsrTrunc); cell->sc.apis->rgSCHUpdBsrTrunc(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); RETVOID; } /* rgSCHUtlUpdBsrTrunc */ @@ -4378,7 +4282,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUpdBsrLong +Void rgSCHUtlUpdBsrLong ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4389,7 +4293,7 @@ U8 bsr3, RgSchErrInfo *err ) #else -PUBLIC Void rgSCHUtlUpdBsrLong(cell, ue, bsr0, bsr1, bsr2, bsr3, err) +Void rgSCHUtlUpdBsrLong(cell, ue, bsr0, bsr1, bsr2, bsr3, err) RgSchCellCb *cell; RgSchUeCb *ue; U8 bsr0; @@ -4400,7 +4304,6 @@ RgSchErrInfo *err; #endif { U8 bsArr[4]; - TRC2(rgSCHUtlUpdBsrLong); bsArr[0] = bsr0; bsArr[1] = bsr1; @@ -4428,7 +4331,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUpdExtPhr +S16 rgSCHUtlUpdExtPhr ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4436,15 +4339,14 @@ RgInfExtPhrCEInfo * extPhr, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlUpdExtPhr(cell, ue, extPhr, err) +S16 rgSCHUtlUpdExtPhr(cell, ue, extPhr, err) RgSchCellCb *cell; RgSchUeCb *ue; RgInfExtPhrCEInfo * extPhr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdExtPhr); - RETVALUE(cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err)); + return (cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err)); } /* rgSCHUtlUpdExtPhr */ @@ -4467,7 +4369,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUpdPhr +S16 rgSCHUtlUpdPhr ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4475,15 +4377,14 @@ U8 phr, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlUpdPhr(cell, ue, phr, err) +S16 rgSCHUtlUpdPhr(cell, ue, phr, err) RgSchCellCb *cell; RgSchUeCb *ue; U8 phr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdPhr); - RETVALUE(cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err)); + return (cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err)); } /* rgSCHUtlUpdPhr */ @@ -4503,20 +4404,19 @@ RgSchErrInfo *err; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlCqiInd +Void rgSCHUtlUlCqiInd ( RgSchCellCb *cell, RgSchUeCb *ue, TfuUlCqiRpt *ulCqiInfo ) #else -PUBLIC Void rgSCHUtlUlCqiInd(cell, ue, ulCqiInfo) +Void rgSCHUtlUlCqiInd(cell, ue, ulCqiInfo) RgSchCellCb *cell; RgSchUeCb *ue; TfuUlCqiRpt *ulCqiInfo; #endif { - TRC2(rgSCHUtlUlCqiInd); cell->sc.apis->rgSCHUlCqiInd(cell, ue, ulCqiInfo); RETVOID; } /* rgSCHUtlUlCqiInd */ @@ -4537,20 +4437,19 @@ TfuUlCqiRpt *ulCqiInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlPucchDeltaPwrInd +Void rgSCHUtlPucchDeltaPwrInd ( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta ) #else -PUBLIC Void rgSCHUtlPucchDeltaPwrInd(cell, ue, delta) +Void rgSCHUtlPucchDeltaPwrInd(cell, ue, delta) RgSchCellCb *cell; RgSchUeCb *ue; S8 delta; #endif { - TRC2(rgSCHUtlPucchDeltaPwrInd); cell->sc.apis->rgSCHPucchDeltaPwrInd(cell, ue, delta); RETVOID; } /* rgSCHUtlPucchDeltaPwrInd */ @@ -4569,18 +4468,17 @@ S8 delta; * @return S16 **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUeReset +Void rgSCHUtlUeReset ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHUtlUeReset(cell, ue) +Void rgSCHUtlUeReset(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlUeReset); ue->remBoCnt = 0; cell->sc.apis->rgSCHUeReset(cell, ue); RETVOID; @@ -4607,7 +4505,7 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHqProcForUe +Void rgSCHUtlUlHqProcForUe ( RgSchCellCb *cell, CmLteTimingInfo frm, @@ -4615,14 +4513,13 @@ RgSchUeCb *ue, RgSchUlHqProcCb **procRef ) #else -PUBLIC Void rgSCHUtlUlHqProcForUe(cell, frm, ue, procRef) +Void rgSCHUtlUlHqProcForUe(cell, frm, ue, procRef) RgSchCellCb *cell; CmLteTimingInfo frm; RgSchUeCb *ue; RgSchUlHqProcCb **procRef; #endif { - TRC2(rgSCHUtlUlHqProcForUe); cell->sc.apis->rgSCHUlHqProcForUe(cell, frm, ue, procRef); /* Stack Crash problems for TRACE5 changes. added the return below */ @@ -4648,17 +4545,16 @@ RgSchUlHqProcCb **procRef; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlFirstRcptnReq +RgSchUlAlloc *rgSCHUtlFirstRcptnReq ( RgSchCellCb *cell ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlFirstRcptnReq(cell) +RgSchUlAlloc *rgSCHUtlFirstRcptnReq(cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHUtlFirstRcptnReq); - RETVALUE(cell->sc.apis->rgSCHFirstRcptnReq(cell)); + return (cell->sc.apis->rgSCHFirstRcptnReq(cell)); } /** @@ -4679,19 +4575,18 @@ RgSchCellCb *cell; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlNextRcptnReq +RgSchUlAlloc *rgSCHUtlNextRcptnReq ( RgSchCellCb *cell, RgSchUlAlloc *alloc ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlNextRcptnReq(cell, alloc) +RgSchUlAlloc *rgSCHUtlNextRcptnReq(cell, alloc) RgSchCellCb *cell; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlNextRcptnReq); - RETVALUE(cell->sc.apis->rgSCHNextRcptnReq(cell, alloc)); + return (cell->sc.apis->rgSCHNextRcptnReq(cell, alloc)); } /** @@ -4713,19 +4608,18 @@ RgSchUlAlloc *alloc; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc +RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc ( RgSchCellCb *cell, U8 idx ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc(cell, idx) +RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc(cell, idx) RgSchCellCb *cell; U8 idx; #endif { - TRC2(rgSCHUtlFirstHqFdbkAlloc); - RETVALUE(cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx)); + return (cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx)); } @@ -4745,21 +4639,20 @@ U8 idx; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc +RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc ( RgSchCellCb *cell, RgSchUlAlloc *alloc, U8 idx ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc(cell, alloc, idx) +RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc(cell, alloc, idx) RgSchCellCb *cell; RgSchUlAlloc *alloc; U8 idx; #endif { - TRC2(rgSCHUtlNextHqFdbkAlloc); - RETVALUE(cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx)); + return (cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx)); } /*********************************** @@ -4783,14 +4676,14 @@ U8 idx; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlTfuBndReq +S16 rgSCHUtlTfuBndReq ( Inst instId, SuId suId, SpId spId ) #else -PUBLIC S16 rgSCHUtlTfuBndReq(instId, suId, spId) +S16 rgSCHUtlTfuBndReq(instId, suId, spId) Inst instId; SuId suId; SpId spId; @@ -4799,17 +4692,16 @@ SpId spId; S16 ret; RgSchLowSapCb *tfuSap; Pst pst; - TRC2(rgSCHUtlTfuBndReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[instId].tfuSap[suId]); - (Void)cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuSchBndReq (&pst, suId, spId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlTfuBndReq() Call to RgLiTfuBndReq()" " failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuBndReq */ /** @@ -4828,14 +4720,14 @@ SpId spId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlTfuUBndReq +S16 rgSCHUtlTfuUBndReq ( Inst inst, RgSchLowSapCfgInfo sapCfg, Reason reason ) #else -PUBLIC S16 rgSCHUtlTfuUBndReq(inst, sapCfg, reason) +S16 rgSCHUtlTfuUBndReq(inst, sapCfg, reason) Inst inst; RgSchLowSapCfgInfo sapCfg; Reason reason; @@ -4844,16 +4736,14 @@ Reason reason; S16 ret; Pst pst; - TRC2(rgSCHUtlTfuUBndReq); - /* Get the lower SAP control block from the layer control block. */ - cmMemcpy ((U8*)&pst, (U8*)&(sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuSchUbndReq (&pst, sapCfg.spId, reason)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuUBndReq() Call to" " RgLiTfuUbndReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuUBndReq */ @@ -4872,25 +4762,24 @@ Reason reason; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlResetSfAlloc +S16 rgSCHUtlResetSfAlloc ( RgInfSfAlloc *sfAlloc, Bool resetCmnLcInfo, Bool restAlloc ) #else -PUBLIC S16 rgSCHUtlResetSfAlloc(sfAlloc,resetCmnLcInfo,restAlloc) +S16 rgSCHUtlResetSfAlloc(sfAlloc,resetCmnLcInfo,restAlloc) RgInfSfAlloc *sfAlloc; Bool resetCmnLcInfo; Bool restAlloc; #endif { - TRC2(rgSCHUtlResetSfAlloc); if(TRUE == restAlloc) { if(sfAlloc->ueInfo.numUes) { - cmMemset((U8 *)sfAlloc->ueInfo.allocInfo,0x00, + memset(sfAlloc->ueInfo.allocInfo,0x00, (sizeof(RgInfUeAlloc)*sfAlloc->ueInfo.numUes)); } sfAlloc->ueInfo.numUes = 0; @@ -4901,7 +4790,7 @@ Bool restAlloc; { sfAlloc->cmnLcInfo.bitMask = 0; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4919,18 +4808,17 @@ Bool restAlloc; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlGetRlsHqAlloc +S16 rgSCHUtlGetRlsHqAlloc ( RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHUtlGetRlsHqAlloc(cell) +S16 rgSCHUtlGetRlsHqAlloc(cell) RgSchCellCb *cell; #endif { U8 idx = 0; Inst inst = cell->instIdx; - TRC2(rgSCHUtlGetRlsHqAlloc); for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) { cell->rlsHqArr[idx].cellId = cell->cellId; @@ -4945,11 +4833,11 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "UE Alloc"); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -4968,18 +4856,17 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlPutRlsHqAlloc +S16 rgSCHUtlPutRlsHqAlloc ( RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHUtlPutRlsHqAlloc(cell) +S16 rgSCHUtlPutRlsHqAlloc(cell) RgSchCellCb *cell; #endif { U8 idx = 0; Inst inst = cell->instIdx; - TRC2(rgSCHUtlPutRlsHqAlloc); for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) { @@ -4996,7 +4883,7 @@ RgSchCellCb *cell; } } - RETVALUE(ROK); + return ROK; } @@ -5016,12 +4903,12 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlGetSfAlloc +S16 rgSCHUtlGetSfAlloc ( RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHUtlGetSfAlloc(cell) +S16 rgSCHUtlGetSfAlloc(cell) RgSchCellCb *cell; #endif { @@ -5029,7 +4916,6 @@ RgSchCellCb *cell; U8 indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHUtlGetSfAlloc); #ifdef LTE_TDD for(idx=0; idx < RGSCH_SF_ALLOC_SIZE; idx++) @@ -5049,7 +4935,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "UE Alloc"); - RETVALUE(RFAILED); + return RFAILED; } /* Allocate memory for "scheduled RAR" Info */ @@ -5059,7 +4945,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "RARNTI"); - RETVALUE(RFAILED); + return RFAILED; } for(indx = 0; indx < RGSCH_MAX_RARNTI_PER_DL_SF; indx++) { @@ -5069,7 +4955,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "RNTI"); - RETVALUE(RFAILED); + return RFAILED; } } @@ -5079,7 +4965,7 @@ RgSchCellCb *cell; rgSCHEmtcUtlGetSfAlloc(cell); #endif - RETVALUE(ROK); + return ROK; } @@ -5098,12 +4984,12 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlPutSfAlloc +S16 rgSCHUtlPutSfAlloc ( RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHUtlPutSfAlloc(cell) +S16 rgSCHUtlPutSfAlloc(cell) RgSchCellCb *cell; #endif { @@ -5111,7 +4997,6 @@ RgSchCellCb *cell; U8 indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHUtlPutSfAlloc); #ifdef LTE_TDD for(idx=0; idx < RGSCH_SF_ALLOC_SIZE; idx++) @@ -5154,7 +5039,7 @@ RgSchCellCb *cell; #ifdef EMTC_ENABLE rgSCHEmtcUtlPutSfAlloc(cell); #endif - RETVALUE(ROK); + return ROK; } @@ -5176,14 +5061,14 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlAllocSBuf +S16 rgSCHUtlAllocSBuf ( Inst inst, /* Instance of the invoking scheduler */ Data **pData, /* Pointer of the data to be returned */ Size size /* size */ ) #else -PUBLIC S16 rgSCHUtlAllocSBuf(inst, pData, size) +S16 rgSCHUtlAllocSBuf(inst, pData, size) Inst inst; /* Instance of the invoking scheduler */ Data **pData; /* Pointer of the data to be returned */ Size size; /* size */ @@ -5191,8 +5076,6 @@ Size size; /* size */ { /* Moving alarm diagnostics to available scope */ - TRC2(rgSCHUtlAllocSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; @@ -5200,7 +5083,7 @@ Size size; /* size */ #ifndef NO_ERRCLS if (size == 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5220,14 +5103,14 @@ Size size; /* size */ LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); RGSCHLOGERROR(inst, ERRCLS_DEBUG, ERG015, 0, "Unable to Allocate Buffer"); RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Unable to Allocate the Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlAllocSBuf */ @@ -5246,14 +5129,14 @@ Size size; /* size */ * File: rg_utl.c */ #ifdef ANSI -PUBLIC Void rgSCHUtlFreeSBuf +Void rgSCHUtlFreeSBuf ( Inst inst, /* Instance of the invoking scheduler */ Data **data, /* pointer to data */ Size size /* size */ ) #else -PUBLIC Void rgSCHUtlFreeSBuf(inst, data, size) +Void rgSCHUtlFreeSBuf(inst, data, size) Inst inst; /* Instance of the invoking scheduler */ Data **data; /* pointer to data */ Size size; /* size */ @@ -5262,8 +5145,6 @@ Size size; /* size */ S16 ret; - TRC2(rgSCHUtlFreeSBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { RETVOID; @@ -5306,14 +5187,14 @@ Size size; /* size */ * File: rg_utl.c */ #ifdef ANSI -PUBLIC Void rgSCHUtlFreeWarningSiSeg +Void rgSCHUtlFreeWarningSiSeg ( Region reg, Pool pool, CmLListCp *siPduLst ) #else -PUBLIC Void rgSCHUtlFreeWarningSiSeg(reg, pool, siPduLst) +Void rgSCHUtlFreeWarningSiSeg(reg, pool, siPduLst) Region reg; Pool pool; CmLListCp *siPduLst; @@ -5322,8 +5203,6 @@ CmLListCp *siPduLst; CmLList *node; Buffer *pdu; - TRC2(rgSCHUtlFreeWarningSiSeg) - while (siPduLst->first != NULLP) { node = siPduLst->first; @@ -5351,12 +5230,12 @@ CmLListCp *siPduLst; * File: rg_utl.c */ #ifdef ANSI -PUBLIC Void rgSCHUtlFreeWarningSiPdu +Void rgSCHUtlFreeWarningSiPdu ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHUtlFreeWarningSiPdu(cell) +Void rgSCHUtlFreeWarningSiPdu(cell) RgSchCellCb *cell; #endif { @@ -5365,8 +5244,6 @@ RgSchCellCb *cell; RgSchWarningSiInfo *warningSi; RgSchWarningSiPdu *warningSiPdu; - TRC2(rgSCHUtlFreeWarningSiPdu) - warningSi = (RgSchWarningSiInfo *) cell->siCb.\ siArray[cell->siCb.siCtx.siId-1].si; /* ccpu00136659: CMAS ETWS design changes */ @@ -5409,12 +5286,12 @@ RgSchCellCb *cell; * File: rg_utl.c */ #ifdef ANSI -PUBLIC Buffer *rgSCHUtlGetWarningSiPdu +Buffer *rgSCHUtlGetWarningSiPdu ( RgSchCellCb *cell ) #else -PUBLIC Buffer *rgSCHUtlGetWarningSiPdu(cell) +Buffer *rgSCHUtlGetWarningSiPdu(cell) RgSchCellCb *cell; #endif { @@ -5423,21 +5300,19 @@ RgSchCellCb *cell; Buffer *pdu; CmLList *node; - TRC2(rgSCHUtlGetWarningSiPdu) - - warningSi = (RgSchWarningSiInfo *) cell->siCb. - siArray[cell->siCb.siCtx.siId-1].si; + warningSi = (RgSchWarningSiInfo *) cell->siCb. + siArray[cell->siCb.siCtx.siId-1].si; /* ccpu00136659: CMAS ETWS design changes */ CM_LLIST_FIRST_NODE(&warningSi->warningSiMsg.segLstCp, node); if (node != NULLP) { warningSiPdu = (RgSchWarningSiPdu *)node->node; pdu = warningSiPdu->pdu; - RETVALUE(pdu); + return (pdu); } else { - RETVALUE(NULLP); + return (NULLP); } } /* rgSCHUtlGetWarningSiPdu */ @@ -5455,7 +5330,7 @@ RgSchCellCb *cell; * File: rg_utl.c */ #ifdef ANSI -PUBLIC S16 rgSCHUtlGetMcsAndNPrb +S16 rgSCHUtlGetMcsAndNPrb ( RgSchCellCb *cell, U8 *nPrb, @@ -5463,7 +5338,7 @@ U8 *mcs, MsgLen *msgLen ) #else -PUBLIC S16 rgSCHUtlGetMcsAndNPrb(cell, nPrb, mcs, msgLen) +S16 rgSCHUtlGetMcsAndNPrb(cell, nPrb, mcs, msgLen) RgSchCellCb *cell; U8 *nPrb; U8 *mcs; @@ -5474,8 +5349,6 @@ MsgLen *msgLen; RgSchWarningSiPdu *warningSiPdu; CmLList *node; - TRC2(rgSCHUtlGetMcsAndNPrb) - if(cell->siCb.siCtx.warningSiFlag == FALSE) { *mcs = cell->siCb.crntSiInfo.siInfo[cell->siCb.siCtx.siId-1].mcs; @@ -5490,17 +5363,17 @@ MsgLen *msgLen; CM_LLIST_FIRST_NODE(&warningSi->warningSiMsg.segLstCp, node); if (node == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } warningSiPdu = (RgSchWarningSiPdu *)node->node; *mcs = warningSiPdu->mcs; *nPrb = warningSiPdu->nPrb; *msgLen = warningSiPdu->msgLen; - RETVALUE(ROK); + return ROK; } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlGetMcsAndNPrb */ /* @@ -5516,7 +5389,7 @@ MsgLen *msgLen; * File: rg_utl.c */ #ifdef ANSI -PUBLIC S16 rgSCHUtlCalMcsAndNPrb +S16 rgSCHUtlCalMcsAndNPrb ( RgSchCellCb *cell, U8 cfgType, @@ -5524,7 +5397,7 @@ MsgLen msgLen, U8 siId ) #else -PUBLIC S16 rgSCHUtlCalMcsAndNPrb(cell, nPrb, mcs, msgLen) +S16 rgSCHUtlCalMcsAndNPrb(cell, nPrb, mcs, msgLen) RgSchCellCb *cell; U8 cfgType; MsgLen msgLen; @@ -5534,14 +5407,12 @@ U8 siId; U8 mcs = 0; U8 nPrb = 0; - TRC2(rgSCHUtlCalMcsAndNPrb) - /*Get the nPrb and mcs parametr values */ if (rgSCHUtlGetAllwdCchTbSz(msgLen*8, &nPrb, &mcs) != (msgLen*8)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "msgLen does " "not match any valid TB Size"); - RETVALUE(RFAILED); + return RFAILED; } @@ -5587,7 +5458,7 @@ U8 siId; cell->siCb.crntSiInfo.siInfo[siId-1].msgLen = msgLen; } - RETVALUE(ROK); + return ROK; } #endif @@ -5605,22 +5476,20 @@ U8 siId; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlFillDgnParams +Void rgSCHUtlFillDgnParams ( Inst inst, RgUstaDgn *dgn, U8 dgnType ) #else -PUBLIC Void rgSCHUtlFillDgnParams(inst, dgn, dgnType) +Void rgSCHUtlFillDgnParams(inst, dgn, dgnType) Inst inst; RgUstaDgn *dgn; U8 dgnType; #endif { - TRC2(rgSCHUtlFillDgnParams) - switch(dgnType) { case LRG_USTA_DGNVAL_MEM: @@ -5653,20 +5522,19 @@ U8 dgnType; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlGetPstToLyr +Void rgSCHUtlGetPstToLyr ( Pst *pst, RgSchCb *schCb, Inst macInst ) #else -PUBLIC Void rgSCHUtlGetPstToLyr (pst, schCb, macInst) +Void rgSCHUtlGetPstToLyr (pst, schCb, macInst) Pst *pst; RgSchCb *schCb; Inst macInst; #endif { - TRC2(rgSCHUtlGetPstToLyr); /* Only the needed params are filled */ pst->region = schCb->rgSchInit.region; @@ -5676,8 +5544,8 @@ Inst macInst; pst->dstProcId = schCb->rgSchInit.procId; pst->dstInst = macInst; - pst->dstEnt = ENTRG; - pst->srcEnt = ENTRG; + pst->dstEnt = ENTMAC; + pst->srcEnt = ENTMAC; pst->selector = 0; pst->prior = PRIOR0; pst->intfVer = 0; @@ -5701,7 +5569,7 @@ Inst macInst; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlFillRgInfCmnLcInfo +S16 rgSCHUtlFillRgInfCmnLcInfo ( RgSchDlSf *sf, RgInfSfAlloc *sfAlloc, @@ -5709,14 +5577,13 @@ CmLteLcId lcId, Bool sendInd ) #else -PUBLIC S16 rgSCHUtlFillRgInfCmnLcInfo(sf, sfAlloc, lcId, sendInd) +S16 rgSCHUtlFillRgInfCmnLcInfo(sf, sfAlloc, lcId, sendInd) RgSchDlSf *sf; RgInfSfAlloc *sfAlloc; CmLteLcId lcId; Bool sendInd; #endif { - TRC2(rgSCHUtlFillRgInfCmnLcInfo); if((sf->bch.tbSize)&& !(sfAlloc->cmnLcInfo.bitMask & RGINF_BCH_INFO)) @@ -5747,7 +5614,7 @@ Bool sendInd; sfAlloc->cmnLcInfo.pcchInfo.lcId = lcId; sfAlloc->cmnLcInfo.bitMask |= RGINF_PCCH_INFO; } - RETVALUE(ROK); + return ROK; } /** @brief This function fills in the RAR information to be sent to MAC @@ -5764,14 +5631,14 @@ Bool sendInd; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlFillRgInfRarInfo +S16 rgSCHUtlFillRgInfRarInfo ( RgSchDlSf *sf, RgInfSfAlloc *sfAlloc, RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHUtlFillRgInfRarInfo(sf, sfAlloc, cell) +S16 rgSCHUtlFillRgInfRarInfo(sf, sfAlloc, cell) RgSchDlSf *sf; RgInfSfAlloc *sfAlloc; RgSchCellCb *cell; @@ -5786,8 +5653,6 @@ RgSchCellCb *cell; U8 noRaRsps; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHUtlFillRgInfRarInfo); - #ifdef LTE_TDD noRaRsps = RGSCH_MAX_TDD_RA_RSP_ALLOC; #else @@ -5884,7 +5749,7 @@ RgSchCellCb *cell; TODO-Need to add a check for max tx power per symbol */ sfAlloc->rarInfo.txPwrOffset = cellDl->rarTxPwrOffset; - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlFillRgInfRarInfo */ /** @brief This function fills in the pdsch data related allocation Info @@ -5905,18 +5770,17 @@ RgSchCellCb *cell; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlFillPdschDciInfo +S16 rgSCHUtlFillPdschDciInfo ( TfuPdschDciInfo *pdsch, TfuDciInfo *pdcchDci ) #else -PUBLIC S16 rgSCHUtlFillPdschDciInfo(pdsch, pdcchDci) +S16 rgSCHUtlFillPdschDciInfo(pdsch, pdcchDci) TfuPdschDciInfo *pdsch; TfuDciInfo *pdcchDci; #endif { - TRC2(rgSCHUtlFillPdschDciInfo) #ifdef EMTC_ENABLE S16 ret = ROK; @@ -5961,13 +5825,13 @@ TfuDciInfo *pdcchDci; ret = rgSCHEmtcUtlFillPdschDciInfo(pdsch, pdcchDci); if(RFAILED == ret) { - RETVALUE(RFAILED); + return RFAILED; } #else - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -5985,7 +5849,7 @@ TfuDciInfo *pdcchDci; * **/ #ifdef ANSI -PUBLIC Void rgSchDSFRPwrCheck +Void rgSchDSFRPwrCheck ( RgSchDlSf *sf, Bool *isAllUePwrHigh @@ -6002,8 +5866,6 @@ PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) CmLListCp *l; CmLList *n; - TRC2(rgSchDSFRPwrCheck); - l = &sf->sfrTotalPoolInfo.ccPool; n = cmLListFirst(l); while(n) @@ -6419,7 +6281,7 @@ RgSchCellCb *cell; **********************************************************/ /* CA dev Start */ #ifdef ANSI -PUBLIC Void rgSCHUtlFillRgInfUeInfo +Void rgSCHUtlFillRgInfUeInfo ( RgSchDlSf *sf, RgSchCellCb *cell, @@ -6428,7 +6290,7 @@ CmLListCp *dlInActvLst, CmLListCp *ulInActvLst ) #else -PUBLIC Void rgSCHUtlFillRgInfUeInfo (sf,cell, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst) +Void rgSCHUtlFillRgInfUeInfo (sf,cell, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst) { RgSchDlSf *sf; RgSchCellCb *cell; @@ -6555,7 +6417,7 @@ CmLListCp *ulInActvLst; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlUpdSch +S16 rgSCHUtlUpdSch ( RgInfSfDatInd *subfrmInfo, RgSchCellCb *cellCb, @@ -6564,7 +6426,7 @@ RgInfUeDatInd *pdu, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlUpdSch (subfrmInfo, cellCb, ueCb, pdu, err) +S16 rgSCHUtlUpdSch (subfrmInfo, cellCb, ueCb, pdu, err) RgInfSfDatInd *subfrmInfo; RgSchCellCb *cellCb; RgSchUeCb *ueCb; @@ -6574,7 +6436,6 @@ RgSchErrInfo *err; { S16 ret; - TRC2(rgSCHUtlUpdSch); #ifdef LTEMAC_SPS if (RGSCH_UL_SPS_ACT_PRSENT & pdu->ceInfo.bitMask) @@ -6589,7 +6450,7 @@ RgSchErrInfo *err; /* PHR present */ RGSCHCPYTIMEINFO(subfrmInfo->timingInfo, ueCb->macCeRptTime); if ((ret = rgSCHUtlUpdPhr(cellCb, ueCb, pdu->ceInfo.ces.phr, err)) != ROK) - RETVALUE(ret); + return (ret); } /* Note: Order of indication to Sch now is * 1st Indicate the DataInd info for each LCG's @@ -6643,7 +6504,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlUpdSch */ #ifdef RGR_V1 /** @@ -6661,20 +6522,19 @@ RgSchErrInfo *err; * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlAddUeToCcchSduLst +S16 rgSCHUtlAddUeToCcchSduLst ( RgSchCellCb *cell, RgSchUeCb *ueCb ) #else -PUBLIC S16 rgSCHUtlAddUeToCcchSduLst(cell, ueCb) +S16 rgSCHUtlAddUeToCcchSduLst(cell, ueCb) RgSchCellCb *cell; RgSchUeCb *ueCb; #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb, cell); RgSchDlHqProcCb *hqP = (RgSchDlHqProcCb *)ueDl->proc; - TRC2(rgSCHUtlAddUeToCcchSduLst); /* Temp Guard: For back to back CCCH SDU BO * twice. Hence an extra guard. If already added to scheduling @@ -6685,13 +6545,13 @@ RgSchUeCb *ueCb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unexpected CCCH SDU BO", ueCb->ueId); - RETVALUE(ROK); + return ROK; } ueCb->ccchSduLnk.node = (PTR)(ueCb); cmLListAdd2Tail(&(cell->ccchSduUeLst), &(ueCb->ccchSduLnk)); - RETVALUE(ROK); + return ROK; } /** * @@ -6707,26 +6567,24 @@ RgSchUeCb *ueCb; * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUpdtBo +S16 rgSCHUtlUpdtBo ( RgSchCellCb *cell, RgInfCmnBoRpt *staRsp ) #else -PUBLIC S16 rgSCHUtlUpdtBo(cell, staRsp) +S16 rgSCHUtlUpdtBo(cell, staRsp) RgSchCellCb *cell; RgInfCmnBoRpt *staRsp; #endif { RgSchUeCb *ueCb; - TRC2(rgSCHUtlUpdtBo) - if ((ueCb = rgSCHDbmGetUeCb(cell, staRsp->u.rnti)) == NULLP) { /* Handle Ue fetch failure */ RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid UEID:%d",staRsp->u.rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Update Bo in ueCb */ ueCb->dlCcchInfo.bo = (U32)(staRsp->bo); @@ -6741,7 +6599,7 @@ RgInfCmnBoRpt *staRsp; rgSCHUtlAddUeToCcchSduLst(cell, ueCb); } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlUpdtBo */ #endif @@ -6761,13 +6619,13 @@ RgInfCmnBoRpt *staRsp; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlHndlCcchBoUpdt +S16 rgSCHUtlHndlCcchBoUpdt ( RgSchCellCb *cell, RgInfCmnBoRpt *boRpt ) #else -PUBLIC S16 rgSCHUtlHndlCcchBoUpdt(cell, boRpt) +S16 rgSCHUtlHndlCcchBoUpdt(cell, boRpt) RgSchCellCb *cell; RgInfCmnBoRpt *boRpt; #endif @@ -6775,19 +6633,17 @@ RgInfCmnBoRpt *boRpt; RgSchRaCb *raCb; RgSchUeCb *ueCb; - TRC2(rgSCHUtlHndlCcchBoUpdt); - if ((raCb = rgSCHDbmGetRaCb(cell, boRpt->u.rnti)) == NULLP) { #ifdef RGR_V1 /* CR timer implementation changes*/ /*If no raCb, schedule ueCb, ueCb is extracted in rgSCHUtlUpdtBo*/ - RETVALUE(rgSCHUtlUpdtBo(cell, boRpt)); + return (rgSCHUtlUpdtBo(cell, boRpt)); #else /* Handle RaCb fetch failure */ RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid RNTI:%d to fetch raCb",boRpt->u.rnti); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -6822,7 +6678,7 @@ RgInfCmnBoRpt *boRpt; { /* Handle Ue fetch failure */ RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RNTI:%d",boRpt->u.rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Update Bo in ueCb */ ueCb->dlCcchInfo.bo = (U32)(boRpt->bo); @@ -6832,7 +6688,7 @@ RgInfCmnBoRpt *boRpt; rgSCHRamUpdtBo(cell, raCb, boRpt); #endif - RETVALUE(ROK); + return ROK; } /* rgSCHUtlHndlCcchBoUpdt */ /** @@ -6855,14 +6711,14 @@ RgInfCmnBoRpt *boRpt; * -# RFAILED **/ #ifdef ANSI -PUBLIC S32 rgSCHUtlGetAllwdCchTbSz +S32 rgSCHUtlGetAllwdCchTbSz ( U32 bo, U8 *nPrb, U8 *mcs ) #else -PUBLIC S32 rgSCHUtlGetAllwdCchTbSz(bo, nPrb, mcs) +S32 rgSCHUtlGetAllwdCchTbSz(bo, nPrb, mcs) U32 bo; U8 *nPrb; U8 *mcs; @@ -6872,8 +6728,6 @@ U8 *mcs; S32 cn; S32 rt; - TRC2(rgSCHUtlGetAllwdCchTbSz); - for (lt = 0, rt = 43; lt <= rt;) { cn = (lt + rt)/2; @@ -6881,7 +6735,7 @@ U8 *mcs; { *nPrb = rgSchUtlBcchPcchTbSzTbl[cn].rbIndex; *mcs = rgSchUtlBcchPcchTbSzTbl[cn].mcs; - RETVALUE(rgSchUtlBcchPcchTbSzTbl[cn].tbSz); + return (rgSchUtlBcchPcchTbSzTbl[cn].tbSz); } else if (rgSchUtlBcchPcchTbSzTbl[cn].tbSz < bo) lt = cn + 1; @@ -6890,11 +6744,11 @@ U8 *mcs; } if (lt == 44) { - RETVALUE(RFAILED); + return RFAILED; } *nPrb = rgSchUtlBcchPcchTbSzTbl[lt].rbIndex; *mcs = rgSchUtlBcchPcchTbSzTbl[lt].mcs; - RETVALUE(rgSchUtlBcchPcchTbSzTbl[lt].tbSz); + return (rgSchUtlBcchPcchTbSzTbl[lt].tbSz); } /** @@ -6914,13 +6768,13 @@ U8 *mcs; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlHndlBcchPcchBoUpdt +S16 rgSCHUtlHndlBcchPcchBoUpdt ( RgSchCellCb *cell, RgInfCmnBoRpt *boUpdt ) #else -PUBLIC S16 rgSCHUtlHndlBcchPcchBoUpdt(cell, boUpdt) +S16 rgSCHUtlHndlBcchPcchBoUpdt(cell, boUpdt) RgSchCellCb *cell; RgInfCmnBoRpt *boUpdt; #endif @@ -6931,14 +6785,12 @@ RgInfCmnBoRpt *boUpdt; U8 nPrb=0; U8 mcs=0; - TRC2(rgSCHUtlHndlBcchPcchBoUpdt); - dlLc = rgSCHDbmGetBcchOnBch(cell); if (dlLc == NULLP) { RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "No Logical Channel dlLc is NULLP for RNTI:%d LCID:%d",boUpdt->u.rnti,boUpdt->lcId); - RETVALUE(RFAILED); + return RFAILED; } if (boUpdt->lcId != dlLc->lcId) { @@ -6951,12 +6803,12 @@ RgInfCmnBoRpt *boUpdt; { RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,"[%ld]BO: does not match any " "valid TB Size RNTI:%d LCID:%d", boUpdt->bo,boUpdt->u.rnti,boUpdt->lcId); - RETVALUE(RFAILED); + return RFAILED; } }/*end of rgSCHChkBoUpdate*/ else { - RETVALUE(ROK); + return ROK; } } if ((dlLc = rgSCHDbmGetCmnLcCb(cell, boUpdt->lcId)) == NULLP) @@ -6971,7 +6823,7 @@ RgInfCmnBoRpt *boUpdt; { RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, "Allocation of common bo %dreport " "failed RNTI:%d LCID:%d", boUpdt->bo,boUpdt->u.rnti,boUpdt->lcId); - RETVALUE(RFAILED); + return RFAILED; } boRpt->bo = boUpdt->bo; @@ -6997,7 +6849,7 @@ RgInfCmnBoRpt *boUpdt; } rgSCHDbmInsCmnLcBoRpt(dlLc, boRpt); - RETVALUE(ROK); + return ROK; } /* rgSCHUtlHndlBcchPcchBoUpdt */ /** @@ -7018,14 +6870,14 @@ RgInfCmnBoRpt *boUpdt; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrBndCfm +S16 rgSCHUtlRgrBndCfm ( Inst instId, SuId suId, U8 status ) #else -PUBLIC S16 rgSCHUtlRgrBndCfm(instId, suId, status) +S16 rgSCHUtlRgrBndCfm(instId, suId, status) Inst instId; SuId suId; U8 status; @@ -7033,16 +6885,13 @@ U8 status; { S16 ret = ROK; - TRC2(rgSCHUtlRgrBndCfm) - - ret = RgUiRgrBndCfm(&rgSchCb[instId].rgrSap[suId].sapCfg.sapPst, rgSchCb[instId].rgrSap[suId].sapCfg.suId, status); if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrBndCfm: RgUiRgrBndCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrBndCfm*/ /** @@ -7063,14 +6912,14 @@ U8 status; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgmBndCfm +S16 rgSCHUtlRgmBndCfm ( Inst instId, SuId suId, U8 status ) #else -PUBLIC S16 rgSCHUtlRgmBndCfm(instId, suId, status) +S16 rgSCHUtlRgmBndCfm(instId, suId, status) Inst instId; SuId suId; U8 status; @@ -7078,16 +6927,13 @@ U8 status; { S16 ret = ROK; - TRC2(rgSCHUtlRgmBndCfm) - - ret = RgUiRgmBndCfm(&rgSchCb[instId].rgmSap[suId].sapCfg.sapPst, rgSchCb[instId].rgmSap[suId].sapCfg.suId, status); if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgmBndCfm: RgUiRgrBndCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgmBndCfm*/ @@ -7110,7 +6956,7 @@ U8 status; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 schSendCfgCfm +S16 schSendCfgCfm ( Region reg, Pool pool, @@ -7118,7 +6964,7 @@ RgrCfgTransId transId, U8 status ) #else -PUBLIC S16 schSendCfgCfm(reg, pool, transId, status) +S16 schSendCfgCfm(reg, pool, transId, status) Region reg; Pool pool; RgrCfgTransId transId; @@ -7126,28 +6972,27 @@ U8 status; #endif { Pst cfmPst; - Inst inst; + Inst inst = 0; - TRC2(schSendCfgCfm) - cmMemset((U8 *)(&cfmPst), 0, sizeof(Pst)); + memset((&cfmPst), 0, sizeof(Pst)); cfmPst.srcEnt = (Ent)ENTDUAPP; cfmPst.srcInst = (Inst) 0; cfmPst.srcProcId = SFndProcId(); - cfmPst.dstEnt = (Ent)ENTRG; + cfmPst.dstEnt = (Ent)ENTMAC; cfmPst.dstInst = (Inst) 0; cfmPst.dstProcId = SFndProcId(); - cfmPst.selector = RGR_SEL_LC; + cfmPst.selector = ODU_SELECTOR_LC; cfmPst.region = reg; cfmPst.pool = pool; if(RgUiRgrCfgCfm(&cfmPst,transId, status) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"schSendCfgCfm: RgUiRgrCfgCfm Failed "); + RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"schSendCfgCfm: RgUiRgrCfgCfm Failed"); printf("\nschSendCfgCfm: RgUiRgrCfgCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* schSendCfgCfm*/ #ifdef RGR_RRM_TICK /** @@ -7167,13 +7012,13 @@ U8 status; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrTtiInd +S16 rgSCHUtlRgrTtiInd ( RgSchCellCb *cell, RgrTtiIndInfo *rgrTti ) #else -PUBLIC S16 rgSCHUtlRgrTtiInd(cell, rgrTti) +S16 rgSCHUtlRgrTtiInd(cell, rgrTti) RgSchCellCb *cell; RgrTtiIndInfo *rgrTti; #endif @@ -7185,16 +7030,13 @@ RgrTtiIndInfo *rgrTti; extern Void mtTmrHdlrPublic(void); #endif - TRC2(rgSCHUtlRgrTtiInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrTtiInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrTtiInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrTti); @@ -7204,7 +7046,7 @@ RgrTtiIndInfo *rgrTti; mtTmrHdlrPublic(); } #endif - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrTtiInd*/ #endif /** @brief This function is called by rgMacSchSfRecpInd. This function invokes the @@ -7232,7 +7074,7 @@ RgrTtiIndInfo *rgrTti; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlProcMsg3 +S16 rgSCHUtlProcMsg3 ( RgInfSfDatInd *subfrmInfo, RgSchCellCb *cellCb, @@ -7242,7 +7084,7 @@ RgInfUeDatInd *pdu, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlProcMsg3 (subfrmInfo, cellCb, ueCb, rnti, pdu, err) +S16 rgSCHUtlProcMsg3 (subfrmInfo, cellCb, ueCb, rnti, pdu, err) RgInfSfDatInd *subfrmInfo; RgSchCellCb *cellCb; RgSchUeCb *ueCb; @@ -7254,16 +7096,13 @@ RgSchErrInfo *err; S16 ret; RgSchRaCb *raCb; - TRC2(rgSCHUtlProcMsg3) - - /* must have an raCb for this case */ raCb = rgSCHDbmGetRaCb (cellCb, rnti); if (raCb == NULLP) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "RNTI:%d Received MSG3, unable to " "find raCb",rnti); - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00130982: Processing CRNTI MAC CE before Short BSR, if any, such that @@ -7273,7 +7112,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Processing failed in the RAM " "RNTI:%d ",rnti); - RETVALUE(ret); + return (ret); } /* if ueCb is present */ if (ueCb != NULLP) @@ -7281,7 +7120,7 @@ RgSchErrInfo *err; rgSCHUtlUpdSch (subfrmInfo, cellCb, ueCb, pdu, err); } - RETVALUE(ROK); + return ROK; } #ifdef LTEMAC_SPS /** @brief This function is called by RgMacSchSpsRelInd. This function invokes the @@ -7303,22 +7142,21 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlSpsRelInd +S16 rgSCHUtlSpsRelInd ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, Bool isExplRel ) #else -PUBLIC S16 rgSCHUtlSpsRelInd (cellCb, ueCb, isExplRel) +S16 rgSCHUtlSpsRelInd (cellCb, ueCb, isExplRel) RgSchCellCb *cellCb; RgSchUeCb *ueCb; Bool isExplRel; #endif { - TRC2(rgSCHUtlSpsRelInd); cellCb->sc.apis->rgSCHUlSpsRelInd(cellCb, ueCb, isExplRel); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlSpsRelInd */ @@ -7341,22 +7179,21 @@ Bool isExplRel; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlSpsActInd +S16 rgSCHUtlSpsActInd ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, U16 spsSduSize ) #else -PUBLIC S16 rgSCHUtlSpsActInd (cellCb, ueCb, spsSduSize) +S16 rgSCHUtlSpsActInd (cellCb, ueCb, spsSduSize) RgSchCellCb *cellCb; RgSchUeCb *ueCb; U16 spsSduSize; #endif { - TRC2(rgSCHUtlSpsActInd); cellCb->sc.apis->rgSCHUlSpsActInd(cellCb, ueCb, spsSduSize); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlSpsActInd */ @@ -7380,14 +7217,14 @@ U16 spsSduSize; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlTfuGrpPwrCntrlReq +S16 rgSCHUtlTfuGrpPwrCntrlReq ( Inst inst, S16 sapId, TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq ) #else -PUBLIC S16 rgSCHUtlTfuGrpPwrCntrlReq(inst, sapId, grpPwrCntrlReq) +S16 rgSCHUtlTfuGrpPwrCntrlReq(inst, sapId, grpPwrCntrlReq) Inst inst; S16 sapId; TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; @@ -7397,7 +7234,6 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; RgSchLowSapCb *tfuSap; Pst pst; - TRC2(rgSCHUtlTfuGrpPwrCntrlReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7405,15 +7241,15 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; { RLOG_ARG1(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, "rgSCHUtlTfuGrpPwrCntrlReq() Lower SAP not bound (%d) ",tfuSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } - cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuGrpPwrCntrlReq (&pst, tfuSap->sapCfg.spId, grpPwrCntrlReq)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, "rgSCHUtlTfuGrpPwrCntrlReq() Call to RgLiTfuGrpPwrCntrlReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuGrpPwrCntrlReq */ #endif @@ -7434,14 +7270,14 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlTfuCntrlReq +S16 rgSCHUtlTfuCntrlReq ( Inst inst, S16 sapId, TfuCntrlReqInfo *cntrlReq ) #else -PUBLIC S16 rgSCHUtlTfuCntrlReq(inst, sapId, cntrlReq) +S16 rgSCHUtlTfuCntrlReq(inst, sapId, cntrlReq) Inst inst; S16 sapId; TfuCntrlReqInfo *cntrlReq; @@ -7450,8 +7286,6 @@ TfuCntrlReqInfo *cntrlReq; S16 ret; RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlTfuCntrlReq) - /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7461,7 +7295,7 @@ TfuCntrlReqInfo *cntrlReq; RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuCntrlReq() Lower SAP not bound (%d) ", tfuSap->sapSta.sapState); RGSCH_FREE_MEM(cntrlReq); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7471,7 +7305,7 @@ TfuCntrlReqInfo *cntrlReq; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuCntrlReq() Call to RgLiTfuCntrlReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuCntrlReq*/ @@ -7495,20 +7329,19 @@ TfuCntrlReqInfo *cntrlReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlDlActvtUe +S16 rgSCHUtlDlActvtUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC S16 rgSCHUtlDlActvtUe(cell, ue) +S16 rgSCHUtlDlActvtUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlDlActvtUe); cell->sc.apis->rgSCHActvtDlUe(cell, ue); - RETVALUE(ROK); + return ROK; } /** @@ -7529,20 +7362,19 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUlActvtUe +S16 rgSCHUtlUlActvtUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC S16 rgSCHUtlUlActvtUe(cell, ue) +S16 rgSCHUtlUlActvtUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlUlActvtUe); cell->sc.apis->rgSCHActvtUlUe(cell, ue); - RETVALUE(ROK); + return ROK; } /** @@ -7562,14 +7394,14 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlTfuRecpReq +S16 rgSCHUtlTfuRecpReq ( Inst inst, S16 sapId, TfuRecpReqInfo *recpReq ) #else -PUBLIC S16 rgSCHUtlTfuRecpReq(inst, sapId, recpReq) +S16 rgSCHUtlTfuRecpReq(inst, sapId, recpReq) Inst inst; S16 sapId; TfuRecpReqInfo *recpReq; @@ -7578,7 +7410,6 @@ TfuRecpReqInfo *recpReq; S16 ret; RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlTfuRecpReq) /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7589,7 +7420,7 @@ TfuRecpReqInfo *recpReq; RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuRecpReq() Lower SAP not bound (%d) ", tfuSap->sapSta.sapState); RGSCH_FREE_MEM(recpReq); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7599,7 +7430,7 @@ TfuRecpReqInfo *recpReq; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuRecpReq() Call to RgLiTfuRecpReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuRecpReq */ /** @brief This function Validates the SAP information received along with the @@ -7614,25 +7445,23 @@ TfuRecpReqInfo *recpReq; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHUtlValidateTfuSap +S16 rgSCHUtlValidateTfuSap ( Inst inst, SuId suId ) #else -PUBLIC S16 rgSCHUtlValidateTfuSap(inst, suId) +S16 rgSCHUtlValidateTfuSap(inst, suId) Inst inst; SuId suId; #endif { RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlValidateTfuSap) - if(suId >= rgSchCb[inst].numSaps) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Incorrect SuId"); - RETVALUE(RFAILED); + return RFAILED; } tfuSap = &(rgSchCb[inst].tfuSap[suId]); @@ -7641,15 +7470,15 @@ SuId suId; { RLOG_ARG2(L_ERROR,DBG_INSTID,inst,"Incorrect SuId. Configured (%d) Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } if (tfuSap->sapSta.sapState != LRG_BND) { RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"Lower SAP not enabled SuId (%d)", tfuSap->sapCfg.suId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlValidateTfuSap */ /* @@ -7667,14 +7496,14 @@ SuId suId; * */ #ifdef ANSI -PUBLIC S16 rgSCHUtlAllocEventMem +S16 rgSCHUtlAllocEventMem ( Inst inst, Ptr *memPtr, Size memSize ) #else -PUBLIC S16 rgSCHUtlAllocEventMem(inst, memPtr, memSize) +S16 rgSCHUtlAllocEventMem(inst, memPtr, memSize) Inst inst; Ptr *memPtr; Size memSize; @@ -7683,8 +7512,6 @@ Size memSize; Mem sMem; VOLATILE U32 startTime=0; - TRC2(rgSCHUtlAllocEventMem) - sMem.region = rgSchCb[inst].rgSchInit.region; sMem.pool = rgSchCb[inst].rgSchInit.pool; @@ -7693,7 +7520,7 @@ Size memSize; { RGSCHLOGERROR(inst, ERRCLS_INT_PAR, ERG022, memSize, "rgAllocEventMem(): memSize invalid\n"); - RETVALUE (RFAILED); + return (RFAILED); } #endif /* ERRCLASS & ERRCLS_DEBUG */ /*starting Task*/ @@ -7709,11 +7536,11 @@ Size memSize; #endif /* */ { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"cmAllocEvnt Failed."); - RETVALUE(RFAILED); + return RFAILED; } /*stoping Task*/ SStopTask(startTime, PID_SCHUTL_CMALLCEVT); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlAllocEventMem*/ /* @@ -7731,14 +7558,14 @@ Size memSize; * */ #ifdef ANSI -PUBLIC S16 rgSCHUtlGetEventMem +S16 rgSCHUtlGetEventMem ( Ptr *ptr, Size len, Ptr memCp ) #else -PUBLIC S16 rgSCHUtlGetEventMem(ptr, len, memCp) +S16 rgSCHUtlGetEventMem(ptr, len, memCp) Ptr *ptr; Size len; Ptr memCp; @@ -7746,13 +7573,12 @@ Ptr memCp; { S16 ret; - TRC2(rgSCHUtlGetEventMem) #ifdef TFU_ALLOC_EVENT_NO_INIT ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr); #else ret = cmGetMem(memCp, len, (Ptr *)ptr); #endif - RETVALUE(ret); + return (ret); } /* end of rgSCHUtlGetEventMem*/ #ifdef LTE_TDD @@ -7771,26 +7597,24 @@ Ptr memCp; * @return S16 **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlAllocUeANFdbkInfo +S16 rgSCHUtlAllocUeANFdbkInfo ( RgSchUeCb *ue, U8 servCellIdx ) #else -PUBLIC S16 rgSCHUtlAllocUeANFdbkInfo(ue,servCellIdx) +S16 rgSCHUtlAllocUeANFdbkInfo(ue,servCellIdx) RgSchUeCb *ue; U8 servCellIdx; #endif { U8 idx; - TRC2(rgSCHUtlAllocUeANFdbkInfo); - if (rgSCHUtlAllocSBuf(ue->cell->instIdx, (Data **) &(ue->cellInfo[servCellIdx]->anInfo), sizeof(RgSchTddANInfo) * \ ue->cell->ackNackFdbkArrSize) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for(idx=0; idx < ue->cell->ackNackFdbkArrSize; idx++) @@ -7800,7 +7624,7 @@ U8 servCellIdx; /* Set it to the first index */ ue->cellInfo[servCellIdx]->nextFreeANIdx = 0; - RETVALUE(ROK); + return ROK; } /* rgSCHUtlAllocUeANFdbkInfo */ /** @@ -7816,18 +7640,17 @@ U8 servCellIdx; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlDelUeANFdbkInfo +Void rgSCHUtlDelUeANFdbkInfo ( RgSchUeCb *ue, U8 servCellIdx ) #else -PUBLIC Void rgSCHUtlDelUeANFdbkInfo(ue,servCellIdx) +Void rgSCHUtlDelUeANFdbkInfo(ue,servCellIdx) RgSchUeCb *ue; U8 servCellIdx; #endif { - TRC2(rgSCHUtlDelUeANFdbkInfo); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -7851,16 +7674,15 @@ U8 servCellIdx; * @return S16 **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlInitUeANFdbkInfo +S16 rgSCHUtlInitUeANFdbkInfo ( RgSchTddANInfo *anFdInfo ) #else -PUBLIC S16 rgSCHUtlInitUeANFdbkInfo(anFdInfo) +S16 rgSCHUtlInitUeANFdbkInfo(anFdInfo) RgSchTddANInfo *anFdInfo; #endif { - TRC2(rgSCHUtlInitUeANFdbkInfo); anFdInfo->sfn = RGSCH_MAX_SFN+1; /* defensively setting invalid sfn */ anFdInfo->slot = 0; @@ -7868,7 +7690,7 @@ RgSchTddANInfo *anFdInfo; anFdInfo->dlDai = RG_SCH_INVALID_DAI_VAL; anFdInfo->latestMIdx = RG_SCH_INVALID_M_VAL; - RETVALUE(ROK); + return ROK; } /* rgSCHUtlInitUeANFdbkInfo */ /** @@ -7886,14 +7708,14 @@ RgSchTddANInfo *anFdInfo; * @return RgSchTddANInfo* **/ #ifdef ANSI -PUBLIC RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo +RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo ( RgSchUeCb *ueCb, CmLteTimingInfo *timeInfo, U8 servCellIdx ) #else -PUBLIC RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo(ueCb, timeInfo,servCellIdx) +RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo(ueCb, timeInfo,servCellIdx) RgSchUeCb *ueCb; CmLteTimingInfo *timeInfo; U8 servCellIdx; @@ -7901,18 +7723,16 @@ U8 servCellIdx; { U8 idx; - TRC2(rgSCHUtlGetUeANFdbkInfo); - for (idx = 0; idx < ueCb->cell->ackNackFdbkArrSize; ++idx) { if( (timeInfo->sfn == ueCb->cellInfo[servCellIdx]->anInfo[idx].sfn) && (timeInfo->slot == ueCb->cellInfo[servCellIdx]->anInfo[idx].slot)) { - RETVALUE(&ueCb->cellInfo[servCellIdx]->anInfo[idx]); + return (&ueCb->cellInfo[servCellIdx]->anInfo[idx]); } } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHUtlGetUeANFdbkInfo */ /** @@ -7929,19 +7749,18 @@ U8 servCellIdx; * **/ #ifdef ANSI -PUBLIC U8 rgSCHUtlGetDlSfIdx +U8 rgSCHUtlGetDlSfIdx ( RgSchCellCb *cell, CmLteTimingInfo *timeInfo ) #else -PUBLIC U8 rgSCHUtlGetDlSfIdx(cell, timeInfo) +U8 rgSCHUtlGetDlSfIdx(cell, timeInfo) RgSchCellCb *cell; CmLteTimingInfo *timeInfo; #endif { U16 idx = 0; - TRC2(rgSCHUtlGetDlSfIdx); idx = RGSCH_NUM_SUB_FRAMES - \ rgSchTddNumUlSubfrmTbl[cell->ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -7949,7 +7768,7 @@ CmLteTimingInfo *timeInfo; rgSchTddNumDlSubfrmTbl[cell->ulDlCfgIdx][timeInfo->slot]) - 1; idx = idx % cell->numDlSubfrms; - RETVALUE((U8)idx); + return ((U8)idx); } /** @@ -7969,7 +7788,7 @@ CmLteTimingInfo *timeInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlGetNxtDlSfInfo +Void rgSCHUtlGetNxtDlSfInfo ( CmLteTimingInfo curDlTime, RgSchCellCb *cell, @@ -7978,7 +7797,7 @@ RgSchDlSf **nxtDlsf, CmLteTimingInfo *nxtDlTime ) #else -PUBLIC Void rgSCHUtlGetNxtDlSfInfo(curDlTime, cell, dlSf, nxtDlsf, nxtDlTime) +Void rgSCHUtlGetNxtDlSfInfo(curDlTime, cell, dlSf, nxtDlsf, nxtDlTime) CmLteTimingInfo curDlTime; RgSchCellCb *cell; RgSchDlSf *dlSf; @@ -7988,7 +7807,6 @@ CmLteTimingInfo *nxtDlTime; { U16 idx = curDlTime.slot; U8 count = 0; - TRC2(rgSCHUtlGetNxtDlSfInfo); while(TRUE) { @@ -8024,7 +7842,7 @@ CmLteTimingInfo *nxtDlTime; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlGetPrevDlSfInfo +Void rgSCHUtlGetPrevDlSfInfo ( RgSchCellCb *cell, CmLteTimingInfo curDlTime, @@ -8032,7 +7850,7 @@ CmLteTimingInfo *prevDlTime, U8 *numSubfrm ) #else -PUBLIC Void rgSCHUtlGetPrevDlSfInfo(cell, curDlTime, prevDlTime, numSubfrm) +Void rgSCHUtlGetPrevDlSfInfo(cell, curDlTime, prevDlTime, numSubfrm) RgSchCellCb *cell; CmLteTimingInfo curDlTime; CmLteTimingInfo *prevDlTime; @@ -8041,7 +7859,6 @@ U8 *numSubfrm; { S16 idx = curDlTime.slot; U8 count = 0; - TRC2(rgSCHUtlGetPrevDlSfInfo); do { @@ -8075,7 +7892,7 @@ U8 *numSubfrm; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUlSfInit +S16 rgSCHUtlUlSfInit ( RgSchCellCb *cell, RgSchUlSf *sf, @@ -8083,7 +7900,7 @@ U8 idx, U8 maxUePerSf ) #else -PUBLIC S16 rgSCHUtlUlSfInit(cell, sf, idx, maxUePerSf) +S16 rgSCHUtlUlSfInit(cell, sf, idx, maxUePerSf) RgSchCellCb *cell; RgSchUlSf *sf; U8 idx; @@ -8091,7 +7908,6 @@ U8 maxUePerSf; #endif { S16 ret=ROK; - TRC2(rgSCHUtlUlSfInit); sf->idx = idx; #ifdef RG_5GTF @@ -8109,7 +7925,7 @@ U8 maxUePerSf; sizeof(RgSchUlAllocDb)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } ret = rgSCHUtlUlAllocDbInit(cell, sf->allocDb, maxUePerSf); if (ret != ROK) @@ -8118,7 +7934,7 @@ U8 maxUePerSf; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->allocDb)), sizeof(RgSchUlAllocDb)); - RETVALUE(ret); + return (ret); } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&sf->holeDb, sizeof(RgSchUlHoleDb)); @@ -8129,7 +7945,7 @@ U8 maxUePerSf; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->allocDb)), sizeof(RgSchUlAllocDb)); - RETVALUE(ret); + return (ret); } /* Initialize the hole with CFI 1 Pusch Bw Info */ ret = rgSCHUtlUlHoleDbInit(cell, sf->holeDb, (U8)(maxUePerSf + 2), \ @@ -8144,7 +7960,7 @@ U8 maxUePerSf; sizeof(RgSchUlAllocDb)); rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->holeDb)), sizeof(RgSchUlHoleDb)); - RETVALUE(ret); + return (ret); } cmLListInit(&sf->reTxLst); @@ -8164,7 +7980,7 @@ U8 maxUePerSf; } #endif - RETVALUE(ret); + return (ret); } @@ -8182,18 +7998,17 @@ U8 maxUePerSf; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlSfDeinit +Void rgSCHUtlUlSfDeinit ( RgSchCellCb *cell, RgSchUlSf *sf ) #else -PUBLIC Void rgSCHUtlUlSfDeinit(cell, sf) +Void rgSCHUtlUlSfDeinit(cell, sf) RgSchCellCb *cell; RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlSfDeinit); if (sf->allocDb) { rgSCHUtlUlAllocDbDeinit(cell, sf->allocDb); @@ -8243,14 +8058,13 @@ U8 maxAllocs; #endif { S16 ret = rgSCHUtlUlAllocMemInit(cell, &allocDb->mem, maxAllocs); - TRC2(rgSCHUtlUlAllocDbInit); if (ret != ROK) { - RETVALUE(ret); + return (ret); } allocDb->count = 0; allocDb->first = NULLP; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -8279,7 +8093,6 @@ RgSchCellCb *cell; RgSchUlAllocDb *allocDb; #endif { - TRC2(rgSCHUtlUlAllocDbDeinit); rgSCHUtlUlAllocMemDeinit(cell, &allocDb->mem); allocDb->count = 0; allocDb->first = NULLP; @@ -8319,19 +8132,18 @@ U8 num; { S16 ret; RgSchUlHole *hole = NULLP; - TRC2(rgSCHUtlUlHoleDbInit); ret = rgSCHUtlUlHoleMemInit(cell, &holeDb->mem, maxHoles, &hole); if (ret != ROK) { - RETVALUE(ret); + return (ret); } holeDb->count = 1; holeDb->first = hole; hole->start = start; hole->num = num; hole->prv = hole->nxt = NULLP; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -8359,7 +8171,6 @@ RgSchCellCb *cell; RgSchUlHoleDb *holeDb; #endif { - TRC2(rgSCHUtlUlHoleDbDeinit); rgSCHUtlUlHoleMemDeinit(cell, &holeDb->mem); holeDb->count = 0; holeDb->first = NULLP; @@ -8381,27 +8192,26 @@ RgSchUlHoleDb *holeDb; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetHole +RgSchUlAlloc *rgSCHUtlUlAllocGetHole ( RgSchUlSf *sf, U8 numSb, RgSchUlHole *hole ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetHole(sf, numSb, hole) +RgSchUlAlloc *rgSCHUtlUlAllocGetHole(sf, numSb, hole) RgSchUlSf *sf; U8 numSb; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlAllocGetHole); if (numSb < hole->num) { - RETVALUE(rgSCHUtlUlAllocGetPartHole(sf, numSb, hole)); + return (rgSCHUtlUlAllocGetPartHole(sf, numSb, hole)); } else { - RETVALUE(rgSCHUtlUlAllocGetCompHole(sf, hole)); + return (rgSCHUtlUlAllocGetCompHole(sf, hole)); } } @@ -8420,13 +8230,13 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole +RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole ( RgSchUlSf *sf, RgSchUlHole *hole ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole(sf, hole) +RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole(sf, hole) RgSchUlSf *sf; RgSchUlHole *hole; #endif @@ -8437,7 +8247,6 @@ RgSchUlHole *hole; * updated, causing another check for prv */ RgSchUlAlloc *prv = hole->prvAlloc; RgSchUlAlloc *nxt = hole->nxtAlloc; - TRC2(rgSCHUtlUlAllocGetCompHole); if (prv) { @@ -8469,7 +8278,7 @@ RgSchUlHole *hole; /* UL_ALLOC_CHANGES*/ alloc->allocDbRef = (void*)sf->allocDb; alloc->holeDbRef = (void*)sf->holeDb; - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -8488,14 +8297,14 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole +RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole ( RgSchUlSf *sf, U8 numSb, RgSchUlHole *hole ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole(sf, numSb, hole) +RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole(sf, numSb, hole) RgSchUlSf *sf; U8 numSb; RgSchUlHole *hole; @@ -8506,7 +8315,6 @@ RgSchUlHole *hole; /* Calling rgSchCmnUlAllocGetAndIns is ok, but prv alloc needs to have nxtHole * updated, causing another check for prv */ RgSchUlAlloc *prv = hole->prvAlloc; - TRC2(rgSCHUtlUlAllocGetPartHole); if (prv) { @@ -8537,7 +8345,7 @@ RgSchUlHole *hole; alloc->allocDbRef = (void*)sf->allocDb; alloc->holeDbRef = (void*)sf->holeDb; - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -8554,17 +8362,16 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocFirst +RgSchUlAlloc *rgSCHUtlUlAllocFirst ( RgSchUlSf *sf ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocFirst(sf) +RgSchUlAlloc *rgSCHUtlUlAllocFirst(sf) RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlAllocFirst); - RETVALUE(sf->allocDb->first); + return (sf->allocDb->first); } /*********************************************************** @@ -8581,20 +8388,19 @@ RgSchUlSf *sf; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocNxt +RgSchUlAlloc *rgSCHUtlUlAllocNxt ( RgSchUlSf *sf, RgSchUlAlloc *alloc ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocNxt(sf, alloc) +RgSchUlAlloc *rgSCHUtlUlAllocNxt(sf, alloc) RgSchUlSf *sf; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlAllocNxt); UNUSED(sf); - RETVALUE(alloc->nxt); + return (alloc->nxt); } /*********************************************************** @@ -8617,25 +8423,24 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt +RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt ( RgSchUlAllocDb *db, RgSchUlAlloc *prv ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt(db, prv) +RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt(db, prv) RgSchUlAllocDb *db; RgSchUlAlloc *prv; #endif { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = prv->nxt; - TRC2(rgSCHUtlUlAllocGetAdjNxt); #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) { - RETVALUE ( NULLP ); + return ( NULLP ); } #endif alloc->prv = prv; @@ -8648,7 +8453,7 @@ RgSchUlAlloc *prv; ++db->count; - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -8670,23 +8475,22 @@ RgSchUlAlloc *prv; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetFirst +RgSchUlAlloc *rgSCHUtlUlAllocGetFirst ( RgSchUlAllocDb *db ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocGetFirst(db) +RgSchUlAlloc *rgSCHUtlUlAllocGetFirst(db) RgSchUlAllocDb *db; #endif { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = db->first; - TRC2(rgSCHUtlUlAllocGetFirst); #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) { - RETVALUE ( NULLP ); + return ( NULLP ); } #endif @@ -8700,7 +8504,7 @@ RgSchUlAllocDb *db; ++db->count; - RETVALUE(alloc); + return (alloc); } /* UL_ALLOC_ENHANCEMENT */ @@ -8718,12 +8522,12 @@ RgSchUlAllocDb *db; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleAddAllocation +Void rgSCHUtlUlHoleAddAllocation ( RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlHoleAddAllocation(alloc) +Void rgSCHUtlUlHoleAddAllocation(alloc) RgSchUlAlloc *alloc; #endif { @@ -8736,7 +8540,6 @@ RgSchUlAlloc *alloc; RgSchUlHoleDb *db = alloc->holeDbRef; RgSchUlHole *prv = alloc->prvHole; RgSchUlHole *nxt = alloc->nxtHole; - TRC2(rgSCHUtlUlHoleAddAllocation); if (prv) { @@ -8774,19 +8577,18 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlAllocRelease +Void rgSCHUtlUlAllocRelease ( RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlAllocRelease(alloc) +Void rgSCHUtlUlAllocRelease(alloc) RgSchUlAlloc *alloc; #endif { RgSchUlAllocDb *allocDb = alloc->allocDbRef; RgSchUlAlloc *prv = alloc->prv; RgSchUlAlloc *nxt = alloc->nxt; - TRC2(rgSCHUtlUlAllocRelease); alloc->ue = NULLP; alloc->raCb = NULLP; @@ -8830,13 +8632,13 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlAllocRls +Void rgSCHUtlUlAllocRls ( RgSchUlSf *sf, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlAllocRls(sf, alloc) +Void rgSCHUtlUlAllocRls(sf, alloc) RgSchUlSf *sf; RgSchUlAlloc *alloc; #endif @@ -8844,7 +8646,6 @@ RgSchUlAlloc *alloc; RgSchUlAllocDb *allocDb = sf->allocDb; RgSchUlAlloc *prv = alloc->prv; RgSchUlAlloc *nxt = alloc->nxt; - TRC2(rgSCHUtlUlAllocRls); alloc->ue = NULLP; alloc->raCb = NULLP; @@ -8897,17 +8698,16 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlHole *rgSCHUtlUlHoleFirst +RgSchUlHole *rgSCHUtlUlHoleFirst ( RgSchUlSf *sf ) #else -PUBLIC RgSchUlHole *rgSCHUtlUlHoleFirst(sf) +RgSchUlHole *rgSCHUtlUlHoleFirst(sf) RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlHoleFirst); - RETVALUE(sf->holeDb->first); + return (sf->holeDb->first); } /*********************************************************** @@ -8924,20 +8724,19 @@ RgSchUlSf *sf; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlHole *rgSCHUtlUlHoleNxt +RgSchUlHole *rgSCHUtlUlHoleNxt ( RgSchUlSf *sf, RgSchUlHole *hole ) #else -PUBLIC RgSchUlHole *rgSCHUtlUlHoleNxt(sf, hole) +RgSchUlHole *rgSCHUtlUlHoleNxt(sf, hole) RgSchUlSf *sf; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlHoleNxt); UNUSED(sf); - RETVALUE(hole->nxt); + return (hole->nxt); } /*********************************************************** @@ -8954,13 +8753,13 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleAddAlloc +Void rgSCHUtlUlHoleAddAlloc ( RgSchUlSf *sf, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlHoleAddAlloc(sf, alloc) +Void rgSCHUtlUlHoleAddAlloc(sf, alloc) RgSchUlSf *sf; RgSchUlAlloc *alloc; #endif @@ -8974,7 +8773,6 @@ RgSchUlAlloc *alloc; RgSchUlHoleDb *db = sf->holeDb; RgSchUlHole *prv = alloc->prvHole; RgSchUlHole *nxt = alloc->nxtHole; - TRC2(rgSCHUtlUlHoleAddAlloc); if (prv) { @@ -9015,7 +8813,7 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleJoin +Void rgSCHUtlUlHoleJoin ( RgSchUlHoleDb *db, RgSchUlHole *prv, @@ -9023,14 +8821,13 @@ RgSchUlHole *nxt, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlHoleJoin(db, prv, nxt, alloc) +Void rgSCHUtlUlHoleJoin(db, prv, nxt, alloc) RgSchUlHoleDb *db; RgSchUlHole *prv; RgSchUlHole *nxt; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleJoin); prv->num += alloc->numSb + nxt->num; rgSCHUtlUlHoleRls(db, nxt); rgSCHUtlUlHoleIncr(db, prv); @@ -9054,20 +8851,19 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleExtndRight +Void rgSCHUtlUlHoleExtndRight ( RgSchUlHoleDb *db, RgSchUlHole *prv, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlHoleExtndRight(db, prv, alloc) +Void rgSCHUtlUlHoleExtndRight(db, prv, alloc) RgSchUlHoleDb *db; RgSchUlHole *prv; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleExtndRight); prv->num += alloc->numSb; rgSCHUtlUlHoleIncr(db, prv); rgSCHUtlUlHoleUpdAllocLnks(prv, alloc->prv, alloc->nxt); @@ -9089,20 +8885,19 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleExtndLeft +Void rgSCHUtlUlHoleExtndLeft ( RgSchUlHoleDb *db, RgSchUlHole *nxt, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlHoleExtndLeft(db, nxt, alloc) +Void rgSCHUtlUlHoleExtndLeft(db, nxt, alloc) RgSchUlHoleDb *db; RgSchUlHole *nxt; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleExtndLeft); nxt->num += alloc->numSb; nxt->start = alloc->sbStart; rgSCHUtlUlHoleIncr(db, nxt); @@ -9124,13 +8919,13 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleNew +Void rgSCHUtlUlHoleNew ( RgSchUlHoleDb *db, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlHoleNew(db, alloc) +Void rgSCHUtlUlHoleNew(db, alloc) RgSchUlHoleDb *db; RgSchUlAlloc *alloc; #endif @@ -9142,7 +8937,6 @@ RgSchUlAlloc *alloc; RETVOID; } #endif - TRC2(rgSCHUtlUlHoleNew); hole->start = alloc->sbStart; hole->num = alloc->numSb; ++db->count; @@ -9165,20 +8959,19 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleUpdAllocLnks +Void rgSCHUtlUlHoleUpdAllocLnks ( RgSchUlHole *hole, RgSchUlAlloc *prvAlloc, RgSchUlAlloc *nxtAlloc ) #else -PUBLIC Void rgSCHUtlUlHoleUpdAllocLnks(hole, prvAlloc, nxtAlloc) +Void rgSCHUtlUlHoleUpdAllocLnks(hole, prvAlloc, nxtAlloc) RgSchUlHole *hole; RgSchUlAlloc *prvAlloc; RgSchUlAlloc *nxtAlloc; #endif { - TRC2(rgSCHUtlUlHoleUpdAllocLnks); if (prvAlloc) { prvAlloc->nxtHole = hole; @@ -9208,19 +9001,18 @@ RgSchUlAlloc *nxtAlloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleIns +Void rgSCHUtlUlHoleIns ( RgSchUlHoleDb *db, RgSchUlHole *hole ) #else -PUBLIC Void rgSCHUtlUlHoleIns(db, hole) +Void rgSCHUtlUlHoleIns(db, hole) RgSchUlHoleDb *db; RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleIns); if ((cur = db->first) != NULLP) { @@ -9278,19 +9070,18 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleIncr +Void rgSCHUtlUlHoleIncr ( RgSchUlHoleDb *db, RgSchUlHole *hole ) #else -PUBLIC Void rgSCHUtlUlHoleIncr(db, hole) +Void rgSCHUtlUlHoleIncr(db, hole) RgSchUlHoleDb *db; RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleIncr); if ((cur = hole->prv) != NULLP) { @@ -9346,19 +9137,18 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleDecr +Void rgSCHUtlUlHoleDecr ( RgSchUlHoleDb *db, RgSchUlHole *hole ) #else -PUBLIC Void rgSCHUtlUlHoleDecr(db, hole) +Void rgSCHUtlUlHoleDecr(db, hole) RgSchUlHoleDb *db; RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleDecr); if ((cur = hole->nxt) != NULLP) { @@ -9419,20 +9209,19 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleRls +Void rgSCHUtlUlHoleRls ( RgSchUlHoleDb *db, RgSchUlHole *hole ) #else -PUBLIC Void rgSCHUtlUlHoleRls(db, hole) +Void rgSCHUtlUlHoleRls(db, hole) RgSchUlHoleDb *db; RgSchUlHole *hole; #endif { RgSchUlHole *prv = hole->prv; RgSchUlHole *nxt = hole->nxt; - TRC2(rgSCHUtlUlHoleRls); --db->count; if (prv) @@ -9471,14 +9260,14 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUlAllocMemInit +S16 rgSCHUtlUlAllocMemInit ( RgSchCellCb *cell, RgSchUlAllocMem *mem, U8 maxAllocs ) #else -PUBLIC S16 rgSCHUtlUlAllocMemInit(cell, mem, maxAllocs) +S16 rgSCHUtlUlAllocMemInit(cell, mem, maxAllocs) RgSchCellCb *cell; RgSchUlAllocMem *mem; U8 maxAllocs; @@ -9486,13 +9275,12 @@ U8 maxAllocs; { S16 ret; RgSchUlAlloc *allocs; - TRC2(rgSCHUtlUlAllocMemInit); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&allocs, maxAllocs * sizeof(*allocs)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } mem->allocs = allocs; mem->maxAllocs = maxAllocs; @@ -9515,7 +9303,7 @@ U8 maxAllocs; allocs[i].nxt = NULLP; } mem->firstFree = &allocs[0]; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -9532,18 +9320,17 @@ U8 maxAllocs; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlAllocMemDeinit +Void rgSCHUtlUlAllocMemDeinit ( RgSchCellCb *cell, RgSchUlAllocMem *mem ) #else -PUBLIC Void rgSCHUtlUlAllocMemDeinit(cell, mem) +Void rgSCHUtlUlAllocMemDeinit(cell, mem) RgSchCellCb *cell; RgSchUlAllocMem *mem; #endif { - TRC2(rgSCHUtlUlAllocMemDeinit); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(mem->allocs)), @@ -9568,7 +9355,7 @@ RgSchUlAllocMem *mem; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUlHoleMemInit +S16 rgSCHUtlUlHoleMemInit ( RgSchCellCb *cell, RgSchUlHoleMem *mem, @@ -9576,7 +9363,7 @@ U8 maxHoles, RgSchUlHole **holeRef ) #else -PUBLIC S16 rgSCHUtlUlHoleMemInit(cell, mem, maxHoles, holeRef) +S16 rgSCHUtlUlHoleMemInit(cell, mem, maxHoles, holeRef) RgSchCellCb *cell; RgSchUlHoleMem *mem; U8 maxHoles; @@ -9585,13 +9372,12 @@ RgSchUlHole **holeRef; { S16 ret; RgSchUlHole *holes; - TRC2(rgSCHUtlUlHoleMemInit); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&holes, maxHoles * sizeof(*holes)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } mem->holes = holes; @@ -9622,7 +9408,7 @@ RgSchUlHole **holeRef; } mem->firstFree = &holes[1]; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -9639,18 +9425,17 @@ RgSchUlHole **holeRef; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleMemDeinit +Void rgSCHUtlUlHoleMemDeinit ( RgSchCellCb *cell, RgSchUlHoleMem *mem ) #else -PUBLIC Void rgSCHUtlUlHoleMemDeinit(cell, mem) +Void rgSCHUtlUlHoleMemDeinit(cell, mem) RgSchCellCb *cell; RgSchUlHoleMem *mem; #endif { - TRC2(rgSCHUtlUlHoleMemDeinit); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(mem->holes)), @@ -9674,22 +9459,21 @@ RgSchUlHoleMem *mem; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocMemGet +RgSchUlAlloc *rgSCHUtlUlAllocMemGet ( RgSchUlAllocMem *mem ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlAllocMemGet(mem) +RgSchUlAlloc *rgSCHUtlUlAllocMemGet(mem) RgSchUlAllocMem *mem; #endif { RgSchUlAlloc *alloc; - TRC2(rgSCHUtlUlAllocMemGet); #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) { - RETVALUE(NULLP); + return (NULLP); } #endif @@ -9698,7 +9482,7 @@ RgSchUlAllocMem *mem; alloc->nxt = NULLP; /* probably not needed */ /* alloc->prv might already be NULLP, in case was needed to set it to NULLP */ - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -9715,18 +9499,17 @@ RgSchUlAllocMem *mem; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlAllocMemRls +Void rgSCHUtlUlAllocMemRls ( RgSchUlAllocMem *mem, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHUtlUlAllocMemRls(mem, alloc) +Void rgSCHUtlUlAllocMemRls(mem, alloc) RgSchUlAllocMem *mem; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlAllocMemRls); alloc->prv = NULLP; alloc->nxt = mem->firstFree; @@ -9752,22 +9535,21 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlHole *rgSCHUtlUlHoleMemGet +RgSchUlHole *rgSCHUtlUlHoleMemGet ( RgSchUlHoleMem *mem ) #else -PUBLIC RgSchUlHole *rgSCHUtlUlHoleMemGet(mem) +RgSchUlHole *rgSCHUtlUlHoleMemGet(mem) RgSchUlHoleMem *mem; #endif { RgSchUlHole *hole; - TRC2(rgSCHUtlUlHoleMemGet); #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) { - RETVALUE(NULLP); + return (NULLP); } #endif @@ -9777,7 +9559,7 @@ RgSchUlHoleMem *mem; hole->nxt = NULLP; /* probably not needed */ /* hole->prv is might already be NULLP, in case was needed to set it to NULLP */ - RETVALUE(hole); + return (hole); } /*********************************************************** @@ -9794,18 +9576,17 @@ RgSchUlHoleMem *mem; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlUlHoleMemRls +Void rgSCHUtlUlHoleMemRls ( RgSchUlHoleMem *mem, RgSchUlHole *hole ) #else -PUBLIC Void rgSCHUtlUlHoleMemRls(mem, hole) +Void rgSCHUtlUlHoleMemRls(mem, hole) RgSchUlHoleMem *mem; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlHoleMemRls); hole->prv = NULLP; hole->nxt = mem->firstFree; @@ -9837,14 +9618,14 @@ RgSchUlHole *hole; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc +RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc ( RgSchUlSf *sf, U8 startSb, U8 numSb ) #else -PUBLIC RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc(sf, startSb, numSb) +RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc(sf, startSb, numSb) RgSchUlSf *sf; U8 startSb; U8 numSb; @@ -9852,11 +9633,10 @@ U8 numSb; { RgSchUlHole *hole, *nxtHole; RgSchUlAlloc *alloc = NULLP; - TRC2(rgSCHUtlUlGetSpfcAlloc); if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { - RETVALUE(NULLP); + return (NULLP); } do { @@ -9873,7 +9653,7 @@ U8 numSb; #if (ERRCLASS & ERRCLS_DEBUG) if ( newHole == NULLP ) { - RETVALUE( NULLP ); + return ( NULLP ); } #endif newHole->start = hole->start; @@ -9913,7 +9693,7 @@ U8 numSb; break; } } while ((hole = nxtHole) != NULLP); - RETVALUE(alloc); + return (alloc); } #ifdef LTE_L2_MEAS /** @@ -9947,22 +9727,21 @@ U8 *qci; U8 qciIdx; U8 qciVal; - TRC3(rgSCHUtlValidateQci) for(qciIdx = 0; qciIdx < numQci; qciIdx++) { qciVal = qci[qciIdx]; if(qciVal == 0 || qciVal > 9) { - RETVALUE(RFAILED); + return RFAILED; } if(qciVal != cellCb->qciArray[qciVal].qci) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; }/* rgSCHUtlValidateQci */ /** * @brief Validates the measurement request parameters. @@ -9977,14 +9756,14 @@ U8 *qci; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlValidateMeasReq +S16 rgSCHUtlValidateMeasReq ( RgSchCellCb *cellCb, LrgSchMeasReqInfo *schL2MeasInfo, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHUtlValidateMeasReq(cellCb, schL2MeasInfo, err) +S16 rgSCHUtlValidateMeasReq(cellCb, schL2MeasInfo, err) RgSchCellCb *cellCb; LrgSchMeasReqInfo *schL2MeasInfo; RgSchErrInfo *err; @@ -9993,7 +9772,6 @@ RgSchErrInfo *err; U16 measType; S16 ret; - TRC3(rgSCHUtlValidateMeasReq) measType = schL2MeasInfo->measType; @@ -10002,7 +9780,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_MEAS_TYPE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((schL2MeasInfo->timePrd !=0) && (measType & LRG_L2MEAS_AVG_PRB_PER_QCI_DL) && @@ -10011,7 +9789,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((schL2MeasInfo->timePrd !=0) && (measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL) && @@ -10019,7 +9797,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL) && ((schL2MeasInfo->nmbActvUeQciDl.numQci > LRG_MAX_QCI_PER_REQ) || @@ -10030,7 +9808,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_UL) && ((schL2MeasInfo->nmbActvUeQciUl.numQci > LRG_MAX_QCI_PER_REQ) || @@ -10041,7 +9819,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((schL2MeasInfo->timePrd !=0) && (measType & LRG_L2MEAS_AVG_PRB_PER_QCI_DL)) @@ -10054,10 +9832,10 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_QCI_VAL; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; }/* rgSCHUtlValidateMeasReq */ #endif /* LTE_L2_MEAS */ /******* : END *****/ @@ -10081,7 +9859,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrSiCfgCfm +S16 rgSCHUtlRgrSiCfgCfm ( Inst instId, SpId spId, @@ -10089,7 +9867,7 @@ RgrCfgTransId transId, U8 status ) #else -PUBLIC S16 rgSCHUtlRgrSiCfgCfm(instId, spId, transId, status) +S16 rgSCHUtlRgrSiCfgCfm(instId, spId, transId, status) Inst instId; SpId spId; RgrCfgTransId transId; @@ -10098,9 +9876,8 @@ U8 status; { U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(rgSCHUtlRgrSiCfgCfm) - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -10110,10 +9887,10 @@ U8 status; { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrSiCfgCfm: " "RgUiRgrSiCfgCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlRgrSiCfgCfm */ @@ -10136,7 +9913,7 @@ U8 status; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrWarningSiCfgCfm +S16 rgSCHUtlRgrWarningSiCfgCfm ( Inst instId, SpId spId, @@ -10145,7 +9922,7 @@ RgrCfgTransId transId, U8 status ) #else -PUBLIC S16 rgSCHUtlRgrWarningSiCfgCfm(instId, spId, siId, transId, status) +S16 rgSCHUtlRgrWarningSiCfgCfm(instId, spId, siId, transId, status) Inst instId; SpId spId; U8 siId; @@ -10155,9 +9932,8 @@ U8 status; { U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(rgSCHUtlRgrWarningSiCfgCfm) - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -10167,10 +9943,10 @@ U8 status; { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrSiCfgCfm: " "RgUiRgrSiCfgCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlRgrWarningSiCfgCfm */ /*********************************************************** @@ -10187,18 +9963,17 @@ U8 status; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHUtlPutSiInfo +Void rgSCHUtlPutSiInfo ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHUtlPutSiInfo(cell) +Void rgSCHUtlPutSiInfo(cell) RgSchCellCb *cell; #endif { U8 idx = 0; U32 sizeOfSiInfo = 0; - TRC2(rgSCHUtlPutSiInfo) /*Free the buffers in crntSiInfo*/ RGSCH_FREE_MSG(cell->siCb.crntSiInfo.mib) RGSCH_FREE_MSG(cell->siCb.crntSiInfo.sib1Info.sib1) @@ -10244,7 +10019,7 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHUtlGetDrxSchdUesInDl +S16 rgSCHUtlGetDrxSchdUesInDl ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -10255,7 +10030,7 @@ CmLListCp *dlInActvLst, CmLListCp *ulInActvLst ) #else -PUBLIC S16 rgSCHUtlGetDrxSchdUesInDl(cellCb, ueCb, dlHq, allocInfo, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst) +S16 rgSCHUtlGetDrxSchdUesInDl(cellCb, ueCb, dlHq, allocInfo, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgSchDlHqProcCb *dlHq; @@ -10378,7 +10153,7 @@ CmLListCp *ulInActvLst; } }/*if(isNewTx == TRUE) */ - RETVALUE(ROK); + return ROK; }/* rgSCHUtlGetSchdUes*/ /* ccpu00117452 - MOD - Changed macro name from @@ -10401,7 +10176,7 @@ CmLListCp *ulInActvLst; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlFillSndStaInd +S16 rgSCHUtlFillSndStaInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -10409,7 +10184,7 @@ RgrStaIndInfo *staInfo, U8 numCqiRept ) #else -PUBLIC S16 rgSCHUtlFillSndStaInd(cell, ue, staInfo, numCqiRept) +S16 rgSCHUtlFillSndStaInd(cell, ue, staInfo, numCqiRept) RgSchCellCb *cell; RgSchUeCb *ue; RgrStaIndInfo *staInfo; @@ -10429,8 +10204,8 @@ U8 numCqiRept; idxStart = ue->schCqiInfo.cqiCount - numCqiRept; - cmMemcpy ((U8*)&(staInfo->ueCqiInfo.cqiRept), - (U8*)&(ue->schCqiInfo.cqiRept[idxStart]), + memcpy (&(staInfo->ueCqiInfo.cqiRept), + &(ue->schCqiInfo.cqiRept[idxStart]), numCqiRept * sizeof(RgrUeCqiRept)); staInfo->ueCqiInfo.numCqiRept = numCqiRept; @@ -10442,10 +10217,10 @@ U8 numCqiRept; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Could not send " "CQI reports for RNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* End of rgSCHUtlFillSndStaInd */ @@ -10469,13 +10244,13 @@ U8 numCqiRept; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrStaInd +S16 rgSCHUtlRgrStaInd ( RgSchCellCb *cell, RgrStaIndInfo *rgrSta ) #else -PUBLIC S16 rgSCHUtlRgrStaInd(cell, rgrSta) +S16 rgSCHUtlRgrStaInd(cell, rgrSta) RgSchCellCb *cell; RgrStaIndInfo *rgrSta; #endif @@ -10483,7 +10258,6 @@ RgrStaIndInfo *rgrSta; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrStaInd) rgrSap = cell->rgrSap; @@ -10492,11 +10266,11 @@ RgrStaIndInfo *rgrSta; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrStaInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrStaInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrSta); - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrStaInd*/ #endif /* End of RGR_CQI_REPT */ @@ -10521,7 +10295,7 @@ RgrStaIndInfo *rgrSta; * -# ROK **/ #ifdef ANSI -PUBLIC Void rgSCHUtlIndRntiRls2Mac +Void rgSCHUtlIndRntiRls2Mac ( RgSchCellCb *cell, CmLteRnti rnti, @@ -10529,7 +10303,7 @@ Bool ueIdChng, CmLteRnti newRnti ) #else -PUBLIC Void rgSCHUtlIndRntiRls2Mac(cell, rnti, ueIdChng, newRnti) +Void rgSCHUtlIndRntiRls2Mac(cell, rnti, ueIdChng, newRnti) RgSchCellCb *cell; CmLteRnti rnti; Bool ueIdChng; @@ -10540,7 +10314,6 @@ CmLteRnti newRnti; Inst inst = cell->instIdx; RgInfRlsRnti rntiInfo; - TRC2(rgSCHUtlIndRntiRls2Mac) /* Copy the info to rntiInfo */ rntiInfo.cellId = cell->cellId; @@ -10577,13 +10350,13 @@ CmLteRnti newRnti; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrLoadInfInd +S16 rgSCHUtlRgrLoadInfInd ( RgSchCellCb *cell, RgrLoadInfIndInfo *rgrLoadInf ) #else -PUBLIC S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) +S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) RgSchCellCb *cell; RgrLoadInfIndInfo *rgrLoadInf; #endif @@ -10591,20 +10364,17 @@ PUBLIC S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrLoadInfInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrLoadInfInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrLoadInfInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrLoadInf); - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrLoadInfInd*/ /* LTE_ADV_FLAG_REMOVED_END */ @@ -10630,7 +10400,7 @@ PUBLIC S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) **/ #ifdef ANSI -PUBLIC Void rgSCHUtlRlsRnti +Void rgSCHUtlRlsRnti ( RgSchCellCb *cell, RgSchRntiLnk *rntiLnk, @@ -10638,7 +10408,7 @@ Bool ueIdChngd, CmLteRnti newRnti ) #else -PUBLIC Void rgSCHUtlRlsRnti(cell, rntiLnk, ueIdChngd, newRnti) +Void rgSCHUtlRlsRnti(cell, rntiLnk, ueIdChngd, newRnti) RgSchCellCb *cell; RgSchRntiLnk *rntiLnk; Bool ueIdChngd; @@ -10646,7 +10416,6 @@ CmLteRnti newRnti; #endif { - TRC2(rgSCHUtlRlsRnti) U8 isLegacy = 0; #ifdef EMTC_ENABLE if(cell->emtcEnable) @@ -10683,14 +10452,14 @@ CmLteRnti newRnti; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlFillSndUeStaInd +S16 rgSCHUtlFillSndUeStaInd ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeStaIndInfo *ueStaInfo ) #else -PUBLIC S16 rgSCHUtlFillSndUeStaInd(cell, ue, ueStaInfo) +S16 rgSCHUtlFillSndUeStaInd(cell, ue, ueStaInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeStaIndInfo *ueStaInfo; @@ -10705,10 +10474,10 @@ RgrUeStaIndInfo *ueStaInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Could not send " "UE Sta reports CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* End of rgSCHUtlFillSndStaInd */ @@ -10732,13 +10501,13 @@ RgrUeStaIndInfo *ueStaInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlRgrUeStaInd +S16 rgSCHUtlRgrUeStaInd ( RgSchCellCb *cell, RgrUeStaIndInfo *rgrUeSta ) #else -PUBLIC S16 rgSCHUtlRgrUeStaInd(cell, rgrUeSta) +S16 rgSCHUtlRgrUeStaInd(cell, rgrUeSta) RgSchCellCb *cell; RgrUeStaIndInfo *rgrUeSta; #endif @@ -10746,20 +10515,17 @@ RgrUeStaIndInfo *rgrUeSta; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrStaInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrUeStaInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrUeStaInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrUeSta); - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrStaInd*/ /* RRM_RBC_X */ @@ -10777,12 +10543,12 @@ RgrUeStaIndInfo *rgrUeSta; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlUpdAvgPrbUsage +S16 rgSCHUtlUpdAvgPrbUsage ( RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHUtlUpdAvgPrbUsage(cell) +S16 rgSCHUtlUpdAvgPrbUsage(cell) RgSchCellCb *cell; #endif { @@ -10797,8 +10563,6 @@ RgSchCellCb *cell; count++; #endif - TRC2(rgSCHUtlUpdAvgPrbUsage); - frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -10831,10 +10595,10 @@ RgSchCellCb *cell; cell->rgmSap->sapCfg.sapPst.pool, (Data**)&prbRprtInd, sizeof(RgmPrbRprtInd)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - cmMemset((U8 *) &prbRprtInd->stQciPrbRpts[0], + memset(&prbRprtInd->stQciPrbRpts[0], 0, (RGM_MAX_QCI_REPORTS * sizeof(RgmPrbRptPerQci))); @@ -10887,7 +10651,7 @@ RgSchCellCb *cell; cell->rgmSap->sapCfg.suId, prbRprtInd); - RETVALUE(ret); + return (ret); } /* RRM_RBC_Y */ @@ -10906,18 +10670,17 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlReTxTa +Void rgSCHUtlReTxTa ( RgSchCellCb *cellCb, RgSchUeCb *ueCb ) #else -PUBLIC Void rgSCHUtlReTxTa(cellCb, ueCb) +Void rgSCHUtlReTxTa(cellCb, ueCb) RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { - TRC2(rgSCHUtlReTxTa) /* If TA Timer is running. Stop it */ if (ueCb->taTmr.tmrEvnt != TMR_NONE) @@ -10972,7 +10735,6 @@ RgInfCmnBoRpt *boUpdt; U32 crntTimeInSubFrms = 0; U32 boUpdTimeInSubFrms = 0; U32 distance = 0; - TRC2(rgSCHChkBoUpdate); crntTimeInSubFrms = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) + cell->crntTime.slot + RG_SCH_CMN_DL_DELTA + 2; /* As bo received will scheduled in next TTI @@ -10986,9 +10748,9 @@ RgInfCmnBoRpt *boUpdt; if (distance > RGSCH_PCCHBCCH_WIN) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/*rgSCHChkBoUpdate*/ @@ -11010,14 +10772,14 @@ RgInfCmnBoRpt *boUpdt; * @return U8 **/ #ifdef ANSI -PUBLIC U8 rgSchUtlCfg0ReTxIdx +U8 rgSchUtlCfg0ReTxIdx ( RgSchCellCb *cell, CmLteTimingInfo phichTime, U8 hqFdbkIdx ) #else -PUBLIC U8 rgSchUtlCfg0ReTxIdx (cell, phichTime, hqFdbkIdx) +U8 rgSchUtlCfg0ReTxIdx (cell, phichTime, hqFdbkIdx) RgSchCellCb *cell; CmLteTimingInfo phichTime; U8 hqFdbkIdx; @@ -11029,8 +10791,6 @@ U8 hqFdbkIdx; RgSchUlSf *ulSf; U8 ulSF; /* UL SF in the TDD frame */ - TRC2(rgSchUtlCfg0ReTxIdx); - ulSf = &cellUl->ulSfArr[hqFdbkIdx]; ulSF = ulSf->ulSfIdx; @@ -11061,7 +10821,7 @@ U8 hqFdbkIdx; /* Fetch the corresponding UL slot Idx in UL sf array */ reTxIdx = rgSCHCmnGetUlSfIdx(&phichTime, cell); } - RETVALUE(reTxIdx); + return (reTxIdx); } #endif @@ -11085,7 +10845,7 @@ U8 hqFdbkIdx; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSchUtlDlCalc1CwPrb +Void rgSchUtlDlCalc1CwPrb ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -11093,7 +10853,7 @@ U32 bo, U32 *prbReqrd ) #else -PUBLIC Void rgSchUtlDlCalc1CwPrb(cell, ue, bo, prbReqrd) +Void rgSchUtlDlCalc1CwPrb(cell, ue, bo, prbReqrd) RgSchCellCb *cell; RgSchUeCb *ue; U32 bo; @@ -11107,8 +10867,6 @@ U32 *prbReqrd; U8 iTbs; U8 cfi = dlCell->currCfi; - TRC2(rgSchUtlDlCalc1CwPrb); - iTbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; eff = (*(RgSchCmnTbSzEff *)(dlCell->cqiToEffTbl[0][cfi]))[iTbs]; @@ -11143,7 +10901,7 @@ U32 *prbReqrd; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSchUtlDlCalc2CwPrb +Void rgSchUtlDlCalc2CwPrb ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -11151,7 +10909,7 @@ U32 bo, U32 *prbReqrd ) #else -PUBLIC Void rgSchUtlDlCalc2CwPrb(cell, ue, bo, prbReqrd) +Void rgSchUtlDlCalc2CwPrb(cell, ue, bo, prbReqrd) RgSchCellCb *cell; RgSchUeCb *ue; U32 bo; @@ -11166,8 +10924,6 @@ U32 *prbReqrd; U8 iTbs1, iTbs2; U8 cfi = dlCell->currCfi; - TRC2(rgSchUtlDlCalc2CwPrb); - if ((dlUe->mimoInfo.forceTD) ||/* Transmit Diversity (TD) */ (dlUe->mimoInfo.ri < 2))/* 1 layer precoding */ { @@ -11218,7 +10974,7 @@ U32 *prbReqrd; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSchUtlCalcTotalPrbReq +Void rgSchUtlCalcTotalPrbReq ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -11226,20 +10982,19 @@ U32 bo, U32 *prbReqrd ) #else -PUBLIC Void rgSchUtlCalcTotalPrbReq(cell, ue, bo, prbReqrd) +Void rgSchUtlCalcTotalPrbReq(cell, ue, bo, prbReqrd) RgSchCellCb *cell; RgSchUeCb *ue; U32 bo; U32 *prbReqrd; #endif { - TRC2(rgSchUtlCalcTotalPrbReq); - /* Call TM specific Prb calculation routine */ (dlCalcPrbFunc[ue->mimoInfo.txMode - 1])(cell, ue, bo, prbReqrd); RETVOID; } /* rgSchUtlCalcTotalPrbReq */ +#ifdef UNUSE_FUN #ifdef TFU_UPGRADE /*********************************************************** * @@ -11275,7 +11030,6 @@ U8 numTxAnt; U8 ri; RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cell); - TRC3(rgSCHUtlFetchPcqiBitSz); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && (ueCb->mimoInfo.txMode != RGR_UE_TM_4)) @@ -11394,9 +11148,10 @@ U8 numTxAnt; break; } - RETVALUE(pcqiSz); + return (pcqiSz); } #endif +#endif /** * @brief Utility function to returns the number of subbands based on the * requested bytes. @@ -11414,14 +11169,14 @@ U8 numTxAnt; * @return U8 **/ #ifdef ANSI -PUBLIC U8 rgSchUtlGetNumSbs +U8 rgSchUtlGetNumSbs ( RgSchCellCb *cell, RgSchUeCb *ue, U32 *numSbs ) #else -PUBLIC U8 rgSchUtlGetNumSbs (cell, ue, numSbs) +U8 rgSchUtlGetNumSbs (cell, ue, numSbs) RgSchCellCb *cell; RgSchUeCb *ue; U32 *numSbs; @@ -11431,7 +11186,7 @@ U32 *numSbs; //Currently hardcoding MAX prb for each UE nPrb = ue->ue5gtfCb.maxPrb; (*numSbs) = RGSCH_CEIL(nPrb, MAX_5GTF_VRBG_SIZE); - RETVALUE(ROK); + return ROK; } /** @@ -11451,7 +11206,7 @@ U32 *numSbs; * @return U8 **/ #ifdef ANSI -PUBLIC U8 rgSchUtlSortInsUeLst +U8 rgSchUtlSortInsUeLst ( RgSchCellCb *cell, CmLListCp *ueLst, @@ -11459,7 +11214,7 @@ CmLList *node, U8 vrbgRequired ) #else -PUBLIC U8 rgSchUtlSortInsUeLst (cell, ueLst, node, vrbgRequired) +U8 rgSchUtlSortInsUeLst (cell, ueLst, node, vrbgRequired) RgSchCellCb *cell; CmLListCp *ueLst; CmLList *node; @@ -11519,7 +11274,7 @@ U8 vrbgRequired; } } - RETVALUE(ROK); + return ROK; } /** @@ -11544,7 +11299,7 @@ U8 vrbgRequired; * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlBuildNSendLcgReg +S16 rgSCHUtlBuildNSendLcgReg ( RgSchCellCb *cell, CmLteRnti crnti, @@ -11552,7 +11307,7 @@ U8 lcgId, Bool isGbr ) #else -PUBLIC S16 rgSCHUtlBuildNSendLcgReg(cell, crnti, lcgId, isGbr) +S16 rgSCHUtlBuildNSendLcgReg(cell, crnti, lcgId, isGbr) RgSchCellCb *cell; CmLteRnti crnti; U8 lcgId; @@ -11562,9 +11317,7 @@ Bool isGbr; Pst pst; RgInfLcgRegReq lcgRegReq; - TRC3(rgSCHUtlBuildNSendLcgReg); - - cmMemset((U8*)&pst, (U8)0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); lcgRegReq.isGbr = isGbr; lcgRegReq.cellId = cell->cellId; lcgRegReq.crnti = crnti; @@ -11573,7 +11326,7 @@ Bool isGbr; /* code Coverage portion of the test case */ RgSchMacLcgReg(&pst, &lcgRegReq); - RETVALUE(ROK); + return ROK; } #ifdef TFU_UPGRADE @@ -11597,20 +11350,18 @@ Bool isGbr; * -# ROK **/ #ifdef ANSI -PUBLIC TfuAckNackMode rgSchUtlGetFdbkMode +TfuAckNackMode rgSchUtlGetFdbkMode ( RgrSchFrmt1b3TypEnum fdbkType ) #else -PUBLIC TfuAckNackMode rgSchUtlGetFdbkMode(fdbkType) +TfuAckNackMode rgSchUtlGetFdbkMode(fdbkType) RgrSchFrmt1b3TypEnum fdbkType; #endif { TfuAckNackMode mode = TFU_UCI_FORMAT_1A_1B; - TRC2(rgSchUtlGetFdbkMode); - switch(fdbkType) { case RG_SCH_UCI_FORMAT_NON_CA: @@ -11630,7 +11381,7 @@ RgrSchFrmt1b3TypEnum fdbkType; } break; } - RETVALUE(mode); + return (mode); } #endif /* TFU_TDD */ #endif /* LTE_ADV */ @@ -11655,13 +11406,13 @@ RgrSchFrmt1b3TypEnum fdbkType; * -# ROK **/ #ifdef ANSI -PUBLIC Void rgSCHUtlSndUeSCellDel2Mac +Void rgSCHUtlSndUeSCellDel2Mac ( RgSchCellCb *cell, CmLteRnti rnti ) #else -PUBLIC Void rgSCHUtlSndUeSCellDel2Mac(cell, rnti) +Void rgSCHUtlSndUeSCellDel2Mac(cell, rnti) RgSchCellCb *cell; CmLteRnti rnti; #endif @@ -11670,8 +11421,6 @@ CmLteRnti rnti; Inst inst = cell->instIdx; RgInfRlsRnti rntiInfo; - TRC2(rgSCHUtlSndUeSCellDel2Mac) - RGSCHDBGINFONEW(inst,(rgSchPBuf(inst),"RNTI Release IND for UE(%d)\n", rnti)); /* Copy the info to rntiInfo */ rntiInfo.cellId = cell->cellId; @@ -11703,19 +11452,17 @@ CmLteRnti rnti; * -# ROK **/ #ifdef ANSI -PUBLIC U8 rgSCHUtlGetMaxTbSupp +U8 rgSCHUtlGetMaxTbSupp ( RgrTxMode txMode ) #else -PUBLIC U8 rgSCHUtlGetMaxTbSupp(txMode) +U8 rgSCHUtlGetMaxTbSupp(txMode) RgrTxMode txMode #endif { U8 maxTbCount; - TRC2(rgSCHUtlGetMaxTbSupp); - /* Primary Cell */ switch(txMode) @@ -11738,7 +11485,7 @@ RgrTxMode txMode break; } - RETVALUE(maxTbCount); + return (maxTbCount); } /** @@ -11758,7 +11505,7 @@ RgrTxMode txMode * -# ROK **/ #ifdef ANSI -PUBLIC Void rgSCHTomUtlGetTrigSet +Void rgSCHTomUtlGetTrigSet ( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -11819,14 +11566,14 @@ PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlUpdUeDciSize +Void rgSCHUtlUpdUeDciSize ( RgSchCellCb *cell, RgSchUeCb *ueCb, Bool isCsi2Bit ) #else -PUBLIC Void rgSCHUtlUpdUeDciSize(cell, ueCb, isCsi2Bit) +Void rgSCHUtlUpdUeDciSize(cell, ueCb, isCsi2Bit) RgSchCellCb *cell; RgSchUeCb *ueCb; Bool isCsi2Bit; @@ -11936,12 +11683,12 @@ Bool isCsi2Bit; * **/ #ifdef ANSI -PUBLIC Void rgSCHUtlCalcDciSizes +Void rgSCHUtlCalcDciSizes ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHUtlCalcDciSizes(cell) +Void rgSCHUtlCalcDciSizes(cell) RgSchCellCb *cell; #endif { @@ -12208,19 +11955,17 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHUtlCpuOvrLdAdjItbsCap +Void rgSCHUtlCpuOvrLdAdjItbsCap ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) +Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) RgSchCellCb *cell #endif { U32 tptDelta; - TRC3(rgSCHUtlCpuOvrLdAdjItbsCap) - if ((cell->cpuOvrLdCntrl.cpuOvrLdIns) & (RGR_CPU_OVRLD_DL_TPT_UP | RGR_CPU_OVRLD_DL_TPT_DOWN)) { @@ -12465,13 +12210,13 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlResetCpuOvrLdState +S16 rgSCHUtlResetCpuOvrLdState ( RgSchCellCb *cell, U8 crntCpuOvrLdIns ) #else -PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) +S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) RgSchCellCb *cell; U8 crntCpuOvrLdIns; #endif @@ -12481,8 +12226,6 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); U8 idx; - TRC3(rgSCHUtlResetCpuOvrLdState) - #ifdef CPU_OL_DBG_PRINTS printf("\n CPU OVR LD Ins Rcvd = %d\n", (int)crntCpuOvrLdIns); #endif @@ -12510,7 +12253,7 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) schCmnCell->ul.maxUeNewTxPerTti; } - RETVALUE(ROK); + return ROK; } /* Check and Update numUEPer TTI based CPU overload instruction before * going for TP based CPU OL @@ -12520,7 +12263,7 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns); /* If need to have both TP and numUePerTti instrcution together in * one command then dont return from here */ - RETVALUE(ROK); + return ROK; } crntDlCpuOL = (crntCpuOvrLdIns & RGR_CPU_OVRLD_DL_TPT_UP) +\ @@ -12529,7 +12272,7 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) (crntDlCpuOL != RGR_CPU_OVRLD_DL_TPT_DOWN)) { /* Cfg validation failed. Invalid Command. Either UP/DOWN is allowed */ - RETVALUE(RFAILED); + return RFAILED; } crntUlCpuOL = (crntCpuOvrLdIns & RGR_CPU_OVRLD_UL_TPT_UP) +\ (crntCpuOvrLdIns & RGR_CPU_OVRLD_UL_TPT_DOWN); @@ -12537,12 +12280,12 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) (crntUlCpuOL != RGR_CPU_OVRLD_UL_TPT_DOWN)) { /* Cfg validation failed. Invalid Command. Either UP/DOWN is allowed */ - RETVALUE(RFAILED); + return RFAILED; } if ((crntDlCpuOL == 0) && (crntUlCpuOL == 0)) { /* Cfg validation failed. Invalid Command. Either UP/DOWN is allowed */ - RETVALUE(RFAILED); + return RFAILED; } cell->cpuOvrLdCntrl.cpuOvrLdIns = crntCpuOvrLdIns; @@ -12588,10 +12331,10 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) #endif } rgSCHUtlCpuOvrLdAdjItbsCap(cell); - RETVALUE(ROK); + return ROK; } #ifdef EMTC_ENABLE -PUBLIC S16 rgSCHUtlAddToResLst +S16 rgSCHUtlAddToResLst ( CmLListCp *cp, RgSchIotRes *iotRes @@ -12599,9 +12342,9 @@ PUBLIC S16 rgSCHUtlAddToResLst { cmLListAdd2Tail(cp, &iotRes->resLnk); iotRes->resLnk.node = (PTR)iotRes; - RETVALUE(ROK); + return ROK; } -PUBLIC S16 rgSCHUtlDelFrmResLst +S16 rgSCHUtlDelFrmResLst ( RgSchUeCb *ue, RgSchIotRes *iotRes @@ -12625,12 +12368,12 @@ RgSchIotRes *iotRes if(cp->count == 0) { RLOG0(L_INFO,"****error count*****\n"); - RETVALUE(ROK); + return ROK; } } cmLListDelFrm(cp, &iotRes->resLnk); iotRes->resLnk.node = NULLP; - RETVALUE(ROK); + return ROK; } #endif /**********************************************************************