X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cfg.c;h=dd7cd12eecf83d7b1e01b53098949cd8456daec1;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=4e3dfdb1267ac6f0057549d7a6ad7f051aedca95;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c index 4e3dfdb12..dd7cd12ee 100755 --- a/src/5gnrsch/rg_sch_cfg.c +++ b/src/5gnrsch/rg_sch_cfg.c @@ -37,16 +37,7 @@ static int RLOG_FILE_ID=186; static int RLOG_MODULE_ID=4096; /* 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_mblk.h" /* common memory link list library */ -#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 "rgm.h" @@ -60,15 +51,6 @@ static int RLOG_MODULE_ID=4096; #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 */ @@ -81,10 +63,10 @@ static int RLOG_MODULE_ID=4096; /* LTE-MAC Scheduler instance control block structures */ -PUBLIC RgSchCb rgSchCb[RGSCH_MAX_INST]; +RgSchCb rgSchCb[RGSCH_MAX_INST]; #ifdef PHY_ERROR_LOGING -PUBLIC RgSchUlAllocCntr rgSchUlAllocCntr; +RgSchUlAllocCntr rgSchUlAllocCntr; #endif #ifdef EMTC_ENABLE @@ -99,15 +81,15 @@ RgrCellRecfg *cellRecfg )); EXTERN S16 rgSCHEmtcCfgVldtDrxReTxCfg ARGS(( -U16 reTxTmr +uint16_t reTxTmr )); EXTERN S16 rgSCHEmtcCfgVldtDrxUlReTxCfg ARGS(( -U16 reTxTmr +uint16_t reTxTmr )); #endif -PUBLIC S16 rgSCHEnbPfsDlCfg ARGS(( +S16 rgSCHEnbPfsDlCfg ARGS(( Inst instIdx, RgSchErrInfo *err )); @@ -150,92 +132,92 @@ PRIVATE Void rgSCHCfgRgrUePhrMsg3 ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb,RgSchUeCb *ue, RgSchErrInfo *errInfo)); PRIVATE S16 rgSCHCfgRgrCmnLcCfg ARGS((RgSchCellCb *cell, RgrCmnLchCfg *lcCfg, RgSchErrInfo *errInfo)); -PUBLIC Void rgSCHSCellFreeBuf ARGS((Inst inst,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,U8 idx)); +Void rgSCHSCellFreeBuf ARGS((Inst inst,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,uint8_t idx)); #ifdef RGR_SI_SCH PRIVATE S16 rgSCHCfgVldtRgrCellSiCfg ARGS(( Inst inst, RgrSiCfg *siCfg)); #endif/*RGR_SI_SCH */ /* LTE_ADV_FLAG_REMOVED_START */ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg ARGS(( Inst inst, - RgrLteAdvancedCellConfig *lteAdvCfg, U8 dlTotalBw)); + RgrLteAdvancedCellConfig *lteAdvCfg, uint8_t dlTotalBw)); /* LTE_ADV_FLAG_REMOVED_END */ PRIVATE S16 rgSCHCfgVldtDrxUeCfg ARGS ((RgSchCellCb *cell, RgrUeDrxCfg *ueDrxCfg)); -PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg ARGS((U8 onDurTmr)); -PRIVATE S16 rgSCHCfgVldtDrxInActvCfg ARGS((U16 inActvTmr)); -PRIVATE S16 rgSCHCfgVldtDrxReTxCfg ARGS((U8 reTxTmr)); +PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg ARGS((uint8_t onDurTmr)); +PRIVATE S16 rgSCHCfgVldtDrxInActvCfg ARGS((uint16_t inActvTmr)); +PRIVATE S16 rgSCHCfgVldtDrxReTxCfg ARGS((uint8_t reTxTmr)); PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg ARGS((RgrDrxLongCycleOffst lngCycleOffst)); -PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs ARGS((U16 val)); +PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs ARGS((uint16_t val)); PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg ARGS((RgrDrxShortDrx shrtCycCfg)); PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg ARGS((Inst inst, RgrCellCsgParamCfg *csgParam)); #ifdef TFU_UPGRADE -PUBLIC S16 rgSCHCfgACqiUeCfg ARGS(( RgSchCellCb *cellCb,RgSchUeCb *ue, RgSchUeACqiCb *aCqiCb, +S16 rgSCHCfgACqiUeCfg ARGS(( RgSchCellCb *cellCb,RgSchUeCb *ue, RgSchUeACqiCb *aCqiCb, RgrTxMode ueTxMode,RgrUeAprdDlCqiCfg *aCqiCfg, CmLteUeCategory ueCat )); -PUBLIC S16 rgSCHCfgAcqiUeReCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, +S16 rgSCHCfgAcqiUeReCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeAprdDlCqiCfg *acqiCfg, CmLteUeCategory ueCat )); -PUBLIC S16 rgSCHUtlGetCfgPerOff ARGS(( RgSchPerTbl tbl, U16 cfgIdx, - U16 *peri, U16 *offset )); +S16 rgSCHUtlGetCfgPerOff ARGS(( RgSchPerTbl tbl, uint16_t cfgIdx, + uint16_t *peri, uint16_t *offset )); -PUBLIC S16 rgSCHCfgRiUeCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, +S16 rgSCHCfgRiUeCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUePrdDlCqiCfg *cqiCfg, CmLteUeCategory ueCat )); -PUBLIC S16 rgSCHCfgPCqiUeCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, +S16 rgSCHCfgPCqiUeCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUePrdDlCqiCfg *cqiCfg,CmLteUeCategory ueCat )); -PUBLIC S16 rgSCHCfgSrsUeCfg ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb, +S16 rgSCHCfgSrsUeCfg ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb, RgrUeUlSrsCfg *srsCfg )); -PUBLIC S16 rgSCHCfgSrUeCfg ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb, +S16 rgSCHCfgSrUeCfg ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb, RgrUeSrCfg *srCfg)); -PUBLIC S16 rgSCHCfgPCqiUeReCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, +S16 rgSCHCfgPCqiUeReCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUePrdDlCqiCfg *cqiCfg,CmLteUeCategory ueCat)); -PUBLIC S16 rgSCHCfgSrsUeReCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, +S16 rgSCHCfgSrsUeReCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeUlSrsCfg *srsCfg)); -PUBLIC S16 rgSCHCfgSrUeReCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, +S16 rgSCHCfgSrUeReCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeSrCfg *srCfg)); -PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode ARGS((RgSchCellCb *cellCb, +S16 rgSCHCfgVldtRgrTxmodePuschMode ARGS((RgSchCellCb *cellCb, RgrTxMode txMde, RgrAprdCqiMode puschMode,RgSchErrInfo *errInfo)); -PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg ARGS(( RgSchCellCb *cellCb, +S16 rgSCHCfgVldtRgrUeACqiCfg ARGS(( RgSchCellCb *cellCb, CmLteRnti crnti, RgrUeAprdDlCqiCfg *acqiCfg, RgrUeTxModeCfg txMode, RgSchErrInfo *errInfo )); -PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode ARGS((RgSchCellCb *cellCb, +S16 rgSCHCfgVldtRgrTxmodePucchMode ARGS((RgSchCellCb *cellCb, RgrTxMode txMde, RgrPrdCqiMode pucchMode,RgSchErrInfo *errInfo)); #ifdef LTEMAC_HDFDD -PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb, +S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb, CmLteRnti crnti, RgrUePrdDlCqiCfg *cqiCfg, Bool hdFdd, RgrUeTxModeCfg txMode, RgSchErrInfo *errInfo)); #else -PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb, +S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb, CmLteRnti crnti, RgrUePrdDlCqiCfg *cqiCfg, RgrUeTxModeCfg txMode, RgSchErrInfo *errInfo)); #endif #ifdef LTEMAC_HDFDD -PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg ARGS ((RgSchCellCb *cellCb, +S16 rgSCHCfgVldtRgrUeUlSrsCfg ARGS ((RgSchCellCb *cellCb, CmLteRnti crnti, RgrUeUlSrsCfg *srsCfg, Bool hdFdd, RgSchErrInfo *errInfo)); #else -PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg ARGS ((RgSchCellCb *cellCb, +S16 rgSCHCfgVldtRgrUeUlSrsCfg ARGS ((RgSchCellCb *cellCb, CmLteRnti crnti, RgrUeUlSrsCfg *srsCfg, RgSchErrInfo *errInfo)); #endif #ifdef LTEMAC_HDFDD -PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg ARGS((RgSchCellCb *cellCb, CmLteRnti crnti, +S16 rgSCHCfgVldtRgrUeSrCfg ARGS((RgSchCellCb *cellCb, CmLteRnti crnti, RgrUeSrCfg *srCfg, Bool hdFdd, RgSchErrInfo *errInfo)); #else -PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg ARGS((RgSchCellCb *cellCb, CmLteRnti crnti, +S16 rgSCHCfgVldtRgrUeSrCfg ARGS((RgSchCellCb *cellCb, CmLteRnti crnti, RgrUeSrCfg *srCfg, RgSchErrInfo *errInfo)); #endif PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg ARGS (( RgSchCellCb *cellCb, @@ -247,18 +229,18 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg ARGS (( RgSchCellCb *cellCb, RgrUeRecfg *ueReCfg, RgSchErrInfo *errInfo )); -PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel ARGS ((RgSchCellCb *cellCb, +S16 rgSCHCfgPCqiSrsSrUeDel ARGS ((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz ARGS (( RgSchUeACqiCb *acqiCb,U8 numTxAnt, - U8* cqiPmiSzR1,U8* cqiPmiSzRn1 )); +PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz ARGS (( RgSchUeACqiCb *acqiCb,uint8_t numTxAnt, + uint8_t* cqiPmiSzR1,uint8_t* cqiPmiSzRn1 )); /* Added the function to be used instead of the * MACRO RG_SCH_GET_PERIODICITY_TBL */ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl* rgSCHCfgUtlGetPcqiSrsSrRiTbl ARGS (( RgSchPerTbl tblType, - U8 * min, - U8 * max)); + uint8_t * min, + uint8_t * max)); #endif /* TFU_UPGRADE */ PRIVATE Void rgSCHCfgUeTaRecfg ARGS (( RgSchCellCb *cellCb, @@ -266,20 +248,20 @@ PRIVATE Void rgSCHCfgUeTaRecfg ARGS (( RgSchCellCb *cellCb, RgrUeRecfg *ueReCfg, RgSchErrInfo *errInfo )); #ifdef LTE_ADV -PUBLIC S16 rgSCHSCellCfgUeCfg ARGS(( +S16 rgSCHSCellCfgUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err )); -PUBLIC S16 rgSCHSCellCfgUePucchReCfg ARGS(( +S16 rgSCHSCellCfgUePucchReCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err )); -PUBLIC S16 rgSCHCfgVldtRgrUeSCellRecfg ARGS(( +S16 rgSCHCfgVldtRgrUeSCellRecfg ARGS(( RgrUeRecfg *ueRecfg, RgSchCellCb *cell, RgSchUeCb *ue, @@ -311,11 +293,11 @@ RgrUeRecfg *ueRecfg PRIVATE S16 rgSchAddToL2Meas ARGS ((RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)); #endif #ifdef EMTC_ENABLE -PUBLIC S16 rgSCHEmtcCfgVldtDrxOnDurCfg +S16 rgSCHEmtcCfgVldtDrxOnDurCfg ( -U16 onDurTmr +uint16_t onDurTmr ); -PUBLIC Void rgSCHUtlUpdEmtcY +Void rgSCHUtlUpdEmtcY ( RgSchUeCb *ue ); @@ -447,7 +429,7 @@ CONSTANT RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrCfgIdxTbl[RG_SCH_ISR_INDX_MAX]= /*Reference:36.213: Derived from Table: 7.2.1-5 for Label L. The Label L is CEIL(log2(BinCoe(N and M)))*/ -CONSTANT U8 RgSCHUeAcqi2022LBitWidth[6][28] ={ +CONSTANT uint8_t RgSCHUeAcqi2022LBitWidth[6][28] ={ {0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5}, {0,0,2,3,4,4,5,5,6,6,6,7,7,7,7,7,8,8,8,8,8,8,8,9,9,9,9,9}, {0,0,0,2,4,5,6,6,7,7,8,8,9,9,9,10,10,10,10,11,11,11,11,11,12,12,12,12}, @@ -458,13 +440,13 @@ CONSTANT U8 RgSCHUeAcqi2022LBitWidth[6][28] ={ #endif -EXTERN U8 rgSchCmnHarqRtt[]; +EXTERN uint8_t rgSchCmnHarqRtt[]; #ifdef EMTC_ENABLE EXTERN S16 rgSCHEmtcCellAlloc ARGS((RgSchCellCb *cel)); EXTERN Void rgSCHEmtcCellFree ARGS((RgSchCellCb *cel)); EXTERN Void rgSCHEmtcUeInfoFree ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN U8 rgSchfillPucchSrRepNumCountemtc ARGS((RgSchUeCb *ueCb)); -EXTERN U8 rgSchfillPucchCqiRepNumCountemtc ARGS((RgSchUePCqiCb *cqiCb, RgSchUeCb *ueCb)); +EXTERN uint8_t rgSchfillPucchSrRepNumCountemtc ARGS((RgSchUeCb *ueCb)); +EXTERN uint8_t rgSchfillPucchCqiRepNumCountemtc ARGS((RgSchUePCqiCb *cqiCb, RgSchUeCb *ueCb)); EXTERN S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb *cell)); #endif /* forward references */ @@ -496,20 +478,19 @@ EXTERN S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb *cell)) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrSchedEnbCfg +S16 rgSCHCfgVldtRgrSchedEnbCfg ( Inst inst, RgrSchedEnbCfg *schedEnbCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrSchedEnbCfg(inst, schedEnbCfg, errInfo) +S16 rgSCHCfgVldtRgrSchedEnbCfg(inst, schedEnbCfg, errInfo) Inst inst; RgrSchedEnbCfg *schedEnbCfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrSchedEnbCfg); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR SCH ENB CONFIG: \n")); errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_ENB_CFG; @@ -519,7 +500,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(inst, (rgSchPBuf(inst), "Validation for scheduler related " "config failed\n")); - RETVALUE(RFAILED); + return RFAILED; } RLOG1(L_INFO, "MIMO_DBG:: SCH:: numAntPorts=%d\n",schedEnbCfg->numTxAntPorts); @@ -529,7 +510,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(inst, (rgSchPBuf(inst),"Invalid number of transmit antenna" " ports %d\n", schedEnbCfg->numTxAntPorts)); - RETVALUE(RFAILED); + return RFAILED; } /* Validate csg access mode */ @@ -537,13 +518,13 @@ RgSchErrInfo *errInfo; (schedEnbCfg->accsMode > RGR_CELL_ACCS_HYBRID)) { RGSCHDBGERR(inst, (rgSchPBuf(inst), "Invalid CSG Access mode\n")); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; RGSCHDBGINFO(inst, (rgSchPBuf(inst), "RGR SCHED ENB config validation done:"\n)); - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrSchedEnbCfg */ /** @@ -572,7 +553,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrCellCfg +S16 rgSCHCfgVldtRgrCellCfg ( Inst inst, RgrCellCfg *cellCfg, @@ -580,43 +561,41 @@ RgSchCellCb *cell, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrCellCfg(inst, cellCfg, cell, errInfo) +S16 rgSCHCfgVldtRgrCellCfg(inst, cellCfg, cell, errInfo) Inst inst; RgrCellCfg *cellCfg; RgSchCellCb *cell; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrCellCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_CFG; /* check if cell exists already */ - if ((U8 *)cell != NULLP) + if ((uint8_t *)cell != NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Cell Id already exists"); - RETVALUE(RFAILED); + return RFAILED; } if(cellCfg->macInst >= SCH_INST_START) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid MAC Instance %d ", cellCfg->macInst); - RETVALUE(RFAILED); + return RFAILED; } if (cellCfg->macRnti.startRnti < RGSCH_MIN_MAC_RNTI ) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid start RNTI %d for cell ", cellCfg->macRnti.startRnti); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for scheduler related " "config failed"); - RETVALUE(RFAILED); + return RFAILED; } if ((cellCfg->dlHqCfg.maxDlHqTx < RGSCH_MIN_HQ_TX) || @@ -625,14 +604,14 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid Downlink HARQ configuration:" " maxDlHqTx %d maxMsg4HqTx %d", cellCfg->dlHqCfg.maxDlHqTx, cellCfg->dlHqCfg.maxMsg4HqTx); - RETVALUE(RFAILED); + return RFAILED; } if ((cellCfg->cfiCfg.cfi < RGSCH_MIN_CFI_VAL) || (cellCfg->cfiCfg.cfi > RGSCH_MAX_CFI_VAL)) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid CFI configuration %d", cellCfg->cfiCfg.cfi); - RETVALUE(RFAILED); + return RFAILED; } if (((cellCfg->puschSubBand.subbandStart) + ((cellCfg->puschSubBand.numSubbands -1) * cellCfg->puschSubBand.size)) @@ -643,7 +622,7 @@ RgSchErrInfo *errInfo; cellCfg->puschSubBand.subbandStart, cellCfg->puschSubBand.numSubbands, cellCfg->puschSubBand.size, cellCfg->bwCfg.ulTotalBw); - RETVALUE(RFAILED); + return RFAILED; } if (((cellCfg->bwCfg.dlTotalBw < RGSCH_MIN_DL_BW) || @@ -654,13 +633,13 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid Bandwidth configuration:" " ul %d dl %d",cellCfg->bwCfg.ulTotalBw, cellCfg->bwCfg.dlTotalBw); - RETVALUE(RFAILED); + return RFAILED; } if (cellCfg->phichCfg.ngEnum > RGR_NG_TWO) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid PHICH Ng configuration %d", - (U8)cellCfg->phichCfg.ngEnum); - RETVALUE(RFAILED); + (uint8_t)cellCfg->phichCfg.ngEnum); + return RFAILED; } /* Validation for extended PHICH Duration */ if ((cellCfg->phichCfg.isDurExtend == TRUE) && @@ -668,16 +647,16 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid cfi value for" "Extended PHICH duration cfi:%d dlBw:%d", - (U8)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); - RETVALUE(RFAILED); + (uint8_t)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); + return RFAILED; } if ((cellCfg->phichCfg.isDurExtend == TRUE) && (cellCfg->bwCfg.dlTotalBw > 10) && (cellCfg->cfiCfg.cfi < 3)) { RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid cfi value for" "Extended PHICH duration cfi:%d dlBw:%d", - (U8)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); - RETVALUE(RFAILED); + (uint8_t)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); + return RFAILED; } RLOG4(L_INFO,"CA_DBG:: PUCCH configuration:" " N2_RB %d N1_PUCCH %d deltaShift %d cyclicShift %d", @@ -700,27 +679,27 @@ RgSchErrInfo *errInfo; cellCfg->pucchCfg.n1PucchAn, cellCfg->pucchCfg.deltaShift, cellCfg->pucchCfg.cyclicShift); - RETVALUE(RFAILED); + return RFAILED; } if (cellCfg->srsCfg.isSrsCfgSetup && cellCfg->srsCfg.srsBwEnum > RGR_SRS_BWCFG_7) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid SRS configuration: " - " srsBw %d", (U8)cellCfg->srsCfg.srsBwEnum); - RETVALUE(RFAILED); + " srsBw %d", (uint8_t)cellCfg->srsCfg.srsBwEnum); + return RFAILED; } if ((rgSCHCfgVldtRgrCellRACfg(inst, cellCfg)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for Random access related" "config failed"); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCellPwrCfg(inst, cellCfg, errInfo)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for cell power " "config failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate the common logical channel configuration */ @@ -729,13 +708,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid number(%d) of common logical" "channels in cell config", cellCfg->numCmnLcs); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCmnLcCfg(inst, cellCfg, errInfo)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for common logical" "channels failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Added 0 as a valid value for number of TICKs RRM @@ -746,7 +725,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for SI" "configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif /*RGR_SI_SCH */ @@ -760,7 +739,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid" "Subframe configuration"); - RETVALUE(RFAILED); + return RFAILED; } #endif /*ccpu00116923 - ADD - Srs Present support - End*/ @@ -773,7 +752,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid txPower offset "); - RETVALUE(RFAILED); + return RFAILED; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -785,7 +764,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "DSFR is enbaled" "Without enabling SFR"); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCellLteAdvCfg(inst, &(cellCfg->rgrLteAdvCfg), @@ -793,14 +772,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for LTE Adv" "configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV if ((rgSCHCfgVldtRgrCellLteLAACfg(inst, cellCfg)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for LTE LAA" "configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTE_ADV_FLAG_REMOVED_END */ @@ -808,7 +787,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid" "msg4pAVal %u", cellCfg->msg4pAVal); - RETVALUE(RFAILED); + return RFAILED; } /* Validate RgrCellCsgParamCfg */ @@ -819,7 +798,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(inst, (rgSchPBuf(inst), "Validation failed for \n" "Access CSG parameter failed\n")); - RETVALUE(RFAILED); + return RFAILED; } } #ifdef EMTC_ENABLE @@ -828,12 +807,12 @@ RgSchErrInfo *errInfo; if(ROK != rgSCHCfgVldtRgrEmtcCellCfg(cellCfg)) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid EMTC cell Configuration %d for cell" ,cellCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } } #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellCfg */ /** @@ -858,34 +837,32 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrSchCfg +S16 rgSCHCfgVldtRgrSchCfg ( Inst inst, RgrSchedEnbCfg *rgSchedCfg ) #else -PUBLIC S16 rgSCHCfgVldtRgrSchCfg(inst, rgSchedCfg) +S16 rgSCHCfgVldtRgrSchCfg(inst, rgSchedCfg) Inst inst; RgrSchedCfg *rgSchedCfg; #endif { - TRC2(rgSCHCfgVldtRgrSchCfg); - RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Validating \ scheduler related Configuration")); if (rgSchedCfg->ulSchdType > (RGSCH_NUM_SCHEDULERS - 1)) { RGSCHDBGERR(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Invalid \ UL scheduler type %d \n", rgSchedCfg->ulSchdType)); - RETVALUE(RFAILED); + return RFAILED; } if (rgSchedCfg->dlSchdType > (RGSCH_NUM_SCHEDULERS - 1)) { RGSCHDBGERR(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Invalid \ DL scheduler type %d \n", rgSchedCfg->dlSchdType)); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** * @brief Validates the scheduler related configuration request from RRM to MAC. @@ -909,28 +886,27 @@ RgrSchedCfg *rgSchedCfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrCellSchCfg +S16 rgSCHCfgVldtRgrCellSchCfg ( Inst inst, RgrCellCfg *cellCfg ) #else -PUBLIC S16 rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg) +S16 rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg) Inst inst; RgrCellCfg *cellCfg; #endif { - TRC2(rgSCHCfgVldtRgrCellSchCfg); #if RGSCH_NUM_DLFS_SCHEDULERS if (cellCfg->dlfsSchdType > RGSCH_NUM_DLFS_SCHEDULERS - 1) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid dlfs scheduler type %d for cell", cellCfg->dlfsSchdType); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /** * @brief Validates the RACH related configuration request from RRM to MAC. @@ -954,19 +930,17 @@ RgrCellCfg *cellCfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrCellRACfg +S16 rgSCHCfgVldtRgrCellRACfg ( Inst inst, RgrCellCfg *cellCfg ) #else -PUBLIC S16 rgSCHCfgVldtRgrCellRACfg(inst, cellCfg) +S16 rgSCHCfgVldtRgrCellRACfg(inst, cellCfg) Inst inst; RgrCellCfg *cellCfg; #endif { - TRC2(rgSCHCfgVldtRgrCellRACfg); - #ifdef LTE_TDD if ((cellCfg->rachCfg.preambleFormat > RGSCH_MAX_TDD_RA_PREAMBLE_FMT) || @@ -990,7 +964,7 @@ RgrCellCfg *cellCfg; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid numRaPreamble %d sizeRaPreambleGrpA %d", cellCfg->rachCfg.numRaPreamble, cellCfg->rachCfg.sizeRaPreambleGrpA); - RETVALUE(RFAILED); + return RFAILED; } /* RACHO */ /* verify that the ded Preambles cfgd for Pdcch Order @@ -1009,12 +983,12 @@ RgrCellCfg *cellCfg; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid RACH Preambleset conf:" "preambleSet Start %d preambleSet Size %d", cellCfg->macPreambleSet.start, cellCfg->macPreambleSet.size); - RETVALUE(RFAILED); + return RFAILED; } #ifdef RGR_V1 if(cellCfg->rachCfg.contResTmr) { - U8 idx; + uint8_t idx; #ifdef LTE_TDD idx = cellCfg->ulDlCfgIdx; #else @@ -1022,7 +996,7 @@ RgrCellCfg *cellCfg; #endif /* maxMsg4TxDelay = (HARQ_RTT * MAX_MSG4_HARQ_RETX) + 3 TTI (MAX L1+L2 processing delay at the UE) */ - U8 maxMsg4TxDelay = (cellCfg->dlHqCfg.maxMsg4HqTx-1) * + uint8_t maxMsg4TxDelay = (cellCfg->dlHqCfg.maxMsg4HqTx-1) * rgSchCmnHarqRtt[idx] + 3; @@ -1045,11 +1019,11 @@ RgrCellCfg *cellCfg; Then return fail*/ RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Contention Resolution timer is configured as '0'"); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -1076,7 +1050,7 @@ RgrCellCfg *cellCfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeCfg +S16 rgSCHCfgVldtRgrUeCfg ( Inst inst, RgrUeCfg *ueCfg, @@ -1084,15 +1058,13 @@ RgSchCellCb **cell, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeCfg(inst, ueCfg, cell, errInfo) +S16 rgSCHCfgVldtRgrUeCfg(inst, ueCfg, cell, errInfo) Inst inst; RgrUeCfg *ueCfg; RgSchCellCb **cell; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrUeCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_CFG; if (((*cell) == NULLP) || @@ -1100,7 +1072,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Cell does not exist %d", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* RACHO: * Check configured preamble id not colliding with non dedicated or PDCCH @@ -1110,30 +1082,30 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Preamble Id configuration" "failed ",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Check if Ue already configured */ if (rgSCHDbmGetUeCb(*cell, ueCfg->crnti) != NULLP) { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d UEID already exists", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate Transmission UE modes */ if ((ueCfg->txMode.pres == TRUE) && ((ueCfg->txMode.txModeEnum < RGR_UE_TM_1) || (ueCfg->txMode.txModeEnum > RGR_UE_TM_7))) { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid transmission mode for" - " UE is %d", ueCfg->cellId,(U8)ueCfg->txMode.txModeEnum); - RETVALUE(RFAILED); + " UE is %d", ueCfg->cellId,(uint8_t)ueCfg->txMode.txModeEnum); + return RFAILED; } /* Validate UE Category */ if (ueCfg->ueCatEnum > CM_LTE_UE_CAT_8) { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid category for UE %d", - ueCfg->cellId,(U8)ueCfg->ueCatEnum); - RETVALUE(RFAILED); + ueCfg->cellId,(uint8_t)ueCfg->ueCatEnum); + return RFAILED; } /* Validate UE Access Stratum Release */ @@ -1141,7 +1113,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid Access Stratum Release %u for UE\n", ueCfg->accessStratumRls)); - RETVALUE(RFAILED); + return RFAILED; } RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "Configured Access Stratum Release %u\n", \ ueCfg->accessStratumRls)); @@ -1153,8 +1125,8 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid transmission mode for" " UE (%d) for the configured Cell Antenna Ports",ueCfg->cellId, - (U8)ueCfg->txMode.txModeEnum); - RETVALUE(RFAILED); + (uint8_t)ueCfg->txMode.txModeEnum); + return RFAILED; } } @@ -1162,7 +1134,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti, "CELLID:%d Invalid CQI Mode configuration", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate Max Uplink HARQ transmission value */ @@ -1170,21 +1142,21 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid Uplink HARQ config for " "UE %d",ueCfg->cellId,ueCfg->ueUlHqCfg.maxUlHqTx); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUePwrCfg(*cell, &ueCfg->ueUlPwrCfg) != ROK) { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid PUSCH Group power" " configuration",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUeMeasGapAckNakRepCfg(*cell, ueCfg) != ROK) { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid MeasGap/AckNackRep" " configuration",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -1196,7 +1168,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid SPS RNTI " " in DL SPS Config",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } if (ueCfg->ueSpsCfg.dlSpsCfg.isDlSpsEnabled) @@ -1205,7 +1177,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid DL SPS configuration" " for the UE",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -1215,7 +1187,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid Periodic CQI/SR/SRS" "configuration",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1224,7 +1196,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid DRX configuration", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00117452 - MOD - Changed macro name from @@ -1234,7 +1206,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid numColltdCqiRept," "MAX supported %d",RGR_CQIRPTS_MAXN,ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } #endif /* End of RGR_CQI_REPT */ @@ -1246,12 +1218,12 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid EMTC UE configurationfor crnti:%d", ueCfg->cellId, ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeCfg */ @@ -1282,7 +1254,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrCellRecfg +S16 rgSCHCfgVldtRgrCellRecfg ( Inst inst, RgrCellRecfg *cellRecfg, @@ -1290,15 +1262,13 @@ RgSchCellCb **cell, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrCellRecfg(inst, cellRecfg, cell, errInfo) +S16 rgSCHCfgVldtRgrCellRecfg(inst, cellRecfg, cell, errInfo) Inst inst; RgrCellRecfg *cellRecfg; RgSchCellCb **cell; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrCellRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_RECFG; @@ -1307,7 +1277,7 @@ RgSchErrInfo *errInfo; ((*cell)->cellId != cellRecfg->cellId)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Cell control block does not exist"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate recieved values */ @@ -1318,7 +1288,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Downlink HARQ configuration:" " maxDlHqTx %d maxMsg4HqTx %d", cellRecfg->dlHqRecfg.maxDlHqTx, cellRecfg->dlHqRecfg.maxMsg4HqTx); - RETVALUE(RFAILED); + return RFAILED; } if ((cellRecfg->recfgTypes & RGR_CELL_CFI_RECFG) && ((cellRecfg->cfiRecfg.cfi < RGSCH_MIN_CFI_VAL) || @@ -1326,7 +1296,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid CFI configuration %d", cellRecfg->cfiRecfg.cfi); - RETVALUE(RFAILED); + return RFAILED; } if (cellRecfg->recfgTypes & RGR_CELL_PUCCH_RECFG) { @@ -1344,7 +1314,7 @@ RgSchErrInfo *errInfo; cellRecfg->pucchRecfg.n1PucchAn, cellRecfg->pucchRecfg.deltaShift, cellRecfg->pucchRecfg.cyclicShift); - RETVALUE(RFAILED); + return RFAILED; } } if (cellRecfg->recfgTypes & RGR_CELL_SRS_RECFG) @@ -1352,8 +1322,8 @@ RgSchErrInfo *errInfo; if (cellRecfg->srsRecfg.isSrsCfgSetup && cellRecfg->srsRecfg.srsBwEnum > RGR_SRS_BWCFG_7) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid SRS configuration: " - "srsBw %d", (U8)cellRecfg->srsRecfg.srsBwEnum); - RETVALUE(RFAILED); + "srsBw %d", (uint8_t)cellRecfg->srsRecfg.srsBwEnum); + return RFAILED; } /*ccpu00116923 - ADD - Srs Present support - Start*/ @@ -1365,7 +1335,7 @@ RgSchErrInfo *errInfo; #endif { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Subframe configuration "); - RETVALUE(RFAILED); + return RFAILED; } #endif /*ccpu00116923 - ADD - Srs Present support - End*/ @@ -1392,7 +1362,7 @@ RgSchErrInfo *errInfo; "numRaPreamble %d sizeRaPreambleGrpA %d", cellRecfg->rachRecfg.numRaPreamble, cellRecfg->rachRecfg.sizeRaPreambleGrpA); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1403,7 +1373,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Validation for SI" "Re-configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } } #endif /*RGR_SI_SCH */ @@ -1423,7 +1393,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"DSFR is enbaled" "Without enabling SFR"); - RETVALUE(RFAILED); + return RFAILED; } } if ((rgSCHCfgVldtRgrCellLteAdvCfg(inst, &(cellRecfg->rgrLteAdvCfg), @@ -1431,7 +1401,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Validation for Lte Adv" "Re-configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } } /* LTE_ADV_FLAG_REMOVED_END */ @@ -1443,17 +1413,17 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Configuration " "of minimum DL resources for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } if (cellRecfg->csgParamCfg.minUlResNonCsg > 100) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Configuration " "of minimum UL resources for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellRecfg */ #ifdef LTE_ADV @@ -1477,7 +1447,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSCellCfgUeCfg +S16 rgSCHSCellCfgUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1485,17 +1455,17 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSCellCfgUeCfg(cell, ue, ueRecfg, err) +S16 rgSCHSCellCfgUeCfg(cell, ue, ueRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; RgSchErrInfo *err; #endif { - U8 idx; + uint8_t idx; Inst inst = cell->instIdx; RgSchCellCb *secCellCb = NULLP; - U8 sCellidx = 0; + uint8_t sCellidx = 0; RgSchUeCellInfo *sCellInfo = NULLP; RgrUeSecCellCfg *sCellInfoCfg = NULLP; #ifdef TFU_UPGRADE @@ -1503,8 +1473,6 @@ RgSchErrInfo *err; RgrUePrdDlCqiCfg *pCqiCfg; #endif - TRC2(rgSCHSCellCfgUeCfg); - RLOG0(L_INFO, "SCELL recfg received from APP \n"); RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), @@ -1522,7 +1490,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]SCellIdx :Memomy allocation " "Failed while Adding SCell Information\n", idx)); - RETVALUE(RFAILED); + return RFAILED; } @@ -1579,7 +1547,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists")); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } if(TRUE == sCellInfoCfg->txMode.pres) @@ -1632,7 +1600,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]SCellIdx ACQI Cfg" "failed..n\n", idx)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } } /* Configuring PCQI */ @@ -1645,7 +1613,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]SCellIdx PCQI Cfg failed..n\n", idx)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1659,7 +1627,7 @@ RgSchErrInfo *err; if (ROK != rgSCHLaaInitDlRbAllocCb(secCellCb, &sCellInfo->dlAllocCb)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* Initialize Harq entity */ @@ -1670,7 +1638,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]UEID:Hq Entity Initialization " "failed in config\n", ue->ueId)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE rgSCHEmtcHqPAlloc(secCellCb, sCellInfo->hqEnt); @@ -1683,7 +1651,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Spec Sched DL UE CFG FAILED\n")); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD @@ -1693,7 +1661,7 @@ RgSchErrInfo *err; "Failed while UE related Ack Nack Information\n", ue->ueId)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTE_TDD */ @@ -1717,7 +1685,7 @@ RgSchErrInfo *err; ue->ul.ctrlOnServCellIdx[idx] = 0xFF; } /* Trigger SCell addition to primary MAC */ - RETVALUE(ROK); + return ROK; } /* rgSCHSCellCfgUeCfg */ /*f1b_Sprint */ @@ -1740,7 +1708,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSCellCfgUePucchReCfg +S16 rgSCHSCellCfgUePucchReCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1748,7 +1716,7 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSCellCfgUePucchReCfg(cell, ue, ueRecfg, err) +S16 rgSCHSCellCfgUePucchReCfg(cell, ue, ueRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -1757,9 +1725,8 @@ RgSchErrInfo *err; { Inst inst = cell->instIdx; RgrUeSCellAckPucchCfg *sCellPucchRecfg = NULLP; - U8 idx; + uint8_t idx; - TRC2(rgSCHSCellCfgUePucchReCfg); RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "--------------------------------------------------------------------\n" "UE SCell PUCCH ReConfiguration at SCH: rnti (%u) cell(%u)\n" @@ -1813,7 +1780,7 @@ RgSchErrInfo *err; RLOG1(L_ERROR,"Wrong PUCCH Format:%d configured for CA",ue->uciFrmtTyp); } - RETVALUE(ROK); + return ROK; } /* rgSCHSCellCfgUePucchReCfg */ /** @@ -1844,7 +1811,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeSCellRecfg +S16 rgSCHCfgVldtRgrUeSCellRecfg ( RgrUeRecfg *ueRecfg, RgSchCellCb *cell, @@ -1852,7 +1819,7 @@ RgSchUeCb *ue, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeSCellRecfg(inst, ueRecfg, cell, ue, errInfo) +S16 rgSCHCfgVldtRgrUeSCellRecfg(inst, ueRecfg, cell, ue, errInfo) RgrUeRecfg *ueRecfg; RgSchCellCb *cell; RgSchUeCb *ue; @@ -1863,7 +1830,6 @@ RgSchErrInfo *errInfo; RgSchCellCb *sCell = NULLP; Inst inst = cell->instIdx; - TRC2(rgSCHCfgVldtRgrUeSCellRecfg); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR UE SCELL RECONFIG: cellId %d " "oldUeId %d cell %p \n", ueRecfg->cellId, ueRecfg->oldCrnti)); @@ -1874,23 +1840,23 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid number of SCELL " " in SCELL Recfg\n")); - RETVALUE(RFAILED); + return RFAILED; } - for(U8 idx = 0; idx < ueRecfg->ueSCellCfgInfo.numSCells; idx++) + for(uint8_t idx = 0; idx < ueRecfg->ueSCellCfgInfo.numSCells; idx++) { ueSCellDedCfg = &ueRecfg->ueSCellCfgInfo.ueSCellDedCfg[idx]; if(ROK != rgSchUtlVldtCellId(inst, ueSCellDedCfg->sCellId)) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCellId is out of range")); - RETVALUE(RFAILED); + return RFAILED; } /* Validate existence of sec cell */ sCell = rgSchUtlGetCellCb(inst, ueSCellDedCfg->sCellId); if(NULLP == sCell ) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists")); - RETVALUE(RFAILED); + return RFAILED; } /* validate the range of serv cell index */ @@ -1899,7 +1865,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", ueSCellDedCfg->sCellIdx)); - RETVALUE(RFAILED); + return RFAILED; } /* Is this sec cell alredy confiured */ @@ -1907,7 +1873,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Secll with id %d already added\n", ueSCellDedCfg->sCellIdx)); - RETVALUE(RFAILED); + return RFAILED; } /* Validate CQI config params */ @@ -1915,7 +1881,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid CQI Mode " " configuration for Ue %d\n",ue->ueId)); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TFU_UPGRADE /* 1. Validate UE Aperiodic CQI related parameters */ @@ -1925,7 +1891,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(sCell->instIdx, (rgSchPBuf(sCell->instIdx), "rgSCHCfgVldtCqiSrSrsUeCfg: Invalid Aperiodic CQI configuration\n")); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_HDFDD @@ -1941,15 +1907,15 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(sCell->instIdx, (rgSchPBuf(sCell->instIdx), "rgSCHCfgVldtCqiSrSrsUeCfg: Invalid Periodic CQI configuration\n")); - RETVALUE(RFAILED); + return RFAILED; } if((ueSCellDedCfg->txMode.txModeEnum < RGR_UE_TM_1) || (ueSCellDedCfg->txMode.txModeEnum > RGR_UE_TM_9)) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCELL Invalid transmission mode for" - " UE %d\n", (U8)ueSCellDedCfg->txMode.txModeEnum)); - RETVALUE(RFAILED); + " UE %d\n", (uint8_t)ueSCellDedCfg->txMode.txModeEnum)); + return RFAILED; } #endif } @@ -1957,7 +1923,7 @@ RgSchErrInfo *errInfo; errInfo->errCause = RGSCHERR_NONE; RGSCHDBGINFO(inst, (rgSchPBuf(inst), "RGR Ue SCell Reconfig validation done: " "cellId %d oldUeId %d\n", ueRecfg->cellId, ue->ueId)); - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeSCellRecfg */ /** @@ -1997,8 +1963,6 @@ RgrUeRecfg *ueRecfg; RgSchUeCellInfo *sCellInfo = NULLP; RgSchCmnCell *cellSch = NULLP; - TRC2(rgSCHSCellCfgUeCfgRollBack); - RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "--------------------------------------------------------------------\n" "UE SCell config roll back at SCH: rnti (%u) cell(%u)\n" @@ -2006,7 +1970,7 @@ RgrUeRecfg *ueRecfg; ue->ueId, cell->cellId)); /* Free all Added scell in this transaction */ - for(U8 idx = 0; idx < ueRecfg->ueSCellCfgInfo.numSCells; idx++) + for(uint8_t idx = 0; idx < ueRecfg->ueSCellCfgInfo.numSCells; idx++) { sCellInfoCfg = &ueRecfg->ueSCellCfgInfo.ueSCellDedCfg[idx]; sCellInfo = ue->cellInfo[(sCellInfoCfg->sCellIdx)]; @@ -2039,7 +2003,7 @@ RgrUeRecfg *ueRecfg; #endif } } - RETVALUE(ROK); + return ROK; } #endif /* LTE_ADV */ /** @@ -2070,7 +2034,7 @@ RgrUeRecfg *ueRecfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeRecfg +S16 rgSCHCfgVldtRgrUeRecfg ( Inst inst, RgrUeRecfg *ueRecfg, @@ -2079,7 +2043,7 @@ RgSchUeCb **ue, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeRecfg(inst, ueRecfg, cell, ue, errInfo) +S16 rgSCHCfgVldtRgrUeRecfg(inst, ueRecfg, cell, ue, errInfo) Inst inst; RgrUeRecfg *ueRecfg; RgSchCellCb **cell; @@ -2088,8 +2052,6 @@ RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrUeRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RECFG; if (((*cell) == NULLP) || @@ -2097,7 +2059,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId, "Cell does not exist for OLD CRNTI:%d",ueRecfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Old Ue */ @@ -2105,7 +2067,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"OLD CRNTI:%d does not exist", ueRecfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV @@ -2115,10 +2077,10 @@ RgSchErrInfo *errInfo; if ( ret != ROK) { RGSCHDBGERR(inst,(rgSchPBuf(inst), "Ue SCell Recfg Validation FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } #endif @@ -2128,7 +2090,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"NEW CRNTI:%d already exists", ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2136,8 +2098,8 @@ RgSchErrInfo *errInfo; ((*ue)->csgMmbrSta == ueRecfg->csgMmbrSta)) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UE ID [%d] invalid CSG Membership reconfig :%d ", - ueRecfg->newCrnti, (U8)ueRecfg->csgMmbrSta); - RETVALUE(RFAILED); + ueRecfg->newCrnti, (uint8_t)ueRecfg->csgMmbrSta); + return RFAILED; } /* Validate values */ if ((ueRecfg->ueRecfgTypes & RGR_UE_TXMODE_RECFG) && @@ -2146,8 +2108,8 @@ RgSchErrInfo *errInfo; (ueRecfg->txMode.txModeEnum > RGR_UE_TM_7))) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid transmission mode %d" - "for NEW CRNTI:%d", (U8)ueRecfg->txMode.txModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + "for NEW CRNTI:%d", (uint8_t)ueRecfg->txMode.txModeEnum,ueRecfg->newCrnti); + return RFAILED; } #ifndef TFU_UPGRADE if ((ueRecfg->ueRecfgTypes & RGR_UE_PRD_DLCQI_RECFG) && @@ -2156,8 +2118,8 @@ RgSchErrInfo *errInfo; (ueRecfg->prdDlCqiRecfg.cqiPmiCfgIdx > 1024)))) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid Periodic CQI INFO" - "OLD CRNTI:%d NEW CRNTI:%d",(U8)ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + "OLD CRNTI:%d NEW CRNTI:%d",(uint8_t)ueRecfg->oldCrnti,ueRecfg->newCrnti); + return RFAILED; } #endif if ((ueRecfg->ueRecfgTypes & RGR_UE_ULHARQ_RECFG) && @@ -2165,31 +2127,31 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid Uplink HARQ config %d" "for NEW CRNTI:%d", ueRecfg->ueUlHqRecfg.maxUlHqTx,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifndef TFU_UPGRADE if ((ueRecfg->ueRecfgTypes & RGR_UE_PRD_DLCQI_RECFG) && (ueRecfg->prdDlCqiRecfg.prdModeEnum > RGR_PRD_CQI_MOD21)) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid periodic mode config for" - " DL CQI %d NEW CRNTI:%d", (U8)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + " DL CQI %d NEW CRNTI:%d", (uint8_t)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->newCrnti); + return RFAILED; } #else if ((ueRecfg->ueRecfgTypes & RGR_UE_PCQI_RECFG) && (ueRecfg->cqiCfg.cqiSetup.prdModeEnum > RGR_PRD_CQI_MOD21)) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid periodic mode config for " - "DL CQI %d for NEW CRNTI:%d",(U8)ueRecfg->cqiCfg.cqiSetup.prdModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + "DL CQI %d for NEW CRNTI:%d",(uint8_t)ueRecfg->cqiCfg.cqiSetup.prdModeEnum,ueRecfg->newCrnti); + return RFAILED; } #endif /* TFU_UPGRADE */ /* Validate UE Category */ if (ueRecfg->ueCatEnum > CM_LTE_UE_CAT_8) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid category %d for NEW CRNTI:%d", - (U8)ueRecfg->ueCatEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + (uint8_t)ueRecfg->ueCatEnum,ueRecfg->newCrnti); + return RFAILED; } /* Validate UE Access Stratum Release */ @@ -2198,7 +2160,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid Access Stratum Release %u for UE\n", ueRecfg->accessStratumRls)); - RETVALUE(RFAILED); + return RFAILED; } RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "Configured Access Stratum Release %u\n", \ ueRecfg->accessStratumRls)); @@ -2209,15 +2171,15 @@ RgSchErrInfo *errInfo; (*cell)->bwCfg.dlTotalBw <= 7))) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid aperiodic mode config for" - " DL CQI %d for NEW CRNTI:%d", (U8)ueRecfg->aprdDlCqiRecfg.aprdModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + " DL CQI %d for NEW CRNTI:%d", (uint8_t)ueRecfg->aprdDlCqiRecfg.aprdModeEnum,ueRecfg->newCrnti); + return RFAILED; } if ((ueRecfg->ueRecfgTypes & RGR_UE_ULPWR_RECFG) && (rgSCHCfgVldtUePwrCfg(*cell, &ueRecfg->ueUlPwrRecfg) != ROK)) { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid PUSCH Group power" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } @@ -2226,14 +2188,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid MeasGap/AckNackRep" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS if(rgSCHCfgVldtSpsReCfg(*cell, *ue, ueRecfg)!= ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid SPS" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef TFU_UPGRADE @@ -2242,7 +2204,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid ACQI, PCQI/SR/SRS " "Re-configuration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif if ((ueRecfg->ueRecfgTypes & RGR_UE_DRX_RECFG) && @@ -2250,7 +2212,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid drxParams" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00117452 - MOD - Changed macro name from @@ -2261,11 +2223,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid DL Power Control" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif /* End of RGR_CQI_REPT */ errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeRecfg */ @@ -2299,7 +2261,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrLchRecfg +S16 rgSCHCfgVldtRgrLchRecfg ( Inst inst, RgrLchRecfg *lcRecfg, @@ -2309,7 +2271,7 @@ RgSchDlLcCb **dlLc, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrLchRecfg(inst, lcRecfg, cell, ue, dlLc, errInfo) +S16 rgSCHCfgVldtRgrLchRecfg(inst, lcRecfg, cell, ue, dlLc, errInfo) Inst inst; RgrLchRecfg *lcRecfg; RgSchCellCb **cell; @@ -2318,8 +2280,6 @@ RgSchDlLcCb **dlLc; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLchRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LC_RECFG; if (((*cell) == NULLP) || @@ -2327,7 +2287,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"Cell does not exist " "for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue for dedicated channels */ @@ -2335,18 +2295,18 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"UEID does not exist" "dedicated logical channel for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } if ((*dlLc = rgSCHDbmGetDlDedLcCb((*ue), lcRecfg->lcId)) == NULLP) { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"Dedicated DL LC does not " "exist for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLchRecfg */ /** @@ -2373,7 +2333,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeReset +S16 rgSCHCfgVldtRgrUeReset ( Inst inst, RgrRst *reset, @@ -2382,7 +2342,7 @@ RgSchUeCb **ue, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeReset(inst, reset, cell, ue, errInfo) +S16 rgSCHCfgVldtRgrUeReset(inst, reset, cell, ue, errInfo) Inst inst; RgrRst *reset; RgSchCellCb *cell; @@ -2390,8 +2350,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrUeReset); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RESET; @@ -2399,19 +2357,19 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"CELL does not exist for CRNTI:%d", reset->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ if ((*ue = rgSCHDbmGetUeCb(&(*cell), reset->crnti)) == NULLP) { RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"UE does not exist for CRNTI:%d", reset->crnti); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeReset */ @@ -2443,7 +2401,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrLcgRecfg +S16 rgSCHCfgVldtRgrLcgRecfg ( Inst inst, RgrLcgRecfg *lcgRecfg, @@ -2452,7 +2410,7 @@ RgSchUeCb **ue, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrLcgRecfg(inst, lcgRecfg, cell, ue, errInfo) +S16 rgSCHCfgVldtRgrLcgRecfg(inst, lcgRecfg, cell, ue, errInfo) Inst inst; RgrLcgRecfg *lcgRecfg; RgSchCellCb *cell; @@ -2460,8 +2418,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLcgRecfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LCG_RECFG; if (((cell) == NULLP) || @@ -2469,7 +2425,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"Cell does not exist for" "CRNTI:%d LCGID:%d",lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue for dedicated channels */ @@ -2478,24 +2434,24 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"UE does not exist for " "dedicated logical channel group CRNTI:%d LCGID:%d", lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if (lcgRecfg->ulRecfg.lcgId > (RGSCH_MAX_LCG_PER_UE - 1)) { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"Invalid lcgId for uplink logical" "channel CRNTI:%d LCGID:%d", lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if ((lcgRecfg->ulRecfg.gbr != 0) && (lcgRecfg->ulRecfg.mbr < lcgRecfg->ulRecfg.gbr)) { RGSCHDBGINFO(inst, (rgSchPBuf(inst), "Dedicated Logical Group %d validation failed" " for ue %d for cell %d\n", lcgCfg->ulInfo.lcgId, lcgCfg->crnti, lcgCfg->cellId)); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLcgRecfg */ /** @@ -2522,16 +2478,14 @@ RgSchCellCb *cell; RgrCellCfg *cellCfg; #endif { - U8 cfi; + uint8_t cfi; #ifdef LTE_TDD - U8 ulDlCfgIdx = cellCfg->ulDlCfgIdx; - U8 mphIdx; - U8 maxMPhich; - U16 numDlSf; + uint8_t ulDlCfgIdx = cellCfg->ulDlCfgIdx; + uint8_t mphIdx; + uint8_t maxMPhich; + uint16_t numDlSf; #endif - TRC2(rgSCHDynCfiCfg); - cell->dynCfiCb.isDynCfiEnb = cellCfg->isDynCfiEnb; /* Initializing Failure Sample Period */ @@ -2544,10 +2498,10 @@ RgrCellCfg *cellCfg; /* Allocating memory for CCE failure average array based on * monitoring interval and CCE failure sample period */ if((rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(cell->dynCfiCb.cceFailSamples), - (cell->dynCfiCb.numFailSamples * sizeof(U16)))) != ROK) + (cell->dynCfiCb.numFailSamples * sizeof(uint16_t)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } /* Setting the Invalid value 0xFF to pdcchSfIdx, it will be assigned @@ -2616,7 +2570,7 @@ RgrCellCfg *cellCfg; RGSCH_CFI_TTI_MON_INTRVL)/100; #endif - RETVALUE(ROK); + return ROK; } /** @@ -2642,7 +2596,7 @@ RgrCellCfg *cellCfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrSchedEnbCfg +S16 rgSCHCfgRgrSchedEnbCfg ( Inst inst, SpId spId, @@ -2650,14 +2604,13 @@ RgrSchedEnbCfg *schedEnbCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrSchedEnbCfg(inst, spId, schedEnbCfg, errInfo) +S16 rgSCHCfgRgrSchedEnbCfg(inst, spId, schedEnbCfg, errInfo) Inst inst, SpId spId; RgrSchedEnbCfg *schedEnbCfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgRgrSchedEnbCfg); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "APPLYING RGR SCH ENB CONFIG: \n")); errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_ENB_CFG; @@ -2680,7 +2633,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; RGSCHDBGINFO(inst, (rgSchPBuf(inst), "RGR SCH ENBconfig done: \n")); - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrSchedEnbCfg */ #ifdef RG_5GTF @@ -2698,20 +2651,18 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCH5gtfCellCfg +S16 rgSCH5gtfCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg ) #else -PUBLIC S16 rgSCH5gtfCellCfg(cell, cellCfg) +S16 rgSCH5gtfCellCfg(cell, cellCfg) RgSchCellCb *cell; RgrCellCfg *cellCfg; #endif { - U8 idx; - - TRC2(rgSCHCfgRgrCellCfg); + uint8_t idx; for(idx = 0; idx < MAX_5GTF_GROUP; idx++) { @@ -2730,13 +2681,13 @@ RgrCellCfg *cellCfg; printf("\ncell cfg at schd,numUes:%u,uepergrp:%u,uegrppertti:%u,numCC:%u,bwPerc:%u cfi %u\n", cell->cell5gtfCb.numUes,cell->cell5gtfCb.uePerGrpPerTti,cell->cell5gtfCb.ueGrpPerTti, cell->cell5gtfCb.numCCs,cell->cell5gtfCb.bwPerCC, cell->cell5gtfCb.cfi); - RETVALUE(ROK); + return ROK; } #endif #ifdef XEON_LMT_ITBS -EXTERN U16 gWrMaxDlItbs; -EXTERN U16 gWrMaxUlItbs; +EXTERN uint16_t gWrMaxDlItbs; +EXTERN uint16_t gWrMaxUlItbs; #endif /** * @brief Handler for the cell configuration request from RRM to MAC. @@ -2762,7 +2713,7 @@ EXTERN U16 gWrMaxUlItbs; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrCellCfg +S16 rgSCHCfgRgrCellCfg ( RgSchCb *instCb, SpId spId, @@ -2770,7 +2721,7 @@ RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrCellCfg(instCb, spId, cellCfg, errInfo) +S16 rgSCHCfgRgrCellCfg(instCb, spId, cellCfg, errInfo) RgSchCb *instCb; SpId spId; RgrCellCfg *cellCfg; @@ -2778,25 +2729,23 @@ RgSchErrInfo *errInfo; #endif { S16 ret; - U8 idx; + uint8_t idx; Pst pst; RgInfCellReg cellRegReq; RgSchCellCb *cell = NULLP; Inst inst = instCb->rgSchInit.inst; - U32 Idx1 = (U8)((cellCfg->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); - - TRC2(rgSCHCfgRgrCellCfg); + uint32_t Idx1 = (uint8_t)((cellCfg->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); errInfo->errCause = RGSCHERR_CFG_RGR_CELL_CFG; - cmMemset((U8*)&pst, (U8)0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); /* Allocate the scheduler's cell control block */ if((ret = rgSCHUtlAllocSBuf(inst, (Data**)&cell, sizeof(RgSchCellCb))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE if(cellCfg->emtcEnable) @@ -2805,14 +2754,14 @@ RgSchErrInfo *errInfo; != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for emtc cell"); - RETVALUE(RFAILED); + return RFAILED; } } #endif - if ((U8 *)cell == NULLP) + if ((uint8_t *)cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize the lists of the cell */ ret = rgSCHDbmInitCell(cell); @@ -2820,14 +2769,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"DBM initialization FAILED for cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* LTE_ADV_FLAG_REMOVED_START */ if(cellCfg->rgrLteAdvCfg.pres & RGR_ABS) { cell->lteAdvCb.absCfg = cellCfg->rgrLteAdvCfg.absCfg; - cmMemset((U8*)cell->lteAdvCb.absLoadInfo, 0, sizeof(U32)*RGR_ABS_PATTERN_LEN); + memset(cell->lteAdvCb.absLoadInfo, 0, sizeof(uint32_t)*RGR_ABS_PATTERN_LEN); cell->lteAdvCb.absLoadTtiCnt = 0; } @@ -2875,7 +2824,7 @@ RgSchErrInfo *errInfo; cell->t300TmrVal = cellCfg->t300TmrVal; #ifdef RGR_SI_SCH /*Initialize the SI CB in Cell CB */ - cmMemset((U8 *)&cell->siCb, 0, sizeof(RgSchSiCb)); + memset(&cell->siCb, 0, sizeof(RgSchSiCb)); #endif /*Fix: Added Guard Pool for RNTI which will contain RNTIs *for UEs deleted from Scheduler but not yet from MAC*/ @@ -2931,7 +2880,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr cell Config failed at " "Scheduler for cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Updating Auto TM Mode enable/diable flag */ cell->isAutoCfgModeEnb = cellCfg->isAutoCfgModeEnb; @@ -2970,7 +2919,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr cell Config failed at " "Scheduler for cell "); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DHM to update DHM specific information */ @@ -2985,7 +2934,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr Cell Config failed at" " RNTI DB init for cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Update the cell with recieved configuration */ @@ -3000,7 +2949,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for " "cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Update RACH Related information * XXX: Below function yet to be written in RAM @@ -3015,7 +2964,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for" "cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Associate a pair of upper and lower sapCbs with this cell */ @@ -3049,7 +2998,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Drx Memory allocation FAILED for" " cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } cell->overLoadBackOffEnab = FALSE;/* Disabling RachOverload by default */ /* Updating CSG Parameters */ @@ -3087,7 +3036,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr Cell Config failed at" " Initializing the LAA Cell Control Cb"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } cell->isPucchFormat3Sptd = cellCfg->isPucchFormat3Sptd; RLOG_ARG0(L_INFO,DBG_CELLID,cellCfg->cellId,"Format 3 is Enabled"); @@ -3103,7 +3052,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"EMTC Config Failed" " cell"); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -3114,11 +3063,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR, DBG_CELLID,cellCfg->cellId,"5GTF Rgr Cell Config failed"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCellCfg */ /** @@ -3146,14 +3095,14 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrUeCfg +S16 rgSCHCfgRgrUeCfg ( RgSchCellCb *cell, RgrUeCfg *ueCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrUeCfg(cell, ueCfg, errInfo) +S16 rgSCHCfgRgrUeCfg(cell, ueCfg, errInfo) RgSchCellCb *cell; RgrUeCfg *ueCfg; RgSchErrInfo *errInfo; @@ -3163,18 +3112,17 @@ RgSchErrInfo *errInfo; RgSchRaCb *raCb=NULLP; RgSchUeCb *ue = NULLP; Inst inst = cell->instIdx; - U32 lcgCnt; + uint32_t lcgCnt; RgSchDlHqEnt *hqEnt = NULLP; #ifdef LTE_TDD - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 maxSubframes ; - U8 maxDlSubframes; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t maxSubframes ; + uint8_t maxDlSubframes; #endif - U32 idx = 0; + uint32_t idx = 0; #ifdef TFU_UPGRADE RgSchUePCqiCb *cqiCb = NULLP; #endif - TRC2(rgSCHCfgRgrUeCfg); do { errInfo->errCause = RGSCHERR_CFG_RGR_UE_CFG; @@ -3193,7 +3141,7 @@ RgSchErrInfo *errInfo; /* Allocate the Ue control block */ if (((rgSCHUtlAllocSBuf(inst, (Data **)&ue, sizeof(RgSchUeCb))) != ROK) || - ((U8 *)ue == NULLP)) + ((uint8_t *)ue == NULLP)) { RLOG_ARG1(L_ERROR,DBG_CELLID,ueCfg->cellId, "Memory allocation" " FAILED for CRNTI:%d", ueCfg->crnti); @@ -3206,7 +3154,7 @@ RgSchErrInfo *errInfo; /*ccpu00117778- Initialize Transmission Indices upon UE CB creation */ #ifdef LA ue->lastRprdAckNackTime.sfn = cell->crntTime.sfn; - ue->lastRprdAckNackTime.subframe = cell->crntTime.subframe; + ue->lastRprdAckNackTime.subframe = cell->crntTime.slot; ue->ueIdle = FALSE; #endif @@ -3221,7 +3169,7 @@ RgSchErrInfo *errInfo; RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%u]SCellIdx :Memomy allocation " "Failed while Adding SCell Information\n", idx)); #endif - RETVALUE(RFAILED); + return RFAILED; } ue->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)] = RGSCH_PCELL_INDEX; @@ -3235,7 +3183,7 @@ RgSchErrInfo *errInfo; if (ROK != rgSCHLaaInitDlRbAllocCb(cell, &ue->cellInfo[RGSCH_PCELL_INDEX]->dlAllocCb)) { - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef TFU_UPGRADE @@ -3337,7 +3285,7 @@ RgSchErrInfo *errInfo; (Data **)&ue->dl.dlSfHqInfo, sizeof(RgSchDlHqInfo) * (ue->dl.numHqDlSfInfo)); #else - ue->dl.numHqDlSfInfo = RGSCH_NUM_DL_SUBFRAMES; + ue->dl.numHqDlSfInfo = RGSCH_NUM_DL_slotS; #endif #ifndef RG_5GTF for (idx =0;idx < ue->dl.numHqDlSfInfo; idx++) @@ -3348,7 +3296,7 @@ RgSchErrInfo *errInfo; } #else { - U8 cellIdx=0; + uint8_t cellIdx=0; for (cellIdx = 0;cellIdx < MAX_5GTF_CELL ; cellIdx++) { for (idx =0;idx < ue->dl.numHqDlSfInfo; idx++) @@ -3517,14 +3465,14 @@ RgSchErrInfo *errInfo; rgSCHUtlUpdUeDciSize(cell, ue, FALSE); } - RETVALUE(ROK); + return ROK; }while(0); if (ue) { rgSCHCfgFreeUeCb(cell, ue); } - RETVALUE(RFAILED); + return RFAILED; } /* rgSCHCfgRgrUeCfg */ /** @@ -3559,8 +3507,6 @@ RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgRgrUePhrMsg3); - /* Record msg3 allocation in the UE */ rgSCHUtlRecMsg3Alloc(cell, ue, raCb); @@ -3571,7 +3517,7 @@ RgSchErrInfo *errInfo; rgSCHUtlUpdPhr(cell, ue, raCb->phr.val, errInfo); } - RETVOID; + return; } /** @@ -3587,22 +3533,20 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHDynCfiReCfg +Void rgSCHDynCfiReCfg ( RgSchCellCb *cell, Bool isDynCfiEnb ) #else -PUBLIC Void rgSCHDynCfiReCfg(cell, isDynCfiEnb) +Void rgSCHDynCfiReCfg(cell, isDynCfiEnb) RgSchCellCb *cell; Bool isDynCfiEnb; #endif { - U8 idx; + uint8_t idx; RgSchCmnDlCell *cellSchDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHDynCfiReCfg); - if(isDynCfiEnb) { cell->dynCfiCb.ttiCnt = 0; @@ -3647,14 +3591,14 @@ Bool isDynCfiEnb; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrCellRecfg +S16 rgSCHCfgRgrCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *cellRecfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrCellRecfg(cell, cellRecfg, errInfo) +S16 rgSCHCfgRgrCellRecfg(cell, cellRecfg, errInfo) RgSchCellCb *cell; RgrCellRecfg *cellRecfg; RgSchErrInfo *errInfo; @@ -3663,13 +3607,10 @@ RgSchErrInfo *errInfo; S16 ret; Inst inst = cell->instIdx; /* LTE_ADV_FLAG_REMOVED_START */ - U8 i = 0; - U16 len; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ + uint8_t i = 0; + uint16_t len; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ /* LTE_ADV_FLAG_REMOVED_END */ - TRC2(rgSCHCfgRgrCellRecfg); - - errInfo->errCause = RGSCHERR_CFG_RGR_CELL_RECFG; /* Invoke scheduler to update scheduler specific information */ @@ -3678,7 +3619,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId, "RGR Cell re-configuration failed " "at Scheduler "); - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DHM to update DHM specific information */ @@ -3751,7 +3692,7 @@ RgSchErrInfo *errInfo; RLOG_ARG1(L_ERROR,DBG_CELLID, cellRecfg->cellId, "Invalid CPU OvrLd Ins %d for cell", cellRecfg->cntrlCmdCfg.cmdDesc.cpuOvrLd.instruction); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -3766,23 +3707,23 @@ RgSchErrInfo *errInfo; } if(cellRecfg->rgrLteAdvCfg.pres & RGR_SFR) { - cmMemcpy((U8 *)&cell->lteAdvCb.sfrCfg, (U8 *)&cellRecfg->rgrLteAdvCfg.sfrCfg, + memcpy(&cell->lteAdvCb.sfrCfg, &cellRecfg->rgrLteAdvCfg.sfrCfg, sizeof(RgrSfrConfig)); /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ if (cellRecfg->rgrLteAdvCfg.sfrCfg.status == RGR_ENABLE) { - for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++) + for(i = 0; i < RGSCH_NUM_DL_slotS; i++) { /*initialise the pools of CC and CE*/ if(rgSchSFRTotalPoolInit(cell, cell->subFrms[i])) { - RETVALUE(RFAILED); + return RFAILED; } } } else { - for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++) + for(i = 0; i < RGSCH_NUM_DL_slotS; i++) { /*initialise the pools of CC and CE*/ rgSchSFRTotalPoolFree(&cell->subFrms[i]->sfrTotalPoolInfo, cell); @@ -3791,7 +3732,7 @@ RgSchErrInfo *errInfo; if (cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) { /* releasing rntp info val from each subframe */ - for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++) + for(i = 0; i < RGSCH_NUM_DL_slotS; i++) { rgSchDSFRRntpInfoFree(&cell->subFrms[i]->rntpInfo, cell, cell->bwCfg.dlTotalBw); } @@ -3810,24 +3751,24 @@ RgSchErrInfo *errInfo; cellRecfg->rgrLteAdvCfg.dsfrCfg; if (cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) { - for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++) + for(i = 0; i < RGSCH_NUM_DL_slotS; i++) { /*initialise the pools of CC and CE*/ if(rgSchDSFRRntpInfoInit(&cell->subFrms[i]->rntpInfo,cell,cell->bwCfg.dlTotalBw)) { - RETVALUE(RFAILED); + return RFAILED; } } /*Calculating the length of RNTP array based on Dl Bandwidth */ - len = (U16)((cell->bwCfg.dlTotalBw % 8 == 0) ? (cell->bwCfg.dlTotalBw/8) : (cell->bwCfg.dlTotalBw/8 + 1)); /* KW fix for LTE_ADV */ + len = (uint16_t)((cell->bwCfg.dlTotalBw % 8 == 0) ? (cell->bwCfg.dlTotalBw/8) : (cell->bwCfg.dlTotalBw/8 + 1)); /* KW fix for LTE_ADV */ if(cell->rntpAggrInfo.pres == NOTPRSNT) { if((rgSCHUtlAllocSBuf(inst, (Data**)&(cell->rntpAggrInfo.val), - (len * sizeof(U8)))) != ROK) + (len * sizeof(uint8_t)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId, "Memory allocation FAILED for RNTP Alloc"); - RETVALUE(RFAILED); + return RFAILED; } cell->rntpAggrInfo.pres = PRSNT_NODEF; cell->rntpAggrInfo.len = len; @@ -3837,7 +3778,7 @@ RgSchErrInfo *errInfo; else { /* releasing rntp info val from each subframe */ - for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++) + for(i = 0; i < RGSCH_NUM_DL_slotS; i++) { rgSchDSFRRntpInfoFree(&cell->subFrms[i]->rntpInfo, cell, cell->bwCfg.dlTotalBw); } @@ -3894,7 +3835,7 @@ RgSchErrInfo *errInfo; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCellRecfg */ /** @@ -3936,16 +3877,14 @@ RgSchErrInfo *errInfo; #endif { #ifdef LTE_ADV - U8 sCellIdx; + uint8_t sCellIdx; #endif S16 ret; RgSchRaCb *raCb; RgSchRaCb *oldRaCb; RgSchDlHqEnt **hqEnt = &(RG_SCH_CMN_GET_UE_HQE(ue, cell)); - U8 idx; + uint8_t idx; - TRC2(rgSCHCfgRgrUeRecfgRntiChg); - /* Handle CRNTI change in reconfiguration */ if (ueRecfg->oldCrnti != ueRecfg->newCrnti) { @@ -3955,7 +3894,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UEID:No RaCb exists while" "Reconfig for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* rntiLnk does not exist for a HandIn UE. Hence this check. */ @@ -3981,7 +3920,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"RAM Handling for UE Reconfig failed" "for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* Delete Ue from the ue list */ rgSCHDbmDelUeCb(cell, ue); @@ -4042,7 +3981,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UE DRX re-est failed" "for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif /* Acc Fix */ @@ -4107,7 +4046,7 @@ RgSchErrInfo *errInfo; rgSCHUtlIndRntiRls2Mac(cell, oldRnti, TRUE, ueRecfg->newCrnti); } } - RETVALUE(ROK); + return ROK; } /** * @brief Handler for the UE reconfiguration request from RRC to MAC. @@ -4136,7 +4075,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrUeRecfg +S16 rgSCHCfgRgrUeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4144,7 +4083,7 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrUeRecfg(cell, ue, ueRecfg, errInfo) +S16 rgSCHCfgRgrUeRecfg(cell, ue, ueRecfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -4156,8 +4095,6 @@ RgSchErrInfo *errInfo; Bool dciChange = TRUE; #endif - TRC2(rgSCHCfgRgrUeRecfg); - errInfo->errCause = RGSCHERR_CFG_RGR_UE_RECFG; #ifdef LTE_ADV @@ -4185,7 +4122,7 @@ RgSchErrInfo *errInfo; /*FH: SCell config failed for a scell index hence revert all successful * Scell config and send negative confirmation to APP*/ rgSCHSCellCfgUeCfgRollBack(cell, ue, ueRecfg); - RETVALUE(RFAILED); + return RFAILED; } } if (dciChange == TRUE) @@ -4207,7 +4144,7 @@ RgSchErrInfo *errInfo; if( ret != ROK) { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_SCELL_PUCCH_RECFG; - RETVALUE(RFAILED); + return RFAILED; } } #else @@ -4228,7 +4165,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, "Scheduler handling while reconfig failed" "for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* Update uplink HARQ related information for UE */ @@ -4250,7 +4187,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Measurement Gap and" "AckNack Rep Recfg failed for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } if (ueRecfg->ueRecfgTypes & RGR_UE_BSRTMR_RECFG) @@ -4270,7 +4207,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"RNTI change " "failed for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TFU_UPGRADE @@ -4305,7 +4242,7 @@ RgSchErrInfo *errInfo; if (ret != ROK) { errInfo->errCause = RGSCHERR_HDFDD_SPSCFGRD; - RETVALUE(ret); + return (ret); } } #endif /* LTEMAC_HDFDD */ @@ -4319,7 +4256,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UE DRX reconfig failed" "failed for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -4333,7 +4270,7 @@ RgSchErrInfo *errInfo; if(ret != OK) { errInfo->errCause = RGSCHERR_CQIREPT; - RETVALUE(ret); + return (ret); } } #endif /* End of RGR_CQI_REPT */ @@ -4374,7 +4311,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrUeRecfg */ @@ -4403,7 +4340,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrLchRecfg +S16 rgSCHCfgRgrLchRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4412,7 +4349,7 @@ RgrLchRecfg *lcRecfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrLchRecfg(cell, ue, dlLc, lcRecfg, errInfo) +S16 rgSCHCfgRgrLchRecfg(cell, ue, dlLc, lcRecfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -4422,8 +4359,6 @@ RgSchErrInfo *errInfo; { S16 ret = ROK; - TRC2(rgSCHCfgRgrLchRecfg); - errInfo->errCause = RGSCHERR_CFG_RGR_LC_RECFG; /* Invoke Scheduler to update the new configuration */ ret = rgSCHUtlRgrLcRecfg(cell, ue, dlLc, lcRecfg, errInfo); @@ -4431,11 +4366,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"Scheduler handling for LC Recfg" " failed for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLchRecfg */ /** * @brief Handler for the logical channel reconfiguration request from @@ -4460,7 +4395,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrLcgRecfg +S16 rgSCHCfgRgrLcgRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4468,7 +4403,7 @@ RgrLcgRecfg *lcgRecfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrLcgRecfg(cell, ue, lcgRecfg, errInfo) +S16 rgSCHCfgRgrLcgRecfg(cell, ue, lcgRecfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrLcgRecfg *lcgRecfg; @@ -4477,8 +4412,6 @@ RgSchErrInfo *errInfo; { S16 ret = ROK; - TRC2(rgSCHCfgRgrLcgRecfg); - errInfo->errCause = RGSCHERR_CFG_RGR_LCG_RECFG; /*Added for handling LCG ReConfig if the LCG was deleted */ @@ -4490,11 +4423,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"Scheduler handling for LCG Recfg" " failed for CRNTI:%d LCGID:%d",lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcgRecfg */ /** @@ -4518,7 +4451,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrUeReset +S16 rgSCHCfgRgrUeReset ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4526,19 +4459,16 @@ RgrRst *reset, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrUeReset(cell, ue, reset, errInfo) +S16 rgSCHCfgRgrUeReset(cell, ue, reset, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrRst *reset; RgSchErrInfo *errInfo; #endif { - U32 idx; + uint32_t idx; RgSchRaCb *raCb; - TRC2(rgSCHCfgRgrUeReset); - - errInfo->errCause = RGSCHERR_CFG_RGR_UE_RESET; /* Setting BO of Each Logical Channel of the UE to 0 */ @@ -4606,7 +4536,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrUeReset */ /** @@ -4630,21 +4560,19 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrCellDel +S16 rgSCHCfgRgrCellDel ( RgSchCellCb *cell, RgrDel *cellDelInfo, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrCellDel(cell, cellDelInfo, errInfo) +S16 rgSCHCfgRgrCellDel(cell, cellDelInfo, errInfo) RgSchCellCb *cell; RgrDel *cellDelInfo; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgRgrCellDel); - errInfo->errCause = RGSCHERR_CFG_RGR_CELL_DEL; @@ -4652,14 +4580,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellDelInfo->u.cellDel.cellId, "Cell does not exist"); - RETVALUE(RFAILED); + return RFAILED; } /* Free the active cell */ rgSCHCfgFreeCellCb(cell); errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCellDel */ @@ -4684,14 +4612,14 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrUeDel +S16 rgSCHCfgRgrUeDel ( RgSchCellCb *cell, RgrDel *ueDelInfo, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrUeDel(cell, ueDelInfo, errInfo) +S16 rgSCHCfgRgrUeDel(cell, ueDelInfo, errInfo) RgSchCellCb *cell; RgrDel *ueDelInfo; RgSchErrInfo *errInfo; @@ -4704,7 +4632,6 @@ RgSchErrInfo *errInfo; RgSchCellCb *secCellCb = NULLP; #endif - TRC2(rgSCHCfgRgrUeDel); errInfo->errCause = RGSCHERR_CFG_RGR_UE_DEL; if (cell->cellId != ueDelInfo->u.ueDel.cellId) @@ -4712,7 +4639,7 @@ RgSchErrInfo *errInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,ueDelInfo->u.ueDel.cellId, "Cell does not exist CRNTI:%d", ueDelInfo->u.ueDel.crnti); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgSCHDbmGetUeCb(cell, ueDelInfo->u.ueDel.crnti)) == NULLP) { @@ -4720,13 +4647,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueDelInfo->u.ueDel.cellId, "RaCb does not exist for CRNTI:%d",ueDelInfo->u.ueDel.crnti); - RETVALUE(RFAILED); + return RFAILED; } else { /* This happens in case of Msg4 rejection */ raCb->toDel = TRUE; - RETVALUE(ROK); + return ROK; } } else @@ -4734,7 +4661,7 @@ RgSchErrInfo *errInfo; #ifdef LTE_ADV if(ueDelInfo->u.ueScellRel.ueDelTypes & RGR_UE_SCELL_DEL_RECFG) { - for(U8 idx = 0; idx < ueDelInfo->u.ueScellRel.ueSCellRelCfgInfo.numSCells; idx++) + for(uint8_t idx = 0; idx < ueDelInfo->u.ueScellRel.ueSCellRelCfgInfo.numSCells; idx++) { if(NULLP != (secCellCb = (RgSchCellCb *)rgSchUtlGetCellCb(inst, \ ueDelInfo->u.ueScellRel.ueSCellRelCfgInfo.ueSCellRelDedCfg[idx].sCellId))) @@ -4802,7 +4729,7 @@ RgSchErrInfo *errInfo; errInfo->errCause = RGSCHERR_NONE; } - RETVALUE(ROK); + return ROK; } } /* rgSCHCfgRgrUeDel */ @@ -4827,14 +4754,14 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrLcDel +S16 rgSCHCfgRgrLcDel ( RgSchCellCb *cell, RgrDel *lcDelInfo, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrLcDel(cell, lcDelInfo, errInfo) +S16 rgSCHCfgRgrLcDel(cell, lcDelInfo, errInfo) RgSchCellCb *cell; RgrDel *lcDelInfo; RgSchErrInfo *errInfo; @@ -4843,13 +4770,11 @@ RgSchErrInfo *errInfo; RgSchUeCb *ue; RgSchDlLcCb *dlLc; #ifdef LTE_L2_MEAS - U8 lcId; - U8 idx; + uint8_t lcId; + uint8_t idx; RgSchUlLcCb *ulLc; #endif - TRC2(rgSCHCfgRgrLcDel); - errInfo->errCause = RGSCHERR_CFG_RGR_LC_DEL; /* Fetch the Active cell */ @@ -4857,7 +4782,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Cell does not exist %d", lcDelInfo->u.lchDel.cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -4866,7 +4791,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "UE does not exist for CRNTI:%d LCID:%d", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } if (lcDelInfo->u.lchDel.lcgId > 3) { @@ -4874,7 +4799,7 @@ RgSchErrInfo *errInfo; "[%d]UEID:For LC %d, LCGid %d is invalid", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId, lcDelInfo->u.lchDel.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if ((dlLc = rgSCHDbmGetDlDedLcCb(ue, lcDelInfo->u.lchDel.lcId)) == NULLP) @@ -4882,7 +4807,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "LC does not exist for CRNTI:%d LCID:%d", lcDelInfo->u.lchDel.crnti, lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } rgSCHUtlRgrLcDel(cell, ue, lcDelInfo->u.lchDel.lcId,lcDelInfo->u.lchDel.lcgId); @@ -4930,7 +4855,7 @@ RgSchErrInfo *errInfo; errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcDel */ @@ -4955,14 +4880,14 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrLcgDel +S16 rgSCHCfgRgrLcgDel ( RgSchCellCb *cell, RgrDel *lcDelInfo, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrLcgDel(cell, lcDelInfo, errInfo) +S16 rgSCHCfgRgrLcgDel(cell, lcDelInfo, errInfo) RgSchCellCb *cell; RgrDel *lcDelInfo; RgSchErrInfo *errInfo; @@ -4970,12 +4895,9 @@ RgSchErrInfo *errInfo; { RgSchUeCb *ue = NULLP; #ifdef LTE_L2_MEAS - U8 lcCount = 0; + uint8_t lcCount = 0; #endif - U8 lcgId = 0; - - TRC2(rgSCHCfgRgrLcgDel); - + uint8_t lcgId = 0; lcgId = lcDelInfo->u.lcgDel.lcgId; @@ -4987,7 +4909,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "CELL does not exist for CRNTI:%d LCGID:%d", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -4996,7 +4918,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "UE does not exist for CRNTI:%d LCGID:%d", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } /* set lcgId in UEs lcg cntrl blk to invalid */ @@ -5029,7 +4951,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcgDel */ @@ -5051,7 +4973,7 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrLcCfg +S16 rgSCHCfgVldtRgrLcCfg ( Inst inst, RgrLchCfg *lcCfg, @@ -5060,7 +4982,7 @@ RgSchUeCb **ue, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrLcCfg(inst, lcCfg, cell, ue, errInfo) +S16 rgSCHCfgVldtRgrLcCfg(inst, lcCfg, cell, ue, errInfo) Inst inst; RgrLchCfg *lcCfg; RgSchCellCb **cell; @@ -5068,8 +4990,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLcCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LC_CFG; @@ -5078,7 +4998,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Cell does not existi for " "CRNTI:%d LCID:%d",lcCfg->crnti, lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -5086,7 +5006,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"UE does not exist for dedicated" " logical channel CRNTI:%d LCID:%d", lcCfg->crnti, lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate logical channel Id */ @@ -5095,17 +5015,17 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid logical channel Id:%d" "for CRNTI:%d",lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } if (lcCfg->lcType != CM_LTE_LCH_DTCH && lcCfg->lcType != CM_LTE_LCH_DCCH) { RLOG_ARG3(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid logical channel Type %d" "CRNTI:%d LCID:%d",lcCfg->lcType,lcCfg->crnti, lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLcCfg */ /*********************************************************** @@ -5125,7 +5045,7 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrLcgCfg +S16 rgSCHCfgVldtRgrLcgCfg ( Inst inst, RgrLcgCfg *lcgCfg, @@ -5134,7 +5054,7 @@ RgSchUeCb **ue, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrLcgCfg(inst, lcgCfg, cell, ue, errInfo) +S16 rgSCHCfgVldtRgrLcgCfg(inst, lcgCfg, cell, ue, errInfo) Inst inst; RgrLcgCfg *lcgCfg; RgSchCellCb **cell; @@ -5142,8 +5062,6 @@ RgSchUeCb **ue; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrLcgCfg); - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LCG_CFG; @@ -5152,7 +5070,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgCfg->cellId,"Cell does not exist for" "CRNTI:%d LCGID:%d",lcgCfg->crnti,lcgCfg->ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -5160,15 +5078,15 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgCfg->cellId,"UE does not exist for " "dedicated logical channel CRNTI:%d LCGID:%d", lcgCfg->crnti, lcgCfg->ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if ((lcgCfg->ulInfo.gbr != 0) && (lcgCfg->ulInfo.mbr < lcgCfg->ulInfo.gbr)) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLcgCfg */ @@ -5205,13 +5123,11 @@ RgSchErrInfo *errInfo; UNUSED(cellCfg); UNUSED(errInfo); - TRC2(rgSCHCfgVldtRgrCellPwrCfg); - /* This function does nothing now, placeholder for * subsequent power config validations that may be needed */ - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellPwrCfg */ @@ -5248,13 +5164,11 @@ RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; #endif { - U8 idx; + uint8_t idx; RgrCmnLchCfg *lcCfg; - U8 dirVld = FALSE; - U8 bitMask = 0x00; - U8 cnt=0; - - TRC2(rgSCHCfgVldtRgrCmnLcCfg); + uint8_t dirVld = FALSE; + uint8_t bitMask = 0x00; + uint8_t cnt=0; errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CMN_LC_CFG; @@ -5293,7 +5207,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid si config for cell"); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -5305,7 +5219,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID, cellCfg->cellId, "Invalid transport channel %d for cell", lcCfg->dlTrchType); - RETVALUE(RFAILED); + return RFAILED; } } else if (lcCfg->lcType == CM_LTE_LCH_PCCH) @@ -5327,7 +5241,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID, cellCfg->cellId,"Invalid UL common lcType %d " "for cell", lcCfg->lcType); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -5341,17 +5255,17 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID, cellCfg->cellId,"Invalid Direction %d", lcCfg->dir); - RETVALUE(RFAILED); + return RFAILED; } } if (bitMask != RGSCH_CELL_ACTIVE_CFG) { RLOG_ARG0(L_ERROR,DBG_CELLID, cellCfg->cellId, "Invalid Common channel config for cell"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCmnLcCfg */ @@ -5384,15 +5298,13 @@ RgrUeDlCqiCfg *ueDlCqiCfg; #endif { - TRC2(rgSCHCfgVldtUeCqiModeCfg) - #ifndef TFU_UPGRADE if((ueDlCqiCfg->prdCqiCfg.cqiPmiCfgIdx < 1) || (ueDlCqiCfg->prdCqiCfg.cqiPmiCfgIdx > 1024)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid Periodic CQI Info"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* Validate UE Aperiodic CQI mode */ @@ -5403,7 +5315,7 @@ RgrUeDlCqiCfg *ueDlCqiCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid Aperiodic mode config for DL CQI", ueDlCqiCfg->aprdCqiCfg.aprdModeEnum); - RETVALUE(RFAILED); + return RFAILED; } #ifndef TFU_UPGRADE /* Validate UE Periodic CQI mode */ @@ -5412,7 +5324,7 @@ RgrUeDlCqiCfg *ueDlCqiCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid periodic mode config for DL CQI", ueDlCqiCfg->prdCqiCfg.prdModeEnum); - RETVALUE(RFAILED); + return RFAILED; } /* Validate K value in periodic CQI Config */ if(((ueDlCqiCfg->prdCqiCfg.prdModeEnum == RGR_PRD_CQI_MOD20) || @@ -5422,7 +5334,7 @@ RgrUeDlCqiCfg *ueDlCqiCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid K for Subband CQI reporting"); - RETVALUE(RFAILED); + return RFAILED; } #else if ((ueDlCqiCfg->prdCqiCfg.type == 1) && @@ -5431,12 +5343,12 @@ RgrUeDlCqiCfg *ueDlCqiCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid periodic mode config for DL CQI", ueDlCqiCfg->prdCqiCfg.cqiSetup.prdModeEnum); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5468,8 +5380,6 @@ RgrUeCfg *ueCfg; #endif { - TRC2(rgSCHCfgVldtUeMeasGapAckNakRepCfg) - #ifdef LTE_TDD if ((ueCfg->ackNackModeEnum == RGR_TDD_ACKNACK_MODE_MULT) && (ueCfg->ueAckNackCfg.isAckNackEnabled == TRUE)) @@ -5477,14 +5387,14 @@ RgrUeCfg *ueCfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"TDD ACK NACK Multiplexing Mode" "is not allowed when Ack/Nack is Enabled: %d CRNTI:%d", ueCfg->ueAckNackCfg.ackNackRepFactor,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTE_TDD */ /* Validate AckNackRep Factor */ if((ueCfg->ueAckNackCfg.isAckNackEnabled == FALSE) && (!ueCfg->ueMesGapCfg.isMesGapEnabled)) { - RETVALUE(ROK); + return ROK; } if(ueCfg->ueAckNackCfg.isAckNackEnabled) @@ -5494,7 +5404,7 @@ RgrUeCfg *ueCfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId, "Invalid ACK NACK REP Factor:%d CRNTI:%d", ueCfg->ueAckNackCfg.ackNackRepFactor,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } if(ueCfg->ueMesGapCfg.isMesGapEnabled) @@ -5506,7 +5416,7 @@ RgrUeCfg *ueCfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"Invalid GAP Offset:%d CRNTI:%d", ueCfg->ueMesGapCfg.gapOffst,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } break; case RG_MEAS_GAPPRD_80: @@ -5514,19 +5424,19 @@ RgrUeCfg *ueCfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"Invalid GAP Offset:%d CRNTI:%d", ueCfg->ueMesGapCfg.gapOffst,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } break; default: { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"Invalid GAP Periodicity Settings:%d" "CRNTI:%d", ueCfg->ueMesGapCfg.gapPrd,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUeMeasGapAckNakRepCfg*/ @@ -5559,11 +5469,10 @@ RgrUeRecfg *ueRecfg; #endif { - TRC2(rgSCHCfgVldtUeMeasGapAckNakRepRecfg) if((ueRecfg->ueAckNackRecfg.isAckNackEnabled == FALSE) && (!ueRecfg->ueMeasGapRecfg.isMesGapEnabled)) { - RETVALUE(ROK); + return ROK; } if(ueRecfg->ueAckNackRecfg.isAckNackEnabled ) @@ -5574,7 +5483,7 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid ACK NACK REP Factor:%d" "NEW CRNTI:%d",ueRecfg->ueAckNackRecfg.ackNackRepFactor,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } if(ueRecfg->ueMeasGapRecfg.isMesGapEnabled) @@ -5586,7 +5495,7 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid GAP Offset:%d" "NEW CRNTI:%d",ueRecfg->ueMeasGapRecfg.gapOffst,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } break; case RG_MEAS_GAPPRD_80: @@ -5594,19 +5503,19 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid GAP Offset:%d" "NEW CRNTI:%d",ueRecfg->ueMeasGapRecfg.gapOffst,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } break; default: { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid GAP Periodicity Settings:%d" "NEW CRNTI:%d",ueRecfg->ueMeasGapRecfg.gapPrd,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUeMeasGapAckNakRepRecfg*/ #ifdef LTEMAC_SPS @@ -5639,9 +5548,7 @@ RgrUeSpsDlCfg *dlSpsCfg; #endif { - U8 idx = 0; - - TRC2(rgSCHCfgVldtUeDlSpsCfg); + uint8_t idx = 0; /* peridicity validation done in SPS module */ if ((dlSpsCfg->numPucchVal > RG_SCH_MAX_NUM_N1PUCCH_PER_UE) || @@ -5649,7 +5556,7 @@ RgrUeSpsDlCfg *dlSpsCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid number of n1Pucch values" " in DL SPS Config"); - RETVALUE(RFAILED); + return RFAILED; } for (idx = 0; idx < dlSpsCfg->numPucchVal; ++idx) @@ -5663,7 +5570,7 @@ RgrUeSpsDlCfg *dlSpsCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid N1Pucch value" " in DL SPS Config %lu", dlSpsCfg->n1PucchVal[idx]); #endif - RETVALUE(RFAILED); + return RFAILED; } } /* SPS_TODO: check will change for TDD */ @@ -5672,10 +5579,10 @@ RgrUeSpsDlCfg *dlSpsCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid number of SPS HARQ procs" " in DL SPS Config"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtDlSpsCfg */ #endif /* LTEMAC_SPS */ @@ -5708,8 +5615,6 @@ RgrUeUlPwrCfg *pwrCfg; #endif { - TRC2(rgSCHCfgVldtUePwrCfg); - /* Group power control works only in accumulated mode */ if (!pwrCfg->isAccumulated) { @@ -5718,7 +5623,7 @@ RgrUeUlPwrCfg *pwrCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Accumulation configutation" " not in sync with group power configuration"); - RETVALUE(RFAILED); + return RFAILED; } } @@ -5726,16 +5631,16 @@ RgrUeUlPwrCfg *pwrCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid PUSCH Group power" " configuration"); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUeGrpPwrCfg(cell, &pwrCfg->uePucchPwr) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid PUSCH Group power" " configuration"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUePwrCfg */ /*********************************************************** @@ -5767,8 +5672,6 @@ RgrUeGrpPwrCfg *grpPwrCfg; #endif { - TRC2(rgSCHCfgVldtUeGrpPwrCfg); - if ((grpPwrCfg->pres) && (((grpPwrCfg->tpcRnti > cell->rntiDb.rntiStart) && ((grpPwrCfg->tpcRnti < @@ -5776,10 +5679,10 @@ RgrUeGrpPwrCfg *grpPwrCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid Uplink Group power " "configuration"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUeGrpPwrCfg */ #ifdef LTEMAC_SPS @@ -5815,7 +5718,6 @@ RgrUeRecfg *ueRecfg; #endif { - TRC2(rgSCHCfgVldtSpsReCfg); if ((ueRecfg->ueRecfgTypes & RGR_UE_DLSPS_RECFG) && (ueRecfg->ueSpsRecfg.dlSpsCfg.isDlSpsEnabled)) { @@ -5829,14 +5731,14 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid SPS RNTI " " in DL SPS Recfg OLD CRNTI:%d NEW CCRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUeDlSpsCfg(cell, &ueRecfg->ueSpsRecfg.dlSpsCfg) != ROK) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid DL SPS configuration" " for the OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -5850,7 +5752,7 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, " DRX reconfig not supported DL SPS enabled for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -5863,7 +5765,7 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, "DL SPS is not supported for HDFDD enabled for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } if(ueRecfg->ueSpsRecfg.ulSpsCfg.isUlSpsEnabled) @@ -5873,12 +5775,12 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, "UL SPS is not supported for HDFDD enabled for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ROK); + return ROK; } /*rgSCHCfgVldtSpsReCfg*/ #endif @@ -5913,17 +5815,16 @@ RgrUeRecfg *ueRecfg; #endif { - TRC2(rgSCHCfgVldtCqiReptReCfg); /* Validate DL Power Control Config parameters */ if (ueRecfg->ueCqiReptCfg.numColltdCqiRept > RGR_CQIRPTS_MAXN) { RLOG_ARG3(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalide numColltdCqiRept," "MAX supported %d for OLD CRNTI:%d NEW CRNTI:%d",RGR_CQIRPTS_MAXN, ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*rgSCHCfgVldtCqiReptReCfg*/ #endif @@ -5945,7 +5846,7 @@ RgrUeRecfg *ueRecfg; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrLchCfg +S16 rgSCHCfgRgrLchCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -5953,7 +5854,7 @@ RgrLchCfg *lcCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrLchCfg(cell, ue, lcCfg, errInfo) +S16 rgSCHCfgRgrLchCfg(cell, ue, lcCfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrLchCfg *lcCfg; @@ -5967,8 +5868,6 @@ RgSchErrInfo *errInfo; RgSchUlLcCb *ulLc; #endif - TRC2(rgSCHCfgRgrLchCfg); - errInfo->errCause = RGSCHERR_CFG_RGR_DED_LC_CFG; /* Allocate the downlink logical channel control block */ @@ -5977,13 +5876,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Memory allocation FAILED for " "Downlink LCId:%d CRNTI:%d", lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } - if ((U8 *)dlLc == NULLP) + if ((uint8_t *)dlLc == NULLP) { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Memory allocation FAILED for " "Downlink LCID:%d CRNTI:%d", lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } dlLc->lcId = lcCfg->lcId; #ifdef LTE_ADV @@ -6006,7 +5905,7 @@ RgSchErrInfo *errInfo; RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,"Dedicated logical channel " "configuration failed at SCH:UEID:%d LCID:%d CRNTI:%d", ue->ueId, lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS RGSCH_ARRAY_BOUND_CHECK(inst, ue->ul.lcCb, (lcCfg->lcId -1)); @@ -6024,7 +5923,7 @@ RgSchErrInfo *errInfo; "configuration failed at SCH: UL LC CB already existing" " UEID:%d LCID:%d CRNTI:%d", ue->ueId, lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* Create UL LC context to maintain LCG to LC mapping and @@ -6049,7 +5948,7 @@ RgSchErrInfo *errInfo; } #endif /* LTE_L2_MEAS */ - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLchCfg */ /*********************************************************** @@ -6070,7 +5969,7 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRgrLcgCfg +S16 rgSCHCfgRgrLcgCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -6078,7 +5977,7 @@ RgrLcgCfg *lcgCfg, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgRgrLcgCfg(cell, ue, lcgCfg, errInfo) +S16 rgSCHCfgRgrLcgCfg(cell, ue, lcgCfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrLcgCfg *lcgCfg; @@ -6089,10 +5988,9 @@ RgSchErrInfo *errInfo; #ifdef RG_UNUSED //#ifdef LTE_L2_MEAS - U32 idx; + uint32_t idx; RgSchUlLcCb *ulLc; #endif - TRC2(rgSCHCfgRgrLcgCfg); errInfo->errCause = RGSCHERR_CFG_RGR_DED_LCG_CFG; @@ -6107,7 +6005,7 @@ RgSchErrInfo *errInfo; /* Roll back lcgCfg */ ue->ul.lcgArr[lcgCfg->ulInfo.lcgId].lcgId = RGSCH_INVALID_LCG_ID; rgSCHUtlRgrLcgDel(cell, ue, lcgCfg->ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef RG_UNUSED //#ifdef LTE_L2_MEAS @@ -6119,12 +6017,12 @@ RgSchErrInfo *errInfo; sizeof(RgSchUlLcCb))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for "); - RETVALUE(RFAILED); + return RFAILED; } - if ((U8 *)ulLc == NULLP) + if ((uint8_t *)ulLc == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for "); - RETVALUE(RFAILED); + return RFAILED; } /* Create UL LC context to maintain LCG to LC mapping and LC and QCI mapping, this is for L2 Counters :UL ACTIVE UE @@ -6141,7 +6039,7 @@ RgSchErrInfo *errInfo; ue->ul.lcgArr[lcgCfg->ulInfo.lcgId].numLch = lcgCfg->ulInfo.numLch; #endif /* LTE_L2_MEAS */ - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcgCfg */ @@ -6178,11 +6076,10 @@ RgSchErrInfo *errInfo; #endif { RgSchClcDlLcCb cmnLcCb; - TRC2(rgSCHCfgRgrCmnLcCfg); errInfo->errCause = RGSCHERR_CFG_RGR_CMN_LC_CFG; - cmMemset((U8 *)&cmnLcCb, 0, sizeof(cmnLcCb)); + memset(&cmnLcCb, 0, sizeof(cmnLcCb)); /* Handle configuration for CCCH/BCCH/PCCH */ if (lcCfg->lcType == CM_LTE_LCH_CCCH) @@ -6220,7 +6117,7 @@ RgSchErrInfo *errInfo; } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCmnLcCfg */ @@ -6256,7 +6153,6 @@ RgSchDlLcCb *dlLc; #endif { Inst inst = cell->instIdx; - TRC2(rgSCHCfgFreeDlDedLcCb); rgSCHUtlFreeDlLc(cell, ue, dlLc); @@ -6267,7 +6163,7 @@ RgSchDlLcCb *dlLc; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeDlDedLcCb */ @@ -6298,11 +6194,10 @@ PRIVATE Void rgSCHCfgFreeDlCmnLcCb(cmnDlLc) RgSchClcDlLcCb *cmnDlLc; #endif { - TRC2(rgSCHCfgFreeDlCmnLcCb); - cmMemset((U8*)cmnDlLc, 0, sizeof(*cmnDlLc)); + memset(cmnDlLc, 0, sizeof(*cmnDlLc)); cmnDlLc->lcId = RGSCH_INVALID_LC_ID; - RETVOID; + return; } /* rgSCHCfgFreeDlCmnLcCb */ @@ -6323,12 +6218,12 @@ RgSchClcDlLcCb *cmnDlLc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCfgFreeCellCb +Void rgSCHCfgFreeCellCb ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCfgFreeCellCb(cell) +Void rgSCHCfgFreeCellCb(cell) RgSchCellCb *cell; #endif { @@ -6337,9 +6232,8 @@ RgSchCellCb *cell; Buffer *pdu; RgSchWarningSiInfo *warningSi; RgSchWarningSiPdu *warningSiPdu; - U8 idx; + uint8_t idx; - TRC2(rgSCHCfgFreeCellCb); /* ccpu00132385- SI Warning PDUs which are not processed need to be deleted */ /* Search for used index in WarningSi */ for(idx = 0; idx < RGR_MAX_NUM_WARNING_SI; idx++) @@ -6397,7 +6291,7 @@ RgSchCellCb *cell; (Void)rgSCHDrxCellDel(cell); rgSCHUtlFreeSBuf(inst, (Data**)&(cell->dynCfiCb.cceFailSamples), - (cell->dynCfiCb.numFailSamples * sizeof(U16))); + (cell->dynCfiCb.numFailSamples * sizeof(uint16_t))); #ifdef TENB_STATS TSL2DeallocCellStatsBlk(cell->cellId); @@ -6422,7 +6316,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeCellCb */ @@ -6459,9 +6353,8 @@ RgSchUeCb *ue; RgUeUlHqCb *ulHqEnt; RgSchDlLcCb *dlLc; Inst inst = cell->instIdx; - U8 lcCnt; - U8 lcgId; - TRC2(rgSCHCfgFreeUeCb); + uint8_t lcCnt; + uint8_t lcgId; /* Free all logical channel info per UE */ while((dlLc = rgSCHDbmGetNextDlDedLcCb(ue, NULLP)) != NULLP) @@ -6551,7 +6444,7 @@ RgSchUeCb *ue; rgSCHUtlFreeSBuf(inst, (Data **)&ue, sizeof(*ue)); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeUeCb */ @@ -6584,8 +6477,6 @@ RgSchCellCb *cell; RgSchCfgElem *rgCfgElem; Inst inst = cell->instIdx; - TRC2(rgSCHCfgFreeRgrCfgLst); - /* Free CURRENT RGR cfg list */ while ((rgCfgElem = rgSCHDbmGetNextCrntRgrCfgElem(cell, NULLP)) != NULLP) { @@ -6606,7 +6497,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeRgrCfgLst */ @@ -6639,7 +6530,6 @@ RgSchCellCb *cell; { RgSchClcDlLcCb *dlCmnLc; - TRC2(rgSCHCfgFreeCmnLcLst); if ((dlCmnLc = rgSCHDbmGetBcchOnBch(cell)) != NULLP) { @@ -6660,7 +6550,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeCmnLcLst */ @@ -6696,7 +6586,6 @@ RgSchCellCb *cell; RgSchUeCellInfo *sCellInfo; CmLList *node; #endif - TRC2(rgSCHCfgFreeUeLst); /* Free Ues in the list */ while ((ue = rgSCHDbmGetNextUeCb(cell, NULLP)) != NULLP) @@ -6731,7 +6620,7 @@ RgSchCellCb *cell; #endif /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeUeLst */ @@ -6764,8 +6653,6 @@ RgSchCellCb *cell; { RgSchUeCb *ue; - TRC2(rgSCHCfgFreeSpsUeLst); - /* Free Ues in the list */ while ((ue = rgSCHDbmGetNextSpsUeCb(cell, NULLP))) { @@ -6807,20 +6694,17 @@ Inst inst; RgrSiCfg *siCfg; #endif { - U8 idx; /* idx for iteration */ + uint8_t idx; /* idx for iteration */ UNUSED(inst); - TRC2(rgSCHCfgVldtRgrCellSiCfg); - - #ifndef LTE_TDD /* Check that retxCnt value should be <= value of siWinSize. This validation is only applicable for FDD mode. */ if(siCfg->retxCnt > siCfg->siWinSize) { RLOG0(L_ERROR,"retxCnt is greater than siWinSize, validation failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6828,7 +6712,7 @@ RgrSiCfg *siCfg; if(siCfg->numSi > RGR_MAX_NUM_SI) { RLOG0(L_ERROR,"Validation for numSi in SI CFG failed"); - RETVALUE(RFAILED); + return RFAILED; } /* MinPeriodicity will have the least configured periodicity @@ -6854,11 +6738,11 @@ RgrSiCfg *siCfg; default: RLOG0(L_ERROR,"Validation for SI Periodicity in SI-CFG failed"); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellSiCfg */ /* LTE_ADV_FLAG_REMOVED_START */ @@ -6882,41 +6766,38 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg ( Inst inst, RgrLteAdvancedCellConfig *lteAdvCfg, - U8 dlTotalBw + uint8_t dlTotalBw ) #else PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) Inst inst; RgrLteAdvancedCellConfig *lteAdvCfg; - U8 dlTotalBw; + uint8_t dlTotalBw; #endif { - U8 temp[RGR_ABS_PATTERN_LEN]; - U32 idx; + uint8_t temp[RGR_ABS_PATTERN_LEN]; + uint32_t idx; UNUSED(inst); - TRC2(rgSCHCfgVldtRgrCellLteAdvCfg); - - if((lteAdvCfg->pres & RGR_SFR) && (RGR_ENABLE == lteAdvCfg->sfrCfg.status)) { if(lteAdvCfg->sfrCfg.cellEdgeRbRange.startRb > lteAdvCfg->sfrCfg.cellEdgeRbRange.endRb) { RLOG0(L_ERROR,"Invalid configuration of cell edge bandwidth for SFR feature"); - RETVALUE(RFAILED); + return RFAILED; } if(lteAdvCfg->sfrCfg.cellEdgeRbRange.endRb >= dlTotalBw) { RLOG0(L_ERROR,"Invalid configuration of cell edge end RB for SFR feature"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TFU_UPGRADE if(lteAdvCfg->sfrCfg.pwrThreshold.pLow >= lteAdvCfg->sfrCfg.pwrThreshold.pHigh) { RLOG0(L_ERROR,"Invalid configuration of power threshold for SFR feature"); - RETVALUE(RFAILED); + return RFAILED; } #endif } @@ -6927,10 +6808,10 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) (RGR_ABS_TRANSMIT != lteAdvCfg->absCfg.absPatternType)) { RLOG0(L_ERROR,"Invalid configuration of ABS pattern type"); - RETVALUE(RFAILED); + return RFAILED; } - cmMemcpy(temp, (U8 *) lteAdvCfg->absCfg.absPattern,RGR_ABS_PATTERN_LEN); + memcpy(temp, lteAdvCfg->absCfg.absPattern,RGR_ABS_PATTERN_LEN); /* Added validation for ABS pattern len */ for(idx = 0; idx < RGR_ABS_PATTERN_LEN; idx++) @@ -6938,12 +6819,12 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) if((temp[idx] != 1) && (temp[idx] != 0)) { RLOG0(L_ERROR,"Invalid configuration of ABS pattern type"); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_END */ @@ -6976,23 +6857,21 @@ RgrCellCsgParamCfg *csgParam; #endif { - TRC2(rgSCHCfgVldtRgrCellCsgParamCfg); - RGSCHDBGPRM(inst, (rgSchPBuf(inst), "Validating CSG Parameters \n")); if(csgParam->minDlResNonCsg > 100) { RLOG0(L_ERROR,"Invalid Configuration of minimum DL resources " "for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } if(csgParam->minUlResNonCsg > 100) { RLOG0(L_ERROR,"Invalid Configuration of minimum UL resources " "for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -7019,7 +6898,7 @@ RgrCellCsgParamCfg *csgParam; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrSiCfg +S16 rgSCHCfgVldtRgrSiCfg ( Inst inst, RgrSiCfgReqInfo *siCfg, @@ -7027,7 +6906,7 @@ RgSchCellCb *cell, RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrSiCfg(inst, siCfg, cell, errInfo) +S16 rgSCHCfgVldtRgrSiCfg(inst, siCfg, cell, errInfo) Inst inst; RgrSiCfgReqInfo *siCfg; RgSchCellCb *cell; @@ -7035,10 +6914,7 @@ RgSchErrInfo *errInfo; #endif { MsgLen msgLen = 0; - U8 numSi; - - TRC2(rgSCHCfgVldtRgrSiCfg); - + uint8_t numSi; errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_SI_CFG; @@ -7054,10 +6930,10 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid SI Id value" " specified"); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; break; case RGR_SI_CFG_TYPE_MIB: /* SI CFG Type MIB */ case RGR_SI_CFG_TYPE_SIB1: /* SI CFG TYPE SIB1 */ @@ -7080,13 +6956,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid SI Id value" " specified"); - RETVALUE(RFAILED); + return RFAILED; } if(siCfg->siId > ((cell->siCfg.minPeriodicity * 10)/cell->siCfg.siWinSize)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "SiId can not be scheduled "); - RETVALUE(RFAILED); + return RFAILED; } break; @@ -7095,14 +6971,14 @@ RgSchErrInfo *errInfo; case RGR_SI_CFG_EMTC_TYPE_SI_PER: if(ROK != rgEmtcvalidateSiCfg(siCfg,cell)) { - RETVALUE(RFAILED); + return RFAILED; } break; #endif default: RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid cfgType " "parameter value"); - RETVALUE(RFAILED); + return RFAILED; } /*Validate the specified pdu */ @@ -7110,7 +6986,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid NULLP pdu " "specified"); - RETVALUE(RFAILED); + return RFAILED; } /*Check if PDU is of 0 length*/ @@ -7119,13 +6995,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid pdu " "specified"); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrSiCfg */ #endif /*RGR_SI_SCH*/ @@ -7154,7 +7030,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrLoadInf +S16 rgSCHCfgVldtRgrLoadInf ( Inst inst, RgrLoadInfReqInfo *loadInfReq, @@ -7162,7 +7038,7 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) +S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) Inst inst; RgrLoadInfReqInfo *loadInfReq; RgSchCellCb *cell; @@ -7170,9 +7046,6 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) #endif { - TRC2(rgSCHCfgVldtRgrLoadInf); - - errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LOAD_INF; /* Validate if the CC startRb which we have received from DSFR lies in CE sub-band of the receiving eNB */ @@ -7180,7 +7053,7 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) (loadInfReq->rgrCcPHighStartRb <= cell->lteAdvCb.sfrCfg.cellEdgeRbRange.endRb)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid rgrCcPHighStartRb received specified"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate if the CC endRb which we have received from DSFR lies in CE sub-band of the receiving eNB */ @@ -7188,13 +7061,13 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) (loadInfReq->rgrCcPHighEndRb <= cell->lteAdvCb.sfrCfg.cellEdgeRbRange.endRb)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid rgrCcPHighEndRb received specified"); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLoadInf */ /* LTE_ADV_FLAG_REMOVED_END */ @@ -7229,7 +7102,7 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode +S16 rgSCHCfgVldtRgrTxmodePuschMode ( RgSchCellCb *cellCb, RgrTxMode txMde, @@ -7237,15 +7110,13 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) +S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) RgSchCellCb *cellCb; RgrTxMode txMde; RgrAprdCqiMode puschMode; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrTxmodePuschMode); - if (txMde == RGR_UE_TM_1 || txMde == RGR_UE_TM_2 || txMde == RGR_UE_TM_3 || txMde == RGR_UE_TM_7) @@ -7254,7 +7125,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) puschMode == RGR_APRD_CQI_MOD22 || puschMode == RGR_APRD_CQI_MOD31) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -7263,7 +7134,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) if (puschMode == RGR_APRD_CQI_MOD20 || puschMode == RGR_APRD_CQI_MOD30) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -7271,7 +7142,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) { if (puschMode != RGR_APRD_CQI_MOD31) { - RETVALUE(RFAILED); + return RFAILED; } } #ifdef LTE_ADV @@ -7286,7 +7157,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) * 2-0,3-0 of pmi/ri reporitng isdisabled and csi-rs ports == 1*/ #endif - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtRgrTxmodePuschMode ends*/ /* @@ -7315,7 +7186,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg +S16 rgSCHCfgVldtRgrUeACqiCfg ( RgSchCellCb *cellCb, CmLteRnti crnti, @@ -7324,7 +7195,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) +S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) RgSchCellCb *cellCb; CmLteRnti crnti; RgrUeAprdDlCqiCfg *acqiCfg; @@ -7334,8 +7205,6 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) { RgrTxMode txMde; RgrAprdCqiMode puschMode; - TRC2(rgSCHCfgVldtRgrUeACqiCfg); - if(acqiCfg->pres) { @@ -7348,11 +7217,11 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Aperiodic CQI configuration CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* @@ -7379,7 +7248,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode +S16 rgSCHCfgVldtRgrTxmodePucchMode ( RgSchCellCb *cellCb, RgrTxMode txMde, @@ -7387,21 +7256,19 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) +S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) RgSchCellCb *cellCb; RgrTxMode txMde; RgrPrdCqiMode pucchMode; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHCfgVldtRgrTxmodePucchMode); - if (pucchMode == RGR_PRD_CQI_MOD10 || pucchMode == RGR_PRD_CQI_MOD20 ) { if (txMde ==RGR_UE_TM_4 || txMde ==RGR_UE_TM_5 || txMde ==RGR_UE_TM_6) { - RETVALUE(RFAILED); + return RFAILED; } } else if (pucchMode == RGR_PRD_CQI_MOD11 || pucchMode == RGR_PRD_CQI_MOD21) @@ -7409,11 +7276,11 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) if (txMde ==RGR_UE_TM_1 || txMde ==RGR_UE_TM_2 || txMde ==RGR_UE_TM_3 \ || txMde ==RGR_UE_TM_7) { - RETVALUE(RFAILED); + return RFAILED; } } /* TODO:: Tm8 and TM9 validation needs to be added */ - RETVALUE(ROK); + return ROK; } /* @@ -7442,7 +7309,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) */ #ifdef LTEMAC_HDFDD #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg +S16 rgSCHCfgVldtRgrUePCqiCfg ( RgSchCellCb *cellCb, CmLteRnti crnti, @@ -7452,7 +7319,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd, +S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd, txMode, errInfo) RgSchCellCb *cellCb; CmLteRnti crnti; @@ -7463,7 +7330,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd, #endif #else #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg +S16 rgSCHCfgVldtRgrUePCqiCfg ( RgSchCellCb *cellCb, CmLteRnti crnti, @@ -7472,7 +7339,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) +S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RgSchCellCb *cellCb; CmLteRnti crnti; RgrUePrdDlCqiCfg *cqiCfg; @@ -7484,8 +7351,6 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RgrTxMode txMde; RgrPrdCqiMode pucchMode; - TRC2(rgSCHCfgVldtRgrUePCqiCfg); - txMde = RGR_UE_TM_1; pucchMode = RGR_PRD_CQI_MOD20; if ( RGR_SCH_PCQI_SETUP == cqiCfg->type ) @@ -7500,7 +7365,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Tx Mode-PUCCH Mode combination CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -7511,7 +7376,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Reporting Type-PUCCH Mode combination CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } if((cqiCfg->cqiSetup.cqiRepType==2) && @@ -7520,7 +7385,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Reporting Type-PUCCH Mode combination CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } /*3. Validate CQI/PMI and RI Configuration related parameter values */ @@ -7530,7 +7395,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG3(L_ERROR,DBG_CELLID,cellCb->cellId, "Not Supported or Invalid CQI-PUCCH resourceIndex=%d Cfg Val=%d CRNTI:%d", RG_SCH_PUCCH_RES_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_HDFDD @@ -7544,7 +7409,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) "Not Supported or Invalid Cfg CQI Min Index Sup =%d" "Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ICQI_MIN_SUPP, RG_SCH_ICQI_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -7556,7 +7421,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) "Not Supported or Invalid Cfg CQI Min Index Sup =%d " "Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ICQI_MIN_SUPP, RG_SCH_ICQI_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } } #else @@ -7567,7 +7432,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) "Not Supported or Invalid Cfg CQI Min Index Sup =%d" "Max Index Sup=%d Cfg Val=%d CRNTI;%d", RG_SCH_ICQI_MIN_SUPP, RG_SCH_ICQI_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7577,7 +7442,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Cfg CQI Report" "ModeCfg Val=%d CRNTI:%d", cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } if((cqiCfg->cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP) && @@ -7586,7 +7451,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid CQI Cfg K Cfg Val=%d CRNTI:%d", cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } if((cqiCfg->cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP) && @@ -7595,7 +7460,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Periodic CQI mode Cfg for dlTotalBw (%d) for CRNTI:%d", cellCb->bwCfg.dlTotalBw, crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifndef LTE_TDD @@ -7604,7 +7469,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Reserved value Cfg =%d CRNTI:%d", cqiCfg->cqiSetup.cqiPResIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7624,7 +7489,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Transmission Mode =%d CRNTI:%d", txMde,crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -7633,13 +7498,13 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Index RI value Cfg =%d CRNTI:%d", cqiCfg->cqiSetup.riCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* @@ -7667,7 +7532,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) */ #ifdef LTEMAC_HDFDD #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg +S16 rgSCHCfgVldtRgrUeUlSrsCfg ( RgSchCellCb *cellCb, CmLteRnti crnti, @@ -7676,7 +7541,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo) +S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo) RgSchCellCb *cellCb; CmLteRnti crnti; RgrUeUlSrsCfg *srsCfg; @@ -7685,7 +7550,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo) #endif #else #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg +S16 rgSCHCfgVldtRgrUeUlSrsCfg ( RgSchCellCb *cellCb, CmLteRnti crnti, @@ -7693,7 +7558,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) +S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) RgSchCellCb *cellCb; CmLteRnti crnti; RgrUeUlSrsCfg *srsCfg; @@ -7701,13 +7566,10 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) #endif #endif { - U16 srsPeri=0; - U16 srsOffset=0; - U8 srsSubframe=0; + uint16_t srsPeri=0; + uint16_t srsOffset=0; + uint8_t srsSubframe=0; - TRC2(rgSCHCfgVldtRgrUeUlSrsCfg); - - if ( RGR_SCH_SRS_SETUP == srsCfg->type ) { @@ -7716,7 +7578,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Cell specific SRS is not configured CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 1. Validate SRS Configuration related parameter values */ @@ -7732,7 +7594,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min Index Sup =%d Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ISRS_MIN_SUPP, RG_SCH_ISRS_MAX_SUPP, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -7744,7 +7606,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min Index Sup =%d Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ISRS_MIN_SUPP, RG_SCH_ISRS_MAX_SUPP, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -7756,7 +7618,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min Index Sup =%d Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ISRS_MIN_SUPP, RG_SCH_ISRS_MAX_SUPP, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef LTE_TDD @@ -7779,7 +7641,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "UE specific SRS is not occuring in Cell specific SRS subframe" "srs Cfg Idx =%d CRNTI:%d", srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } @@ -7791,7 +7653,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "Max Freq Domain Position =%d Cfg Val=%d CRNTI:%d", RG_SCH_SRS_FREQDOM_POS_MIN, RG_SCH_SRS_FREQDOM_POS_MAX, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } if ( srsCfg->srsSetup.txComb > RG_SCH_SRS_TXCOMB_MAX ) @@ -7801,10 +7663,10 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min TX Comb =%d Max TX Comb =%d Cfg Val=%d CRNTI:%d", RG_SCH_SRS_TXCOMB_MIN, RG_SCH_SRS_TXCOMB_MAX, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* @@ -7832,7 +7694,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) */ #ifdef LTEMAC_HDFDD #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg +S16 rgSCHCfgVldtRgrUeSrCfg ( RgSchCellCb *cellCb, CmLteRnti crnti, @@ -7841,7 +7703,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo) +S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo) RgSchCellCb *cellCb; CmLteRnti crnti; RgrUeSrCfg *srCfg; @@ -7850,7 +7712,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo) #endif #else #ifdef ANSI -PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg +S16 rgSCHCfgVldtRgrUeSrCfg ( RgSchCellCb *cellCb, CmLteRnti crnti, @@ -7858,7 +7720,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg RgSchErrInfo *errInfo ) #else -PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) +S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) RgSchCellCb *cellCb; CmLteRnti crnti; RgrUeSrCfg *srCfg; @@ -7867,10 +7729,6 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) #endif { - TRC2(rgSCHCfgVldtRgrUeSrCfg); - - - if ( RGR_SCH_SR_SETUP == srCfg->type ) { /* 1. Validate SR Configuration related parameter values */ @@ -7886,7 +7744,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) "Max Supp=%d,Min Supp=%d CRNTI:%d", srCfg->srSetup.srCfgIdx, RG_SCH_ISR_MAX_SUPP, RG_SCH_ISR_MIN_SUPP,crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -7899,7 +7757,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) "Max Supp=%d,Min Supp=%d CRNTI:%d", srCfg->srSetup.srCfgIdx, RG_SCH_ISR_MAX_SUPP, RG_SCH_ISR_MIN_SUPP,crnti); - RETVALUE(RFAILED); + return RFAILED; } } #else @@ -7911,11 +7769,11 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) "Max Supp=%d,Min Supp=%d CRNTI:%d", srCfg->srSetup.srCfgIdx, RG_SCH_ISR_MAX_SUPP, RG_SCH_ISR_MIN_SUPP,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif } - RETVALUE(ROK); + return ROK; } @@ -7957,16 +7815,13 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) #endif { - TRC2(rgSCHCfgVldtCqiSrSrsUeCfg); - - /* 1. Validate UE Aperiodic CQI related parameters */ if ( ROK != rgSCHCfgVldtRgrUeACqiCfg (cellCb, ueCfg->crnti, &ueCfg->ueDlCqiCfg.aprdCqiCfg, ueCfg->txMode, errInfo )) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Aperiodic CQI configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 1. Validate UE Periodic CQI/PMI, SRS and SR related parameters */ @@ -7981,7 +7836,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Periodic CQI configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 2. Validate SRS Configuration related parameter values */ @@ -7995,7 +7850,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SRS configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 3. Validate SR Configuration related parameter values */ @@ -8009,10 +7864,10 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SR configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8063,7 +7918,6 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) #endif { RgrUeTxModeCfg txMode; - TRC3(rgSCHCfgVldtCqiSrSrsUeReCfg); txMode.pres = TRUE; txMode.tmTrnstnState = RGR_TXMODE_RECFG_CMPLT; @@ -8086,7 +7940,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Aperiodic CQI configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8106,7 +7960,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Periodic CQI configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8122,7 +7976,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SRS configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8139,11 +7993,11 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SR configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -8175,7 +8029,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) * **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgACqiUeCfg +S16 rgSCHCfgACqiUeCfg ( RgSchCellCb *cellCb, RgSchUeCb *ue, @@ -8185,7 +8039,7 @@ RgrUeAprdDlCqiCfg *aCqiCfg, CmLteUeCategory ueCat ) #else -PUBLIC S16 rgSCHCfgACqiUeCfg(cellCb,ue,acqiCb ueTxMode, aCqiCfg, ueCat) +S16 rgSCHCfgACqiUeCfg(cellCb,ue,acqiCb ueTxMode, aCqiCfg, ueCat) RgSchCellCb *cellCb; RgSchUeCb *ue; RgSchUeACqiCb *acqiCb; @@ -8194,13 +8048,11 @@ RgrUeAprdDlCqiCfg *aCqiCfg; CmLteUeCategory ueCat; #endif { - U8 M; /*Num of Subbands -- Applicable only for Mode 2-0 and 2-2*/ - U8 k; /*SubBand Size (RB) -- + uint8_t M; /*Num of Subbands -- Applicable only for Mode 2-0 and 2-2*/ + uint8_t k; /*SubBand Size (RB) -- Holds different values depending on Mode*/ - U8 cqiPmiSzR1; /*CQIPMI Size for Rank =1*/ - U8 cqiPmiSzRn1; /*CQIPMI Size for Rank > 1*/ - - TRC3(rgSCHCfgACqiUeCfg); + uint8_t cqiPmiSzR1; /*CQIPMI Size for Rank =1*/ + uint8_t cqiPmiSzRn1; /*CQIPMI Size for Rank > 1*/ cqiPmiSzR1 = 0; cqiPmiSzRn1 = 0; @@ -8273,7 +8125,7 @@ CmLteUeCategory ueCat; rgSchCmnSetCqiReqField(RG_SCH_CMN_GET_SCELL_INFO(ue, cellCb),ue,&acqiCb->cqiReqField); #endif - RETVALUE(ROK); + return ROK; } /** @@ -8314,7 +8166,7 @@ CmLteUeCategory ueCat; * **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgPCqiUeCfg +S16 rgSCHCfgPCqiUeCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -8322,7 +8174,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg CmLteUeCategory ueCat ) #else -PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) +S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUePrdDlCqiCfg *cqiCfg; @@ -8330,16 +8182,15 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) #endif { CmLteTimingInfo timingInfo; - U16 crntTime; - U16 cqiTrInstTime; - U8 j; /*Bandwidth Parts*/ - U8 temp; - U8 loop; + uint16_t crntTime; + uint16_t cqiTrInstTime; + uint8_t j; /*Bandwidth Parts*/ + uint8_t temp; + uint8_t loop; RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHCfgPCqiUeCfg); crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)+ - (cellCb->crntTime.subframe); + (cellCb->crntTime.slot); cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb); cqiCb->servCellInfo = ueCb->cellInfo[0]; /* Periodic CQI is setup */ @@ -8350,7 +8201,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) ueCb->rawCqiBitW[loop].type = TFU_RECP_REQ_INVLD; /* setting invalid type*/ } /* 1. Copy the Received CQI Cfg parameters to ueCb */ - cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg, + memcpy(&cqiCb->cqiCfg, cqiCfg, sizeof(RgrUePrdDlCqiCfg)); /* 2. Compute Periodic CQI Periodicity and subframe offset */ @@ -8384,7 +8235,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) cqiCb->nCqiTrIdx = cqiCb->nCqiTrIdx % (RGSCH_MAX_SFN * RGSCH_NUM_SUB_FRAMES_5G); timingInfo.sfn = cqiCb->nCqiTrIdx/RGSCH_NUM_SUB_FRAMES_5G; - timingInfo.subframe = cqiCb->nCqiTrIdx % RGSCH_NUM_SUB_FRAMES_5G; + timingInfo.slot = cqiCb->nCqiTrIdx % RGSCH_NUM_SUB_FRAMES_5G; cqiCb->nCqiTrIdx = cqiCb->nCqiTrIdx %RG_SCH_PCQI_SRS_SR_TRINS_SIZE; @@ -8399,7 +8250,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) if(RGR_UE_PCQI_SB_REP == cqiCfg->cqiSetup.cqiRepType) { - U8 k; /*SubBand Size (RB) */ + uint8_t k; /*SubBand Size (RB) */ RG_SCH_GET_CQI_J_VAL(cellCb->bwCfg.dlTotalBw, j); RG_SCH_GET_CQI_K_VAL(cellCb->bwCfg.dlTotalBw, k); cqiCb->J = j; /*Number of Bandwidth Parts*/ @@ -8456,7 +8307,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) } ueCb->nPCqiCb = cqiCb; ueCb->nPRiCb = cqiCb; - RETVALUE(ROK); + return ROK; } /** @@ -8488,7 +8339,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) * **/ #ifdef ANSI -PUBLIC S16 rgSCHCfgRiUeCfg +S16 rgSCHCfgRiUeCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -8496,26 +8347,22 @@ PUBLIC S16 rgSCHCfgRiUeCfg CmLteUeCategory ueCat ) #else -PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) +S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUePrdDlCqiCfg *cqiCfg; CmLteUeCategory ueCat; #endif { - U16 crntTime; - U16 riTrInsTime; - U8 j; /*Bandwidth parts. Valid for Modes 2-0, 2-1*/ - U16 periodicity; - U16 tempIdx; + uint16_t crntTime; + uint16_t riTrInsTime; + uint8_t j; /*Bandwidth parts. Valid for Modes 2-0, 2-1*/ + uint16_t periodicity; + uint16_t tempIdx; RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHCfgRiUeCfg); - - - crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) - +(cellCb->crntTime.subframe); + +(cellCb->crntTime.slot); cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb); /* 1. Rank Indicator is enabled */ if(cqiCfg->cqiSetup.riEna) @@ -8593,8 +8440,8 @@ PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) % RG_SCH_PCQI_SRS_SR_TRINS_SIZE; if(periodicity >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE) { - cqiCb->riDist = rgSCHUtlFindDist((U16)(crntTime + TFU_RECPREQ_DLDELTA), - (U16) tempIdx); + cqiCb->riDist = rgSCHUtlFindDist((uint16_t)(crntTime + TFU_RECPREQ_DLDELTA), + (uint16_t) tempIdx); } else { @@ -8639,7 +8486,7 @@ PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) cqiCb->riDist = RG_SCH_INVALID_IDX; } - RETVALUE(ROK); + return ROK; } @@ -8674,33 +8521,30 @@ PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgSrsUeCfg +S16 rgSCHCfgSrsUeCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeUlSrsCfg *srsCfg ) #else -PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) +S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUeUlSrsCfg *srsCfg; #endif { - U16 srsTrInsTime; - U16 crntTime; - U16 tempIdx; - - TRC3(rgSCHCfgSrsUeCfg); - + uint16_t srsTrInsTime; + uint16_t crntTime; + uint16_t tempIdx; crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) - +(cellCb->crntTime.subframe); + +(cellCb->crntTime.slot); if(RGR_SCH_SRS_SETUP == srsCfg->type) { /* 1. Copy the Received Cfg parameters to local cb */ - cmMemcpy((U8 *)&ueCb->srsCb.srsCfg, (U8 *)srsCfg, sizeof(RgrUeUlSrsCfg)); + memcpy(&ueCb->srsCb.srsCfg, srsCfg, sizeof(RgrUeUlSrsCfg)); #ifndef LTE_TDD /* 2. Compute SRS Offset and Periodicity */ @@ -8738,16 +8582,16 @@ PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) { tempIdx = tempIdx + ueCb->srsCb.peri; } - ueCb->srsCb.nSrsTrIdx =(U16) (tempIdx + ueCb->srsCb.nSrsTrIdx =(uint16_t) (tempIdx % RG_SCH_PCQI_SRS_SR_TRINS_SIZE); if(ueCb->srsCb.peri >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE) { #ifdef LTE_TDD - ueCb->srsCb.srsDist = rgSCHUtlFindDist((U8)(crntTime+TFU_DELTA), - (U16)tempIdx); + ueCb->srsCb.srsDist = rgSCHUtlFindDist((uint8_t)(crntTime+TFU_DELTA), + (uint16_t)tempIdx); #else - ueCb->srsCb.srsDist = rgSCHUtlFindDist((U8)(crntTime + TFU_RECPREQ_DLDELTA), - (U16)tempIdx); + ueCb->srsCb.srsDist = rgSCHUtlFindDist((uint8_t)(crntTime + TFU_RECPREQ_DLDELTA), + (uint16_t)tempIdx); #endif } else @@ -8790,7 +8634,7 @@ PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) ueCb->srsCb.srsLstEnt.node =(PTR) NULLP; } - RETVALUE(ROK); + return ROK; } @@ -8824,31 +8668,29 @@ PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgSrUeCfg +S16 rgSCHCfgSrUeCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeSrCfg *srCfg ) #else -PUBLIC S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) +S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUeSrCfg *srCfg; #endif { - U16 srTrInsTime; - U16 crntTime; - - TRC3(rgSCHCfgSrUeCfg); + uint16_t srTrInsTime; + uint16_t crntTime; crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) - +(cellCb->crntTime.subframe); + +(cellCb->crntTime.slot); if(srCfg->type == RGR_SCH_SR_SETUP) { /* 1. Copy the Received Cfg parameters to local cb */ - cmMemcpy((U8 *)&ueCb->srCb.srCfg, (U8 *)srCfg, sizeof(RgrUeSrCfg)); + memcpy(&ueCb->srCb.srCfg, srCfg, sizeof(RgrUeSrCfg)); /* 2. Compute SR periodicity and offset */ @@ -8902,7 +8744,7 @@ PUBLIC S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) ueCb->srCb.srLstEnt.node = (PTR)NULLP; } - RETVALUE(ROK); + return ROK; } @@ -8966,7 +8808,7 @@ PUBLIC S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) * */ #ifdef ANSI -PUBLIC S16 rgSCHCfgPCqiUeReCfg +S16 rgSCHCfgPCqiUeReCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -8974,7 +8816,7 @@ PUBLIC S16 rgSCHCfgPCqiUeReCfg CmLteUeCategory ueCat ) #else -PUBLIC S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) +S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUePrdDlCqiCfg *cqiCfg; @@ -8983,7 +8825,6 @@ PUBLIC S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) { RgSchUePCqiCb *cqiCb = NULLP; - TRC3(rgSCHCfgPCqiUeReCfg); cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb); /* Fix: ccpu00124008 Fix for incorrect check causing missed CQI reception instance */ @@ -9036,7 +8877,7 @@ PUBLIC S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) /* ccpu00140578:: */ cqiCb->riRecpPrcsd = FALSE; - RETVALUE(ROK); + return ROK; } @@ -9081,23 +8922,20 @@ PUBLIC S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgSrsUeReCfg +S16 rgSCHCfgSrsUeReCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeUlSrsCfg *srsCfg ) #else -PUBLIC S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) +S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUeUlSrsCfg *srsCfg; #endif { - TRC3(rgSCHCfgSrsUeReCfg); - - if(( RGR_SCH_SRS_SETUP == srsCfg->type) || ( RGR_SCH_SRS_SETUP != ueCb->srsCb.srsCfg.type )) @@ -9134,7 +8972,7 @@ PUBLIC S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) /* ccpu00140578:: */ ueCb->srsCb.srsRecpPrcsd = FALSE; - RETVALUE(ROK); + return ROK; } /* @brief Handles SR Re-configuration for a UE. @@ -9180,21 +9018,19 @@ PUBLIC S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgSrUeReCfg +S16 rgSCHCfgSrUeReCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeSrCfg *srCfg ) #else -PUBLIC S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) +S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUeSrCfg *srCfg; #endif { - TRC3(rgSCHCfgSrUeReCfg); - /* Fix : syed Incorrect check for SR RECFG */ if((srCfg->type == RGR_SCH_SR_SETUP) && @@ -9229,7 +9065,7 @@ PUBLIC S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg); } - RETVALUE(ROK); + return ROK; } /* @brief Handles ACQI Re-configuration for a UE. @@ -9263,7 +9099,7 @@ PUBLIC S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHCfgAcqiUeReCfg +S16 rgSCHCfgAcqiUeReCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -9271,16 +9107,15 @@ PUBLIC S16 rgSCHCfgAcqiUeReCfg CmLteUeCategory ueCat ) #else -PUBLIC S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat) +S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUeAprdDlCqiCfg *acqiCfg; CmLteUeCategory ueCat; #endif { - TRC3(rgSCHCfgAcqiUeReCfg); - RETVALUE(rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb)) + return (rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb)) ,ueCb->mimoInfo.txMode, acqiCfg, ueCat)); } @@ -9324,23 +9159,22 @@ PUBLIC S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat) * -# ROK */ #ifdef ANSI -PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel +S16 rgSCHCfgPCqiSrsSrUeDel ( RgSchCellCb *cellCb, RgSchUeCb *ueCb ) #else -PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) +S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { #ifdef LTE_ADV - U32 cellIdx; - U32 sCellCnt = 0; + uint32_t cellIdx; + uint32_t sCellCnt = 0; #endif RgSchUePCqiCb *cqiRiCb = NULLP; - TRC3(rgSCHCfgPCqiSrsSrUeDel); cqiRiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb); @@ -9419,7 +9253,7 @@ PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) } #endif - RETVALUE(ROK); + return ROK; } @@ -9436,35 +9270,34 @@ PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) * find the periodicty, offset for a given config index from the table * - Return ROK * @param[in] RgSchPerTbl tbl - * @param[in] U16 cfgIdx - * @param[out] U16 *peri - * @param[out] U16 *offset + * @param[in] uint16_t cfgIdx + * @param[out] uint16_t *peri + * @param[out] uint16_t *offset * * @return S16 * -# ROK * */ #ifdef ANSI -PUBLIC S16 rgSCHUtlGetCfgPerOff +S16 rgSCHUtlGetCfgPerOff ( RgSchPerTbl tbl, - U16 cfgIdx, - U16 *peri, - U16 *offset + uint16_t cfgIdx, + uint16_t *peri, + uint16_t *offset ) #else -PUBLIC S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) +S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) RgSchPerTbl tbl; - U16 cfgIdx; - U16 *peri; - U16 *offset; + uint16_t cfgIdx; + uint16_t *peri; + uint16_t *offset; #endif { - U8 mid; - U8 min = 0; - U8 max = 0; + uint8_t mid; + uint8_t min = 0; + uint8_t max = 0; CONSTANT RgSchUePCqiSrsSrCfgIdxTbl* table; - TRC3(rgSCHUtlGetCfgPerOff); /* Added the function instead of the MACRO to get the * periodicity table */ @@ -9490,7 +9323,7 @@ PUBLIC S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) }while( min <= max ); - RETVALUE(ROK); + return ROK; } @@ -9503,7 +9336,7 @@ PUBLIC S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) * for decoding. * * Ret : Void - * ROK - RETVOID + * ROK - void * * Notes: * @@ -9514,23 +9347,20 @@ PUBLIC S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz ( RgSchUeACqiCb *acqiCb, - U8 numTxAnt, - U8* cqiPmiSzR1, - U8* cqiPmiSzRn1 + uint8_t numTxAnt, + uint8_t* cqiPmiSzR1, + uint8_t* cqiPmiSzRn1 ) #else PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn1) RgSchUeACqiCb *acqiCb; - U8 numTxAnt; - U8* cqiPmiSzR1; - U8* cqiPmiSzRn1; + uint8_t numTxAnt; + uint8_t* cqiPmiSzR1; + uint8_t* cqiPmiSzRn1; #endif { - U32 confRepMode; - - - TRC3(rgSCHCfgUtlFetchAcqiBitSz); + uint32_t confRepMode; confRepMode = acqiCb->aCqiCfg.aprdModeEnum; switch(confRepMode) @@ -9596,7 +9426,7 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn default: break; } - RETVOID; + return; } /* Added the function rgSCHCfgUtlGetPcqiCrsSrRiTbl to be used * instead of the MACRO RG_SCH_GET_PERIODICITY_TBL */ @@ -9608,7 +9438,7 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn * Desc : Get the Srs Cqi Crs Ri Table * * Ret : Void - * ROK - RETVOID + * ROK - void * * Notes: * @@ -9620,18 +9450,17 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl ( RgSchPerTbl tblType, - U8* min, - U8* max + uint8_t* min, + uint8_t* max ) #else PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblType, min, max) RgSchPerTbl tblType; - U8* min; - U8* max; + uint8_t* min; + uint8_t* max; #endif { CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * table; - TRC3(rgSCHCfgUtlGetPcqiCrsSrRiTbl); switch (tblType) { @@ -9687,7 +9516,7 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy } } - RETVALUE ( table ); + return ( table ); } /* #endif */ #endif /* TFU_UPGRADE */ @@ -9720,12 +9549,10 @@ RgSchCellCb *cell; RgrUeDrxCfg *ueDrxCfg; #endif { - TRC2(rgSCHCfgVldtDrxUeCfg) - if (ueDrxCfg->isDrxEnabled == FALSE) { - RETVALUE(ROK); + return ROK; } #ifdef LTEMAC_R9 @@ -9740,7 +9567,7 @@ RgrUeDrxCfg *ueDrxCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid cqiMask configuration(%ld)", ueDrxCfg->cqiMask.val); #endif - RETVALUE(RFAILED); + return RFAILED; } } #endif /*LTEMAC_R9*/ @@ -9753,7 +9580,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid onDurTimer configuration(%d)", ueDrxCfg->drxOnDurTmr); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9762,7 +9589,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid onDurTimer configuration(%d) for EMTC", ueDrxCfg->drxOnDurTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9774,7 +9601,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid onDurTimer configuration(%d) for EMTC", ueDrxCfg->drxOnDurTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9782,7 +9609,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid Inactivity configuration(%d)", ueDrxCfg->drxInactvTmr); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE if(ueDrxCfg->isEmtcUe) @@ -9793,7 +9620,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d) for EMTC", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9802,7 +9629,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d)", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9814,7 +9641,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d)", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } #ifdef EMTC_ENABLE @@ -9824,7 +9651,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d) for EMTC", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9833,14 +9660,14 @@ RgrUeDrxCfg *ueDrxCfg; if ( rgSCHCfgVldtDrxLngCycCfg(ueDrxCfg->drxLongCycleOffst) != ROK ) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid LongCycle configuration"); - RETVALUE(RFAILED); + return RFAILED; } if ( ueDrxCfg->drxLongCycleOffst.longDrxCycle < ueDrxCfg->drxOnDurTmr ) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of Long DRX Cycle " " and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD @@ -9849,7 +9676,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of Long DRX Cycle " " and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -9859,7 +9686,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of short DRX " "Cycle and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } if ( (ueDrxCfg->drxLongCycleOffst.longDrxCycle % @@ -9867,13 +9694,13 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId," Long DRX cycle is not multiple of " "short DRX cycle"); - RETVALUE(RFAILED); + return RFAILED; } if ( rgSCHCfgVldtDrxShrtCycCfg(ueDrxCfg->drxShortDrx) != ROK ) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid Short Cycle configuration"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD @@ -9884,12 +9711,12 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of Long DRX Cycle " " and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } #endif } - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxUeCfg*/ /*********************************************************** @@ -9912,14 +9739,13 @@ RgrUeDrxCfg *ueDrxCfg; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg ( -U8 onDurTmr +uint8_t onDurTmr ) #else PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr) -U8 onDurTmr; +uint8_t onDurTmr; #endif { - TRC2(rgSCHCfgVldtDrxOnDurCfg) switch ( onDurTmr ) { @@ -9943,11 +9769,11 @@ U8 onDurTmr; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(onDurTmr)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtOnDurCfg*/ /*********************************************************** @@ -9970,15 +9796,13 @@ U8 onDurTmr; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxInActvCfg ( -U16 inActvTmr +uint16_t inActvTmr ) #else PRIVATE S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr) -U16 inActvTmr; +uint16_t inActvTmr; #endif { - TRC2(rgSCHCfgVldtDrxInActvCfg) - switch ( inActvTmr ) { case RGR_DRX_PRD_1PSF: @@ -10007,11 +9831,11 @@ U16 inActvTmr; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(InactvTmr)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxInActvCfg*/ /*********************************************************** @@ -10034,15 +9858,13 @@ U16 inActvTmr; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxReTxCfg ( -U8 reTxTmr +uint8_t reTxTmr ) #else PRIVATE S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr) -U8 reTxTmr; +uint8_t reTxTmr; #endif { - TRC2(rgSCHCfgVldtDrxReTxCfg) - switch ( reTxTmr ) { case RGR_DRX_PRD_1PSF: @@ -10057,11 +9879,11 @@ U8 reTxTmr; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(drxRetxTmr)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxReTxCfg*/ /*********************************************************** @@ -10092,19 +9914,17 @@ PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg(lngCycleOffst) RgrDrxLongCycleOffst lngCycleOffst; #endif { - TRC2(rgSCHCfgVldtDrxLngCycCfg) - if ( rgSCHCfgVldtDrxLngCyclTmrs(lngCycleOffst.longDrxCycle) != ROK ) { - RETVALUE(RFAILED); + return RFAILED; } if ( lngCycleOffst.drxStartOffst >= lngCycleOffst.longDrxCycle ) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxLngCycCfg*/ /*********************************************************** @@ -10128,14 +9948,13 @@ RgrDrxLongCycleOffst lngCycleOffst; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs ( -U16 val +uint16_t val ) #else PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs(val) -U16 val; +uint16_t val; #endif { - TRC2(rgSCHCfgVldtDrxLngCyclTmrs) switch ( val ) { @@ -10159,11 +9978,11 @@ U16 val; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(longDrxCycle)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxLngCyclTmrs*/ /*********************************************************** @@ -10194,8 +10013,6 @@ PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg(shrtCycCfg) RgrDrxShortDrx shrtCycCfg; #endif { - TRC2(rgSCHCfgVldtDrxShrtCycCfg) - switch(shrtCycCfg.shortDrxCycle) { case RGR_DRX_PRD_2SF: @@ -10217,7 +10034,7 @@ RgrDrxShortDrx shrtCycCfg; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(shortDrxCycle)*/ @@ -10226,10 +10043,10 @@ RgrDrxShortDrx shrtCycCfg; (shrtCycCfg.drxShortCycleTmr > RGR_DRX_SHRTCYCLE_MAX) ) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -10267,8 +10084,6 @@ RgrUeRecfg *ueCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHCfgUeTaRecfg) - UNUSED(err); /* Update the TA related information */ @@ -10294,7 +10109,7 @@ RgSchErrInfo *err; rgSCHTmrStartTmr(cell, ueCb, RG_SCH_TMR_TA, ueCb->dl.taCb.cfgTaTmr); } } - RETVOID; + return; } /* rgSCHCfgUeTaRecfg */ /* ccpu00117452 - MOD - Changed macro name from @@ -10330,7 +10145,6 @@ RgrUeRecfg *ueRecfg; #endif { S16 retVal; - TRC3(rgSCHCfgUeCqiReptReCfg) /* Check has it been disabled */ if(ueRecfg->ueCqiReptCfg.numColltdCqiRept) @@ -10347,7 +10161,7 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not allocate memory for sending StaInd OLD CRNTI:%d",ueRecfg->oldCrnti); - RETVALUE(retVal); + return (retVal); } /* Fill StaInd for sending collated N CQI rpeort */ @@ -10362,7 +10176,7 @@ RgrUeRecfg *ueRecfg; ue->cqiReptCfgInfo.numColltdCqiRept = ueRecfg->ueCqiReptCfg.numColltdCqiRept; - RETVALUE(ROK); + return ROK; } /* End of rgSCHCfgUeCqiReptReCfg */ #endif /* End of RGR_CQI_REPT */ /*This function Added Ue in ongoing L2 Meas*/ @@ -10371,7 +10185,7 @@ RgrUeRecfg *ueRecfg; PRIVATE S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) { CmLList *lnk; - U16 idx; + uint16_t idx; RgSchL2MeasCb *measCb = NULLP; lnk = cellCb->l2mList.first; @@ -10396,7 +10210,7 @@ PRIVATE S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) lnk = lnk->next; }/*End of while loop*/ - RETVALUE(ROK); + return ROK; } #endif #ifdef LTE_ADV @@ -10414,31 +10228,30 @@ PRIVATE S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) * @param[in] Inst inst * @param[in] RgSchUeCb *ue * @param[int] RgrUeRecfg *ueRecfg - * @param[out] U8 idx + * @param[out] uint8_t idx * @return VOID **/ #ifdef ANSI -PUBLIC Void rgSCHSCellFreeBuf +Void rgSCHSCellFreeBuf ( Inst inst, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, -U8 idx +uint8_t idx ) #else -PUBLIC Void rgSCHSCellFreeBuf(inst ,ue, ueRecfg, idx) +Void rgSCHSCellFreeBuf(inst ,ue, ueRecfg, idx) Inst inst; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; -U8 idx; +uint8_t idx; #endif { RgSchUeCellInfo *sCellInfo = NULLP; RgrUeSecCellCfg *sCellInfoRecfg = NULLP; - TRC2(rgSCHSCellFreeBuf); - for(U8 i = 0; i <= idx; i++) + for(uint8_t i = 0; i <= idx; i++) { sCellInfoRecfg = &ueRecfg->ueSCellCfgInfo.ueSCellDedCfg[i]; sCellInfo = ue->cellInfo[(sCellInfoRecfg->sCellIdx)]; @@ -10451,7 +10264,7 @@ U8 idx; } } - RETVOID; + return; } #endif /**********************************************************************