X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_tom.c;h=2f434b6f939ad86e3591b546a5e16b701396968f;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=afabf281809dfc42f9e3d847ef02e32ea6aa4789;hpb=aa016a0a037017083dd793b564b47ed7855069ec;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c index afabf2818..2f434b6f9 100755 --- a/src/5gnrsch/rg_sch_tom.c +++ b/src/5gnrsch/rg_sch_tom.c @@ -37,17 +37,7 @@ static int RLOG_FILE_ID=228; static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system services */ -#include "cm5.h" /* common timers defines */ -#include "cm_hash.h" /* common hash list defines */ -#include "cm_llist.h" /* common linked list defines */ -#include "cm_mblk.h" /* memory management */ -#include "cm_tkns.h" /* common tokens */ -#include "cm_lte.h" /* common tokens */ +#include "common_def.h" #include "tfu.h" /* RGU defines */ #include "lrg.h" /* layer management defines for LTE-MAC */ #include "rgr.h" /* layer management defines for LTE-MAC */ @@ -62,15 +52,6 @@ static int RLOG_MODULE_ID=4096; /* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common tokens */ #include "tfu.x" /* RGU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "rgr.x" /* layer management typedefs for MAC */ @@ -81,6 +62,8 @@ static int RLOG_MODULE_ID=4096; #ifdef EMTC_ENABLE #include "rg_sch_emtc_ext.x" #endif +U8 rgSCHCmnCalcPcqiBitSz(RgSchUeCb *ueCb,U8 numTxAnt); +S16 rgSCHDhm5gtfHqFdbkInd(RgSchUeCb *ue,RgSchCellCb *cell,CmLteTimingInfo timingInfo,TfuHqFdbk fdbk,RgSchErrInfo *err); /* local defines */ #ifdef EMTC_ENABLE EXTERN Bool rgSCHEmtcChkEmtcUe ARGS( @@ -223,7 +206,7 @@ RgSchCellCb *cell, U16 rapId, CmLteTimingInfo timingInfo ); -PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq ARGS( +S16 rgSCHTomUtlFillDatAperRecpReq ARGS( ( RgSchCellCb *cell, U8 cqiReq, @@ -234,7 +217,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq ARGS( U16 validIdx )); -PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq ARGS( +S16 rgSCHTomUtlFillDatPriRecpReq ARGS( ( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -244,7 +227,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq ARGS( U16 validIdx )); -PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS( +S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS( ( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -254,7 +237,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS( U16 validIdx )); -PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq ARGS( +S16 rgSCHTomUtlFillDatSrsRecpReq ARGS( ( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -263,7 +246,7 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq ARGS( Bool hqPres )); -PUBLIC void schFillCrntTime( +void schFillCrntTime( SlotIndInfo slotInd, Inst schInst); @@ -368,8 +351,8 @@ RgSchCellCb *cells[] #endif /* local typedefs */ -PUBLIC U32 rgBwAlloInfo[RGSCH_NUM_SUB_FRAMES]; /* Num of Rbs Allocated in each SF */ -PUBLIC U32 rgBwAlcnt[RGSCH_NUM_SUB_FRAMES]; /*Num of times Allocation done in each Subframe */ +U32 rgBwAlloInfo[RGSCH_NUM_SUB_FRAMES]; /* Num of Rbs Allocated in each SF */ +U32 rgBwAlcnt[RGSCH_NUM_SUB_FRAMES]; /*Num of times Allocation done in each Subframe */ /* local externs */ /* rg006.201: [ccpu000111706, ccpu00112394]: Separated UL and DL TTI @@ -435,7 +418,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS(( #endif #ifdef TFU_UPGRADE -PUBLIC S16 rgSCHTomFillOnlySrsRecpReq ARGS +S16 rgSCHTomFillOnlySrsRecpReq ARGS (( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -451,19 +434,19 @@ PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS Bool isDatPresOnSecCell )); -PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo ARGS +S16 rgSCHTomUtlFillRiBitWidthInfo ARGS (( RgSchUeCb *ueCb )); -PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz ARGS +U8 rgSCHTomUtlFetchPcqiBitSz ARGS (( RgSchUeCb *ueCb, U8 numTxAnt, U8 *ri )); -PUBLIC U8 rgSCHTomUtlFetchPcqiBitSzPucchMode21 ARGS +U8 rgSCHTomUtlFetchPcqiBitSzPucchMode21 ARGS (( RgSchUeCb *ueCb, TfuCqiPucchMode21 *mode21Info, @@ -471,7 +454,7 @@ U8 numTxAnt, U8 *ri )); -PUBLIC S16 rgSCHTomUtlMoveNxtOccasion ARGS +S16 rgSCHTomUtlMoveNxtOccasion ARGS (( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -590,7 +573,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS(( )); #endif #ifdef LTEMAC_SPS -EXTERN PUBLIC Void rgSCHCmnDlSpsSch (RgSchCellCb *cell); +EXTERN Void rgSCHCmnDlSpsSch (RgSchCellCb *cell); #ifndef LTE_TDD #ifdef UNUSED_FUNC #ifdef TFU_UPGRADE @@ -687,7 +670,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 ARGS #endif/*LTE_ADV*/ #endif/*LTE_TDD*/ -PUBLIC U32 rgDlCqiRptCnt[16], rgTotDlCqiRpt; +U32 rgDlCqiRptCnt[16], rgTotDlCqiRpt; #ifdef RG_5GTF U32 rgSch5gtfCqi2Mcs[15] = @@ -698,9 +681,9 @@ U32 rgSch5gtfCqi2Mcs[15] = /*HARQ Feedback interpretation in accordance with Femto Forum. Note: There is no value as '0' in Femto Forum Spec but in order to retain the existing usage in MAC (and its Acceptance), its being considered*/ -CONSTANT PRIVATE U8 rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4}; +//CONSTANT PRIVATE U8 rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4}; /*added #defines instead of magic numbers*/ -CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={ +/*CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={ {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28}, {0,1,3,6,10,15,21,28,36,45,55,66,78,91,105,120,136,153,171,190,210,231,253,276,300,325,351,378}, {0,0,1,4,10,20,35,56,84,120,165,220,286,364,455,560,680,816,969,1140,1330,1540,1771,2024,2300,2600,2925,3276}, @@ -708,13 +691,13 @@ CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_T {0,0,0,0,1,6,21,56,126,252,462,792,1287,2002,3003,4368,6188,8568,11628,15504,20349,26334,33649,42504,53130,65780,80730,98280}, {0,0,0,0,0,1,7,28,84,210,462,924,1716,3003,5005,8008,12376,18564,27132,38760,54264,74613,100947,134596,177100,230230,296010,376740} }; - +*/ /*ccpu00116923 - ADD - SRS present support*/ /*Tables Derived from 3GPP TS 36.211 Section 5.5.3.3 */ /* Table 5.5.3.3-1 */ #ifndef LTE_TDD -CONSTANT PUBLIC RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = { +CONSTANT RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = { {TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE}, {TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE}, {FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE}, @@ -734,7 +717,7 @@ CONSTANT PUBLIC RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = { }; #else /* Table 5.5.3.3-2 */ -CONSTANT PUBLIC RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = { +CONSTANT RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = { {FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE}, {FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE}, {FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE}, @@ -753,8 +736,8 @@ CONSTANT PUBLIC RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = { {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE} }; #endif -PUBLIC S8 rgSchCmnAper20n22DiffCqi[4] = {1, 2, 3, 4}; -PUBLIC S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1}; +S8 rgSchCmnAper20n22DiffCqi[4] = {1, 2, 3, 4}; +S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1}; #endif /** @@ -773,7 +756,7 @@ PUBLIC S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1}; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHGetDedPrmUe +S16 rgSCHGetDedPrmUe ( RgSchCellCb *cell, U16 rapId, @@ -781,7 +764,7 @@ CmLteTimingInfo timingInfo, RgSchUeCb **ue ) #else -PUBLIC S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue) +S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue) RgSchCellCb *cell; U16 rapId; CmLteTimingInfo timingInfo; @@ -806,7 +789,7 @@ RgSchUeCb **ue; *ue = rgSCHCmnGetPoUe(cell, rapId, timingInfo); printf(" ==== inding UE from PDCCH Order Mapping\n"); } - RETVALUE(ROK); + return ROK; } /** * @brief Handler for processing Random Access request indication @@ -832,13 +815,13 @@ RgSchUeCb **ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomRaReqInd +S16 rgSCHTomRaReqInd ( RgSchCellCb *cell, TfuRaReqIndInfo *raReqInd ) #else -PUBLIC S16 rgSCHTomRaReqInd(cell, raReqInd) +S16 rgSCHTomRaReqInd(cell, raReqInd) RgSchCellCb *cell; TfuRaReqIndInfo *raReqInd; #endif @@ -851,8 +834,6 @@ TfuRaReqIndInfo *raReqInd; U16 rapId; RgSchUeCb *ue = NULLP; - TRC2(rgSCHTomRaReqInd); - if(cell->cellId != raReqInd->cellId) { err.errType = RGSCHERR_TOM_RAREQIND; @@ -860,7 +841,7 @@ TfuRaReqIndInfo *raReqInd; RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHTomRaReqInd(): No cell found with raReq cellId = (%d) errorType (%d)" " errorCause(%d)",raReqInd->cellId, err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } for (raRntiCnt = 0; raRntiCnt < raReqInd->nmbOfRaRnti; raRntiCnt++) @@ -906,7 +887,7 @@ TfuRaReqIndInfo *raReqInd; } } } - RETVALUE(ROK); + return ROK; } /* rgSCHTomRaReqInd */ @@ -932,13 +913,13 @@ TfuRaReqIndInfo *raReqInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomUlCqiInd +S16 rgSCHTomUlCqiInd ( RgSchCellCb *cell, TfuUlCqiIndInfo *ulCqiInd ) #else -PUBLIC S16 rgSCHTomUlCqiInd(cell, ulCqiInd) +S16 rgSCHTomUlCqiInd(cell, ulCqiInd) RgSchCellCb *cell; TfuUlCqiIndInfo *ulCqiInd; #endif @@ -946,7 +927,6 @@ TfuUlCqiIndInfo *ulCqiInd; RgSchUeCb *ue; CmLList *node; TfuUlCqiRpt *ulCqiInfo; - TRC2(rgSCHTomUlCqiInd); node = ulCqiInd->ulCqiRpt.first; if(cell->cellId != ulCqiInd->cellId) @@ -954,7 +934,7 @@ TfuUlCqiIndInfo *ulCqiInd; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHTomUlCqiInd() Unable to get the ulCqiInd cell with id(%d)", ulCqiInd->cellId); - RETVALUE(RFAILED); + return RFAILED; } for (;node; node=node->next) @@ -982,7 +962,7 @@ TfuUlCqiIndInfo *ulCqiInd; /* wideband cqi is directly reported now. and also isTxPort0 */ rgSCHUtlUlCqiInd(cell, ue, ulCqiInfo); } - RETVALUE(ROK); + return ROK; } /* rgSCHTomUlCqiInd */ /** @@ -1008,13 +988,13 @@ TfuUlCqiIndInfo *ulCqiInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomPucchDeltaPwrInd +S16 rgSCHTomPucchDeltaPwrInd ( RgSchCellCb *cell, TfuPucchDeltaPwrIndInfo *pucchDeltaPwr ) #else -PUBLIC S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr) +S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr) RgSchCellCb *cell; TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; #endif @@ -1023,14 +1003,12 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; CmLList *node; TfuPucchDeltaPwr *ueElem; - TRC2(rgSCHTomPucchDeltaPwrInd); - if(cell->cellId != pucchDeltaPwr->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHTomPucchDeltaPwrInd() Unable to get the pucchDeltaPwr cell with id(%d)", pucchDeltaPwr->cellId); - RETVALUE(RFAILED); + return RFAILED; } node = pucchDeltaPwr->pucchDeltaPwrLst.first; @@ -1051,7 +1029,7 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; } rgSCHUtlPucchDeltaPwrInd(cell, ue, ueElem->pucchDeltaPwr); } - RETVALUE(ROK); + return ROK; } /* rgSCHTomPucchDeltaPwrInd */ /** @@ -1077,13 +1055,13 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomHarqAckInd +S16 rgSCHTomHarqAckInd ( RgSchCellCb *cell, TfuHqIndInfo *harqAckInd ) #else -PUBLIC S16 rgSCHTomHarqAckInd(cell, harqAckInd) +S16 rgSCHTomHarqAckInd(cell, harqAckInd) RgSchCellCb *cell; TfuHqIndInfo *harqAckInd; #endif @@ -1100,16 +1078,14 @@ TfuHqIndInfo *harqAckInd; U32 cellIdx; RgSchCellCb *iterCellP; - TRC2(rgSCHTomHarqAckInd); - if(cell->cellId != harqAckInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() Unable to get" " the cell for cellId (%d)", harqAckInd->cellId); err.errType = RGSCHERR_TOM_HARQACKIND; err.errCause = RGSCHERR_TOM_INV_CELL_ID; - RETVALUE(RFAILED); - } + return RFAILED; + } #ifdef RG_5GTF node = harqAckInd->hqIndLst.first; for (;node; node=node->next) @@ -1243,7 +1219,7 @@ TfuHqIndInfo *harqAckInd; } } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHTomHarqAckInd */ @@ -1270,13 +1246,13 @@ TfuHqIndInfo *harqAckInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomSrInd +S16 rgSCHTomSrInd ( RgSchCellCb *cell, TfuSrIndInfo *srInd ) #else -PUBLIC S16 rgSCHTomSrInd(cell, srInd) +S16 rgSCHTomSrInd(cell, srInd) RgSchCellCb *cell; TfuSrIndInfo *srInd; #endif @@ -1287,16 +1263,14 @@ TfuSrIndInfo *srInd; CmLList *node; TfuSrInfo *srInfo; - TRC2(rgSCHTomSrInd); - if(cell->cellId != srInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for srcInd cellId" ":%d ", srInd->cellId); err.errType = RGSCHERR_TOM_SRIND; err.errCause = RGSCHERR_TOM_INV_CELL_ID; - RETVALUE(RFAILED); - } + return RFAILED; + } node = srInd->srLst.first; @@ -1327,7 +1301,7 @@ TfuSrIndInfo *srInd; continue; } } - RETVALUE(ret); + return ROK; } /* end of rgSCHTomSrInd */ /** @@ -1353,13 +1327,13 @@ TfuSrIndInfo *srInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomDoaInd +S16 rgSCHTomDoaInd ( RgSchCellCb *cell, TfuDoaIndInfo *doaInd ) #else -PUBLIC S16 rgSCHTomDoaInd(cell, doaInd ) +S16 rgSCHTomDoaInd(cell, doaInd ) RgSchCellCb *cell; TfuDoaIndInfo *doaInd; #endif @@ -1367,14 +1341,13 @@ TfuDoaIndInfo *doaInd; RgSchUeCb *ue; CmLList *node; TfuDoaRpt *doaInfo; - TRC2(rgSCHTomDoaInd); if(cell->cellId != doaInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for doaInd cellId" ":%d", doaInd->cellId); - RETVALUE(RFAILED); - } + return RFAILED; + } node = doaInd->doaRpt.first; @@ -1390,7 +1363,7 @@ TfuDoaIndInfo *doaInd; } rgSCHUtlDoaInd(cell, ue, doaInfo); } - RETVALUE(ROK); + return ROK; } /* rgSCHTomDoaInd */ /** * @brief Handler for processing downlink CQI indication recieved from @@ -1415,13 +1388,13 @@ TfuDoaIndInfo *doaInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomDlCqiInd +S16 rgSCHTomDlCqiInd ( RgSchCellCb *cell, TfuDlCqiIndInfo *dlCqiInd ) #else -PUBLIC S16 rgSCHTomDlCqiInd(cell, dlCqiInd) +S16 rgSCHTomDlCqiInd(cell, dlCqiInd) RgSchCellCb *cell; TfuDlCqiIndInfo *dlCqiInd; #endif @@ -1429,14 +1402,13 @@ TfuDlCqiIndInfo *dlCqiInd; RgSchUeCb *ue; CmLList *node; TfuDlCqiRpt *dlCqiInfo; - TRC2(rgSCHTomDlCqiInd); if(cell->cellId != dlCqiInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" ":%d", dlCqiInd->cellId); - RETVALUE(RFAILED); - } + return RFAILED; + } node = dlCqiInd->dlCqiRptsLst.first; @@ -1453,7 +1425,7 @@ TfuDlCqiIndInfo *dlCqiInd; rgSCHUtlDlCqiInd(cell, ue, dlCqiInfo, dlCqiInd->timingInfo); rgSCHUtlHdlUlTransInd(cell, ue, dlCqiInd->timingInfo); } - RETVALUE(ROK); + return ROK; } /* rgSCHTomDlCqiInd */ /** @@ -1496,7 +1468,6 @@ PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) U16 cqiIdx = 0; CmLteTimingInfo timingInfo; - TRC2(rgSCHTomUtlMovePcqiNxtOccasion); if(cqiCb->cqiCfg.cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP) { @@ -1526,7 +1497,7 @@ PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) rgSCHUtlSCellHndlCqiCollsn(cqiCb); #endif - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlMovePcqiNxtOccasion */ /** @@ -1573,7 +1544,6 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) U16 crntTime; U16 tempIdx; - TRC2(rgSCHTomUtlMovePriNxtOccasion); crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cell->crntTime.slot); #ifdef XEON_SPECIFIC_CHANGES @@ -1649,7 +1619,7 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) #ifdef LTE_ADV rgSCHUtlSCellHndlRiCollsn(riCb); #endif - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlMovePriNxtOccasion */ /** @@ -1689,8 +1659,6 @@ PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) { U16 srIdx = 0; - TRC2(rgSCHTomUtlMoveSrNxtOccasion); - /* Compute Next Transmission Instance */ srIdx = ue->srCb.peri + ue->srCb.nSrTrIdx; srIdx = srIdx%RG_SCH_PCQI_SRS_SR_TRINS_SIZE; @@ -1705,7 +1673,7 @@ PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) cmLListAdd2Tail(&cell->pCqiSrsSrLst[ue->srCb.nSrTrIdx].srLst, &ue->srCb.srLstEnt); - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlMoveSrNxtOccasion */ /** @@ -1749,7 +1717,6 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) U16 crntTime; - TRC2(rgSCHTomUtlMoveSrsNxtOccasion); crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +(cell->crntTime.slot); @@ -1791,8 +1758,7 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) } ue->srsCb.nSrsTrIdx = srsIdx; ue->srsCb.srsDist = srsDist; - - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlMoveSrsNxtOccasion */ @@ -1819,13 +1785,13 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomRawCqiInd +S16 rgSCHTomRawCqiInd ( RgSchCellCb *cell, TfuRawCqiIndInfo *rawCqiInd ) #else -PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd) +S16 rgSCHTomRawCqiInd(cell, rawCqiInd) RgSchCellCb *cell; TfuRawCqiIndInfo *rawCqiInd; #endif @@ -1848,14 +1814,12 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd) RgSchRaCb *raCb; TfuHqInfo hqInfo; - TRC2(rgSCHTomRawCqiInd); - if(cell->cellId != rawCqiInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" ":%d", rawCqiInd->cellId); - RETVALUE(RFAILED); - } + return RFAILED; + } node = rawCqiInd->rawCqiRpt.first; @@ -2068,7 +2032,7 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd) rlsHqBufs->numUes = 0; } } - RETVALUE(ROK); + return ROK; } /* rgSCHTomRawCqiInd */ /** @@ -2094,13 +2058,13 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomSrsInd +S16 rgSCHTomSrsInd ( RgSchCellCb *cell, TfuSrsIndInfo *srsInd ) #else -PUBLIC S16 rgSCHTomSrsInd(cell, srsInd) +S16 rgSCHTomSrsInd(cell, srsInd) RgSchCellCb *cell; TfuSrsIndInfo *srsInd; #endif @@ -2109,14 +2073,12 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd) CmLList *node; TfuSrsRpt* srsInfo; - TRC2(rgSCHTomSrsInd); - if(cell->cellId != srsInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" ":%d", srsInd->cellId); - RETVALUE(RFAILED); - } + return RFAILED; + } node = srsInd->srsRpt.first; for (;node; node=node->next) @@ -2132,7 +2094,7 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd) rgSCHUtlSrsInd(cell, ue, srsInfo, srsInd->timingInfo); rgSCHUtlHdlUlTransInd(cell, ue, srsInd->timingInfo); } - RETVALUE(ROK); + return ROK; } /* rgSCHTomSrsInd */ /* @@ -2192,7 +2154,7 @@ PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo) xmin = idx+1; label = label-binCoe; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHTomUtlGenIndices*/ #endif #endif @@ -2219,13 +2181,13 @@ PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomCrcInd +S16 rgSCHTomCrcInd ( RgSchCellCb *cell, TfuCrcIndInfo *crcInd ) #else -PUBLIC S16 rgSCHTomCrcInd(cell, crcInd) +S16 rgSCHTomCrcInd(cell, crcInd) RgSchCellCb *cell; TfuCrcIndInfo *crcInd; #endif @@ -2255,14 +2217,12 @@ TfuCrcIndInfo *crcInd; RgSchUlHqProcCb *ulHqProc; #endif - TRC2(rgSCHTomCrcInd); - if(cell->cellId != crcInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" ":%d", crcInd->cellId); - RETVALUE(RFAILED); - } + return RFAILED; + } #ifdef RG_ULSCHED_AT_CRC #ifndef LTE_ADV { @@ -2438,7 +2398,7 @@ TfuCrcIndInfo *crcInd; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate TfuCntrlReqInfo " "for cell"); - RETVALUE(ret); + return ret; } rgSCHCmnUlSch(cell); #ifdef LTE_L2_MEAS @@ -2452,10 +2412,10 @@ TfuCrcIndInfo *crcInd; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomCrcInd() Unable to process" " downlink subframe for cellId %d", crcInd->cellId); err.errType = RGSCHERR_TOM_TTIIND; - RETVALUE(RFAILED); - } + return RFAILED; + } #endif /* RG_ULSCHED_AT_CRC */ - RETVALUE(ROK); + return ROK; } /* rgSCHTomCrcInd */ /** @@ -2481,13 +2441,13 @@ TfuCrcIndInfo *crcInd; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomTimingAdvInd +S16 rgSCHTomTimingAdvInd ( RgSchCellCb *cell, TfuTimingAdvIndInfo *timingAdvInd ) #else -PUBLIC S16 rgSCHTomTimingAdvInd(cell, timingAdvInd) +S16 rgSCHTomTimingAdvInd(cell, timingAdvInd) RgSchCellCb *cell; TfuTimingAdvIndInfo *timingAdvInd; #endif @@ -2496,15 +2456,12 @@ TfuTimingAdvIndInfo *timingAdvInd; CmLList *node; TfuTimingAdvInfo *timingAdvInfo; - - TRC2(rgSCHTomTimingAdvInd); - if(cell->cellId != timingAdvInd->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" "=(%d)", timingAdvInd->cellId); - RETVALUE(RFAILED); - } + return RFAILED; + } node = timingAdvInd->timingAdvLst.first; @@ -2520,7 +2477,7 @@ TfuTimingAdvIndInfo *timingAdvInd; } rgSCHDhmUpdTa (cell, ue, timingAdvInfo->timingAdv); } - RETVALUE(ROK); + return ROK; } /* rgSCHTomTimingAdvInd */ /** @@ -2545,13 +2502,13 @@ TfuTimingAdvIndInfo *timingAdvInd; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHTomTtiInd +Void rgSCHTomTtiInd ( SlotIndInfo *slotInd, Inst schInst ) #else -PUBLIC Void rgSCHTomTtiInd(slotInd, schInst) +Void rgSCHTomTtiInd(slotInd, schInst) SlotIndInfo *slotInd; Inst schInst; #endif @@ -2564,8 +2521,6 @@ Inst schInst; RgSchCellCb *cell[CM_LTE_MAX_CELLS]; RgSchCellCb *cellLst[CM_LTE_MAX_CELLS]; - TRC2(rgSCHTomTtiInd); - #ifdef LTE_L2_MEAS glblTtiCnt++; #endif @@ -2875,15 +2830,13 @@ RgSchErrInfo *err; #endif Inst inst = cell->instIdx; - TRC2(rgSCHTomUtlProcUlSf) - if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, sizeof(TfuRecpReqInfo))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate TfuRecpReqInfo " "for cell"); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } recpReqInfo->cellId = cell->cellId; cmLListInit(&recpReqInfo->ueRecpReqLst); @@ -2900,7 +2853,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to fill Data recption " "requests for cell"); RGSCH_FREE_MEM(recpReqInfo); - RETVALUE(ret); + return ret; } /* Filling HARQ Reception requests */ ret = rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx,err); @@ -2909,14 +2862,14 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to fill Harq Feedback " "reception requests for cell"); RGSCH_FREE_MEM(recpReqInfo); - RETVALUE(ret); + return ret; } /* sending the RecpReq to Phy */ if (rgSCHUtlTfuRecpReq(inst, cell->tfuSap->sapCfg.suId, recpReqInfo) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send Cntrl info for cell"); } - RETVALUE(ROK); + return ROK; } /* end of rgSCHTomUtlProcUlSf */ #ifdef LTE_TDD @@ -2956,15 +2909,13 @@ RgSchErrInfo *err; U16 validIdx; /* Index computed from recreq's timing info*/ Inst inst = cell->instIdx; - TRC2(rgSCHTomUtlPrcUlTddSpclSf) - if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, sizeof(TfuRecpReqInfo))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to " "Allocate TfuRecpReqInfo for cell"); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } recpReqInfo->cellId = cell->cellId; cmLListInit(&recpReqInfo->ueRecpReqLst); @@ -2991,7 +2942,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to fill" " SRS recption requests for cell");; RGSCH_FREE_MEM(recpReqInfo); - RETVALUE(ret); + return ret; } /* sending the RecpReq to Phy */ if (rgSCHUtlTfuRecpReq(inst, cell->tfuSap->sapCfg.suId, recpReqInfo) != ROK) @@ -2999,7 +2950,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to send " "Cntrl info for cell"); } - RETVALUE(ROK); + return ROK; } /* end of rgSCHTomUtlPrcUlTddSpclSf */ #endif #endif @@ -3042,8 +2993,6 @@ RgSchErrInfo *err; S16 ret; U8 sfTyp = 1; /* Dl Subframe */ - TRC2(rgSCHTomUtlProcDlSf); - cmLListInit(&cntrlInfo->phichLst); cmLListInit(&cntrlInfo->dlPdcchLst); cmLListInit(&cntrlInfo->ulPdcchLst); @@ -3082,7 +3031,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PHICH info " "for cellId (%d)\n", cell->cellId)); RGSCH_FREE_MEM(cntrlInfo); - RETVALUE(ret); + return ret; } if ((ret = rgSCHTomUtlFillUlPdcch (cell, cntrlInfo, ulSf, err)) != ROK) @@ -3090,7 +3039,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PDCCH info " "for cellId (%d)\n", cell->cellId)); RGSCH_FREE_MEM(cntrlInfo); - RETVALUE(ret); + return ret; } } #ifdef EMTC_ENABLE @@ -3112,7 +3061,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PDCCH info " "for cellId (%d)\n", cell->cellId)); RGSCH_FREE_MEM(cntrlInfo); - RETVALUE(ret); + return ret; } rgBwAlloInfo[dlSf->sfNum] += dlSf->bwAssigned; rgBwAlcnt[dlSf->sfNum] ++; @@ -3137,8 +3086,8 @@ if(0 == cntrlInfo->dlMpdcchLst.count) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send Cntrl info " "for cell"); } + return ROK; - RETVALUE(ROK); } @@ -3184,7 +3133,6 @@ RgSchErrInfo *err; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); #endif - TRC2(rgSCHTomUtlFillPhich) ret = ROK; /* Traversing the list of Phichs */ node = dlSf->phichInfo.phichs.first; @@ -3195,7 +3143,7 @@ RgSchErrInfo *err; &(cntrlInfo->memCp))) != ROK) { err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT harqAck->txPower = 0; @@ -3218,7 +3166,7 @@ RgSchErrInfo *err; harqAck->lnk.node = (PTR)harqAck; node = node->next; } /* end of while */ - RETVALUE(ret); + return ret; } /* end of */ @@ -3316,7 +3264,6 @@ RgSchErrInfo *err; U8 isDcivld = FALSE; U8 numUePerTti = 0; - TRC2(rgSCHTomUtlFillDlPdcch) ret = ROK; /* Traversing the scheduled Harq processes */ node = dlSf->pdcchInfo.pdcchs.first; @@ -3367,7 +3314,7 @@ RgSchErrInfo *err; &(cntrlInfo->memCp))) != ROK) { err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef LTEMAC_SPS tfuPdcch->crnti = pdcch->crnti; @@ -3411,7 +3358,7 @@ RgSchErrInfo *err; gDlNumUePerTti[numUePerTti-1]++; } } - RETVALUE(ret); + return ret; } /* end of rgSCHTomUtlFillDlPdcch*/ #ifdef RGSCH_SPS_STATS @@ -3458,7 +3405,6 @@ RgSchErrInfo *err; TfuPdcchInfo *tfuPdcch; U8 isDcivld = FALSE; - TRC2(rgSCHTomUtlFillUlPdcch) ret = ROK; /* Traversing the scheduled Harq processes */ node = dlSf->pdcchInfo.pdcchs.first; @@ -3504,7 +3450,7 @@ RgSchErrInfo *err; &(cntrlInfo->memCp))) != ROK) { err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } tfuPdcch->rnti = pdcch->rnti; #ifdef LTE_ADV @@ -3536,7 +3482,7 @@ RgSchErrInfo *err; // abort(); } #endif - RETVALUE(ret); + return ret; } /* end of rgSCHTomUtlFillUlPdcch*/ /** @brief This function does the processing for Timing adjustment. @@ -3568,8 +3514,6 @@ RgSchCellCb *cell; CmLList *node; RgSchUeCb *ue; - TRC2(rgSCHTomUtlProcTA); - node = cell->taUeLst.first; while (node) { @@ -3603,8 +3547,7 @@ RgSchCellCb *cell; ue->dl.taCb.numRemSf--; } } /* end of taUeLst */ - - RETVALUE(ROK); + return ROK; } /* end of rgSCHTomUtlProcTA */ /** @brief This function handles filling of Hq reception request to @@ -3622,7 +3565,7 @@ RgSchCellCb *cell; */ #ifdef TFU_UPGRADE #ifdef ANSI -PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo +S16 rgSCHTomUtlFillHqFdbkInfo ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -3634,7 +3577,7 @@ PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err) +S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; U16 validIdx; @@ -3646,7 +3589,7 @@ PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf #endif #else #ifdef ANSI -PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo +S16 rgSCHTomUtlFillHqFdbkInfo ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -3657,7 +3600,7 @@ RgSchDlHqProcCb *prvHqCb, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err) +S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; RgSchDlHqProcCb *hqCb; @@ -3717,7 +3660,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for cell"); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; if ((hqCb->hqE->ue != NULLP) /*&& @@ -3816,7 +3759,7 @@ RgSchErrInfo *err; break; } } - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillHqFdbkInfo */ #ifdef RG_5GTF @@ -3867,17 +3810,15 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS Inst inst = cell->instIdx; #endif S16 ret; - CmLList *hqPNode; RgSchUeCb *ue; TfuUePucchRecpReq *pucchReqInfo = NULLP; - hqPNode = dlSfHqInfo->hqPLst.first; ue = (RgSchUeCb*)dlSfHqInfo->dlSfUeLnk.node; if (ue == NULLP) { - RETVALUE(RFAILED); - } + return RFAILED; + } ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) @@ -3885,7 +3826,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate " "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId)); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; pucchRecpInfo->rnti = ue->ueId; /* Even for Rel pdcch also setting CRNTI @@ -3910,7 +3851,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS cmLListAdd2Tail(&recpReqInfo->ueRecpReqLst, &(pucchRecpInfo->lnk)); pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo; - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillHqFdbkForFrmt1B */ #endif @@ -3997,8 +3938,8 @@ RgSchErrInfo *err; if (ue == NULLP) { - RETVALUE(RFAILED); - } + return RFAILED; + } ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) @@ -4006,7 +3947,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate " "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId)); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; pucchRecpInfo->rnti = ue->ueId; /* Even for Rel pdcch also setting CRNTI @@ -4028,7 +3969,7 @@ RgSchErrInfo *err; pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal; pucchReqInfo->hqInfo.pucchResCnt = ue->f1bCsAVal; - cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); + memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); #ifdef LTEMAC_SPS /* Two Resources needs to be configured if the * serving cell is in mimo mode else single @@ -4243,7 +4184,7 @@ RgSchErrInfo *err; #endif/*TFU_UPGRADE*/ cmLListAdd2Tail(&recpReqInfo->ueRecpReqLst, &(pucchRecpInfo->lnk)); pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo; - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillHqFdbkForFrmt1B */ /** @brief This function handles filling of Hq reception request to * Per Hq Proc. @@ -4324,8 +4265,8 @@ RgSchErrInfo *err; if (ue == NULLP) { - RETVALUE(RFAILED); - } + return RFAILED; + } ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) @@ -4333,7 +4274,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate " "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId)); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; pucchRecpInfo->rnti = ue->ueId; /* Even for Rel pdcch also setting CRNTI @@ -4355,7 +4296,7 @@ RgSchErrInfo *err; pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal; pucchReqInfo->hqInfo.pucchResCnt = 1; - cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); + memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); #endif/*TFU_UPGRADE*/ pucchReqInfo->hqInfo.hqRes[0] = dlSfHqInfo->n3ScellPucch.n3PucchIdx; #ifdef TFU_UPGRADE @@ -4364,7 +4305,7 @@ RgSchErrInfo *err; #endif/*TFU_UPGRADE*/ cmLListAdd2Tail(&recpReqInfo->ueRecpReqLst, &(pucchRecpInfo->lnk)); pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo; - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillHqFdbkForFrmt3 */ #endif/*LTE_ADV*/ @@ -4426,8 +4367,6 @@ RgSchErrInfo *err; RgSchUeCb *ue; RgSchDlHqProcCb *prvHqCb=NULLP; - TRC2(rgSCHTomUtlFillHqFdbkRecpReq); - #ifdef CA_DBG { gF1bCsPres = FALSE; @@ -4479,7 +4418,7 @@ RgSchErrInfo *err; /* Check with TDD Code */ /* FOR ACK NACK REP */ - RETVALUE(ROK); + return ROK; } /* end of rgSCHTomUtlFillHqFdbkRecpReq */ #ifdef TFU_UPGRADE /** @brief This function handles filling of SR reception request to @@ -4526,8 +4465,6 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) #endif - TRC2(rgSCHTomUtlFillSrRecpReq); - isAddToLst = FALSE; node = cell->pCqiSrsSrLst[validIdx].srLst.first; @@ -4546,10 +4483,10 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for cell RNTI:%d",ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif /*Fill SR params*/ @@ -4585,7 +4522,7 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) } pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo; } - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillSrRecpReq */ #endif #endif @@ -4617,8 +4554,6 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) Bool *willueRprtCqiRi; #endif { - TRC2(rgSCHTomUtlWillUeRprtCqiRi); - /* Intialising Reporting probability as TRUE */ *willueRprtCqiRi = TRUE; @@ -4633,8 +4568,8 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) {/*onDuration NOT running, do not expect cqi/pmi/ri*/ *willueRprtCqiRi = FALSE; } - RETVALUE(ROK); - } + return ROK; + } #endif /*end of LTEMAC_R9*/ /* ccpu00134258: Fix for CQI DRX issue*/ if(ue->drxCb->onDurTmrLen > 2) @@ -4645,8 +4580,7 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) } } }/*ue->isDrxEnabled*/ - - RETVALUE(ROK); + return ROK; } /*End of rgSCHTomUtlWillUeRprtCqiRi*/ /** @brief This function handles filling of RI reception request to @@ -4690,7 +4624,6 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) Bool willUeRprtCqi; /* Flag set due to CQI Mask and UE inactive state (DRX) */ RgSchUePCqiCb *riCb = NULLP; - TRC2(rgSCHTomUtlFillRiRecpReq); node = cell->pCqiSrsSrLst[validIdx].riLst.first; while(node) @@ -4733,10 +4666,10 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for cell RNTI:%d",ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif /*Fill RI params*/ @@ -4768,7 +4701,7 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) riCb->riDist--; } } - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillRiRecpReq */ #endif #ifdef RG_5GTF @@ -4811,8 +4744,6 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) RgSchUeCb *ue = NULLP; U16 ret; - TRC2(rgSCHTomUtlFillCqiRiRecpReq); - while ((ue = rgSCHDbmGetNextUeCb(cell, ue)) != NULLP) { if (RGSCH_TIMEINFO_SAME (recpReqInfo->timingInfo, ue->ue5gtfCb.nxtCqiRiOccn)) @@ -4823,10 +4754,10 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif pucchRecpInfo->rnti = ue->ueId; @@ -4840,8 +4771,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo; } } - - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillCqiRiRecpReq */ #endif #endif @@ -4891,8 +4821,6 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) RgSchUePCqiCb *cqiCb = NULLP; Bool isAddToLst = FALSE; - TRC2(rgSCHTomUtlFillPcqiRecpReq); - node = cell->pCqiSrsSrLst[validIdx].cqiLst.first; while(node) { @@ -4931,10 +4859,10 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; #endif @@ -4958,7 +4886,7 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) } pucchRecpInfo->lnk.node = (PTR)pucchRecpInfo; } - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillPcqiRecpReq */ /** @brief This function handles filling of SRS reception request to * PHY. @@ -4998,8 +4926,6 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) S16 ret; RgSchUeCb *ue; - TRC2(rgSCHTomUtlFillSrsRecpReq); - node = cell->pCqiSrsSrLst[validIdx].srsLst.first; while(node) { @@ -5024,7 +4950,7 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for RNTI:%d ",ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT @@ -5056,7 +4982,7 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) ue->srsCb.srsDist--; } } - RETVALUE(ROK); + return ROK; }/* end of rgSCHTomUtlFillSrsRecpReq */ #endif #ifndef TFU_UPGRADE @@ -5094,7 +5020,6 @@ RgSchErrInfo *err; RgSchUlAlloc *alloc; TfuUeRecpReqInfo *datRecpInfo; - TRC2(rgSCHTomUtlFillDatRecpReq) /* processing steps are * - Run through the UL allocations going out in this subframe. @@ -5122,7 +5047,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for RNTI:%d ", alloc->ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } if (!alloc->forMsg3) { @@ -5167,7 +5092,7 @@ RgSchErrInfo *err; alloc = rgSCHUtlNextRcptnReq (cell, alloc); } /* end of while */ - RETVALUE(ROK); + return ROK; } /* end of rgSCHTomUtlFillDatRecpReq */ #else @@ -5210,12 +5135,9 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) RgSchUlAlloc *alloc; TfuUeRecpReqInfo *datRecpInfo; - Bool hqPres; /*Set when HARQ Rec Req is present*/ Bool isAperiodic = FALSE; /*Set when Aperiodic CQI is expected */ U8 numUePerTti = 0; - TRC2(rgSCHTomUtlFillDatRecpReq); - if((0 == (recpReqInfo->timingInfo.sfn % 30)) && (0 == recpReqInfo->timingInfo.slot)) { //printf("5GTF_CHECK rgSCHTomUtlFillDatRecpReq (%d : %d)\n", recpReqInfo->timingInfo.sfn, recpReqInfo->timingInfo.slot); @@ -5236,15 +5158,13 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " "TfuUeRecpReqInfo for RNTI:%d ", alloc->rnti); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } #ifdef TFU_ALLOC_EVENT_NO_INIT datRecpInfo->t.puschRecpReq.initialNSrs.pres = FALSE; datRecpInfo->t.puschRecpReq.initialNumRbs.pres = FALSE; #endif datRecpInfo->type = TFU_RECP_REQ_PUSCH; - /* ccpu00131944 - Intializing hqPres in each iteration*/ - hqPres = FALSE; /* Check if this if for MSG3 - no scope for feedback along with it. */ if ((FALSE == alloc->forMsg3)) { @@ -5304,7 +5224,7 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) cell->ulNumUeSchedPerTti[numUePerTti-1]++; gUlNumUePerTti[numUePerTti - 1]++; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHTomUtlFillDatRecpReq */ #endif /* rg009.201. Added changes of TFU_UPGRADE */ @@ -5325,23 +5245,22 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo +S16 rgSCHTomUtlFillRiBitWidthInfo ( RgSchUeCb *ueCb ) #else -PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb) +S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb) RgSchUeCb *ueCb; #endif { RgSchUePCqiCb *riCb = ueCb->nPRiCb; - TRC2(rgSCHTomUtlFillRiBitWidthInfo); if (ueCb->mimoInfo.txMode != RGR_UE_TM_3 && ueCb->mimoInfo.txMode != RGR_UE_TM_4) { - RETVALUE(RFAILED); - } + return RFAILED; + } ueCb->rawCqiBitW[ueCb->cqiRiWritIdx].type = TFU_RECP_REQ_PUCCH; ueCb->rawCqiBitW[ueCb->cqiRiWritIdx].u.pucch.pucchRawCqiInfo.mode= @@ -5373,7 +5292,7 @@ PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb) } RG_SCH_INCR_CQIRI_INDEX(ueCb->cqiRiWritIdx); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5392,14 +5311,14 @@ PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb) * **********************************************************/ #ifdef ANSI -PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz +U8 rgSCHTomUtlFetchPcqiBitSz ( RgSchUeCb *ueCb, U8 numTxAnt, U8 *ri ) #else -PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) +U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) RgSchUeCb *ueCb; U8 numTxAnt; U8 *ri; @@ -5413,7 +5332,6 @@ PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) TfuCqiPucchMode21 *mode21Info; RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb; - TRC3(rgSCHTomUtlFetchPcqiBitSz); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && @@ -5523,7 +5441,7 @@ PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) } RG_SCH_INCR_CQIRI_INDEX(ueCb->cqiRiWritIdx); - RETVALUE(pcqiSz); + return pcqiSz; } @@ -5543,14 +5461,14 @@ PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx +S16 rgSCHTomUtlPcqiSbCalcBpIdx ( CmLteTimingInfo crntTimInfo, RgSchUeCb *ueCb, RgSchUePCqiCb *cqiCb ) #else -PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) +S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) CmLteTimingInfo crntTimInfo; RgSchUeCb *ueCb; RgSchUePCqiCb *cqiCb; @@ -5559,7 +5477,6 @@ PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) U16 tti = (crntTimInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTimInfo.slot); U16 prdNum = tti/cqiCb->cqiPeri; - TRC2(rgSCHTomUtlPcqiSbCalcBpIdx); if((prdNum % cqiCb->h) == 0) { cqiCb->isWb = TRUE; @@ -5575,7 +5492,7 @@ PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) cqiCb->prioLvl = RG_SCH_CQI_PRIO_LVL_0; #endif } - RETVALUE(ROK); + return ROK; } @@ -5606,14 +5523,14 @@ PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomUtlMoveNxtOccasion +S16 rgSCHTomUtlMoveNxtOccasion ( RgSchCellCb *cell, RgSchUeCb *ue, U16 validIdx ) #else -PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) +S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) RgSchCellCb *cell; RgSchUeCb *ue; U16 validIdx; @@ -5621,7 +5538,6 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) { RgSchUePCqiCb *cqiCb = ue->nPCqiCb; RgSchUePCqiCb *riCb = ue->nPRiCb; - TRC2(rgSCHTomUtlMoveNxtOccasion); /* ccpu00140578::Skip the UE if already RI recpetion * is processed in the same subframe */ @@ -5674,7 +5590,7 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) { rgSCHTomUtlMoveSrNxtOccasion(cell, ue); } - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlMoveNxtOccasion */ @@ -5696,7 +5612,7 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHTomPrepareAcqiRecp +Void rgSCHTomPrepareAcqiRecp ( RgSchUeCb *ueCb, RgSchCellCb *cell, @@ -5704,7 +5620,7 @@ PUBLIC Void rgSCHTomPrepareAcqiRecp U8 ccIdx ) #else -PUBLIC Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx) + Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx) RgSchUeCb *ueCb; RgSchCellCb *cell; TfuUePuschCqiRecpInfo *cqiRecpReqInfo; @@ -5722,8 +5638,6 @@ PUBLIC Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx) U8 numOfCells = 0; RgSchUeACqiCb *acqiCb = &ueCb->cellInfo[sCellIdx]->acqiCb; - TRC2(rgSCHTomPrepareAcqiRecp); - /* Fill TFU Recp */ cqiRecpReqInfo->reportType = TFU_APERIODIC_CQI_TYPE; /* Aperiodic */ if (ueCb->mimoInfo.txMode == RGR_UE_TM_3 || @@ -5889,7 +5803,7 @@ PUBLIC Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq +S16 rgSCHTomUtlFillDatAperRecpReq ( RgSchCellCb *cell, U8 cqiReq, @@ -5900,7 +5814,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq U16 validIdx ) #else -PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx) +S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx) RgSchCellCb *cell; U8 cqiReq; RgSchUlAlloc *alloc; @@ -5916,7 +5830,6 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeI U8 triggerSet = 0; U8 sIdx = 0; #endif - TRC2(rgSCHTomUtlFillDatAperRecpReq); /*Fill RI Reception Params*/ cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo; @@ -5969,7 +5882,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeI datRecpInfo->rnti = alloc->rnti; rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo, &datRecpInfo->t.puschRecpReq.ulSchInfo); - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlFillDatAperRecpReq */ @@ -6001,7 +5914,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeI * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq +S16 rgSCHTomUtlFillDatPriRecpReq ( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -6011,7 +5924,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq U16 validIdx ) #else -PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, +S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, hqPres, validIdx) RgSchCellCb *cell; RgSchUlAlloc *alloc; @@ -6022,7 +5935,6 @@ hqPres, validIdx) #endif { TfuUePuschCqiRecpInfo *cqiRecpReqInfo; - TRC2(rgSCHTomUtlFillDatPriRecpReq); /*Fill RI Reception Params*/ cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo; @@ -6065,7 +5977,7 @@ hqPres, validIdx) datRecpInfo->rnti = alloc->rnti; rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo, &datRecpInfo->t.puschRecpReq.ulSchInfo); - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlFillDatPriRecpReq */ @@ -6097,7 +6009,7 @@ hqPres, validIdx) **/ #ifdef ANSI -PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq +S16 rgSCHTomUtlFillDatPCqiRecpReq ( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -6107,7 +6019,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq U16 validIdx ) #else -PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, +S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, timeInfo, hqPres, validIdx) RgSchCellCb *cell; RgSchUlAlloc *alloc; @@ -6121,9 +6033,6 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, U8 cqiPmiSz; /*Raw CQI/PMI Size*/ U8 ri; - TRC2(rgSCHTomUtlFillDatPCqiRecpReq); - - /*Fill CQI Reception Params*/ cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo; #ifdef TFU_ALLOC_EVENT_NO_INIT @@ -6135,7 +6044,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Fill " "CqiPmi size RNTI:%d",alloc->rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fill only the first RI index since Periodic can come @@ -6182,7 +6091,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, datRecpInfo->rnti = alloc->rnti; rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo, &datRecpInfo->t.puschRecpReq.ulSchInfo); - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlFillDatPCqiRecpReq */ /** @@ -6212,7 +6121,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq +S16 rgSCHTomUtlFillDatSrsRecpReq ( RgSchCellCb *cell, RgSchUlAlloc *alloc, @@ -6221,7 +6130,7 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq Bool hqPres ) #else -PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, +S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, hqPres) RgSchCellCb *cell; RgSchUlAlloc *alloc; @@ -6230,7 +6139,6 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, Bool hqPres; #endif { - TRC2(rgSCHTomUtlFillDatSrsRecpReq); datRecpInfo->rnti = alloc->rnti; rgSCHTomFillOnlySrsRecpReq(cell,alloc, datRecpInfo); if(hqPres) @@ -6244,7 +6152,7 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, datRecpInfo->rnti = alloc->rnti; rgSCHUtlAllocRcptInfo (cell, alloc, timeInfo, &datRecpInfo->t.puschRecpReq.ulSchInfo); - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlFillDatSrsRecpReq */ /** @@ -6272,21 +6180,20 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHTomFillOnlySrsRecpReq +S16 rgSCHTomFillOnlySrsRecpReq ( RgSchCellCb *cell, RgSchUlAlloc *alloc, TfuUeRecpReqInfo *datRecpInfo ) #else -PUBLIC S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo) +S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo) RgSchCellCb *cell; RgSchUlAlloc *alloc; TfuUeRecpReqInfo *datRecpInfo; #endif { TfuUePuschSrsRecpInfo *srsRecpReqInfo; - TRC2(rgSCHTomFillOnlySrsRecpReq); srsRecpReqInfo = &datRecpInfo->t.puschRecpReq.srsInfo; srsRecpReqInfo->srsBw = (TfuUlSrsBwInfo)alloc->ue->srsCb.srsCfg.srsSetup.srsBw; @@ -6300,7 +6207,7 @@ PUBLIC S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo) * Refer Section 5.2.2.6 of TS 36.212 V8.5.0*/ datRecpInfo->t.puschRecpReq.ulSchInfo.nSrs = 1; - RETVALUE(ROK); + return ROK; } /* rgSCHTomFillOnlySrsRecpReq */ /** @@ -6371,8 +6278,6 @@ Bool isDatPresOnSecCell; RgSchEmtcUeInfo *emtcUe = NULLP; #endif - TRC2(rgSCHTomUtlFillCqiSrSrsWithHq); - if(ue) { /*Changes for PUCCH Format3 */ @@ -6539,7 +6444,7 @@ Bool isDatPresOnSecCell; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d " "Unable to Fill CqiPmi size", ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } if(pucchRecpInfo->t.pucchRecpReq.uciInfo == TFU_PUCCH_HARQ_SR) { @@ -6623,7 +6528,7 @@ Bool isDatPresOnSecCell; } } UNUSED(dropCqi); - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlFillCqiSrSrsWithHq */ /** @@ -6680,8 +6585,6 @@ U16 validIdx; U8 ri; /*To fetch RI value*/ Bool willUeRprtCqi; /* Flag set due to CQI Mask and UE Inactive state (DRX)*/ - TRC2(rgSCHTomUtlFillCqiSrsWithSr); - riCb = ue->nPRiCb; cqiCb = ue->nPCqiCb; rgSCHTomUtlWillUeRprtCqiRi(ue, &willUeRprtCqi); @@ -6750,8 +6653,8 @@ U16 validIdx; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d" " Unable to Fill CqiPmi size", ue->ueId); - RETVALUE(RFAILED); - } + return RFAILED; + } pucchRecpInfo->t.pucchRecpReq.uciInfo = TFU_PUCCH_SR_CQI; } @@ -6812,7 +6715,7 @@ U16 validIdx; } } - RETVALUE(ROK); + return ROK; } /* rgSCHTomUtlFillCqiSrsWithSr */ #endif @@ -6905,8 +6808,6 @@ noFdbks, memCp, elemIdx, nxtDlsf) RgSchDlHqTbCb *tbCb; RgSchDlHqProcCb *prvHqCb = NULLP; - TRC2(rgSCHTomUtlFillSfRepHqFdbk) - node = dlSf->ackNakRepQ.first; while (node) { @@ -6948,7 +6849,7 @@ noFdbks, memCp, elemIdx, nxtDlsf) RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to" "Allocate TfuUeRecpReqInfo for RNTI:%d ", ueCb->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } pucchRecpInfo->rnti = ueCb->ueId; #ifndef TFU_UPGRADE @@ -6998,8 +6899,7 @@ noFdbks, memCp, elemIdx, nxtDlsf) /* Go to the next node */ node = node->next; } - - RETVALUE(ROK); + return ROK; } /** @brief This function handles filling of HARQ feedback recption request @@ -7107,8 +7007,6 @@ RgSchDlHqProcCb *prvHqCb; U8 hqSz = 0; U32 idx = 0; - TRC2(rgSCHTomUtlFillSfHqFdbkInfo) - #ifndef TFU_UPGRADE RG_SCH_ADD_TO_CRNT_TIME(cellCb->crntTime, futTime, TFU_RECPREQ_DLDELTA); #endif @@ -7133,8 +7031,8 @@ RgSchDlHqProcCb *prvHqCb; if((anInfo == NULLP) || (anInfo->latestMIdx != dlSf->dlFdbkInfo.m)) { - RETVALUE(ROK); - } + return ROK; + } } else { @@ -7156,7 +7054,7 @@ RgSchDlHqProcCb *prvHqCb; } else { - RETVALUE(ROK); + return ROK; } /* Do not proceed if PUSCH @@ -7195,7 +7093,7 @@ RgSchDlHqProcCb *prvHqCb; n1PucchTkn, &alloc, hqSz); if (ret != ROK) { - RETVALUE(ret); + return ret; } /* TODO:: In case of F1BCS and CSI in same subframe * UE shall drop the CSI if there was at least one @@ -7275,7 +7173,7 @@ RgSchDlHqProcCb *prvHqCb; prvHqCb = hqCb; } } - RETVALUE(ROK); + return ROK; } #ifdef LTE_ADV @@ -7794,7 +7692,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch default: break; } - RETVALUE(ROK); + return ROK; } #endif @@ -7881,7 +7779,7 @@ U8 hqSz; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to " "Allocate TfuUeRecpReqInfo for cell RNTI:%d",rnti); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } alloc = TRUE; #ifdef TFU_ALLOC_EVENT_NO_INIT @@ -7896,11 +7794,11 @@ U8 hqSz; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to " "Allocate TfuUeRecpReqInfo for cell RNTI:%d",rnti); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; - RETVALUE(ret); + return ret; } - cmMemset((U8 *)pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); + memset(pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES); #ifdef TFU_ALLOC_EVENT_NO_INIT - cmMemset((U8 *)&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); + memset(&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq)); #endif pucchInfo->pucchRecpInfo->type = TFU_RECP_REQ_PUCCH; pucchInfo->pucchRecpInfo->rnti = rnti; @@ -7961,8 +7859,7 @@ U8 hqSz; because of kworks*/ RGSCHDBGERRNEW(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx), "ANInfo should not be NULL for cellId=%d \n", cellCb->cellId)); - RETVALUE(RFAILED); - + return RFAILED; } #endif } @@ -7971,7 +7868,7 @@ U8 hqSz; {/* This needs to be revisited while adding support for PUCCH format 3 */ RGSCHDBGERRNEW(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx),"Invalid Pucch format configured..")); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -8123,7 +8020,7 @@ U8 hqSz; *pucchInfoRef = pucchInfo; *allocRef = alloc; - RETVALUE(ROK); + return ROK; } #endif @@ -8166,9 +8063,6 @@ RgSchErrInfo *err; Inst inst = cell->instIdx; S16 ret; - TRC2(rgSCHTomUtlProcDlSfAtCrc); - - cntrlInfo->numDlActvUes = 0; cmLListInit(&cntrlInfo->phichLst); cmLListInit(&cntrlInfo->dlPdcchLst); @@ -8188,7 +8082,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send PHICH info for " "cell"); RGSCH_FREE_MEM(cntrlInfo); - RETVALUE(ret); + return ret; } /* Fill UL Pdcch */ @@ -8197,7 +8091,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send PDCCH info for " "cell"); RGSCH_FREE_MEM(cntrlInfo); - RETVALUE(ret); + return ret; } #ifdef EMTC_ENABLE @@ -8224,8 +8118,7 @@ RgSchErrInfo *err; { RGSCH_FREE_MEM(cntrlInfo); } - - RETVALUE(ROK); + return ROK; } /* end of */ #endif /* #ifdef RG_ULSCHED_AT_CRC*/ @@ -8251,8 +8144,6 @@ RgSchCellCb *cell; { RgrTtiIndInfo *rgrTtiInd; - TRC2(rgSCHTomUtlSendSfnTick); - /* TTI to be sent to RRM only once per system frame */ /* Added support for period = 0 to disable tick to RRM */ if ((cell->rrmTtiIndPrd != 0) && @@ -8295,7 +8186,7 @@ RgSchCellCb *cell; * Function: rgSCHDynTDDMrkCrntSfIdx * Purpose: update the dyn tdd sunframe index * @param[in] Inst schInst - * @RETVALUE None + * @return None */ #ifdef UNUSED_FUNC #ifdef ANSI @@ -8310,7 +8201,6 @@ Inst schInst; { RgSchDynTddCb *rgSchDynTddInfo = &(rgSchCb[schInst].rgSchDynTdd); - TRC2(rgSCHDynTDDMrkCrntSfIdx) RG_SCH_DYN_TDD_MARKTYPE(rgSchDynTddInfo, rgSchDynTddInfo->crntDTddSfIdx, RG_SCH_DYNTDD_NOTDEF); @@ -8362,8 +8252,6 @@ RgSchCellCb *cells[]; CmLteTimingInfo frm; - TRC2 (rgSchTomFillCellTtiInfo); - if (CM_LTE_MAX_CELLS < ttiInd->numCells) { RETVOID; @@ -8532,8 +8420,6 @@ RgSchCellCb *cell; #endif { - TRC2(rgSchTomTtiUlAndDlCmnChSch); - cell->rlsHqArr[cell->crntHqIdx].numUes = 0; cell->crntHqIdx++; cell->crntHqIdx = cell->crntHqIdx % RGSCH_NUM_SUB_FRAMES; @@ -8612,8 +8498,6 @@ RgSchCellCb *cell; { U8 suId = cell->tfuSap->sapCfg.suId; - TRC2(rgSchTomTtiMiscFunctions); - /* Invoke RAM Tti Handler */ rgSCHRamTtiHndlr(cell); @@ -8704,7 +8588,6 @@ PRIVATE Void rgSchTomTtiDlSch (cell) RgSchCellCb *cell; #endif { - TRC2(rgSchTomTtiDlSch); if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE)) { @@ -8741,8 +8624,6 @@ RgSchCellCb *cell; dlSf = rgSCHUtlSubFrmGet(cell, cellSch->dl.time); - TRC2(rgSchTomTtiCnsldtSfAlloc); - /* Prepare Subframe allocation info and send to MAC */ rgSCHCmnCnsldtSfAlloc(cell); @@ -8782,8 +8663,6 @@ RgTfuCntrlReqInfo *cntrlInfo; RgSchDlSf *ulSf = rgSCHUtlSubFrmGet (cell, cell->hiDci0Time); RgSchErrInfo err; - TRC2(rgSchTomTtiL1DlAndUlCfg); - rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, &err); /* Mark this frame as sent */ dlSf->txDone = TRUE; @@ -8823,7 +8702,6 @@ PRIVATE Void rgSchTomUtlTddRlsSfAndHarq (cell) RgSchCellCb *cell; #endif { - TRC2(rgSchTomUtlTddRlsSfAndHarq); /* ccpu00132341-MOD- rgSchTddRlsDlSubfrmTbl is dependent on DELTA(=2). * Instead rgSchTddDlAscSetIdxKTbl can be used as the K set gives proper @@ -8866,8 +8744,6 @@ RgSchCellCb *cell; { RgSchErrInfo err; - TRC2(rgSCHTomUtlProcTddUlSf); - if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx] [cell->rcpReqTime.subframe] == RG_SCH_TDD_UL_SUBFRAME) {