X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cmn.c;h=b217d3c094e05e4d8c2e75c3faa5f54fd25bd11e;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=7398c2006b3ef31533ec5720cf98dcb810f00d55;hpb=8340c342ebcfc82193c3f66e7f15047c1e37399b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c index 7398c2006..b217d3c09 100755 --- a/src/5gnrsch/rg_sch_cmn.c +++ b/src/5gnrsch/rg_sch_cmn.c @@ -37,16 +37,7 @@ static int RLOG_FILE_ID=187; 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 service interface */ -#include "cm_hash.h" /* common hash list */ -#include "cm_llist.h" /* common linked list library */ -#include "cm_err.h" /* common error */ -#include "cm_lte.h" /* common LTE */ -#include "cm5.h" +#include "common_def.h" #include "lrg.h" #include "rgr.h" #include "tfu.h" @@ -60,15 +51,6 @@ static int RLOG_MODULE_ID=4096; #include "rl_common.h" /* 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" /* TFU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "rgr.x" /* layer management typedefs for MAC */ @@ -127,7 +109,7 @@ U16 msgSzA, U8 sbSize, Bool isEcp )); -PUBLIC Void rgSCHEmtcCmnUeCcchSduDel +Void rgSCHEmtcCmnUeCcchSduDel ( RgSchCellCb *cell, RgSchUeCb *ueCb @@ -243,7 +225,7 @@ U8 tpc #endif -PUBLIC Void rgSCHCmnDlSpsSch +Void rgSCHCmnDlSpsSch ( RgSchCellCb *cell ); @@ -306,7 +288,7 @@ PRIVATE S16 rgSCHCmnApplyUeRefresh ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); #ifdef DL_LA -PUBLIC Void rgSCHCmnDlSetUeAllocLmtLa ARGS +Void rgSCHCmnDlSetUeAllocLmtLa ARGS (( RgSchCellCb *cell, RgSchUeCb *ue @@ -355,7 +337,7 @@ RgSchCellCb *cell /* local defines */ -PUBLIC RgSchdApis rgSchCmnApis; + RgSchdApis rgSchCmnApis; PRIVATE RgUlSchdApis rgSchUlSchdTbl[RGSCH_NUM_SCHEDULERS]; PRIVATE RgDlSchdApis rgSchDlSchdTbl[RGSCH_NUM_SCHEDULERS]; #ifdef EMTC_ENABLE @@ -516,13 +498,13 @@ PRIVATE U8 rgSchGetN1ResCount ARGS (( RgSchUeCb *ue, U16 servCellId )); -PUBLIC Bool rgSchCmnChkDataOnlyOnPcell +Bool rgSchCmnChkDataOnlyOnPcell ( RgSchUeCb *ue, RgSchDlSf *dlSf ); #endif /*LTE_ADV */ -PUBLIC U8 rgSCHCmnCalcPcqiBitSz +U8 rgSCHCmnCalcPcqiBitSz ( RgSchUeCb *ueCb, U8 numTxAnt @@ -723,13 +705,13 @@ U8 *maskIdx )); #endif -PUBLIC Bool rgSCHCmnRetxAllocAvoid ARGS(( +Bool rgSCHCmnRetxAllocAvoid ARGS(( RgSchDlSf *subFrm, RgSchCellCb *cell, RgSchDlHqProcCb *proc )); -PUBLIC U16 rgSCHCmnGetSiSetId ARGS(( +U16 rgSCHCmnGetSiSetId ARGS(( U16 sfn, U8 sf, U16 minPeriodicity @@ -760,16 +742,16 @@ U32 ul5gtfTotSchdCnt = 0; /* CQI Offset Index to Beta CQI Offset value mapping, * stored as parts per 1000. Reserved is set to 0. * Refer 36.213 sec 8.6.3 Tbl 8.6.3-3 */ -PUBLIC U32 rgSchCmnBetaCqiOffstTbl[16] = {0, 0, 1125, +U32 rgSchCmnBetaCqiOffstTbl[16] = {0, 0, 1125, 1250, 1375, 1625, 1750, 2000, 2250, 2500, 2875, 3125, 3500, 4000, 5000, 6250}; -PUBLIC U32 rgSchCmnBetaHqOffstTbl[16] = {2000, 2500, 3125, +U32 rgSchCmnBetaHqOffstTbl[16] = {2000, 2500, 3125, 4000, 5000, 6250, 8000,10000, 12625, 15875, 20000, 31000, 50000,80000,126000,0}; -PUBLIC U32 rgSchCmnBetaRiOffstTbl[16] = {1250, 1625, 2000, +U32 rgSchCmnBetaRiOffstTbl[16] = {1250, 1625, 2000, 2500, 3125, 4000, 5000, 6250, 8000, 10000,12625, 15875,20000,0,0,0}; -PUBLIC S8 rgSchCmnDlCqiDiffOfst[8] = {0, 1, 2, 3, -4, -3, -2, -1}; +S8 rgSchCmnDlCqiDiffOfst[8] = {0, 1, 2, 3, -4, -3, -2, -1}; /* Include CRS REs while calculating Efficiency */ CONSTANT PRIVATE U8 rgSchCmnAntIdx[5] = {0,0,1,0,2}; @@ -780,8 +762,8 @@ U32 cfiDecr ; #ifdef TFU_UPGRADE -PUBLIC S8 rgSchCmnApUeSelDiffCqi[4] = {1, 2, 3, 4}; -PUBLIC S8 rgSchCmnApEnbConfDiffCqi[4] = {0, 1, 2, -1}; +S8 rgSchCmnApUeSelDiffCqi[4] = {1, 2, 3, 4}; +S8 rgSchCmnApEnbConfDiffCqi[4] = {0, 1, 2, -1}; #endif typedef struct rgSchCmnDlUeDciFrmtOptns @@ -856,7 +838,7 @@ CONSTANT struct rgSchCmnMult235Info /* BI table from 36.321 Table 7.2.1 */ CONSTANT PRIVATE S16 rgSchCmnBiTbl[RG_SCH_CMN_NUM_BI_VAL] = { 0, 10, 20, 30,40,60,80,120,160,240,320,480,960}; -PUBLIC RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = { +RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = { { 0, 0 }, {RGSCH_CMN_QM_CQI_1,RGSCH_CMN_UL_EFF_CQI_1 }, {RGSCH_CMN_QM_CQI_2,RGSCH_CMN_UL_EFF_CQI_2 }, @@ -933,7 +915,7 @@ PRIVATE U16 rgSchCmnCqiPdcchEff[16] = RG_SCH_CMN_CQI_TO_PDCCH_EFF; #ifdef LTE_TDD -PUBLIC RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl = { +RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl = { {RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME}, {RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME}, {RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_SPL_SUBFRAME, RG_SCH_TDD_UL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME, RG_SCH_TDD_DL_SUBFRAME}, @@ -945,7 +927,7 @@ PUBLIC RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl = { /* SPS_INTG_FIX */ #ifdef LTEMAC_SPS -PUBLIC U8 rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = { +U8 rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = { /* 0 */ 6, /* 1 */ 7, /* 2 */ 8, @@ -959,7 +941,7 @@ PUBLIC U8 rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG] = { /* Special Subframes in OFDM symbols */ /* ccpu00134197-MOD-Correct the number of symbols */ -PUBLIC RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl = { +RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl = { {3, 1, 1, 3, 1, 1}, {9, 1, 1, 8, 1, 1}, {10, 1, 1, 9, 1, 1}, @@ -972,7 +954,7 @@ PUBLIC RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl = { }; /* PHICH 'm' value Table */ -PUBLIC RgSchTddPhichMValTbl rgSchTddPhichMValTbl = { +RgSchTddPhichMValTbl rgSchTddPhichMValTbl = { {2, 1, 0, 0, 0, 2, 1, 0, 0, 0}, {0, 1, 0, 0, 1, 0, 1, 0, 0, 1}, {0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, @@ -983,7 +965,7 @@ PUBLIC RgSchTddPhichMValTbl rgSchTddPhichMValTbl = { }; /* PHICH 'K' value Table */ -PUBLIC RgSchTddKPhichTbl rgSchTddKPhichTbl = { +RgSchTddKPhichTbl rgSchTddKPhichTbl = { {0, 0, 4, 7, 6, 0, 0, 4, 7, 6}, {0, 0, 4, 6, 0, 0, 0, 4, 6, 0}, {0, 0, 6, 0, 0, 0, 0, 6, 0, 0}, @@ -994,7 +976,7 @@ PUBLIC RgSchTddKPhichTbl rgSchTddKPhichTbl = { }; /* Uplink association index 'K' value Table */ -PUBLIC RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl = { +RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl = { {0, 0, 6, 4, 0, 0, 0, 6, 4, 0}, {0, 0, 4, 0, 0, 0, 0, 4, 0, 0}, {0, 0, 4, 4, 4, 0, 0, 0, 0, 0}, @@ -1005,7 +987,7 @@ PUBLIC RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl = { /* PUSCH 'K' value Table */ -PUBLIC RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl = { +RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl = { {4, 6, 0, 0, 0, 4, 6, 0, 0, 0}, {0, 6, 0, 0, 4, 0, 6, 0, 0, 4}, {0, 0, 0, 4, 0, 0, 0, 0, 4, 0}, @@ -1017,7 +999,7 @@ PUBLIC RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl = { /* PDSCH to PUCCH Table for DL Harq Feed back. Based on the Downlink association set index 'K' table */ -PUBLIC U8 rgSchTddPucchTxTbl[7][10] = { +U8 rgSchTddPucchTxTbl[7][10] = { {4, 6, 0, 0, 0, 4, 6, 0, 0, 0}, {7, 6, 0, 0, 4, 7, 6, 0, 0, 4}, {7, 6, 0, 4, 8, 7, 6, 0, 4, 8}, @@ -1046,7 +1028,7 @@ PUBLIC U8 rgSchTddPucchTxTbl[7][10] = { So at sf4 the new CFI can be applied. To arrive at sf4 from sf0, the sfIdx has to be increased by 3 */ -PUBLIC U8 rgSchTddPdcchSfIncTbl[7][10] = { +U8 rgSchTddPdcchSfIncTbl[7][10] = { /* A/N Bundl: 0,1,5,6*/ {2, 1, 0, 0, 0, 2, 1, 0, 0, 0}, /* A/N Bundl: 0,4,5,9*/ {2, 2, 0, 0, 3, 2, 2, 0, 0, 3}, /* A/N Bundl: 4,9*/ {3, 6, 0, 5, 4, 3, 6, 0, 5, 4}, @@ -1061,7 +1043,7 @@ PUBLIC U8 rgSchTddPdcchSfIncTbl[7][10] = { #ifdef LTEMAC_SPS /* subframe offset values to be used when twoIntervalsConfig is enabled in UL * SPS for a UE */ -PUBLIC RgSchTddSfOffTbl rgSchTddSfOffTbl = { +RgSchTddSfOffTbl rgSchTddSfOffTbl = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 1, -1, 0, 0, 0, 1, -1, 0}, {0, 0, 5, 0, 0, 0, 0, -5, 0, 0}, @@ -1077,7 +1059,7 @@ PUBLIC RgSchTddSfOffTbl rgSchTddSfOffTbl = { * as that of Msg3SubfrmTbl, indicates competition with msg3. * As of now, this is same as Msg3SubfrmTbl (leaving out uldlcfg 2), * except that all 255s are now zeros. */ -PUBLIC RgSchTddSpsUlRsrvTbl rgSchTddSpsUlRsrvTbl = { +RgSchTddSpsUlRsrvTbl rgSchTddSpsUlRsrvTbl = { {0, 0, 0, 6, 8, 0, 0, 0, 6, 8}, {0, 0, 6, 9, 0, 0, 0, 6, 9, 0}, {0, 0, 10, 0, 0, 0, 0, 10, 0, 0}, @@ -1088,7 +1070,7 @@ PUBLIC RgSchTddSpsUlRsrvTbl rgSchTddSpsUlRsrvTbl = { }; /* Inverse DL Assoc Set index Table */ -PUBLIC RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = { +RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = { {4, 6, 0, 0, 0, 4, 6, 0, 0, 0}, {7, 6, 0, 0, 4, 7, 6, 0, 0, 4}, {7, 6, 0, 4, 8, 7, 6, 0, 4, 8}, @@ -1104,13 +1086,13 @@ PUBLIC RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = { PRIVATE U8 rgSchTddNumUlSf[] = {6, 4, 2, 3, 2, 1, 5}; /* Downlink HARQ processes Table */ -PUBLIC RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl = { 7, 4, 2, 3, 2, 1, 6}; +RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl = { 7, 4, 2, 3, 2, 1, 6}; /* Uplink HARQ processes Table */ -PUBLIC RgSchTddDlNumHarqProcTbl rgSchTddDlNumHarqProcTbl = { 4, 7, 10, 9, 12, 15, 6}; +RgSchTddDlNumHarqProcTbl rgSchTddDlNumHarqProcTbl = { 4, 7, 10, 9, 12, 15, 6}; /* Downlink association index set 'K' value Table */ -PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl = { +RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl = { { {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}}, {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}} }, { {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}}, {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}} }, @@ -1129,7 +1111,7 @@ PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl = { /* ccpu132282-ADD-the table rgSchTddDlAscSetIdxKTbl is rearranged in * decreasing order of Km, this is used to calculate the NCE used for * calculating N1Pucch Resource for Harq*/ -PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl = { +RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl = { { {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}}, {0, {0}}, {0, {0}}, {1, {6}}, {0, {0}}, {1, {4}} }, { {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}}, {0, {0}}, {0, {0}}, {2, {7, 6}}, {1, {4}}, {0, {0}} }, @@ -1147,20 +1129,20 @@ PUBLIC RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl = { /* Minimum number of Ack/Nack feeback information to be stored for each UL-DL configuration */ -PUBLIC RgSchTddANFdbkMapTbl rgSchTddANFdbkMapTbl = {4, 4, 2, 3, 2, 1, 5}; +RgSchTddANFdbkMapTbl rgSchTddANFdbkMapTbl = {4, 4, 2, 3, 2, 1, 5}; /* Uplink switch points and number of UL subframes Table */ -PUBLIC RgSchTddMaxUlSubfrmTbl rgSchTddMaxUlSubfrmTbl = { +RgSchTddMaxUlSubfrmTbl rgSchTddMaxUlSubfrmTbl = { {2,3,3}, {2,2,2}, {2,1,1}, {1,3,0}, {1,2,0}, {1,1,0}, {2,3,2} }; /* Uplink switch points and number of DL subframes Table */ -PUBLIC RgSchTddMaxDlSubfrmTbl rgSchTddMaxDlSubfrmTbl = { +RgSchTddMaxDlSubfrmTbl rgSchTddMaxDlSubfrmTbl = { {2,2,2}, {2,3,3}, {2,4,4}, {1,7,0}, {1,8,0}, {1,9,0}, {2,2,3} }; /* Number of UL subframes present before a particular subframe */ -PUBLIC RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl = { +RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl = { {0, 0, 1, 2, 3, 3, 3, 4, 5, 6}, {0, 0, 1, 2, 2, 2, 2, 3, 4, 4}, {0, 0, 1, 1, 1, 1, 1, 2, 2, 2}, @@ -1171,7 +1153,7 @@ PUBLIC RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl = { }; /* Number of DL subframes present till a particular subframe */ -PUBLIC RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl = { +RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl = { {1, 2, 2, 2, 2, 3, 4, 4, 4, 4}, {1, 2, 2, 2, 3, 4, 5, 5, 5, 6}, {1, 2, 2, 3, 4, 5, 6, 6, 7, 8}, @@ -1184,7 +1166,7 @@ PUBLIC RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl = { /* Nearest possible UL subframe Index from UL subframe * DL Index < UL Index */ -PUBLIC RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl = { +RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl = { {0, 1, 1, 1, 1, 5, 6, 6, 6, 6}, {0, 1, 1, 1, 4, 5, 6, 6, 6, 9}, {0, 1, 1, 3, 4, 5, 6, 6, 8, 9}, @@ -1197,7 +1179,7 @@ PUBLIC RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl = { /* Nearest possible DL subframe Index from UL subframe * DL Index > UL Index * 10 represents Next SFN low DL Idx */ -PUBLIC RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl = { +RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl = { {0, 1, 5, 5, 5, 5, 6, 10, 10, 10}, {0, 1, 4, 4, 4, 5, 6, 9, 9, 9}, {0, 1, 3, 3, 4, 5, 6, 8, 8, 9}, @@ -1208,7 +1190,7 @@ PUBLIC RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl = { }; /* RACH Message3 related information */ -PUBLIC RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl = { +RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl = { {7, 6, 255, 255, 255, 7, 6, 255, 255, 255}, {7, 6, 255, 255, 8, 7, 6, 255, 255, 8}, {7, 6, 255, 9, 8, 7, 6, 255, 9, 8}, @@ -1256,9 +1238,9 @@ PRIVATE U32 rgSchCmnExtBsrTbl[64] = { 867737, 1067031, 1312097, 1613447, 1984009, 2439678, 3000000, 3100000 }; -PUBLIC U8 rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI]; +U8 rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI]; -PUBLIC RgSchTbSzTbl rgTbSzTbl = { +RgSchTbSzTbl rgTbSzTbl = { { {16, 32, 56, 88, 120, 152, 176, 208, 224, 256, 288, 328, 344, 376, 392, 424, 456, 488, 504, 536, 568, 600, 616, 648, 680, 712, 744, 776, 776, 808, 840, 872, 904, 936, 968, 1000, 1032, 1032, 1064, 1096, 1128, 1160, 1192, 1224, 1256, 1256, 1288, 1320, 1352, 1384, 1416, 1416, 1480, 1480, 1544, 1544, 1608, 1608, 1608, 1672, 1672, 1736, 1736, 1800, 1800, 1800, 1864, 1864, 1928, 1928, 1992, 1992, 2024, 2088, 2088, 2088, 2152, 2152, 2216, 2216, 2280, 2280, 2280, 2344, 2344, 2408, 2408, 2472, 2472, 2536, 2536, 2536, 2600, 2600, 2664, 2664, 2728, 2728, 2728, 2792, 2792, 2856, 2856, 2856, 2984, 2984, 2984, 2984, 2984, 3112}, {24, 56, 88, 144, 176, 208, 224, 256, 328, 344, 376, 424, 456, 488, 520, 568, 600, 632, 680, 712, 744, 776, 808, 872, 904, 936, 968, 1000, 1032, 1064, 1128, 1160, 1192, 1224, 1256, 1288, 1352, 1384, 1416, 1416, 1480, 1544, 1544, 1608, 1608, 1672, 1736, 1736, 1800, 1800, 1864, 1864, 1928, 1992, 1992, 2024, 2088, 2088, 2152, 2152, 2216, 2280, 2280, 2344, 2344, 2408, 2472, 2472, 2536, 2536, 2600, 2600, 2664, 2728, 2728, 2792, 2792, 2856, 2856, 2856, 2984, 2984, 2984, 3112, 3112, 3112, 3240, 3240, 3240, 3240, 3368, 3368, 3368, 3496, 3496, 3496, 3496, 3624, 3624, 3624, 3752, 3752, 3752, 3752, 3880, 3880, 3880, 4008, 4008, 4008}, @@ -1396,7 +1378,7 @@ PRIVATE S16 rgSCHCmnUeIdleExdThrsld ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PUBLIC RgSchUeCb* rgSCHCmnGetHoUe ARGS(( +RgSchUeCb* rgSCHCmnGetHoUe ARGS(( RgSchCellCb *cell, U16 rapId )); @@ -1404,7 +1386,7 @@ PRIVATE Void rgSCHCmnDelDedPreamble ARGS(( RgSchCellCb *cell, U8 preambleId )); -PUBLIC RgSchUeCb* rgSCHCmnGetPoUe ARGS(( +RgSchUeCb* rgSCHCmnGetPoUe ARGS(( RgSchCellCb *cell, U16 rapId, CmLteTimingInfo timingInfo @@ -1570,7 +1552,7 @@ PRIVATE Void rgSCHCmnInitVars ARGS(( RgSchCellCb *cell )); -/*ccpu00117180 - DEL - Moved rgSCHCmnUpdVars to .x as its access is now PUBLIC */ +/*ccpu00117180 - DEL - Moved rgSCHCmnUpdVars to .x as its access is now */ PRIVATE Void rgSCHCmnUlRbAllocForLst ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, @@ -1607,12 +1589,12 @@ RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc )); -PUBLIC Bool rgSCHCmnChkInWin ARGS(( +Bool rgSCHCmnChkInWin ARGS(( CmLteTimingInfo frm, CmLteTimingInfo start, CmLteTimingInfo end )); -PUBLIC Bool rgSCHCmnChkPastWin ARGS(( +Bool rgSCHCmnChkPastWin ARGS(( CmLteTimingInfo frm, CmLteTimingInfo end )); @@ -1901,7 +1883,6 @@ RgSchCmnTbSzEff *effTbl; U8 resOfCrs; /* Effective REs occupied by CRS */ U8 i, j; - TRC2(rgSCHCmnCompEff); switch (cpType) { @@ -1983,7 +1964,6 @@ RgSchCmnTbSzEff *effTbl; U8 noSymPerRb; U8 i, j; - TRC2(rgSCHCmnCompUlEff); switch (cpType) { @@ -2052,7 +2032,6 @@ RgSchCmnTbSzEff *effTbl2Lyr; U8 resOfCrs; /* Effective REs occupied by CRS */ U8 i, j; - TRC2(rgSCHCmn2LyrCompEff); switch (cpType) { @@ -2126,7 +2105,6 @@ RgSchCellCb *cell; #endif { - TRC2(rgSCHCmnGetDciFrmtSizes); /* DCI Format 0 size determination */ rgSchCmnDciFrmtSizes[0] = 1 + @@ -2275,7 +2253,6 @@ RgSchCellCb *cell; U8 i; U8 j; - TRC2(rgSCHCmnGetCqiDciFrmt2AggrLvl); for (i = 0; i < RG_SCH_CMN_MAX_CQI; i++) { @@ -2337,7 +2314,6 @@ PRIVATE Void rgSCHCmnDlInit() RgSchCmnTbSzEff *effTbl; RgSchCmnCqiToTbs *tbsTbl; - TRC2(rgSCHCmnDlInit); /* 0 corresponds to Single layer case, 1 corresponds to 2 layers case*/ /* Init Efficiency table for normal cyclic prefix */ @@ -2577,7 +2553,6 @@ PRIVATE Void rgSCHCmnUlInit() CONSTANT RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0]; S16 i; S16 j; - TRC2(rgSCHCmnUlInit); /* Initaializing new variable added for UL eff */ rgSchCmnUlEffTbl[RG_SCH_CMN_NOR_CP] = &rgSchCmnNorUlEff[0]; @@ -2641,15 +2616,14 @@ PRIVATE Void rgSCHCmnUlInit() * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnInit +Void rgSCHCmnInit ( ) #else -PUBLIC Void rgSCHCmnInit() +Void rgSCHCmnInit() #endif { U8 idx; - TRC2(rgSCHCmnInit); rgSCHCmnDlInit(); rgSCHCmnUlInit(); @@ -2762,13 +2736,13 @@ PUBLIC Void rgSCHCmnInit() * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlRlsSubFrm +Void rgSCHCmnDlRlsSubFrm ( RgSchCellCb *cell, CmLteTimingInfo frm ) #else -PUBLIC Void rgSCHCmnDlRlsSubFrm(cell, frm) +Void rgSCHCmnDlRlsSubFrm(cell, frm) RgSchCellCb *cell; CmLteTimingInfo frm; #endif @@ -2776,7 +2750,6 @@ CmLteTimingInfo frm; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchDlSf *sf; - TRC2(rgSCHCmnDlRlsSubFrm); /* Get the pointer to the subframe */ sf = rgSCHUtlSubFrmGet(cell, frm); @@ -2820,7 +2793,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlCcchRarAlloc); rgSCHCmnDlCcchRetx(cell, &cellSch->allocInfo); /* LTE_ADV_FLAG_REMOVED_START */ @@ -2941,7 +2913,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); - TRC2(rgSCHCmnCcchSduAlloc); /* Return if subframe BW exhausted */ if (allocInfo->ccchSduAlloc.ccchSduDlSf->bw <= @@ -2949,14 +2920,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "bw<=bwAssigned for UEID:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHDhmGetCcchSduHqProc(ueCb, cellSch->dl.time, &(ueDl->proc)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetCcchSduHqProc failed UEID:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } rbAllocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb, cell); @@ -2968,13 +2939,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHDhmRlsHqpTb(ueDl->proc, 0, FALSE); RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnCcchSduDedAlloc failed UEID:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } cmLListAdd2Tail(&allocInfo->ccchSduAlloc.ccchSduTxLst, &ueDl->proc->reqLnk); ueDl->proc->reqLnk.node = (PTR)ueDl->proc; allocInfo->ccchSduAlloc.ccchSduDlSf->schdCcchUe++; - RETVALUE(ROK); + return ROK; } /** * @brief This function scheduler for downlink CCCH messages. @@ -3010,7 +2981,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; - TRC2(rgSCHCmnDlCcchSduTx); node = cell->ccchSduUeLst.first; while(node) @@ -3082,7 +3052,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchDlSf *dlSf = allocInfo->msg4Alloc.msg4DlSf; - TRC2(rgSCHCmnDlCcchTx); node = cell->raInfo.toBeSchdLst.first; while(node) @@ -3145,7 +3114,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchCmnDlUe *ueDl; RgSchDlSf *dlSf = allocInfo->ccchSduAlloc.ccchSduDlSf; - TRC2(rgSCHCmnDlCcchSduRetx); node = cellSch->dl.ccchSduRetxLst.first; while(node) @@ -3241,7 +3209,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 retxBw = 0; RgSchDlSf *dlSf = allocInfo->msg4Alloc.msg4DlSf; - TRC2(rgSCHCmnDlCcchRetx); node = cellSch->dl.msg4RetxLst.first; while(node) @@ -3339,7 +3306,6 @@ RgInfSfAlloc *subfrmAlloc; #endif/*RGR_SI_SCH*/ - TRC2(rgSCHCmnDlBcchPcch); frm = cell->crntTime; #ifdef LTEMAC_HDFDD @@ -3485,14 +3451,14 @@ RgInfSfAlloc *subfrmAlloc; * */ #ifdef ANSI -PUBLIC Bool rgSCHCmnChkInWin +Bool rgSCHCmnChkInWin ( CmLteTimingInfo frm, CmLteTimingInfo start, CmLteTimingInfo end ) #else -PUBLIC Bool rgSCHCmnChkInWin(frm, start, end) +Bool rgSCHCmnChkInWin(frm, start, end) CmLteTimingInfo frm; CmLteTimingInfo start; CmLteTimingInfo end; @@ -3500,7 +3466,6 @@ CmLteTimingInfo end; { Bool inWin = FALSE; - TRC2(rgSCHCmnChkInWin); if (end.sfn > start.sfn) { @@ -3545,7 +3510,7 @@ CmLteTimingInfo end; } } - RETVALUE(inWin); + return (inWin); } /* end of rgSCHCmnChkInWin*/ /* @@ -3563,13 +3528,13 @@ CmLteTimingInfo end; * */ #ifdef ANSI -PUBLIC Bool rgSCHCmnChkPastWin +Bool rgSCHCmnChkPastWin ( CmLteTimingInfo frm, CmLteTimingInfo end ) #else -PUBLIC Bool rgSCHCmnChkPastWin(frm, end) +Bool rgSCHCmnChkPastWin(frm, end) CmLteTimingInfo frm; CmLteTimingInfo end; #endif @@ -3577,13 +3542,12 @@ CmLteTimingInfo end; CmLteTimingInfo refFrm = end; Bool pastWin; - TRC2(rgSCHCmnChkPastWin); RGSCH_INCR_FRAME(refFrm.sfn); RGSCH_INCR_SUB_FRAME(end, 1); pastWin = rgSCHCmnChkInWin(frm, end, refFrm); - RETVALUE(pastWin); + return (pastWin); } /* end of rgSCHCmnChkPastWin*/ /** @@ -3635,7 +3599,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnClcAlloc); bo = (RgSchClcBoRpt *)(lch->boLst.first->node); @@ -3727,13 +3690,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PUBLIC RgSchPdcch *rgSCHCmnCmnPdcchAlloc +RgSchPdcch *rgSCHCmnCmnPdcchAlloc ( RgSchCellCb *cell, RgSchDlSf *subFrm ) #else -PUBLIC RgSchPdcch *rgSCHCmnCmnPdcchAlloc(cell, subFrm) +RgSchPdcch *rgSCHCmnCmnPdcchAlloc(cell, subFrm) RgSchCellCb *cell; RgSchDlSf *subFrm; #endif @@ -3744,7 +3707,6 @@ RgSchDlSf *subFrm; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); U8 numCce; /*store num CCEs based on aggregation level */ - TRC2(rgSCHCmnCmnPdcchAlloc); aggrLvl = cellSch->dl.cmnChAggrLvl; @@ -3776,7 +3738,7 @@ RgSchDlSf *subFrm; numCce = 16; break; default: - RETVALUE(NULLP); + return (NULLP); } if (rgSCHUtlPdcchAvail(cell, pdcchInfo, aggrLvl, &pdcch) == TRUE) @@ -3788,7 +3750,7 @@ RgSchDlSf *subFrm; subFrm->cceCnt += numCce; pdcch->pdcchSearchSpace = RG_SCH_CMN_SEARCH_SPACE; - RETVALUE(pdcch); + return (pdcch); } /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */ @@ -3797,7 +3759,7 @@ RgSchDlSf *subFrm; RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "PDCCH ERR: NO PDDCH AVAIL IN COMMON SEARCH SPACE aggr:%u", aggrLvl); - RETVALUE(NULLP); + return (NULLP); } @@ -3824,7 +3786,7 @@ RgSchDlSf *subFrm; **/ #ifdef LTEMAC_SPS #ifdef ANSI -PUBLIC Void rgSCHCmnClcRbAlloc +Void rgSCHCmnClcRbAlloc ( RgSchCellCb *cell, U32 bo, @@ -3837,7 +3799,7 @@ Bool isSpsBo, RgSchDlSf *sf ) #else -PUBLIC Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, iTbs, isSpsBo) +Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, iTbs, isSpsBo) RgSchCellCb *cell; U32 bo; U8 cqi; @@ -3879,7 +3841,6 @@ RgSchDlSf *sf; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); U8 cfi = cellSch->dl.currCfi; U32 tmpRb=0; - TRC2(rgSCHCmnClcRbAlloc); /* first get the CQI to MCS table and determine the number of RBs */ effTbl = (RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[0][cfi]); @@ -3948,7 +3909,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnMsg4Alloc); /* SR_RACH_STATS : MSG4 TO BE TXED */ rgNumMsg4ToBeTx++; @@ -3958,14 +3918,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId , "bw<=bwAssigned"); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHDhmGetMsg4HqProc(raCb, cellSch->dl.time) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetMsg4HqProc failed"); - RETVALUE(RFAILED); + return RFAILED; } raCb->rbAllocInfo.dlSf = allocInfo->msg4Alloc.msg4DlSf; @@ -3976,13 +3936,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, FALSE); RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnMsg4DedAlloc failed."); - RETVALUE(RFAILED); + return RFAILED; } cmLListAdd2Tail(&allocInfo->msg4Alloc.msg4TxLst, &raCb->dlHqE->msg4Proc->reqLnk); raCb->dlHqE->msg4Proc->reqLnk.node = (PTR)raCb->dlHqE->msg4Proc; allocInfo->msg4Alloc.msg4DlSf->schdCcchUe++; - RETVALUE(ROK); + return ROK; } @@ -4009,7 +3969,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PUBLIC RgSchPdcch *rgSCHCmnPdcchAlloc +RgSchPdcch *rgSCHCmnPdcchAlloc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4019,7 +3979,7 @@ TfuDciFormat dciFrmt, Bool isDtx ) #else -PUBLIC RgSchPdcch *rgSCHCmnPdcchAlloc(cell, subFrm, cqi, dciFrmt, isDtx) +RgSchPdcch *rgSCHCmnPdcchAlloc(cell, subFrm, cqi, dciFrmt, isDtx) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlSf *subFrm; @@ -4032,7 +3992,6 @@ Bool isDtx; RgSchPdcchInfo *pdcchInfo; RgSchPdcch *pdcch; - TRC2(rgSCHCmnPdcchAlloc); /* 3.1 consider the selected DCI format size in determining the * aggregation level */ @@ -4051,7 +4010,7 @@ Bool isDtx; // prc_trace_format_string(PRC_TRACE_GROUP_PS, PRC_TRACE_INFO_LOW,"Forcing alloc in CMN search spc size %d fmt %d \n", // pdcch->dciNumOfBits, dciFrmt); } - RETVALUE(pdcch); + return (pdcch); } #endif @@ -4103,7 +4062,7 @@ Bool isDtx; "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", aggrLvl); - RETVALUE(NULLP); + return (NULLP); } if (rgSCHUtlPdcchAvail(cell, pdcchInfo, aggrLvl, &pdcch) == TRUE) @@ -4139,7 +4098,7 @@ Bool isDtx; /* MSG4 */ pdcch->dciNumOfBits = cell->dciSize.size[dciFrmt]; } - RETVALUE(pdcch); + return (pdcch); } /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */ @@ -4148,7 +4107,7 @@ Bool isDtx; RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", aggrLvl); - RETVALUE(NULLP); + return (NULLP); } #ifdef RGR_V1 @@ -4189,7 +4148,6 @@ RgSchUeCb *ueCb; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnCcchSduDedAlloc); rbAllocinfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb, cell); @@ -4237,7 +4195,7 @@ RgSchUeCb *ueCb; } else { - RETVALUE(RFAILED); + return RFAILED; } } @@ -4249,7 +4207,7 @@ RgSchUeCb *ueCb; rbAllocinfo->rnti = ueCb->ueId; rbAllocinfo->tbInfo[0].noLyr = 1; - RETVALUE(ROK); + return ROK; } #endif @@ -4289,7 +4247,6 @@ RgSchRaCb *raCb; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnMsg4DedAlloc); effBo = raCb->dlCcchInfo.bo + RGSCH_MSG4_HDRSIZE + RGSCH_CONT_RESID_SIZE; @@ -4335,7 +4292,7 @@ RgSchRaCb *raCb; } else { - RETVALUE(RFAILED); + return RFAILED; } } @@ -4347,7 +4304,7 @@ RgSchRaCb *raCb; rbAllocinfo->tbInfo[0].schdlngForTb = TRUE; rbAllocinfo->tbInfo[0].noLyr = 1; - RETVALUE(ROK); + return ROK; } #ifdef LTE_TDD @@ -4389,7 +4346,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 sfnIdx; U8 subfrmIdx; U16 rntiIdx=0; - TRC2(rgSCHCmnDlRaRsp); frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -4482,7 +4438,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 raIdx; RgSchCmnCell *sched; U8 i,noRaRnti=0; - TRC2(rgSCHCmnDlRaRsp); frm = cell->crntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -4595,7 +4550,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 cfi = cellDl->currCfi; #endif - TRC2(rgSCHCmnRaRspAlloc); #ifndef RGR_V1 UNUSED(cellUl); #endif @@ -4611,7 +4565,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "bw == bwAssigned RARNTI:%d",rarnti); - RETVALUE(RFAILED); + return RFAILED; } reqLst = &cell->raInfo.raReqLst[raIndex]; @@ -4619,7 +4573,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "reqLst Count=0 RARNTI:%d",rarnti); - RETVALUE(RFAILED); + return RFAILED; } remNumRapid = reqLst->count; @@ -4688,7 +4642,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; if (!isAlloc) { RLOG_ARG0(L_INFO,DBG_CELLID,cell->cellId,"BW alloc Failed"); - RETVALUE(RFAILED); + return RFAILED; } subFrm->bwAssigned = subFrm->bwAssigned + rb; @@ -4706,7 +4660,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; allocInfo->raRspAlloc[noRaRnti].tbInfo[0].noLyr = 1; allocInfo->raRspAlloc[noRaRnti].vrbgReq = RGSCH_CEIL(nPrb,MAX_5GTF_VRBG_SIZE); schdNumRapid += remNumRapid; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4724,14 +4678,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlAllocFillRbInfo +Void rgSCHCmnUlAllocFillRbInfo ( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc) +Void rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc) RgSchCellCb *cell; RgSchUlSf *sf; RgSchUlAlloc *alloc; @@ -4742,7 +4696,6 @@ RgSchUlAlloc *alloc; U8 cfi = cellDl->currCfi; - TRC2(rgSCHCmnUlAllocFillRbInfo); alloc->grnt.rbStart = (alloc->sbStart * cellUl->sbSize) + cell->dynCfiCb.bwInfo[cfi].startRb; @@ -4804,7 +4757,6 @@ U8 *hqProcIdRef; U8 iMcs; U8 numSb; - TRC2(rgSCHCmnMsg3GrntReq); *ulAllocRef = NULLP; @@ -4927,7 +4879,6 @@ Bool isEmtcUe; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); U8 cfi = cellSch->dl.currCfi; - TRC2(rgSCHCmnDlSetUeAllocLmt); #ifdef EMTC_ENABLE if(TRUE == isEmtcUe) @@ -5092,7 +5043,6 @@ RgSchUeCb *ue; U8 cqiBasediTbs; U8 actualiTbs; - TRC2(rgSCHCheckAndSetTxScheme); maxiTbs = (*(RgSchCmnCqiToTbs*)(cellSch->dl.cqiToTbsTbl[0][cfi]))\ [RG_SCH_CMN_MAX_CQI - 1]; @@ -5135,13 +5085,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlSetUeAllocLmtLa +Void rgSCHCmnDlSetUeAllocLmtLa ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnDlSetUeAllocLmtLa(cell, ue) +Void rgSCHCmnDlSetUeAllocLmtLa(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -5155,7 +5105,6 @@ RgSchUeCb *ue; U8 maxiTbs; U8 cwIdx = 0; - TRC2(rgSCHCmnDlSetUeAllocLmtLa); maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1]; if(ueDl->cqiFlag == TRUE) @@ -5250,17 +5199,16 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlHqPResetTemp +Void rgSCHCmnDlHqPResetTemp ( RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHCmnDlHqPResetTemp(hqP) +Void rgSCHCmnDlHqPResetTemp(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHCmnDlHqPResetTemp); /* Fix: syed having a hqP added to Lists for RB assignment rather than * a UE, as adding UE was limiting handling some scenarios */ @@ -5285,13 +5233,13 @@ RgSchDlHqProcCb *hqP; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlUeResetTemp +Void rgSCHCmnDlUeResetTemp ( RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHCmnDlUeResetTemp(ue, hqP) +Void rgSCHCmnDlUeResetTemp(ue, hqP) RgSchUeCb *ue; RgSchDlHqProcCb *hqP; #endif @@ -5302,7 +5250,6 @@ RgSchDlHqProcCb *hqP; Void *tmpCb; #endif - TRC2(rgSCHCmnDlUeResetTemp); /* Fix : syed check for UE's existence was useless. * Instead we need to check that reset is done only for the @@ -5315,7 +5262,7 @@ RgSchDlHqProcCb *hqP; #ifdef LTE_ADV tmpCb = allocInfo->laaCb; #endif - cmMemset((U8 *)allocInfo, (U8)0, sizeof(RgSchDlRbAlloc)); + memset(allocInfo, 0, sizeof(RgSchDlRbAlloc)); allocInfo->rnti = ue->ueId; #ifdef LTE_ADV allocInfo->laaCb = tmpCb; @@ -5344,22 +5291,21 @@ RgSchDlHqProcCb *hqP; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlUeResetTemp +Void rgSCHCmnUlUeResetTemp ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUlUeResetTemp(cell, ue) +Void rgSCHCmnUlUeResetTemp(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchCmnUlUe *cmnUlUe = RG_SCH_CMN_GET_UL_UE(ue,cell); - TRC2(rgSCHCmnUlUeResetTemp); - cmMemset((U8 *)&cmnUlUe->alloc, (U8)0, sizeof(cmnUlUe->alloc)); + memset(&cmnUlUe->alloc, 0, sizeof(cmnUlUe->alloc)); RETVOID; } /* rgSCHCmnUlUeResetTemp */ @@ -5384,21 +5330,20 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnFillPdcch +Void rgSCHCmnFillPdcch ( RgSchCellCb *cell, RgSchPdcch *pdcch, RgSchDlRbAlloc *rbAllocInfo ) #else -PUBLIC Void rgSCHCmnFillPdcch(cell, pdcch, rbAllocInfo) +Void rgSCHCmnFillPdcch(cell, pdcch, rbAllocInfo) RgSchCellCb *cell; RgSchPdcch *pdcch; RgSchDlRbAlloc *rbAllocInfo; #endif { - TRC2(rgSCHCmnFillPdcch); /* common channel pdcch filling, * only 1A and Local is supported */ @@ -5559,7 +5504,6 @@ RgSchTddSubfrmInfo *subfrmInfo; U8 dlSfCnt = 0; U8 splfrmIdx = 0; - TRC2(rgSCHCmnIsSplSubfrm); if(splfrmCnt > 0) { @@ -5591,10 +5535,10 @@ RgSchTddSubfrmInfo *subfrmInfo; if(splfrmIdx == curSubfrmIdx) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /** @@ -5634,7 +5578,6 @@ U8 tbAllocIdx; { RgSchUeCb *ue = hqP->hqE->ue; - TRC2(rgSCHCmnUpdHqAndDai); if(subFrm != NULLP) { @@ -5699,7 +5642,7 @@ U8 tbAllocIdx; * **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnUpdDai +U8 rgSCHCmnUpdDai ( RgSchUeCb *ue, CmLteTimingInfo *fdbkTime, @@ -5709,7 +5652,7 @@ RgSchDlHqProcCb *hqP, U8 *ulDai ) #else -PUBLIC U8 rgSCHCmnUpdDai(ue, fdbkTime, m, havePdcch,tbCb,servCellId,hqP,ulDai) +U8 rgSCHCmnUpdDai(ue, fdbkTime, m, havePdcch,tbCb,servCellId,hqP,ulDai) RgSchUeCb *ue; CmLteTimingInfo *fdbkTime; U8 m; @@ -5723,7 +5666,6 @@ U8 *ulDai; U8 ackNackFdbkArrSize; - TRC2(rgSCHCmnUpdDai); if(hqP != NULLP) {/* Non SPS */ @@ -5788,13 +5730,13 @@ U8 *ulDai; *ulDai = anInfo->ulDai; } #endif - RETVALUE(anInfo->dlDai); + return (anInfo->dlDai); } #endif /* ifdef LTE_TDD */ -PUBLIC U32 rgHqRvRetxCnt[4][2]; -PUBLIC U32 rgUlrate_grant; +U32 rgHqRvRetxCnt[4][2]; +U32 rgUlrate_grant; /** * @brief This function fills the HqP TB with rbAllocInfo. @@ -5815,7 +5757,7 @@ PUBLIC U32 rgUlrate_grant; **/ #ifdef LTEMAC_SPS #ifdef ANSI -PUBLIC Void rgSCHCmnFillHqPTb +Void rgSCHCmnFillHqPTb ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -5823,7 +5765,7 @@ U8 tbAllocIdx, RgSchPdcch *pdcch ) #else -PUBLIC Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch) +Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; U8 tbAllocIdx; @@ -5852,7 +5794,6 @@ RgSchPdcch *pdcch; RgSchDlHqTbCb *tbInfo = tbAllocInfo->tbCb; RgSchDlHqProcCb *hqP = tbInfo->hqP; - TRC2(rgSCHCmnFillHqPTb); /*ccpu00120365-ADD-if tb is disabled, set mcs=0,rv=1. * Relevant for DCI format 2 & 2A as per 36.213-7.1.7.2 @@ -5958,7 +5899,6 @@ U8 tpc; #endif { - TRC2(rgSCHCmnFillHqPPdcchDciFrmtB1B2) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); //Currently hardcoding values here. @@ -6055,14 +5995,14 @@ extern U32 addedForScell2; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnFillHqPPdcch +Void rgSCHCmnFillHqPPdcch ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHCmnFillHqPPdcch(cell, rbAllocInfo, hqP) +Void rgSCHCmnFillHqPPdcch(cell, rbAllocInfo, hqP) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; @@ -6072,7 +6012,6 @@ RgSchDlHqProcCb *hqP; RgSchPdcch *pdcch = rbAllocInfo->pdcch; U8 tpc = 1; - TRC2(rgSCHCmnFillHqPPdcch); if (hqP->hqE->ue) { @@ -6245,7 +6184,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt1) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); pdcch->dci.u.format1Info.tpcCmd = tpc; @@ -6381,7 +6319,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt1A) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); pdcch->dci.u.format1aInfo.isPdcchOrder = FALSE; @@ -6514,7 +6451,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt1B) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); pdcch->dci.u.format1bInfo.tpcCmd = tpc; @@ -6638,7 +6574,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt2) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); /*ccpu00120365:-ADD-call also if tb is disabled */ @@ -6792,7 +6727,6 @@ U8 tpc; RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); #endif - TRC2(rgSCHCmnFillHqPPdcchDciFrmt2A) rgSCHCmnFillHqPTb(cell, rbAllocInfo, 0, pdcch); /*ccpu00120365:-ADD-call also if tb is disabled */ @@ -6927,7 +6861,6 @@ RgSchCellCb *cell; { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnInitVars); cellUl->idx = RGSCH_INVALID_INFO; cellUl->schdIdx = RGSCH_INVALID_INFO; @@ -6961,12 +6894,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUpdVars +Void rgSCHCmnUpdVars ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnUpdVars(cell) +Void rgSCHCmnUpdVars(cell) RgSchCellCb *cell; #endif { @@ -6974,7 +6907,6 @@ RgSchCellCb *cell; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); U16 idx; - TRC2(rgSCHCmnUpdVars); idx = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot); cellUl->idx = ((idx) % (RG_SCH_CMN_UL_NUM_SF)); @@ -7049,13 +6981,13 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnGetPhichUlSfIdx +U8 rgSCHCmnGetPhichUlSfIdx ( CmLteTimingInfo *timeInfo, RgSchCellCb *cell ) #else -PUBLIC U8 rgSCHCmnGetPhichUlSfIdx(timeInfo, cell) +U8 rgSCHCmnGetPhichUlSfIdx(timeInfo, cell) CmLteTimingInfo *timeInfo; RgSchCellCb *cell; #endif @@ -7068,13 +7000,12 @@ RgSchCellCb *cell; U16 sfn; U8 subframe; - TRC2(rgSCHCmnGetPhichUlSfIdx); dlsf = rgSCHUtlSubFrmGet(cell, *timeInfo); if(dlsf->phichOffInfo.sfnOffset == RGSCH_INVALID_INFO) { - RETVALUE(RGSCH_INVALID_INFO); + return (RGSCH_INVALID_INFO); } subframe = dlsf->phichOffInfo.subframe; @@ -7087,7 +7018,7 @@ RgSchCellCb *cell; numUlSf = ((numUlSf * sfn) + rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][subframe]) - 1; idx = numUlSf % (cellUl->numUlSubfrms); - RETVALUE(idx); + return (idx); } /** @@ -7105,13 +7036,13 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnGetUlSfIdx +U8 rgSCHCmnGetUlSfIdx ( CmLteTimingInfo *timeInfo, RgSchCellCb *cell ) #else -PUBLIC U8 rgSCHCmnGetUlSfIdx(timeInfo, cell) +U8 rgSCHCmnGetUlSfIdx(timeInfo, cell) CmLteTimingInfo *timeInfo; RgSchCellCb *cell; #endif @@ -7121,7 +7052,6 @@ RgSchCellCb *cell; U8 idx = 0; U16 numUlSf; - TRC2(rgSCHCmnGetUlSfIdx); /* ccpu00130980: numUlSf(U16) parameter added to avoid integer * wrap case such that idx will be proper*/ @@ -7130,7 +7060,7 @@ RgSchCellCb *cell; rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][timeInfo->subframe]) - 1; idx = numUlSf % (cellUl->numUlSubfrms); - RETVALUE(idx); + return (idx); } #endif @@ -7150,13 +7080,13 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnGetUlHqProcIdx +U8 rgSCHCmnGetUlHqProcIdx ( CmLteTimingInfo *timeInfo, RgSchCellCb *cell ) #else -PUBLIC U8 rgSCHCmnGetUlHqProcIdx(timeInfo, cell) +U8 rgSCHCmnGetUlHqProcIdx(timeInfo, cell) CmLteTimingInfo *timeInfo; RgSchCellCb *cell; #endif @@ -7175,7 +7105,6 @@ RgSchCellCb *cell; U8 numUlHarq = rgSchTddUlNumHarqProcTbl[ulDlCfgIdx] /* TRACE 5 Changes */ - TRC2(rgSCHCmnGetUlHqProcIdx); /* Calculate the number of UL SF in one SFN */ numUlSfInSfn = RGSCH_NUM_SUB_FRAMES - @@ -7198,7 +7127,7 @@ RgSchCellCb *cell; procId = numUlSf % numUlHarq; #endif - RETVALUE(procId); + return (procId); } @@ -7219,19 +7148,18 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlFreeAlloc +Void rgSCHCmnUlFreeAlloc ( RgSchCellCb *cell, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHCmnUlFreeAlloc(cell, alloc) +Void rgSCHCmnUlFreeAlloc(cell, alloc) RgSchCellCb *cell; RgSchUlAlloc *alloc; #endif { RgSchUlHqProcCb *hqProc; - TRC2(rgSCHCmnUlFreeAllocation); if (alloc->forMsg3) { @@ -7270,14 +7198,14 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlFreeAllocation +Void rgSCHCmnUlFreeAllocation ( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHCmnUlFreeAllocation(cell, sf, alloc) +Void rgSCHCmnUlFreeAllocation(cell, sf, alloc) RgSchCellCb *cell; RgSchUlSf *sf; RgSchUlAlloc *alloc; @@ -7285,7 +7213,6 @@ RgSchUlAlloc *alloc; { RgSchUlHqProcCb *hqProc; - TRC2(rgSCHCmnUlFreeAllocation); if (alloc->forMsg3) { @@ -7335,13 +7262,13 @@ RgSchUlAlloc *alloc; * -# NULLP when unsuccessful **/ #ifdef ANSI -PUBLIC RgSchPdcch *rgSCHCmnPdcchAllocCrntSf +RgSchPdcch *rgSCHCmnPdcchAllocCrntSf ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(cell, ue) +RgSchPdcch *rgSCHCmnPdcchAllocCrntSf(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -7351,7 +7278,6 @@ RgSchUeCb *ue; RgSchDlSf *sf; RgSchPdcch *pdcch = NULLP; - TRC2(rgSCHCmnPdcchAllocCrntSf); RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA); sf = rgSCHUtlSubFrmGet(cell, frm); @@ -7371,7 +7297,7 @@ RgSchUeCb *ue; //pdcch = rgSCHCmnPdcchAlloc(cell, ue, sf, y, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_0, FALSE); pdcch = rgSCHCmnPdcchAlloc(cell, ue, sf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_A1, FALSE); } - RETVALUE(pdcch); + return (pdcch); } /*********************************************************** @@ -7390,18 +7316,17 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlAllocFillNdmrs +Void rgSCHCmnUlAllocFillNdmrs ( RgSchCmnUlCell *cellUl, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHCmnUlAllocFillNdmrs(cellUl, alloc) +Void rgSCHCmnUlAllocFillNdmrs(cellUl, alloc) RgSchCmnUlCell *cellUl; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHCmnUlAllocFillNdmrs); alloc->grnt.nDmrs = cellUl->dmrsArr[alloc->sbStart]; RETVOID; } @@ -7421,7 +7346,7 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlAllocLnkHqProc +Void rgSCHCmnUlAllocLnkHqProc ( RgSchUeCb *ue, RgSchUlAlloc *alloc, @@ -7429,14 +7354,13 @@ RgSchUlHqProcCb *proc, Bool isRetx ) #else -PUBLIC Void rgSCHCmnUlAllocLnkHqProc(ue, alloc, proc, isRetx) +Void rgSCHCmnUlAllocLnkHqProc(ue, alloc, proc, isRetx) RgSchUeCb *ue; RgSchUlAlloc *alloc; RgSchUlHqProcCb *proc; Bool isRetx; #endif { - TRC2(rgSCHCmnUlAllocLnkHqProc); if(TRUE == isRetx) { @@ -7474,13 +7398,13 @@ Bool isRetx; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnPdcchRlsCrntSf +Void rgSCHCmnPdcchRlsCrntSf ( RgSchCellCb *cell, RgSchPdcch *pdcch ) #else -PUBLIC Void rgSCHCmnPdcchRlsCrntSf(cell, pdcch) +Void rgSCHCmnPdcchRlsCrntSf(cell, pdcch) RgSchCellCb *cell; RgSchPdcch *pdcch; #endif @@ -7488,7 +7412,6 @@ RgSchPdcch *pdcch; CmLteTimingInfo frm = cell->crntTime; RgSchDlSf *sf; - TRC2(rgSCHCmnPdcchRlsCrntSf); RGSCH_INCR_SUB_FRAME(frm, TFU_ULCNTRL_DLDELTA); sf = rgSCHUtlSubFrmGet(cell, frm); @@ -7509,21 +7432,20 @@ RgSchPdcch *pdcch; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlFillPdcchWithAlloc +Void rgSCHCmnUlFillPdcchWithAlloc ( RgSchPdcch *pdcch, RgSchUlAlloc *alloc, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUlFillPdcchWithAlloc(pdcch, alloc, ue) +Void rgSCHCmnUlFillPdcchWithAlloc(pdcch, alloc, ue) RgSchPdcch *pdcch; RgSchUlAlloc *alloc; RgSchUeCb *ue; #endif { - TRC2(rgSCHCmnUlFillPdcchWithAlloc); pdcch->ue = ue; pdcch->rnti = alloc->rnti; @@ -7608,20 +7530,19 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlAllocFillTpc +Void rgSCHCmnUlAllocFillTpc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUlAlloc *alloc ) #else -PUBLIC Void rgSCHCmnUlAllocFillTpc(cell, ue, alloc) +Void rgSCHCmnUlAllocFillTpc(cell, ue, alloc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchUlAlloc *alloc; #endif { - TRC2(rgSCHCmnUlAllocFillTpc); alloc->grnt.tpc = rgSCHPwrPuschTpcForUe(cell, ue); RETVOID; } @@ -7660,10 +7581,9 @@ U32 wait; CmTmrArg arg; RgSchCmnUeInfo *ueSchd = RG_SCH_CMN_GET_CMN_UE(ue); - TRC2(rgSCHCmnAddUeToRefreshQ); UNUSED(cell); - cmMemset((U8 *)&arg, 0, sizeof(arg)); + memset(&arg, 0, sizeof(arg)); arg.tqCp = &sched->tmrTqCp; arg.tq = sched->tmrTq; arg.timers = &ueSchd->tmr; @@ -7709,7 +7629,6 @@ RgSchUeCb *ue; RgSchCmnLcg *lcgCmn; CmLList *node; RgSchCmnAllocRecord *allRcd; - TRC2(rgSCHCmnUlUeReset); ue->ul.minReqBytes = 0; ue->ul.totalBsr = 0; @@ -7775,7 +7694,6 @@ RgSchUeCb *ue; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); - TRC2(rgSCHCmnResetRiCqi); rgSCHCmnUpdUeUlCqiInfo(cell, ue, ueUl, ueSchCmn, cellSchd, cell->isCpUlExtend); @@ -7841,7 +7759,6 @@ RgSchUeCb *ue; RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlUeReset); if (ueDl->rachInfo.poLnk.node != NULLP) { @@ -7886,13 +7803,13 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUeReset +Void rgSCHCmnUeReset ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUeReset(cell, ue) +Void rgSCHCmnUeReset(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -7901,7 +7818,6 @@ RgSchUeCb *ue; Pst pst; RgInfResetHqEnt hqEntRstInfo; - TRC2(rgSCHCmnUeReset); /* RACHO: remove UE from pdcch, handover and rapId assoc Qs */ rgSCHCmnDelRachInfo(cell, ue); @@ -7961,19 +7877,18 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHCmnActvtUlUe +Void rgSCHCmnActvtUlUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnActvtUlUe(cell, ue) +Void rgSCHCmnActvtUlUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnActvtUlUe); /* : take care of this in UL retransmission */ cellSchd->apisUl->rgSCHUlActvtUe(cell, ue); @@ -7997,19 +7912,18 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHCmnActvtDlUe +Void rgSCHCmnActvtDlUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnActvtDlUe(cell, ue) +Void rgSCHCmnActvtDlUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnActvtDlUe); cellSchd->apisDl->rgSCHDlActvtUe(cell, ue); RETVOID; @@ -8030,20 +7944,19 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnHdlUlTransInd +Void rgSCHCmnHdlUlTransInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHCmnHdlUlTransInd(cell, ue, timingInfo) +Void rgSCHCmnHdlUlTransInd(cell, ue, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { - TRC2(rgSCHCmnHdlUlTransInd); /* Update the latest UL dat/sig transmission time */ RGSCHCPYTIMEINFO(timingInfo, ue->ul.ulTransTime); @@ -8085,28 +7998,27 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) #endif { U32 bitMap0, bitMap1; - TRC2(rgSCHCmnComp4TxMode4); bitMap0 = pmiBitMap[0]; bitMap1 = pmiBitMap[1]; if((bitMap1) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap1>>16) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else if((bitMap0) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_3); + return (RG_SCH_CMN_RANK_3); } else if((bitMap0>>16) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_4); + return (RG_SCH_CMN_RANK_4); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8137,19 +8049,18 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) #endif { U32 bitMap0; - TRC2(rgSCHCmnComp2TxMode4); bitMap0 = pmiBitMap[0]; if((bitMap0>>26)& 0x0F) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap0>>30) & 3) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8179,27 +8090,26 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) #endif { U32 bitMap0; - TRC2(rgSCHCmnComp4TxMode3); bitMap0 = pmiBitMap[0]; if((bitMap0>>28)& 1) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap0>>29) &1) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else if((bitMap0>>30) &1) { - RETVALUE (RG_SCH_CMN_RANK_3); + return (RG_SCH_CMN_RANK_3); } else if((bitMap0>>31) &1) { - RETVALUE (RG_SCH_CMN_RANK_4); + return (RG_SCH_CMN_RANK_4); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8229,19 +8139,18 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) #endif { U32 bitMap0; - TRC2(rgSCHCmnComp2TxMode3); bitMap0 = pmiBitMap[0]; if((bitMap0>>30)& 1) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap0>>31) &1) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8276,27 +8185,26 @@ PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) U8 numTxPorts; #endif { - TRC2(rgSCHCmnComputeRank); if (numTxPorts ==2 && txMode == RGR_UE_TM_3) { - RETVALUE (rgSCHCmnComp2TxMode3(pmiBitMap)); + return (rgSCHCmnComp2TxMode3(pmiBitMap)); } else if (numTxPorts ==4 && txMode == RGR_UE_TM_3) { - RETVALUE (rgSCHCmnComp4TxMode3(pmiBitMap)); + return (rgSCHCmnComp4TxMode3(pmiBitMap)); } else if (numTxPorts ==2 && txMode == RGR_UE_TM_4) { - RETVALUE (rgSCHCmnComp2TxMode4(pmiBitMap)); + return (rgSCHCmnComp2TxMode4(pmiBitMap)); } else if (numTxPorts ==4 && txMode == RGR_UE_TM_4) { - RETVALUE (rgSCHCmnComp4TxMode4(pmiBitMap)); + return (rgSCHCmnComp4TxMode4(pmiBitMap)); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8317,13 +8225,13 @@ PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) **/ /*KWORK_FIX:Changed function return type to void */ #ifdef ANSI -PUBLIC Void rgSCHCmnDlDeInitHqEnt +Void rgSCHCmnDlDeInitHqEnt ( RgSchCellCb *cell, RgSchDlHqEnt *hqE ) #else -PUBLIC Void rgSCHCmnDlDeInitHqEnt(cell, hqE) +Void rgSCHCmnDlDeInitHqEnt(cell, hqE) RgSchCellCb *cell; RgSchDlHqEnt *hqE; #endif @@ -8333,7 +8241,6 @@ RgSchDlHqEnt *hqE; U8 cnt; S16 ret; - TRC2(rgSCHCmnDlDeInitHqEnt); ret = cellSchd->apisDl->rgSCHDlUeHqEntDeInit(cell, hqE); /* Free only If the Harq proc are created*/ @@ -8373,13 +8280,13 @@ RgSchDlHqEnt *hqE; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnDlInitHqEnt +S16 rgSCHCmnDlInitHqEnt ( RgSchCellCb *cell, RgSchDlHqEnt *hqEnt ) #else -PUBLIC S16 rgSCHCmnDlInitHqEnt(cell, hqEnt) +S16 rgSCHCmnDlInitHqEnt(cell, hqEnt) RgSchCellCb *cell; RgSchDlHqEnt *hqEnt; #endif @@ -8389,7 +8296,6 @@ RgSchDlHqEnt *hqEnt; U8 cnt; RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlInitHqEnt); for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++) { @@ -8397,7 +8303,7 @@ RgSchDlHqEnt *hqEnt; if (rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(hqP->sch), (sizeof(RgSchCmnDlHqProc))) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } #ifdef EMTC_ENABLE @@ -8405,7 +8311,7 @@ RgSchDlHqEnt *hqEnt; { if(ROK != cellSchd->apisEmtcDl->rgSCHDlUeHqEntInit(cell, hqEnt)) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -8414,11 +8320,11 @@ RgSchDlHqEnt *hqEnt; { if(ROK != cellSchd->apisDl->rgSCHDlUeHqEntInit(cell, hqEnt)) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* rgSCHCmnDlInitHqEnt */ /** @@ -8454,7 +8360,6 @@ RgSchUeCb *ue; #ifdef DEBUGP Inst inst = cell->instIdx; #endif - TRC2(rgSCHCmnGetRefreshDist); for(refOffst = 0; refOffst < RGSCH_MAX_REFRESH_OFFSET; refOffst++) { @@ -8463,7 +8368,7 @@ RgSchUeCb *ue; cell->refreshUeCnt[refOffst]++; ue->refreshOffset = refOffst; /* printf("UE[%d] refresh offset[%d]. Cell refresh ue count[%d].\n", ue->ueId, refOffst, cell->refreshUeCnt[refOffst]); */ - RETVALUE(refOffst); + return (refOffst); } } @@ -8472,7 +8377,7 @@ RgSchUeCb *ue; cell->refreshUeCnt[refOffst-1]++; ue->refreshOffset = refOffst-1; - RETVALUE(refOffst-1); + return (refOffst-1); } /** * @brief This function computes initial Refresh Wait Period. @@ -8509,7 +8414,6 @@ U32 *waitPer; U32 refreshPer; U32 crntSubFrm; - TRC2(rgSCHCmnGetRefreshPer); refreshPer = RG_SCH_CMN_REFRESH_TIME * RG_SCH_CMN_REFRESH_TIMERES; crntSubFrm = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot; @@ -8546,7 +8450,7 @@ U32 *waitPer; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrSCellUeCfg +S16 rgSCHCmnRgrSCellUeCfg ( RgSchCellCb *sCell, RgSchUeCb *ue, @@ -8554,7 +8458,7 @@ RgrUeSecCellCfg *sCellInfoCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrSCellUeCfg(sCell, ue, sCellInfoCfg, err) +S16 rgSCHCmnRgrSCellUeCfg(sCell, ue, sCellInfoCfg, err) RgSchCellCb *sCell; RgSchUeCb *ue; RgrUeSecCellCfg *sCellInfoCfg; @@ -8577,7 +8481,6 @@ RgSchErrInfo *err; Inst inst = ue->cell->instIdx; #endif U32 idx = (U8)((sCell->cellId - rgSchCb[sCell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); - TRC2(rgSCHCmnRgrSCellUeCfg); pCellUeSchCmn = RG_SCH_CMN_GET_UE(ue,ue->cell); pCellUeDl = &pCellUeSchCmn->dl; @@ -8588,7 +8491,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Memory allocation FAILED\n")); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ueSchCmn = RG_SCH_CMN_GET_UE(ue,sCell); @@ -8649,7 +8552,7 @@ RgSchErrInfo *err; if ((cellSchd->apisDl->rgSCHRgrSCellDlUeCfg(sCell, ue, err)) != ROK) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Spec Sched DL UE CFG FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } /* TODO: enhance for DLFS RB Allocation for SCELLs in future dev */ @@ -8660,7 +8563,7 @@ RgSchErrInfo *err; if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeCfg(sCell, ue, sCellInfoCfg, err)) != ROK) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS UE config FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8677,7 +8580,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL UHM HARQ Ent Init " "Failed for CRNTI:%d", ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } ueUlPcell = RG_SCH_CMN_GET_UL_UE(ue, ue->cell); @@ -8711,7 +8614,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL Memory allocation FAILED" "for CRNTI:%d",ue->ueId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } allRcd->allocTime = sCell->crntTime; cmLListAdd2Tail(&ueUl->ulAllocLst, &allRcd->lnk); @@ -8724,7 +8627,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Could not do " "power config for UE CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE @@ -8734,7 +8637,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -8744,14 +8647,14 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } ue->ul.isUlCaEnabled = TRUE; } - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrSCellUeCfg */ @@ -8772,13 +8675,13 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrSCellUeDel +S16 rgSCHCmnRgrSCellUeDel ( RgSchUeCellInfo *sCellInfo, RgSchUeCb *ue ) #else -PUBLIC S16 rgSCHCmnRgrSCellUeDel(sCellInfo, ue) +S16 rgSCHCmnRgrSCellUeDel(sCellInfo, ue) RgSchUeCellInfo *sCellInfo; RgSchUeCb *ue; #endif @@ -8786,7 +8689,6 @@ RgSchUeCb *ue; RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(ue->cell); Inst inst = ue->cell->instIdx; - TRC2(rgSCHCmnRgrSCellUeDel); cellSchd->apisDl->rgSCHRgrSCellDlUeDel(sCellInfo, ue); @@ -8810,7 +8712,7 @@ RgSchUeCb *ue; if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeDel(sCellInfo->cell, ue)) != ROK) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS Scell del FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8818,7 +8720,7 @@ RgSchUeCb *ue; (Data**)(&(sCellInfo->sch)), (sizeof(RgSchCmnUe))); - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrSCellUeDel */ #endif @@ -8843,20 +8745,19 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmn5gtfUeCfg +S16 rgSCHCmn5gtfUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *cfg ) #else -PUBLIC S16 rgSCHCmn5gtfUeCfg(cell, ue, cfg) +S16 rgSCHCmn5gtfUeCfg(cell, ue, cfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCfg *cfg; #endif { - TRC2(rgSCHCmnRgrUeCfg); RgSchUeGrp *ue5gtfGrp; ue->ue5gtfCb.grpId = cfg->ue5gtfCfg.grpId; @@ -8882,11 +8783,11 @@ RgrUeCfg *cfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "5GTF_ERROR Invalid beam id CRNTI:%d",cfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } ue5gtfGrp->beamBitMask |= (1 << ue->ue5gtfCb.BeamId); - RETVALUE(ROK); + return ROK; } #endif @@ -8914,7 +8815,7 @@ RgrUeCfg *cfg; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrUeCfg +S16 rgSCHCmnRgrUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -8922,7 +8823,7 @@ RgrUeCfg *ueCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrUeCfg(cell, ue, ueCfg, err) +S16 rgSCHCmnRgrUeCfg(cell, ue, ueCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCfg *ueCfg; @@ -8940,7 +8841,6 @@ RgSchErrInfo *err; U32 waitPer; U32 idx = (U8)((cell->cellId - rgSchCb[cell->instIdx].genCfg.startCellId)&(CM_LTE_MAX_CELLS-1)); RgSchUeCellInfo *pCellInfo = RG_SCH_CMN_GET_PCELL_INFO(ue); - TRC2(rgSCHCmnRgrUeCfg); /* 1. Allocate Common sched control block */ @@ -8950,7 +8850,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ueSchCmn = RG_SCH_CMN_GET_UE(ue,cell); ue->dl.ueDlCqiCfg = ueCfg->ueDlCqiCfg; @@ -9028,7 +8928,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"UL Ambr and DL Ambr are" "configured as 0 for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } /* DL ambr */ ue->dl.ambrCfgd = (ueCfg->ueQosCfg.dlAmbr * RG_SCH_CMN_REFRESH_TIME)/100; @@ -9045,7 +8945,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9056,7 +8956,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9086,7 +8986,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED" "for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } allRcd->allocTime = cell->crntTime; cmLListAdd2Tail(&ueUl->ulAllocLst, &allRcd->lnk); @@ -9102,7 +9002,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "SCH struct alloc failed for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } } /* After initialising UL part, do power related init */ @@ -9111,7 +9011,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do " "power config for UE CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS ret = rgSCHCmnSpsUeCfg(cell, ue, ueCfg, err); @@ -9119,7 +9019,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do " "SPS config for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTEMAC_SPS */ @@ -9130,7 +9030,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9140,7 +9040,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9151,7 +9051,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DLFS UE config FAILED" "for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9163,7 +9063,7 @@ RgSchErrInfo *err; rgSCHCmn5gtfUeCfg(cell, ue, ueCfg); #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrUeCfg */ /** @@ -9213,7 +9113,6 @@ RgrUeRecfg *ueRecfg; #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlHdlTxModeRecfg); if (ueRecfg->txMode.pres != PRSNT_NODEF) { @@ -9317,7 +9216,6 @@ RgSchCellCb *cell; RgSchCmnCell *cellSchd; #endif { - TRC2(rgSCHCmnUpdUeMimoInfo) #ifdef TFU_UPGRADE if(ueCfg->txMode.pres) { @@ -9387,7 +9285,6 @@ Bool isEcp; #endif { - TRC2(rgSCHCmnUpdUeUlCqiInfo) #ifdef TFU_UPGRADE if(ue->srsCb.srsCfg.type == RGR_SCH_SRS_SETUP) @@ -9461,7 +9358,6 @@ RgSchCellCb *cell; RgSchCmnUe *ueSchCmn = RG_SCH_CMN_GET_UE(ue,cell); RgSchCmnCell *cellSchd = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUpdUeCatCfg) ueDl->maxTbBits = rgUeCatTbl[ueSchCmn->cmn.ueCat].maxDlTbBits; @@ -9514,7 +9410,7 @@ RgSchCellCb *cell; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrUeRecfg +S16 rgSCHCmnRgrUeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -9522,7 +9418,7 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrUeRecfg(cell, ue, ueRecfg, err) +S16 rgSCHCmnRgrUeRecfg(cell, ue, ueRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -9532,7 +9428,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell); U32 waitPer; - TRC2(rgSCHCmnRgrUeRecfg); /* Basic validations */ if (ueRecfg->ueRecfgTypes & RGR_UE_TXMODE_RECFG) { @@ -9567,7 +9462,7 @@ RgSchErrInfo *err; "reporting mode %d for old CRNIT:%d", (int)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->oldCrnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->dl.ueDlCqiCfg.prdCqiCfg = ueRecfg->prdDlCqiRecfg; } @@ -9579,7 +9474,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Power Reconfiguration Failed for OLD CRNTI:%d",ueRecfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9591,7 +9486,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Ul Ambr and DL Ambr " "configured as 0 for OLD CRNTI:%d",ueRecfg->oldCrnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->ul.cfgdAmbr = (ueRecfg->ueQosRecfg.ueBr * \ RG_SCH_CMN_REFRESH_TIME)/100; @@ -9613,13 +9508,13 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((cellSchCmn->apisEmtcDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9629,13 +9524,13 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((cellSchCmn->apisDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } /* DLFS UE Config */ @@ -9646,7 +9541,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DLFS UE re-config FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9656,11 +9551,11 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DL SPS ReCFG FAILED for UE CRNTI:%d", ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrUeRecfg*/ /*********************************************************** @@ -9694,7 +9589,6 @@ RgSchUeCb *ue; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell); #endif - TRC2(rgSCHCmnUlUeDelAllocs); for (i = 0; i < ueUl->hqEnt.numHqPrcs; ++i) { @@ -9774,7 +9668,6 @@ RgSchUeCb *ue; CmTmrArg arg; RgSchCmnUeInfo *ueSchd = RG_SCH_CMN_GET_CMN_UE(ue); - TRC2(rgSCHCmnDelUeFrmRefreshQ); #ifdef RGL_SPECIFIC_CHANGES if(ue->refreshOffset < RGSCH_MAX_REFRESH_GRPSZ) @@ -9787,7 +9680,7 @@ RgSchUeCb *ue; #endif - cmMemset((U8 *)&arg, 0, sizeof(arg)); + memset(&arg, 0, sizeof(arg)); arg.tqCp = &sched->tmrTqCp; arg.tq = sched->tmrTq; arg.timers = &ueSchd->tmr; @@ -9829,7 +9722,6 @@ RgSchUeCb *ueCb; RgSchDlHqProcCb *ccchSduHqP = NULLP; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUeCcchSduDel); hqE = RG_SCH_CMN_GET_UE_HQE(ueCb, cell); if (hqE == NULLP) @@ -9890,13 +9782,13 @@ RgSchUeCb *ueCb; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUeDel +Void rgSCHCmnUeDel ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUeDel(cell, ue) +Void rgSCHCmnUeDel(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -9908,7 +9800,6 @@ RgSchUeCb *ue; U8 cnt; RgSchCmnCell *cellSchCmn = RG_SCH_CMN_GET_CELL(cell); U32 idx = 0; - TRC2(rgSCHCmnUeDel); if (RG_SCH_CMN_GET_UE(ue,cell) == NULLP) { @@ -10049,7 +9940,6 @@ RgrDlCmnCodeRateCfg *dlCmnCodeRate; U8 i, rbNum; U32 pdcchBits; - TRC2(rgSCHCmnDlCnsdrCmnRt); /* code rate is bits per 1024 phy bits, since modl'n scheme is 2. it is * bits per 1024/2 REs */ @@ -10125,13 +10015,13 @@ RgrDlCmnCodeRateCfg *dlCmnCodeRate; } if (dlCmnCodeRate->ccchCqi == 0) { - RETVALUE(RFAILED); + return RFAILED; } else { cellDl->dl.ccchCqi = dlCmnCodeRate->ccchCqi; } - RETVALUE(ROK); + return ROK; } #ifdef LTE_TDD @@ -10187,7 +10077,6 @@ RgSchErrInfo *err; U8 splSfCfi; U8 mPhich; - TRC2(rgSCHCmnDlRgrCellCfg); cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -10208,7 +10097,7 @@ RgSchErrInfo *err; } if (cellSch->dl.maxUePerDlSf < cellSch->dl.maxUeNewTxPerTti) { - RETVALUE(RFAILED); + return RFAILED; } @@ -10322,7 +10211,7 @@ RgSchErrInfo *err; /* Intialize the RACH response scheduling related infromation */ if(rgSCHCmnDlRachInfoInit(cell) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Allocate PRACH preamble list */ @@ -10487,7 +10376,7 @@ RgSchErrInfo *err; "maxCcchPerDlSf %u > maxUePerDlSf %u", cfg->maxCcchPerDlSf, cfg->maxUePerDlSf ); - RETVALUE(RFAILED); + return RFAILED; } else if (!cfg->maxCcchPerDlSf) { @@ -10504,7 +10393,7 @@ RgSchErrInfo *err; } if (rgSCHCmnDlCnsdrCmnRt(cell, &cfg->dlCmnCodeRate) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /*ccpu00118273 - ADD - start */ @@ -10523,7 +10412,7 @@ RgSchErrInfo *err; ret = cellSch->apisDlfs->rgSCHDlfsCellCfg(cell, cfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } cellSch->dl.isDlFreqSel = cfg->dlfsCfg.isDlFreqSel; @@ -10533,7 +10422,7 @@ RgSchErrInfo *err; ret = rgSCHPwrCellCfg(cell, cfg); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cellSch->dl.bcchTxPwrOffset = cfg->bcchTxPwrOffset; @@ -10541,7 +10430,7 @@ RgSchErrInfo *err; cellSch->dl.rarTxPwrOffset = cfg->rarTxPwrOffset; cellSch->dl.phichTxPwrOffset = cfg->phichTxPwrOffset; cellSch->dl.msg4pAVal = cfg->msg4pAVal; - RETVALUE(ROK); + return ROK; } #else /* LTE_TDD */ /** @@ -10585,7 +10474,6 @@ RgSchErrInfo *err; U8 cfi; U8 cfiIdx; - TRC2(rgSCHCmnDlRgrCellCfg); cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -10699,7 +10587,7 @@ RgSchErrInfo *err; "FAILED MaxUePerDlSf(%u) < MaxDlUeNewTxPerTti(%u)", cellSch->dl.maxUePerDlSf, cellSch->dl.maxUeNewTxPerTti); - RETVALUE(RFAILED); + return RFAILED; } /*[ccpu00138609]-ADD- Configure the Max CCCH Counter */ if (cfg->maxCcchPerDlSf > cfg->maxUePerDlSf) @@ -10708,7 +10596,7 @@ RgSchErrInfo *err; "maxCcchPerDlSf %u > maxUePerDlSf %u", cfg->maxCcchPerDlSf, cfg->maxUePerDlSf ); - RETVALUE(RFAILED); + return RFAILED; } else if (!cfg->maxCcchPerDlSf) { @@ -10727,7 +10615,7 @@ RgSchErrInfo *err; if (rgSCHCmnDlCnsdrCmnRt(cell, &cfg->dlCmnCodeRate) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cmLListInit(&cellSch->dl.msg4RetxLst); #ifdef RGR_V1 @@ -10744,7 +10632,7 @@ RgSchErrInfo *err; ret = cellSch->apisDlfs->rgSCHDlfsCellCfg(cell, cfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } cellSch->dl.isDlFreqSel = cfg->dlfsCfg.isDlFreqSel; @@ -10754,7 +10642,7 @@ RgSchErrInfo *err; ret = rgSCHPwrCellCfg(cell, cfg); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cellSch->dl.bcchTxPwrOffset = cfg->bcchTxPwrOffset; @@ -10762,7 +10650,7 @@ RgSchErrInfo *err; cellSch->dl.rarTxPwrOffset = cfg->rarTxPwrOffset; cellSch->dl.phichTxPwrOffset = cfg->phichTxPwrOffset; RG_SCH_RESET_HCSG_DL_PRB_CNTR(&cellSch->dl); - RETVALUE(ROK); + return ROK; } #endif /* LTE_TDD */ @@ -10784,22 +10672,21 @@ RgSchErrInfo *err; * **********************************************************/ #ifdef ANSI -PUBLIC U8 rgSCHCmnUlCalcReqRbCeil +U8 rgSCHCmnUlCalcReqRbCeil ( U32 bytes, U8 cqi, RgSchCmnUlCell *cellUl ) #else -PUBLIC U8 rgSCHCmnUlCalcReqRbCeil(bytes, cqi, cellUl) +U8 rgSCHCmnUlCalcReqRbCeil(bytes, cqi, cellUl) U32 bytes; U8 cqi; RgSchCmnUlCell *cellUl; #endif { U32 numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff); - TRC2(rgSCHCmnUlCalcReqRbCeil); - RETVALUE((U8)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl))); + return ((U8)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl))); } /*********************************************************** @@ -10843,7 +10730,6 @@ Bool isEcp; U8 iTbs = 0; U16 msg3GrntSz = 0; - TRC2(rgSCHCmnPrecompMsg3Vars); if (ccchCqi > cellUl->max16qamCqi) { @@ -10877,7 +10763,7 @@ Bool isEcp; if (msgSzA < RGSCH_MIN_MSG3_GRNT_SZ) { - RETVALUE(RFAILED); + return RFAILED; } numSb = RGSCH_CEIL(rgSCHCmnUlCalcReqRbCeil(msgSzA, ccchCqi, cellUl), sbSize); @@ -10916,10 +10802,10 @@ Bool isEcp; * Refer- TG36.321- section- 5.1.2*/ cellUl->ra.prmblANumSb = numSb; cellUl->ra.prmblAIMcs = ccchMcs; - RETVALUE(ROK); + return ROK; } -PUBLIC U32 gPrntPucchDet=0; +U32 gPrntPucchDet=0; #ifdef LTE_TDD /*********************************************************** @@ -10975,7 +10861,6 @@ U8 *bwAvailRef; /* Maximum value of M as per Table 10.1-1 */ U8 M[RGSCH_MAX_TDD_UL_DL_CFG] = {1, 2, 4, 3, 4, 9, 1}; - TRC2(rgSCHCmnUlCalcAvailBw); if (cell->isCpUlExtend) { @@ -11023,7 +10908,7 @@ U8 *bwAvailRef; if (puschRbStart * 2 >= ulBw) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH"); - RETVALUE(RFAILED); + return RFAILED; } *rbStartRef = puschRbStart; @@ -11035,7 +10920,7 @@ U8 *bwAvailRef; cell->dynCfiCb.maxCfi = RGSCH_MIN(cfi-1, cell->dynCfiCb.maxCfi); } - RETVALUE(ROK); + return ROK; } #else @@ -11089,7 +10974,6 @@ U8 *bwAvailRef; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); #endif - TRC2(rgSCHCmnUlCalcAvailBw); if (cell->isCpUlExtend) { @@ -11142,7 +11026,7 @@ U8 *bwAvailRef; if (puschRbStart*2 >= ulBw) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH"); - RETVALUE(RFAILED); + return RFAILED; } *rbStartRef = puschRbStart; @@ -11154,7 +11038,7 @@ U8 *bwAvailRef; cell->dynCfiCb.maxCfi = RGSCH_MIN(cfi-1, cell->dynCfiCb.maxCfi); } - RETVALUE(ROK); + return ROK; } #endif @@ -11221,7 +11105,6 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) #endif /* #if (defined(LTE_L2_MEAS) || defined(DEBUGP) */ RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - TRC2(rgSCHCmnUlCellInit); cellUl->maxUeNewTxPerTti = cellCfg->maxUlUeNewTxPerTti; if (maxUePerUlSf == 0) @@ -11261,7 +11144,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) "FAILED: MaxUePerUlSf(%u) < MaxUlUeNewTxPerTti(%u)", cellUl->maxAllocPerUlSf, cellUl->maxUeNewTxPerTti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS @@ -11277,7 +11160,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation failed "); - RETVALUE(ret); + return (ret); } } #endif @@ -11301,7 +11184,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if (sbSize != rgSchCmnMult235Tbl[sbSize].match) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid subband size %d", sbSize); - RETVALUE(RFAILED); + return RFAILED; } //Setting the subband size to 4 which is size of VRBG in 5GTF #ifdef RG_5GTF @@ -11313,7 +11196,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlCellInit(): " "maxUlBwPerUe/sbSize is zero"); - RETVALUE(RFAILED); + return RFAILED; } cellUl->maxSbPerUe = rgSchCmnMult235Tbl[maxSbPerUe].prvMatch; @@ -11323,7 +11206,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnUlCellInit(): " "Invalid cqi"); - RETVALUE(RFAILED); + return RFAILED; } cellUl->dfltUlCqi = cellCfg->ulCmnCodeRate.ccchCqi; @@ -11365,7 +11248,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cell->rachCfg.msgSizeGrpA, sbSize, cell->isCpUlExtend); if (ret != ROK) { - RETVALUE(ret); + return (ret); } #endif @@ -11374,7 +11257,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cell->rachCfg.msgSizeGrpA, sbSize, cell->isCpUlExtend); if (ret != ROK) { - RETVALUE(ret); + return (ret); } cellUl->sbSize = sbSize; @@ -11388,7 +11271,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if (ret != ROK) { cellUl->numUlSubfrms = 0; - RETVALUE(ret); + return (ret); } /* store the DL subframe corresponding to the PUSCH offset @@ -11425,7 +11308,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) #endif if (ret != ROK) { - RETVALUE(ret); + return (ret); } if (cfi == 1) @@ -11446,7 +11329,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cellSch->cfiCfg.cfi, cell->dynCfiCb.maxCfi, cell->pucchCfg.maxPucchRb); - RETVALUE(RFAILED); + return RFAILED; } /* DMRS values */ @@ -11455,7 +11338,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cellUl->dmrsArrSize * sizeof(*cellUl->dmrsArr)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } for (i = 0; i < cellUl->dmrsArrSize; ++i) { @@ -11483,11 +11366,11 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(cellUl->ulSfArr)), maxSubfrms * sizeof(RgSchUlSf)); #endif - RETVALUE(ret); + return (ret); } } RG_SCH_RESET_HCSG_UL_PRB_CNTR(cellUl); - RETVALUE(ROK); + return ROK; } /** @@ -11509,14 +11392,14 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrCellCfg +S16 rgSCHCmnRgrCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrCellCfg(cell, cellCfg, err) +S16 rgSCHCmnRgrCellCfg(cell, cellCfg, err) RgSchCellCb *cell; RgrCellCfg *cellCfg; RgSchErrInfo *err; @@ -11524,7 +11407,6 @@ RgSchErrInfo *err; { S16 ret; RgSchCmnCell *cellSch; - TRC2(rgSCHCmnRgrCellCfg); /* As part of RGR cell configuration, validate the CRGCellCfg * There is no trigger for crgCellCfg from SC1 */ @@ -11536,7 +11418,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } cellSch = (RgSchCmnCell *)(cell->sc.sch); cellSch->cfiCfg = cellCfg->cfiCfg; @@ -11565,13 +11447,13 @@ RgSchErrInfo *err; { /* There is no downlink deinit to be performed */ err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } ret = rgSCHCmnDlRgrCellCfg(cell, cellCfg, err); if (ret != ROK) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } /* DL scheduler has no initializations to make */ /* As of now DL scheduler always returns ROK */ @@ -11590,7 +11472,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } #endif @@ -11598,7 +11480,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } #ifdef EMTC_ENABLE if(TRUE == cellCfg->emtcEnable) @@ -11607,7 +11489,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcDl->rgSCHRgrDlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } #endif @@ -11617,17 +11499,17 @@ RgSchErrInfo *err; ret = rgSCHCmnSpsCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } #endif ret = cellSch->apisDl->rgSCHRgrDlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } rgSCHCmnInitVars(cell); - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrCellCfg*/ @@ -11646,14 +11528,14 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrCellRecfg +S16 rgSCHCmnRgrCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrCellRecfg(cell, recfg, err) +S16 rgSCHCmnRgrCellRecfg(cell, recfg, err) RgSchCellCb *cell; RgrCellRecfg *recfg; RgSchErrInfo *err; @@ -11663,7 +11545,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnRgrCellRecfg); if (recfg->recfgTypes & RGR_CELL_UL_CMNRATE_RECFG) { @@ -11673,7 +11554,7 @@ RgSchErrInfo *err; err->errCause = RGSCHERR_SCH_CFG; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnRgrCellRecfg(): " "Invalid cqi"); - RETVALUE(RFAILED); + return RFAILED; } cellUl->dfltUlCqi = recfg->ulCmnCodeRate.ccchCqi; ret = rgSCHCmnPrecompMsg3Vars(cellUl, recfg->ulCmnCodeRate.ccchCqi, @@ -11683,7 +11564,7 @@ RgSchErrInfo *err; cellUl->dfltUlCqi = oldCqi; rgSCHCmnPrecompMsg3Vars(cellUl, recfg->ulCmnCodeRate.ccchCqi, cell->rachCfg.msgSizeGrpA, cellUl->sbSize, cell->isCpUlExtend); - RETVALUE(ret); + return (ret); } } @@ -11692,7 +11573,7 @@ RgSchErrInfo *err; if (rgSCHCmnDlCnsdrCmnRt(cell, &recfg->dlCmnCodeRate) != ROK) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } } @@ -11703,14 +11584,14 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DL sched for cell Recfg */ ret = cellSch->apisEmtcDl->rgSCHRgrDlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -11720,14 +11601,14 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DL sched for cell Recfg */ ret = cellSch->apisDl->rgSCHRgrDlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -11736,7 +11617,7 @@ RgSchErrInfo *err; ret = cellSch->apisDlfs->rgSCHDlfsCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cellSch->dl.isDlFreqSel = recfg->dlfsRecfg.isDlFreqSel; } @@ -11746,11 +11627,11 @@ RgSchErrInfo *err; ret = rgSCHPwrCellRecfg(cell, recfg); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -11785,7 +11666,6 @@ RgSchCellCb *cell; CmLList *lnk = NULLP; RgSchL2MeasCb *measCb; #endif - TRC2(rgSCHCmnUlCellDeinit); #ifdef LTE_L2_MEAS #ifdef LTE_TDD for(ulSfIdx = 0; ulSfIdx < RGSCH_SF_ALLOC_SIZE; ulSfIdx++) @@ -11862,17 +11742,16 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnCellDel +Void rgSCHCmnCellDel ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnCellDel(cell) +Void rgSCHCmnCellDel(cell) RgSchCellCb *cell; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnCellDel); #ifdef LTE_L2_MEAS glblTtiCnt = 0; @@ -11959,11 +11838,10 @@ RgrLchQosCfg *dlQos; { U8 qci = dlQos->qci; - TRC2(rgSCHCmnValidateDlQos); if ( qci < RG_SCH_CMN_MIN_QCI || qci > RG_SCH_CMN_MAX_QCI ) { - RETVALUE(RFAILED); + return RFAILED; } if ((qci >= RG_SCH_CMN_GBR_QCI_START) && @@ -11971,10 +11849,10 @@ RgrLchQosCfg *dlQos; { if ((dlQos->mbr == 0) || (dlQos->mbr < dlQos->gbr)) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /** @@ -11998,7 +11876,7 @@ RgrLchQosCfg *dlQos; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrLchCfg +S16 rgSCHCmnRgrLchCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -12007,7 +11885,7 @@ RgrLchCfg *lcCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrLchCfg(cell, ue, dlLc, lcCfg, err) +S16 rgSCHCmnRgrLchCfg(cell, ue, dlLc, lcCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -12019,7 +11897,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnRgrLchCfg); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&((dlLc)->sch), (sizeof(RgSchCmnDlSvc))); @@ -12028,7 +11905,7 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnRgrLchCfg(): " "SCH struct alloc failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } if(lcCfg->lcType != CM_LTE_LCH_DCCH) { @@ -12038,7 +11915,7 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSchCmnCrgLcCfg(): " "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } /* Perform DL service activation in the scheduler */ ((RgSchCmnDlSvc *)(dlLc->sch))->qci = lcCfg->dlInfo.dlQos.qci; @@ -12062,7 +11939,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcDl->rgSCHRgrDlLcCfg(cell, ue,dlLc ,lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12071,7 +11948,7 @@ RgSchErrInfo *err; ret = cellSch->apisDl->rgSCHRgrDlLcCfg(cell, ue, dlLc, lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -12081,7 +11958,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlLcCfg(cell, ue, lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12090,7 +11967,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlLcCfg(cell, ue, lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -12112,12 +11989,12 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSchCmnRgrLchCfg(): " "SPS configuration failed for DL LC for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ROK); + return ROK; } /** @@ -12143,7 +12020,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrLchRecfg +S16 rgSCHCmnRgrLchRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -12152,7 +12029,7 @@ RgrLchRecfg *lcRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrLchRecfg(cell, ue, dlLc, lcRecfg, err) +S16 rgSCHCmnRgrLchRecfg(cell, ue, dlLc, lcRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -12163,7 +12040,6 @@ RgSchErrInfo *err; S16 ret; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnRgrLchRecfg) if(dlLc->lcType != CM_LTE_LCH_DCCH) { @@ -12174,14 +12050,14 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } if (((RgSchCmnDlSvc *)(dlLc->sch))->qci != lcRecfg->dlRecfg.dlQos.qci) { RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Qci, hence lc Priority change " "not supported for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } ((RgSchCmnDlSvc *)(dlLc->sch))->gbr = (lcRecfg->dlRecfg.dlQos.gbr * \ RG_SCH_CMN_REFRESH_TIME)/100; @@ -12200,12 +12076,12 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcDl->rgSCHRgrDlLcRecfg(cell, ue, dlLc, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } ret = cellSch->apisEmtcUl->rgSCHRgrUlLcRecfg(cell, ue, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12214,12 +12090,12 @@ RgSchErrInfo *err; ret = cellSch->apisDl->rgSCHRgrDlLcRecfg(cell, ue, dlLc, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } ret = cellSch->apisUl->rgSCHRgrUlLcRecfg(cell, ue, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -12236,11 +12112,11 @@ RgSchErrInfo *err; "supported for dlLC Ignore this CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); } } - RETVALUE(ROK); + return ROK; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -12264,7 +12140,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrLcgCfg +S16 rgSCHCmnRgrLcgCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -12273,7 +12149,7 @@ RgrLcgCfg *lcgCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrLcgCfg(cell, ue, lcg, lcgCfg, err) +S16 rgSCHCmnRgrLcgCfg(cell, ue, lcg, lcgCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; @@ -12285,7 +12161,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *ulLcg = ((RgSchCmnLcg *)(ue->ul.lcgArr[lcgCfg->ulInfo.lcgId].sch)); - TRC2(rgSCHCmnRgrLcgCfg); ulLcg->cfgdGbr = (lcgCfg->ulInfo.gbr * RG_SCH_CMN_REFRESH_TIME)/100; ulLcg->effGbr = ulLcg->cfgdGbr; @@ -12298,7 +12173,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlLcgCfg(cell, ue, lcg, lcgCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12307,7 +12182,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlLcgCfg(cell, ue, lcg, lcgCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } if (RGSCH_IS_GBR_BEARER(ulLcg->cfgdGbr)) @@ -12315,7 +12190,7 @@ RgSchErrInfo *err; /* Indicate MAC that this LCG is GBR LCG */ rgSCHUtlBuildNSendLcgReg(cell, ue->ueId, lcgCfg->ulInfo.lcgId, TRUE); } - RETVALUE(ROK); + return ROK; } /** @@ -12339,7 +12214,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrLcgRecfg +S16 rgSCHCmnRgrLcgRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -12348,7 +12223,7 @@ RgrLcgRecfg *reCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnRgrLcgRecfg(cell, ue, lcg, reCfg, err) +S16 rgSCHCmnRgrLcgRecfg(cell, ue, lcg, reCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; @@ -12360,7 +12235,6 @@ RgSchErrInfo *err; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *ulLcg = ((RgSchCmnLcg *)(ue->ul.lcgArr[reCfg->ulRecfg.lcgId].sch)); - TRC2(rgSCHCmnRgrLcgRecfg); ulLcg->cfgdGbr = (reCfg->ulRecfg.gbr * RG_SCH_CMN_REFRESH_TIME)/100; ulLcg->effGbr = ulLcg->cfgdGbr; @@ -12373,7 +12247,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlLcgRecfg(cell, ue, lcg, reCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12382,7 +12256,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlLcgRecfg(cell, ue, lcg, reCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } if (RGSCH_IS_GBR_BEARER(ulLcg->cfgdGbr)) @@ -12395,7 +12269,7 @@ RgSchErrInfo *err; /* In case of RAB modification */ rgSCHUtlBuildNSendLcgReg(cell, ue->ueId, reCfg->ulRecfg.lcgId, FALSE); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12412,7 +12286,7 @@ RgSchErrInfo *err; * File : **********************************************************/ #ifdef ANSI -PUBLIC S16 rgSCHCmnRgrLchDel +S16 rgSCHCmnRgrLchDel ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -12420,7 +12294,7 @@ CmLteLcId lcId, U8 lcgId ) #else -PUBLIC S16 rgSCHCmnRgrLchDel(cell, ue, lcId, lcgId) +S16 rgSCHCmnRgrLchDel(cell, ue, lcId, lcgId) RgSchCellCb *cell; RgSchUeCb *ue; CmLteLcId lcId; @@ -12428,7 +12302,6 @@ U8 lcgId; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnRgrLchDel); #ifdef EMTC_ENABLE if(TRUE == ue->isEmtcUe) { @@ -12439,7 +12312,7 @@ U8 lcgId; { cellSch->apisUl->rgSCHRgrUlLchDel(cell, ue, lcId, lcgId); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12457,14 +12330,14 @@ U8 lcgId; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnLcgDel +Void rgSCHCmnLcgDel ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg ) #else -PUBLIC Void rgSCHCmnLcgDel(cell, ue, lcg) +Void rgSCHCmnLcgDel(cell, ue, lcg) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; @@ -12472,7 +12345,6 @@ RgSchLcgCb *lcg; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnLcg *lcgCmn = RG_SCH_CMN_GET_UL_LCG(lcg); - TRC2(rgSCHCmnLcgDel); if (lcgCmn == NULLP) { @@ -12530,21 +12402,20 @@ RgSchLcgCb *lcg; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnFreeDlLc +Void rgSCHCmnFreeDlLc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PUBLIC Void rgSCHCmnFreeDlLc(cell, ue, svc) +Void rgSCHCmnFreeDlLc(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnFreeDlLc); if (svc->sch == NULLP) { RETVOID; @@ -12629,7 +12500,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchUeCb *ue; - TRC2(rgSCHCmnDlCcchSduRetxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->ccchSduAlloc.schdCcchSduRetxLst.first; @@ -12703,7 +12573,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchRaCb *raCb; - TRC2(rgSCHCmnDlCcchRetxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->msg4Alloc.schdMsg4RetxLst.first; @@ -12720,7 +12589,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; hqP->tbInfo[0].ccchSchdInfo.retxLnk.node = (PTR)NULLP; /* Fix: syed dlAllocCb reset should be performed. * zombie info in dlAllocCb leading to crash rbNum wraparound */ - cmMemset((U8 *)rbAllocInfo, (U8)0, sizeof(*rbAllocInfo)); + memset(rbAllocInfo, 0, sizeof(*rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } /* Fix: syed dlAllocCb reset should be performed. @@ -12731,7 +12600,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; hqP = (RgSchDlHqProcCb *)(node->node); raCb = hqP->hqE->raCb; node = node->next; - cmMemset((U8 *)&raCb->rbAllocInfo, (U8)0, sizeof(raCb->rbAllocInfo)); + memset(&raCb->rbAllocInfo, 0, sizeof(raCb->rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } RETVOID; @@ -12778,7 +12647,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchLchAllocInfo lchSchdData; - TRC2(rgSCHCmnDlCcchSduTxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->ccchSduAlloc.schdCcchSduTxLst.first; @@ -12870,7 +12738,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; RgSchLchAllocInfo lchSchdData; - TRC2(rgSCHCmnDlCcchTxFnlz); /* Traverse through the Scheduled Retx List */ node = allocInfo->msg4Alloc.schdMsg4TxLst.first; @@ -12907,7 +12774,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; } /* Fix: syed dlAllocCb reset should be performed. * zombie info in dlAllocCb leading to crash rbNum wraparound */ - cmMemset((U8 *)&raCb->rbAllocInfo, (U8)0, sizeof(raCb->rbAllocInfo)); + memset(&raCb->rbAllocInfo, 0, sizeof(raCb->rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } node = allocInfo->msg4Alloc.nonSchdMsg4TxLst.first; @@ -12922,7 +12789,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /*Fix: Removing releasing of TB1 as it will not exist for MSG4 and hence caused a crash*/ /* rgSCHDhmRlsHqpTb(hqP, 1, FALSE);*/ /* reset the UE allocation Information */ - cmMemset((U8 *)rbAllocInfo, (U8)0, sizeof(*rbAllocInfo)); + memset(rbAllocInfo, 0, sizeof(*rbAllocInfo)); rgSCHCmnDlHqPResetTemp(hqP); } @@ -12948,13 +12815,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnGetBiIndex +U8 rgSCHCmnGetBiIndex ( RgSchCellCb *cell, U32 ueCount ) #else -PUBLIC U8 rgSCHCmnGetBiIndex(cell, ueCount) +U8 rgSCHCmnGetBiIndex(cell, ueCount) RgSchCellCb *cell; U32 ueCount; #endif @@ -12964,7 +12831,6 @@ U32 ueCount; U8 idx = 0; U16 timeDiff = 0; - TRC2(rgSCHCmnGetBiIndex) if (cell->biInfo.prevBiTime != 0) { @@ -13010,7 +12876,7 @@ U32 ueCount; }while(idx < RG_SCH_CMN_NUM_BI_VAL-1); cell->biInfo.prevBiTime = rgSchCmnBiTbl[idx]; /* For 16 Entries in Table 7.2.1 36.321.880 - 3 reserved so total 13 Entries */ - RETVALUE(idx); /* Returning reserved value from table UE treats it has 960 ms */ + return (idx); /* Returning reserved value from table UE treats it has 960 ms */ } /* rgSCHCmnGetBiIndex */ @@ -13064,7 +12930,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; U8 msg3Subfrm; #endif - TRC2(rgSCHCmnDlRaRspFnlz); for (rarCnt=0; rarCntcrntTime; RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA); @@ -13278,7 +13142,7 @@ U16 i; k = (frm.sfn/2) % 4; } rv = RGSCH_CEIL(3*k, 2) % 4; - RETVALUE(rv); + return (rv); } /** @@ -13336,7 +13200,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #endif RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHCmnDlBcchPcchFnlz); /* handle PCCH */ rbAllocInfo = &allocInfo->pcchAlloc; @@ -13524,7 +13387,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; { CmLList *node; - TRC2(rgSCHCmnUlSetAllUnSched); node = allocInfo->contResLst.first; while (node) @@ -13567,19 +13429,18 @@ RgSchCmnUlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlAdd2CntResLst +Void rgSCHCmnUlAdd2CntResLst ( RgSchCmnUlRbAllocInfo *allocInfo, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUlAdd2CntResLst(allocInfo, ue) +Void rgSCHCmnUlAdd2CntResLst(allocInfo, ue) RgSchCmnUlRbAllocInfo *allocInfo; RgSchUeCb *ue; #endif { RgSchCmnUeUlAlloc *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,ue->cell))->alloc); - TRC2(rgSCHCmnUlAdd2CntResLst); cmLListAdd2Tail(&allocInfo->contResLst, &ulAllocInfo->reqLnk); ulAllocInfo->reqLnk.node = (PTR)ue; RETVOID; @@ -13601,21 +13462,20 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlAdd2UeLst +Void rgSCHCmnUlAdd2UeLst ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUlAdd2UeLst(cell, allocInfo, ue) +Void rgSCHCmnUlAdd2UeLst(cell, allocInfo, ue) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; RgSchUeCb *ue; #endif { RgSchCmnUeUlAlloc *ulAllocInfo = &((RG_SCH_CMN_GET_UL_UE(ue,cell))->alloc); - TRC2(rgSCHCmnUlAdd2UeLst); if (ulAllocInfo->reqLnk.node == NULLP) { cmLListAdd2Tail(&allocInfo->ueLst, &ulAllocInfo->reqLnk); @@ -13639,19 +13499,18 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnAllocUlRb +Void rgSCHCmnAllocUlRb ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PUBLIC Void rgSCHCmnAllocUlRb(cell, allocInfo) +Void rgSCHCmnAllocUlRb(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif { RgSchUlSf *sf = allocInfo->sf; - TRC2(rgSCHCmnAllocUlRb); /* Schedule for new transmissions */ rgSCHCmnUlRbAllocForLst(cell, sf, allocInfo->ueLst.count, @@ -13705,7 +13564,6 @@ Bool isNewTx; CmLteTimingInfo timeInfo; #endif #endif - TRC2(rgSCHCmnUlRbAllocForLst); if(schdLst->count == 0) { @@ -13847,7 +13705,6 @@ U32 effTgt; Bool mdfyiTbsFlg = FALSE; U8 resiTbs = *iTbs; - TRC2(rgSCHCmnUlMdfyGrntForCqi) do @@ -13867,7 +13724,7 @@ U32 effTgt; if ((nPrb >= maxRb) && (resiTbs <= 10)) { /* Could not accomodate ACQI */ - RETVALUE(RFAILED); + return RFAILED; } totREs = nPrb * RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl); tbSz = rgTbSzTbl[0][resiTbs][nPrb-1]; @@ -13912,7 +13769,7 @@ U32 effTgt; *numSb = resNumSb; *iTbs = resiTbs; - RETVALUE(ROK); + return ROK; } #endif #endif @@ -13970,13 +13827,12 @@ RgSchUlHole *hole; U8 numLyr; #endif - TRC2(rgSCHCmnUlRbAllocForUe); #ifdef RG_5GTF rgSCHUhmGetAvlHqProc(cell, ue, &proc); if (proc == NULLP) { //printf("UE [%d] HQ Proc unavailable\n", ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -13996,7 +13852,7 @@ RgSchUlHole *hole; { RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHCmnUlRbAllocForUe(): Could not get PDCCH for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } gUl5gtfPdcchSchd++; #if defined (TENB_STATS) && defined (RG_5GTF) @@ -14032,7 +13888,7 @@ RgSchUlHole *hole; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlRbAllocForUe(): Could not get UlAlloc %d CRNTI:%d",numVrbg,ue->ueId); rgSCHCmnPdcchRlsCrntSf(cell, pdcch); - RETVALUE(RFAILED); + return RFAILED; } gUl5gtfAllocAllocated++; #if defined (TENB_STATS) && defined (RG_5GTF) @@ -14093,7 +13949,7 @@ RgSchUlHole *hole; ueUl->alloc.alloc = alloc; /*rntiwari-Adding the debug for generating the graph.*/ /* No grant attr recorded now */ - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -14111,21 +13967,20 @@ RgSchUlHole *hole; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlRbAllocAddUeToLst +Void rgSCHCmnUlRbAllocAddUeToLst ( RgSchCellCb *cell, RgSchUeCb *ue, CmLListCp *lst ) #else -PUBLIC Void rgSCHCmnUlRbAllocAddUeToLst(cell, ue, lst) +Void rgSCHCmnUlRbAllocAddUeToLst(cell, ue, lst) RgSchCellCb *cell; RgSchUeCb *ue; CmLListCp *lst; #endif { RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); - TRC2(rgSCHCmnUlRbAllocAddUeToLst); UNUSED(cell); gUl5gtfUeRbAllocDone++; @@ -14167,7 +14022,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUlAllocFnlz); /* call scheduler specific Finalization */ cellSch->apisUl->rgSCHUlAllocFnlz(cell, allocInfo); @@ -14192,19 +14046,18 @@ RgSchCmnUlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlAllocFnlz +Void rgSCHCmnDlAllocFnlz ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnDlAllocFnlz(cell) +Void rgSCHCmnDlAllocFnlz(cell) RgSchCellCb *cell; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlRbAllocInfo *allocInfo = &cellSch->allocInfo; - TRC2(rgSCHCmnDlAllocFnlz); rgSCHCmnDlCcchRetxFnlz(cell, allocInfo); rgSCHCmnDlCcchTxFnlz(cell, allocInfo); @@ -14256,7 +14109,6 @@ RgSchUlSf *sf; #endif { CmLList *lnk; - TRC2(rgSCHCmnUlUpdSf); while ((lnk = sf->allocs.first)) { @@ -14331,7 +14183,6 @@ RgSchUlAlloc *alloc; { U32 bytes; RgSchCmnUlUe *ueUl; - TRC2(rgSCHCmnUlHndlAllocRetx); bytes = \ rgTbSzTbl[0][rgSCHCmnUlGetITbsFrmIMcs(alloc->grnt.iMcs)]\ [alloc->grnt.numRb-1]/8; @@ -14405,7 +14256,6 @@ RgSchCellCb *cell; #endif - TRC2(rgSCHCmnUlAlloc); /* Initializing RgSchCmnUlRbAllocInfo structure */ rgSCHCmnInitUlRbAllocInfo(allocInfoRef); @@ -14512,12 +14362,12 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnSndCnsldtInfo +Void rgSCHCmnSndCnsldtInfo ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnSndCnsldtInfo(cell) +Void rgSCHCmnSndCnsldtInfo(cell) RgSchCellCb *cell; #endif { @@ -14525,7 +14375,6 @@ RgSchCellCb *cell; Pst pst; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnSndCnsldtInfo); subfrmAlloc = &(cell->sfAllocArr[cell->crntSfIdx]); @@ -14581,12 +14430,12 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnCnsldtSfAlloc +Void rgSCHCmnCnsldtSfAlloc ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnCnsldtSfAlloc(cell) +Void rgSCHCmnCnsldtSfAlloc(cell) RgSchCellCb *cell; #endif { @@ -14598,7 +14447,6 @@ RgSchCellCb *cell; CmLListCp ulInActvLst; RgSchCmnCell *cellSch = NULLP; - TRC2(rgSCHCmnCnsldtSfAlloc); cmLListInit(&dlDrxInactvTmrLst); cmLListInit(&dlInActvLst); @@ -14657,10 +14505,9 @@ PRIVATE Void rgSCHCmnInitDlRbAllocInfo(allocInfo) RgSchCmnDlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHCmnInitDlRbAllocInfo); - cmMemset((U8 *)&allocInfo->pcchAlloc, (U8)0, sizeof(RgSchDlRbAlloc)); - cmMemset((U8 *)&allocInfo->bcchAlloc, (U8)0, sizeof(RgSchDlRbAlloc)); - cmMemset((U8 *)allocInfo->raRspAlloc, (U8)0, + memset(&allocInfo->pcchAlloc, 0, sizeof(RgSchDlRbAlloc)); + memset(&allocInfo->bcchAlloc, 0, sizeof(RgSchDlRbAlloc)); + memset(allocInfo->raRspAlloc, 0, RG_SCH_CMN_MAX_CMN_PDCCH*sizeof(RgSchDlRbAlloc)); allocInfo->msg4Alloc.msg4DlSf = NULLP; @@ -14724,16 +14571,15 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnInitUlRbAllocInfo +Void rgSCHCmnInitUlRbAllocInfo ( RgSchCmnUlRbAllocInfo *allocInfo ) #else -PUBLIC Void rgSCHCmnInitUlRbAllocInfo(allocInfo) +Void rgSCHCmnInitUlRbAllocInfo(allocInfo) RgSchCmnUlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHCmnInitUlRbAllocInfo); allocInfo->sf = NULLP; cmLListInit(&allocInfo->contResLst); cmLListInit(&allocInfo->schdContResLst); @@ -14772,7 +14618,6 @@ RgSchCellCb *cell; RgSchDlSf *dlSf; #endif { - TRC2(rgSCHCmnGrpPwrCntrlPucch); rgSCHPwrGrpCntrlPucch(cell, dlSf); @@ -14810,7 +14655,6 @@ RgSchUlSf *ulSf; CmLteTimingInfo frm; RgSchDlSf *dlSf; - TRC2(rgSCHCmnGrpPwrCntrlPusch); /* Got to pass DL SF corresponding to UL SF, so get that first. * There is no easy way of getting dlSf by having the RgSchUlSf*, @@ -14868,7 +14712,6 @@ RgSchUeCb *ue; U32 effNonGbrBsr = 0; U32 lcgId; - TRC2(rgSCHCmnApplyUeRefresh); /* Reset the refresh cycle variableCAP */ ue->ul.effAmbr = ue->ul.cfgdAmbr; @@ -14907,7 +14750,7 @@ RgSchUeCb *ue; cellSch->apisUl->rgSCHUlUeRefresh(cell, ue); cellSch->apisDl->rgSCHDlUeRefresh(cell, ue); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -14942,14 +14785,13 @@ S16 tmrEvnt; /* Timer Event */ #if (ERRCLASS & ERRCLS_DEBUG) #endif - TRC2(rgSCHCmnTmrExpiry); #if (ERRCLASS & ERRCLS_DEBUG) if (tmrEvnt != RG_SCH_CMN_EVNT_UE_REFRESH) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnTmrExpiry(): Invalid " "timer event CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #else UNUSED(tmrEvnt); @@ -14959,7 +14801,7 @@ S16 tmrEvnt; /* Timer Event */ rgSCHCmnAddUeToRefreshQ(cell, ue, RG_SCH_CMN_REFRESH_TIME); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -14991,7 +14833,6 @@ RgSchCellCb *cell; RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); /* Moving the assignment of scheduler pointer to available scope for optimization */ - TRC2(rgSCHCmnTmrProc); if ((cell->crntTime.slot % RGSCH_NUM_SUB_FRAMES_5G) == 0) { @@ -15019,7 +14860,7 @@ RgSchCellCb *cell; cmPrcTmr(&sched->tmrTqCp, sched->tmrTq, (PFV)rgSCHCmnTmrExpiry); } - RETVALUE(ROK); + return ROK; } @@ -15059,7 +14900,6 @@ U8 delta; U8 splSfCfi = 0; #endif - TRC2(rgSchCmnUpdCfiVal); pdsch = cell->crntTime; RGSCH_INCR_SUB_FRAME(pdsch, delta); @@ -15167,7 +15007,6 @@ U8 dlIdx; { U8 idx; - TRC2(rgSchCmnUpdtPdcchSfIdx); /* Resetting the parameters on CFI switching */ cell->dynCfiCb.cceUsed = 0; @@ -15213,13 +15052,13 @@ U8 dlIdx; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSchCmnUpdCfiDb +Void rgSchCmnUpdCfiDb ( RgSchCellCb *cell, U8 delta ) #else -PUBLIC Void rgSchCmnUpdCfiDb(cell, delta) +Void rgSchCmnUpdCfiDb(cell, delta) RgSchCellCb *cell; U8 delta; #endif @@ -15238,7 +15077,6 @@ U8 delta; U8 dlIdx; U16 ttiMod; - TRC2(rgSchCmnUpdCfiDb); /* Get Downlink Subframe */ frm = cell->crntTime; @@ -15410,18 +15248,17 @@ U8 delta; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlCommonChSch +Void rgSCHCmnDlCommonChSch ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnDlCommonChSch(cell) +Void rgSCHCmnDlCommonChSch(cell) RgSchCellCb *cell; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlCommonChSch); cellSch->apisDl->rgSCHDlTickForPdbTrkng(cell); rgSchCmnUpdCfiVal(cell, RG_SCH_CMN_DL_DELTA); @@ -15467,18 +15304,17 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlSch +Void rgSCHCmnUlSch ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnUlSch(cell) +Void rgSCHCmnUlSch(cell) RgSchCellCb *cell; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnUlSch); #ifdef LTE_ADV /* LAA_SCELL: */ @@ -15549,21 +15385,20 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlDedBoUpd +Void rgSCHCmnDlDedBoUpd ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PUBLIC Void rgSCHCmnDlDedBoUpd(cell, ue, svc) +Void rgSCHCmnDlDedBoUpd(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlDedBoUpd); /* RACHO : if UEs idle time exceeded and a BO update * is received, then add UE to the pdcch Order Q */ @@ -15625,19 +15460,18 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnRmvFrmTaLst +Void rgSCHCmnRmvFrmTaLst ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnRmvFrmTaLst(cell, ue) +Void rgSCHCmnRmvFrmTaLst(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHCmnRmvFrmTaLst); #ifdef EMTC_ENABLE if(cell->emtcEnable && ue->isEmtcUe) @@ -15674,19 +15508,18 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlMsg4ProcRmvFrmRetx +Void rgSCHCmnDlMsg4ProcRmvFrmRetx ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHCmnDlMsg4ProcRmvFrmRetx(cell, hqP) +Void rgSCHCmnDlMsg4ProcRmvFrmRetx(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlMsg4ProcRmvFrmRetx); if (hqP->tbInfo[0].ccchSchdInfo.retxLnk.node) { @@ -15727,19 +15560,18 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlProcAddToRetx +Void rgSCHCmnDlProcAddToRetx ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHCmnDlProcAddToRetx(cell, hqP) +Void rgSCHCmnDlProcAddToRetx(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlProcAddToRetx); if (hqP->hqE->msg4Proc == hqP) /* indicating msg4 transmission */ { @@ -15819,7 +15651,6 @@ Bool isPer; { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); RgSchCmnUeInfo *ueSchCmn = RG_SCH_CMN_GET_CMN_UE(ue); - TRC2(rgSCHCmnDlSetUeRi); #ifdef TFU_UPGRADE RgSchUePCqiCb *cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ue,cell); @@ -15933,18 +15764,17 @@ U8 pmi; #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlSetUePmi); if (ue->txModeTransCmplt == FALSE) { - RETVALUE(RFAILED); + return RFAILED; } if (cell->numTxAntPorts == 2) { if (pmi > 3) { - RETVALUE(RFAILED); + return RFAILED; } if (ueDl->mimoInfo.ri == 2) { @@ -15952,7 +15782,7 @@ U8 pmi; /* PMI 2 and 3 are invalid incase of 2 TxAnt and 2 Layered SM */ if (pmi == 2 || pmi == 3) { - RETVALUE(RFAILED); + return RFAILED; } ueDl->mimoInfo.pmi = pmi+1; } @@ -15965,13 +15795,13 @@ U8 pmi; { if (pmi > 15) { - RETVALUE(RFAILED); + return RFAILED; } ueDl->mimoInfo.pmi = pmi; } /* Reset the No PMI Flag in forceTD */ RG_SCH_CMN_UNSET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_NO_PMI); - RETVALUE(ROK); + return ROK; } /** @@ -16027,7 +15857,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode10); if (pucchCqi->u.mode10Info.type == TFU_RPT_CQI) { @@ -16121,7 +15950,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode11); if (pucchCqi->u.mode11Info.type == TFU_RPT_CQI) { @@ -16225,7 +16053,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode20); if (pucchCqi->u.mode20Info.type == TFU_RPT_CQI) { @@ -16324,7 +16151,6 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlProcCqiMode21); if (pucchCqi->u.mode21Info.type == TFU_RPT_CQI) { @@ -16439,7 +16265,6 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) #endif { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlCqiOnPucchInd); /* ccpu00117452 - MOD - Changed RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ @@ -16561,7 +16386,6 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) { RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U32 prevRiVal = 0; - TRC2(rgSCHCmnDlCqiOnPuschInd); if (puschCqi->ri.pres == PRSNT_NODEF) { if (RG_SCH_CMN_IS_RI_VALID(puschCqi->ri.val)) @@ -16794,7 +16618,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlCqiInd +Void rgSCHCmnDlCqiInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -16803,7 +16627,7 @@ Void *dlCqi, CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHCmnDlCqiInd(cell, ue, isPucchInfo, dlCqi, timingInfo) +Void rgSCHCmnDlCqiInd(cell, ue, isPucchInfo, dlCqi, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; Bool isPucchInfo; @@ -16823,7 +16647,6 @@ CmLteTimingInfo timingInfo; Bool is2ndCwCqiAvail = FALSE; #endif - TRC2(rgSCHCmnDlCqiInd); #ifdef RGR_CQI_REPT if (isPucchInfo) @@ -16993,7 +16816,6 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) #endif { U8 wideCqi=1; /*Calculated value from SNR*/ - TRC2(rgSCHCmnCalcWcqiFrmSnr); /*Need to map a certain SNR with a WideCQI value. * The CQI calculation is still primitive. Further, need to * use a improvized method for calculating WideCQI from SNR*/ @@ -17021,7 +16843,7 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) { wideCqi=15; } - RETVALUE(wideCqi); + return (wideCqi); }/*rgSCHCmnCalcWcqiFrmSnr*/ @@ -17042,7 +16864,7 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnSrsInd +Void rgSCHCmnSrsInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -17050,7 +16872,7 @@ PUBLIC Void rgSCHCmnSrsInd CmLteTimingInfo timingInfo ) #else -PUBLIC Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) +Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) RgSchCellCb *cell; RgSchUeCb *ue; TfuSrsRpt *srsRpt; @@ -17059,7 +16881,6 @@ PUBLIC Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) { U8 wideCqi; /*Calculated value from SNR*/ U32 recReqTime; /*Received Time in TTI*/ - TRC2(rgSCHCmnSrsInd); recReqTime = (timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) + timingInfo.slot; ue->srsCb.selectedAnt = (recReqTime/ue->srsCb.peri)%2; @@ -17096,13 +16917,13 @@ PUBLIC Void rgSCHCmnSrsInd(cell, ue, srsRpt, timingInfo) * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlTARpt +Void rgSCHCmnDlTARpt ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnDlTARpt(cell, ue) +Void rgSCHCmnDlTARpt(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -17112,7 +16933,6 @@ RgSchUeCb *ue; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); CmLListCp poInactvLst; - TRC2(rgSCHCmnDlTARpt); /* RACHO: If UE idle time is more than threshold, then * set its poInactv pdcch order inactivity */ @@ -17219,14 +17039,14 @@ U8 wideCqi; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlCqiInd +Void rgSCHCmnUlCqiInd ( RgSchCellCb *cell, RgSchUeCb *ue, TfuUlCqiRpt *ulCqiInfo ) #else -PUBLIC Void rgSCHCmnUlCqiInd(cell, ue, ulCqiInfo) +Void rgSCHCmnUlCqiInd(cell, ue, ulCqiInfo) RgSchCellCb *cell; RgSchUeCb *ue; TfuUlCqiRpt *ulCqiInfo; @@ -17242,7 +17062,6 @@ TfuUlCqiRpt *ulCqiInfo; CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); #endif - TRC2(rgSCHCmnUlCqiInd); /* consider inputs from SRS handlers about SRS occassions * in determining the UL TX Antenna selection */ ueUl->crntUlCqi[0] = ulCqiInfo->wideCqi; @@ -17334,7 +17153,7 @@ TfuUlCqiRpt *ulCqiInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlHqProcForUe +Void rgSCHCmnUlHqProcForUe ( RgSchCellCb *cell, CmLteTimingInfo frm, @@ -17342,7 +17161,7 @@ RgSchUeCb *ue, RgSchUlHqProcCb **procRef ) #else -PUBLIC Void rgSCHCmnUlHqProcForUe(cell, frm, ue, procRef) +Void rgSCHCmnUlHqProcForUe(cell, frm, ue, procRef) RgSchCellCb *cell; CmLteTimingInfo frm; RgSchUeCb *ue; @@ -17352,7 +17171,6 @@ RgSchUlHqProcCb **procRef; #ifndef RG_5GTF U8 procId = rgSCHCmnGetUlHqProcIdx(&frm, cell); #endif - TRC2(rgSCHCmnUlHqProcForUe); #ifndef RG_5GTF *procRef = rgSCHUhmGetUlHqProc(cell, ue, procId); #else @@ -17381,31 +17199,30 @@ RgSchUlHqProcCb **procRef; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnUpdUlHqProc +S16 rgSCHCmnUpdUlHqProc ( RgSchCellCb *cell, RgSchUlHqProcCb *curProc, RgSchUlHqProcCb *oldProc ) #else -PUBLIC S16 rgSCHCmnUpdUlHqProc(cell, curProc, oldProc) +S16 rgSCHCmnUpdUlHqProc(cell, curProc, oldProc) RgSchCellCb *cell; RgSchUlHqProcCb *curProc; RgSchUlHqProcCb *oldProc; #endif { - TRC2(rgSCHCmnUpdUlHqProc); UNUSED(cell); UNUSED(oldProc); #if (ERRCLASS & ERRCLS_DEBUG) if (curProc->alloc == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif curProc->alloc->hqProc = curProc; - RETVALUE(ROK); + return ROK; } /* rgSCHCmnUpdUlHqProc */ #endif @@ -17425,18 +17242,17 @@ RgSchUlHqProcCb *oldProc; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnBsrTmrExpry +S16 rgSCHCmnBsrTmrExpry ( RgSchUeCb *ueCb ) #else -PUBLIC S16 rgSCHCmnBsrTmrExpry(ueCb) +S16 rgSCHCmnBsrTmrExpry(ueCb) RgSchUeCb *ueCb; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ueCb->cell); - TRC2(rgSCHCmnBsrTmrExpry) ueCb->isSrGrant = TRUE; @@ -17450,7 +17266,7 @@ RgSchUeCb *ueCb; if(ueCb->isEmtcUe) { cellSch->apisEmtcUl->rgSCHSrRcvd(ueCb->cell, ueCb); - RETVALUE(ROK); + return ROK; } } else @@ -17459,7 +17275,7 @@ RgSchUeCb *ueCb; cellSch->apisUl->rgSCHSrRcvd(ueCb->cell, ueCb); } - RETVALUE (ROK); + return (ROK); } /** @@ -17481,7 +17297,7 @@ RgSchUeCb *ueCb; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnUpdBsrShort +S16 rgSCHCmnUpdBsrShort ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -17490,7 +17306,7 @@ U8 bsr, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnUpdBsrShort(cell, ue, ulLcg, bsr, err) +S16 rgSCHCmnUpdBsrShort(cell, ue, ulLcg, bsr, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *ulLcg; @@ -17508,12 +17324,11 @@ RgSchErrInfo *err; #ifdef LTE_L2_MEAS U8 idx; #endif - TRC2(rgSCHCmnUpdBsrShort); if (!RGSCH_LCG_ISCFGD(ulLcg)) { err->errCause = RGSCHERR_SCH_LCG_NOT_CFGD; - RETVALUE(RFAILED); + return RFAILED; } for (lcgCnt=0; lcgCnt<4; lcgCnt++) { @@ -17614,7 +17429,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHUpdBsrShort(cell, ue, ulLcg, bsr); - RETVALUE(ROK); + return ROK; } } else @@ -17642,7 +17457,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -17665,7 +17480,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnUpdBsrTrunc +S16 rgSCHCmnUpdBsrTrunc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -17674,7 +17489,7 @@ U8 bsr, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnUpdBsrTrunc(cell, ue, ulLcg, bsr, err) +S16 rgSCHCmnUpdBsrTrunc(cell, ue, ulLcg, bsr, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *ulLcg; @@ -17689,12 +17504,11 @@ RgSchErrInfo *err; U8 idx; #endif - TRC2(rgSCHCmnUpdBsrTrunc); if (!RGSCH_LCG_ISCFGD(ulLcg)) { err->errCause = RGSCHERR_SCH_LCG_NOT_CFGD; - RETVALUE(RFAILED); + return RFAILED; } /* set all higher prio lcgs bs to 0 and update this lcgs bs and total bsr= sumofall lcgs bs */ @@ -17792,7 +17606,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHUpdBsrTrunc(cell, ue, ulLcg, bsr); - RETVALUE(ROK); + return ROK; } } else @@ -17819,7 +17633,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -17843,7 +17657,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnUpdBsrLong +S16 rgSCHCmnUpdBsrLong ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -17851,7 +17665,7 @@ U8 *bsArr, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnUpdBsrLong(cell, ue, bsArr, err) +S16 rgSCHCmnUpdBsrLong(cell, ue, bsArr, err) RgSchCellCb *cell; RgSchUeCb *ue; U8 *bsArr; @@ -17867,7 +17681,6 @@ RgSchErrInfo *err; #endif U32 lcgId; - TRC2(rgSCHCmnUpdBsrLong); #ifdef LTE_L2_MEAS for(idx1 = 1; idx1 < RGSCH_MAX_LCG_PER_UE; idx1++) @@ -17962,7 +17775,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHUpdBsrLong(cell, ue, bsArr); - RETVALUE(ROK); + return ROK; } } else @@ -17989,7 +17802,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -18010,7 +17823,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnUpdExtPhr +S16 rgSCHCmnUpdExtPhr ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -18018,7 +17831,7 @@ RgInfExtPhrCEInfo *extPhr, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnUpdExtPhr(cell, ue, extPhr, err) +S16 rgSCHCmnUpdExtPhr(cell, ue, extPhr, err) RgSchCellCb *cell; RgSchUeCb *ue; RgInfExtPhrCEInfo *extPhr; @@ -18032,7 +17845,6 @@ RgSchErrInfo *err; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell); #endif - TRC2(rgSCHCmnUpdExtPhr); UNUSED(err); @@ -18053,7 +17865,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnUpdExtPhr */ @@ -18077,7 +17889,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnUpdPhr +S16 rgSCHCmnUpdPhr ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -18085,7 +17897,7 @@ U8 phr, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnUpdPhr(cell, ue, phr, err) +S16 rgSCHCmnUpdPhr(cell, ue, phr, err) RgSchCellCb *cell; RgSchUeCb *ue; U8 phr; @@ -18099,7 +17911,6 @@ RgSchErrInfo *err; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = RG_SCH_CMN_GET_UL_SPS_UE(ue,cell); #endif - TRC2(rgSCHCmnUpdPhr); UNUSED(err); @@ -18120,7 +17931,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnUpdPhr */ /** @@ -18141,21 +17952,20 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnContResUlGrant +S16 rgSCHCmnContResUlGrant ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnContResUlGrant(cell, ue, err) +S16 rgSCHCmnContResUlGrant(cell, ue, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchErrInfo *err; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnContResUlGrant); #ifdef EMTC_ENABLE if(cell->emtcEnable) @@ -18163,7 +17973,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHContResUlGrant(cell, ue); - RETVALUE(ROK); + return ROK; } } else @@ -18171,7 +17981,7 @@ RgSchErrInfo *err; { cellSch->apisUl->rgSCHContResUlGrant(cell, ue); } - RETVALUE(ROK); + return ROK; } /** @@ -18193,7 +18003,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnSrRcvd +S16 rgSCHCmnSrRcvd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -18201,7 +18011,7 @@ CmLteTimingInfo frm, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHCmnSrRcvd(cell, ue, frm, err) +S16 rgSCHCmnSrRcvd(cell, ue, frm, err) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo frm; @@ -18212,7 +18022,6 @@ RgSchErrInfo *err; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); CmLList *node = ueUl->ulAllocLst.last; - TRC2(rgSCHCmnSrRcvd); #ifdef EMTC_ENABLE emtcStatsUlTomSrInd++; @@ -18236,7 +18045,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHSrRcvd(cell, ue); - RETVALUE(ROK); + return ROK; } } else @@ -18244,7 +18053,7 @@ RgSchErrInfo *err; { cellSch->apisUl->rgSCHSrRcvd(cell, ue); } - RETVALUE(ROK); + return ROK; } /** @@ -18265,12 +18074,12 @@ RgSchErrInfo *err; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHCmnFirstRcptnReq +RgSchUlAlloc *rgSCHCmnFirstRcptnReq ( RgSchCellCb *cell ) #else -PUBLIC RgSchUlAlloc *rgSCHCmnFirstRcptnReq(cell) +RgSchUlAlloc *rgSCHCmnFirstRcptnReq(cell) RgSchCellCb *cell; #endif { @@ -18278,7 +18087,6 @@ RgSchCellCb *cell; /* ACC_TDD */ RgSchUlAlloc* alloc = NULLP; - TRC2(rgSCHCmnFirstRcptnReq); if (cellUl->rcpReqIdx != RGSCH_INVALID_INFO) { @@ -18291,7 +18099,7 @@ RgSchCellCb *cell; } } - RETVALUE(alloc); + return (alloc); } /** @@ -18312,13 +18120,13 @@ RgSchCellCb *cell; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHCmnNextRcptnReq +RgSchUlAlloc *rgSCHCmnNextRcptnReq ( RgSchCellCb *cell, RgSchUlAlloc *alloc ) #else -PUBLIC RgSchUlAlloc *rgSCHCmnNextRcptnReq(cell, alloc) +RgSchUlAlloc *rgSCHCmnNextRcptnReq(cell, alloc) RgSchCellCb *cell; RgSchUlAlloc *alloc; #endif @@ -18327,7 +18135,6 @@ RgSchUlAlloc *alloc; /* ACC-TDD */ //RgSchUlSf *sf = &cellUl->ulSfArr[cellUl->rcpReqIdx]; - TRC2(rgSCHCmnNextRcptnReq); /* ACC-TDD */ if (cellUl->rcpReqIdx != RGSCH_INVALID_INFO) { @@ -18344,7 +18151,7 @@ RgSchUlAlloc *alloc; alloc = NULLP; } - RETVALUE(alloc); + return (alloc); } /** * @brief Collates DRX enabled UE's scheduled in this SF @@ -18364,12 +18171,12 @@ RgSchUlAlloc *alloc; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDrxStrtInActvTmrInUl +Void rgSCHCmnDrxStrtInActvTmrInUl ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnDrxStrtInActvTmrInUl(cell) +Void rgSCHCmnDrxStrtInActvTmrInUl(cell) RgSchCellCb *cell; #endif { @@ -18380,8 +18187,6 @@ RgSchCellCb *cell; RgSchUeCb *ueCb; - TRC2(rgSCHCmnDrxStrtInActvTmrInUl); - cmLListInit(&ulUeLst); while(alloc) @@ -18431,13 +18236,13 @@ RgSchCellCb *cell; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc +RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc ( RgSchCellCb *cell, U8 idx ) #else -PUBLIC RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(cell, idx) +RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc(cell, idx) RgSchCellCb *cell; U8 idx; #endif @@ -18446,7 +18251,6 @@ U8 idx; /* ACC-TDD */ RgSchUlAlloc *alloc = NULLP; - TRC2(rgSCHCmnFirstHqFdbkAlloc); if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO) { @@ -18459,7 +18263,7 @@ U8 idx; } } - RETVALUE(alloc); + return (alloc); } /** @@ -18478,21 +18282,20 @@ U8 idx; * @return RgSchUlAlloc* **/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc +RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc ( RgSchCellCb *cell, RgSchUlAlloc *alloc, U8 idx ) #else -PUBLIC RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(cell, alloc, idx) +RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc(cell, alloc, idx) RgSchCellCb *cell; RgSchUlAlloc *alloc; U8 idx; #endif { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnNextHqFdbkAlloc); if (cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO) { @@ -18508,7 +18311,7 @@ U8 idx; { alloc = NULLP; } - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -18526,18 +18329,17 @@ U8 idx; * **********************************************************/ #ifdef ANSI -PUBLIC U8 rgSCHCmnUlGetITbsFrmIMcs +U8 rgSCHCmnUlGetITbsFrmIMcs ( U8 iMcs ) #else -PUBLIC U8 rgSCHCmnUlGetITbsFrmIMcs(iMcs) +U8 rgSCHCmnUlGetITbsFrmIMcs(iMcs) U8 iMcs; #endif { - TRC2(rgSCHCmnUlGetITbsFrmIMcs); - RETVALUE(rgUlIMcsTbl[iMcs].iTbs); + return (rgUlIMcsTbl[iMcs].iTbs); } /*********************************************************** @@ -18557,19 +18359,18 @@ U8 iMcs; * **********************************************************/ #ifdef ANSI -PUBLIC U8 rgSCHCmnUlGetIMcsFrmITbs +U8 rgSCHCmnUlGetIMcsFrmITbs ( U8 iTbs, CmLteUeCategory ueCtg ) #else -PUBLIC U8 rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg) +U8 rgSCHCmnUlGetIMcsFrmITbs(iTbs, ueCtg) U8 iTbs; CmLteUeCategory ueCtg; #endif { U8 iMcs; - TRC2(rgSCHCmnUlGetIMcsFrmITbs); if (iTbs <= 10) { @@ -18602,7 +18403,7 @@ CmLteUeCategory ueCtg; } #endif - RETVALUE(iMcs); + return (iMcs); } /*********************************************************** @@ -18620,22 +18421,21 @@ CmLteUeCategory ueCtg; * **********************************************************/ #ifdef ANSI -PUBLIC U32 rgSCHCmnUlMinTbBitsForITbs +U32 rgSCHCmnUlMinTbBitsForITbs ( RgSchCmnUlCell *cellUl, U8 iTbs ) #else -PUBLIC U32 rgSCHCmnUlMinTbBitsForITbs(cellUl, iTbs) +U32 rgSCHCmnUlMinTbBitsForITbs(cellUl, iTbs) RgSchCmnUlCell *cellUl; U8 iTbs; #endif { - TRC2(rgSCHCmnUlMinTbBitsForITbs); RGSCH_ARRAY_BOUND_CHECK(0, rgTbSzTbl[0], iTbs); - RETVALUE(rgTbSzTbl[0][iTbs][cellUl->sbSize-1]); + return (rgTbSzTbl[0][iTbs][cellUl->sbSize-1]); } /*********************************************************** @@ -18655,14 +18455,14 @@ U8 iTbs; * **********************************************************/ #ifdef ANSI -PUBLIC RgSchUlAlloc *rgSCHCmnUlSbAlloc +RgSchUlAlloc *rgSCHCmnUlSbAlloc ( RgSchUlSf *sf, U8 numSb, RgSchUlHole *hole ) #else -PUBLIC RgSchUlAlloc *rgSCHCmnUlSbAlloc(sf, numSb, hole) +RgSchUlAlloc *rgSCHCmnUlSbAlloc(sf, numSb, hole) RgSchUlSf *sf; U8 numSb; RgSchUlHole *hole; @@ -18670,7 +18470,6 @@ RgSchUlHole *hole; { U8 holeSz; /* valid hole size */ RgSchUlAlloc *alloc; - TRC2(rgSCHCmnUlSbAlloc); if ((holeSz = rgSchCmnMult235Tbl[hole->num].prvMatch) == hole->num) { @@ -18701,7 +18500,7 @@ RgSchUlHole *hole; } alloc = rgSCHUtlUlAllocGetPartHole(sf, numSb, hole); } - RETVALUE(alloc); + return (alloc); } /** @@ -18720,13 +18519,13 @@ RgSchUlHole *hole; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlUeFillAllocInfo +Void rgSCHCmnUlUeFillAllocInfo ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUlUeFillAllocInfo(cell, ue) +Void rgSCHCmnUlUeFillAllocInfo(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -18735,7 +18534,6 @@ RgSchUeCb *ue; RgSchCmnUeUlAlloc *ulAllocInfo; RgSchCmnUlUe *ueUl; - TRC2(rgSCHCmnUlUeFillAllocInfo); ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); ulAllocInfo = &ueUl->alloc; @@ -18793,7 +18591,6 @@ RgSchUeCb *ue; U32 nonLcg0Bsr=0; U8 lcgId; RgSchCmnLcg *cmnLcg = NULLP; - TRC2(rgSCHCmnUpdUlCompEffBsr); while (node) { @@ -18872,13 +18669,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlRecordUeAlloc +Void rgSCHCmnUlRecordUeAlloc ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnUlRecordUeAlloc(cell, ue) +Void rgSCHCmnUlRecordUeAlloc(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -18892,7 +18689,6 @@ RgSchUeCb *ue; RgSchCmnAllocRecord *allRcd = (RgSchCmnAllocRecord *)(node->node); RgSchCmnUeUlAlloc *ulAllocInfo = &ueUl->alloc; CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); - TRC2(rgSCHCmnUlRecordUeAlloc); cmLListDelFrm(lst, &allRcd->lnk); #ifndef LTE_TDD @@ -18950,14 +18746,14 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlRecMsg3Alloc +Void rgSCHCmnUlRecMsg3Alloc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchRaCb *raCb ) #else -PUBLIC Void rgSCHCmnUlRecMsg3Alloc(cell, ue, raCb) +Void rgSCHCmnUlRecMsg3Alloc(cell, ue, raCb) RgSchCellCb *cell; RgSchUeCb *ue; RgSchRaCb *raCb; @@ -18969,7 +18765,6 @@ RgSchRaCb *raCb; RgSchCmnAllocRecord *allRcd = (RgSchCmnAllocRecord *)(node->node); /* Stack Crash problem for TRACE5 changes */ - TRC2(rgSCHCmnUlRecMsg3Alloc); cmLListDelFrm(lst, node); allRcd->allocTime = raCb->msg3AllocTime; @@ -19005,21 +18800,20 @@ RgSchRaCb *raCb; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlUpdOutStndAlloc +Void rgSCHCmnUlUpdOutStndAlloc ( RgSchCellCb *cell, RgSchUeCb *ue, U32 alloc ) #else -PUBLIC Void rgSCHCmnUlUpdOutStndAlloc(cell, ue, alloc) +Void rgSCHCmnUlUpdOutStndAlloc(cell, ue, alloc) RgSchCellCb *cell; RgSchUeCb *ue; U32 alloc; #endif { U32 nonLcg0Alloc=0; - TRC2(rgSCHCmnUlUpdOutStndAlloc); /* Update UEs LCG0's bs according to the total outstanding BSR allocation.*/ if (((RgSchCmnLcg *)(ue->ul.lcgArr[0].sch))->bs > alloc) @@ -19086,14 +18880,14 @@ U32 alloc; * @return U8 **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnUlGetITbs +U8 rgSCHCmnUlGetITbs ( RgSchCellCb *cell, RgSchUeCb *ue, Bool isEcp ) #else -PUBLIC U8 rgSCHCmnUlGetITbs(cell, ue, isEcp) +U8 rgSCHCmnUlGetITbs(cell, ue, isEcp) RgSchCellCb *cell; RgSchUeCb *ue; Bool isEcp; @@ -19108,7 +18902,6 @@ Bool isEcp; U8 maxiTbs = rgSchCmnUlCqiToTbsTbl[(U8)isEcp][ueUl->maxUlCqi]; #endif - TRC2(rgSCHCmnUlGetITbs); /* #ifdef RG_SCH_CMN_EXT_CP_SUP For ECP pick index 1 */ #ifdef TFU_UPGRADE @@ -19138,7 +18931,7 @@ Bool isEcp; iTbs = 19; } #endif - RETVALUE(iTbs); + return (iTbs); #endif #else if ( (ueCtgy != CM_LTE_UE_CAT_5) && (ueUl->crntUlCqi[0] > ueUl->maxUlCqi )) @@ -19150,7 +18943,7 @@ Bool isEcp; cqi = ueUl->crntUlCqi[0]; } #endif - RETVALUE(rgSchCmnUlCqiToTbsTbl[(U8)isEcp][cqi]); + return (rgSchCmnUlCqiToTbsTbl[(U8)isEcp][cqi]); } /** @@ -19187,7 +18980,6 @@ RgSchDlHqProcCb *hqP; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlRbInfoAddUeTx); if (hqP->reqLnk.node == NULLP) { @@ -19241,7 +19033,6 @@ RgSchDlHqProcCb *hqP; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ue->cell); - TRC2(rgSCHCmnDlRbInfoAddUeRetx); if (cellSch->dl.isDlFreqSel) { @@ -19291,7 +19082,6 @@ RgSchDlHqProcCb *hqP; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(ue->cell); - TRC2(rgSCHCmnDlRbInfoAddUeRetxTx); if (cellSch->dl.isDlFreqSel) { @@ -19341,7 +19131,6 @@ RgSchDlHqProcCb *hqP; { CmLList *schdLnkNode; - TRC2(rgSCHCmnDlAdd2NonSchdRetxLst); #ifdef LTEMAC_SPS if ( (hqP->sch != (RgSchCmnDlHqProc *)NULLP) && @@ -19421,7 +19210,6 @@ RgSchCellCb *cell; RgSchTddSubfrmInfo ulSubfrmInfo; U8 maxUlSubfrms; - TRC2(rgSCHCmnDlANFdbkInit); ulSubfrmInfo = rgSchTddMaxUlSubfrmTbl[ulDlCfgIdx]; maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][RGSCH_NUM_SUB_FRAMES-1]; @@ -19488,7 +19276,7 @@ RgSchCellCb *cell; cell->subFrms[sfNum]->dlFdbkInfo.sfnOffset; cell->subFrms[dlIdx]->dlFdbkInfo.m = cell->subFrms[sfNum]->dlFdbkInfo.m; } - RETVALUE(ROK); + return ROK; } /** @@ -19532,7 +19320,6 @@ RgSchCellCb *cell; [RGSCH_NUM_SUB_FRAMES-1]; U8 dlPres = 0; - TRC2(rgSCHCmnDlKdashUlAscInit); /* Generate ACK/NACK offset information for each DL subframe in a radio frame * Calculate this information based on K` in UL Association Set table */ @@ -19606,7 +19393,7 @@ RgSchCellCb *cell; cell->subFrms[dlIdx]->ulAscInfo.sfnOffset = cell->subFrms[sfNum]->ulAscInfo.sfnOffset; } - RETVALUE(ROK); + return ROK; } @@ -19638,7 +19425,6 @@ RgSchCellCb *cell; { U8 idx; U16 np; - TRC2(rgSCHCmnDlNpValInit); /* Always Np is 0 for p=0 */ cell->rgSchTddNpValTbl[0] = 0; @@ -19649,7 +19435,7 @@ RgSchCellCb *cell; cell->rgSchTddNpValTbl[idx] = (U8) (np/36); } - RETVALUE(ROK); + return ROK; } /** @@ -19684,7 +19470,6 @@ RgSchCellCb *cell; S16 ret; U8 lstSize; - TRC2(rgSCHCmnDlCreateRachPrmLst); RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz); @@ -19695,12 +19480,12 @@ RgSchCellCb *cell; (Data **)(&cell->raInfo.raReqLst), (Size)(lstSize * sizeof(CmLListCp))); if (ret != ROK) { - RETVALUE(ret); + return (ret); } cell->raInfo.lstSize = lstSize; - RETVALUE(ROK); + return ROK; } @@ -19750,9 +19535,8 @@ RgSchCellCb *cell; S8 sfnOffset; U8 numSubfrms; - TRC2(rgSCHCmnDlRachInfoInit); - cmMemset((U8 *)rachRspLst, 0, sizeof(rachRspLst)); + memset(rachRspLst, 0, sizeof(rachRspLst)); RG_SCH_CMN_CALC_RARSPLST_SIZE(cell, raArrSz); @@ -19864,10 +19648,10 @@ RgSchCellCb *cell; ret = rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz); if (ret != ROK) { - RETVALUE(ret); + return (ret); } - RETVALUE(ROK); + return ROK; } /** @@ -19910,7 +19694,6 @@ RgSchCellCb *cell; U8 maxUlSubfrms = rgSchTddNumUlSubfrmTbl[ulDlCfgIdx]\ [RGSCH_NUM_SUB_FRAMES-1]; - TRC2(rgSCHCmnDlPhichOffsetInit); /* Generate PHICH offset information for each DL subframe in a radio frame * Calculate this information based on K in PHICH table */ @@ -19982,7 +19765,7 @@ RgSchCellCb *cell; cell->subFrms[dlIdx]->phichOffInfo.sfnOffset = cell->subFrms[sfNum]->phichOffInfo.sfnOffset; } - RETVALUE(ROK); + return ROK; } @@ -19999,12 +19782,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUpdVars +Void rgSCHCmnUpdVars ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnUpdVars(cell) +Void rgSCHCmnUpdVars(cell) RgSchCellCb *cell; #endif { @@ -20015,7 +19798,6 @@ RgSchCellCb *cell; U8 ulDlCfgIdx = cell->ulDlCfgIdx; U8 msg3Subfrm; U8 Mval; - TRC2(rgSCHCmnUpdVars); /* ccpu00132654-ADD- Initializing all the indices in every subframe*/ rgSCHCmnInitVars(cell); @@ -20127,28 +19909,27 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnGetPValFrmCCE +U8 rgSCHCmnGetPValFrmCCE ( RgSchCellCb *cell, U8 cce ) #else -PUBLIC U8 rgSCHCmnGetPValFrmCCE(cell, cce) +U8 rgSCHCmnGetPValFrmCCE(cell, cce) RgSchCellCb *cell; U8 cce; #endif { U8 i; - TRC2(rgSCHCmnGetPValFrmCCE); for(i=1; i < RGSCH_TDD_MAX_P_PLUS_ONE_VAL; i++) { if(cce < cell->rgSchTddNpValTbl[i]) { - RETVALUE(i-1); + return (i-1); } } - RETVALUE(0); + return (0); } #endif @@ -20177,7 +19958,6 @@ RgSchUlAlloc *alloc; RgSchUlHqProcCb *proc; #endif { - TRC2(rgSCHCmnUlAdapRetx); rgSCHUhmRetx(proc, alloc); #ifndef RG_5GTF @@ -20218,7 +19998,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); CmLListCp ulInactvLst; - TRC2(rgSCHCmnHdlUlInactUes); /* Get a List of Inactv UEs for UL*/ cmLListInit(&ulInactvLst); @@ -20255,7 +20034,6 @@ RgSchCellCb *cell; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); CmLListCp dlInactvLst; - TRC2(rgSCHCmnHdlDlInactUes); /* Get a List of Inactv UEs for DL */ cmLListInit(&dlInactvLst); @@ -20296,15 +20074,14 @@ RgSchUeCb *ue; /* Time difference in subframes */ U32 sfDiff = RGSCH_CALC_SF_DIFF(cell->crntTime, ue->ul.ulTransTime); - TRC2(rgSCHCmnUeIdleExdThrsld); if (sfDiff > (U32)RG_SCH_CMN_UE_IDLE_THRSLD(ue)) { - RETVALUE(ROK); + return ROK; } else { - RETVALUE(RFAILED); + return RFAILED; } } @@ -20337,7 +20114,6 @@ RgSchCellCb *cell; U32 gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; U32 sfDiff; U8 cnt; - TRC2(rgSCHCmnCfgRachDedPrm); if (cell->macPreambleSet.pres == NOTPRSNT) { @@ -20456,7 +20232,6 @@ RgSchCellCb *cell; #endif { RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - TRC2(rgSCHCmnUpdNxtPrchMskIdx); /* Determine the next prach mask Index */ if (cellSch->rachCfg.prachMskIndx == cell->rachCfg.raOccasion.size - 1) @@ -20522,7 +20297,6 @@ RgSchCellCb *cell; RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); U32 gap = RG_SCH_CMN_MIN_PRACH_OPPR_GAP; U32 sfDiff; - TRC2(rgSCHCmnUpdRachParam); if (cell->macPreambleSet.pres == NOTPRSNT) { @@ -20585,18 +20359,17 @@ U8 *prachMskIdx; RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnAllocPOParam); if (cell->macPreambleSet.pres == PRSNT_NODEF) { if (cellSch->rachCfg.remDedPrm == 0) { - RETVALUE(RFAILED); + return RFAILED; } /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ if ((*pdcch = rgSCHCmnPdcchAlloc(cell, ue, dlSf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_1A, FALSE)) == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* The stored prachMskIdx is the index of PRACH Oppurtunities in * raOccasions.subframes[]. @@ -20619,13 +20392,13 @@ U8 *prachMskIdx; /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ if ((*pdcch = rgSCHCmnPdcchAlloc(cell, ue, dlSf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_1A, FALSE)) == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } *prachMskIdx = 0; *rapId = 0; } - RETVALUE(ROK); + return ROK; } /** @@ -20663,7 +20436,6 @@ RgSchDlSf *dlSf; U8 prachMskIdx; RgSchPdcch *pdcch = NULLP; - TRC2(rgSCHCmnGenPdcchOrder); while (node) { @@ -20736,7 +20508,6 @@ RgSchUeCb *ue; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlAdd2PdcchOdrQ); if (ueDl->rachInfo.poLnk.node == NULLP) { @@ -20777,7 +20548,6 @@ RgSchUeCb *ue; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnDlRmvFrmPdcchOdrQ); cmLListDelFrm(&cellSch->rachCfg.pdcchOdrLst, &ueDl->rachInfo.poLnk); ueDl->rachInfo.poLnk.node = NULLP; @@ -20820,7 +20590,6 @@ U8 prachMskIdx; { RgSchUeACqiCb *acqiCb = RG_SCH_CMN_GET_ACQICB(ue,cell); - TRC2(rgSCHCmnFillPdcchOdr2Sf); pdcch->rnti = ue->ueId; pdcch->dci.dciFormat = TFU_DCI_FORMAT_1A; @@ -20872,7 +20641,6 @@ RgSchUeCb *ue; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 rapIdIdx; - TRC2(rgSCHCmnDelRachInfo); if (ueDl->rachInfo.poLnk.node) { @@ -20929,7 +20697,6 @@ RgSchRaReqInfo *raReq; #endif { RgSchUeCb *ue = raReq->ue; - TRC2(rgSCHCmnHdlHoPo); if ( ue->isDrxEnabled ) { @@ -20958,13 +20725,13 @@ RgSchRaReqInfo *raReq; * **/ #ifdef ANSI -PUBLIC RgSchUeCb* rgSCHCmnGetHoUe +RgSchUeCb* rgSCHCmnGetHoUe ( RgSchCellCb *cell, U16 rapId ) #else -PUBLIC RgSchUeCb* rgSCHCmnGetHoUe(cell, rapId) +RgSchUeCb* rgSCHCmnGetHoUe(cell, rapId) RgSchCellCb *cell; U16 rapId #endif @@ -20974,7 +20741,6 @@ U16 rapId CmLListCp *ueLst; RgSchUeCb *ue; RgSchCmnDlUe *ueDl; - TRC2(rgSCHCmnGetHoUe); ueLst = &cellSch->rachCfg.hoUeLst; node = ueLst->first; @@ -20985,10 +20751,10 @@ U16 rapId ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); if (ueDl->rachInfo.hoRapId == rapId) { - RETVALUE(ue); + return (ue); } } - RETVALUE(NULLP); + return (NULLP); } #ifdef ANSI @@ -21008,7 +20774,6 @@ U8 preambleId; CmLListCp *ueLst; RgSchUeCb *ue; RgSchCmnDlUe *ueDl; - TRC2(rgSCHCmnDelDedPreamble); ueLst = &cellSch->rachCfg.hoUeLst; node = ueLst->first; @@ -21044,14 +20809,14 @@ U8 preambleId; * **/ #ifdef ANSI -PUBLIC RgSchUeCb* rgSCHCmnGetPoUe +RgSchUeCb* rgSCHCmnGetPoUe ( RgSchCellCb *cell, U16 rapId, CmLteTimingInfo timingInfo ) #else -PUBLIC RgSchUeCb* rgSCHCmnGetPoUe(cell, rapId, timingInfo) +RgSchUeCb* rgSCHCmnGetPoUe(cell, rapId, timingInfo) RgSchCellCb *cell; U16 rapId; CmLteTimingInfo timingInfo; @@ -21063,7 +20828,6 @@ CmLteTimingInfo timingInfo; RgSchUeCb *ue; RgSchCmnDlUe *ueDl; U8 rapIdIdx; - TRC2(rgSCHCmnGetPoUe); rapIdIdx = rapId -cellSch->rachCfg.dedPrmStart; ueLst = &cellSch->rachCfg.rapIdMap[rapIdIdx].assgndUes; @@ -21079,11 +20843,11 @@ CmLteTimingInfo timingInfo; ueDl->rachInfo.rapIdLnk.node = (PTR)NULLP; if (RGSCH_TIMEINFO_SAME(ueDl->rachInfo.asgnOppr, timingInfo)) { - RETVALUE(ue); + return (ue); } } - RETVALUE(NULLP); + return (NULLP); } @@ -21103,14 +20867,14 @@ CmLteTimingInfo timingInfo; * @return U8 **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnUlGetCqi +U8 rgSCHCmnUlGetCqi ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteUeCategory ueCtgy ) #else -PUBLIC U8 rgSCHCmnUlGetCqi(cell, ue, ueCtgy) +U8 rgSCHCmnUlGetCqi(cell, ue, ueCtgy) RgSchCellCb *cell; RgSchUeCb *ue; CmLteUeCategory ueCtgy; @@ -21119,7 +20883,6 @@ CmLteUeCategory ueCtgy; RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell); U8 cqi; - TRC2(rgSCHCmnUlGetCqi); cqi = ueUl->maxUlCqi; #ifdef TFU_UPGRADE @@ -21135,7 +20898,7 @@ CmLteUeCategory ueCtgy; cqi = ueUl->crntUlCqi[0]; } #endif - RETVALUE(cqi); + return (cqi); }/* End of rgSCHCmnUlGetCqi */ /*********************************************************** @@ -21188,10 +20951,9 @@ U8 maxRb; RgSchUlHqProcCb *proc = &ueUl->hqEnt.hqProcCb[cellUl->msg3SchdHqProcIdx]; CmLteUeCategory ueCtg = (CmLteUeCategory)(RG_SCH_CMN_GET_UE_CTGY(ue)); - TRC2(rgSCHCmnUlRbAllocForPoHoUe); if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /*MS_WORKAROUND for HO ccpu00121116*/ cqi = rgSCHCmnUlGetCqi(cell, ue, ueCtg); @@ -21220,7 +20982,7 @@ U8 maxRb; #if (ERRCLASS & ERRCLS_DEBUG) if (!bits) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -21261,7 +21023,7 @@ U8 maxRb; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlRbAllocForPoHoUe(): Could not get UlAlloc"); - RETVALUE(RFAILED); + return RFAILED; } rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc); @@ -21289,7 +21051,7 @@ U8 maxRb; RG_SCH_UL_MCS_TO_MODODR(alloc->grnt.iMcsCrnt,alloc->grnt.modOdr); rgSCHUhmNewTx(proc, ueUl->hqEnt.maxHqRetx, alloc); /* No grant attr recorded now */ - RETVALUE(ROK); + return ROK; } /** @@ -21333,7 +21095,6 @@ RgSchRaReqInfo *raReq; RgSchUlGrnt *grnt; RgSchUlSf *sf = &cellUl->ulSfArr[cellUl->msg3SchdIdx]; - TRC2(rgSCHCmnAllocPoHoGrnt); /* Clearing previous allocs if any*/ rgSCHCmnUlUeDelAllocs(cell, ue); @@ -21429,7 +21190,6 @@ RgSchUlAlloc *alloc; U8 idx; #endif { - TRC2(rgSCHCmnUlNonadapRetx); rgSCHUhmRetx(alloc->hqProc, alloc); /* Update alloc to retx */ @@ -21474,16 +21234,15 @@ RgSchUlAlloc *alloc2; #endif { - TRC2(rgSCHCmnUlAllocsOvrLap); if (((alloc1->sbStart >= alloc2->sbStart) && (alloc1->sbStart <= alloc2->sbStart + alloc2->numSb-1)) || ((alloc2->sbStart >= alloc1->sbStart) && (alloc2->sbStart <= alloc1->sbStart + alloc1->numSb-1))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /** * @brief Copy allocation Info from src to dst. @@ -21513,7 +21272,6 @@ RgSchUlAlloc *dstAlloc; #endif { RgSchCmnUlUe *ueUl; - TRC2(rgSCHCmnUlCpyAllocInfo); dstAlloc->grnt = srcAlloc->grnt; dstAlloc->hqProc = srcAlloc->hqProc; @@ -21595,7 +21353,6 @@ RgSchUlAlloc *srcAlloc; /* MS_WORKAROUND ccpu00120827 */ RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); U8 remAllocs; - TRC2(rgSCHCmnUlInsAllocFrmNewSf2OldSf); if ((alloc = rgSCHUtlUlAllocFirst(oldSf)) != NULLP) { @@ -21701,7 +21458,6 @@ RgSchUlSf *newSf; #endif { RgSchUlAlloc *alloc, *nxtAlloc; - TRC2(rgSCHCmnUlMergeSfAllocs); UNUSED(cell); /* Merge each alloc of newSf in to oldSf @@ -21749,7 +21505,6 @@ RgSchUlSf *newSf; RgSchUlHoleDb *tempHoleDb = newSf->holeDb; U8 tempAvailSbs = newSf->availSubbands; - TRC2(rgSCHCmnUlSwapSfAllocs); UNUSED(cell); newSf->allocDb = oldSf->allocDb; @@ -21795,7 +21550,6 @@ U8 idx; { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); RgSchUlAlloc *alloc, *nxtAlloc; - TRC2(rgSCHCmnUlPrcNonAdptRetx); /* perform non-adaptive retx allocation(adjustment) */ if ((alloc = rgSCHUtlUlAllocFirst(newSf)) != NULLP) @@ -21856,7 +21610,6 @@ RgSchUlSf *newSf; U8 idx; #endif { - TRC2(rgSCHCmnUlPrfmSfMerge); /* Preassigned resources for msg3 in newSf. * Hence do adaptive retx for all NACKED TXs */ rgSCHCmnUlMergeSfAllocs(cell, oldSf, newSf); @@ -21899,7 +21652,6 @@ RgSchUlSf *sf; #endif { RgSchUlAlloc *alloc, *nxtAlloc; - TRC2(rgSCHCmnUlRmvCmpltdAllocs); if ((alloc = rgSCHUtlUlAllocFirst(sf)) == NULLP) { @@ -21992,18 +21744,17 @@ RgSchUlSf *sf; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnRlsUlSf +Void rgSCHCmnRlsUlSf ( RgSchCellCb *cell, U8 idx ) #else -PUBLIC Void rgSCHCmnRlsUlSf(cell, idx) +Void rgSCHCmnRlsUlSf(cell, idx) RgSchCellCb *cell; U8 idx; #endif { - TRC2(rgSCHCmnRlsUlSf); RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); @@ -22051,7 +21802,6 @@ RgSchUlAlloc *alloc; { RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnUlUpdAllocRetx); alloc->hqProc->reTxAlloc.rnti = alloc->rnti; alloc->hqProc->reTxAlloc.numSb = alloc->numSb; @@ -22124,7 +21874,6 @@ RgSchUlHole *hole; RgSchDlSf *dlSf; RgSchPdcch *pdcch; RgSchUlAlloc *alloc; - TRC2(rgSCHCmnUlAdapRetxAlloc); /* Fetch PDCCH for msg3 */ /* ccpu00116293 - Correcting relation between UL subframe and DL subframe based on RG_UL_DELTA*/ @@ -22134,7 +21883,7 @@ RgSchUlHole *hole; pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf); if (pdcch == NULLP) { - RETVALUE(FALSE); + return (FALSE); } /* Fetch UL Alloc for msg3 */ @@ -22149,7 +21898,7 @@ RgSchUlHole *hole; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "UL Alloc fail for msg3 retx for rnti: %d\n", proc->reTxAlloc.rnti); - RETVALUE(FALSE); + return (FALSE); } rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc); @@ -22252,9 +22001,9 @@ RgSchUlHole *hole; RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "Num SB not suffiecient for adap retx for rnti: %d", proc->reTxAlloc.rnti); - RETVALUE(FALSE); + return (FALSE); } - RETVALUE(TRUE); + return (TRUE); } /* Fix: syed Adaptive Msg3 Retx crash. */ @@ -22289,7 +22038,6 @@ RgSchUlSf *sf; RgSchUlHqProcCb *proc; RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnUlSfRlsRetxProcs); cp = &(cellUl->reTxLst); node = cp->first; @@ -22339,7 +22087,6 @@ RgSchUlSf *sf; RgSchUeCb *ue; RgSchCmnCell *schCmnCell = (RgSchCmnCell *)(cell->sc.sch); RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnUlSfReTxAllocs); cp = &(cellUl->reTxLst); node = cp->first; @@ -22411,7 +22158,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnDlRbAlloc); if (cellSch->dl.isDlFreqSel) { @@ -22446,7 +22192,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlGetRbgInfo +Void rgSCHCmnDlGetRbgInfo ( U8 dlTotalBw, U8 dlSubsetBw, @@ -22455,7 +22201,7 @@ U8 rbgSize, RgSchBwRbgInfo *rbgInfo ) #else -PUBLIC Void rgSCHCmnDlGetRbgInfo(dlTotalBw, dlSubsetBw, maxRaType1SubsetBw, +Void rgSCHCmnDlGetRbgInfo(dlTotalBw, dlSubsetBw, maxRaType1SubsetBw, rbgSize, rbgInfo) U8 dlTotalBw; U8 dlSubsetBw; @@ -22501,7 +22247,7 @@ RgSchBwRbgInfo *rbgInfo; rbgInfo->lastRbgSize = rbgSize - (dlSubsetBw - ((dlSubsetBw/rbgSize) * rbgSize)); #ifdef RGSCH_SPS_UNUSED - cmMemcpy((U8 *)rbgInfo->rbgSubsetSize, (U8 *) subsetSize, 4 * sizeof(U8)); + memcpy(rbgInfo->rbgSubsetSize, subsetSize, 4 * sizeof(U8)); #endif rbgInfo->numRbs = (rbgInfo->numRbgs * rbgSize > dlTotalBw) ? dlTotalBw:(rbgInfo->numRbgs * rbgSize); @@ -22535,7 +22281,7 @@ RgSchBwRbgInfo *rbgInfo; **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnDlRaType0Alloc +U8 rgSCHCmnDlRaType0Alloc ( RgSchDlSfAllocInfo *allocedInfo, U8 rbsReq, @@ -22545,7 +22291,7 @@ RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc ) #else -PUBLIC U8 rgSCHCmnDlRaType0Alloc(allocedInfo, rbsReq, rbgInfo, +U8 rgSCHCmnDlRaType0Alloc(allocedInfo, rbsReq, rbgInfo, numAllocRbs, resAllocInfo, isPartialAlloc) RgSchDlSfAllocInfo *allocedInfo; U8 rbsReq; @@ -22679,7 +22425,7 @@ Bool isPartialAlloc; * same */ } - RETVALUE(numAllocRbgs); + return (numAllocRbgs); } #ifdef RGSCH_SPS_UNUSED @@ -22712,7 +22458,7 @@ Bool isPartialAlloc; **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnDlRaType1Alloc +U8 rgSCHCmnDlRaType1Alloc ( RgSchDlSfAllocInfo *allocedInfo, U8 rbsReq, @@ -22723,7 +22469,7 @@ RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc ) #else -PUBLIC U8 rgSCHCmnDlRaType1Alloc(allocedInfo, rbsReq,rbgInfo,startRbgSubset, +U8 rgSCHCmnDlRaType1Alloc(allocedInfo, rbsReq,rbgInfo,startRbgSubset, allocRbgSubset, resAllocInfo, isPartialAlloc) RgSchDlSfAllocInfo *allocedInfo; U8 rbsReq; @@ -22832,7 +22578,7 @@ Bool isPartialAlloc; *allocRbgSubset = bestSubsetIdx; } /* End of if (bestNumAvailRbs) */ - RETVALUE(numAllocRbs); + return (numAllocRbs); } #endif /** @@ -22863,7 +22609,7 @@ Bool isPartialAlloc; **/ #ifdef ANSI -PUBLIC U8 rgSCHCmnDlRaType2Alloc +U8 rgSCHCmnDlRaType2Alloc ( RgSchDlSfAllocInfo *allocedInfo, U8 rbsReq, @@ -22873,7 +22619,7 @@ RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc ) #else -PUBLIC U8 rgSCHCmnDlRaType2Alloc(allocedInfo, rbsReq, rbgInfo, rbStart, +U8 rgSCHCmnDlRaType2Alloc(allocedInfo, rbsReq, rbgInfo, rbStart, resAllocInfo, isPartialAlloc) RgSchDlSfAllocInfo *allocedInfo; U8 rbsReq; @@ -22928,7 +22674,7 @@ Bool isPartialAlloc; } } - RETVALUE(numAllocRbs); + return (numAllocRbs); } /** @@ -22964,7 +22710,7 @@ U8 rbgSize; rbg = rbIdx/rbgSize; rbgPosInRbgMask = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbg); - RETVALUE(rbgPosInRbgMask); + return (rbgPosInRbgMask); } #ifdef RGSCH_SPS_UNUSED @@ -23009,7 +22755,7 @@ U8 *type1Subset; rbPosInSubset = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbInSubset); *type1Subset = rbgSubset; - RETVALUE(rbPosInSubset); + return (rbPosInSubset); } #endif /* RGSCH_SPS_UNUSED */ /** @@ -23044,7 +22790,7 @@ U8 *maskIdx; *maskIdx = rbIdx / 32; rbPosInType2 = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbIdx % 32); - RETVALUE(rbPosInType2); + return (rbPosInType2); } /** @@ -23070,7 +22816,7 @@ U8 *maskIdx; * RFAILED failed **/ #ifdef ANSI -PUBLIC Bool rgSCHCmnAllocUeInSpsBw +Bool rgSCHCmnAllocUeInSpsBw ( RgSchDlSf *dlSf, RgSchCellCb *cell, @@ -23079,7 +22825,7 @@ RgSchDlRbAlloc *rbAllocInfo, Bool isPartialAlloc ) #else -PUBLIC Bool rgSCHCmnAllocUeInSpsBw(dlSf, cell, ue, rbAllocInfo, isPartialAlloc) +Bool rgSCHCmnAllocUeInSpsBw(dlSf, cell, ue, rbAllocInfo, isPartialAlloc) RgSchDlSf *dlSf; RgSchCellCb *cell; RgSchUeCb *ue; @@ -23100,20 +22846,20 @@ Bool isPartialAlloc; if ((0 == rbAllocInfo->tbInfo[0].schdlngForTb) && (0 == rbAllocInfo->tbInfo[1].schdlngForTb)) { - RETVALUE(TRUE); + return (TRUE); } /* Check if the requirement can be accomodated in SPS BW */ if (dlSf->spsAllocdBw == spsRbgInfo->numRbs) { /* SPS Bandwidth has been exhausted: no further allocations possible */ - RETVALUE(FALSE); + return (FALSE); } if (!isPartialAlloc) { if((dlSf->spsAllocdBw + rbAllocInfo->rbsReq) > spsRbgInfo->numRbs) { - RETVALUE(TRUE); + return (TRUE); } } @@ -23151,7 +22897,7 @@ Bool isPartialAlloc; } if (!numAllocRbs) { - RETVALUE(TRUE); + return (TRUE); } if (!(rbAllocInfo->pdcch = @@ -23159,7 +22905,7 @@ Bool isPartialAlloc; rbAllocInfo->dciFormat, FALSE))) { /* Note: Returning TRUE since PDCCH might be available for another UE */ - RETVALUE(TRUE); + return (TRUE); } /* Update Tb info for each scheduled TB */ @@ -23222,7 +22968,7 @@ Bool isPartialAlloc; } dlSf->spsAllocdBw += numAllocRbs; - RETVALUE(TRUE); + return (TRUE); } /*********************************************************** @@ -23311,11 +23057,11 @@ Bool isPartialAlloc; { bestAvailNumRbs = numAvailRbs; bestStartPos = startPos; - cmMemcpy((U8 *)bestMask, (U8 *) tmpMask, 4 * sizeof(U32)); + memcpy(bestMask, tmpMask, 4 * sizeof(U32)); } numAvailRbs = 0; startPos = -1; - cmMemset((U8 *)tmpMask, 0, 4 * sizeof(U32)); + memset(tmpMask, 0, 4 * sizeof(U32)); } } if (*allocNumRbs == rbsReq) @@ -23327,7 +23073,7 @@ Bool isPartialAlloc; if (*allocNumRbs == rbsReq) { /* Convert the hole into allocation */ - cmMemcpy((U8 *)crntAllocMask, (U8 *) tmpMask, 4 * sizeof(U32)); + memcpy(crntAllocMask, tmpMask, 4 * sizeof(U32)); RETVOID; } else @@ -23338,7 +23084,7 @@ Bool isPartialAlloc; *allocStart = (U8)bestStartPos; *allocNumRbs = bestAvailNumRbs; /* Convert the hole into allocation */ - cmMemcpy((U8 *)crntAllocMask, (U8 *) bestMask, 4 * sizeof(U32)); + memcpy(crntAllocMask, bestMask, 4 * sizeof(U32)); } } @@ -23571,7 +23317,6 @@ RgSchDlRbAlloc *allocInfo; { U8 addtlRbsAvl = 0; - TRC2(rgSCHCmnFindNumAddtlRbsAvl) if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0) { @@ -23583,7 +23328,7 @@ RgSchDlRbAlloc *allocInfo; addtlRbsAvl = (dlSf->bw - dlSf->bwAlloced) - allocInfo->rbsReq; } - RETVALUE(addtlRbsAvl); + return (addtlRbsAvl); } /* Added this function to find num of ovrlapping PBCH rb*/ @@ -23620,7 +23365,6 @@ U8 *numOvrlapgPbchRb; #endif { *numOvrlapgPbchRb = 0; - TRC2(rgSCHCmnFindNumPbchOvrlapRbs) /*Find if we have already crossed the start boundary for PBCH 6 RBs, * if yes then lets find the number of RBs which are getting overlapped * with this allocation.*/ @@ -23706,7 +23450,6 @@ Bool isBcchPcch; U8 divResult; - TRC2(rgSCHCmnNonDlfsPbchRbAllocAdj); origRbsReq = allocInfo->rbsReq; @@ -23894,7 +23637,6 @@ RgSchDlRbAlloc *allocInfo; U8 spsRbsAlloc = 0; RgSchDlSfAllocInfo *dlSfAlloc = &allocInfo->dlSf->dlSfAllocInfo; #endif - TRC2(rgSCHCmnNonDlfsCmnRbAlloc); allocInfo->tbInfo[0].noLyr = 1; @@ -23902,9 +23644,9 @@ RgSchDlRbAlloc *allocInfo; /* Note: Initialize the masks to 0, this might not be needed since alloInfo * is initialized to 0 at the beginning of allcoation */ allocInfo->resAllocInfo.raType0Mask = 0; - cmMemset((U8*)allocInfo->resAllocInfo.raType1Mask, 0, + memset(allocInfo->resAllocInfo.raType1Mask, 0, RG_SCH_NUM_RATYPE1_32BIT_MASK * sizeof (U32)); - cmMemset((U8*)allocInfo->resAllocInfo.raType2Mask, 0, + memset(allocInfo->resAllocInfo.raType2Mask, 0, RG_SCH_NUM_RATYPE2_32BIT_MASK * sizeof (U32)); if ((dlSf->spsAllocdBw >= cell->spsBwRbgInfo.numRbs) && @@ -23913,7 +23655,7 @@ RgSchDlRbAlloc *allocInfo; if(dlSf->bwAlloced == dlSf->bw) #endif { - RETVALUE(RFAILED); + return RFAILED; } #ifndef LTE_TDD if (allocInfo->rbsReq > (dlSf->bw - dlSf->bwAlloced)) @@ -23946,7 +23688,7 @@ RgSchDlRbAlloc *allocInfo; if (!spsRbsAlloc) #endif /* LTEMAC_SPS */ { - RETVALUE(RFAILED); + return RFAILED; } } } @@ -23956,7 +23698,7 @@ RgSchDlRbAlloc *allocInfo; allocInfo->pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf); if (allocInfo->pdcch == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } allocInfo->dciFormat = TFU_DCI_FORMAT_1A; allocInfo->pdcch->dciNumOfBits = cell->dciSize.size[TFU_DCI_FORMAT_1A]; @@ -24076,7 +23818,7 @@ RgSchDlRbAlloc *allocInfo; } #endif - RETVALUE(ROK); + return ROK; } @@ -24109,12 +23851,11 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) #endif { RgSchDlSf *dlSf = allocInfo->dlSf; - TRC2(rgSCHCmnNonDlfsCmnRbAllocRar); if(dlSf->bwAlloced == dlSf->bw) { - RETVALUE(RFAILED); + return RFAILED; } allocInfo->tbInfo[0].noLyr = 1; @@ -24123,7 +23864,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) allocInfo->pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf); if (allocInfo->pdcch == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } allocInfo->dciFormat = TFU_DCI_FORMAT_1A; allocInfo->pdcch->dciNumOfBits = cell->dciSize.size[TFU_DCI_FORMAT_1A]; @@ -24142,13 +23883,13 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) allocInfo->pdcch = rgSCHCmnPdcchAlloc(cell, NULLP, dlSf, 13, TFU_DCI_FORMAT_B1, FALSE); if (allocInfo->pdcch == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } RgSchSfBeamInfo *beamInfo = &(dlSf->sfBeamInfo[0]); if(beamInfo->totVrbgAllocated > MAX_5GTF_VRBG) { printf("5GTF_ERROR vrbg allocated > 25\n"); - RETVALUE(RFAILED); + return RFAILED; } allocInfo->tbInfo[0].cmnGrnt.vrbgStart = beamInfo->vrbgStart; @@ -24173,7 +23914,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) printf("\n[%s],allocInfo->tbInfo[0].bytesAlloc:%u,vrbgReq:%u\n", __func__,allocInfo->tbInfo[0].bytesAlloc,allocInfo->vrbgReq); - RETVALUE(ROK); + return ROK; } @@ -24297,7 +24038,7 @@ Bool isUeCellEdge; /* Check if type0 allocation can cater to this RETX requirement */ if ((allocInfo->rbsReq % cell->rbgSize) != (cell->rbgSize - dlSf->lstRbgDfct)) { - RETVALUE(FALSE); + return (FALSE); } else { @@ -24310,7 +24051,7 @@ Bool isUeCellEdge; else { /* cannot allocate same number of required RBs */ - RETVALUE(FALSE); + return (FALSE); } } } @@ -24320,7 +24061,7 @@ Bool isUeCellEdge; cell->rbgSize) - dlSf->lstRbgDfct)) { *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { @@ -24349,7 +24090,7 @@ Bool isUeCellEdge; noLyrs = allocInfo->tbInfo[0].noLyr; allocInfo->tbInfo[0].bytesReq = rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8; *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { @@ -24366,7 +24107,7 @@ Bool isUeCellEdge; continue; } - // RETVALUE(FALSE); + // return (FALSE); } } else if (allocInfo->raType == RG_SCH_CMN_RA_TYPE2) @@ -24403,7 +24144,7 @@ Bool isUeCellEdge; cell->rbgSize); sfrPool->adjCCPool->bw -= addtnlPRBs; *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } } } @@ -24421,12 +24162,12 @@ Bool isUeCellEdge; if(allocInfo->rbsReq <= (sfrCEPool->bw - sfrCEPool->bwAlloced)) { *sfrpoolInfo = sfrCEPool; - RETVALUE(TRUE); + return (TRUE); } else if(allocInfo->rbsReq <= (sfrPool->bw - sfrPool->bwAlloced)) { *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } /* Check if CE and CC boundary has unallocated prbs */ else if ((sfrPool->poolstartRB == sfrPool->type2Start) && @@ -24455,7 +24196,7 @@ Bool isUeCellEdge; sfrCEPool->type0End = ((sfrCEPool->poolendRB + 1 - addtnlPRBs) / cell->rbgSize) - 1; } *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else if ( bwAvlbl < ((sfrCEPool->bw - sfrCEPool->bwAlloced) + @@ -24477,11 +24218,11 @@ Bool isUeCellEdge; allocInfo->tbInfo[0].bytesReq = rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8; *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { - RETVALUE(FALSE); + return (FALSE); } } } @@ -24497,7 +24238,7 @@ Bool isUeCellEdge; if (allocInfo->rbsReq <= (sfrPool->bw - sfrPool->bwAlloced)) { *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { @@ -24535,7 +24276,7 @@ Bool isUeCellEdge; { dlSf->sfrTotalPoolInfo.ccBwFull = TRUE; } - RETVALUE(FALSE); + return (FALSE); } else { @@ -24547,7 +24288,7 @@ Bool isUeCellEdge; allocInfo->tbInfo[0].bytesReq = rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8; *sfrpoolInfo = poolWithMaxAvlblBw; - RETVALUE(TRUE); + return (TRUE); } } } @@ -24566,14 +24307,14 @@ Bool isUeCellEdge; if (n == NULLP) { - RETVALUE(FALSE); + return (FALSE); } } } } } - RETVALUE(FALSE); + return (FALSE); } #endif #endif /* end of ifndef LTE_TDD*/ @@ -24616,12 +24357,11 @@ RgSchDlRbAlloc *allocInfo; U8 noLyrs; U8 ignoredDfctRbg = FALSE; - TRC2(rgSCHCmnNonDlfsBwAvlbl); if (dlSf->bw <= dlSf->bwAlloced) { RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, "(%d:%d)FAILED CRNTI:%d", dlSf->bw, dlSf->bwAlloced,allocInfo->rnti); - RETVALUE(FALSE); + return (FALSE); } if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0) { @@ -24653,13 +24393,13 @@ RgSchDlRbAlloc *allocInfo; /* Check if type0 allocation can cater to this RETX requirement */ if ((allocInfo->rbsReq % cell->rbgSize) != (cell->rbgSize - dlSf->lstRbgDfct)) { - RETVALUE(FALSE); + return (FALSE); } } else { /* cannot allocate same number of required RBs */ - RETVALUE(FALSE); + return (FALSE); } } } @@ -24669,7 +24409,7 @@ RgSchDlRbAlloc *allocInfo; if(allocInfo->rbsReq <= (((dlSf->type0End - dlSf->type2End + 1)*\ cell->rbgSize) - dlSf->lstRbgDfct)) { - RETVALUE(TRUE); + return (TRUE); } /* ccpu00132358:MOD- Removing "ifndef LTE_TDD" for unblocking the RB * allocation in TDD when requested RBs are more than available RBs*/ @@ -24688,7 +24428,7 @@ RgSchDlRbAlloc *allocInfo; } - RETVALUE(FALSE); + return (FALSE); } /* Fix: Number of RBs in case of RETX should be same as * that of initial transmission. */ @@ -24728,16 +24468,16 @@ RgSchDlRbAlloc *allocInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "FAILED for CRNTI:%d", allocInfo->rnti); printf ("RB Alloc failed for LAA TB type 0\n"); - RETVALUE(FALSE); + return (FALSE); } - RETVALUE(TRUE); + return (TRUE); } } else if (allocInfo->raType == RG_SCH_CMN_RA_TYPE2) { if (allocInfo->rbsReq <= (dlSf->bw - dlSf->bwAlloced)) { - RETVALUE(TRUE); + return (TRUE); } /* ccpu00132358:MOD- Removing "ifndef LTE_TDD" for unblocking the RB * allocation in TDD when requested RBs are more than available RBs*/ @@ -24770,15 +24510,15 @@ RgSchDlRbAlloc *allocInfo; { printf ("RB Alloc failed for LAA TB type 2\n"); RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti); - RETVALUE(FALSE); + return (FALSE); } /* Fix: Number of RBs in case of RETX should be same as * that of initial transmission. */ - RETVALUE(TRUE); + return (TRUE); } } RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti); - RETVALUE(FALSE); + return (FALSE); } #endif /* LTE_ADV_FLAG_REMOVED_START */ @@ -24800,7 +24540,7 @@ RgSchDlRbAlloc *allocInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc +Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -24808,7 +24548,7 @@ U8 rbStrt, U8 numRb ) #else -PUBLIC Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc(cell, dlSf, rbStrt, numRb) +Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc(cell, dlSf, rbStrt, numRb) RgSchCellCb *cell; RgSchDlSf *dlSf; U8 rbStrt; @@ -24818,7 +24558,6 @@ U8 numRb; CmLListCp *l; CmLList *n; RgSchSFRPoolInfo *sfrPool; - TRC2(rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc); l = &dlSf->sfrTotalPoolInfo.ccPool; @@ -24904,7 +24643,6 @@ U8 numRb; RgSchSFRPoolInfo *sfrCCPool2 = NULL; S16 ret = RFAILED; - TRC2(rgSCHCmnNonDlfsUpdDSFRTyp2Alloc); /* Move the type2End pivot forward */ @@ -24918,7 +24656,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "sfrCCPool1 is NULL for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } n = cmLListNext(l); if(n) @@ -24942,7 +24680,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -24959,7 +24697,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -24970,7 +24708,7 @@ U8 numRb; /*MS_FIX for ccpu00123918*/ dlSf->type2Start += numRb; #endif - RETVALUE(ROK); + return ROK; } #endif @@ -25008,7 +24746,6 @@ U8 rbStrt; U8 numRb; #endif { - TRC2(rgSCHCmnNonDlfsUpdTyp2Alloc); /* Move the type2End pivot forward */ dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize); //#ifndef LTEMAC_SPS @@ -25066,7 +24803,6 @@ RgSchUeCb *ue; U32 tb2BytesAlloc = 0; RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnNonDlfsType0Alloc); //if(noRbgs == 0) noRbgs = 1; /* Not required as ceilling is used above*/ /* Fix for ccpu00123919*/ @@ -25240,7 +24976,6 @@ U16 bw; U16 rbBitLoc; /* Bit Location to be set as 1 in the current Byte */ U16 nmbRbPerByte; /* PRB's to be set in the current Byte (in case of multiple Bytes) */ - TRC2(rgSCHCmnBuildRntpInfo); rbPtrStartIdx = (startRb)/8; rbPtrEndIdx = (startRb + nmbRb)/8; @@ -25250,7 +24985,7 @@ U16 bw; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnBuildRntpInfo():" "rntpPtr can't be NULLP (Memory Allocation Failed)"); - RETVALUE(RFAILED); + return RFAILED; } while(rbPtrStartIdx <= rbPtrEndIdx) @@ -25281,7 +25016,7 @@ U16 bw; /* dsfr_pal_fixes ** 25-March-2013 ** SKS ** Adding Debug logs to print RNTP */ - RETVALUE(ROK); + return ROK; } /** @@ -25324,7 +25059,6 @@ U8 numRb; S16 ret; #endif - TRC2(rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc); dlSf->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize); sfrPool->type2End = RGSCH_CEIL((rbStrt+numRb), cell->rbgSize); @@ -25348,7 +25082,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -25360,7 +25094,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -25368,7 +25102,7 @@ U8 numRb; sfrPool->bwAlloced += numRb; #endif - RETVALUE(ROK); + return ROK; } /** @@ -25412,7 +25146,6 @@ RgSchDlRbAlloc *allocInfo; U8 noLyr; U8 iTbs; - TRC2(rgSCHCmnNonDlfsSFRPoolType0Alloc); if (poolInfo->poolstartRB + poolInfo->bw == dlSf->bw) { @@ -25533,7 +25266,6 @@ RgSchDlSf *dlSf; U16 len; U16 ret = ROK; - TRC2(rgSCHCmnNonDlfsDsfrRntpComp); len = (dlSf->bw % 8 == 0) ? dlSf->bw/8 : dlSf->bw/8 + 1; @@ -25576,7 +25308,7 @@ RgSchDlSf *dlSf; "rgSCHUtlRgrLoadInfInd() returned RFAILED"); } - cmMemset(cell->rntpAggrInfo.val,0,len); + memset(cell->rntpAggrInfo.val,0,len); samples = 0; } } @@ -25624,7 +25356,6 @@ U8 *isDlBwAvail; Bool isUECellEdge; RgSchSFRPoolInfo *sfrpoolInfo = NULLP; - TRC2(rgSCHCmnSFRNonDlfsUeRbAlloc); isUECellEdge = RG_SCH_CMN_IS_UE_CELL_EDGE(ue); @@ -25645,7 +25376,7 @@ U8 *isDlBwAvail; { *isDlBwAvail = FALSE; } - RETVALUE(RFAILED); + return RFAILED; } if (dlUe->proc->tbInfo[0].isAckNackDtx == TFU_HQFDB_DTX || dlUe->proc->tbInfo[1].isAckNackDtx) @@ -25660,7 +25391,7 @@ U8 *isDlBwAvail; if (!(allocInfo->pdcch)) { /* Returning ROK since PDCCH might be available for another UE and further allocations could be done */ - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -25701,7 +25432,7 @@ U8 *isDlBwAvail; dlSf->bwAlloced += allocInfo->rbsReq; #endif - RETVALUE(ROK); + return ROK; } #endif /* LTE_ADV_FLAG_REMOVED_END */ @@ -25747,7 +25478,6 @@ U8 *isDlBwAvail; #ifdef LAA_DBG U32 dbgRbsReq = 0; #endif - TRC2(rgSCHCmnNonDlfsUeRbAlloc); #ifdef RG_5GTF RgSch5gtfUeCb *ue5gtfCb = &(ue->ue5gtfCb); @@ -25763,7 +25493,7 @@ U8 *isDlBwAvail; "5GTF_ERROR : vrbg allocated > 25 :ue (%u)", ue->ueId); printf("5GTF_ERROR vrbg allocated > 25\n"); - RETVALUE(RFAILED); + return RFAILED; } if (dlUe->proc->tbInfo[0].isAckNackDtx == TFU_HQFDB_DTX @@ -25783,7 +25513,7 @@ U8 *isDlBwAvail; "5GTF_ERROR : PDCCH allocation failed :ue (%u)", ue->ueId); printf("5GTF_ERROR PDCCH allocation failed\n"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef RG_5GTF //maxPrb = RGSCH_MIN((allocInfo->vrbgReq * MAX_5GTF_VRBG_SIZE), ue5gtfCb->maxPrb); @@ -25807,7 +25537,7 @@ U8 *isDlBwAvail; allocInfo->tbInfo[0].bytesAlloc = allocInfo->tbInfo[0].bytesReq; #endif - RETVALUE(ROK); + return ROK; } #ifdef RGR_V1 @@ -25853,7 +25583,6 @@ U8 isRetx; RgSchDlSf *dlSf = allocInfo->ccchSduDlSf; RgSchUeCb *ueCb = NULLP; RgSchDlHqProcCb *hqP = NULLP; - TRC2(rgSCHCmnNonDlfsCcchSduAlloc); if (isRetx) { @@ -25938,7 +25667,6 @@ RgSchDlSf *dlSf; RgSchDlRbAlloc *allocInfo; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); - TRC2(rgSCHCmnNonDlfsCcchSduRbAlloc); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb,cell); @@ -25953,7 +25681,7 @@ RgSchDlSf *dlSf; (allocInfo->rbsReq > (dlSf->bw - dlSf->bwAlloced))) #endif { - RETVALUE(RFAILED); + return RFAILED; } /* Retrieve PDCCH */ /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ @@ -25970,7 +25698,7 @@ RgSchDlSf *dlSf; if (!(allocInfo->pdcch)) { /* Returning RFAILED since PDCCH not available for any CCCH allocations */ - RETVALUE(RFAILED); + return RFAILED; } /* Update allocation information */ @@ -26006,7 +25734,7 @@ RgSchDlSf *dlSf; /* ccpu00131941 - bwAlloced is updated from SPS bandwidth */ - RETVALUE(ROK); + return ROK; } #endif @@ -26043,7 +25771,6 @@ RgSchDlSf *dlSf; #endif { RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnNonDlfsMsg4RbAlloc); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_RACB(raCb); @@ -26056,7 +25783,7 @@ RgSchDlSf *dlSf; "5GTF_ERROR : vrbg allocated > 25 :ue (%u)", raCb->ue->ueId); printf("5GTF_ERROR vrbg allocated > 25\n"); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef LTEMAC_SPS @@ -26068,7 +25795,7 @@ RgSchDlSf *dlSf; #endif { - RETVALUE(RFAILED); + return RFAILED; } /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ @@ -26083,7 +25810,7 @@ RgSchDlSf *dlSf; if (!(allocInfo->pdcch)) { /* Returning RFAILED since PDCCH not available for any CCCH allocations */ - RETVALUE(RFAILED); + return RFAILED; } #ifndef RG_5GTF @@ -26143,7 +25870,7 @@ RgSchDlSf *dlSf; #endif - RETVALUE(ROK); + return ROK; } /** @@ -26187,7 +25914,6 @@ U8 isRetx; RgSchDlSf *dlSf = allocInfo->msg4DlSf; RgSchRaCb *raCb = NULLP; RgSchDlHqProcCb *hqP = NULLP; - TRC2(rgSCHCmnNonDlfsMsg4Alloc); if (isRetx) { @@ -26262,7 +25988,7 @@ U8 isRetx; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnNonDlfsDedRbAlloc +Void rgSCHCmnNonDlfsDedRbAlloc ( RgSchCellCb *cell, RgSchCmnUeRbAlloc *allocInfo, @@ -26271,7 +25997,7 @@ CmLListCp *schdHqPLst, CmLListCp *nonSchdHqPLst ) #else -PUBLIC Void rgSCHCmnNonDlfsDedRbAlloc(cell, allocInfo, ueLst, +Void rgSCHCmnNonDlfsDedRbAlloc(cell, allocInfo, ueLst, schdHqPLst, nonSchdHqPLst) RgSchCellCb *cell; RgSchCmnUeRbAlloc *allocInfo; @@ -26287,7 +26013,6 @@ CmLListCp *nonSchdHqPLst; RgSchUeCb *ue = NULLP; RgSchDlHqProcCb *hqP = NULLP; U8 isDlBwAvail; - TRC2(rgSCHCmnNonDlfsDedRbAlloc); /* Perform allocaations for the list */ @@ -26367,20 +26092,19 @@ CmLListCp *nonSchdHqPLst; **/ #ifdef ANSI -PUBLIC Void rgSCHCmnNonDlfsRbAlloc +Void rgSCHCmnNonDlfsRbAlloc ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PUBLIC Void rgSCHCmnNonDlfsRbAlloc(cell, allocInfo) +Void rgSCHCmnNonDlfsRbAlloc(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif { U8 raRspCnt = 0; RgSchDlRbAlloc *reqAllocInfo; - TRC2(rgSCHCmnNonDlfsRbAlloc); /* Allocate for MSG4 retransmissions */ if (allocInfo->msg4Alloc.msg4RetxLst.count) @@ -26506,28 +26230,28 @@ RgSchCmnDlRbAllocInfo *allocInfo; **********************************************************/ #ifdef LTEMAC_SPS #ifdef ANSI -PUBLIC U32 rgSCHCmnCalcRiv +U32 rgSCHCmnCalcRiv ( U8 bw, U8 rbStart, U8 numRb ) #else -PUBLIC U32 rgSCHCmnCalcRiv(bw, rbStart, numRb) +U32 rgSCHCmnCalcRiv(bw, rbStart, numRb) U8 bw; U8 rbStart; U8 numRb; #endif #else #ifdef ANSI -PUBLIC U32 rgSCHCmnCalcRiv +U32 rgSCHCmnCalcRiv ( U8 bw, U8 rbStart, U8 numRb ) #else -PUBLIC U32 rgSCHCmnCalcRiv(bw, rbStart, numRb) +U32 rgSCHCmnCalcRiv(bw, rbStart, numRb) U8 bw; U8 rbStart; U8 numRb; @@ -26537,7 +26261,6 @@ U8 numRb; U8 numRbMinus1 = numRb - 1; U32 riv; - TRC2(rgSCHCmnCalcRiv); if (numRbMinus1 <= bw/2) { @@ -26547,7 +26270,7 @@ U8 numRb; { riv = bw * (bw - numRbMinus1) + (bw - rbStart - 1); } - RETVALUE(riv); + return (riv); } /* rgSCHCmnCalcRiv */ #ifdef LTE_TDD @@ -26594,7 +26317,6 @@ U8 raArrSz; U8 sfcount; S16 ret; - TRC2(rgSCHCmnDlCpyRachInfo); /* Allocate RACH response information for each DL * subframe in a radio frame */ @@ -26603,7 +26325,7 @@ U8 raArrSz; sizeof(RgSchTddRachRspLst)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } for(sfnIdx=raArrSz-1; sfnIdx>=0; sfnIdx--) @@ -26658,7 +26380,7 @@ U8 raArrSz; } } } - RETVALUE(ROK); + return ROK; } #endif /** @@ -26725,7 +26447,6 @@ U8 noLyr; RgSchCmnDlCell *cellDl = RG_SCH_CMN_GET_DL_CELL(cell); S32 iTbs = 0; - TRC2(rgSchCmnFetchItbs); #ifdef LTE_TDD /* Special Handling for Spl Sf when CFI is 3 as @@ -26764,7 +26485,7 @@ U8 noLyr; ueDl->laCb[cwIdx].deltaiTbs = 0; } - RETVALUE(iTbs); + return (iTbs); } /** @@ -26816,7 +26537,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RgSchDlRbAlloc *allocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocTxRb1Tb1Cw); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -26902,7 +26622,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RgSchDlRbAlloc *allocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocRetxRb1Tb1Cw); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -26984,7 +26703,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM1); rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27036,7 +26754,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM1); rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27088,7 +26805,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM2); rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27140,7 +26856,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM2); rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -27193,7 +26908,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM3); /* Both TBs free for TX allocation */ rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo,\ @@ -27250,7 +26964,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM3); if ((proc->tbInfo[0].state == HQ_TB_NACKED) && (proc->tbInfo[1].state == HQ_TB_NACKED)) @@ -27301,14 +27014,14 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PUBLIC TfuDciFormat rgSCHCmnSlctPdcchFrmt +TfuDciFormat rgSCHCmnSlctPdcchFrmt ( RgSchCellCb *cell, RgSchUeCb *ue, U8 *raType ) #else -PUBLIC TfuDciFormat rgSCHCmnSlctPdcchFrmt(cell, ue, raType) +TfuDciFormat rgSCHCmnSlctPdcchFrmt(cell, ue, raType) RgSchCellCb *cell; RgSchUeCb *ue; U8 *raType; @@ -27316,19 +27029,18 @@ U8 *raType; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHCmnSlctPdcchFrmt); /* ccpu00140894- Selective DCI Format and RA type should be selected only * after TX Mode transition is completed*/ if ((cellSch->dl.isDlFreqSel) && (ue->txModeTransCmplt)) { *raType = rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciRAType; - RETVALUE(rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciFrmt); + return (rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciFrmt); } else { *raType = rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciRAType; - RETVALUE(rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciFrmt); + return (rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciFrmt); } } @@ -27393,7 +27105,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 noTxLyrs; U8 precInfoAntIdx; - TRC2(rgSCHCmnDlTM3RetxRetx); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -27506,7 +27217,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif U8 noTxLyrs; - TRC2(rgSCHCmnDlTM4RetxRetx); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -27607,7 +27317,6 @@ Bool *swpFlg; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,proc->hqE->cell); RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnDlSMGetAttrForTxRetx); if (proc->tbInfo[0].state == HQ_TB_NACKED) { @@ -27679,9 +27388,8 @@ U8 numTxLyrs; Bool bothCwEnbld; #endif { - TRC2(rgSCHCmnDlTM3PrecInf2); - RETVALUE(0); + return (0); } @@ -27721,7 +27429,6 @@ Bool bothCwEnbld; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precIdx; - TRC2(rgSCHCmnDlTM4PrecInf2); if (ueDl->mimoInfo.ri == numTxLyrs) { @@ -27770,7 +27477,7 @@ Bool bothCwEnbld; { precIdx = (ueDl->mimoInfo.pmi < 2)? 0:1; } - RETVALUE(precIdx); + return (precIdx); } @@ -27809,7 +27516,6 @@ Bool bothCwEnbld; { U8 precIdx; - TRC2(rgSCHCmnDlTM3PrecInf4); if (bothCwEnbld) { @@ -27819,7 +27525,7 @@ Bool bothCwEnbld; { precIdx = 1; } - RETVALUE(precIdx); + return (precIdx); } @@ -27859,7 +27565,6 @@ Bool bothCwEnbld; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precInfoBaseIdx, precIdx; - TRC2(rgSCHCmnDlTM4PrecInf4); precInfoBaseIdx = (ue->mimoInfo.puschFdbkVld)? (16): (ueDl->mimoInfo.pmi); @@ -27872,7 +27577,7 @@ Bool bothCwEnbld; precInfoBaseIdx += 1; precIdx = precInfoBaseIdx + (numTxLyrs-1)*17; } - RETVALUE(precIdx); + return (precIdx); } @@ -27944,7 +27649,6 @@ U8 *raType; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precInfoAntIdx; - TRC2(rgSCHCmnDlGetAttrForTM3); /* Avoiding Tx-Retx for LAA cell as firstSchedTime is associated with HQP */ @@ -28145,7 +27849,6 @@ U8 *raType; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); U8 precInfoAntIdx; - TRC2(rgSCHCmnDlGetAttrForTM4); *frthrScp = FALSE; /* Integration_fix: SPS Proc shall always have only one Cw */ @@ -28325,7 +28028,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 prcdngInf; U8 numTxLyrs; - TRC2(rgSCHCmnDlTM3TxRetx); frthrScp = FALSE; ret = ROK; @@ -28440,7 +28142,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 prcdngInf; U8 numTxLyrs; - TRC2(rgSCHCmnDlTM4TxRetx); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -28557,7 +28258,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; S16 ret; U8 precInfoAntIdx; - TRC2(rgSCHCmnDlTM3TxTx); ret = ROK; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -28691,7 +28391,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U8 precInfoAntIdx; S16 ret; - TRC2(rgSCHCmnDlTM4TxTx); ret = ROK; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -28820,7 +28519,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM4); /* Both TBs free for TX allocation */ rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo,\ @@ -28877,7 +28575,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM4); if ((proc->tbInfo[0].state == HQ_TB_NACKED) && (proc->tbInfo[1].state == HQ_TB_NACKED)) @@ -28945,7 +28642,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM5); #if (ERRCLASS & ERRCLS_DEBUG) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId); #endif @@ -28999,7 +28695,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM5); #if (ERRCLASS & ERRCLS_DEBUG) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid TM 5 for CRNTI:%d",ue->ueId); #endif @@ -29059,7 +28754,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocTxRbTM6); ret = ROK; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -29154,7 +28848,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; S16 ret; U8 numRb; - TRC2(rgSCHCmnDlAllocRetxRbTM6); ret = ROK; allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -29242,7 +28935,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocTxRbTM7); rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -29294,7 +28986,6 @@ RgSchDlHqProcCb *proc; RgSchCmnDlRbAllocInfo *cellWdAllocInfo; #endif { - TRC2(rgSCHCmnDlAllocRetxRbTM7); rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo); RETVOID; } @@ -29322,7 +29013,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnDlAllocTxRb +S16 rgSCHCmnDlAllocTxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -29333,7 +29024,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PUBLIC S16 rgSCHCmnDlAllocTxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +S16 rgSCHCmnDlAllocTxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -29347,7 +29038,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U32 prevSchBits = 0; RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnDlAllocTxRb); if ( !RGSCH_TIMEINFO_SAME((cell->crntTime),(ue->dl.lstSchTime) )) { @@ -29388,7 +29078,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; } } - RETVALUE(ROK); + return ROK; } /* DwPTS Scheduling Changes Start */ @@ -29412,14 +29102,14 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PUBLIC Bool rgSCHCmnRetxAvoidTdd +Bool rgSCHCmnRetxAvoidTdd ( RgSchDlSf *curSf, RgSchCellCb *cell, RgSchDlHqProcCb *proc ) #else -PUBLIC Bool rgSCHCmnRetxAvoidTdd(curSf, cell, proc) +Bool rgSCHCmnRetxAvoidTdd(curSf, cell, proc) RgSchDlSf *curSf; RgSchCellCb *cell; RgSchDlHqProcCb *proc; @@ -29427,7 +29117,6 @@ RgSchDlHqProcCb *proc; { RgSchTddSfType txSfType = 0; - TRC2(rgSCHCmnRetxAvoidTdd); /* Get the RBs of TB that will be retransmitted */ if (proc->tbInfo[0].state == HQ_TB_NACKED) @@ -29439,7 +29128,7 @@ RgSchDlHqProcCb *proc; /* Avoid re-transmission on Normal SF when the corresponding TB wss transmitted on SPCL SF */ if(txSfType <= RG_SCH_SPL_SF_DATA && curSf->sfType >= RG_SCH_DL_SF_0) { - RETVALUE(TRUE); + return (TRUE); } #endif #endif @@ -29455,7 +29144,7 @@ RgSchDlHqProcCb *proc; /* Avoid re-transmission on Normal SF when the corresponding TB wss tranmitted on SPCL SF */ if(txSfType <= RG_SCH_SPL_SF_DATA && curSf->sfType >= RG_SCH_DL_SF_0) { - RETVALUE(TRUE); + return (TRUE); } #endif #endif @@ -29464,11 +29153,11 @@ RgSchDlHqProcCb *proc; if (txSfType > curSf->sfType) { /* Avoid retx */ - RETVALUE(TRUE); + return (TRUE); } /* Allow Retx */ - RETVALUE(FALSE); + return (FALSE); } #else @@ -29493,14 +29182,14 @@ RgSchDlHqProcCb *proc; * **/ #ifdef ANSI -PUBLIC Bool rgSCHCmnRetxAllocAvoid +Bool rgSCHCmnRetxAllocAvoid ( RgSchDlSf *subFrm, RgSchCellCb *cell, RgSchDlHqProcCb *proc ) #else -PUBLIC Bool rgSCHCmnRetxAllocAvoid(subFrm, cell, proc) +Bool rgSCHCmnRetxAllocAvoid(subFrm, cell, proc) RgSchDlSf *subFrm; RgSchCellCb *cell; RgSchDlHqProcCb *proc; @@ -29508,7 +29197,6 @@ RgSchDlHqProcCb *proc; { U8 reqRbs; - TRC2(rgSCHCmnRetxAllocAvoid); if (proc->tbInfo[0].state == HQ_TB_NACKED) { @@ -29526,10 +29214,10 @@ RgSchDlHqProcCb *proc; if ((subFrm->bwAssigned < cell->pbchRbEnd) && (((subFrm->bwAssigned + reqRbs) - cell->pbchRbStart) > 0)) { - RETVALUE(TRUE); + return (TRUE); } } - RETVALUE(FALSE); + return (FALSE); } #endif @@ -29557,7 +29245,7 @@ RgSchDlHqProcCb *proc; * **/ #ifdef ANSI -PUBLIC S16 rgSCHCmnDlAllocRetxRb +S16 rgSCHCmnDlAllocRetxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -29568,7 +29256,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PUBLIC S16 rgSCHCmnDlAllocRetxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +S16 rgSCHCmnDlAllocRetxRb(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -29581,7 +29269,6 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; U32 newSchBits = 0; RgSchDlRbAlloc *allocInfo; - TRC2(rgSCHCmnDlAllocRetxRb); if ( !RGSCH_TIMEINFO_SAME((cell->crntTime),(ue->dl.lstSchTime) )) { @@ -29592,7 +29279,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; /* Check for DL BW exhaustion */ if (subFrm->bw <= subFrm->bwAssigned) { - RETVALUE(RFAILED); + return RFAILED; } /* Call TM specific RB allocation routine */ (dlAllocRetxRbFunc[ue->mimoInfo.txMode - 1])(cell, subFrm, ue, bo, effBo, \ @@ -29614,7 +29301,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RGSCHCPYTIMEINFO((cell->crntTime),(ue->dl.lstSchTime)) } - RETVALUE(ROK); + return ROK; } @@ -29675,7 +29362,6 @@ U32 *effBo; /* Correcting wrap around issue. * This change has been done at mutliple places in this function.*/ U32 tempNumRb; - TRC2(rgSCHCmnDlAlloc1CwTxRb); reqBytes = bo; ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -29716,7 +29402,7 @@ U32 *effBo; /* Update the subframe Allocated BW field */ subFrm->bwAssigned = subFrm->bwAssigned + tempNumRb - allocInfo->rbsReq; - RETVALUE(ROK); + return ROK; } @@ -29742,14 +29428,14 @@ U32 *effBo; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnRdcImcsTxTb +Void rgSCHCmnRdcImcsTxTb ( RgSchDlRbAlloc *allocInfo, U8 tbInfoIdx, U32 cnsmdBytes ) #else -PUBLIC Void rgSCHCmnRdcImcsTxTb(allocInfo, tbInfoIdx, cnsmdBytes) +Void rgSCHCmnRdcImcsTxTb(allocInfo, tbInfoIdx, cnsmdBytes) RgSchDlRbAlloc *allocInfo; U8 tbInfoIdx; U32 cnsmdBytes; @@ -29761,7 +29447,6 @@ U32 cnsmdBytes; U8 iTbs; U16 numRb; - TRC2(rgSCHCmnRdcImcsTxTb); iTbs = allocInfo->tbInfo[tbInfoIdx].iTbs; noLyr = allocInfo->tbInfo[tbInfoIdx].noLyr; @@ -29859,7 +29544,6 @@ U32 *effBo; U32 boTmp = bo; #endif - TRC2(rgSCHCmnDlAlloc2CwTxRb); reqBytes = bo; cellDl = RG_SCH_CMN_GET_DL_CELL(cell); @@ -29880,7 +29564,7 @@ U32 *effBo; { RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHCmnDlAllocRb(): UEs max allocation exceed"); - RETVALUE(RFAILED); + return RFAILED; } noLyr1 = ueDl->mimoInfo.cwInfo[0].noLyr; @@ -30038,7 +29722,7 @@ U32 *effBo; #ifdef LTE_ADV if (ROK != rgSCHLaaCmn2TBPrbCheck(allocInfo, tb1Sz, tb2Sz, boTmp, effBo, iTbs1, iTbs2, numRb, proc)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -30051,7 +29735,7 @@ U32 *effBo; *numRbRef = (U8)numRb; - RETVALUE(ROK); + return ROK; } @@ -30114,7 +29798,6 @@ U32 *effBo; U8 cfi = cellDl->currCfi; U8 iTbs; - TRC2(rgSCHCmnDlAlloc2CwTxRetxRb); ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -30136,14 +29819,14 @@ U32 *effBo; if(*numRb <= 3) { RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb); - RETVALUE(RFAILED); + return RFAILED; } } #endif if ((S16)*numRb > availBw) { - RETVALUE(RFAILED); + return RFAILED; } /* Update the subframe Allocated BW field */ subFrm->bwAssigned += *numRb; @@ -30181,7 +29864,7 @@ U32 *effBo; *effBo = reTxTb->tbSz + tb2Sz; - RETVALUE(ROK); + return ROK; } @@ -30238,7 +29921,6 @@ U32 *effBo; U8 imcs2; RgSchDlHqTbCb *lrgTbInfo, *othrTbInfo; - TRC2(rgSCHCmnDlAlloc2CwRetxRb); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -30269,13 +29951,13 @@ U32 *effBo; if(*numRb <= 3) { RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb); - RETVALUE(RFAILED); + return RFAILED; } } #endif if ((S16)*numRb > (S16)(subFrm->bw - subFrm->bwAssigned)) { - RETVALUE(RFAILED); + return RFAILED; } /* Update the subframe Allocated BW field */ subFrm->bwAssigned += *numRb; @@ -30289,7 +29971,7 @@ U32 *effBo; - RETVALUE(ROK); + return ROK; } @@ -30342,7 +30024,6 @@ U32 *effBo; RgSchDlRbAlloc *allocInfo; U8 imcs; - TRC2(rgSCHCmnDlAlloc1CwRetxRb); allocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue,cell); @@ -30353,7 +30034,7 @@ U32 *effBo; *numRb = tbInfo->dlGrnt.numRb; if ((S16)*numRb > (S16)(subFrm->bw - subFrm->bwAssigned)) { - RETVALUE(RFAILED); + return RFAILED; } /* Update the subframe Allocated BW field */ subFrm->bwAssigned += *numRb; @@ -30364,7 +30045,7 @@ U32 *effBo; 0, imcs, tbInfo, tbInfo->numLyrs); *effBo = tbInfo->tbSz; - RETVALUE(ROK); + return ROK; } #ifdef LTEMAC_SPS @@ -30386,21 +30067,20 @@ U32 *effBo; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlRelPdcchFbk +Void rgSCHCmnDlRelPdcchFbk ( RgSchCellCb *cell, RgSchUeCb *ue, Bool isAck ) #else -PUBLIC Void rgSCHCmnDlRelPdcchFbk(cell, ue, isAck) +Void rgSCHCmnDlRelPdcchFbk(cell, ue, isAck) RgSchCellCb *cell; RgSchUeCb *ue; Bool isAck; #endif { - TRC2(rgSCHCmnDlRelPdcchFbk); rgSCHCmnSpsDlRelPdcchFbk(cell, ue, isAck); RETVOID; @@ -30423,19 +30103,18 @@ Bool isAck; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnDlProcAck +Void rgSCHCmnDlProcAck ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHCmnDlProcAck(cell, hqP) +Void rgSCHCmnDlProcAck(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHCmnDlProcAck); if (RG_SCH_CMN_SPS_DL_IS_SPS_HQP(hqP)) { @@ -30463,19 +30142,18 @@ extern U32 rgSchStatCrntiCeRcvCnt; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnHdlCrntiCE +Void rgSCHCmnHdlCrntiCE ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHCmnHdlCrntiCE(cell, ue) +Void rgSCHCmnHdlCrntiCE(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHCmnHdlCrntiCE); #ifdef RGSCH_SPS_STATS rgSchStatCrntiCeRcvCnt++; #endif @@ -30525,21 +30203,20 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlSpsRelInd +Void rgSCHCmnUlSpsRelInd ( RgSchCellCb *cell, RgSchUeCb *ue, Bool isExplRel ) #else -PUBLIC Void rgSCHCmnUlSpsRelInd(cell, ue, isExplRel) +Void rgSCHCmnUlSpsRelInd(cell, ue, isExplRel) RgSchCellCb *cell; RgSchUeCb *ue; Bool isExplRel; #endif { - TRC2(rgSCHCmnUlSpsRelInd); rgSCHCmnSpsUlProcRelInd(cell, ue, isExplRel); RETVOID; @@ -30561,21 +30238,20 @@ Bool isExplRel; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlSpsActInd +Void rgSCHCmnUlSpsActInd ( RgSchCellCb *cell, RgSchUeCb *ue, U16 spsSduSize ) #else -PUBLIC Void rgSCHCmnUlSpsActInd(cell, ue,spsSduSize) +Void rgSCHCmnUlSpsActInd(cell, ue,spsSduSize) RgSchCellCb *cell; RgSchUeCb *ue; U16 spsSduSize; #endif { - TRC2(rgSCHCmnUlSpsActInd); if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { @@ -30603,21 +30279,20 @@ U16 spsSduSize; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlCrcInd +Void rgSCHCmnUlCrcInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo crcTime ) #else -PUBLIC Void rgSCHCmnUlCrcInd(cell, ue, crcTime) +Void rgSCHCmnUlCrcInd(cell, ue, crcTime) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo crcTime; #endif { - TRC2(rgSCHCmnUlCrcInd); if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { rgSCHCmnSpsUlProcCrcInd(cell, ue, crcTime); @@ -30643,21 +30318,20 @@ CmLteTimingInfo crcTime; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUlCrcFailInd +Void rgSCHCmnUlCrcFailInd ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo crcTime ) #else -PUBLIC Void rgSCHCmnUlCrcFailInd(cell, ue, crcTime) +Void rgSCHCmnUlCrcFailInd(cell, ue, crcTime) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo crcTime; #endif { - TRC2(rgSCHCmnUlCrcFailInd); if (ue->ul.ulSpsCfg.isUlSpsEnabled == TRUE) { rgSCHCmnSpsUlProcDtxInd(cell, ue, crcTime); @@ -30708,7 +30382,6 @@ RgSchCellCb *cell; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); RgSchCmnDlRbAllocInfo *allocInfo = &cellSch->allocInfo; - TRC2(rgSCHCmnDlBcchPcchAlloc); /*Reset the bitmask for BCCH/PCCH*/ @@ -30766,7 +30439,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSCHBcchPcchDlRbAlloc); if (cellSch->dl.isDlFreqSel) @@ -30817,7 +30489,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RgSchDlRbAlloc *reqAllocInfo; - TRC2(rgSCHCmnNonDlfsBcchPcchRbAlloc); /* 143473 */ /* Allocate for PCCH */ @@ -30866,7 +30537,6 @@ RgSchCellCb *cell; { CmLteTimingInfo pdSchTmInfo; - TRC2(rgSCHChkNUpdSiCfg); pdSchTmInfo = cell->crntTime; @@ -31035,7 +30705,6 @@ RgSchCellCb *cell; U16 x; U16 windowId; - TRC2(rgSCHSelectSi); crntTmInfo = cell->crntTime; @@ -31165,7 +30834,6 @@ RgInfSfAlloc *subfrmAlloc; #endif /* DwPTS Scheduling Changes End */ - TRC2(rgSCHDlSiSched); crntTimInfo = cell->crntTime; @@ -31442,7 +31110,6 @@ RgrUeCqiRept *ueCqiRpt; S16 retVal; RgrStaIndInfo *staInfo = NULLP; - TRC2(rgSCHCmnUeDlPwrCtColltCqiRept) /* Step 1: Store the CQI in collation array */ /* Step 2: Increament the tracking count */ @@ -31461,7 +31128,7 @@ RgrUeCqiRept *ueCqiRpt; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not " "allocate memory for sending StaInd CRNTI:%d",ue->ueId); - RETVALUE(retVal); + return (retVal); } /* Step 4.1: Fill StaInd for sending collated N CQI rpeorts */ @@ -31475,11 +31142,11 @@ RgrUeCqiRept *ueCqiRpt; #endif retVal = rgSCHUtlFillSndStaInd(cell, ue, staInfo, ue->cqiReptCfgInfo.numColltdCqiRept); - RETVALUE(retVal); + return (retVal); } - RETVALUE(ROK); + return ROK; } /* End of rgSCHCmnUeDlPwrCtColltCqiRept */ #endif /* End of RGR_CQI_REPT */ @@ -31500,7 +31167,7 @@ RgrUeCqiRept *ueCqiRpt; * **/ #ifdef ANSI -PUBLIC Void rgSCHCmnChkRetxAllowDtx +Void rgSCHCmnChkRetxAllowDtx ( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -31508,14 +31175,13 @@ RgSchDlHqProcCb *proc, Bool *reTxAllwd ) #else -PUBLIC Void rgSCHCmnChkRetxAllowDtx(cell, ueCb, proc, reTxAllwd) +Void rgSCHCmnChkRetxAllowDtx(cell, ueCb, proc, reTxAllwd) RgSchCellCb *cell; RgSchUeCb *ueCb; RgSchDlHqProcCb *proc; Bool *reTxAllwd; #endif { - TRC3(rgSCHCmnChkRetxAllowDtx) *reTxAllwd = TRUE; @@ -31547,14 +31213,14 @@ Bool *reTxAllwd; * @return U16 siSetId **/ #ifdef ANSI -PUBLIC U16 rgSCHCmnGetSiSetId +U16 rgSCHCmnGetSiSetId ( U16 sfn, U8 sf, U16 minPeriodicity ) #else -PUBLIC U16 rgSCHCmnGetSiSetId(sfn, sf, minPeriodicity) +U16 rgSCHCmnGetSiSetId(sfn, sf, minPeriodicity) U16 sfn; U8 sf U16 minPeriodicity; @@ -31562,7 +31228,7 @@ U16 minPeriodicity; { /* 80 is the minimum SI periodicity in sf. Also * all other SI periodicities are multiples of 80 */ - RETVALUE (((sfn * RGSCH_NUM_SUB_FRAMES_5G) + sf) / (minPeriodicity * 10)); + return (((sfn * RGSCH_NUM_SUB_FRAMES_5G) + sf) / (minPeriodicity * 10)); } #ifdef LTE_TDD /** @@ -31605,7 +31271,6 @@ U8 cfi; U32 numRE = *rb * cellDl->noResPerRb[cfi]; U32 numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); - TRC2(rgSCHCmnCalcDwPtsTbSz); /* DwPts Rb cannot exceed the cell Bw */ numDwPtsRb = RGSCH_MIN(numDwPtsRb, cellDl->maxDlBwPerUe); @@ -31632,7 +31297,7 @@ U8 cfi; } *rb = numDwPtsRb; - RETVALUE(tbSz/8); + return (tbSz/8); } /** @@ -31689,7 +31354,6 @@ U8 cfi; U32 numRE = *rb * cellDl->noResPerRb[cfi]; U32 numDwPtsRb = RGSCH_CEIL(numRE, cellDl->numReDwPts[cfi]); - TRC2(rgSCHCmnCalcDwPtsTbSz2Cw); /* DwPts Rb cannot exceed the cell Bw */ numDwPtsRb = RGSCH_MIN(numDwPtsRb, maxRb); @@ -31735,14 +31399,14 @@ U8 cfi; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHCmnUpdUeDataIndLcg +Void rgSCHCmnUpdUeDataIndLcg ( RgSchCellCb *cell, RgSchUeCb *ue, RgInfUeDatInd *datInd ) #else -PUBLIC Void rgSCHCmnUpdUeDataIndLcg(cell, ue, datInd) +Void rgSCHCmnUpdUeDataIndLcg(cell, ue, datInd) RgSchCellCb *cell; RgSchUeCb *ue; RgInfUeDatInd *datInd; @@ -31754,7 +31418,6 @@ RgInfUeDatInd *datInd; Inst inst = cell->instIdx; #endif - TRC2(rgSCHCmnUpdUeDataIndLcg); for (idx = 0; (idx < RGINF_MAX_LCG_PER_UE - 1); idx++) { @@ -31850,7 +31513,6 @@ RgSchCellCb *cell; RgSchDlSf *dlSf; U8 idx; - TRC2(rgSCHCmnInitRbAlloc); /* Initializing RgSchCmnUlRbAllocInfo structure.*/ rgSCHCmnInitDlRbAllocInfo(&cellSch->allocInfo); @@ -31937,7 +31599,6 @@ U8 newTxMode; RgmTransModeInd *txModeChgInd; RgSchCmnDlUe *ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); - TRC2(rgSCHCmnSendTxModeInd); if(!(ueDl->mimoInfo.forceTD & RG_SCH_CMN_TD_TXMODE_RECFG)) { @@ -31978,7 +31639,7 @@ U8 newTxMode; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSchCheckAndTriggerModeChange +Void rgSchCheckAndTriggerModeChange ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -31987,7 +31648,7 @@ U8 previTbs, U8 maxiTbs ) #else -PUBLIC Void rgSchCheckAndTriggerModeChange(cell, ue, reportediTbs, previTbs, maxiTbs) +Void rgSchCheckAndTriggerModeChange(cell, ue, reportediTbs, previTbs, maxiTbs) RgSchCellCb *cell; RgSchUeCb *ue; U8 reportediTbs; @@ -31998,7 +31659,6 @@ U8 maxiTbs; RgrTxMode txMode; /*!< UE's Transmission Mode */ RgrTxMode modTxMode; /*!< UE's Transmission Mode */ - TRC2(rgSchCheckAndTriggerModeChange); txMode = ue->mimoInfo.txMode; @@ -32072,33 +31732,32 @@ U8 maxiTbs; * @return Void **/ #ifdef ANSI -PUBLIC Bool rgSCHCmnIsDlCsgPrio +Bool rgSCHCmnIsDlCsgPrio ( RgSchCellCb *cell ) #else -PUBLIC Bool rgSCHCmnIsDlCsgPrio(cell) +Bool rgSCHCmnIsDlCsgPrio(cell) RgSchCellCb *cell; #endif { RgSchCmnDlCell *cmnDlCell = RG_SCH_CMN_GET_DL_CELL(cell); - TRC2(rgSCHCmnIsDlCsgPrio) /* Calculating the percentage resource allocated */ if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode) { - RETVALUE(FALSE); + return (FALSE); } else { if(((cmnDlCell->ncsgPrbCnt * 100) / cmnDlCell->totPrbCnt) < cell->minDlResNonCsg) { - RETVALUE(FALSE); + return (FALSE); } else { - RETVALUE(TRUE); + return (TRUE); } } } @@ -32120,33 +31779,32 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PUBLIC Bool rgSCHCmnIsUlCsgPrio +Bool rgSCHCmnIsUlCsgPrio ( RgSchCellCb *cell ) #else -PUBLIC Bool rgSCHCmnIsUlCsgPrio(cell) +Bool rgSCHCmnIsUlCsgPrio(cell) RgSchCellCb *cell; #endif { RgSchCmnUlCell *cmnUlCell = RG_SCH_CMN_GET_UL_CELL(cell); - TRC2(rgSCHCmnIsUlCsgPrio) /* Calculating the percentage resource allocated */ if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode) { - RETVALUE(FALSE); + return (FALSE); } else { if (((cmnUlCell->ncsgPrbCnt * 100) /cmnUlCell->totPrbCnt) < cell->minUlResNonCsg) { - RETVALUE(FALSE); + return (FALSE); } else { - RETVALUE(TRUE); + return (TRUE); } } } @@ -32162,14 +31820,14 @@ RgSchCellCb *cell; * */ #ifdef ANSI - PUBLIC Void rgSchCmnPreDlSch + Void rgSchCmnPreDlSch ( RgSchCellCb **cell, U8 nCell, RgSchCellCb **cellLst ) #else -PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst) +Void rgSchCmnPreDlSch(cell, nCell, cellLst) RgSchCellCb **cell; U8 nCell; RgSchCellCb **cellLst; @@ -32179,7 +31837,6 @@ PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst) RgSchDlSf *sf; U8 idx; - TRC2(rgSchCmnPreDlSch); if(nCell > CM_LTE_MAX_CELLS) { @@ -32244,18 +31901,17 @@ PUBLIC Void rgSchCmnPreDlSch(cell, nCell, cellLst) * */ #ifdef ANSI -PUBLIC Void rgSchCmnPstDlSch +Void rgSchCmnPstDlSch ( RgSchCellCb *cell ) #else -PUBLIC Void rgSchCmnPstDlSch(cell) +Void rgSchCmnPstDlSch(cell) RgSchCellCb *cell #endif { RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - TRC2(rgSchCmnPstDlSch); if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE)) { @@ -32264,13 +31920,13 @@ PUBLIC Void rgSchCmnPstDlSch(cell) } #ifdef ANSI -PUBLIC U8 rgSCHCmnCalcPcqiBitSz +U8 rgSCHCmnCalcPcqiBitSz ( RgSchUeCb *ueCb, U8 numTxAnt ) #else -PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) +U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) RgSchUeCb *ueCb; U8 numTxAnt; #endif @@ -32280,7 +31936,6 @@ PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) U8 ri; RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb; - TRC3(rgSCHCmnCalcPcqiBitSz); confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum; if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && @@ -32399,7 +32054,7 @@ PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) break; } - RETVALUE(pcqiSz); + return (pcqiSz); } /** @brief DL scheduler for SPS, and all other downlink data @@ -32414,12 +32069,12 @@ PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) * */ #ifdef ANSI -PUBLIC Void rgSCHCmnDlSch +Void rgSCHCmnDlSch ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHCmnDlSch (cell) +Void rgSCHCmnDlSch (cell) RgSchCellCb *cell; #endif { @@ -32430,7 +32085,6 @@ PUBLIC Void rgSCHCmnDlSch (cell) U16 dlCntrlSfIdx; #endif - TRC2(rgSCHCmnDlSch); dlSf = rgSCHUtlSubFrmGet(cell, cellSch->dl.time); #ifdef RG_5GTF