X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cfg.c;h=e66826e39569963442b1fa79396410b3f78629e1;hb=631549c756e38e4f42032059f40de4d030c1dddc;hp=db04bfd9140c76eba98a31cd523305d0a7e5204b;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c index db04bfd91..e66826e39 100755 --- a/src/5gnrsch/rg_sch_cfg.c +++ b/src/5gnrsch/rg_sch_cfg.c @@ -70,22 +70,22 @@ RgSchUlAllocCntr rgSchUlAllocCntr; #endif #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcPOTrigger ARGS (( +Void rgSCHEmtcPOTrigger ARGS (( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSchEmtcUpdSiCfg ARGS (( +S16 rgSchEmtcUpdSiCfg ARGS (( RgSchCellCb *cell, RgrCellRecfg *cellRecfg )); -EXTERN S16 rgSCHEmtcCfgVldtDrxReTxCfg ARGS(( -U16 reTxTmr +S16 rgSCHEmtcCfgVldtDrxReTxCfg ARGS(( +uint16_t reTxTmr )); -EXTERN S16 rgSCHEmtcCfgVldtDrxUlReTxCfg ARGS(( -U16 reTxTmr +S16 rgSCHEmtcCfgVldtDrxUlReTxCfg ARGS(( +uint16_t reTxTmr )); #endif @@ -94,63 +94,63 @@ S16 rgSCHEnbPfsDlCfg ARGS(( RgSchErrInfo *err )); /* local defines */ -PRIVATE S16 rgSCHCfgRgrUeRecfgRntiChg ARGS (( RgSchCellCb *cell, +static S16 rgSCHCfgRgrUeRecfgRntiChg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtUePwrCfg ARGS((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUePwrCfg ARGS((RgSchCellCb *cell, RgrUeUlPwrCfg *pwrCfg)); -PRIVATE S16 rgSCHCfgVldtUeGrpPwrCfg ARGS((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeGrpPwrCfg ARGS((RgSchCellCb *cell, RgrUeGrpPwrCfg *grpPwrCfg)); #ifdef LTEMAC_SPS -PRIVATE S16 rgSCHCfgVldtUeDlSpsCfg ARGS((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeDlSpsCfg ARGS((RgSchCellCb *cell, RgrUeSpsDlCfg *dlSpsCfg)); -PRIVATE S16 rgSCHCfgVldtSpsReCfg ARGS ((RgSchCellCb *cell, +static S16 rgSCHCfgVldtSpsReCfg ARGS ((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg)); #endif /*LTEMAC_SPS*/ -PRIVATE S16 rgSCHCfgVldtUeCqiModeCfg ARGS((RgSchCellCb *cell,RgrUeDlCqiCfg *ueDlCqiCfg)); -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg ARGS ((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeCqiModeCfg ARGS((RgSchCellCb *cell,RgrUeDlCqiCfg *ueDlCqiCfg)); +static S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg ARGS ((RgSchCellCb *cell, RgrUeCfg *ueCfg)); -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg ARGS ((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg ARGS ((RgSchCellCb *cell, RgrUeRecfg *ueRecfg)); -PRIVATE Void rgSCHCfgFreeDlDedLcCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +static Void rgSCHCfgFreeDlDedLcCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc)); -PRIVATE Void rgSCHCfgFreeDlCmnLcCb ARGS((RgSchClcDlLcCb *cmnDlLc)); -PRIVATE Void rgSCHCfgFreeUeCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -PRIVATE Void rgSCHCfgFreeRgrCfgLst ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHCfgFreeCmnLcLst ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHCfgFreeUeLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeDlCmnLcCb ARGS((RgSchClcDlLcCb *cmnDlLc)); +static Void rgSCHCfgFreeUeCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +static Void rgSCHCfgFreeRgrCfgLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeCmnLcLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeUeLst ARGS((RgSchCellCb *cell)); #ifdef LTEMAC_SPS -PRIVATE Void rgSCHCfgFreeSpsUeLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeSpsUeLst ARGS((RgSchCellCb *cell)); #endif -PRIVATE S16 rgSCHCfgVldtRgrCmnLcCfg ARGS((Inst inst, RgrCellCfg *cellCfg, +static S16 rgSCHCfgVldtRgrCmnLcCfg ARGS((Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtRgrCellPwrCfg ARGS((Inst inst, RgrCellCfg *cellCfg, +static S16 rgSCHCfgVldtRgrCellPwrCfg ARGS((Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtRgrCellSchCfg ARGS((Inst inst, RgrCellCfg *cellCfg)); -PRIVATE S16 rgSCHCfgVldtRgrSchCfg ARGS((Inst inst, RgrSchedEnbCfg *schedEnbCfg)); -PRIVATE S16 rgSCHCfgVldtRgrCellRACfg ARGS((Inst inst, RgrCellCfg *cellCfg)); -PRIVATE Void rgSCHCfgRgrUePhrMsg3 ARGS(( RgSchCellCb *cell, +static S16 rgSCHCfgVldtRgrCellSchCfg ARGS((Inst inst, RgrCellCfg *cellCfg)); +static S16 rgSCHCfgVldtRgrSchCfg ARGS((Inst inst, RgrSchedEnbCfg *schedEnbCfg)); +static S16 rgSCHCfgVldtRgrCellRACfg ARGS((Inst inst, RgrCellCfg *cellCfg)); +static Void rgSCHCfgRgrUePhrMsg3 ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb,RgSchUeCb *ue, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgRgrCmnLcCfg ARGS((RgSchCellCb *cell, RgrCmnLchCfg *lcCfg, +static 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)); +static 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)); +static S16 rgSCHCfgVldtRgrCellLteAdvCfg ARGS(( Inst inst, + RgrLteAdvancedCellConfig *lteAdvCfg, uint8_t dlTotalBw)); /* LTE_ADV_FLAG_REMOVED_END */ -PRIVATE S16 rgSCHCfgVldtDrxUeCfg ARGS ((RgSchCellCb *cell, +static 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 rgSCHCfgVldtDrxLngCycCfg ARGS((RgrDrxLongCycleOffst lngCycleOffst)); -PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs ARGS((U16 val)); -PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg ARGS((RgrDrxShortDrx shrtCycCfg)); -PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg ARGS((Inst inst, +static S16 rgSCHCfgVldtDrxOnDurCfg ARGS((uint8_t onDurTmr)); +static S16 rgSCHCfgVldtDrxInActvCfg ARGS((uint16_t inActvTmr)); +static S16 rgSCHCfgVldtDrxReTxCfg ARGS((uint8_t reTxTmr)); +static S16 rgSCHCfgVldtDrxLngCycCfg ARGS((RgrDrxLongCycleOffst lngCycleOffst)); +static S16 rgSCHCfgVldtDrxLngCyclTmrs ARGS((uint16_t val)); +static S16 rgSCHCfgVldtDrxShrtCycCfg ARGS((RgrDrxShortDrx shrtCycCfg)); +static S16 rgSCHCfgVldtRgrCellCsgParamCfg ARGS((Inst inst, RgrCellCsgParamCfg *csgParam)); #ifdef TFU_UPGRADE @@ -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 )); @@ -220,11 +220,11 @@ 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, +static S16 rgSCHCfgVldtCqiSrSrsUeCfg ARGS (( RgSchCellCb *cellCb, RgrUeCfg *ueCfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg ARGS (( RgSchCellCb *cellCb, +static S16 rgSCHCfgVldtCqiSrSrsUeReCfg ARGS (( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeRecfg *ueReCfg, RgSchErrInfo *errInfo )); @@ -232,18 +232,18 @@ 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 )); +static 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 (( +static const RgSchUePCqiSrsSrCfgIdxTbl* rgSCHCfgUtlGetPcqiSrsSrRiTbl ARGS (( RgSchPerTbl tblType, - U8 * min, - U8 * max)); + uint8_t * min, + uint8_t * max)); #endif /* TFU_UPGRADE */ -PRIVATE Void rgSCHCfgUeTaRecfg ARGS (( RgSchCellCb *cellCb, +static Void rgSCHCfgUeTaRecfg ARGS (( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeRecfg *ueReCfg, RgSchErrInfo *errInfo )); @@ -267,7 +267,7 @@ RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *errInfo )); -PRIVATE S16 rgSCHSCellCfgUeCfgRollBack ARGS(( +static S16 rgSCHSCellCfgUeCfgRollBack ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg @@ -277,31 +277,31 @@ RgrUeRecfg *ueRecfg /* ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #if ((defined (RGR_CQI_REPT)) && (defined (RGR_V2))) -PRIVATE S16 rgSCHCfgUeCqiReptReCfg ARGS (( +static S16 rgSCHCfgUeCqiReptReCfg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg )); -PRIVATE S16 rgSCHCfgVldtCqiReptReCfg ARGS (( +static S16 rgSCHCfgVldtCqiReptReCfg ARGS (( RgSchCellCb *cell, RgrUeRecfg *ueRecfg )); #endif /*LTE_L2_MEAS_PHASE2*/ #ifdef LTE_L2_MEAS -PRIVATE S16 rgSchAddToL2Meas ARGS ((RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)); +static S16 rgSchAddToL2Meas ARGS ((RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)); #endif #ifdef EMTC_ENABLE S16 rgSCHEmtcCfgVldtDrxOnDurCfg ( -U16 onDurTmr +uint16_t onDurTmr ); Void rgSCHUtlUpdEmtcY ( RgSchUeCb *ue ); -EXTERN Void rgSCHEmtcHqPAlloc +Void rgSCHEmtcHqPAlloc ( RgSchCellCb *cell, RgSchDlHqEnt *hqEnt @@ -309,7 +309,7 @@ RgSchDlHqEnt *hqEnt #endif /* local typedefs */ -CONSTANT RgSchSrsTxOffst rgSrsTxOffstTbl[RGSCH_MAX_SRS_SFCFG_IDX+1]= +const RgSchSrsTxOffst rgSrsTxOffstTbl[RGSCH_MAX_SRS_SFCFG_IDX+1]= {{1,{0,0,0,0,0,0,0,0}}, {1,{0,0,0,0,0,0,0,0}}, {1,{1,0,0,0,0,0,0,0}}, @@ -331,7 +331,7 @@ CONSTANT RgSchSrsTxOffst rgSrsTxOffstTbl[RGSCH_MAX_SRS_SFCFG_IDX+1]= #ifdef TFU_UPGRADE /* SRSCfg Table: Ref 36.213, Table: 8.2.1 */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrsCfgIdxFddTbl[RG_SCH_SRS_ISRS_INDX_MAX_FDD]= { { 0,1, 2, 0 }, @@ -345,7 +345,7 @@ rgSchUeSrsCfgIdxFddTbl[RG_SCH_SRS_ISRS_INDX_MAX_FDD]= }; /* Reference : 36.213 Table 8.2-2 */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrsCfgIdxTddTbl[RG_SCH_SRS_ISRS_INDX_MAX_TDD]= { { 10,14, 5, 10 }, @@ -359,7 +359,7 @@ rgSchUeSrsCfgIdxTddTbl[RG_SCH_SRS_ISRS_INDX_MAX_TDD]= }; /*Reference: 36.213 Table:7.2.2-1A */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUePCqiCfgIdxFddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_FDD]= { { 0,1, 2, 0 }, @@ -376,7 +376,7 @@ rgSchUePCqiCfgIdxFddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_FDD]= }; /* Reference: 36.213 Table:7.2.2-1C */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeCqiPmiCfgIdxTddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_TDD]= { { 0,0, 1, 0 }, @@ -391,7 +391,7 @@ rgSchUeCqiPmiCfgIdxTddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_TDD]= /* Note: RI table is same for FDD and TDD */ /*Reference: 36.213 Table:7.2.2-1B */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeRiCfgIdxTbl[RG_SCH_RI_CFGIDX_MAX]= { { 0,160, 1, 0 }, @@ -404,7 +404,7 @@ rgSchUeRiCfgIdxTbl[RG_SCH_RI_CFGIDX_MAX]= }; /*Reference: 36.213 Table:7.2.2-2 */ -CONSTANT RgSchUeBwSubSzBwParts +const RgSchUeBwSubSzBwParts rgSchUeBwSubSzBwPartsTbl[RG_SCH_BW_SUBSZ_BWPARTS_MAX]= { {6,7, 0, 0}, /*TODO: 6,7, NA, NA */ @@ -417,7 +417,7 @@ rgSchUeBwSubSzBwPartsTbl[RG_SCH_BW_SUBSZ_BWPARTS_MAX]= /* Reference : 36.213 Table 10.1-5 */ /* Note: SR is same table for TDD and FDD */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrCfgIdxTbl[RG_SCH_ISR_INDX_MAX]= +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrCfgIdxTbl[RG_SCH_ISR_INDX_MAX]= { { 0,4, 5, 0 }, { 5,14, 10, 5 }, @@ -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] ={ +const 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,14 +440,14 @@ 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 S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb *cell)); +S16 rgSCHEmtcCellAlloc ARGS((RgSchCellCb *cel)); +Void rgSCHEmtcCellFree ARGS((RgSchCellCb *cel)); +Void rgSCHEmtcUeInfoFree ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +uint8_t rgSchfillPucchSrRepNumCountemtc ARGS((RgSchUeCb *ueCb)); +uint8_t rgSchfillPucchCqiRepNumCountemtc ARGS((RgSchUePCqiCb *cqiCb, RgSchUeCb *ueCb)); +S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb *cell)); #endif /* forward references */ @@ -477,19 +477,12 @@ EXTERN S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb *cell)) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrSchedEnbCfg ( Inst inst, RgrSchedEnbCfg *schedEnbCfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrSchedEnbCfg(inst, schedEnbCfg, errInfo) -Inst inst; -RgrSchedEnbCfg *schedEnbCfg; -RgSchErrInfo *errInfo; -#endif { RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR SCH ENB CONFIG: \n")); @@ -552,7 +545,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrCellCfg ( Inst inst, @@ -560,18 +552,11 @@ RgrCellCfg *cellCfg, RgSchCellCb *cell, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrCellCfg(inst, cellCfg, cell, errInfo) -Inst inst; -RgrCellCfg *cellCfg; -RgSchCellCb *cell; -RgSchErrInfo *errInfo; -#endif { 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 +623,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 +632,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 +640,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 +669,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; } @@ -836,17 +821,11 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrSchCfg ( Inst inst, RgrSchedEnbCfg *rgSchedCfg ) -#else -S16 rgSCHCfgVldtRgrSchCfg(inst, rgSchedCfg) -Inst inst; -RgrSchedCfg *rgSchedCfg; -#endif { RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Validating \ scheduler related Configuration")); @@ -885,17 +864,11 @@ RgrSchedCfg *rgSchedCfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrCellSchCfg ( Inst inst, RgrCellCfg *cellCfg ) -#else -S16 rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg) -Inst inst; -RgrCellCfg *cellCfg; -#endif { #if RGSCH_NUM_DLFS_SCHEDULERS @@ -929,17 +902,11 @@ RgrCellCfg *cellCfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrCellRACfg ( Inst inst, RgrCellCfg *cellCfg ) -#else -S16 rgSCHCfgVldtRgrCellRACfg(inst, cellCfg) -Inst inst; -RgrCellCfg *cellCfg; -#endif { #ifdef LTE_TDD @@ -988,7 +955,7 @@ RgrCellCfg *cellCfg; #ifdef RGR_V1 if(cellCfg->rachCfg.contResTmr) { - U8 idx; + uint8_t idx; #ifdef LTE_TDD idx = cellCfg->ulDlCfgIdx; #else @@ -996,7 +963,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; @@ -1049,7 +1016,6 @@ RgrCellCfg *cellCfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrUeCfg ( Inst inst, @@ -1057,13 +1023,6 @@ RgrUeCfg *ueCfg, RgSchCellCb **cell, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrUeCfg(inst, ueCfg, cell, errInfo) -Inst inst; -RgrUeCfg *ueCfg; -RgSchCellCb **cell; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_CFG; @@ -1096,7 +1055,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 +1063,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 +1084,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; } } @@ -1253,7 +1212,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrCellRecfg ( Inst inst, @@ -1261,13 +1219,6 @@ RgrCellRecfg *cellRecfg, RgSchCellCb **cell, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrCellRecfg(inst, cellRecfg, cell, errInfo) -Inst inst; -RgrCellRecfg *cellRecfg; -RgSchCellCb **cell; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_RECFG; @@ -1322,7 +1273,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; } @@ -1446,7 +1397,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHSCellCfgUeCfg ( RgSchCellCb *cell, @@ -1454,19 +1404,12 @@ RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) -#else -S16 rgSCHSCellCfgUeCfg(cell, ue, ueRecfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -RgSchErrInfo *err; -#endif { - U8 idx; - Inst inst = cell->instIdx; - RgSchCellCb *secCellCb = NULLP; - U8 sCellidx = 0; - RgSchUeCellInfo *sCellInfo = NULLP; + uint8_t idx; + Inst inst = cell->instIdx; + RgSchCellCb *secCellCb = NULLP; + uint8_t sCellidx = 0; + RgSchUeCellInfo *sCellInfo = NULLP; RgrUeSecCellCfg *sCellInfoCfg = NULLP; #ifdef TFU_UPGRADE RgrUeAprdDlCqiCfg *aCqiCfg; @@ -1707,7 +1650,6 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHSCellCfgUePucchReCfg ( RgSchCellCb *cell, @@ -1715,17 +1657,10 @@ RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) -#else -S16 rgSCHSCellCfgUePucchReCfg(cell, ue, ueRecfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -RgSchErrInfo *err; -#endif { Inst inst = cell->instIdx; RgrUeSCellAckPucchCfg *sCellPucchRecfg = NULLP; - U8 idx; + uint8_t idx; RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "--------------------------------------------------------------------\n" @@ -1810,7 +1745,6 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrUeSCellRecfg ( RgrUeRecfg *ueRecfg, @@ -1818,13 +1752,6 @@ RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrUeSCellRecfg(inst, ueRecfg, cell, ue, errInfo) -RgrUeRecfg *ueRecfg; -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchErrInfo *errInfo; -#endif { RgrUeSecCellCfg *ueSCellDedCfg = NULLP; RgSchCellCb *sCell = NULLP; @@ -1843,7 +1770,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 +1841,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 @@ -1944,19 +1871,12 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHSCellCfgUeCfgRollBack +static S16 rgSCHSCellCfgUeCfgRollBack ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) -#else -PRIVATE S16 rgSCHSCellCfgUeCfgRollBack(cell, ue, ueRecfg) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -#endif { Inst inst = cell->instIdx; RgrUeSecCellCfg *sCellInfoCfg = NULLP; @@ -1970,7 +1890,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)]; @@ -2033,7 +1953,6 @@ RgrUeRecfg *ueRecfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrUeRecfg ( Inst inst, @@ -2042,14 +1961,6 @@ RgSchCellCb **cell, RgSchUeCb **ue, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrUeRecfg(inst, ueRecfg, cell, ue, errInfo) -Inst inst; -RgrUeRecfg *ueRecfg; -RgSchCellCb **cell; -RgSchUeCb **ue; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RECFG; @@ -2098,7 +2009,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 +2019,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 +2029,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 +2045,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 +2053,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 +2061,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 +2082,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) && @@ -2260,7 +2171,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrLchRecfg ( Inst inst, @@ -2270,15 +2180,6 @@ RgSchUeCb **ue, RgSchDlLcCb **dlLc, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrLchRecfg(inst, lcRecfg, cell, ue, dlLc, errInfo) -Inst inst; -RgrLchRecfg *lcRecfg; -RgSchCellCb **cell; -RgSchUeCb **ue; -RgSchDlLcCb **dlLc; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LC_RECFG; @@ -2332,7 +2233,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrUeReset ( Inst inst, @@ -2341,14 +2241,6 @@ RgSchCellCb *cell, RgSchUeCb **ue, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrUeReset(inst, reset, cell, ue, errInfo) -Inst inst; -RgrRst *reset; -RgSchCellCb *cell; -RgSchUeCb **ue; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RESET; @@ -2400,7 +2292,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrLcgRecfg ( Inst inst, @@ -2409,14 +2300,6 @@ RgSchCellCb *cell, RgSchUeCb **ue, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrLcgRecfg(inst, lcgRecfg, cell, ue, errInfo) -Inst inst; -RgrLcgRecfg *lcgRecfg; -RgSchCellCb *cell; -RgSchUeCb **ue; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LCG_RECFG; @@ -2466,24 +2349,18 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHDynCfiCfg +static S16 rgSCHDynCfiCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg ) -#else -PRIVATE S16 rgSCHDynCfiCfg(cell, cellCfg) -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 +2375,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; @@ -2595,7 +2472,6 @@ RgrCellCfg *cellCfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrSchedEnbCfg ( Inst inst, @@ -2603,13 +2479,6 @@ SpId spId, RgrSchedEnbCfg *schedEnbCfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrSchedEnbCfg(inst, spId, schedEnbCfg, errInfo) -Inst inst, -SpId spId; -RgrSchedEnbCfg *schedEnbCfg; -RgSchErrInfo *errInfo; -#endif { RGSCHDBGPRM(inst, (rgSchPBuf(inst), "APPLYING RGR SCH ENB CONFIG: \n")); @@ -2650,19 +2519,13 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCH5gtfCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg ) -#else -S16 rgSCH5gtfCellCfg(cell, cellCfg) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -#endif { - U8 idx; + uint8_t idx; for(idx = 0; idx < MAX_5GTF_GROUP; idx++) { @@ -2686,8 +2549,8 @@ RgrCellCfg *cellCfg; #endif #ifdef XEON_LMT_ITBS -EXTERN U16 gWrMaxDlItbs; -EXTERN U16 gWrMaxUlItbs; +uint16_t gWrMaxDlItbs; +uint16_t gWrMaxUlItbs; #endif /** * @brief Handler for the cell configuration request from RRM to MAC. @@ -2712,7 +2575,6 @@ EXTERN U16 gWrMaxUlItbs; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrCellCfg ( RgSchCb *instCb, @@ -2720,21 +2582,14 @@ SpId spId, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrCellCfg(instCb, spId, cellCfg, errInfo) -RgSchCb *instCb; -SpId spId; -RgrCellCfg *cellCfg; -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 +2613,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 +2631,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; } @@ -3094,32 +2949,25 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrUeCfg ( RgSchCellCb *cell, RgrUeCfg *ueCfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrUeCfg(cell, ueCfg, errInfo) -RgSchCellCb *cell; -RgrUeCfg *ueCfg; -RgSchErrInfo *errInfo; -#endif { S16 ret; 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 +2989,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 +3144,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++) @@ -3490,21 +3338,13 @@ RgSchErrInfo *errInfo; * @param[in] RgSchRaCb *raCb * @param[out] RgSchErrInfo *errInfo **/ -#ifdef ANSI -PRIVATE Void rgSCHCfgRgrUePhrMsg3 +static Void rgSCHCfgRgrUePhrMsg3 ( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchUeCb *ue, RgSchErrInfo *errInfo ) -#else -PRIVATE Void rgSCHCfgRgrUePhrMsg3(cell, raCb, ue, errInfo) -RgSchCellCb *cell; -RgSchRaCb *raCb; -RgSchUeCb *ue; -RgSchErrInfo *errInfo; -#endif { /* Record msg3 allocation in the UE */ @@ -3517,7 +3357,7 @@ RgSchErrInfo *errInfo; rgSCHUtlUpdPhr(cell, ue, raCb->phr.val, errInfo); } - RETVOID; + return; } /** @@ -3532,19 +3372,13 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI Void rgSCHDynCfiReCfg ( RgSchCellCb *cell, Bool isDynCfiEnb ) -#else -Void rgSCHDynCfiReCfg(cell, isDynCfiEnb) -RgSchCellCb *cell; -Bool isDynCfiEnb; -#endif { - U8 idx; + uint8_t idx; RgSchCmnDlCell *cellSchDl = RG_SCH_CMN_GET_DL_CELL(cell); if(isDynCfiEnb) @@ -3590,25 +3424,18 @@ Bool isDynCfiEnb; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *cellRecfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrCellRecfg(cell, cellRecfg, errInfo) -RgSchCellCb *cell; -RgrCellRecfg *cellRecfg; -RgSchErrInfo *errInfo; -#endif { 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 +3587,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"); @@ -3860,30 +3687,22 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgRgrUeRecfgRntiChg +static S16 rgSCHCfgRgrUeRecfgRntiChg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *errInfo ) -#else -PRIVATE S16 rgSCHCfgRgrUeRecfgRntiChg(cell, ue, ueRecfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -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) @@ -4074,7 +3893,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrUeRecfg ( RgSchCellCb *cell, @@ -4082,13 +3900,6 @@ RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrUeRecfg(cell, ue, ueRecfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -RgSchErrInfo *errInfo; -#endif { S16 ret; #ifdef LTE_ADV @@ -4339,7 +4150,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrLchRecfg ( RgSchCellCb *cell, @@ -4348,14 +4158,6 @@ RgSchDlLcCb *dlLc, RgrLchRecfg *lcRecfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrLchRecfg(cell, ue, dlLc, lcRecfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *dlLc; -RgrLchRecfg *lcRecfg; -RgSchErrInfo *errInfo; -#endif { S16 ret = ROK; @@ -4394,7 +4196,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrLcgRecfg ( RgSchCellCb *cell, @@ -4402,13 +4203,6 @@ RgSchUeCb *ue, RgrLcgRecfg *lcgRecfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrLcgRecfg(cell, ue, lcgRecfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrLcgRecfg *lcgRecfg; -RgSchErrInfo *errInfo; -#endif { S16 ret = ROK; @@ -4450,7 +4244,6 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrUeReset ( RgSchCellCb *cell, @@ -4458,15 +4251,8 @@ RgSchUeCb *ue, RgrRst *reset, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrUeReset(cell, ue, reset, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrRst *reset; -RgSchErrInfo *errInfo; -#endif { - U32 idx; + uint32_t idx; RgSchRaCb *raCb; errInfo->errCause = RGSCHERR_CFG_RGR_UE_RESET; @@ -4559,19 +4345,12 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrCellDel ( RgSchCellCb *cell, RgrDel *cellDelInfo, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrCellDel(cell, cellDelInfo, errInfo) -RgSchCellCb *cell; -RgrDel *cellDelInfo; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_RGR_CELL_DEL; @@ -4611,19 +4390,12 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrUeDel ( RgSchCellCb *cell, RgrDel *ueDelInfo, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrUeDel(cell, ueDelInfo, errInfo) -RgSchCellCb *cell; -RgrDel *ueDelInfo; -RgSchErrInfo *errInfo; -#endif { RgSchUeCb *ue; RgSchRaCb *raCb; @@ -4661,7 +4433,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))) @@ -4753,25 +4525,18 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrLcDel ( RgSchCellCb *cell, RgrDel *lcDelInfo, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrLcDel(cell, lcDelInfo, errInfo) -RgSchCellCb *cell; -RgrDel *lcDelInfo; -RgSchErrInfo *errInfo; -#endif { RgSchUeCb *ue; RgSchDlLcCb *dlLc; #ifdef LTE_L2_MEAS - U8 lcId; - U8 idx; + uint8_t lcId; + uint8_t idx; RgSchUlLcCb *ulLc; #endif @@ -4879,25 +4644,18 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgRgrLcgDel ( RgSchCellCb *cell, RgrDel *lcDelInfo, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrLcgDel(cell, lcDelInfo, errInfo) -RgSchCellCb *cell; -RgrDel *lcDelInfo; -RgSchErrInfo *errInfo; -#endif { 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; @@ -4972,7 +4730,6 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI S16 rgSCHCfgVldtRgrLcCfg ( Inst inst, @@ -4981,14 +4738,6 @@ RgSchCellCb **cell, RgSchUeCb **ue, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrLcCfg(inst, lcCfg, cell, ue, errInfo) -Inst inst; -RgrLchCfg *lcCfg; -RgSchCellCb **cell; -RgSchUeCb **ue; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LC_CFG; @@ -5044,7 +4793,6 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI S16 rgSCHCfgVldtRgrLcgCfg ( Inst inst, @@ -5053,14 +4801,6 @@ RgSchCellCb **cell, RgSchUeCb **ue, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrLcgCfg(inst, lcgCfg, cell, ue, errInfo) -Inst inst; -RgrLcgCfg *lcgCfg; -RgSchCellCb **cell; -RgSchUeCb **ue; -RgSchErrInfo *errInfo; -#endif { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LCG_CFG; @@ -5105,19 +4845,12 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellPwrCfg +static S16 rgSCHCfgVldtRgrCellPwrCfg ( Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) -#else -PRIVATE S16 rgSCHCfgVldtRgrCellPwrCfg(inst, cellCfg, errInfo) -Inst inst; -RgrCellCfg *cellCfg; -RgSchErrInfo *errInfo; -#endif { UNUSED(inst); UNUSED(cellCfg); @@ -5150,25 +4883,18 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCmnLcCfg +static S16 rgSCHCfgVldtRgrCmnLcCfg ( Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) -#else -PRIVATE S16 rgSCHCfgVldtRgrCmnLcCfg(inst, cellCfg, errInfo) -Inst inst; -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; @@ -5285,17 +5011,11 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeCqiModeCfg +static S16 rgSCHCfgVldtUeCqiModeCfg ( RgSchCellCb *cell, RgrUeDlCqiCfg *ueDlCqiCfg ) -#else -PRIVATE S16 rgSCHCfgVldtUeCqiModeCfg(cell, ueDlCqiCfg) -RgSchCellCb *cell; -RgrUeDlCqiCfg *ueDlCqiCfg; -#endif { #ifndef TFU_UPGRADE @@ -5367,17 +5087,11 @@ RgrUeDlCqiCfg *ueDlCqiCfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg +static S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg ( RgSchCellCb *cell, RgrUeCfg *ueCfg ) -#else -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg(cell, ueCfg) -RgSchCellCb *cell; -RgrUeCfg *ueCfg; -#endif { #ifdef LTE_TDD @@ -5456,17 +5170,11 @@ RgrUeCfg *ueCfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg +static S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg ( RgSchCellCb *cell, RgrUeRecfg *ueRecfg ) -#else -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg(cell, ueRecfg) -RgSchCellCb *cell; -RgrUeRecfg *ueRecfg; -#endif { if((ueRecfg->ueAckNackRecfg.isAckNackEnabled == FALSE) && @@ -5535,20 +5243,14 @@ RgrUeRecfg *ueRecfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeDlSpsCfg +static S16 rgSCHCfgVldtUeDlSpsCfg ( RgSchCellCb *cell, RgrUeSpsDlCfg *dlSpsCfg ) -#else -PRIVATE S16 rgSCHCfgVldtUeDlSpsCfg(cell, dlSpsCfg) -RgSchCellCb *cell; -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) || @@ -5602,17 +5304,11 @@ RgrUeSpsDlCfg *dlSpsCfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUePwrCfg +static S16 rgSCHCfgVldtUePwrCfg ( RgSchCellCb *cell, RgrUeUlPwrCfg *pwrCfg ) -#else -PRIVATE S16 rgSCHCfgVldtUePwrCfg(cell, pwrCfg) -RgSchCellCb *cell; -RgrUeUlPwrCfg *pwrCfg; -#endif { /* Group power control works only in accumulated mode */ @@ -5659,17 +5355,11 @@ RgrUeUlPwrCfg *pwrCfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeGrpPwrCfg +static S16 rgSCHCfgVldtUeGrpPwrCfg ( RgSchCellCb *cell, RgrUeGrpPwrCfg *grpPwrCfg ) -#else -PRIVATE S16 rgSCHCfgVldtUeGrpPwrCfg(cell, grpPwrCfg) -RgSchCellCb *cell; -RgrUeGrpPwrCfg *grpPwrCfg; -#endif { if ((grpPwrCfg->pres) && @@ -5703,19 +5393,12 @@ RgrUeGrpPwrCfg *grpPwrCfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtSpsReCfg +static S16 rgSCHCfgVldtSpsReCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) -#else -PRIVATE S16 rgSCHCfgVldtSpsReCfg(cell, ue, ueRecfg) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -#endif { if ((ueRecfg->ueRecfgTypes & RGR_UE_DLSPS_RECFG) && @@ -5802,17 +5485,11 @@ RgrUeRecfg *ueRecfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtCqiReptReCfg +static S16 rgSCHCfgVldtCqiReptReCfg ( RgSchCellCb *cell, RgrUeRecfg *ueRecfg ) -#else -PRIVATE S16 rgSCHCfgVldtCqiReptReCfg(cell, ueRecfg) -RgSchCellCb *cell; -RgrUeRecfg *ueRecfg; -#endif { /* Validate DL Power Control Config parameters */ @@ -5845,7 +5522,6 @@ RgrUeRecfg *ueRecfg; * File : * **********************************************************/ -#ifdef ANSI S16 rgSCHCfgRgrLchCfg ( RgSchCellCb *cell, @@ -5853,13 +5529,6 @@ RgSchUeCb *ue, RgrLchCfg *lcCfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrLchCfg(cell, ue, lcCfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrLchCfg *lcCfg; -RgSchErrInfo *errInfo; -#endif { S16 ret; RgSchDlLcCb *dlLc = NULLP; @@ -5878,7 +5547,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); @@ -5968,7 +5637,6 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI S16 rgSCHCfgRgrLcgCfg ( RgSchCellCb *cell, @@ -5976,19 +5644,12 @@ RgSchUeCb *ue, RgrLcgCfg *lcgCfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgRgrLcgCfg(cell, ue, lcgCfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrLcgCfg *lcgCfg; -RgSchErrInfo *errInfo; -#endif { S16 ret = ROK; #ifdef RG_UNUSED //#ifdef LTE_L2_MEAS - U32 idx; + uint32_t idx; RgSchUlLcCb *ulLc; #endif @@ -6019,7 +5680,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; @@ -6061,19 +5722,12 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgRgrCmnLcCfg +static S16 rgSCHCfgRgrCmnLcCfg ( RgSchCellCb *cell, RgrCmnLchCfg *lcCfg, RgSchErrInfo *errInfo ) -#else -PRIVATE S16 rgSCHCfgRgrCmnLcCfg(cell, lcCfg, errInfo) -RgSchCellCb *cell; -RgrCmnLchCfg *lcCfg; -RgSchErrInfo *errInfo; -#endif { RgSchClcDlLcCb cmnLcCb; @@ -6138,19 +5792,12 @@ RgSchErrInfo *errInfo; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgFreeDlDedLcCb +static Void rgSCHCfgFreeDlDedLcCb ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc ) -#else -PRIVATE Void rgSCHCfgFreeDlDedLcCb(cell, ue, dlLc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *dlLc; -#endif { Inst inst = cell->instIdx; @@ -6163,7 +5810,7 @@ RgSchDlLcCb *dlLc; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeDlDedLcCb */ @@ -6184,20 +5831,12 @@ RgSchDlLcCb *dlLc; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgFreeDlCmnLcCb -( -RgSchClcDlLcCb *cmnDlLc -) -#else -PRIVATE Void rgSCHCfgFreeDlCmnLcCb(cmnDlLc) -RgSchClcDlLcCb *cmnDlLc; -#endif +static Void rgSCHCfgFreeDlCmnLcCb(RgSchClcDlLcCb *cmnDlLc) { memset(cmnDlLc, 0, sizeof(*cmnDlLc)); cmnDlLc->lcId = RGSCH_INVALID_LC_ID; - RETVOID; + return; } /* rgSCHCfgFreeDlCmnLcCb */ @@ -6217,22 +5856,14 @@ RgSchClcDlLcCb *cmnDlLc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCfgFreeCellCb -( -RgSchCellCb *cell -) -#else -Void rgSCHCfgFreeCellCb(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCfgFreeCellCb(RgSchCellCb *cell) { Inst inst = cell->instIdx; CmLList *node; 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 +5922,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 +5947,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeCellCb */ @@ -6337,24 +5968,18 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgFreeUeCb +static Void rgSCHCfgFreeUeCb ( RgSchCellCb *cell, RgSchUeCb *ue ) -#else -PRIVATE Void rgSCHCfgFreeUeCb(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); 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 +6069,7 @@ RgSchUeCb *ue; rgSCHUtlFreeSBuf(inst, (Data **)&ue, sizeof(*ue)); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeUeCb */ @@ -6464,15 +6089,10 @@ RgSchUeCb *ue; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgFreeRgrCfgLst +static Void rgSCHCfgFreeRgrCfgLst ( RgSchCellCb *cell ) -#else -PRIVATE Void rgSCHCfgFreeRgrCfgLst(cell) -RgSchCellCb *cell; -#endif { RgSchCfgElem *rgCfgElem; Inst inst = cell->instIdx; @@ -6497,7 +6117,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeRgrCfgLst */ @@ -6518,15 +6138,10 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgFreeCmnLcLst +static Void rgSCHCfgFreeCmnLcLst ( RgSchCellCb *cell ) -#else -PRIVATE Void rgSCHCfgFreeCmnLcLst(cell) -RgSchCellCb *cell; -#endif { RgSchClcDlLcCb *dlCmnLc; @@ -6550,7 +6165,7 @@ RgSchCellCb *cell; /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeCmnLcLst */ @@ -6571,15 +6186,10 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgFreeUeLst +static Void rgSCHCfgFreeUeLst ( RgSchCellCb *cell ) -#else -PRIVATE Void rgSCHCfgFreeUeLst(cell) -RgSchCellCb *cell; -#endif { RgSchUeCb *ue; #ifdef LTE_ADV @@ -6620,7 +6230,7 @@ RgSchCellCb *cell; #endif /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgSCHCfgFreeUeLst */ @@ -6641,15 +6251,7 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgFreeSpsUeLst -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCfgFreeSpsUeLst(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCfgFreeSpsUeLst(RgSchCellCb *cell) { RgSchUeCb *ue; @@ -6682,19 +6284,13 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellSiCfg +static S16 rgSCHCfgVldtRgrCellSiCfg ( Inst inst, RgrSiCfg *siCfg ) -#else -PRIVATE S16 rgSCHCfgVldtRgrCellSiCfg(inst, siCfg) -Inst inst; -RgrSiCfg *siCfg; -#endif { - U8 idx; /* idx for iteration */ + uint8_t idx; /* idx for iteration */ UNUSED(inst); @@ -6761,22 +6357,15 @@ RgrSiCfg *siCfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg +static S16 rgSCHCfgVldtRgrCellLteAdvCfg ( - Inst inst, - RgrLteAdvancedCellConfig *lteAdvCfg, - U8 dlTotalBw - ) -#else -PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) - Inst inst; - RgrLteAdvancedCellConfig *lteAdvCfg; - U8 dlTotalBw; -#endif +Inst inst, +RgrLteAdvancedCellConfig *lteAdvCfg, +uint8_t dlTotalBw +) { - 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)) @@ -6844,17 +6433,11 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg +static S16 rgSCHCfgVldtRgrCellCsgParamCfg ( Inst inst, RgrCellCsgParamCfg *csgParam ) -#else -PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg(inst, csgParam) -Inst inst; -RgrCellCsgParamCfg *csgParam; -#endif { RGSCHDBGPRM(inst, (rgSchPBuf(inst), "Validating CSG Parameters \n")); @@ -6897,7 +6480,6 @@ RgrCellCsgParamCfg *csgParam; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrSiCfg ( Inst inst, @@ -6905,16 +6487,9 @@ RgrSiCfgReqInfo *siCfg, RgSchCellCb *cell, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrSiCfg(inst, siCfg, cell, errInfo) -Inst inst; -RgrSiCfgReqInfo *siCfg; -RgSchCellCb *cell; -RgSchErrInfo *errInfo; -#endif { MsgLen msgLen = 0; - U8 numSi; + uint8_t numSi; errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_SI_CFG; @@ -7029,21 +6604,13 @@ RgSchErrInfo *errInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCfgVldtRgrLoadInf ( - Inst inst, - RgrLoadInfReqInfo *loadInfReq, - RgSchCellCb *cell, - RgSchErrInfo *errInfo - ) -#else -S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) - Inst inst; - RgrLoadInfReqInfo *loadInfReq; - RgSchCellCb *cell; - RgSchErrInfo *errInfo; -#endif +Inst inst, +RgrLoadInfReqInfo *loadInfReq, +RgSchCellCb *cell, +RgSchErrInfo *errInfo +) { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LOAD_INF; @@ -7101,21 +6668,13 @@ S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgVldtRgrTxmodePuschMode ( - RgSchCellCb *cellCb, - RgrTxMode txMde, - RgrAprdCqiMode puschMode, - RgSchErrInfo *errInfo - ) -#else -S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) - RgSchCellCb *cellCb; - RgrTxMode txMde; - RgrAprdCqiMode puschMode; - RgSchErrInfo *errInfo; -#endif +RgSchCellCb *cellCb, +RgrTxMode txMde, +RgrAprdCqiMode puschMode, +RgSchErrInfo *errInfo +) { if (txMde == RGR_UE_TM_1 || txMde == RGR_UE_TM_2 || @@ -7185,23 +6744,14 @@ S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgVldtRgrUeACqiCfg ( - RgSchCellCb *cellCb, - CmLteRnti crnti, - RgrUeAprdDlCqiCfg *acqiCfg, - RgrUeTxModeCfg txMode, - RgSchErrInfo *errInfo - ) -#else -S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) - RgSchCellCb *cellCb; - CmLteRnti crnti; - RgrUeAprdDlCqiCfg *acqiCfg; - RgrUeTxModeCfg txMode; - RgSchErrInfo *errInfo; -#endif +RgSchCellCb *cellCb, +CmLteRnti crnti, +RgrUeAprdDlCqiCfg *acqiCfg, +RgrUeTxModeCfg txMode, +RgSchErrInfo *errInfo +) { RgrTxMode txMde; RgrAprdCqiMode puschMode; @@ -7247,21 +6797,13 @@ S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgVldtRgrTxmodePucchMode ( - RgSchCellCb *cellCb, - RgrTxMode txMde, - RgrPrdCqiMode pucchMode, - RgSchErrInfo *errInfo - ) -#else -S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) - RgSchCellCb *cellCb; - RgrTxMode txMde; - RgrPrdCqiMode pucchMode; - RgSchErrInfo *errInfo; -#endif +RgSchCellCb *cellCb, +RgrTxMode txMde, +RgrPrdCqiMode pucchMode, +RgSchErrInfo *errInfo +) { if (pucchMode == RGR_PRD_CQI_MOD10 || pucchMode == RGR_PRD_CQI_MOD20 ) @@ -7308,44 +6850,24 @@ S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) * -# RFAILED */ #ifdef LTEMAC_HDFDD -#ifdef ANSI S16 rgSCHCfgVldtRgrUePCqiCfg ( - RgSchCellCb *cellCb, - CmLteRnti crnti, - RgrUePrdDlCqiCfg *cqiCfg, - Bool hdFdd, - RgrUeTxModeCfg txMode, - RgSchErrInfo *errInfo - ) -#else -S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd, - txMode, errInfo) - RgSchCellCb *cellCb; - CmLteRnti crnti; - RgrUePrdDlCqiCfg *cqiCfg; - Bool hdFdd; - RgrUeTxModeCfg txMode; - RgSchErrInfo *errInfo; -#endif +RgSchCellCb *cellCb, +CmLteRnti crnti, +RgrUePrdDlCqiCfg *cqiCfg, +Bool hdFdd, +RgrUeTxModeCfg txMode, +RgSchErrInfo *errInfo +) #else -#ifdef ANSI S16 rgSCHCfgVldtRgrUePCqiCfg - ( - RgSchCellCb *cellCb, - CmLteRnti crnti, - RgrUePrdDlCqiCfg *cqiCfg, - RgrUeTxModeCfg txMode, - RgSchErrInfo *errInfo - ) -#else -S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) - RgSchCellCb *cellCb; - CmLteRnti crnti; - RgrUePrdDlCqiCfg *cqiCfg; - RgrUeTxModeCfg txMode; - RgSchErrInfo *errInfo; -#endif +( +RgSchCellCb *cellCb, +CmLteRnti crnti, +RgrUePrdDlCqiCfg *cqiCfg, +RgrUeTxModeCfg txMode, +RgSchErrInfo *errInfo +) #endif { RgrTxMode txMde; @@ -7531,7 +7053,6 @@ S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) * -# RFAILED */ #ifdef LTEMAC_HDFDD -#ifdef ANSI S16 rgSCHCfgVldtRgrUeUlSrsCfg ( RgSchCellCb *cellCb, @@ -7541,34 +7062,18 @@ S16 rgSCHCfgVldtRgrUeUlSrsCfg RgSchErrInfo *errInfo ) #else -S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo) - RgSchCellCb *cellCb; - CmLteRnti crnti; - RgrUeUlSrsCfg *srsCfg; - Bool hdFdd; - RgSchErrInfo *errInfo; -#endif -#else -#ifdef ANSI S16 rgSCHCfgVldtRgrUeUlSrsCfg ( - RgSchCellCb *cellCb, - CmLteRnti crnti, - RgrUeUlSrsCfg *srsCfg, - RgSchErrInfo *errInfo - ) -#else -S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) - RgSchCellCb *cellCb; - CmLteRnti crnti; - RgrUeUlSrsCfg *srsCfg; - RgSchErrInfo *errInfo; -#endif +RgSchCellCb *cellCb, +CmLteRnti crnti, +RgrUeUlSrsCfg *srsCfg, +RgSchErrInfo *errInfo +) #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 ) { @@ -7693,7 +7198,6 @@ S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) * -# RFAILED */ #ifdef LTEMAC_HDFDD -#ifdef ANSI S16 rgSCHCfgVldtRgrUeSrCfg ( RgSchCellCb *cellCb, @@ -7703,15 +7207,6 @@ S16 rgSCHCfgVldtRgrUeSrCfg RgSchErrInfo *errInfo ) #else -S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo) - RgSchCellCb *cellCb; - CmLteRnti crnti; - RgrUeSrCfg *srCfg; - Bool hdFdd; - RgSchErrInfo *errInfo; -#endif -#else -#ifdef ANSI S16 rgSCHCfgVldtRgrUeSrCfg ( RgSchCellCb *cellCb, @@ -7719,13 +7214,6 @@ S16 rgSCHCfgVldtRgrUeSrCfg RgrUeSrCfg *srCfg, RgSchErrInfo *errInfo ) -#else -S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) - RgSchCellCb *cellCb; - CmLteRnti crnti; - RgrUeSrCfg *srCfg; - RgSchErrInfo *errInfo; -#endif #endif { @@ -7800,19 +7288,12 @@ S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) * -# ROK * -# RFAILED */ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg +static S16 rgSCHCfgVldtCqiSrSrsUeCfg ( - RgSchCellCb *cellCb, - RgrUeCfg *ueCfg, - RgSchErrInfo *errInfo - ) -#else -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) - RgSchCellCb *cellCb; - RgrUeCfg *ueCfg; - RgSchErrInfo *errInfo; -#endif +RgSchCellCb *cellCb, +RgrUeCfg *ueCfg, +RgSchErrInfo *errInfo +) { /* 1. Validate UE Aperiodic CQI related parameters */ @@ -7901,21 +7382,13 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) * -# ROK * -# RFAILED */ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg +static S16 rgSCHCfgVldtCqiSrSrsUeReCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUeRecfg *ueReCfg, - RgSchErrInfo *errInfo - ) -#else -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUeRecfg *ueReCfg; - RgSchErrInfo *errInfo; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUeRecfg *ueReCfg, +RgSchErrInfo *errInfo +) { RgrUeTxModeCfg txMode; @@ -8028,7 +7501,6 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) * -# ROK * **/ -#ifdef ANSI S16 rgSCHCfgACqiUeCfg ( RgSchCellCb *cellCb, @@ -8038,21 +7510,12 @@ RgrTxMode ueTxMode, RgrUeAprdDlCqiCfg *aCqiCfg, CmLteUeCategory ueCat ) -#else -S16 rgSCHCfgACqiUeCfg(cellCb,ue,acqiCb ueTxMode, aCqiCfg, ueCat) -RgSchCellCb *cellCb; -RgSchUeCb *ue; -RgSchUeACqiCb *acqiCb; -RgrTxMode ueTxMode; -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; @@ -8165,28 +7628,20 @@ CmLteUeCategory ueCat; * -# ROK * **/ -#ifdef ANSI S16 rgSCHCfgPCqiUeCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUePrdDlCqiCfg *cqiCfg, - CmLteUeCategory ueCat - ) -#else -S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUePrdDlCqiCfg *cqiCfg; - CmLteUeCategory ueCat; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUePrdDlCqiCfg *cqiCfg, +CmLteUeCategory ueCat +) { 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 +7705,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*/ @@ -8338,27 +7793,19 @@ S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) * -# ROK * **/ -#ifdef ANSI S16 rgSCHCfgRiUeCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUePrdDlCqiCfg *cqiCfg, - CmLteUeCategory ueCat - ) -#else -S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUePrdDlCqiCfg *cqiCfg; - CmLteUeCategory ueCat; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUePrdDlCqiCfg *cqiCfg, +CmLteUeCategory ueCat +) { - 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 +7887,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 { @@ -8520,23 +7967,16 @@ S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgSrsUeCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUeUlSrsCfg *srsCfg - ) -#else -S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUeUlSrsCfg *srsCfg; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUeUlSrsCfg *srsCfg +) { - 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 +8022,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 @@ -8667,22 +8107,15 @@ S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgSrUeCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUeSrCfg *srCfg - ) -#else -S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUeSrCfg *srCfg; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUeSrCfg *srCfg +) { - U16 srTrInsTime; - U16 crntTime; + uint16_t srTrInsTime; + uint16_t crntTime; crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) @@ -8807,21 +8240,13 @@ S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) * -# ROK * */ -#ifdef ANSI S16 rgSCHCfgPCqiUeReCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUePrdDlCqiCfg *cqiCfg, - CmLteUeCategory ueCat - ) -#else -S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUePrdDlCqiCfg *cqiCfg; - CmLteUeCategory ueCat; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUePrdDlCqiCfg *cqiCfg, +CmLteUeCategory ueCat +) { RgSchUePCqiCb *cqiCb = NULLP; @@ -8921,19 +8346,12 @@ S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgSrsUeReCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUeUlSrsCfg *srsCfg - ) -#else -S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUeUlSrsCfg *srsCfg; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUeUlSrsCfg *srsCfg +) { @@ -9017,19 +8435,12 @@ S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgSrUeReCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUeSrCfg *srCfg - ) -#else -S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUeSrCfg *srCfg; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUeSrCfg *srCfg +) { /* Fix : syed Incorrect check for SR RECFG */ @@ -9098,21 +8509,13 @@ S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHCfgAcqiUeReCfg ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - RgrUeAprdDlCqiCfg *acqiCfg, - CmLteUeCategory ueCat - ) -#else -S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; - RgrUeAprdDlCqiCfg *acqiCfg; - CmLteUeCategory ueCat; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb, +RgrUeAprdDlCqiCfg *acqiCfg, +CmLteUeCategory ueCat +) { return (rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb)) @@ -9158,21 +8561,15 @@ S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat) * @return S16 * -# ROK */ -#ifdef ANSI S16 rgSCHCfgPCqiSrsSrUeDel ( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb - ) -#else -S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) - RgSchCellCb *cellCb; - RgSchUeCb *ueCb; -#endif +RgSchCellCb *cellCb, +RgSchUeCb *ueCb +) { #ifdef LTE_ADV - U32 cellIdx; - U32 sCellCnt = 0; + uint32_t cellIdx; + uint32_t sCellCnt = 0; #endif RgSchUePCqiCb *cqiRiCb = NULLP; @@ -9270,34 +8667,26 @@ 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 S16 rgSCHUtlGetCfgPerOff ( - RgSchPerTbl tbl, - U16 cfgIdx, - U16 *peri, - U16 *offset - ) -#else -S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) - RgSchPerTbl tbl; - U16 cfgIdx; - U16 *peri; - U16 *offset; -#endif +RgSchPerTbl tbl, +uint16_t cfgIdx, +uint16_t *peri, +uint16_t *offset +) { - U8 mid; - U8 min = 0; - U8 max = 0; - CONSTANT RgSchUePCqiSrsSrCfgIdxTbl* table; + uint8_t mid; + uint8_t min = 0; + uint8_t max = 0; + const RgSchUePCqiSrsSrCfgIdxTbl* table; /* Added the function instead of the MACRO to get the * periodicity table */ @@ -9336,31 +8725,23 @@ S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) * for decoding. * * Ret : Void - * ROK - RETVOID + * ROK - void * * Notes: * * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz +static Void rgSCHCfgUtlFetchAcqiBitSz ( - RgSchUeACqiCb *acqiCb, - U8 numTxAnt, - U8* cqiPmiSzR1, - U8* cqiPmiSzRn1 - ) -#else -PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn1) - RgSchUeACqiCb *acqiCb; - U8 numTxAnt; - U8* cqiPmiSzR1; - U8* cqiPmiSzRn1; -#endif +RgSchUeACqiCb *acqiCb, +uint8_t numTxAnt, +uint8_t* cqiPmiSzR1, +uint8_t* cqiPmiSzRn1 +) { - U32 confRepMode; + uint32_t confRepMode; confRepMode = acqiCb->aCqiCfg.aprdModeEnum; switch(confRepMode) @@ -9426,7 +8807,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 +8819,7 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn * Desc : Get the Srs Cqi Crs Ri Table * * Ret : Void - * ROK - RETVOID + * ROK - void * * Notes: * @@ -9446,21 +8827,14 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn * **********************************************************/ -#ifdef ANSI -PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl +static const RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl ( - RgSchPerTbl tblType, - U8* min, - U8* max +RgSchPerTbl tblType, +uint8_t* min, +uint8_t* max ) -#else -PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblType, min, max) - RgSchPerTbl tblType; - U8* min; - U8* max; -#endif { - CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * table; + const RgSchUePCqiSrsSrCfgIdxTbl * table; switch (tblType) { @@ -9509,7 +8883,7 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy } default: { - table = (CONSTANT RgSchUePCqiSrsSrCfgIdxTbl *) 0; + table = (const RgSchUePCqiSrsSrCfgIdxTbl *) 0; * min = 0; * max = 0; break; @@ -9537,17 +8911,11 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxUeCfg +static S16 rgSCHCfgVldtDrxUeCfg ( RgSchCellCb *cell, RgrUeDrxCfg *ueDrxCfg ) -#else -PRIVATE S16 rgSCHCfgVldtDrxUeCfg(cell, ueDrxCfg) -RgSchCellCb *cell; -RgrUeDrxCfg *ueDrxCfg; -#endif { if (ueDrxCfg->isDrxEnabled == FALSE) @@ -9736,15 +9104,10 @@ RgrUeDrxCfg *ueDrxCfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg +static S16 rgSCHCfgVldtDrxOnDurCfg ( -U8 onDurTmr +uint8_t onDurTmr ) -#else -PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr) -U8 onDurTmr; -#endif { switch ( onDurTmr ) @@ -9793,15 +9156,7 @@ U8 onDurTmr; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxInActvCfg -( -U16 inActvTmr -) -#else -PRIVATE S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr) -U16 inActvTmr; -#endif +static S16 rgSCHCfgVldtDrxInActvCfg(uint16_t inActvTmr) { switch ( inActvTmr ) { @@ -9855,15 +9210,7 @@ U16 inActvTmr; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxReTxCfg -( -U8 reTxTmr -) -#else -PRIVATE S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr) -U8 reTxTmr; -#endif +static S16 rgSCHCfgVldtDrxReTxCfg(uint8_t reTxTmr) { switch ( reTxTmr ) { @@ -9904,15 +9251,7 @@ U8 reTxTmr; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg -( -RgrDrxLongCycleOffst lngCycleOffst -) -#else -PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg(lngCycleOffst) -RgrDrxLongCycleOffst lngCycleOffst; -#endif +static S16 rgSCHCfgVldtDrxLngCycCfg(RgrDrxLongCycleOffst lngCycleOffst) { if ( rgSCHCfgVldtDrxLngCyclTmrs(lngCycleOffst.longDrxCycle) != ROK ) { @@ -9945,15 +9284,7 @@ RgrDrxLongCycleOffst lngCycleOffst; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs -( -U16 val -) -#else -PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs(val) -U16 val; -#endif +static S16 rgSCHCfgVldtDrxLngCyclTmrs(uint16_t val) { switch ( val ) @@ -10003,15 +9334,7 @@ U16 val; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg -( -RgrDrxShortDrx shrtCycCfg -) -#else -PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg(shrtCycCfg) -RgrDrxShortDrx shrtCycCfg; -#endif +static S16 rgSCHCfgVldtDrxShrtCycCfg(RgrDrxShortDrx shrtCycCfg ) { switch(shrtCycCfg.shortDrxCycle) { @@ -10068,21 +9391,13 @@ RgrDrxShortDrx shrtCycCfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE Void rgSCHCfgUeTaRecfg +static Void rgSCHCfgUeTaRecfg ( RgSchCellCb *cell, RgSchUeCb *ueCb, RgrUeRecfg *ueCfg, RgSchErrInfo *err ) -#else -PRIVATE Void rgSCHCfgUeTaRecfg(cell, ueCb, ueCfg, err) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -RgrUeRecfg *ueCfg; -RgSchErrInfo *err; -#endif { UNUSED(err); @@ -10109,7 +9424,7 @@ RgSchErrInfo *err; rgSCHTmrStartTmr(cell, ueCb, RG_SCH_TMR_TA, ueCb->dl.taCb.cfgTaTmr); } } - RETVOID; + return; } /* rgSCHCfgUeTaRecfg */ /* ccpu00117452 - MOD - Changed macro name from @@ -10130,19 +9445,12 @@ RgSchErrInfo *err; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCfgUeCqiReptReCfg +static S16 rgSCHCfgUeCqiReptReCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) -#else -PRIVATE S16 rgSCHCfgUeCqiReptReCfg(cell, ue, ueRecfg) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -#endif { S16 retVal; @@ -10182,10 +9490,10 @@ RgrUeRecfg *ueRecfg; /*This function Added Ue in ongoing L2 Meas*/ /*LTE_L2_MEAS_PHASE2*/ #ifdef LTE_L2_MEAS -PRIVATE S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) +static S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) { CmLList *lnk; - U16 idx; + uint16_t idx; RgSchL2MeasCb *measCb = NULLP; lnk = cellCb->l2mList.first; @@ -10228,30 +9536,22 @@ 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 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; -#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 +9564,7 @@ U8 idx; } } - RETVOID; + return; } #endif /**********************************************************************