X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cmn.c;h=a4f1406d58bad16e54dad88d1ba68bd7516af765;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=b217d3c094e05e4d8c2e75c3faa5f54fd25bd11e;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c index b217d3c09..a4f1406d5 100755 --- a/src/5gnrsch/rg_sch_cmn.c +++ b/src/5gnrsch/rg_sch_cmn.c @@ -32,9 +32,6 @@ @brief This file implements the schedulers main access to MAC layer code. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=187; -static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ #include "common_def.h" @@ -47,8 +44,6 @@ static int RLOG_MODULE_ID=4096; #include "rg_sch_inf.h" #include "rg_sch.h" #include "rg_sch_cmn.h" -#include "rl_interface.h" -#include "rl_common.h" /* header/extern include files (.x) */ #include "tfu.x" /* TFU types */ @@ -66,47 +61,47 @@ extern "C" { #endif /* __cplusplus */ #ifdef EMTC_ENABLE -EXTERN U32 emtcStatsUlTomSrInd; -EXTERN U32 emtcStatsUlBsrTmrTxp; +uint32_t emtcStatsUlTomSrInd; +uint32_t emtcStatsUlBsrTmrTxp; #endif #define RG_ITBS_DIFF(_x, _y) ((_x) > (_y) ? (_x) - (_y) : (_y) - (_x)) -EXTERN Void rgSCHSc1UlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHSc1UlInit ARGS((RgUlSchdApis *apis)); #ifdef RG_PHASE2_SCHED -EXTERN Void rgSCHRrUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHRrUlInit ARGS((RgUlSchdApis *apis)); #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcHqInfoFree ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); -EXTERN Void rgSCHEmtcRrUlInit ARGS((RgUlSchdApis *apis)); -EXTERN Void rgSCHEmtcCmnDlInit ARGS((Void)); -EXTERN Void rgSCHEmtcCmnUlInit ARGS((Void)); -EXTERN Void rgSCHEmtcCmnUeNbReset ARGS((RgSchUeCb *ueCb)); -EXTERN RgSchCmnCqiToTbs *rgSchEmtcCmnCqiToTbs[RGSCH_MAX_NUM_LYR_PERCW][RG_SCH_CMN_MAX_CP][RG_SCH_CMN_MAX_CFI]; +Void rgSCHEmtcHqInfoFree ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); +Void rgSCHEmtcRrUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHEmtcCmnDlInit ARGS((Void)); +Void rgSCHEmtcCmnUlInit ARGS((Void)); +Void rgSCHEmtcCmnUeNbReset ARGS((RgSchUeCb *ueCb)); +RgSchCmnCqiToTbs *rgSchEmtcCmnCqiToTbs[RGSCH_MAX_NUM_LYR_PERCW][RG_SCH_CMN_MAX_CP][RG_SCH_CMN_MAX_CFI]; #endif -EXTERN Void rgSCHMaxciUlInit ARGS((RgUlSchdApis *apis)); -EXTERN Void rgSCHPfsUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHMaxciUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHPfsUlInit ARGS((RgUlSchdApis *apis)); #endif -EXTERN Void rgSCHSc1DlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHSc1DlInit ARGS((RgDlSchdApis *apis)); #ifdef RG_PHASE2_SCHED -EXTERN Void rgSCHRrDlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHRrDlInit ARGS((RgDlSchdApis *apis)); #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcRrDlInit ARGS((RgDlEmtcSchdApis *apis)); +Void rgSCHEmtcRrDlInit ARGS((RgDlEmtcSchdApis *apis)); #endif -EXTERN Void rgSCHMaxciDlInit ARGS((RgDlSchdApis *apis)); -EXTERN Void rgSCHPfsDlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHMaxciDlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHPfsDlInit ARGS((RgDlSchdApis *apis)); #ifdef TFU_UPGRADE -EXTERN Void rgSCHDlfsInit ARGS((RgDlfsSchdApis *apis)); +Void rgSCHDlfsInit ARGS((RgDlfsSchdApis *apis)); #endif #endif #ifdef EMTC_ENABLE -EXTERN Void rgSCHCmnGetCqiEmtcDciFrmt2AggrLvl ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHCmnGetEmtcDciFrmtSizes ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHEmtcRrUlProcRmvFrmRetx ARGS((RgSchCellCb *cell, RgSchUlHqProcCb *proc)); -EXTERN S16 rgSCHCmnPrecompEmtcMsg3Vars +Void rgSCHCmnGetCqiEmtcDciFrmt2AggrLvl ARGS((RgSchCellCb *cell)); +Void rgSCHCmnGetEmtcDciFrmtSizes ARGS((RgSchCellCb *cell)); +Void rgSCHEmtcRrUlProcRmvFrmRetx ARGS((RgSchCellCb *cell, RgSchUlHqProcCb *proc)); +S16 rgSCHCmnPrecompEmtcMsg3Vars ARGS(( RgSchCmnUlCell *cellUl, -U8 ccchCqi, -U16 msgSzA, -U8 sbSize, +uint8_t ccchCqi, +uint16_t msgSzA, +uint8_t sbSize, Bool isEcp )); Void rgSCHEmtcCmnUeCcchSduDel @@ -114,16 +109,16 @@ Void rgSCHEmtcCmnUeCcchSduDel RgSchCellCb *cell, RgSchUeCb *ueCb ); -EXTERN Void rgSCHEmtcRmvFrmTaLst +Void rgSCHEmtcRmvFrmTaLst ( RgSchCmnDlCell *cellDl, RgSchUeCb *ue ); -EXTERN Void rgSCHEmtcInitTaLst +Void rgSCHEmtcInitTaLst ( RgSchCmnDlCell *cellDl ); -EXTERN Void rgSCHEmtcAddToTaLst +Void rgSCHEmtcAddToTaLst ( RgSchCmnDlCell *cellDl, RgSchUeCb *ue @@ -132,95 +127,95 @@ RgSchUeCb *ue #endif #ifdef RGR_SI_SCH -PRIVATE Void rgSCHDlSiSched ARGS((RgSchCellCb *cell, +static Void rgSCHDlSiSched ARGS((RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc)); -PRIVATE Void rgSCHChkNUpdSiCfg ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHSelectSi ARGS((RgSchCellCb *cell)); +static Void rgSCHChkNUpdSiCfg ARGS((RgSchCellCb *cell)); +static Void rgSCHSelectSi ARGS((RgSchCellCb *cell)); #endif /*RGR_SI_SCH*/ /* LTE_ADV_FLAG_REMOVED_START */ #ifdef UNUSED_FUNC #ifndef LTE_TDD -PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc +static S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlSf *dlSf, -U8 rbStrt, -U8 numRb +uint8_t rbStrt, +uint8_t numRb ); -PRIVATE S16 rgSCHCmnBuildRntpInfo ( +static S16 rgSCHCmnBuildRntpInfo ( RgSchCellCb *cell, -U8 *rntpPtr, -U8 startRb, -U8 nmbRb, -U16 bw +uint8_t *rntpPtr, +uint8_t startRb, +uint8_t nmbRb, +uint16_t bw ); #endif -PRIVATE Void rgSCHCmnNonDlfsType0Alloc +static Void rgSCHCmnNonDlfsType0Alloc ( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo, RgSchUeCb *ue ); -PRIVATE U8 rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29}; -PRIVATE Void rgSCHCmnUlNonadapRetx ARGS(( +static uint8_t rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29}; +static Void rgSCHCmnUlNonadapRetx ARGS(( RgSchCmnUlCell *cellUl, RgSchUlAlloc *alloc, -U8 idx +uint8_t idx )); -PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ARGS(( +static Void rgSCHCmnUlSfRlsRetxProcs ARGS(( RgSchCellCb *cell, RgSchUlSf *sf )); #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS(( +static S16 rgSCHCmnUlMdfyGrntForCqi ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, -U32 maxRb, -U32 *numSb, -U8 *iTbs, -U32 hqSz, -U32 stepDownItbs, -U32 effTgt +uint32_t maxRb, +uint32_t *numSb, +uint8_t *iTbs, +uint32_t hqSz, +uint32_t stepDownItbs, +uint32_t effTgt )); #endif -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, -U8 tpc +uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, -U8 tpc +uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, -U8 tpc +uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, -U8 tpc +uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, -U8 tpc +uint8_t tpc )); #endif @@ -231,19 +226,19 @@ Void rgSCHCmnDlSpsSch ); /* LTE_ADV_FLAG_REMOVED_END */ -PRIVATE Void rgSCHCmnNonDlfsBcchPcchRbAlloc ARGS(( +static Void rgSCHCmnNonDlfsBcchPcchRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHBcchPcchDlRbAlloc ARGS(( +static Void rgSCHBcchPcchDlRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnDlBcchPcchAlloc ARGS(( +static Void rgSCHCmnDlBcchPcchAlloc ARGS(( RgSchCellCb *cell )); #ifdef RGR_CQI_REPT -PRIVATE Void rgSCHCmnDlCqiOnPucchInd ARGS (( +static Void rgSCHCmnDlCqiOnPucchInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi, @@ -251,7 +246,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd ARGS (( Bool *isCqiAvail, Bool *is2ndCwCqiAvail )); -PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( +static Void rgSCHCmnDlCqiOnPuschInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPusch *puschCqi, @@ -260,12 +255,12 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( Bool *is2ndCwCqiAvail )); #else -PRIVATE Void rgSCHCmnDlCqiOnPucchInd ARGS (( +static Void rgSCHCmnDlCqiOnPucchInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi )); -PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( +static Void rgSCHCmnDlCqiOnPuschInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPusch *puschCqi @@ -274,17 +269,17 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( /* ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #ifdef RGR_CQI_REPT -PRIVATE S16 rgSCHCmnUeDlPwrCtColltCqiRept ARGS(( +static S16 rgSCHCmnUeDlPwrCtColltCqiRept ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCqiRept *ueCqiRept)); #endif /* End of RGR_CQI_REPT */ /* Fix: syed align multiple UEs to refresh at same time */ -PRIVATE Void rgSCHCmnGetRefreshPer ARGS(( +static Void rgSCHCmnGetRefreshPer ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, - U32 *waitPer)); -PRIVATE S16 rgSCHCmnApplyUeRefresh ARGS(( + uint32_t *waitPer)); +static S16 rgSCHCmnApplyUeRefresh ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); #ifdef DL_LA @@ -293,7 +288,7 @@ Void rgSCHCmnDlSetUeAllocLmtLa ARGS RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCheckAndSetTxScheme ARGS +static Void rgSCHCheckAndSetTxScheme ARGS (( RgSchCellCb *cell, RgSchUeCb *ue @@ -301,33 +296,33 @@ RgSchUeCb *ue #endif #ifdef LTE_TDD -PRIVATE U32 rgSCHCmnCalcDwPtsTbSz ARGS +static uint32_t rgSCHCmnCalcDwPtsTbSz ARGS (( RgSchCellCb *cell, -U32 bo, -U8 *rb, -U8 *iTbs, -U8 lyr, -U8 cfi +uint32_t bo, +uint8_t *rb, +uint8_t *iTbs, +uint8_t lyr, +uint8_t cfi )); -PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw ARGS +static Void rgSCHCmnCalcDwPtsTbSz2Cw ARGS (( RgSchCellCb *cell, -U32 bo, -U8 *rb, -U8 maxRb, -U8 *iTbs1, -U8 *iTbs2, -U8 lyr1, -U8 lyr2, -U32 *tb1Sz, -U32 *tb2Sz, -U8 cfi +uint32_t bo, +uint8_t *rb, +uint8_t maxRb, +uint8_t *iTbs1, +uint8_t *iTbs2, +uint8_t lyr1, +uint8_t lyr2, +uint32_t *tb1Sz, +uint32_t *tb2Sz, +uint8_t cfi )); #endif -PRIVATE Void rgSCHCmnInitRbAlloc ARGS +static Void rgSCHCmnInitRbAlloc ARGS (( RgSchCellCb *cell )); @@ -338,165 +333,165 @@ RgSchCellCb *cell /* local defines */ RgSchdApis rgSchCmnApis; -PRIVATE RgUlSchdApis rgSchUlSchdTbl[RGSCH_NUM_SCHEDULERS]; -PRIVATE RgDlSchdApis rgSchDlSchdTbl[RGSCH_NUM_SCHEDULERS]; +static RgUlSchdApis rgSchUlSchdTbl[RGSCH_NUM_SCHEDULERS]; +static RgDlSchdApis rgSchDlSchdTbl[RGSCH_NUM_SCHEDULERS]; #ifdef EMTC_ENABLE -PRIVATE RgUlSchdApis rgSchEmtcUlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; -PRIVATE RgDlEmtcSchdApis rgSchEmtcDlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; +static RgUlSchdApis rgSchEmtcUlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; +static RgDlEmtcSchdApis rgSchEmtcDlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; #endif #ifdef RG_PHASE2_SCHED -PRIVATE RgDlfsSchdApis rgSchDlfsSchdTbl[RGSCH_NUM_DLFS_SCHEDULERS]; +static RgDlfsSchdApis rgSchDlfsSchdTbl[RGSCH_NUM_DLFS_SCHEDULERS]; #endif -PRIVATE RgUlSchdInits rgSchUlSchdInits = RGSCH_ULSCHED_INITS; -PRIVATE RgDlSchdInits rgSchDlSchdInits = RGSCH_DLSCHED_INITS; +RgUlSchdInits rgSchUlSchdInits = RGSCH_ULSCHED_INITS; +RgDlSchdInits rgSchDlSchdInits = RGSCH_DLSCHED_INITS; #ifdef EMTC_ENABLE -PRIVATE RgEmtcUlSchdInits rgSchEmtcUlSchdInits = RGSCH_EMTC_ULSCHED_INITS; -PRIVATE RgEmtcDlSchdInits rgSchEmtcDlSchdInits = RGSCH_EMTC_DLSCHED_INITS; +static RgEmtcUlSchdInits rgSchEmtcUlSchdInits = RGSCH_EMTC_ULSCHED_INITS; +static RgEmtcDlSchdInits rgSchEmtcDlSchdInits = RGSCH_EMTC_DLSCHED_INITS; #endif #if (defined (RG_PHASE2_SCHED) && defined (TFU_UPGRADE)) -PRIVATE RgDlfsSchdInits rgSchDlfsSchdInits = RGSCH_DLFSSCHED_INITS; +static RgDlfsSchdInits rgSchDlfsSchdInits = RGSCH_DLFSSCHED_INITS; #endif typedef Void (*RgSchCmnDlAllocRbFunc) ARGS((RgSchCellCb *cell, RgSchDlSf *subFrm, -RgSchUeCb *ue, U32 bo, U32 *effBo, RgSchDlHqProcCb *proc, +RgSchUeCb *ue, uint32_t bo, uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo)); -typedef U8 (*RgSchCmnDlGetPrecInfFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, - U8 numLyrs, Bool bothCwEnbld)); -PRIVATE Void rgSCHCmnDlAllocTxRbTM1 ARGS(( +typedef uint8_t (*RgSchCmnDlGetPrecInfFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, + uint8_t numLyrs, Bool bothCwEnbld)); +static Void rgSCHCmnDlAllocTxRbTM1 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM2 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM2 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM3 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM3 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM4 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM4 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #ifdef RG_UNUSED -PRIVATE Void rgSCHCmnDlAllocTxRbTM5 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM5 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #endif -PRIVATE Void rgSCHCmnDlAllocTxRbTM6 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM6 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM7 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM7 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM1 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM1 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM2 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM2 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM3 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM3 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM4 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM4 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #ifdef RG_UNUSED -PRIVATE Void rgSCHCmnDlAllocRetxRbTM5 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM5 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #endif -PRIVATE Void rgSCHCmnDlAllocRetxRbTM6 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM6 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM7 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM7 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #ifdef LTE_ADV -PRIVATE U8 rgSchGetN1ResCount ARGS (( +static uint8_t rgSchGetN1ResCount ARGS (( RgSchUeCb *ue, - U16 servCellId + uint16_t servCellId )); Bool rgSchCmnChkDataOnlyOnPcell ( @@ -504,10 +499,10 @@ Bool rgSchCmnChkDataOnlyOnPcell RgSchDlSf *dlSf ); #endif /*LTE_ADV */ -U8 rgSCHCmnCalcPcqiBitSz +uint8_t rgSCHCmnCalcPcqiBitSz ( RgSchUeCb *ueCb, - U8 numTxAnt + uint8_t numTxAnt ); #ifndef LTE_ADV @@ -534,28 +529,28 @@ NULLP, rgSCHCmnDlAllocRetxRbTM6, rgSCHCmnDlAllocRetxRbTM7, NULLP, NULLP}; #endif -PRIVATE U8 rgSCHCmnDlTM3PrecInf2 ARGS(( +static uint8_t rgSCHCmnDlTM3PrecInf2 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, -U8 numTxLyrs, +uint8_t numTxLyrs, Bool bothCwEnbld )); -PRIVATE U8 rgSCHCmnDlTM3PrecInf4 ARGS(( +static uint8_t rgSCHCmnDlTM3PrecInf4 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, -U8 numTxLyrs, +uint8_t numTxLyrs, Bool bothCwEnbld )); -PRIVATE U8 rgSCHCmnDlTM4PrecInf2 ARGS(( +static uint8_t rgSCHCmnDlTM4PrecInf2 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, -U8 numTxLyrs, +uint8_t numTxLyrs, Bool bothCwEnbld )); -PRIVATE U8 rgSCHCmnDlTM4PrecInf4 ARGS(( +static uint8_t rgSCHCmnDlTM4PrecInf4 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, -U8 numTxLyrs, +uint8_t numTxLyrs, Bool bothCwEnbld )); /* Functions specific to each transmission mode for DL RB Allocation*/ @@ -564,144 +559,144 @@ RgSchCmnDlGetPrecInfFunc getPrecInfoFunc[2][2] = { {rgSCHCmnDlTM4PrecInf2, rgSCHCmnDlTM4PrecInf4} }; -PRIVATE S16 rgSCHCmnDlAlloc1CwRetxRb ARGS(( +static S16 rgSCHCmnDlAlloc1CwRetxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, RgSchDlHqTbCb *tbInfo, -U8 noLyr, -U8 *numRb, -U32 *effBo +uint8_t noLyr, +uint8_t *numRb, +uint32_t *effBo )); -PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb ARGS(( +static S16 rgSCHCmnDlAlloc2CwRetxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, RgSchDlHqProcCb *proc, -U8 *numRb, +uint8_t *numRb, Bool *swpFlg, -U32 *effBo +uint32_t *effBo )); -PRIVATE Void rgSCHCmnDlTM3TxTx ARGS(( +static Void rgSCHCmnDlTM3TxTx ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlTM3TxRetx ARGS(( +static Void rgSCHCmnDlTM3TxRetx ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlTM3RetxRetx ARGS(( +static Void rgSCHCmnDlTM3RetxRetx ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc ARGS(( +static Void rgSCHCmnNonDlfsUpdTyp2Alloc ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, -U8 rbStrt, -U8 numRb +uint8_t rbStrt, +uint8_t numRb )); /* LTE_ADV_FLAG_REMOVED_START */ #ifndef LTE_TDD -PRIVATE Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc ARGS(( +static Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, -U8 rbStrt, -U8 numRb +uint8_t rbStrt, +uint8_t numRb )); #endif /* LTE_ADV_FLAG_REMOVED_END */ -PRIVATE Void rgSCHCmnDlRbInfoAddUeTx ARGS(( +static Void rgSCHCmnDlRbInfoAddUeTx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *proc )); -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetx ARGS(( +static Void rgSCHCmnDlRbInfoAddUeRetx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *hqP )); -PRIVATE Void rgSCHCmnDlAdd2NonSchdRetxLst ARGS(( +static Void rgSCHCmnDlAdd2NonSchdRetxLst ARGS(( RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *proc )); -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRetxRb ARGS(( +static S16 rgSCHCmnDlAlloc2CwTxRetxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, RgSchDlHqTbCb *reTxTb, RgSchDlHqTbCb *txTb, -U8 *numRb, -U32 *effBo +uint8_t *numRb, +uint32_t *effBo )); -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb ARGS(( +static S16 rgSCHCmnDlAlloc2CwTxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, RgSchDlHqProcCb *proc, -U32 bo, -U8 *numRb, -U32 *effBo +uint32_t bo, +uint8_t *numRb, +uint32_t *effBo )); -PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb ARGS(( +static S16 rgSCHCmnDlAlloc1CwTxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, RgSchDlHqTbCb *tbInfo, -U32 bo, -U8 *numRb, -U32 *effBo +uint32_t bo, +uint8_t *numRb, +uint32_t *effBo )); #ifndef LTEMAC_SPS -PRIVATE Void rgSCHCmnFillHqPTb ARGS(( +static Void rgSCHCmnFillHqPTb ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, -U8 tbAllocIdx, +uint8_t tbAllocIdx, RgSchPdcch *pdcch )); #endif #ifdef LTEMAC_SPS -PRIVATE Void rgSCHCmnDlGetBestFitHole ARGS(( -U32 *allocMask, -U8 numMaskRbs, -U32 *crntAllocMask, -U8 rbsReq, -U8 *allocStart, -U8 *allocNumRbs, +static Void rgSCHCmnDlGetBestFitHole ARGS(( +uint32_t *allocMask, +uint8_t numMaskRbs, +uint32_t *crntAllocMask, +uint8_t rbsReq, +uint8_t *allocStart, +uint8_t *allocNumRbs, Bool isPartialAlloc )); #ifdef RGSCH_SPS_UNUSED -PRIVATE U32 rgSCHCmnGetRaType1Mask ARGS(( -U8 rbIdx, -U8 rbgSize, -U8 *type1Subset +static uint32_t rgSCHCmnGetRaType1Mask ARGS(( +uint8_t rbIdx, +uint8_t rbgSize, +uint8_t *type1Subset )); #endif -PRIVATE U32 rgSCHCmnGetRaType0Mask ARGS(( -U8 rbIdx, -U8 rbgSize +static uint32_t rgSCHCmnGetRaType0Mask ARGS(( +uint8_t rbIdx, +uint8_t rbgSize )); -PRIVATE U32 rgSCHCmnGetRaType2Mask ARGS(( -U8 rbIdx, -U8 *maskIdx +static uint32_t rgSCHCmnGetRaType2Mask ARGS(( +uint8_t rbIdx, +uint8_t *maskIdx )); #endif @@ -711,54 +706,54 @@ RgSchCellCb *cell, RgSchDlHqProcCb *proc )); -U16 rgSCHCmnGetSiSetId ARGS(( -U16 sfn, -U8 sf, -U16 minPeriodicity +uint16_t rgSCHCmnGetSiSetId ARGS(( +uint16_t sfn, +uint8_t sf, +uint16_t minPeriodicity )); #ifdef RG_5GTF //TODO_SID: Currenly table is only for 100 Prbs. Need to modify wrt VRBG table 8.1.5.2.1-1 V5G_213 -U32 rgSch5gtfTbSzTbl[MAX_5GTF_MCS] = +uint32_t rgSch5gtfTbSzTbl[MAX_5GTF_MCS] = {1864, 5256, 8776, 13176, 17576, 21976, 26376, 31656, 35176, 39576, 43976, 47496, 52776, 59376, 66392}; -U32 g5gtfTtiCnt = 0; -U32 gUl5gtfSrRecv = 0; -U32 gUl5gtfBsrRecv = 0; -U32 gUl5gtfUeSchPick = 0; -U32 gUl5gtfPdcchSchd = 0; -U32 gUl5gtfAllocAllocated = 0; -U32 gUl5gtfUeRbAllocDone = 0; -U32 gUl5gtfUeRmvFnlzZeroBo = 0; -U32 gUl5gtfUeFnlzReAdd = 0; -U32 gUl5gtfPdcchSend = 0; -U32 gUl5gtfRbAllocFail = 0; -U32 ul5gtfsidUlMarkUl = 0; -U32 ul5gtfsidDlSchdPass = 0; -U32 ul5gtfsidDlAlreadyMarkUl = 0; -U32 ul5gtfTotSchdCnt = 0; +uint32_t g5gtfTtiCnt = 0; +uint32_t gUl5gtfSrRecv = 0; +uint32_t gUl5gtfBsrRecv = 0; +uint32_t gUl5gtfUeSchPick = 0; +uint32_t gUl5gtfPdcchSchd = 0; +uint32_t gUl5gtfAllocAllocated = 0; +uint32_t gUl5gtfUeRbAllocDone = 0; +uint32_t gUl5gtfUeRmvFnlzZeroBo = 0; +uint32_t gUl5gtfUeFnlzReAdd = 0; +uint32_t gUl5gtfPdcchSend = 0; +uint32_t gUl5gtfRbAllocFail = 0; +uint32_t ul5gtfsidUlMarkUl = 0; +uint32_t ul5gtfsidDlSchdPass = 0; +uint32_t ul5gtfsidDlAlreadyMarkUl = 0; +uint32_t ul5gtfTotSchdCnt = 0; #endif /* CQI Offset Index to Beta CQI Offset value mapping, * stored as parts per 1000. Reserved is set to 0. * Refer 36.213 sec 8.6.3 Tbl 8.6.3-3 */ -U32 rgSchCmnBetaCqiOffstTbl[16] = {0, 0, 1125, +uint32_t rgSchCmnBetaCqiOffstTbl[16] = {0, 0, 1125, 1250, 1375, 1625, 1750, 2000, 2250, 2500, 2875, 3125, 3500, 4000, 5000, 6250}; -U32 rgSchCmnBetaHqOffstTbl[16] = {2000, 2500, 3125, +uint32_t rgSchCmnBetaHqOffstTbl[16] = {2000, 2500, 3125, 4000, 5000, 6250, 8000,10000, 12625, 15875, 20000, 31000, 50000,80000,126000,0}; -U32 rgSchCmnBetaRiOffstTbl[16] = {1250, 1625, 2000, +uint32_t rgSchCmnBetaRiOffstTbl[16] = {1250, 1625, 2000, 2500, 3125, 4000, 5000, 6250, 8000, 10000,12625, 15875,20000,0,0,0}; S8 rgSchCmnDlCqiDiffOfst[8] = {0, 1, 2, 3, -4, -3, -2, -1}; /* Include CRS REs while calculating Efficiency */ -CONSTANT PRIVATE U8 rgSchCmnAntIdx[5] = {0,0,1,0,2}; -CONSTANT PRIVATE U8 rgSchCmnNumResForCrs[5] = {0,6,12,0,16}; -U32 cfiSwitchCnt ; -U32 cfiIncr ; -U32 cfiDecr ; +const static uint8_t rgSchCmnAntIdx[5] = {0,0,1,0,2}; +const static uint8_t rgSchCmnNumResForCrs[5] = {0,6,12,0,16}; +uint32_t cfiSwitchCnt ; +uint32_t cfiIncr ; +uint32_t cfiDecr ; #ifdef TFU_UPGRADE @@ -770,10 +765,10 @@ typedef struct rgSchCmnDlUeDciFrmtOptns { TfuDciFormat spfcDciFrmt; /* TM(Transmission Mode) specific DCI format. * Search space : UE Specific by C-RNTI only. */ - U8 spfcDciRAType; /* Resource Alloctn(RA) type for spfcDciFrmt */ + uint8_t spfcDciRAType; /* Resource Alloctn(RA) type for spfcDciFrmt */ TfuDciFormat prfrdDciFrmt; /* Preferred DCI format among the available * options for TD (Transmit Diversity) */ - U8 prfrdDciRAType; /* Resource Alloctn(RA) type for prfrdDciFrmt */ + uint8_t prfrdDciRAType; /* Resource Alloctn(RA) type for prfrdDciFrmt */ }RgSchCmnDlUeDciFrmtOptns; #ifndef LTE_ADV @@ -804,15 +799,15 @@ RgSchCmnDlUeDciFrmtOptns rgSchCmnDciFrmtOptns[9] = { typedef struct rgSchCmnDlImcsTbl { - U8 modOdr; /* Modulation Order */ - U8 iTbs; /* ITBS */ + uint8_t modOdr; /* Modulation Order */ + uint8_t iTbs; /* ITBS */ }RgSchCmnDlImcsTbl[29]; -CONSTANT struct rgSchCmnMult235Info +const struct rgSchCmnMult235Info { - U8 match; /* Closest number satisfying 2^a.3^b.5^c, with a bias + uint8_t match; /* Closest number satisfying 2^a.3^b.5^c, with a bias * towards the smaller number */ - U8 prvMatch; /* Closest number not greater than array index + uint8_t prvMatch; /* Closest number not greater than array index * satisfying 2^a.3^b.5^c */ } rgSchCmnMult235Tbl[110+1] = { {0, 0}, /* dummy */ @@ -836,7 +831,7 @@ CONSTANT struct rgSchCmnMult235Info /* R8 Upgrade */ /* BI table from 36.321 Table 7.2.1 */ -CONSTANT PRIVATE S16 rgSchCmnBiTbl[RG_SCH_CMN_NUM_BI_VAL] = { +const static S16 rgSchCmnBiTbl[RG_SCH_CMN_NUM_BI_VAL] = { 0, 10, 20, 30,40,60,80,120,160,240,320,480,960}; RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = { { 0, 0 }, @@ -861,7 +856,7 @@ RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = { /* This table maps a (delta_offset * 2 + 2) to a (beta * 8) * where beta is 10^-(delta_offset/10) rounded off to nearest 1/8 */ -PRIVATE U16 rgSchCmnUlBeta8Tbl[29] = { +static uint16_t rgSchCmnUlBeta8Tbl[29] = { 6, RG_SCH_CMN_UL_INVALID_BETA8, 8, 9, 10, 11, 13, 14, 16, 18, 20, 23, 25, 28, 32, RG_SCH_CMN_UL_INVALID_BETA8, 40, RG_SCH_CMN_UL_INVALID_BETA8, 50, RG_SCH_CMN_UL_INVALID_BETA8, 64, RG_SCH_CMN_UL_INVALID_BETA8, 80, @@ -871,7 +866,7 @@ PRIVATE U16 rgSchCmnUlBeta8Tbl[29] = { #endif /* QCI to SVC priority mapping. Index specifies the Qci*/ -PRIVATE U8 rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO; +static uint8_t rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO; /* The configuration is efficiency measured per 1024 REs. */ /* The first element stands for when CQI is not known */ @@ -882,15 +877,15 @@ PRIVATE U8 rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO; /* ADD CQI to MCS mapping correction * single dimensional array is replaced by 2 dimensions for different CFI*/ -PRIVATE U16 rgSchCmnCqiPdschEff[4][16] = {RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI1, +static uint16_t rgSchCmnCqiPdschEff[4][16] = {RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI1, RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI2,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI3}; -PRIVATE U16 rgSchCmn2LyrCqiPdschEff[4][16] = {RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI1, +static uint16_t rgSchCmn2LyrCqiPdschEff[4][16] = {RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI1, RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI2, RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI3}; /* This configuration determines the transalation of a UEs CQI to its */ /* PDCCH coding efficiency. This may be edited based on the installation */ -PRIVATE U8 rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/ +static uint8_t rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/ /* Indexed by [DciFrmt]. * Considering the following definition in determining the dciFrmt index. @@ -908,10 +903,9 @@ PRIVATE U8 rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/ TFU_DCI_FORMAT_3A } TfuDciFormat; */ -PRIVATE U16 rgSchCmnDciFrmtSizes[10]; +static uint16_t rgSchCmnDciFrmtSizes[10]; - -PRIVATE U16 rgSchCmnCqiPdcchEff[16] = RG_SCH_CMN_CQI_TO_PDCCH_EFF; +static uint16_t rgSchCmnCqiPdcchEff[16] = RG_SCH_CMN_CQI_TO_PDCCH_EFF; #ifdef LTE_TDD @@ -927,7 +921,7 @@ RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl = { /* SPS_INTG_FIX */ #ifdef LTEMAC_SPS -U8 rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = { +uint8_t rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = { /* 0 */ 6, /* 1 */ 7, /* 2 */ 8, @@ -999,7 +993,7 @@ RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl = { /* PDSCH to PUCCH Table for DL Harq Feed back. Based on the Downlink association set index 'K' table */ -U8 rgSchTddPucchTxTbl[7][10] = { +uint8_t rgSchTddPucchTxTbl[7][10] = { {4, 6, 0, 0, 0, 4, 6, 0, 0, 0}, {7, 6, 0, 0, 4, 7, 6, 0, 0, 4}, {7, 6, 0, 4, 8, 7, 6, 0, 4, 8}, @@ -1028,7 +1022,7 @@ U8 rgSchTddPucchTxTbl[7][10] = { So at sf4 the new CFI can be applied. To arrive at sf4 from sf0, the sfIdx has to be increased by 3 */ -U8 rgSchTddPdcchSfIncTbl[7][10] = { +uint8_t rgSchTddPdcchSfIncTbl[7][10] = { /* A/N Bundl: 0,1,5,6*/ {2, 1, 0, 0, 0, 2, 1, 0, 0, 0}, /* A/N Bundl: 0,4,5,9*/ {2, 2, 0, 0, 3, 2, 2, 0, 0, 3}, /* A/N Bundl: 4,9*/ {3, 6, 0, 5, 4, 3, 6, 0, 5, 4}, @@ -1083,7 +1077,7 @@ RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = { #endif /* (LTEMAC_SPS ) */ /* Number of Uplink subframes Table */ -PRIVATE U8 rgSchTddNumUlSf[] = {6, 4, 2, 3, 2, 1, 5}; +static uint8_t rgSchTddNumUlSf[] = {6, 4, 2, 3, 2, 1, 5}; /* Downlink HARQ processes Table */ RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl = { 7, 4, 2, 3, 2, 1, 6}; @@ -1206,17 +1200,17 @@ RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl = { /* DwPTS Scheduling Changes Start */ /* Provides the number of Cell Reference Signals in DwPTS * region per RB */ -PRIVATE U8 rgSchCmnDwptsCrs[2][3] = {/* [Spl Sf cfg][Ant Port] */ +static uint8_t rgSchCmnDwptsCrs[2][3] = {/* [Spl Sf cfg][Ant Port] */ {4, 8, 16}, /* Spl Sf cfg 1,2,3,6,7,8 */ {6, 12, 20}, /* Spl Sf cfg 4 */ }; -PRIVATE S8 rgSchCmnSplSfDeltaItbs[9] = RG_SCH_DWPTS_ITBS_ADJ; +static S8 rgSchCmnSplSfDeltaItbs[9] = RG_SCH_DWPTS_ITBS_ADJ; /* DwPTS Scheduling Changes End */ #endif -PRIVATE U32 rgSchCmnBsrTbl[64] = { +static uint32_t rgSchCmnBsrTbl[64] = { 0, 10, 12, 14, 17, 19, 22, 26, 31, 36, 42, 49, 57, 67, 78, 91, 107, 125, 146, 171, 200, 234, 274, 321, @@ -1227,7 +1221,7 @@ PRIVATE U32 rgSchCmnBsrTbl[64] = { 58255, 68201, 79846, 93479, 109439, 128125, 150000, 220000 }; -PRIVATE U32 rgSchCmnExtBsrTbl[64] = { +static uint32_t rgSchCmnExtBsrTbl[64] = { 0, 10, 13, 16, 19, 23, 29, 35, 43, 53, 65, 80, 98, 120, 147, 181, 223, 274, 337, 414, 509, 625, 769, 945, @@ -1238,7 +1232,7 @@ PRIVATE U32 rgSchCmnExtBsrTbl[64] = { 867737, 1067031, 1312097, 1613447, 1984009, 2439678, 3000000, 3100000 }; -U8 rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI]; +uint8_t rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI]; RgSchTbSzTbl rgTbSzTbl = { { @@ -1338,9 +1332,9 @@ RgSchUeCatTbl rgUeCatTbl = { /* [ccpu00138532]-ADD-The below table stores the min HARQ RTT time in Downlink for TDD and FDD. Indices 0 to 6 map to tdd UL DL config 0-6. Index 7 map to FDD */ -U8 rgSchCmnHarqRtt[8] = {4,7,10,9,12,15,6,8}; +uint8_t rgSchCmnHarqRtt[8] = {4,7,10,9,12,15,6,8}; /* Number of CFI Switchover Index is equals to 7 TDD Indexes + 1 FDD index */ -U8 rgSchCfiSwitchOvrWinLen[] = {7, 4, 2, 3, 2, 1, 6, 8}; +uint8_t rgSchCfiSwitchOvrWinLen[] = {7, 4, 2, 3, 2, 1, 6, 8}; /* EffTbl is calculated for single layer and two layers. * CqiToTbs is calculated for single layer and two layers */ @@ -1365,158 +1359,158 @@ RgSchRaPrmblToRaFrmTbl rgRaPrmblToRaFrmTbl = {1, 2, 2, 3, 1}; RgSchRaPrmblToRaFrmTbl rgRaPrmblToRaFrmTbl = {1, 2, 2, 3}; #endif -EXTERN RgUlSchdInits rgSchUlSchdInits; -EXTERN RgDlSchdInits rgSchDlSchdInits; -EXTERN RgDlfsSchdInits rgSchDlfsSchdInits; + RgUlSchdInits rgSchUlSchdInits; + RgDlSchdInits rgSchDlSchdInits; + RgDlfsSchdInits rgSchDlfsSchdInits; #ifdef EMTC_ENABLE -EXTERN RgEmtcUlSchdInits rgSchEmtcUlSchdInits; -EXTERN RgEmtcDlSchdInits rgSchEmtcDlSchdInits; + RgEmtcUlSchdInits rgSchEmtcUlSchdInits; + RgEmtcDlSchdInits rgSchEmtcDlSchdInits; #endif /* RACHO : start */ -PRIVATE S16 rgSCHCmnUeIdleExdThrsld ARGS(( +static S16 rgSCHCmnUeIdleExdThrsld ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); RgSchUeCb* rgSCHCmnGetHoUe ARGS(( RgSchCellCb *cell, -U16 rapId +uint16_t rapId )); -PRIVATE Void rgSCHCmnDelDedPreamble ARGS(( +static Void rgSCHCmnDelDedPreamble ARGS(( RgSchCellCb *cell, -U8 preambleId +uint8_t preambleId )); RgSchUeCb* rgSCHCmnGetPoUe ARGS(( RgSchCellCb *cell, -U16 rapId, +uint16_t rapId, CmLteTimingInfo timingInfo )); -PRIVATE Void rgSCHCmnDelRachInfo ARGS(( +static Void rgSCHCmnDelRachInfo ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe ARGS(( +static S16 rgSCHCmnUlRbAllocForPoHoUe ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUeCb *ue, -U8 maxRb +uint8_t maxRb )); -PRIVATE Void rgSCHCmnHdlHoPo ARGS(( +static Void rgSCHCmnHdlHoPo ARGS(( RgSchCellCb *cell, CmLListCp *raRspLst, RgSchRaReqInfo *raReq )); -PRIVATE Void rgSCHCmnAllocPoHoGrnt ARGS(( +static Void rgSCHCmnAllocPoHoGrnt ARGS(( RgSchCellCb *cell, CmLListCp *raRspLst, RgSchUeCb *ue, RgSchRaReqInfo *raReq )); -PRIVATE Void rgSCHCmnFillPdcchOdr2Sf ARGS(( +static Void rgSCHCmnFillPdcchOdr2Sf ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchPdcch *pdcc, -U8 rapId, -U8 prachMskIdx +uint8_t rapId, +uint8_t prachMskIdx )); -PRIVATE Void rgSCHCmnDlAdd2PdcchOdrQ ARGS(( +static Void rgSCHCmnDlAdd2PdcchOdrQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCmnDlRmvFrmPdcchOdrQ ARGS(( +static Void rgSCHCmnDlRmvFrmPdcchOdrQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCmnUpdNxtPrchMskIdx ARGS(( +static Void rgSCHCmnUpdNxtPrchMskIdx ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnUpdRachParam ARGS(( +static Void rgSCHCmnUpdRachParam ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnAllocPOParam ARGS(( +static S16 rgSCHCmnAllocPOParam ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchUeCb *ue, RgSchPdcch **pdcch, -U8 *rapId, -U8 *prachMskIdx +uint8_t *rapId, +uint8_t *prachMskIdx )); -PRIVATE Void rgSCHCmnGenPdcchOrder ARGS(( +static Void rgSCHCmnGenPdcchOrder ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf )); -PRIVATE Void rgSCHCmnCfgRachDedPrm ARGS(( +static Void rgSCHCmnCfgRachDedPrm ARGS(( RgSchCellCb *cell )); /* RACHO : end */ -PRIVATE Void rgSCHCmnHdlUlInactUes ARGS(( +static Void rgSCHCmnHdlUlInactUes ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnHdlDlInactUes ARGS(( +static Void rgSCHCmnHdlDlInactUes ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnUlInit ARGS((Void +static Void rgSCHCmnUlInit ARGS((Void )); -PRIVATE Void rgSCHCmnDlInit ARGS((Void +static Void rgSCHCmnDlInit ARGS((Void )); -PRIVATE Void rgSCHCmnInitDlRbAllocInfo ARGS(( +static Void rgSCHCmnInitDlRbAllocInfo ARGS(( RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUpdUlCompEffBsr ARGS(( +static Void rgSCHCmnUpdUlCompEffBsr ARGS(( RgSchUeCb *ue )); #if RG_UNUSED -PRIVATE Void rgSCHCmnUlSetAllUnSched ARGS(( +static Void rgSCHCmnUlSetAllUnSched ARGS(( RgSchCmnUlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUlUpdSf ARGS(( +static Void rgSCHCmnUlUpdSf ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, RgSchUlSf *sf )); -PRIVATE Void rgSCHCmnUlHndlAllocRetx ARGS(( +static Void rgSCHCmnUlHndlAllocRetx ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, RgSchUlSf *sf, RgSchUlAlloc *alloc )); #endif -PRIVATE Void rgSCHCmnGrpPwrCntrlPucch ARGS(( +static Void rgSCHCmnGrpPwrCntrlPucch ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf )); -PRIVATE Void rgSCHCmnGrpPwrCntrlPusch ARGS(( +static Void rgSCHCmnGrpPwrCntrlPusch ARGS(( RgSchCellCb *cell, RgSchUlSf *ulSf )); -PRIVATE Void rgSCHCmnDelUeFrmRefreshQ ARGS(( +static Void rgSCHCmnDelUeFrmRefreshQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE S16 rgSCHCmnTmrExpiry ARGS(( +static S16 rgSCHCmnTmrExpiry ARGS(( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ )); -PRIVATE S16 rgSCHCmnTmrProc ARGS(( +static S16 rgSCHCmnTmrProc ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnAddUeToRefreshQ ARGS(( +static Void rgSCHCmnAddUeToRefreshQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, -U32 wait +uint32_t wait )); -PRIVATE Void rgSCHCmnDlCcchRetx ARGS(( +static Void rgSCHCmnDlCcchRetx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUpdUeMimoInfo ARGS(( +static Void rgSCHCmnUpdUeMimoInfo ARGS(( RgrUeCfg *ueCfg, RgSchCmnDlUe *ueDl, RgSchCellCb *cell, RgSchCmnCell *cellSchd )); -PRIVATE Void rgSCHCmnUpdUeUlCqiInfo ARGS(( +static Void rgSCHCmnUpdUeUlCqiInfo ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchCmnUlUe *ueUl, @@ -1525,66 +1519,66 @@ RgSchCmnCell *cellSchd, Bool isEcp )); #ifdef RGR_V1 -PRIVATE Void rgSCHCmnDlCcchSduRetx ARGS(( +static Void rgSCHCmnDlCcchSduRetx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnDlCcchSduTx ARGS(( +static Void rgSCHCmnDlCcchSduTx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnCcchSduAlloc ARGS(( +static S16 rgSCHCmnCcchSduAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnCcchSduDedAlloc ARGS(( +static S16 rgSCHCmnCcchSduDedAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb )); -PRIVATE S16 rgSCHCmnNonDlfsCcchSduRbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsCcchSduRbAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, RgSchDlSf *dlSf )); #endif -PRIVATE Void rgSCHCmnInitVars ARGS(( +static Void rgSCHCmnInitVars ARGS(( RgSchCellCb *cell )); /*ccpu00117180 - DEL - Moved rgSCHCmnUpdVars to .x as its access is now */ -PRIVATE Void rgSCHCmnUlRbAllocForLst ARGS(( +static Void rgSCHCmnUlRbAllocForLst ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, - U32 count, + uint32_t count, CmLListCp *reqLst, CmLListCp *schdLst, CmLListCp *nonSchdLst, Bool isNewTx )); -PRIVATE S16 rgSCHCmnUlRbAllocForUe ARGS(( +static S16 rgSCHCmnUlRbAllocForUe ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUeCb *ue, - U8 maxRb, + uint8_t maxRb, RgSchUlHole *hole )); -PRIVATE Void rgSCHCmnMsg3GrntReq ARGS(( +static Void rgSCHCmnMsg3GrntReq ARGS(( RgSchCellCb *cell, CmLteRnti rnti, Bool preamGrpA, RgSchUlHqProcCb *hqProc, RgSchUlAlloc **ulAllocRef, - U8 *hqProcIdRef + uint8_t *hqProcIdRef )); -PRIVATE Void rgSCHCmnDlCcchRarAlloc ARGS(( +static Void rgSCHCmnDlCcchRarAlloc ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnDlCcchTx ARGS(( +static Void rgSCHCmnDlCcchTx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnDlBcchPcch ARGS(( +static Void rgSCHCmnDlBcchPcch ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc @@ -1598,83 +1592,83 @@ Bool rgSCHCmnChkPastWin ARGS(( CmLteTimingInfo frm, CmLteTimingInfo end )); -PRIVATE Void rgSCHCmnClcAlloc ARGS(( +static Void rgSCHCmnClcAlloc ARGS(( RgSchCellCb *cell, RgSchDlSf *sf, RgSchClcDlLcCb *lch, -U16 rnti, +uint16_t rnti, RgSchCmnDlRbAllocInfo *allocInfo )); #ifndef LTEMAC_SPS -PRIVATE Void rgSCHCmnClcRbAlloc ARGS(( +static Void rgSCHCmnClcRbAlloc ARGS(( RgSchCellCb *cell, -U32 bo, -U8 cqi, -U8 *rb, -U32 *tbs, -U8 *mcs, +uint32_t bo, +uint8_t cqi, +uint8_t *rb, +uint32_t *tbs, +uint8_t *mcs, RgSchDlSf *sf )); #endif -PRIVATE S16 rgSCHCmnMsg4Alloc ARGS(( +static S16 rgSCHCmnMsg4Alloc ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnMsg4DedAlloc ARGS(( +static S16 rgSCHCmnMsg4DedAlloc ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb )); -PRIVATE Void rgSCHCmnDlRaRsp ARGS(( +static Void rgSCHCmnDlRaRsp ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnRaRspAlloc ARGS(( +static S16 rgSCHCmnRaRspAlloc ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, -U16 rntiIdx, -U16 rarnti, -U8 noRaRnti, +uint16_t rntiIdx, +uint16_t rarnti, +uint8_t noRaRnti, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUlUeDelAllocs ARGS(( +static Void rgSCHCmnUlUeDelAllocs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCmnDlSetUeAllocLmt ARGS(( +static Void rgSCHCmnDlSetUeAllocLmt ARGS(( RgSchCellCb *cell, RgSchCmnDlUe *ueDl, Bool isEmtcUe )); -PRIVATE S16 rgSCHCmnDlRgrCellCfg ARGS(( +static S16 rgSCHCmnDlRgrCellCfg ARGS(( RgSchCellCb *cell, RgrCellCfg *cfg, RgSchErrInfo *err )); -PRIVATE Void rgSCHCmnUlAdapRetx ARGS(( +static Void rgSCHCmnUlAdapRetx ARGS(( RgSchUlAlloc *alloc, RgSchUlHqProcCb *proc )); -PRIVATE Void rgSCHCmnUlUpdAllocRetx ARGS(( +static Void rgSCHCmnUlUpdAllocRetx ARGS(( RgSchCellCb *cell, RgSchUlAlloc *alloc )); -PRIVATE Void rgSCHCmnUlSfReTxAllocs ARGS(( +static Void rgSCHCmnUlSfReTxAllocs ARGS(( RgSchCellCb *cell, RgSchUlSf *sf )); /* Fix: syed Adaptive Msg3 Retx crash. */ #ifdef TFU_UPGRADE -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS +static Void rgSCHCmnDlHdlTxModeRecfg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, -U8 numTxPorts +uint8_t numTxPorts )); #else -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS +static Void rgSCHCmnDlHdlTxModeRecfg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1687,154 +1681,154 @@ RgrUeRecfg *ueRecfg * DL RB allocation specific functions */ -PRIVATE Void rgSCHCmnDlRbAlloc ARGS(( +static Void rgSCHCmnDlRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnNonDlfsRbAlloc ARGS(( +static Void rgSCHCmnNonDlfsRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsCmnRbAlloc ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *cmnAllocInfo)); #ifndef LTE_TDD -PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj ARGS(( +static Void rgSCHCmnNonDlfsPbchRbAllocAdj ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *cmnAllocInfo, -U8 pbchSsRsSym, +uint8_t pbchSsRsSym, Bool isBcchPcch )); /* Added function to adjust TBSize*/ -PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj ARGS(( +static Void rgSCHCmnNonDlfsPbchTbSizeAdj ARGS(( RgSchDlRbAlloc *allocInfo, -U8 numOvrlapgPbchRb, -U8 pbchSsRsSym, -U8 idx, -U32 bytesReq +uint8_t numOvrlapgPbchRb, +uint8_t pbchSsRsSym, +uint8_t idx, +uint32_t bytesReq )); /* Added function to find num of overlapping PBCH rb*/ -PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs ARGS(( +static Void rgSCHCmnFindNumPbchOvrlapRbs ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo, -U8 *numOvrlapgPbchRb +uint8_t *numOvrlapgPbchRb )); -PRIVATE U8 rgSCHCmnFindNumAddtlRbsAvl ARGS(( +static uint8_t rgSCHCmnFindNumAddtlRbsAvl ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo )); #ifdef DEBUGP #ifdef UNUSED_FUNC -PRIVATE Void rgSCHCmnFindCodeRate ARGS(( +static Void rgSCHCmnFindCodeRate ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo, -U8 idx +uint8_t idx )); #endif #endif #endif -PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc ARGS(( +static Void rgSCHCmnNonDlfsMsg4Alloc ARGS(( RgSchCellCb *cell, RgSchCmnMsg4RbAlloc *msg4AllocInfo, -U8 isRetx +uint8_t isRetx )); -PRIVATE S16 rgSCHCmnNonDlfsMsg4RbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsMsg4RbAlloc ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchDlSf *dlSf )); -PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsUeRbAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlSf *dlSf, -U8 *isDlBwAvail +uint8_t *isDlBwAvail )); #ifndef LTEMAC_SPS -PRIVATE U32 rgSCHCmnCalcRiv ARGS(( U8 bw, - U8 rbStart, - U8 numRb)); +static uint32_t rgSCHCmnCalcRiv ARGS(( uint8_t bw, + uint8_t rbStart, + uint8_t numRb)); #endif #ifdef LTE_TDD -PRIVATE Void rgSCHCmnUpdHqAndDai ARGS(( +static Void rgSCHCmnUpdHqAndDai ARGS(( RgSchDlHqProcCb *hqP, RgSchDlSf *subFrm, RgSchDlHqTbCb *tbCb, -U8 tbAllocIdx +uint8_t tbAllocIdx )); -PRIVATE S16 rgSCHCmnUlCalcAvailBw ARGS(( +static S16 rgSCHCmnUlCalcAvailBw ARGS(( RgSchCellCb *cell, RgrCellCfg *cellCfg, -U8 cfi, -U8 *rbStartRef, -U8 *bwAvailRef +uint8_t cfi, +uint8_t *rbStartRef, +uint8_t *bwAvailRef )); -PRIVATE S16 rgSCHCmnDlKdashUlAscInit ARGS(( +static S16 rgSCHCmnDlKdashUlAscInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlANFdbkInit ARGS(( +static S16 rgSCHCmnDlANFdbkInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlNpValInit ARGS(( +static S16 rgSCHCmnDlNpValInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlCreateRachPrmLst ARGS(( +static S16 rgSCHCmnDlCreateRachPrmLst ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlCpyRachInfo ARGS(( +static S16 rgSCHCmnDlCpyRachInfo ARGS(( RgSchCellCb *cell, RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES], -U8 raArrSz +uint8_t raArrSz )); -PRIVATE S16 rgSCHCmnDlRachInfoInit ARGS(( +static S16 rgSCHCmnDlRachInfoInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlPhichOffsetInit ARGS(( +static S16 rgSCHCmnDlPhichOffsetInit ARGS(( RgSchCellCb *cell )); #endif #ifdef TFU_UPGRADE -PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt ARGS +static Void rgSCHCmnFindUlCqiUlTxAnt ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, - U8 wideCqi + uint8_t wideCqi )); - PRIVATE RgSchCmnRank rgSCHCmnComputeRank ARGS + static RgSchCmnRank rgSCHCmnComputeRank ARGS (( RgrTxMode txMode, - U32 *pmiBitMap, - U8 numTxPorts + uint32_t *pmiBitMap, + uint8_t numTxPorts )); - PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3 ARGS + static RgSchCmnRank rgSCHCmnComp2TxMode3 ARGS (( - U32 *pmiBitMap + uint32_t *pmiBitMap )); - PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3 ARGS + static RgSchCmnRank rgSCHCmnComp4TxMode3 ARGS (( - U32 *pmiBitMap + uint32_t *pmiBitMap )); - PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4 ARGS + static RgSchCmnRank rgSCHCmnComp2TxMode4 ARGS (( - U32 *pmiBitMap + uint32_t *pmiBitMap )); - PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4 ARGS + static RgSchCmnRank rgSCHCmnComp4TxMode4 ARGS (( - U32 *pmiBitMap + uint32_t *pmiBitMap )); - PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr ARGS + static uint8_t rgSCHCmnCalcWcqiFrmSnr ARGS (( RgSchCellCb *cell, TfuSrsRpt *srsRpt @@ -1855,33 +1849,19 @@ PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt ARGS * * Invoked by: Scheduler * - * @param[in] U8 noPdcchSym - * @param[in] U8 cpType - * @param[in] U8 txAntIdx + * @param[in] uint8_t noPdcchSym + * @param[in] uint8_t cpType + * @param[in] uint8_t txAntIdx * @param[in] RgSchCmnTbSzEff* effTbl * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnCompEff -( -U8 noPdcchSym, -U8 cpType, -U8 txAntIdx, -RgSchCmnTbSzEff *effTbl -) -#else -PRIVATE Void rgSCHCmnCompEff(noPdcchSym, cpType, txAntIdx, effTbl) -U8 noPdcchSym; -U8 cpType; -U8 txAntIdx; -RgSchCmnTbSzEff *effTbl; -#endif +static Void rgSCHCmnCompEff(uint8_t noPdcchSym,uint8_t cpType,uint8_t txAntIdx,RgSchCmnTbSzEff *effTbl) { - U8 noResPerRb; - U8 noSymPerRb; - U8 resOfCrs; /* Effective REs occupied by CRS */ - U8 i, j; + uint8_t noResPerRb; + uint8_t noSymPerRb; + uint8_t resOfCrs; /* Effective REs occupied by CRS */ + uint8_t i, j; switch (cpType) @@ -1894,7 +1874,7 @@ RgSchCmnTbSzEff *effTbl; break; default: /* Generate a log error. This case should never be executed */ - RETVOID; + return; } /* Depending on the Tx Antenna Index, deduct the @@ -1912,7 +1892,7 @@ RgSchCmnTbSzEff *effTbl; break; default: /* Generate a log error. This case should never be executed */ - RETVOID; + return; } noResPerRb = ((noSymPerRb - noPdcchSym) * RB_SCH_CMN_NUM_SCS_PER_RB) - resOfCrs; for (i = 0; i < RG_SCH_CMN_NUM_TBS; i++) @@ -1925,7 +1905,7 @@ RgSchCmnTbSzEff *effTbl; } (*effTbl)[i] /= RG_SCH_CMN_NUM_RBS; } - RETVOID; + return; } /** * @brief This function computes efficiency and stores in a table. @@ -1939,30 +1919,18 @@ RgSchCmnTbSzEff *effTbl; * * Invoked by: Scheduler * - * @param[in] U8 noUlRsSym - * @param[in] U8 cpType - * @param[in] U8 txAntIdx + * @param[in] uint8_t noUlRsSym + * @param[in] uint8_t cpType + * @param[in] uint8_t txAntIdx * @param[in] RgSchCmnTbSzEff* effTbl * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnCompUlEff -( -U8 noUlRsSym, -U8 cpType, -RgSchCmnTbSzEff *effTbl -) -#else -PRIVATE Void rgSCHCmnCompUlEff(noUlRsSym, cpType, effTbl) -U8 noUlRsSym; -U8 cpType; -RgSchCmnTbSzEff *effTbl; -#endif +static Void rgSCHCmnCompUlEff(uint8_t noUlRsSym,uint8_t cpType,RgSchCmnTbSzEff *effTbl) { - U8 noResPerRb; - U8 noSymPerRb; - U8 i, j; + uint8_t noResPerRb; + uint8_t noSymPerRb; + uint8_t i, j; switch (cpType) @@ -1975,7 +1943,7 @@ RgSchCmnTbSzEff *effTbl; break; default: /* Generate a log error. This case should never be executed */ - RETVOID; + return; } noResPerRb = ((noSymPerRb - noUlRsSym) * RB_SCH_CMN_NUM_SCS_PER_RB); @@ -1989,7 +1957,7 @@ RgSchCmnTbSzEff *effTbl; } (*effTbl)[i] /= RG_SCH_CMN_NUM_RBS; } - RETVOID; + return; } /** @@ -2004,33 +1972,19 @@ RgSchCmnTbSzEff *effTbl; * * Invoked by: Scheduler * - * @param[in] U8 noPdcchSym - * @param[in] U8 cpType - * @param[in] U8 txAntIdx + * @param[in] uint8_t noPdcchSym + * @param[in] uint8_t cpType + * @param[in] uint8_t txAntIdx * @param[in] RgSchCmnTbSzEff* effTbl2Lyr * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmn2LyrCompEff -( -U8 noPdcchSym, -U8 cpType, -U8 txAntIdx, -RgSchCmnTbSzEff *effTbl2Lyr -) -#else -PRIVATE Void rgSCHCmn2LyrCompEff(noPdcchSym, cpType, txAntIdx, effTbl2Lyr) -U8 noPdcchSym; -U8 cpType; -U8 txAntIdx; -RgSchCmnTbSzEff *effTbl2Lyr; -#endif +static Void rgSCHCmn2LyrCompEff(uint8_t noPdcchSym,uint8_t cpType,uint8_t txAntIdx,RgSchCmnTbSzEff *effTbl2Lyr) { - U8 noResPerRb; - U8 noSymPerRb; - U8 resOfCrs; /* Effective REs occupied by CRS */ - U8 i, j; + uint8_t noResPerRb; + uint8_t noSymPerRb; + uint8_t resOfCrs; /* Effective REs occupied by CRS */ + uint8_t i, j; switch (cpType) @@ -2043,7 +1997,7 @@ RgSchCmnTbSzEff *effTbl2Lyr; break; default: /* Generate a log error. This case should never be executed */ - RETVOID; + return; } /* Depending on the Tx Antenna Index, deduct the @@ -2061,7 +2015,7 @@ RgSchCmnTbSzEff *effTbl2Lyr; break; default: /* Generate a log error. This case should never be executed */ - RETVOID; + return; } noResPerRb = ((noSymPerRb - noPdcchSym) * RB_SCH_CMN_NUM_SCS_PER_RB) - resOfCrs; @@ -2075,7 +2029,7 @@ RgSchCmnTbSzEff *effTbl2Lyr; } (*effTbl2Lyr)[i] /= RG_SCH_CMN_NUM_RBS; } - RETVOID; + return; } @@ -2094,15 +2048,7 @@ RgSchCmnTbSzEff *effTbl2Lyr; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnGetDciFrmtSizes -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnGetDciFrmtSizes(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnGetDciFrmtSizes(RgSchCellCb *cell) { @@ -2222,7 +2168,7 @@ RgSchCellCb *cell; /* DCI Format 3A size determination */ rgSchCmnDciFrmtSizes[9] = rgSchCmnDciFrmtSizes[0]; - RETVOID; + return; } @@ -2239,26 +2185,18 @@ RgSchCellCb *cell; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnGetCqiDciFrmt2AggrLvl -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnGetCqiDciFrmt2AggrLvl(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnGetCqiDciFrmt2AggrLvl(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U8 i; - U8 j; + uint8_t i; + uint8_t j; for (i = 0; i < RG_SCH_CMN_MAX_CQI; i++) { for (j = 0; j < 10; j++) { - U32 pdcchBits; /* Actual number of phy bits needed for a given DCI Format + uint32_t pdcchBits; /* Actual number of phy bits needed for a given DCI Format * for a given CQI Level */ pdcchBits = (rgSchCmnDciFrmtSizes[j] * 1024)/rgSchCmnCqiPdcchEff[i]; /* V5G_211 : 6.6 */ @@ -2280,7 +2218,7 @@ RgSchCellCb *cell; cellSch->dciAggrLvl[i][j] = CM_LTE_AGGR_LVL16; } } - RETVOID; + return; } /** @@ -2299,20 +2237,14 @@ RgSchCellCb *cell; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlInit -( -) -#else -PRIVATE Void rgSCHCmnDlInit() -#endif +static Void rgSCHCmnDlInit() { - U8 i; - S16 j; - S16 k; - U8 idx; - RgSchCmnTbSzEff *effTbl; - RgSchCmnCqiToTbs *tbsTbl; + uint8_t i; + S16 j; + S16 k; + uint8_t idx; + RgSchCmnTbSzEff *effTbl; + RgSchCmnCqiToTbs *tbsTbl; /* 0 corresponds to Single layer case, 1 corresponds to 2 layers case*/ @@ -2372,9 +2304,9 @@ PRIVATE Void rgSCHCmnDlInit() for (i = 0; i < RG_SCH_CMN_MAX_CFI; i++) { /* EfficiencyTbl calculation incase of 2 layers for normal CP */ - rgSCHCmnCompEff((U8)(i + 1), RG_SCH_CMN_NOR_CP, idx,\ + rgSCHCmnCompEff((uint8_t)(i + 1), RG_SCH_CMN_NOR_CP, idx,\ rgSchCmnEffTbl[0][RG_SCH_CMN_NOR_CP][idx][i]); - rgSCHCmn2LyrCompEff((U8)(i + 1), RG_SCH_CMN_NOR_CP, idx, \ + rgSCHCmn2LyrCompEff((uint8_t)(i + 1), RG_SCH_CMN_NOR_CP, idx, \ rgSchCmnEffTbl[1][RG_SCH_CMN_NOR_CP][idx][i]); } } @@ -2392,7 +2324,7 @@ PRIVATE Void rgSCHCmnDlInit() * single dimensional array is replaced by 2 dimensions for different CFI*/ if ((*effTbl)[j] <= rgSchCmnCqiPdschEff[i][k]) { - (*tbsTbl)[k--] = (U8)j; + (*tbsTbl)[k--] = (uint8_t)j; } } for (; k > 0; --k) @@ -2409,7 +2341,7 @@ PRIVATE Void rgSCHCmnDlInit() * single dimensional array is replaced by 2 dimensions for different CFI*/ if ((*effTbl)[j] <= rgSchCmn2LyrCqiPdschEff[i][k]) { - (*tbsTbl)[k--] = (U8)j; + (*tbsTbl)[k--] = (uint8_t)j; } } for (; k > 0; --k) @@ -2475,9 +2407,9 @@ PRIVATE Void rgSCHCmnDlInit() for (i = 0; i < RG_SCH_CMN_MAX_CFI; i++) { /* EfficiencyTbl calculation incase of 2 layers for extendedl CP */ - rgSCHCmnCompEff( (U8)(i + 1 ), (U8)RG_SCH_CMN_EXT_CP, idx,\ + rgSCHCmnCompEff( (uint8_t)(i + 1 ), (uint8_t)RG_SCH_CMN_EXT_CP, idx,\ rgSchCmnEffTbl[0][RG_SCH_CMN_EXT_CP][idx][i]); - rgSCHCmn2LyrCompEff((U8)(i + 1), (U8) RG_SCH_CMN_EXT_CP,idx, \ + rgSCHCmn2LyrCompEff((uint8_t)(i + 1), (uint8_t) RG_SCH_CMN_EXT_CP,idx, \ rgSchCmnEffTbl[1][RG_SCH_CMN_EXT_CP][idx][i]); } } @@ -2495,7 +2427,7 @@ PRIVATE Void rgSCHCmnDlInit() * single dimensional array is replaced by 2 dimensions for different CFI*/ if ((*effTbl)[j] <= rgSchCmnCqiPdschEff[i][k]) { - (*tbsTbl)[k--] = (U8)j; + (*tbsTbl)[k--] = (uint8_t)j; } } for (; k > 0; --k) @@ -2512,7 +2444,7 @@ PRIVATE Void rgSCHCmnDlInit() * single dimensional array is replaced by 2 dimensions for different CFI*/ if ((*effTbl)[j] <= rgSchCmn2LyrCqiPdschEff[i][k]) { - (*tbsTbl)[k--] = (U8)j; + (*tbsTbl)[k--] = (uint8_t)j; } } for (; k > 0; --k) @@ -2521,7 +2453,7 @@ PRIVATE Void rgSCHCmnDlInit() } } } - RETVOID; + return; } /** @@ -2540,17 +2472,11 @@ PRIVATE Void rgSCHCmnDlInit() * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlInit -( -) -#else -PRIVATE Void rgSCHCmnUlInit() -#endif +static Void rgSCHCmnUlInit() { - U8 *mapTbl = &rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_NOR_CP][0]; + uint8_t *mapTbl = &rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_NOR_CP][0]; RgSchCmnTbSzEff *effTbl = &rgSchCmnNorUlEff[0]; - CONSTANT RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0]; + const RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0]; S16 i; S16 j; @@ -2566,7 +2492,7 @@ PRIVATE Void rgSCHCmnUlInit() { if ((*effTbl)[i] <= cqiTbl[j].eff) { - mapTbl[j--] = (U8)i; + mapTbl[j--] = (uint8_t)i; } } for (; j > 0; --j) @@ -2588,7 +2514,7 @@ PRIVATE Void rgSCHCmnUlInit() { if ((*effTbl)[i] <= cqiTbl[j].eff) { - mapTbl[j--] = (U8)i; + mapTbl[j--] = (uint8_t)i; } } for (; j > 0; --j) @@ -2596,7 +2522,7 @@ PRIVATE Void rgSCHCmnUlInit() mapTbl[j] = 0; } rgSCHPwrInit(); - RETVOID; + return; } /** @@ -2615,15 +2541,9 @@ PRIVATE Void rgSCHCmnUlInit() * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnInit -( -) -#else Void rgSCHCmnInit() -#endif { - U8 idx; + uint8_t idx; rgSCHCmnDlInit(); rgSCHCmnUlInit(); @@ -2716,7 +2636,7 @@ Void rgSCHCmnInit() rgSchCmnApis.rgSCHRgrSCellUeCfg = rgSCHCmnRgrSCellUeCfg; rgSchCmnApis.rgSCHRgrSCellUeDel = rgSCHCmnRgrSCellUeDel; #endif - RETVOID; + return; } @@ -2735,20 +2655,10 @@ Void rgSCHCmnInit() * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnDlRlsSubFrm -( -RgSchCellCb *cell, -CmLteTimingInfo frm -) -#else -Void rgSCHCmnDlRlsSubFrm(cell, frm) -RgSchCellCb *cell; -CmLteTimingInfo frm; -#endif +Void rgSCHCmnDlRlsSubFrm(RgSchCellCb *cell,CmLteTimingInfo frm) { - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - RgSchDlSf *sf; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + RgSchDlSf *sf; /* Get the pointer to the subframe */ @@ -2760,7 +2670,7 @@ CmLteTimingInfo frm; /* Re-initialize DLFS specific information for the sub-frame */ cellSch->apisDlfs->rgSCHDlfsReinitSf(cell, sf); } - RETVOID; + return; } @@ -2781,15 +2691,7 @@ CmLteTimingInfo frm; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchRarAlloc -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnDlCcchRarAlloc(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnDlCcchRarAlloc(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -2875,7 +2777,7 @@ RgSchCellCb *cell; /* LTE_ADV_FLAG_REMOVED_END */ #endif - RETVOID; + return; } #ifdef RGR_V1 @@ -2895,38 +2797,24 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnCcchSduAlloc -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE S16 rgSCHCmnCcchSduAlloc(cell, ueCb, allocInfo) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static S16 rgSCHCmnCcchSduAlloc(RgSchCellCb *cell,RgSchUeCb *ueCb,RgSchCmnDlRbAllocInfo *allocInfo) { RgSchDlRbAlloc *rbAllocInfo; - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); /* Return if subframe BW exhausted */ if (allocInfo->ccchSduAlloc.ccchSduDlSf->bw <= allocInfo->ccchSduAlloc.ccchSduDlSf->bwAssigned) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "bw<=bwAssigned for UEID:%d",ueCb->ueId); + DU_LOG("\nERROR --> SCH : bw<=bwAssigned for UEID:%d",ueCb->ueId); return RFAILED; } if (rgSCHDhmGetCcchSduHqProc(ueCb, cellSch->dl.time, &(ueDl->proc)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHDhmGetCcchSduHqProc failed UEID:%d",ueCb->ueId); + DU_LOG("\nERROR --> SCH : rgSCHDhmGetCcchSduHqProc failed UEID:%d",ueCb->ueId); return RFAILED; } @@ -2937,8 +2825,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { /* Fix : syed Minor failure handling, release hqP if Unsuccessful */ rgSCHDhmRlsHqpTb(ueDl->proc, 0, FALSE); - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHCmnCcchSduDedAlloc failed UEID:%d",ueCb->ueId); + DU_LOG("\nERROR --> SCH : rgSCHCmnCcchSduDedAlloc failed UEID:%d",ueCb->ueId); return RFAILED; } cmLListAdd2Tail(&allocInfo->ccchSduAlloc.ccchSduTxLst, &ueDl->proc->reqLnk); @@ -2962,24 +2849,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduTx -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchSduTx(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchSduTx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { - CmLList *node; - RgSchUeCb *ueCb; - RgSchCmnDlUe *ueCmnDl; - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - - RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; + CmLList *node; + RgSchUeCb *ueCb; + RgSchCmnDlUe *ueCmnDl; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; node = cell->ccchSduUeLst.first; @@ -3010,13 +2886,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; } else { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"ERROR!! THIS SHOULD " + DU_LOG("\nERROR --> SCH : THIS SHOULD " "NEVER HAPPEN for UEID:%d", ueCb->ueId); continue; } } } - RETVOID; + return; } #endif @@ -3035,23 +2911,12 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchTx -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchTx(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchTx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { - CmLList *node; - RgSchRaCb *raCb; - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - RgSchDlSf *dlSf = allocInfo->msg4Alloc.msg4DlSf; - + CmLList *node; + RgSchRaCb *raCb; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + RgSchDlSf *dlSf = allocInfo->msg4Alloc.msg4DlSf; node = cell->raInfo.toBeSchdLst.first; while(node) @@ -3074,7 +2939,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; } } } - RETVOID; + return; } #ifdef RGR_V1 @@ -3093,26 +2958,16 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduRetx -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchSduRetx(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchSduRetx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { RgSchDlRbAlloc *rbAllocInfo; - CmLList *node; - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - RgSchUeCb *ueCb; - RgSchDlHqProcCb *hqP; - U8 retxBw = 0; - RgSchCmnDlUe *ueDl; - RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; + CmLList *node; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + RgSchUeCb *ueCb; + RgSchDlHqProcCb *hqP; + uint8_t retxBw = 0; + RgSchCmnDlUe *ueDl; + RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; node = cellSch->dl.ccchSduRetxLst.first; @@ -3171,7 +3026,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; } } dlSf->bwAssigned += retxBw; - RETVOID; + return; } #endif @@ -3190,23 +3045,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchRetx -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchRetx(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchRetx(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { CmLList *node; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchRaCb *raCb; RgSchDlHqProcCb *hqP; - U8 retxBw = 0; + uint8_t retxBw = 0; RgSchDlSf *dlSf = allocInfo->msg4Alloc.msg4DlSf; @@ -3261,7 +3106,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; } } dlSf->bwAssigned += retxBw; - RETVOID; + return; } @@ -3282,19 +3127,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlBcchPcch -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo, -RgInfSfAlloc *subfrmAlloc -) -#else -PRIVATE Void rgSCHCmnDlBcchPcch(cell, allocInfo, subfrmAlloc) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -RgInfSfAlloc *subfrmAlloc; -#endif +static Void rgSCHCmnDlBcchPcch(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo,RgInfSfAlloc *subfrmAlloc) { CmLteTimingInfo frm; RgSchDlSf *sf; @@ -3306,7 +3139,6 @@ RgInfSfAlloc *subfrmAlloc; #endif/*RGR_SI_SCH*/ - frm = cell->crntTime; #ifdef LTEMAC_HDFDD /* For HDFDD we need scheduling information at least RG_SCH_CMN_DL_DELTA @@ -3327,8 +3159,8 @@ RgInfSfAlloc *subfrmAlloc; #if (ERRCLASS & ERRCLS_DEBUG) if (bch == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"BCCH on BCH is not configured"); - RETVOID; + DU_LOG("\nERROR --> SCH : BCCH on BCH is not configured"); + return; } #endif if (bch->boLst.first != NULLP) @@ -3356,8 +3188,8 @@ RgInfSfAlloc *subfrmAlloc; #if (ERRCLASS & ERRCLS_DEBUG) if (bcch == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"BCCH on DLSCH is not configured"); - RETVOID; + DU_LOG("\nERROR --> SCH : BCCH on DLSCH is not configured"); + return; } #endif if (bcch->boLst.first != NULLP) @@ -3379,8 +3211,8 @@ RgInfSfAlloc *subfrmAlloc; #if (ERRCLASS & ERRCLS_DEBUG) if (bcch == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"BCCH on DLSCH is not configured"); - RETVOID; + DU_LOG("\nERROR --> SCH : BCCH on DLSCH is not configured"); + return; } #endif lnk = bcch->boLst.first; @@ -3419,8 +3251,8 @@ RgInfSfAlloc *subfrmAlloc; #ifdef ERRCLS_KW if (pcch == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"PCCH on DLSCH is not configured"); - RETVOID; + DU_LOG("\nERROR --> SCH : PCCH on DLSCH is not configured"); + return; } #endif if (pcch->boLst.first != NULLP) @@ -3433,7 +3265,7 @@ RgInfSfAlloc *subfrmAlloc; rgSCHCmnClcAlloc(cell, sf, pcch, RGSCH_P_RNTI, allocInfo); } } - RETVOID; + return; } /* @@ -3450,19 +3282,7 @@ RgInfSfAlloc *subfrmAlloc; * File: rg_sch_cmn.c * */ -#ifdef ANSI -Bool rgSCHCmnChkInWin -( -CmLteTimingInfo frm, -CmLteTimingInfo start, -CmLteTimingInfo end -) -#else -Bool rgSCHCmnChkInWin(frm, start, end) -CmLteTimingInfo frm; -CmLteTimingInfo start; -CmLteTimingInfo end; -#endif +Bool rgSCHCmnChkInWin(CmLteTimingInfo frm,CmLteTimingInfo start,CmLteTimingInfo end) { Bool inWin = FALSE; @@ -3527,17 +3347,7 @@ CmLteTimingInfo end; * File: rg_sch_cmn.c * */ -#ifdef ANSI -Bool rgSCHCmnChkPastWin -( -CmLteTimingInfo frm, -CmLteTimingInfo end -) -#else -Bool rgSCHCmnChkPastWin(frm, end) -CmLteTimingInfo frm; -CmLteTimingInfo end; -#endif +Bool rgSCHCmnChkPastWin(CmLteTimingInfo frm,CmLteTimingInfo end) { CmLteTimingInfo refFrm = end; Bool pastWin; @@ -3566,37 +3376,21 @@ CmLteTimingInfo end; * @param[in] RgSchCellCb *cell, * @param[in] RgSchDlSf *sf, * @param[in] RgSchClcDlLcCb *lch, - * @param[in] U16 rnti, + * @param[in] uint16_t rnti, * @param[out] RgSchCmnDlRbAllocInfo *allocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnClcAlloc -( -RgSchCellCb *cell, -RgSchDlSf *sf, -RgSchClcDlLcCb *lch, -U16 rnti, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnClcAlloc(cell, sf, lch, rnti, allocInfo) -RgSchCellCb *cell; -RgSchDlSf *sf; -RgSchClcDlLcCb *lch; -U16 rnti; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnClcAlloc(RgSchCellCb *cell,RgSchDlSf *sf,RgSchClcDlLcCb *lch,uint16_t rnti,RgSchCmnDlRbAllocInfo *allocInfo) { RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); RgSchClcBoRpt *bo; - U32 rb=0; - U8 mcs; - U32 tbs; + uint32_t rb=0; + uint8_t mcs; + uint32_t tbs; #ifdef LTE_TDD - U8 lostRe; - U8 cfi = cellDl->currCfi; + uint8_t lostRe; + uint8_t cfi = cellDl->currCfi; #endif @@ -3636,9 +3430,9 @@ RgSchCmnDlRbAllocInfo *allocInfo; * exceeds the available */ if (rb > sf->bw - sf->bwAssigned) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"BW allocation " + DU_LOG("\nERROR --> SCH : BW allocation " "failed for CRNTI:%d",rnti); - RETVOID; + return; } /* Update the subframe Allocated BW field */ @@ -3665,7 +3459,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; allocInfo->pcchAlloc.tbInfo[0].noLyr = 1; allocInfo->pcchAlloc.nPrb = bo->nPrb; } - RETVOID; + return; } @@ -3689,23 +3483,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * -# NULLP when unsuccessful * **/ -#ifdef ANSI -RgSchPdcch *rgSCHCmnCmnPdcchAlloc -( -RgSchCellCb *cell, -RgSchDlSf *subFrm -) -#else -RgSchPdcch *rgSCHCmnCmnPdcchAlloc(cell, subFrm) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -#endif +RgSchPdcch *rgSCHCmnCmnPdcchAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm) { CmLteAggrLvl aggrLvl; RgSchPdcchInfo *pdcchInfo; RgSchPdcch *pdcch; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U8 numCce; /*store num CCEs based on + uint8_t numCce; /*store num CCEs based on aggregation level */ aggrLvl = cellSch->dl.cmnChAggrLvl; @@ -3755,9 +3539,7 @@ RgSchDlSf *subFrm; /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */ subFrm->isCceFailure = TRUE; - - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "PDCCH ERR: NO PDDCH AVAIL IN COMMON SEARCH SPACE aggr:%u", + DU_LOG("\nDEBUG --> SCH : PDCCH ERR: NO PDDCH AVAIL IN COMMON SEARCH SPACE aggr:%u", aggrLvl); return (NULLP); } @@ -3775,72 +3557,48 @@ RgSchDlSf *subFrm; * Invoked by: Scheduler * * @param[in] RgSchCellCb* cell - * @param[in] U32 bo - * @param[in] U8 cqi - * @param[in] U8 *rb - * @param[in] U32 *tbs - * @param[in] U8 *mcs + * @param[in] uint32_t bo + * @param[in] uint8_t cqi + * @param[in] uint8_t *rb + * @param[in] uint32_t *tbs + * @param[in] uint8_t *mcs * @param[in] RgSchDlSf *sf * @return Void * **/ #ifdef LTEMAC_SPS -#ifdef ANSI Void rgSCHCmnClcRbAlloc ( -RgSchCellCb *cell, -U32 bo, -U8 cqi, -U8 *rb, -U32 *tbs, -U8 *mcs, -U8 *iTbs, -Bool isSpsBo, -RgSchDlSf *sf +RgSchCellCb *cell, +uint32_t bo, +uint8_t cqi, +uint8_t *rb, +uint32_t *tbs, +uint8_t *mcs, +uint8_t *iTbs, +Bool isSpsBo, +RgSchDlSf *sf ) #else -Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, iTbs, isSpsBo) -RgSchCellCb *cell; -U32 bo; -U8 cqi; -U8 *rb; -U32 *tbs; -U8 *mcs; -U8 *iTbs; -Bool isSpsBo; -RgSchDlSf *sf; -#endif -#else -#ifdef ANSI -PRIVATE Void rgSCHCmnClcRbAlloc +static Void rgSCHCmnClcRbAlloc ( -RgSchCellCb *cell, -U32 bo, -U8 cqi, -U8 *rb, -U32 *tbs, -U8 *mcs, -RgSchDlSf *sf +RgSchCellCb *cell, +uint32_t bo, +uint8_t cqi, +uint8_t *rb, +uint32_t *tbs, +uint8_t *mcs, +RgSchDlSf *sf ) -#else -PRIVATE Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, sf) -RgSchCellCb *cell; -U32 bo; -U8 cqi; -U8 *rb; -U32 *tbs; -U8 *mcs; -RgSchDlSf *sf; -#endif #endif /* LTEMAC_SPS */ { - U8 iTbsVal; - RgSchCmnTbSzEff *effTbl; - U32 eff; - U32 noRes; - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U8 cfi = cellSch->dl.currCfi; - U32 tmpRb=0; + uint8_t iTbsVal; + RgSchCmnTbSzEff *effTbl; + uint32_t eff; + uint32_t noRes; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + uint8_t cfi = cellSch->dl.currCfi; + uint32_t tmpRb=0; /* first get the CQI to MCS table and determine the number of RBs */ effTbl = (RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[0][cfi]); @@ -3869,10 +3627,10 @@ RgSchDlSf *sf; RGSCH_ARRAY_BOUND_CHECK_WITH_POS_IDX(cell->instIdx, rgTbSzTbl[0][0], (tmpRb-1)); } *tbs = rgTbSzTbl[0][iTbsVal][tmpRb-1]/8; - *rb = (U8)tmpRb; + *rb = (uint8_t)tmpRb; RG_SCH_CMN_DL_TBS_TO_MCS(iTbsVal, *mcs); - RETVOID; + return; } @@ -3893,38 +3651,24 @@ RgSchDlSf *sf; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnMsg4Alloc -( -RgSchCellCb *cell, -RgSchRaCb *raCb, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE S16 rgSCHCmnMsg4Alloc(cell, raCb, allocInfo) -RgSchCellCb *cell; -RgSchRaCb *raCb; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static S16 rgSCHCmnMsg4Alloc(RgSchCellCb *cell,RgSchRaCb *raCb,RgSchCmnDlRbAllocInfo *allocInfo) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - /* SR_RACH_STATS : MSG4 TO BE TXED */ + /* SR_RACH_STATS : MSG4 TO BE TXED */ rgNumMsg4ToBeTx++; /* Return if subframe BW exhausted */ if (allocInfo->msg4Alloc.msg4DlSf->bw <= allocInfo->msg4Alloc.msg4DlSf->bwAssigned) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId , - "bw<=bwAssigned"); + DU_LOG("\nERROR --> SCH : bw<=bwAssigned"); return RFAILED; } if (rgSCHDhmGetMsg4HqProc(raCb, cellSch->dl.time) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHDhmGetMsg4HqProc failed"); + DU_LOG("\nERROR --> SCH : rgSCHDhmGetMsg4HqProc failed"); return RFAILED; } @@ -3934,8 +3678,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { /* Fix : syed Minor failure handling, release hqP if Unsuccessful */ rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, FALSE); - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHCmnMsg4DedAlloc failed."); + DU_LOG("\nERROR --> SCH : rgSCHCmnMsg4DedAlloc failed."); return RFAILED; } cmLListAdd2Tail(&allocInfo->msg4Alloc.msg4TxLst, &raCb->dlHqE->msg4Proc->reqLnk); @@ -3968,25 +3711,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * -# NULLP when unsuccessful * **/ -#ifdef ANSI -RgSchPdcch *rgSCHCmnPdcchAlloc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlSf *subFrm, -U8 cqi, -TfuDciFormat dciFrmt, -Bool isDtx -) -#else -RgSchPdcch *rgSCHCmnPdcchAlloc(cell, subFrm, cqi, dciFrmt, isDtx) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlSf *subFrm; -U8 cqi; -TfuDciFormat dciFrmt; -Bool isDtx; -#endif +RgSchPdcch *rgSCHCmnPdcchAlloc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlSf *subFrm,uint8_t cqi,TfuDciFormat dciFrmt,Bool isDtx) { CmLteAggrLvl aggrLvl; RgSchPdcchInfo *pdcchInfo; @@ -4058,8 +3783,7 @@ Bool isDtx; { /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */ subFrm->isCceFailure = TRUE; - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", + DU_LOG("\nDEBUG --> SCH : PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", aggrLvl); return (NULLP); @@ -4104,8 +3828,7 @@ Bool isDtx; /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */ subFrm->isCceFailure = TRUE; - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", + DU_LOG("\nDEBUG --> SCH : PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", aggrLvl); return (NULLP); } @@ -4126,26 +3849,16 @@ Bool isDtx; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnCcchSduDedAlloc -( -RgSchCellCb *cell, -RgSchUeCb *ueCb -) -#else -PRIVATE S16 rgSCHCmnCcchSduDedAlloc(cell, ueCb) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -#endif +static S16 rgSCHCmnCcchSduDedAlloc(RgSchCellCb *cell,RgSchUeCb *ueCb) { - RgSchDlHqEnt *hqE = NULLP; - U32 effBo; - RgSchDlRbAlloc *rbAllocinfo = NULLP; - RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - U8 iTbs; - U8 numRb; + RgSchDlHqEnt *hqE = NULLP; + uint32_t effBo; + RgSchDlRbAlloc *rbAllocinfo = NULLP; + RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); + uint8_t iTbs; + uint8_t numRb; #ifdef LTE_TDD - U8 cfi = cellDl->currCfi; + uint8_t cfi = cellDl->currCfi; #endif @@ -4226,25 +3939,15 @@ RgSchUeCb *ueCb; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnMsg4DedAlloc -( -RgSchCellCb *cell, -RgSchRaCb *raCb -) -#else -PRIVATE S16 rgSCHCmnMsg4DedAlloc(cell, raCb) -RgSchCellCb *cell; -RgSchRaCb *raCb; -#endif +static S16 rgSCHCmnMsg4DedAlloc(RgSchCellCb *cell,RgSchRaCb *raCb) { - U32 effBo; - RgSchDlRbAlloc *rbAllocinfo = &raCb->rbAllocInfo; - U8 iTbs; - U8 numRb; + uint32_t effBo; + RgSchDlRbAlloc *rbAllocinfo = &raCb->rbAllocInfo; + uint8_t iTbs; + uint8_t numRb; #ifdef LTE_TDD - RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - U8 cfi = cellDl->currCfi; + RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); + uint8_t cfi = cellDl->currCfi; #endif @@ -4322,30 +4025,20 @@ RgSchRaCb *raCb; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRaRsp -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlRaRsp(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlRaRsp(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { CmLteTimingInfo frm; CmLteTimingInfo schFrm; RgSchDlSf *subFrm; - U16 rarnti; - U8 i; - U8 noRaRnti=0; - U8 raIdx; + uint16_t rarnti; + uint8_t i; + uint8_t noRaRnti=0; + uint8_t raIdx; RgSchTddRachRspLst *rachRsp; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 sfnIdx; - U8 subfrmIdx; - U16 rntiIdx=0; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t sfnIdx; + uint8_t subfrmIdx; + uint16_t rntiIdx=0; frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -4399,7 +4092,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; } } - RETVOID; + return; } #else /** @@ -4417,27 +4110,17 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRaRsp //FDD -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlRaRsp(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlRaRsp(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { - CmLteTimingInfo frm; - CmLteTimingInfo winStartFrm; - RgSchDlSf *subFrm; - U8 winStartIdx; - U8 winGap; - U8 rarnti; - U8 raIdx; - RgSchCmnCell *sched; - U8 i,noRaRnti=0; + CmLteTimingInfo frm; + CmLteTimingInfo winStartFrm; + RgSchDlSf *subFrm; + uint8_t winStartIdx; + uint8_t winGap; + uint8_t rarnti; + uint8_t raIdx; + RgSchCmnCell *sched; + uint8_t i,noRaRnti=0; frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -4484,7 +4167,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; for response allocation */ } } - RETVOID; + return; } #endif @@ -4505,49 +4188,31 @@ RgSchCmnDlRbAllocInfo *allocInfo; * * @param[in] RgSchCellCb *cell, * @param[in] RgSchDlSf *subFrm, - * @param[in] U16 rarnti, - * @param[in] U8 noRaRnti + * @param[in] uint16_t rarnti, + * @param[in] uint8_t noRaRnti * @param[out] RgSchCmnDlRbAllocInfo *allocInfo * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnRaRspAlloc -( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -U16 raIndex, -U16 rarnti, -U8 noRaRnti, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE S16 rgSCHCmnRaRspAlloc(cell,subFrm,raIndex,rarnti,noRaRnti,allocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -U16 raIndex; -U16 rarnti; -U8 noRaRnti; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static S16 rgSCHCmnRaRspAlloc(RgSchCellCb *cell,RgSchDlSf *subFrm,uint16_t raIndex,uint16_t rarnti,uint8_t noRaRnti,RgSchCmnDlRbAllocInfo *allocInfo) { - RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - U16 noBytes; - U32 rb = 0; - U32 tbs; + RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); + RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); + uint16_t noBytes; + uint32_t rb = 0; + uint32_t tbs; /*ccpu00116700,ccpu00116708- Corrected the wrong type for mcs*/ - U8 mcs; - CmLListCp *reqLst; + uint8_t mcs; + CmLListCp *reqLst; /* RACH handling related changes */ - Bool isAlloc = FALSE; - static U8 schdNumRapid = 0; - U8 remNumRapid = 0; - U8 nPrb = 0; - S32 allwdTbSz = 0; + Bool isAlloc = FALSE; + static uint8_t schdNumRapid = 0; + uint8_t remNumRapid = 0; + uint8_t nPrb = 0; + S32 allwdTbSz = 0; #ifdef LTE_TDD - U16 lostRe; - U8 cfi = cellDl->currCfi; + uint16_t lostRe; + uint8_t cfi = cellDl->currCfi; #endif #ifndef RGR_V1 @@ -4563,16 +4228,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; if (subFrm->bw == subFrm->bwAssigned) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "bw == bwAssigned RARNTI:%d",rarnti); + DU_LOG("\nERROR --> SCH : bw == bwAssigned RARNTI:%d",rarnti); return RFAILED; } reqLst = &cell->raInfo.raReqLst[raIndex]; if (reqLst->count == 0) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "reqLst Count=0 RARNTI:%d",rarnti); + DU_LOG("\nERROR --> SCH : reqLst Count=0 RARNTI:%d",rarnti); return RFAILED; } remNumRapid = reqLst->count; @@ -4600,7 +4263,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* rgSCHCmnClcRbAllocForFxdTb(cell, allwdTbSz/8, cellDl->ccchCqi, &rb);*/ if(cellDl->bitsPerRb==0) { - while ((rgTbSzTbl[0][0][rb]) <(U32) allwdTbSz) + while ((rgTbSzTbl[0][0][rb]) <(uint32_t) allwdTbSz) { rb++; } @@ -4635,13 +4298,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* Allocation succeeded for 'remNumRapid' */ isAlloc = TRUE; tbs = allwdTbSz/8; - printf("\n!!!RAR alloc noBytes:%u,allwdTbSz:%u,tbs:%u,rb:%u\n", + DU_LOG("\nINFO --> SCH : RAR alloc noBytes:%u,allwdTbSz:%u,tbs:%u,rb:%u\n", noBytes,allwdTbSz,tbs,rb); break; } if (!isAlloc) { - RLOG_ARG0(L_INFO,DBG_CELLID,cell->cellId,"BW alloc Failed"); + DU_LOG("\nERROR --> SCH : BW alloc Failed"); return RFAILED; } @@ -4677,23 +4340,11 @@ RgSchCmnDlRbAllocInfo *allocInfo; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlAllocFillRbInfo -( -RgSchCellCb *cell, -RgSchUlSf *sf, -RgSchUlAlloc *alloc -) -#else -Void rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc) -RgSchCellCb *cell; -RgSchUlSf *sf; -RgSchUlAlloc *alloc; -#endif +Void rgSCHCmnUlAllocFillRbInfo(RgSchCellCb *cell,RgSchUlSf *sf,RgSchUlAlloc *alloc) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - U8 cfi = cellDl->currCfi; + uint8_t cfi = cellDl->currCfi; alloc->grnt.rbStart = (alloc->sbStart * cellUl->sbSize) + @@ -4702,7 +4353,7 @@ RgSchUlAlloc *alloc; /* Num RBs = numSbAllocated * sbSize - less RBs in the last SB */ alloc->grnt.numRb = (alloc->numSb * cellUl->sbSize); - RETVOID; + return; } /** @@ -4726,36 +4377,25 @@ RgSchUlAlloc *alloc; * @param[in] Bool preamGrpA * @param[in] RgSchUlHqProcCb *hqProc * @param[out] RgSchUlAlloc **ulAllocRef - * @param[out] U8 *hqProcIdRef + * @param[out] uint8_t *hqProcIdRef * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnMsg3GrntReq +static Void rgSCHCmnMsg3GrntReq ( RgSchCellCb *cell, CmLteRnti rnti, Bool preamGrpA, RgSchUlHqProcCb *hqProc, RgSchUlAlloc **ulAllocRef, -U8 *hqProcIdRef +uint8_t *hqProcIdRef ) -#else -PRIVATE Void rgSCHCmnMsg3GrntReq(cell, rnti, preamGrpA, hqProc, - ulAllocRef, hqProcIdRef) -RgSchCellCb *cell; -CmLteRnti rnti; -Bool preamGrpA; -RgSchUlHqProcCb *hqProc; -RgSchUlAlloc **ulAllocRef; -U8 *hqProcIdRef; -#endif { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlSf *sf = &cellUl->ulSfArr[cellUl->msg3SchdIdx]; RgSchUlHole *hole; RgSchUlAlloc *alloc; - U8 iMcs; - U8 numSb; + uint8_t iMcs; + uint8_t numSb; *ulAllocRef = NULLP; @@ -4763,7 +4403,7 @@ U8 *hqProcIdRef; /* Fix: ccpu00120610 Use remAllocs from subframe during msg3 allocation */ if (*sf->allocCountRef >= cellUl->maxAllocPerUlSf) { - RETVOID; + return; } if (preamGrpA == FALSE) { @@ -4790,13 +4430,12 @@ U8 *hqProcIdRef; } else { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Error! holeDb sanity check failed RNTI:%d",rnti); + DU_LOG("\nERROR --> SCH : holeDb sanity check failed RNTI:%d",rnti); } } if (numSb <= hole->num) { - U8 iTbs; + uint8_t iTbs; alloc = rgSCHUtlUlAllocGetHole(sf, numSb, hole); rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc); alloc->grnt.iMcs = iMcs; @@ -4820,22 +4459,19 @@ U8 *hqProcIdRef; alloc->pdcch = FALSE; alloc->forMsg3 = TRUE; alloc->hqProc = hqProc; - rgSCHUhmNewTx(hqProc, (U8)(cell->rachCfg.maxMsg3Tx - 1), alloc); - //RLOG_ARG4(L_DEBUG,DBG_CELLID,cell->cellId, - printf( - "\nRNTI:%d MSG3 ALLOC proc(%lu)procId(%d)schdIdx(%d)\n", + rgSCHUhmNewTx(hqProc, (uint8_t)(cell->rachCfg.maxMsg3Tx - 1), alloc); + DU_LOG("\nDEBUG --> SCH : RNTI:%d MSG3 ALLOC proc(%lu)procId(%d)schdIdx(%d)\n", alloc->rnti, ((PTR)alloc->hqProc), alloc->hqProc->procId, alloc->hqProc->ulSfIdx); - RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, - "alloc(%p)maxMsg3Tx(%d)", - ((PTR)alloc), + DU_LOG("\nDEBUG --> SCH : alloc(%p)maxMsg3Tx(%d)", + ((void *)alloc), cell->rachCfg.maxMsg3Tx); } } - RETVOID; + return; } @@ -4860,24 +4496,12 @@ U8 *hqProcIdRef; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlSetUeAllocLmt -( -RgSchCellCb *cell, -RgSchCmnDlUe *ueDl, -Bool isEmtcUe -) -#else -PRIVATE Void rgSCHCmnDlSetUeAllocLmt(cell, ueDl, isEmtcUe) -RgSchCellCb *cell; -RgSchCmnDlUe *ueDl; -Bool isEmtcUe; -#endif +static Void rgSCHCmnDlSetUeAllocLmt(RgSchCellCb *cell,RgSchCmnDlUe *ueDl,Bool isEmtcUe) { - U8 modOrder; - U32 maxRb; + uint8_t modOrder; + uint32_t maxRb; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U8 cfi = cellSch->dl.currCfi; + uint8_t cfi = cellSch->dl.currCfi; #ifdef EMTC_ENABLE @@ -4999,7 +4623,7 @@ Bool isEmtcUe; } } - RETVOID; + return; } #ifdef DL_LA @@ -5024,24 +4648,14 @@ Bool isEmtcUe; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCheckAndSetTxScheme -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCheckAndSetTxScheme(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCheckAndSetTxScheme(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue ,cell); - U8 cfi = cellSch->dl.currCfi; - U8 maxiTbs; - U8 cqiBasediTbs; - U8 actualiTbs; + uint8_t cfi = cellSch->dl.currCfi; + uint8_t maxiTbs; + uint8_t cqiBasediTbs; + uint8_t actualiTbs; maxiTbs = (*(RgSchCmnCqiToTbs*)(cellSch->dl.cqiToTbsTbl[0][cfi]))\ @@ -5060,7 +4674,7 @@ RgSchUeCb *ue; RG_SCH_CMN_UNSET_FORCE_TD(ue,cell, RG_SCH_CMN_TD_TXSCHEME_CHNG); } - RETVOID; + return; } /** @@ -5084,26 +4698,16 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnDlSetUeAllocLmtLa -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnDlSetUeAllocLmtLa(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnDlSetUeAllocLmtLa(RgSchCellCb *cell,RgSchUeCb *ue) { - U8 modOrder; - U32 maxRb; - U8 reportediTbs; + uint8_t modOrder; + uint32_t maxRb; + uint8_t reportediTbs; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - U8 cfi = cellSch->dl.currCfi; - U8 maxiTbs; - U8 cwIdx = 0; + uint8_t cfi = cellSch->dl.currCfi; + uint8_t maxiTbs; + uint8_t cwIdx = 0; maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1]; @@ -5166,7 +4770,7 @@ RgSchUeCb *ue; #ifdef RG_5GTF ue->ue5gtfCb.mcs = ueDl->mimoInfo.cwInfo[cwIdx].iTbs[0]; /* - printf("reportediTbs[%d] cqiBasediTbs[%d] deltaiTbs[%d] iTbsNew[%d] mcs[%d] cwIdx[%d]\n", + DU_LOG("\nINFO --> SCH : reportediTbs[%d] cqiBasediTbs[%d] deltaiTbs[%d] iTbsNew[%d] mcs[%d] cwIdx[%d]\n", reportediTbs, ueDl->laCb[cwIdx].cqiBasediTbs, ueDl->laCb[cwIdx].deltaiTbs, iTbsNew, ue->ue5gtfCb.mcs, cwIdx); */ @@ -5181,7 +4785,7 @@ RgSchUeCb *ue; } - RETVOID; + return; } #endif /*********************************************************** @@ -5198,24 +4802,15 @@ RgSchUeCb *ue; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnDlHqPResetTemp -( -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHCmnDlHqPResetTemp(hqP) -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHCmnDlHqPResetTemp(RgSchDlHqProcCb *hqP) { - /* Fix: syed having a hqP added to Lists for RB assignment rather than * a UE, as adding UE was limiting handling some scenarios */ hqP->reqLnk.node = (PTR)NULLP; hqP->schdLstLnk.node = (PTR)NULLP; - RETVOID; + return; } /* rgSCHCmnDlHqPResetTemp */ /*********************************************************** @@ -5232,20 +4827,10 @@ RgSchDlHqProcCb *hqP; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnDlUeResetTemp -( -RgSchUeCb *ue, -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHCmnDlUeResetTemp(ue, hqP) -RgSchUeCb *ue; -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHCmnDlUeResetTemp(RgSchUeCb *ue,RgSchDlHqProcCb *hqP) { RgSchDlRbAlloc *allocInfo; - RgSchCmnDlUe *cmnUe = RG_SCH_CMN_GET_DL_UE(ue,hqP->hqE->cell); + RgSchCmnDlUe *cmnUe = RG_SCH_CMN_GET_DL_UE(ue,hqP->hqE->cell); #ifdef LTE_ADV Void *tmpCb; #endif @@ -5273,7 +4858,7 @@ RgSchDlHqProcCb *hqP; } rgSCHCmnDlHqPResetTemp(hqP); - RETVOID; + return; } /* rgSCHCmnDlUeResetTemp */ /*********************************************************** @@ -5290,24 +4875,13 @@ RgSchDlHqProcCb *hqP; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlUeResetTemp -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUlUeResetTemp(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUlUeResetTemp(RgSchCellCb *cell,RgSchUeCb *ue) { - RgSchCmnUlUe *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue,cell); - + RgSchCmnUlUe *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue,cell); memset(&cmnUlUe->alloc, 0, sizeof(cmnUlUe->alloc)); - RETVOID; + return; } /* rgSCHCmnUlUeResetTemp */ @@ -5329,22 +4903,9 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnFillPdcch -( -RgSchCellCb *cell, -RgSchPdcch *pdcch, -RgSchDlRbAlloc *rbAllocInfo -) -#else -Void rgSCHCmnFillPdcch(cell, pdcch, rbAllocInfo) -RgSchCellCb *cell; -RgSchPdcch *pdcch; -RgSchDlRbAlloc *rbAllocInfo; -#endif +Void rgSCHCmnFillPdcch(RgSchCellCb *cell,RgSchPdcch *pdcch,RgSchDlRbAlloc *rbAllocInfo) { - /* common channel pdcch filling, * only 1A and Local is supported */ pdcch->rnti = rbAllocInfo->rnti; @@ -5386,7 +4947,7 @@ RgSchDlRbAlloc *rbAllocInfo; case TFU_DCI_FORMAT_B2: { - //printf(" RG_5GTF:: Pdcch filling with DCI format B2\n"); + //DU_LOG("\nINFO --> SCH : RG_5GTF:: Pdcch filling with DCI format B2\n"); /* ToDo: Anoop */ break; /* case TFU_DCI_FORMAT_B2: */ } @@ -5459,11 +5020,11 @@ RgSchDlRbAlloc *rbAllocInfo; #endif break; default: - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Allocator's icorrect " + DU_LOG("\nERROR --> SCH : Allocator's icorrect " "dciForamt Fill RNTI:%d",rbAllocInfo->rnti); break; } - RETVOID; + return; } #ifdef LTE_TDD @@ -5478,32 +5039,17 @@ RgSchDlRbAlloc *rbAllocInfo; * * Invoked by: Scheduler * - * @param[in] U8 splfrmCnt - * @param[in] U8 curSubfrmIdx - * @param[in] U8 periodicity + * @param[in] uint8_t splfrmCnt + * @param[in] uint8_t curSubfrmIdx + * @param[in] uint8_t periodicity * @param[in] RgSchTddSubfrmInfo *subfrmInfo * @return Bool * **/ -#ifdef ANSI -PRIVATE Bool rgSCHCmnIsSplSubfrm -( -U8 splfrmCnt, -U8 curSubfrmIdx, -U8 periodicity, -RgSchTddSubfrmInfo *subfrmInfo -) -#else -PRIVATE Bool rgSCHCmnIsSplSubfrm(splfrmCnt, curSubfrmIdx, periodicity, subfrmInfo) -U8 splfrmCnt; -U8 curSubfrmIdx; -U8 periodicity; -RgSchTddSubfrmInfo *subfrmInfo; -#endif +static Bool rgSCHCmnIsSplSubfrm(uint8_t splfrmCnt,uint8_t curSubfrmIdx,uint8_t periodicity,RgSchTddSubfrmInfo *subfrmInfo) { - U8 dlSfCnt = 0; - U8 splfrmIdx = 0; - + uint8_t dlSfCnt = 0; + uint8_t splfrmIdx = 0; if(splfrmCnt > 0) { @@ -5556,25 +5102,11 @@ RgSchTddSubfrmInfo *subfrmInfo; * @param[in] RgDlHqProcCb *hqP * @param[in] RgSchDlSf *subFrm * @param[in] RgSchDlHqTbCb *tbCb - * @param[in] U8 tbAllocIdx + * @param[in] uint8_t tbAllocIdx * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUpdHqAndDai -( -RgSchDlHqProcCb *hqP, -RgSchDlSf *subFrm, -RgSchDlHqTbCb *tbCb, -U8 tbAllocIdx -) -#else -PRIVATE Void rgSCHCmnUpdHqAndDai(hqP, subFrm, tbCb,tbAllocIdx) -RgSchDlHqProcCb *hqP; -RgSchDlSf *subFrm; -RgSchDlHqTbCb *tbCb; -U8 tbAllocIdx; -#endif +static Void rgSCHCmnUpdHqAndDai(RgSchDlHqProcCb *hqP,RgSchDlSf *subFrm,RgSchDlHqTbCb *tbCb,uint8_t tbAllocIdx) { RgSchUeCb *ue = hqP->hqE->ue; @@ -5602,7 +5134,7 @@ U8 tbAllocIdx; if(ue && !tbAllocIdx) { Bool havePdcch = (tbCb->hqP->pdcch ? TRUE : FALSE); - U8 dlDai; + uint8_t dlDai; dlDai = rgSCHCmnUpdDai(ue, &tbCb->fdbkTime, tbCb->m, havePdcch,tbCb->hqP, &tbCb->dai); @@ -5620,7 +5152,7 @@ U8 tbAllocIdx; fdbk reception */ tbCb->pucchFdbkIdx = tbCb->hqP->ulDai; - RETVOID; + return; } @@ -5638,34 +5170,22 @@ U8 tbAllocIdx; * @param[in] RgDlHqProcCb *hqP * @param[in] RgSchDlSf *subFrm * @param[in] RgSchDlHqTbCb *tbCb - * @return U8 dlDai + * @return uint8_t dlDai * **/ -#ifdef ANSI -U8 rgSCHCmnUpdDai +uint8_t rgSCHCmnUpdDai ( -RgSchUeCb *ue, -CmLteTimingInfo *fdbkTime, -U8 m, -Bool havePdcch, -RgSchDlHqProcCb *hqP, -U8 *ulDai +RgSchUeCb *ue, +CmLteTimingInfo *fdbkTime, +uint8_t m, +Bool havePdcch, +RgSchDlHqProcCb *hqP, +uint8_t *ulDai ) -#else -U8 rgSCHCmnUpdDai(ue, fdbkTime, m, havePdcch,tbCb,servCellId,hqP,ulDai) -RgSchUeCb *ue; -CmLteTimingInfo *fdbkTime; -U8 m; -Bool havePdcch; -RgSchDlHqProcCb *hqP; -U8 *ulDai; -#endif { RgSchTddANInfo *anInfo; - U8 servCellIdx; - U8 ackNackFdbkArrSize; - - + uint8_t servCellIdx; + uint8_t ackNackFdbkArrSize; if(hqP != NULLP) {/* Non SPS */ @@ -5735,8 +5255,8 @@ U8 *ulDai; } #endif /* ifdef LTE_TDD */ -U32 rgHqRvRetxCnt[4][2]; -U32 rgUlrate_grant; +uint32_t rgHqRvRetxCnt[4][2]; +uint32_t rgUlrate_grant; /** * @brief This function fills the HqP TB with rbAllocInfo. @@ -5750,43 +5270,27 @@ U32 rgUlrate_grant; * * @param[in] RgSchCellCb* cell * @param[in] RgSchDlRbAlloc *rbAllocInfo, - * @param[in] U8 tbAllocIdx + * @param[in] uint8_t tbAllocIdx * @param[in] RgSchPdcch *pdcch * @return Void * **/ #ifdef LTEMAC_SPS -#ifdef ANSI Void rgSCHCmnFillHqPTb ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -U8 tbAllocIdx, -RgSchPdcch *pdcch +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +uint8_t tbAllocIdx, +RgSchPdcch *pdcch ) #else -Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -U8 tbAllocIdx; -RgSchPdcch *pdcch; -#endif -#else -#ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPTb +static Void rgSCHCmnFillHqPTb ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -U8 tbAllocIdx, -RgSchPdcch *pdcch +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +uint8_t tbAllocIdx, +RgSchPdcch *pdcch ) -#else -PRIVATE Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -U8 tbAllocIdx; -RgSchPdcch *pdcch; -#endif #endif /* LTEMAC_SPS */ { RgSchCmnDlCell *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell); @@ -5855,7 +5359,7 @@ RgSchPdcch *pdcch; //tbInfo->dlGrnt.numRb = rbAllocInfo->rbsAlloc; rgSCHUtlDlHqPTbAddToTx(hqP->subFrm, hqP, tbInfo->tbIdx); } - RETVOID; + return; } /** @@ -5876,33 +5380,24 @@ RgSchPdcch *pdcch; * @param[in] RgSchDlRbAlloc* rbAllocInfo * @param[in] RgDlHqProc* hqP * @param[out] RgSchPdcch *pdcch - * @param[in] U8 tpc + * @param[in] uint8_t tpc * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmtB1B2 +static Void rgSCHCmnFillHqPPdcchDciFrmtB1B2 ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -RgSchDlHqProcCb *hqP, -RgSchPdcch *pdcch, -U8 tpc +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +RgSchDlHqProcCb *hqP, +RgSchPdcch *pdcch, +uint8_t tpc ) -#else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmtB1B2(cell, rbAllocInfo, hqP, pdcch, tpc) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -RgSchDlHqProcCb *hqP; -RgSchPdcch *pdcch; -U8 tpc; -#endif { rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); //Currently hardcoding values here. - //printf("Filling 5GTF UL DCI for rnti %d \n",alloc->rnti); + //DU_LOG("\nINFO --> SCH : Filling 5GTF UL DCI for rnti %d \n",alloc->rnti); switch(rbAllocInfo->dciFormat) { case TFU_DCI_FORMAT_B1: @@ -5962,18 +5457,18 @@ U8 tpc; break; } default: - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId," 5GTF_ERROR Allocator's icorrect " + DU_LOG("\nERROR --> SCH : 5GTF_ERROR Allocator's incorrect " "dciForamt Fill RNTI:%d",rbAllocInfo->rnti); break; } - RETVOID; + return; } -extern U32 totPcellSCell; -extern U32 addedForScell; -extern U32 addedForScell1; -extern U32 addedForScell2; +uint32_t totPcellSCell; +uint32_t addedForScell; +uint32_t addedForScell1; +uint32_t addedForScell2; /** * @brief This function fills the PDCCH information from dlProc. * @@ -5994,23 +5489,11 @@ extern U32 addedForScell2; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnFillHqPPdcch -( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHCmnFillHqPPdcch(cell, rbAllocInfo, hqP) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHCmnFillHqPPdcch(RgSchCellCb *cell,RgSchDlRbAlloc *rbAllocInfo,RgSchDlHqProcCb *hqP) { - RgSchCmnDlCell *cmnCell = RG_SCH_CMN_GET_DL_CELL(cell); - RgSchPdcch *pdcch = rbAllocInfo->pdcch; - U8 tpc = 1; + RgSchCmnDlCell *cmnCell = RG_SCH_CMN_GET_DL_CELL(cell); + RgSchPdcch *pdcch = rbAllocInfo->pdcch; + uint8_t tpc = 1; if (hqP->hqE->ue) @@ -6051,7 +5534,7 @@ RgSchDlHqProcCb *hqP; addedForScell += (rbAllocInfo->tbInfo[0].bytesAlloc << 3); addedForScell1 += (rbAllocInfo->tbInfo[0].bytesAlloc << 3); /* - printf (" Hqp %d cell %d addedForScell %lu addedForScell1 %lu sfn:sf %d:%d \n", + DU_LOG("\nINFO --> SCH : Hqp %d cell %d addedForScell %lu addedForScell1 %lu sfn:sf %d:%d \n", hqP->procId, hqP->hqE->cell->cellId, addedForScell, @@ -6086,7 +5569,7 @@ RgSchDlHqProcCb *hqP; addedForScell += (rbAllocInfo->tbInfo[1].bytesAlloc << 3); addedForScell2 += (rbAllocInfo->tbInfo[1].bytesAlloc << 3); /* - printf (" Hqp %d cell %d addedForScell %lu addedForScell2 %lu \n", + DU_LOG("\nINFO --> SCH : Hqp %d cell %d addedForScell %lu addedForScell2 %lu \n", hqP->procId, hqP->hqE->cell->cellId, addedForScell, @@ -6101,7 +5584,7 @@ RgSchDlHqProcCb *hqP; (rbAllocInfo->tbInfo[1].bytesAlloc << 3); } /* - printf ("add DL TPT is %lu sfn:sf %d:%d \n", hqP->hqE->ue->tenbStats->stats.nonPersistent.sch[RG_SCH_CELLINDEX(hqP->hqE->cell)].dlTpt , + DU_LOG("\nINFO --> SCH : add DL TPT is %lu sfn:sf %d:%d \n", hqP->hqE->ue->tenbStats->stats.nonPersistent.sch[RG_SCH_CELLINDEX(hqP->hqE->cell)].dlTpt , cell->crntTime.sfn, cell->crntTime.slot); */ @@ -6118,18 +5601,17 @@ RgSchDlHqProcCb *hqP; case TFU_DCI_FORMAT_B1: case TFU_DCI_FORMAT_B2: { - // printf(" RG_5GTF:: Pdcch filling with DCI format B1/B2\n"); + // DU_LOG("\nINFO --> SCH : RG_5GTF:: Pdcch filling with DCI format B1/B2\n"); rgSCHCmnFillHqPPdcchDciFrmtB1B2(cell, rbAllocInfo, hqP, \ pdcch, tpc); break; } #endif default: - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Allocator's incorrect dciForamt Fill for RNTI:%d",rbAllocInfo->rnti); + DU_LOG("\nERROR --> SCH : Allocator's incorrect dciForamt Fill for RNTI:%d",rbAllocInfo->rnti); break; } - RETVOID; + return; } #ifdef UNUSED_FUNC /** @@ -6150,32 +5632,23 @@ RgSchDlHqProcCb *hqP; * @param[in] RgSchDlRbAlloc* rbAllocInfo * @param[in] RgDlHqProc* hqP * @param[out] RgSchPdcch *pdcch - * @param[in] U8 tpc + * @param[in] uint8_t tpc * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 +static Void rgSCHCmnFillHqPPdcchDciFrmt1 ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -RgSchDlHqProcCb *hqP, -RgSchPdcch *pdcch, -U8 tpc +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +RgSchDlHqProcCb *hqP, +RgSchPdcch *pdcch, +uint8_t tpc ) -#else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1(cell, rbAllocInfo, hqP, pdcch, tpc) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -RgSchDlHqProcCb *hqP; -RgSchPdcch *pdcch; -U8 tpc; -#endif { #ifdef LTE_TDD - RgSchTddANInfo *anInfo; + RgSchTddANInfo *anInfo; #endif #ifdef LTEMAC_SPS @@ -6234,7 +5707,7 @@ U8 tpc; if(hqP->hqE->ue != NULLP) { #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, + uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, hqP->hqE->cell->cellId, hqP->hqE->ue); @@ -6268,7 +5741,7 @@ U8 tpc; #endif - RETVOID; + return; } /** * @brief This function fills the PDCCH DCI format 1A information from dlProc. @@ -6288,27 +5761,18 @@ U8 tpc; * @param[in] RgSchDlRbAlloc* rbAllocInfo * @param[in] RgDlHqProc* hqP * @param[out] RgSchPdcch *pdcch - * @param[in] U8 tpc + * @param[in] uint8_t tpc * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A +static Void rgSCHCmnFillHqPPdcchDciFrmt1A ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -RgSchDlHqProcCb *hqP, -RgSchPdcch *pdcch, -U8 tpc +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +RgSchDlHqProcCb *hqP, +RgSchPdcch *pdcch, +uint8_t tpc ) -#else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A(cell, rbAllocInfo, hqP, pdcch, tpc) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -RgSchDlHqProcCb *hqP; -RgSchPdcch *pdcch; -U8 tpc; -#endif { #ifdef LTE_TDD @@ -6361,7 +5825,7 @@ U8 tpc; if(hqP->hqE->ue != NULLP) { #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, + uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, hqP->hqE->cell->cellId, hqP->hqE->ue); anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue, @@ -6381,8 +5845,7 @@ U8 tpc; { /* Fixing DAI value - ccpu00109162 */ pdcch->dci.u.format1aInfo.t.pdschInfo.dai.val = RG_SCH_MAX_DAI_IDX; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "PDCCH is been scheduled without updating anInfo RNTI:%d", + DU_LOG("\nERROR --> SCH : PDCCH is been scheduled without updating anInfo RNTI:%d", rbAllocInfo->rnti); } #endif @@ -6400,7 +5863,7 @@ U8 tpc; } #endif - RETVOID; + return; } /** * @brief This function fills the PDCCH DCI format 1B information from dlProc. @@ -6420,27 +5883,18 @@ U8 tpc; * @param[in] RgSchDlRbAlloc* rbAllocInfo * @param[in] RgDlHqProc* hqP * @param[out] RgSchPdcch *pdcch - * @param[in] U8 tpc + * @param[in] uint8_t tpc * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B +static Void rgSCHCmnFillHqPPdcchDciFrmt1B ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -RgSchDlHqProcCb *hqP, -RgSchPdcch *pdcch, -U8 tpc +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +RgSchDlHqProcCb *hqP, +RgSchPdcch *pdcch, +uint8_t tpc ) -#else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B(cell, rbAllocInfo, hqP, pdcch, tpc) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -RgSchDlHqProcCb *hqP; -RgSchPdcch *pdcch; -U8 tpc; -#endif { #ifdef LTE_TDD @@ -6494,7 +5948,7 @@ U8 tpc; if(hqP->hqE->ue != NULLP) { #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, + uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, hqP->hqE->cell->cellId, hqP->hqE->ue); anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue, @@ -6512,15 +5966,14 @@ U8 tpc; else { pdcch->dci.u.format1bInfo.dai = RG_SCH_MAX_DAI_IDX; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "PDCCH is been scheduled without updating anInfo RNTI:%d", + DU_LOG("\nERROR --> SCH : PDCCH is been scheduled without updating anInfo RNTI:%d", rbAllocInfo->rnti); } #endif } #endif - RETVOID; + return; } /** @@ -6541,27 +5994,18 @@ U8 tpc; * @param[in] RgSchDlRbAlloc* rbAllocInfo * @param[in] RgDlHqProc* hqP * @param[out] RgSchPdcch *pdcch - * @param[in] U8 tpc + * @param[in] uint8_t tpc * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 +static Void rgSCHCmnFillHqPPdcchDciFrmt2 ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -RgSchDlHqProcCb *hqP, -RgSchPdcch *pdcch, -U8 tpc +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +RgSchDlHqProcCb *hqP, +RgSchPdcch *pdcch, +uint8_t tpc ) -#else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2(cell, rbAllocInfo, hqP, pdcch, tpc) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -RgSchDlHqProcCb *hqP; -RgSchPdcch *pdcch; -U8 tpc; -#endif { #ifdef LTE_TDD @@ -6652,7 +6096,7 @@ U8 tpc; { #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, + uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, hqP->hqE->cell->cellId, hqP->hqE->ue); anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue, @@ -6669,15 +6113,14 @@ U8 tpc; else { pdcch->dci.u.format2Info.dai = RG_SCH_MAX_DAI_IDX; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "PDCCH is been scheduled without updating anInfo RNTI:%d", + DU_LOG("\nERROR --> SCH : PDCCH is been scheduled without updating anInfo RNTI:%d", rbAllocInfo->rnti); } #endif } #endif - RETVOID; + return; } /** * @brief This function fills the PDCCH DCI format 2A information from dlProc. @@ -6697,27 +6140,18 @@ U8 tpc; * @param[in] RgSchDlRbAlloc* rbAllocInfo * @param[in] RgDlHqProc* hqP * @param[out] RgSchPdcch *pdcch - * @param[in] U8 tpc + * @param[in] uint8_t tpc * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A +static Void rgSCHCmnFillHqPPdcchDciFrmt2A ( -RgSchCellCb *cell, -RgSchDlRbAlloc *rbAllocInfo, -RgSchDlHqProcCb *hqP, -RgSchPdcch *pdcch, -U8 tpc +RgSchCellCb *cell, +RgSchDlRbAlloc *rbAllocInfo, +RgSchDlHqProcCb *hqP, +RgSchPdcch *pdcch, +uint8_t tpc ) -#else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A(cell, rbAllocInfo, hqP, pdcch, tpc) -RgSchCellCb *cell; -RgSchDlRbAlloc *rbAllocInfo; -RgSchDlHqProcCb *hqP; -RgSchPdcch *pdcch; -U8 tpc; -#endif { #ifdef LTE_TDD RgSchTddANInfo *anInfo; @@ -6808,7 +6242,7 @@ U8 tpc; if(hqP->hqE->ue != NULLP) { #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, + uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, hqP->hqE->cell->cellId, hqP->hqE->ue); anInfo = rgSCHUtlGetUeANFdbkInfo(hqP->hqE->ue, @@ -6825,8 +6259,7 @@ U8 tpc; else { pdcch->dci.u.format2AInfo.dai = RG_SCH_MAX_DAI_IDX; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "PDCCH is been scheduled without updating anInfo RNTI:%d", + DU_LOG("\nERROR --> SCH : PDCCH is been scheduled without updating anInfo RNTI:%d", rbAllocInfo->rnti); } #endif @@ -6834,7 +6267,7 @@ U8 tpc; #endif - RETVOID; + return; } #endif /** @@ -6849,15 +6282,7 @@ U8 tpc; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnInitVars -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnInitVars(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnInitVars(RgSchCellCb *cell) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -6876,7 +6301,7 @@ RgSchCellCb *cell; cellUl->reTxIdx[0] = RGSCH_INVALID_INFO; cellUl->reTxIdx[1] = RGSCH_INVALID_INFO; /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } @@ -6893,25 +6318,17 @@ RgSchCellCb *cell; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnUpdVars -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnUpdVars(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnUpdVars(RgSchCellCb *cell) { CmLteTimingInfo timeInfo; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - U16 idx; + uint16_t idx; idx = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot); cellUl->idx = ((idx) % (RG_SCH_CMN_UL_NUM_SF)); #ifdef UL_ADPT_DBG - printf("idx %d cellUl->idx %d RGSCH_NUM_SUB_FRAMES_5G %d time(%d %d) \n",idx,cellUl->idx ,RGSCH_NUM_SUB_FRAMES_5G,cell->crntTime.sfn,cell->crntTime.slot); + DU_LOG("\nDEBUG --> SCH : idx %d cellUl->idx %d RGSCH_NUM_SUB_FRAMES_5G %d time(%d %d) \n",idx,cellUl->idx ,RGSCH_NUM_SUB_FRAMES_5G,cell->crntTime.sfn,cell->crntTime.slot); #endif /* Need to scheduler for after SCHED_DELTA */ /* UL allocation has been advanced by 1 subframe @@ -6945,21 +6362,21 @@ RgSchCellCb *cell; /* take care of getting the correct subframe for feedback */ idx = (cellUl->idx - TFU_CRCIND_ULDELTA + RG_SCH_CMN_UL_NUM_SF); #ifdef UL_ADPT_DBG - printf("Finally setting cellUl->hqFdbkIdx[0] = %d TFU_CRCIND_ULDELTA %d RG_SCH_CMN_UL_NUM_SF %d\n",idx,TFU_CRCIND_ULDELTA,RG_SCH_CMN_UL_NUM_SF); + DU_LOG("\nDEBUG --> SCH : Finally setting cellUl->hqFdbkIdx[0] = %d TFU_CRCIND_ULDELTA %d RG_SCH_CMN_UL_NUM_SF %d\n",idx,TFU_CRCIND_ULDELTA,RG_SCH_CMN_UL_NUM_SF); #endif cellUl->hqFdbkIdx[0] = (idx % (RG_SCH_CMN_UL_NUM_SF)); idx = ((cellUl->schdIdx) % (RG_SCH_CMN_UL_NUM_SF)); - cellUl->reTxIdx[0] = (U8) idx; + cellUl->reTxIdx[0] = (uint8_t) idx; #ifdef UL_ADPT_DBG - printf("cellUl->hqFdbkIdx[0] %d cellUl->reTxIdx[0] %d \n",cellUl->hqFdbkIdx[0], cellUl->reTxIdx[0] ); + DU_LOG("\nDEBUG --> SCH : cellUl->hqFdbkIdx[0] %d cellUl->reTxIdx[0] %d \n",cellUl->hqFdbkIdx[0], cellUl->reTxIdx[0] ); #endif /* RACHO: update cmn sched specific RACH variables, * mainly the prachMaskIndex */ rgSCHCmnUpdRachParam(cell); - RETVOID; + return; } #endif @@ -6977,28 +6394,18 @@ RgSchCellCb *cell; * * @param[in] CmLteTimingInfo *timeInfo * @param[in] RgSchCellCb *cell - * @return U8 + * @return uint8_t * **/ -#ifdef ANSI -U8 rgSCHCmnGetPhichUlSfIdx -( -CmLteTimingInfo *timeInfo, -RgSchCellCb *cell -) -#else -U8 rgSCHCmnGetPhichUlSfIdx(timeInfo, cell) -CmLteTimingInfo *timeInfo; -RgSchCellCb *cell; -#endif +uint8_t rgSCHCmnGetPhichUlSfIdx(CmLteTimingInfo *timeInfo,RgSchCellCb *cell) { - RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - RgSchDlSf *dlsf; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 idx; - U16 numUlSf; - U16 sfn; - U8 subframe; + RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); + RgSchDlSf *dlsf; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t idx; + uint16_t numUlSf; + uint16_t sfn; + uint8_t subframe; dlsf = rgSCHUtlSubFrmGet(cell, *timeInfo); @@ -7012,7 +6419,7 @@ RgSchCellCb *cell; sfn = (RGSCH_MAX_SFN + timeInfo->sfn - dlsf->phichOffInfo.sfnOffset) % RGSCH_MAX_SFN; - /* ccpu00130980: numUlSf(U16) parameter added to avoid integer + /* ccpu00130980: numUlSf(uint16_t) parameter added to avoid integer * wrap case such that idx will be proper*/ numUlSf = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; numUlSf = ((numUlSf * sfn) + rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][subframe]) - 1; @@ -7031,29 +6438,19 @@ RgSchCellCb *cell; * Purpose: Gets uplink subframe index based on SFN and subframe number. * * @param[in] CmLteTimingInfo *timeInfo - * @param[in] U8 ulDlCfgIdx - * @return U8 + * @param[in] uint8_t ulDlCfgIdx + * @return uint8_t * **/ -#ifdef ANSI -U8 rgSCHCmnGetUlSfIdx -( -CmLteTimingInfo *timeInfo, -RgSchCellCb *cell -) -#else -U8 rgSCHCmnGetUlSfIdx(timeInfo, cell) -CmLteTimingInfo *timeInfo; -RgSchCellCb *cell; -#endif +uint8_t rgSCHCmnGetUlSfIdx(CmLteTimingInfo *timeInfo,RgSchCellCb *cell) { - RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 idx = 0; - U16 numUlSf; + RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t idx = 0; + uint16_t numUlSf; - /* ccpu00130980: numUlSf(U16) parameter added to avoid integer + /* ccpu00130980: numUlSf(uint16_t) parameter added to avoid integer * wrap case such that idx will be proper*/ numUlSf = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; numUlSf = ((numUlSf * timeInfo->sfn) + \ @@ -7075,34 +6472,24 @@ RgSchCellCb *cell; * Purpose: Gets uplink subframe index based on SFN and subframe number. * * @param[in] CmLteTimingInfo *timeInfo - * @param[in] U8 ulDlCfgIdx - * @return U8 + * @param[in] uint8_t ulDlCfgIdx + * @return uint8_t * **/ -#ifdef ANSI -U8 rgSCHCmnGetUlHqProcIdx -( -CmLteTimingInfo *timeInfo, -RgSchCellCb *cell -) -#else -U8 rgSCHCmnGetUlHqProcIdx(timeInfo, cell) -CmLteTimingInfo *timeInfo; -RgSchCellCb *cell; -#endif +uint8_t rgSCHCmnGetUlHqProcIdx(CmLteTimingInfo *timeInfo,RgSchCellCb *cell) { - U8 procId; - U32 numUlSf; + uint8_t procId; + uint32_t numUlSf; #ifndef LTE_TDD numUlSf = (timeInfo->sfn * RGSCH_NUM_SUB_FRAMES_5G + timeInfo->slot); procId = numUlSf % RGSCH_NUM_UL_HQ_PROC; #else - U8 ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; /*ccpu00130639 - MOD - To get correct UL HARQ Proc IDs for all UL/DL Configs*/ - U8 numUlSfInSfn; - S8 sfnCycle = cell->tddHqSfnCycle; - U8 numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx] + uint8_t numUlSfInSfn; + S8 sfnCycle = cell->tddHqSfnCycle; + uint8_t numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx] /* TRACE 5 Changes */ @@ -7147,17 +6534,7 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlFreeAlloc -( -RgSchCellCb *cell, -RgSchUlAlloc *alloc -) -#else -Void rgSCHCmnUlFreeAlloc(cell, alloc) -RgSchCellCb *cell; -RgSchUlAlloc *alloc; -#endif +Void rgSCHCmnUlFreeAlloc(RgSchCellCb *cell,RgSchUlAlloc *alloc) { RgSchUlHqProcCb *hqProc; @@ -7172,14 +6549,14 @@ RgSchUlAlloc *alloc; rgSCHUhmFreeProc(alloc->hqProc, cell); rgSCHUtlUlAllocRelease(alloc); rgSCHRamDelRaCb(cell, raCb, TRUE); - RETVOID; + return; } } hqProc = alloc->hqProc; rgSCHUtlUlAllocRelease(alloc); rgSCHUhmFreeProc(hqProc, cell); - RETVOID; + return; } @@ -7197,19 +6574,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlFreeAllocation -( -RgSchCellCb *cell, -RgSchUlSf *sf, -RgSchUlAlloc *alloc -) -#else -Void rgSCHCmnUlFreeAllocation(cell, sf, alloc) -RgSchCellCb *cell; -RgSchUlSf *sf; -RgSchUlAlloc *alloc; -#endif +Void rgSCHCmnUlFreeAllocation(RgSchCellCb *cell,RgSchUlSf *sf,RgSchUlAlloc *alloc) { RgSchUlHqProcCb *hqProc; @@ -7225,7 +6590,7 @@ RgSchUlAlloc *alloc; rgSCHUhmFreeProc(alloc->hqProc, cell); rgSCHUtlUlAllocRls(sf, alloc); rgSCHRamDelRaCb(cell, raCb, TRUE); - RETVOID; + return; } } @@ -7237,7 +6602,7 @@ RgSchUlAlloc *alloc; #endif rgSCHUtlUlAllocRls(sf, alloc); - RETVOID; + return; } /** @@ -7261,22 +6626,12 @@ RgSchUlAlloc *alloc; * @return RgSchPdcch * * -# NULLP when unsuccessful **/ -#ifdef ANSI -RgSchPdcch *rgSCHCmnPdcchAllocCrntSf -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(RgSchCellCb *cell,RgSchUeCb *ue) { - CmLteTimingInfo frm = cell->crntTime; - RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - RgSchDlSf *sf; - RgSchPdcch *pdcch = NULLP; + CmLteTimingInfo frm = cell->crntTime; + RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); + RgSchDlSf *sf; + RgSchPdcch *pdcch = NULLP; RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA); sf = rgSCHUtlSubFrmGet(cell, frm); @@ -7315,20 +6670,10 @@ RgSchUeCb *ue; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlAllocFillNdmrs -( -RgSchCmnUlCell *cellUl, -RgSchUlAlloc *alloc -) -#else -Void rgSCHCmnUlAllocFillNdmrs(cellUl, alloc) -RgSchCmnUlCell *cellUl; -RgSchUlAlloc *alloc; -#endif +Void rgSCHCmnUlAllocFillNdmrs(RgSchCmnUlCell *cellUl,RgSchUlAlloc *alloc) { alloc->grnt.nDmrs = cellUl->dmrsArr[alloc->sbStart]; - RETVOID; + return; } /*********************************************************** @@ -7345,21 +6690,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlAllocLnkHqProc -( -RgSchUeCb *ue, -RgSchUlAlloc *alloc, -RgSchUlHqProcCb *proc, -Bool isRetx -) -#else -Void rgSCHCmnUlAllocLnkHqProc(ue, alloc, proc, isRetx) -RgSchUeCb *ue; -RgSchUlAlloc *alloc; -RgSchUlHqProcCb *proc; -Bool isRetx; -#endif +Void rgSCHCmnUlAllocLnkHqProc(RgSchUeCb *ue,RgSchUlAlloc *alloc,RgSchUlHqProcCb *proc,Bool isRetx) { if(TRUE == isRetx) @@ -7373,7 +6704,7 @@ Bool isRetx; #endif rgSCHUhmNewTx(proc, (((RgUeUlHqCb*)proc->hqEnt)->maxHqRetx), alloc); } - RETVOID; + return; } /** @@ -7397,26 +6728,15 @@ Bool isRetx; * @param[in] RgSchPdcch *pdcch * @return Void **/ -#ifdef ANSI -Void rgSCHCmnPdcchRlsCrntSf -( -RgSchCellCb *cell, -RgSchPdcch *pdcch -) -#else -Void rgSCHCmnPdcchRlsCrntSf(cell, pdcch) -RgSchCellCb *cell; -RgSchPdcch *pdcch; -#endif +Void rgSCHCmnPdcchRlsCrntSf(RgSchCellCb *cell,RgSchPdcch *pdcch) { - CmLteTimingInfo frm = cell->crntTime; - RgSchDlSf *sf; - + CmLteTimingInfo frm = cell->crntTime; + RgSchDlSf *sf; RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA); sf = rgSCHUtlSubFrmGet(cell, frm); rgSCHUtlPdcchPut(cell, &sf->pdcchInfo, pdcch); - RETVOID; + return; } /*********************************************************** * @@ -7431,29 +6751,16 @@ RgSchPdcch *pdcch; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlFillPdcchWithAlloc -( -RgSchPdcch *pdcch, -RgSchUlAlloc *alloc, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUlFillPdcchWithAlloc(pdcch, alloc, ue) -RgSchPdcch *pdcch; -RgSchUlAlloc *alloc; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUlFillPdcchWithAlloc(RgSchPdcch *pdcch,RgSchUlAlloc *alloc,RgSchUeCb *ue) { - pdcch->ue = ue; pdcch->rnti = alloc->rnti; //pdcch->dci.dciFormat = TFU_DCI_FORMAT_A2; pdcch->dci.dciFormat = alloc->grnt.dciFrmt; //Currently hardcoding values here. - //printf("Filling 5GTF UL DCI for rnti %d \n",alloc->rnti); + //DU_LOG("\nINFO --> SCH : Filling 5GTF UL DCI for rnti %d \n",alloc->rnti); switch(pdcch->dci.dciFormat) { case TFU_DCI_FORMAT_A1: @@ -7507,13 +6814,13 @@ RgSchUeCb *ue; break; } default: - RLOG1(L_ERROR," 5GTF_ERROR UL Allocator's icorrect " + DU_LOG("\nERROR --> SCH : 5GTF_ERROR UL Allocator's icorrect " "dciForamt Fill RNTI:%d",alloc->rnti); break; } - RETVOID; + return; } /*********************************************************** @@ -7529,22 +6836,10 @@ RgSchUeCb *ue; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlAllocFillTpc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchUlAlloc *alloc -) -#else -Void rgSCHCmnUlAllocFillTpc(cell, ue, alloc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchUlAlloc *alloc; -#endif +Void rgSCHCmnUlAllocFillTpc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchUlAlloc *alloc) { alloc->grnt.tpc = rgSCHPwrPuschTpcForUe(cell, ue); - RETVOID; + return; } @@ -7563,19 +6858,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnAddUeToRefreshQ -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 wait -) -#else -PRIVATE Void rgSCHCmnAddUeToRefreshQ(cell, ue, wait) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 wait; -#endif +static Void rgSCHCmnAddUeToRefreshQ(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t wait) { RgSchCmnCell *sched = RG_SCH_CMN_GET_CELL(cell); CmTmrArg arg; @@ -7593,7 +6876,7 @@ U32 wait; arg.evnt = RG_SCH_CMN_EVNT_UE_REFRESH; arg.wait = wait; cmPlcCbTq(&arg); - RETVOID; + return; } /** @@ -7611,21 +6894,11 @@ U32 wait; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlUeReset -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnUlUeReset(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnUlUeReset(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); - U8 lcgCnt=0; + uint8_t lcgCnt=0; RgSchCmnLcg *lcgCmn; CmLList *node; RgSchCmnAllocRecord *allRcd; @@ -7658,7 +6931,7 @@ RgSchUeCb *ue; cellSchd->apisUl->rgSCHUlUeReset(cell, ue); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } @@ -7677,17 +6950,7 @@ RgSchUeCb *ue; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnResetRiCqi -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnResetRiCqi(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnResetRiCqi(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); RgSchCmnUe *ueSchCmn = RG_SCH_CMN_GET_UE(ue,cell); @@ -7725,7 +6988,7 @@ RgSchUeCb *ue; } #endif - RETVOID; + return; } /** @@ -7743,21 +7006,11 @@ RgSchUeCb *ue; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlUeReset -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnDlUeReset(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnDlUeReset(RgSchCellCb *cell,RgSchUeCb *ue) { - RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); + RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); + RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); + RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); if (ueDl->rachInfo.poLnk.node != NULLP) @@ -7802,20 +7055,10 @@ RgSchUeCb *ue; * -# ROK * -# RFAILED **/ -#ifdef ANSI -Void rgSCHCmnUeReset -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUeReset(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUeReset(RgSchCellCb *cell,RgSchUeCb *ue) { - U8 idx; - Pst pst; + uint8_t idx; + Pst pst; RgInfResetHqEnt hqEntRstInfo; /* RACHO: remove UE from pdcch, handover and rapId assoc Qs */ @@ -7857,7 +7100,7 @@ RgSchUeCb *ue; rgSCHUtlGetPstToLyr(&pst, &rgSchCb[cell->instIdx], cell->macInst); RgSchMacRstHqEnt(&pst,&hqEntRstInfo); - RETVOID; + return; } /** @@ -7876,23 +7119,13 @@ RgSchUeCb *ue; * -# ROK * -# RFAILED **/ -#ifdef ANSI -Void rgSCHCmnActvtUlUe -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnActvtUlUe(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnActvtUlUe(RgSchCellCb *cell,RgSchUeCb *ue) { - RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); + RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); /* : take care of this in UL retransmission */ cellSchd->apisUl->rgSCHUlActvtUe(cell, ue); - RETVOID; + return; } /** @@ -7911,22 +7144,12 @@ RgSchUeCb *ue; * -# ROK * -# RFAILED **/ -#ifdef ANSI -Void rgSCHCmnActvtDlUe -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnActvtDlUe(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnActvtDlUe(RgSchCellCb *cell,RgSchUeCb *ue) { - RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); + RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); cellSchd->apisDl->rgSCHDlActvtUe(cell, ue); - RETVOID; + return; } /** @@ -7943,19 +7166,7 @@ RgSchUeCb *ue; * * @return Void **/ -#ifdef ANSI -Void rgSCHCmnHdlUlTransInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteTimingInfo timingInfo -) -#else -Void rgSCHCmnHdlUlTransInd(cell, ue, timingInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo timingInfo; -#endif +Void rgSCHCmnHdlUlTransInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo) { /* Update the latest UL dat/sig transmission time */ @@ -7967,7 +7178,7 @@ CmLteTimingInfo timingInfo; RG_SCH_CMN_DL_UPDT_INACTV_MASK ( cell, ue, RG_PDCCHODR_INACTIVE); RG_SCH_CMN_UL_UPDT_INACTV_MASK ( cell, ue, RG_PDCCHODR_INACTIVE); } - RETVOID; + return; } #ifdef TFU_UPGRADE @@ -7984,20 +7195,12 @@ CmLteTimingInfo timingInfo; * - return the least possible Rank * * - * @param[in] U32 *pmiBitMap + * @param[in] uint32_t *pmiBitMap * @return RgSchCmnRank **/ -#ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4 -( - U32 *pmiBitMap - ) -#else -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) - U32 *pmiBitMap; -#endif +static RgSchCmnRank rgSCHCmnComp4TxMode4(uint32_t *pmiBitMap) { - U32 bitMap0, bitMap1; + uint32_t bitMap0, bitMap1; bitMap0 = pmiBitMap[0]; bitMap1 = pmiBitMap[1]; if((bitMap1) & 0xFFFF) @@ -8035,20 +7238,12 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) * - return the least possible Rank * * - * @param[in] U32 *pmiBitMap + * @param[in] uint32_t *pmiBitMap * @return RgSchCmnRank **/ -#ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4 -( - U32 *pmiBitMap - ) -#else -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) - U32 *pmiBitMap; -#endif +static RgSchCmnRank rgSCHCmnComp2TxMode4(uint32_t *pmiBitMap) { - U32 bitMap0; + uint32_t bitMap0; bitMap0 = pmiBitMap[0]; if((bitMap0>>26)& 0x0F) { @@ -8076,20 +7271,12 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) * - return the least possible Rank * * - * @param[in] U32 *pmiBitMap + * @param[in] uint32_t *pmiBitMap * @return RgSchCmnRank **/ -#ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3 -( - U32 *pmiBitMap - ) -#else -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) - U32 *pmiBitMap; -#endif +static RgSchCmnRank rgSCHCmnComp4TxMode3(uint32_t *pmiBitMap) { - U32 bitMap0; + uint32_t bitMap0; bitMap0 = pmiBitMap[0]; if((bitMap0>>28)& 1) { @@ -8125,20 +7312,12 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) * - return the least possible Rank * * - * @param[in] U32 *pmiBitMap + * @param[in] uint32_t *pmiBitMap * @return RgSchCmnRank **/ -#ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3 -( - U32 *pmiBitMap - ) -#else -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) - U32 *pmiBitMap; -#endif +static RgSchCmnRank rgSCHCmnComp2TxMode3(uint32_t *pmiBitMap) { - U32 bitMap0; + uint32_t bitMap0; bitMap0 = pmiBitMap[0]; if((bitMap0>>30)& 1) { @@ -8167,23 +7346,11 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) * * * @param[in] RgrTxMode txMode - * @param[in] U32 *pmiBitMap - * @param[in] U8 numTxPorts + * @param[in] uint32_t *pmiBitMap + * @param[in] uint8_t numTxPorts * @return RgSchCmnRank **/ -#ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComputeRank -( - RgrTxMode txMode, - U32 *pmiBitMap, - U8 numTxPorts - ) -#else -PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) - RgrTxMode txMode; - U32 *pmiBitMap; - U8 numTxPorts; -#endif +static RgSchCmnRank rgSCHCmnComputeRank(RgrTxMode txMode,uint32_t *pmiBitMap,uint8_t numTxPorts) { if (numTxPorts ==2 && txMode == RGR_UE_TM_3) @@ -8224,23 +7391,12 @@ PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) * @return VOID **/ /*KWORK_FIX:Changed function return type to void */ -#ifdef ANSI -Void rgSCHCmnDlDeInitHqEnt -( -RgSchCellCb *cell, -RgSchDlHqEnt *hqE -) -#else -Void rgSCHCmnDlDeInitHqEnt(cell, hqE) -RgSchCellCb *cell; -RgSchDlHqEnt *hqE; -#endif +Void rgSCHCmnDlDeInitHqEnt(RgSchCellCb *cell,RgSchDlHqEnt *hqE) { - RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - RgSchDlHqProcCb *hqP; - U8 cnt; - S16 ret; - + RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); + RgSchDlHqProcCb *hqP; + uint8_t cnt; + S16 ret; ret = cellSchd->apisDl->rgSCHDlUeHqEntDeInit(cell, hqE); /* Free only If the Harq proc are created*/ @@ -8261,7 +7417,7 @@ RgSchDlHqEnt *hqE; rgSCHLaaDeInitDlHqProcCb (cell, hqE); #endif - RETVOID; + return; } /** @@ -8279,23 +7435,11 @@ RgSchDlHqEnt *hqE; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmnDlInitHqEnt -( -RgSchCellCb *cell, -RgSchDlHqEnt *hqEnt -) -#else -S16 rgSCHCmnDlInitHqEnt(cell, hqEnt) -RgSchCellCb *cell; -RgSchDlHqEnt *hqEnt; -#endif - +S16 rgSCHCmnDlInitHqEnt(RgSchCellCb *cell,RgSchDlHqEnt *hqEnt) { - RgSchDlHqProcCb *hqP; - U8 cnt; - - RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); + RgSchDlHqProcCb *hqP; + uint8_t cnt; + RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++) { @@ -8344,22 +7488,9 @@ RgSchDlHqEnt *hqEnt; * @return Void * **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnGetRefreshDist -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE U8 rgSCHCmnGetRefreshDist(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static uint8_t rgSCHCmnGetRefreshDist(RgSchCellCb *cell,RgSchUeCb *ue) { - U8 refOffst; -#ifdef DEBUGP - Inst inst = cell->instIdx; -#endif + uint8_t refOffst; for(refOffst = 0; refOffst < RGSCH_MAX_REFRESH_OFFSET; refOffst++) { @@ -8367,12 +7498,12 @@ RgSchUeCb *ue; { cell->refreshUeCnt[refOffst]++; ue->refreshOffset = refOffst; - /* printf("UE[%d] refresh offset[%d]. Cell refresh ue count[%d].\n", ue->ueId, refOffst, cell->refreshUeCnt[refOffst]); */ + /* DU_LOG("\nINFO --> SCH : UE[%d] refresh offset[%d]. Cell refresh ue count[%d].\n", ue->ueId, refOffst, cell->refreshUeCnt[refOffst]); */ return (refOffst); } } - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Allocation of refresh distribution failed\n")); + DU_LOG("\nERROR --> SCH : Allocation of refresh distribution failed\n"); /* We should not enter here normally, but incase of failure, allocating from last offset*/ cell->refreshUeCnt[refOffst-1]++; ue->refreshOffset = refOffst-1; @@ -8393,26 +7524,14 @@ RgSchUeCb *ue; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U32 *waitPer + * @param[in] uint32_t *waitPer * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnGetRefreshPer -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 *waitPer -) -#else -PRIVATE Void rgSCHCmnGetRefreshPer(cell, ue, waitPer) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 *waitPer; -#endif +static Void rgSCHCmnGetRefreshPer(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t *waitPer) { - U32 refreshPer; - U32 crntSubFrm; + uint32_t refreshPer; + uint32_t crntSubFrm; refreshPer = RG_SCH_CMN_REFRESH_TIME * RG_SCH_CMN_REFRESH_TIMERES; @@ -8422,7 +7541,7 @@ U32 *waitPer; *waitPer = RGSCH_CEIL(*waitPer, RG_SCH_CMN_REFRESH_TIMERES); *waitPer = *waitPer + rgSCHCmnGetRefreshDist(cell, ue); - RETVOID; + return; } @@ -8449,25 +7568,11 @@ U32 *waitPer; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmnRgrSCellUeCfg -( -RgSchCellCb *sCell, -RgSchUeCb *ue, -RgrUeSecCellCfg *sCellInfoCfg, -RgSchErrInfo *err -) -#else -S16 rgSCHCmnRgrSCellUeCfg(sCell, ue, sCellInfoCfg, err) -RgSchCellCb *sCell; -RgSchUeCb *ue; -RgrUeSecCellCfg *sCellInfoCfg; -RgSchErrInfo *err; -#endif +S16 rgSCHCmnRgrSCellUeCfg(RgSchCellCb *sCell,RgSchUeCb *ue,RgrUeSecCellCfg *sCellInfoCfg,RgSchErrInfo *err) { - U8 i; - S16 ret; - U8 cnt; + uint8_t i; + S16 ret; + uint8_t cnt; RgSchCmnAllocRecord *allRcd; RgSchDlRbAlloc *allocInfo; RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell); @@ -8480,7 +7585,7 @@ RgSchErrInfo *err; #ifdef DEBUGP Inst inst = ue->cell->instIdx; #endif - U32 idx = (U8)((sCell->cellId - rgSchCb[sCell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); + uint32_t idx = (uint8_t)((sCell->cellId - rgSchCb[sCell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); pCellUeSchCmn = RG_SCH_CMN_GET_UE(ue,ue->cell); pCellUeDl = &pCellUeSchCmn->dl; @@ -8489,7 +7594,7 @@ RgSchErrInfo *err; if((rgSCHUtlAllocSBuf(sCell->instIdx, (Data**)&(((ue->cellInfo[ue->cellIdToCellIdxMap[idx]])->sch)), (sizeof(RgSchCmnUe))) != ROK)) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Memory allocation FAILED\n")); + DU_LOG("\nERROR --> SCH : Memory allocation FAILED\n"); err->errCause = RGSCHERR_SCH_CFG; return RFAILED; } @@ -8513,7 +7618,7 @@ RgSchErrInfo *err; RGSCH_ARRAY_BOUND_CHECK(sCell->instIdx, rgUeCatTbl, pCellUeSchCmn->cmn.ueCat); ueDl->maxTbBits = rgUeCatTbl[pCellUeSchCmn->cmn.ueCat].maxDlTbBits; /*CA dev-Start*/ - U8 ri = 0; + uint8_t ri = 0; ri = RGSCH_MIN(ri, sCell->numTxAntPorts); if(((CM_LTE_UE_CAT_6 == pCellUeSchCmn->cmn.ueCat ) ||(CM_LTE_UE_CAT_7 == pCellUeSchCmn->cmn.ueCat)) @@ -8551,7 +7656,7 @@ RgSchErrInfo *err; if ((cellSchd->apisDl->rgSCHRgrSCellDlUeCfg(sCell, ue, err)) != ROK) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Spec Sched DL UE CFG FAILED\n")); + DU_LOG("\nERROR --> SCH : Spec Sched DL UE CFG FAILED\n"); return RFAILED; } @@ -8562,7 +7667,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeCfg(sCell, ue, sCellInfoCfg, err)) != ROK) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS UE config FAILED\n")); + DU_LOG("\nERROR --> SCH : DLFS UE config FAILED\n"); return RFAILED; } } @@ -8578,7 +7683,7 @@ RgSchErrInfo *err; ret = rgSCHUhmHqEntInit(sCell, ue); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL UHM HARQ Ent Init " + DU_LOG("\nERROR --> SCH : SCELL UHM HARQ Ent Init " "Failed for CRNTI:%d", ue->ueId); return RFAILED; } @@ -8611,7 +7716,7 @@ RgSchErrInfo *err; if((rgSCHUtlAllocSBuf(sCell->instIdx, (Data**)&(allRcd),sizeof(RgSchCmnAllocRecord)) != ROK)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL Memory allocation FAILED" + DU_LOG("\nERROR --> SCH : SCELL Memory allocation FAILED" "for CRNTI:%d",ue->ueId); err->errCause = RGSCHERR_SCH_CFG; return RFAILED; @@ -8625,7 +7730,7 @@ RgSchErrInfo *err; ret = rgSCHPwrUeSCellCfg(sCell, ue, sCellInfoCfg); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Could not do " + DU_LOG("\nERROR --> SCH : Could not do " "power config for UE CRNTI:%d",ue->ueId); return RFAILED; } @@ -8635,7 +7740,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisEmtcUl->rgSCHRgrUlUeCfg(sCell, ue, NULL, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED" + DU_LOG("\nERROR --> SCH : Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ue->ueId); return RFAILED; } @@ -8645,7 +7750,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisUl->rgSCHRgrUlUeCfg(sCell, ue, NULL, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED" + DU_LOG("\nERROR --> SCH : Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ue->ueId); return RFAILED; } @@ -8674,20 +7779,10 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmnRgrSCellUeDel -( -RgSchUeCellInfo *sCellInfo, -RgSchUeCb *ue -) -#else -S16 rgSCHCmnRgrSCellUeDel(sCellInfo, ue) -RgSchUeCellInfo *sCellInfo; -RgSchUeCb *ue; -#endif +S16 rgSCHCmnRgrSCellUeDel(RgSchUeCellInfo *sCellInfo,RgSchUeCb *ue) { - RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell); - Inst inst = ue->cell->instIdx; + RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell); + Inst inst = ue->cell->instIdx; cellSchd->apisDl->rgSCHRgrSCellDlUeDel(sCellInfo, ue); @@ -8711,7 +7806,7 @@ RgSchUeCb *ue; { if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeDel(sCellInfo->cell, ue)) != ROK) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS Scell del FAILED\n")); + DU_LOG("\nERROR --> SCH : DLFS Scell del FAILED\n"); return RFAILED; } } @@ -8744,19 +7839,7 @@ RgSchUeCb *ue; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmn5gtfUeCfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeCfg *cfg -) -#else -S16 rgSCHCmn5gtfUeCfg(cell, ue, cfg) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeCfg *cfg; -#endif +S16 rgSCHCmn5gtfUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *cfg) { RgSchUeGrp *ue5gtfGrp; @@ -8772,7 +7855,7 @@ RgrUeCfg *cfg; ue->ue5gtfCb.nxtCqiRiOccn.slot = 0; ue->ue5gtfCb.rank = 1; - printf("\nschd cfg at mac,%u,%u,%u,%u,%u\n",ue->ue5gtfCb.grpId,ue->ue5gtfCb.BeamId,ue->ue5gtfCb.numCC, + DU_LOG("\nINFO --> SCH : schd cfg at mac,%u,%u,%u,%u,%u\n",ue->ue5gtfCb.grpId,ue->ue5gtfCb.BeamId,ue->ue5gtfCb.numCC, ue->ue5gtfCb.mcs,ue->ue5gtfCb.maxPrb); ue5gtfGrp = &(cell->cell5gtfCb.ueGrp5gConf[ue->ue5gtfCb.BeamId]); @@ -8781,8 +7864,7 @@ RgrUeCfg *cfg; scheduling comes into picture */ if(ue5gtfGrp->beamBitMask & (1 << ue->ue5gtfCb.BeamId)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "5GTF_ERROR Invalid beam id CRNTI:%d",cfg->crnti); + DU_LOG("\nERROR --> SCH : 5GTF_ERROR Invalid beam id CRNTI:%d",cfg->crnti); return RFAILED; } ue5gtfGrp->beamBitMask |= (1 << ue->ue5gtfCb.BeamId); @@ -8814,41 +7896,26 @@ RgrUeCfg *cfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmnRgrUeCfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeCfg *ueCfg, -RgSchErrInfo *err -) -#else -S16 rgSCHCmnRgrUeCfg(cell, ue, ueCfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeCfg *ueCfg; -RgSchErrInfo *err; -#endif +S16 rgSCHCmnRgrUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *ueCfg,RgSchErrInfo *err) { RgSchDlRbAlloc *allocInfo; - S16 ret; - RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - RgSchCmnUe *ueSchCmn; - RgSchCmnUlUe *ueUl; - RgSchCmnDlUe *ueDl; - U8 cnt; + S16 ret; + RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); + RgSchCmnUe *ueSchCmn; + RgSchCmnUlUe *ueUl; + RgSchCmnDlUe *ueDl; + uint8_t cnt; RgSchCmnAllocRecord *allRcd; - U32 waitPer; - U32 idx = (U8)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); - RgSchUeCellInfo *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ue); + uint32_t waitPer; + uint32_t idx = (uint8_t)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); + RgSchUeCellInfo *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ue); /* 1. Allocate Common sched control block */ if((rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(((ue->cellInfo[ue->cellIdToCellIdxMap[idx]])->sch)), (sizeof(RgSchCmnUe))) != ROK)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Memory allocation FAILED for CRNTI:%d",ueCfg->crnti); + DU_LOG("\nERROR --> SCH : Memory allocation FAILED for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; return RFAILED; } @@ -8895,7 +7962,7 @@ RgSchErrInfo *err; RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, rgUeCatTbl, ueSchCmn->cmn.ueCat); ueDl->maxTbBits = rgUeCatTbl[ueSchCmn->cmn.ueCat].maxDlTbBits; /*CA dev-Start*/ - U8 ri = 0; + uint8_t ri = 0; ri = RGSCH_MIN(ri, cell->numTxAntPorts); if(((CM_LTE_UE_CAT_6 == ueSchCmn->cmn.ueCat ) ||(CM_LTE_UE_CAT_7 == ueSchCmn->cmn.ueCat)) @@ -8925,7 +7992,7 @@ RgSchErrInfo *err; */ if((ueCfg->ueQosCfg.dlAmbr == 0) && (ueCfg->ueQosCfg.ueBr == 0)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"UL Ambr and DL Ambr are" + DU_LOG("\nERROR --> SCH : UL Ambr and DL Ambr are" "configured as 0 for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; return RFAILED; @@ -8943,8 +8010,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisEmtcDl->rgSCHRgrDlUeCfg(cell, ue, ueCfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); + DU_LOG("\nERROR --> SCH : Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); return RFAILED; } @@ -8954,8 +8020,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisDl->rgSCHRgrDlUeCfg(cell, ue, ueCfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); + DU_LOG("\nERROR --> SCH : Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); return RFAILED; } } @@ -8983,7 +8048,7 @@ RgSchErrInfo *err; if((rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(allRcd),sizeof(RgSchCmnAllocRecord)) != ROK)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED" + DU_LOG("\nERROR --> SCH : Memory allocation FAILED" "for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; return RFAILED; @@ -8999,8 +8064,7 @@ RgSchErrInfo *err; (Data**)&(ue->ul.lcgArr[cnt].sch), (sizeof(RgSchCmnLcg))); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "SCH struct alloc failed for CRNTI:%d",ueCfg->crnti); + DU_LOG("\nERROR --> SCH : SCH struct alloc failed for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; return (ret); } @@ -9009,7 +8073,7 @@ RgSchErrInfo *err; ret = rgSCHPwrUeCfg(cell, ue, ueCfg); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do " + DU_LOG("\nERROR --> SCH : Could not do " "power config for UE CRNTI:%d",ueCfg->crnti); return RFAILED; } @@ -9017,7 +8081,7 @@ RgSchErrInfo *err; ret = rgSCHCmnSpsUeCfg(cell, ue, ueCfg, err); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do " + DU_LOG("\nERROR --> SCH : Could not do " "SPS config for CRNTI:%d",ueCfg->crnti); return RFAILED; } @@ -9028,7 +8092,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisEmtcUl->rgSCHRgrUlUeCfg(cell, ue, ueCfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED" + DU_LOG("\nERROR --> SCH : Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ueCfg->crnti); return RFAILED; } @@ -9038,7 +8102,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisUl->rgSCHRgrUlUeCfg(cell, ue, ueCfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED" + DU_LOG("\nERROR --> SCH : Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ueCfg->crnti); return RFAILED; } @@ -9049,7 +8113,7 @@ RgSchErrInfo *err; { if ((cellSchd->apisDlfs->rgSCHDlfsUeCfg(cell, ue, ueCfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DLFS UE config FAILED" + DU_LOG("\nERROR --> SCH : DLFS UE config FAILED" "for CRNTI:%d",ueCfg->crnti); return RFAILED; } @@ -9081,42 +8145,16 @@ RgSchErrInfo *err; * @return Void **/ #ifdef TFU_UPGRADE -#ifdef ANSI -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeRecfg *ueRecfg, -U8 numTxPorts -) -#else -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg, numTxPorts) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -U8 numTxPorts; -#endif -#else -#ifdef ANSI -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeRecfg *ueRecfg -) +static Void rgSCHCmnDlHdlTxModeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,uint8_t numTxPorts) #else -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -#endif +static Void rgSCHCmnDlHdlTxModeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); if (ueRecfg->txMode.pres != PRSNT_NODEF) { - RETVOID; + return; } /* ccpu00140894- Starting Timer for TxMode Transition Completion*/ ue->txModeTransCmplt =FALSE; @@ -9137,7 +8175,7 @@ RgrUeRecfg *ueRecfg; RG_SCH_CMN_SET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_RI_1); } /* MIMO Fix End: need to set FORCE TD bitmap based on TX mode */ - RETVOID; + return; } if (ueRecfg->txMode.tmTrnstnState == RGR_TXMODE_RECFG_START) { @@ -9184,7 +8222,7 @@ RgrUeRecfg *ueRecfg; { RG_SCH_CMN_SET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_RI_1); } - RETVOID; + return; } } /*********************************************************** @@ -9200,21 +8238,7 @@ RgrUeRecfg *ueRecfg; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUpdUeMimoInfo -( -RgrUeCfg *ueCfg, -RgSchCmnDlUe *ueDl, -RgSchCellCb *cell, -RgSchCmnCell *cellSchd -) -#else -PRIVATE Void rgSCHCmnUpdUeMimoInfo(ueCfg, ueDl, cell, cellSchd) -RgrUeCfg *ueCfg; -RgSchCmnDlUe *ueDl; -RgSchCellCb *cell; -RgSchCmnCell *cellSchd; -#endif +static Void rgSCHCmnUpdUeMimoInfo(RgrUeCfg *ueCfg,RgSchCmnDlUe *ueDl,RgSchCellCb *cell,RgSchCmnCell *cellSchd) { #ifdef TFU_UPGRADE if(ueCfg->txMode.pres) @@ -9249,7 +8273,7 @@ RgSchCmnCell *cellSchd; ueDl->mimoInfo.cwInfo[0].cqi = cellSchd->dl.ccchCqi; ueDl->mimoInfo.cwInfo[1].cqi = cellSchd->dl.ccchCqi; - RETVOID; + return; } /*********************************************************** * @@ -9264,28 +8288,9 @@ RgSchCmnCell *cellSchd; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUpdUeUlCqiInfo -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchCmnUlUe *ueUl, -RgSchCmnUe *ueSchCmn, -RgSchCmnCell *cellSchd, -Bool isEcp -) -#else -PRIVATE Void rgSCHCmnUpdUeUlCqiInfo(cell, ue, ueUl, ueSchCmn, cellSchd, isEcp) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchCmnUlUe *ueUl; -RgSchCmnUe *ueSchCmn; -RgSchCmnCell *cellSchd; -Bool isEcp; -#endif +static Void rgSCHCmnUpdUeUlCqiInfo(RgSchCellCb *cell,RgSchUeCb *ue,RgSchCmnUlUe *ueUl,RgSchCmnUe *ueSchCmn,RgSchCmnCell *cellSchd,Bool isEcp) { - #ifdef TFU_UPGRADE if(ue->srsCb.srsCfg.type == RGR_SCH_SRS_SETUP) { @@ -9325,7 +8330,7 @@ Bool isEcp; ueUl->maxUlCqi = RG_SCH_CMN_UL_NUM_CQI - 1; } - RETVOID; + return; } /*********************************************************** * @@ -9340,17 +8345,7 @@ Bool isEcp; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUpdUeCatCfg -( -RgSchUeCb *ue, -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnUpdUeCatCfg(ue, cell) -RgSchUeCb *ue; -RgSchCellCb *cell; -#endif +static Void rgSCHCmnUpdUeCatCfg(RgSchUeCb *ue,RgSchCellCb *cell) { RgSchDlHqEnt *hqE = NULLP; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); @@ -9363,7 +8358,7 @@ RgSchCellCb *cell; hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); /*CA dev-Start*/ - U8 ri = 0; + uint8_t ri = 0; ri = RGSCH_MIN(ri, cell->numTxAntPorts); if(((CM_LTE_UE_CAT_6 == ueSchCmn->cmn.ueCat ) ||(CM_LTE_UE_CAT_7 == ueSchCmn->cmn.ueCat)) @@ -9388,7 +8383,7 @@ RgSchCellCb *cell; } ue->ul.maxBytesPerUePerTti = rgUeCatTbl[ueSchCmn->cmn.ueCat].maxUlBits * \ RG_SCH_CMN_MAX_BITS_RATIO / (RG_SCH_CMN_UL_COM_DENOM*8); - RETVOID; + return; } /** @@ -9409,24 +8404,10 @@ RgSchCellCb *cell; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmnRgrUeRecfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeRecfg *ueRecfg, -RgSchErrInfo *err -) -#else -S16 rgSCHCmnRgrUeRecfg(cell, ue, ueRecfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -RgSchErrInfo *err; -#endif +S16 rgSCHCmnRgrUeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,RgSchErrInfo *err) { RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell); - U32 waitPer; + uint32_t waitPer; /* Basic validations */ if (ueRecfg->ueRecfgTypes & RGR_UE_TXMODE_RECFG) @@ -9458,7 +8439,7 @@ RgSchErrInfo *err; && (ueRecfg->prdDlCqiRecfg.prdModeEnum != RGR_PRD_CQI_MOD10) && (ueRecfg->prdDlCqiRecfg.prdModeEnum != RGR_PRD_CQI_MOD20)) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Unsupported periodic CQI " + DU_LOG("\nERROR --> SCH : Unsupported periodic CQI " "reporting mode %d for old CRNIT:%d", (int)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->oldCrnti); err->errCause = RGSCHERR_SCH_CFG; @@ -9472,8 +8453,7 @@ RgSchErrInfo *err; { if (rgSCHPwrUeRecfg(cell, ue, ueRecfg) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Power Reconfiguration Failed for OLD CRNTI:%d",ueRecfg->oldCrnti); + DU_LOG("\nERROR --> SCH : Power Reconfiguration Failed for OLD CRNTI:%d",ueRecfg->oldCrnti); return RFAILED; } } @@ -9483,7 +8463,7 @@ RgSchErrInfo *err; /* Uplink Sched related Initialization */ if ((ueRecfg->ueQosRecfg.dlAmbr == 0) && (ueRecfg->ueQosRecfg.ueBr == 0)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Ul Ambr and DL Ambr " + DU_LOG("\nERROR --> SCH : Ul Ambr and DL Ambr " "configured as 0 for OLD CRNTI:%d",ueRecfg->oldCrnti); err->errCause = RGSCHERR_SCH_CFG; return RFAILED; @@ -9506,14 +8486,12 @@ RgSchErrInfo *err; { if ((cellSchCmn->apisEmtcUl->rgSCHRgrUlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); return RFAILED; } if ((cellSchCmn->apisEmtcDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); return RFAILED; } } @@ -9522,14 +8500,12 @@ RgSchErrInfo *err; { if ((cellSchCmn->apisUl->rgSCHRgrUlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); return RFAILED; } if ((cellSchCmn->apisDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); return RFAILED; } } @@ -9539,8 +8515,7 @@ RgSchErrInfo *err; if ((cellSchCmn->apisDlfs->rgSCHDlfsUeRecfg(cell, ue, \ ueRecfg, err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "DLFS UE re-config FAILED for CRNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : DLFS UE re-config FAILED for CRNTI:%d",ue->ueId); return RFAILED; } } @@ -9549,8 +8524,7 @@ RgSchErrInfo *err; /* Invoke re-configuration on SPS module */ if (rgSCHCmnSpsUeRecfg(cell, ue, ueRecfg, err) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "DL SPS ReCFG FAILED for UE CRNTI:%d", ue->ueId); + DU_LOG("\nERROR --> SCH : DL SPS ReCFG FAILED for UE CRNTI:%d", ue->ueId); return RFAILED; } #endif @@ -9571,21 +8545,11 @@ RgSchErrInfo *err; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlUeDelAllocs -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnUlUeDelAllocs(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnUlUeDelAllocs(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); - U8 i; + uint8_t i; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell); #endif @@ -9634,7 +8598,7 @@ RgSchUeCb *ue; } } } - RETVOID; + return; } /*********************************************************** @@ -9652,17 +8616,7 @@ RgSchUeCb *ue; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDelUeFrmRefreshQ -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnDelUeFrmRefreshQ(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnDelUeFrmRefreshQ(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *sched = RG_SCH_CMN_GET_CELL(cell); CmTmrArg arg; @@ -9690,7 +8644,7 @@ RgSchUeCb *ue; arg.evnt = RG_SCH_CMN_EVNT_UE_REFRESH; cmRmvCbTq(&arg); - RETVOID; + return; } /*********************************************************** @@ -9705,18 +8659,8 @@ RgSchUeCb *ue; * * File : * - **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUeCcchSduDel -( -RgSchCellCb *cell, -RgSchUeCb *ueCb -) -#else -PRIVATE Void rgSCHCmnUeCcchSduDel(cell, ueCb) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -#endif + **********************************************************/ +static Void rgSCHCmnUeCcchSduDel(RgSchCellCb *cell,RgSchUeCb *ueCb) { RgSchDlHqEnt *hqE = NULLP; RgSchDlHqProcCb *ccchSduHqP = NULLP; @@ -9726,7 +8670,7 @@ RgSchUeCb *ueCb; hqE = RG_SCH_CMN_GET_UE_HQE(ueCb, cell); if (hqE == NULLP) { - RETVOID; + return; } ccchSduHqP = hqE->ccchSduProc; if(ueCb->ccchSduLnk.node != NULLP) @@ -9761,7 +8705,7 @@ RgSchUeCb *ueCb; rgSCHDhmRlsHqpTb(ccchSduHqP, 0, TRUE); } } - RETVOID; + return; } @@ -9781,30 +8725,20 @@ RgSchUeCb *ueCb; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -Void rgSCHCmnUeDel -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUeDel(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUeDel(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchDlHqEnt *hqE = NULLP; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); CmLList *node; RgSchCmnAllocRecord *allRcd; - U8 cnt; + uint8_t cnt; RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell); - U32 idx = 0; + uint32_t idx = 0; if (RG_SCH_CMN_GET_UE(ue,cell) == NULLP) { /* Common scheduler config has not happened yet */ - RETVOID; + return; } hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); if(hqE) @@ -9897,10 +8831,10 @@ RgSchUeCb *ue; } /* Fix : syed Moved hqEnt deinit to rgSCHCmnDlDeInitHqEnt */ - idx = (U8)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId) & (CM_LTE_MAX_CELLS - 1)); + idx = (uint8_t)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId) & (CM_LTE_MAX_CELLS - 1)); rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&(((ue->cellInfo[ue->cellIdToCellIdxMap[idx]])->sch))), (sizeof(RgSchCmnUe))); - RETVOID; + return; } /* rgSCHCmnUeDel */ @@ -9921,24 +8855,14 @@ RgSchUeCb *ue; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlCnsdrCmnRt -( -RgSchCellCb *cell, -RgrDlCmnCodeRateCfg *dlCmnCodeRate -) -#else -PRIVATE S16 rgSCHCmnDlCnsdrCmnRt(cell, dlCmnCodeRate) -RgSchCellCb *cell; -RgrDlCmnCodeRateCfg *dlCmnCodeRate; -#endif +static S16 rgSCHCmnDlCnsdrCmnRt(RgSchCellCb *cell,RgrDlCmnCodeRateCfg *dlCmnCodeRate) { - RgSchCmnCell *cellDl = RG_SCH_CMN_GET_CELL(cell); - U32 bitsPerRb; - U32 bitsPer2Rb; - U32 bitsPer3Rb; - U8 i, rbNum; - U32 pdcchBits; + RgSchCmnCell *cellDl = RG_SCH_CMN_GET_CELL(cell); + uint32_t bitsPerRb; + uint32_t bitsPer2Rb; + uint32_t bitsPer3Rb; + uint8_t i, rbNum; + uint32_t pdcchBits; /* code rate is bits per 1024 phy bits, since modl'n scheme is 2. it is @@ -10043,39 +8967,27 @@ RgrDlCmnCodeRateCfg *dlCmnCodeRate; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlRgrCellCfg -( -RgSchCellCb *cell, -RgrCellCfg *cfg, -RgSchErrInfo *err -) -#else -PRIVATE S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err) -RgSchCellCb *cell; -RgrCellCfg *cfg; -RgSchErrInfo *err; -#endif +static S16 rgSCHCmnDlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cfg,RgSchErrInfo *err) { RgSchCmnCell *cellSch; - U8 cp; - U8 sfCount; - U8 numPdcchSym; - U8 noSymPerSlot; - U8 maxDlSubfrms = cell->numDlSubfrms; - U8 splSubfrmIdx = cfg->spclSfCfgIdx; - U8 swPtCnt = 0; + uint8_t cp; + uint8_t sfCount; + uint8_t numPdcchSym; + uint8_t noSymPerSlot; + uint8_t maxDlSubfrms = cell->numDlSubfrms; + uint8_t splSubfrmIdx = cfg->spclSfCfgIdx; + uint8_t swPtCnt = 0; Bool isSplfrm; RgSchTddSubfrmInfo subfrmInfo = rgSchTddMaxUlSubfrmTbl[cell->ulDlCfgIdx]; S16 ret; - U8 splSfIdx; - U8 antPortIdx; - U8 numCrs; - U8 cfi; - U8 cfiIdx; + uint8_t splSfIdx; + uint8_t antPortIdx; + uint8_t numCrs; + uint8_t cfi; + uint8_t cfiIdx; RgSchDlSf *sf; - U8 splSfCfi; - U8 mPhich; + uint8_t splSfCfi; + uint8_t mPhich; @@ -10371,8 +9283,7 @@ RgSchErrInfo *err; /*[ccpu00138609]-ADD- Configure the Max CCCH Counter */ if (cfg->maxCcchPerDlSf > cfg->maxUePerDlSf) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "Invalid configuration !: " + DU_LOG("\nERROR --> SCH : Invalid configuration !: " "maxCcchPerDlSf %u > maxUePerDlSf %u", cfg->maxCcchPerDlSf, cfg->maxUePerDlSf ); @@ -10452,27 +9363,15 @@ RgSchErrInfo *err; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlRgrCellCfg -( -RgSchCellCb *cell, -RgrCellCfg *cfg, -RgSchErrInfo *err -) -#else -PRIVATE S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err) -RgSchCellCb *cell; -RgrCellCfg *cfg; -RgSchErrInfo *err; -#endif +static S16 rgSCHCmnDlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cfg,RgSchErrInfo *err) { - S16 ret; - RgSchCmnCell *cellSch; - U8 cp; - U8 numPdcchSym; - U8 noSymPerSlot; - U8 cfi; - U8 cfiIdx; + S16 ret; + RgSchCmnCell *cellSch; + uint8_t cp; + uint8_t numPdcchSym; + uint8_t noSymPerSlot; + uint8_t cfi; + uint8_t cfiIdx; cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -10583,8 +9482,7 @@ RgSchErrInfo *err; /* Fix: MUE_PERTTI_DL syed validating Cell Configuration */ if (cellSch->dl.maxUePerDlSf < cellSch->dl.maxUeNewTxPerTti) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "FAILED MaxUePerDlSf(%u) < MaxDlUeNewTxPerTti(%u)", + DU_LOG("\nERROR --> SCH : FAILED MaxUePerDlSf(%u) < MaxDlUeNewTxPerTti(%u)", cellSch->dl.maxUePerDlSf, cellSch->dl.maxUeNewTxPerTti); return RFAILED; @@ -10592,7 +9490,7 @@ RgSchErrInfo *err; /*[ccpu00138609]-ADD- Configure the Max CCCH Counter */ if (cfg->maxCcchPerDlSf > cfg->maxUePerDlSf) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Invalid configuration !: " + DU_LOG("\nERROR --> SCH : Invalid configuration !: " "maxCcchPerDlSf %u > maxUePerDlSf %u", cfg->maxCcchPerDlSf, cfg->maxUePerDlSf ); @@ -10664,29 +9562,17 @@ RgSchErrInfo *err; * is necessarily satisfied (does a 'ceiling' * computation). * - * Ret : Required RBs (U8) + * Ret : Required RBs (uint8_t) * * Notes: * * File : * **********************************************************/ -#ifdef ANSI -U8 rgSCHCmnUlCalcReqRbCeil -( -U32 bytes, -U8 cqi, -RgSchCmnUlCell *cellUl -) -#else -U8 rgSCHCmnUlCalcReqRbCeil(bytes, cqi, cellUl) -U32 bytes; -U8 cqi; -RgSchCmnUlCell *cellUl; -#endif +uint8_t rgSCHCmnUlCalcReqRbCeil(uint32_t bytes,uint8_t cqi,RgSchCmnUlCell *cellUl) { - U32 numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff); - return ((U8)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl))); + uint32_t numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff); + return ((uint8_t)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl))); } /*********************************************************** @@ -10705,30 +9591,14 @@ RgSchCmnUlCell *cellUl; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnPrecompMsg3Vars -( -RgSchCmnUlCell *cellUl, -U8 ccchCqi, -U16 msgSzA, -U8 sbSize, -Bool isEcp -) -#else -PRIVATE S16 rgSCHCmnPrecompMsg3Vars(cellUl, ccchCqi, msgSzA, sbSize, isEcp) -RgSchCmnUlCell *cellUl; -U8 ccchCqi; -U16 msgSzA; -U8 sbSize; -Bool isEcp; -#endif +static S16 rgSCHCmnPrecompMsg3Vars(RgSchCmnUlCell *cellUl,uint8_t ccchCqi,uint16_t msgSzA,uint8_t sbSize,Bool isEcp) { - U8 numSb; - U8 ccchTbs; - U8 ccchMcs; - U8 numRb = 0; - U8 iTbs = 0; - U16 msg3GrntSz = 0; + uint8_t numSb; + uint8_t ccchTbs; + uint8_t ccchMcs; + uint8_t numRb = 0; + uint8_t iTbs = 0; + uint16_t msg3GrntSz = 0; if (ccchCqi > cellUl->max16qamCqi) @@ -10737,7 +9607,7 @@ Bool isEcp; } /* #ifndef RG_SCH_CMN_EXP_CP_SUP For ECP Pick the index 1 */ /* Fix */ - ccchTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ccchCqi]; + ccchTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ccchCqi]; ccchMcs = rgSCHCmnUlGetIMcsFrmITbs(ccchTbs, CM_LTE_UE_CAT_1); /* MCS should fit in 4 bits in RAR */ @@ -10752,14 +9622,14 @@ Bool isEcp; * Since, UE doesn't exist right now, we use CAT_1 for ue * category*/ while((ccchMcs = (rgSCHCmnUlGetIMcsFrmITbs( - rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ccchCqi],CM_LTE_UE_CAT_1)) + rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ccchCqi],CM_LTE_UE_CAT_1)) ) > RG_SCH_CMN_MAX_MSG3_IMCS) { ccchCqi--; } - iTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ccchCqi]; + iTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ccchCqi]; if (msgSzA < RGSCH_MIN_MSG3_GRNT_SZ) { @@ -10805,7 +9675,7 @@ Bool isEcp; return ROK; } -U32 gPrntPucchDet=0; +uint32_t gPrntPucchDet=0; #ifdef LTE_TDD /*********************************************************** @@ -10821,45 +9691,28 @@ U32 gPrntPucchDet=0; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUlCalcAvailBw -( -RgSchCellCb *cell, -RgrCellCfg *cellCfg, -U8 cfi, -U8 *rbStartRef, -U8 *bwAvailRef -) -#else -PRIVATE S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -U8 cfi; -U8 *rbStartRef; -U8 *bwAvailRef; -#endif -{ - U8 c = 3; - U8 ulBw = cell->bwCfg.ulTotalBw; - U8 n2Rb = cell->pucchCfg.resourceSize; - U8 pucchDeltaShft = cell->pucchCfg.deltaShift; - U16 n1Pucch = cell->pucchCfg.n1PucchAn; - U8 n1Cs = cell->pucchCfg.cyclicShift; - - U8 n1PerRb; - U8 totalCce; - U16 n1Max; - U8 n1Rb; - U32 mixedRb; - U8 exclRb; /* RBs to exclude */ - U8 n1RbPart; - U8 puschRbStart; +static S16 rgSCHCmnUlCalcAvailBw(RgSchCellCb *cell,RgrCellCfg *cellCfg,uint8_t cfi,uint8_t *rbStartRef,uint8_t *bwAvailRef) +{ + uint8_t c = 3; + uint8_t ulBw = cell->bwCfg.ulTotalBw; + uint8_t n2Rb = cell->pucchCfg.resourceSize; + uint8_t pucchDeltaShft = cell->pucchCfg.deltaShift; + uint16_t n1Pucch = cell->pucchCfg.n1PucchAn; + uint8_t n1Cs = cell->pucchCfg.cyclicShift; + uint8_t n1PerRb; + uint8_t totalCce; + uint16_t n1Max; + uint8_t n1Rb; + uint32_t mixedRb; + uint8_t exclRb; /* RBs to exclude */ + uint8_t n1RbPart; + uint8_t puschRbStart; /* To avoid PUCCH and PUSCH collision issue */ - U8 P; - U8 n1PlusOne; - U8 mi; + uint8_t P; + uint8_t n1PlusOne; + uint8_t mi; /* Maximum value of M as per Table 10.1-1 */ - U8 M[RGSCH_MAX_TDD_UL_DL_CFG] = {1, 2, 4, 3, 4, 9, 1}; + uint8_t M[RGSCH_MAX_TDD_UL_DL_CFG] = {1, 2, 4, 3, 4, 9, 1}; if (cell->isCpUlExtend) @@ -10907,7 +9760,7 @@ U8 *bwAvailRef; /* Num of PUCCH RBs = puschRbStart*2 */ if (puschRbStart * 2 >= ulBw) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH"); + DU_LOG("\nERROR --> SCH : No bw available for PUSCH"); return RFAILED; } @@ -10937,40 +9790,24 @@ U8 *bwAvailRef; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUlCalcAvailBw -( -RgSchCellCb *cell, -RgrCellCfg *cellCfg, -U8 cfi, -U8 *rbStartRef, -U8 *bwAvailRef -) -#else -PRIVATE S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -U8 cfi; -U8 *rbStartRef; -U8 *bwAvailRef; -#endif -{ - U8 c = 3; - U8 ulBw = cell->bwCfg.ulTotalBw; - U8 n2Rb = cell->pucchCfg.resourceSize; - U8 pucchDeltaShft = cell->pucchCfg.deltaShift; - U16 n1Pucch = cell->pucchCfg.n1PucchAn; - U8 n1Cs = cell->pucchCfg.cyclicShift; - U8 n1PerRb; - U8 totalCce; - U16 n1Max; - U8 n1Rb; - U32 mixedRb; - U8 exclRb; /* RBs to exclude */ - U8 n1RbPart; - U8 puschRbStart; +static S16 rgSCHCmnUlCalcAvailBw(RgSchCellCb *cell,RgrCellCfg *cellCfg,uint8_t cfi,uint8_t *rbStartRef,uint8_t *bwAvailRef) +{ + uint8_t c = 3; + uint8_t ulBw = cell->bwCfg.ulTotalBw; + uint8_t n2Rb = cell->pucchCfg.resourceSize; + uint8_t pucchDeltaShft = cell->pucchCfg.deltaShift; + uint16_t n1Pucch = cell->pucchCfg.n1PucchAn; + uint8_t n1Cs = cell->pucchCfg.cyclicShift; + uint8_t n1PerRb; + uint8_t totalCce; + uint16_t n1Max; + uint8_t n1Rb; + uint32_t mixedRb; + uint8_t exclRb; /* RBs to exclude */ + uint8_t n1RbPart; + uint8_t puschRbStart; #ifdef LTE_ADV - U16 numOfN3PucchRb; + uint16_t numOfN3PucchRb; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); #endif @@ -10989,7 +9826,7 @@ U8 *bwAvailRef; /* ccpu00129978- MOD- excluding RBs based on formula in section 5.4.3 in * TS 36.211 */ n1RbPart = (c*n1Cs)/pucchDeltaShft; - n1Rb = (U8)((n1Max - n1RbPart) / n1PerRb); + n1Rb = (uint8_t)((n1Max - n1RbPart) / n1PerRb); mixedRb = RGSCH_CEIL(n1Cs, 8); /* same as 'mixedRb = n1Cs ? 1 : 0' */ /* get the total Number of RB's to be excluded for PUSCH */ @@ -11015,17 +9852,17 @@ U8 *bwAvailRef; if(gPrntPucchDet) { #ifndef ALIGN_64BIT - printf("CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%ld:%d:%d:%d:%d:%d]\n", + DU_LOG("\nDEBUG --> SCH : CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%ld:%d:%d:%d:%d:%d]\n", cell->crntTime.sfn, cell->crntTime.slot, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb); #else - printf("CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%d:%d:%d:%d:%d:%d]\n", + DU_LOG("\nDEBUG --> SCH : CA_DBG:: puschRbStart:n1Rb:mixedRb:n1PerRb:totalCce:n1Max:n1RbPart:n2Rb::[%d:%d] [%d:%d:%d:%d:%d:%d:%d:%d]\n", cell->crntTime.sfn, cell->crntTime.slot, puschRbStart, n1Rb, mixedRb,n1PerRb, totalCce, n1Max, n1RbPart, n2Rb); #endif } if (puschRbStart*2 >= ulBw) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH"); + DU_LOG("\nERROR --> SCH : No bw available for PUSCH"); return RFAILED; } @@ -11057,51 +9894,41 @@ U8 *bwAvailRef; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUlCellInit -( - RgSchCellCb *cell, - RgrCellCfg *cellCfg - ) -#else -PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) - RgSchCellCb *cell; - RgrCellCfg *cellCfg; -#endif +static S16 rgSCHCmnUlCellInit(RgSchCellCb *cell,RgrCellCfg *cellCfg) { S16 ret; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - U8 maxUePerUlSf = cellCfg->maxUePerUlSf; + uint8_t maxUePerUlSf = cellCfg->maxUePerUlSf; #ifdef RGR_V1 /* Added configuration for maximum number of MSG3s */ - U8 maxMsg3PerUlSf = cellCfg->maxMsg3PerUlSf; -#endif - U8 maxUlBwPerUe = cellCfg->maxUlBwPerUe; - U8 sbSize = cellCfg->puschSubBand.size; - U8 i; - U8 rbStart; - U8 bwAvail; - U8 cfi; - U8 maxSbPerUe; - U8 numSb; + uint8_t maxMsg3PerUlSf = cellCfg->maxMsg3PerUlSf; +#endif + uint8_t maxUlBwPerUe = cellCfg->maxUlBwPerUe; + uint8_t sbSize = cellCfg->puschSubBand.size; + uint8_t i; + uint8_t rbStart; + uint8_t bwAvail; + uint8_t cfi; + uint8_t maxSbPerUe; + uint8_t numSb; #ifdef LTE_TDD - U16 ulDlCfgIdx = cell->ulDlCfgIdx; + uint16_t ulDlCfgIdx = cell->ulDlCfgIdx; /* [ccpu00127294]-MOD-Change the max Ul subfrms size in TDD */ - U8 maxSubfrms = 2 * rgSchTddNumUlSf[ulDlCfgIdx]; - U8 ulToDlMap[12] = {0}; /* maximum 6 Subframes in UL * 2 */ - U8 maxUlsubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ + uint8_t maxSubfrms = 2 * rgSchTddNumUlSf[ulDlCfgIdx]; + uint8_t ulToDlMap[12] = {0}; /* maximum 6 Subframes in UL * 2 */ + uint8_t maxUlsubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ [RGSCH_NUM_SUB_FRAMES-1]; - U16 subfrm; - S8 dlIdx; + uint16_t subfrm; + S8 dlIdx; #else - U8 maxSubfrms = RG_SCH_CMN_UL_NUM_SF; + uint8_t maxSubfrms = RG_SCH_CMN_UL_NUM_SF; #endif #ifdef LTE_L2_MEAS - U8 idx; + uint8_t idx; #endif - U8 iTbs; + uint8_t iTbs; #if (defined(LTE_L2_MEAS) ) - Inst inst = cell->instIdx; + Inst inst = cell->instIdx; #endif /* #if (defined(LTE_L2_MEAS) || defined(DEBUGP) */ RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); @@ -11140,8 +9967,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) /* Fix: MUE_PERTTI_UL syed validating Cell Configuration */ if (cellUl->maxAllocPerUlSf < cellUl->maxUeNewTxPerTti) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "FAILED: MaxUePerUlSf(%u) < MaxUlUeNewTxPerTti(%u)", + DU_LOG("\nERROR --> SCH : FAILED: MaxUePerUlSf(%u) < MaxUlUeNewTxPerTti(%u)", cellUl->maxAllocPerUlSf, cellUl->maxUeNewTxPerTti); return RFAILED; @@ -11159,7 +9985,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) ulUeInfo.ulAllocInfo), (cellUl->maxAllocPerUlSf * sizeof(RgInfUeUlAlloc))); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation failed "); + DU_LOG("\nERROR --> SCH : Memory allocation failed "); return (ret); } } @@ -11183,7 +10009,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if (sbSize != rgSchCmnMult235Tbl[sbSize].match) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid subband size %d", sbSize); + DU_LOG("\nERROR --> SCH : Invalid subband size %d", sbSize); return RFAILED; } //Setting the subband size to 4 which is size of VRBG in 5GTF @@ -11194,7 +10020,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) maxSbPerUe = maxUlBwPerUe / sbSize; if (maxSbPerUe == 0) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlCellInit(): " + DU_LOG("\nERROR --> SCH : rgSCHCmnUlCellInit(): " "maxUlBwPerUe/sbSize is zero"); return RFAILED; } @@ -11204,7 +10030,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if ((!RG_SCH_CMN_UL_IS_CQI_VALID(cellCfg->ulCmnCodeRate.ccchCqi)) || (!RG_SCH_CMN_UL_IS_CQI_VALID(cellCfg->trgUlCqi.trgCqi))) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnUlCellInit(): " + DU_LOG("\nERROR --> SCH : rgSCHCmnUlCellInit(): " "Invalid cqi"); return RFAILED; } @@ -11216,9 +10042,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) * Refer to 36.213-8.6.1 */ for (i = RG_SCH_CMN_UL_NUM_CQI - 1;i > 0; --i) { - RLOG_ARG2(L_INFO,DBG_CELLID,cell->cellId, - "CQI %u:iTbs %u", - i, + DU_LOG("\nINFO --> SCH : CQI %u:iTbs %u",i, rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend][i]); #ifdef MAC_SCH_STATS /* ccpu00128489 ADD Update mcs in hqFailStats here instead of at CRC @@ -11235,8 +10059,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) iTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend][i]; if (iTbs <= RGSCH_UL_16QAM_MAX_ITBS) /* corresponds to 16QAM */ { - RLOG_ARG1(L_INFO,DBG_CELLID,cell->cellId, - "16 QAM CQI %u", i); + DU_LOG("\nINFO --> SCH : 16 QAM CQI %u", i); cellUl->max16qamCqi = i; break; } @@ -11324,8 +10147,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if(0 == cell->dynCfiCb.maxCfi) { - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, - "Incorrect Default CFI(%u), maxCfi(%u), maxPucchRb(%d)", + DU_LOG("\nERROR --> SCH : Incorrect Default CFI(%u), maxCfi(%u), maxPucchRb(%d)", cellSch->cfiCfg.cfi, cell->dynCfiCb.maxCfi, cell->pucchCfg.maxPucchRb); @@ -11391,21 +10213,9 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmnRgrCellCfg -( -RgSchCellCb *cell, -RgrCellCfg *cellCfg, -RgSchErrInfo *err -) -#else -S16 rgSCHCmnRgrCellCfg(cell, cellCfg, err) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -RgSchErrInfo *err; -#endif +S16 rgSCHCmnRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *err) { - S16 ret; + S16 ret; RgSchCmnCell *cellSch; /* As part of RGR cell configuration, validate the CRGCellCfg @@ -11415,8 +10225,7 @@ RgSchErrInfo *err; if (((ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(cell->sc.sch), (sizeof(RgSchCmnCell)))) != ROK)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "Memory allocation FAILED"); + DU_LOG("\nERROR --> SCH : Memory allocation FAILED"); err->errCause = RGSCHERR_SCH_CFG; return (ret); } @@ -11527,19 +10336,7 @@ RgSchErrInfo *err; * @return Void * **/ -#ifdef ANSI -S16 rgSCHCmnRgrCellRecfg -( -RgSchCellCb *cell, -RgrCellRecfg *recfg, -RgSchErrInfo *err -) -#else -S16 rgSCHCmnRgrCellRecfg(cell, recfg, err) -RgSchCellCb *cell; -RgrCellRecfg *recfg; -RgSchErrInfo *err; -#endif +S16 rgSCHCmnRgrCellRecfg(RgSchCellCb *cell,RgrCellRecfg *recfg,RgSchErrInfo *err) { S16 ret; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -11548,11 +10345,11 @@ RgSchErrInfo *err; if (recfg->recfgTypes & RGR_CELL_UL_CMNRATE_RECFG) { - U8 oldCqi = cellUl->dfltUlCqi; + uint8_t oldCqi = cellUl->dfltUlCqi; if (!RG_SCH_CMN_UL_IS_CQI_VALID(recfg->ulCmnCodeRate.ccchCqi)) { err->errCause = RGSCHERR_SCH_CFG; - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnRgrCellRecfg(): " + DU_LOG("\nERROR --> SCH : rgSCHCmnRgrCellRecfg(): " "Invalid cqi"); return RFAILED; } @@ -11647,20 +10444,12 @@ RgSchErrInfo *err; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlCellDeinit -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnUlCellDeinit(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnUlCellDeinit(RgSchCellCb *cell) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - U8 ulSfIdx; + uint8_t ulSfIdx; #ifdef LTE_TDD - U8 maxSubfrms = cellUl->numUlSubfrms; + uint8_t maxSubfrms = cellUl->numUlSubfrms; #endif #ifdef LTE_L2_MEAS CmLList *lnk = NULLP; @@ -11725,7 +10514,7 @@ RgSchCellCb *cell; } #endif - RETVOID; + return; } /** @@ -11741,15 +10530,7 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -Void rgSCHCmnCellDel -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnCellDel(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnCellDel(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -11758,7 +10539,7 @@ RgSchCellCb *cell; #endif if (cellSch == NULLP) { - RETVOID; + return; } /* Perform the deinit for the UL scheduler */ rgSCHCmnUlCellDeinit(cell); @@ -11808,7 +10589,7 @@ RgSchCellCb *cell; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&(cell->sc.sch)), (sizeof(RgSchCmnCell))); - RETVOID; + return; } /* rgSCHCmnCellDel */ @@ -11826,19 +10607,9 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnValidateDlQos -( -RgrLchQosCfg *dlQos -) -#else -PRIVATE S16 rgSCHCmnValidateDlQos(dlQos) -RgrLchQosCfg *dlQos; -#endif +static S16 rgSCHCmnValidateDlQos(RgrLchQosCfg *dlQos) { - U8 qci = dlQos->qci; - - + uint8_t qci = dlQos->qci; if ( qci < RG_SCH_CMN_MIN_QCI || qci > RG_SCH_CMN_MAX_QCI ) { return RFAILED; @@ -11875,7 +10646,6 @@ RgrLchQosCfg *dlQos; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnRgrLchCfg ( RgSchCellCb *cell, @@ -11884,14 +10654,6 @@ RgSchDlLcCb *dlLc, RgrLchCfg *lcCfg, RgSchErrInfo *err ) -#else -S16 rgSCHCmnRgrLchCfg(cell, ue, dlLc, lcCfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *dlLc; -RgrLchCfg *lcCfg; -RgSchErrInfo *err; -#endif { S16 ret; @@ -11902,7 +10664,7 @@ RgSchErrInfo *err; (Data**)&((dlLc)->sch), (sizeof(RgSchCmnDlSvc))); if (ret != ROK) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnRgrLchCfg(): " + DU_LOG("\nERROR --> SCH : rgSCHCmnRgrLchCfg(): " "SCH struct alloc failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; return (ret); @@ -11912,7 +10674,7 @@ RgSchErrInfo *err; ret = rgSCHCmnValidateDlQos(&lcCfg->dlInfo.dlQos); if (ret != ROK) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSchCmnCrgLcCfg(): " + DU_LOG("\nERROR --> SCH : rgSchCmnCrgLcCfg(): " "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; return (ret); @@ -11986,7 +10748,7 @@ RgSchErrInfo *err; ret = rgSCHCmnSpsDlLcCfg(cell, ue, dlLc, lcCfg, err); if (ret != ROK) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSchCmnRgrLchCfg(): " + DU_LOG("\nERROR --> SCH : rgSchCmnRgrLchCfg(): " "SPS configuration failed for DL LC for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; return RFAILED; @@ -12019,7 +10781,6 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnRgrLchRecfg ( RgSchCellCb *cell, @@ -12028,14 +10789,6 @@ RgSchDlLcCb *dlLc, RgrLchRecfg *lcRecfg, RgSchErrInfo *err ) -#else -S16 rgSCHCmnRgrLchRecfg(cell, ue, dlLc, lcRecfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *dlLc; -RgrLchRecfg *lcRecfg; -RgSchErrInfo *err; -#endif { S16 ret; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -12047,14 +10800,13 @@ RgSchErrInfo *err; if (ret != ROK) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); + DU_LOG("\nERROR --> SCH : DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); err->errCause = RGSCHERR_SCH_CFG; return (ret); } if (((RgSchCmnDlSvc *)(dlLc->sch))->qci != lcRecfg->dlRecfg.dlQos.qci) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Qci, hence lc Priority change " + DU_LOG("\nERROR --> SCH : Qci, hence lc Priority change " "not supported for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); err->errCause = RGSCHERR_SCH_CFG; return (ret); @@ -12108,7 +10860,7 @@ RgSchErrInfo *err; ret = rgSCHCmnSpsDlLcRecfg(cell, ue, dlLc, lcRecfg, err); if (ret != ROK) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"SPS re-configuration not " + DU_LOG("\nERROR --> SCH : SPS re-configuration not " "supported for dlLC Ignore this CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); } } @@ -12139,7 +10891,6 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnRgrLcgCfg ( RgSchCellCb *cell, @@ -12148,14 +10899,6 @@ RgSchLcgCb *lcg, RgrLcgCfg *lcgCfg, RgSchErrInfo *err ) -#else -S16 rgSCHCmnRgrLcgCfg(cell, ue, lcg, lcgCfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchLcgCb *lcg; -RgrLcgCfg *lcgCfg; -RgSchErrInfo *err; -#endif { S16 ret; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -12213,7 +10956,6 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnRgrLcgRecfg ( RgSchCellCb *cell, @@ -12222,14 +10964,6 @@ RgSchLcgCb *lcg, RgrLcgRecfg *reCfg, RgSchErrInfo *err ) -#else -S16 rgSCHCmnRgrLcgRecfg(cell, ue, lcg, reCfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchLcgCb *lcg; -RgrLcgRecfg *reCfg; -RgSchErrInfo *err; -#endif { S16 ret; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -12285,21 +11019,7 @@ RgSchErrInfo *err; * * File : **********************************************************/ -#ifdef ANSI -S16 rgSCHCmnRgrLchDel -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteLcId lcId, -U8 lcgId -) -#else -S16 rgSCHCmnRgrLchDel(cell, ue, lcId, lcgId) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteLcId lcId; -U8 lcgId; -#endif +S16 rgSCHCmnRgrLchDel(RgSchCellCb *cell,RgSchUeCb *ue,CmLteLcId lcId,uint8_t lcgId) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); #ifdef EMTC_ENABLE @@ -12329,26 +11049,14 @@ U8 lcgId; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnLcgDel -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchLcgCb *lcg -) -#else -Void rgSCHCmnLcgDel(cell, ue, lcg) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchLcgCb *lcg; -#endif +Void rgSCHCmnLcgDel(RgSchCellCb *cell,RgSchUeCb *ue,RgSchLcgCb *lcg) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *lcgCmn = RG_SCH_CMN_GET_UL_LCG(lcg); if (lcgCmn == NULLP) { - RETVOID; + return; } if (RGSCH_IS_GBR_BEARER(lcgCmn->cfgdGbr)) @@ -12380,7 +11088,7 @@ RgSchLcgCb *lcg; { cellSch->apisUl->rgSCHFreeUlLcg(cell, ue, lcg); } - RETVOID; + return; } @@ -12401,24 +11109,12 @@ RgSchLcgCb *lcg; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnFreeDlLc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *svc -) -#else -Void rgSCHCmnFreeDlLc(cell, ue, svc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *svc; -#endif +Void rgSCHCmnFreeDlLc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); if (svc->sch == NULLP) { - RETVOID; + return; } #ifdef EMTC_ENABLE if((cell->emtcEnable)&&(TRUE == ue->isEmtcUe)) @@ -12455,7 +11151,7 @@ RgSchDlLcCb *svc; rgSCHLaaDeInitDlLchCb(cell, svc); #endif - RETVOID; + return; } #ifdef RGR_V1 @@ -12483,17 +11179,7 @@ RgSchDlLcCb *svc; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduRetxFnlz -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchSduRetxFnlz(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchSduRetxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { CmLList *node; RgSchCmnDlCell *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell); @@ -12530,7 +11216,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* reset the UE allocation Information */ rgSCHCmnDlUeResetTemp(ue, hqP); } - RETVOID; + return; } #endif /** @@ -12556,17 +11242,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchRetxFnlz -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchRetxFnlz(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchRetxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { CmLList *node; RgSchCmnDlCell *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell); @@ -12603,7 +11279,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; memset(&raCb->rbAllocInfo, 0, sizeof(raCb->rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } - RETVOID; + return; } #ifdef RGR_V1 @@ -12630,17 +11306,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduTxFnlz -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchSduTxFnlz(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchSduTxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { CmLList *node; RgSchUeCb *ueCb; @@ -12694,7 +11360,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* reset the UE allocation Information */ rgSCHCmnDlUeResetTemp(ueCb, hqP); } - RETVOID; + return; } #endif @@ -12721,17 +11387,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchTxFnlz -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlCcchTxFnlz(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlCcchTxFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { CmLList *node; RgSchRaCb *raCb; @@ -12793,7 +11449,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHCmnDlHqPResetTemp(hqP); } - RETVOID; + return; } /* R8 Upgrade */ /** @@ -12810,26 +11466,16 @@ RgSchCmnDlRbAllocInfo *allocInfo; * Invoked by: Common Scheduler * * @param[in] RgSchCellCb *cell - * @param[in] U32 ueCount - * @return U8 + * @param[in] uint32_t ueCount + * @return uint8_t * **/ -#ifdef ANSI -U8 rgSCHCmnGetBiIndex -( -RgSchCellCb *cell, -U32 ueCount -) -#else -U8 rgSCHCmnGetBiIndex(cell, ueCount) -RgSchCellCb *cell; -U32 ueCount; -#endif +uint8_t rgSCHCmnGetBiIndex(RgSchCellCb *cell,uint32_t ueCount) { S16 prevVal = 0; /* To Store Intermediate Value */ - U16 newBiVal = 0; /* To store Bi Value in millisecond */ - U8 idx = 0; - U16 timeDiff = 0; + uint16_t newBiVal = 0; /* To store Bi Value in millisecond */ + uint8_t idx = 0; + uint16_t timeDiff = 0; if (cell->biInfo.prevBiTime != 0) @@ -12901,19 +11547,9 @@ U32 ueCount; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRaRspFnlz -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlRaRspFnlz(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlRaRspFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { - U32 rarCnt = 0; + uint32_t rarCnt = 0; RgSchDlRbAlloc *raRspAlloc; RgSchDlSf *subFrm = NULLP; RgSchRaCb *raCb; @@ -12923,11 +11559,11 @@ RgSchCmnDlRbAllocInfo *allocInfo; Bool preamGrpA; RgSchUlAlloc *ulAllocRef=NULLP; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - U8 allocRapidCnt = 0; + uint8_t allocRapidCnt = 0; #ifdef LTE_TDD - U32 msg3SchdIdx = 0; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 msg3Subfrm; + uint32_t msg3SchdIdx = 0; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t msg3Subfrm; #endif @@ -13083,18 +11719,17 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* Return the grabbed PDCCH */ rgSCHUtlPdcchPut(cell, &subFrm->pdcchInfo, raRspAlloc->pdcch); subFrm->raRsp[rarCnt].pdcch = NULLP; - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnRaRspAlloc(): " + DU_LOG("\nERROR --> SCH : rgSCHCmnRaRspAlloc(): " "Not even one RaReq."); - RETVOID; + return; } } - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, - "RNTI:%d Scheduled RAR @ (%u,%u) ", + DU_LOG("\nDEBUG --> SCH : RNTI:%d Scheduled RAR @ (%u,%u) ", raRspAlloc->rnti, cell->crntTime.sfn, cell->crntTime.slot); } - RETVOID; + return; } /** @@ -13109,25 +11744,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * * @param[in] RgSchCellCb *cell * @param[in] Bool si - * @param[in] U16 i - * @return U8 + * @param[in] uint16_t i + * @return uint8_t * **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnDlCalcRvForBcch -( -RgSchCellCb *cell, -Bool si, -U16 i -) -#else -PRIVATE U8 rgSCHCmnDlCalcRvForBcch(cell, si, i) -RgSchCellCb *cell; -Bool si; -U16 i; -#endif +static uint8_t rgSCHCmnDlCalcRvForBcch(RgSchCellCb *cell,Bool si,uint16_t i) { - U8 k, rv; + uint8_t k, rv; CmLteTimingInfo frm; frm = cell->crntTime; @@ -13166,28 +11789,18 @@ U16 i; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlBcchPcchFnlz -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlBcchPcchFnlz(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlBcchPcchFnlz(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { RgSchDlRbAlloc *rbAllocInfo; RgSchDlSf *subFrm; #ifdef LTE_TDD - U8 nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE; + uint8_t nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE; #else #ifdef LTEMAC_HDFDD - U8 nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES; + uint8_t nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES; #else - U8 nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES; + uint8_t nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES; #endif #endif @@ -13219,9 +11832,9 @@ RgSchCmnDlRbAllocInfo *allocInfo; pcch = rgSCHDbmGetPcch(cell); if(pcch == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnDlBcchPcchFnlz( ): " + DU_LOG("\nERROR --> SCH : rgSCHCmnDlBcchPcchFnlz( ): " "No Pcch Present"); - RETVOID; + return; } /* Added Dl TB count for paging message transmission*/ @@ -13281,7 +11894,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; } else { - U16 i; + uint16_t i; #ifdef RGR_SI_SCH Buffer *pdu; @@ -13356,7 +11969,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; #endif/*RGR_SI_SCH*/ } - RETVOID; + return; } @@ -13375,15 +11988,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlSetAllUnSched -( -RgSchCmnUlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnUlSetAllUnSched(allocInfo) -RgSchCmnUlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnUlSetAllUnSched(RgSchCmnUlRbAllocInfo *allocInfo) { CmLList *node; @@ -13409,7 +12014,7 @@ RgSchCmnUlRbAllocInfo *allocInfo; node = allocInfo->ueLst.first; } - RETVOID; + return; } #endif @@ -13428,22 +12033,12 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnUlAdd2CntResLst -( -RgSchCmnUlRbAllocInfo *allocInfo, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUlAdd2CntResLst(allocInfo, ue) -RgSchCmnUlRbAllocInfo *allocInfo; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUlAdd2CntResLst(RgSchCmnUlRbAllocInfo *allocInfo,RgSchUeCb *ue) { RgSchCmnUeUlAlloc *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,ue->cell))->alloc); cmLListAdd2Tail(&allocInfo->contResLst, &ulAllocInfo->reqLnk); ulAllocInfo->reqLnk.node = (PTR)ue; - RETVOID; + return; } /** @@ -13461,19 +12056,7 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnUlAdd2UeLst -( -RgSchCellCb *cell, -RgSchCmnUlRbAllocInfo *allocInfo, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUlAdd2UeLst(cell, allocInfo, ue) -RgSchCellCb *cell; -RgSchCmnUlRbAllocInfo *allocInfo; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUlAdd2UeLst(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo,RgSchUeCb *ue) { RgSchCmnUeUlAlloc *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,cell))->alloc); if (ulAllocInfo->reqLnk.node == NULLP) @@ -13481,7 +12064,7 @@ RgSchUeCb *ue; cmLListAdd2Tail(&allocInfo->ueLst, &ulAllocInfo->reqLnk); ulAllocInfo->reqLnk.node = (PTR)ue; } - RETVOID; + return; } /** @@ -13498,17 +12081,7 @@ RgSchUeCb *ue; * @param[in] RgSchCmnUlRbAllocInfo *allocInfo * @return Void **/ -#ifdef ANSI -Void rgSCHCmnAllocUlRb -( -RgSchCellCb *cell, -RgSchCmnUlRbAllocInfo *allocInfo -) -#else -Void rgSCHCmnAllocUlRb(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnUlRbAllocInfo *allocInfo; -#endif +Void rgSCHCmnAllocUlRb(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo) { RgSchUlSf *sf = allocInfo->sf; @@ -13516,7 +12089,7 @@ RgSchCmnUlRbAllocInfo *allocInfo; rgSCHCmnUlRbAllocForLst(cell, sf, allocInfo->ueLst.count, &allocInfo->ueLst, &allocInfo->schdUeLst, &allocInfo->nonSchdUeLst, (Bool)TRUE); - RETVOID; + return; } /*********************************************************** @@ -13533,34 +12106,22 @@ RgSchCmnUlRbAllocInfo *allocInfo; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlRbAllocForLst +static Void rgSCHCmnUlRbAllocForLst ( -RgSchCellCb *cell, -RgSchUlSf *sf, -U32 count, -CmLListCp *reqLst, -CmLListCp *schdLst, -CmLListCp *nonSchdLst, -Bool isNewTx +RgSchCellCb *cell, +RgSchUlSf *sf, +uint32_t count, +CmLListCp *reqLst, +CmLListCp *schdLst, +CmLListCp *nonSchdLst, +Bool isNewTx ) -#else -PRIVATE Void rgSCHCmnUlRbAllocForLst(cell, sf, count, reqLst, schdLst, - nonSchdLst, isNewTx) -RgSchCellCb *cell; -RgSchUlSf *sf; -U32 count; -CmLListCp *reqLst; -CmLListCp *schdLst; -CmLListCp *nonSchdLst; -Bool isNewTx; -#endif { CmLList *lnk; RgSchUlHole *hole; #ifdef LTE_L2_MEAS #ifdef LTE_TDD - U8 k; + uint8_t k; CmLteTimingInfo timeInfo; #endif #endif @@ -13574,7 +12135,7 @@ Bool isNewTx; #ifdef LTE_L2_MEAS if(isNewTx == TRUE) { - cell->sfAllocArr[cell->crntSfIdx].ulUeInfo.numUes = (U8) count; + cell->sfAllocArr[cell->crntSfIdx].ulUeInfo.numUes = (uint8_t) count; #ifdef LTE_TDD RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, timeInfo, TFU_ULCNTRL_DLDELTA); k = rgSchTddPuschTxKTbl[cell->ulDlCfgIdx][timeInfo.subframe]; @@ -13592,7 +12153,7 @@ Bool isNewTx; RgSchUeCb *ue = (RgSchUeCb *)lnk->node; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); S16 ret; - U8 maxRb; + uint8_t maxRb; if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) @@ -13639,7 +12200,7 @@ Bool isNewTx; rgSCHCmnUlRbAllocAddUeToLst(cell, ue, nonSchdLst); ue->isMsg4PdcchWithCrnti = FALSE; } - RETVOID; + return; } #ifdef UNUSED_FUNC @@ -13663,47 +12224,35 @@ Bool isNewTx; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi +static S16 rgSCHCmnUlMdfyGrntForCqi ( RgSchCellCb *cell, RgSchUeCb *ue, -U32 maxRb, -U32 *numSb, -U8 *iTbs, -U32 hqSz, -U32 stepDownItbs, -U32 effTgt +uint32_t maxRb, +uint32_t *numSb, +uint8_t *iTbs, +uint32_t hqSz, +uint32_t stepDownItbs, +uint32_t effTgt ) -#else -PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi(cell, ue, maxRb, numSb, iTbs, hqSz, stepDownItbs, effTgt) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 maxRb; -U32 *numSb; -U8 *iTbs; -U32 hqSz; -U32 stepDownItbs; -U32 effTgt; -#endif { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(ue->cell); - U32 nPrb; - U32 totREs; - U32 cqiRiREs; - U32 hqREs; - U32 remREsForPusch; - U32 bitsPerRe; - U32 tbSz; - U32 betaOffVal = ue->ul.betaOffstVal; - U32 cqiRiRptSz = ue->ul.cqiRiSz; - U32 betaOffHqVal = rgSchCmnBetaHqOffstTbl[ue->ul.betaHqOffst]; - U32 resNumSb = *numSb; - U32 puschEff = 1000; - U8 modOdr; - U8 iMcs; + uint32_t nPrb; + uint32_t totREs; + uint32_t cqiRiREs; + uint32_t hqREs; + uint32_t remREsForPusch; + uint32_t bitsPerRe; + uint32_t tbSz; + uint32_t betaOffVal = ue->ul.betaOffstVal; + uint32_t cqiRiRptSz = ue->ul.cqiRiSz; + uint32_t betaOffHqVal = rgSchCmnBetaHqOffstTbl[ue->ul.betaHqOffst]; + uint32_t resNumSb = *numSb; + uint32_t puschEff = 1000; + uint8_t modOdr; + uint8_t iMcs; Bool mdfyiTbsFlg = FALSE; - U8 resiTbs = *iTbs; + uint8_t resiTbs = *iTbs; @@ -13789,49 +12338,40 @@ U32 effTgt; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUlRbAllocForUe +static S16 rgSCHCmnUlRbAllocForUe ( -RgSchCellCb *cell, -RgSchUlSf *sf, -RgSchUeCb *ue, -U8 maxRb, -RgSchUlHole *hole +RgSchCellCb *cell, +RgSchUlSf *sf, +RgSchUeCb *ue, +uint8_t maxRb, +RgSchUlHole *hole ) -#else -PRIVATE S16 rgSCHCmnUlRbAllocForUe(cell, sf, ue, maxRb, hole) -RgSchCellCb *cell; -RgSchUlSf *sf; -RgSchUeCb *ue; -U8 maxRb; -RgSchUlHole *hole; -#endif { - RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); - RgSchUlAlloc *alloc = NULLP; - U32 nPrb = 0; - U8 numVrbg; - U8 iMcs; - U8 iMcsCrnt; + RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); + RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell); + RgSchUlAlloc *alloc = NULLP; + uint32_t nPrb = 0; + uint8_t numVrbg; + uint8_t iMcs; + uint8_t iMcsCrnt; #ifndef RG_5GTF RgSchUlHqProcCb *proc = &ueUl->hqEnt.hqProcCb[cellUl->schdHqProcIdx]; #else RgSchUlHqProcCb *proc = NULLP; #endif RgSchPdcch *pdcch; - U32 reqVrbg; - U8 numVrbgTemp; + uint32_t reqVrbg; + uint8_t numVrbgTemp; #ifdef RG_5GTF TfuDciFormat dciFrmt; - U8 numLyr; + uint8_t numLyr; #endif #ifdef RG_5GTF rgSCHUhmGetAvlHqProc(cell, ue, &proc); if (proc == NULLP) { - //printf("UE [%d] HQ Proc unavailable\n", ue->ueId); + //DU_LOG("\nINFO --> SCH : UE [%d] HQ Proc unavailable\n", ue->ueId); return RFAILED; } #endif @@ -13850,8 +12390,7 @@ RgSchUlHole *hole; pdcch = rgSCHCmnPdcchAllocCrntSf(cell, ue); if(pdcch == NULLP) { - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHCmnUlRbAllocForUe(): Could not get PDCCH for CRNTI:%d",ue->ueId); + DU_LOG("\nDEBUG --> SCH : rgSCHCmnUlRbAllocForUe(): Could not get PDCCH for CRNTI:%d",ue->ueId); return RFAILED; } gUl5gtfPdcchSchd++; @@ -13869,7 +12408,7 @@ RgSchUlHole *hole; if((sf->sfBeamInfo[ue->ue5gtfCb.BeamId].vrbgStart > MAX_5GTF_VRBG) || (sf->sfBeamInfo[ue->ue5gtfCb.BeamId].totVrbgAllocated > MAX_5GTF_VRBG)) { - printf("5GTF_ERROR vrbg > 25 valstart = %d valalloc %d\n", sf->sfBeamInfo[ue->ue5gtfCb.BeamId].vrbgStart + DU_LOG("\nINFO --> SCH : 5GTF_ERROR vrbg > 25 valstart = %d valalloc %d\n", sf->sfBeamInfo[ue->ue5gtfCb.BeamId].vrbgStart , sf->sfBeamInfo[ue->ue5gtfCb.BeamId].totVrbgAllocated); int *p=NULLP; *p = 10; @@ -13885,8 +12424,7 @@ RgSchUlHole *hole; } if (alloc == NULLP) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHCmnUlRbAllocForUe(): Could not get UlAlloc %d CRNTI:%d",numVrbg,ue->ueId); + DU_LOG("\nERROR --> SCH : rgSCHCmnUlRbAllocForUe(): Could not get UlAlloc %d CRNTI:%d",numVrbg,ue->ueId); rgSCHCmnPdcchRlsCrntSf(cell, pdcch); return RFAILED; } @@ -13966,19 +12504,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHCmnUlRbAllocAddUeToLst -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLListCp *lst -) -#else -Void rgSCHCmnUlRbAllocAddUeToLst(cell, ue, lst) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLListCp *lst; -#endif +Void rgSCHCmnUlRbAllocAddUeToLst(RgSchCellCb *cell,RgSchUeCb *ue,CmLListCp *lst) { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); UNUSED(cell); @@ -14009,24 +12535,14 @@ CmLListCp *lst; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlAllocFnlz -( -RgSchCellCb *cell, -RgSchCmnUlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnUlAllocFnlz(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnUlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnUlAllocFnlz(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); /* call scheduler specific Finalization */ cellSch->apisUl->rgSCHUlAllocFnlz(cell, allocInfo); - RETVOID; + return; } /** @@ -14045,15 +12561,7 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnDlAllocFnlz -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnDlAllocFnlz(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnDlAllocFnlz(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlRbAllocInfo *allocInfo = &cellSch->allocInfo; @@ -14073,7 +12581,7 @@ RgSchCellCb *cell; cellSch->apisDl->rgSCHDlAllocFnlz(cell, allocInfo); /* Stack Crash problem for TRACE5 Changes. Added the return below */ - RETVOID; + return; } @@ -14094,19 +12602,7 @@ RgSchCellCb *cell; * @param[in] RgSchUlSf *sf * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlUpdSf -( -RgSchCellCb *cell, -RgSchCmnUlRbAllocInfo *allocInfo, -RgSchUlSf *sf -) -#else -PRIVATE Void rgSCHCmnUlUpdSf(cell, allocInfo, sf) -RgSchCellCb *cell; -RgSchCmnUlRbAllocInfo *allocInfo; -RgSchUlSf *sf; -#endif +static Void rgSCHCmnUlUpdSf(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo,RgSchUlSf *sf) { CmLList *lnk; @@ -14144,7 +12640,7 @@ RgSchUlSf *sf; */ - RETVOID; + return; } /** @@ -14165,23 +12661,9 @@ RgSchUlSf *sf; * @param[in] RgSchUlAlloc *alloc * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlHndlAllocRetx -( -RgSchCellCb *cell, -RgSchCmnUlRbAllocInfo *allocInfo, -RgSchUlSf *sf, -RgSchUlAlloc *alloc -) -#else -PRIVATE Void rgSCHCmnUlHndlAllocRetx(cell, allocInfo, sf, alloc) -RgSchCellCb *cell; -RgSchCmnUlRbAllocInfo *allocInfo; -RgSchUlSf *sf; -RgSchUlAlloc *alloc; -#endif +static Void rgSCHCmnUlHndlAllocRetx(RgSchCellCb *cell,RgSchCmnUlRbAllocInfo *allocInfo,RgSchUlSf *sf,RgSchUlAlloc *alloc) { - U32 bytes; + uint32_t bytes; RgSchCmnUlUe *ueUl; bytes = \ rgTbSzTbl[0][rgSCHCmnUlGetITbsFrmIMcs(alloc->grnt.iMcs)]\ @@ -14199,10 +12681,9 @@ RgSchUlAlloc *alloc; retxAlloc = rgSCHCmnUlGetUlAlloc(cell, sf, alloc->numSb); if (retxAlloc == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHCmnUlRbAllocForUe():Could not get UlAlloc for msg3Retx RNTI:%d", + DU_LOG("\nERROR --> SCH : rgSCHCmnUlRbAllocForUe():Could not get UlAlloc for msg3Retx RNTI:%d", alloc->rnti); - RETVOID; + return; } retxAlloc->grnt.iMcs = alloc->grnt.iMcs; retxAlloc->grnt.iMcsCrnt = rgSchCmnUlRvIdxToIMcsTbl\ @@ -14218,7 +12699,7 @@ RgSchUlAlloc *alloc; retxAlloc->hqProc = alloc->hqProc; rgSCHUhmRetx(retxAlloc->hqProc); } - RETVOID; + return; } #endif @@ -14236,15 +12717,7 @@ RgSchUlAlloc *alloc; * @return Void **/ /* ccpu00132653- The definition of this function made common for TDD and FDD*/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlAlloc -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnUlAlloc(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnUlAlloc(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -14252,7 +12725,7 @@ RgSchCellCb *cell; RgSchCmnUlRbAllocInfo allocInfo; RgSchCmnUlRbAllocInfo *allocInfoRef = &allocInfo; #ifdef RG_5GTF - U8 idx; + uint8_t idx; #endif @@ -14299,8 +12772,7 @@ RgSchCellCb *cell; } else { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "Error! holeDb sanity check failed"); + DU_LOG("\nERROR --> SCH : holeDb sanity check failed"); } } } @@ -14343,7 +12815,7 @@ RgSchCellCb *cell; g5gtfTtiCnt = 0; } - RETVOID; + return; } /** @@ -14361,19 +12833,11 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -Void rgSCHCmnSndCnsldtInfo -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnSndCnsldtInfo(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnSndCnsldtInfo(RgSchCellCb *cell) { - RgInfSfAlloc *subfrmAlloc; - Pst pst; - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + RgInfSfAlloc *subfrmAlloc; + Pst pst; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); subfrmAlloc = &(cell->sfAllocArr[cell->crntSfIdx]); @@ -14414,7 +12878,7 @@ RgSchCellCb *cell; cell->crntSfIdx = (cell->crntSfIdx + 1) % RGSCH_SF_ALLOC_SIZE; #endif - RETVOID; + return; } /** * @brief Consolidate Subframe Allocations. @@ -14429,23 +12893,15 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -Void rgSCHCmnCnsldtSfAlloc -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnCnsldtSfAlloc(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnCnsldtSfAlloc(RgSchCellCb *cell) { - RgInfSfAlloc *subfrmAlloc; - CmLteTimingInfo frm; - RgSchDlSf *dlSf; - CmLListCp dlDrxInactvTmrLst; - CmLListCp dlInActvLst; - CmLListCp ulInActvLst; - RgSchCmnCell *cellSch = NULLP; + RgInfSfAlloc *subfrmAlloc; + CmLteTimingInfo frm; + RgSchDlSf *dlSf; + CmLListCp dlDrxInactvTmrLst; + CmLListCp dlInActvLst; + CmLListCp ulInActvLst; + RgSchCmnCell *cellSch = NULLP; cmLListInit(&dlDrxInactvTmrLst); @@ -14479,7 +12935,7 @@ RgSchCellCb *cell; /*re/start DRX inactivity timer for the UEs*/ (Void)rgSCHDrxStrtInActvTmr(cell,&dlDrxInactvTmrLst,RG_SCH_DRX_DL); - RETVOID; + return; } /** @@ -14495,20 +12951,11 @@ RgSchCellCb *cell; * @param[out] RgSchCmnDlRbAllocInfo *allocInfo * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnInitDlRbAllocInfo -( -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnInitDlRbAllocInfo(allocInfo) -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnInitDlRbAllocInfo(RgSchCmnDlRbAllocInfo *allocInfo) { memset(&allocInfo->pcchAlloc, 0, sizeof(RgSchDlRbAlloc)); memset(&allocInfo->bcchAlloc, 0, sizeof(RgSchDlRbAlloc)); - memset(allocInfo->raRspAlloc, 0, - RG_SCH_CMN_MAX_CMN_PDCCH*sizeof(RgSchDlRbAlloc)); + memset(allocInfo->raRspAlloc, 0, RG_SCH_CMN_MAX_CMN_PDCCH*sizeof(RgSchDlRbAlloc)); allocInfo->msg4Alloc.msg4DlSf = NULLP; cmLListInit(&allocInfo->msg4Alloc.msg4TxLst); @@ -14554,7 +13001,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; cmLListInit(&allocInfo->dedAlloc.errIndTxHqPLst); cmLListInit(&allocInfo->dedAlloc.schdErrIndTxHqPLst); cmLListInit(&allocInfo->dedAlloc.nonSchdErrIndTxHqPLst); - RETVOID; + return; } /** @@ -14570,15 +13017,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @param[out] RgSchCmnUlRbAllocInfo *allocInfo * @return Void **/ -#ifdef ANSI -Void rgSCHCmnInitUlRbAllocInfo -( -RgSchCmnUlRbAllocInfo *allocInfo -) -#else -Void rgSCHCmnInitUlRbAllocInfo(allocInfo) -RgSchCmnUlRbAllocInfo *allocInfo; -#endif +Void rgSCHCmnInitUlRbAllocInfo(RgSchCmnUlRbAllocInfo *allocInfo) { allocInfo->sf = NULLP; cmLListInit(&allocInfo->contResLst); @@ -14588,7 +13027,7 @@ RgSchCmnUlRbAllocInfo *allocInfo; cmLListInit(&allocInfo->schdUeLst); cmLListInit(&allocInfo->nonSchdUeLst); - RETVOID; + return; } /** @@ -14606,22 +13045,10 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnGrpPwrCntrlPucch -( -RgSchCellCb *cell, -RgSchDlSf *dlSf -) -#else -PRIVATE Void rgSCHCmnGrpPwrCntrlPucch(cell, dlSf) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -#endif +static Void rgSCHCmnGrpPwrCntrlPucch(RgSchCellCb *cell,RgSchDlSf *dlSf) { - rgSCHPwrGrpCntrlPucch(cell, dlSf); - - RETVOID; + return; } /** @@ -14639,17 +13066,7 @@ RgSchDlSf *dlSf; * @param[in] RgSchUlSf *ulSf * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnGrpPwrCntrlPusch -( -RgSchCellCb *cell, -RgSchUlSf *ulSf -) -#else -PRIVATE Void rgSCHCmnGrpPwrCntrlPusch(cell, ulSf) -RgSchCellCb *cell; -RgSchUlSf *ulSf; -#endif +static Void rgSCHCmnGrpPwrCntrlPusch(RgSchCellCb *cell,RgSchUlSf *ulSf) { /*removed unused variable *cellSch*/ CmLteTimingInfo frm; @@ -14676,7 +13093,7 @@ RgSchUlSf *ulSf; rgSCHPwrGrpCntrlPusch(cell, dlSf, ulSf); - RETVOID; + return; } /* Fix: syed align multiple UEs to refresh at same time */ @@ -14693,24 +13110,14 @@ RgSchUlSf *ulSf; * Notes: * * File : - * - **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnApplyUeRefresh -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE S16 rgSCHCmnApplyUeRefresh(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif + * + **********************************************************/ +static S16 rgSCHCmnApplyUeRefresh(RgSchCellCb *cell,RgSchUeCb *ue) { - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U32 effGbrBsr = 0; - U32 effNonGbrBsr = 0; - U32 lcgId; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + uint32_t effGbrBsr = 0; + uint32_t effNonGbrBsr = 0; + uint32_t lcgId; /* Reset the refresh cycle variableCAP */ @@ -14768,17 +13175,11 @@ RgSchUeCb *ue; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnTmrExpiry +static S16 rgSCHCmnTmrExpiry ( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ ) -#else -PRIVATE S16 rgSCHCmnTmrExpiry(cb, tmrEvnt) -PTR cb; /* Pointer to timer control block */ -S16 tmrEvnt; /* Timer Event */ -#endif { RgSchUeCb *ue = (RgSchUeCb *)cb; RgSchCellCb *cell = ue->cell; @@ -14789,7 +13190,7 @@ S16 tmrEvnt; /* Timer Event */ #if (ERRCLASS & ERRCLS_DEBUG) if (tmrEvnt != RG_SCH_CMN_EVNT_UE_REFRESH) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnTmrExpiry(): Invalid " + DU_LOG("\nERROR --> SCH : rgSCHCmnTmrExpiry(): Invalid " "timer event CRNTI:%d",ue->ueId); return RFAILED; } @@ -14819,15 +13220,7 @@ S16 tmrEvnt; /* Timer Event */ * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnTmrProc -( -RgSchCellCb *cell -) -#else -PRIVATE S16 rgSCHCmnTmrProc(cell) -RgSchCellCb *cell; -#endif +static S16 rgSCHCmnTmrProc(RgSchCellCb *cell) { RgSchCmnDlCell *cmnDlCell = RG_SCH_CMN_GET_DL_CELL(cell); RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); @@ -14877,27 +13270,17 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSchCmnUpdCfiVal -( -RgSchCellCb *cell, -U8 delta -) -#else -PRIVATE Void rgSchCmnUpdCfiVal(cell, delta) -RgSchCellCb *cell; -U8 delta; -#endif +static Void rgSchCmnUpdCfiVal(RgSchCellCb *cell,uint8_t delta) { RgSchDlSf *dlSf; CmLteTimingInfo pdsch; - RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - U8 dlIdx; + RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); + uint8_t dlIdx; #ifdef LTE_TDD - U8 mPhich; + uint8_t mPhich; RgSchDlSf *tddSf; - U8 idx; - U8 splSfCfi = 0; + uint8_t idx; + uint8_t splSfCfi = 0; #endif @@ -14961,7 +13344,7 @@ U8 delta; } } - RETVOID; + return; } /*********************************************************** @@ -14978,34 +13361,12 @@ U8 delta; * **********************************************************/ #ifdef LTE_TDD -#ifdef ANSI -PRIVATE Void rgSchCmnUpdtPdcchSfIdx -( -RgSchCellCb *cell, -U8 dlIdx, -U8 sfNum -) -#else -PRIVATE Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx, sfNum) -RgSchCellCb *cell; -U8 dlIdx; -U8 sfNum; -#endif -#else -#ifdef ANSI -PRIVATE Void rgSchCmnUpdtPdcchSfIdx -( -RgSchCellCb *cell, -U8 dlIdx -) +static Void rgSchCmnUpdtPdcchSfIdx(RgSchCellCb *cell,uint8_t dlIdx,uint8_t sfNum) #else -PRIVATE Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx) -RgSchCellCb *cell; -U8 dlIdx; -#endif +static Void rgSchCmnUpdtPdcchSfIdx(RgSchCellCb *cell,uint8_t dlIdx) #endif { - U8 idx; + uint8_t idx; /* Resetting the parameters on CFI switching */ @@ -15051,31 +13412,21 @@ U8 dlIdx; * File : * **********************************************************/ -#ifdef ANSI -Void rgSchCmnUpdCfiDb -( -RgSchCellCb *cell, -U8 delta -) -#else -Void rgSchCmnUpdCfiDb(cell, delta) -RgSchCellCb *cell; -U8 delta; -#endif +Void rgSchCmnUpdCfiDb(RgSchCellCb *cell,uint8_t delta) { - CmLteTimingInfo frm; - RgSchDlSf *dlSf; + CmLteTimingInfo frm; + RgSchDlSf *dlSf; #ifdef LTE_TDD - U8 mPhich; - Bool isHiDci0; + uint8_t mPhich; + Bool isHiDci0; #endif - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U8 nCceLowerCfi = 0; - U8 currCfi; - U8 cceFailIdx; - U32 totalCce; - U8 dlIdx; - U16 ttiMod; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + uint8_t nCceLowerCfi = 0; + uint8_t currCfi; + uint8_t cceFailIdx; + uint32_t totalCce; + uint8_t dlIdx; + uint16_t ttiMod; /* Get Downlink Subframe */ @@ -15247,15 +13598,7 @@ U8 delta; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -Void rgSCHCmnDlCommonChSch -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnDlCommonChSch(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnDlCommonChSch(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -15286,7 +13629,7 @@ RgSchCellCb *cell; { rgSCHCmnDlCcchRarAlloc(cell); } - RETVOID; + return; } /** @@ -15303,15 +13646,7 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -Void rgSCHCmnUlSch -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnUlSch(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnUlSch(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -15320,7 +13655,7 @@ RgSchCellCb *cell; /* LAA_SCELL: */ if(TRUE == rgSCHLaaSCellEnabled(cell)) { - RETVOID; + return; } #endif @@ -15363,7 +13698,7 @@ RgSchCellCb *cell; #endif #endif - RETVOID; + return; } @@ -15384,19 +13719,7 @@ RgSchCellCb *cell; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnDlDedBoUpd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *svc -) -#else -Void rgSCHCmnDlDedBoUpd(cell, ue, svc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *svc; -#endif +Void rgSCHCmnDlDedBoUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -15420,14 +13743,14 @@ RgSchDlLcCb *svc; { rgSCHCmnSpsDlDedBoUpd(cell, ue, svc); /* Note: Retrun from here, no update needed in other schedulers */ - RETVOID; + return; } #endif #ifdef EMTC_ENABLE if((cell->emtcEnable)&&(TRUE == ue->isEmtcUe)) { cellSch->apisEmtcDl->rgSCHDlDedBoUpd(cell, ue, svc); - //printf("rgSCHEMTCDlDedBoUpd\n"); + //DU_LOG("\nINFO --> SCH : rgSCHEMTCDlDedBoUpd\n"); } else #endif @@ -15440,7 +13763,7 @@ RgSchDlLcCb *svc; rgSCHSCellDlDedBoUpd(cell, ue, svc); } #endif - RETVOID; + return; } @@ -15459,17 +13782,7 @@ RgSchDlLcCb *svc; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnRmvFrmTaLst -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnRmvFrmTaLst(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnRmvFrmTaLst(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); @@ -15484,7 +13797,7 @@ RgSchUeCb *ue; cmLListDelFrm(&cellCmnDl->taLst, &ue->dlTaLnk); ue->dlTaLnk.node = (PTR)NULLP; } - RETVOID; + return; } /* Fix: syed Remove the msg4Proc from cell @@ -15507,17 +13820,7 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnDlMsg4ProcRmvFrmRetx -( -RgSchCellCb *cell, -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHCmnDlMsg4ProcRmvFrmRetx(cell, hqP) -RgSchCellCb *cell; -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHCmnDlMsg4ProcRmvFrmRetx(RgSchCellCb *cell,RgSchDlHqProcCb *hqP) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -15538,7 +13841,7 @@ RgSchDlHqProcCb *hqP; } #endif } - RETVOID; + return; } @@ -15559,17 +13862,7 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnDlProcAddToRetx -( -RgSchCellCb *cell, -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHCmnDlProcAddToRetx(cell, hqP) -RgSchCellCb *cell; -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHCmnDlProcAddToRetx(RgSchCellCb *cell,RgSchDlHqProcCb *hqP) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -15595,7 +13888,7 @@ RgSchDlHqProcCb *hqP; { /* Invoke SPS module for SPS HARQ proc re-transmission handling */ rgSCHCmnSpsDlProcAddToRetx(cell, hqP); - RETVOID; + return; } #endif /* LTEMAC_SPS */ #ifdef EMTC_ENABLE @@ -15610,7 +13903,7 @@ RgSchDlHqProcCb *hqP; cellSch->apisDl->rgSCHDlProcAddToRetx(cell, hqP); } } - RETVOID; + return; } @@ -15628,29 +13921,15 @@ RgSchDlHqProcCb *hqP; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 ri + * @param[in] uint8_t ri * @param[in] Bool isPeriodic * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlSetUeRi -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 ri, -Bool isPer -) -#else -PRIVATE Void rgSCHCmnDlSetUeRi(cell, ue, ri, isPer) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 ri; -Bool isPer; -#endif +static Void rgSCHCmnDlSetUeRi(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t ri,Bool isPer) { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - RgSchCmnUeInfo *ueSchCmn = RG_SCH_CMN_GET_CMN_UE(ue); + RgSchCmnUeInfo *ueSchCmn = RG_SCH_CMN_GET_CMN_UE(ue); #ifdef TFU_UPGRADE RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ue,cell); @@ -15663,7 +13942,7 @@ Bool isPer; * specific during which SCH expecting UE can complete TX mode transition*/ if (ue->txModeTransCmplt == FALSE) { - RETVOID; + return; } /* Restrict the Number of TX layers to cell->numTxAntPorts. @@ -15727,7 +14006,7 @@ Bool isPer; RG_SCH_CMN_SET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_RI_1); } - RETVOID; + return; } @@ -15745,23 +14024,11 @@ Bool isPer; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 pmi + * @param[in] uint8_t pmi * @return Void * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlSetUePmi -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 pmi -) -#else -PRIVATE S16 rgSCHCmnDlSetUePmi(cell, ue, pmi) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 pmi; -#endif +static S16 rgSCHCmnDlSetUePmi(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t pmi) { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -15825,35 +14092,20 @@ U8 pmi; * -# RFAILED **/ #ifdef RGR_CQI_REPT -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10 +static inline Void rgSCHCmnDlProcCqiMode10 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi, - Bool *isCqiAvail - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi, isCqiAvail) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; - Bool *isCqiAvail; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi, +Bool *isCqiAvail +) #else -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10 +static inline Void rgSCHCmnDlProcCqiMode10 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi +) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -15876,7 +14128,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) } else { - RETVOID; + return; } } else if (pucchCqi->u.mode10Info.type == TFU_RPT_RI) @@ -15888,9 +14140,9 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) } else { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RI value(%x) CRNTI:%d", + DU_LOG("\nERROR --> SCH : Invalid RI value(%x) CRNTI:%d", pucchCqi->u.mode10Info.u.ri,ue->ueId); - RETVOID; + return; } } } @@ -15916,37 +14168,21 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) * -# RFAILED **/ #ifdef RGR_CQI_REPT -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11 +static inline Void rgSCHCmnDlProcCqiMode11 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi, - Bool *isCqiAvail, - Bool *is2ndCwCqiAvail - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; - Bool *isCqiAvail; - Bool *is2ndCwCqiAvail; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi, +Bool *isCqiAvail, +Bool *is2ndCwCqiAvail +) #else -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11 +static inline Void rgSCHCmnDlProcCqiMode11 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi +) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -15979,7 +14215,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) } else { - RETVOID; + return; } rgSCHCmnDlSetUePmi(cell, ue, \ pucchCqi->u.mode11Info.u.cqi.pmi); @@ -15993,9 +14229,9 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) } else { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Invalid RI value(%x) CRNTI:%d", + DU_LOG("\nERROR --> SCH : Invalid RI value(%x) CRNTI:%d", pucchCqi->u.mode11Info.u.ri,ue->ueId); - RETVOID; + return; } } } @@ -16021,35 +14257,20 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) * -# RFAILED **/ #ifdef RGR_CQI_REPT -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20 +static inline Void rgSCHCmnDlProcCqiMode20 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi, - Bool *isCqiAvail - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi, isCqiAvail ) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; - Bool *isCqiAvail; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi, +Bool *isCqiAvail +) #else -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20 +static inline Void rgSCHCmnDlProcCqiMode20 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi +) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -16074,7 +14295,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) } else { - RETVOID; + return; } } } @@ -16087,9 +14308,9 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) } else { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RI value(%x) CRNTI:%d", + DU_LOG("\nERROR --> SCH : Invalid RI value(%x) CRNTI:%d", pucchCqi->u.mode20Info.u.ri,ue->ueId); - RETVOID; + return; } } } @@ -16116,38 +14337,21 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) * -# RFAILED **/ #ifdef RGR_CQI_REPT -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21 +static inline Void rgSCHCmnDlProcCqiMode21 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi, - Bool *isCqiAvail, - Bool *is2ndCwCqiAvail - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; - TfuDlCqiRpt *dlCqiRpt; - Bool *isCqiAvail; - Bool *is2ndCwCqiAvail; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi, +Bool *isCqiAvail, +Bool *is2ndCwCqiAvail +) #else -#ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21 +static inline Void rgSCHCmnDlProcCqiMode21 ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi - ) -#else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi +) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -16183,7 +14387,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) } else { - RETVOID; + return; } rgSCHCmnDlSetUePmi(cell, ue, \ pucchCqi->u.mode21Info.u.cqi.u.wideCqi.pmi); @@ -16198,9 +14402,9 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) } else { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Invalid RI value(%x) CRNTI:%d", + DU_LOG("\nERROR --> SCH : Invalid RI value(%x) CRNTI:%d", pucchCqi->u.mode21Info.u.ri,ue->ueId); - RETVOID; + return; } } } @@ -16229,39 +14433,22 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) * -# RFAILED **/ #ifdef RGR_CQI_REPT -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPucchInd +static Void rgSCHCmnDlCqiOnPucchInd ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi, - RgrUeCqiRept *ueCqiRept, - Bool *isCqiAvail, - Bool *is2ndCwCqiAvail - ) -#else -PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; - RgrUeCqiRept *ueCqiRept; - Bool *isCqiAvail; - Bool *is2ndCwCqiAvail; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi, +RgrUeCqiRept *ueCqiRept, +Bool *isCqiAvail, +Bool *is2ndCwCqiAvail +) #else -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPucchInd +static Void rgSCHCmnDlCqiOnPucchInd ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPucch *pucchCqi - ) -#else -PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPucch *pucchCqi; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPucch *pucchCqi +) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -16311,7 +14498,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) break; default: { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Unknown CQI Mode %d", + DU_LOG("\nERROR --> SCH : Unknown CQI Mode %d of UE %d", pucchCqi->mode,ue->ueId); /* ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ @@ -16322,7 +14509,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) break; } - RETVOID; + return; } /* rgSCHCmnDlCqiOnPucchInd */ @@ -16349,43 +14536,26 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) * -# RFAILED **/ #ifdef RGR_CQI_REPT -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPuschInd +static Void rgSCHCmnDlCqiOnPuschInd ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPusch *puschCqi, - RgrUeCqiRept *ueCqiRept, - Bool *isCqiAvail, - Bool *is2ndCwCqiAvail - ) -#else -PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPusch *puschCqi; - RgrUeCqiRept *ueCqiRept; - Bool *isCqiAvail; - Bool *is2ndCwCqiAvail; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPusch *puschCqi, +RgrUeCqiRept *ueCqiRept, +Bool *isCqiAvail, +Bool *is2ndCwCqiAvail +) #else -#ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPuschInd +static Void rgSCHCmnDlCqiOnPuschInd ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuDlCqiPusch *puschCqi - ) -#else -PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuDlCqiPusch *puschCqi; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuDlCqiPusch *puschCqi +) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - U32 prevRiVal = 0; + uint32_t prevRiVal = 0; if (puschCqi->ri.pres == PRSNT_NODEF) { if (RG_SCH_CMN_IS_RI_VALID(puschCqi->ri.val)) @@ -16400,9 +14570,9 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) } else { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RI value(%x) CRNTI:%d", + DU_LOG("\nERROR --> SCH : Invalid RI value(%x) CRNTI:%d", puschCqi->ri.val,ue->ueId); - RETVOID; + return; } } ue->mimoInfo.puschFdbkVld = FALSE; @@ -16432,7 +14602,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) } else { - RETVOID; + return; } break; case TFU_PUSCH_CQI_MODE_30: @@ -16449,7 +14619,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) #endif #ifdef CA_DBG { - extern U32 gACqiRcvdCount; + uint32_t gACqiRcvdCount; gACqiRcvdCount++; } @@ -16457,7 +14627,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) } else { - RETVOID; + return; } break; case TFU_PUSCH_CQI_MODE_12: @@ -16474,7 +14644,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) } else { - RETVOID; + return; } if((puschCqi->u.mode12Info.cqiIdx[1]) && (puschCqi->u.mode12Info.cqiIdx[1] < RG_SCH_CMN_MAX_CQI)) @@ -16490,7 +14660,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) } else { - RETVOID; + return; } ue->mimoInfo.puschFdbkVld = TRUE; ue->mimoInfo.puschPmiInfo.mode = TFU_PUSCH_CQI_MODE_12; @@ -16513,7 +14683,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) } else { - RETVOID; + return; } if((puschCqi->u.mode22Info.wideBandCqi[1]) && (puschCqi->u.mode22Info.wideBandCqi[1] < RG_SCH_CMN_MAX_CQI)) @@ -16529,7 +14699,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) } else { - RETVOID; + return; } rgSCHCmnDlSetUePmi(cell, ue, puschCqi->u.mode22Info.wideBandPmi); ue->mimoInfo.puschFdbkVld = TRUE; @@ -16577,7 +14747,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) break; default: { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Unknown CQI Mode %d CRNTI:%d", + DU_LOG("\nERROR --> SCH : Unknown CQI Mode %d CRNTI:%d", puschCqi->mode,ue->ueId); /* CQI decoding failed revert the RI to previous value */ if ((puschCqi->ri.pres == PRSNT_NODEF) && @@ -16597,7 +14767,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) break; } - RETVOID; + return; } /* rgSCHCmnDlCqiOnPuschInd */ @@ -16617,23 +14787,14 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) * @return Void * **/ -#ifdef ANSI Void rgSCHCmnDlCqiInd ( -RgSchCellCb *cell, -RgSchUeCb *ue, -Bool isPucchInfo, -Void *dlCqi, -CmLteTimingInfo timingInfo +RgSchCellCb *cell, +RgSchUeCb *ue, +Bool isPucchInfo, +Void *dlCqi, +CmLteTimingInfo timingInfo ) -#else -Void rgSCHCmnDlCqiInd(cell, ue, isPucchInfo, dlCqi, timingInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -Bool isPucchInfo; -Void *dlCqi; -CmLteTimingInfo timingInfo; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); /* ccpu00117452 - MOD - Changed macro name from @@ -16682,7 +14843,7 @@ CmLteTimingInfo timingInfo; } else { - U8 dlCqiDeltaPrev = 0; + uint8_t dlCqiDeltaPrev = 0; dlCqiDeltaPrev = ue->prevCqi - ueDl->mimoInfo.cwInfo[0].cqi; if (dlCqiDeltaPrev > 3) dlCqiDeltaPrev = 3; @@ -16783,7 +14944,7 @@ CmLteTimingInfo timingInfo; cell->tenbStats->sch.dlNumCw0Cqi ++; cell->tenbStats->sch.dlNumCw1Cqi ++; #endif - RETVOID; + return; } #ifdef TFU_UPGRADE @@ -16803,19 +14964,9 @@ CmLteTimingInfo timingInfo; * @return Wideband CQI * **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr -( - RgSchCellCb *cell, - TfuSrsRpt *srsRpt - ) -#else -PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) - RgSchCellCb *cell; - TfuSrsRpt *srsRpt; -#endif +static uint8_t rgSCHCmnCalcWcqiFrmSnr(RgSchCellCb *cell, TfuSrsRpt *srsRpt) { - U8 wideCqi=1; /*Calculated value from SNR*/ + uint8_t wideCqi=1; /*Calculated value from SNR*/ /*Need to map a certain SNR with a WideCQI value. * The CQI calculation is still primitive. Further, need to * use a improvized method for calculating WideCQI from SNR*/ @@ -16863,24 +15014,10 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnSrsInd -( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuSrsRpt *srsRpt, - CmLteTimingInfo timingInfo - ) -#else -Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) - RgSchCellCb *cell; - RgSchUeCb *ue; - TfuSrsRpt *srsRpt; - CmLteTimingInfo timingInfo; -#endif +Void rgSCHCmnSrsInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuSrsRpt *srsRpt,CmLteTimingInfo timingInfo) { - U8 wideCqi; /*Calculated value from SNR*/ - U32 recReqTime; /*Received Time in TTI*/ + uint8_t wideCqi; /*Calculated value from SNR*/ + uint32_t recReqTime; /*Received Time in TTI*/ recReqTime = (timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + timingInfo.slot; ue->srsCb.selectedAnt = (recReqTime/ue->srsCb.peri)%2; @@ -16893,7 +15030,7 @@ Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) wideCqi = rgSCHCmnCalcWcqiFrmSnr(cell, srsRpt); } rgSCHCmnFindUlCqiUlTxAnt(cell, ue, wideCqi); - RETVOID; + return; }/*rgSCHCmnSrsInd*/ #endif @@ -16916,17 +15053,7 @@ Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnDlTARpt -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnDlTARpt(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnDlTARpt(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); @@ -16939,8 +15066,8 @@ RgSchUeCb *ue; /* Fix : syed Ignore if TaTmr is not configured */ if ((ue->dl.taCb.cfgTaTmr) && (rgSCHCmnUeIdleExdThrsld(cell, ue) == ROK)) { - U32 prevDlMsk = ue->dl.dlInactvMask; - U32 prevUlMsk = ue->ul.ulInactvMask; + uint32_t prevDlMsk = ue->dl.dlInactvMask; + uint32_t prevUlMsk = ue->ul.ulInactvMask; ue->dl.dlInactvMask |= RG_PDCCHODR_INACTIVE; ue->ul.ulInactvMask |= RG_PDCCHODR_INACTIVE; /* Indicate Specific scheduler for this UEs inactivity */ @@ -16980,12 +15107,11 @@ RgSchUeCb *ue; } else { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "TA duplicate entry attempt failed: UEID:%u", + DU_LOG("\nERROR --> SCH : TA duplicate entry attempt failed: UEID:%u", ue->ueId); } } - RETVOID; + return; } #ifdef TFU_UPGRADE @@ -17001,25 +15127,13 @@ RgSchUeCb *ue; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 wideCqi + * @param[in] uint8_t wideCqi * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 wideCqi -) -#else -PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt(cell, ue, wideCqi) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 wideCqi; -#endif +static Void rgSCHCmnFindUlCqiUlTxAnt(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t wideCqi) { ue->validTxAnt = 1; - RETVOID; + return; } /* rgSCHCmnFindUlCqiUlTxAnt */ #endif @@ -17038,24 +15152,12 @@ U8 wideCqi; * @param[in] TfuUlCqiRpt *ulCqiInfo * @return Void **/ -#ifdef ANSI -Void rgSCHCmnUlCqiInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -TfuUlCqiRpt *ulCqiInfo -) -#else -Void rgSCHCmnUlCqiInd(cell, ue, ulCqiInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -TfuUlCqiRpt *ulCqiInfo; -#endif +Void rgSCHCmnUlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuUlCqiRpt *ulCqiInfo) { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); #ifdef UL_LA - U8 iTbsNew; + uint8_t iTbsNew; S32 previTbs; #endif #if (defined(SCH_STATS) || defined(TENB_STATS)) @@ -17130,7 +15232,7 @@ TfuUlCqiRpt *ulCqiInfo; } #endif - RETVOID; + return; } /* rgSCHCmnUlCqiInd */ /** @@ -17152,31 +15254,23 @@ TfuUlCqiRpt *ulCqiInfo; * @param[out] RgSchUlHqProcCb **procRef * @return Void **/ -#ifdef ANSI Void rgSCHCmnUlHqProcForUe ( -RgSchCellCb *cell, -CmLteTimingInfo frm, -RgSchUeCb *ue, -RgSchUlHqProcCb **procRef +RgSchCellCb *cell, +CmLteTimingInfo frm, +RgSchUeCb *ue, +RgSchUlHqProcCb **procRef ) -#else -Void rgSCHCmnUlHqProcForUe(cell, frm, ue, procRef) -RgSchCellCb *cell; -CmLteTimingInfo frm; -RgSchUeCb *ue; -RgSchUlHqProcCb **procRef; -#endif { #ifndef RG_5GTF - U8 procId = rgSCHCmnGetUlHqProcIdx(&frm, cell); + uint8_t procId = rgSCHCmnGetUlHqProcIdx(&frm, cell); #endif #ifndef RG_5GTF *procRef = rgSCHUhmGetUlHqProc(cell, ue, procId); #else *procRef = rgSCHUhmGetUlProcByTime(cell, ue, frm); #endif - RETVOID; + return; } #ifdef RG_UNUSED @@ -17198,19 +15292,12 @@ RgSchUlHqProcCb **procRef; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnUpdUlHqProc ( RgSchCellCb *cell, RgSchUlHqProcCb *curProc, RgSchUlHqProcCb *oldProc ) -#else -S16 rgSCHCmnUpdUlHqProc(cell, curProc, oldProc) -RgSchCellCb *cell; -RgSchUlHqProcCb *curProc; -RgSchUlHqProcCb *oldProc; -#endif { UNUSED(cell); @@ -17241,15 +15328,7 @@ RgSchUlHqProcCb *oldProc; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHCmnBsrTmrExpry -( -RgSchUeCb *ueCb -) -#else -S16 rgSCHCmnBsrTmrExpry(ueCb) -RgSchUeCb *ueCb; -#endif +S16 rgSCHCmnBsrTmrExpry(RgSchUeCb *ueCb) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ueCb->cell); @@ -17290,31 +15369,22 @@ RgSchUeCb *ueCb; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * @param[in] RgSchLcgCb *ulLcg - * @param[in] U8 bsr + * @param[in] uint8_t bsr * @param[out] RgSchErrInfo *err * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnUpdBsrShort ( RgSchCellCb *cell, RgSchUeCb *ue, -RgSchLcgCb *ulLcg, -U8 bsr, +RgSchLcgCb *ulLcg, +uint8_t bsr, RgSchErrInfo *err ) -#else -S16 rgSCHCmnUpdBsrShort(cell, ue, ulLcg, bsr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchLcgCb *ulLcg; -U8 bsr; -RgSchErrInfo *err; -#endif { - U8 lcgCnt; + uint8_t lcgCnt; #ifdef LTE_L2_MEAS RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); #endif @@ -17322,7 +15392,7 @@ RgSchErrInfo *err; RgSchCmnLcg *cmnLcg = NULLP; #ifdef LTE_L2_MEAS - U8 idx; + uint8_t idx; #endif if (!RGSCH_LCG_ISCFGD(ulLcg)) @@ -17441,7 +15511,7 @@ RgSchErrInfo *err; #ifdef LTE_ADV if (ue->ul.isUlCaEnabled && ue->numSCells) { - for(U8 sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++) + for(uint8_t sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++) { #ifndef PAL_ENABLE_UL_CA if((ue->cellInfo[sCellIdx] != NULLP) && @@ -17473,35 +15543,26 @@ RgSchErrInfo *err; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * @param[in] RgSchLcgCb *ulLcg - * @param[in] U8 bsr + * @param[in] uint8_t bsr * @param[out] RgSchErrInfo *err * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnUpdBsrTrunc ( RgSchCellCb *cell, RgSchUeCb *ue, -RgSchLcgCb *ulLcg, -U8 bsr, +RgSchLcgCb *ulLcg, +uint8_t bsr, RgSchErrInfo *err ) -#else -S16 rgSCHCmnUpdBsrTrunc(cell, ue, ulLcg, bsr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchLcgCb *ulLcg; -U8 bsr; -RgSchErrInfo *err; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *cmnLcg = NULLP; S32 cnt; #ifdef LTE_L2_MEAS - U8 idx; + uint8_t idx; #endif @@ -17618,7 +15679,7 @@ RgSchErrInfo *err; #ifdef LTE_ADV if (ue->ul.isUlCaEnabled && ue->numSCells) { - for(U8 sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++) + for(uint8_t sCellIdx = 1; sCellIdx <= RG_SCH_MAX_SCELL ; sCellIdx++) { #ifndef PAL_ENABLE_UL_CA if((ue->cellInfo[sCellIdx] != NULLP) && @@ -17650,37 +15711,28 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 bsArr[] + * @param[in] uint8_t bsArr[] * @param[out] RgSchErrInfo *err * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnUpdBsrLong ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 *bsArr, +uint8_t *bsArr, RgSchErrInfo *err ) -#else -S16 rgSCHCmnUpdBsrLong(cell, ue, bsArr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 *bsArr; -RgSchErrInfo *err; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U32 tmpBsArr[4] = {0, 0, 0, 0}; - U32 nonGbrBs = 0; + uint32_t tmpBsArr[4] = {0, 0, 0, 0}; + uint32_t nonGbrBs = 0; #ifdef LTE_L2_MEAS - U8 idx1; - U8 idx2; + uint8_t idx1; + uint8_t idx2; #endif - U32 lcgId; - + uint32_t lcgId; #ifdef LTE_L2_MEAS for(idx1 = 1; idx1 < RGSCH_MAX_LCG_PER_UE; idx1++) @@ -17787,7 +15839,7 @@ RgSchErrInfo *err; #ifdef LTE_ADV if (ue->ul.isUlCaEnabled && ue->numSCells) { - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { #ifndef PAL_ENABLE_UL_CA if((ue->cellInfo[idx] != NULLP) && @@ -17816,13 +15868,12 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 phr + * @param[in] uint8_t phr * @param[out] RgSchErrInfo *err * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnUpdExtPhr ( RgSchCellCb *cell, @@ -17830,13 +15881,6 @@ RgSchUeCb *ue, RgInfExtPhrCEInfo *extPhr, RgSchErrInfo *err ) -#else -S16 rgSCHCmnUpdExtPhr(cell, ue, extPhr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgInfExtPhrCEInfo *extPhr; -RgSchErrInfo *err; -#endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); RgSchCmnAllocRecord *allRcd; @@ -17882,27 +15926,19 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 phr + * @param[in] uint8_t phr * @param[out] RgSchErrInfo *err * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnUpdPhr ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 phr, +uint8_t phr, RgSchErrInfo *err ) -#else -S16 rgSCHCmnUpdPhr(cell, ue, phr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 phr; -RgSchErrInfo *err; -#endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); RgSchCmnAllocRecord *allRcd; @@ -17951,19 +15987,12 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnContResUlGrant ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *err ) -#else -S16 rgSCHCmnContResUlGrant(cell, ue, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchErrInfo *err; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -18002,7 +16031,6 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHCmnSrRcvd ( RgSchCellCb *cell, @@ -18010,13 +16038,6 @@ RgSchUeCb *ue, CmLteTimingInfo frm, RgSchErrInfo *err ) -#else -S16 rgSCHCmnSrRcvd(cell, ue, frm, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo frm; -RgSchErrInfo *err; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); @@ -18073,15 +16094,7 @@ RgSchErrInfo *err; * @param[in] RgSchCellCb *cell * @return RgSchUlAlloc* **/ -#ifdef ANSI -RgSchUlAlloc *rgSCHCmnFirstRcptnReq -( -RgSchCellCb *cell -) -#else -RgSchUlAlloc *rgSCHCmnFirstRcptnReq(cell) -RgSchCellCb *cell; -#endif +RgSchUlAlloc *rgSCHCmnFirstRcptnReq(RgSchCellCb *cell) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); /* ACC_TDD */ @@ -18119,17 +16132,7 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return RgSchUlAlloc* **/ -#ifdef ANSI -RgSchUlAlloc *rgSCHCmnNextRcptnReq -( -RgSchCellCb *cell, -RgSchUlAlloc *alloc -) -#else -RgSchUlAlloc *rgSCHCmnNextRcptnReq(cell, alloc) -RgSchCellCb *cell; -RgSchUlAlloc *alloc; -#endif +RgSchUlAlloc *rgSCHCmnNextRcptnReq(RgSchCellCb *cell,RgSchUlAlloc *alloc) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); /* ACC-TDD */ @@ -18170,15 +16173,7 @@ RgSchUlAlloc *alloc; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -Void rgSCHCmnDrxStrtInActvTmrInUl -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnDrxStrtInActvTmrInUl(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnDrxStrtInActvTmrInUl(RgSchCellCb *cell) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlSf *sf = &(cellUl->ulSfArr[cellUl->schdIdx]); @@ -18213,7 +16208,7 @@ RgSchCellCb *cell; (Void)rgSCHDrxStrtInActvTmr(cell,&ulUeLst,RG_SCH_DRX_UL); - RETVOID; + return; } @@ -18232,20 +16227,10 @@ RgSchCellCb *cell; * Invoked by: TOM * * @param[in] RgSchCellCb *cell - * @param[in] U8 idx + * @param[in] uint8_t idx * @return RgSchUlAlloc* **/ -#ifdef ANSI -RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc -( -RgSchCellCb *cell, -U8 idx -) -#else -RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(cell, idx) -RgSchCellCb *cell; -U8 idx; -#endif +RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(RgSchCellCb *cell,uint8_t idx) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); /* ACC-TDD */ @@ -18281,19 +16266,7 @@ U8 idx; * @param[in] RgSchCellCb *cell * @return RgSchUlAlloc* **/ -#ifdef ANSI -RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc -( -RgSchCellCb *cell, -RgSchUlAlloc *alloc, -U8 idx -) -#else -RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(cell, alloc, idx) -RgSchCellCb *cell; -RgSchUlAlloc *alloc; -U8 idx; -#endif +RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(RgSchCellCb *cell,RgSchUlAlloc *alloc,uint8_t idx) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -18328,17 +16301,8 @@ U8 idx; * File : * **********************************************************/ -#ifdef ANSI -U8 rgSCHCmnUlGetITbsFrmIMcs -( -U8 iMcs -) -#else -U8 rgSCHCmnUlGetITbsFrmIMcs(iMcs) -U8 iMcs; -#endif +uint8_t rgSCHCmnUlGetITbsFrmIMcs(uint8_t iMcs) { - return (rgUlIMcsTbl[iMcs].iTbs); } @@ -18358,19 +16322,9 @@ U8 iMcs; * File : * **********************************************************/ -#ifdef ANSI -U8 rgSCHCmnUlGetIMcsFrmITbs -( -U8 iTbs, -CmLteUeCategory ueCtg -) -#else -U8 rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg) -U8 iTbs; -CmLteUeCategory ueCtg; -#endif +uint8_t rgSCHCmnUlGetIMcsFrmITbs(uint8_t iTbs,CmLteUeCategory ueCtg) { - U8 iMcs; + uint8_t iMcs; if (iTbs <= 10) { @@ -18420,17 +16374,7 @@ CmLteUeCategory ueCtg; * File : * **********************************************************/ -#ifdef ANSI -U32 rgSCHCmnUlMinTbBitsForITbs -( -RgSchCmnUlCell *cellUl, -U8 iTbs -) -#else -U32 rgSCHCmnUlMinTbBitsForITbs(cellUl, iTbs) -RgSchCmnUlCell *cellUl; -U8 iTbs; -#endif +uint32_t rgSCHCmnUlMinTbBitsForITbs(RgSchCmnUlCell *cellUl,uint8_t iTbs) { RGSCH_ARRAY_BOUND_CHECK(0, rgTbSzTbl[0], iTbs); @@ -18454,21 +16398,14 @@ U8 iTbs; * File : * **********************************************************/ -#ifdef ANSI RgSchUlAlloc *rgSCHCmnUlSbAlloc ( -RgSchUlSf *sf, -U8 numSb, -RgSchUlHole *hole +RgSchUlSf *sf, +uint8_t numSb, +RgSchUlHole *hole ) -#else -RgSchUlAlloc *rgSCHCmnUlSbAlloc(sf, numSb, hole) -RgSchUlSf *sf; -U8 numSb; -RgSchUlHole *hole; -#endif { - U8 holeSz; /* valid hole size */ + uint8_t holeSz; /* valid hole size */ RgSchUlAlloc *alloc; if ((holeSz = rgSchCmnMult235Tbl[hole->num].prvMatch) == hole->num) @@ -18518,17 +16455,7 @@ RgSchUlHole *hole; * @param[out] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -Void rgSCHCmnUlUeFillAllocInfo -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUlUeFillAllocInfo(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUlUeFillAllocInfo(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchCmnUeUlAlloc *ulAllocInfo; @@ -18555,7 +16482,7 @@ RgSchUeCb *ue; rgSCHCmnUlUpdOutStndAlloc(cell, ue, ulAllocInfo->allocdBytes); } - RETVOID; + return; } /** @@ -18573,23 +16500,15 @@ RgSchUeCb *ue; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUpdUlCompEffBsr -( -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnUpdUlCompEffBsr(ue) -RgSchUeCb *ue; -#endif +static Void rgSCHCmnUpdUlCompEffBsr(RgSchUeCb *ue) { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,ue->cell); CmLList *node = ueUl->ulAllocLst.last; RgSchCmnAllocRecord *allRcd; - U32 outStndAlloc=0; - U32 nonLcg0OutStndAllocBs=0; - U32 nonLcg0Bsr=0; - U8 lcgId; + uint32_t outStndAlloc=0; + uint32_t nonLcg0OutStndAllocBs=0; + uint32_t nonLcg0Bsr=0; + uint8_t lcgId; RgSchCmnLcg *cmnLcg = NULLP; while (node) @@ -18649,7 +16568,7 @@ RgSchUeCb *ue; /* better be handled in individual scheduler */ ue->ul.effBsr = nonLcg0Bsr +\ ((RgSchCmnLcg *)(ue->ul.lcgArr[0].sch))->bs; - RETVOID; + return; } /** @@ -18668,17 +16587,7 @@ RgSchUeCb *ue; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -Void rgSCHCmnUlRecordUeAlloc -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHCmnUlRecordUeAlloc(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHCmnUlRecordUeAlloc(RgSchCellCb *cell,RgSchUeCb *ue) { #ifdef LTE_TDD RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -18725,7 +16634,7 @@ RgSchUeCb *ue; cell->measurements.ulBytesCnt += ulAllocInfo->allocdBytes; - RETVOID; + return; } /** PHR handling for MSG3 @@ -18745,19 +16654,7 @@ RgSchUeCb *ue; * @param[in] RgSchRaCb *raCb * @return Void **/ -#ifdef ANSI -Void rgSCHCmnUlRecMsg3Alloc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchRaCb *raCb -) -#else -Void rgSCHCmnUlRecMsg3Alloc(cell, ue, raCb) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchRaCb *raCb; -#endif +Void rgSCHCmnUlRecMsg3Alloc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchRaCb *raCb) { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); CmLListCp *lst = &ueUl->ulAllocLst; @@ -18778,7 +16675,7 @@ RgSchRaCb *raCb; rgSCHPwrRecordRbAlloc(cell, ue, allRcd->numRb); - RETVOID; + return; } /** * @brief Keeps track of the most recent RG_SCH_CMN_MAX_ALLOC_TRACK @@ -18796,24 +16693,12 @@ RgSchRaCb *raCb; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U32 alloc + * @param[in] uint32_t alloc * @return Void **/ -#ifdef ANSI -Void rgSCHCmnUlUpdOutStndAlloc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 alloc -) -#else -Void rgSCHCmnUlUpdOutStndAlloc(cell, ue, alloc) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 alloc; -#endif +Void rgSCHCmnUlUpdOutStndAlloc(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t alloc) { - U32 nonLcg0Alloc=0; + uint32_t nonLcg0Alloc=0; /* Update UEs LCG0's bs according to the total outstanding BSR allocation.*/ if (((RgSchCmnLcg *)(ue->ul.lcgArr[0].sch))->bs > alloc) @@ -18862,7 +16747,7 @@ U32 alloc; /* Resetting UEs lower Cap */ ue->ul.minReqBytes = 0; - RETVOID; + return; } @@ -18877,29 +16762,22 @@ U32 alloc; * Invoked by: Scheduler * * @param[in] RgSchUeCb *ue - * @return U8 + * @return uint8_t **/ -#ifdef ANSI -U8 rgSCHCmnUlGetITbs +uint8_t rgSCHCmnUlGetITbs ( -RgSchCellCb *cell, -RgSchUeCb *ue, -Bool isEcp +RgSchCellCb *cell, +RgSchUeCb *ue, +Bool isEcp ) -#else -U8 rgSCHCmnUlGetITbs(cell, ue, isEcp) -RgSchCellCb *cell; -RgSchUeCb *ue; -Bool isEcp; -#endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); /* CQI will be capped to maxUlCqi for 16qam UEs */ CmLteUeCategory ueCtgy = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); - U8 cqi; + uint8_t cqi; #ifdef UL_LA S32 iTbs; - U8 maxiTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ueUl->maxUlCqi]; + uint8_t maxiTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][ueUl->maxUlCqi]; #endif @@ -18943,7 +16821,7 @@ Bool isEcp; cqi = ueUl->crntUlCqi[0]; } #endif - return (rgSchCmnUlCqiToTbsTbl[(U8)isEcp][cqi]); + return (rgSchCmnUlCqiToTbsTbl[(uint8_t)isEcp][cqi]); } /** @@ -18962,21 +16840,13 @@ Bool isEcp; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRbInfoAddUeTx +static Void rgSCHCmnDlRbInfoAddUeTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) -#else -PRIVATE Void rgSCHCmnDlRbInfoAddUeTx(cell, allocInfo, ue, hqP) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -RgSchUeCb *ue; -RgSchDlHqProcCb *hqP; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -18996,7 +16866,7 @@ RgSchDlHqProcCb *hqP; hqP->reqLnk.node = (PTR)hqP; } } - RETVOID; + return; } /** @@ -19015,21 +16885,13 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetx +static Void rgSCHCmnDlRbInfoAddUeRetx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) -#else -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetx(cell, allocInfo, ue, hqP) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -RgSchUeCb *ue; -RgSchDlHqProcCb *hqP; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ue->cell); @@ -19045,7 +16907,7 @@ RgSchDlHqProcCb *hqP; cmLListAdd2Tail(&allocInfo->dedAlloc.retxHqPLst, &hqP->reqLnk); hqP->reqLnk.node = (PTR)hqP; } - RETVOID; + return; } /** @@ -19064,21 +16926,13 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetxTx +static Void rgSCHCmnDlRbInfoAddUeRetxTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) -#else -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetxTx(allocInfo, ue, hqP) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -RgSchUeCb *ue; -RgSchDlHqProcCb *hqP; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ue->cell); @@ -19093,7 +16947,7 @@ RgSchDlHqProcCb *hqP; cmLListAdd2Tail(&allocInfo->dedAlloc.txRetxHqPLst, &hqP->reqLnk); hqP->reqLnk.node = (PTR)hqP; } - RETVOID; + return; } /** @@ -19115,19 +16969,12 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAdd2NonSchdRetxLst +static Void rgSCHCmnDlAdd2NonSchdRetxLst ( RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) -#else -PRIVATE Void rgSCHCmnDlAdd2NonSchdRetxLst(allocInfo, ue, hqP) -RgSchCmnDlRbAllocInfo *allocInfo; -RgSchUeCb *ue; -RgSchDlHqProcCb *hqP; -#endif { CmLList *schdLnkNode; @@ -19136,7 +16983,7 @@ RgSchDlHqProcCb *hqP; if ( (hqP->sch != (RgSchCmnDlHqProc *)NULLP) && (RG_SCH_CMN_SPS_DL_IS_SPS_HQP(hqP))) { - RETVOID; + return; } #endif @@ -19144,7 +16991,7 @@ RgSchDlHqProcCb *hqP; RG_SCH_CMN_INIT_SCHD_LNK(schdLnkNode, hqP); cmLListAdd2Tail(&allocInfo->dedAlloc.nonSchdRetxHqPLst, schdLnkNode); - RETVOID; + return; } @@ -19188,27 +17035,19 @@ RgSchDlHqProcCb *hqP; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlANFdbkInit -( -RgSchCellCb *cell -) -#else -PRIVATE S16 rgSCHCmnDlANFdbkInit(cell) -RgSchCellCb *cell; -#endif +static S16 rgSCHCmnDlANFdbkInit(RgSchCellCb *cell) { - U8 sfCount; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 maxDlSubfrms = cell->numDlSubfrms; - U8 sfNum; - U8 idx; - U8 dlIdx; - U8 calcSfnOffset; + uint8_t sfCount; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t maxDlSubfrms = cell->numDlSubfrms; + uint8_t sfNum; + uint8_t idx; + uint8_t dlIdx; + uint8_t calcSfnOffset; S8 calcSfNum; - U8 ulSfCnt =0; + uint8_t ulSfCnt =0; RgSchTddSubfrmInfo ulSubfrmInfo; - U8 maxUlSubfrms; + uint8_t maxUlSubfrms; ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx]; @@ -19297,28 +17136,19 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlKdashUlAscInit -( -RgSchCellCb *cell -) -#else -PRIVATE S16 rgSCHCmnDlKdashUlAscInit(cell) -RgSchCellCb *cell; -#endif +static S16 rgSCHCmnDlKdashUlAscInit(RgSchCellCb *cell) { - U8 sfCount; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 maxDlSubfrms = cell->numDlSubfrms; - U8 sfNum; - U8 dlIdx; + uint8_t sfCount; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t maxDlSubfrms = cell->numDlSubfrms; + uint8_t sfNum; + uint8_t dlIdx; S8 calcSfnOffset; S8 calcSfNum; - U8 ulSfCnt =0; + uint8_t ulSfCnt =0; RgSchTddSubfrmInfo ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx]; - U8 maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ - [RGSCH_NUM_SUB_FRAMES-1]; - U8 dlPres = 0; + uint8_t maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; + uint8_t dlPres = 0; /* Generate ACK/NACK offset information for each DL subframe in a radio frame @@ -19413,18 +17243,10 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlNpValInit -( -RgSchCellCb *cell -) -#else -PRIVATE S16 rgSCHCmnDlNpValInit(cell) -RgSchCellCb *cell; -#endif +static S16 rgSCHCmnDlNpValInit(RgSchCellCb *cell) { - U8 idx; - U16 np; + uint8_t idx; + uint16_t np; /* Always Np is 0 for p=0 */ cell->rgSchTddNpValTbl[0] = 0; @@ -19432,7 +17254,7 @@ RgSchCellCb *cell; for(idx=1; idx < RGSCH_TDD_MAX_P_PLUS_ONE_VAL; idx++) { np = cell->bwCfg.dlTotalBw * (idx * RG_SCH_CMN_NUM_SUBCAR - 4); - cell->rgSchTddNpValTbl[idx] = (U8) (np/36); + cell->rgSchTddNpValTbl[idx] = (uint8_t) (np/36); } return ROK; @@ -19456,20 +17278,11 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlCreateRachPrmLst -( -RgSchCellCb *cell -) -#else -PRIVATE S16 rgSCHCmnDlCreateRachPrmLst(cell) -RgSchCellCb *cell; -#endif +static S16 rgSCHCmnDlCreateRachPrmLst(RgSchCellCb *cell) { - U8 raArrSz; - S16 ret; - U8 lstSize; - + uint8_t raArrSz; + S16 ret; + uint8_t lstSize; RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz); @@ -19506,34 +17319,26 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlRachInfoInit -( -RgSchCellCb *cell -) -#else -PRIVATE S16 rgSCHCmnDlRachInfoInit(cell) -RgSchCellCb *cell; -#endif +static S16 rgSCHCmnDlRachInfoInit(RgSchCellCb *cell) { - U8 sfCount; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 sfNum; - U8 ulSfCnt =0; - U8 maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ + uint8_t sfCount; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t sfNum; + uint8_t ulSfCnt =0; + uint8_t maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ [RGSCH_NUM_SUB_FRAMES-1]; - U8 raArrSz; - RgSchTddRachRspLst rachRspLst[3][RGSCH_NUM_SUB_FRAMES]; - U8 startWin; - U8 endWin; - U8 sfnIdx; - U8 subfrmIdx; - U8 endSubfrmIdx; - U8 startSubfrmIdx; - S16 ret; - RgSchTddRachDelInfo *delInfo; - S8 sfnOffset; - U8 numSubfrms; + uint8_t raArrSz; + RgSchTddRachRspLst rachRspLst[3][RGSCH_NUM_SUB_FRAMES]; + uint8_t startWin; + uint8_t endWin; + uint8_t sfnIdx; + uint8_t subfrmIdx; + uint8_t endSubfrmIdx; + uint8_t startSubfrmIdx; + S16 ret; + RgSchTddRachDelInfo *delInfo; + S8 sfnOffset; + uint8_t numSubfrms; memset(rachRspLst, 0, sizeof(rachRspLst)); @@ -19671,27 +17476,19 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlPhichOffsetInit -( -RgSchCellCb *cell -) -#else -PRIVATE S16 rgSCHCmnDlPhichOffsetInit(cell) -RgSchCellCb *cell; -#endif -{ - U8 sfCount; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 maxDlSubfrms = cell->numDlSubfrms; - U8 sfNum; - U8 dlIdx; - U8 dlPres = 0; - U8 calcSfnOffset; - U8 calcSfNum; - U8 ulSfCnt =0; +static S16 rgSCHCmnDlPhichOffsetInit(RgSchCellCb *cell) +{ + uint8_t sfCount; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t maxDlSubfrms = cell->numDlSubfrms; + uint8_t sfNum; + uint8_t dlIdx; + uint8_t dlPres = 0; + uint8_t calcSfnOffset; + uint8_t calcSfNum; + uint8_t ulSfCnt =0; RgSchTddSubfrmInfo ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx]; - U8 maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ + uint8_t maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ [RGSCH_NUM_SUB_FRAMES-1]; @@ -19781,23 +17578,15 @@ RgSchCellCb *cell; * @return Void * **/ -#ifdef ANSI -Void rgSCHCmnUpdVars -( -RgSchCellCb *cell -) -#else -Void rgSCHCmnUpdVars(cell) -RgSchCellCb *cell; -#endif +Void rgSCHCmnUpdVars(RgSchCellCb *cell) { - RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - CmLteTimingInfo timeInfo; - U8 idx; - U8 ulSubframe; - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 msg3Subfrm; - U8 Mval; + RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); + CmLteTimingInfo timeInfo; + uint8_t idx; + uint8_t ulSubframe; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t msg3Subfrm; + uint8_t Mval; /* ccpu00132654-ADD- Initializing all the indices in every subframe*/ rgSCHCmnInitVars(cell); @@ -19876,7 +17665,7 @@ RgSchCellCb *cell; else { /* introduce some reuse with above code? */ - U8 offst; + uint8_t offst; RGSCHCMNADDTOCRNTTIME(cell->crntTime,timeInfo,RG_SCH_CMN_DL_DELTA) //offst = rgSchTddMsg3SubfrmTbl[ulDlCfgIdx][timeInfo.subframe]; offst = rgSchTddSpsUlRsrvTbl[ulDlCfgIdx][timeInfo.subframe]; @@ -19892,7 +17681,7 @@ RgSchCellCb *cell; * mainly the prachMaskIndex */ rgSCHCmnUpdRachParam(cell); - RETVOID; + return; } /** @@ -19904,23 +17693,13 @@ RgSchCellCb *cell; * Purpose: Gets 'p' value for HARQ ACK/NACK reception from CCE. * * @param[in] RgSchCellCb *cell - * @param[in] U8 cce - * @return U8 + * @param[in] uint8_t cce + * @return uint8_t * **/ -#ifdef ANSI -U8 rgSCHCmnGetPValFrmCCE -( -RgSchCellCb *cell, -U8 cce -) -#else -U8 rgSCHCmnGetPValFrmCCE(cell, cce) -RgSchCellCb *cell; -U8 cce; -#endif +uint8_t rgSCHCmnGetPValFrmCCE(RgSchCellCb *cell,uint8_t cce) { - U8 i; + uint8_t i; for(i=1; i < RGSCH_TDD_MAX_P_PLUS_ONE_VAL; i++) { @@ -19946,17 +17725,7 @@ U8 cce; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlAdapRetx -( -RgSchUlAlloc *alloc, -RgSchUlHqProcCb *proc -) -#else -PRIVATE Void rgSCHCmnUlAdapRetx(alloc, proc) -RgSchUlAlloc *alloc; -RgSchUlHqProcCb *proc; -#endif +static Void rgSCHCmnUlAdapRetx(RgSchUlAlloc *alloc,RgSchUlHqProcCb *proc) { rgSCHUhmRetx(proc, alloc); @@ -19970,7 +17739,7 @@ RgSchUlHqProcCb *proc; { alloc->grnt.iMcsCrnt = alloc->grnt.iMcs; } - RETVOID; + return; } /** @@ -19986,15 +17755,7 @@ RgSchUlHqProcCb *proc; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnHdlUlInactUes -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnHdlUlInactUes(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnHdlUlInactUes(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); CmLListCp ulInactvLst; @@ -20006,7 +17767,7 @@ RgSchCellCb *cell; /* take care of this in UL retransmission */ cellSch->apisUl->rgSCHUlInactvtUes(cell, &ulInactvLst); - RETVOID; + return; } /** @@ -20022,15 +17783,7 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnHdlDlInactUes -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnHdlDlInactUes(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnHdlDlInactUes(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); CmLListCp dlInactvLst; @@ -20041,7 +17794,7 @@ RgSchCellCb *cell; rgSCHMeasGapANRepGetDlInactvUe (cell, &dlInactvLst); cellSch->apisDl->rgSCHDlInactvtUes(cell, &dlInactvLst); - RETVOID; + return; } /* RACHO: Rach handover functions start here */ @@ -20059,23 +17812,12 @@ RgSchCellCb *cell; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUeIdleExdThrsld -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE S16 rgSCHCmnUeIdleExdThrsld(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static S16 rgSCHCmnUeIdleExdThrsld(RgSchCellCb *cell,RgSchUeCb *ue) { /* Time difference in subframes */ - U32 sfDiff = RGSCH_CALC_SF_DIFF(cell->crntTime, ue->ul.ulTransTime); + uint32_t sfDiff = RGSCH_CALC_SF_DIFF(cell->crntTime, ue->ul.ulTransTime); - - if (sfDiff > (U32)RG_SCH_CMN_UE_IDLE_THRSLD(ue)) + if (sfDiff > (uint32_t)RG_SCH_CMN_UE_IDLE_THRSLD(ue)) { return ROK; } @@ -20100,24 +17842,16 @@ RgSchUeCb *ue; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnCfgRachDedPrm -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnCfgRachDedPrm(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnCfgRachDedPrm(RgSchCellCb *cell) { RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - U32 gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; - U32 sfDiff; - U8 cnt; + uint32_t gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; + uint32_t sfDiff; + uint8_t cnt; if (cell->macPreambleSet.pres == NOTPRSNT) { - RETVOID; + return; } cellSch->rachCfg.numDedPrm = cell->macPreambleSet.size; cellSch->rachCfg.dedPrmStart = cell->macPreambleSet.start; @@ -20201,7 +17935,7 @@ RgSchCellCb *cell; sfDiff = RGSCH_CALC_SF_DIFF(cellSch->rachCfg.applFrm, cell->crntTime); } - RETVOID; + return; } /** @@ -20221,15 +17955,7 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUpdNxtPrchMskIdx -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnUpdNxtPrchMskIdx(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnUpdNxtPrchMskIdx(RgSchCellCb *cell) { RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); @@ -20260,7 +17986,7 @@ RgSchCellCb *cell; cell->rachCfg.raOccasion.subFrameNum[cellSch->rachCfg.prachMskIndx]; } } - RETVOID; + return; } /** @@ -20283,37 +18009,29 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUpdRachParam -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnUpdRachParam(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnUpdRachParam(RgSchCellCb *cell) { - RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - U32 gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; - U32 sfDiff; + RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); + uint32_t gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; + uint32_t sfDiff; if (cell->macPreambleSet.pres == NOTPRSNT) { - RETVOID; + return; } sfDiff = RGSCH_CALC_SF_DIFF(cellSch->rachCfg.applFrm, \ cell->crntTime); if (sfDiff > gap) { /* applFrm is still a valid next Prach Oppurtunity */ - RETVOID; + return; } rgSCHCmnUpdNxtPrchMskIdx(cell); /* Reset remDedPrm as numDedPrm */ cellSch->rachCfg.remDedPrm = cellSch->rachCfg.numDedPrm; - RETVOID; + return; } /** @@ -20331,29 +18049,19 @@ RgSchCellCb *cell; * @param[in] RgSchDlSf *dlSf * @param[in] RgSchUeCb *ue * @param[out] RgSchPdcch **pdcch - * @param[out] U8 *rapId - * @param[out] U8 *prachMskIdx + * @param[out] uint8_t *rapId + * @param[out] uint8_t *prachMskIdx * @return Void **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnAllocPOParam +static S16 rgSCHCmnAllocPOParam ( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchUeCb *ue, RgSchPdcch **pdcch, -U8 *rapId, -U8 *prachMskIdx +uint8_t *rapId, +uint8_t *prachMskIdx ) -#else -PRIVATE S16 rgSCHCmnAllocPOParam(cell, dlSf, ue, pdcch, rapId, prachMskIdx) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchUeCb *ue; -RgSchPdcch **pdcch; -U8 *rapId; -U8 *prachMskIdx; -#endif { RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); @@ -20417,25 +18125,14 @@ U8 *prachMskIdx; * @param[in] RgSchDlSf *dlSf * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnGenPdcchOrder -( -RgSchCellCb *cell, -RgSchDlSf *dlSf -) -#else -PRIVATE Void rgSCHCmnGenPdcchOrder(cell, dlSf) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -#endif +static Void rgSCHCmnGenPdcchOrder(RgSchCellCb *cell,RgSchDlSf *dlSf) { - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - CmLList *node = cellSch->rachCfg.pdcchOdrLst.first; - RgSchUeCb *ue; - U8 rapId; - U8 prachMskIdx; - RgSchPdcch *pdcch = NULLP; - + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + CmLList *node = cellSch->rachCfg.pdcchOdrLst.first; + RgSchUeCb *ue; + uint8_t rapId; + uint8_t prachMskIdx; + RgSchPdcch *pdcch = NULLP; while (node) { @@ -20474,7 +18171,7 @@ RgSchDlSf *dlSf; /* Reset UE's power state */ rgSCHPwrUeReset(cell, ue); } - RETVOID; + return; } @@ -20493,17 +18190,7 @@ RgSchDlSf *dlSf; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAdd2PdcchOdrQ -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnDlAdd2PdcchOdrQ(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnDlAdd2PdcchOdrQ(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -20514,7 +18201,7 @@ RgSchUeCb *ue; cmLListAdd2Tail(&cellSch->rachCfg.pdcchOdrLst, &ueDl->rachInfo.poLnk); ueDl->rachInfo.poLnk.node = (PTR)ue; } - RETVOID; + return; } @@ -20533,25 +18220,14 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRmvFrmPdcchOdrQ -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnDlRmvFrmPdcchOdrQ(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnDlRmvFrmPdcchOdrQ(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - cmLListDelFrm(&cellSch->rachCfg.pdcchOdrLst, &ueDl->rachInfo.poLnk); ueDl->rachInfo.poLnk.node = NULLP; - RETVOID; + return; } /** @@ -20566,27 +18242,18 @@ RgSchUeCb *ue; * * @param[in] RgSchUeCb *ue * @param[in] RgSchPdcch *pdcch - * @param[in] U8 rapId - * @param[in] U8 prachMskIdx + * @param[in] uint8_t rapId + * @param[in] uint8_t prachMskIdx * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFillPdcchOdr2Sf +static Void rgSCHCmnFillPdcchOdr2Sf ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchPdcch *pdcch, -U8 rapId, -U8 prachMskIdx +uint8_t rapId, +uint8_t prachMskIdx ) -#else -PRIVATE Void rgSCHCmnFillPdcchOdr2Sf(ue, pdcch, rapId, prachMskIdx) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchPdcch *pdcch; -U8 rapId; -U8 prachMskIdx; -#endif { RgSchUeACqiCb *acqiCb = RG_SCH_CMN_GET_ACQICB(ue,cell); @@ -20607,7 +18274,7 @@ U8 prachMskIdx; } #endif - RETVOID; + return; } @@ -20625,21 +18292,11 @@ U8 prachMskIdx; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDelRachInfo -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -PRIVATE Void rgSCHCmnDelRachInfo(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +static Void rgSCHCmnDelRachInfo(RgSchCellCb *cell,RgSchUeCb *ue) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - U8 rapIdIdx; + uint8_t rapIdIdx; if (ueDl->rachInfo.poLnk.node) @@ -20658,7 +18315,7 @@ RgSchUeCb *ue; &ueDl->rachInfo.rapIdLnk); ueDl->rachInfo.rapIdLnk.node = NULLP; } - RETVOID; + return; } /** @@ -20682,19 +18339,12 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnHdlHoPo +static Void rgSCHCmnHdlHoPo ( RgSchCellCb *cell, CmLListCp *raRspLst, RgSchRaReqInfo *raReq ) -#else -PRIVATE Void rgSCHCmnHdlHoPo(cell, raRspLst, raReq) -RgSchCellCb *cell; -CmLListCp *raRspLst; -RgSchRaReqInfo *raReq; -#endif { RgSchUeCb *ue = raReq->ue; @@ -20703,7 +18353,7 @@ RgSchRaReqInfo *raReq; rgSCHDrxDedRa(cell,ue); } rgSCHCmnAllocPoHoGrnt(cell, raRspLst, ue, raReq); - RETVOID; + return; } /** @@ -20724,23 +18374,13 @@ RgSchRaReqInfo *raReq; * @return RgSchUeCb* * **/ -#ifdef ANSI -RgSchUeCb* rgSCHCmnGetHoUe -( -RgSchCellCb *cell, -U16 rapId -) -#else -RgSchUeCb* rgSCHCmnGetHoUe(cell, rapId) -RgSchCellCb *cell; -U16 rapId -#endif +RgSchUeCb* rgSCHCmnGetHoUe(RgSchCellCb *cell,uint16_t rapId) { - RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - CmLList *node; - CmLListCp *ueLst; - RgSchUeCb *ue; - RgSchCmnDlUe *ueDl; + RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); + CmLList *node; + CmLListCp *ueLst; + RgSchUeCb *ue; + RgSchCmnDlUe *ueDl; ueLst = &cellSch->rachCfg.hoUeLst; node = ueLst->first; @@ -20757,23 +18397,13 @@ U16 rapId return (NULLP); } -#ifdef ANSI -PRIVATE Void rgSCHCmnDelDedPreamble -( -RgSchCellCb *cell, -U8 preambleId -) -#else -PRIVATE rgSCHCmnDelDedPreamble(cell, preambleId) -RgSchCellCb *cell; -U8 preambleId; -#endif +static Void rgSCHCmnDelDedPreamble(RgSchCellCb *cell,uint8_t preambleId) { - RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - CmLList *node; - CmLListCp *ueLst; - RgSchUeCb *ue; - RgSchCmnDlUe *ueDl; + RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); + CmLList *node; + CmLListCp *ueLst; + RgSchUeCb *ue; + RgSchCmnDlUe *ueDl; ueLst = &cellSch->rachCfg.hoUeLst; node = ueLst->first; @@ -20808,26 +18438,19 @@ U8 preambleId; * @return RgSchUeCb* * **/ -#ifdef ANSI RgSchUeCb* rgSCHCmnGetPoUe ( -RgSchCellCb *cell, -U16 rapId, -CmLteTimingInfo timingInfo +RgSchCellCb *cell, +uint16_t rapId, +CmLteTimingInfo timingInfo ) -#else -RgSchUeCb* rgSCHCmnGetPoUe(cell, rapId, timingInfo) -RgSchCellCb *cell; -U16 rapId; -CmLteTimingInfo timingInfo; -#endif { - RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - CmLList *node; - CmLListCp *ueLst; - RgSchUeCb *ue; - RgSchCmnDlUe *ueDl; - U8 rapIdIdx; + RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); + CmLList *node; + CmLListCp *ueLst; + RgSchUeCb *ue; + RgSchCmnDlUe *ueDl; + uint8_t rapIdIdx; rapIdIdx = rapId -cellSch->rachCfg.dedPrmStart; ueLst = &cellSch->rachCfg.rapIdMap[rapIdIdx].assgndUes; @@ -20863,25 +18486,18 @@ CmLteTimingInfo timingInfo; * Invoked by: Scheduler * * @param[in] RgSchUeCb *ue - * @param[in] U8 ueCtgy - * @return U8 + * @param[in] uint8_t ueCtgy + * @return uint8_t **/ -#ifdef ANSI -U8 rgSCHCmnUlGetCqi +uint8_t rgSCHCmnUlGetCqi ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteUeCategory ueCtgy ) -#else -U8 rgSCHCmnUlGetCqi(cell, ue, ueCtgy) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteUeCategory ueCtgy; -#endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); - U8 cqi; + uint8_t cqi; cqi = ueUl->maxUlCqi; @@ -20917,39 +18533,31 @@ CmLteUeCategory ueCtgy; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe +static S16 rgSCHCmnUlRbAllocForPoHoUe ( -RgSchCellCb *cell, -RgSchUlSf *sf, -RgSchUeCb *ue, -U8 maxRb +RgSchCellCb *cell, +RgSchUlSf *sf, +RgSchUeCb *ue, +uint8_t maxRb ) -#else -PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe(cell, sf, ue, maxRb) -RgSchCellCb *cell; -RgSchUlSf *sf; -RgSchUeCb *ue; -U8 maxRb; -#endif { - RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); - U8 sbSize = cellUl->sbSize; - U32 maxBits = ue->ul.maxBytesPerUePerTti*8; - U32 bits; - RgSchUlAlloc *alloc; - U32 nPrb; - U8 iTbs; - U32 eff; - U32 numSb; - U8 iMcs; - U8 iMcsCrnt; - U8 cqi; - U8 modOdr; + RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); + RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); + uint8_t sbSize = cellUl->sbSize; + uint32_t maxBits = ue->ul.maxBytesPerUePerTti*8; + uint32_t bits; + RgSchUlAlloc *alloc; + uint32_t nPrb; + uint8_t iTbs; + uint32_t eff; + uint32_t numSb; + uint8_t iMcs; + uint8_t iMcsCrnt; + uint8_t cqi; + uint8_t modOdr; RgSchUlHole *hole; RgSchUlHqProcCb *proc = &ueUl->hqEnt.hqProcCb[cellUl->msg3SchdHqProcIdx]; - CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); + CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { @@ -20957,13 +18565,13 @@ U8 maxRb; } /*MS_WORKAROUND for HO ccpu00121116*/ cqi = rgSCHCmnUlGetCqi(cell, ue, ueCtg); - RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, rgSchCmnUlCqiToTbsTbl[(U8)cell->isCpUlExtend], cqi); - iTbs = rgSchCmnUlCqiToTbsTbl[(U8)cell->isCpUlExtend][cqi]; + RGSCH_ARRAY_BOUND_CHECK(cell->instIdx, rgSchCmnUlCqiToTbsTbl[(uint8_t)cell->isCpUlExtend], cqi); + iTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)cell->isCpUlExtend][cqi]; iMcs = rgSCHCmnUlGetIMcsFrmITbs(iTbs,ueCtg); while(iMcs > RG_SCH_CMN_MAX_MSG3_IMCS) { cqi--; - iTbs = rgSchCmnUlCqiToTbsTbl[(U8)cell->isCpUlExtend][cqi]; + iTbs = rgSchCmnUlCqiToTbsTbl[(uint8_t)cell->isCpUlExtend][cqi]; iMcs = rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg); } /* Filling the modorder in the grant structure*/ @@ -21017,12 +18625,11 @@ U8 maxRb; } iMcsCrnt = iMcs; - alloc = rgSCHCmnUlSbAlloc(sf, (U8)RGSCH_MIN(numSb, cellUl->maxSbPerUe),\ + alloc = rgSCHCmnUlSbAlloc(sf, (uint8_t)RGSCH_MIN(numSb, cellUl->maxSbPerUe),\ hole); if (alloc == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHCmnUlRbAllocForPoHoUe(): Could not get UlAlloc"); + DU_LOG("\nERROR --> SCH : rgSCHCmnUlRbAllocForPoHoUe(): Could not get UlAlloc"); return RFAILED; } rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc); @@ -21074,21 +18681,13 @@ U8 maxRb; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnAllocPoHoGrnt +static Void rgSCHCmnAllocPoHoGrnt ( -RgSchCellCb *cell, -CmLListCp *raRspLst, -RgSchUeCb *ue, -RgSchRaReqInfo *raReq +RgSchCellCb *cell, +CmLListCp *raRspLst, +RgSchUeCb *ue, +RgSchRaReqInfo *raReq ) -#else -PRIVATE Void rgSCHCmnAllocPoHoGrnt(cell, raRspLst, ue, raReq) -RgSchCellCb *cell; -CmLListCp *raRspLst; -RgSchUeCb *ue; -RgSchRaReqInfo *raReq; -#endif { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); @@ -21101,12 +18700,12 @@ RgSchRaReqInfo *raReq; /* Fix : syed allocs are limited */ if (*sf->allocCountRef >= cellUl->maxAllocPerUlSf) { - RETVOID; + return; } ueUl->alloc.reqBytes = RG_SCH_MIN_GRNT_HOPO; if (rgSCHCmnUlRbAllocForPoHoUe(cell, sf, ue, RGSCH_MAX_UL_RB) != ROK) { - RETVOID; + return; } /* Fill grant information */ @@ -21115,9 +18714,9 @@ RgSchRaReqInfo *raReq; /* KWork fix */ if (grnt == NULLP) { - RLOG_ARG1(L_ERROR,DBG_INSTID,cell->instIdx, "Failed to get" + DU_LOG("\nERROR --> SCH : Failed to get" "the grant for HO/PDCCH Order. CRNTI:%d",ue->ueId); - RETVOID; + return; } ue->ul.rarGrnt.rapId = raReq->raReq.rapId; ue->ul.rarGrnt.hop = grnt->hop; @@ -21131,7 +18730,7 @@ RgSchRaReqInfo *raReq; if((sf->numACqiCount < RG_SCH_MAX_ACQI_PER_ULSF) && (RG_SCH_APCQI_NO != ue->dl.reqForCqi)) { #ifdef LTE_ADV - U8 idx = 0; + uint8_t idx = 0; /* Send two bits cqireq field if more than one cells are configured else one*/ for (idx = 1;idx < CM_LTE_MAX_CELLS;idx++) { @@ -21157,7 +18756,7 @@ RgSchRaReqInfo *raReq; cmLListAdd2Tail(raRspLst, &ue->ul.rarGrnt.raRspLnk); ue->ul.rarGrnt.raRspLnk.node = (PTR)ue; - RETVOID; + return; } /** @@ -21171,24 +18770,17 @@ RgSchRaReqInfo *raReq; * * @param[in] RgSchCmnUlCell *cellUl * @param[out] RgSchUlAlloc *alloc - * @param[in] U8 idx + * @param[in] uint8_t idx * @return Void * **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE Void rgSCHCmnUlNonadapRetx +static Void rgSCHCmnUlNonadapRetx ( RgSchCmnUlCell *cellUl, RgSchUlAlloc *alloc, -U8 idx +uint8_t idx ) -#else -PRIVATE Void rgSCHCmnUlNonadapRetx(cellUl, alloc, idx) -RgSchCmnUlCell *cellUl; -RgSchUlAlloc *alloc; -U8 idx; -#endif { rgSCHUhmRetx(alloc->hqProc, alloc); @@ -21206,7 +18798,7 @@ U8 idx; } alloc->grnt.isRtx = TRUE; alloc->pdcch = NULLP; - RETVOID; + return; } /** * @brief Check if 2 allocs overlap @@ -21221,20 +18813,9 @@ U8 idx; * @param[in] RgSchUlAlloc *alloc2 * @return Bool **/ -#ifdef ANSI -PRIVATE Bool rgSCHCmnUlAllocsOvrLap -( -RgSchUlAlloc *alloc1, -RgSchUlAlloc *alloc2 -) -#else -PRIVATE Bool rgSCHCmnUlAllocsOvrLap(alloc1, alloc2) -RgSchUlAlloc *alloc1; -RgSchUlAlloc *alloc2; -#endif +static Bool rgSCHCmnUlAllocsOvrLap(RgSchUlAlloc *alloc1,RgSchUlAlloc *alloc2) { - if (((alloc1->sbStart >= alloc2->sbStart) && (alloc1->sbStart <= alloc2->sbStart + alloc2->numSb-1)) || ((alloc2->sbStart >= alloc1->sbStart) && @@ -21257,19 +18838,7 @@ RgSchUlAlloc *alloc2; * @param[in] RgSchUlAlloc *dstAlloc * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlCpyAllocInfo -( -RgSchCellCb *cell, -RgSchUlAlloc *srcAlloc, -RgSchUlAlloc *dstAlloc -) -#else -PRIVATE Void rgSCHCmnUlCpyAllocInfo(cell, srcAlloc, dstAlloc) -RgSchCellCb *cell; -RgSchUlAlloc *srcAlloc; -RgSchUlAlloc *dstAlloc; -#endif +static Void rgSCHCmnUlCpyAllocInfo(RgSchCellCb *cell,RgSchUlAlloc *srcAlloc,RgSchUlAlloc *dstAlloc) { RgSchCmnUlUe *ueUl; @@ -21310,7 +18879,7 @@ RgSchUlAlloc *dstAlloc; #endif } - RETVOID; + return; } /** * @brief Update TX and RETX subframe's allocation @@ -21332,27 +18901,19 @@ RgSchUlAlloc *dstAlloc; * @param[in] RgSchUlAlloc *srcAlloc * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlInsAllocFrmNewSf2OldSf +static Void rgSCHCmnUlInsAllocFrmNewSf2OldSf ( RgSchCellCb *cell, RgSchUlSf *newSf, RgSchUlSf *oldSf, RgSchUlAlloc *srcAlloc ) -#else -PRIVATE Void rgSCHCmnUlInsAllocFrmNewSf2OldSf(cell, newSf, oldSf, srcAlloc) -RgSchCellCb *cell; -RgSchUlSf *newSf; -RgSchUlSf *oldSf; -RgSchUlAlloc *srcAlloc; -#endif { RgSchUlAlloc *alloc, *dstAlloc, *nxtAlloc; /* MS_WORKAROUND ccpu00120827 */ RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); - U8 remAllocs; + uint8_t remAllocs; if ((alloc = rgSCHUtlUlAllocFirst(oldSf)) != NULLP) { @@ -21412,10 +18973,10 @@ RgSchUlAlloc *srcAlloc; /* This should never happen */ if (dstAlloc == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"CRNTI:%d " + DU_LOG("\nERROR --> SCH : CRNTI:%d " "rgSCHUtlUlGetSpfcAlloc failed in rgSCHCmnUlInsAllocFrmNewSf2OldSf", srcAlloc->rnti); - RETVOID; + return; } #endif /* Copy the srcAlloc's state information in to dstAlloc */ @@ -21423,7 +18984,7 @@ RgSchUlAlloc *srcAlloc; /* Set new Tx merged Alloc Flag to TRUE, indicating that this * alloc shall not be processed for non-adaptive retransmission */ dstAlloc->mrgdNewTxAlloc = TRUE; - RETVOID; + return; } /** * @brief Merge all allocations of newSf to oldSf. @@ -21443,19 +19004,7 @@ RgSchUlAlloc *srcAlloc; * @param[in] RgSchUlSf *newSf * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlMergeSfAllocs -( -RgSchCellCb *cell, -RgSchUlSf *oldSf, -RgSchUlSf *newSf -) -#else -PRIVATE Void rgSCHCmnUlMergeSfAllocs(cell, oldSf, newSf) -RgSchCellCb *cell; -RgSchUlSf *oldSf; -RgSchUlSf *newSf; -#endif +static Void rgSCHCmnUlMergeSfAllocs(RgSchCellCb *cell,RgSchUlSf *oldSf,RgSchUlSf *newSf) { RgSchUlAlloc *alloc, *nxtAlloc; UNUSED(cell); @@ -21471,7 +19020,7 @@ RgSchUlSf *newSf; rgSCHUtlUlAllocRls(newSf, alloc); } while((alloc = nxtAlloc) != NULLP); } - RETVOID; + return; } /** * @brief Swap Hole/Alloc DB context of newSf and oldSf. @@ -21487,23 +19036,11 @@ RgSchUlSf *newSf; * @param[in] RgSchUlSf *newSf * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlSwapSfAllocs -( -RgSchCellCb *cell, -RgSchUlSf *oldSf, -RgSchUlSf *newSf -) -#else -PRIVATE Void rgSCHCmnUlSwapSfAllocs(cell, oldSf, newSf) -RgSchCellCb *cell; -RgSchUlSf *oldSf; -RgSchUlSf *newSf; -#endif +static Void rgSCHCmnUlSwapSfAllocs(RgSchCellCb *cell,RgSchUlSf *oldSf,RgSchUlSf *newSf) { RgSchUlAllocDb *tempAllocDb = newSf->allocDb; RgSchUlHoleDb *tempHoleDb = newSf->holeDb; - U8 tempAvailSbs = newSf->availSubbands; + uint8_t tempAvailSbs = newSf->availSubbands; UNUSED(cell); @@ -21518,7 +19055,7 @@ RgSchUlSf *newSf; /* Fix ccpu00120610*/ newSf->allocCountRef = &newSf->allocDb->count; oldSf->allocCountRef = &oldSf->allocDb->count; - RETVOID; + return; } /** * @brief Perform non-adaptive RETX for non-colliding allocs. @@ -21531,22 +19068,10 @@ RgSchUlSf *newSf; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUlSf *newSf - * @param[in] U8 idx + * @param[in] uint8_t idx * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlPrcNonAdptRetx -( -RgSchCellCb *cell, -RgSchUlSf *newSf, -U8 idx -) -#else -PRIVATE Void rgSCHCmnUlPrcNonAdptRetx(cell, newSf, idx) -RgSchCellCb *cell; -RgSchUlSf *newSf; -U8 idx; -#endif +static Void rgSCHCmnUlPrcNonAdptRetx(RgSchCellCb *cell,RgSchUlSf *newSf,uint8_t idx) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlAlloc *alloc, *nxtAlloc; @@ -21569,7 +19094,7 @@ U8 idx; } while((alloc = nxtAlloc) != NULLP); } - RETVOID; + return; } /** @@ -21591,24 +19116,16 @@ U8 idx; * @param[in] RgSchCellCb *cell * @param[in] RgSchUlSf *oldSf * @param[in] RgSchUlSf *newSf - * @param[in] U8 idx + * @param[in] uint8_t idx * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlPrfmSfMerge +static Void rgSCHCmnUlPrfmSfMerge ( RgSchCellCb *cell, RgSchUlSf *oldSf, RgSchUlSf *newSf, -U8 idx -) -#else -PRIVATE Void rgSCHCmnUlPrfmSfMerge(cell, oldSf, newSf, idx) -RgSchCellCb *cell; -RgSchUlSf *oldSf; -RgSchUlSf *newSf; -U8 idx; -#endif +uint8_t idx +) { /* Preassigned resources for msg3 in newSf. * Hence do adaptive retx for all NACKED TXs */ @@ -21619,7 +19136,7 @@ U8 idx; /* Perform non-adaptive RETX for non-colliding allocs */ rgSCHCmnUlPrcNonAdptRetx(cell, newSf, idx); - RETVOID; + return; } #endif /** @@ -21639,29 +19156,19 @@ U8 idx; * @param[in] RgSchUlSf *sf * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlRmvCmpltdAllocs -( -RgSchCellCb *cell, -RgSchUlSf *sf -) -#else -PRIVATE Void rgSCHCmnUlRmvCmpltdAllocs(cell, sf) -RgSchCellCb *cell; -RgSchUlSf *sf; -#endif +static Void rgSCHCmnUlRmvCmpltdAllocs(RgSchCellCb *cell,RgSchUlSf *sf) { RgSchUlAlloc *alloc, *nxtAlloc; if ((alloc = rgSCHUtlUlAllocFirst(sf)) == NULLP) { - RETVOID; + return; } do { nxtAlloc = rgSCHUtlUlAllocNxt(sf, alloc); #ifdef UL_ADPT_DBG - printf("rgSCHCmnUlRmvCmpltdAllocs:time(%d %d) alloc->hqProc->remTx %d hqProcId(%d) \n",cell->crntTime.sfn,cell->crntTime.slot,alloc->hqProc->remTx, alloc->grnt.hqProcId); + DU_LOG("\nDEBUG --> SCH : rgSCHCmnUlRmvCmpltdAllocs:time(%d %d) alloc->hqProc->remTx %d hqProcId(%d) \n",cell->crntTime.sfn,cell->crntTime.slot,alloc->hqProc->remTx, alloc->grnt.hqProcId); #endif alloc->hqProc->rcvdCrcInd = TRUE; if ((alloc->hqProc->rcvdCrcInd) || (alloc->hqProc->remTx == 0)) @@ -21683,8 +19190,8 @@ RgSchUlSf *sf; RgSchUeCb *ueCb = alloc->ue; RgSchCmnUe *cmnUe = (RgSchCmnUe*)ueCb->sch; RgSchCmnUlUe *ulUe = &(cmnUe->ul); - U8 cqi = ulUe->crntUlCqi[0]; - U16 numUlRetx = ueCb->ul.hqEnt.maxHqRetx - alloc->hqProc->remTx; + uint8_t cqi = ulUe->crntUlCqi[0]; + uint16_t numUlRetx = ueCb->ul.hqEnt.maxHqRetx - alloc->hqProc->remTx; hqRetxStats.ulCqiStat[(cqi - 1)].mcs = alloc->grnt.iMcs; @@ -21723,7 +19230,7 @@ RgSchUlSf *sf; } } while ((alloc = nxtAlloc) != NULLP); - RETVOID; + return; } /** @@ -21740,24 +19247,13 @@ RgSchUlSf *sf; * - Perform retransmission * * @param[in] RgSchUlSf *sf - * @param[in] U8 idx + * @param[in] uint8_t idx * @return Void **/ -#ifdef ANSI -Void rgSCHCmnRlsUlSf -( -RgSchCellCb *cell, -U8 idx -) -#else -Void rgSCHCmnRlsUlSf(cell, idx) -RgSchCellCb *cell; -U8 idx; -#endif +Void rgSCHCmnRlsUlSf(RgSchCellCb *cell,uint8_t idx) { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO) { RgSchUlSf *oldSf = &cellUl->ulSfArr[cellUl->hqFdbkIdx[idx]]; @@ -21765,14 +19261,14 @@ U8 idx; /* Initialize the reTxLst of UL HqProcs for RETX subframe */ if (rgSCHUtlUlAllocFirst(oldSf) == NULLP) { - RETVOID; + return; } /* Release all completed TX allocs from sf */ rgSCHCmnUlRmvCmpltdAllocs(cell, oldSf); oldSf->numACqiCount = 0; } - RETVOID; + return; } /** @@ -21788,21 +19284,10 @@ U8 idx; * @param[in] RgSchUlAlloc *alloc * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlUpdAllocRetx -( -RgSchCellCb *cell, -RgSchUlAlloc *alloc -) -#else -PRIVATE Void rgSCHCmnUlUpdAllocRetx(cell, alloc) -RgSchCellCb *cell; -RgSchUlAlloc *alloc; -#endif +static Void rgSCHCmnUlUpdAllocRetx(RgSchCellCb *cell,RgSchUlAlloc *alloc) { RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); - alloc->hqProc->reTxAlloc.rnti = alloc->rnti; alloc->hqProc->reTxAlloc.numSb = alloc->numSb; alloc->hqProc->reTxAlloc.iMcs = alloc->grnt.iMcs; @@ -21827,11 +19312,11 @@ RgSchUlAlloc *alloc; alloc->hqProc->alloc = NULLP; alloc->hqProc->ulSfIdx = RGSCH_INVALID_INFO; #ifdef UL_ADPT_DBG - printf("Adding Harq Proc Id in the retx list hqProcId %d \n",alloc->grnt.hqProcId); + DU_LOG("\nDEBUG --> SCH : Adding Harq Proc Id in the retx list hqProcId %d \n",alloc->grnt.hqProcId); #endif cmLListAdd2Tail(&cmnUlCell->reTxLst, &alloc->hqProc->reTxLnk); alloc->hqProc->reTxLnk.node = (PTR)alloc->hqProc; - RETVOID; + return; } /** @@ -21849,26 +19334,18 @@ RgSchUlAlloc *alloc; * @param[in] RgSchUlSf *sf * @param[in] RgSchUlHqProcCb *proc; * @param[in] RgSchUlHole *hole; - * @return U8 + * @return uint8_t **/ -#ifdef ANSI -PRIVATE Bool rgSCHCmnUlAdapRetxAlloc +static Bool rgSCHCmnUlAdapRetxAlloc ( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUlHqProcCb *proc, RgSchUlHole *hole ) -#else -PRIVATE Bool rgSCHCmnUlAdapRetxAlloc(cell, sf, proc, hole) -RgSchCellCb *cell; -RgSchUlSf *sf; -RgSchUlHqProcCb *proc; -RgSchUlHole *hole; -#endif { - U8 numSb = proc->reTxAlloc.numSb; - U8 iMcs = proc->reTxAlloc.iMcs; + uint8_t numSb = proc->reTxAlloc.numSb; + uint8_t iMcs = proc->reTxAlloc.iMcs; CmLteTimingInfo frm = cell->crntTime; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchDlSf *dlSf; @@ -21895,8 +19372,7 @@ RgSchUlHole *hole; if(alloc == NULLP) { rgSCHUtlPdcchPut(cell, &dlSf->pdcchInfo, pdcch); - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "UL Alloc fail for msg3 retx for rnti: %d\n", + DU_LOG("\nERROR --> SCH : UL Alloc fail for msg3 retx for rnti: %d\n", proc->reTxAlloc.rnti); return (FALSE); } @@ -21998,8 +19474,7 @@ RgSchUlHole *hole; else /* Intg fix */ { rgSCHUtlPdcchPut(cell, &dlSf->pdcchInfo, pdcch); - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "Num SB not suffiecient for adap retx for rnti: %d", + DU_LOG("\nERROR --> SCH : Num SB not suffiecient for adap retx for rnti: %d", proc->reTxAlloc.rnti); return (FALSE); } @@ -22018,27 +19493,16 @@ RgSchUlHole *hole; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUlSf *sf - * @return U8 + * @return uint8_t **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE Void rgSCHCmnUlSfRlsRetxProcs -( -RgSchCellCb *cell, -RgSchUlSf *sf -) -#else -PRIVATE Void rgSCHCmnUlSfRlsRetxProcs(cell, sf) -RgSchCellCb *cell; -RgSchUlSf *sf; -#endif +static Void rgSCHCmnUlSfRlsRetxProcs(RgSchCellCb *cell,RgSchUlSf *sf) { CmLListCp *cp; CmLList *node; RgSchUlHqProcCb *proc; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - cp = &(cellUl->reTxLst); node = cp->first; while (node) @@ -22049,7 +19513,7 @@ RgSchUlSf *sf; cmLListDelFrm(&cellUl->reTxLst, &proc->reTxLnk); proc->reTxLnk.node = (PTR)NULLP; } - RETVOID; + return; } #endif @@ -22066,19 +19530,9 @@ RgSchUlSf *sf; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUlSf *sf - * @return U8 + * @return uint8_t **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnUlSfReTxAllocs -( -RgSchCellCb *cell, -RgSchUlSf *sf -) -#else -PRIVATE Void rgSCHCmnUlSfReTxAllocs(cell, sf) -RgSchCellCb *cell; -RgSchUlSf *sf; -#endif +static Void rgSCHCmnUlSfReTxAllocs(RgSchCellCb *cell,RgSchUlSf *sf) { CmLListCp *cp; CmLList *node; @@ -22121,7 +19575,7 @@ RgSchUlSf *sf; /* Fix: syed Adaptive Msg3 Retx crash. */ proc->reTxLnk.node = (PTR)NULLP; } - RETVOID; + return; } /** @@ -22145,30 +19599,20 @@ RgSchUlSf *sf; * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlRbAlloc -( -RgSchCellCb *cell, -RgSchCmnDlRbAllocInfo *allocInfo -) -#else -PRIVATE Void rgSCHCmnDlRbAlloc(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif +static Void rgSCHCmnDlRbAlloc(RgSchCellCb *cell,RgSchCmnDlRbAllocInfo *allocInfo) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); if (cellSch->dl.isDlFreqSel) { - printf("5GTF_ERROR DLFS SCH Enabled\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR DLFS SCH Enabled\n"); cellSch->apisDlfs->rgSCHDlfsAllocRb(cell, allocInfo); } else { rgSCHCmnNonDlfsRbAlloc(cell, allocInfo); } - RETVOID; + return; } #ifdef LTEMAC_SPS @@ -22184,40 +19628,30 @@ RgSchCmnDlRbAllocInfo *allocInfo; * Processing Steps: * - Fill-up rbgInfo data structure for given DL bandwidth and rbgSize * - * @param[in] U8 dlTotalBw - * @param[in] U8 dlSubsetBw - * @param[in] U8 maxRaType1SubsetBw - * @param[in] U8 rbgSize + * @param[in] uint8_t dlTotalBw + * @param[in] uint8_t dlSubsetBw + * @param[in] uint8_t maxRaType1SubsetBw + * @param[in] uint8_t rbgSize * @param[out] RgSchBwRbgInfo *rbgInfo * @return Void **/ -#ifdef ANSI Void rgSCHCmnDlGetRbgInfo ( -U8 dlTotalBw, -U8 dlSubsetBw, -U8 maxRaType1SubsetBw, -U8 rbgSize, +uint8_t dlTotalBw, +uint8_t dlSubsetBw, +uint8_t maxRaType1SubsetBw, +uint8_t rbgSize, RgSchBwRbgInfo *rbgInfo ) -#else -Void rgSCHCmnDlGetRbgInfo(dlTotalBw, dlSubsetBw, maxRaType1SubsetBw, - rbgSize, rbgInfo) -U8 dlTotalBw; -U8 dlSubsetBw; -U8 maxRaType1SubsetBw; -U8 rbgSize; -RgSchBwRbgInfo *rbgInfo; -#endif { #ifdef RGSCH_SPS_UNUSED - U8 idx = 0; - U8 lastRbgIdx = ((dlTotalBw + rbgSize - 1)/rbgSize) - 1; - U8 currRbgSize = rbgSize; - U8 subsetSizeIdx = 0; - U8 subsetSize[RG_SCH_NUM_RATYPE1_SUBSETS] = {0}; - U8 lastRbgSize = rbgSize - (dlTotalBw - ((dlTotalBw/rbgSize) * rbgSize)); - U8 numRaType1Rbgs = (maxRaType1SubsetBw + rbgSize - 1)/rbgSize; + uint8_t idx = 0; + uint8_t lastRbgIdx = ((dlTotalBw + rbgSize - 1)/rbgSize) - 1; + uint8_t currRbgSize = rbgSize; + uint8_t subsetSizeIdx = 0; + uint8_t subsetSize[RG_SCH_NUM_RATYPE1_SUBSETS] = {0}; + uint8_t lastRbgSize = rbgSize - (dlTotalBw - ((dlTotalBw/rbgSize) * rbgSize)); + uint8_t numRaType1Rbgs = (maxRaType1SubsetBw + rbgSize - 1)/rbgSize; #endif /* Compute maximum number of SPS RBGs for the cell */ @@ -22247,7 +19681,7 @@ RgSchBwRbgInfo *rbgInfo; rbgInfo->lastRbgSize = rbgSize - (dlSubsetBw - ((dlSubsetBw/rbgSize) * rbgSize)); #ifdef RGSCH_SPS_UNUSED - memcpy(rbgInfo->rbgSubsetSize, subsetSize, 4 * sizeof(U8)); + memcpy(rbgInfo->rbgSubsetSize, subsetSize, 4 * sizeof(uint8_t)); #endif rbgInfo->numRbs = (rbgInfo->numRbgs * rbgSize > dlTotalBw) ? dlTotalBw:(rbgInfo->numRbgs * rbgSize); @@ -22271,54 +19705,43 @@ RgSchBwRbgInfo *rbgInfo; * - Update RA Type 0, RA Type 1 and RA type 2 masks. * * @param[in] RgSchDlSfAllocInfo *allocedInfo - * @param[in] U8 rbsReq + * @param[in] uint8_t rbsReq * @param[in] RgSchBwRbgInfo *rbgInfo - * @param[out] U8 *numAllocRbs + * @param[out] uint8_t *numAllocRbs * @param[out] RgSchDlSfAllocInfo *resAllocInfo * @param[in] Bool isPartialAlloc * * @return Void **/ -#ifdef ANSI -U8 rgSCHCmnDlRaType0Alloc +uint8_t rgSCHCmnDlRaType0Alloc ( RgSchDlSfAllocInfo *allocedInfo, -U8 rbsReq, +uint8_t rbsReq, RgSchBwRbgInfo *rbgInfo, -U8 *numAllocRbs, +uint8_t *numAllocRbs, RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc ) -#else -U8 rgSCHCmnDlRaType0Alloc(allocedInfo, rbsReq, rbgInfo, - numAllocRbs, resAllocInfo, isPartialAlloc) -RgSchDlSfAllocInfo *allocedInfo; -U8 rbsReq; -RgSchBwRbgInfo *rbgInfo; -U8 *numAllocRbs; -RgSchDlSfAllocInfo *resAllocInfo; -Bool isPartialAlloc; -#endif { /* Note: This function atttempts allocation only full allocation */ - U32 remNumRbs, rbgPosInRbgMask, ueRaType2Mask; - U8 type2MaskIdx, cnt, rbIdx; - U8 maskSize, rbg; - U8 bestNumAvailRbs = 0; - U8 usedRbs = 0; - U8 numAllocRbgs = 0; - U8 rbgSize = rbgInfo->rbgSize; - U32 *rbgMask = &(resAllocInfo->raType0Mask); + uint32_t remNumRbs, rbgPosInRbgMask, ueRaType2Mask; + uint8_t type2MaskIdx, cnt, rbIdx; + uint8_t maskSize, rbg; + uint8_t bestNumAvailRbs = 0; + uint8_t usedRbs = 0; + uint8_t numAllocRbgs = 0; + uint8_t rbgSize = rbgInfo->rbgSize; + uint32_t *rbgMask = &(resAllocInfo->raType0Mask); #ifdef RGSCH_SPS_UNUSED - U8 rbgSubset; - U32 ueRaType1Mask; - U32 *raType1Mask = resAllocInfo->raType1Mask; - U32 *raType1UsedRbs = resAllocInfo->raType1UsedRbs; + uint8_t rbgSubset; + uint32_t ueRaType1Mask; + uint32_t *raType1Mask = resAllocInfo->raType1Mask; + uint32_t *raType1UsedRbs = resAllocInfo->raType1UsedRbs; #endif - U32 *raType2Mask = resAllocInfo->raType2Mask; + uint32_t *raType2Mask = resAllocInfo->raType2Mask; - U32 allocedMask = allocedInfo->raType0Mask; + uint32_t allocedMask = allocedInfo->raType0Mask; maskSize = rbgInfo->numRbgs; @@ -22446,57 +19869,45 @@ Bool isPartialAlloc; * - Update RA Type1, RA type 0 and RA type 2 masks. * * @param[in] RgSchDlSfAllocInfo *allocedInfo - * @param[in] U8 rbsReq + * @param[in] uint8_t rbsReq * @param[in] RgSchBwRbgInfo *rbgInfo - * @param[in] U8 startRbgSubset - * @param[in] U8 *allocRbgSubset + * @param[in] uint8_t startRbgSubset + * @param[in] uint8_t *allocRbgSubset * @param[out] rgSchDlSfAllocInfo *resAllocInfo * @param[in] Bool isPartialAlloc * - * @return U8 + * @return uint8_t * Number of allocated RBs **/ -#ifdef ANSI -U8 rgSCHCmnDlRaType1Alloc +uint8_t rgSCHCmnDlRaType1Alloc ( RgSchDlSfAllocInfo *allocedInfo, -U8 rbsReq, +uint8_t rbsReq, RgSchBwRbgInfo *rbgInfo, -U8 startRbgSubset, -U8 *allocRbgSubset, +uint8_t startRbgSubset, +uint8_t *allocRbgSubset, RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc ) -#else -U8 rgSCHCmnDlRaType1Alloc(allocedInfo, rbsReq,rbgInfo,startRbgSubset, - allocRbgSubset, resAllocInfo, isPartialAlloc) -RgSchDlSfAllocInfo *allocedInfo; -U8 rbsReq; -RgSchBwRbgInfo *rbgInfo; -U8 startRbgSubset; -U8 *allocRbgSubset; -RgSchDlSfAllocInfo *resAllocInfo; -Bool isPartialAlloc; -#endif { /* Note: This function atttempts only full allocation */ - U8 *rbgSubsetSzArr; - U8 type2MaskIdx, subsetIdx, rbIdx, rbInSubset, rbgInSubset; - U8 offset, rbg, maskSize, bestSubsetIdx; - U8 startPos = 0; - U8 bestNumAvailRbs = 0; - U8 numAllocRbs = 0; - U32 ueRaType2Mask, ueRaType0Mask, rbPosInSubset; - U32 remNumRbs, allocedMask; - U8 usedRbs = 0; - U8 rbgSize = rbgInfo->rbgSize; - U8 rbgSubset = startRbgSubset; - U32 *rbgMask = &resAllocInfo->raType0Mask; - U32 *raType1Mask = resAllocInfo->raType1Mask; - U32 *raType2Mask = resAllocInfo->raType2Mask; - U32 *raType1UsedRbs = resAllocInfo->raType1UsedRbs; - U32 *allocMask = allocedInfo->raType1Mask; + uint8_t *rbgSubsetSzArr; + uint8_t type2MaskIdx, subsetIdx, rbIdx, rbInSubset, rbgInSubset; + uint8_t offset, rbg, maskSize, bestSubsetIdx; + uint8_t startPos = 0; + uint8_t bestNumAvailRbs = 0; + uint8_t numAllocRbs = 0; + uint32_t ueRaType2Mask, ueRaType0Mask, rbPosInSubset; + uint32_t remNumRbs, allocedMask; + uint8_t usedRbs = 0; + uint8_t rbgSize = rbgInfo->rbgSize; + uint8_t rbgSubset = startRbgSubset; + uint32_t *rbgMask = &resAllocInfo->raType0Mask; + uint32_t *raType1Mask = resAllocInfo->raType1Mask; + uint32_t *raType2Mask = resAllocInfo->raType2Mask; + uint32_t *raType1UsedRbs = resAllocInfo->raType1UsedRbs; + uint32_t *allocMask = allocedInfo->raType1Mask; /* Initialize the subset size Array */ rbgSubsetSzArr = rbgInfo->rbgSubsetSize; @@ -22530,7 +19941,7 @@ Bool isPartialAlloc; { /* Initialize alloced mask and subsetSize depending on the RBG * subset of allocation */ - U8 startIdx = 0; + uint8_t startIdx = 0; maskSize = rbgSubsetSzArr[bestSubsetIdx]; allocedMask = allocMask[bestSubsetIdx]; RG_SCH_CMN_DL_GET_START_POS(allocedMask, maskSize, @@ -22598,49 +20009,38 @@ Bool isPartialAlloc; * - Update RA Type2, RA type 1 and RA type 0 masks. * * @param[in] RgSchDlSfAllocInfo *allocedInfo - * @param[in] U8 rbsReq + * @param[in] uint8_t rbsReq * @param[in] RgSchBwRbgInfo *rbgInfo - * @param[out] U8 *rbStart + * @param[out] uint8_t *rbStart * @param[out] rgSchDlSfAllocInfo *resAllocInfo * @param[in] Bool isPartialAlloc * - * @return U8 + * @return uint8_t * Number of allocated RBs **/ -#ifdef ANSI -U8 rgSCHCmnDlRaType2Alloc +uint8_t rgSCHCmnDlRaType2Alloc ( RgSchDlSfAllocInfo *allocedInfo, -U8 rbsReq, +uint8_t rbsReq, RgSchBwRbgInfo *rbgInfo, -U8 *rbStart, +uint8_t *rbStart, RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc ) -#else -U8 rgSCHCmnDlRaType2Alloc(allocedInfo, rbsReq, rbgInfo, rbStart, - resAllocInfo, isPartialAlloc) -RgSchDlSfAllocInfo *allocedInfo; -U8 rbsReq; -RgSchBwRbgInfo *rbgInfo; -U8 *rbStart; -RgSchDlSfAllocInfo *resAllocInfo; -Bool isPartialAlloc; -#endif -{ - U8 numAllocRbs = 0; - U8 rbIdx; - U8 rbgSize = rbgInfo->rbgSize; - U32 *rbgMask = &resAllocInfo->raType0Mask; +{ + uint8_t numAllocRbs = 0; + uint8_t rbIdx; + uint8_t rbgSize = rbgInfo->rbgSize; + uint32_t *rbgMask = &resAllocInfo->raType0Mask; #ifdef RGSCH_SPS_UNUSED - U32 *raType1Mask = resAllocInfo->raType1Mask; + uint32_t *raType1Mask = resAllocInfo->raType1Mask; #endif - U32 *raType2Mask = resAllocInfo->raType2Mask; + uint32_t *raType2Mask = resAllocInfo->raType2Mask; #ifdef RGSCH_SPS_UNUSED - U32 *raType1UsedRbs = resAllocInfo->raType1UsedRbs; + uint32_t *raType1UsedRbs = resAllocInfo->raType1UsedRbs; #endif - U32 *allocedMask = allocedInfo->raType2Mask; + uint32_t *allocedMask = allocedInfo->raType2Mask; /* Note: This function atttempts only full allocation */ rgSCHCmnDlGetBestFitHole(allocedMask, rbgInfo->numRbs, @@ -22648,12 +20048,12 @@ Bool isPartialAlloc; if (numAllocRbs) { /* Update the allocation in RA type 0 and RA type 1 masks */ - U8 rbCnt = numAllocRbs; + uint8_t rbCnt = numAllocRbs; #ifdef RGSCH_SPS_UNUSED - U8 rbgSubset; - U32 ueRaType1Mask; + uint8_t rbgSubset; + uint32_t ueRaType1Mask; #endif - U32 ueRaType0Mask; + uint32_t ueRaType0Mask; rbIdx = *rbStart; while(rbCnt) @@ -22688,24 +20088,14 @@ Bool isPartialAlloc; * Processing Steps: * - Determine RA Type 0 mask for given rbIdex and rbg size. * - * @param[in] U8 rbIdx - * @param[in] U8 rbgSize - * @return U32 RA type 0 mask + * @param[in] uint8_t rbIdx + * @param[in] uint8_t rbgSize + * @return uint32_t RA type 0 mask **/ -#ifdef ANSI -PRIVATE U32 rgSCHCmnGetRaType0Mask -( -U8 rbIdx, -U8 rbgSize -) -#else -PRIVATE U32 rgSCHCmnGetRaType0Mask(rbIdx, rbgSize) -U8 rbIdx; -U8 rbgSize; -#endif +static uint32_t rgSCHCmnGetRaType0Mask(uint8_t rbIdx,uint8_t rbgSize) { - U8 rbg; - U32 rbgPosInRbgMask = 0; + uint8_t rbg; + uint32_t rbgPosInRbgMask = 0; rbg = rbIdx/rbgSize; rbgPosInRbgMask = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbg); @@ -22725,27 +20115,15 @@ U8 rbgSize; * Processing Steps: * - Determine RA Type 1 mask for given rbIdex and rbg size. * - * @param[in] U8 rbIdx - * @param[in] U8 rbgSize - * @param[out] U8 *type1Subset - * @return U32 RA type 1 mask + * @param[in] uint8_t rbIdx + * @param[in] uint8_t rbgSize + * @param[out] uint8_t *type1Subset + * @return uint32_t RA type 1 mask **/ -#ifdef ANSI -PRIVATE U32 rgSCHCmnGetRaType1Mask -( -U8 rbIdx, -U8 rbgSize, -U8 *type1Subset -) -#else -PRIVATE U32 rgSCHCmnGetRaType1Mask(rbIdx, rbgSize, type1Subset) -U8 rbIdx; -U8 rbgSize; -U8 *type1Subset; -#endif +static uint32_t rgSCHCmnGetRaType1Mask(uint8_t rbIdx,uint8_t rbgSize,uint8_t *type1Subset) { - U8 rbg, rbgSubset, rbgInSubset, offset, rbInSubset; - U32 rbPosInSubset; + uint8_t rbg, rbgSubset, rbgInSubset, offset, rbInSubset; + uint32_t rbPosInSubset; rbg = rbIdx/rbgSize; rbgSubset = rbg % rbgSize; @@ -22769,23 +20147,13 @@ U8 *type1Subset; * Processing Steps: * - Determine RA Type 2 mask for given rbIdx and rbg size. * - * @param[in] U8 rbIdx - * @param[out] U8 *maskIdx - * @return U32 RA type 2 mask + * @param[in] uint8_t rbIdx + * @param[out] uint8_t *maskIdx + * @return uint32_t RA type 2 mask **/ -#ifdef ANSI -PRIVATE U32 rgSCHCmnGetRaType2Mask -( -U8 rbIdx, -U8 *maskIdx -) -#else -PRIVATE U32 rgSCHCmnGetRaType2Mask(rbIdx, maskIdx) -U8 rbIdx; -U8 *maskIdx; -#endif +static uint32_t rgSCHCmnGetRaType2Mask(uint8_t rbIdx,uint8_t *maskIdx) { - U32 rbPosInType2; + uint32_t rbPosInType2; *maskIdx = rbIdx / 32; rbPosInType2 = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbIdx % 32); @@ -22815,7 +20183,6 @@ U8 *maskIdx; * ROK success * RFAILED failed **/ -#ifdef ANSI Bool rgSCHCmnAllocUeInSpsBw ( RgSchDlSf *dlSf, @@ -22824,23 +20191,15 @@ RgSchUeCb *ue, RgSchDlRbAlloc *rbAllocInfo, Bool isPartialAlloc ) -#else -Bool rgSCHCmnAllocUeInSpsBw(dlSf, cell, ue, rbAllocInfo, isPartialAlloc) -RgSchDlSf *dlSf; -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlRbAlloc *rbAllocInfo; -Bool isPartialAlloc; -#endif -{ - U8 rbgSize = cell->rbgSize; - U8 numAllocRbs = 0; - U8 numAllocRbgs = 0; - U8 rbStart = 0; - U8 idx, noLyr, iTbs; - RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell); - RgSchDlSfAllocInfo *dlSfAlloc = &rbAllocInfo->dlSf->dlSfAllocInfo; - RgSchBwRbgInfo *spsRbgInfo = &cell->spsBwRbgInfo; +{ + uint8_t rbgSize = cell->rbgSize; + uint8_t numAllocRbs = 0; + uint8_t numAllocRbgs = 0; + uint8_t rbStart = 0; + uint8_t idx, noLyr, iTbs; + RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell); + RgSchDlSfAllocInfo *dlSfAlloc = &rbAllocInfo->dlSf->dlSfAllocInfo; + RgSchBwRbgInfo *spsRbgInfo = &cell->spsBwRbgInfo; /* SPS_FIX : Check if this Hq proc is scheduled */ if ((0 == rbAllocInfo->tbInfo[0].schdlngForTb) && @@ -22878,7 +20237,7 @@ Bool isPartialAlloc; /* If no RBS could be allocated, attempt RA TYPE 1 */ numAllocRbs = rgSCHCmnDlRaType1Alloc(dlSfAlloc, - rbAllocInfo->rbsReq, spsRbgInfo, (U8)dlSfAlloc->nxtRbgSubset, + rbAllocInfo->rbsReq, spsRbgInfo, (uint8_t)dlSfAlloc->nxtRbgSubset, &rbAllocInfo->allocInfo.raType1.rbgSubset, &rbAllocInfo->resAllocInfo, isPartialAlloc); @@ -22919,7 +20278,7 @@ Bool isPartialAlloc; iTbs = rbAllocInfo->tbInfo[1].iTbs; noLyr = rbAllocInfo->tbInfo[1].noLyr; rbAllocInfo->tbInfo[1].bytesAlloc = - rgTbSzTbl[noLyr - 1][iTbs][numAllocRbs - 1]/8;; + rgTbSzTbl[noLyr - 1][iTbs][numAllocRbs - 1]/8; } /* Update rbAllocInfo with the allocation information */ @@ -22988,38 +20347,26 @@ Bool isPartialAlloc; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlGetBestFitHole -( -U32 *allocMask, -U8 numMaskRbs, -U32 *crntAllocMask, -U8 rbsReq, -U8 *allocStart, -U8 *allocNumRbs, -Bool isPartialAlloc -) -#else -PRIVATE Void rgSCHCmnDlGetBestFitHole (allocMask, numMaskRbs, - crntAllocMask, rbsReq, allocStart, allocNumRbs, isPartialAlloc) -U32 *allocMask; -U8 numMaskRbs; -U32 *crntAllocMask; -U8 rbsReq; -U8 *allocStart; -U8 *allocNumRbs; -Bool isPartialAlloc; -#endif -{ - U8 maskSz = (numMaskRbs + 31)/32; - U8 maxMaskPos = (numMaskRbs % 32); - U8 maskIdx, maskPos; - U8 numAvailRbs = 0; - U8 bestAvailNumRbs = 0; +static Void rgSCHCmnDlGetBestFitHole +( +uint32_t *allocMask, +uint8_t numMaskRbs, +uint32_t *crntAllocMask, +uint8_t rbsReq, +uint8_t *allocStart, +uint8_t *allocNumRbs, +Bool isPartialAlloc +) +{ + uint8_t maskSz = (numMaskRbs + 31)/32; + uint8_t maxMaskPos = (numMaskRbs % 32); + uint8_t maskIdx, maskPos; + uint8_t numAvailRbs = 0; + uint8_t bestAvailNumRbs = 0; S8 bestStartPos = -1; S8 startPos = -1; - U32 tmpMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0}; - U32 bestMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0}; + uint32_t tmpMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0}; + uint32_t bestMask[RG_SCH_NUM_RATYPE2_32BIT_MASK] = {0}; *allocNumRbs = numAvailRbs; *allocStart = 0; @@ -23046,7 +20393,7 @@ Bool isPartialAlloc; ++numAvailRbs; if (numAvailRbs == rbsReq) { - *allocStart = (U8)startPos; + *allocStart = (uint8_t)startPos; *allocNumRbs = rbsReq; break; } @@ -23057,11 +20404,11 @@ Bool isPartialAlloc; { bestAvailNumRbs = numAvailRbs; bestStartPos = startPos; - memcpy(bestMask, tmpMask, 4 * sizeof(U32)); + memcpy(bestMask, tmpMask, 4 * sizeof(uint32_t)); } numAvailRbs = 0; startPos = -1; - memset(tmpMask, 0, 4 * sizeof(U32)); + memset(tmpMask, 0, 4 * sizeof(uint32_t)); } } if (*allocNumRbs == rbsReq) @@ -23073,22 +20420,22 @@ Bool isPartialAlloc; if (*allocNumRbs == rbsReq) { /* Convert the hole into allocation */ - memcpy(crntAllocMask, tmpMask, 4 * sizeof(U32)); - RETVOID; + memcpy(crntAllocMask, tmpMask, 4 * sizeof(uint32_t)); + return; } else { if (bestAvailNumRbs && isPartialAlloc) { /* Partial allocation could have been done */ - *allocStart = (U8)bestStartPos; + *allocStart = (uint8_t)bestStartPos; *allocNumRbs = bestAvailNumRbs; /* Convert the hole into allocation */ - memcpy(crntAllocMask, bestMask, 4 * sizeof(U32)); + memcpy(crntAllocMask, bestMask, 4 * sizeof(uint32_t)); } } - RETVOID; + return; } #endif /* LTEMAC_SPS */ @@ -23114,23 +20461,15 @@ Bool isPartialAlloc; * @return void **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE Void rgSCHCmnFindCodeRate +static Void rgSCHCmnFindCodeRate ( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -RgSchDlRbAlloc *allocInfo, -U8 idx +RgSchCellCb *cell, +RgSchDlSf *dlSf, +RgSchDlRbAlloc *allocInfo, +uint8_t idx ) -#else -PRIVATE Void rgSCHCmnFindCodeRate(cell,dlSf,allocInfo,idx) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchDlRbAlloc *allocInfo; -U8 idx; -#endif { - RETVOID; + return; } #endif @@ -23149,31 +20488,23 @@ U8 idx; * - Adjust Imcs according to tbSize and ITBS. * * @param[in,out] RgSchDlRbAlloc *allocInfo - * @param[in] U8 *idx + * @param[in] uint8_t *idx * @return void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsPbchTbImcsAdj +static Void rgSCHCmnNonDlfsPbchTbImcsAdj ( -RgSchCellCb *cell, -RgSchDlRbAlloc *allocInfo, -U8 idx, -U8 rbsReq +RgSchCellCb *cell, +RgSchDlRbAlloc *allocInfo, +uint8_t idx, +uint8_t rbsReq ) -#else -PRIVATE Void rgSCHCmnNonDlfsPbchTbImcsAdj(cell,allocInfo, idx, rbsReq) -RgSchCellCb *cell; -RgSchDlRbAlloc *allocInfo; -U8 idx; -U8 rbsReq; -#endif { - U8 noLyrs = 0; - U8 tbs = 0; - U32 origBytesReq; - U8 noRbgs = 0; - U8 noRbs = 0; - RgSchDlSf *dlSf = allocInfo->dlSf; + uint8_t noLyrs = 0; + uint8_t tbs = 0; + uint32_t origBytesReq; + uint8_t noRbgs = 0; + uint8_t noRbs = 0; + RgSchDlSf *dlSf = allocInfo->dlSf; RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[idx].imcs, tbs); noLyrs = allocInfo->tbInfo[idx].noLyr; @@ -23191,7 +20522,7 @@ U8 rbsReq; /* This line will help in case if tbs is zero and reduction in MCS is not possible */ if (allocInfo->rbsReq == 0 ) { - RETVOID; + return; } origBytesReq = rgTbSzTbl[noLyrs - 1][tbs][rbsReq - 1]/8; @@ -23216,7 +20547,7 @@ U8 rbsReq; RG_SCH_CMN_DL_TBS_TO_MCS(tbs,allocInfo->tbInfo[idx].imcs); } - RETVOID; + return; } /* Added funcion to adjust TBSize*/ /** @@ -23230,38 +20561,29 @@ U8 rbsReq; * Processing Steps: * * @param[in,out] RgSchDlRbAlloc *allocInfo - * @param[in] U8 numOvrlapgPbchRb - * @param[in] U8 idx - * @param[in] U8 pbchSsRsSym + * @param[in] uint8_t numOvrlapgPbchRb + * @param[in] uint8_t idx + * @param[in] uint8_t pbchSsRsSym * @return void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj +static Void rgSCHCmnNonDlfsPbchTbSizeAdj ( -RgSchDlRbAlloc *allocInfo, -U8 numOvrlapgPbchRb, -U8 pbchSsRsSym, -U8 idx, -U32 bytesReq +RgSchDlRbAlloc *allocInfo, +uint8_t numOvrlapgPbchRb, +uint8_t pbchSsRsSym, +uint8_t idx, +uint32_t bytesReq ) -#else -PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj(allocInfo,numOvrlapgPbchRb,pbchSsRsSym,idx,bytesReq) -RgSchDlRbAlloc *allocInfo; -U8 numOvrlapgPbchRb; -U8 pbchSsRsSym; -U8 idx; -U32 bytesReq; -#endif { - U32 reducedTbs = 0; - U8 noLyrs = 0; - U8 tbs = 0; - + uint32_t reducedTbs = 0; + uint8_t noLyrs = 0; + uint8_t tbs = 0; + noLyrs = allocInfo->tbInfo[idx].noLyr; RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[idx].imcs, tbs); - reducedTbs = bytesReq - (((U32)numOvrlapgPbchRb * (U32)pbchSsRsSym * 6)/8); + reducedTbs = bytesReq - (((uint32_t)numOvrlapgPbchRb * (uint32_t)pbchSsRsSym * 6)/8); /* find out the ITbs & Imcs by identifying first Highest number of bits compared with reduced bits considering the bits that are @@ -23281,7 +20603,7 @@ U32 bytesReq; allocInfo->tbInfo[idx].iTbs = tbs; RG_SCH_CMN_DL_TBS_TO_MCS(tbs,allocInfo->tbInfo[idx].imcs); - RETVOID; + return; } /* Added this function to find num of ovrlapping PBCH rb*/ @@ -23298,26 +20620,12 @@ U32 bytesReq; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *dlSf * @param[in,out] RgSchDlRbAlloc *allocInfo - * @param[out] U8 addtlRbsAvl + * @param[out] uint8_t addtlRbsAvl * @return void **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnFindNumAddtlRbsAvl -( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -RgSchDlRbAlloc *allocInfo -) -#else -PRIVATE U8 rgSCHCmnFindNumAddtlRbsAvl(cell,dlSf,allocInfo) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchDlRbAlloc *allocInfo; -#endif +static uint8_t rgSCHCmnFindNumAddtlRbsAvl(RgSchCellCb *cell,RgSchDlSf *dlSf,RgSchDlRbAlloc *allocInfo) { - U8 addtlRbsAvl = 0; - - + uint8_t addtlRbsAvl = 0; if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0) { addtlRbsAvl = (((dlSf->type0End - dlSf->type2End + 1)*\ @@ -23345,24 +20653,16 @@ RgSchDlRbAlloc *allocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *dlSf * @param[in,out] RgSchDlRbAlloc *allocInfo - * @param[out] U8* numOvrlapgPbchRb + * @param[out] uint8_t* numOvrlapgPbchRb * @return void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs +static Void rgSCHCmnFindNumPbchOvrlapRbs ( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -RgSchDlRbAlloc *allocInfo, -U8 *numOvrlapgPbchRb +RgSchCellCb *cell, +RgSchDlSf *dlSf, +RgSchDlRbAlloc *allocInfo, +uint8_t *numOvrlapgPbchRb ) -#else -PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs(cell,dlSf,allocInfo,numOvrlapgPbchRb) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchDlRbAlloc *allocInfo; -U8 *numOvrlapgPbchRb; -#endif { *numOvrlapgPbchRb = 0; /*Find if we have already crossed the start boundary for PBCH 6 RBs, @@ -23401,7 +20701,7 @@ U8 *numOvrlapgPbchRb; *numOvrlapgPbchRb = (cell->pbchRbEnd) - dlSf->bwAlloced; } } - RETVOID; + return; } /** @@ -23416,38 +20716,30 @@ U8 *numOvrlapgPbchRb; * * @param[in] RgSchCellCb *cell * @param[in,out] RgSchDlRbAlloc *allocInfo - * @param[in] U8 pbchSsRsSym + * @param[in] uint8_t pbchSsRsSym * @return void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj +static Void rgSCHCmnNonDlfsPbchRbAllocAdj ( RgSchCellCb *cell, RgSchDlRbAlloc *allocInfo, -U8 pbchSsRsSym, +uint8_t pbchSsRsSym, Bool isBcchPcch ) -#else -PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj(cell, allocInfo,pbchSsRsSym) -RgSchCellCb *cell; -RgSchDlRbAlloc *allocInfo; -U8 pbchSsRsSym; -Bool isBcchPcch; -#endif { - RgSchDlSf *dlSf = allocInfo->dlSf; - U8 numOvrlapgPbchRb = 0; - U8 numOvrlapgAdtlPbchRb = 0; - U8 totSym; - U8 addtlRbsReq = 0; - U8 moreAddtlRbsReq = 0; - U8 addtlRbsAdd = 0; - U8 moreAddtlRbsAdd = 0; - U8 tbs; - U8 origRbsReq = 0; - U32 bytesReq; - U8 noLyr; - U8 divResult; + RgSchDlSf *dlSf = allocInfo->dlSf; + uint8_t numOvrlapgPbchRb = 0; + uint8_t numOvrlapgAdtlPbchRb = 0; + uint8_t totSym; + uint8_t addtlRbsReq = 0; + uint8_t moreAddtlRbsReq = 0; + uint8_t addtlRbsAdd = 0; + uint8_t moreAddtlRbsAdd = 0; + uint8_t tbs; + uint8_t origRbsReq = 0; + uint32_t bytesReq; + uint8_t noLyr; + uint8_t divResult; @@ -23518,7 +20810,7 @@ Bool isBcchPcch; } if (isBcchPcch == TRUE) { - RETVOID; + return; } RG_SCH_CMN_DL_MCS_TO_TBS(allocInfo->tbInfo[0].imcs, tbs); @@ -23591,7 +20883,7 @@ Bool isBcchPcch; } } - RETVOID; + return; } /* end of rgSCHCmnNonDlfsPbchRbAllocAdj */ #endif #endif @@ -23611,30 +20903,20 @@ Bool isBcchPcch; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc -( -RgSchCellCb *cell, -RgSchDlRbAlloc *allocInfo -) -#else -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) -RgSchCellCb *cell; -RgSchDlRbAlloc *allocInfo; -#endif +static S16 rgSCHCmnNonDlfsCmnRbAlloc(RgSchCellCb *cell,RgSchDlRbAlloc *allocInfo) { #ifndef LTE_TDD #ifdef LTEMAC_SPS #endif - U8 pbchSsRsSym = 0; - U8 pbchFrame = 0; - U8 tbs = 0; + uint8_t pbchSsRsSym = 0; + uint8_t pbchFrame = 0; + uint8_t tbs = 0; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); #endif RgSchDlSf *dlSf = allocInfo->dlSf; #ifdef LTEMAC_SPS - U8 rbStart = 0; - U8 spsRbsAlloc = 0; + uint8_t rbStart = 0; + uint8_t spsRbsAlloc = 0; RgSchDlSfAllocInfo *dlSfAlloc = &allocInfo->dlSf->dlSfAllocInfo; #endif @@ -23645,9 +20927,9 @@ RgSchDlRbAlloc *allocInfo; * is initialized to 0 at the beginning of allcoation */ allocInfo->resAllocInfo.raType0Mask = 0; memset(allocInfo->resAllocInfo.raType1Mask, 0, - RG_SCH_NUM_RATYPE1_32BIT_MASK * sizeof (U32)); + RG_SCH_NUM_RATYPE1_32BIT_MASK * sizeof (uint32_t)); memset(allocInfo->resAllocInfo.raType2Mask, 0, - RG_SCH_NUM_RATYPE2_32BIT_MASK * sizeof (U32)); + RG_SCH_NUM_RATYPE2_32BIT_MASK * sizeof (uint32_t)); if ((dlSf->spsAllocdBw >= cell->spsBwRbgInfo.numRbs) && (dlSf->bwAlloced == dlSf->bw)) @@ -23727,7 +21009,7 @@ RgSchDlRbAlloc *allocInfo; allocInfo->allocInfo.raType2.rbStart = rbStart; #else /*Fix for ccpu00123918*/ - allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start; + allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start; #endif } else @@ -23768,7 +21050,7 @@ RgSchDlRbAlloc *allocInfo; { #endif /*Fix for ccpu00123918*/ - allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start; + allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start; allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq; allocInfo->rbsAlloc = allocInfo->rbsReq; @@ -23798,7 +21080,7 @@ RgSchDlRbAlloc *allocInfo; #ifdef LTEMAC_SPS if (spsRbsAlloc) { - U8 idx; + uint8_t idx; /* Update type 0, 1 and 2 masks */ dlSfAlloc->raType0Mask |= allocInfo->resAllocInfo.raType0Mask; #ifdef RGSCH_SPS_UNUSED @@ -23838,21 +21120,10 @@ RgSchDlRbAlloc *allocInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAllocRar -( - RgSchCellCb *cell, - RgSchDlRbAlloc *allocInfo - ) -#else -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) - RgSchCellCb *cell; - RgSchDlRbAlloc *allocInfo; -#endif +static S16 rgSCHCmnNonDlfsCmnRbAllocRar(RgSchCellCb *cell,RgSchDlRbAlloc *allocInfo) { RgSchDlSf *dlSf = allocInfo->dlSf; - if(dlSf->bwAlloced == dlSf->bw) { return RFAILED; @@ -23872,7 +21143,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) allocInfo->allocInfo.raType2.isLocal = TRUE; /*Fix for ccpu00123918*/ - allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start; + allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start; allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq; allocInfo->rbsAlloc = allocInfo->rbsReq; @@ -23888,7 +21159,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) RgSchSfBeamInfo *beamInfo = &(dlSf->sfBeamInfo[0]); if(beamInfo->totVrbgAllocated > MAX_5GTF_VRBG) { - printf("5GTF_ERROR vrbg allocated > 25\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR vrbg allocated > 25\n"); return RFAILED; } @@ -23911,7 +21182,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) allocInfo->tbInfo[0].bytesAlloc = allocInfo->tbInfo[0].bytesReq; #endif - printf("\n[%s],allocInfo->tbInfo[0].bytesAlloc:%u,vrbgReq:%u\n", + DU_LOG("\nINFO --> SCH : [%s],allocInfo->tbInfo[0].bytesAlloc:%u,vrbgReq:%u\n", __func__,allocInfo->tbInfo[0].bytesAlloc,allocInfo->vrbgReq); return ROK; @@ -23939,23 +21210,14 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) * -# FALSE **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl +static Bool rgSCHCmnNonDlfsSFRBwAvlbl ( -RgSchCellCb *cell, -RgSchSFRPoolInfo **sfrpoolInfo, -RgSchDlSf *dlSf, -RgSchDlRbAlloc *allocInfo, -Bool isUeCellEdge +RgSchCellCb *cell, +RgSchSFRPoolInfo **sfrpoolInfo, +RgSchDlSf *dlSf, +RgSchDlRbAlloc *allocInfo, +Bool isUeCellEdge ) -#else -PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl(cell, sfrpoolInfo, dlSf, allocInfo, isUeCellEdge) -RgSchCellCb *cell; -RgSchSFRPoolInfo **sfrpoolInfo; -RgSchDlSf *dlSf; -RgSchDlRbAlloc *allocInfo; -Bool isUeCellEdge; -#endif { CmLListCp *l; CmLListCp *l1; @@ -23964,30 +21226,27 @@ Bool isUeCellEdge; RgSchSFRPoolInfo *sfrPool; RgSchSFRPoolInfo *sfrCEPool; - U8 tbs; - U8 noLyrs; + uint8_t tbs; + uint8_t noLyrs; RgSchSFRPoolInfo *poolWithMaxAvlblBw = NULLP; - U32 bwAvlbl = 0; - U32 addtnlPRBs = 0; + uint32_t bwAvlbl = 0; + uint32_t addtnlPRBs = 0; if (dlSf->bw <= dlSf->bwAlloced) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "BW is fully allocated for subframe (%d) CRNTI:%d", dlSf->sfNum,allocInfo->rnti); + DU_LOG("\nERROR --> SCH : BW is fully allocated for subframe (%d) CRNTI:%d", dlSf->sfNum,allocInfo->rnti); return FALSE; } if (dlSf->sfrTotalPoolInfo.ccBwFull == TRUE) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "BW is fully allocated for CC Pool CRNTI:%d",allocInfo->rnti); + DU_LOG("\nERROR --> SCH : BW is fully allocated for CC Pool CRNTI:%d",allocInfo->rnti); return FALSE; } if ((dlSf->sfrTotalPoolInfo.ceBwFull == TRUE) && (isUeCellEdge)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "BW is fully allocated for CE Pool CRNTI:%d",allocInfo->rnti); + DU_LOG("\nERROR --> SCH : BW is fully allocated for CE Pool CRNTI:%d",allocInfo->rnti); return FALSE; } @@ -24339,27 +21598,20 @@ Bool isUeCellEdge; * -# FALSE **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl +static Bool rgSCHCmnNonDlfsBwAvlbl ( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -RgSchDlRbAlloc *allocInfo +RgSchCellCb *cell, +RgSchDlSf *dlSf, +RgSchDlRbAlloc *allocInfo ) -#else -PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl(cell, dlSf, allocInfo) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchDlRbAlloc *allocInfo; -#endif { - U8 tbs; - U8 noLyrs; - U8 ignoredDfctRbg = FALSE; + uint8_t tbs; + uint8_t noLyrs; + uint8_t ignoredDfctRbg = FALSE; if (dlSf->bw <= dlSf->bwAlloced) { - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, "(%d:%d)FAILED CRNTI:%d", + DU_LOG("\nERROR --> SCH : (%d:%d)FAILED CRNTI:%d", dlSf->bw, dlSf->bwAlloced,allocInfo->rnti); return (FALSE); } @@ -24465,9 +21717,9 @@ RgSchDlRbAlloc *allocInfo; dlSf->lstRbgDfct = 1; } - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "FAILED for CRNTI:%d", + DU_LOG("\nERROR --> SCH : FAILED for CRNTI:%d", allocInfo->rnti); - printf ("RB Alloc failed for LAA TB type 0\n"); + DU_LOG("\nERROR --> SCH : RB Alloc failed for LAA TB type 0\n"); return (FALSE); } return (TRUE); @@ -24508,8 +21760,8 @@ RgSchDlRbAlloc *allocInfo; } else { - printf ("RB Alloc failed for LAA TB type 2\n"); - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti); + DU_LOG("\nERROR --> SCH : RB Alloc failed for LAA TB type 2\n"); + DU_LOG("\nERROR --> SCH : FAILED for CRNTI:%d",allocInfo->rnti); return (FALSE); } /* Fix: Number of RBs in case of RETX should be same as @@ -24517,7 +21769,7 @@ RgSchDlRbAlloc *allocInfo; return (TRUE); } } - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti); + DU_LOG("\nERROR --> SCH : FAILED for CRNTI:%d",allocInfo->rnti); return (FALSE); } #endif @@ -24534,26 +21786,18 @@ RgSchDlRbAlloc *allocInfo; * * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *dlSf - * @param[in] U8 rbStrt - * @param[in] U8 numRb + * @param[in] uint8_t rbStrt + * @param[in] uint8_t numRb * * @return Void **/ -#ifdef ANSI Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc ( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -U8 rbStrt, -U8 numRb +RgSchCellCb *cell, +RgSchDlSf *dlSf, +uint8_t rbStrt, +uint8_t numRb ) -#else -Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc(cell, dlSf, rbStrt, numRb) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -U8 rbStrt; -U8 numRb; -#endif { CmLListCp *l; CmLList *n; @@ -24596,10 +21840,10 @@ U8 numRb; n = cmLListFirst(l); } else - RETVOID; + return; } } - RETVOID; + return; } /** @@ -24613,29 +21857,20 @@ U8 numRb; * * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *dlSf - * @param[in] U8 rbStrt - * @param[in] U8 numRb + * @param[in] uint8_t rbStrt + * @param[in] uint8_t numRb * * @return Void **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc +static S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc ( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlSf *dlSf, -U8 rbStrt, -U8 numRb +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchDlSf *dlSf, +uint8_t rbStrt, +uint8_t numRb ) -#else -PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc(cell, ue, dlSf, rbStrt, numRb) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlSf *dlSf; -U8 rbStrt; -U8 numRb; -#endif { CmLListCp *l; CmLList *n; @@ -24654,7 +21889,7 @@ U8 numRb; /* KWork fix */ if (sfrCCPool1 == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" + DU_LOG("\nERROR --> SCH : rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "sfrCCPool1 is NULL for CRNTI:%d",ue->ueId); return RFAILED; } @@ -24678,7 +21913,7 @@ U8 numRb; ret = rgSCHCmnBuildRntpInfo(cell, dlSf->rntpInfo.val, dlSf->type2Start, numRb, dlSf->bw); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" + DU_LOG("\nERROR --> SCH : rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); return RFAILED; } @@ -24695,7 +21930,7 @@ U8 numRb; ret = rgSCHCmnBuildRntpInfo(cell, dlSf->rntpInfo.val, dlSf->type2Start, numRb, dlSf->bw); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" + DU_LOG("\nERROR --> SCH : rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED CRNTI:%d",ue->ueId); return RFAILED; } @@ -24725,26 +21960,18 @@ U8 numRb; * * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *dlSf - * @param[in] U8 rbStrt - * @param[in] U8 numRb + * @param[in] uint8_t rbStrt + * @param[in] uint8_t numRb * * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc +static Void rgSCHCmnNonDlfsUpdTyp2Alloc ( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -U8 rbStrt, -U8 numRb +RgSchCellCb *cell, +RgSchDlSf *dlSf, +uint8_t rbStrt, +uint8_t numRb ) -#else -PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc(cell, dlSf, rbStrt, numRb) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -U8 rbStrt; -U8 numRb; -#endif { /* Move the type2End pivot forward */ dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize); @@ -24753,7 +21980,7 @@ U8 numRb; /*Fix for ccpu00123918*/ dlSf->type2Start += numRb; //#endif - RETVOID; + return; } /** @@ -24776,31 +22003,23 @@ U8 numRb; * @return Void **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsType0Alloc +static Void rgSCHCmnNonDlfsType0Alloc ( -RgSchCellCb *cell, -RgSchDlSf *dlSf, -RgSchDlRbAlloc *allocInfo, -RgSchUeCb *ue +RgSchCellCb *cell, +RgSchDlSf *dlSf, +RgSchDlRbAlloc *allocInfo, +RgSchUeCb *ue ) -#else -PRIVATE Void rgSCHCmnNonDlfsType0Alloc(cell, dlSf, allocInfo, dlUe) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchDlRbAlloc *allocInfo; -RgSchUeCb *ue; -#endif -{ - U32 dlAllocMsk = 0; - U8 rbgFiller = dlSf->lstRbgDfct; - U8 noRbgs = RGSCH_CEIL((allocInfo->rbsReq + rbgFiller), cell->rbgSize); - //U8 noRbgs = (allocInfo->rbsReq + rbgFiller)/ cell->rbgSize; - U8 noRbs; - U8 noLyr; - U8 iTbs; - U32 tb1BytesAlloc = 0; - U32 tb2BytesAlloc = 0; +{ + uint32_t dlAllocMsk = 0; + uint8_t rbgFiller = dlSf->lstRbgDfct; + uint8_t noRbgs = RGSCH_CEIL((allocInfo->rbsReq + rbgFiller), cell->rbgSize); + //uint8_t noRbgs = (allocInfo->rbsReq + rbgFiller)/ cell->rbgSize; + uint8_t noRbs; + uint8_t noLyr; + uint8_t iTbs; + uint32_t tb1BytesAlloc = 0; + uint32_t tb2BytesAlloc = 0; RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell); //if(noRbgs == 0) noRbgs = 1; /* Not required as ceilling is used above*/ @@ -24811,7 +22030,7 @@ RgSchUeCb *ue; { if (--noRbgs == 0) { - RETVOID; + return; } noRbs = (noRbgs * cell->rbgSize) - rbgFiller; } @@ -24854,7 +22073,7 @@ RgSchUeCb *ue; { if (--noRbgs == 0) { - RETVOID; + return; } noRbs = (noRbgs * cell->rbgSize) - rbgFiller; } @@ -24916,7 +22135,7 @@ RgSchUeCb *ue; else { allocInfo->tbInfo[1].bytesAlloc = - rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8;; + rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8; /* DwPts Scheduling Changes Start */ #ifdef LTE_TDD if (dlSf->sfType == RG_SCH_SPL_SF_DATA) @@ -24932,7 +22151,7 @@ RgSchUeCb *ue; /* The last RBG which can be smaller than the RBG size is consedered * only for the first time allocation of TYPE0 UE */ dlSf->lstRbgDfct = 0; - RETVOID; + return; } #endif #ifndef LTE_TDD @@ -24946,35 +22165,26 @@ RgSchUeCb *ue; * * Processing Steps: * - * @param[in] U8 *rntpPtr - * @param[in] U8 startRb - * @param[in] U8 numRb + * @param[in] uint8_t *rntpPtr + * @param[in] uint8_t startRb + * @param[in] uint8_t numRb * * @return Void **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE S16 rgSCHCmnBuildRntpInfo +static S16 rgSCHCmnBuildRntpInfo ( -RgSchCellCb *cell, -U8 *rntpPtr, -U8 startRb, -U8 nmbRb, -U16 bw +RgSchCellCb *cell, +uint8_t *rntpPtr, +uint8_t startRb, +uint8_t nmbRb, +uint16_t bw ) -#else -PRIVATE S16 rgSCHCmnBuildRntpInfo(cell, rntpPtr, startRb, nmbRb, bw) -RgSchCellCb *cell; -U8 *rntpPtr; -U8 startRb; -U8 nmbRb; -U16 bw; -#endif { - U16 rbPtrStartIdx; /* Start Index of Octete Buffer to be filled */ - U16 rbPtrEndIdx; /* End Index of Octete Buffer to be filled */ - U16 rbBitLoc; /* Bit Location to be set as 1 in the current Byte */ - U16 nmbRbPerByte; /* PRB's to be set in the current Byte (in case of multiple Bytes) */ + uint16_t rbPtrStartIdx; /* Start Index of Octete Buffer to be filled */ + uint16_t rbPtrEndIdx; /* End Index of Octete Buffer to be filled */ + uint16_t rbBitLoc; /* Bit Location to be set as 1 in the current Byte */ + uint16_t nmbRbPerByte; /* PRB's to be set in the current Byte (in case of multiple Bytes) */ rbPtrStartIdx = (startRb)/8; @@ -24982,8 +22192,7 @@ U16 bw; if (rntpPtr == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHCmnBuildRntpInfo():" + DU_LOG("\nERROR --> SCH : rgSCHCmnBuildRntpInfo():" "rntpPtr can't be NULLP (Memory Allocation Failed)"); return RFAILED; } @@ -25030,30 +22239,20 @@ U16 bw; * * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *dlSf - * @param[in] U8 rbStrt - * @param[in] U8 numRb + * @param[in] uint8_t rbStrt + * @param[in] uint8_t numRb * * @return Void **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc +static S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc ( RgSchCellCb *cell, -RgSchUeCb *ue, +RgSchUeCb *ue, RgSchDlSf *dlSf, RgSchSFRPoolInfo *sfrPool, -U8 rbStrt, -U8 numRb +uint8_t rbStrt, +uint8_t numRb ) -#else -PRIVATE S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc(cell, ue, dlSf, sfrPool, rbStrt, numRb) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlSf *dlSf; -RgSchSFRPoolInfo *sfrPool; -U8 rbStrt; -U8 numRb; -#endif { #ifndef LTEMAC_SPS S16 ret; @@ -25080,7 +22279,7 @@ U8 numRb; ret = rgSCHCmnBuildRntpInfo(cell, dlSf->rntpInfo.val, sfrPool->type2Start, numRb, dlSf->bw); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" + DU_LOG("\nERROR --> SCH : rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); return RFAILED; } @@ -25092,7 +22291,7 @@ U8 numRb; ret = rgSCHCmnBuildRntpInfo(cell, dlSf->rntpInfo.val, sfrPool->type2Start, numRb, dlSf->bw); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" + DU_LOG("\nERROR --> SCH : rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); return RFAILED; } @@ -25123,28 +22322,20 @@ U8 numRb; * * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsSFRPoolType0Alloc +static Void rgSCHCmnNonDlfsSFRPoolType0Alloc ( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchSFRPoolInfo *poolInfo, RgSchDlRbAlloc *allocInfo ) -#else -PRIVATE Void rgSCHCmnNonDlfsSFRPoolType0Alloc(cell, dlSf, poolInfo, allocInfo) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchSFRPoolInfo *poolInfo; -RgSchDlRbAlloc *allocInfo; -#endif { - U32 dlAllocMsk = 0; - U8 rbgFiller = 0; - U8 noRbgs = 0; - U8 noRbs; - U8 noLyr; - U8 iTbs; + uint32_t dlAllocMsk = 0; + uint8_t rbgFiller = 0; + uint8_t noRbgs = 0; + uint8_t noRbs; + uint8_t noLyr; + uint8_t iTbs; if (poolInfo->poolstartRB + poolInfo->bw == dlSf->bw) @@ -25167,7 +22358,7 @@ RgSchDlRbAlloc *allocInfo; { if (--noRbgs == 0) { - RETVOID; + return; } noRbs = (noRbgs * cell->rbgSize) - rbgFiller; } @@ -25222,14 +22413,14 @@ RgSchDlRbAlloc *allocInfo; else { allocInfo->tbInfo[1].bytesAlloc = - rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8;; + rgTbSzTbl[noLyr - 1][iTbs][noRbs - 1]/8; } } /* The last RBG which can be smaller than the RBG size is consedered * only for the first time allocation of TYPE0 UE */ dlSf->lstRbgDfct = 0; - RETVOID; + return; } #endif /** @@ -25247,24 +22438,14 @@ RgSchDlRbAlloc *allocInfo; * @return void **/ -#ifdef ANSI -PRIVATE void rgSCHCmnNonDlfsDsfrRntpComp -( -RgSchCellCb *cell, -RgSchDlSf *dlSf -) -#else -PRIVATE void rgSCHCmnNonDlfsDsfrRntpComp(cell, dlSf) -RgSchCellCb *cell; -RgSchDlSf *dlSf; -#endif +static void rgSCHCmnNonDlfsDsfrRntpComp(RgSchCellCb *cell,RgSchDlSf *dlSf) { - PRIVATE U16 samples = 0; - U16 i; - U16 bwBytes = (dlSf->bw-1)/8; + static uint16_t samples = 0; + uint16_t i; + uint16_t bwBytes = (dlSf->bw-1)/8; RgrLoadInfIndInfo *rgrLoadInf; - U16 len; - U16 ret = ROK; + uint16_t len; + uint16_t ret = ROK; len = (dlSf->bw % 8 == 0) ? dlSf->bw/8 : dlSf->bw/8 + 1; @@ -25284,9 +22465,9 @@ RgSchDlSf *dlSf; sizeof(RgrLoadInfIndInfo)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Could not " + DU_LOG("\nERROR --> SCH : Could not " "allocate memory for sending LoadInfo"); - RETVOID; + return; } rgrLoadInf->u.rntpInfo.pres = cell->rntpAggrInfo.pres; @@ -25304,7 +22485,7 @@ RgSchDlSf *dlSf; ret = rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf); if(ret == RFAILED) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsDsfrRntpComp():" + DU_LOG("\nERROR --> SCH : rgSCHCmnNonDlfsDsfrRntpComp():" "rgSCHUtlRgrLoadInfInd() returned RFAILED"); } @@ -25328,28 +22509,20 @@ RgSchDlSf *dlSf; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * @param[in] RgSchDlSf *dlSf - * @param[out] U8 *isDlBwAvail + * @param[out] uint8_t *isDlBwAvail * * @return S16 * -# ROK * -# RFAILED **/ #ifdef UNUSED_FUNC -#ifdef ANSI -PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc +static S16 rgSCHCmnSFRNonDlfsUeRbAlloc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlSf *dlSf, -U8 *isDlBwAvail +uint8_t *isDlBwAvail ) -#else -PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlSf *dlSf; -U8 *isDlBwAvail; -#endif { RgSchDlRbAlloc *allocInfo; RgSchCmnDlUe *dlUe; @@ -25403,7 +22576,7 @@ U8 *isDlBwAvail; allocInfo->allocInfo.raType2.isLocal = TRUE; /* rg004.201 patch - ccpu00109921 fix end */ /* MS_FIX for ccpu00123918*/ - allocInfo->allocInfo.raType2.rbStart = (U8)sfrpoolInfo->type2Start; + allocInfo->allocInfo.raType2.rbStart = (uint8_t)sfrpoolInfo->type2Start; allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq; /* rg007.201 - Changes for MIMO feature addition */ /* rg008.201 - Removed dependency on MIMO compile-time flag */ @@ -25451,32 +22624,24 @@ U8 *isDlBwAvail; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * @param[in] RgSchDlSf *dlSf - * @param[out] U8 *isDlBwAvail + * @param[out] uint8_t *isDlBwAvail * * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc +static S16 rgSCHCmnNonDlfsUeRbAlloc ( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlSf *dlSf, -U8 *isDlBwAvail +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchDlSf *dlSf, +uint8_t *isDlBwAvail ) -#else -PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlSf *dlSf; -U8 *isDlBwAvail; -#endif { RgSchDlRbAlloc *allocInfo; RgSchCmnDlUe *dlUe; #ifdef LAA_DBG - U32 dbgRbsReq = 0; + uint32_t dbgRbsReq = 0; #endif #ifdef RG_5GTF @@ -25489,10 +22654,9 @@ U8 *isDlBwAvail; if(beamInfo->totVrbgAllocated > MAX_5GTF_VRBG) { - RLOG_ARG1(L_ERROR ,DBG_CELLID,cell->cellId, - "5GTF_ERROR : vrbg allocated > 25 :ue (%u)", + DU_LOG("\nERROR --> SCH : 5GTF_ERROR : vrbg allocated > 25 :ue (%u)", ue->ueId); - printf("5GTF_ERROR vrbg allocated > 25\n"); + DU_LOG("\nERROR --> SCH : 5GTF_ERROR vrbg allocated > 25\n"); return RFAILED; } @@ -25509,10 +22673,9 @@ U8 *isDlBwAvail; { /* Returning ROK since PDCCH might be available for another UE and * further allocations could be done */ - RLOG_ARG1(L_ERROR ,DBG_CELLID,cell->cellId, - "5GTF_ERROR : PDCCH allocation failed :ue (%u)", + DU_LOG("\nERROR --> SCH : 5GTF_ERROR : PDCCH allocation failed :ue (%u)", ue->ueId); - printf("5GTF_ERROR PDCCH allocation failed\n"); + DU_LOG("\nERROR --> SCH : 5GTF_ERROR PDCCH allocation failed\n"); return RFAILED; } #ifdef RG_5GTF @@ -25556,23 +22719,16 @@ U8 *isDlBwAvail; * * @param[in] RgSchCellCb *cell * @param[in, out] RgSchCmnCcchSduRbAlloc *allocInfo - * @param[in] U8 isRetx + * @param[in] uint8_t isRetx * * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsCcchSduAlloc +static Void rgSCHCmnNonDlfsCcchSduAlloc ( RgSchCellCb *cell, RgSchCmnCcchSduRbAlloc *allocInfo, -U8 isRetx +uint8_t isRetx ) -#else -PRIVATE Void rgSCHCmnNonDlfsCcchSduAlloc(cell, allocInfo, isRetx) -RgSchCellCb *cell; -RgSchCmnCcchSduRbAlloc *allocInfo; -U8 isRetx; -#endif { S16 ret; CmLListCp *ccchSduLst = NULLP; @@ -25621,7 +22777,7 @@ U8 isRetx; cmLListAdd2Tail(nonSchdCcchSduLst, schdLnkNode); toBeSchdLnk = toBeSchdLnk->next; } while(toBeSchdLnk); - RETVOID; + return; } /* Allocation successful: Add UE to the scheduled list */ @@ -25629,7 +22785,7 @@ U8 isRetx; } - RETVOID; + return; } /** @@ -25650,19 +22806,12 @@ U8 isRetx; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsCcchSduRbAlloc +static S16 rgSCHCmnNonDlfsCcchSduRbAlloc ( RgSchCellCb *cell, RgSchUeCb *ueCb, RgSchDlSf *dlSf ) -#else -PRIVATE S16 rgSCHCmnNonDlfsCcchSduRbAlloc(cell, ueCb, dlSf) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -RgSchDlSf *dlSf; -#endif { RgSchDlRbAlloc *allocInfo; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); @@ -25708,7 +22857,7 @@ RgSchDlSf *dlSf; /*Fix for ccpu00123918*/ /* Push this harq process back to the free queue */ - allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start; + allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start; allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq; allocInfo->rbsAlloc = allocInfo->rbsReq; allocInfo->tbInfo[0].bytesAlloc = allocInfo->tbInfo[0].bytesReq; @@ -25756,19 +22905,12 @@ RgSchDlSf *dlSf; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsMsg4RbAlloc +static S16 rgSCHCmnNonDlfsMsg4RbAlloc ( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchDlSf *dlSf ) -#else -PRIVATE S16 rgSCHCmnNonDlfsMsg4RbAlloc(cell, raCb, dlSf) -RgSchCellCb *cell; -RgSchRaCb *raCb; -RgSchDlSf *dlSf; -#endif { RgSchDlRbAlloc *allocInfo; @@ -25779,10 +22921,9 @@ RgSchDlSf *dlSf; RgSchSfBeamInfo *beamInfo = &(dlSf->sfBeamInfo[0]); if(beamInfo->totVrbgAllocated > MAX_5GTF_VRBG) { - RLOG_ARG1(L_ERROR ,DBG_CELLID,cell->cellId, - "5GTF_ERROR : vrbg allocated > 25 :ue (%u)", + DU_LOG("\nERROR --> SCH : 5GTF_ERROR : vrbg allocated > 25 :ue (%u)", raCb->ue->ueId); - printf("5GTF_ERROR vrbg allocated > 25\n"); + DU_LOG("\nERROR --> SCH : 5GTF_ERROR vrbg allocated > 25\n"); return RFAILED; } #endif @@ -25824,7 +22965,7 @@ RgSchDlSf *dlSf; /*Fix for ccpu00123918*/ - allocInfo->allocInfo.raType2.rbStart = (U8)dlSf->type2Start; + allocInfo->allocInfo.raType2.rbStart = (uint8_t)dlSf->type2Start; allocInfo->allocInfo.raType2.numRb = allocInfo->rbsReq; /* LTE_ADV_FLAG_REMOVED_START */ #ifndef LTE_TDD @@ -25887,23 +23028,16 @@ RgSchDlSf *dlSf; * * @param[in] RgSchCellCb *cell * @param[in, out] RgSchCmnMsg4RbAlloc *allocInfo - * @param[in] U8 isRetx + * @param[in] uint8_t isRetx * * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc +static Void rgSCHCmnNonDlfsMsg4Alloc ( RgSchCellCb *cell, RgSchCmnMsg4RbAlloc *allocInfo, -U8 isRetx +uint8_t isRetx ) -#else -PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc(cell, allocInfo, isRetx) -RgSchCellCb *cell; -RgSchCmnMsg4RbAlloc *allocInfo; -U8 isRetx; -#endif { S16 ret; CmLListCp *msg4Lst = NULLP; @@ -25952,7 +23086,7 @@ U8 isRetx; cmLListAdd2Tail(nonSchdMsg4Lst, schdLnkNode); toBeSchdLnk = toBeSchdLnk->next; } while(toBeSchdLnk); - RETVOID; + return; } /* Allocation successful: Add UE to the scheduled list */ @@ -25963,7 +23097,7 @@ U8 isRetx; } - RETVOID; + return; } /** @@ -25987,7 +23121,6 @@ U8 isRetx; * * @return Void **/ -#ifdef ANSI Void rgSCHCmnNonDlfsDedRbAlloc ( RgSchCellCb *cell, @@ -25996,15 +23129,6 @@ CmLListCp *ueLst, CmLListCp *schdHqPLst, CmLListCp *nonSchdHqPLst ) -#else -Void rgSCHCmnNonDlfsDedRbAlloc(cell, allocInfo, ueLst, - schdHqPLst, nonSchdHqPLst) -RgSchCellCb *cell; -RgSchCmnUeRbAlloc *allocInfo; -CmLListCp *ueLst; -CmLListCp *schdHqPLst; -CmLListCp *nonSchdHqPLst; -#endif { S16 ret; CmLList *schdLnkNode = NULLP; @@ -26012,7 +23136,7 @@ CmLListCp *nonSchdHqPLst; RgSchDlSf *dlSf = allocInfo->dedDlSf; RgSchUeCb *ue = NULLP; RgSchDlHqProcCb *hqP = NULLP; - U8 isDlBwAvail; + uint8_t isDlBwAvail; /* Perform allocaations for the list */ @@ -26055,12 +23179,12 @@ CmLListCp *nonSchdHqPLst; cell->tenbStats->sch.dl5gtfRbAllocFail++; #endif /* Allocation failed : Add UE to the non-scheduled list */ - printf("5GTF_ERROR Dl rb alloc failed adding nonSchdHqPLst\n"); + DU_LOG("\nERROR --> SCH : 5GTF_ERROR Dl rb alloc failed adding nonSchdHqPLst\n"); cmLListAdd2Tail(nonSchdHqPLst, schdLnkNode); } } - RETVOID; + return; } /** @@ -26091,25 +23215,19 @@ CmLListCp *nonSchdHqPLst; * @return Void **/ -#ifdef ANSI Void rgSCHCmnNonDlfsRbAlloc ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) -#else -Void rgSCHCmnNonDlfsRbAlloc(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif { - U8 raRspCnt = 0; - RgSchDlRbAlloc *reqAllocInfo; + uint8_t raRspCnt = 0; + RgSchDlRbAlloc *reqAllocInfo; /* Allocate for MSG4 retransmissions */ if (allocInfo->msg4Alloc.msg4RetxLst.count) { - printf("5GTF_ERROR rgSCHCmnNonDlfsMsg4Alloc RetxLst\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR rgSCHCmnNonDlfsMsg4Alloc RetxLst\n"); rgSCHCmnNonDlfsMsg4Alloc(cell, &(allocInfo->msg4Alloc), TRUE); } @@ -26117,7 +23235,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* Assuming all the nodes in the list need allocations: rbsReq is valid */ if (allocInfo->msg4Alloc.msg4TxLst.count) { - printf("5GTF_ERROR rgSCHCmnNonDlfsMsg4Alloc txLst\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR rgSCHCmnNonDlfsMsg4Alloc txLst\n"); rgSCHCmnNonDlfsMsg4Alloc(cell, &(allocInfo->msg4Alloc), FALSE); } #ifdef RGR_V1 @@ -26125,7 +23243,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * retransmissions */ if (allocInfo->ccchSduAlloc.ccchSduRetxLst.count) { - printf("5GTF_ERROR rgSCHCmnNonDlfsCcchSduAlloc\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR rgSCHCmnNonDlfsCcchSduAlloc\n"); rgSCHCmnNonDlfsCcchSduAlloc(cell, &(allocInfo->ccchSduAlloc), TRUE); } @@ -26133,7 +23251,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* Allocate for CCCH SDU (received after guard timer expiry) transmissions */ if (allocInfo->ccchSduAlloc.ccchSduTxLst.count) { - printf("5GTF_ERROR rgSCHCmnNonDlfsCcchSduAlloc\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR rgSCHCmnNonDlfsCcchSduAlloc\n"); rgSCHCmnNonDlfsCcchSduAlloc(cell, &(allocInfo->ccchSduAlloc), FALSE); } #endif @@ -26147,7 +23265,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { break; } - printf("5GTF_ERROR calling RAR rgSCHCmnNonDlfsCmnRbAlloc\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR calling RAR rgSCHCmnNonDlfsCmnRbAlloc\n"); // if ((rgSCHCmnNonDlfsCmnRbAlloc(cell, reqAllocInfo)) != ROK) if ((rgSCHCmnNonDlfsCmnRbAllocRar(cell, reqAllocInfo)) != ROK) { @@ -26158,7 +23276,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* Allocate for RETX+TX UEs */ if(allocInfo->dedAlloc.txRetxHqPLst.count) { - printf("5GTF_ERROR TX RETX rgSCHCmnNonDlfsDedRbAlloc\n"); + DU_LOG("\nDEBUG --> SCH : 5GTF_ERROR TX RETX rgSCHCmnNonDlfsDedRbAlloc\n"); rgSCHCmnNonDlfsDedRbAlloc(cell, &(allocInfo->dedAlloc), &(allocInfo->dedAlloc.txRetxHqPLst), &(allocInfo->dedAlloc.schdTxRetxHqPLst), @@ -26189,17 +23307,17 @@ RgSchCmnDlRbAllocInfo *allocInfo; cmnCell->dl.maxUePerDlSf) { #ifndef ALIGN_64BIT - RGSCHDBGERRNEW(cell->instIdx,(rgSchPBuf(cell->instIdx),"UEs selected by" + DU_LOG("\nERROR --> SCH : UEs selected by" " scheduler exceed maximumUePerDlSf(%u)tx-retx %ld retx %ld tx %ld\n", cmnCell->dl.maxUePerDlSf, allocInfo->dedAlloc.txRetxHqPLst.count, allocInfo->dedAlloc.retxHqPLst.count, - allocInfo->dedAlloc.txHqPLst.count)); + allocInfo->dedAlloc.txHqPLst.count); #else - RGSCHDBGERRNEW(cell->instIdx,(rgSchPBuf(cell->instIdx),"UEs selected by" + DU_LOG("\nERROR --> SCH : UEs selected by" " scheduler exceed maximumUePerDlSf(%u)tx-retx %d retx %d tx %d\n", cmnCell->dl.maxUePerDlSf, allocInfo->dedAlloc.txRetxHqPLst.count, allocInfo->dedAlloc.retxHqPLst.count, - allocInfo->dedAlloc.txHqPLst.count)); + allocInfo->dedAlloc.txHqPLst.count); #endif } } @@ -26207,12 +23325,12 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* LTE_ADV_FLAG_REMOVED_START */ if(cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) { - printf("5GTF_ERROR RETX rgSCHCmnNonDlfsDsfrRntpComp\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR RETX rgSCHCmnNonDlfsDsfrRntpComp\n"); rgSCHCmnNonDlfsDsfrRntpComp(cell, allocInfo->dedAlloc.dedDlSf); } /* LTE_ADV_FLAG_REMOVED_END */ #endif /* LTE_TDD */ - RETVOID; + return; } /*********************************************************** @@ -26229,37 +23347,23 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **********************************************************/ #ifdef LTEMAC_SPS -#ifdef ANSI -U32 rgSCHCmnCalcRiv +uint32_t rgSCHCmnCalcRiv ( -U8 bw, -U8 rbStart, -U8 numRb +uint8_t bw, +uint8_t rbStart, +uint8_t numRb ) #else -U32 rgSCHCmnCalcRiv(bw, rbStart, numRb) -U8 bw; -U8 rbStart; -U8 numRb; -#endif -#else -#ifdef ANSI -U32 rgSCHCmnCalcRiv +uint32_t rgSCHCmnCalcRiv ( -U8 bw, -U8 rbStart, -U8 numRb +uint8_t bw, +uint8_t rbStart, +uint8_t numRb ) -#else -U32 rgSCHCmnCalcRiv(bw, rbStart, numRb) -U8 bw; -U8 rbStart; -U8 numRb; -#endif #endif { - U8 numRbMinus1 = numRb - 1; - U32 riv; + uint8_t numRbMinus1 = numRb - 1; + uint32_t riv; if (numRbMinus1 <= bw/2) @@ -26290,32 +23394,25 @@ U8 numRb; * * @param[in] RgSchCellCb* cell * @param[in] RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES] - * @param[in] U8 raArrSz + * @param[in] uint8_t raArrSz * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlCpyRachInfo +static S16 rgSCHCmnDlCpyRachInfo ( -RgSchCellCb *cell, -RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES], -U8 raArrSz +RgSchCellCb *cell, +RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES], +uint8_t raArrSz ) -#else -PRIVATE S16 rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz) -RgSchCellCb *cell; -RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES]; -U8 raArrSz; -#endif { - U8 ulDlCfgIdx = cell->ulDlCfgIdx; - U8 sfNum; - S16 sfnIdx; - U16 subfrmIdx; - U8 numRfs; - U8 numSubfrms; - U8 sfcount; - S16 ret; + uint8_t ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t sfNum; + S16 sfnIdx; + uint16_t subfrmIdx; + uint8_t numRfs; + uint8_t numSubfrms; + uint8_t sfcount; + S16 ret; /* Allocate RACH response information for each DL @@ -26394,53 +23491,32 @@ U8 raArrSz; * * @param[in] RgSchCellCb *cell * @param[in] RgSchCmnDlUe *ueDl - * @param[in] U8 cqi + * @param[in] uint8_t cqi * * @return S32 iTbs * **/ #ifdef LTE_TDD -#ifdef ANSI -PRIVATE S32 rgSchCmnFetchItbs +static S32 rgSchCmnFetchItbs ( -RgSchCellCb *cell, -RgSchCmnDlUe *ueDl, -RgSchDlSf *subFrm, -U8 cqi, -U8 cfi, -U8 cwIdx, -U8 noLyr +RgSchCellCb *cell, +RgSchCmnDlUe *ueDl, +RgSchDlSf *subFrm, +uint8_t cqi, +uint8_t cfi, +uint8_t cwIdx, +uint8_t noLyr ) #else -PRIVATE S32 rgSchCmnFetchItbs (cell, ueDl, subFrm, cqi, cfi, cwIdx, noLyr) -RgSchCellCb *cell; -RgSchCmnDlUe *ueDl; -RgSchDlSf *subFrm; -U8 cqi; -U8 cfi; -U8 cwIdx; -U8 noLyr; -#endif -#else -#ifdef ANSI -PRIVATE S32 rgSchCmnFetchItbs +static S32 rgSchCmnFetchItbs ( -RgSchCellCb *cell, -RgSchCmnDlUe *ueDl, -U8 cqi, -U8 cfi, -U8 cwIdx, -U8 noLyr +RgSchCellCb *cell, +RgSchCmnDlUe *ueDl, +uint8_t cqi, +uint8_t cfi, +uint8_t cwIdx, +uint8_t noLyr ) -#else -PRIVATE S32 rgSchCmnFetchItbs (cell, ueDl, cqi, cfi, cwIdx, noLyr) -RgSchCellCb *cell; -RgSchCmnDlUe *ueDl; -U8 cqi; -U8 cfi; -U8 cwIdx; -U8 noLyr; -#endif #endif { @@ -26505,38 +23581,27 @@ U8 noLyr; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRb1Tb1Cw +static Void rgSCHCmnDlAllocTxRb1Tb1Cw ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { RgSchDlRbAlloc *allocInfo; S16 ret; - U8 numRb; + uint8_t numRb; ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -26558,7 +23623,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (ret == RFAILED) { /* If allocation couldn't be made then return */ - RETVOID; + return; } /* Adding UE to RbAllocInfo TX Lst */ rgSCHCmnDlRbInfoAddUeTx(cell, cellWdAllocInfo, ue, proc); @@ -26569,7 +23634,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; allocInfo->vrbgReq = numRb/MAX_5GTF_VRBG_SIZE; #endif - RETVOID; + return; } @@ -26590,38 +23655,27 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRb1Tb1Cw +static Void rgSCHCmnDlAllocRetxRb1Tb1Cw ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { RgSchDlRbAlloc *allocInfo; S16 ret; - U8 numRb; + uint8_t numRb; ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -26643,7 +23697,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * to the nonSchdTxRetxUeLst and let spfc scheduler take care of it during * finalization. */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } rgSCHCmnDlRbInfoAddUeRetx(cell, cellWdAllocInfo, ue, proc); /* Fill UE alloc Info */ @@ -26653,7 +23707,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; allocInfo->vrbgReq = numRb/MAX_5GTF_VRBG_SIZE; #endif - RETVOID; + return; } @@ -26674,37 +23728,26 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM1 +static Void rgSCHCmnDlAllocTxRbTM1 ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); - RETVOID; + return; } @@ -26725,37 +23768,26 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM1 +static Void rgSCHCmnDlAllocRetxRbTM1 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); - RETVOID; + return; } @@ -26776,37 +23808,26 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM2 +static Void rgSCHCmnDlAllocTxRbTM2 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); - RETVOID; + return; } @@ -26827,37 +23848,26 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM2 +static Void rgSCHCmnDlAllocRetxRbTM2 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); - RETVOID; + return; } @@ -26878,34 +23888,23 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM3 +static Void rgSCHCmnDlAllocTxRbTM3 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { @@ -26913,7 +23912,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo,\ proc, cellWdAllocInfo); - RETVOID; + return; } @@ -26934,34 +23933,23 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM3 +static Void rgSCHCmnDlAllocRetxRbTM3 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { @@ -26969,7 +23957,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; (proc->tbInfo[1].state == HQ_TB_NACKED)) { #ifdef LAA_DBG_LOG - printf ("RETX RB TM3 nack for both hqp %d cell %d \n", proc->procId, proc->hqE->cell->cellId); + DU_LOG("\nDEBUG --> SCH : RETX RB TM3 nack for both hqp %d cell %d \n", proc->procId, proc->hqE->cell->cellId); #endif /* Both TBs require RETX allocation */ rgSCHCmnDlTM3RetxRetx(cell, subFrm, ue, bo, effBo,\ @@ -26983,7 +23971,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; proc, cellWdAllocInfo); } - RETVOID; + return; } @@ -27009,23 +23997,16 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[out] U8 *raType + * @param[out] uint8_t *raType * @return TfuDciFormat * **/ -#ifdef ANSI TfuDciFormat rgSCHCmnSlctPdcchFrmt ( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 *raType +RgSchCellCb *cell, +RgSchUeCb *ue, +uint8_t *raType ) -#else -TfuDciFormat rgSCHCmnSlctPdcchFrmt(cell, ue, raType) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 *raType; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -27068,42 +24049,31 @@ U8 *raType; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlTM3RetxRetx +static Void rgSCHCmnDlTM3RetxRetx ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlTM3RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { S16 ret; RgSchDlRbAlloc *allocInfo; - U8 numRb; + uint8_t numRb; Bool swpFlg; - U8 precInfo; - U8 noTxLyrs; - U8 precInfoAntIdx; + uint8_t precInfo; + uint8_t noTxLyrs; + uint8_t precInfoAntIdx; ret = ROK; @@ -27120,7 +24090,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; { /* Allocation couldn't be made for Retx */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } /* Fix for ccpu00123927: Retransmit 2 codewords irrespective of current rank */ noTxLyrs = proc->tbInfo[0].numLyrs + proc->tbInfo[1].numLyrs; @@ -27148,7 +24118,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \ precInfo, noTxLyrs, subFrm); - RETVOID; + return; } @@ -27178,44 +24148,33 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlTM4RetxRetx +static Void rgSCHCmnDlTM4RetxRetx ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlTM4RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { S16 ret; RgSchDlRbAlloc *allocInfo; - U8 numRb; + uint8_t numRb; Bool swpFlg = FALSE; - U8 precInfo; + uint8_t precInfo; #ifdef FOUR_TX_ANTENNA - U8 precInfoAntIdx; + uint8_t precInfoAntIdx; #endif - U8 noTxLyrs; + uint8_t noTxLyrs; ret = ROK; @@ -27231,7 +24190,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; { /* Allocation couldn't be made for Retx */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } noTxLyrs = proc->tbInfo[0].numLyrs + proc->tbInfo[1].numLyrs; precInfo = 0; @@ -27258,7 +24217,7 @@ precInfo = (getPrecInfoFunc[1][precInfoAntIdx])(cell, ue, noTxLyrs, TRUE); RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \ precInfo, noTxLyrs, subFrm); - RETVOID; + return; } @@ -27293,8 +24252,7 @@ precInfo = (getPrecInfoFunc[1][precInfoAntIdx])(cell, ue, noTxLyrs, TRUE); * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlSMGetAttrForTxRetx +static Void rgSCHCmnDlSMGetAttrForTxRetx ( RgSchUeCb *ue, RgSchDlHqProcCb *proc, @@ -27303,16 +24261,6 @@ RgSchDlHqTbCb **txTb, Bool *frthrScp, Bool *swpFlg ) -#else -PRIVATE Void rgSCHCmnDlSMGetAttrForTxRetx(ue, proc, retxTb, txTb, frthrScp,\ - swpFlg) -RgSchUeCb *ue; -RgSchDlHqProcCb *proc; -RgSchDlHqTbCb **retxTb; -RgSchDlHqTbCb **txTb; -Bool *frthrScp; -Bool *swpFlg; -#endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,proc->hqE->cell); RgSchDlRbAlloc *allocInfo; @@ -27352,7 +24300,7 @@ Bool *swpFlg; *frthrScp = allocInfo->mimoAllocInfo.hasNewTxData; } } - RETVOID; + return; } @@ -27367,26 +24315,18 @@ Bool *swpFlg; * Invoked by: rgSCHCmnDlGetAttrForTM3 * * @param[in] RgSchUeCb *ue - * @param[in] U8 numTxLyrs + * @param[in] uint8_t numTxLyrs * @param[in] Bool bothCwEnbld - * @return U8 + * @return uint8_t * **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnDlTM3PrecInf2 +static uint8_t rgSCHCmnDlTM3PrecInf2 ( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 numTxLyrs, -Bool bothCwEnbld +RgSchCellCb *cell, +RgSchUeCb *ue, +uint8_t numTxLyrs, +Bool bothCwEnbld ) -#else -PRIVATE U8 rgSCHCmnDlTM3PrecInf2(ue, numTxLyrs, bothCwEnbld) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 numTxLyrs; -Bool bothCwEnbld; -#endif { return (0); @@ -27405,29 +24345,21 @@ Bool bothCwEnbld; * Invoked by: rgSCHCmnDlGetAttrForTM4 * * @param[in] RgSchUeCb *ue - * @param[in] U8 numTxLyrs + * @param[in] uint8_t numTxLyrs * @param[in] Bool bothCwEnbld - * @return U8 + * @return uint8_t * **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnDlTM4PrecInf2 +static uint8_t rgSCHCmnDlTM4PrecInf2 ( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 numTxLyrs, -Bool bothCwEnbld +RgSchCellCb *cell, +RgSchUeCb *ue, +uint8_t numTxLyrs, +Bool bothCwEnbld ) -#else -PRIVATE U8 rgSCHCmnDlTM4PrecInf2(ue, numTxLyrs, bothCwEnbld) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 numTxLyrs; -Bool bothCwEnbld; -#endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - U8 precIdx; + uint8_t precIdx; if (ueDl->mimoInfo.ri == numTxLyrs) @@ -27493,28 +24425,20 @@ Bool bothCwEnbld; * Invoked by: rgSCHCmnDlGetAttrForTM3 * * @param[in] RgSchUeCb *ue - * @param[in] U8 numTxLyrs + * @param[in] uint8_t numTxLyrs * @param[in] Bool bothCwEnbld - * @return U8 + * @return uint8_t * **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnDlTM3PrecInf4 +static uint8_t rgSCHCmnDlTM3PrecInf4 ( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 numTxLyrs, -Bool bothCwEnbld +RgSchCellCb *cell, +RgSchUeCb *ue, +uint8_t numTxLyrs, +Bool bothCwEnbld ) -#else -PRIVATE U8 rgSCHCmnDlTM3PrecInf4(ue, numTxLyrs, bothCwEnbld) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 numTxLyrs; -Bool bothCwEnbld; -#endif { - U8 precIdx; + uint8_t precIdx; if (bothCwEnbld) @@ -27541,29 +24465,21 @@ Bool bothCwEnbld; * Invoked by: rgSCHCmnDlGetAttrForTM4 * * @param[in] RgSchUeCb *ue - * @param[in] U8 numTxLyrs + * @param[in] uint8_t numTxLyrs * @param[in] Bool bothCwEnbld - * @return U8 + * @return uint8_t * **/ -#ifdef ANSI -PRIVATE U8 rgSCHCmnDlTM4PrecInf4 +static uint8_t rgSCHCmnDlTM4PrecInf4 ( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 numTxLyrs, -Bool bothCwEnbld +RgSchCellCb *cell, +RgSchUeCb *ue, +uint8_t numTxLyrs, +Bool bothCwEnbld ) -#else -PRIVATE U8 rgSCHCmnDlTM4PrecInf4(cell, ue, numTxLyrs, bothCwEnbld) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 numTxLyrs; -Bool bothCwEnbld; -#endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - U8 precInfoBaseIdx, precIdx; + uint8_t precInfoBaseIdx, precIdx; precInfoBaseIdx = (ue->mimoInfo.puschFdbkVld)? (16): @@ -27608,46 +24524,30 @@ Bool bothCwEnbld; * * @param[in] RgSchUeCb *ue * @param[in] RgSchDlHqProcCb *proc - * @param[out] U8 *numTxLyrs + * @param[out] uint8_t *numTxLyrs * @param[out] Bool *isTraDiv - * @param[out] U8 *prcdngInf - * @param[out] U8 *raType + * @param[out] uint8_t *prcdngInf + * @param[out] uint8_t *raType * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlGetAttrForTM3 +static Void rgSCHCmnDlGetAttrForTM3 ( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlHqProcCb *proc, -U8 *numTxLyrs, -TfuDciFormat *dciFrmt, -U8 *prcdngInf, -RgSchDlHqTbCb **retxTb, -RgSchDlHqTbCb **txTb, -Bool *frthrScp, -Bool *swpFlg, -U8 *raType +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchDlHqProcCb *proc, +uint8_t *numTxLyrs, +TfuDciFormat *dciFrmt, +uint8_t *prcdngInf, +RgSchDlHqTbCb **retxTb, +RgSchDlHqTbCb **txTb, +Bool *frthrScp, +Bool *swpFlg, +uint8_t *raType ) -#else -PRIVATE Void rgSCHCmnDlGetAttrForTM3(cell, ue, proc, numTxLyrs, dciFrmt,\ - prcdngInf, retxTb, txTb, frthrScp, swpFlg, raType) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlHqProcCb *proc; -U8 *numTxLyrs; -TfuDciFormat *dciFrmt; -U8 *prcdngInf; -RgSchDlHqTbCb **retxTb; -RgSchDlHqTbCb **txTb; -Bool *frthrScp; -Bool *swpFlg; -U8 *raType; -#endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - U8 precInfoAntIdx; + uint8_t precInfoAntIdx; /* Avoiding Tx-Retx for LAA cell as firstSchedTime is associated with @@ -27684,7 +24584,7 @@ U8 *raType; *numTxLyrs = 1; *frthrScp = FALSE; *prcdngInf = 0; - RETVOID; + return; } /* Determine the 2 TB transmission attributes */ @@ -27741,7 +24641,7 @@ U8 *raType; *raType = RG_SCH_CMN_RA_TYPE0; } *prcdngInf = 0; - RETVOID; + return; } else /* NumAntPorts == 4 */ { @@ -27754,7 +24654,7 @@ U8 *raType; *raType = RG_SCH_CMN_RA_TYPE0; precInfoAntIdx = cell->numTxAntPorts/2 - 1; *prcdngInf = (getPrecInfoFunc[0][precInfoAntIdx])(cell, ue, *numTxLyrs, *frthrScp); - RETVOID; + return; } else { @@ -27771,12 +24671,12 @@ U8 *raType; *raType = RG_SCH_CMN_RA_TYPE0; } *prcdngInf = 0; - RETVOID; + return; } } } - RETVOID; + return; } @@ -27808,46 +24708,30 @@ U8 *raType; * * @param[in] RgSchUeCb *ue * @param[in] RgSchDlHqProcCb *proc - * @param[out] U8 *numTxLyrs + * @param[out] uint8_t *numTxLyrs * @param[out] Bool *isTraDiv - * @param[out] U8 *prcdngInf - * @param[out] U8 *raType + * @param[out] uint8_t *prcdngInf + * @param[out] uint8_t *raType * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlGetAttrForTM4 +static Void rgSCHCmnDlGetAttrForTM4 ( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlHqProcCb *proc, -U8 *numTxLyrs, -TfuDciFormat *dciFrmt, -U8 *prcdngInf, -RgSchDlHqTbCb **retxTb, -RgSchDlHqTbCb **txTb, -Bool *frthrScp, -Bool *swpFlg, -U8 *raType +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchDlHqProcCb *proc, +uint8_t *numTxLyrs, +TfuDciFormat *dciFrmt, +uint8_t *prcdngInf, +RgSchDlHqTbCb **retxTb, +RgSchDlHqTbCb **txTb, +Bool *frthrScp, +Bool *swpFlg, +uint8_t *raType ) -#else -PRIVATE Void rgSCHCmnDlGetAttrForTM4(cell, ue, proc, numTxLyrs, dciFrmt,\ - prcdngInf, retxTb, txTb, frthrScp, swpFlg, raType) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlHqProcCb *proc; -U8 *numTxLyrs; -TfuDciFormat *dciFrmt; -U8 *prcdngInf; -RgSchDlHqTbCb **retxTb; -RgSchDlHqTbCb **txTb; -Bool *frthrScp; -Bool *swpFlg; -U8 *raType; -#endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - U8 precInfoAntIdx; + uint8_t precInfoAntIdx; *frthrScp = FALSE; @@ -27883,7 +24767,7 @@ U8 *raType; *numTxLyrs = 1; *frthrScp = FALSE; *prcdngInf = 0; - RETVOID; + return; } if (ueDl->mimoInfo.ri == 1) @@ -27903,7 +24787,7 @@ U8 *raType; *raType = RG_SCH_CMN_RA_TYPE0; *frthrScp = FALSE; *prcdngInf = 0; /*When RI= 1*/ - RETVOID; + return; } /* Determine the 2 TB transmission attributes */ @@ -27935,7 +24819,7 @@ U8 *raType; *numTxLyrs = 1; *prcdngInf = (getPrecInfoFunc[1][cell->numTxAntPorts/2 - 1])\ (cell, ue, *numTxLyrs, *frthrScp); - RETVOID; + return; } else /* NumAntPorts == 4 */ { @@ -27947,7 +24831,7 @@ U8 *raType; precInfoAntIdx = cell->numTxAntPorts/2 - 1; *prcdngInf = (getPrecInfoFunc[1][precInfoAntIdx])\ (cell, ue, *numTxLyrs, *frthrScp); - RETVOID; + return; } else { @@ -27957,12 +24841,12 @@ U8 *raType; precInfoAntIdx = cell->numTxAntPorts/2 - 1; *prcdngInf = (getPrecInfoFunc[1][precInfoAntIdx])\ (cell, ue, *numTxLyrs, *frthrScp); - RETVOID; + return; } } } - RETVOID; + return; } @@ -27990,43 +24874,32 @@ U8 *raType; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlTM3TxRetx +static Void rgSCHCmnDlTM3TxRetx ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlTM3TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { S16 ret; RgSchDlRbAlloc *allocInfo; - U8 numRb; + uint8_t numRb; RgSchDlHqTbCb *retxTb, *txTb; Bool frthrScp; Bool swpFlg; - U8 prcdngInf; - U8 numTxLyrs; + uint8_t prcdngInf; + uint8_t numTxLyrs; frthrScp = FALSE; @@ -28042,7 +24915,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (frthrScp) { #ifdef LAA_DBG_LOG - printf ("TX RETX called from proc %d cell %d \n",proc->procId, cell->cellId); + DU_LOG("\nDEBUG --> SCH : TX RETX called from proc %d cell %d \n",proc->procId, cell->cellId); #endif ret = rgSCHCmnDlAlloc2CwTxRetxRb(cell, subFrm, ue, retxTb, txTb,\ &numRb, effBo); @@ -28050,7 +24923,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; { /* Allocation couldn't be made for Retx */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } /* Adding UE to RbAllocInfo RETX-TX Lst */ rgSCHCmnDlRbInfoAddUeRetxTx(cell, cellWdAllocInfo, ue, proc); @@ -28063,7 +24936,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; { /* Allocation couldn't be made for Retx */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } #ifdef LTEMAC_SPS if (!RG_SCH_CMN_SPS_DL_IS_SPS_HQP(proc)) @@ -28076,7 +24949,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \ prcdngInf, numTxLyrs, subFrm); - RETVOID; + return; } @@ -28104,43 +24977,32 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlTM4TxRetx +static Void rgSCHCmnDlTM4TxRetx ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlTM4TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { S16 ret; RgSchDlRbAlloc *allocInfo; - U8 numRb; + uint8_t numRb; RgSchDlHqTbCb *retxTb, *txTb; Bool frthrScp; Bool swpFlg; - U8 prcdngInf; - U8 numTxLyrs; + uint8_t prcdngInf; + uint8_t numTxLyrs; ret = ROK; @@ -28162,7 +25024,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * with the proc to the nonSchdTxRetxUeLst and let spfc scheduler * take care of it during finalization. */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } /* Adding UE to RbAllocInfo RETX-TX Lst */ rgSCHCmnDlRbInfoAddUeRetxTx(cell, cellWdAllocInfo, ue, proc); @@ -28175,7 +25037,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; { /* Allocation couldn't be made for Retx */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } #ifdef LTEMAC_SPS if (!RG_SCH_CMN_SPS_DL_IS_SPS_HQP(proc)) @@ -28188,7 +25050,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, swpFlg, \ prcdngInf, numTxLyrs, subFrm) - RETVOID; + return; } @@ -28221,42 +25083,31 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlTM3TxTx +static Void rgSCHCmnDlTM3TxTx ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { RgSchCmnDlUe *ueDl; RgSchDlRbAlloc *allocInfo; - U8 numRb; - U8 noTxLyrs; - U8 precInfo; + uint8_t numRb; + uint8_t noTxLyrs; + uint8_t precInfo; S16 ret; - U8 precInfoAntIdx; + uint8_t precInfoAntIdx; ret = ROK; @@ -28283,7 +25134,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (ret == RFAILED) { /* If allocation couldn't be made then return */ - RETVOID; + return; } noTxLyrs = 1; precInfo = 0; /* TD */ @@ -28298,7 +25149,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (ret == RFAILED) { /* If allocation couldn't be made then return */ - RETVOID; + return; } noTxLyrs = ueDl->mimoInfo.ri; precInfoAntIdx = cell->numTxAntPorts/2 - 1; @@ -28317,7 +25168,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, FALSE, \ precInfo, noTxLyrs, subFrm); - RETVOID; + return; } @@ -28354,41 +25205,30 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlTM4TxTx +static Void rgSCHCmnDlTM4TxTx ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { RgSchCmnDlUe *ueDl; RgSchDlRbAlloc *allocInfo; - U8 numRb; - U8 precInfo; - U8 noTxLyrs; - U8 precInfoAntIdx; + uint8_t numRb; + uint8_t precInfo; + uint8_t noTxLyrs; + uint8_t precInfoAntIdx; S16 ret; @@ -28417,7 +25257,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (ret == RFAILED) { /* If allocation couldn't be made then return */ - RETVOID; + return; } noTxLyrs = 1; precInfo = 0; /* TD */ @@ -28435,7 +25275,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (ret == RFAILED) { /* If allocation couldn't be made then return */ - RETVOID; + return; } noTxLyrs = 1; precInfo = 0; /* PrecInfo as 0 for RI=1*/ @@ -28447,7 +25287,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (ret == RFAILED) { /* If allocation couldn't be made then return */ - RETVOID; + return; } noTxLyrs = ueDl->mimoInfo.ri; precInfoAntIdx = cell->numTxAntPorts/2 - 1; @@ -28468,7 +25308,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RG_SCH_CMN_FILL_DL_TXINFO(allocInfo, numRb, FALSE, \ precInfo, noTxLyrs, subFrm); - RETVOID; + return; } @@ -28490,41 +25330,30 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM4 +static Void rgSCHCmnDlAllocTxRbTM4 ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { /* Both TBs free for TX allocation */ rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo,\ proc, cellWdAllocInfo); - RETVOID; + return; } @@ -28546,34 +25375,23 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM4 +static Void rgSCHCmnDlAllocRetxRbTM4 ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { if ((proc->tbInfo[0].state == HQ_TB_NACKED) && @@ -28591,7 +25409,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; proc, cellWdAllocInfo); } - RETVOID; + return; } #ifdef RG_UNUSED @@ -28613,39 +25431,28 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM5 +static Void rgSCHCmnDlAllocTxRbTM5 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { #if (ERRCLASS & ERRCLS_DEBUG) - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Invalid TM 5 for CRNTI:%d",ue->ueId); #endif - RETVOID; + return; } @@ -28666,39 +25473,28 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM5 +static Void rgSCHCmnDlAllocRetxRbTM5 ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -U32 bo, -U32 *effBo, -RgSchDlHqProcCb *proc, -RgSchCmnDlRbAllocInfo *cellWdAllocInfo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +uint32_t bo, +uint32_t *effBo, +RgSchDlHqProcCb *proc, +RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { #if (ERRCLASS & ERRCLS_DEBUG) - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Invalid TM 5 for CRNTI:%d",ue->ueId); #endif - RETVOID; + return; } #endif @@ -28720,39 +25516,28 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM6 +static Void rgSCHCmnDlAllocTxRbTM6 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { RgSchDlRbAlloc *allocInfo; RgSchCmnDlUe *ueDl; S16 ret; - U8 numRb; + uint8_t numRb; ret = ROK; @@ -28780,7 +25565,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; if (ret == RFAILED) { /* If allocation couldn't be made then return */ - RETVOID; + return; } #ifdef LTEMAC_SPS @@ -28793,7 +25578,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; /* Fill UE alloc Info */ allocInfo->rbsReq = numRb; allocInfo->dlSf = subFrm; - RETVOID; + return; } @@ -28814,39 +25599,28 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM6 +static Void rgSCHCmnDlAllocRetxRbTM6 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { RgSchDlRbAlloc *allocInfo; RgSchCmnDlUe *ueDl; S16 ret; - U8 numRb; + uint8_t numRb; ret = ROK; @@ -28878,14 +25652,14 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; { /* Allocation couldn't be made for Retx */ rgSCHCmnDlAdd2NonSchdRetxLst(cellWdAllocInfo, ue, proc); - RETVOID; + return; } /* Adding UE to allocInfo RETX Lst */ rgSCHCmnDlRbInfoAddUeRetx(cell, cellWdAllocInfo, ue, proc); /* Fill UE alloc Info */ allocInfo->rbsReq = numRb; allocInfo->dlSf = subFrm; - RETVOID; + return; } @@ -28906,37 +25680,26 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM7 +static Void rgSCHCmnDlAllocTxRbTM7 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocTxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); - RETVOID; + return; } @@ -28957,37 +25720,26 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM7 +static Void rgSCHCmnDlAllocRetxRbTM7 ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); - RETVOID; + return; } @@ -29005,37 +25757,26 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return S16 * **/ -#ifdef ANSI S16 rgSCHCmnDlAllocTxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -S16 rgSCHCmnDlAllocTxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif -{ - U32 newSchBits = 0; - U32 prevSchBits = 0; +{ + uint32_t newSchBits = 0; + uint32_t prevSchBits = 0; RgSchDlRbAlloc *allocInfo; @@ -29101,19 +25842,12 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @return Bool * **/ -#ifdef ANSI Bool rgSCHCmnRetxAvoidTdd ( RgSchDlSf *curSf, RgSchCellCb *cell, RgSchDlHqProcCb *proc ) -#else -Bool rgSCHCmnRetxAvoidTdd(curSf, cell, proc) -RgSchDlSf *curSf; -RgSchCellCb *cell; -RgSchDlHqProcCb *proc; -#endif { RgSchTddSfType txSfType = 0; @@ -29181,21 +25915,14 @@ RgSchDlHqProcCb *proc; * @return Bool * **/ -#ifdef ANSI Bool rgSCHCmnRetxAllocAvoid ( RgSchDlSf *subFrm, RgSchCellCb *cell, RgSchDlHqProcCb *proc ) -#else -Bool rgSCHCmnRetxAllocAvoid(subFrm, cell, proc) -RgSchDlSf *subFrm; -RgSchCellCb *cell; -RgSchDlHqProcCb *proc; -#endif { - U8 reqRbs; + uint8_t reqRbs; if (proc->tbInfo[0].state == HQ_TB_NACKED) @@ -29237,36 +25964,25 @@ RgSchDlHqProcCb *proc; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint32_t *effBo * @param[in] RgSchDlHqProcCb *proc * @param[out] RgSchCmnDlRbAllocInfo *cellWdAllocInfo * @return S16 * **/ -#ifdef ANSI S16 rgSCHCmnDlAllocRetxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, -U32 bo, -U32 *effBo, +uint32_t bo, +uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) -#else -S16 rgSCHCmnDlAllocRetxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -U32 bo; -U32 *effBo; -RgSchDlHqProcCb *proc; -RgSchCmnDlRbAllocInfo *cellWdAllocInfo; -#endif { - U32 newSchBits = 0; + uint32_t newSchBits = 0; RgSchDlRbAlloc *allocInfo; @@ -29324,44 +26040,33 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue * @param[in] RgSchDlHqTbCb *tbInfo - * @param[in] U32 bo - * @param[out] U8 *numRb - * @param[out] U32 *effBo + * @param[in] uint32_t bo + * @param[out] uint8_t *numRb + * @param[out] uint32_t *effBo * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb +static S16 rgSCHCmnDlAlloc1CwTxRb ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -RgSchDlHqTbCb *tbInfo, -U32 bo, -U8 *numRb, -U32 *effBo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +RgSchDlHqTbCb *tbInfo, +uint32_t bo, +uint8_t *numRb, +uint32_t *effBo ) -#else -PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb(cell, subFrm, ue, tbInfo, bo, numRb, effBo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -RgSchDlHqTbCb *tbInfo; -U32 bo; -U8 *numRb; -U32 *effBo; -#endif -{ - U32 tbSz; - U8 imcs; - U8 iTbs; - RgSchCmnDlUe *ueDl; - RgSchDlRbAlloc *allocInfo; - U32 oldReq; - U32 reqBytes; +{ + uint32_t tbSz; + uint8_t imcs; + uint8_t iTbs; + RgSchCmnDlUe *ueDl; + RgSchDlRbAlloc *allocInfo; + uint32_t oldReq; + uint32_t reqBytes; /* Correcting wrap around issue. * This change has been done at mutliple places in this function.*/ - U32 tempNumRb; + uint32_t tempNumRb; reqBytes = bo; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -29397,7 +26102,7 @@ U32 *effBo; RG_SCH_CMN_FILL_DL_TBINFO(&allocInfo->tbInfo[0], tbSz, \ iTbs, imcs, tbInfo, ue->ue5gtfCb.rank); - *numRb = (U8) tempNumRb; + *numRb = (uint8_t) tempNumRb; /* Update the subframe Allocated BW field */ subFrm->bwAssigned = subFrm->bwAssigned + tempNumRb - allocInfo->rbsReq; @@ -29422,30 +26127,23 @@ U32 *effBo; * of specific scheduler. * * @param[in] RgSchDlRbAlloc *allocInfo - * @param[in] U8 tbInfoIdx - * @param[in] U32 cnsmdBytes + * @param[in] uint8_t tbInfoIdx + * @param[in] uint32_t cnsmdBytes * @return Void * **/ -#ifdef ANSI Void rgSCHCmnRdcImcsTxTb ( RgSchDlRbAlloc *allocInfo, -U8 tbInfoIdx, -U32 cnsmdBytes +uint8_t tbInfoIdx, +uint32_t cnsmdBytes ) -#else -Void rgSCHCmnRdcImcsTxTb(allocInfo, tbInfoIdx, cnsmdBytes) -RgSchDlRbAlloc *allocInfo; -U8 tbInfoIdx; -U32 cnsmdBytes; -#endif { - RETVOID; + return; /*The below functionality is not needed.*/ - U8 noLyr; - U8 iTbs; - U16 numRb; + uint8_t noLyr; + uint8_t iTbs; + uint16_t numRb; iTbs = allocInfo->tbInfo[tbInfoIdx].iTbs; @@ -29455,7 +26153,7 @@ U32 cnsmdBytes; { if ((rgTbSzTbl[noLyr-1][iTbs][numRb-1]/8) == cnsmdBytes) { - RETVOID; + return; } } /* Get iTbs as suitable for the consumed bytes */ @@ -29465,14 +26163,14 @@ U32 cnsmdBytes; { RG_SCH_CMN_DL_TBS_TO_MCS(iTbs, allocInfo->tbInfo[tbInfoIdx].\ tbCb->dlGrnt.iMcs); - RETVOID; + return; } iTbs--; } iTbs++; RG_SCH_CMN_DL_TBS_TO_MCS(iTbs, allocInfo->tbInfo[tbInfoIdx].tbCb->dlGrnt.iMcs); - RETVOID; + return; } @@ -29496,52 +26194,41 @@ U32 cnsmdBytes; * @param[in] RgSchUeCb *ue * @param[in] RgSchDlHqProcCb *proc * @param[in] RgSchDlHqProcCb bo - * @param[out] U8 *numRb - * @param[out] U32 *effBo + * @param[out] uint8_t *numRb + * @param[out] uint32_t *effBo * @return Void * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb +static S16 rgSCHCmnDlAlloc2CwTxRb ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -RgSchDlHqProcCb *proc, -U32 bo, -U8 *numRbRef, -U32 *effBo -) -#else -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb(cell, subFrm, ue, proc, bo, numRbRef, effBo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -RgSchDlHqProcCb *proc; -U32 bo; -U8 *numRbRef; -U32 *effBo; -#endif -{ - U32 noRes; - U32 eff1, eff2; - U32 tb1Sz, tb2Sz; - U8 imcs1, imcs2; - U8 noLyr1, noLyr2; - U8 iTbs1, iTbs2; - RgSchCmnDlCell *cellDl; - RgSchCmnDlUe *ueDl; - RgSchDlRbAlloc *allocInfo; - U32 oldReq; - U32 reqBytes; +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +RgSchDlHqProcCb *proc, +uint32_t bo, +uint8_t *numRbRef, +uint32_t *effBo +) +{ + uint32_t noRes; + uint32_t eff1, eff2; + uint32_t tb1Sz, tb2Sz; + uint8_t imcs1, imcs2; + uint8_t noLyr1, noLyr2; + uint8_t iTbs1, iTbs2; + RgSchCmnDlCell *cellDl; + RgSchCmnDlUe *ueDl; + RgSchDlRbAlloc *allocInfo; + uint32_t oldReq; + uint32_t reqBytes; /* Fix: MUE_PERTTI_DL */ - U32 numRb; - RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U8 cfi = cellSch->dl.currCfi; - S16 availBw; - U32 availBits = 0; + uint32_t numRb; + RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); + uint8_t cfi = cellSch->dl.currCfi; + S16 availBw; + uint32_t availBits = 0; #ifdef LTE_ADV - U32 boTmp = bo; + uint32_t boTmp = bo; #endif @@ -29562,8 +26249,7 @@ U32 *effBo; (allocInfo->tbInfo[1].bytesReq >= ueDl->maxTbSz/8) || (allocInfo->rbsReq >= ueDl->maxRb)) { - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHCmnDlAllocRb(): UEs max allocation exceed"); + DU_LOG("\nDEBUG --> SCH : rgSCHCmnDlAllocRb(): UEs max allocation exceed"); return RFAILED; } @@ -29579,18 +26265,18 @@ U32 *effBo; } else { - U8 cqi = ueDl->mimoInfo.cwInfo[0].cqi; + uint8_t cqi = ueDl->mimoInfo.cwInfo[0].cqi; #ifdef LTE_TDD - iTbs1 = (U8) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 0, noLyr1); + iTbs1 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 0, noLyr1); #else - iTbs1 = (U8) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 0, noLyr1); + iTbs1 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 0, noLyr1); #endif cqi = ueDl->mimoInfo.cwInfo[1].cqi; #ifdef LTE_TDD - iTbs2 = (U8) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 1, noLyr2); + iTbs2 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, subFrm, cqi, cfi, 1, noLyr2); #else - iTbs2 = (U8) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 1, noLyr2); + iTbs2 = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, cqi, cfi, 1, noLyr2); #endif } @@ -29700,7 +26386,7 @@ U32 *effBo; if(subFrm->sfType == RG_SCH_SPL_SF_DATA) { /* Max Rb for Special Sf is approximated as 4/3 of maxRb */ - rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, (U8*)&numRb, ueDl->maxRb*4/3, + rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, (uint8_t*)&numRb, ueDl->maxRb*4/3, &iTbs1, &iTbs2, noLyr1, noLyr2, &tb1Sz, &tb2Sz, cfi); /* Check for available Bw */ @@ -29732,7 +26418,7 @@ U32 *effBo; iTbs1, imcs1, &proc->tbInfo[0], noLyr1); RG_SCH_CMN_FILL_DL_TBINFO(&allocInfo->tbInfo[1], tb2Sz, \ iTbs2, imcs2, &proc->tbInfo[1], noLyr2); - *numRbRef = (U8)numRb; + *numRbRef = (uint8_t)numRb; return ROK; @@ -29759,44 +26445,32 @@ U32 *effBo; * @param[in] RgSchUeCb *ue * @param[in] RgSchDlHqTbCb *reTxTb * @param[in] RgSchDlHqTbCb *txTb - * @param[out] U8 *numRb - * @param[out] U32 *effBo + * @param[out] uint8_t *numRb + * @param[out] uint32_t *effBo * @return Void * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRetxRb +static S16 rgSCHCmnDlAlloc2CwTxRetxRb ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -RgSchDlHqTbCb *reTxTb, -RgSchDlHqTbCb *txTb, -U8 *numRb, -U32 *effBo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +RgSchDlHqTbCb *reTxTb, +RgSchDlHqTbCb *txTb, +uint8_t *numRb, +uint32_t *effBo ) -#else -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRetxRb(cell, subFrm, ue, reTxTb, txTb, numRb,\ - effBo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -RgSchDlHqTbCb *reTxTb; -RgSchDlHqTbCb *txTb; -U8 *numRb; -U32 *effBo; -#endif { RgSchCmnDlUe *ueDl; RgSchDlRbAlloc *allocInfo; - U8 imcs1, imcs2; - U8 noLyr2; - U16 tb2Sz; + uint8_t imcs1, imcs2; + uint8_t noLyr2; + uint16_t tb2Sz; RgSchCmnDlUeCwInfo *otherCw; S16 availBw; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - U8 cfi = cellDl->currCfi; - U8 iTbs; + uint8_t cfi = cellDl->currCfi; + uint8_t iTbs; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -29818,7 +26492,7 @@ U32 *effBo; if(*numRb <= 3) { - RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb); + DU_LOG("\nERROR --> SCH : Number of RBs [%d] are less than or equal to 3",*numRb); return RFAILED; } } @@ -29842,10 +26516,10 @@ U32 *effBo; else { #ifdef LTE_TDD - iTbs = (U8) rgSchCmnFetchItbs(cell, ueDl, subFrm, otherCw->cqi, cfi, + iTbs = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, subFrm, otherCw->cqi, cfi, !(ueDl->mimoInfo.btrCwIdx), noLyr2); #else - iTbs = (U8) rgSchCmnFetchItbs(cell, ueDl, otherCw->cqi, cfi, + iTbs = (uint8_t) rgSchCmnFetchItbs(cell, ueDl, otherCw->cqi, cfi, !(ueDl->mimoInfo.btrCwIdx), noLyr2); #endif } @@ -29887,39 +26561,27 @@ U32 *effBo; * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue * @param[in] RgSchDlHqProcCb *proc - * @param[out] U8 *numRb + * @param[out] uint8_t *numRb * @param[out] Bool *swpFlg - * @param[out] U32 *effBo + * @param[out] uint32_t *effBo * @return Void * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb +static S16 rgSCHCmnDlAlloc2CwRetxRb ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -RgSchDlHqProcCb *proc, -U8 *numRb, -Bool *swpFlg, -U32 *effBo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +RgSchDlHqProcCb *proc, +uint8_t *numRb, +Bool *swpFlg, +uint32_t *effBo ) -#else -PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb(cell, subFrm, ue, proc,\ - numRb, swpFlg, effBo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -RgSchDlHqProcCb *proc; -U8 *numRb; -Bool *swpFlg; -U32 *effBo; -#endif { - RgSchDlRbAlloc *allocInfo; - U8 imcs1; - U8 imcs2; - RgSchDlHqTbCb *lrgTbInfo, *othrTbInfo; + RgSchDlRbAlloc *allocInfo; + uint8_t imcs1; + uint8_t imcs2; + RgSchDlHqTbCb *lrgTbInfo, *othrTbInfo; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -29950,7 +26612,7 @@ U32 *effBo; if(*numRb <= 3) { - RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb); + DU_LOG("\nERROR --> SCH : Number of RBs [%d] are less than or equal to 3",*numRb); return RFAILED; } } @@ -29992,37 +26654,25 @@ U32 *effBo; * @param[in] RgSchDlSf *subFrm * @param[in] RgSchUeCb *ue * @param[in] RgSchDlHqTbCb *tbInfo - * @param[in] U8 noLyr - * @param[out] U8 *numRb - * @param[out] U32 *effBo + * @param[in] uint8_t noLyr + * @param[out] uint8_t *numRb + * @param[out] uint32_t *effBo * @return S16 * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc1CwRetxRb +static S16 rgSCHCmnDlAlloc1CwRetxRb ( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -RgSchUeCb *ue, -RgSchDlHqTbCb *tbInfo, -U8 noLyr, -U8 *numRb, -U32 *effBo +RgSchCellCb *cell, +RgSchDlSf *subFrm, +RgSchUeCb *ue, +RgSchDlHqTbCb *tbInfo, +uint8_t noLyr, +uint8_t *numRb, +uint32_t *effBo ) -#else -PRIVATE S16 rgSCHCmnDlAlloc1CwRetxRb(cell, subFrm, ue, tbInfo, noLyr,\ - numRb, effBo) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -RgSchUeCb *ue; -RgSchDlHqTbCb *tbInfo; -U8 noLyr; -U8 *numRb; -U32 *effBo; -#endif { RgSchDlRbAlloc *allocInfo; - U8 imcs; + uint8_t imcs; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -30066,23 +26716,16 @@ U32 *effBo; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnDlRelPdcchFbk ( RgSchCellCb *cell, RgSchUeCb *ue, Bool isAck ) -#else -Void rgSCHCmnDlRelPdcchFbk(cell, ue, isAck) -RgSchCellCb *cell; -RgSchUeCb *ue; -Bool isAck; -#endif { rgSCHCmnSpsDlRelPdcchFbk(cell, ue, isAck); - RETVOID; + return; } @@ -30102,17 +26745,11 @@ Bool isAck; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnDlProcAck ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) -#else -Void rgSCHCmnDlProcAck(cell, hqP) -RgSchCellCb *cell; -RgSchDlHqProcCb *hqP; -#endif { @@ -30121,10 +26758,10 @@ RgSchDlHqProcCb *hqP; /* Invoke SPS module if SPS service was scheduled for this HARQ proc */ rgSCHCmnSpsDlProcAck(cell, hqP); } - RETVOID; + return; } #ifdef RGSCH_SPS_STATS -extern U32 rgSchStatCrntiCeRcvCnt; +uint32_t rgSchStatCrntiCeRcvCnt; #endif /** * @brief This function is invoked to handle CRNTI CE reception for an UE @@ -30141,17 +26778,11 @@ extern U32 rgSchStatCrntiCeRcvCnt; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnHdlCrntiCE ( RgSchCellCb *cell, RgSchUeCb *ue ) -#else -Void rgSCHCmnHdlCrntiCE(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif { #ifdef RGSCH_SPS_STATS @@ -30182,7 +26813,7 @@ RgSchUeCb *ue; rgSCHCmnSpsUlUeReset(cell, ue); } - RETVOID; + return; } @@ -30202,23 +26833,16 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnUlSpsRelInd ( RgSchCellCb *cell, RgSchUeCb *ue, Bool isExplRel ) -#else -Void rgSCHCmnUlSpsRelInd(cell, ue, isExplRel) -RgSchCellCb *cell; -RgSchUeCb *ue; -Bool isExplRel; -#endif { rgSCHCmnSpsUlProcRelInd(cell, ue, isExplRel); - RETVOID; + return; } /* end of rgSCHCmnUlSpsRelInd */ @@ -30237,19 +26861,12 @@ Bool isExplRel; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnUlSpsActInd ( -RgSchCellCb *cell, -RgSchUeCb *ue, -U16 spsSduSize +RgSchCellCb *cell, +RgSchUeCb *ue, +uint16_t spsSduSize ) -#else -Void rgSCHCmnUlSpsActInd(cell, ue,spsSduSize) -RgSchCellCb *cell; -RgSchUeCb *ue; -U16 spsSduSize; -#endif { @@ -30257,7 +26874,7 @@ U16 spsSduSize; { rgSCHCmnSpsUlProcActInd(cell, ue,spsSduSize); } - RETVOID; + return; } /* end of rgSCHCmnUlSpsActInd */ @@ -30278,26 +26895,19 @@ U16 spsSduSize; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnUlCrcInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo crcTime ) -#else -Void rgSCHCmnUlCrcInd(cell, ue, crcTime) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo crcTime; -#endif { if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { rgSCHCmnSpsUlProcCrcInd(cell, ue, crcTime); } - RETVOID; + return; } /* end of rgSCHCmnUlCrcFailInd */ @@ -30317,26 +26927,19 @@ CmLteTimingInfo crcTime; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnUlCrcFailInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo crcTime ) -#else -Void rgSCHCmnUlCrcFailInd(cell, ue, crcTime) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo crcTime; -#endif { if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { rgSCHCmnSpsUlProcDtxInd(cell, ue, crcTime); } - RETVOID; + return; } /* end of rgSCHCmnUlCrcFailInd */ @@ -30359,23 +26962,15 @@ CmLteTimingInfo crcTime; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnDlBcchPcchAlloc -( -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHCmnDlBcchPcchAlloc(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHCmnDlBcchPcchAlloc(RgSchCellCb *cell) { #ifdef LTE_TDD - U8 nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE; + uint8_t nextSfIdx = (cell->crntSfIdx) % RGSCH_SF_ALLOC_SIZE; #else #ifdef LTEMAC_HDFDD - U8 nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES; + uint8_t nextSfIdx = (cell->crntSfIdx + RG_SCH_CMN_HARQ_INTERVAL) % RGSCH_NUM_SUB_FRAMES; #else - U8 nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES; + uint8_t nextSfIdx = (cell->crntSfIdx) % RGSCH_NUM_SUB_FRAMES; #endif #endif RgInfSfAlloc *nextsfAlloc = &(cell->sfAllocArr[nextSfIdx]); @@ -30401,7 +26996,7 @@ RgSchCellCb *cell; /* Finalize the Allocations for reqested Against alloced */ rgSCHCmnDlBcchPcchFnlz(cell, allocInfo); #endif /* DISABLE_MIB_SIB */ - RETVOID; + return; } /** @@ -30425,17 +27020,11 @@ RgSchCellCb *cell; * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHBcchPcchDlRbAlloc +static Void rgSCHBcchPcchDlRbAlloc ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) -#else -PRIVATE Void rgSCHBcchPcchDlRbAlloc(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -30450,7 +27039,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHCmnNonDlfsBcchPcchRbAlloc(cell, allocInfo); } - RETVOID; + return; } /** @@ -30475,17 +27064,11 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsBcchPcchRbAlloc +static Void rgSCHCmnNonDlfsBcchPcchRbAlloc ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) -#else -PRIVATE Void rgSCHCmnNonDlfsBcchPcchRbAlloc(cell, allocInfo) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -#endif { RgSchDlRbAlloc *reqAllocInfo; @@ -30503,7 +27086,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { rgSCHCmnNonDlfsCmnRbAlloc(cell, reqAllocInfo); } - RETVOID; + return; } @@ -30525,15 +27108,10 @@ RgSchCmnDlRbAllocInfo *allocInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE Void rgSCHChkNUpdSiCfg +static Void rgSCHChkNUpdSiCfg ( RgSchCellCb *cell ) -#else -PRIVATE Void rgSCHChkNUpdSiCfg(cell) -RgSchCellCb *cell; -#endif { CmLteTimingInfo pdSchTmInfo; @@ -30578,7 +27156,7 @@ RgSchCellCb *cell; /*if(!((((pdSchTmInfo.hSfn * 1024) + pdSchTmInfo.sfn) % cell->siCfg.modPrd == 0) && (0 == pdSchTmInfo.slot)))*/ { - RETVOID; + return; } /*Check whether MIB has been updated*/ @@ -30604,7 +27182,7 @@ RgSchCellCb *cell; /*Check whether SIs have been updated*/ if(cell->siCb.siBitMask & RGSCH_SI_SI_UPD) { - U8 idx; + uint8_t idx; /*Check if SI cfg have been modified And Check if numSi have been changed, if yes then we would need to update the @@ -30669,7 +27247,7 @@ RgSchCellCb *cell; cell->siCb.siBitMask &= ~RGSCH_SI_SICFG_UPD; } - RETVOID; + return; } @@ -30690,20 +27268,15 @@ RgSchCellCb *cell; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE Void rgSCHSelectSi +static Void rgSCHSelectSi ( RgSchCellCb *cell ) -#else -PRIVATE Void rgSCHSelectSi(cell) -RgSchCellCb *cell; -#endif { - CmLteTimingInfo crntTmInfo; - U8 siWinSize; - U16 x; - U16 windowId; + CmLteTimingInfo crntTmInfo; + uint8_t siWinSize; + uint16_t x; + uint16_t windowId; @@ -30730,7 +27303,7 @@ RgSchCellCb *cell; else { cell->siCb.inWindow--; - RETVOID; + return; } } else /* New window. Re-init the winSize counter with the window length */ @@ -30755,7 +27328,7 @@ RgSchCellCb *cell; / siWinSize; if(windowId >= RGR_MAX_NUM_SI) - RETVOID; + return; /* Update the siCtx if there is a valid SI and its periodicity * has occurred */ @@ -30785,7 +27358,7 @@ RgSchCellCb *cell; cell->siCb.siCtx.siId = 0; } - RETVOID; + return; } @@ -30806,31 +27379,24 @@ RgSchCellCb *cell; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE Void rgSCHDlSiSched +static Void rgSCHDlSiSched ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc ) -#else -PRIVATE Void rgSCHDlSiSched(cell, allocInfo, subfrmAlloc) -RgSchCellCb *cell; -RgSchCmnDlRbAllocInfo *allocInfo; -RgInfSfAlloc *subfrmAlloc; -#endif { CmLteTimingInfo crntTimInfo; RgSchDlSf *sf; - U8 nPrb = 0; - U8 mcs = 0; + uint8_t nPrb = 0; + uint8_t mcs = 0; MsgLen msgLen = 0; - U32 rb=0; + uint32_t rb=0; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); /* DwPTS Scheduling Changes Start */ #ifdef LTE_TDD - U16 lostRe; - U8 cfi = cellDl->currCfi; + uint16_t lostRe; + uint8_t cfi = cellDl->currCfi; #endif /* DwPTS Scheduling Changes End */ @@ -30861,11 +27427,11 @@ RgInfSfAlloc *subfrmAlloc; && (RGSCH_MIB_TX_SF_NUM == crntTimInfo.slot)) { MsgLen mibLen = 0; - U8 sfnOctet, mibOct2 = 0; - U8 mibOct1 = 0; + uint8_t sfnOctet, mibOct2 = 0; + uint8_t mibOct1 = 0; /*If MIB has not been yet setup by Application, return*/ if(NULLP == cell->siCb.crntSiInfo.mib) - RETVOID; + return; SFndLenMsg(cell->siCb.crntSiInfo.mib, &mibLen); sf->bch.tbSize = mibLen; @@ -30874,16 +27440,16 @@ RgInfSfAlloc *subfrmAlloc; /*Set the bits of MIB to reflect SFN */ /*First get the Most signficant 8 bits of SFN */ - sfnOctet = (U8)(crntTimInfo.sfn >> 2); + sfnOctet = (uint8_t)(crntTimInfo.sfn >> 2); /*Get the first two octets of MIB, and then update them using the SFN octet value obtained above.*/ if(ROK != SExamMsg((Data *)(&mibOct1), cell->siCb.crntSiInfo.mib, 0)) - RETVOID; + return; if(ROK != SExamMsg((Data *)(&mibOct2), cell->siCb.crntSiInfo.mib, 1)) - RETVOID; + return; /* ccpu00114572- Fix for improper way of MIB Octet setting for SFN */ mibOct1 = (mibOct1 & 0xFC) | (sfnOctet >> 6); @@ -30893,11 +27459,11 @@ RgInfSfAlloc *subfrmAlloc; /*Now, replace the two octets in MIB */ if(ROK != SRepMsg((Data)(mibOct1), cell->siCb.crntSiInfo.mib, 0)) - RETVOID; + return; if(ROK != SRepMsg((Data)(mibOct2), cell->siCb.crntSiInfo.mib, 1)) - RETVOID; + return; /*Copy the MIB msg buff into interface buffer */ SCpyMsgMsg(cell->siCb.crntSiInfo.mib, @@ -30926,7 +27492,7 @@ RgInfSfAlloc *subfrmAlloc; /*If SIB1 has not been yet setup by Application, return*/ if(NULLP == (cell->siCb.crntSiInfo.sib1Info.sib1)) { - RETVOID; + return; } allocInfo->bcchAlloc.schdFirst = TRUE; @@ -30940,7 +27506,7 @@ RgInfSfAlloc *subfrmAlloc; Bool invalid = FALSE; if(cell->siCb.siCtx.siId == 0) - RETVOID; + return; /*Check if the Si-Window for the current Si-Context is completed*/ invalid = rgSCHCmnChkPastWin(crntTimInfo, cell->siCb.siCtx.maxTimeToTx); @@ -30949,8 +27515,7 @@ RgInfSfAlloc *subfrmAlloc; /* LTE_ADV_FLAG_REMOVED_START */ if(cell->siCb.siCtx.retxCntRem) { - RGSCHLOGERROR(cell->instIdx,ERRCLS_INT_PAR,ERG011,(ErrVal)cell->siCb.siCtx.siId, - "rgSCHDlSiSched(): SI not scheduled and window expired"); + DU_LOG("\nERROR --> SCH : rgSCHDlSiSched(): SI not scheduled and window expired"); } /* LTE_ADV_FLAG_REMOVED_END */ if(cell->siCb.siCtx.warningSiFlag == TRUE) @@ -30958,7 +27523,7 @@ RgInfSfAlloc *subfrmAlloc; rgSCHUtlFreeWarningSiPdu(cell); cell->siCb.siCtx.warningSiFlag = FALSE; } - RETVOID; + return; } /*Check the timinginfo of the current SI-Context to see if its @@ -30967,13 +27532,13 @@ RgInfSfAlloc *subfrmAlloc; cell->siCb.siCtx.timeToTx, cell->siCb.siCtx.maxTimeToTx))) { - RETVOID; + return; } /*Check if retransmission count has become 0*/ if(0 == cell->siCb.siCtx.retxCntRem) { - RETVOID; + return; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -30988,7 +27553,7 @@ RgInfSfAlloc *subfrmAlloc; [((crntTimInfo.sfn*RGSCH_NUM_SUB_FRAMES) + crntTimInfo.slot) % RGR_ABS_PATTERN_LEN])) { /* Skip the SI scheduling to next tti */ - RETVOID; + return; } } } @@ -31000,7 +27565,7 @@ RgInfSfAlloc *subfrmAlloc; * and Other SI */ if((rgSCHUtlGetMcsAndNPrb(cell, &nPrb, &mcs, &msgLen)) != ROK) { - RETVOID; + return; } cell->siCb.siCtx.i = RGSCH_CALC_SF_DIFF(crntTimInfo, @@ -31012,7 +27577,7 @@ RgInfSfAlloc *subfrmAlloc; /*rgSCHCmnClcRbAllocForFxdTb(cell, msgLen, cellDl->ccchCqi, &rb);*/ if(cellDl->bitsPerRb==0) { - while ((rgTbSzTbl[0][0][rb]) < (U32) (msgLen*8)) + while ((rgTbSzTbl[0][0][rb]) < (uint32_t) (msgLen*8)) { rb++; } @@ -31041,9 +27606,9 @@ RgInfSfAlloc *subfrmAlloc; * exceeds the available */ if (rb > sf->bw - sf->bwAssigned) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDlSiSched(): " + DU_LOG("\nERROR --> SCH : rgSCHDlSiSched(): " "BW allocation failed CRNTI:%d",RGSCH_SI_RNTI); - RETVOID; + return; } /* Update the subframe Allocated BW field */ @@ -31060,7 +27625,7 @@ RgInfSfAlloc *subfrmAlloc; allocInfo->bcchAlloc.nPrb = nPrb; allocInfo->bcchAlloc.tbInfo[0].bytesReq = msgLen; allocInfo->bcchAlloc.tbInfo[0].noLyr = 1; - RETVOID; + return; } #endif /*RGR_SI_SCH*/ @@ -31092,21 +27657,14 @@ RgInfSfAlloc *subfrmAlloc; * @return Void * **/ -#ifdef ANSI -PRIVATE S16 rgSCHCmnUeDlPwrCtColltCqiRept +static S16 rgSCHCmnUeDlPwrCtColltCqiRept ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCqiRept *ueCqiRpt ) -#else -PRIVATE S16 rgSCHCmnUeDlPwrCtColltCqiRept(cell, ue, ueCqiRpt) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeCqiRept *ueCqiRpt; -#endif { - U8 *cqiCount = NULLP; + uint8_t *cqiCount = NULLP; S16 retVal; RgrStaIndInfo *staInfo = NULLP; @@ -31126,7 +27684,7 @@ RgrUeCqiRept *ueCqiRpt; sizeof(RgrStaIndInfo)); if (retVal != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not " + DU_LOG("\nERROR --> SCH : Could not " "allocate memory for sending StaInd CRNTI:%d",ue->ueId); return (retVal); } @@ -31134,7 +27692,7 @@ RgrUeCqiRept *ueCqiRpt; /* Step 4.1: Fill StaInd for sending collated N CQI rpeorts */ #ifdef CA_DBG { - extern U32 gCqiReptToAppCount; + uint32_t gCqiReptToAppCount; gCqiReptToAppCount++; } @@ -31166,7 +27724,6 @@ RgrUeCqiRept *ueCqiRpt; * @return Void * **/ -#ifdef ANSI Void rgSCHCmnChkRetxAllowDtx ( RgSchCellCb *cell, @@ -31174,13 +27731,6 @@ RgSchUeCb *ueCb, RgSchDlHqProcCb *proc, Bool *reTxAllwd ) -#else -Void rgSCHCmnChkRetxAllowDtx(cell, ueCb, proc, reTxAllwd) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -RgSchDlHqProcCb *proc; -Bool *reTxAllwd; -#endif { @@ -31191,7 +27741,7 @@ Bool *reTxAllwd; *reTxAllwd = FALSE; } - RETVOID; + return; } /** @@ -31208,23 +27758,16 @@ Bool *reTxAllwd; * (0,0) (8,0) (16,0) (SFN, SF) * * - * @param[in] U16 sfn - * @param[in] U8 sf - * @return U16 siSetId + * @param[in] uint16_t sfn + * @param[in] uint8_t sf + * @return uint16_t siSetId **/ -#ifdef ANSI -U16 rgSCHCmnGetSiSetId +uint16_t rgSCHCmnGetSiSetId ( -U16 sfn, -U8 sf, -U16 minPeriodicity +uint16_t sfn, +uint8_t sf, +uint16_t minPeriodicity ) -#else -U16 rgSCHCmnGetSiSetId(sfn, sf, minPeriodicity) -U16 sfn; -U8 sf -U16 minPeriodicity; -#endif { /* 80 is the minimum SI periodicity in sf. Also * all other SI periodicities are multiples of 80 */ @@ -31239,37 +27782,27 @@ U16 minPeriodicity; * Function: rgSCHCmnCalcDwPtsTbSz * * @param[in] RgSchCellCb *cell - * @param[in] U32 bo - * @param[in/out] U8 *rb - * @param[in/out] U8 *iTbs - * @param[in] U8 lyr - * @param[in] U8 cfi - * @return U32 tbSz - **/ -#ifdef ANSI -PRIVATE U32 rgSCHCmnCalcDwPtsTbSz + * @param[in] uint32_t bo + * @param[in/out] uint8_t *rb + * @param[in/out] uint8_t *iTbs + * @param[in] uint8_t lyr + * @param[in] uint8_t cfi + * @return uint32_t tbSz + **/ +static uint32_t rgSCHCmnCalcDwPtsTbSz ( -RgSchCellCb *cell, -U32 bo, -U8 *rb, -U8 *iTbs, -U8 lyr, -U8 cfi +RgSchCellCb *cell, +uint32_t bo, +uint8_t *rb, +uint8_t *iTbs, +uint8_t lyr, +uint8_t cfi ) -#else -PRIVATE U32 rgSCHCmnCalcDwPtsTbSz(cell, bo, rb, iTbs, lyr, cfi) -RgSchCellCb *cell; -U32 bo; -U8 *rb; -U8 *iTbs; -U8 lyr; -U8 cfi; -#endif { - U32 tbSz; + uint32_t tbSz; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - U32 numRE = *rb * cellDl->noResPerRb[cfi]; - U32 numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); + uint32_t numRE = *rb * cellDl->noResPerRb[cfi]; + uint32_t numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); /* DwPts Rb cannot exceed the cell Bw */ @@ -31308,51 +27841,35 @@ U8 cfi; * Function: rgSCHCmnCalcDwPtsTbSz2Cw * * @param[in] RgSchCellCb *cell - * @param[in] U32 bo - * @param[in/out] U8 *rb - * @param[in] U8 maxRb - * @param[in/out] U8 *iTbs1 - * @param[in/out] U8 *iTbs2 - * @param[in] U8 lyr1 - * @param[in] U8 lyr2 - * @return[in/out] U32 *tb1Sz - * @return[in/out] U32 *tb2Sz - * @param[in] U8 cfi - **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw + * @param[in] uint32_t bo + * @param[in/out] uint8_t *rb + * @param[in] uint8_t maxRb + * @param[in/out] uint8_t *iTbs1 + * @param[in/out] uint8_t *iTbs2 + * @param[in] uint8_t lyr1 + * @param[in] uint8_t lyr2 + * @return[in/out] uint32_t *tb1Sz + * @return[in/out] uint32_t *tb2Sz + * @param[in] uint8_t cfi + **/ +static Void rgSCHCmnCalcDwPtsTbSz2Cw ( -RgSchCellCb *cell, -U32 bo, -U8 *rb, -U8 maxRb, -U8 *iTbs1, -U8 *iTbs2, -U8 lyr1, -U8 lyr2, -U32 *tb1Sz, -U32 *tb2Sz, -U8 cfi +RgSchCellCb *cell, +uint32_t bo, +uint8_t *rb, +uint8_t maxRb, +uint8_t *iTbs1, +uint8_t *iTbs2, +uint8_t lyr1, +uint8_t lyr2, +uint32_t *tb1Sz, +uint32_t *tb2Sz, +uint8_t cfi ) -#else -PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, rb, maxRb, iTbs1, iTbs2, - lyr1, lyr2, tb1Sz, tb2Sz, cfi) -RgSchCellCb *cell; -U32 bo; -U8 *rb; -U8 maxRb; -U8 *iTbs1; -U8 *iTbs2; -U8 lyr1; -U8 lyr2; -U32 *tb1Sz; -U32 *tb2Sz; -U8 cfi; -#endif { RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - U32 numRE = *rb * cellDl->noResPerRb[cfi]; - U32 numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); + uint32_t numRE = *rb * cellDl->noResPerRb[cfi]; + uint32_t numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); /* DwPts Rb cannot exceed the cell Bw */ @@ -31377,7 +27894,7 @@ U8 cfi; *rb = numDwPtsRb; - RETVOID; + return; } #endif @@ -31398,33 +27915,23 @@ U8 cfi; * @param[in] RgInfUeDatInd *datInd * @return Void **/ -#ifdef ANSI Void rgSCHCmnUpdUeDataIndLcg ( RgSchCellCb *cell, RgSchUeCb *ue, RgInfUeDatInd *datInd ) -#else -Void rgSCHCmnUpdUeDataIndLcg(cell, ue, datInd) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgInfUeDatInd *datInd; -#endif { - U32 idx = 0; + uint32_t idx = 0; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); -#ifdef DEBUGP - Inst inst = cell->instIdx; -#endif for (idx = 0; (idx < RGINF_MAX_LCG_PER_UE - 1); idx++) { if (datInd->lcgInfo[idx].bytesRcvd != 0) { - U8 lcgId = datInd->lcgInfo[idx].lcgId; - U32 bytesRcvd = datInd->lcgInfo[idx].bytesRcvd; + uint8_t lcgId = datInd->lcgInfo[idx].lcgId; + uint32_t bytesRcvd = datInd->lcgInfo[idx].bytesRcvd; if (RGSCH_LCG_ISCFGD(&ue->ul.lcgArr[lcgId])) { @@ -31471,7 +27978,7 @@ RgInfUeDatInd *datInd; { if (cellSch->apisEmtcUl->rgSCHRgrUlLcgUpd(cell, ue, datInd) != ROK) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "\n rgSCHCmnUpdUeDataIndLcg(): rgSCHRgrUlLcgUpd returned failure")); + DU_LOG("\nERROR --> SCH : rgSCHCmnUpdUeDataIndLcg(): rgSCHRgrUlLcgUpd returned failure"); } } @@ -31480,7 +27987,7 @@ RgInfUeDatInd *datInd; { if (cellSch->apisUl->rgSCHRgrUlLcgUpd(cell, ue, datInd) != ROK) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "\n rgSCHCmnUpdUeDataIndLcg(): rgSCHRgrUlLcgUpd returned failure")); + DU_LOG("\nERROR --> SCH : rgSCHCmnUpdUeDataIndLcg(): rgSCHRgrUlLcgUpd returned failure"); } } } @@ -31498,20 +28005,15 @@ RgInfUeDatInd *datInd; * Returns: Void * */ -#ifdef ANSI -PRIVATE Void rgSCHCmnInitRbAlloc +static Void rgSCHCmnInitRbAlloc ( RgSchCellCb *cell ) -#else -PRIVATE Void rgSCHCmnInitRbAlloc (cell) -RgSchCellCb *cell; -#endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); CmLteTimingInfo frm; RgSchDlSf *dlSf; - U8 idx; + uint8_t idx; /* Initializing RgSchCmnUlRbAllocInfo structure.*/ @@ -31558,7 +28060,7 @@ RgSchCellCb *cell; /* Update subframe-wide allocation information with SPS allocation */ rgSCHCmnSpsDlUpdDlSfAllocWithSps(cell, frm, dlSf); #endif - RETVOID; + return; } @@ -31579,22 +28081,15 @@ RgSchCellCb *cell; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 newTxMode + * @param[in] uint8_t newTxMode * @return Void **/ -#ifdef ANSI -PRIVATE Void rgSCHCmnSendTxModeInd +static Void rgSCHCmnSendTxModeInd ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 newTxMode +uint8_t newTxMode ) -#else -PRIVATE Void rgSCHCmnSendTxModeInd(cell, ue, newTxMode) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 newTxMode; -#endif { RgmTransModeInd *txModeChgInd; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -31607,7 +28102,7 @@ U8 newTxMode; cell->rgmSap->sapCfg.sapPst.pool, (Data**)&txModeChgInd, sizeof(RgmTransModeInd)) != ROK) { - RETVOID; + return; } RG_SCH_FILL_RGM_TRANSMODE_IND(ue->ueId, cell->cellId, newTxMode, txModeChgInd); RgUiRgmChangeTransModeInd(&(cell->rgmSap->sapCfg.sapPst), @@ -31618,7 +28113,7 @@ U8 newTxMode; ue->mimoInfo.txModDownChgFactor = 0; ueDl->laCb[0].deltaiTbs = 0; - RETVOID; + return; } /** @@ -31635,26 +28130,17 @@ U8 newTxMode; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 iTbs + * @param[in] uint8_t iTbs * @return Void **/ -#ifdef ANSI Void rgSchCheckAndTriggerModeChange ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 reportediTbs, -U8 previTbs, -U8 maxiTbs +uint8_t reportediTbs, +uint8_t previTbs, +uint8_t maxiTbs ) -#else -Void rgSchCheckAndTriggerModeChange(cell, ue, reportediTbs, previTbs, maxiTbs) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 reportediTbs; -U8 previTbs; -U8 maxiTbs; -#endif { RgrTxMode txMode; /*!< UE's Transmission Mode */ RgrTxMode modTxMode; /*!< UE's Transmission Mode */ @@ -31711,7 +28197,7 @@ U8 maxiTbs; } } - RETVOID; + return; } #endif @@ -31731,15 +28217,7 @@ U8 maxiTbs; * @param[in] RgInfUeDatInd *datInd * @return Void **/ -#ifdef ANSI -Bool rgSCHCmnIsDlCsgPrio -( -RgSchCellCb *cell -) -#else -Bool rgSCHCmnIsDlCsgPrio(cell) -RgSchCellCb *cell; -#endif +Bool rgSCHCmnIsDlCsgPrio(RgSchCellCb *cell) { RgSchCmnDlCell *cmnDlCell = RG_SCH_CMN_GET_DL_CELL(cell); @@ -31778,15 +28256,7 @@ RgSchCellCb *cell; * @param[in] RgInfUeDatInd *datInd * @return Void **/ -#ifdef ANSI -Bool rgSCHCmnIsUlCsgPrio -( -RgSchCellCb *cell -) -#else -Bool rgSCHCmnIsUlCsgPrio(cell) -RgSchCellCb *cell; -#endif +Bool rgSCHCmnIsUlCsgPrio(RgSchCellCb *cell) { RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); @@ -31819,28 +28289,21 @@ RgSchCellCb *cell; * Returns: Void * */ -#ifdef ANSI - Void rgSchCmnPreDlSch +Void rgSchCmnPreDlSch ( - RgSchCellCb **cell, - U8 nCell, - RgSchCellCb **cellLst - ) -#else -Void rgSchCmnPreDlSch(cell, nCell, cellLst) - RgSchCellCb **cell; - U8 nCell; - RgSchCellCb **cellLst; -#endif +RgSchCellCb **cell, +uint8_t nCell, +RgSchCellCb **cellLst +) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell[0]); RgSchDlSf *sf; - U8 idx; + uint8_t idx; if(nCell > CM_LTE_MAX_CELLS) { - RETVOID; + return; } if (cell[0]->isDlDataAllwd && (cell[0]->stopDlSch == FALSE)) @@ -31853,7 +28316,7 @@ Void rgSchCmnPreDlSch(cell, nCell, cellLst) * in that cell */ for (idx = 0; idx < nCell; idx++) { - U8 j; + uint8_t j; cellSch = RG_SCH_CMN_GET_CELL(cell[idx]); sf = cellSch->allocInfo.dedAlloc.dedDlSf; @@ -31870,7 +28333,7 @@ Void rgSchCmnPreDlSch(cell, nCell, cellLst) if(sf->remUeCnt < subfrm->remUeCnt) { - U8 k; + uint8_t k; for(k = idx; k > j; k--) { cellLst[k] = cellLst[k-1]; @@ -31888,7 +28351,7 @@ Void rgSchCmnPreDlSch(cell, nCell, cellLst) cellLst[idx] = cell[idx]; } } - RETVOID; + return; } /** @brief DL scheduler for SPS, and all other downlink data @@ -31900,15 +28363,7 @@ Void rgSchCmnPreDlSch(cell, nCell, cellLst) * Returns: Void * */ -#ifdef ANSI -Void rgSchCmnPstDlSch -( - RgSchCellCb *cell -) -#else -Void rgSchCmnPstDlSch(cell) - RgSchCellCb *cell -#endif +Void rgSchCmnPstDlSch(RgSchCellCb *cell) { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -31919,21 +28374,11 @@ Void rgSchCmnPstDlSch(cell) } } -#ifdef ANSI -U8 rgSCHCmnCalcPcqiBitSz -( - RgSchUeCb *ueCb, - U8 numTxAnt -) -#else -U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) - RgSchUeCb *ueCb; - U8 numTxAnt; -#endif +uint8_t rgSCHCmnCalcPcqiBitSz(RgSchUeCb *ueCb, uint8_t numTxAnt) { - U8 confRepMode; - U8 pcqiSz; - U8 ri; + uint8_t confRepMode; + uint8_t pcqiSz; + uint8_t ri; RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb; @@ -32068,21 +28513,13 @@ U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) * Returns: Void * */ -#ifdef ANSI -Void rgSCHCmnDlSch -( - RgSchCellCb *cell - ) -#else -Void rgSCHCmnDlSch (cell) - RgSchCellCb *cell; -#endif +Void rgSCHCmnDlSch(RgSchCellCb *cell) { RgSchDlSf *dlSf; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); #ifdef RG_5GTF RgSchDynTddCb *rgSchDynTddInfo = &(rgSchCb[cell->instIdx].rgSchDynTdd); - U16 dlCntrlSfIdx; + uint16_t dlCntrlSfIdx; #endif @@ -32098,12 +28535,12 @@ Void rgSCHCmnDlSch (cell) { ul5gtfsidDlAlreadyMarkUl++; /* - printf("ul5gtfsidDlAlreadyMarkUl: %d, [sfn:sf] [%04d:%02d]\n", + DU_LOG("\nINFO --> SCH : ul5gtfsidDlAlreadyMarkUl: %d, [sfn:sf] [%04d:%02d]\n", ul5gtfsidDlAlreadyMarkUl, cellSch->dl.time.sfn, cellSch->dl.time.slot); */ } - RETVOID; + return; } } #endif @@ -32127,7 +28564,7 @@ Void rgSCHCmnDlSch (cell) /* Do group power control for PUCCH */ rgSCHCmnGrpPwrCntrlPucch(cell, dlSf); - RETVOID; + return; } /**********************************************************************