X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_utl.c;h=22092d80a9b57f5acbec99335f170103d009184d;hb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;hp=5fe435be67acb76119e5a1bd7b1af5d53f7c8805;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c index 5fe435be6..22092d80a 100755 --- a/src/5gnrsch/rg_sch_utl.c +++ b/src/5gnrsch/rg_sch_utl.c @@ -64,39 +64,39 @@ static int RLOG_FILE_ID=177; /* SR_RACH_STATS */ -U32 rgNumPrachRecvd =0; /* Num of Rach Req received including dedicated preambles */ -U32 rgNumRarSched =0; /* Num of RARs sent */ -U32 rgNumBI =0; /* Num of BackOff Ind sent */ -U32 rgNumMsg3CrcPassed =0; /* Num of CRC success for Msg3 */ -U32 rgNumMsg3CrcFailed =0; /* Num of CRC fail for Msg 3 */ -U32 rgNumMsg3FailMaxRetx =0; /* Num of Msg3 fail after Max Retx attempts */ -U32 rgNumMsg4Ack =0; /* Num of Acks for Msg4 Tx */ -U32 rgNumMsg4Nack =0; +uint32_t rgNumPrachRecvd =0; /* Num of Rach Req received including dedicated preambles */ +uint32_t rgNumRarSched =0; /* Num of RARs sent */ +uint32_t rgNumBI =0; /* Num of BackOff Ind sent */ +uint32_t rgNumMsg3CrcPassed =0; /* Num of CRC success for Msg3 */ +uint32_t rgNumMsg3CrcFailed =0; /* Num of CRC fail for Msg 3 */ +uint32_t rgNumMsg3FailMaxRetx =0; /* Num of Msg3 fail after Max Retx attempts */ +uint32_t rgNumMsg4Ack =0; /* Num of Acks for Msg4 Tx */ +uint32_t rgNumMsg4Nack =0; /* Num of Nacks for Msg4 Tx */ -U32 rgNumMsg4FailMaxRetx =0; /* Num of Msg4 Tx failed after Max Retx attempts */ -U32 rgNumSrRecvd =0; /* Num of Sched Req received */ -U32 rgNumSrGrant =0; /* Num of Sched Req Grants sent */ -U32 rgNumMsg3CrntiCE =0; /* Num of Msg 3 CRNTI CE received */ -U32 rgNumDedPream =0; /* Num of Dedicated Preambles recvd */ -U32 rgNumMsg3CCCHSdu =0; /* Num of Msg 3 CCCH Sdus recvd */ -U32 rgNumCCCHSduCrntiNotFound =0; /*UE Ctx not found for CCCH SDU Msg 3 */ -U32 rgNumCrntiCeCrntiNotFound =0; /*UE Ctx not found for CRNTI CE Msg 3 */ -U32 rgNumMsg4WithCCCHSdu =0; /* Num of Msg4 with CCCH Sdu */ -U32 rgNumMsg4WoCCCHSdu =0; /* Num of Msg4 without CCCH Sdu */ -U32 rgNumMsg4Dtx =0; /* Num of DTX received for Msg 4 */ -U32 rgNumMsg3AckSent =0; /* Num of PHICH Ack sent for Msg 3 */ -U32 rgNumMsg3NackSent =0; /* Num of PHICH Nack sent for Msg 3 */ -U32 rgNumMsg4PdcchWithCrnti =0; /* Num of PDCCH for CRNTI based contention resolution */ -U32 rgNumRarFailDuetoRntiExhaustion =0; /* Num of RACH Failures due to RNTI pool exhaution */ -U32 rgNumTAModified =0; /* Num of times TA received is different from prev value */ -U32 rgNumTASent =0; /* Num of TA Command sent */ -U32 rgNumMsg4ToBeTx =0; /* Num of times MSG4 that should be sent */ -U32 rgNumMsg4Txed =0; /* Num of MSG4 actually sent *//* ysNumMsg4ToBeTx -ysNumMsg4Txed == Failed MSG4 TX */ -U32 rgNumMsg3DtxRcvd =0; /* CRC Fail with SINR < 0 */ - -U32 rgNumDedPreamUECtxtFound =0; /* Num of Dedicated Preambles recvd */ - -PRIVATE U8 rgSchDciAmbigSizeTbl[61] = {0,0,0,0,0,0,0,0,0,0,0, +uint32_t rgNumMsg4FailMaxRetx =0; /* Num of Msg4 Tx failed after Max Retx attempts */ +uint32_t rgNumSrRecvd =0; /* Num of Sched Req received */ +uint32_t rgNumSrGrant =0; /* Num of Sched Req Grants sent */ +uint32_t rgNumMsg3CrntiCE =0; /* Num of Msg 3 CRNTI CE received */ +uint32_t rgNumDedPream =0; /* Num of Dedicated Preambles recvd */ +uint32_t rgNumMsg3CCCHSdu =0; /* Num of Msg 3 CCCH Sdus recvd */ +uint32_t rgNumCCCHSduCrntiNotFound =0; /*UE Ctx not found for CCCH SDU Msg 3 */ +uint32_t rgNumCrntiCeCrntiNotFound =0; /*UE Ctx not found for CRNTI CE Msg 3 */ +uint32_t rgNumMsg4WithCCCHSdu =0; /* Num of Msg4 with CCCH Sdu */ +uint32_t rgNumMsg4WoCCCHSdu =0; /* Num of Msg4 without CCCH Sdu */ +uint32_t rgNumMsg4Dtx =0; /* Num of DTX received for Msg 4 */ +uint32_t rgNumMsg3AckSent =0; /* Num of PHICH Ack sent for Msg 3 */ +uint32_t rgNumMsg3NackSent =0; /* Num of PHICH Nack sent for Msg 3 */ +uint32_t rgNumMsg4PdcchWithCrnti =0; /* Num of PDCCH for CRNTI based contention resolution */ +uint32_t rgNumRarFailDuetoRntiExhaustion =0; /* Num of RACH Failures due to RNTI pool exhaution */ +uint32_t rgNumTAModified =0; /* Num of times TA received is different from prev value */ +uint32_t rgNumTASent =0; /* Num of TA Command sent */ +uint32_t rgNumMsg4ToBeTx =0; /* Num of times MSG4 that should be sent */ +uint32_t rgNumMsg4Txed =0; /* Num of MSG4 actually sent *//* ysNumMsg4ToBeTx -ysNumMsg4Txed == Failed MSG4 TX */ +uint32_t rgNumMsg3DtxRcvd =0; /* CRC Fail with SINR < 0 */ + +uint32_t rgNumDedPreamUECtxtFound =0; /* Num of Dedicated Preambles recvd */ + +static uint8_t rgSchDciAmbigSizeTbl[61] = {0,0,0,0,0,0,0,0,0,0,0, 0,1,0,1,0,1,0,0,0,1, 0,0,0,1,0,1,0,0,0,0, 0,1,0,0,0,0,0,0,0,1, @@ -105,51 +105,51 @@ PRIVATE U8 rgSchDciAmbigSizeTbl[61] = {0,0,0,0,0,0,0,0,0,0,0, /* local defines */ -EXTERN U32 rgSchCmnBetaCqiOffstTbl[16]; -EXTERN U32 rgSchCmnBetaRiOffstTbl[16]; -EXTERN RgSchdApis rgSchCmnApis; -EXTERN S16 RgUiRgmSendPrbRprtInd ARGS(( +uint32_t rgSchCmnBetaCqiOffstTbl[16]; +uint32_t rgSchCmnBetaRiOffstTbl[16]; +RgSchdApis rgSchCmnApis; +S16 RgUiRgmSendPrbRprtInd ARGS(( Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd )); -EXTERN S16 RgUiRgmSendTmModeChangeInd ARGS(( +S16 RgUiRgmSendTmModeChangeInd ARGS(( Pst* pst, SuId suId, RgmTransModeInd *txModeChngInd )); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHEmtcUtlGetSfAlloc ARGS(( +S16 rgSCHEmtcUtlGetSfAlloc ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHEmtcUtlPutSfAlloc ARGS(( +S16 rgSCHEmtcUtlPutSfAlloc ARGS(( RgSchCellCb *cell )); -EXTERN Void rgSCHEmtcUtlUpdUeDciSize ARGS(( +Void rgSCHEmtcUtlUpdUeDciSize ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb )); -EXTERN Void rgSCHEmtcGetDciFrmt61ASize ARGS(( +Void rgSCHEmtcGetDciFrmt61ASize ARGS(( RgSchCellCb *cell )); -EXTERN Void rgSCHEmtcGetDciFrmt60ASize ARGS(( +Void rgSCHEmtcGetDciFrmt60ASize ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHEmtcUtlFillPdschDciInfo ARGS(( +S16 rgSCHEmtcUtlFillPdschDciInfo ARGS(( TfuPdschDciInfo *pdsch, TfuDciInfo *pdcchDci )); -EXTERN Void rgSCHEmtcUtlRlsRnti ARGS(( +Void rgSCHEmtcUtlRlsRnti ARGS(( RgSchCellCb *cell, RgSchRntiLnk *rntiLnk, -U8 *isLegacy +uint8_t *isLegacy )); -EXTERN S16 rgSCHEmtcPdcchAlloc ARGS(( +S16 rgSCHEmtcPdcchAlloc ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch )); -EXTERN Void rgSCHEmtcPdcchFree ARGS(( +Void rgSCHEmtcPdcchFree ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch )); @@ -157,23 +157,23 @@ RgSchPdcch *pdcch /* Functions specific to TM1/TM2/TM6/TM7 for PRB calculation*/ Void rgSchUtlDlCalc1CwPrb ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, - U32 bo, - U32 *prbReqrd)); + uint32_t bo, + uint32_t *prbReqrd)); /* Functions specific to TM3/TM4 for PRB calculation*/ Void rgSchUtlDlCalc2CwPrb ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, - U32 bo, - U32 *prbReqrd)); + uint32_t bo, + uint32_t *prbReqrd)); #ifdef LTE_ADV RgSchCellCb* rgSchUtlGetCellCb ARGS(( Inst inst, - U16 cellId + uint16_t cellId )); #endif typedef Void (*RgSchUtlDlCalcPrbFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, - U32 bo, U32 *prbRequrd)); + uint32_t bo, uint32_t *prbRequrd)); #ifndef LTE_ADV /* Functions specific to each transmission mode for PRB calculation*/ RgSchUtlDlCalcPrbFunc dlCalcPrbFunc[7] = {rgSchUtlDlCalc1CwPrb, @@ -191,51 +191,51 @@ NULLP, rgSchUtlDlCalc1CwPrb, rgSchUtlDlCalc1CwPrb, NULLP, NULLP}; #ifdef LTE_TDD /* The below table will be used to map the UL SF number in a TDD Cfg 0 frame to the ul Sf array maintained in cellCb */ -PRIVATE U8 rgSchTddCfg0UlSfTbl[] = {2, 3, 4, 7, 8, 9}; +static uint8_t rgSchTddCfg0UlSfTbl[] = {2, 3, 4, 7, 8, 9}; #endif -PRIVATE S16 rgSCHUtlUlAllocDbInit ARGS(( +static S16 rgSCHUtlUlAllocDbInit ARGS(( RgSchCellCb *cell, RgSchUlAllocDb *db, - U8 maxAllocs + uint8_t maxAllocs )); -PRIVATE Void rgSCHUtlUlAllocDbDeinit ARGS(( +static Void rgSCHUtlUlAllocDbDeinit ARGS(( RgSchCellCb *cell, RgSchUlAllocDb *db )); -PRIVATE S16 rgSCHUtlUlHoleDbInit ARGS(( +static S16 rgSCHUtlUlHoleDbInit ARGS(( RgSchCellCb *cell, RgSchUlHoleDb *db, - U8 maxHoles, - U8 start, - U8 num + uint8_t maxHoles, + uint8_t start, + uint8_t num )); -PRIVATE Void rgSCHUtlUlHoleDbDeinit ARGS(( +static Void rgSCHUtlUlHoleDbDeinit ARGS(( RgSchCellCb *cell, RgSchUlHoleDb *db )); -PRIVATE S16 rgSCHChkBoUpdate ARGS(( +static S16 rgSCHChkBoUpdate ARGS(( RgSchCellCb *cell, RgInfCmnBoRpt *boUpdt )); #ifdef UNUSE_FUN #ifdef TFU_UPGRADE -PRIVATE U8 rgSCHUtlFetchPcqiBitSz ARGS(( +static uint8_t rgSCHUtlFetchPcqiBitSz ARGS(( RgSchCellCb *cell, - RgSchUeCb *ueCb, - U8 numTxAnt + RgSchUeCb *ueCb, + uint8_t numTxAnt )); #endif #endif /* sorted in ascending order of tbSz */ -CONSTANT struct rgSchUtlBcchPcchTbSz +const struct rgSchUtlBcchPcchTbSz { - U8 rbIndex; /* RB index {2,3} */ - U16 tbSz; /* one of the Transport block size in bits of + uint8_t rbIndex; /* RB index {2,3} */ + uint16_t tbSz; /* one of the Transport block size in bits of * rbIndex 2 or 3 */ /* Corrected allocation for common channels */ - U8 mcs; /* imcs */ + uint8_t mcs; /* imcs */ } rgSchUtlBcchPcchTbSzTbl[44] = { { 2, 32, 0 }, { 2, 56, 1 }, { 2, 72, 2 }, { 3, 88, 1 }, { 2, 104, 3 }, { 2, 120, 4 }, { 2, 144, 5 }, { 2, 176, 6 }, @@ -256,7 +256,7 @@ CONSTANT struct rgSchUtlBcchPcchTbSz /* forward references */ #ifdef LTE_TDD -PRIVATE Void rgSCHUtlUpdPrachOcc ARGS(( +static Void rgSCHUtlUpdPrachOcc ARGS(( RgSchCellCb *cell, RgrTddPrachInfo *cellCfg)); #endif @@ -298,7 +298,7 @@ for proper NULLP assignment*/ } #ifdef TFU_UPGRADE -#define RGSCH_GETBIT(a, b) ((((U8*)a)[(b)>>3] >> ((7-((b)&7)))) & 1) +#define RGSCH_GETBIT(a, b) ((((uint8_t*)a)[(b)>>3] >> ((7-((b)&7)))) & 1) /* * @@ -354,25 +354,24 @@ F64 n; * */ #ifdef ANSI -U32 rgSCHUtlParse +uint32_t rgSCHUtlParse ( -U8 *buff, -U8 startPos, -U8 endPos, -U8 buffSize +uint8_t *buff, +uint8_t startPos, +uint8_t endPos, +uint8_t buffSize ) #else -U32 rgSCHUtlParse(buff, startPos, endPos, buffSize) -U8 *buff; -U8 startPos; -U8 endPos; -U8 buffSize; +uint32_t rgSCHUtlParse(buff, startPos, endPos, buffSize) +uint8_t *buff; +uint8_t startPos; +uint8_t endPos; +uint8_t buffSize; #endif { - U8 pointToChar,pointToEnd, loop; - U8 size = endPos - startPos; + uint8_t pointToChar,pointToEnd, loop; + uint8_t size = endPos - startPos; F64 result = 0; - TRC2(rgSCHUtlParse); pointToEnd = (startPos)%8; for ( loop=0; loopinstIdx; S16 ret; - U16 offsetStepMask; - - TRC2(rgSCHUtlPdcchAvail); + uint16_t offsetStepMask; /* V5G_213 : 10.1 */ offset = 0; @@ -579,8 +576,8 @@ RgSchPdcch **pdcch; * Invoked by: scheduler * * @param[in] RgSchPdcchInfo* pdcchInfo - * @param[in] U8 loc - * @param[in] U8 aggrLvl + * @param[in] uint8_t loc + * @param[in] uint8_t aggrLvl * @return Void * **/ @@ -598,12 +595,10 @@ RgSchPdcchInfo *pdcchInfo; RgSchPdcch *pdcch; #endif { - U8 *byte; - U8 offset; + uint8_t *byte; + uint8_t offset; uint16_t mask; - TRC2(rgSCHUtlPdcchPut); - switch(pdcch->aggrLvl) { case CM_LTE_AGGR_LVL2: @@ -621,7 +616,7 @@ RgSchPdcch *pdcch; mask = 0xffff; break; default: - RETVOID; + return; } /* Placing common computation of byte from all the cases above here for optimization */ @@ -633,7 +628,7 @@ RgSchPdcch *pdcch; pdcch->ue = NULLP; (*byte) &= ~mask; - RETVOID; + return; } @@ -659,22 +654,20 @@ Void rgSCHUtlPdcchInit ( RgSchCellCb *cell, RgSchDlSf *subFrm, -U16 nCce +uint16_t nCce ) #else Void rgSCHUtlPdcchInit(cell, subFrm, nCce) RgSchCellCb *cell; RgSchDlSf *subFrm; -U16 nCce; +uint16_t nCce; #endif { RgSchPdcchInfo *pdcchInfo; RgSchPdcch *pdcch; Inst inst = cell->instIdx; - U8 extraBits; - U32 cceMapSz; - - TRC2(rgSCHUtlPdcchInit); + uint8_t extraBits; + uint32_t cceMapSz; pdcchInfo = &subFrm->pdcchInfo; while(pdcchInfo->pdcchs.first != NULLP) @@ -709,11 +702,11 @@ U16 nCce; if (pdcchInfo->map == NULLP) { /* Generate log error here */ - RETVOID; + return; } } - cmMemset(subFrm->pdcchInfo.map, 0, cceMapSz); + memset(subFrm->pdcchInfo.map, 0, cceMapSz); /* If nCce is not exactly same as the bitMap size(no of bits allocated * to represent the Cce's, then mark the extra bits as unavailable extra bits = (((pdcchInfo->nCce + 7) >> 3)*8) - pdcchInfo->nCce @@ -722,7 +715,7 @@ U16 nCce; extraBits = (cceMapSz)*8 - pdcchInfo->nCce; subFrm->pdcchInfo.map[cceMapSz - 1] |= ((1 << extraBits) - 1) << (8 - extraBits); - RETVOID; + return; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -753,7 +746,6 @@ Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell) { CmLListCp *l; CmLList *n; - TRC2(rgSchSFRTotalPoolFree); /*Deinitialise if these cc pools and ce pools are already existent*/ l = &sfrTotalPoolInfo->ccPool; @@ -808,7 +800,7 @@ S16 rgSchSFRTotalPoolInit RgSchDlSf *sf ) #else -PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) +static Void rgSchSFRTotalPoolInit(cell, sf) RgSchCellCb *cell; RgSchDlSf *sf; #endif @@ -821,8 +813,6 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) CmLList *temp = NULLP; S16 ret = 0; - TRC2(rgSchSFRTotalPoolInit); - rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo, cell); sf->sfrTotalPoolInfo.CCPool1BwAvlbl = 0; sf->sfrTotalPoolInfo.CCPool2BwAvlbl = 0; @@ -1001,19 +991,17 @@ S16 rgSchDSFRRntpInfoInit ( TknStrOSXL *rntpPtr, RgSchCellCb *cell, - U16 bw + uint16_t bw ) #else -PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) +static Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) TknStrOSXL *rntpPtr; RgSchCellCb *cell; - U16 bw; + uint16_t bw; #endif { Inst inst = cell->instIdx; - U16 len; - - TRC2(rgSchDSFRRntpInfoInit); + uint16_t len; rntpPtr->pres = PRSNT_NODEF; @@ -1023,7 +1011,7 @@ PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) /* Allocate memory for "scheduled UE" Info */ if((rgSCHUtlAllocSBuf(inst, (Data**)&(rntpPtr->val), - (len * sizeof(U8)))) != ROK) + (len * sizeof(uint8_t)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for RNTP Alloc"); return RFAILED; @@ -1050,25 +1038,23 @@ S16 rgSchDSFRRntpInfoFree ( TknStrOSXL *rntpPtr, RgSchCellCb *cell, - U16 bw + uint16_t bw ) #else -PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) +static Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) TknStrOSXL *rntpPtr; RgSchCellCb *cell; - U16 bw; + uint16_t bw; #endif { Inst inst = cell->instIdx; - U16 len; - - TRC2(rgSchDSFRRntpInfoFree); + uint16_t len; len = (bw % 8 == 0) ? (bw/8) : (bw/8 + 1); if(rntpPtr->pres == PRSNT_NODEF) { - rgSCHUtlFreeSBuf(inst, (Data **)(&(rntpPtr->val)),(len * sizeof(U8))); + rgSCHUtlFreeSBuf(inst, (Data **)(&(rntpPtr->val)),(len * sizeof(uint8_t))); rntpPtr->pres = NOTPRSNT; rntpPtr->len = 0; } @@ -1091,19 +1077,18 @@ PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) * **/ #ifdef ANSI -PRIVATE Void rgSchSFRResetPoolVariables +static Void rgSchSFRResetPoolVariables ( RgSchCellCb *cell, RgSchSFRPoolInfo *pool ) #else -PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) +static Void rgSchSFRResetPoolVariables(cell, pool) RgSchCellCb *cell; RgSchSFRPoolInfo *pool; #endif { - TRC2(rgSchSFRResetPoolVariables); pool->bwAlloced = 0; /*type0end will be the last RBG in pool with all available RBs*/ @@ -1114,7 +1099,7 @@ PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) pool->type2Start = pool->poolstartRB; pool->bw = pool->poolendRB - pool->poolstartRB + 1; - RETVOID; + return; } /** * @brief This function resets SFR Pool information for frame @@ -1132,13 +1117,13 @@ PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) * **/ #ifdef ANSI -PRIVATE Void rgSCHSFRUtlTotalPoolReset +static Void rgSCHSFRUtlTotalPoolReset ( RgSchCellCb *cell, RgSchDlSf *subFrm ) #else -PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) +static Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) RgSchCellCb *cell; RgSchDlSf *subFrm; #endif @@ -1149,8 +1134,6 @@ PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) CmLList *node = NULLP; RgSchSFRPoolInfo *tempPool = NULLP; - TRC2(rgSCHSFRUtlTotalPoolReset); - totalPoolInfo->ccBwFull = FALSE; totalPoolInfo->ceBwFull = FALSE; totalPoolInfo->isUeCellEdge = FALSE; @@ -1181,7 +1164,7 @@ PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) totalPoolInfo->CEPoolBwAvlbl = tempPool->bw; } - RETVOID; + return; } /* LTE_ADV_FLAG_REMOVED_END */ /** @@ -1197,9 +1180,9 @@ PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) * * @param[in] RgSchCellCb* cell * @param[in] RgSubFrm* subFrm - * @param[in] U8 hqFeedBack - * @param[in] U8 nDmrs - * @param[in] U8 rbStart + * @param[in] uint8_t hqFeedBack + * @param[in] uint8_t nDmrs + * @param[in] uint8_t rbStart * @return S16 * -# ROK * -# RFAILED @@ -1210,19 +1193,19 @@ S16 rgSCHUtlAddPhich ( RgSchCellCb *cell, CmLteTimingInfo frm, -U8 hqFeedBack, -U8 nDmrs, -U8 rbStart, -U8 iPhich +uint8_t hqFeedBack, +uint8_t nDmrs, +uint8_t rbStart, +uint8_t iPhich ) #else S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, iPhich) RgSchCellCb *cell; CmLteTimingInfo frm; -U8 hqFeedBack; -U8 nDmrs; -U8 rbStart; -U8 iPhich; +uint8_t hqFeedBack; +uint8_t nDmrs; +uint8_t rbStart; +uint8_t iPhich; #endif #else #ifdef ANSI @@ -1230,18 +1213,18 @@ S16 rgSCHUtlAddPhich ( RgSchCellCb *cell, CmLteTimingInfo frm, -U8 hqFeedBack, -U8 nDmrs, -U8 rbStart, +uint8_t hqFeedBack, +uint8_t nDmrs, +uint8_t rbStart, Bool isForMsg3 ) #else S16 rgSCHUtlAddPhich(cell, frm, hqFeedBack, nDmrs, rbStart, isForMsg3) RgSchCellCb *cell; CmLteTimingInfo frm; -U8 hqFeedBack; -U8 nDmrs; -U8 rbStart; +uint8_t hqFeedBack; +uint8_t nDmrs; +uint8_t rbStart; Bool isForMsg3; #endif #endif @@ -1250,7 +1233,6 @@ Bool isForMsg3; RgSchPhich *phich; RgSchDlSf *dlSf; Inst inst = cell->instIdx; - TRC2(rgSCHUtlAddPhich); dlSf = rgSCHUtlSubFrmGet(cell, frm); RGSCH_PHICH_ALLOC(inst, phich,sizeof(RgSchPhich), ret); @@ -1288,13 +1270,13 @@ Bool isForMsg3; * **/ #ifdef ANSI -PRIVATE Void rgSCHUtlPhichReset +static Void rgSCHUtlPhichReset ( RgSchCellCb *cell, RgSchDlSf *subFrm ) #else -PRIVATE Void rgSCHUtlPhichReset(cell, subFrm) +static Void rgSCHUtlPhichReset(cell, subFrm) RgSchCellCb *cell; RgSchDlSf *subFrm; #endif @@ -1304,8 +1286,6 @@ RgSchDlSf *subFrm; UNUSED(cell); - TRC2(rgSCHUtlPhichReset); - phichInfo = &subFrm->phichInfo; while(phichInfo->phichs.first != NULLP) { @@ -1314,7 +1294,7 @@ RgSchDlSf *subFrm; RGSCH_PHICH_FREE(cell->instIdx, phich, sizeof(RgSchPhich)); } cmLListInit(&phichInfo->phichs); - RETVOID; + return; } /* rgSCHUtlPhichReset */ @@ -1346,9 +1326,7 @@ CmLteTimingInfo frm; #endif { RgSchDlSf *sf; - U8 dlIdx; - - TRC2(rgSCHUtlSubFrmGet); + uint8_t dlIdx; #ifdef LTE_TDD dlIdx = rgSCHUtlGetDlSfIdx(cell, &frm); @@ -1395,10 +1373,8 @@ RgSchCellCb *cell; RgSchDlSf *sf; #endif { - U8 i; - U8 noRaRsps; - - TRC2(rgSCHUtlSubFrmPut); + uint8_t i; + uint8_t noRaRsps; #ifdef LTE_TDD /* Release all the held PDCCH information */ @@ -1421,7 +1397,7 @@ RgSchDlSf *sf; } sf->spsAllocdBw = 0; sf->type2Start = sf->bwAlloced; - cmMemset((U8*) &sf->dlSfAllocInfo, 0, sizeof(RgSchDlSfAllocInfo)); + memset( &sf->dlSfAllocInfo, 0, sizeof(RgSchDlSfAllocInfo)); #else sf->bwAlloced = 0; /* Fix for ccpu00123918*/ @@ -1430,7 +1406,7 @@ RgSchDlSf *sf; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ if (cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) { - cmMemset((U8*) sf->rntpInfo.val, 0, sf->rntpInfo.len); + memset(sf->rntpInfo.val, 0, sf->rntpInfo.len); } /* LTE_ADV_FLAG_REMOVED_END */ #endif @@ -1488,7 +1464,7 @@ RgSchDlSf *sf; sf->cceCnt = 0; sf->isCceFailure = FALSE; sf->dlUlBothCmplt = 0; - RETVOID; + return; } @@ -1503,26 +1479,24 @@ RgSchDlSf *sf; * * Invoked by: Scheduler * - * @param[in] U32 n - * @return U8 + * @param[in] uint32_t n + * @return uint8_t * **/ #ifdef ANSI -U8 rgSCHUtlLog32bitNbase2 +uint8_t rgSCHUtlLog32bitNbase2 ( -U32 n +uint32_t n ) #else -U8 rgSCHUtlLog32bitNbase2(n) -U32 n; +uint8_t rgSCHUtlLog32bitNbase2(n) +uint32_t n; #endif { - U32 b[] = {0x2, 0xc, 0xf0, 0xff00, 0xffff0000}; - U32 s[] = {1, 2, 4, 8, 16}; - S16 i; - U8 ret = 0; - - TRC2(rgSCHUtlLog32bitNbase2) + uint32_t b[] = {0x2, 0xc, 0xf0, 0xff00, 0xffff0000}; + uint32_t s[] = {1, 2, 4, 8, 16}; + S16 i; + uint8_t ret = 0; for (i=4; i >= 0; i--) { @@ -1550,7 +1524,7 @@ U32 n; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 isAck + * @param[in] uint8_t isAck * @return Void * **/ @@ -1559,18 +1533,17 @@ Void rgSCHUtlDlRelPdcchFbk ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 isAck +uint8_t isAck ) #else Void rgSCHUtlDlRelPdcchFbk(cell, ue, isAck) RgSchCellCb *cell; RgSchUeCb *ue; -U8 isAck; +uint8_t isAck; #endif { - TRC2(rgSCHUtlDlRelPdcchFbk); cell->sc.apis->rgSCHDlRelPdcchFbk(cell, ue, isAck); - RETVOID; + return; } @@ -1603,9 +1576,8 @@ RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHUtlDlProcAck); cell->sc.apis->rgSCHDlProcAck(cell, hqP); - RETVOID; + return; } /** @@ -1635,10 +1607,9 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlHdlCrntiCE); cell->sc.apis->rgSCHHdlCrntiCE(cell, ue); - RETVOID; + return; } /* rgSCHUtlHdlCrntiCE */ #endif /* LTEMAC_SPS */ @@ -1649,7 +1620,7 @@ RgSchUeCb *ue; * Desc : Calculate total REGs, given a bandwidth, CFI * and number of antennas. * - * Ret : Total REGs (U16) + * Ret : Total REGs (uint16_t) * * Notes: Could optimise if bw values are limited * (taken from RRC spec) by indexing values from @@ -1661,23 +1632,22 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE U16 rgSCHUtlCalcTotalRegs +static uint16_t rgSCHUtlCalcTotalRegs ( -U8 bw, -U8 cfi, -U8 numAntna, +uint8_t bw, +uint8_t cfi, +uint8_t numAntna, Bool isEcp ) #else -PRIVATE U16 rgSCHUtlCalcTotalRegs(bw, cfi, numAntna, isEcp) -U8 bw; -U8 cfi; -U8 numAntna; +static uint16_t rgSCHUtlCalcTotalRegs(bw, cfi, numAntna, isEcp) +uint8_t bw; +uint8_t cfi; +uint8_t numAntna; Bool isEcp; #endif { - U16 regs = 0; - TRC2(rgSCHUtlCalcTotalRegs); + uint16_t regs = 0; /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1720,7 +1690,7 @@ Bool isEcp; * * Desc : Calculates number of PHICH REGs * - * Ret : Number of PHICH REGs (U8) + * Ret : Number of PHICH REGs (uint8_t) * * Notes: ng6 is Ng multiplied by 6 * @@ -1728,18 +1698,17 @@ Bool isEcp; * **********************************************************/ #ifdef ANSI -PRIVATE U16 rgSCHUtlCalcPhichRegs +static uint16_t rgSCHUtlCalcPhichRegs ( -U8 bw, -U8 ng6 +uint8_t bw, +uint8_t ng6 ) #else -PRIVATE U16 rgSCHUtlCalcPhichRegs(bw, ng6) -U8 bw; -U8 ng6; +static uint16_t rgSCHUtlCalcPhichRegs(bw, ng6) +uint8_t bw; +uint8_t ng6; #endif { - TRC2(rgSCHUtlCalcPhichRegs); /* ccpu00115330: Corrected the calculation for number of PHICH groups*/ return (RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP); } @@ -1758,40 +1727,39 @@ U8 ng6; * * Invoked by: Scheduler * - * @param[in] U8 bw - * @param[in] U8 ng6 - * @param[in] U8 cfi - * @param[in] U8 mPhich - * @param[in] U8 numAntna + * @param[in] uint8_t bw + * @param[in] uint8_t ng6 + * @param[in] uint8_t cfi + * @param[in] uint8_t mPhich + * @param[in] uint8_t numAntna * @param[in] Bool isEcp - * @return N_cce (U8) + * @return N_cce (uint8_t) * **/ #ifdef ANSI -U8 rgSCHUtlCalcNCce +uint8_t rgSCHUtlCalcNCce ( -U8 bw, +uint8_t bw, RgrPhichNg ng, -U8 cfi, -U8 mPhich, -U8 numAntna, +uint8_t cfi, +uint8_t mPhich, +uint8_t numAntna, Bool isEcp ) #else -U8 rgSCHUtlCalcNCce(bw, ng, cfi, mPhich, numAntna, isEcp) -U8 bw; +uint8_t rgSCHUtlCalcNCce(bw, ng, cfi, mPhich, numAntna, isEcp) +uint8_t bw; RgrPhichNg ng; -U8 cfi; -U8 mPhich; -U8 numAntna; +uint8_t cfi; +uint8_t mPhich; +uint8_t numAntna; Bool isEcp; #endif { - U16 totalRegs; - U16 phichRegs; - U16 cceRegs; - U8 ng6; - TRC2(rgSCHUtlCalcNCce); + uint16_t totalRegs; + uint16_t phichRegs; + uint16_t cceRegs; + uint8_t ng6; /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1816,7 +1784,7 @@ Bool isEcp; phichRegs = rgSCHUtlCalcPhichRegs(bw, ng6); cceRegs = totalRegs - mPhich*phichRegs - RGSCH_NUM_PCFICH_REG; - return ((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); + return ((uint8_t)(cceRegs/RGSCH_NUM_REG_PER_CCE)); } #else @@ -1833,36 +1801,35 @@ Bool isEcp; * * Invoked by: Scheduler * - * @param[in] U8 bw - * @param[in] U8 ng6 - * @param[in] U8 cfi - * @param[in] U8 numAntna - * @return N_cce (U8) + * @param[in] uint8_t bw + * @param[in] uint8_t ng6 + * @param[in] uint8_t cfi + * @param[in] uint8_t numAntna + * @return N_cce (uint8_t) * **/ #ifdef ANSI -U8 rgSCHUtlCalcNCce +uint8_t rgSCHUtlCalcNCce ( -U8 bw, +uint8_t bw, RgrPhichNg ng, -U8 cfi, -U8 numAntna, +uint8_t cfi, +uint8_t numAntna, Bool isEcp ) #else -U8 rgSCHUtlCalcNCce(bw, ng, cfi, numAntna, isEcp) -U8 bw; +uint8_t rgSCHUtlCalcNCce(bw, ng, cfi, numAntna, isEcp) +uint8_t bw; RgrPhichNg ng; -U8 cfi; -U8 numAntna; +uint8_t cfi; +uint8_t numAntna; Bool isEcp; #endif { - U16 totalRegs; - U16 phichRegs; - U16 cceRegs; - U8 ng6; - TRC2(rgSCHUtlCalcNCce); + uint16_t totalRegs; + uint16_t phichRegs; + uint16_t cceRegs; + uint8_t ng6; /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1887,7 +1854,7 @@ Bool isEcp; phichRegs = rgSCHUtlCalcPhichRegs(bw, ng6); cceRegs = totalRegs - phichRegs - RGSCH_NUM_PCFICH_REG; - return ((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); + return ((uint8_t)(cceRegs/RGSCH_NUM_REG_PER_CCE)); } #endif @@ -1903,8 +1870,8 @@ Bool isEcp; * comprises RB start and N_dmrs. * * @param[in] RgSchUlHqProcCb *hqProc - * @param[out] U8 *rbStartRef - * @param[out] U8 *nDmrsRef + * @param[out] uint8_t *rbStartRef + * @param[out] uint8_t *nDmrsRef * @return S16 **/ #ifdef LTE_TDD @@ -1912,38 +1879,36 @@ Bool isEcp; S16 rgSCHUtlGetPhichInfo ( RgSchUlHqProcCb *hqProc, -U8 *rbStartRef, -U8 *nDmrsRef, -U8 *iPhich +uint8_t *rbStartRef, +uint8_t *nDmrsRef, +uint8_t *iPhich ) #else S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef, iPhich) RgSchUlHqProcCb *hqProc; -U8 *rbStartRef; -U8 *nDmrsRef; -U8 *iPhich; +uint8_t *rbStartRef; +uint8_t *nDmrsRef; +uint8_t *iPhich; #endif #else #ifdef ANSI S16 rgSCHUtlGetPhichInfo ( RgSchUlHqProcCb *hqProc, -U8 *rbStartRef, -U8 *nDmrsRef +uint8_t *rbStartRef, +uint8_t *nDmrsRef ) #else S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef) RgSchUlHqProcCb *hqProc; -U8 *rbStartRef; -U8 *nDmrsRef; +uint8_t *rbStartRef; +uint8_t *nDmrsRef; #endif #endif { /* ACC-TDD */ S16 ret = RFAILED; - TRC2(rgSCHUtlGetPhichInfo); - if ((hqProc != NULLP) && (hqProc->alloc != NULLP)) { *rbStartRef = hqProc->alloc->grnt.rbStart; @@ -1971,15 +1936,15 @@ U8 *nDmrsRef; * - RV * * @param[in] RgSchUlAlloc *alloc - * @param[out] U8 *rbStartRef - * @param[out] U8 *numRbRef - * @param[out] U8 *rvRef - * @param[out] U16 *size + * @param[out] uint8_t *rbStartRef + * @param[out] uint8_t *numRbRef + * @param[out] uint8_t *rvRef + * @param[out] uint16_t *size * @param[out] TfuModScheme *modType * @param[out] Bool *isRtx - * @param[out] U8 *nDmrs + * @param[out] uint8_t *nDmrs * @param[out] Bool *ndi - * @param[out] U8 *hqPId + * @param[out] uint8_t *hqPId * @return S16 **/ #ifdef ANSI @@ -1987,16 +1952,16 @@ S16 rgSCHUtlAllocRcptInfo ( RgSchUlAlloc *alloc, CmLteRnti *rnti, -U8 *iMcsRef, -U8 *rbStartRef, -U8 *numRbRef, -U8 *rvRef, -U16 *size, +uint8_t *iMcsRef, +uint8_t *rbStartRef, +uint8_t *numRbRef, +uint8_t *rvRef, +uint16_t *size, TfuModScheme *modType, Bool *isRtx, -U8 *nDmrs, +uint8_t *nDmrs, Bool *ndi, -U8 *hqPId +uint8_t *hqPId ) #else S16 rgSCHUtlAllocRcptInfo(alloc, rnti, iMcsRef, rbStartRef, numRbRef, @@ -2004,23 +1969,22 @@ S16 rgSCHUtlAllocRcptInfo(alloc, rnti, iMcsRef, rbStartRef, numRbRef, hqPId) RgSchUlAlloc *alloc; CmLteRnti *rnti; -U8 *iMcsRef; -U8 *rbStartRef; -U8 *numRbRef; -U8 *rvRef; -U16 *size; +uint8_t *iMcsRef; +uint8_t *rbStartRef; +uint8_t *numRbRef; +uint8_t *rvRef; +uint16_t *size; TfuModScheme *modType; Bool *isRtx; -U8 *nDmrs; +uint8_t *nDmrs; Bool *ndi; -U8 *hqPId; +uint8_t *hqPId; #endif { /* Modulation order for 16qam UEs would be * min(4,modulation order in grant). Please refer to 36.213-8.6.1*/ CmLteUeCategory ueCtgy; - TRC2(rgSCHUtlAllocRcptInfo); #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { @@ -2073,10 +2037,10 @@ U8 *hqPId; * - RV * * @param[in] RgSchUlAlloc *alloc - * @param[out] U8 *rbStartRef - * @param[out] U8 *numRbRef - * @param[out] U8 *rvRef - * @param[out] U16 *size + * @param[out] uint8_t *rbStartRef + * @param[out] uint8_t *numRbRef + * @param[out] uint8_t *rvRef + * @param[out] uint16_t *size * @param[out] TfuModScheme *modType * @return S16 **/ @@ -2096,7 +2060,6 @@ CmLteTimingInfo *timeInfo; TfuUeUlSchRecpInfo *recpReq; #endif { - TRC2(rgSCHUtlAllocRcptInfo); #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { @@ -2195,24 +2158,22 @@ TfuUeUlSchRecpInfo *recpReq; * **/ #ifdef ANSI -PRIVATE Void rgSCHUtlUpdPrachOcc +static Void rgSCHUtlUpdPrachOcc ( RgSchCellCb *cell, RgrTddPrachInfo *cellCfg ) #else -PRIVATE Void rgSCHUtlUpdPrachOcc(cell, cellCfg) +static Void rgSCHUtlUpdPrachOcc(cell, cellCfg) RgSchCellCb *cell; RgrTddPrachInfo *cellCfg; #endif { - U8 idx; - U8 count = 0; - U8 size; - U8 startIdx; - U8 endIdx; - - TRC2(rgSCHUtlUpdPrachOcc) + uint8_t idx; + uint8_t count = 0; + uint8_t size; + uint8_t startIdx; + uint8_t endIdx; /* In the 1st half frame */ if(cellCfg->halfFrm == 0) @@ -2241,7 +2202,7 @@ RgrTddPrachInfo *cellCfg; count ++; } } - RETVOID; + return; } /** @@ -2272,16 +2233,15 @@ RgSchCellCb *cell; RgrCellCfg *cellCfg; #endif { - U8 idx; - U8 subfrmIdx; - U8 splFrm; + uint8_t idx; + uint8_t subfrmIdx; + uint8_t splFrm; - TRC2(rgSCHUtlPrachCfgInit) if(cellCfg->prachRscInfo.numRsc <= 0) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid" "PRACH resources Configuration "); - RETVOID; + return; } /* Update SFN occasions */ @@ -2317,7 +2277,7 @@ RgrCellCfg *cellCfg; } } } - RETVOID; + return; } /** @@ -2351,20 +2311,18 @@ RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; #endif { - U8 i; - U8 sfn=0; - U8 sfNum = 0; + uint8_t i; + uint8_t sfn=0; + uint8_t sfNum = 0; RgSchDlSf *sf; CmLteTimingInfo frm; - U8 ulDlCfgIdx = cellCfg->ulDlCfgIdx; - U8 maxslots ; - U8 maxDlslots; + uint8_t ulDlCfgIdx = cellCfg->ulDlCfgIdx; + uint8_t maxslots ; + uint8_t maxDlslots; S16 ret = ROK; - U16 bw; /*!< Number of RBs in the cell */ + uint16_t bw; /*!< Number of RBs in the cell */ - TRC2(rgSCHUtlRgrCellCfg); - - cmMemset((U8 *)&frm,0,sizeof(CmLteTimingInfo)); + memset(&frm,0,sizeof(CmLteTimingInfo)); /* ccpu00132657-MOD- Determining DLSF array size independent of DELTAS */ maxDlslots = rgSchTddNumDlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -2422,7 +2380,7 @@ RgSchErrInfo *errInfo; { break; } - cmMemset((U8 *)sf, 0, sizeof(*sf)); + memset(sf, 0, sizeof(*sf)); #ifdef LTE_ADV if (ROK != rgSCHLaaInitDlSfCb(cell, sf)) @@ -2533,18 +2491,17 @@ RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; #endif { - U8 i; + uint8_t i; RgSchDlSf *sf; CmLteTimingInfo frm; S16 ret; Inst inst = cell->instIdx; /* LTE_ADV_FLAG_REMOVED_START */ - U16 len; - len = (U16)((cell->bwCfg.dlTotalBw % 8 == 0) ? (cell->bwCfg.dlTotalBw/8) : (cell->bwCfg.dlTotalBw/8 + 1)); /*KW fix for LTE_ADV */ + uint16_t len; + len = (uint16_t)((cell->bwCfg.dlTotalBw % 8 == 0) ? (cell->bwCfg.dlTotalBw/8) : (cell->bwCfg.dlTotalBw/8 + 1)); /*KW fix for LTE_ADV */ /* LTE_ADV_FLAG_REMOVED_END */ - TRC2(rgSCHUtlRgrCellCfg); - cmMemset((U8 *)&frm,0,sizeof(CmLteTimingInfo)); + memset(&frm,0,sizeof(CmLteTimingInfo)); /* determine the RBG size and no of RBGs for the configured * DL BW */ @@ -2575,7 +2532,7 @@ RgSchErrInfo *errInfo; { break; } - cmMemset((U8 *)sf, 0, sizeof(*sf)); + memset(sf, 0, sizeof(*sf)); #ifdef LTE_ADV if (ROK != rgSCHLaaInitDlSfCb(cell, sf)) @@ -2617,7 +2574,7 @@ RgSchErrInfo *errInfo; if (cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) { if((rgSCHUtlAllocSBuf(inst, (Data**)&(cell->rntpAggrInfo.val), - (len * sizeof(U8)))) != ROK) + (len * sizeof(uint8_t)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for RNTP Alloc"); return RFAILED; @@ -2721,7 +2678,6 @@ RgrCellRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrCellRecfg); return (cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err)); } @@ -2753,19 +2709,18 @@ S16 rgSCHUtlFreeCell(cell) RgSchCellCb *cell; #endif { - U8 i; + uint8_t i; CmLListCp *lst; RgSchPdcch *pdcch; RgSchPdcchInfo *pdcchInfo; RgSchPhichInfo *phichInfo; RgSchPhich *phich; Inst inst = cell->instIdx; - U8 maxslots; + uint8_t maxslots; #ifdef LTE_TDD RgSchRaReqInfo *raReqInfo; - U8 idx; + uint8_t idx; #endif - TRC2(rgSCHUtlFreeCell); #ifdef LTE_TDD maxslots = cell->numDlSubfrms; @@ -2909,7 +2864,6 @@ RgrUeCfg *cfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrUeCfg); /* Assign TM 1 as UE's default TM */ ue->mimoInfo.txMode = RGR_UE_TM_1; @@ -2942,7 +2896,7 @@ RgSchErrInfo *err; #endif ue->csgMmbrSta = cfg->csgMmbrSta; #ifdef RG_PFS_STATS - cmMemset((U8 *)&ue->pfsStats, 0, sizeof(RgSchPfsStats)); + memset(&ue->pfsStats, 0, sizeof(RgSchPfsStats)); #endif /* Call the handler of the scheduler based on cell configuration */ return (cell->sc.apis->rgSCHRgrUeCfg(cell, ue, cfg, err)); @@ -2987,7 +2941,6 @@ RgrLchCfg *cfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHUtlRgrLcCfg); return (cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo)); } @@ -3030,7 +2983,6 @@ RgrLchRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrLcRecfg); return (cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err)); } @@ -3047,7 +2999,7 @@ RgSchErrInfo *err; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * @param[in] CmLteLcId lcId - * @param[in] U8 lcgId + * @param[in] uint8_t lcgId * @return S16 * **/ @@ -3057,17 +3009,16 @@ S16 rgSCHUtlRgrLcDel RgSchCellCb *cell, RgSchUeCb *ue, CmLteLcId lcId, -U8 lcgId +uint8_t lcgId ) #else S16 rgSCHUtlRgrLcDel(cell, ue, lcId, lcgId) RgSchCellCb *cell; RgSchUeCb *ue; CmLteLcId lcId; -U8 lcgId; +uint8_t lcgId; #endif { - TRC2(rgSCHUtlRgrLcDel); cell->sc.apis->rgSCHRgrLchDel(cell, ue, lcId, lcgId); return (ROK); @@ -3108,7 +3059,6 @@ RgrLcgCfg *cfg; RgSchErrInfo *errInfo; #endif { - TRC2(rgSCHUtlRgrLcgCfg); return (cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo)); } @@ -3148,7 +3098,6 @@ RgrLcgRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlRgrLcgRecfg); return (cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err)); } /* rgSCHUtlRgrLcRecfg */ @@ -3175,20 +3124,19 @@ Void rgSCHUtlRgrLcgDel ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 lcgId +uint8_t lcgId ) #else Void rgSCHUtlRgrLcgDel(cell, ue, lcgId) RgSchCellCb *cell; RgSchUeCb *ue; -U8 lcgId; +uint8_t lcgId; #endif { - TRC2(rgSCHUtlRgrLcgDel); cell->sc.apis->rgSCHFreeLcg(cell, ue, &ue->ul.lcgArr[lcgId]); /* Stack Crash problem for TRACE5 changes. added the return below . */ - RETVOID; + return; } /* rgSCHUtlRgrLcgDel */ @@ -3225,10 +3173,9 @@ RgSchUeCb *ue; TfuDoaRpt *doaRpt; #endif { - TRC2(rgSCHUtlDoaInd); ue->mimoInfo.doa.pres = PRSNT_NODEF; ue->mimoInfo.doa.val = doaRpt->doa; - RETVOID; + return; } /** @@ -3265,7 +3212,6 @@ CmLteTimingInfo timingInfo; #endif { RgSchCellCb *sCellCb = NULLP; - TRC2(rgSCHUtlDlCqiInd); if (dlCqiRpt->isPucchInfo) { sCellCb = ue->cellInfo[dlCqiRpt->dlCqiInfo.pucchCqi.cellIdx]->cell; @@ -3274,7 +3220,7 @@ CmLteTimingInfo timingInfo; } else { - U32 idx; + uint32_t idx; for (idx = 0; idx < dlCqiRpt->dlCqiInfo.pusch.numOfCells; idx++) { sCellCb = ue->cellInfo[dlCqiRpt->dlCqiInfo.pusch.puschCqi[idx].cellIdx]->cell; @@ -3282,7 +3228,7 @@ CmLteTimingInfo timingInfo; (Void *)&dlCqiRpt->dlCqiInfo.pusch.puschCqi[idx], timingInfo); } } - RETVOID; + return; } @@ -3320,9 +3266,8 @@ TfuSrsRpt *srsRpt; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlSrsInd); cell->sc.apis->rgSCHSrsInd(cell, ue, srsRpt, timingInfo); - RETVOID; + return; } #endif @@ -3353,9 +3298,8 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlDlTARpt); cell->sc.apis->rgSCHDlTARpt(cell, ue); - RETVOID; + return; } @@ -3386,9 +3330,8 @@ RgSchCellCb *cell; CmLteTimingInfo subFrm; #endif { - TRC2(rgSCHUtlDlRlsSubFrm); cell->sc.apis->rgSCHDlRlsSubFrm(cell, subFrm); - RETVOID; + return; } #ifdef TFU_UPGRADE @@ -3407,7 +3350,7 @@ CmLteTimingInfo subFrm; * grant req for APERCQI to SCH. * * @param[in] RgSchUeCb *ue - * @param[in] U8 isAck + * @param[in] uint8_t isAck * * @return Void **/ @@ -3416,22 +3359,20 @@ Void rgSCHUtlUpdACqiTrigWt ( RgSchUeCb *ue, RgSchUeCellInfo *cellInfo, -U8 isAck +uint8_t isAck ) #else Void rgSCHUtlUpdACqiTrigWt(ue,cellInfo, isAck) RgSchUeCb *ue; RgSchUeCellInfo *cellInfo; -U8 isAck; +uint8_t isAck; #endif { #ifdef LTE_ADV - U8 triggerSet = 0; - U8 sIdx = 0; + uint8_t triggerSet = 0; + uint8_t sIdx = 0; #endif - TRC2(rgSCHUtlUpdACqiTrigWt); - if (isAck == TFU_HQFDB_ACK) { cellInfo->acqiCb.aCqiTrigWt += RG_APER_CQI_ACK_WGT; @@ -3451,7 +3392,7 @@ U8 isAck; /* Already one ACQI trigger procedure is going on * which is not yet satisfied. Delaying this request till * the previous is getting satisfied*/ - RETVOID; + return; } ue->dl.reqForCqi = TRUE; @@ -3476,7 +3417,7 @@ U8 isAck; rgSCHUtlSrRcvd(cell, ue, cell->crntTime, &unUsed); } - RETVOID; + return; } #endif @@ -3508,9 +3449,8 @@ RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlUlTransInd); cell->sc.apis->rgSCHHdlUlTransInd(cell, ue, timingInfo); - RETVOID; + return; } #ifdef LTEMAC_SPS /** @@ -3541,9 +3481,8 @@ RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlCrcFail); cell->sc.apis->rgSCHUlCrcInd(cell, ue, timingInfo); - RETVOID; + return; } /* end of rgSCHUtlHdlCrcFailInd */ /** @@ -3574,9 +3513,8 @@ RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHUtlHdlCrcFail); cell->sc.apis->rgSCHUlCrcFailInd(cell, ue, timingInfo); - RETVOID; + return; } /* end of rgSCHUtlHdlCrcFailInd */ #endif /* LTEMAC_SPS */ @@ -3610,9 +3548,8 @@ RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHUtlDlProcAddToRetx); cell->sc.apis->rgSCHDlProcAddToRetx(cell, hqP); - RETVOID; + return; } @@ -3629,7 +3566,7 @@ RgSchDlHqProcCb *hqP; * * @param[in] RgSubFrm* subFrm * @param[in] RgDlHqProc* hqP - * @param[in] U8 tbIdx + * @param[in] uint8_t tbIdx * @return Void * **/ @@ -3638,13 +3575,13 @@ Void rgSCHUtlDlHqPTbAddToTx ( RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP, -U8 tbIdx +uint8_t tbIdx ) #else Void rgSCHUtlDlHqPTbAddToTx(subFrm, hqP, tbIdx) RgSchDlSf *subFrm; RgSchDlHqProcCb *hqP; -U8 tbIdx; +uint8_t tbIdx; #endif { RgSchUeCb *ue = NULLP; @@ -3673,7 +3610,7 @@ U8 tbIdx; cmLListAdd2Tail(&ue->dl.dlSfHqInfo[cell->cellId][subFrm->dlIdx].hqPLst,&hqP->hqPSfLnk); #ifdef CA_DBG { - extern U32 gSCellSchedCount,gPrimarySchedCount; + uint32_t gSCellSchedCount,gPrimarySchedCount; if(RG_SCH_IS_CELL_SEC(hqP->hqE->ue,hqP->hqE->cell)) { gSCellSchedCount++; @@ -3704,7 +3641,7 @@ U8 tbIdx; hqP->subFrm = subFrm; /* CA Dev End */ - RETVOID; + return; } @@ -3722,7 +3659,7 @@ U8 tbIdx; * * @param[in] RgSubFrm* subFrm * @param[in] RgDlHqProc* hqP - * @param[in] U8 tbIdx + * @param[in] uint8_t tbIdx * @param[in] Bool isRepeting * @return Void * @@ -3732,14 +3669,14 @@ Void rgSCHUtlDlHqPTbRmvFrmTx ( RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP, -U8 tbIdx, +uint8_t tbIdx, Bool isRepeting ) #else Void rgSCHUtlDlHqPTbRmvFrmTx(subFrm, hqP, tbIdx, isRepeting) RgSchDlSf *subFrm; RgSchDlHqProcCb *hqP; -U8 tbIdx; +uint8_t tbIdx; Bool isRepeting; #endif { @@ -3781,7 +3718,7 @@ Bool isRepeting; } hqP->subFrm = NULLP; } - RETVOID; + return; } #ifdef LTE_ADV @@ -3802,18 +3739,16 @@ Bool isRepeting; RgSchCellCb* rgSchUtlGetCellCb ( Inst inst, - U16 cellId + uint16_t cellId ) #else RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) Inst inst; - U16 cellId; + uint16_t cellId; #endif { RgSchCellCb *cellCb = NULLP; - U8 strtCellId; - - TRC2(rgSchUtlGetCellCb); + uint8_t strtCellId; strtCellId = rgSchCb[inst].genCfg.startCellId; cellCb = rgSchCb[inst].cells[cellId - strtCellId]; @@ -3832,26 +3767,24 @@ RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) * * @param[in] *cellId * @param[in] RgSchUeCb *ue - * @return U8 servCellIdx + * @return uint8_t servCellIdx **/ #ifdef ANSI -U8 rgSchUtlGetServCellIdx +uint8_t rgSchUtlGetServCellIdx ( Inst inst, - U16 cellId, + uint16_t cellId, RgSchUeCb *ue ) #else -U8 rgSchUtlGetServCellIdx(inst,cellId,ue) +uint8_t rgSchUtlGetServCellIdx(inst,cellId,ue) Inst inst; - U16 cellId; + uint16_t cellId; RgSchUeCb *ue; #endif { - U8 servCellIdx; - U16 strtCellId; - - TRC2(rgSchUtlGetCellCb); + uint8_t servCellIdx; + uint16_t strtCellId; strtCellId = rgSchCb[inst].genCfg.startCellId; @@ -3877,17 +3810,15 @@ U8 rgSchUtlGetServCellIdx(inst,cellId,ue) S16 rgSchUtlVldtCellId ( Inst inst, - U16 cellId + uint16_t cellId ) #else S16 rgSchUtlVldtCellId(inst, cellId) Inst inst; - U16 cellId; + uint16_t cellId; #endif { - U8 strtCellId; - - TRC2(rgSchUtlVldtCellId); + uint8_t strtCellId; strtCellId = rgSchCb[inst].genCfg.startCellId; if((cellId >= strtCellId) && ((cellId - strtCellId) < CM_LTE_MAX_CELLS)) @@ -3935,8 +3866,6 @@ RgSchErrInfo *err; /* Changes for UE Category Reconfiguration feature addition */ RgSchCmnUe *ueSch = RG_SCH_CMN_GET_UE(ue, cell); - TRC2(rgSCHUtlRgrUeRecfg); - /* Changes for UE Category Reconfiguration feature addition */ if (ueRecfg->ueRecfgTypes & RGR_UE_UECAT_RECFG) { @@ -4028,11 +3957,10 @@ RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { - TRC2(rgSCHUtlFreeDlLc); cell->sc.apis->rgSCHFreeDlLc(cell, ue, svc); /* Stack Crash problem for TRACE5 changes. added the return below . */ - RETVOID; + return; } @@ -4062,14 +3990,13 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlFreeUe); #ifdef LTE_TDD rgSCHUtlDelUeANFdbkInfo(ue,RGSCH_PCELL_INDEX); #endif cell->sc.apis->rgSCHFreeUe(cell, ue); /* Stack Crash problem for TRACE5 changes. added the return below . */ - RETVOID; + return; } /* rgSCHUtlFreeUe */ @@ -4103,9 +4030,8 @@ RgSchUeCb *ue; RgSchDlLcCb *lc; #endif { - TRC2(rgSCHUtlDlDedBoUpd); cell->sc.apis->rgSCHDlDedBoUpd(cell, ue, lc); - RETVOID; + return; } /** * @brief Record MSG3 allocation into the UE @@ -4136,9 +4062,8 @@ RgSchUeCb *ue; RgSchRaCb *raCb; #endif { - TRC2(rgSCHUtlRecMsg3Alloc) cell->sc.apis->rgSCHUlRecMsg3Alloc(cell, ue, raCb); - RETVOID; + return; } /* rgSCHRecMsg3Alloc */ @@ -4175,7 +4100,6 @@ RgSchUlHqProcCb *curProc; RgSchUlHqProcCb *oldProc; #endif { - TRC2(rgSCHUtlUpdUlHqProc); return (cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc)); } /* rgSCHUtlUpdUlHqProc */ #endif @@ -4210,8 +4134,6 @@ RgSchUeCb *ue; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlContResUlGrant); - ue->isMsg4PdcchWithCrnti = TRUE; @@ -4250,7 +4172,6 @@ CmLteTimingInfo frm; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlSrRcvd); return (cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err)); } /* rgSCHUtlSrRcvd */ @@ -4265,8 +4186,8 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 lcgId - * @param[in] U8 bsr + * @param[in] uint8_t lcgId + * @param[in] uint8_t bsr * @param[out] RgSchErrInfo *err * @return Void * -# ROK @@ -4277,22 +4198,21 @@ Void rgSCHUtlUpdBsrShort ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 lcgId, -U8 bsr, +uint8_t lcgId, +uint8_t bsr, RgSchErrInfo *err ) #else Void rgSCHUtlUpdBsrShort(cell, ue, lcgId, bsr, err) RgSchCellCb *cell; RgSchUeCb *ue; -U8 lcgId; -U8 bsr; +uint8_t lcgId; +uint8_t bsr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdBsrShort); cell->sc.apis->rgSCHUpdBsrShort(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); - RETVOID; + return; } /* rgSCHUtlUpdBsrShort */ @@ -4308,8 +4228,8 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 lcgId - * @param[in] U8 bsr + * @param[in] uint8_t lcgId + * @param[in] uint8_t bsr * @param[out] RgSchErrInfo *err * @return Void * -# ROK @@ -4320,22 +4240,21 @@ Void rgSCHUtlUpdBsrTrunc ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 lcgId, -U8 bsr, +uint8_t lcgId, +uint8_t bsr, RgSchErrInfo *err ) #else Void rgSCHUtlUpdBsrTrunc(cell, ue, lcgId, bsr, err) RgSchCellCb *cell; RgSchUeCb *ue; -U8 lcgId; -U8 bsr; +uint8_t lcgId; +uint8_t bsr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdBsrTrunc); cell->sc.apis->rgSCHUpdBsrTrunc(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); - RETVOID; + return; } /* rgSCHUtlUpdBsrTrunc */ @@ -4353,10 +4272,10 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 bsr0 - * @param[in] U8 bsr1 - * @param[in] U8 bsr2 - * @param[in] U8 bsr3 + * @param[in] uint8_t bsr0 + * @param[in] uint8_t bsr1 + * @param[in] uint8_t bsr2 + * @param[in] uint8_t bsr3 * @param[out] RgSchErrInfo *err * @return Void * -# ROK @@ -4367,32 +4286,31 @@ Void rgSCHUtlUpdBsrLong ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 bsr0, -U8 bsr1, -U8 bsr2, -U8 bsr3, +uint8_t bsr0, +uint8_t bsr1, +uint8_t bsr2, +uint8_t bsr3, RgSchErrInfo *err ) #else Void rgSCHUtlUpdBsrLong(cell, ue, bsr0, bsr1, bsr2, bsr3, err) RgSchCellCb *cell; RgSchUeCb *ue; -U8 bsr0; -U8 bsr1; -U8 bsr2; -U8 bsr3; +uint8_t bsr0; +uint8_t bsr1; +uint8_t bsr2; +uint8_t bsr3; RgSchErrInfo *err; #endif { - U8 bsArr[4]; - TRC2(rgSCHUtlUpdBsrLong); + uint8_t bsArr[4]; bsArr[0] = bsr0; bsArr[1] = bsr1; bsArr[2] = bsr2; bsArr[3] = bsr3; cell->sc.apis->rgSCHUpdBsrLong(cell, ue, bsArr, err); - RETVOID; + return; } /* rgSCHUtlUpdBsrLong */ /** @@ -4406,7 +4324,7 @@ 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 @@ -4428,7 +4346,6 @@ RgInfExtPhrCEInfo * extPhr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdExtPhr); return (cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err)); } /* rgSCHUtlUpdExtPhr */ @@ -4445,7 +4362,7 @@ 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 @@ -4456,18 +4373,17 @@ S16 rgSCHUtlUpdPhr ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 phr, +uint8_t phr, RgSchErrInfo *err ) #else S16 rgSCHUtlUpdPhr(cell, ue, phr, err) RgSchCellCb *cell; RgSchUeCb *ue; -U8 phr; +uint8_t phr; RgSchErrInfo *err; #endif { - TRC2(rgSCHUtlUpdPhr); return (cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err)); } /* rgSCHUtlUpdPhr */ @@ -4501,9 +4417,8 @@ RgSchUeCb *ue; TfuUlCqiRpt *ulCqiInfo; #endif { - TRC2(rgSCHUtlUlCqiInd); cell->sc.apis->rgSCHUlCqiInd(cell, ue, ulCqiInfo); - RETVOID; + return; } /* rgSCHUtlUlCqiInd */ /** @@ -4518,7 +4433,7 @@ TfuUlCqiRpt *ulCqiInfo; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 delta + * @param[in] uint8_t delta * @return Void **/ #ifdef ANSI @@ -4535,9 +4450,8 @@ RgSchUeCb *ue; S8 delta; #endif { - TRC2(rgSCHUtlPucchDeltaPwrInd); cell->sc.apis->rgSCHPucchDeltaPwrInd(cell, ue, delta); - RETVOID; + return; } /* rgSCHUtlPucchDeltaPwrInd */ /* Start: LTEMAC_2.1_DEV_CFG */ @@ -4565,10 +4479,9 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlUeReset); ue->remBoCnt = 0; cell->sc.apis->rgSCHUeReset(cell, ue); - RETVOID; + return; } /* rgSCHUtlUeReset */ /* End: LTEMAC_2.1_DEV_CFG */ @@ -4607,11 +4520,10 @@ RgSchUeCb *ue; RgSchUlHqProcCb **procRef; #endif { - TRC2(rgSCHUtlUlHqProcForUe); cell->sc.apis->rgSCHUlHqProcForUe(cell, frm, ue, procRef); /* Stack Crash problems for TRACE5 changes. added the return below */ - RETVOID; + return; } @@ -4642,7 +4554,6 @@ RgSchUlAlloc *rgSCHUtlFirstRcptnReq(cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHUtlFirstRcptnReq); return (cell->sc.apis->rgSCHFirstRcptnReq(cell)); } @@ -4675,7 +4586,6 @@ RgSchCellCb *cell; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlNextRcptnReq); return (cell->sc.apis->rgSCHNextRcptnReq(cell, alloc)); } @@ -4694,22 +4604,21 @@ RgSchUlAlloc *alloc; * Invoked by: TOM * * @param[in] RgSchCellCb *cell - * @param[in] U8 idx + * @param[in] uint8_t idx * @return RgSchUlAlloc* **/ #ifdef ANSI RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc ( RgSchCellCb *cell, -U8 idx +uint8_t idx ) #else RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc(cell, idx) RgSchCellCb *cell; -U8 idx; +uint8_t idx; #endif { - TRC2(rgSCHUtlFirstHqFdbkAlloc); return (cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx)); } @@ -4734,16 +4643,15 @@ RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc ( RgSchCellCb *cell, RgSchUlAlloc *alloc, -U8 idx +uint8_t idx ) #else RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc(cell, alloc, idx) RgSchCellCb *cell; RgSchUlAlloc *alloc; -U8 idx; +uint8_t idx; #endif { - TRC2(rgSCHUtlNextHqFdbkAlloc); return (cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx)); } @@ -4784,11 +4692,10 @@ SpId spId; S16 ret; RgSchLowSapCb *tfuSap; Pst pst; - TRC2(rgSCHUtlTfuBndReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[instId].tfuSap[suId]); - (Void)cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuSchBndReq (&pst, suId, spId)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlTfuBndReq() Call to RgLiTfuBndReq()" @@ -4829,10 +4736,8 @@ Reason reason; S16 ret; Pst pst; - TRC2(rgSCHUtlTfuUBndReq); - /* Get the lower SAP control block from the layer control block. */ - cmMemcpy ((U8*)&pst, (U8*)&(sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuSchUbndReq (&pst, sapCfg.spId, reason)) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuUBndReq() Call to" @@ -4870,12 +4775,11 @@ Bool resetCmnLcInfo; Bool restAlloc; #endif { - TRC2(rgSCHUtlResetSfAlloc); if(TRUE == restAlloc) { if(sfAlloc->ueInfo.numUes) { - cmMemset((U8 *)sfAlloc->ueInfo.allocInfo,0x00, + memset(sfAlloc->ueInfo.allocInfo,0x00, (sizeof(RgInfUeAlloc)*sfAlloc->ueInfo.numUes)); } sfAlloc->ueInfo.numUes = 0; @@ -4913,9 +4817,8 @@ S16 rgSCHUtlGetRlsHqAlloc(cell) RgSchCellCb *cell; #endif { - U8 idx = 0; + uint8_t idx = 0; Inst inst = cell->instIdx; - TRC2(rgSCHUtlGetRlsHqAlloc); for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) { cell->rlsHqArr[idx].cellId = cell->cellId; @@ -4962,9 +4865,8 @@ S16 rgSCHUtlPutRlsHqAlloc(cell) RgSchCellCb *cell; #endif { - U8 idx = 0; + uint8_t idx = 0; Inst inst = cell->instIdx; - TRC2(rgSCHUtlPutRlsHqAlloc); for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) { @@ -5010,11 +4912,10 @@ S16 rgSCHUtlGetSfAlloc(cell) RgSchCellCb *cell; #endif { - U8 idx; - U8 indx; + uint8_t idx; + uint8_t indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHUtlGetSfAlloc); #ifdef LTE_TDD for(idx=0; idx < RGSCH_SF_ALLOC_SIZE; idx++) @@ -5092,11 +4993,10 @@ S16 rgSCHUtlPutSfAlloc(cell) RgSchCellCb *cell; #endif { - U8 idx; - U8 indx; + uint8_t idx; + uint8_t indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHUtlPutSfAlloc); #ifdef LTE_TDD for(idx=0; idx < RGSCH_SF_ALLOC_SIZE; idx++) @@ -5176,8 +5076,6 @@ Size size; /* size */ { /* Moving alarm diagnostics to available scope */ - TRC2(rgSCHUtlAllocSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; @@ -5210,7 +5108,7 @@ Size size; /* size */ /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); return ROK; @@ -5225,7 +5123,7 @@ Size size; /* size */ * previously allocated by rgSCHUtlAllocSBuf() and size. It * deallocates the memory. * -* Ret: RETVOID +* Ret: void * * Notes: None * File: rg_utl.c @@ -5247,11 +5145,9 @@ Size size; /* size */ S16 ret; - TRC2(rgSCHUtlFreeSBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { - RETVOID; + return; } @@ -5267,13 +5163,13 @@ Size size; /* size */ RGSCHLOGERROR(inst, ERRCLS_DEBUG, ERG016, (ErrVal) 0, "rgSCHUtlFreeSBuf failed.\n"); RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHUtlFreeSBuf failed"); - RETVOID; + return; } /* ccpu00117052 - ADD - Assigning the pointer to NULLP */ *data = NULLP; - RETVOID; + return; } /* end of rgSCHUtlFreeSBuf */ @@ -5284,7 +5180,7 @@ Size size; /* size */ * * Desc: This is used to deallocate Warning SI Seg. * -* Ret: RETVOID +* Ret: void * * Notes: None * @@ -5307,8 +5203,6 @@ CmLListCp *siPduLst; CmLList *node; Buffer *pdu; - TRC2(rgSCHUtlFreeWarningSiSeg) - while (siPduLst->first != NULLP) { node = siPduLst->first; @@ -5319,7 +5213,7 @@ CmLListCp *siPduLst; node = NULLP; } - RETVOID; + return; } /* end of rgSCHUtlFreeWarningSiSeg */ @@ -5329,7 +5223,7 @@ CmLListCp *siPduLst; * * Desc: This is used to deallocate Warning SI PDU. * -* Ret: RETVOID +* Ret: void * * Notes: None * @@ -5350,15 +5244,13 @@ RgSchCellCb *cell; RgSchWarningSiInfo *warningSi; RgSchWarningSiPdu *warningSiPdu; - TRC2(rgSCHUtlFreeWarningSiPdu) - warningSi = (RgSchWarningSiInfo *) cell->siCb.\ siArray[cell->siCb.siCtx.siId-1].si; /* ccpu00136659: CMAS ETWS design changes */ CM_LLIST_FIRST_NODE(&warningSi->warningSiMsg.segLstCp, node); if (node == NULLP) { - RETVOID; + return; } warningSiPdu = (RgSchWarningSiPdu *)node->node; @@ -5376,7 +5268,7 @@ RgSchCellCb *cell; warningSi->warningSiMsg.transId, RGR_CFG_CFM_TX_COMPLETE); } - RETVOID; + return; } /* end of rgSCHUtlFreeWarningSiPdu */ @@ -5408,10 +5300,8 @@ RgSchCellCb *cell; Buffer *pdu; CmLList *node; - TRC2(rgSCHUtlGetWarningSiPdu) - - warningSi = (RgSchWarningSiInfo *) cell->siCb. - siArray[cell->siCb.siCtx.siId-1].si; + warningSi = (RgSchWarningSiInfo *) cell->siCb. + siArray[cell->siCb.siCtx.siId-1].si; /* ccpu00136659: CMAS ETWS design changes */ CM_LLIST_FIRST_NODE(&warningSi->warningSiMsg.segLstCp, node); if (node != NULLP) @@ -5443,15 +5333,15 @@ RgSchCellCb *cell; S16 rgSCHUtlGetMcsAndNPrb ( RgSchCellCb *cell, -U8 *nPrb, -U8 *mcs, +uint8_t *nPrb, +uint8_t *mcs, MsgLen *msgLen ) #else S16 rgSCHUtlGetMcsAndNPrb(cell, nPrb, mcs, msgLen) RgSchCellCb *cell; -U8 *nPrb; -U8 *mcs; +uint8_t *nPrb; +uint8_t *mcs; MsgLen *msgLen; #endif { @@ -5459,8 +5349,6 @@ MsgLen *msgLen; RgSchWarningSiPdu *warningSiPdu; CmLList *node; - TRC2(rgSCHUtlGetMcsAndNPrb) - if(cell->siCb.siCtx.warningSiFlag == FALSE) { *mcs = cell->siCb.crntSiInfo.siInfo[cell->siCb.siCtx.siId-1].mcs; @@ -5504,22 +5392,20 @@ MsgLen *msgLen; S16 rgSCHUtlCalMcsAndNPrb ( RgSchCellCb *cell, -U8 cfgType, +uint8_t cfgType, MsgLen msgLen, -U8 siId +uint8_t siId ) #else S16 rgSCHUtlCalMcsAndNPrb(cell, nPrb, mcs, msgLen) RgSchCellCb *cell; -U8 cfgType; +uint8_t cfgType; MsgLen msgLen; -U8 siId; +uint8_t siId; #endif { - U8 mcs = 0; - U8 nPrb = 0; - - TRC2(rgSCHUtlCalMcsAndNPrb) + uint8_t mcs = 0; + uint8_t nPrb = 0; /*Get the nPrb and mcs parametr values */ if (rgSCHUtlGetAllwdCchTbSz(msgLen*8, &nPrb, &mcs) != (msgLen*8)) @@ -5594,22 +5480,20 @@ Void rgSCHUtlFillDgnParams ( Inst inst, RgUstaDgn *dgn, -U8 dgnType +uint8_t dgnType ) #else Void rgSCHUtlFillDgnParams(inst, dgn, dgnType) Inst inst; RgUstaDgn *dgn; -U8 dgnType; +uint8_t dgnType; #endif { - TRC2(rgSCHUtlFillDgnParams) - switch(dgnType) { case LRG_USTA_DGNVAL_MEM: - dgn->type = (U8) LRG_USTA_DGNVAL_MEM; + dgn->type = (uint8_t) LRG_USTA_DGNVAL_MEM; dgn->u.mem.region = rgSchCb[inst].rgSchInit.region; dgn->u.mem.pool = rgSchCb[inst].rgSchInit.pool; break; @@ -5618,7 +5502,7 @@ U8 dgnType; break; } - RETVOID; + return; } /* end of rgSCHUtlFillDgnParams */ /*********************************************************** @@ -5651,7 +5535,6 @@ RgSchCb *schCb; Inst macInst; #endif { - TRC2(rgSCHUtlGetPstToLyr); /* Only the needed params are filled */ pst->region = schCb->rgSchInit.region; @@ -5668,7 +5551,7 @@ Inst macInst; pst->intfVer = 0; pst->route = RTESPEC; - RETVOID; + return; } /* end of rgSCHUtlGetPstToLyr */ /** @brief This function fills in the common lc information to be sent to MAC @@ -5701,7 +5584,6 @@ CmLteLcId lcId; Bool sendInd; #endif { - TRC2(rgSCHUtlFillRgInfCmnLcInfo); if((sf->bch.tbSize)&& !(sfAlloc->cmnLcInfo.bitMask & RGINF_BCH_INFO)) @@ -5762,17 +5644,15 @@ RgInfSfAlloc *sfAlloc; RgSchCellCb *cell; #endif { - U8 idx; + uint8_t idx; CmLListCp *lnkLst; CmLList *tmp; RgSchRaCb *raCb; RgSchUeCb *ue; RgInfRaRntiInfo *raRntiAlloc; - U8 noRaRsps; + uint8_t noRaRsps; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHUtlFillRgInfRarInfo); - #ifdef LTE_TDD noRaRsps = RGSCH_MAX_TDD_RA_RSP_ALLOC; #else @@ -5901,7 +5781,6 @@ TfuPdschDciInfo *pdsch; TfuDciInfo *pdcchDci; #endif { - TRC2(rgSCHUtlFillPdschDciInfo) #ifdef EMTC_ENABLE S16 ret = ROK; @@ -5976,7 +5855,7 @@ Void rgSchDSFRPwrCheck Bool *isAllUePwrHigh ) #else -PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) +static Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) RgSchDlSf *sf; Bool *isAllUePwrHigh; @@ -5987,8 +5866,6 @@ PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) CmLListCp *l; CmLList *n; - TRC2(rgSchDSFRPwrCheck); - l = &sf->sfrTotalPoolInfo.ccPool; n = cmLListFirst(l); while(n) @@ -6017,7 +5894,7 @@ PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) * Desc : Utility Function to fill the allocation info of each Tb * * - * Ret : RETVOID + * Ret : void * * * Notes: This function should be called while sending a msg from @@ -6027,35 +5904,35 @@ PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHUtlFillRgInfTbInfo +static Void rgSCHUtlFillRgInfTbInfo ( RgSchDlHqProcCb *hqP, RgInfUeAlloc *allocInfo, RgSchCellCb *cell ) #else -PRIVATE Void rgSCHUtlFillRgInfTbInfo (hqP, allocInfo, cell) +static Void rgSCHUtlFillRgInfTbInfo (hqP, allocInfo, cell) RgSchDlHqProcCb *hqP; RgInfUeAlloc *allocInfo; RgSchCellCb *cell; #endif { RgSchDlSf *sf; - U8 idx; + uint8_t idx; RgInfUeTbInfo *tbInfo; - U8 tbCnt; + uint8_t tbCnt; /* LTE_ADV_FLAG_REMOVED_START */ #ifdef TFU_UPGRADE - PRIVATE U32 tmpCnt = 0; + static uint32_t tmpCnt = 0; Bool isAllUePwrHigh = FALSE; #endif /* LTE_ADV_FLAG_REMOVED_END */ RgSchDlLcCb *dlLcCb = NULLP; - U16 rlcHdrEstmt; - U8 lcId; + uint16_t rlcHdrEstmt; + uint8_t lcId; /* RRM_RBC_X */ #ifdef LTE_L2_MEAS - U8 prbUsed = 0; + uint8_t prbUsed = 0; #endif /* RRM_RBC_Y */ @@ -6145,7 +6022,7 @@ RgSchCellCb *cell; #ifdef TFU_UPGRADE /*if SFR is enabled*/ - allocInfo->isEnbSFR = (U8)RG_SCH_CMN_IS_SFR_ENB(ue->cell); /* KW fix for LTE_ADV */ + allocInfo->isEnbSFR = (uint8_t)RG_SCH_CMN_IS_SFR_ENB(ue->cell); /* KW fix for LTE_ADV */ if((ue->cell->lteAdvCb.dsfrCfg.status == RGR_ENABLE) && (ue->lteAdvUeCb.rgrLteAdvUeCfg.isUeCellEdge == FALSE)) { @@ -6153,7 +6030,7 @@ RgSchCellCb *cell; } if(isAllUePwrHigh) { - allocInfo->pa = (U8)ue->cell->lteAdvCb.sfrCfg.pwrThreshold.pHigh; /* KW fix for LTE_ADV */ + allocInfo->pa = (uint8_t)ue->cell->lteAdvCb.sfrCfg.pwrThreshold.pHigh; /* KW fix for LTE_ADV */ if(tmpCnt++ == 100000) { RLOG_ARG2(L_DEBUG,DBG_CELLID,ue->cell->cellId, @@ -6301,7 +6178,7 @@ RgSchCellCb *cell; //if(!(hqP->hqE->ue->pfsStats.lcStats[lcId-1].isLcCntSet)) if(tbCnt == 0) { - U8 idx = 0; + uint8_t idx = 0; if (hqP->hqE->ue->cell == hqP->hqE->cell) { idx = RGSCH_PCELL_INDEX; @@ -6384,7 +6261,7 @@ RgSchCellCb *cell; rgSCHLaaResetDlHqProcCb(hqP); #endif - RETVOID; + return; } /*********************************************************** * @@ -6513,7 +6390,7 @@ CmLListCp *ulInActvLst; #endif } - RETVOID; + return; } /* end of rgSCHUtlFillRgInfUeInfo */ /* CA dev End */ @@ -6559,7 +6436,6 @@ RgSchErrInfo *err; { S16 ret; - TRC2(rgSCHUtlUpdSch); #ifdef LTEMAC_SPS if (RGSCH_UL_SPS_ACT_PRSENT & pdu->ceInfo.bitMask) @@ -6591,8 +6467,8 @@ RgSchErrInfo *err; /*ccpu00129922 - MOD - Deleted return value * checking since it returns void*/ rgSCHUtlUpdBsrTrunc (cellCb, ueCb, - (U8)(pdu->ceInfo.ces.bsr.truncBsr >> 6), - (U8)(pdu->ceInfo.ces.bsr.truncBsr & 0x3F), err); + (uint8_t)(pdu->ceInfo.ces.bsr.truncBsr >> 6), + (uint8_t)(pdu->ceInfo.ces.bsr.truncBsr & 0x3F), err); } else { @@ -6602,8 +6478,8 @@ RgSchErrInfo *err; /*ccpu00129922 - MOD - Deleted return value checking since it returns void*/ rgSCHUtlUpdBsrShort (cellCb, ueCb, - (U8)(pdu->ceInfo.ces.bsr.shortBsr >> 6), - (U8)(pdu->ceInfo.ces.bsr.shortBsr & 0x3F), err); + (uint8_t)(pdu->ceInfo.ces.bsr.shortBsr >> 6), + (uint8_t)(pdu->ceInfo.ces.bsr.shortBsr & 0x3F), err); } else { @@ -6659,7 +6535,6 @@ RgSchUeCb *ueCb; { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb, cell); RgSchDlHqProcCb *hqP = (RgSchDlHqProcCb *)ueDl->proc; - TRC2(rgSCHUtlAddUeToCcchSduLst); /* Temp Guard: For back to back CCCH SDU BO * twice. Hence an extra guard. If already added to scheduling @@ -6704,8 +6579,6 @@ RgInfCmnBoRpt *staRsp; #endif { RgSchUeCb *ueCb; - TRC2(rgSCHUtlUpdtBo) - if ((ueCb = rgSCHDbmGetUeCb(cell, staRsp->u.rnti)) == NULLP) { @@ -6714,7 +6587,7 @@ RgInfCmnBoRpt *staRsp; return RFAILED; } /* Update Bo in ueCb */ - ueCb->dlCcchInfo.bo = (U32)(staRsp->bo); + ueCb->dlCcchInfo.bo = (uint32_t)(staRsp->bo); #ifdef EMTC_ENABLE if(ueCb->isEmtcUe) { @@ -6760,8 +6633,6 @@ RgInfCmnBoRpt *boRpt; RgSchRaCb *raCb; RgSchUeCb *ueCb; - TRC2(rgSCHUtlHndlCcchBoUpdt); - if ((raCb = rgSCHDbmGetRaCb(cell, boRpt->u.rnti)) == NULLP) { #ifdef RGR_V1 @@ -6810,7 +6681,7 @@ RgInfCmnBoRpt *boRpt; return RFAILED; } /* Update Bo in ueCb */ - ueCb->dlCcchInfo.bo = (U32)(boRpt->bo); + ueCb->dlCcchInfo.bo = (uint32_t)(boRpt->bo); } #else @@ -6833,8 +6704,8 @@ RgInfCmnBoRpt *boRpt; * accordingly set. * * - * @param[in] U32 bo - * @param[out] U8 *nPrb + * @param[in] uint32_t bo + * @param[out] uint8_t *nPrb * @return S32 * -# ROK * -# RFAILED @@ -6842,23 +6713,21 @@ RgInfCmnBoRpt *boRpt; #ifdef ANSI S32 rgSCHUtlGetAllwdCchTbSz ( -U32 bo, -U8 *nPrb, -U8 *mcs +uint32_t bo, +uint8_t *nPrb, +uint8_t *mcs ) #else S32 rgSCHUtlGetAllwdCchTbSz(bo, nPrb, mcs) -U32 bo; -U8 *nPrb; -U8 *mcs; +uint32_t bo; +uint8_t *nPrb; +uint8_t *mcs; #endif { S32 lt; S32 cn; S32 rt; - TRC2(rgSCHUtlGetAllwdCchTbSz); - for (lt = 0, rt = 43; lt <= rt;) { cn = (lt + rt)/2; @@ -6913,10 +6782,8 @@ RgInfCmnBoRpt *boUpdt; RgSchClcDlLcCb *dlLc; RgSchClcBoRpt *boRpt; Inst inst = cell->instIdx; - U8 nPrb=0; - U8 mcs=0; - - TRC2(rgSCHUtlHndlBcchPcchBoUpdt); + uint8_t nPrb=0; + uint8_t mcs=0; dlLc = rgSCHDbmGetBcchOnBch(cell); if (dlLc == NULLP) @@ -6997,7 +6864,7 @@ RgInfCmnBoRpt *boUpdt; * bind confirm API towards RRM. * * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED @@ -7007,20 +6874,17 @@ S16 rgSCHUtlRgrBndCfm ( Inst instId, SuId suId, -U8 status +uint8_t status ) #else S16 rgSCHUtlRgrBndCfm(instId, suId, status) Inst instId; SuId suId; -U8 status; +uint8_t status; #endif { S16 ret = ROK; - TRC2(rgSCHUtlRgrBndCfm) - - ret = RgUiRgrBndCfm(&rgSchCb[instId].rgrSap[suId].sapCfg.sapPst, rgSchCb[instId].rgrSap[suId].sapCfg.suId, status); if (ret != ROK) { @@ -7042,7 +6906,7 @@ U8 status; * This API fills in Pst structure and SAP Ids and invokes * * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED @@ -7052,20 +6916,17 @@ S16 rgSCHUtlRgmBndCfm ( Inst instId, SuId suId, -U8 status +uint8_t status ) #else S16 rgSCHUtlRgmBndCfm(instId, suId, status) Inst instId; SuId suId; -U8 status; +uint8_t status; #endif { S16 ret = ROK; - TRC2(rgSCHUtlRgmBndCfm) - - ret = RgUiRgmBndCfm(&rgSchCb[instId].rgmSap[suId].sapCfg.sapPst, rgSchCb[instId].rgmSap[suId].sapCfg.suId, status); if (ret != ROK) { @@ -7089,7 +6950,7 @@ U8 status; * * @param[in] Pst pst * @param[in] RgrCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED @@ -7100,21 +6961,20 @@ S16 schSendCfgCfm Region reg, Pool pool, RgrCfgTransId transId, -U8 status +uint8_t status ) #else S16 schSendCfgCfm(reg, pool, transId, status) Region reg; Pool pool; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { Pst cfmPst; Inst inst = 0; - TRC2(schSendCfgCfm) - cmMemset((U8 *)(&cfmPst), 0, sizeof(Pst)); + memset((&cfmPst), 0, sizeof(Pst)); cfmPst.srcEnt = (Ent)ENTDUAPP; cfmPst.srcInst = (Inst) 0; @@ -7166,13 +7026,10 @@ RgrTtiIndInfo *rgrTti; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ #ifdef L2_L3_SPLIT - extern Bool g_usettitmr; - extern Void mtTmrHdlrPublic(void); + Bool g_usettitmr; + Void mtTmrHdlrPublic(void); #endif - TRC2(rgSCHUtlRgrTtiInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { @@ -7239,9 +7096,6 @@ RgSchErrInfo *err; S16 ret; RgSchRaCb *raCb; - TRC2(rgSCHUtlProcMsg3) - - /* must have an raCb for this case */ raCb = rgSCHDbmGetRaCb (cellCb, rnti); if (raCb == NULLP) @@ -7301,7 +7155,6 @@ RgSchUeCb *ueCb; Bool isExplRel; #endif { - TRC2(rgSCHUtlSpsRelInd); cellCb->sc.apis->rgSCHUlSpsRelInd(cellCb, ueCb, isExplRel); return ROK; } /* end of rgSCHUtlSpsRelInd */ @@ -7319,7 +7172,7 @@ Bool isExplRel; * * @param [in] RgSchCellCb *cellCb * @param [in] RgSchUeCb *ueCb - * @param [in] U16 spsSduSize + * @param [in] uint16_t spsSduSize * @param * @return S16 * -# ROK @@ -7330,16 +7183,15 @@ S16 rgSCHUtlSpsActInd ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, -U16 spsSduSize +uint16_t spsSduSize ) #else S16 rgSCHUtlSpsActInd (cellCb, ueCb, spsSduSize) RgSchCellCb *cellCb; RgSchUeCb *ueCb; -U16 spsSduSize; +uint16_t spsSduSize; #endif { - TRC2(rgSCHUtlSpsActInd); cellCb->sc.apis->rgSCHUlSpsActInd(cellCb, ueCb, spsSduSize); return ROK; } /* end of rgSCHUtlSpsActInd */ @@ -7382,7 +7234,6 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; RgSchLowSapCb *tfuSap; Pst pst; - TRC2(rgSCHUtlTfuGrpPwrCntrlReq); /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7392,7 +7243,7 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; "rgSCHUtlTfuGrpPwrCntrlReq() Lower SAP not bound (%d) ",tfuSap->sapSta.sapState); return RFAILED; } - cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); + memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuGrpPwrCntrlReq (&pst, tfuSap->sapCfg.spId, grpPwrCntrlReq)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, @@ -7435,8 +7286,6 @@ TfuCntrlReqInfo *cntrlReq; S16 ret; RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlTfuCntrlReq) - /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7491,7 +7340,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlDlActvtUe); cell->sc.apis->rgSCHActvtDlUe(cell, ue); return ROK; } @@ -7525,7 +7373,6 @@ RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHUtlUlActvtUe); cell->sc.apis->rgSCHActvtUlUe(cell, ue); return ROK; } @@ -7563,7 +7410,6 @@ TfuRecpReqInfo *recpReq; S16 ret; RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlTfuRecpReq) /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); @@ -7612,8 +7458,6 @@ SuId suId; { RgSchLowSapCb *tfuSap; - TRC2(rgSCHUtlValidateTfuSap) - if(suId >= rgSchCb[inst].numSaps) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Incorrect SuId"); @@ -7666,9 +7510,8 @@ Size memSize; #endif { Mem sMem; - VOLATILE U32 startTime=0; + volatile uint32_t startTime=0; - TRC2(rgSCHUtlAllocEventMem) sMem.region = rgSchCb[inst].rgSchInit.region; sMem.pool = rgSchCb[inst].rgSchInit.pool; @@ -7731,7 +7574,6 @@ Ptr memCp; { S16 ret; - TRC2(rgSCHUtlGetEventMem) #ifdef TFU_ALLOC_EVENT_NO_INIT ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr); #else @@ -7759,17 +7601,15 @@ Ptr memCp; S16 rgSCHUtlAllocUeANFdbkInfo ( RgSchUeCb *ue, -U8 servCellIdx +uint8_t servCellIdx ) #else S16 rgSCHUtlAllocUeANFdbkInfo(ue,servCellIdx) RgSchUeCb *ue; -U8 servCellIdx; +uint8_t servCellIdx; #endif { - U8 idx; - - TRC2(rgSCHUtlAllocUeANFdbkInfo); + uint8_t idx; if (rgSCHUtlAllocSBuf(ue->cell->instIdx, (Data **) &(ue->cellInfo[servCellIdx]->anInfo), sizeof(RgSchTddANInfo) * \ @@ -7804,15 +7644,14 @@ U8 servCellIdx; Void rgSCHUtlDelUeANFdbkInfo ( RgSchUeCb *ue, -U8 servCellIdx +uint8_t servCellIdx ) #else Void rgSCHUtlDelUeANFdbkInfo(ue,servCellIdx) RgSchUeCb *ue; -U8 servCellIdx; +uint8_t servCellIdx; #endif { - TRC2(rgSCHUtlDelUeANFdbkInfo); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -7820,7 +7659,7 @@ U8 servCellIdx; (Data **)(&( ue->cellInfo[servCellIdx]->anInfo)), sizeof(RgSchTddANInfo) * \ ue->cell->ackNackFdbkArrSize); - RETVOID; + return; } /* rgSCHUtlDelUeANFdbkInfo */ /** @@ -7845,7 +7684,6 @@ S16 rgSCHUtlInitUeANFdbkInfo(anFdInfo) RgSchTddANInfo *anFdInfo; #endif { - TRC2(rgSCHUtlInitUeANFdbkInfo); anFdInfo->sfn = RGSCH_MAX_SFN+1; /* defensively setting invalid sfn */ anFdInfo->slot = 0; @@ -7875,18 +7713,16 @@ RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo ( RgSchUeCb *ueCb, CmLteTimingInfo *timeInfo, -U8 servCellIdx +uint8_t servCellIdx ) #else RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo(ueCb, timeInfo,servCellIdx) RgSchUeCb *ueCb; CmLteTimingInfo *timeInfo; -U8 servCellIdx; +uint8_t servCellIdx; #endif { - U8 idx; - - TRC2(rgSCHUtlGetUeANFdbkInfo); + uint8_t idx; for (idx = 0; idx < ueCb->cell->ackNackFdbkArrSize; ++idx) { @@ -7910,23 +7746,22 @@ U8 servCellIdx; * * @param[in] CmLteTimingInfo *timeInfo * @param[in] RgSchCellCb *cell - * @return U8 + * @return uint8_t * **/ #ifdef ANSI -U8 rgSCHUtlGetDlSfIdx +uint8_t rgSCHUtlGetDlSfIdx ( RgSchCellCb *cell, CmLteTimingInfo *timeInfo ) #else -U8 rgSCHUtlGetDlSfIdx(cell, timeInfo) +uint8_t rgSCHUtlGetDlSfIdx(cell, timeInfo) RgSchCellCb *cell; CmLteTimingInfo *timeInfo; #endif { - U16 idx = 0; - TRC2(rgSCHUtlGetDlSfIdx); + uint16_t idx = 0; idx = RGSCH_NUM_SUB_FRAMES - \ rgSchTddNumUlSubfrmTbl[cell->ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -7934,7 +7769,7 @@ CmLteTimingInfo *timeInfo; rgSchTddNumDlSubfrmTbl[cell->ulDlCfgIdx][timeInfo->slot]) - 1; idx = idx % cell->numDlSubfrms; - return ((U8)idx); + return ((uint8_t)idx); } /** @@ -7950,7 +7785,7 @@ CmLteTimingInfo *timeInfo; * @param[in] RgSchDlSf *dlSf * @param[in] RgSchDlSf **nxtDlsf * @param[in] CmLteTimingInfo *nxtDlTime - * @return U8 + * @return uint8_t * **/ #ifdef ANSI @@ -7971,9 +7806,8 @@ RgSchDlSf **nxtDlsf; CmLteTimingInfo *nxtDlTime; #endif { - U16 idx = curDlTime.slot; - U8 count = 0; - TRC2(rgSCHUtlGetNxtDlSfInfo); + uint16_t idx = curDlTime.slot; + uint8_t count = 0; while(TRUE) { @@ -7990,7 +7824,7 @@ CmLteTimingInfo *nxtDlTime; break; } } - RETVOID; + return; } /** @@ -8004,8 +7838,8 @@ CmLteTimingInfo *nxtDlTime; * @param[in] RgSchCellCb *cell * @param[in] CmLteTimingInfo curDlTime * @param[in] CmLteTimingInfo *prevDlTime - * @param[in] U8 *numSubfrm - * @return U8 + * @param[in] uint8_t *numSubfrm + * @return uint8_t * **/ #ifdef ANSI @@ -8014,19 +7848,18 @@ Void rgSCHUtlGetPrevDlSfInfo RgSchCellCb *cell, CmLteTimingInfo curDlTime, CmLteTimingInfo *prevDlTime, -U8 *numSubfrm +uint8_t *numSubfrm ) #else Void rgSCHUtlGetPrevDlSfInfo(cell, curDlTime, prevDlTime, numSubfrm) RgSchCellCb *cell; CmLteTimingInfo curDlTime; CmLteTimingInfo *prevDlTime; -U8 *numSubfrm; +uint8_t *numSubfrm; #endif { S16 idx = curDlTime.slot; - U8 count = 0; - TRC2(rgSCHUtlGetPrevDlSfInfo); + uint8_t count = 0; do { @@ -8040,7 +7873,7 @@ U8 *numSubfrm; != RG_SCH_TDD_DL_slot); *numSubfrm = count; RGSCHDECRFRMCRNTTIME(curDlTime, (*prevDlTime), count); - RETVOID; + return; } #endif @@ -8064,23 +7897,22 @@ S16 rgSCHUtlUlSfInit ( RgSchCellCb *cell, RgSchUlSf *sf, -U8 idx, -U8 maxUePerSf +uint8_t idx, +uint8_t maxUePerSf ) #else S16 rgSCHUtlUlSfInit(cell, sf, idx, maxUePerSf) RgSchCellCb *cell; RgSchUlSf *sf; -U8 idx; -U8 maxUePerSf; +uint8_t idx; +uint8_t maxUePerSf; #endif { S16 ret=ROK; - TRC2(rgSCHUtlUlSfInit); sf->idx = idx; #ifdef RG_5GTF - U8 index; + uint8_t index; #endif #ifdef LTE_TDD @@ -8117,7 +7949,7 @@ U8 maxUePerSf; return (ret); } /* Initialize the hole with CFI 1 Pusch Bw Info */ - ret = rgSCHUtlUlHoleDbInit(cell, sf->holeDb, (U8)(maxUePerSf + 2), \ + ret = rgSCHUtlUlHoleDbInit(cell, sf->holeDb, (uint8_t)(maxUePerSf + 2), \ 0, cell->dynCfiCb.bwInfo[1].numSb); if (ret != ROK) @@ -8178,7 +8010,6 @@ RgSchCellCb *cell; RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlSfDeinit); if (sf->allocDb) { rgSCHUtlUlAllocDbDeinit(cell, sf->allocDb); @@ -8197,7 +8028,7 @@ RgSchUlSf *sf; rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->holeDb)), sizeof(RgSchUlHoleDb)); } - RETVOID; + return; } /*********************************************************** @@ -8214,21 +8045,20 @@ RgSchUlSf *sf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHUtlUlAllocDbInit +static S16 rgSCHUtlUlAllocDbInit ( RgSchCellCb *cell, RgSchUlAllocDb *allocDb, -U8 maxAllocs +uint8_t maxAllocs ) #else -PRIVATE S16 rgSCHUtlUlAllocDbInit(cell, allocDb, maxAllocs) +static S16 rgSCHUtlUlAllocDbInit(cell, allocDb, maxAllocs) RgSchCellCb *cell; RgSchUlAllocDb *allocDb; -U8 maxAllocs; +uint8_t maxAllocs; #endif { S16 ret = rgSCHUtlUlAllocMemInit(cell, &allocDb->mem, maxAllocs); - TRC2(rgSCHUtlUlAllocDbInit); if (ret != ROK) { return (ret); @@ -8253,22 +8083,21 @@ U8 maxAllocs; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHUtlUlAllocDbDeinit +static Void rgSCHUtlUlAllocDbDeinit ( RgSchCellCb *cell, RgSchUlAllocDb *allocDb ) #else -PRIVATE Void rgSCHUtlUlAllocDbDeinit(cell, allocDb) +static Void rgSCHUtlUlAllocDbDeinit(cell, allocDb) RgSchCellCb *cell; RgSchUlAllocDb *allocDb; #endif { - TRC2(rgSCHUtlUlAllocDbDeinit); rgSCHUtlUlAllocMemDeinit(cell, &allocDb->mem); allocDb->count = 0; allocDb->first = NULLP; - RETVOID; + return; } /*********************************************************** @@ -8285,26 +8114,25 @@ RgSchUlAllocDb *allocDb; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHUtlUlHoleDbInit +static S16 rgSCHUtlUlHoleDbInit ( RgSchCellCb *cell, RgSchUlHoleDb *holeDb, -U8 maxHoles, -U8 start, -U8 num +uint8_t maxHoles, +uint8_t start, +uint8_t num ) #else -PRIVATE S16 rgSCHUtlUlHoleDbInit(cell, holeDb, maxHoles, start, num) +static S16 rgSCHUtlUlHoleDbInit(cell, holeDb, maxHoles, start, num) RgSchCellCb *cell; RgSchUlHoleDb *holeDb; -U8 maxHoles; -U8 start; -U8 num; +uint8_t maxHoles; +uint8_t start; +uint8_t num; #endif { S16 ret; RgSchUlHole *hole = NULLP; - TRC2(rgSCHUtlUlHoleDbInit); ret = rgSCHUtlUlHoleMemInit(cell, &holeDb->mem, maxHoles, &hole); if (ret != ROK) @@ -8333,22 +8161,21 @@ U8 num; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHUtlUlHoleDbDeinit +static Void rgSCHUtlUlHoleDbDeinit ( RgSchCellCb *cell, RgSchUlHoleDb *holeDb ) #else -PRIVATE Void rgSCHUtlUlHoleDbDeinit(cell, holeDb) +static Void rgSCHUtlUlHoleDbDeinit(cell, holeDb) RgSchCellCb *cell; RgSchUlHoleDb *holeDb; #endif { - TRC2(rgSCHUtlUlHoleDbDeinit); rgSCHUtlUlHoleMemDeinit(cell, &holeDb->mem); holeDb->count = 0; holeDb->first = NULLP; - RETVOID; + return; } @@ -8369,17 +8196,16 @@ RgSchUlHoleDb *holeDb; RgSchUlAlloc *rgSCHUtlUlAllocGetHole ( RgSchUlSf *sf, -U8 numSb, +uint8_t numSb, RgSchUlHole *hole ) #else RgSchUlAlloc *rgSCHUtlUlAllocGetHole(sf, numSb, hole) RgSchUlSf *sf; -U8 numSb; +uint8_t numSb; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlAllocGetHole); if (numSb < hole->num) { return (rgSCHUtlUlAllocGetPartHole(sf, numSb, hole)); @@ -8422,7 +8248,6 @@ RgSchUlHole *hole; * updated, causing another check for prv */ RgSchUlAlloc *prv = hole->prvAlloc; RgSchUlAlloc *nxt = hole->nxtAlloc; - TRC2(rgSCHUtlUlAllocGetCompHole); if (prv) { @@ -8476,13 +8301,13 @@ RgSchUlHole *hole; RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole ( RgSchUlSf *sf, -U8 numSb, +uint8_t numSb, RgSchUlHole *hole ) #else RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole(sf, numSb, hole) RgSchUlSf *sf; -U8 numSb; +uint8_t numSb; RgSchUlHole *hole; #endif { @@ -8491,7 +8316,6 @@ RgSchUlHole *hole; /* Calling rgSchCmnUlAllocGetAndIns is ok, but prv alloc needs to have nxtHole * updated, causing another check for prv */ RgSchUlAlloc *prv = hole->prvAlloc; - TRC2(rgSCHUtlUlAllocGetPartHole); if (prv) { @@ -8548,7 +8372,6 @@ RgSchUlAlloc *rgSCHUtlUlAllocFirst(sf) RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlAllocFirst); return (sf->allocDb->first); } @@ -8577,7 +8400,6 @@ RgSchUlSf *sf; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlAllocNxt); UNUSED(sf); return (alloc->nxt); } @@ -8615,7 +8437,6 @@ RgSchUlAlloc *prv; { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = prv->nxt; - TRC2(rgSCHUtlUlAllocGetAdjNxt); #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) @@ -8666,7 +8487,6 @@ RgSchUlAllocDb *db; { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = db->first; - TRC2(rgSCHUtlUlAllocGetFirst); #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) @@ -8721,7 +8541,6 @@ RgSchUlAlloc *alloc; RgSchUlHoleDb *db = alloc->holeDbRef; RgSchUlHole *prv = alloc->prvHole; RgSchUlHole *nxt = alloc->nxtHole; - TRC2(rgSCHUtlUlHoleAddAllocation); if (prv) { @@ -8741,7 +8560,7 @@ RgSchUlAlloc *alloc; else rgSCHUtlUlHoleNew(db, alloc); } - RETVOID; + return; } @@ -8771,7 +8590,6 @@ RgSchUlAlloc *alloc; RgSchUlAllocDb *allocDb = alloc->allocDbRef; RgSchUlAlloc *prv = alloc->prv; RgSchUlAlloc *nxt = alloc->nxt; - TRC2(rgSCHUtlUlAllocRelease); alloc->ue = NULLP; alloc->raCb = NULLP; @@ -8797,7 +8615,7 @@ RgSchUlAlloc *alloc; rgSCHUtlUlHoleAddAllocation(alloc); rgSCHUtlUlAllocMemRls(&allocDb->mem, alloc); - RETVOID; + return; } @@ -8829,7 +8647,6 @@ RgSchUlAlloc *alloc; RgSchUlAllocDb *allocDb = sf->allocDb; RgSchUlAlloc *prv = alloc->prv; RgSchUlAlloc *nxt = alloc->nxt; - TRC2(rgSCHUtlUlAllocRls); alloc->ue = NULLP; alloc->raCb = NULLP; @@ -8865,7 +8682,7 @@ RgSchUlAlloc *alloc; //printf("\nallocDb->count:%u\n",allocDb->count); - RETVOID; + return; } /*********************************************************** @@ -8891,7 +8708,6 @@ RgSchUlHole *rgSCHUtlUlHoleFirst(sf) RgSchUlSf *sf; #endif { - TRC2(rgSCHUtlUlHoleFirst); return (sf->holeDb->first); } @@ -8920,7 +8736,6 @@ RgSchUlSf *sf; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlHoleNxt); UNUSED(sf); return (hole->nxt); } @@ -8959,7 +8774,6 @@ RgSchUlAlloc *alloc; RgSchUlHoleDb *db = sf->holeDb; RgSchUlHole *prv = alloc->prvHole; RgSchUlHole *nxt = alloc->nxtHole; - TRC2(rgSCHUtlUlHoleAddAlloc); if (prv) { @@ -8983,7 +8797,7 @@ RgSchUlAlloc *alloc; /* increment the number of subbands getting freed to total available list */ sf->availSubbands += alloc->numSb; - RETVOID; + return; } /*********************************************************** @@ -9015,13 +8829,12 @@ RgSchUlHole *nxt; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleJoin); prv->num += alloc->numSb + nxt->num; rgSCHUtlUlHoleRls(db, nxt); rgSCHUtlUlHoleIncr(db, prv); rgSCHUtlUlHoleUpdAllocLnks(prv, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -9052,11 +8865,10 @@ RgSchUlHole *prv; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleExtndRight); prv->num += alloc->numSb; rgSCHUtlUlHoleIncr(db, prv); rgSCHUtlUlHoleUpdAllocLnks(prv, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -9087,12 +8899,11 @@ RgSchUlHole *nxt; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlHoleExtndLeft); nxt->num += alloc->numSb; nxt->start = alloc->sbStart; rgSCHUtlUlHoleIncr(db, nxt); rgSCHUtlUlHoleUpdAllocLnks(nxt, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -9124,16 +8935,15 @@ RgSchUlAlloc *alloc; #if (ERRCLASS & ERRCLS_DEBUG) if ( hole == NULLP ) { - RETVOID; + return; } #endif - TRC2(rgSCHUtlUlHoleNew); hole->start = alloc->sbStart; hole->num = alloc->numSb; ++db->count; rgSCHUtlUlHoleIns(db, hole); rgSCHUtlUlHoleUpdAllocLnks(hole, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -9163,7 +8973,6 @@ RgSchUlAlloc *prvAlloc; RgSchUlAlloc *nxtAlloc; #endif { - TRC2(rgSCHUtlUlHoleUpdAllocLnks); if (prvAlloc) { prvAlloc->nxtHole = hole; @@ -9174,7 +8983,7 @@ RgSchUlAlloc *nxtAlloc; } hole->prvAlloc = prvAlloc; hole->nxtAlloc = nxtAlloc; - RETVOID; + return; } @@ -9205,7 +9014,6 @@ RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleIns); if ((cur = db->first) != NULLP) { @@ -9217,7 +9025,7 @@ RgSchUlHole *hole; cur->prv = hole; db->first = hole; hole->prv = NULLP; - RETVOID; + return; } for (nxt = cur->nxt; nxt; cur = nxt, nxt = nxt->nxt) @@ -9229,7 +9037,7 @@ RgSchUlHole *hole; hole->prv = cur; hole->nxt = nxt; nxt->prv = hole; - RETVOID; + return; } } @@ -9237,14 +9045,14 @@ RgSchUlHole *hole; cur->nxt = hole; hole->prv = cur; hole->nxt = NULLP; - RETVOID; + return; } /* This is the first hole */ db->first = hole; hole->prv = NULLP; /* may not be needed */ hole->nxt = NULLP; - RETVOID; + return; } @@ -9275,7 +9083,6 @@ RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleIncr); if ((cur = hole->prv) != NULLP) { @@ -9283,7 +9090,7 @@ RgSchUlHole *hole; if (cur->num > hole->num) { - RETVOID; + return; } /* Remove hole from current position */ @@ -9302,7 +9109,7 @@ RgSchUlHole *hole; hole->prv = prv; hole->nxt = cur; cur->prv = hole; - RETVOID; + return; } } @@ -9311,9 +9118,9 @@ RgSchUlHole *hole; cur->prv = hole; db->first = hole; hole->prv = NULLP; - RETVOID; + return; } - RETVOID; + return; } /*********************************************************** @@ -9343,7 +9150,6 @@ RgSchUlHole *hole; #endif { RgSchUlHole *cur; - TRC2(rgSCHUtlUlHoleDecr); if ((cur = hole->nxt) != NULLP) { @@ -9351,7 +9157,7 @@ RgSchUlHole *hole; if (cur->num < hole->num) { - RETVOID; + return; } /* Remove hole from current position */ @@ -9374,7 +9180,7 @@ RgSchUlHole *hole; hole->prv = cur; hole->nxt = nxt; nxt->prv = hole; - RETVOID; + return; } } @@ -9382,9 +9188,9 @@ RgSchUlHole *hole; cur->nxt = hole; hole->prv = cur; hole->nxt = NULLP; - RETVOID; + return; } - RETVOID; + return; } /*********************************************************** @@ -9417,7 +9223,6 @@ RgSchUlHole *hole; { RgSchUlHole *prv = hole->prv; RgSchUlHole *nxt = hole->nxt; - TRC2(rgSCHUtlUlHoleRls); --db->count; if (prv) @@ -9438,7 +9243,7 @@ RgSchUlHole *hole; } rgSCHUtlUlHoleMemRls(&db->mem, hole); - RETVOID; + return; } @@ -9460,18 +9265,17 @@ S16 rgSCHUtlUlAllocMemInit ( RgSchCellCb *cell, RgSchUlAllocMem *mem, -U8 maxAllocs +uint8_t maxAllocs ) #else S16 rgSCHUtlUlAllocMemInit(cell, mem, maxAllocs) RgSchCellCb *cell; RgSchUlAllocMem *mem; -U8 maxAllocs; +uint8_t maxAllocs; #endif { S16 ret; RgSchUlAlloc *allocs; - TRC2(rgSCHUtlUlAllocMemInit); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&allocs, maxAllocs * sizeof(*allocs)); @@ -9488,7 +9292,7 @@ U8 maxAllocs; } else { - U8 i; + uint8_t i; allocs[0].prv = NULLP; allocs[0].nxt = &allocs[1]; for (i = 1; i < mem->maxAllocs - 1; ++i) @@ -9528,14 +9332,13 @@ RgSchCellCb *cell; RgSchUlAllocMem *mem; #endif { - TRC2(rgSCHUtlUlAllocMemDeinit); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(mem->allocs)), mem->maxAllocs * sizeof(*mem->allocs)); mem->maxAllocs = 0; mem->firstFree = NULLP; - RETVOID; + return; } /*********************************************************** @@ -9557,20 +9360,19 @@ S16 rgSCHUtlUlHoleMemInit ( RgSchCellCb *cell, RgSchUlHoleMem *mem, -U8 maxHoles, +uint8_t maxHoles, RgSchUlHole **holeRef ) #else S16 rgSCHUtlUlHoleMemInit(cell, mem, maxHoles, holeRef) RgSchCellCb *cell; RgSchUlHoleMem *mem; -U8 maxHoles; +uint8_t maxHoles; RgSchUlHole **holeRef; #endif { S16 ret; RgSchUlHole *holes; - TRC2(rgSCHUtlUlHoleMemInit); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&holes, maxHoles * sizeof(*holes)); @@ -9594,7 +9396,7 @@ RgSchUlHole **holeRef; } else { - U8 i; + uint8_t i; holes[1].prv = NULLP; holes[0].nxt = &holes[1]; for (i = 1; i < mem->maxHoles - 1; ++i) @@ -9635,14 +9437,13 @@ RgSchCellCb *cell; RgSchUlHoleMem *mem; #endif { - TRC2(rgSCHUtlUlHoleMemDeinit); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(mem->holes)), mem->maxHoles * sizeof(*mem->holes)); mem->maxHoles = 0; mem->firstFree = NULLP; - RETVOID; + return; } /*********************************************************** @@ -9669,7 +9470,6 @@ RgSchUlAllocMem *mem; #endif { RgSchUlAlloc *alloc; - TRC2(rgSCHUtlUlAllocMemGet); #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) @@ -9711,7 +9511,6 @@ RgSchUlAllocMem *mem; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHUtlUlAllocMemRls); alloc->prv = NULLP; alloc->nxt = mem->firstFree; @@ -9720,7 +9519,7 @@ RgSchUlAlloc *alloc; mem->firstFree->prv = alloc; } mem->firstFree = alloc; - RETVOID; + return; } /*********************************************************** @@ -9747,7 +9546,6 @@ RgSchUlHoleMem *mem; #endif { RgSchUlHole *hole; - TRC2(rgSCHUtlUlHoleMemGet); #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) @@ -9790,7 +9588,6 @@ RgSchUlHoleMem *mem; RgSchUlHole *hole; #endif { - TRC2(rgSCHUtlUlHoleMemRls); hole->prv = NULLP; hole->nxt = mem->firstFree; @@ -9799,7 +9596,7 @@ RgSchUlHole *hole; mem->firstFree->prv = hole; } mem->firstFree = hole; - RETVOID; + return; } /** @@ -9817,27 +9614,26 @@ RgSchUlHole *hole; * will always be such hole. And also for efficiency. * * @param[in] RgSchUlSf *sf - * @param[in] U8 startSb - * @param[in] U8 numSb + * @param[in] uint8_t startSb + * @param[in] uint8_t numSb * @return RgSchUlAlloc* **/ #ifdef ANSI RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc ( RgSchUlSf *sf, -U8 startSb, -U8 numSb +uint8_t startSb, +uint8_t numSb ) #else RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc(sf, startSb, numSb) RgSchUlSf *sf; -U8 startSb; -U8 numSb; +uint8_t startSb; +uint8_t numSb; #endif { RgSchUlHole *hole, *nxtHole; RgSchUlAlloc *alloc = NULLP; - TRC2(rgSCHUtlUlGetSpfcAlloc); if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { @@ -9909,30 +9705,29 @@ U8 numSb; * Function :rgSCHUtlValidateQci * * @param[in] RgSchCellCb *cellCb - * @param[in] U8 numQci - * @param[out] U8 *qci + * @param[in] uint8_t numQci + * @param[out] uint8_t *qci * @return S16 * ROK * RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHUtlValidateQci +static S16 rgSCHUtlValidateQci ( RgSchCellCb *cellCb, -U8 numQci, -U8 *qci +uint8_t numQci, +uint8_t *qci ) #else -PRIVATE S16 rgSCHUtlValidateQci(cellCb, numQci, qci) +static S16 rgSCHUtlValidateQci(cellCb, numQci, qci) RgSchCellCb *cellCb; -U8 numQci; -U8 *qci; +uint8_t numQci; +uint8_t *qci; #endif { - U8 qciIdx; - U8 qciVal; + uint8_t qciIdx; + uint8_t qciVal; - TRC3(rgSCHUtlValidateQci) for(qciIdx = 0; qciIdx < numQci; qciIdx++) { @@ -9975,10 +9770,9 @@ LrgSchMeasReqInfo *schL2MeasInfo; RgSchErrInfo *err; #endif { - U16 measType; + uint16_t measType; S16 ret; - TRC3(rgSCHUtlValidateMeasReq) measType = schL2MeasInfo->measType; @@ -10060,7 +9854,7 @@ RgSchErrInfo *err; * config confirm API towards RRM. * * @param[in] RgrCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED @@ -10071,21 +9865,20 @@ S16 rgSCHUtlRgrSiCfgCfm Inst instId, SpId spId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else S16 rgSCHUtlRgrSiCfgCfm(instId, spId, transId, status) Inst instId; SpId spId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(rgSCHUtlRgrSiCfgCfm) - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -10115,7 +9908,7 @@ U8 status; * config confirm API towards RRM. * * @param[in] RgrCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED @@ -10125,24 +9918,23 @@ S16 rgSCHUtlRgrWarningSiCfgCfm ( Inst instId, SpId spId, -U8 siId, +uint8_t siId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else S16 rgSCHUtlRgrWarningSiCfgCfm(instId, spId, siId, transId, status) Inst instId; SpId spId; -U8 siId; +uint8_t siId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; - TRC2(rgSCHUtlRgrWarningSiCfgCfm) - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; @@ -10181,9 +9973,8 @@ Void rgSCHUtlPutSiInfo(cell) RgSchCellCb *cell; #endif { - U8 idx = 0; - U32 sizeOfSiInfo = 0; - TRC2(rgSCHUtlPutSiInfo) + uint8_t idx = 0; + uint32_t sizeOfSiInfo = 0; /*Free the buffers in crntSiInfo*/ RGSCH_FREE_MSG(cell->siCb.crntSiInfo.mib) RGSCH_FREE_MSG(cell->siCb.crntSiInfo.sib1Info.sib1) @@ -10206,7 +9997,7 @@ RgSchCellCb *cell; RGSCH_FREE_MSG(cell->siCb.newSiInfo.siInfo[idx].si) } - RETVOID; + return; } #endif /*RGR_SI_SCH */ @@ -10251,16 +10042,16 @@ CmLListCp *ulInActvLst; #endif { Bool isNewTx = FALSE; - U8 idx; + uint8_t idx; RgSchDrxDlHqProcCb *drxHq; RgSchDRXCellCb *drxCell = cellCb->drxCb; RgSchDrxUeCb *drxUe; #ifdef DEBUGP Inst inst = cellCb->instIdx; #endif - U8 cellIdx = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(dlHq->hqE->cell)]; - U32 dlInactvMask; - U32 ulInactvMask; + uint8_t cellIdx = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(dlHq->hqE->cell)]; + uint32_t dlInactvMask; + uint32_t ulInactvMask; for(idx = 0; idx < allocInfo->nmbOfTBs; idx++) { @@ -10381,7 +10172,7 @@ CmLListCp *ulInActvLst; * @param[in] RgSchCellCb *cell pointer to Cell Control block * @param[in] RgSchUeCb *ue pointer to Ue Control block * @param[in] RgrStaIndInfo *staInfo Sta Ind struct to be filled - * @param[in] U8 numCqiRept NUmber of reports to be filled + * @param[in] uint8_t numCqiRept NUmber of reports to be filled * @return Void * **/ @@ -10391,17 +10182,17 @@ S16 rgSCHUtlFillSndStaInd RgSchCellCb *cell, RgSchUeCb *ue, RgrStaIndInfo *staInfo, -U8 numCqiRept +uint8_t numCqiRept ) #else S16 rgSCHUtlFillSndStaInd(cell, ue, staInfo, numCqiRept) RgSchCellCb *cell; RgSchUeCb *ue; RgrStaIndInfo *staInfo; -U8 numCqiRept; +uint8_t numCqiRept; #endif { - U8 idxStart; + uint8_t idxStart; /* Fill StaInd for sending collated Latest N CQI rpeorts */ /* Find index in the array from where Latest N @@ -10414,8 +10205,8 @@ U8 numCqiRept; idxStart = ue->schCqiInfo.cqiCount - numCqiRept; - cmMemcpy ((U8*)&(staInfo->ueCqiInfo.cqiRept), - (U8*)&(ue->schCqiInfo.cqiRept[idxStart]), + memcpy (&(staInfo->ueCqiInfo.cqiRept), + &(ue->schCqiInfo.cqiRept[idxStart]), numCqiRept * sizeof(RgrUeCqiRept)); staInfo->ueCqiInfo.numCqiRept = numCqiRept; @@ -10468,7 +10259,6 @@ RgrStaIndInfo *rgrSta; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrStaInd) rgrSap = cell->rgrSap; @@ -10525,7 +10315,6 @@ CmLteRnti newRnti; Inst inst = cell->instIdx; RgInfRlsRnti rntiInfo; - TRC2(rgSCHUtlIndRntiRls2Mac) /* Copy the info to rntiInfo */ rntiInfo.cellId = cell->cellId; @@ -10541,7 +10330,7 @@ CmLteRnti newRnti; /* Invoke MAC to release the rnti */ rgSCHUtlGetPstToLyr(&pst, &rgSchCb[inst], cell->macInst); RgSchMacRlsRnti(&pst, &rntiInfo); - RETVOID; + return; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -10576,9 +10365,6 @@ S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrLoadInfInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { @@ -10631,8 +10417,7 @@ CmLteRnti newRnti; #endif { - TRC2(rgSCHUtlRlsRnti) - U8 isLegacy = 0; + uint8_t isLegacy = 0; #ifdef EMTC_ENABLE if(cell->emtcEnable) { @@ -10648,7 +10433,7 @@ CmLteRnti newRnti; /* Fix: syed Explicitly Inidcate MAC to release RNTI */ rgSCHUtlIndRntiRls2Mac(cell, rntiLnk->rnti, ueIdChngd, newRnti); - RETVOID; + return; } @@ -10663,7 +10448,7 @@ CmLteRnti newRnti; * * @param[in] RgSchCellCb *cell pointer to Cell Control block * @param[in] RgSchUeCb *ue pointer to Ue Control block - * @param[in] U8 numCqiRept NUmber of reports to be filled + * @param[in] uint8_t numCqiRept NUmber of reports to be filled * @return Void * **/ @@ -10731,9 +10516,6 @@ RgrUeStaIndInfo *rgrUeSta; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - TRC2(rgSCHUtlRgrStaInd) - - rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { @@ -10774,21 +10556,19 @@ RgSchCellCb *cell; CmLteTimingInfo frm; RgmPrbRprtInd *prbRprtInd; S16 ret = ROK; - U32 idx; + uint32_t idx; #ifdef DBG_MAC_RRM_PRB_PRINT - static U32 count = 0; - const U32 reprotForEvery20Sec = 20000/cell->prbUsage.rprtPeriod; + static uint32_t count = 0; + const uint32_t reprotForEvery20Sec = 20000/cell->prbUsage.rprtPeriod; count++; #endif - TRC2(rgSCHUtlUpdAvgPrbUsage); - frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); - U16 numDlSf; - U16 numUlSf; + uint16_t numDlSf; + uint16_t numUlSf; #ifdef LTE_TDD if(cell->prbUsage.rprtPeriod >= RGSCH_NUM_SUB_FRAMES) @@ -10819,7 +10599,7 @@ RgSchCellCb *cell; return RFAILED; } - cmMemset((U8 *) &prbRprtInd->stQciPrbRpts[0], + memset(&prbRprtInd->stQciPrbRpts[0], 0, (RGM_MAX_QCI_REPORTS * sizeof(RgmPrbRptPerQci))); @@ -10902,7 +10682,6 @@ RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif { - TRC2(rgSCHUtlReTxTa) /* If TA Timer is running. Stop it */ if (ueCb->taTmr.tmrEvnt != TMR_NONE) @@ -10922,7 +10701,7 @@ RgSchUeCb *ueCb; ueCb->dl.taCb.state = RGSCH_TA_TOBE_SCHEDULED; rgSCHUtlDlTARpt(cellCb, ueCb); - RETVOID; + return; } /* Added function for dropping Paging Message*/ @@ -10942,22 +10721,21 @@ RgSchUeCb *ueCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHChkBoUpdate +static S16 rgSCHChkBoUpdate ( RgSchCellCb *cell, RgInfCmnBoRpt *boUpdt ) #else -PRIVATE S16 rgSCHChkBoUpdate (cell, boUpdt) +static S16 rgSCHChkBoUpdate (cell, boUpdt) RgSchCellCb *cell; RgInfCmnBoRpt *boUpdt; #endif { - U32 crntTimeInSubFrms = 0; - U32 boUpdTimeInSubFrms = 0; - U32 distance = 0; - TRC2(rgSCHChkBoUpdate); + uint32_t crntTimeInSubFrms = 0; + uint32_t boUpdTimeInSubFrms = 0; + uint32_t distance = 0; crntTimeInSubFrms = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) + cell->crntTime.slot + RG_SCH_CMN_DL_DELTA + 2; /* As bo received will scheduled in next TTI @@ -10991,31 +10769,29 @@ RgInfCmnBoRpt *boUpdt; * * @param[in] RgSchCellCb *cell * @param[in] CmLteTimingInfo phichTime - * @param[in] U8 hqFdbkIdx - * @return U8 + * @param[in] uint8_t hqFdbkIdx + * @return uint8_t **/ #ifdef ANSI -U8 rgSchUtlCfg0ReTxIdx +uint8_t rgSchUtlCfg0ReTxIdx ( RgSchCellCb *cell, CmLteTimingInfo phichTime, -U8 hqFdbkIdx +uint8_t hqFdbkIdx ) #else -U8 rgSchUtlCfg0ReTxIdx (cell, phichTime, hqFdbkIdx) +uint8_t rgSchUtlCfg0ReTxIdx (cell, phichTime, hqFdbkIdx) RgSchCellCb *cell; CmLteTimingInfo phichTime; -U8 hqFdbkIdx; +uint8_t hqFdbkIdx; #endif { - U8 reTxIdx = RGSCH_INVALID_INFO; - U8 iPhich = 0; + uint8_t reTxIdx = RGSCH_INVALID_INFO; + uint8_t iPhich = 0; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlSf *ulSf; - U8 ulSF; /* UL SF in the TDD frame */ + uint8_t ulSF; /* UL SF in the TDD frame */ - TRC2(rgSchUtlCfg0ReTxIdx); - ulSf = &cellUl->ulSfArr[hqFdbkIdx]; ulSF = ulSf->ulSfIdx; @@ -11065,8 +10841,8 @@ U8 hqFdbkIdx; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *prbReqrd + * @param[in] uint32_t bo + * @param[out] uint32_t *prbReqrd * @return Void **/ #ifdef ANSI @@ -11074,37 +10850,35 @@ Void rgSchUtlDlCalc1CwPrb ( RgSchCellCb *cell, RgSchUeCb *ue, -U32 bo, -U32 *prbReqrd +uint32_t bo, +uint32_t *prbReqrd ) #else Void rgSchUtlDlCalc1CwPrb(cell, ue, bo, prbReqrd) RgSchCellCb *cell; RgSchUeCb *ue; -U32 bo; -U32 *prbReqrd; +uint32_t bo; +uint32_t *prbReqrd; #endif { RgSchCmnDlCell *dlCell = RG_SCH_CMN_GET_DL_CELL(cell); RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ue, cell); - U32 eff; - U32 noRes; - U8 iTbs; - U8 cfi = dlCell->currCfi; - - TRC2(rgSchUtlDlCalc1CwPrb); + uint32_t eff; + uint32_t noRes; + uint8_t iTbs; + uint8_t cfi = dlCell->currCfi; iTbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; eff = (*(RgSchCmnTbSzEff *)(dlCell->cqiToEffTbl[0][cfi]))[iTbs]; /* Optimization to convert totalBo (which is in-terms of bytes) to bits * i.e, << 3 and multiply with 1024 i.e, << 10 */ - noRes = ((U64)((bo << 3) << 10)) / (eff); + noRes = ((uint64_t)((bo << 3) << 10)) / (eff); /* Get the number of RBs needed for this transmission */ /* Number of RBs = No of REs / No of REs per RB */ *prbReqrd = RGSCH_CEIL(noRes, dlCell->noResPerRb[cfi]); - RETVOID; + return; } /* rgSchUtlDlCalc1CwPrb*/ /** @@ -11123,8 +10897,8 @@ U32 *prbReqrd; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *prbReqrd + * @param[in] uint32_t bo + * @param[out] uint32_t *prbReqrd * @return Void **/ #ifdef ANSI @@ -11132,26 +10906,24 @@ Void rgSchUtlDlCalc2CwPrb ( RgSchCellCb *cell, RgSchUeCb *ue, -U32 bo, -U32 *prbReqrd +uint32_t bo, +uint32_t *prbReqrd ) #else Void rgSchUtlDlCalc2CwPrb(cell, ue, bo, prbReqrd) RgSchCellCb *cell; RgSchUeCb *ue; -U32 bo; -U32 *prbReqrd; +uint32_t bo; +uint32_t *prbReqrd; #endif { RgSchCmnDlCell *dlCell = RG_SCH_CMN_GET_DL_CELL(cell); RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ue, cell); - U32 eff1, eff2; - U32 noRes; - U8 noLyr1, noLyr2; - U8 iTbs1, iTbs2; - U8 cfi = dlCell->currCfi; - - TRC2(rgSchUtlDlCalc2CwPrb); + uint32_t eff1, eff2; + uint32_t noRes; + uint8_t noLyr1, noLyr2; + uint8_t iTbs1, iTbs2; + uint8_t cfi = dlCell->currCfi; if ((dlUe->mimoInfo.forceTD) ||/* Transmit Diversity (TD) */ (dlUe->mimoInfo.ri < 2))/* 1 layer precoding */ @@ -11161,7 +10933,7 @@ U32 *prbReqrd; /* Optimization to convert totalBo (which is in-terms of bytes) to bits * i.e, << 3 and multiply with 1024 i.e, << 10 */ - noRes = ((U64)((bo << 3) << 10)) / (eff1); + noRes = ((uint64_t)((bo << 3) << 10)) / (eff1); /* Get the number of RBs needed for this transmission */ /* Number of RBs = No of REs / No of REs per RB */ *prbReqrd = RGSCH_CEIL(noRes, dlCell->noResPerRb[cfi]); @@ -11177,12 +10949,12 @@ U32 *prbReqrd; /* Optimization to convert totalBo (which is in-terms of bytes) to bits * i.e, << 3 and multiply with 1024 i.e, << 10 */ - noRes = ((U64)((bo << 3) << 10)) / (eff1 + eff2); + noRes = ((uint64_t)((bo << 3) << 10)) / (eff1 + eff2); /* Get the number of RBs needed for this transmission */ /* Number of RBs = No of REs / No of REs per RB */ *prbReqrd = RGSCH_CEIL(noRes, dlCell->noResPerRb[cfi]); } - RETVOID; + return; } /* rgSchUtlDlCalc2CwPrb */ /** @@ -11198,8 +10970,8 @@ U32 *prbReqrd; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U32 bo - * @param[out] U32 *prbReqrd + * @param[in] uint32_t bo + * @param[out] uint32_t *prbReqrd * @return Void **/ #ifdef ANSI @@ -11207,23 +10979,21 @@ Void rgSchUtlCalcTotalPrbReq ( RgSchCellCb *cell, RgSchUeCb *ue, -U32 bo, -U32 *prbReqrd +uint32_t bo, +uint32_t *prbReqrd ) #else Void rgSchUtlCalcTotalPrbReq(cell, ue, bo, prbReqrd) RgSchCellCb *cell; RgSchUeCb *ue; -U32 bo; -U32 *prbReqrd; +uint32_t bo; +uint32_t *prbReqrd; #endif { - TRC2(rgSchUtlCalcTotalPrbReq); - /* Call TM specific Prb calculation routine */ (dlCalcPrbFunc[ue->mimoInfo.txMode - 1])(cell, ue, bo, prbReqrd); - RETVOID; + return; } /* rgSchUtlCalcTotalPrbReq */ #ifdef UNUSE_FUN #ifdef TFU_UPGRADE @@ -11234,7 +11004,7 @@ U32 *prbReqrd; * * Desc : Fetch the CQI/PMI bits for a UE based on the mode, periodicity. * - * Ret : U8 + * Ret : uint8_t * ROK - Success * * Notes: @@ -11243,25 +11013,24 @@ U32 *prbReqrd; * **********************************************************/ #ifdef ANSI -PRIVATE U8 rgSCHUtlFetchPcqiBitSz +static uint8_t rgSCHUtlFetchPcqiBitSz ( RgSchCellCb *cell, RgSchUeCb *ueCb, - U8 numTxAnt + uint8_t numTxAnt ) #else -PRIVATE U8 rgSCHUtlFetchPcqiBitSz (cell, ueCb, numTxAnt) +static uint8_t rgSCHUtlFetchPcqiBitSz (cell, ueCb, numTxAnt) RgSchCellCb *cell; RgSchUeCb *ueCb; -U8 numTxAnt; +uint8_t numTxAnt; #endif { - U8 confRepMode; - U8 pcqiSz; - U8 ri; + uint8_t confRepMode; + uint8_t pcqiSz; + uint8_t ri; RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cell); - TRC3(rgSCHUtlFetchPcqiBitSz); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && (ueCb->mimoInfo.txMode != RGR_UE_TM_4)) @@ -11397,24 +11166,24 @@ U8 numTxAnt; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U32 *numSbs - * @return U8 + * @param[in] uint32_t *numSbs + * @return uint8_t **/ #ifdef ANSI -U8 rgSchUtlGetNumSbs +uint8_t rgSchUtlGetNumSbs ( RgSchCellCb *cell, RgSchUeCb *ue, -U32 *numSbs +uint32_t *numSbs ) #else -U8 rgSchUtlGetNumSbs (cell, ue, numSbs) +uint8_t rgSchUtlGetNumSbs (cell, ue, numSbs) RgSchCellCb *cell; RgSchUeCb *ue; -U32 *numSbs; +uint32_t *numSbs; #endif { - U32 nPrb; + uint32_t nPrb; //Currently hardcoding MAX prb for each UE nPrb = ue->ue5gtfCb.maxPrb; (*numSbs) = RGSCH_CEIL(nPrb, MAX_5GTF_VRBG_SIZE); @@ -11435,22 +11204,22 @@ U32 *numSbs; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @return U8 + * @return uint8_t **/ #ifdef ANSI -U8 rgSchUtlSortInsUeLst +uint8_t rgSchUtlSortInsUeLst ( RgSchCellCb *cell, CmLListCp *ueLst, CmLList *node, -U8 vrbgRequired +uint8_t vrbgRequired ) #else -U8 rgSchUtlSortInsUeLst (cell, ueLst, node, vrbgRequired) +uint8_t rgSchUtlSortInsUeLst (cell, ueLst, node, vrbgRequired) RgSchCellCb *cell; CmLListCp *ueLst; CmLList *node; -U8 vrbgRequired; +uint8_t vrbgRequired; #endif { CmLList *ueInLst; @@ -11525,7 +11294,7 @@ U8 vrbgRequired; * * @param[in] RgSchCellCb *cell * @param[in] CmLteRnti crnti - * @param[in] U8 lcgId + * @param[in] uint8_t lcgId * @param[in] Bool isGbr * @return S16 * -# ROK @@ -11535,23 +11304,21 @@ S16 rgSCHUtlBuildNSendLcgReg ( RgSchCellCb *cell, CmLteRnti crnti, -U8 lcgId, +uint8_t lcgId, Bool isGbr ) #else S16 rgSCHUtlBuildNSendLcgReg(cell, crnti, lcgId, isGbr) RgSchCellCb *cell; CmLteRnti crnti; -U8 lcgId; +uint8_t lcgId; Bool isGbr; #endif { Pst pst; RgInfLcgRegReq lcgRegReq; - TRC3(rgSCHUtlBuildNSendLcgReg); - - cmMemset((U8*)&pst, (U8)0, sizeof(Pst)); + memset(&pst, 0, sizeof(Pst)); lcgRegReq.isGbr = isGbr; lcgRegReq.cellId = cell->cellId; lcgRegReq.crnti = crnti; @@ -11596,8 +11363,6 @@ RgrSchFrmt1b3TypEnum fdbkType; TfuAckNackMode mode = TFU_UCI_FORMAT_1A_1B; - TRC2(rgSchUtlGetFdbkMode); - switch(fdbkType) { case RG_SCH_UCI_FORMAT_NON_CA: @@ -11657,8 +11422,6 @@ CmLteRnti rnti; Inst inst = cell->instIdx; RgInfRlsRnti rntiInfo; - TRC2(rgSCHUtlSndUeSCellDel2Mac) - RGSCHDBGINFONEW(inst,(rgSchPBuf(inst),"RNTI Release IND for UE(%d)\n", rnti)); /* Copy the info to rntiInfo */ rntiInfo.cellId = cell->cellId; @@ -11672,7 +11435,7 @@ CmLteRnti rnti; /* Invoke MAC to release the rnti */ rgSCHUtlGetPstToLyr(&pst, &rgSchCb[inst], cell->macInst); RgSchMacRlsRnti(&pst, &rntiInfo); - RETVOID; + return; } /** @@ -11686,22 +11449,20 @@ CmLteRnti rnti; * * * @param[in] RgrTxMode txMode - * @return U8 maxTbCount; + * @return uint8_t maxTbCount; * -# ROK **/ #ifdef ANSI -U8 rgSCHUtlGetMaxTbSupp +uint8_t rgSCHUtlGetMaxTbSupp ( RgrTxMode txMode ) #else -U8 rgSCHUtlGetMaxTbSupp(txMode) +uint8_t rgSCHUtlGetMaxTbSupp(txMode) RgrTxMode txMode #endif { - U8 maxTbCount; - - TRC2(rgSCHUtlGetMaxTbSupp); + uint8_t maxTbCount; /* Primary Cell */ @@ -11738,8 +11499,8 @@ RgrTxMode txMode * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb ueCb - * @param[in] U8 cqiReq, - * @param[out] U8 *triggerSet + * @param[in] uint8_t cqiReq, + * @param[out] uint8_t *triggerSet * * @return Void * -# ROK @@ -11749,15 +11510,15 @@ Void rgSCHTomUtlGetTrigSet ( RgSchCellCb *cell, RgSchUeCb *ueCb, - U8 cqiReq, - U8 *triggerSet + uint8_t cqiReq, + uint8_t *triggerSet ) #else -PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) +static S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) RgSchCellCb *cell; RgSchUeCb *ueCb; - U8 cqiReq; - U8 *triggerSet; + uint8_t cqiReq; + uint8_t *triggerSet; #endif { RgSchUeCellInfo *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ueCb); @@ -11766,7 +11527,7 @@ PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) case RG_SCH_APCQI_SERVING_CC: { /* APeriodic CQI request for Current Carrier.*/ - U8 sCellIdx = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)]; + uint8_t sCellIdx = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)]; *triggerSet = 1 << (7 - sCellIdx); break; } @@ -11786,7 +11547,7 @@ PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) break; } } - RETVOID; + return; } #endif /** @@ -11819,8 +11580,8 @@ RgSchUeCb *ueCb; Bool isCsi2Bit; #endif { - U8 dci01aCmnSize = cell->dciSize.baseSize[TFU_DCI_FORMAT_0]; - U8 dci01aDedSize = cell->dciSize.baseSize[TFU_DCI_FORMAT_0]; + uint8_t dci01aCmnSize = cell->dciSize.baseSize[TFU_DCI_FORMAT_0]; + uint8_t dci01aDedSize = cell->dciSize.baseSize[TFU_DCI_FORMAT_0]; if ((ueCb->accessStratumRls >= RGR_REL_10) && (cell->bwCfg.dlTotalBw >= cell->bwCfg.ulTotalBw)) { dci01aCmnSize += 1; /* Resource Allocation Type DCI 0 */ @@ -11932,9 +11693,9 @@ Void rgSCHUtlCalcDciSizes(cell) RgSchCellCb *cell; #endif { - U8 dciSize = 0; - U8 dci01aSize = 0; - U32 bits = 0, idx = 0; + uint8_t dciSize = 0; + uint8_t dci01aSize = 0; + uint32_t bits = 0, idx = 0; switch(TFU_DCI_FORMAT_0) /* Switch case for the purpose of readability */ { @@ -11954,7 +11715,7 @@ RgSchCellCb *cell; dciSize = 1 /* DCI 0 bit indicator */ + \ 1 /* Frequency hoping enable bit field */ + \ - (U8)bits /* For frequency Hopping */ + \ + (uint8_t)bits /* For frequency Hopping */ + \ 5 /* MCS */ + \ 1 /* NDI */ + \ 2 /* TPC */ + \ @@ -11997,7 +11758,7 @@ RgSchCellCb *cell; dciSize += 1 /* Format 1A */ + \ 1 /* Local or Distributed */ + \ - (U8)bits /* Resource block Assignment */ + \ + (uint8_t)bits /* Resource block Assignment */ + \ 5 /* MCS */ + #ifdef TFU_TDD 4 /* HARQ Proc Id */ + @@ -12043,7 +11804,7 @@ RgSchCellCb *cell; bits++; } - dciSize += (U8)bits /* Resource Allocation bits */ + \ + dciSize += (uint8_t)bits /* Resource Allocation bits */ + \ 5 /* MCS */ + #ifdef TFU_TDD 4 /* HARQ TDD */ + @@ -12090,7 +11851,7 @@ RgSchCellCb *cell; dciSize = 1; /* Resource Allocation bit */ } - dciSize += (U8)bits /* Resource Allocation bits */ + \ + dciSize += (uint8_t)bits /* Resource Allocation bits */ + \ 2 /* TPC */ + #ifdef TFU_TDD 2 /* DAI */ + \ @@ -12125,7 +11886,7 @@ RgSchCellCb *cell; dciSize = 1; /* Resource Allocation bit */ } - dciSize += (U8)bits /* Resource Allocation bits */ + \ + dciSize += (uint8_t)bits /* Resource Allocation bits */ + \ 2 /* TPC */ + #ifdef TFU_TDD 2 /* DAI */ + \ @@ -12204,9 +11965,7 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) RgSchCellCb *cell #endif { - U32 tptDelta; - - TRC3(rgSCHUtlCpuOvrLdAdjItbsCap) + uint32_t tptDelta; if ((cell->cpuOvrLdCntrl.cpuOvrLdIns) & (RGR_CPU_OVRLD_DL_TPT_UP | RGR_CPU_OVRLD_DL_TPT_DOWN)) @@ -12264,7 +12023,7 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) #endif } - RETVOID; + return; } /** * @brief Handler for the num UE per TTI based CPU OvrLd instr updating @@ -12279,31 +12038,31 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) * - If successful, return ROK else RFAILED. * * @param[in] RgSchCellCb *cell - * @param[in] U8 cnrtCpuOvrLdIns + * @param[in] uint8_t cnrtCpuOvrLdIns * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr +static Void rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr ( RgSchCellCb *cell, - U8 crntCpuOvrLdIns + uint8_t crntCpuOvrLdIns ) #else -PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) +static S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) RgSchCellCb *cell; - U8 crntCpuOvrLdIns; + uint8_t crntCpuOvrLdIns; #endif { RgSchCpuOvrLdCntrlCb *cpuInstr = &(cell->cpuOvrLdCntrl); RgSchCmnCell *cellSch; - U8 maxUeNewDlTxPerTti; - U8 maxUeNewUlTxPerTti; - U8 tmpslot = 0; + uint8_t maxUeNewDlTxPerTti; + uint8_t maxUeNewUlTxPerTti; + uint8_t tmpslot = 0; #ifdef CPU_OL_DBG_PRINTS - U8 idx = 0; + uint8_t idx = 0; #endif - U8 maxDlDecCnt; - U8 maxUlDecCnt; + uint8_t maxDlDecCnt; + uint8_t maxUlDecCnt; cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -12430,7 +12189,7 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) printf("\n"); #endif - RETVOID; + return; } /* rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr */ /** @@ -12446,7 +12205,7 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) * - If successful, return ROK else RFAILED. * * @param[in] RgSchCellCb *cell - * @param[in] U8 cnrtCpuOvrLdIns + * @param[in] uint8_t cnrtCpuOvrLdIns * @return S16 * -# ROK * -# RFAILED @@ -12455,20 +12214,18 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) S16 rgSCHUtlResetCpuOvrLdState ( RgSchCellCb *cell, - U8 crntCpuOvrLdIns + uint8_t crntCpuOvrLdIns ) #else S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) RgSchCellCb *cell; - U8 crntCpuOvrLdIns; + uint8_t crntCpuOvrLdIns; #endif { - U8 crntDlCpuOL=0; - U8 crntUlCpuOL=0; + uint8_t crntDlCpuOL=0; + uint8_t crntUlCpuOL=0; RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); - U8 idx; - - TRC3(rgSCHUtlResetCpuOvrLdState) + uint8_t idx; #ifdef CPU_OL_DBG_PRINTS printf("\n CPU OVR LD Ins Rcvd = %d\n", (int)crntCpuOvrLdIns);