X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_utl.c;h=0e0e037298f6fa77c262b2c4a0865233eb1343d3;hb=2bd852089c3226f721d83b30f816b90f803237f6;hp=bde585b3deb92739628d616b689eab4566aaa2d6;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c index bde585b3d..0e0e03729 100755 --- a/src/5gnrsch/rg_sch_utl.c +++ b/src/5gnrsch/rg_sch_utl.c @@ -32,23 +32,19 @@ @brief This file implements the schedulers main access to MAC layer code. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=177; /* header include files -- defines (.h) */ #include "common_def.h" #include "lrg.h" #include "rgr.h" #include "tfu.h" +#include "sch_utils.h" #include "rg_env.h" #include "rg_sch_err.h" #include "rg_sch_inf.h" #include "rg_sch.h" #include "rg_sch_cmn.h" #include "rgm.h" -#include "rl_interface.h" -#include "rl_common.h" /* header/extern include files (.x) */ #include "tfu.x" /* TFU types */ @@ -64,39 +60,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 +101,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 +153,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 +187,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 +252,7 @@ CONSTANT struct rgSchUtlBcchPcchTbSz /* forward references */ #ifdef LTE_TDD -PRIVATE Void rgSCHUtlUpdPrachOcc ARGS(( +static Void rgSCHUtlUpdPrachOcc ARGS(( RgSchCellCb *cell, RgrTddPrachInfo *cellCfg)); #endif @@ -298,7 +294,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) /* * @@ -313,17 +309,7 @@ for proper NULLP assignment*/ * File: rg_sch_utl.c * */ -#ifdef ANSI -F64 rgSCHUtlPower -( -F64 x, -F64 n -) -#else -F64 rgSCHUtlPower(x, n) -F64 x; -F64 n; -#endif +F64 rgSCHUtlPower(F64 x,F64 n) { if( n==0 ) { @@ -353,24 +339,10 @@ F64 n; * File: rg_sch_utl.c * */ -#ifdef ANSI -U32 rgSCHUtlParse -( -U8 *buff, -U8 startPos, -U8 endPos, -U8 buffSize -) -#else -U32 rgSCHUtlParse(buff, startPos, endPos, buffSize) -U8 *buff; -U8 startPos; -U8 endPos; -U8 buffSize; -#endif +uint32_t rgSCHUtlParse(uint8_t *buff,uint8_t startPos,uint8_t endPos,uint8_t buffSize) { - U8 pointToChar,pointToEnd, loop; - U8 size = endPos - startPos; + uint8_t pointToChar,pointToEnd, loop; + uint8_t size = endPos - startPos; F64 result = 0; pointToEnd = (startPos)%8; for ( loop=0; loopinstIdx; S16 ret; - U16 offsetStepMask; + uint16_t offsetStepMask; /* V5G_213 : 10.1 */ offset = 0; @@ -576,27 +530,15 @@ 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 * **/ -#ifdef ANSI -Void rgSCHUtlPdcchPut -( -RgSchCellCb *cell, -RgSchPdcchInfo *pdcchInfo, -RgSchPdcch *pdcch -) -#else -Void rgSCHUtlPdcchPut(cell, pdcchInfo, pdcch) -RgSchCellCb *cell; -RgSchPdcchInfo *pdcchInfo; -RgSchPdcch *pdcch; -#endif +Void rgSCHUtlPdcchPut(RgSchCellCb *cell,RgSchPdcchInfo *pdcchInfo,RgSchPdcch *pdcch) { - U8 *byte; - U8 offset; + uint8_t *byte; + uint8_t offset; uint16_t mask; switch(pdcch->aggrLvl) @@ -616,7 +558,7 @@ RgSchPdcch *pdcch; mask = 0xffff; break; default: - RETVOID; + return; } /* Placing common computation of byte from all the cases above here for optimization */ @@ -628,7 +570,7 @@ RgSchPdcch *pdcch; pdcch->ue = NULLP; (*byte) &= ~mask; - RETVOID; + return; } @@ -649,25 +591,13 @@ RgSchPdcch *pdcch; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlPdcchInit -( -RgSchCellCb *cell, -RgSchDlSf *subFrm, -U16 nCce -) -#else -Void rgSCHUtlPdcchInit(cell, subFrm, nCce) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -U16 nCce; -#endif +Void rgSCHUtlPdcchInit(RgSchCellCb *cell,RgSchDlSf *subFrm,uint16_t nCce) { RgSchPdcchInfo *pdcchInfo; RgSchPdcch *pdcch; Inst inst = cell->instIdx; - U8 extraBits; - U32 cceMapSz; + uint8_t extraBits; + uint32_t cceMapSz; pdcchInfo = &subFrm->pdcchInfo; while(pdcchInfo->pdcchs.first != NULLP) @@ -702,7 +632,7 @@ U16 nCce; if (pdcchInfo->map == NULLP) { /* Generate log error here */ - RETVOID; + return; } } @@ -715,7 +645,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 */ @@ -732,17 +662,7 @@ U16 nCce; * @return Void * **/ -#ifdef ANSI -Void rgSchSFRTotalPoolFree -( - RgSchSFRTotalPoolInfo *sfrTotalPoolInfo, - RgSchCellCb *cell - ) -#else -Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell) - RgSchSFRTotalPoolInfo *sfrTotalPoolInfo; - RgSchCellCb *cell; -#endif +Void rgSchSFRTotalPoolFree(RgSchSFRTotalPoolInfo *sfrTotalPoolInfo,RgSchCellCb *cell) { CmLListCp *l; CmLList *n; @@ -793,17 +713,7 @@ Void rgSchSFRTotalPoolFree(sfrTotalPoolInfo, cell) * @return Void * **/ -#ifdef ANSI -S16 rgSchSFRTotalPoolInit -( - RgSchCellCb *cell, - RgSchDlSf *sf - ) -#else -PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) - RgSchCellCb *cell; - RgSchDlSf *sf; -#endif +S16 rgSchSFRTotalPoolInit(RgSchCellCb *cell,RgSchDlSf *sf) { /* Initialise the variables */ RgSchSFRPoolInfo *sfrCCPool; @@ -825,8 +735,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp, sizeof(CmLList)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "CE Pool memory allocation FAILED for cell"); + DU_LOG("\nERROR --> SCH : CE Pool memory allocation FAILED for cell"); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo, cell); return RFAILED; } @@ -834,8 +743,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "CE Pool memory allocation FAILED for cell "); + DU_LOG("\nERROR --> SCH : CE Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); return RFAILED; } @@ -868,8 +776,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp, sizeof(CmLList)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "CC Pool memory allocation FAILED for cell "); + DU_LOG("\nERROR --> SCH : CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); return RFAILED; } @@ -877,8 +784,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "CC Pool memory allocation FAILED for cell "); + DU_LOG("\nERROR --> SCH : CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); return RFAILED; } @@ -930,8 +836,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp, sizeof(CmLList)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "CC Pool memory allocation FAILED for cell "); + DU_LOG("\nERROR --> SCH : CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); return RFAILED; } @@ -939,8 +844,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, - "CC Pool memory allocation FAILED for cell "); + DU_LOG("\nERROR --> SCH : CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); return RFAILED; } @@ -986,22 +890,10 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) * @return S16 * **/ -#ifdef ANSI -S16 rgSchDSFRRntpInfoInit -( - TknStrOSXL *rntpPtr, - RgSchCellCb *cell, - U16 bw - ) -#else -PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) - TknStrOSXL *rntpPtr; - RgSchCellCb *cell; - U16 bw; -#endif +S16 rgSchDSFRRntpInfoInit(TknStrOSXL *rntpPtr,RgSchCellCb *cell,uint16_t bw) { Inst inst = cell->instIdx; - U16 len; + uint16_t len; rntpPtr->pres = PRSNT_NODEF; @@ -1011,9 +903,9 @@ 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"); + DU_LOG("\nERROR --> SCH : Memory allocation FAILED for RNTP Alloc"); return RFAILED; } @@ -1033,28 +925,16 @@ PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) * @return S16 * **/ -#ifdef ANSI -S16 rgSchDSFRRntpInfoFree -( - TknStrOSXL *rntpPtr, - RgSchCellCb *cell, - U16 bw - ) -#else -PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) - TknStrOSXL *rntpPtr; - RgSchCellCb *cell; - U16 bw; -#endif +S16 rgSchDSFRRntpInfoFree(TknStrOSXL *rntpPtr,RgSchCellCb *cell,uint16_t bw) { Inst inst = cell->instIdx; - U16 len; + 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; } @@ -1076,17 +956,7 @@ PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSchSFRResetPoolVariables -( - RgSchCellCb *cell, - RgSchSFRPoolInfo *pool - ) -#else -PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) - RgSchCellCb *cell; - RgSchSFRPoolInfo *pool; -#endif +static Void rgSchSFRResetPoolVariables(RgSchCellCb *cell,RgSchSFRPoolInfo *pool) { pool->bwAlloced = 0; @@ -1099,7 +969,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 @@ -1116,17 +986,7 @@ PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHSFRUtlTotalPoolReset -( - RgSchCellCb *cell, - RgSchDlSf *subFrm - ) -#else -PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) - RgSchCellCb *cell; - RgSchDlSf *subFrm; -#endif +static Void rgSCHSFRUtlTotalPoolReset(RgSchCellCb *cell,RgSchDlSf *subFrm) { RgSchSFRTotalPoolInfo *totalPoolInfo = &subFrm->sfrTotalPoolInfo; CmLListCp *ccPool = &totalPoolInfo->ccPool; @@ -1164,7 +1024,7 @@ PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) totalPoolInfo->CEPoolBwAvlbl = tempPool->bw; } - RETVOID; + return; } /* LTE_ADV_FLAG_REMOVED_END */ /** @@ -1180,53 +1040,33 @@ 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 **/ #ifdef LTE_TDD -#ifdef ANSI S16 rgSCHUtlAddPhich ( -RgSchCellCb *cell, -CmLteTimingInfo frm, -U8 hqFeedBack, -U8 nDmrs, -U8 rbStart, -U8 iPhich +RgSchCellCb *cell, +CmLteTimingInfo frm, +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; -#endif -#else -#ifdef ANSI S16 rgSCHUtlAddPhich ( -RgSchCellCb *cell, -CmLteTimingInfo frm, -U8 hqFeedBack, -U8 nDmrs, -U8 rbStart, -Bool isForMsg3 +RgSchCellCb *cell, +CmLteTimingInfo frm, +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; -Bool isForMsg3; -#endif #endif { S16 ret; @@ -1239,7 +1079,7 @@ Bool isForMsg3; if(ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, " rgSCHUtlAddPhich(): " + DU_LOG("\nERROR --> SCH : rgSCHUtlAddPhich(): " "Allocation of RgSchPhich failed"); return RFAILED; } @@ -1269,17 +1109,7 @@ Bool isForMsg3; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHUtlPhichReset -( -RgSchCellCb *cell, -RgSchDlSf *subFrm -) -#else -PRIVATE Void rgSCHUtlPhichReset(cell, subFrm) -RgSchCellCb *cell; -RgSchDlSf *subFrm; -#endif +static Void rgSCHUtlPhichReset(RgSchCellCb *cell,RgSchDlSf *subFrm) { RgSchPhichInfo *phichInfo; RgSchPhich *phich; @@ -1294,7 +1124,7 @@ RgSchDlSf *subFrm; RGSCH_PHICH_FREE(cell->instIdx, phich, sizeof(RgSchPhich)); } cmLListInit(&phichInfo->phichs); - RETVOID; + return; } /* rgSCHUtlPhichReset */ @@ -1313,20 +1143,10 @@ RgSchDlSf *subFrm; * @return Void * **/ -#ifdef ANSI -RgSchDlSf* rgSCHUtlSubFrmGet -( -RgSchCellCb *cell, -CmLteTimingInfo frm -) -#else -RgSchDlSf* rgSCHUtlSubFrmGet(cell, frm) -RgSchCellCb *cell; -CmLteTimingInfo frm; -#endif +RgSchDlSf* rgSCHUtlSubFrmGet(RgSchCellCb *cell,CmLteTimingInfo frm) { RgSchDlSf *sf; - U8 dlIdx; + uint8_t dlIdx; #ifdef LTE_TDD dlIdx = rgSCHUtlGetDlSfIdx(cell, &frm); @@ -1361,20 +1181,10 @@ CmLteTimingInfo frm; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlSubFrmPut -( -RgSchCellCb *cell, -RgSchDlSf *sf -) -#else -Void rgSCHUtlSubFrmPut(cell, sf) -RgSchCellCb *cell; -RgSchDlSf *sf; -#endif +Void rgSCHUtlSubFrmPut(RgSchCellCb *cell,RgSchDlSf *sf) { - U8 i; - U8 noRaRsps; + uint8_t i; + uint8_t noRaRsps; #ifdef LTE_TDD /* Release all the held PDCCH information */ @@ -1464,7 +1274,7 @@ RgSchDlSf *sf; sf->cceCnt = 0; sf->isCceFailure = FALSE; sf->dlUlBothCmplt = 0; - RETVOID; + return; } @@ -1479,24 +1289,16 @@ RgSchDlSf *sf; * * Invoked by: Scheduler * - * @param[in] U32 n - * @return U8 + * @param[in] uint32_t n + * @return uint8_t * **/ -#ifdef ANSI -U8 rgSCHUtlLog32bitNbase2 -( -U32 n -) -#else -U8 rgSCHUtlLog32bitNbase2(n) -U32 n; -#endif +uint8_t rgSCHUtlLog32bitNbase2(uint32_t n) { - U32 b[] = {0x2, 0xc, 0xf0, 0xff00, 0xffff0000}; - U32 s[] = {1, 2, 4, 8, 16}; - S16 i; - U8 ret = 0; + 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--) { @@ -1524,26 +1326,14 @@ U32 n; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 isAck + * @param[in] uint8_t isAck * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDlRelPdcchFbk -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 isAck -) -#else -Void rgSCHUtlDlRelPdcchFbk(cell, ue, isAck) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 isAck; -#endif +Void rgSCHUtlDlRelPdcchFbk(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t isAck) { cell->sc.apis->rgSCHDlRelPdcchFbk(cell, ue, isAck); - RETVOID; + return; } @@ -1564,20 +1354,10 @@ U8 isAck; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDlProcAck -( -RgSchCellCb *cell, -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHUtlDlProcAck(cell, hqP) -RgSchCellCb *cell; -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHUtlDlProcAck(RgSchCellCb *cell,RgSchDlHqProcCb *hqP) { cell->sc.apis->rgSCHDlProcAck(cell, hqP); - RETVOID; + return; } /** @@ -1595,21 +1375,11 @@ RgSchDlHqProcCb *hqP; * @param[out] RgSchErrInfo *err * @return Void **/ -#ifdef ANSI -Void rgSCHUtlHdlCrntiCE -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHUtlHdlCrntiCE(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHUtlHdlCrntiCE(RgSchCellCb *cell,RgSchUeCb *ue) { cell->sc.apis->rgSCHHdlCrntiCE(cell, ue); - RETVOID; + return; } /* rgSCHUtlHdlCrntiCE */ #endif /* LTEMAC_SPS */ @@ -1620,7 +1390,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 @@ -1631,23 +1401,9 @@ RgSchUeCb *ue; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE U16 rgSCHUtlCalcTotalRegs -( -U8 bw, -U8 cfi, -U8 numAntna, -Bool isEcp -) -#else -PRIVATE U16 rgSCHUtlCalcTotalRegs(bw, cfi, numAntna, isEcp) -U8 bw; -U8 cfi; -U8 numAntna; -Bool isEcp; -#endif +static uint16_t rgSCHUtlCalcTotalRegs(uint8_t bw,uint8_t cfi,uint8_t numAntna,Bool isEcp) { - U16 regs = 0; + uint16_t regs = 0; /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1690,24 +1446,14 @@ 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 * * File : * **********************************************************/ -#ifdef ANSI -PRIVATE U16 rgSCHUtlCalcPhichRegs -( -U8 bw, -U8 ng6 -) -#else -PRIVATE U16 rgSCHUtlCalcPhichRegs(bw, ng6) -U8 bw; -U8 ng6; -#endif +static uint16_t rgSCHUtlCalcPhichRegs(uint8_t bw,uint8_t ng6) { /* ccpu00115330: Corrected the calculation for number of PHICH groups*/ return (RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP); @@ -1727,39 +1473,21 @@ 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 -( -U8 bw, -RgrPhichNg ng, -U8 cfi, -U8 mPhich, -U8 numAntna, -Bool isEcp -) -#else -U8 rgSCHUtlCalcNCce(bw, ng, cfi, mPhich, numAntna, isEcp) -U8 bw; -RgrPhichNg ng; -U8 cfi; -U8 mPhich; -U8 numAntna; -Bool isEcp; -#endif +uint8_t rgSCHUtlCalcNCce(uint8_t bw,RgrPhichNg ng,uint8_t cfi,uint8_t mPhich,uint8_t numAntna,Bool isEcp) { - U16 totalRegs; - U16 phichRegs; - U16 cceRegs; - U8 ng6; + uint16_t totalRegs; + uint16_t phichRegs; + uint16_t cceRegs; + uint8_t ng6; /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1784,7 +1512,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 @@ -1801,35 +1529,19 @@ 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 -( -U8 bw, -RgrPhichNg ng, -U8 cfi, -U8 numAntna, -Bool isEcp -) -#else -U8 rgSCHUtlCalcNCce(bw, ng, cfi, numAntna, isEcp) -U8 bw; -RgrPhichNg ng; -U8 cfi; -U8 numAntna; -Bool isEcp; -#endif +uint8_t rgSCHUtlCalcNCce(uint8_t bw,RgrPhichNg ng,uint8_t cfi,uint8_t numAntna,Bool isEcp) { - U16 totalRegs; - U16 phichRegs; - U16 cceRegs; - U8 ng6; + uint16_t totalRegs; + uint16_t phichRegs; + uint16_t cceRegs; + uint8_t ng6; /*ccpu00116757- removed check for (ERRCLASS & ERRCLS_DEBUG)*/ @@ -1854,7 +1566,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 @@ -1870,40 +1582,14 @@ 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 -#ifdef ANSI -S16 rgSCHUtlGetPhichInfo -( -RgSchUlHqProcCb *hqProc, -U8 *rbStartRef, -U8 *nDmrsRef, -U8 *iPhich -) -#else -S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef, iPhich) -RgSchUlHqProcCb *hqProc; -U8 *rbStartRef; -U8 *nDmrsRef; -U8 *iPhich; -#endif -#else -#ifdef ANSI -S16 rgSCHUtlGetPhichInfo -( -RgSchUlHqProcCb *hqProc, -U8 *rbStartRef, -U8 *nDmrsRef -) +S16 rgSCHUtlGetPhichInfo(RgSchUlHqProcCb *hqProc,uint8_t *rbStartRef,uint8_t *nDmrsRef,uint8_t *iPhich) #else -S16 rgSCHUtlGetPhichInfo(hqProc, rbStartRef, nDmrsRef) -RgSchUlHqProcCb *hqProc; -U8 *rbStartRef; -U8 *nDmrsRef; -#endif +S16 rgSCHUtlGetPhichInfo(RgSchUlHqProcCb *hqProc,uint8_t *rbStartRef,uint8_t *nDmrsRef) #endif { /* ACC-TDD */ @@ -1936,50 +1622,32 @@ 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 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, - rvRef, size, modType, isRtx, nDmrs, ndi, - hqPId) -RgSchUlAlloc *alloc; -CmLteRnti *rnti; -U8 *iMcsRef; -U8 *rbStartRef; -U8 *numRbRef; -U8 *rvRef; -U16 *size; -TfuModScheme *modType; -Bool *isRtx; -U8 *nDmrs; -Bool *ndi; -U8 *hqPId; -#endif { /* Modulation order for 16qam UEs would be * min(4,modulation order in grant). Please refer to 36.213-8.6.1*/ @@ -1996,8 +1664,7 @@ U8 *hqPId; { if ( ((alloc->ue) == NULLP) || (RG_SCH_CMN_GET_UE(alloc->ue, alloc->ue->cell) == NULLP)) { - RLOG_ARG2(L_ERROR,DBG_CELLID,alloc->ue->cell->cellId, - "Failed: ue->sch is null RNTI:%d,isRetx=%d", + DU_LOG("\nERROR --> SCH : Failed: ue->sch is null RNTI:%d,isRetx=%d", alloc->rnti, alloc->grnt.isRtx); return RFAILED; } @@ -2037,28 +1704,14 @@ 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 **/ -#ifdef ANSI -S16 rgSCHUtlAllocRcptInfo -( -RgSchCellCb *cell, -RgSchUlAlloc *alloc, -CmLteTimingInfo *timeInfo, -TfuUeUlSchRecpInfo *recpReq -) -#else -S16 rgSCHUtlAllocRcptInfo(cell, alloc, timeInfo, recpReq) -RgSchCellCb *cell; -RgSchUlAlloc *alloc; -CmLteTimingInfo *timeInfo; -TfuUeUlSchRecpInfo *recpReq; -#endif +S16 rgSCHUtlAllocRcptInfo(RgSchCellCb *cell,RgSchUlAlloc *alloc,CmLteTimingInfo *timeInfo,TfuUeUlSchRecpInfo *recpReq) { #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) @@ -2157,23 +1810,13 @@ TfuUeUlSchRecpInfo *recpReq; * @return Void * **/ -#ifdef ANSI -PRIVATE Void rgSCHUtlUpdPrachOcc -( -RgSchCellCb *cell, -RgrTddPrachInfo *cellCfg -) -#else -PRIVATE Void rgSCHUtlUpdPrachOcc(cell, cellCfg) -RgSchCellCb *cell; -RgrTddPrachInfo *cellCfg; -#endif +static Void rgSCHUtlUpdPrachOcc(RgSchCellCb *cell,RgrTddPrachInfo *cellCfg) { - U8 idx; - U8 count = 0; - U8 size; - U8 startIdx; - U8 endIdx; + 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) @@ -2202,7 +1845,7 @@ RgrTddPrachInfo *cellCfg; count ++; } } - RETVOID; + return; } /** @@ -2221,27 +1864,17 @@ RgrTddPrachInfo *cellCfg; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlPrachCfgInit -( -RgSchCellCb *cell, -RgrCellCfg *cellCfg -) -#else -Void rgSCHUtlPrachCfgInit(cell, cellCfg) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -#endif +Void rgSCHUtlPrachCfgInit(RgSchCellCb *cell,RgrCellCfg *cellCfg) { - U8 idx; - U8 subfrmIdx; - U8 splFrm; + uint8_t idx; + uint8_t subfrmIdx; + uint8_t splFrm; if(cellCfg->prachRscInfo.numRsc <= 0) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid" + DU_LOG("\nERROR --> SCH : Invalid" "PRACH resources Configuration "); - RETVOID; + return; } /* Update SFN occasions */ @@ -2277,7 +1910,7 @@ RgrCellCfg *cellCfg; } } } - RETVOID; + return; } /** @@ -2297,30 +1930,18 @@ RgrCellCfg *cellCfg; * @return Void * **/ -#ifdef ANSI -S16 rgSCHUtlRgrCellCfg -( -RgSchCellCb *cell, -RgrCellCfg *cellCfg, -RgSchErrInfo *errInfo -) -#else -S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -RgSchErrInfo *errInfo; -#endif +S16 rgSCHUtlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *errInfo) { - 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 */ memset(&frm,0,sizeof(CmLteTimingInfo)); @@ -2477,28 +2098,16 @@ RgSchErrInfo *errInfo; * @return Void * **/ -#ifdef ANSI -S16 rgSCHUtlRgrCellCfg -( -RgSchCellCb *cell, -RgrCellCfg *cellCfg, -RgSchErrInfo *errInfo -) -#else -S16 rgSCHUtlRgrCellCfg(cell, cellCfg, errInfo) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -RgSchErrInfo *errInfo; -#endif +S16 rgSCHUtlRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *errInfo) { - 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 */ memset(&frm,0,sizeof(CmLteTimingInfo)); @@ -2574,9 +2183,9 @@ 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"); + DU_LOG("\nERROR --> SCH : Memory allocation FAILED for RNTP Alloc"); return RFAILED; } cell->rntpAggrInfo.pres = PRSNT_NODEF; @@ -2664,19 +2273,7 @@ RgSchErrInfo *errInfo; * @return Void * **/ -#ifdef ANSI -S16 rgSCHUtlRgrCellRecfg -( -RgSchCellCb *cell, -RgrCellRecfg *recfg, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlRgrCellRecfg(cell, recfg, err) -RgSchCellCb *cell; -RgrCellRecfg *recfg; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlRgrCellRecfg(RgSchCellCb *cell,RgrCellRecfg *recfg,RgSchErrInfo *err) { return (cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err)); } @@ -2699,27 +2296,19 @@ RgSchErrInfo *err; * @return Void * **/ -#ifdef ANSI -S16 rgSCHUtlFreeCell -( -RgSchCellCb *cell -) -#else -S16 rgSCHUtlFreeCell(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHUtlFreeCell(RgSchCellCb *cell) { - 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 #ifdef LTE_TDD @@ -2848,21 +2437,7 @@ RgSchCellCb *cell; * @return S16 * **/ -#ifdef ANSI -S16 rgSCHUtlRgrUeCfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeCfg *cfg, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlRgrUeCfg(cell, ue, cfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeCfg *cfg; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlRgrUeCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeCfg *cfg,RgSchErrInfo *err) { /* Assign TM 1 as UE's default TM */ @@ -2923,23 +2498,7 @@ RgSchErrInfo *err; * @return S16 * **/ -#ifdef ANSI -S16 rgSCHUtlRgrLcCfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *dlLc, -RgrLchCfg *cfg, -RgSchErrInfo *errInfo -) -#else -S16 rgSCHUtlRgrLcCfg(cell, ue, dlLc, cfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *dlLc; -RgrLchCfg *cfg; -RgSchErrInfo *errInfo; -#endif +S16 rgSCHUtlRgrLcCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *dlLc,RgrLchCfg *cfg,RgSchErrInfo *errInfo) { return (cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo)); } @@ -2965,23 +2524,7 @@ RgSchErrInfo *errInfo; * @return S16 * **/ -#ifdef ANSI -S16 rgSCHUtlRgrLcRecfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *dlLc, -RgrLchRecfg *recfg, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlRgrLcRecfg(cell, ue, dlLc, recfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *dlLc; -RgrLchRecfg *recfg; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlRgrLcRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *dlLc,RgrLchRecfg *recfg,RgSchErrInfo *err) { return (cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err)); } @@ -2999,25 +2542,11 @@ 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 * **/ -#ifdef ANSI -S16 rgSCHUtlRgrLcDel -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteLcId lcId, -U8 lcgId -) -#else -S16 rgSCHUtlRgrLcDel(cell, ue, lcId, lcgId) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteLcId lcId; -U8 lcgId; -#endif +S16 rgSCHUtlRgrLcDel(RgSchCellCb *cell,RgSchUeCb *ue,CmLteLcId lcId,uint8_t lcgId) { cell->sc.apis->rgSCHRgrLchDel(cell, ue, lcId, lcgId); @@ -3043,21 +2572,7 @@ U8 lcgId; * @return S16 * **/ -#ifdef ANSI -S16 rgSCHUtlRgrLcgCfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrLcgCfg *cfg, -RgSchErrInfo *errInfo -) -#else -S16 rgSCHUtlRgrLcgCfg(cell, ue, cfg, errInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrLcgCfg *cfg; -RgSchErrInfo *errInfo; -#endif +S16 rgSCHUtlRgrLcgCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrLcgCfg *cfg,RgSchErrInfo *errInfo) { return (cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo)); } @@ -3082,21 +2597,7 @@ RgSchErrInfo *errInfo; * @return S16 * **/ -#ifdef ANSI -S16 rgSCHUtlRgrLcgRecfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrLcgRecfg *recfg, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlRgrLcgRecfg(cell, ue, recfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrLcgRecfg *recfg; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlRgrLcgRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrLcgRecfg *recfg,RgSchErrInfo *err) { return (cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err)); } /* rgSCHUtlRgrLcRecfg */ @@ -3119,24 +2620,12 @@ RgSchErrInfo *err; * @return S16 * **/ -#ifdef ANSI -Void rgSCHUtlRgrLcgDel -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 lcgId -) -#else -Void rgSCHUtlRgrLcgDel(cell, ue, lcgId) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 lcgId; -#endif +Void rgSCHUtlRgrLcgDel(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t lcgId) { cell->sc.apis->rgSCHFreeLcg(cell, ue, &ue->ul.lcgArr[lcgId]); /* Stack Crash problem for TRACE5 changes. added the return below . */ - RETVOID; + return; } /* rgSCHUtlRgrLcgDel */ @@ -3159,23 +2648,11 @@ U8 lcgId; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDoaInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -TfuDoaRpt *doaRpt -) -#else -Void rgSCHUtlDoaInd(cell, ue, doaRpt) -RgSchCellCb *cell; -RgSchUeCb *ue; -TfuDoaRpt *doaRpt; -#endif +Void rgSCHUtlDoaInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuDoaRpt *doaRpt) { ue->mimoInfo.doa.pres = PRSNT_NODEF; ue->mimoInfo.doa.val = doaRpt->doa; - RETVOID; + return; } /** @@ -3195,21 +2672,7 @@ TfuDoaRpt *doaRpt; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDlCqiInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -TfuDlCqiRpt *dlCqiRpt, -CmLteTimingInfo timingInfo -) -#else -Void rgSCHUtlDlCqiInd(cell, ue, dlCqiRpt, timingInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -TfuDlCqiRpt *dlCqiRpt; -CmLteTimingInfo timingInfo; -#endif +Void rgSCHUtlDlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuDlCqiRpt *dlCqiRpt,CmLteTimingInfo timingInfo) { RgSchCellCb *sCellCb = NULLP; if (dlCqiRpt->isPucchInfo) @@ -3220,7 +2683,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; @@ -3228,7 +2691,7 @@ CmLteTimingInfo timingInfo; (Void *)&dlCqiRpt->dlCqiInfo.pusch.puschCqi[idx], timingInfo); } } - RETVOID; + return; } @@ -3250,24 +2713,10 @@ CmLteTimingInfo timingInfo; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlSrsInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -TfuSrsRpt *srsRpt, -CmLteTimingInfo timingInfo -) -#else -Void rgSCHUtlSrsInd(cell, ue, srsRpt, timingInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -TfuSrsRpt *srsRpt; -CmLteTimingInfo timingInfo; -#endif +Void rgSCHUtlSrsInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuSrsRpt *srsRpt,CmLteTimingInfo timingInfo) { cell->sc.apis->rgSCHSrsInd(cell, ue, srsRpt, timingInfo); - RETVOID; + return; } #endif @@ -3286,20 +2735,10 @@ CmLteTimingInfo timingInfo; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDlTARpt -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHUtlDlTARpt(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHUtlDlTARpt(RgSchCellCb *cell,RgSchUeCb *ue) { cell->sc.apis->rgSCHDlTARpt(cell, ue); - RETVOID; + return; } @@ -3318,20 +2757,10 @@ RgSchUeCb *ue; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDlRlsSubFrm -( -RgSchCellCb *cell, -CmLteTimingInfo subFrm -) -#else -Void rgSCHUtlDlRlsSubFrm(cell, subFrm) -RgSchCellCb *cell; -CmLteTimingInfo subFrm; -#endif +Void rgSCHUtlDlRlsSubFrm(RgSchCellCb *cell,CmLteTimingInfo subFrm) { cell->sc.apis->rgSCHDlRlsSubFrm(cell, subFrm); - RETVOID; + return; } #ifdef TFU_UPGRADE @@ -3350,27 +2779,15 @@ CmLteTimingInfo subFrm; * grant req for APERCQI to SCH. * * @param[in] RgSchUeCb *ue - * @param[in] U8 isAck + * @param[in] uint8_t isAck * * @return Void **/ -#ifdef ANSI -Void rgSCHUtlUpdACqiTrigWt -( -RgSchUeCb *ue, -RgSchUeCellInfo *cellInfo, -U8 isAck -) -#else -Void rgSCHUtlUpdACqiTrigWt(ue,cellInfo, isAck) -RgSchUeCb *ue; -RgSchUeCellInfo *cellInfo; -U8 isAck; -#endif +Void rgSCHUtlUpdACqiTrigWt(RgSchUeCb *ue,RgSchUeCellInfo *cellInfo,uint8_t isAck ) { #ifdef LTE_ADV - U8 triggerSet = 0; - U8 sIdx = 0; + uint8_t triggerSet = 0; + uint8_t sIdx = 0; #endif if (isAck == TFU_HQFDB_ACK) @@ -3392,7 +2809,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; @@ -3417,7 +2834,7 @@ U8 isAck; rgSCHUtlSrRcvd(cell, ue, cell->crntTime, &unUsed); } - RETVOID; + return; } #endif @@ -3435,22 +2852,10 @@ U8 isAck; * * @return Void **/ -#ifdef ANSI -Void rgSCHUtlHdlUlTransInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteTimingInfo timingInfo -) -#else -Void rgSCHUtlHdlUlTransInd(cell, ue, timingInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo timingInfo; -#endif +Void rgSCHUtlHdlUlTransInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo) { cell->sc.apis->rgSCHHdlUlTransInd(cell, ue, timingInfo); - RETVOID; + return; } #ifdef LTEMAC_SPS /** @@ -3467,22 +2872,10 @@ CmLteTimingInfo timingInfo; * * @return Void **/ -#ifdef ANSI -Void rgSCHUtlHdlCrcInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteTimingInfo timingInfo -) -#else -Void rgSCHUtlHdlCrcInd(cell, ue, timingInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo timingInfo; -#endif +Void rgSCHUtlHdlCrcInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo) { cell->sc.apis->rgSCHUlCrcInd(cell, ue, timingInfo); - RETVOID; + return; } /* end of rgSCHUtlHdlCrcFailInd */ /** @@ -3499,22 +2892,10 @@ CmLteTimingInfo timingInfo; * * @return Void **/ -#ifdef ANSI -Void rgSCHUtlHdlCrcFailInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteTimingInfo timingInfo -) -#else -Void rgSCHUtlHdlCrcFailInd(cell, ue, timingInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo timingInfo; -#endif +Void rgSCHUtlHdlCrcFailInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo) { cell->sc.apis->rgSCHUlCrcFailInd(cell, ue, timingInfo); - RETVOID; + return; } /* end of rgSCHUtlHdlCrcFailInd */ #endif /* LTEMAC_SPS */ @@ -3536,20 +2917,10 @@ CmLteTimingInfo timingInfo; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDlProcAddToRetx -( -RgSchCellCb *cell, -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHUtlDlProcAddToRetx(cell, hqP) -RgSchCellCb *cell; -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHUtlDlProcAddToRetx(RgSchCellCb *cell,RgSchDlHqProcCb *hqP) { cell->sc.apis->rgSCHDlProcAddToRetx(cell, hqP); - RETVOID; + return; } @@ -3566,23 +2937,11 @@ RgSchDlHqProcCb *hqP; * * @param[in] RgSubFrm* subFrm * @param[in] RgDlHqProc* hqP - * @param[in] U8 tbIdx + * @param[in] uint8_t tbIdx * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlDlHqPTbAddToTx -( -RgSchDlSf *subFrm, -RgSchDlHqProcCb *hqP, -U8 tbIdx -) -#else -Void rgSCHUtlDlHqPTbAddToTx(subFrm, hqP, tbIdx) -RgSchDlSf *subFrm; -RgSchDlHqProcCb *hqP; -U8 tbIdx; -#endif +Void rgSCHUtlDlHqPTbAddToTx(RgSchDlSf *subFrm,RgSchDlHqProcCb *hqP,uint8_t tbIdx) { RgSchUeCb *ue = NULLP; RgSchCellCb *cell = hqP->hqE->cell; @@ -3610,7 +2969,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++; @@ -3641,7 +3000,7 @@ U8 tbIdx; hqP->subFrm = subFrm; /* CA Dev End */ - RETVOID; + return; } @@ -3659,26 +3018,12 @@ 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 * **/ -#ifdef ANSI -Void rgSCHUtlDlHqPTbRmvFrmTx -( -RgSchDlSf *subFrm, -RgSchDlHqProcCb *hqP, -U8 tbIdx, -Bool isRepeting -) -#else -Void rgSCHUtlDlHqPTbRmvFrmTx(subFrm, hqP, tbIdx, isRepeting) -RgSchDlSf *subFrm; -RgSchDlHqProcCb *hqP; -U8 tbIdx; -Bool isRepeting; -#endif +Void rgSCHUtlDlHqPTbRmvFrmTx(RgSchDlSf *subFrm,RgSchDlHqProcCb *hqP,uint8_t tbIdx,Bool isRepeting) { RgSchCellCb *cell = NULLP; /* Check with TDD */ @@ -3718,7 +3063,7 @@ Bool isRepeting; } hqP->subFrm = NULLP; } - RETVOID; + return; } #ifdef LTE_ADV @@ -3735,21 +3080,10 @@ Bool isRepeting; * @param[in] ueId * @return RgSchUeCb* **/ -#ifdef ANSI -RgSchCellCb* rgSchUtlGetCellCb -( - Inst inst, - U16 cellId -) -#else -RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) - Inst inst; - U16 cellId; -#endif +RgSchCellCb* rgSchUtlGetCellCb(Inst inst,uint16_t cellId) { - RgSchCellCb *cellCb = NULLP; - U8 strtCellId; - + RgSchCellCb *cellCb = NULLP; + uint8_t strtCellId; strtCellId = rgSchCb[inst].genCfg.startCellId; cellCb = rgSchCb[inst].cells[cellId - strtCellId]; @@ -3767,29 +3101,15 @@ RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) * * @param[in] *cellId * @param[in] RgSchUeCb *ue - * @return U8 servCellIdx + * @return uint8_t servCellIdx **/ -#ifdef ANSI -U8 rgSchUtlGetServCellIdx -( - Inst inst, - U16 cellId, - RgSchUeCb *ue -) -#else -U8 rgSchUtlGetServCellIdx(inst,cellId,ue) - Inst inst; - U16 cellId; - RgSchUeCb *ue; -#endif +uint8_t rgSchUtlGetServCellIdx(Inst inst, uint16_t cellId, RgSchUeCb *ue) { - U8 servCellIdx; - U16 strtCellId; + uint8_t servCellIdx; + uint16_t strtCellId; strtCellId = rgSchCb[inst].genCfg.startCellId; - servCellIdx = ue->cellIdToCellIdxMap[cellId - strtCellId]; - return (servCellIdx); } /* rgSchUtlGetCellCb */ @@ -3806,19 +3126,9 @@ U8 rgSchUtlGetServCellIdx(inst,cellId,ue) * @param[in] ueId * @return RgSchUeCb* **/ -#ifdef ANSI -S16 rgSchUtlVldtCellId -( - Inst inst, - U16 cellId -) -#else -S16 rgSchUtlVldtCellId(inst, cellId) - Inst inst; - U16 cellId; -#endif +S16 rgSchUtlVldtCellId(Inst inst,uint16_t cellId) { - U8 strtCellId; + uint8_t strtCellId; strtCellId = rgSchCb[inst].genCfg.startCellId; if((cellId >= strtCellId) && ((cellId - strtCellId) < CM_LTE_MAX_CELLS)) @@ -3847,21 +3157,7 @@ S16 rgSchUtlVldtCellId(inst, cellId) * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrUeRecfg -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeRecfg *ueRecfg, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlRgrUeRecfg(cell, ue, ueRecfg, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeRecfg *ueRecfg; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlRgrUeRecfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,RgSchErrInfo *err) { /* Changes for UE Category Reconfiguration feature addition */ RgSchCmnUe *ueSch = RG_SCH_CMN_GET_UE(ue, cell); @@ -3895,7 +3191,7 @@ RgSchErrInfo *err; ue->f1bCsAVal += rgSCHUtlGetMaxTbSupp(ueRecfg->txMode.txModeEnum); - RLOG1(L_INFO,"UeReCfg A valie is %d\n",ue->f1bCsAVal); + DU_LOG("\nINFO --> SCH : UeReCfg A valie is %d\n",ue->f1bCsAVal); } #endif ue->mimoInfo.txMode = ueRecfg->txMode.txModeEnum; @@ -3943,24 +3239,12 @@ RgSchErrInfo *err; * @param[in] RgSchDlLcCb* svc * @return Void **/ -#ifdef ANSI -Void rgSCHUtlFreeDlLc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *svc -) -#else -Void rgSCHUtlFreeDlLc(cell, ue, svc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *svc; -#endif +Void rgSCHUtlFreeDlLc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc) { cell->sc.apis->rgSCHFreeDlLc(cell, ue, svc); /* Stack Crash problem for TRACE5 changes. added the return below . */ - RETVOID; + return; } @@ -3978,17 +3262,7 @@ RgSchDlLcCb *svc; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -Void rgSCHUtlFreeUe -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHUtlFreeUe(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHUtlFreeUe(RgSchCellCb *cell,RgSchUeCb *ue) { #ifdef LTE_TDD rgSCHUtlDelUeANFdbkInfo(ue,RGSCH_PCELL_INDEX); @@ -3996,7 +3270,7 @@ RgSchUeCb *ue; cell->sc.apis->rgSCHFreeUe(cell, ue); /* Stack Crash problem for TRACE5 changes. added the return below . */ - RETVOID; + return; } /* rgSCHUtlFreeUe */ @@ -4016,22 +3290,10 @@ RgSchUeCb *ue; * @param[in] RgSchDlLcCb* lc * @return Void **/ -#ifdef ANSI -Void rgSCHUtlDlDedBoUpd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlLcCb *lc -) -#else -Void rgSCHUtlDlDedBoUpd(cell, ue, lc) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchDlLcCb *lc; -#endif +Void rgSCHUtlDlDedBoUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *lc) { cell->sc.apis->rgSCHDlDedBoUpd(cell, ue, lc); - RETVOID; + return; } /** * @brief Record MSG3 allocation into the UE @@ -4048,22 +3310,10 @@ RgSchDlLcCb *lc; * @param[in] RgSchRaCb *raCb * **/ -#ifdef ANSI -Void rgSCHUtlRecMsg3Alloc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchRaCb *raCb -) -#else -Void rgSCHUtlRecMsg3Alloc(cell, ue, raCb) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchRaCb *raCb; -#endif +Void rgSCHUtlRecMsg3Alloc(RgSchCellCb *cell,RgSchUeCb *ue,RgSchRaCb *raCb) { cell->sc.apis->rgSCHUlRecMsg3Alloc(cell, ue, raCb); - RETVOID; + return; } /* rgSCHRecMsg3Alloc */ @@ -4086,19 +3336,7 @@ RgSchRaCb *raCb; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlUpdUlHqProc -( -RgSchCellCb *cell, -RgSchUlHqProcCb *curProc, -RgSchUlHqProcCb *oldProc -) -#else -S16 rgSCHUtlUpdUlHqProc(cell, curProc, oldProc) -RgSchCellCb *cell; -RgSchUlHqProcCb *curProc; -RgSchUlHqProcCb *oldProc; -#endif +S16 rgSCHUtlUpdUlHqProc(RgSchCellCb *cell,RgSchUlHqProcCb *curProc,RgSchUlHqProcCb *oldProc) { return (cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc)); } /* rgSCHUtlUpdUlHqProc */ @@ -4120,23 +3358,10 @@ RgSchUlHqProcCb *oldProc; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlContResUlGrant -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlContResUlGrant(cell, ue, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlContResUlGrant(RgSchCellCb *cell,RgSchUeCb *ue,RgSchErrInfo *err) { ue->isMsg4PdcchWithCrnti = TRUE; - return (cell->sc.apis->rgSCHContResUlGrant(cell, ue, err)); } /* rgSCHUtlContResUlGrant */ @@ -4156,21 +3381,7 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlSrRcvd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteTimingInfo frm, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlSrRcvd(cell, ue, frm, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo frm; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlSrRcvd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo frm,RgSchErrInfo *err) { return (cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err)); } /* rgSCHUtlSrRcvd */ @@ -4186,33 +3397,17 @@ 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 * -# RFAILED **/ -#ifdef ANSI -Void rgSCHUtlUpdBsrShort -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 lcgId, -U8 bsr, -RgSchErrInfo *err -) -#else -Void rgSCHUtlUpdBsrShort(cell, ue, lcgId, bsr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 lcgId; -U8 bsr; -RgSchErrInfo *err; -#endif +Void rgSCHUtlUpdBsrShort(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t lcgId,uint8_t bsr,RgSchErrInfo *err) { cell->sc.apis->rgSCHUpdBsrShort(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); - RETVOID; + return; } /* rgSCHUtlUpdBsrShort */ @@ -4228,33 +3423,17 @@ 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 * -# RFAILED **/ -#ifdef ANSI -Void rgSCHUtlUpdBsrTrunc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 lcgId, -U8 bsr, -RgSchErrInfo *err -) -#else -Void rgSCHUtlUpdBsrTrunc(cell, ue, lcgId, bsr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 lcgId; -U8 bsr; -RgSchErrInfo *err; -#endif +Void rgSCHUtlUpdBsrTrunc(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t lcgId,uint8_t bsr,RgSchErrInfo *err) { cell->sc.apis->rgSCHUpdBsrTrunc(cell, ue, &ue->ul.lcgArr[lcgId], bsr, err); - RETVOID; + return; } /* rgSCHUtlUpdBsrTrunc */ @@ -4272,45 +3451,24 @@ 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 * -# RFAILED **/ -#ifdef ANSI -Void rgSCHUtlUpdBsrLong -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 bsr0, -U8 bsr1, -U8 bsr2, -U8 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; -RgSchErrInfo *err; -#endif +Void rgSCHUtlUpdBsrLong(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t bsr0,uint8_t bsr1,uint8_t bsr2,uint8_t bsr3,RgSchErrInfo *err) { - U8 bsArr[4]; - + 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 */ /** @@ -4324,27 +3482,13 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 phr + * @param[in] uint8_t phr * @param[out] RgSchErrInfo *err * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlUpdExtPhr -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgInfExtPhrCEInfo * extPhr, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlUpdExtPhr(cell, ue, extPhr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgInfExtPhrCEInfo * extPhr; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlUpdExtPhr(RgSchCellCb *cell,RgSchUeCb *ue,RgInfExtPhrCEInfo *extPhr,RgSchErrInfo *err) { return (cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err)); } /* rgSCHUtlUpdExtPhr */ @@ -4362,27 +3506,13 @@ RgSchErrInfo *err; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 phr + * @param[in] uint8_t phr * @param[out] RgSchErrInfo *err * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlUpdPhr -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 phr, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlUpdPhr(cell, ue, phr, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 phr; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlUpdPhr(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t phr,RgSchErrInfo *err) { return (cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err)); } /* rgSCHUtlUpdPhr */ @@ -4403,22 +3533,10 @@ RgSchErrInfo *err; * @param[in] TfuUlCqiRpt *ulCqiInfo * @return Void **/ -#ifdef ANSI -Void rgSCHUtlUlCqiInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -TfuUlCqiRpt *ulCqiInfo -) -#else -Void rgSCHUtlUlCqiInd(cell, ue, ulCqiInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -TfuUlCqiRpt *ulCqiInfo; -#endif +Void rgSCHUtlUlCqiInd(RgSchCellCb *cell,RgSchUeCb *ue,TfuUlCqiRpt *ulCqiInfo) { cell->sc.apis->rgSCHUlCqiInd(cell, ue, ulCqiInfo); - RETVOID; + return; } /* rgSCHUtlUlCqiInd */ /** @@ -4433,25 +3551,13 @@ TfuUlCqiRpt *ulCqiInfo; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 delta + * @param[in] uint8_t delta * @return Void **/ -#ifdef ANSI -Void rgSCHUtlPucchDeltaPwrInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -S8 delta -) -#else -Void rgSCHUtlPucchDeltaPwrInd(cell, ue, delta) -RgSchCellCb *cell; -RgSchUeCb *ue; -S8 delta; -#endif +Void rgSCHUtlPucchDeltaPwrInd(RgSchCellCb *cell,RgSchUeCb *ue,S8 delta) { cell->sc.apis->rgSCHPucchDeltaPwrInd(cell, ue, delta); - RETVOID; + return; } /* rgSCHUtlPucchDeltaPwrInd */ /* Start: LTEMAC_2.1_DEV_CFG */ @@ -4467,21 +3573,11 @@ S8 delta; * @param[in] RgSchUeCb *ue * @return S16 **/ -#ifdef ANSI -Void rgSCHUtlUeReset -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -Void rgSCHUtlUeReset(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +Void rgSCHUtlUeReset(RgSchCellCb *cell,RgSchUeCb *ue) { ue->remBoCnt = 0; cell->sc.apis->rgSCHUeReset(cell, ue); - RETVOID; + return; } /* rgSCHUtlUeReset */ /* End: LTEMAC_2.1_DEV_CFG */ @@ -4504,26 +3600,12 @@ RgSchUeCb *ue; * @param[out] RgSchUlHqProcCb **procRef * @return Void **/ -#ifdef ANSI -Void rgSCHUtlUlHqProcForUe -( -RgSchCellCb *cell, -CmLteTimingInfo frm, -RgSchUeCb *ue, -RgSchUlHqProcCb **procRef -) -#else -Void rgSCHUtlUlHqProcForUe(cell, frm, ue, procRef) -RgSchCellCb *cell; -CmLteTimingInfo frm; -RgSchUeCb *ue; -RgSchUlHqProcCb **procRef; -#endif +Void rgSCHUtlUlHqProcForUe(RgSchCellCb *cell,CmLteTimingInfo frm,RgSchUeCb *ue,RgSchUlHqProcCb **procRef) { cell->sc.apis->rgSCHUlHqProcForUe(cell, frm, ue, procRef); /* Stack Crash problems for TRACE5 changes. added the return below */ - RETVOID; + return; } @@ -4544,15 +3626,7 @@ RgSchUlHqProcCb **procRef; * @param[in] RgSchCellCb *cell * @return RgSchUlAlloc* **/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlFirstRcptnReq -( -RgSchCellCb *cell -) -#else -RgSchUlAlloc *rgSCHUtlFirstRcptnReq(cell) -RgSchCellCb *cell; -#endif +RgSchUlAlloc *rgSCHUtlFirstRcptnReq(RgSchCellCb *cell) { return (cell->sc.apis->rgSCHFirstRcptnReq(cell)); } @@ -4574,17 +3648,7 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return RgSchUlAlloc* **/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlNextRcptnReq -( -RgSchCellCb *cell, -RgSchUlAlloc *alloc -) -#else -RgSchUlAlloc *rgSCHUtlNextRcptnReq(cell, alloc) -RgSchCellCb *cell; -RgSchUlAlloc *alloc; -#endif +RgSchUlAlloc *rgSCHUtlNextRcptnReq(RgSchCellCb *cell,RgSchUlAlloc *alloc) { return (cell->sc.apis->rgSCHNextRcptnReq(cell, alloc)); } @@ -4604,20 +3668,10 @@ 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 -) -#else -RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc(cell, idx) -RgSchCellCb *cell; -U8 idx; -#endif +RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc(RgSchCellCb *cell,uint8_t idx) { return (cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx)); } @@ -4638,115 +3692,11 @@ U8 idx; * @param[in] RgSchCellCb *cell * @return RgSchUlAlloc* **/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc -( -RgSchCellCb *cell, -RgSchUlAlloc *alloc, -U8 idx -) -#else -RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc(cell, alloc, idx) -RgSchCellCb *cell; -RgSchUlAlloc *alloc; -U8 idx; -#endif +RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc(RgSchCellCb *cell,RgSchUlAlloc *alloc,uint8_t idx) { return (cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx)); } -/*********************************** -***********************************/ -/** - * @brief This API is invoked to send TFU SAP bind request to PHY. - * - * @details - * - * Function : rgSCHUtlTfuBndReq - * - * This API is invoked to send TFU SAP bind request to PHY from scheduler - * isntance. It fills in the Pst structure, spId and suId values and - * invokes bind request primitive at TFU. - * - * @param[in] Inst instId - * @param[in] SuId suId - * @param[in] SpId spId - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -S16 rgSCHUtlTfuBndReq -( -Inst instId, -SuId suId, -SpId spId -) -#else -S16 rgSCHUtlTfuBndReq(instId, suId, spId) -Inst instId; -SuId suId; -SpId spId; -#endif -{ - S16 ret; - RgSchLowSapCb *tfuSap; - Pst pst; - - /* Get the lower SAP control block from the layer control block. */ - tfuSap = &(rgSchCb[instId].tfuSap[suId]); - 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()" - " failed"); - } - return (ret); -} /* rgSCHUtlTfuBndReq */ - -/** - * @brief This API is invoked to send TFU SAP unbind request to PHY. - * - * @details - * - * Function : rgSCHUtlTfuUBndReq - * This API is invoked to send TFU SAP unbind request to PHY from Scheduler - * isntance. It fills in the Pst structure and spId value and invokes - * unbind request primitive at TFU. - * - * @param[in] SpId spId - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -S16 rgSCHUtlTfuUBndReq -( -Inst inst, -RgSchLowSapCfgInfo sapCfg, -Reason reason -) -#else -S16 rgSCHUtlTfuUBndReq(inst, sapCfg, reason) -Inst inst; -RgSchLowSapCfgInfo sapCfg; -Reason reason; -#endif -{ - S16 ret; - Pst pst; - - /* Get the lower SAP control block from the layer control block. */ - memcpy (&pst, &(sapCfg.sapPst), sizeof(Pst)); - if((ret = RgLiTfuSchUbndReq (&pst, sapCfg.spId, reason)) != ROK) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuUBndReq() Call to" - " RgLiTfuUbndReq() failed"); - } - return (ret); - -} /* rgSCHUtlTfuUBndReq */ - /*********************************************************** * * Func : rgSCHUtlResetSfAlloc @@ -4761,19 +3711,7 @@ Reason reason; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlResetSfAlloc -( -RgInfSfAlloc *sfAlloc, -Bool resetCmnLcInfo, -Bool restAlloc -) -#else -S16 rgSCHUtlResetSfAlloc(sfAlloc,resetCmnLcInfo,restAlloc) -RgInfSfAlloc *sfAlloc; -Bool resetCmnLcInfo; -Bool restAlloc; -#endif +S16 rgSCHUtlResetSfAlloc(RgInfSfAlloc *sfAlloc,Bool resetCmnLcInfo,Bool restAlloc) { if(TRUE == restAlloc) { @@ -4807,17 +3745,9 @@ Bool restAlloc; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlGetRlsHqAlloc -( -RgSchCellCb *cell -) -#else -S16 rgSCHUtlGetRlsHqAlloc(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHUtlGetRlsHqAlloc(RgSchCellCb *cell) { - U8 idx = 0; + uint8_t idx = 0; Inst inst = cell->instIdx; for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) { @@ -4831,7 +3761,7 @@ RgSchCellCb *cell; (Data**)&(cell->rlsHqArr[idx].ueHqInfo), (sizeof(RgInfUeHqInfo)*RGSCH_MAX_UE_PER_DL_SF))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " + DU_LOG("\nERROR --> SCH : Memory allocation FAILED for " "UE Alloc"); return RFAILED; } @@ -4855,17 +3785,9 @@ RgSchCellCb *cell; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlPutRlsHqAlloc -( -RgSchCellCb *cell -) -#else -S16 rgSCHUtlPutRlsHqAlloc(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHUtlPutRlsHqAlloc(RgSchCellCb *cell) { - U8 idx = 0; + uint8_t idx = 0; Inst inst = cell->instIdx; for(idx=0; idx < RGSCH_NUM_SUB_FRAMES; idx++) @@ -4902,18 +3824,10 @@ RgSchCellCb *cell; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlGetSfAlloc -( -RgSchCellCb *cell -) -#else -S16 rgSCHUtlGetSfAlloc(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHUtlGetSfAlloc(RgSchCellCb *cell) { - U8 idx; - U8 indx; + uint8_t idx; + uint8_t indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -4933,7 +3847,7 @@ RgSchCellCb *cell; (Data**)&(cell->sfAllocArr[idx].ueInfo.allocInfo), (sizeof(RgInfUeAlloc)*RGSCH_MAX_UE_PER_DL_SF))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " + DU_LOG("\nERROR --> SCH : Memory allocation FAILED for " "UE Alloc"); return RFAILED; } @@ -4943,7 +3857,7 @@ RgSchCellCb *cell; (Data**)&(cell->sfAllocArr[idx].rarInfo.raRntiInfo), (sizeof(RgInfRaRntiInfo)*RGSCH_MAX_RARNTI_PER_DL_SF))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " + DU_LOG("\nERROR --> SCH : Memory allocation FAILED for " "RARNTI"); return RFAILED; } @@ -4953,7 +3867,7 @@ RgSchCellCb *cell; (Data**)&(cell->sfAllocArr[idx].rarInfo.raRntiInfo[indx].crntiInfo), (sizeof(RgInfCrntiInfo)* (cellUl->maxMsg3PerUlSf)))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " + DU_LOG("\nERROR --> SCH : Memory allocation FAILED for " "RNTI"); return RFAILED; } @@ -4983,18 +3897,10 @@ RgSchCellCb *cell; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlPutSfAlloc -( -RgSchCellCb *cell -) -#else -S16 rgSCHUtlPutSfAlloc(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHUtlPutSfAlloc(RgSchCellCb *cell) { - U8 idx; - U8 indx; + uint8_t idx; + uint8_t indx; Inst inst = cell->instIdx; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -5060,19 +3966,12 @@ RgSchCellCb *cell; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI S16 rgSCHUtlAllocSBuf ( Inst inst, /* Instance of the invoking scheduler */ Data **pData, /* Pointer of the data to be returned */ Size size /* size */ ) -#else -S16 rgSCHUtlAllocSBuf(inst, pData, size) -Inst inst; /* Instance of the invoking scheduler */ -Data **pData; /* Pointer of the data to be returned */ -Size size; /* size */ -#endif { /* Moving alarm diagnostics to available scope */ @@ -5091,8 +3990,8 @@ Size size; /* size */ #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ MS_BUF_ADD_ALLOC_CALLER(); #endif /* */ - if (SGetSBuf(rgSchCb[inst].rgSchInit.region, rgSchCb[inst].rgSchInit.pool, - pData, size) != ROK) + SCH_ALLOC(pData, size); + if(pData == NULLP) { RgUstaDgn dgn; /* Alarm diagnostics structure */ dgn.type = LRG_USTA_DGNVAL_MEM; @@ -5101,8 +4000,7 @@ Size size; /* size */ /* Send an alarm to Layer Manager */ rgSCHLmmStaInd(inst, LCM_CATEGORY_RESOURCE, LCM_EVENT_SMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); - RGSCHLOGERROR(inst, ERRCLS_DEBUG, ERG015, 0, "Unable to Allocate Buffer"); - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Unable to Allocate the Buffer"); + DU_LOG("\nERROR --> SCH : Unable to Allocate the Buffer"); return RFAILED; } @@ -5123,31 +4021,22 @@ Size size; /* size */ * previously allocated by rgSCHUtlAllocSBuf() and size. It * deallocates the memory. * -* Ret: RETVOID +* Ret: void * * Notes: None * File: rg_utl.c */ -#ifdef ANSI Void rgSCHUtlFreeSBuf ( Inst inst, /* Instance of the invoking scheduler */ Data **data, /* pointer to data */ Size size /* size */ ) -#else -Void rgSCHUtlFreeSBuf(inst, data, size) -Inst inst; /* Instance of the invoking scheduler */ -Data **data; /* pointer to data */ -Size size; /* size */ -#endif { - S16 ret; - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { - RETVOID; + return; } @@ -5155,21 +4044,18 @@ Size size; /* size */ MS_BUF_ADD_CALLER(); #endif /* */ /* Deallocate buffer */ - ret = SPutSBuf(rgSchCb[inst].rgSchInit.region, - rgSchCb[inst].rgSchInit.pool, (*data), size); + SCH_FREE((*data), size); - if (ret != ROK) + if (data ==NULLP) { - RGSCHLOGERROR(inst, ERRCLS_DEBUG, ERG016, (ErrVal) 0, - "rgSCHUtlFreeSBuf failed.\n"); - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHUtlFreeSBuf failed"); - RETVOID; + DU_LOG("\nERROR --> SCH : rgSCHUtlFreeSBuf failed"); + return; } /* ccpu00117052 - ADD - Assigning the pointer to NULLP */ *data = NULLP; - RETVOID; + return; } /* end of rgSCHUtlFreeSBuf */ @@ -5180,40 +4066,28 @@ Size size; /* size */ * * Desc: This is used to deallocate Warning SI Seg. * -* Ret: RETVOID +* Ret: void * * Notes: None * * File: rg_utl.c */ -#ifdef ANSI -Void rgSCHUtlFreeWarningSiSeg -( -Region reg, -Pool pool, -CmLListCp *siPduLst -) -#else -Void rgSCHUtlFreeWarningSiSeg(reg, pool, siPduLst) -Region reg; -Pool pool; -CmLListCp *siPduLst; -#endif +Void rgSCHUtlFreeWarningSiSeg(Region reg,Pool pool,CmLListCp *siPduLst) { CmLList *node; Buffer *pdu; - while (siPduLst->first != NULLP) - { - node = siPduLst->first; - pdu = (Buffer *)node->node; - cmLListDelFrm(siPduLst, node); - RGSCH_FREE_MSG(pdu); - SPutSBuf(reg, pool, (Data *)node,sizeof(CmLList)); - node = NULLP; - } + while (siPduLst->first != NULLP) + { + node = siPduLst->first; + pdu = (Buffer *)node->node; + cmLListDelFrm(siPduLst, node); + RGSCH_FREE_MSG(pdu); + SCH_FREE(node,sizeof(CmLList)); + node = NULLP; + } - RETVOID; + return; } /* end of rgSCHUtlFreeWarningSiSeg */ @@ -5223,21 +4097,13 @@ CmLListCp *siPduLst; * * Desc: This is used to deallocate Warning SI PDU. * -* Ret: RETVOID +* Ret: void * * Notes: None * * File: rg_utl.c */ -#ifdef ANSI -Void rgSCHUtlFreeWarningSiPdu -( -RgSchCellCb *cell -) -#else -Void rgSCHUtlFreeWarningSiPdu(cell) -RgSchCellCb *cell; -#endif +Void rgSCHUtlFreeWarningSiPdu(RgSchCellCb *cell) { CmLList *node; Buffer *pdu; @@ -5250,7 +4116,7 @@ RgSchCellCb *cell; CM_LLIST_FIRST_NODE(&warningSi->warningSiMsg.segLstCp, node); if (node == NULLP) { - RETVOID; + return; } warningSiPdu = (RgSchWarningSiPdu *)node->node; @@ -5268,7 +4134,7 @@ RgSchCellCb *cell; warningSi->warningSiMsg.transId, RGR_CFG_CFM_TX_COMPLETE); } - RETVOID; + return; } /* end of rgSCHUtlFreeWarningSiPdu */ @@ -5285,15 +4151,7 @@ RgSchCellCb *cell; * * File: rg_utl.c */ -#ifdef ANSI -Buffer *rgSCHUtlGetWarningSiPdu -( -RgSchCellCb *cell -) -#else -Buffer *rgSCHUtlGetWarningSiPdu(cell) -RgSchCellCb *cell; -#endif +Buffer *rgSCHUtlGetWarningSiPdu(RgSchCellCb *cell) { RgSchWarningSiInfo *warningSi; RgSchWarningSiPdu *warningSiPdu; @@ -5329,21 +4187,7 @@ RgSchCellCb *cell; * * File: rg_utl.c */ -#ifdef ANSI -S16 rgSCHUtlGetMcsAndNPrb -( -RgSchCellCb *cell, -U8 *nPrb, -U8 *mcs, -MsgLen *msgLen -) -#else -S16 rgSCHUtlGetMcsAndNPrb(cell, nPrb, mcs, msgLen) -RgSchCellCb *cell; -U8 *nPrb; -U8 *mcs; -MsgLen *msgLen; -#endif +S16 rgSCHUtlGetMcsAndNPrb(RgSchCellCb *cell,uint8_t *nPrb,uint8_t *mcs,MsgLen *msgLen) { RgSchWarningSiInfo *warningSi; RgSchWarningSiPdu *warningSiPdu; @@ -5388,29 +4232,15 @@ MsgLen *msgLen; * * File: rg_utl.c */ -#ifdef ANSI -S16 rgSCHUtlCalMcsAndNPrb -( -RgSchCellCb *cell, -U8 cfgType, -MsgLen msgLen, -U8 siId -) -#else -S16 rgSCHUtlCalMcsAndNPrb(cell, nPrb, mcs, msgLen) -RgSchCellCb *cell; -U8 cfgType; -MsgLen msgLen; -U8 siId; -#endif +S16 rgSCHUtlCalMcsAndNPrb(RgSchCellCb *cell,uint8_t cfgType,MsgLen msgLen,uint8_t siId) { - U8 mcs = 0; - U8 nPrb = 0; + uint8_t mcs = 0; + uint8_t nPrb = 0; /*Get the nPrb and mcs parametr values */ if (rgSCHUtlGetAllwdCchTbSz(msgLen*8, &nPrb, &mcs) != (msgLen*8)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "msgLen does " + DU_LOG("\nERROR --> SCH : msgLen does " "not match any valid TB Size"); return RFAILED; } @@ -5475,25 +4305,13 @@ U8 siId; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlFillDgnParams -( -Inst inst, -RgUstaDgn *dgn, -U8 dgnType -) -#else -Void rgSCHUtlFillDgnParams(inst, dgn, dgnType) -Inst inst; -RgUstaDgn *dgn; -U8 dgnType; -#endif +Void rgSCHUtlFillDgnParams(Inst inst,RgUstaDgn *dgn,uint8_t dgnType) { 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; @@ -5502,7 +4320,7 @@ U8 dgnType; break; } - RETVOID; + return; } /* end of rgSCHUtlFillDgnParams */ /*********************************************************** @@ -5521,19 +4339,7 @@ U8 dgnType; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlGetPstToLyr -( -Pst *pst, -RgSchCb *schCb, -Inst macInst -) -#else -Void rgSCHUtlGetPstToLyr (pst, schCb, macInst) -Pst *pst; -RgSchCb *schCb; -Inst macInst; -#endif +Void rgSCHUtlGetPstToLyr(Pst *pst,RgSchCb *schCb,Inst macInst) { /* Only the needed params are filled */ @@ -5551,7 +4357,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 @@ -5568,21 +4374,7 @@ Inst macInst; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rgSCHUtlFillRgInfCmnLcInfo -( -RgSchDlSf *sf, -RgInfSfAlloc *sfAlloc, -CmLteLcId lcId, -Bool sendInd -) -#else -S16 rgSCHUtlFillRgInfCmnLcInfo(sf, sfAlloc, lcId, sendInd) -RgSchDlSf *sf; -RgInfSfAlloc *sfAlloc; -CmLteLcId lcId; -Bool sendInd; -#endif +S16 rgSCHUtlFillRgInfCmnLcInfo(RgSchDlSf *sf,RgInfSfAlloc *sfAlloc,CmLteLcId lcId,Bool sendInd) { if((sf->bch.tbSize)&& @@ -5630,27 +4422,15 @@ Bool sendInd; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rgSCHUtlFillRgInfRarInfo -( -RgSchDlSf *sf, -RgInfSfAlloc *sfAlloc, -RgSchCellCb *cell -) -#else -S16 rgSCHUtlFillRgInfRarInfo(sf, sfAlloc, cell) -RgSchDlSf *sf; -RgInfSfAlloc *sfAlloc; -RgSchCellCb *cell; -#endif +S16 rgSCHUtlFillRgInfRarInfo(RgSchDlSf *sf,RgInfSfAlloc *sfAlloc,RgSchCellCb *cell) { - 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); #ifdef LTE_TDD @@ -5769,17 +4549,7 @@ RgSchCellCb *cell; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rgSCHUtlFillPdschDciInfo -( -TfuPdschDciInfo *pdsch, -TfuDciInfo *pdcchDci -) -#else -S16 rgSCHUtlFillPdschDciInfo(pdsch, pdcchDci) -TfuPdschDciInfo *pdsch; -TfuDciInfo *pdcchDci; -#endif +S16 rgSCHUtlFillPdschDciInfo(TfuPdschDciInfo *pdsch,TfuDciInfo *pdcchDci) { #ifdef EMTC_ENABLE @@ -5848,18 +4618,7 @@ TfuDciInfo *pdcchDci; * @return Void * **/ -#ifdef ANSI -Void rgSchDSFRPwrCheck -( - RgSchDlSf *sf, - Bool *isAllUePwrHigh - ) -#else -PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) - RgSchDlSf *sf; - Bool *isAllUePwrHigh; - -#endif +Void rgSchDSFRPwrCheck(RgSchDlSf *sf,Bool *isAllUePwrHigh) { RgSchSFRPoolInfo *sfrCCPool; @@ -5894,7 +4653,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 @@ -5903,36 +4662,24 @@ PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHUtlFillRgInfTbInfo -( -RgSchDlHqProcCb *hqP, -RgInfUeAlloc *allocInfo, -RgSchCellCb *cell -) -#else -PRIVATE Void rgSCHUtlFillRgInfTbInfo (hqP, allocInfo, cell) -RgSchDlHqProcCb *hqP; -RgInfUeAlloc *allocInfo; -RgSchCellCb *cell; -#endif +static Void rgSCHUtlFillRgInfTbInfo(RgSchDlHqProcCb *hqP,RgInfUeAlloc *allocInfo,RgSchCellCb *cell) { 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 */ @@ -6022,7 +4769,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)) { @@ -6030,11 +4777,10 @@ 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, - "DSFR::ll UEs can go HIGH, PHigh(%d) for UE(%d)",allocInfo->pa, ue->ueId); + DU_LOG("\nDEBUG --> SCH : DSFR::ll UEs can go HIGH, PHigh(%d) for UE(%d)",allocInfo->pa, ue->ueId); tmpCnt = 0; } } @@ -6048,8 +4794,7 @@ RgSchCellCb *cell; allocInfo->pa = ue->cell->lteAdvCb.sfrCfg.pwrThreshold.pHigh; if(tmpCnt++ == 100000) { - RLOG_ARG2(L_DEBUG,DBG_CELLID,ue->cell->cellId, - "SFR::UE is CELL EDGE, PHigh(%d) for UE(%d)",allocInfo->pa, ue->ueId); + DU_LOG("\nDEBUG --> SCH : SFR::UE is CELL EDGE, PHigh(%d) for UE(%d)",allocInfo->pa, ue->ueId); tmpCnt = 0; } @@ -6066,8 +4811,7 @@ RgSchCellCb *cell; allocInfo->pa = ue->cell->lteAdvCb.sfrCfg.pwrThreshold.pLow; if(tmpCnt++ == 100000) { - RLOG_ARG2(L_DEBUG,DBG_CELLID,ue->cell->cellId, - "SFR::UE is CELL CENTRE, PLow(%d) for UE(%d)\n",allocInfo->pa, ue->ueId); + DU_LOG("\nDEBUG --> SCH : SFR::UE is CELL CENTRE, PLow(%d) for UE(%d)\n",allocInfo->pa, ue->ueId); tmpCnt = 0; } } @@ -6178,7 +4922,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; @@ -6261,7 +5005,7 @@ RgSchCellCb *cell; rgSCHLaaResetDlHqProcCb(hqP); #endif - RETVOID; + return; } /*********************************************************** * @@ -6280,24 +5024,7 @@ RgSchCellCb *cell; * **********************************************************/ /* CA dev Start */ -#ifdef ANSI -Void rgSCHUtlFillRgInfUeInfo -( -RgSchDlSf *sf, -RgSchCellCb *cell, -CmLListCp *dlDrxInactvTmrLst, -CmLListCp *dlInActvLst, -CmLListCp *ulInActvLst -) -#else -Void rgSCHUtlFillRgInfUeInfo (sf,cell, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst) -{ -RgSchDlSf *sf; -RgSchCellCb *cell; -CmLListCp *dlDrxInactvTmrLst; -CmLListCp *dlInActvLst; -CmLListCp *ulInActvLst; -#endif +Void rgSCHUtlFillRgInfUeInfo(RgSchDlSf *sf,RgSchCellCb *cell,CmLListCp *dlDrxInactvTmrLst,CmLListCp *dlInActvLst,CmLListCp *ulInActvLst) { RgInfSfAlloc *sfAlloc; CmLListCp *lnkLst; /* lnkLst assignment */ @@ -6317,7 +5044,7 @@ CmLListCp *ulInActvLst; CM_LLIST_FIRST_NODE(lnkLst, tmp); while(NULLP != tmp) { - printf("5GTF_ERROR MSG4 Consolidation\n"); + DU_LOG("\nINFO --> SCH : 5GTF_ERROR MSG4 Consolidation\n"); hqCb = (RgSchDlHqProcCb *)(tmp->node); CM_LLIST_NEXT_NODE(lnkLst, tmp); @@ -6390,7 +5117,7 @@ CmLListCp *ulInActvLst; #endif } - RETVOID; + return; } /* end of rgSCHUtlFillRgInfUeInfo */ /* CA dev End */ @@ -6416,27 +5143,10 @@ CmLListCp *ulInActvLst; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rgSCHUtlUpdSch -( -RgInfSfDatInd *subfrmInfo, -RgSchCellCb *cellCb, -RgSchUeCb *ueCb, -RgInfUeDatInd *pdu, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlUpdSch (subfrmInfo, cellCb, ueCb, pdu, err) -RgInfSfDatInd *subfrmInfo; -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -RgInfUeDatInd *pdu; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlUpdSch(RgInfSfDatInd *subfrmInfo,RgSchCellCb *cellCb,RgSchUeCb *ueCb,RgInfUeDatInd *pdu,RgSchErrInfo *err) { S16 ret; - #ifdef LTEMAC_SPS if (RGSCH_UL_SPS_ACT_PRSENT & pdu->ceInfo.bitMask) { @@ -6467,8 +5177,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 { @@ -6478,8 +5188,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 { @@ -6521,17 +5231,7 @@ RgSchErrInfo *err; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHUtlAddUeToCcchSduLst -( -RgSchCellCb *cell, -RgSchUeCb *ueCb -) -#else -S16 rgSCHUtlAddUeToCcchSduLst(cell, ueCb) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -#endif +S16 rgSCHUtlAddUeToCcchSduLst(RgSchCellCb *cell,RgSchUeCb *ueCb) { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb, cell); RgSchDlHqProcCb *hqP = (RgSchDlHqProcCb *)ueDl->proc; @@ -6543,7 +5243,7 @@ RgSchUeCb *ueCb; ((!(ueCb->dl.dlInactvMask & RG_HQENT_INACTIVE)) && ((hqP != NULLP) && (hqP->hqE->ccchSduProc)))) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unexpected CCCH SDU BO", + DU_LOG("\nINFO --> SCH : RNTI:%d Unexpected CCCH SDU BO", ueCb->ueId); return ROK; } @@ -6566,28 +5266,18 @@ RgSchUeCb *ueCb; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHUtlUpdtBo -( -RgSchCellCb *cell, -RgInfCmnBoRpt *staRsp -) -#else -S16 rgSCHUtlUpdtBo(cell, staRsp) -RgSchCellCb *cell; -RgInfCmnBoRpt *staRsp; -#endif +S16 rgSCHUtlUpdtBo(RgSchCellCb *cell,RgInfCmnBoRpt *staRsp) { RgSchUeCb *ueCb; if ((ueCb = rgSCHDbmGetUeCb(cell, staRsp->u.rnti)) == NULLP) { /* Handle Ue fetch failure */ - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid UEID:%d",staRsp->u.rnti); + DU_LOG("\nERROR --> SCH : Invalid UEID:%d",staRsp->u.rnti); 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) { @@ -6618,17 +5308,7 @@ RgInfCmnBoRpt *staRsp; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlHndlCcchBoUpdt -( -RgSchCellCb *cell, -RgInfCmnBoRpt *boRpt -) -#else -S16 rgSCHUtlHndlCcchBoUpdt(cell, boRpt) -RgSchCellCb *cell; -RgInfCmnBoRpt *boRpt; -#endif +S16 rgSCHUtlHndlCcchBoUpdt(RgSchCellCb *cell,RgInfCmnBoRpt *boRpt) { RgSchRaCb *raCb; RgSchUeCb *ueCb; @@ -6641,8 +5321,7 @@ RgInfCmnBoRpt *boRpt; return (rgSCHUtlUpdtBo(cell, boRpt)); #else /* Handle RaCb fetch failure */ - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Invalid RNTI:%d to fetch raCb",boRpt->u.rnti); + DU_LOG("\nERROR --> SCH : Invalid RNTI:%d to fetch raCb",boRpt->u.rnti); return RFAILED; #endif } @@ -6677,11 +5356,11 @@ RgInfCmnBoRpt *boRpt; if ((ueCb = rgSCHDbmGetUeCb(cell, boRpt->u.rnti)) == NULLP) { /* Handle Ue fetch failure */ - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RNTI:%d",boRpt->u.rnti); + DU_LOG("\nERROR --> SCH : Invalid RNTI:%d",boRpt->u.rnti); return RFAILED; } /* Update Bo in ueCb */ - ueCb->dlCcchInfo.bo = (U32)(boRpt->bo); + ueCb->dlCcchInfo.bo = (uint32_t)(boRpt->bo); } #else @@ -6704,25 +5383,13 @@ 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 **/ -#ifdef ANSI -S32 rgSCHUtlGetAllwdCchTbSz -( -U32 bo, -U8 *nPrb, -U8 *mcs -) -#else -S32 rgSCHUtlGetAllwdCchTbSz(bo, nPrb, mcs) -U32 bo; -U8 *nPrb; -U8 *mcs; -#endif +S32 rgSCHUtlGetAllwdCchTbSz(uint32_t bo,uint8_t *nPrb,uint8_t *mcs) { S32 lt; S32 cn; @@ -6767,29 +5434,18 @@ U8 *mcs; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlHndlBcchPcchBoUpdt -( -RgSchCellCb *cell, -RgInfCmnBoRpt *boUpdt -) -#else -S16 rgSCHUtlHndlBcchPcchBoUpdt(cell, boUpdt) -RgSchCellCb *cell; -RgInfCmnBoRpt *boUpdt; -#endif +S16 rgSCHUtlHndlBcchPcchBoUpdt(RgSchCellCb *cell,RgInfCmnBoRpt *boUpdt) { RgSchClcDlLcCb *dlLc; RgSchClcBoRpt *boRpt; Inst inst = cell->instIdx; - U8 nPrb=0; - U8 mcs=0; + uint8_t nPrb=0; + uint8_t mcs=0; dlLc = rgSCHDbmGetBcchOnBch(cell); if (dlLc == NULLP) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "No Logical Channel dlLc is NULLP for RNTI:%d LCID:%d",boUpdt->u.rnti,boUpdt->lcId); + DU_LOG("\nERROR --> SCH : No Logical Channel dlLc is NULLP for RNTI:%d LCID:%d",boUpdt->u.rnti,boUpdt->lcId); return RFAILED; } if (boUpdt->lcId != dlLc->lcId) @@ -6801,7 +5457,7 @@ RgInfCmnBoRpt *boUpdt; if (rgSCHUtlGetAllwdCchTbSz(boUpdt->bo*8, &nPrb, &mcs) != (boUpdt->bo*8)) { - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,"[%ld]BO: does not match any " + DU_LOG("\nERROR --> SCH : [%d]BO: does not match any " "valid TB Size RNTI:%d LCID:%d", boUpdt->bo,boUpdt->u.rnti,boUpdt->lcId); return RFAILED; } @@ -6814,14 +5470,13 @@ RgInfCmnBoRpt *boUpdt; if ((dlLc = rgSCHDbmGetCmnLcCb(cell, boUpdt->lcId)) == NULLP) { /* Handle lcCb fetch failure */ - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "LCID:%d Invalid for RNTI:%d",boUpdt->lcId,boUpdt->u.rnti); + DU_LOG("\nERROR --> SCH : LCID:%d Invalid for RNTI:%d",boUpdt->lcId,boUpdt->u.rnti); } if (((rgSCHUtlAllocSBuf(inst, (Data **)(&boRpt), sizeof(RgSchClcBoRpt))) ==RFAILED) || (!boRpt)) { - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, "Allocation of common bo %dreport " + DU_LOG("\nERROR --> SCH : Allocation of common bo %dreport " "failed RNTI:%d LCID:%d", boUpdt->bo,boUpdt->u.rnti,boUpdt->lcId); return RFAILED; } @@ -6864,31 +5519,19 @@ RgInfCmnBoRpt *boUpdt; * bind confirm API towards RRM. * * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrBndCfm -( -Inst instId, -SuId suId, -U8 status -) -#else -S16 rgSCHUtlRgrBndCfm(instId, suId, status) -Inst instId; -SuId suId; -U8 status; -#endif +S16 rgSCHUtlRgrBndCfm(Inst instId,SuId suId,uint8_t status) { S16 ret = ROK; ret = RgUiRgrBndCfm(&rgSchCb[instId].rgrSap[suId].sapCfg.sapPst, rgSchCb[instId].rgrSap[suId].sapCfg.suId, status); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrBndCfm: RgUiRgrBndCfm Failed "); + DU_LOG("\nERROR --> SCH : rgSCHUtlRgrBndCfm: RgUiRgrBndCfm Failed "); return (ret); } return (ret); @@ -6906,31 +5549,19 @@ 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 **/ -#ifdef ANSI -S16 rgSCHUtlRgmBndCfm -( -Inst instId, -SuId suId, -U8 status -) -#else -S16 rgSCHUtlRgmBndCfm(instId, suId, status) -Inst instId; -SuId suId; -U8 status; -#endif +S16 rgSCHUtlRgmBndCfm(Inst instId,SuId suId,uint8_t status) { S16 ret = ROK; ret = RgUiRgmBndCfm(&rgSchCb[instId].rgmSap[suId].sapCfg.sapPst, rgSchCb[instId].rgmSap[suId].sapCfg.suId, status); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgmBndCfm: RgUiRgrBndCfm Failed "); + DU_LOG("\nERROR --> SCH : rgSCHUtlRgmBndCfm: RgUiRgrBndCfm Failed "); return (ret); } return (ret); @@ -6950,29 +5581,14 @@ U8 status; * * @param[in] Pst pst * @param[in] RgrCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 schSendCfgCfm -( -Region reg, -Pool pool, -RgrCfgTransId transId, -U8 status -) -#else -S16 schSendCfgCfm(reg, pool, transId, status) -Region reg; -Pool pool; -RgrCfgTransId transId; -U8 status; -#endif +S16 schSendCfgCfm(Region reg,Pool pool,RgrCfgTransId transId,uint8_t status) { Pst cfmPst; - Inst inst = 0; memset((&cfmPst), 0, sizeof(Pst)); @@ -6988,8 +5604,7 @@ U8 status; if(RgUiRgrCfgCfm(&cfmPst,transId, status) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"schSendCfgCfm: RgUiRgrCfgCfm Failed"); - printf("\nschSendCfgCfm: RgUiRgrCfgCfm Failed "); + DU_LOG("\nERROR --> SCH : schSendCfgCfm: RgUiRgrCfgCfm Failed "); return RFAILED; } return ROK; @@ -7011,30 +5626,19 @@ U8 status; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrTtiInd -( -RgSchCellCb *cell, -RgrTtiIndInfo *rgrTti -) -#else -S16 rgSCHUtlRgrTtiInd(cell, rgrTti) -RgSchCellCb *cell; -RgrTtiIndInfo *rgrTti; -#endif +S16 rgSCHUtlRgrTtiInd(RgSchCellCb *cell,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 rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHUtlRgrTtiInd() Upper SAP not bound (%d) ", + DU_LOG("\nERROR --> SCH : rgSCHUtlRgrTtiInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); return RFAILED; } @@ -7073,7 +5677,6 @@ RgrTtiIndInfo *rgrTti; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rgSCHUtlProcMsg3 ( RgInfSfDatInd *subfrmInfo, @@ -7082,16 +5685,7 @@ RgSchUeCb *ueCb, CmLteRnti rnti, RgInfUeDatInd *pdu, RgSchErrInfo *err - ) -#else -S16 rgSCHUtlProcMsg3 (subfrmInfo, cellCb, ueCb, rnti, pdu, err) -RgInfSfDatInd *subfrmInfo; -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -CmLteRnti rnti; -RgInfUeDatInd *pdu; -RgSchErrInfo *err; -#endif +) { S16 ret; RgSchRaCb *raCb; @@ -7100,7 +5694,7 @@ RgSchErrInfo *err; raCb = rgSCHDbmGetRaCb (cellCb, rnti); if (raCb == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "RNTI:%d Received MSG3, unable to " + DU_LOG("\nERROR --> SCH : RNTI:%d Received MSG3, unable to " "find raCb",rnti); return RFAILED; } @@ -7110,7 +5704,7 @@ RgSchErrInfo *err; ret = rgSCHRamProcMsg3 (cellCb, ueCb, raCb, pdu, err); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Processing failed in the RAM " + DU_LOG("\nERROR --> SCH : Processing failed in the RAM " "RNTI:%d ",rnti); return (ret); } @@ -7141,19 +5735,7 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rgSCHUtlSpsRelInd -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb, -Bool isExplRel -) -#else -S16 rgSCHUtlSpsRelInd (cellCb, ueCb, isExplRel) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -Bool isExplRel; -#endif +S16 rgSCHUtlSpsRelInd(RgSchCellCb *cellCb,RgSchUeCb *ueCb,Bool isExplRel) { cellCb->sc.apis->rgSCHUlSpsRelInd(cellCb, ueCb, isExplRel); return ROK; @@ -7172,25 +5754,13 @@ Bool isExplRel; * * @param [in] RgSchCellCb *cellCb * @param [in] RgSchUeCb *ueCb - * @param [in] U16 spsSduSize + * @param [in] uint16_t spsSduSize * @param * @return S16 * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rgSCHUtlSpsActInd -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb, -U16 spsSduSize -) -#else -S16 rgSCHUtlSpsActInd (cellCb, ueCb, spsSduSize) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -U16 spsSduSize; -#endif +S16 rgSCHUtlSpsActInd(RgSchCellCb *cellCb,RgSchUeCb *ueCb,uint16_t spsSduSize) { cellCb->sc.apis->rgSCHUlSpsActInd(cellCb, ueCb, spsSduSize); return ROK; @@ -7216,99 +5786,28 @@ U16 spsSduSize; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlTfuGrpPwrCntrlReq -( -Inst inst, -S16 sapId, -TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq -) -#else -S16 rgSCHUtlTfuGrpPwrCntrlReq(inst, sapId, grpPwrCntrlReq) -Inst inst; -S16 sapId; -TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; -#endif +S16 rgSCHUtlTfuGrpPwrCntrlReq(Inst inst,S16 sapId,TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq) { S16 ret; RgSchLowSapCb *tfuSap; Pst pst; - /* Get the lower SAP control block from the layer control block. */ tfuSap = &(rgSchCb[inst].tfuSap[sapId]); if (tfuSap->sapSta.sapState != LRG_BND) { - RLOG_ARG1(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, - "rgSCHUtlTfuGrpPwrCntrlReq() Lower SAP not bound (%d) ",tfuSap->sapSta.sapState); + DU_LOG("\nERROR --> SCH : rgSCHUtlTfuGrpPwrCntrlReq() Lower SAP not bound (%d) ",tfuSap->sapSta.sapState); return RFAILED; } memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuGrpPwrCntrlReq (&pst, tfuSap->sapCfg.spId, grpPwrCntrlReq)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, - "rgSCHUtlTfuGrpPwrCntrlReq() Call to RgLiTfuGrpPwrCntrlReq() failed"); + DU_LOG("\nERROR --> SCH : rgSCHUtlTfuGrpPwrCntrlReq() Call to RgLiTfuGrpPwrCntrlReq() failed"); } return (ret); } /* rgSCHUtlTfuGrpPwrCntrlReq */ #endif -/** - * @brief This API is invoked to send Control Info to PHY. - * - * @details - * - * Function : rgSCHUtlTfuCntrlReq - * - * This API is invoked to send Control Info to PHY. It - * fills in the Pst structure, spId value and invokes Cntrl - * request primitive at TFU. - * - * @param[in] TfuCntrlReqInfo *cntrlReq - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -S16 rgSCHUtlTfuCntrlReq -( -Inst inst, -S16 sapId, -TfuCntrlReqInfo *cntrlReq -) -#else -S16 rgSCHUtlTfuCntrlReq(inst, sapId, cntrlReq) -Inst inst; -S16 sapId; -TfuCntrlReqInfo *cntrlReq; -#endif -{ - S16 ret; - RgSchLowSapCb *tfuSap; - - /* Get the lower SAP control block from the layer control block. */ - tfuSap = &(rgSchCb[inst].tfuSap[sapId]); - -#ifndef NO_ERRCLS - if (tfuSap->sapSta.sapState != LRG_BND) - { - RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuCntrlReq() Lower SAP not bound (%d) ", - tfuSap->sapSta.sapState); - RGSCH_FREE_MEM(cntrlReq); - return RFAILED; - } -#endif - - /* Using local variable for pst is unnecessary - for optimization */ - if((ret = RgLiTfuCntrlReq(&tfuSap->sapCfg.sapPst, tfuSap->sapCfg.spId, - cntrlReq)) != ROK) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuCntrlReq() Call to RgLiTfuCntrlReq() failed"); - } - return (ret); -} /* rgSCHUtlTfuCntrlReq*/ - - /* FOR ACK NACK REP */ /** @@ -7328,17 +5827,7 @@ TfuCntrlReqInfo *cntrlReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlDlActvtUe -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -S16 rgSCHUtlDlActvtUe(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +S16 rgSCHUtlDlActvtUe(RgSchCellCb *cell,RgSchUeCb *ue) { cell->sc.apis->rgSCHActvtDlUe(cell, ue); return ROK; @@ -7361,78 +5850,12 @@ RgSchUeCb *ue; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlUlActvtUe -( -RgSchCellCb *cell, -RgSchUeCb *ue -) -#else -S16 rgSCHUtlUlActvtUe(cell, ue) -RgSchCellCb *cell; -RgSchUeCb *ue; -#endif +S16 rgSCHUtlUlActvtUe(RgSchCellCb *cell,RgSchUeCb *ue) { cell->sc.apis->rgSCHActvtUlUe(cell, ue); return ROK; } -/** - * @brief This API is invoked to send Reception Request Info to PHY. - * - * @details - * - * Function : rgSCHUtlTfuRecpReq - * - * This API is invoked to send Reception Request Info to PHY. It - * fills in the Pst structure, spId value and invokes Reception - * request primitive at TFU. - * - * @param[in] TfuRecpReqInfo *recpReq - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -S16 rgSCHUtlTfuRecpReq -( -Inst inst, -S16 sapId, -TfuRecpReqInfo *recpReq -) -#else -S16 rgSCHUtlTfuRecpReq(inst, sapId, recpReq) -Inst inst; -S16 sapId; -TfuRecpReqInfo *recpReq; -#endif -{ - S16 ret; - RgSchLowSapCb *tfuSap; - - - /* Get the lower SAP control block from the layer control block. */ - tfuSap = &(rgSchCb[inst].tfuSap[sapId]); - -#ifndef NO_ERRCLS - if (tfuSap->sapSta.sapState != LRG_BND) - { - RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuRecpReq() Lower SAP not bound (%d) ", - tfuSap->sapSta.sapState); - RGSCH_FREE_MEM(recpReq); - return RFAILED; - } -#endif - - /* Using local variable for pst is unnecessary - for optimization */ - if((ret = RgLiTfuRecpReq(&tfuSap->sapCfg.sapPst, tfuSap->sapCfg.spId, - recpReq)) != ROK) - { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuRecpReq() Call to RgLiTfuRecpReq() failed"); - } - return (ret); -} /* rgSCHUtlTfuRecpReq */ - /** @brief This function Validates the SAP information received along with the * primitive from the lower layer. * @@ -7444,23 +5867,13 @@ TfuRecpReqInfo *recpReq; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 rgSCHUtlValidateTfuSap -( -Inst inst, -SuId suId -) -#else -S16 rgSCHUtlValidateTfuSap(inst, suId) -Inst inst; -SuId suId; -#endif +S16 rgSCHUtlValidateTfuSap(Inst inst,SuId suId) { RgSchLowSapCb *tfuSap; if(suId >= rgSchCb[inst].numSaps) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Incorrect SuId"); + DU_LOG("\nERROR --> SCH : Incorrect SuId"); return RFAILED; } tfuSap = &(rgSchCb[inst].tfuSap[suId]); @@ -7468,13 +5881,13 @@ SuId suId; /* First lets check the suId */ if( suId != tfuSap->sapCfg.suId) { - RLOG_ARG2(L_ERROR,DBG_INSTID,inst,"Incorrect SuId. Configured (%d) Recieved (%d)", + DU_LOG("\nERROR --> SCH : Incorrect SuId. Configured (%d) Recieved (%d)", tfuSap->sapCfg.suId, suId); return RFAILED; } if (tfuSap->sapSta.sapState != LRG_BND) { - RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"Lower SAP not enabled SuId (%d)", + DU_LOG("\nERROR --> SCH : Lower SAP not enabled SuId (%d)", tfuSap->sapCfg.suId); return RFAILED; } @@ -7495,22 +5908,11 @@ SuId suId; * File: rg_utl.c * */ -#ifdef ANSI -S16 rgSCHUtlAllocEventMem -( -Inst inst, -Ptr *memPtr, -Size memSize -) -#else -S16 rgSCHUtlAllocEventMem(inst, memPtr, memSize) -Inst inst; -Ptr *memPtr; -Size memSize; -#endif +S16 rgSCHUtlAllocEventMem(Inst inst,Ptr *memPtr,Size memSize) { - Mem sMem; - VOLATILE U32 startTime=0; + Mem sMem; + volatile uint32_t startTime=0; + sMem.region = rgSchCb[inst].rgSchInit.region; sMem.pool = rgSchCb[inst].rgSchInit.pool; @@ -7518,8 +5920,7 @@ Size memSize; #if (ERRCLASS & ERRCLS_DEBUG) if (memSize<= 0) { - RGSCHLOGERROR(inst, ERRCLS_INT_PAR, ERG022, memSize, - "rgAllocEventMem(): memSize invalid\n"); + DU_LOG("\nERROR --> SCH : rgAllocEventMem(): memSize invalid\n"); return (RFAILED); } #endif /* ERRCLASS & ERRCLS_DEBUG */ @@ -7535,7 +5936,7 @@ Size memSize; if(ROK != cmAllocEvnt(memSize, TFU_MAX_MEMBLK_SIZE, &sMem, memPtr)) #endif /* */ { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"cmAllocEvnt Failed."); + DU_LOG("\nERROR --> SCH : cmAllocEvnt Failed."); return RFAILED; } /*stoping Task*/ @@ -7557,19 +5958,7 @@ Size memSize; * File: rg_utl.c * */ -#ifdef ANSI -S16 rgSCHUtlGetEventMem -( -Ptr *ptr, -Size len, -Ptr memCp -) -#else -S16 rgSCHUtlGetEventMem(ptr, len, memCp) -Ptr *ptr; -Size len; -Ptr memCp; -#endif +S16 rgSCHUtlGetEventMem(Ptr *ptr,Size len,Ptr memCp) { S16 ret; @@ -7596,23 +5985,13 @@ Ptr memCp; * @param[in] RgSchUeCb *ue * @return S16 **/ -#ifdef ANSI -S16 rgSCHUtlAllocUeANFdbkInfo -( -RgSchUeCb *ue, -U8 servCellIdx -) -#else -S16 rgSCHUtlAllocUeANFdbkInfo(ue,servCellIdx) -RgSchUeCb *ue; -U8 servCellIdx; -#endif +S16 rgSCHUtlAllocUeANFdbkInfo(RgSchUeCb *ue,uint8_t servCellIdx) { - U8 idx; + uint8_t idx; if (rgSCHUtlAllocSBuf(ue->cell->instIdx, (Data **) &(ue->cellInfo[servCellIdx]->anInfo), sizeof(RgSchTddANInfo) * \ - ue->cell->ackNackFdbkArrSize) != ROK) + ue->cell->ackNackFdbkArrSize) != ROK) { return RFAILED; } @@ -7639,17 +6018,7 @@ U8 servCellIdx; * @param[in] RgSchUeCb *ue * @return Void **/ -#ifdef ANSI -Void rgSCHUtlDelUeANFdbkInfo -( -RgSchUeCb *ue, -U8 servCellIdx -) -#else -Void rgSCHUtlDelUeANFdbkInfo(ue,servCellIdx) -RgSchUeCb *ue; -U8 servCellIdx; -#endif +Void rgSCHUtlDelUeANFdbkInfo(RgSchUeCb *ue,uint8_t servCellIdx) { /* ccpu00117052 - MOD - Passing double pointer @@ -7658,7 +6027,7 @@ U8 servCellIdx; (Data **)(&( ue->cellInfo[servCellIdx]->anInfo)), sizeof(RgSchTddANInfo) * \ ue->cell->ackNackFdbkArrSize); - RETVOID; + return; } /* rgSCHUtlDelUeANFdbkInfo */ /** @@ -7673,15 +6042,7 @@ U8 servCellIdx; * @param[in] RgSchTddANInfo *anFdInfo * @return S16 **/ -#ifdef ANSI -S16 rgSCHUtlInitUeANFdbkInfo -( -RgSchTddANInfo *anFdInfo -) -#else -S16 rgSCHUtlInitUeANFdbkInfo(anFdInfo) -RgSchTddANInfo *anFdInfo; -#endif +S16 rgSCHUtlInitUeANFdbkInfo(RgSchTddANInfo *anFdInfo) { anFdInfo->sfn = RGSCH_MAX_SFN+1; /* defensively setting invalid sfn */ @@ -7707,21 +6068,9 @@ RgSchTddANInfo *anFdInfo; * @param[in] CmLteTimingInfo *time * @return RgSchTddANInfo* **/ -#ifdef ANSI -RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo -( -RgSchUeCb *ueCb, -CmLteTimingInfo *timeInfo, -U8 servCellIdx -) -#else -RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo(ueCb, timeInfo,servCellIdx) -RgSchUeCb *ueCb; -CmLteTimingInfo *timeInfo; -U8 servCellIdx; -#endif +RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo(RgSchUeCb *ueCb,CmLteTimingInfo *timeInfo,uint8_t servCellIdx) { - U8 idx; + uint8_t idx; for (idx = 0; idx < ueCb->cell->ackNackFdbkArrSize; ++idx) { @@ -7745,22 +6094,12 @@ U8 servCellIdx; * * @param[in] CmLteTimingInfo *timeInfo * @param[in] RgSchCellCb *cell - * @return U8 + * @return uint8_t * **/ -#ifdef ANSI -U8 rgSCHUtlGetDlSfIdx -( -RgSchCellCb *cell, -CmLteTimingInfo *timeInfo -) -#else -U8 rgSCHUtlGetDlSfIdx(cell, timeInfo) -RgSchCellCb *cell; -CmLteTimingInfo *timeInfo; -#endif +uint8_t rgSCHUtlGetDlSfIdx(RgSchCellCb *cell,CmLteTimingInfo *timeInfo) { - U16 idx = 0; + uint16_t idx = 0; idx = RGSCH_NUM_SUB_FRAMES - \ rgSchTddNumUlSubfrmTbl[cell->ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -7768,7 +6107,7 @@ CmLteTimingInfo *timeInfo; rgSchTddNumDlSubfrmTbl[cell->ulDlCfgIdx][timeInfo->slot]) - 1; idx = idx % cell->numDlSubfrms; - return ((U8)idx); + return ((uint8_t)idx); } /** @@ -7784,29 +6123,13 @@ CmLteTimingInfo *timeInfo; * @param[in] RgSchDlSf *dlSf * @param[in] RgSchDlSf **nxtDlsf * @param[in] CmLteTimingInfo *nxtDlTime - * @return U8 + * @return uint8_t * **/ -#ifdef ANSI -Void rgSCHUtlGetNxtDlSfInfo -( -CmLteTimingInfo curDlTime, -RgSchCellCb *cell, -RgSchDlSf *dlSf, -RgSchDlSf **nxtDlsf, -CmLteTimingInfo *nxtDlTime -) -#else -Void rgSCHUtlGetNxtDlSfInfo(curDlTime, cell, dlSf, nxtDlsf, nxtDlTime) -CmLteTimingInfo curDlTime; -RgSchCellCb *cell; -RgSchDlSf *dlSf; -RgSchDlSf **nxtDlsf; -CmLteTimingInfo *nxtDlTime; -#endif +Void rgSCHUtlGetNxtDlSfInfo(CmLteTimingInfo curDlTime,RgSchCellCb *cell,RgSchDlSf *dlSf,RgSchDlSf **nxtDlsf,CmLteTimingInfo *nxtDlTime) { - U16 idx = curDlTime.slot; - U8 count = 0; + uint16_t idx = curDlTime.slot; + uint8_t count = 0; while(TRUE) { @@ -7823,7 +6146,7 @@ CmLteTimingInfo *nxtDlTime; break; } } - RETVOID; + return; } /** @@ -7837,28 +6160,14 @@ 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 -Void rgSCHUtlGetPrevDlSfInfo -( -RgSchCellCb *cell, -CmLteTimingInfo curDlTime, -CmLteTimingInfo *prevDlTime, -U8 *numSubfrm -) -#else -Void rgSCHUtlGetPrevDlSfInfo(cell, curDlTime, prevDlTime, numSubfrm) -RgSchCellCb *cell; -CmLteTimingInfo curDlTime; -CmLteTimingInfo *prevDlTime; -U8 *numSubfrm; -#endif +Void rgSCHUtlGetPrevDlSfInfo(RgSchCellCb *cell,CmLteTimingInfo curDlTime,CmLteTimingInfo *prevDlTime,uint8_t *numSubfrm) { S16 idx = curDlTime.slot; - U8 count = 0; + uint8_t count = 0; do { @@ -7872,7 +6181,7 @@ U8 *numSubfrm; != RG_SCH_TDD_DL_slot); *numSubfrm = count; RGSCHDECRFRMCRNTTIME(curDlTime, (*prevDlTime), count); - RETVOID; + return; } #endif @@ -7891,27 +6200,13 @@ U8 *numSubfrm; * File : * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlUlSfInit -( -RgSchCellCb *cell, -RgSchUlSf *sf, -U8 idx, -U8 maxUePerSf -) -#else -S16 rgSCHUtlUlSfInit(cell, sf, idx, maxUePerSf) -RgSchCellCb *cell; -RgSchUlSf *sf; -U8 idx; -U8 maxUePerSf; -#endif +S16 rgSCHUtlUlSfInit(RgSchCellCb *cell,RgSchUlSf *sf,uint8_t idx,uint8_t maxUePerSf) { S16 ret=ROK; sf->idx = idx; #ifdef RG_5GTF - U8 index; + uint8_t index; #endif #ifdef LTE_TDD @@ -7948,7 +6243,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) @@ -7997,17 +6292,7 @@ U8 maxUePerSf; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlSfDeinit -( -RgSchCellCb *cell, -RgSchUlSf *sf -) -#else -Void rgSCHUtlUlSfDeinit(cell, sf) -RgSchCellCb *cell; -RgSchUlSf *sf; -#endif +Void rgSCHUtlUlSfDeinit(RgSchCellCb *cell,RgSchUlSf *sf) { if (sf->allocDb) { @@ -8027,7 +6312,7 @@ RgSchUlSf *sf; rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->holeDb)), sizeof(RgSchUlHoleDb)); } - RETVOID; + return; } /*********************************************************** @@ -8043,19 +6328,7 @@ RgSchUlSf *sf; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHUtlUlAllocDbInit -( -RgSchCellCb *cell, -RgSchUlAllocDb *allocDb, -U8 maxAllocs -) -#else -PRIVATE S16 rgSCHUtlUlAllocDbInit(cell, allocDb, maxAllocs) -RgSchCellCb *cell; -RgSchUlAllocDb *allocDb; -U8 maxAllocs; -#endif +static S16 rgSCHUtlUlAllocDbInit(RgSchCellCb *cell,RgSchUlAllocDb *allocDb,uint8_t maxAllocs) { S16 ret = rgSCHUtlUlAllocMemInit(cell, &allocDb->mem, maxAllocs); if (ret != ROK) @@ -8081,22 +6354,12 @@ U8 maxAllocs; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHUtlUlAllocDbDeinit -( -RgSchCellCb *cell, -RgSchUlAllocDb *allocDb -) -#else -PRIVATE Void rgSCHUtlUlAllocDbDeinit(cell, allocDb) -RgSchCellCb *cell; -RgSchUlAllocDb *allocDb; -#endif +static Void rgSCHUtlUlAllocDbDeinit(RgSchCellCb *cell,RgSchUlAllocDb *allocDb) { rgSCHUtlUlAllocMemDeinit(cell, &allocDb->mem); allocDb->count = 0; allocDb->first = NULLP; - RETVOID; + return; } /*********************************************************** @@ -8112,23 +6375,7 @@ RgSchUlAllocDb *allocDb; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE S16 rgSCHUtlUlHoleDbInit -( -RgSchCellCb *cell, -RgSchUlHoleDb *holeDb, -U8 maxHoles, -U8 start, -U8 num -) -#else -PRIVATE S16 rgSCHUtlUlHoleDbInit(cell, holeDb, maxHoles, start, num) -RgSchCellCb *cell; -RgSchUlHoleDb *holeDb; -U8 maxHoles; -U8 start; -U8 num; -#endif +static S16 rgSCHUtlUlHoleDbInit(RgSchCellCb *cell,RgSchUlHoleDb *holeDb,uint8_t maxHoles,uint8_t start,uint8_t num) { S16 ret; RgSchUlHole *hole = NULLP; @@ -8159,22 +6406,12 @@ U8 num; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE Void rgSCHUtlUlHoleDbDeinit -( -RgSchCellCb *cell, -RgSchUlHoleDb *holeDb -) -#else -PRIVATE Void rgSCHUtlUlHoleDbDeinit(cell, holeDb) -RgSchCellCb *cell; -RgSchUlHoleDb *holeDb; -#endif +static Void rgSCHUtlUlHoleDbDeinit(RgSchCellCb *cell,RgSchUlHoleDb *holeDb) { rgSCHUtlUlHoleMemDeinit(cell, &holeDb->mem); holeDb->count = 0; holeDb->first = NULLP; - RETVOID; + return; } @@ -8191,19 +6428,7 @@ RgSchUlHoleDb *holeDb; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocGetHole -( -RgSchUlSf *sf, -U8 numSb, -RgSchUlHole *hole -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocGetHole(sf, numSb, hole) -RgSchUlSf *sf; -U8 numSb; -RgSchUlHole *hole; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocGetHole(RgSchUlSf *sf,uint8_t numSb,RgSchUlHole *hole) { if (numSb < hole->num) { @@ -8229,17 +6454,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole -( -RgSchUlSf *sf, -RgSchUlHole *hole -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole(sf, hole) -RgSchUlSf *sf; -RgSchUlHole *hole; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole(RgSchUlSf *sf,RgSchUlHole *hole) { RgSchUlAlloc *alloc; /* alloc = rgSCHUtlUlAllocGetAndIns(sf->allocDb, hole->prvAlloc, hole->nxtAlloc); */ @@ -8296,19 +6511,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole -( -RgSchUlSf *sf, -U8 numSb, -RgSchUlHole *hole -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole(sf, numSb, hole) -RgSchUlSf *sf; -U8 numSb; -RgSchUlHole *hole; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole(RgSchUlSf *sf,uint8_t numSb,RgSchUlHole *hole) { RgSchUlAlloc *alloc; /* alloc = rgSCHUtlUlAllocGetAndIns(sf->allocDb, hole->prvAlloc, hole->nxtAlloc); */ @@ -8361,15 +6564,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocFirst -( -RgSchUlSf *sf -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocFirst(sf) -RgSchUlSf *sf; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocFirst(RgSchUlSf *sf) { return (sf->allocDb->first); } @@ -8387,17 +6582,7 @@ RgSchUlSf *sf; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocNxt -( -RgSchUlSf *sf, -RgSchUlAlloc *alloc -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocNxt(sf, alloc) -RgSchUlSf *sf; -RgSchUlAlloc *alloc; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocNxt(RgSchUlSf *sf,RgSchUlAlloc *alloc) { UNUSED(sf); return (alloc->nxt); @@ -8422,17 +6607,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt -( -RgSchUlAllocDb *db, -RgSchUlAlloc *prv -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt(db, prv) -RgSchUlAllocDb *db; -RgSchUlAlloc *prv; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt(RgSchUlAllocDb *db,RgSchUlAlloc *prv) { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = prv->nxt; @@ -8474,15 +6649,7 @@ RgSchUlAlloc *prv; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocGetFirst -( -RgSchUlAllocDb *db -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocGetFirst(db) -RgSchUlAllocDb *db; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocGetFirst(RgSchUlAllocDb *db) { RgSchUlAlloc *alloc = rgSCHUtlUlAllocMemGet(&db->mem); RgSchUlAlloc *nxt = db->first; @@ -8519,17 +6686,9 @@ RgSchUlAllocDb *db; * Notes: * * File : - * - **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleAddAllocation -( -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlHoleAddAllocation(alloc) -RgSchUlAlloc *alloc; -#endif + * + **********************************************************/ +Void rgSCHUtlUlHoleAddAllocation(RgSchUlAlloc *alloc) { /* Note: rgSchCmnUlHoleUpdAllocLnks function that is used should not exist as * one, if such excessive branching is done (AllocNone, AllocNoPrv etc). @@ -8559,7 +6718,7 @@ RgSchUlAlloc *alloc; else rgSCHUtlUlHoleNew(db, alloc); } - RETVOID; + return; } @@ -8576,15 +6735,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlAllocRelease -( -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlAllocRelease(alloc) -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlAllocRelease(RgSchUlAlloc *alloc) { RgSchUlAllocDb *allocDb = alloc->allocDbRef; RgSchUlAlloc *prv = alloc->prv; @@ -8614,7 +6765,7 @@ RgSchUlAlloc *alloc; rgSCHUtlUlHoleAddAllocation(alloc); rgSCHUtlUlAllocMemRls(&allocDb->mem, alloc); - RETVOID; + return; } @@ -8631,17 +6782,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlAllocRls -( -RgSchUlSf *sf, -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlAllocRls(sf, alloc) -RgSchUlSf *sf; -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlAllocRls(RgSchUlSf *sf,RgSchUlAlloc *alloc) { RgSchUlAllocDb *allocDb = sf->allocDb; RgSchUlAlloc *prv = alloc->prv; @@ -8676,12 +6817,12 @@ RgSchUlAlloc *alloc; else { - printf("\nError: allocDb->count is ZERO ====\n"); + DU_LOG("\nERROR --> SCH : allocDb->count is ZERO "); } - //printf("\nallocDb->count:%u\n",allocDb->count); + //DU_LOG("\nallocDb->count:%u\n",allocDb->count); - RETVOID; + return; } /*********************************************************** @@ -8697,15 +6838,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlHole *rgSCHUtlUlHoleFirst -( -RgSchUlSf *sf -) -#else -RgSchUlHole *rgSCHUtlUlHoleFirst(sf) -RgSchUlSf *sf; -#endif +RgSchUlHole *rgSCHUtlUlHoleFirst(RgSchUlSf *sf) { return (sf->holeDb->first); } @@ -8723,17 +6856,7 @@ RgSchUlSf *sf; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlHole *rgSCHUtlUlHoleNxt -( -RgSchUlSf *sf, -RgSchUlHole *hole -) -#else -RgSchUlHole *rgSCHUtlUlHoleNxt(sf, hole) -RgSchUlSf *sf; -RgSchUlHole *hole; -#endif +RgSchUlHole *rgSCHUtlUlHoleNxt(RgSchUlSf *sf,RgSchUlHole *hole) { UNUSED(sf); return (hole->nxt); @@ -8752,17 +6875,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleAddAlloc -( -RgSchUlSf *sf, -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlHoleAddAlloc(sf, alloc) -RgSchUlSf *sf; -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlHoleAddAlloc(RgSchUlSf *sf,RgSchUlAlloc *alloc) { /* Note: rgSchCmnUlHoleUpdAllocLnks function that is used should not exist as * one, if such excessive branching is done (AllocNone, AllocNoPrv etc). @@ -8796,7 +6909,7 @@ RgSchUlAlloc *alloc; /* increment the number of subbands getting freed to total available list */ sf->availSubbands += alloc->numSb; - RETVOID; + return; } /*********************************************************** @@ -8812,28 +6925,14 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleJoin -( -RgSchUlHoleDb *db, -RgSchUlHole *prv, -RgSchUlHole *nxt, -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlHoleJoin(db, prv, nxt, alloc) -RgSchUlHoleDb *db; -RgSchUlHole *prv; -RgSchUlHole *nxt; -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlHoleJoin(RgSchUlHoleDb *db,RgSchUlHole *prv,RgSchUlHole *nxt,RgSchUlAlloc *alloc) { prv->num += alloc->numSb + nxt->num; rgSCHUtlUlHoleRls(db, nxt); rgSCHUtlUlHoleIncr(db, prv); rgSCHUtlUlHoleUpdAllocLnks(prv, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -8850,24 +6949,12 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleExtndRight -( -RgSchUlHoleDb *db, -RgSchUlHole *prv, -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlHoleExtndRight(db, prv, alloc) -RgSchUlHoleDb *db; -RgSchUlHole *prv; -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlHoleExtndRight(RgSchUlHoleDb *db,RgSchUlHole *prv,RgSchUlAlloc *alloc) { prv->num += alloc->numSb; rgSCHUtlUlHoleIncr(db, prv); rgSCHUtlUlHoleUpdAllocLnks(prv, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -8884,25 +6971,13 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleExtndLeft -( -RgSchUlHoleDb *db, -RgSchUlHole *nxt, -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlHoleExtndLeft(db, nxt, alloc) -RgSchUlHoleDb *db; -RgSchUlHole *nxt; -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlHoleExtndLeft(RgSchUlHoleDb *db,RgSchUlHole *nxt,RgSchUlAlloc *alloc) { nxt->num += alloc->numSb; nxt->start = alloc->sbStart; rgSCHUtlUlHoleIncr(db, nxt); rgSCHUtlUlHoleUpdAllocLnks(nxt, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -8918,23 +6993,13 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleNew -( -RgSchUlHoleDb *db, -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlHoleNew(db, alloc) -RgSchUlHoleDb *db; -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlHoleNew(RgSchUlHoleDb *db,RgSchUlAlloc *alloc) { RgSchUlHole *hole = rgSCHUtlUlHoleMemGet(&db->mem); #if (ERRCLASS & ERRCLS_DEBUG) if ( hole == NULLP ) { - RETVOID; + return; } #endif hole->start = alloc->sbStart; @@ -8942,7 +7007,7 @@ RgSchUlAlloc *alloc; ++db->count; rgSCHUtlUlHoleIns(db, hole); rgSCHUtlUlHoleUpdAllocLnks(hole, alloc->prv, alloc->nxt); - RETVOID; + return; } /*********************************************************** @@ -8958,19 +7023,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleUpdAllocLnks -( -RgSchUlHole *hole, -RgSchUlAlloc *prvAlloc, -RgSchUlAlloc *nxtAlloc -) -#else -Void rgSCHUtlUlHoleUpdAllocLnks(hole, prvAlloc, nxtAlloc) -RgSchUlHole *hole; -RgSchUlAlloc *prvAlloc; -RgSchUlAlloc *nxtAlloc; -#endif +Void rgSCHUtlUlHoleUpdAllocLnks(RgSchUlHole *hole,RgSchUlAlloc *prvAlloc,RgSchUlAlloc *nxtAlloc) { if (prvAlloc) { @@ -8982,7 +7035,7 @@ RgSchUlAlloc *nxtAlloc; } hole->prvAlloc = prvAlloc; hole->nxtAlloc = nxtAlloc; - RETVOID; + return; } @@ -9000,17 +7053,7 @@ RgSchUlAlloc *nxtAlloc; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleIns -( -RgSchUlHoleDb *db, -RgSchUlHole *hole -) -#else -Void rgSCHUtlUlHoleIns(db, hole) -RgSchUlHoleDb *db; -RgSchUlHole *hole; -#endif +Void rgSCHUtlUlHoleIns(RgSchUlHoleDb *db,RgSchUlHole *hole) { RgSchUlHole *cur; @@ -9024,7 +7067,7 @@ RgSchUlHole *hole; cur->prv = hole; db->first = hole; hole->prv = NULLP; - RETVOID; + return; } for (nxt = cur->nxt; nxt; cur = nxt, nxt = nxt->nxt) @@ -9036,7 +7079,7 @@ RgSchUlHole *hole; hole->prv = cur; hole->nxt = nxt; nxt->prv = hole; - RETVOID; + return; } } @@ -9044,14 +7087,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; } @@ -9069,17 +7112,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleIncr -( -RgSchUlHoleDb *db, -RgSchUlHole *hole -) -#else -Void rgSCHUtlUlHoleIncr(db, hole) -RgSchUlHoleDb *db; -RgSchUlHole *hole; -#endif +Void rgSCHUtlUlHoleIncr(RgSchUlHoleDb *db,RgSchUlHole *hole) { RgSchUlHole *cur; @@ -9089,7 +7122,7 @@ RgSchUlHole *hole; if (cur->num > hole->num) { - RETVOID; + return; } /* Remove hole from current position */ @@ -9108,7 +7141,7 @@ RgSchUlHole *hole; hole->prv = prv; hole->nxt = cur; cur->prv = hole; - RETVOID; + return; } } @@ -9117,9 +7150,9 @@ RgSchUlHole *hole; cur->prv = hole; db->first = hole; hole->prv = NULLP; - RETVOID; + return; } - RETVOID; + return; } /*********************************************************** @@ -9136,17 +7169,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleDecr -( -RgSchUlHoleDb *db, -RgSchUlHole *hole -) -#else -Void rgSCHUtlUlHoleDecr(db, hole) -RgSchUlHoleDb *db; -RgSchUlHole *hole; -#endif +Void rgSCHUtlUlHoleDecr(RgSchUlHoleDb *db,RgSchUlHole *hole) { RgSchUlHole *cur; @@ -9156,7 +7179,7 @@ RgSchUlHole *hole; if (cur->num < hole->num) { - RETVOID; + return; } /* Remove hole from current position */ @@ -9179,7 +7202,7 @@ RgSchUlHole *hole; hole->prv = cur; hole->nxt = nxt; nxt->prv = hole; - RETVOID; + return; } } @@ -9187,9 +7210,9 @@ RgSchUlHole *hole; cur->nxt = hole; hole->prv = cur; hole->nxt = NULLP; - RETVOID; + return; } - RETVOID; + return; } /*********************************************************** @@ -9208,17 +7231,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleRls -( -RgSchUlHoleDb *db, -RgSchUlHole *hole -) -#else -Void rgSCHUtlUlHoleRls(db, hole) -RgSchUlHoleDb *db; -RgSchUlHole *hole; -#endif +Void rgSCHUtlUlHoleRls(RgSchUlHoleDb *db,RgSchUlHole *hole) { RgSchUlHole *prv = hole->prv; RgSchUlHole *nxt = hole->nxt; @@ -9242,7 +7255,7 @@ RgSchUlHole *hole; } rgSCHUtlUlHoleMemRls(&db->mem, hole); - RETVOID; + return; } @@ -9259,19 +7272,7 @@ RgSchUlHole *hole; * File : * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlUlAllocMemInit -( -RgSchCellCb *cell, -RgSchUlAllocMem *mem, -U8 maxAllocs -) -#else -S16 rgSCHUtlUlAllocMemInit(cell, mem, maxAllocs) -RgSchCellCb *cell; -RgSchUlAllocMem *mem; -U8 maxAllocs; -#endif +S16 rgSCHUtlUlAllocMemInit(RgSchCellCb *cell,RgSchUlAllocMem *mem,uint8_t maxAllocs) { S16 ret; RgSchUlAlloc *allocs; @@ -9291,7 +7292,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) @@ -9319,17 +7320,7 @@ U8 maxAllocs; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlAllocMemDeinit -( -RgSchCellCb *cell, -RgSchUlAllocMem *mem -) -#else -Void rgSCHUtlUlAllocMemDeinit(cell, mem) -RgSchCellCb *cell; -RgSchUlAllocMem *mem; -#endif +Void rgSCHUtlUlAllocMemDeinit(RgSchCellCb *cell,RgSchUlAllocMem *mem) { /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -9337,7 +7328,7 @@ RgSchUlAllocMem *mem; mem->maxAllocs * sizeof(*mem->allocs)); mem->maxAllocs = 0; mem->firstFree = NULLP; - RETVOID; + return; } /*********************************************************** @@ -9354,21 +7345,7 @@ RgSchUlAllocMem *mem; * File : * **********************************************************/ -#ifdef ANSI -S16 rgSCHUtlUlHoleMemInit -( -RgSchCellCb *cell, -RgSchUlHoleMem *mem, -U8 maxHoles, -RgSchUlHole **holeRef -) -#else -S16 rgSCHUtlUlHoleMemInit(cell, mem, maxHoles, holeRef) -RgSchCellCb *cell; -RgSchUlHoleMem *mem; -U8 maxHoles; -RgSchUlHole **holeRef; -#endif +S16 rgSCHUtlUlHoleMemInit(RgSchCellCb *cell,RgSchUlHoleMem *mem,uint8_t maxHoles,RgSchUlHole **holeRef) { S16 ret; RgSchUlHole *holes; @@ -9395,7 +7372,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) @@ -9424,17 +7401,7 @@ RgSchUlHole **holeRef; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleMemDeinit -( -RgSchCellCb *cell, -RgSchUlHoleMem *mem -) -#else -Void rgSCHUtlUlHoleMemDeinit(cell, mem) -RgSchCellCb *cell; -RgSchUlHoleMem *mem; -#endif +Void rgSCHUtlUlHoleMemDeinit(RgSchCellCb *cell,RgSchUlHoleMem *mem) { /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -9442,7 +7409,7 @@ RgSchUlHoleMem *mem; mem->maxHoles * sizeof(*mem->holes)); mem->maxHoles = 0; mem->firstFree = NULLP; - RETVOID; + return; } /*********************************************************** @@ -9458,15 +7425,7 @@ RgSchUlHoleMem *mem; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlAlloc *rgSCHUtlUlAllocMemGet -( -RgSchUlAllocMem *mem -) -#else -RgSchUlAlloc *rgSCHUtlUlAllocMemGet(mem) -RgSchUlAllocMem *mem; -#endif +RgSchUlAlloc *rgSCHUtlUlAllocMemGet(RgSchUlAllocMem *mem) { RgSchUlAlloc *alloc; @@ -9498,17 +7457,7 @@ RgSchUlAllocMem *mem; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlAllocMemRls -( -RgSchUlAllocMem *mem, -RgSchUlAlloc *alloc -) -#else -Void rgSCHUtlUlAllocMemRls(mem, alloc) -RgSchUlAllocMem *mem; -RgSchUlAlloc *alloc; -#endif +Void rgSCHUtlUlAllocMemRls(RgSchUlAllocMem *mem,RgSchUlAlloc *alloc) { alloc->prv = NULLP; @@ -9518,7 +7467,7 @@ RgSchUlAlloc *alloc; mem->firstFree->prv = alloc; } mem->firstFree = alloc; - RETVOID; + return; } /*********************************************************** @@ -9534,15 +7483,7 @@ RgSchUlAlloc *alloc; * File : * **********************************************************/ -#ifdef ANSI -RgSchUlHole *rgSCHUtlUlHoleMemGet -( -RgSchUlHoleMem *mem -) -#else -RgSchUlHole *rgSCHUtlUlHoleMemGet(mem) -RgSchUlHoleMem *mem; -#endif +RgSchUlHole *rgSCHUtlUlHoleMemGet(RgSchUlHoleMem *mem) { RgSchUlHole *hole; @@ -9575,17 +7516,7 @@ RgSchUlHoleMem *mem; * File : * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlUlHoleMemRls -( -RgSchUlHoleMem *mem, -RgSchUlHole *hole -) -#else -Void rgSCHUtlUlHoleMemRls(mem, hole) -RgSchUlHoleMem *mem; -RgSchUlHole *hole; -#endif +Void rgSCHUtlUlHoleMemRls(RgSchUlHoleMem *mem,RgSchUlHole *hole) { hole->prv = NULLP; @@ -9595,7 +7526,7 @@ RgSchUlHole *hole; mem->firstFree->prv = hole; } mem->firstFree = hole; - RETVOID; + return; } /** @@ -9613,23 +7544,11 @@ 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 -) -#else -RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc(sf, startSb, numSb) -RgSchUlSf *sf; -U8 startSb; -U8 numSb; -#endif +RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc(RgSchUlSf *sf,uint8_t startSb,uint8_t numSb) { RgSchUlHole *hole, *nxtHole; RgSchUlAlloc *alloc = NULLP; @@ -9704,29 +7623,16 @@ 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 -( -RgSchCellCb *cellCb, -U8 numQci, -U8 *qci -) -#else -PRIVATE S16 rgSCHUtlValidateQci(cellCb, numQci, qci) -RgSchCellCb *cellCb; -U8 numQci; -U8 *qci; -#endif +static S16 rgSCHUtlValidateQci(RgSchCellCb *cellCb,uint8_t numQci,uint8_t *qci) { - U8 qciIdx; - U8 qciVal; - + uint8_t qciIdx; + uint8_t qciVal; for(qciIdx = 0; qciIdx < numQci; qciIdx++) { @@ -9755,26 +7661,12 @@ U8 *qci; * @param[out] RgSchErrInfo *err * @return RgSchUlAlloc* **/ -#ifdef ANSI -S16 rgSCHUtlValidateMeasReq -( -RgSchCellCb *cellCb, -LrgSchMeasReqInfo *schL2MeasInfo, -RgSchErrInfo *err -) -#else -S16 rgSCHUtlValidateMeasReq(cellCb, schL2MeasInfo, err) -RgSchCellCb *cellCb; -LrgSchMeasReqInfo *schL2MeasInfo; -RgSchErrInfo *err; -#endif +S16 rgSCHUtlValidateMeasReq(RgSchCellCb *cellCb, LrgSchMeasReqInfo *schL2MeasInfo,RgSchErrInfo *err) { - U16 measType; + uint16_t measType; S16 ret; - measType = schL2MeasInfo->measType; - if((measType == 0) || measType > 2047) { @@ -9853,39 +7745,22 @@ RgSchErrInfo *err; * config confirm API towards RRM. * * @param[in] RgrCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrSiCfgCfm -( -Inst instId, -SpId spId, -RgrCfgTransId transId, -U8 status -) -#else -S16 rgSCHUtlRgrSiCfgCfm(instId, spId, transId, status) -Inst instId; -SpId spId; -RgrCfgTransId transId; -U8 status; -#endif +S16 rgSCHUtlRgrSiCfgCfm(Inst instId,SpId spId,RgrCfgTransId transId,uint8_t status) { - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; - - if(RgUiRgrSiCfgCfm(&rgSchCb[instId].rgrSap[spId].sapCfg.sapPst, rgSchCb[instId].rgrSap[spId].sapCfg.suId, transId, status) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrSiCfgCfm: " + DU_LOG("\nERROR --> SCH : rgSCHUtlRgrSiCfgCfm: " "RgUiRgrSiCfgCfm Failed "); return RFAILED; } @@ -9907,41 +7782,23 @@ U8 status; * config confirm API towards RRM. * * @param[in] RgrCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrWarningSiCfgCfm -( -Inst instId, -SpId spId, -U8 siId, -RgrCfgTransId transId, -U8 status -) -#else -S16 rgSCHUtlRgrWarningSiCfgCfm(instId, spId, siId, transId, status) -Inst instId; -SpId spId; -U8 siId; -RgrCfgTransId transId; -U8 status; -#endif +S16 rgSCHUtlRgrWarningSiCfgCfm(Inst instId,SpId spId,uint8_t siId,RgrCfgTransId transId,uint8_t status) { - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; - + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; - - + if(RgUiRgrWarningSiCfgCfm(&rgSchCb[instId].rgrSap[spId].sapCfg.sapPst, rgSchCb[instId].rgrSap[spId].sapCfg.suId, transId, siId, status) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrSiCfgCfm: " + DU_LOG("\nERROR --> SCH : rgSCHUtlRgrSiCfgCfm: " "RgUiRgrSiCfgCfm Failed "); return RFAILED; } @@ -9962,18 +7819,10 @@ U8 status; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI -Void rgSCHUtlPutSiInfo -( -RgSchCellCb *cell -) -#else -Void rgSCHUtlPutSiInfo(cell) -RgSchCellCb *cell; -#endif +Void rgSCHUtlPutSiInfo(RgSchCellCb *cell) { - U8 idx = 0; - U32 sizeOfSiInfo = 0; + 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) @@ -9996,7 +7845,7 @@ RgSchCellCb *cell; RGSCH_FREE_MSG(cell->siCb.newSiInfo.siInfo[idx].si) } - RETVOID; + return; } #endif /*RGR_SI_SCH */ @@ -10018,7 +7867,6 @@ RgSchCellCb *cell; * File : rg_utl.c * **********************************************************/ -#ifdef ANSI S16 rgSCHUtlGetDrxSchdUesInDl ( RgSchCellCb *cellCb, @@ -10029,28 +7877,15 @@ CmLListCp *dlDrxInactvTmrLst, CmLListCp *dlInActvLst, CmLListCp *ulInActvLst ) -#else -S16 rgSCHUtlGetDrxSchdUesInDl(cellCb, ueCb, dlHq, allocInfo, dlDrxInactvTmrLst, dlInActvLst, ulInActvLst) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -RgSchDlHqProcCb *dlHq; -RgInfUeAlloc *allocInfo; -CmLListCp *dlDrxInactvTmrLst; -CmLListCp *dlInActvLst; -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++) { @@ -10074,9 +7909,9 @@ CmLListCp *ulInActvLst; /* This condition should never occur */ if(drxHq->reTxIndx >= RG_SCH_MAX_DRXQ_SIZE) { - RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"[%d]UE:DRXUE RETX IDX[%d]" + DU_LOG("\nERROR --> SCH : [%d]UE:DRXUE RETX IDX[%d]" "is out of bound,dlInactvMask %d,procId %d\n", ueCb->ueId, - drxHq->reTxIndx,ueCb->dl.dlInactvMask, dlHq->procId)); + drxHq->reTxIndx,ueCb->dl.dlInactvMask, dlHq->procId); } drxUe->drxDlInactvMaskPerCell[cellIdx] |= (RG_SCH_DRX_DLHQ_BITMASK << dlHq->procId); @@ -10171,27 +8006,13 @@ 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 * **/ -#ifdef ANSI -S16 rgSCHUtlFillSndStaInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrStaIndInfo *staInfo, -U8 numCqiRept -) -#else -S16 rgSCHUtlFillSndStaInd(cell, ue, staInfo, numCqiRept) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrStaIndInfo *staInfo; -U8 numCqiRept; -#endif +S16 rgSCHUtlFillSndStaInd(RgSchCellCb *cell,RgSchUeCb *ue,RgrStaIndInfo *staInfo,uint8_t numCqiRept) { - U8 idxStart; + uint8_t idxStart; /* Fill StaInd for sending collated Latest N CQI rpeorts */ /* Find index in the array from where Latest N @@ -10215,7 +8036,7 @@ U8 numCqiRept; /* Call utility function (rgSCHUtlRgrStaInd) to send rpts to RRM */ if(rgSCHUtlRgrStaInd(cell, staInfo) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Could not send " + DU_LOG("\nERROR --> SCH : Could not send " "CQI reports for RNTI:%d",ue->ueId); return RFAILED; } @@ -10243,28 +8064,15 @@ U8 numCqiRept; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrStaInd -( -RgSchCellCb *cell, -RgrStaIndInfo *rgrSta -) -#else -S16 rgSCHUtlRgrStaInd(cell, rgrSta) -RgSchCellCb *cell; -RgrStaIndInfo *rgrSta; -#endif +S16 rgSCHUtlRgrStaInd(RgSchCellCb *cell,RgrStaIndInfo *rgrSta) { S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ - - - + rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHUtlRgrStaInd() Upper SAP not bound (%d) ", + DU_LOG("\nERROR --> SCH : rgSCHUtlRgrStaInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); return RFAILED; } @@ -10294,21 +8102,7 @@ RgrStaIndInfo *rgrSta; * @return Void * -# ROK **/ -#ifdef ANSI -Void rgSCHUtlIndRntiRls2Mac -( -RgSchCellCb *cell, -CmLteRnti rnti, -Bool ueIdChng, -CmLteRnti newRnti -) -#else -Void rgSCHUtlIndRntiRls2Mac(cell, rnti, ueIdChng, newRnti) -RgSchCellCb *cell; -CmLteRnti rnti; -Bool ueIdChng; -CmLteRnti newRnti; -#endif +Void rgSCHUtlIndRntiRls2Mac(RgSchCellCb *cell,CmLteRnti rnti,Bool ueIdChng,CmLteRnti newRnti) { Pst pst; Inst inst = cell->instIdx; @@ -10329,7 +8123,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 */ @@ -10349,17 +8143,7 @@ CmLteRnti newRnti; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrLoadInfInd -( - RgSchCellCb *cell, - RgrLoadInfIndInfo *rgrLoadInf - ) -#else -S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) - RgSchCellCb *cell; - RgrLoadInfIndInfo *rgrLoadInf; -#endif +S16 rgSCHUtlRgrLoadInfInd(RgSchCellCb *cell,RgrLoadInfIndInfo *rgrLoadInf) { S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ @@ -10367,8 +8151,7 @@ S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHUtlRgrLoadInfInd() Upper SAP not bound (%d) ", + DU_LOG("\nERROR --> SCH : rgSCHUtlRgrLoadInfInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); return RFAILED; } @@ -10399,24 +8182,10 @@ S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) * @return Void **/ -#ifdef ANSI -Void rgSCHUtlRlsRnti -( -RgSchCellCb *cell, -RgSchRntiLnk *rntiLnk, -Bool ueIdChngd, -CmLteRnti newRnti -) -#else -Void rgSCHUtlRlsRnti(cell, rntiLnk, ueIdChngd, newRnti) -RgSchCellCb *cell; -RgSchRntiLnk *rntiLnk; -Bool ueIdChngd; -CmLteRnti newRnti; -#endif +Void rgSCHUtlRlsRnti(RgSchCellCb *cell,RgSchRntiLnk *rntiLnk,Bool ueIdChngd,CmLteRnti newRnti) { - U8 isLegacy = 0; + uint8_t isLegacy = 0; #ifdef EMTC_ENABLE if(cell->emtcEnable) { @@ -10432,7 +8201,7 @@ CmLteRnti newRnti; /* Fix: syed Explicitly Inidcate MAC to release RNTI */ rgSCHUtlIndRntiRls2Mac(cell, rntiLnk->rnti, ueIdChngd, newRnti); - RETVOID; + return; } @@ -10447,23 +8216,11 @@ 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 * **/ -#ifdef ANSI -S16 rgSCHUtlFillSndUeStaInd -( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgrUeStaIndInfo *ueStaInfo -) -#else -S16 rgSCHUtlFillSndUeStaInd(cell, ue, ueStaInfo) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgrUeStaIndInfo *ueStaInfo; -#endif +S16 rgSCHUtlFillSndUeStaInd(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeStaIndInfo *ueStaInfo) { ueStaInfo->cellId = cell->cellId; @@ -10472,7 +8229,7 @@ RgrUeStaIndInfo *ueStaInfo; /* Call utility function (rgSCHUtlRgrUeStaInd) to send rpts to RRM */ if(rgSCHUtlRgrUeStaInd(cell, ueStaInfo) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Could not send " + DU_LOG("\nERROR --> SCH : Could not send " "UE Sta reports CRNTI:%d",ue->ueId); return RFAILED; } @@ -10500,17 +8257,7 @@ RgrUeStaIndInfo *ueStaInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlRgrUeStaInd -( -RgSchCellCb *cell, -RgrUeStaIndInfo *rgrUeSta -) -#else -S16 rgSCHUtlRgrUeStaInd(cell, rgrUeSta) -RgSchCellCb *cell; -RgrUeStaIndInfo *rgrUeSta; -#endif +S16 rgSCHUtlRgrUeStaInd(RgSchCellCb *cell,RgrUeStaIndInfo *rgrUeSta) { S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ @@ -10518,8 +8265,7 @@ RgrUeStaIndInfo *rgrUeSta; rgrSap = cell->rgrSap; if (rgrSap->sapSta.sapState != LRG_BND) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHUtlRgrUeStaInd() Upper SAP not bound (%d) ", + DU_LOG("\nERROR --> SCH : rgSCHUtlRgrUeStaInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); return RFAILED; } @@ -10542,23 +8288,15 @@ RgrUeStaIndInfo *rgrUeSta; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHUtlUpdAvgPrbUsage -( -RgSchCellCb *cell -) -#else -S16 rgSCHUtlUpdAvgPrbUsage(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHUtlUpdAvgPrbUsage(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 @@ -10566,8 +8304,8 @@ RgSchCellCb *cell; 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) @@ -10591,10 +8329,10 @@ RgSchCellCb *cell; numUlSf = cell->prbUsage.rprtPeriod; #endif - if(SGetSBuf(cell->rgmSap->sapCfg.sapPst.region, - cell->rgmSap->sapCfg.sapPst.pool, (Data**)&prbRprtInd, - sizeof(RgmPrbRprtInd)) != ROK) + SCH_ALLOC(prbRprtInd, sizeof(RgmPrbRprtInd)); + if(prbRprtInd == NULLP) { + DU_LOG("\nERROR --> SCH : Failed to allocate memory for prbRprtInd"); return RFAILED; } @@ -10633,10 +8371,10 @@ RgSchCellCb *cell; #ifdef DBG_MAC_RRM_PRB_PRINT if((count % reprotForEvery20Sec) == 0 ) { - printf("\n===================================================================="); - printf("\nMAC: QCI-1[DL:UL] | QCI-2[DL:UL] | QCI-3[DL:UL] | QCI-4[DL:UL] \n"); - printf("======================================================================\n"); - printf(" [%d: %d]\t | [%d: %d]\t | [%d: %d]\t| [%d: %d]\t\n", + DU_LOG("\n===================================================================="); + DU_LOG("\nINFO --> SCH : QCI-1[DL:UL] | QCI-2[DL:UL] | QCI-3[DL:UL] | QCI-4[DL:UL] \n"); + DU_LOG("======================================================================\n"); + DU_LOG(" [%d: %d]\t | [%d: %d]\t | [%d: %d]\t| [%d: %d]\t\n", prbRprtInd->stQciPrbRpts[0].bAvgPrbDlUsage, prbRprtInd->stQciPrbRpts[0].bAvgPrbUlUsage, prbRprtInd->stQciPrbRpts[1].bAvgPrbDlUsage, @@ -10669,17 +8407,7 @@ RgSchCellCb *cell; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlReTxTa -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb -) -#else -Void rgSCHUtlReTxTa(cellCb, ueCb) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -#endif +Void rgSCHUtlReTxTa(RgSchCellCb *cellCb,RgSchUeCb *ueCb) { /* If TA Timer is running. Stop it */ @@ -10700,7 +8428,7 @@ RgSchUeCb *ueCb; ueCb->dl.taCb.state = RGSCH_TA_TOBE_SCHEDULED; rgSCHUtlDlTARpt(cellCb, ueCb); - RETVOID; + return; } /* Added function for dropping Paging Message*/ @@ -10719,22 +8447,12 @@ RgSchUeCb *ueCb; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgSCHChkBoUpdate -( -RgSchCellCb *cell, -RgInfCmnBoRpt *boUpdt -) -#else -PRIVATE S16 rgSCHChkBoUpdate (cell, boUpdt) -RgSchCellCb *cell; -RgInfCmnBoRpt *boUpdt; -#endif +static S16 rgSCHChkBoUpdate(RgSchCellCb *cell,RgInfCmnBoRpt *boUpdt) { - U32 crntTimeInSubFrms = 0; - U32 boUpdTimeInSubFrms = 0; - U32 distance = 0; + 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 @@ -10768,28 +8486,16 @@ 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 -( -RgSchCellCb *cell, -CmLteTimingInfo phichTime, -U8 hqFdbkIdx -) -#else -U8 rgSchUtlCfg0ReTxIdx (cell, phichTime, hqFdbkIdx) -RgSchCellCb *cell; -CmLteTimingInfo phichTime; -U8 hqFdbkIdx; -#endif +uint8_t rgSchUtlCfg0ReTxIdx(RgSchCellCb *cell,CmLteTimingInfo phichTime,uint8_t hqFdbkIdx) { - 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 */ ulSf = &cellUl->ulSfArr[hqFdbkIdx]; ulSF = ulSf->ulSfIdx; @@ -10840,44 +8546,30 @@ 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 -Void rgSchUtlDlCalc1CwPrb -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 bo, -U32 *prbReqrd -) -#else -Void rgSchUtlDlCalc1CwPrb(cell, ue, bo, prbReqrd) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 bo; -U32 *prbReqrd; -#endif +Void rgSchUtlDlCalc1CwPrb(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t bo,uint32_t *prbReqrd) { 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; + 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*/ /** @@ -10896,33 +8588,19 @@ 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 -Void rgSchUtlDlCalc2CwPrb -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 bo, -U32 *prbReqrd -) -#else -Void rgSchUtlDlCalc2CwPrb(cell, ue, bo, prbReqrd) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 bo; -U32 *prbReqrd; -#endif +Void rgSchUtlDlCalc2CwPrb(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t bo,uint32_t *prbReqrd) { 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; + 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 */ @@ -10932,7 +8610,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]); @@ -10948,12 +8626,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 */ /** @@ -10969,30 +8647,16 @@ 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 -Void rgSchUtlCalcTotalPrbReq -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 bo, -U32 *prbReqrd -) -#else -Void rgSchUtlCalcTotalPrbReq(cell, ue, bo, prbReqrd) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 bo; -U32 *prbReqrd; -#endif +Void rgSchUtlCalcTotalPrbReq(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t bo,uint32_t *prbReqrd) { /* Call TM specific Prb calculation routine */ (dlCalcPrbFunc[ue->mimoInfo.txMode - 1])(cell, ue, bo, prbReqrd); - RETVOID; + return; } /* rgSchUtlCalcTotalPrbReq */ #ifdef UNUSE_FUN #ifdef TFU_UPGRADE @@ -11003,7 +8667,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: @@ -11011,23 +8675,11 @@ U32 *prbReqrd; * File : * **********************************************************/ -#ifdef ANSI -PRIVATE U8 rgSCHUtlFetchPcqiBitSz -( - RgSchCellCb *cell, - RgSchUeCb *ueCb, - U8 numTxAnt - ) -#else -PRIVATE U8 rgSCHUtlFetchPcqiBitSz (cell, ueCb, numTxAnt) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -U8 numTxAnt; -#endif +static uint8_t rgSCHUtlFetchPcqiBitSz(RgSchCellCb *cell, RgSchUeCb *ueCb,uint8_t numTxAnt) { - 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); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; @@ -11165,24 +8817,12 @@ 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 -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U32 *numSbs -) -#else -U8 rgSchUtlGetNumSbs (cell, ue, numSbs) -RgSchCellCb *cell; -RgSchUeCb *ue; -U32 *numSbs; -#endif +uint8_t rgSchUtlGetNumSbs(RgSchCellCb *cell,RgSchUeCb *ue,uint32_t *numSbs) { - U32 nPrb; + uint32_t nPrb; //Currently hardcoding MAX prb for each UE nPrb = ue->ue5gtfCb.maxPrb; (*numSbs) = RGSCH_CEIL(nPrb, MAX_5GTF_VRBG_SIZE); @@ -11203,23 +8843,9 @@ U32 *numSbs; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @return U8 + * @return uint8_t **/ -#ifdef ANSI -U8 rgSchUtlSortInsUeLst -( -RgSchCellCb *cell, -CmLListCp *ueLst, -CmLList *node, -U8 vrbgRequired -) -#else -U8 rgSchUtlSortInsUeLst (cell, ueLst, node, vrbgRequired) -RgSchCellCb *cell; -CmLListCp *ueLst; -CmLList *node; -U8 vrbgRequired; -#endif +uint8_t rgSchUtlSortInsUeLst(RgSchCellCb *cell,CmLListCp *ueLst,CmLList *node,uint8_t vrbgRequired) { CmLList *ueInLst; CmLList *firstUeInLst; @@ -11293,26 +8919,12 @@ 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 **/ -#ifdef ANSI -S16 rgSCHUtlBuildNSendLcgReg -( -RgSchCellCb *cell, -CmLteRnti crnti, -U8 lcgId, -Bool isGbr -) -#else -S16 rgSCHUtlBuildNSendLcgReg(cell, crnti, lcgId, isGbr) -RgSchCellCb *cell; -CmLteRnti crnti; -U8 lcgId; -Bool isGbr; -#endif +S16 rgSCHUtlBuildNSendLcgReg(RgSchCellCb *cell,CmLteRnti crnti,uint8_t lcgId,Bool isGbr) { Pst pst; RgInfLcgRegReq lcgRegReq; @@ -11349,15 +8961,7 @@ Bool isGbr; * @return TfuAckNackMode * -# ROK **/ -#ifdef ANSI -TfuAckNackMode rgSchUtlGetFdbkMode -( -RgrSchFrmt1b3TypEnum fdbkType -) -#else -TfuAckNackMode rgSchUtlGetFdbkMode(fdbkType) -RgrSchFrmt1b3TypEnum fdbkType; -#endif +TfuAckNackMode rgSchUtlGetFdbkMode(RgrSchFrmt1b3TypEnum fdbkType) { TfuAckNackMode mode = TFU_UCI_FORMAT_1A_1B; @@ -11405,23 +9009,13 @@ RgrSchFrmt1b3TypEnum fdbkType; * @return Void * -# ROK **/ -#ifdef ANSI -Void rgSCHUtlSndUeSCellDel2Mac -( -RgSchCellCb *cell, -CmLteRnti rnti -) -#else -Void rgSCHUtlSndUeSCellDel2Mac(cell, rnti) -RgSchCellCb *cell; -CmLteRnti rnti; -#endif +Void rgSCHUtlSndUeSCellDel2Mac(RgSchCellCb *cell,CmLteRnti rnti) { Pst pst; Inst inst = cell->instIdx; RgInfRlsRnti rntiInfo; - RGSCHDBGINFONEW(inst,(rgSchPBuf(inst),"RNTI Release IND for UE(%d)\n", rnti)); + DU_LOG("\nINFO --> SCH : RNTI Release IND for UE(%d)\n", rnti); /* Copy the info to rntiInfo */ rntiInfo.cellId = cell->cellId; rntiInfo.rnti = rnti; @@ -11434,7 +9028,7 @@ CmLteRnti rnti; /* Invoke MAC to release the rnti */ rgSCHUtlGetPstToLyr(&pst, &rgSchCb[inst], cell->macInst); RgSchMacRlsRnti(&pst, &rntiInfo); - RETVOID; + return; } /** @@ -11448,20 +9042,12 @@ CmLteRnti rnti; * * * @param[in] RgrTxMode txMode - * @return U8 maxTbCount; + * @return uint8_t maxTbCount; * -# ROK **/ -#ifdef ANSI -U8 rgSCHUtlGetMaxTbSupp -( -RgrTxMode txMode -) -#else -U8 rgSCHUtlGetMaxTbSupp(txMode) -RgrTxMode txMode -#endif +uint8_t rgSCHUtlGetMaxTbSupp(RgrTxMode txMode) { - U8 maxTbCount; + uint8_t maxTbCount; /* Primary Cell */ @@ -11498,27 +9084,13 @@ 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 **/ -#ifdef ANSI -Void rgSCHTomUtlGetTrigSet -( - RgSchCellCb *cell, - RgSchUeCb *ueCb, - U8 cqiReq, - U8 *triggerSet - ) -#else -PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) - RgSchCellCb *cell; - RgSchUeCb *ueCb; - U8 cqiReq; - U8 *triggerSet; -#endif +Void rgSCHTomUtlGetTrigSet(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t cqiReq,uint8_t *triggerSet) { RgSchUeCellInfo *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ueCb); switch(cqiReq) @@ -11526,7 +9098,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; } @@ -11546,7 +9118,7 @@ PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) break; } } - RETVOID; + return; } #endif /** @@ -11565,22 +9137,10 @@ PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlUpdUeDciSize -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -Bool isCsi2Bit -) -#else -Void rgSCHUtlUpdUeDciSize(cell, ueCb, isCsi2Bit) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -Bool isCsi2Bit; -#endif +Void rgSCHUtlUpdUeDciSize(RgSchCellCb *cell,RgSchUeCb *ueCb,Bool isCsi2Bit) { - 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 */ @@ -11682,19 +9242,11 @@ Bool isCsi2Bit; * @return Void * **/ -#ifdef ANSI -Void rgSCHUtlCalcDciSizes -( -RgSchCellCb *cell -) -#else -Void rgSCHUtlCalcDciSizes(cell) -RgSchCellCb *cell; -#endif +Void rgSCHUtlCalcDciSizes(RgSchCellCb *cell) { - 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 */ { @@ -11714,7 +9266,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 */ + \ @@ -11757,7 +9309,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 */ + @@ -11803,7 +9355,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 */ + @@ -11850,7 +9402,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 */ + \ @@ -11885,7 +9437,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 */ + \ @@ -11954,17 +9506,9 @@ RgSchCellCb *cell; * @param[in] RgSchCellCb *cell * @return Void **/ -#ifdef ANSI -Void rgSCHUtlCpuOvrLdAdjItbsCap -( - RgSchCellCb *cell -) -#else -Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) - RgSchCellCb *cell -#endif +Void rgSCHUtlCpuOvrLdAdjItbsCap( RgSchCellCb *cell) { - U32 tptDelta; + uint32_t tptDelta; if ((cell->cpuOvrLdCntrl.cpuOvrLdIns) & (RGR_CPU_OVRLD_DL_TPT_UP | RGR_CPU_OVRLD_DL_TPT_DOWN)) @@ -11989,7 +9533,7 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) } } #ifdef CPU_OL_DBG_PRINTS - printf("\n DL CPU OL ADJ = %lu, %lu, %d\n", cell->measurements.dlTpt, cell->cpuOvrLdCntrl.tgtDlTpt, + DU_LOG("\nINFO --> SCH : DL CPU OL ADJ = %lu, %lu, %d\n", cell->measurements.dlTpt, cell->cpuOvrLdCntrl.tgtDlTpt, cell->thresholds.maxDlItbs); #endif } @@ -12017,12 +9561,12 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) } } #ifdef CPU_OL_DBG_PRINTS - printf("\n UL CPU OL ADJ = %lu, %lu, %d\n", cell->measurements.ulTpt, cell->cpuOvrLdCntrl.tgtUlTpt, + DU_LOG("\nDEBUG --> SCH : UL CPU OL ADJ = %lu, %lu, %d\n", cell->measurements.ulTpt, cell->cpuOvrLdCntrl.tgtUlTpt, cell->thresholds.maxUlItbs); #endif } - RETVOID; + return; } /** * @brief Handler for the num UE per TTI based CPU OvrLd instr updating @@ -12037,31 +9581,21 @@ 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 -( - RgSchCellCb *cell, - U8 crntCpuOvrLdIns -) -#else -PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) - RgSchCellCb *cell; - U8 crntCpuOvrLdIns; -#endif +static Void rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(RgSchCellCb *cell,uint8_t crntCpuOvrLdIns) { 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); @@ -12087,15 +9621,15 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) else { #ifdef CPU_OL_DBG_PRINTS - printf("CPU_OL_TTI__ERROR\n"); + DU_LOG("\nERROR --> SCH : CPU_OL_TTI__ERROR\n"); #endif - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid CPU OL"); + DU_LOG("\nERROR --> SCH : Invalid CPU OL"); } } #ifdef CPU_OL_DBG_PRINTS - printf("dlNxtIndxDecNumUeTti = %d\n", cpuInstr->dlNxtIndxDecNumUeTti); + DU_LOG("\nDEBUG --> SCH : dlNxtIndxDecNumUeTti = %d\n", cpuInstr->dlNxtIndxDecNumUeTti); #endif - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,"dlNxtIndxDecNumUeTti = %d", + DU_LOG("\nDEBUG --> SCH : dlNxtIndxDecNumUeTti = %d", cpuInstr->dlNxtIndxDecNumUeTti); } else if ( crntCpuOvrLdIns & RGR_CPU_OVRLD_DL_INC_NUM_UE_PER_TTI ) @@ -12111,15 +9645,15 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) else { #ifdef CPU_OL_DBG_PRINTS - printf("CPU_OL_TTI__ERROR\n"); + DU_LOG("\nERROR --> SCH : CPU_OL_TTI__ERROR\n"); #endif - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid CPU OL"); + DU_LOG("\nERROR --> SCH : Invalid CPU OL"); } } #ifdef CPU_OL_DBG_PRINTS - printf("dlNxtIndxDecNumUeTti = %d\n", cpuInstr->dlNxtIndxDecNumUeTti); + DU_LOG("\nDEBUG --> SCH : dlNxtIndxDecNumUeTti = %d\n", cpuInstr->dlNxtIndxDecNumUeTti); #endif - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,"dlNxtIndxDecNumUeTti = %d", + DU_LOG("\nERROR --> SCH : dlNxtIndxDecNumUeTti = %d", cpuInstr->dlNxtIndxDecNumUeTti); } /* Check for UL CPU commands */ @@ -12137,15 +9671,15 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) else { #ifdef CPU_OL_DBG_PRINTS - printf("CPU_OL_TTI__ERROR\n"); + DU_LOG("\nERROR --> SCH : CPU_OL_TTI__ERROR\n"); #endif - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid CPU OL"); + DU_LOG("\nERROR --> SCH : Invalid CPU OL"); } } #ifdef CPU_OL_DBG_PRINTS - printf("ulNxtIndxDecNumUeTti = %d\n", cpuInstr->ulNxtIndxDecNumUeTti); + DU_LOG("\nDEBUG --> SCH : ulNxtIndxDecNumUeTti = %d\n", cpuInstr->ulNxtIndxDecNumUeTti); #endif - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,"dlNxtIndxDecNumUeTti = %d", + DU_LOG("\nDEBUG --> SCH : dlNxtIndxDecNumUeTti = %d", cpuInstr->dlNxtIndxDecNumUeTti); } else if ( crntCpuOvrLdIns & RGR_CPU_OVRLD_UL_INC_NUM_UE_PER_TTI ) @@ -12161,34 +9695,34 @@ PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) else { #ifdef CPU_OL_DBG_PRINTS - printf("CPU_OL_TTI__ERROR\n"); + DU_LOG("\nERROR --> SCH : CPU_OL_TTI__ERROR\n"); #endif - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid CPU OL"); + DU_LOG("\nERROR --> SCH : Invalid CPU OL"); } } #ifdef CPU_OL_DBG_PRINTS - printf("ulNxtIndxDecNumUeTti = %d\n", cpuInstr->ulNxtIndxDecNumUeTti); + DU_LOG("\nDEBUG --> SCH : ulNxtIndxDecNumUeTti = %d\n", cpuInstr->ulNxtIndxDecNumUeTti); #endif - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,"dlNxtIndxDecNumUeTti = %d", + DU_LOG("\nDEBUG --> SCH : dlNxtIndxDecNumUeTti = %d", cpuInstr->dlNxtIndxDecNumUeTti); } #ifdef CPU_OL_DBG_PRINTS /* TODO: Debug Information - Shall be moved under CPU_OL_DBG_PRINTS */ - printf("maxUeNewDlTxPerTti = %d, maxUeNewUlTxPerTti = %d\n", maxUeNewDlTxPerTti, maxUeNewUlTxPerTti); - printf("DL Sf numUePerTti:"); + DU_LOG("\nDEBUG --> SCH : maxUeNewDlTxPerTti = %d, maxUeNewUlTxPerTti = %d\n", maxUeNewDlTxPerTti, maxUeNewUlTxPerTti); + DU_LOG("\nINFO --> SCH : DL Sf numUePerTti:"); for ( idx = 0; idx < 10 ; idx ++ ) { - printf(" %d", cpuInstr->maxUeNewTxPerTti[idx]); + DU_LOG(" %d", cpuInstr->maxUeNewTxPerTti[idx]); } - printf("\nUL Sf numUePerTti:"); + DU_LOG("\nINFO --> SCH : UL Sf numUePerTti:"); for ( idx = 0; idx < 10 ; idx ++ ) { - printf(" %d", cpuInstr->maxUeNewRxPerTti[idx]); + DU_LOG(" %d", cpuInstr->maxUeNewRxPerTti[idx]); } - printf("\n"); + DU_LOG("\n"); #endif - RETVOID; + return; } /* rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr */ /** @@ -12204,40 +9738,30 @@ 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 **/ -#ifdef ANSI -S16 rgSCHUtlResetCpuOvrLdState -( - RgSchCellCb *cell, - U8 crntCpuOvrLdIns -) -#else -S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) - RgSchCellCb *cell; - U8 crntCpuOvrLdIns; -#endif +S16 rgSCHUtlResetCpuOvrLdState(RgSchCellCb *cell,uint8_t crntCpuOvrLdIns) { - U8 crntDlCpuOL=0; - U8 crntUlCpuOL=0; - RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); - U8 idx; + uint8_t crntDlCpuOL=0; + uint8_t crntUlCpuOL=0; + RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); + uint8_t idx; #ifdef CPU_OL_DBG_PRINTS - printf("\n CPU OVR LD Ins Rcvd = %d\n", (int)crntCpuOvrLdIns); + DU_LOG("\nDEBUG --> SCH : CPU OVR LD Ins Rcvd = %d\n", (int)crntCpuOvrLdIns); #endif - RLOG_ARG0(L_INFO,DBG_CELLID,cell->cellId,"CPU OVR LD Ins Rcvd"); + DU_LOG("\nINFO --> SCH : CPU OVR LD Ins Rcvd"); if ( RGR_CPU_OVRLD_RESET == crntCpuOvrLdIns ) { /* The CPU OL instruction received with RESET (0), hence reset it */ #ifdef CPU_OL_DBG_PRINTS - printf("rgSCHUtlResetCpuOvrLdState: RESET CPU OL instr\n"); + DU_LOG("\nDEBUG --> SCH : rgSCHUtlResetCpuOvrLdState: RESET CPU OL instr\n"); #endif - RLOG_ARG0(L_INFO,DBG_CELLID,cell->cellId,"RESET CPU OVR LD"); + DU_LOG("\nINFO --> SCH : RESET CPU OVR LD"); cell->cpuOvrLdCntrl.cpuOvrLdIns = 0; /* Reset the max UL and DL itbs to 26 */ cell->thresholds.maxUlItbs = RG_SCH_UL_MAX_ITBS; @@ -12302,10 +9826,10 @@ S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) cell->cpuOvrLdCntrl.tgtUlTpt = cell->measurements.ulTpt + \ (cell->measurements.ulTpt * 2 )/100; } - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,"CPU OVR LD UL Reset to " - "%d, %lu, %lu", (int)crntUlCpuOL, cell->cpuOvrLdCntrl.tgtUlTpt,cell->measurements.ulTpt); + DU_LOG("\nDEBUG --> SCH : CPU OVR LD UL Reset to " + "%d, %u, %u", (int)crntUlCpuOL, cell->cpuOvrLdCntrl.tgtUlTpt,cell->measurements.ulTpt); #ifdef CPU_OL_DBG_PRINTS - printf("\n CPU OVR LD UL Reset to= %d, %lu, %lu\n", (int)crntUlCpuOL, cell->cpuOvrLdCntrl.tgtUlTpt, + DU_LOG("\nDEBUG --> SCH : CPU OVR LD UL Reset to= %d, %u, %u\n", (int)crntUlCpuOL, cell->cpuOvrLdCntrl.tgtUlTpt, cell->measurements.ulTpt); #endif } @@ -12322,11 +9846,11 @@ S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) cell->cpuOvrLdCntrl.tgtDlTpt = cell->measurements.dlTpt + \ (cell->measurements.dlTpt * 1 )/100; } - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,"CPU OVR LD DL Reset to " - "%d, %lu, %lu", (int)crntDlCpuOL, cell->cpuOvrLdCntrl.tgtDlTpt,cell->measurements.dlTpt); + DU_LOG("\nDEBUG --> SCH : CPU OVR LD DL Reset to " + "%d, %u, %u", (int)crntDlCpuOL, cell->cpuOvrLdCntrl.tgtDlTpt,cell->measurements.dlTpt); #ifdef CPU_OL_DBG_PRINTS - printf("\n CPU OVR LD DL Reset to= %d, %lu, %lu\n", (int)crntDlCpuOL, cell->cpuOvrLdCntrl.tgtDlTpt, + DU_LOG("\nDEBUG --> SCH : CPU OVR LD DL Reset to= %d, %lu, %lu\n", (int)crntDlCpuOL, cell->cpuOvrLdCntrl.tgtDlTpt, cell->measurements.dlTpt); #endif } @@ -12361,13 +9885,13 @@ RgSchIotRes *iotRes cp = &emtcUe->dlResLst; }else { - RLOG0(L_INFO, "*****restype mismatch"); + DU_LOG("\nINFO --> SCH : *****restype mismatch"); } if(cp != NULLP ) { if(cp->count == 0) { - RLOG0(L_INFO,"****error count*****\n"); + DU_LOG("\nINFO --> SCH : ****error count*****\n"); return ROK; } }