X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cfg.c;fp=src%2F5gnrsch%2Frg_sch_cfg.c;h=dd7cd12eecf83d7b1e01b53098949cd8456daec1;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=db04bfd9140c76eba98a31cd523305d0a7e5204b;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c index db04bfd91..dd7cd12ee 100755 --- a/src/5gnrsch/rg_sch_cfg.c +++ b/src/5gnrsch/rg_sch_cfg.c @@ -81,11 +81,11 @@ RgrCellRecfg *cellRecfg )); EXTERN S16 rgSCHEmtcCfgVldtDrxReTxCfg ARGS(( -U16 reTxTmr +uint16_t reTxTmr )); EXTERN S16 rgSCHEmtcCfgVldtDrxUlReTxCfg ARGS(( -U16 reTxTmr +uint16_t reTxTmr )); #endif @@ -132,23 +132,23 @@ PRIVATE Void rgSCHCfgRgrUePhrMsg3 ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb,RgSchUeCb *ue, RgSchErrInfo *errInfo)); PRIVATE S16 rgSCHCfgRgrCmnLcCfg ARGS((RgSchCellCb *cell, RgrCmnLchCfg *lcCfg, RgSchErrInfo *errInfo)); -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)); @@ -160,8 +160,8 @@ S16 rgSCHCfgACqiUeCfg ARGS(( RgSchCellCb *cellCb,RgSchUeCb *ue, RgSchUeACqiCb *a S16 rgSCHCfgAcqiUeReCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeAprdDlCqiCfg *acqiCfg, CmLteUeCategory ueCat )); -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 )); S16 rgSCHCfgRiUeCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUePrdDlCqiCfg *cqiCfg, CmLteUeCategory ueCat )); @@ -232,15 +232,15 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg 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, @@ -295,7 +295,7 @@ PRIVATE S16 rgSchAddToL2Meas ARGS ((RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)); #ifdef EMTC_ENABLE S16 rgSCHEmtcCfgVldtDrxOnDurCfg ( -U16 onDurTmr +uint16_t onDurTmr ); Void rgSCHUtlUpdEmtcY ( @@ -429,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}, @@ -440,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 */ @@ -571,7 +571,7 @@ RgSchErrInfo *errInfo; 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"); return RFAILED; @@ -638,7 +638,7 @@ RgSchErrInfo *errInfo; if (cellCfg->phichCfg.ngEnum > RGR_NG_TWO) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid PHICH Ng configuration %d", - (U8)cellCfg->phichCfg.ngEnum); + (uint8_t)cellCfg->phichCfg.ngEnum); return RFAILED; } /* Validation for extended PHICH Duration */ @@ -647,7 +647,7 @@ 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); + (uint8_t)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); return RFAILED; } if ((cellCfg->phichCfg.isDurExtend == TRUE) && @@ -655,7 +655,7 @@ 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); + (uint8_t)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); return RFAILED; } RLOG4(L_INFO,"CA_DBG:: PUCCH configuration:" @@ -684,7 +684,7 @@ RgSchErrInfo *errInfo; 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); + " srsBw %d", (uint8_t)cellCfg->srsCfg.srsBwEnum); return RFAILED; } @@ -988,7 +988,7 @@ RgrCellCfg *cellCfg; #ifdef RGR_V1 if(cellCfg->rachCfg.contResTmr) { - U8 idx; + uint8_t idx; #ifdef LTE_TDD idx = cellCfg->ulDlCfgIdx; #else @@ -996,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; @@ -1096,7 +1096,7 @@ RgSchErrInfo *errInfo; || (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); + " UE is %d", ueCfg->cellId,(uint8_t)ueCfg->txMode.txModeEnum); return RFAILED; } @@ -1104,7 +1104,7 @@ RgSchErrInfo *errInfo; 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); + ueCfg->cellId,(uint8_t)ueCfg->ueCatEnum); return RFAILED; } @@ -1125,7 +1125,7 @@ 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); + (uint8_t)ueCfg->txMode.txModeEnum); return RFAILED; } } @@ -1322,7 +1322,7 @@ 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); + "srsBw %d", (uint8_t)cellRecfg->srsRecfg.srsBwEnum); return RFAILED; } @@ -1462,10 +1462,10 @@ 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 @@ -1725,7 +1725,7 @@ RgSchErrInfo *err; { Inst inst = cell->instIdx; RgrUeSCellAckPucchCfg *sCellPucchRecfg = NULLP; - U8 idx; + uint8_t idx; RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "--------------------------------------------------------------------\n" @@ -1843,7 +1843,7 @@ RgSchErrInfo *errInfo; 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)) @@ -1914,7 +1914,7 @@ RgSchErrInfo *errInfo; (ueSCellDedCfg->txMode.txModeEnum > RGR_UE_TM_9)) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCELL Invalid transmission mode for" - " UE %d\n", (U8)ueSCellDedCfg->txMode.txModeEnum)); + " UE %d\n", (uint8_t)ueSCellDedCfg->txMode.txModeEnum)); return RFAILED; } #endif @@ -1970,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)]; @@ -2098,7 +2098,7 @@ 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); + ueRecfg->newCrnti, (uint8_t)ueRecfg->csgMmbrSta); return RFAILED; } /* Validate values */ @@ -2108,7 +2108,7 @@ 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); + "for NEW CRNTI:%d", (uint8_t)ueRecfg->txMode.txModeEnum,ueRecfg->newCrnti); return RFAILED; } #ifndef TFU_UPGRADE @@ -2118,7 +2118,7 @@ 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); + "OLD CRNTI:%d NEW CRNTI:%d",(uint8_t)ueRecfg->oldCrnti,ueRecfg->newCrnti); return RFAILED; } #endif @@ -2134,7 +2134,7 @@ RgSchErrInfo *errInfo; (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); + " DL CQI %d NEW CRNTI:%d", (uint8_t)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->newCrnti); return RFAILED; } #else @@ -2142,7 +2142,7 @@ RgSchErrInfo *errInfo; (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); + "DL CQI %d for NEW CRNTI:%d",(uint8_t)ueRecfg->cqiCfg.cqiSetup.prdModeEnum,ueRecfg->newCrnti); return RFAILED; } #endif /* TFU_UPGRADE */ @@ -2150,7 +2150,7 @@ RgSchErrInfo *errInfo; 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); + (uint8_t)ueRecfg->ueCatEnum,ueRecfg->newCrnti); return RFAILED; } @@ -2171,7 +2171,7 @@ 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); + " DL CQI %d for NEW CRNTI:%d", (uint8_t)ueRecfg->aprdDlCqiRecfg.aprdModeEnum,ueRecfg->newCrnti); return RFAILED; } if ((ueRecfg->ueRecfgTypes & RGR_UE_ULPWR_RECFG) && @@ -2478,12 +2478,12 @@ 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 cell->dynCfiCb.isDynCfiEnb = cellCfg->isDynCfiEnb; @@ -2498,7 +2498,7 @@ 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"); return RFAILED; @@ -2662,7 +2662,7 @@ RgSchCellCb *cell; RgrCellCfg *cellCfg; #endif { - U8 idx; + uint8_t idx; for(idx = 0; idx < MAX_5GTF_GROUP; idx++) { @@ -2686,8 +2686,8 @@ RgrCellCfg *cellCfg; #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. @@ -2729,12 +2729,12 @@ 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)); + uint32_t Idx1 = (uint8_t)((cellCfg->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); errInfo->errCause = RGSCHERR_CFG_RGR_CELL_CFG; @@ -2758,7 +2758,7 @@ RgSchErrInfo *errInfo; } } #endif - if ((U8 *)cell == NULLP) + if ((uint8_t *)cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); return RFAILED; @@ -2776,7 +2776,7 @@ RgSchErrInfo *errInfo; { cell->lteAdvCb.absCfg = cellCfg->rgrLteAdvCfg.absCfg; - memset(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; } @@ -3112,14 +3112,14 @@ 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 @@ -3141,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); @@ -3296,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,7 +3517,7 @@ RgSchErrInfo *errInfo; rgSCHUtlUpdPhr(cell, ue, raCb->phr.val, errInfo); } - RETVOID; + return; } /** @@ -3544,7 +3544,7 @@ RgSchCellCb *cell; Bool isDynCfiEnb; #endif { - U8 idx; + uint8_t idx; RgSchCmnDlCell *cellSchDl = RG_SCH_CMN_GET_DL_CELL(cell); if(isDynCfiEnb) @@ -3607,8 +3607,8 @@ 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 */ errInfo->errCause = RGSCHERR_CFG_RGR_CELL_RECFG; @@ -3760,11 +3760,11 @@ RgSchErrInfo *errInfo; } } /*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"); @@ -3877,13 +3877,13 @@ 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; /* Handle CRNTI change in reconfiguration */ if (ueRecfg->oldCrnti != ueRecfg->newCrnti) @@ -4466,7 +4466,7 @@ RgrRst *reset; RgSchErrInfo *errInfo; #endif { - U32 idx; + uint32_t idx; RgSchRaCb *raCb; errInfo->errCause = RGSCHERR_CFG_RGR_UE_RESET; @@ -4661,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))) @@ -4770,8 +4770,8 @@ RgSchErrInfo *errInfo; RgSchUeCb *ue; RgSchDlLcCb *dlLc; #ifdef LTE_L2_MEAS - U8 lcId; - U8 idx; + uint8_t lcId; + uint8_t idx; RgSchUlLcCb *ulLc; #endif @@ -4895,9 +4895,9 @@ RgSchErrInfo *errInfo; { RgSchUeCb *ue = NULLP; #ifdef LTE_L2_MEAS - U8 lcCount = 0; + uint8_t lcCount = 0; #endif - U8 lcgId = 0; + uint8_t lcgId = 0; lcgId = lcDelInfo->u.lcgDel.lcgId; @@ -5164,11 +5164,11 @@ RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; #endif { - U8 idx; + uint8_t idx; RgrCmnLchCfg *lcCfg; - U8 dirVld = FALSE; - U8 bitMask = 0x00; - U8 cnt=0; + uint8_t dirVld = FALSE; + uint8_t bitMask = 0x00; + uint8_t cnt=0; errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CMN_LC_CFG; @@ -5548,7 +5548,7 @@ RgrUeSpsDlCfg *dlSpsCfg; #endif { - U8 idx = 0; + uint8_t idx = 0; /* peridicity validation done in SPS module */ if ((dlSpsCfg->numPucchVal > RG_SCH_MAX_NUM_N1PUCCH_PER_UE) || @@ -5878,7 +5878,7 @@ RgSchErrInfo *errInfo; "Downlink LCId:%d CRNTI:%d", lcCfg->lcId,lcCfg->crnti); 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); @@ -5988,7 +5988,7 @@ RgSchErrInfo *errInfo; #ifdef RG_UNUSED //#ifdef LTE_L2_MEAS - U32 idx; + uint32_t idx; RgSchUlLcCb *ulLc; #endif @@ -6019,7 +6019,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for "); return RFAILED; } - if ((U8 *)ulLc == NULLP) + if ((uint8_t *)ulLc == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for "); return RFAILED; @@ -6163,7 +6163,7 @@ RgSchDlLcCb *dlLc; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeDlDedLcCb */ @@ -6197,7 +6197,7 @@ RgSchClcDlLcCb *cmnDlLc; memset(cmnDlLc, 0, sizeof(*cmnDlLc)); cmnDlLc->lcId = RGSCH_INVALID_LC_ID; - RETVOID; + return; } /* rgSCHCfgFreeDlCmnLcCb */ @@ -6232,7 +6232,7 @@ RgSchCellCb *cell; Buffer *pdu; RgSchWarningSiInfo *warningSi; RgSchWarningSiPdu *warningSiPdu; - U8 idx; + uint8_t idx; /* ccpu00132385- SI Warning PDUs which are not processed need to be deleted */ /* Search for used index in WarningSi */ @@ -6291,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); @@ -6316,7 +6316,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeCellCb */ @@ -6353,8 +6353,8 @@ RgSchUeCb *ue; RgUeUlHqCb *ulHqEnt; RgSchDlLcCb *dlLc; Inst inst = cell->instIdx; - U8 lcCnt; - U8 lcgId; + uint8_t lcCnt; + uint8_t lcgId; /* Free all logical channel info per UE */ while((dlLc = rgSCHDbmGetNextDlDedLcCb(ue, NULLP)) != NULLP) @@ -6444,7 +6444,7 @@ RgSchUeCb *ue; rgSCHUtlFreeSBuf(inst, (Data **)&ue, sizeof(*ue)); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeUeCb */ @@ -6497,7 +6497,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeRgrCfgLst */ @@ -6550,7 +6550,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeCmnLcLst */ @@ -6620,7 +6620,7 @@ RgSchCellCb *cell; #endif /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeUeLst */ @@ -6694,7 +6694,7 @@ Inst inst; RgrSiCfg *siCfg; #endif { - U8 idx; /* idx for iteration */ + uint8_t idx; /* idx for iteration */ UNUSED(inst); @@ -6766,17 +6766,17 @@ 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); if((lteAdvCfg->pres & RGR_SFR) && (RGR_ENABLE == lteAdvCfg->sfrCfg.status)) @@ -6914,7 +6914,7 @@ RgSchErrInfo *errInfo; #endif { MsgLen msgLen = 0; - U8 numSi; + uint8_t numSi; errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_SI_CFG; @@ -7566,9 +7566,9 @@ 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; if ( RGR_SCH_SRS_SETUP == srsCfg->type ) { @@ -8048,11 +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*/ + uint8_t cqiPmiSzR1; /*CQIPMI Size for Rank =1*/ + uint8_t cqiPmiSzRn1; /*CQIPMI Size for Rank > 1*/ cqiPmiSzR1 = 0; cqiPmiSzRn1 = 0; @@ -8182,11 +8182,11 @@ 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; crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)+ @@ -8250,7 +8250,7 @@ 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*/ @@ -8354,11 +8354,11 @@ S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) 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; crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) @@ -8440,8 +8440,8 @@ 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 { @@ -8534,9 +8534,9 @@ S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) RgrUeUlSrsCfg *srsCfg; #endif { - U16 srsTrInsTime; - U16 crntTime; - U16 tempIdx; + uint16_t srsTrInsTime; + uint16_t crntTime; + uint16_t tempIdx; crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cellCb->crntTime.slot); @@ -8582,16 +8582,16 @@ 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 @@ -8681,8 +8681,8 @@ S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) RgrUeSrCfg *srCfg; #endif { - U16 srTrInsTime; - U16 crntTime; + uint16_t srTrInsTime; + uint16_t crntTime; crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) @@ -9171,8 +9171,8 @@ S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) #endif { #ifdef LTE_ADV - U32 cellIdx; - U32 sCellCnt = 0; + uint32_t cellIdx; + uint32_t sCellCnt = 0; #endif RgSchUePCqiCb *cqiRiCb = NULLP; @@ -9270,9 +9270,9 @@ 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 @@ -9282,21 +9282,21 @@ S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) S16 rgSCHUtlGetCfgPerOff ( RgSchPerTbl tbl, - U16 cfgIdx, - U16 *peri, - U16 *offset + uint16_t cfgIdx, + uint16_t *peri, + uint16_t *offset ) #else 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; /* Added the function instead of the MACRO to get the @@ -9336,7 +9336,7 @@ S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) * for decoding. * * Ret : Void - * ROK - RETVOID + * ROK - void * * Notes: * @@ -9347,20 +9347,20 @@ 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; + uint32_t confRepMode; confRepMode = acqiCb->aCqiCfg.aprdModeEnum; switch(confRepMode) @@ -9426,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 */ @@ -9438,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: * @@ -9450,14 +9450,14 @@ 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; @@ -9739,11 +9739,11 @@ RgrUeDrxCfg *ueDrxCfg; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg ( -U8 onDurTmr +uint8_t onDurTmr ) #else PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr) -U8 onDurTmr; +uint8_t onDurTmr; #endif { @@ -9796,11 +9796,11 @@ U8 onDurTmr; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxInActvCfg ( -U16 inActvTmr +uint16_t inActvTmr ) #else PRIVATE S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr) -U16 inActvTmr; +uint16_t inActvTmr; #endif { switch ( inActvTmr ) @@ -9858,11 +9858,11 @@ U16 inActvTmr; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxReTxCfg ( -U8 reTxTmr +uint8_t reTxTmr ) #else PRIVATE S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr) -U8 reTxTmr; +uint8_t reTxTmr; #endif { switch ( reTxTmr ) @@ -9948,11 +9948,11 @@ RgrDrxLongCycleOffst lngCycleOffst; #ifdef ANSI PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs ( -U16 val +uint16_t val ) #else PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs(val) -U16 val; +uint16_t val; #endif { @@ -10109,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 @@ -10185,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; @@ -10228,7 +10228,7 @@ 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 @@ -10237,21 +10237,21 @@ Void rgSCHSCellFreeBuf Inst inst, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, -U8 idx +uint8_t idx ) #else Void rgSCHSCellFreeBuf(inst ,ue, ueRecfg, idx) Inst inst; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; -U8 idx; +uint8_t idx; #endif { RgSchUeCellInfo *sCellInfo = NULLP; RgrUeSecCellCfg *sCellInfoRecfg = NULLP; - 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)]; @@ -10264,7 +10264,7 @@ U8 idx; } } - RETVOID; + return; } #endif /**********************************************************************