X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_tom.c;h=2f434b6f939ad86e3591b546a5e16b701396968f;hb=7c6820e987fadb1102e5891408ad33a8ce36ba95;hp=7949abaea6045c685d219413899362d28a08eefb;hpb=8340c342ebcfc82193c3f66e7f15047c1e37399b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c
index 7949abaea..2f434b6f9 100755
--- a/src/5gnrsch/rg_sch_tom.c
+++ b/src/5gnrsch/rg_sch_tom.c
@@ -37,17 +37,7 @@ static int RLOG_FILE_ID=228;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -62,15 +52,6 @@ static int RLOG_MODULE_ID=4096;
 
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -82,7 +63,7 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_sch_emtc_ext.x"
 #endif 
 U8 rgSCHCmnCalcPcqiBitSz(RgSchUeCb    *ueCb,U8 numTxAnt);
-PUBLIC S16 rgSCHDhm5gtfHqFdbkInd(RgSchUeCb *ue,RgSchCellCb *cell,CmLteTimingInfo timingInfo,TfuHqFdbk fdbk,RgSchErrInfo *err);
+S16 rgSCHDhm5gtfHqFdbkInd(RgSchUeCb *ue,RgSchCellCb *cell,CmLteTimingInfo timingInfo,TfuHqFdbk fdbk,RgSchErrInfo *err);
 /* local defines */
 #ifdef EMTC_ENABLE
 EXTERN  Bool rgSCHEmtcChkEmtcUe ARGS(
@@ -225,7 +206,7 @@ RgSchCellCb           *cell,
 U16                   rapId,
 CmLteTimingInfo       timingInfo
 );
-PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq ARGS(
+S16 rgSCHTomUtlFillDatAperRecpReq ARGS(
 (
  RgSchCellCb       *cell,
  U8                cqiReq,
@@ -236,7 +217,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq ARGS(
  U16                validIdx
  ));
 
-PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq ARGS(
+S16 rgSCHTomUtlFillDatPriRecpReq ARGS(
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -246,7 +227,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq ARGS(
  U16               validIdx
  ));
 
-PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS(
+S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS(
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -256,7 +237,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS(
  U16                validIdx
  ));
 
-PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq ARGS(
+S16 rgSCHTomUtlFillDatSrsRecpReq ARGS(
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -265,7 +246,7 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq ARGS(
  Bool              hqPres
  ));
 
-PUBLIC void schFillCrntTime(
+void schFillCrntTime(
    SlotIndInfo slotInd,
    Inst        schInst);
 
@@ -370,8 +351,8 @@ RgSchCellCb        *cells[]
 #endif
 
 /* local typedefs */
-PUBLIC U32 rgBwAlloInfo[RGSCH_NUM_SUB_FRAMES]; /* Num of Rbs Allocated in each SF */ 
-PUBLIC U32 rgBwAlcnt[RGSCH_NUM_SUB_FRAMES];   /*Num of times Allocation done in each Subframe */
+U32 rgBwAlloInfo[RGSCH_NUM_SUB_FRAMES]; /* Num of Rbs Allocated in each SF */ 
+U32 rgBwAlcnt[RGSCH_NUM_SUB_FRAMES];   /*Num of times Allocation done in each Subframe */
 
 /* local externs */
 /* rg006.201: [ccpu000111706, ccpu00112394]: Separated UL and DL TTI
@@ -437,7 +418,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS((
 #endif
 #ifdef TFU_UPGRADE
 
-PUBLIC S16 rgSCHTomFillOnlySrsRecpReq ARGS
+S16 rgSCHTomFillOnlySrsRecpReq ARGS
 ((
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -453,19 +434,19 @@ PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS
  Bool                 isDatPresOnSecCell
  ));
 
-PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo ARGS
+S16 rgSCHTomUtlFillRiBitWidthInfo ARGS
 ((
  RgSchUeCb          *ueCb
 ));
 
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz ARGS
+U8 rgSCHTomUtlFetchPcqiBitSz ARGS
 ((
 RgSchUeCb          *ueCb, 
 U8                 numTxAnt,
 U8                 *ri
 ));
 
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSzPucchMode21 ARGS
+U8 rgSCHTomUtlFetchPcqiBitSzPucchMode21 ARGS
 ((
 RgSchUeCb          *ueCb, 
 TfuCqiPucchMode21   *mode21Info,
@@ -473,7 +454,7 @@ U8                 numTxAnt,
 U8                 *ri
 ));
 
-PUBLIC S16 rgSCHTomUtlMoveNxtOccasion ARGS
+S16 rgSCHTomUtlMoveNxtOccasion ARGS
 ((
 RgSchCellCb        *cell,
 RgSchUeCb          *ueCb,
@@ -592,7 +573,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS((
       ));
 #endif
 #ifdef LTEMAC_SPS
-EXTERN PUBLIC Void rgSCHCmnDlSpsSch (RgSchCellCb *cell);
+EXTERN Void rgSCHCmnDlSpsSch (RgSchCellCb *cell);
 #ifndef LTE_TDD
 #ifdef UNUSED_FUNC
 #ifdef TFU_UPGRADE
@@ -689,7 +670,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 ARGS
 #endif/*LTE_ADV*/
 #endif/*LTE_TDD*/
 
-PUBLIC U32 rgDlCqiRptCnt[16], rgTotDlCqiRpt;
+U32 rgDlCqiRptCnt[16], rgTotDlCqiRpt;
 
 #ifdef RG_5GTF
 U32 rgSch5gtfCqi2Mcs[15] = 
@@ -700,9 +681,9 @@ U32 rgSch5gtfCqi2Mcs[15] =
 /*HARQ Feedback interpretation in accordance with Femto Forum.
 Note: There is no value as '0' in Femto Forum Spec but in order to retain
 the existing usage in MAC (and its Acceptance), its being considered*/
-CONSTANT PRIVATE U8 rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4};
+//CONSTANT PRIVATE U8 rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4};
 /*added #defines instead of magic numbers*/
-CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={
+/*CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={
 {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28},
 {0,1,3,6,10,15,21,28,36,45,55,66,78,91,105,120,136,153,171,190,210,231,253,276,300,325,351,378},
 {0,0,1,4,10,20,35,56,84,120,165,220,286,364,455,560,680,816,969,1140,1330,1540,1771,2024,2300,2600,2925,3276},
@@ -710,13 +691,13 @@ CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_T
 {0,0,0,0,1,6,21,56,126,252,462,792,1287,2002,3003,4368,6188,8568,11628,15504,20349,26334,33649,42504,53130,65780,80730,98280},
 {0,0,0,0,0,1,7,28,84,210,462,924,1716,3003,5005,8008,12376,18564,27132,38760,54264,74613,100947,134596,177100,230230,296010,376740}
 };
-
+*/
 
 /*ccpu00116923 - ADD - SRS present support*/
 /*Tables Derived from 3GPP TS 36.211 Section 5.5.3.3 */
 /* Table 5.5.3.3-1 */
 #ifndef LTE_TDD
-CONSTANT PUBLIC RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = {
+CONSTANT RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = {
    {TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE},
    {TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE},
    {FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE},
@@ -736,7 +717,7 @@ CONSTANT PUBLIC RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = {
 };
 #else
 /* Table 5.5.3.3-2 */
-CONSTANT PUBLIC RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = {
+CONSTANT RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = {
    {FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE},
    {FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE},
    {FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE},
@@ -755,8 +736,8 @@ CONSTANT PUBLIC RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = {
    {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}
 };
 #endif
-PUBLIC S8 rgSchCmnAper20n22DiffCqi[4] = {1, 2, 3, 4};
-PUBLIC S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1};
+S8 rgSchCmnAper20n22DiffCqi[4] = {1, 2, 3, 4};
+S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1};
 #endif 
 
 /**
@@ -775,7 +756,7 @@ PUBLIC S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1};
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHGetDedPrmUe 
+S16 rgSCHGetDedPrmUe 
 (
 RgSchCellCb     *cell,
 U16             rapId,
@@ -783,7 +764,7 @@ CmLteTimingInfo timingInfo,
 RgSchUeCb       **ue
 )
 #else
-PUBLIC S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue)
+S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue)
 RgSchCellCb     *cell; 
 U16             rapId;
 CmLteTimingInfo timingInfo;
@@ -834,13 +815,13 @@ RgSchUeCb       **ue;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomRaReqInd
+S16 rgSCHTomRaReqInd
 (
 RgSchCellCb     *cell,
 TfuRaReqIndInfo *raReqInd
 )
 #else
-PUBLIC S16 rgSCHTomRaReqInd(cell, raReqInd)
+S16 rgSCHTomRaReqInd(cell, raReqInd)
 RgSchCellCb     *cell; 
 TfuRaReqIndInfo *raReqInd;
 #endif
@@ -853,8 +834,6 @@ TfuRaReqIndInfo *raReqInd;
    U16             rapId;
    RgSchUeCb       *ue = NULLP;
 
-   TRC2(rgSCHTomRaReqInd);
-
    if(cell->cellId != raReqInd->cellId)
    {
       err.errType    = RGSCHERR_TOM_RAREQIND;
@@ -934,13 +913,13 @@ TfuRaReqIndInfo *raReqInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUlCqiInd
+S16 rgSCHTomUlCqiInd
 ( 
 RgSchCellCb     *cell,
 TfuUlCqiIndInfo *ulCqiInd
 )
 #else
-PUBLIC S16 rgSCHTomUlCqiInd(cell, ulCqiInd)
+S16 rgSCHTomUlCqiInd(cell, ulCqiInd)
 RgSchCellCb     *cell; 
 TfuUlCqiIndInfo *ulCqiInd;
 #endif
@@ -948,7 +927,6 @@ TfuUlCqiIndInfo *ulCqiInd;
    RgSchUeCb    *ue;
    CmLList      *node;
    TfuUlCqiRpt  *ulCqiInfo;
-   TRC2(rgSCHTomUlCqiInd);
 
    node =  ulCqiInd->ulCqiRpt.first;
    if(cell->cellId != ulCqiInd->cellId)
@@ -1010,13 +988,13 @@ TfuUlCqiIndInfo *ulCqiInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomPucchDeltaPwrInd
+S16 rgSCHTomPucchDeltaPwrInd
 ( 
 RgSchCellCb             *cell,
 TfuPucchDeltaPwrIndInfo *pucchDeltaPwr
 )
 #else
-PUBLIC S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr)
+S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr)
 RgSchCellCb             *cell; 
 TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
 #endif
@@ -1025,8 +1003,6 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
    CmLList         *node;
    TfuPucchDeltaPwr  *ueElem;
 
-   TRC2(rgSCHTomPucchDeltaPwrInd);
-
    if(cell->cellId != pucchDeltaPwr->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
@@ -1079,13 +1055,13 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomHarqAckInd
+S16 rgSCHTomHarqAckInd
 (
 RgSchCellCb     *cell,
 TfuHqIndInfo    *harqAckInd
 )
 #else
-PUBLIC S16 rgSCHTomHarqAckInd(cell, harqAckInd)
+S16 rgSCHTomHarqAckInd(cell, harqAckInd)
 RgSchCellCb     *cell; 
 TfuHqIndInfo    *harqAckInd;
 #endif
@@ -1102,8 +1078,6 @@ TfuHqIndInfo    *harqAckInd;
    U32            cellIdx;
    RgSchCellCb     *iterCellP; 
    
-   TRC2(rgSCHTomHarqAckInd);
-
    if(cell->cellId != harqAckInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() Unable to get"
@@ -1272,13 +1246,13 @@ TfuHqIndInfo    *harqAckInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomSrInd
+S16 rgSCHTomSrInd
 (
 RgSchCellCb     *cell,
 TfuSrIndInfo    *srInd
 )
 #else
-PUBLIC S16 rgSCHTomSrInd(cell, srInd)
+S16 rgSCHTomSrInd(cell, srInd)
 RgSchCellCb     *cell; 
 TfuSrIndInfo    *srInd;
 #endif
@@ -1289,8 +1263,6 @@ TfuSrIndInfo    *srInd;
    CmLList      *node;
    TfuSrInfo    *srInfo;
 
-   TRC2(rgSCHTomSrInd);
-
    if(cell->cellId != srInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for srcInd cellId"
@@ -1355,13 +1327,13 @@ TfuSrIndInfo    *srInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomDoaInd
+S16 rgSCHTomDoaInd
 (
 RgSchCellCb     *cell,
 TfuDoaIndInfo   *doaInd
 )
 #else
-PUBLIC S16 rgSCHTomDoaInd(cell, doaInd )
+S16 rgSCHTomDoaInd(cell, doaInd )
 RgSchCellCb     *cell;
 TfuDoaIndInfo   *doaInd;
 #endif
@@ -1369,7 +1341,6 @@ TfuDoaIndInfo   *doaInd;
    RgSchUeCb    *ue;
    CmLList      *node;
    TfuDoaRpt    *doaInfo;
-   TRC2(rgSCHTomDoaInd);
 
    if(cell->cellId != doaInd->cellId)
    {
@@ -1417,13 +1388,13 @@ TfuDoaIndInfo   *doaInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomDlCqiInd
+S16 rgSCHTomDlCqiInd
 (
 RgSchCellCb     *cell,
 TfuDlCqiIndInfo *dlCqiInd
 )
 #else
-PUBLIC S16 rgSCHTomDlCqiInd(cell, dlCqiInd)
+S16 rgSCHTomDlCqiInd(cell, dlCqiInd)
 RgSchCellCb     *cell;
 TfuDlCqiIndInfo *dlCqiInd;
 #endif
@@ -1431,7 +1402,6 @@ TfuDlCqiIndInfo *dlCqiInd;
    RgSchUeCb    *ue;
    CmLList      *node;
    TfuDlCqiRpt  *dlCqiInfo;
-   TRC2(rgSCHTomDlCqiInd);
 
    if(cell->cellId != dlCqiInd->cellId)
    {
@@ -1498,7 +1468,6 @@ PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb)
    U16   cqiIdx = 0;
 
    CmLteTimingInfo timingInfo;
-   TRC2(rgSCHTomUtlMovePcqiNxtOccasion);
 
    if(cqiCb->cqiCfg.cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP)
    {
@@ -1575,7 +1544,6 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb)
    U16   crntTime;
    U16   tempIdx; 
 
-   TRC2(rgSCHTomUtlMovePriNxtOccasion);
    crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)
       +(cell->crntTime.slot);
 #ifdef XEON_SPECIFIC_CHANGES
@@ -1691,8 +1659,6 @@ PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue)
 {
    U16   srIdx = 0;
 
-   TRC2(rgSCHTomUtlMoveSrNxtOccasion);
-
    /* Compute Next Transmission Instance */ 
    srIdx = ue->srCb.peri + ue->srCb.nSrTrIdx;
    srIdx = srIdx%RG_SCH_PCQI_SRS_SR_TRINS_SIZE;  
@@ -1751,7 +1717,6 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue)
    U16   crntTime; 
 
 
-   TRC2(rgSCHTomUtlMoveSrsNxtOccasion);
    crntTime = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)
       +(cell->crntTime.slot);
 
@@ -1820,13 +1785,13 @@ PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomRawCqiInd
+S16 rgSCHTomRawCqiInd
 (
  RgSchCellCb     *cell,
  TfuRawCqiIndInfo *rawCqiInd
 )
 #else
-PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
+S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
    RgSchCellCb     *cell;
    TfuRawCqiIndInfo *rawCqiInd;
 #endif
@@ -1849,8 +1814,6 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
    RgSchRaCb       *raCb;
    TfuHqInfo       hqInfo;
 
-   TRC2(rgSCHTomRawCqiInd);
-
    if(cell->cellId != rawCqiInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
@@ -2095,13 +2058,13 @@ PUBLIC S16 rgSCHTomRawCqiInd(cell, rawCqiInd)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomSrsInd
+S16 rgSCHTomSrsInd
 (
  RgSchCellCb     *cell,
  TfuSrsIndInfo *srsInd
  )
 #else
-PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
+S16 rgSCHTomSrsInd(cell, srsInd)
    RgSchCellCb     *cell;
    TfuSrsIndInfo *srsInd;
 #endif
@@ -2110,8 +2073,6 @@ PUBLIC S16 rgSCHTomSrsInd(cell, srsInd)
    CmLList      *node;
    TfuSrsRpt* srsInfo;
 
-   TRC2(rgSCHTomSrsInd);
-
    if(cell->cellId != srsInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
@@ -2220,13 +2181,13 @@ PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomCrcInd
+S16 rgSCHTomCrcInd
 (
 RgSchCellCb       *cell,
 TfuCrcIndInfo *crcInd
 )
 #else
-PUBLIC S16 rgSCHTomCrcInd(cell, crcInd)
+S16 rgSCHTomCrcInd(cell, crcInd)
 RgSchCellCb       *cell;
 TfuCrcIndInfo *crcInd;
 #endif
@@ -2256,8 +2217,6 @@ TfuCrcIndInfo *crcInd;
    RgSchUlHqProcCb   *ulHqProc;
 #endif   
 
-   TRC2(rgSCHTomCrcInd);
-
    if(cell->cellId != crcInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
@@ -2482,13 +2441,13 @@ TfuCrcIndInfo *crcInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomTimingAdvInd
+S16 rgSCHTomTimingAdvInd
 (
 RgSchCellCb         *cell,
 TfuTimingAdvIndInfo *timingAdvInd
  )
 #else
-PUBLIC S16 rgSCHTomTimingAdvInd(cell, timingAdvInd)
+S16 rgSCHTomTimingAdvInd(cell, timingAdvInd)
 RgSchCellCb         *cell;
 TfuTimingAdvIndInfo *timingAdvInd;
 #endif
@@ -2497,9 +2456,6 @@ TfuTimingAdvIndInfo *timingAdvInd;
    CmLList          *node;
    TfuTimingAdvInfo *timingAdvInfo;
 
-
-   TRC2(rgSCHTomTimingAdvInd);
-
    if(cell->cellId != timingAdvInd->cellId)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId"
@@ -2546,13 +2502,13 @@ TfuTimingAdvIndInfo *timingAdvInd;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHTomTtiInd
+Void rgSCHTomTtiInd
 (
 SlotIndInfo        *slotInd,
 Inst               schInst
 )
 #else
-PUBLIC Void rgSCHTomTtiInd(slotInd, schInst)
+Void rgSCHTomTtiInd(slotInd, schInst)
 SlotIndInfo        *slotInd;
 Inst               schInst;
 #endif
@@ -2565,8 +2521,6 @@ Inst               schInst;
    RgSchCellCb       *cell[CM_LTE_MAX_CELLS];
    RgSchCellCb       *cellLst[CM_LTE_MAX_CELLS];
    
-   TRC2(rgSCHTomTtiInd);
-   
 #ifdef LTE_L2_MEAS
    glblTtiCnt++;
 #endif
@@ -2876,8 +2830,6 @@ RgSchErrInfo       *err;
 #endif 
    Inst            inst = cell->instIdx;
 
-   TRC2(rgSCHTomUtlProcUlSf)
-
    if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, 
                             sizeof(TfuRecpReqInfo))) != ROK)
    {
@@ -2957,8 +2909,6 @@ RgSchErrInfo       *err;
    U16             validIdx; /* Index computed from recreq's timing info*/
    Inst            inst = cell->instIdx;
 
-   TRC2(rgSCHTomUtlPrcUlTddSpclSf)
-
    if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, 
                             sizeof(TfuRecpReqInfo))) != ROK)
    {
@@ -3043,8 +2993,6 @@ RgSchErrInfo         *err;
    S16               ret;
    U8                sfTyp = 1; /* Dl Subframe */
 
-   TRC2(rgSCHTomUtlProcDlSf);
-
       cmLListInit(&cntrlInfo->phichLst);
       cmLListInit(&cntrlInfo->dlPdcchLst);
       cmLListInit(&cntrlInfo->ulPdcchLst);
@@ -3185,7 +3133,6 @@ RgSchErrInfo       *err;
    RgSchCmnDlCell   *cellDl = RG_SCH_CMN_GET_DL_CELL(cell);
 #endif
 
-   TRC2(rgSCHTomUtlFillPhich)
    ret = ROK;
    /* Traversing the list of Phichs */
    node =  dlSf->phichInfo.phichs.first;
@@ -3317,7 +3264,6 @@ RgSchErrInfo    *err;
    U8 isDcivld = FALSE;
    U8            numUePerTti = 0;
 
-   TRC2(rgSCHTomUtlFillDlPdcch)
    ret = ROK;
    /* Traversing the scheduled Harq processes */
    node =  dlSf->pdcchInfo.pdcchs.first;
@@ -3459,7 +3405,6 @@ RgSchErrInfo    *err;
    TfuPdcchInfo *tfuPdcch;
    U8 isDcivld = FALSE;
 
-   TRC2(rgSCHTomUtlFillUlPdcch)
    ret = ROK;
    /* Traversing the scheduled Harq processes */
    node =  dlSf->pdcchInfo.pdcchs.first;
@@ -3569,8 +3514,6 @@ RgSchCellCb    *cell;
    CmLList     *node;
    RgSchUeCb   *ue;
 
-   TRC2(rgSCHTomUtlProcTA);
-
    node =  cell->taUeLst.first;
    while (node)
    {
@@ -3622,7 +3565,7 @@ RgSchCellCb    *cell;
  */
 #ifdef TFU_UPGRADE
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo
+S16 rgSCHTomUtlFillHqFdbkInfo
 (
  TfuRecpReqInfo          *recpReqInfo,
  RgSchCellCb             *cell,
@@ -3634,7 +3577,7 @@ PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo
  RgSchErrInfo            *err
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
+S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
    TfuRecpReqInfo          *recpReqInfo;
    RgSchCellCb             *cell;
    U16                     validIdx; 
@@ -3646,7 +3589,7 @@ PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo
+S16 rgSCHTomUtlFillHqFdbkInfo
 (
 TfuRecpReqInfo          *recpReqInfo,
 RgSchCellCb             *cell,
@@ -3657,7 +3600,7 @@ RgSchDlHqProcCb         *prvHqCb,
 RgSchErrInfo            *err
 )
 #else
-PUBLIC S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
+S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err)
 TfuRecpReqInfo          *recpReqInfo;
 RgSchCellCb             *cell;
 RgSchDlHqProcCb         *hqCb;
@@ -4026,7 +3969,7 @@ RgSchErrInfo            *err;
    pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal;
    pucchReqInfo->hqInfo.pucchResCnt = ue->f1bCsAVal;
 
-  cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
+  memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
 #ifdef LTEMAC_SPS
    /* Two Resources needs to be configured if the 
     * serving cell is in mimo mode else single
@@ -4353,7 +4296,7 @@ RgSchErrInfo            *err;
    pucchReqInfo->hqInfo.hqSz = ue->f1bCsAVal;
    pucchReqInfo->hqInfo.pucchResCnt = 1;
 
-  cmMemset((U8 *)pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
+  memset(pucchReqInfo->hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
 #endif/*TFU_UPGRADE*/
    pucchReqInfo->hqInfo.hqRes[0] = dlSfHqInfo->n3ScellPucch.n3PucchIdx; 
 #ifdef TFU_UPGRADE
@@ -4424,8 +4367,6 @@ RgSchErrInfo            *err;
    RgSchUeCb            *ue;
    RgSchDlHqProcCb      *prvHqCb=NULLP;
 
-   TRC2(rgSCHTomUtlFillHqFdbkRecpReq);
-
 #ifdef CA_DBG
    {
       gF1bCsPres = FALSE;
@@ -4524,8 +4465,6 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
 #endif
 
 
-   TRC2(rgSCHTomUtlFillSrRecpReq);
-
    isAddToLst = FALSE;
 
    node = cell->pCqiSrsSrLst[validIdx].srLst.first;
@@ -4547,7 +4486,7 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err)
          return ret;
       }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-     cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+     memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
       pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
 #endif      
       /*Fill SR params*/
@@ -4615,8 +4554,6 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi)
  Bool             *willueRprtCqiRi;
 #endif
 {
-   TRC2(rgSCHTomUtlWillUeRprtCqiRi);
-  
    /* Intialising Reporting probability as TRUE */ 
    *willueRprtCqiRi = TRUE; 
 
@@ -4687,7 +4624,6 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
    Bool                  willUeRprtCqi; /* Flag set due to CQI Mask
                                        and UE inactive state (DRX) */
    RgSchUePCqiCb *riCb = NULLP;
-   TRC2(rgSCHTomUtlFillRiRecpReq);
 
    node = cell->pCqiSrsSrLst[validIdx].riLst.first;
    while(node)
@@ -4733,7 +4669,7 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err)
             return ret;
          }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-         cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+         memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
          pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
 #endif
          /*Fill RI params*/
@@ -4808,8 +4744,6 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
    RgSchUeCb            *ue = NULLP;
    U16                  ret;
 
-   TRC2(rgSCHTomUtlFillCqiRiRecpReq);
-
    while ((ue = rgSCHDbmGetNextUeCb(cell, ue)) != NULLP)
    {
       if (RGSCH_TIMEINFO_SAME (recpReqInfo->timingInfo, ue->ue5gtfCb.nxtCqiRiOccn)) 
@@ -4823,7 +4757,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err)
             return ret;
          }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-         cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+         memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
          pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;     
 #endif
          pucchRecpInfo->rnti =  ue->ueId; 
@@ -4887,8 +4821,6 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
    RgSchUePCqiCb        *cqiCb = NULLP;
    Bool                 isAddToLst = FALSE;
 
-   TRC2(rgSCHTomUtlFillPcqiRecpReq);
-
    node = cell->pCqiSrsSrLst[validIdx].cqiLst.first;
    while(node)
    {
@@ -4930,7 +4862,7 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err)
          return ret;
       }
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-      cmMemset((U8 *)&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+      memset(&pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
       pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;     
 #endif
       
@@ -4994,8 +4926,6 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err)
    S16                  ret;
    RgSchUeCb            *ue;
 
-   TRC2(rgSCHTomUtlFillSrsRecpReq);
-
    node = cell->pCqiSrsSrLst[validIdx].srsLst.first;
    while(node)
    {
@@ -5090,7 +5020,6 @@ RgSchErrInfo         *err;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
 
-   TRC2(rgSCHTomUtlFillDatRecpReq)
 
    /* processing steps are 
     * - Run through the UL allocations going out in this subframe.
@@ -5209,8 +5138,6 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
    Bool              isAperiodic = FALSE; /*Set when Aperiodic CQI is expected */
    U8                numUePerTti = 0;
 
-   TRC2(rgSCHTomUtlFillDatRecpReq);
-
    if((0 == (recpReqInfo->timingInfo.sfn % 30)) && (0 == recpReqInfo->timingInfo.slot))
    {
       //printf("5GTF_CHECK rgSCHTomUtlFillDatRecpReq (%d : %d)\n", recpReqInfo->timingInfo.sfn, recpReqInfo->timingInfo.slot);
@@ -5318,17 +5245,16 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo
+S16 rgSCHTomUtlFillRiBitWidthInfo
 (
  RgSchUeCb     *ueCb
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
+S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
    RgSchUeCb   *ueCb;
 #endif
 {
    RgSchUePCqiCb *riCb = ueCb->nPRiCb;
-   TRC2(rgSCHTomUtlFillRiBitWidthInfo);
    
    if (ueCb->mimoInfo.txMode != RGR_UE_TM_3 &&
              ueCb->mimoInfo.txMode != RGR_UE_TM_4)
@@ -5385,14 +5311,14 @@ PUBLIC S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz
+U8 rgSCHTomUtlFetchPcqiBitSz
 (
  RgSchUeCb    *ueCb, 
  U8           numTxAnt,
  U8           *ri
  )
 #else
-PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
+U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
    RgSchUeCb     *ueCb;
    U8            numTxAnt;
    U8            *ri;
@@ -5406,7 +5332,6 @@ PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
    TfuCqiPucchMode21   *mode21Info;    
    RgSchUePCqiCb *cqiCb = ueCb->nPCqiCb;
 
-   TRC3(rgSCHTomUtlFetchPcqiBitSz);
 
    confRepMode = cqiCb->cqiCfg.cqiSetup.prdModeEnum;
    if((ueCb->mimoInfo.txMode != RGR_UE_TM_3) && 
@@ -5536,14 +5461,14 @@ PUBLIC U8 rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx
+S16 rgSCHTomUtlPcqiSbCalcBpIdx
 (
  CmLteTimingInfo    crntTimInfo,
  RgSchUeCb          *ueCb,
  RgSchUePCqiCb   *cqiCb
  )
 #else
-PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
+S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
    CmLteTimingInfo  crntTimInfo;
    RgSchUeCb        *ueCb;
    RgSchUePCqiCb   *cqiCb;
@@ -5552,7 +5477,6 @@ PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
    U16 tti = (crntTimInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTimInfo.slot);
    U16  prdNum = tti/cqiCb->cqiPeri;
 
-   TRC2(rgSCHTomUtlPcqiSbCalcBpIdx);
    if((prdNum % cqiCb->h) == 0)
    {
       cqiCb->isWb = TRUE;
@@ -5599,14 +5523,14 @@ PUBLIC S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlMoveNxtOccasion
+S16 rgSCHTomUtlMoveNxtOccasion
 (
  RgSchCellCb    *cell,
  RgSchUeCb      *ue,
  U16            validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
+S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
    RgSchCellCb    *cell;
    RgSchUeCb      *ue;
    U16            validIdx;
@@ -5614,7 +5538,6 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
 {
    RgSchUePCqiCb *cqiCb = ue->nPCqiCb;
    RgSchUePCqiCb *riCb = ue->nPRiCb;
-   TRC2(rgSCHTomUtlMoveNxtOccasion);
  
    /* ccpu00140578::Skip the UE if already RI recpetion 
     * is processed in the same subframe */
@@ -5689,7 +5612,7 @@ PUBLIC S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx)
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHTomPrepareAcqiRecp
+Void rgSCHTomPrepareAcqiRecp
 (
  RgSchUeCb			   *ueCb, 
  RgSchCellCb			*cell,
@@ -5697,7 +5620,7 @@ PUBLIC Void rgSCHTomPrepareAcqiRecp
  U8                    ccIdx
  )
 #else
-PUBLIC  Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
+ Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
  RgSchUeCb			   *ueCb;
  RgSchCellCb		   *cell;
  TfuUePuschCqiRecpInfo *cqiRecpReqInfo;
@@ -5715,8 +5638,6 @@ PUBLIC  Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
    U8            numOfCells = 0;
    RgSchUeACqiCb *acqiCb  = &ueCb->cellInfo[sCellIdx]->acqiCb;
 
-   TRC2(rgSCHTomPrepareAcqiRecp);
-
    /* Fill TFU Recp */
    cqiRecpReqInfo->reportType = TFU_APERIODIC_CQI_TYPE; /* Aperiodic */
    if (ueCb->mimoInfo.txMode == RGR_UE_TM_3 ||
@@ -5882,7 +5803,7 @@ PUBLIC  Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq
+S16 rgSCHTomUtlFillDatAperRecpReq
 (
  RgSchCellCb       *cell,
  U8                cqiReq,
@@ -5893,7 +5814,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq
  U16                validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx)
+S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx)
    RgSchCellCb       *cell;
    U8                cqiReq;
    RgSchUlAlloc      *alloc;
@@ -5909,7 +5830,6 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeI
    U8                     triggerSet = 0;
    U8                     sIdx = 0;
 #endif
-   TRC2(rgSCHTomUtlFillDatAperRecpReq);
 
    /*Fill RI Reception Params*/
    cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo;   
@@ -5994,7 +5914,7 @@ PUBLIC S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeI
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq
+S16 rgSCHTomUtlFillDatPriRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -6004,7 +5924,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq
  U16               validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, 
+S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, 
 hqPres, validIdx)
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
@@ -6015,7 +5935,6 @@ hqPres, validIdx)
 #endif
 {
    TfuUePuschCqiRecpInfo  *cqiRecpReqInfo;
-   TRC2(rgSCHTomUtlFillDatPriRecpReq);
 
    /*Fill RI Reception Params*/
    cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo;   
@@ -6090,7 +6009,7 @@ hqPres, validIdx)
  **/
 
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq
+S16 rgSCHTomUtlFillDatPCqiRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -6100,7 +6019,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq
  U16                validIdx
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, 
+S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, 
       timeInfo, hqPres, validIdx)
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
@@ -6114,9 +6033,6 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo,
    U8                 cqiPmiSz; /*Raw CQI/PMI Size*/
    U8                 ri;
 
-   TRC2(rgSCHTomUtlFillDatPCqiRecpReq);
-
-
    /*Fill CQI Reception Params*/
    cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo;
 #ifdef TFU_ALLOC_EVENT_NO_INIT
@@ -6205,7 +6121,7 @@ PUBLIC S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo,
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq
+S16 rgSCHTomUtlFillDatSrsRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
@@ -6214,7 +6130,7 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq
  Bool              hqPres
  )
 #else
-PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, 
+S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, 
       hqPres)
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
@@ -6223,7 +6139,6 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo,
    Bool              hqPres; 
 #endif
 {
-   TRC2(rgSCHTomUtlFillDatSrsRecpReq);
    datRecpInfo->rnti = alloc->rnti;
    rgSCHTomFillOnlySrsRecpReq(cell,alloc, datRecpInfo); 
    if(hqPres)
@@ -6265,21 +6180,20 @@ PUBLIC S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo,
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHTomFillOnlySrsRecpReq
+S16 rgSCHTomFillOnlySrsRecpReq
 (
  RgSchCellCb       *cell,
  RgSchUlAlloc      *alloc,
  TfuUeRecpReqInfo  *datRecpInfo
  )
 #else
-PUBLIC S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)  
+S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo)  
    RgSchCellCb       *cell;
    RgSchUlAlloc      *alloc;
    TfuUeRecpReqInfo  *datRecpInfo;
 #endif
 {
    TfuUePuschSrsRecpInfo  *srsRecpReqInfo;
-   TRC2(rgSCHTomFillOnlySrsRecpReq);
 
    srsRecpReqInfo = &datRecpInfo->t.puschRecpReq.srsInfo;
    srsRecpReqInfo->srsBw = (TfuUlSrsBwInfo)alloc->ue->srsCb.srsCfg.srsSetup.srsBw;
@@ -6364,8 +6278,6 @@ Bool              isDatPresOnSecCell;
    RgSchEmtcUeInfo *emtcUe = NULLP;
 #endif
 
-   TRC2(rgSCHTomUtlFillCqiSrSrsWithHq);
-    
    if(ue)
    {
       /*Changes for PUCCH Format3 */
@@ -6673,8 +6585,6 @@ U16               validIdx;
    U8                 ri; /*To fetch RI value*/
    Bool               willUeRprtCqi;   /* Flag set due to CQI Mask and 
                                       UE Inactive state (DRX)*/
-   TRC2(rgSCHTomUtlFillCqiSrsWithSr);
-   
    riCb = ue->nPRiCb;
    cqiCb = ue->nPCqiCb;
    rgSCHTomUtlWillUeRprtCqiRi(ue, &willUeRprtCqi);
@@ -6898,8 +6808,6 @@ noFdbks, memCp, elemIdx, nxtDlsf)
    RgSchDlHqTbCb           *tbCb;
    RgSchDlHqProcCb         *prvHqCb = NULLP;
 
-   TRC2(rgSCHTomUtlFillSfRepHqFdbk)
-
    node =  dlSf->ackNakRepQ.first;
    while (node)
    {
@@ -7099,8 +7007,6 @@ RgSchDlHqProcCb         *prvHqCb;
    U8                      hqSz = 0;
    U32                     idx = 0;
 
-   TRC2(rgSCHTomUtlFillSfHqFdbkInfo)
-
 #ifndef TFU_UPGRADE
    RG_SCH_ADD_TO_CRNT_TIME(cellCb->crntTime, futTime, TFU_RECPREQ_DLDELTA);
 #endif
@@ -7890,9 +7796,9 @@ U8                      hqSz;
          err->errCause = RGSCHERR_TOM_MEM_EXHAUST;
          return ret;
       }
-      cmMemset((U8 *)pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
+      memset(pucchInfo->pucchRecpInfo->t.pucchRecpReq.hqInfo.hqRes,0xff,sizeof(U16)*TFU_MAX_HQ_RES);
 #ifdef TFU_ALLOC_EVENT_NO_INIT
-      cmMemset((U8 *)&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
+      memset(&pucchInfo->pucchRecpInfo->t.pucchRecpReq, 0, sizeof(TfuUePucchRecpReq));
 #endif
       pucchInfo->pucchRecpInfo->type = TFU_RECP_REQ_PUCCH;
       pucchInfo->pucchRecpInfo->rnti = rnti;
@@ -8157,9 +8063,6 @@ RgSchErrInfo         *err;
    Inst              inst = cell->instIdx;
    S16               ret;
 
-   TRC2(rgSCHTomUtlProcDlSfAtCrc);
-
-
    cntrlInfo->numDlActvUes = 0;
    cmLListInit(&cntrlInfo->phichLst);
    cmLListInit(&cntrlInfo->dlPdcchLst);
@@ -8241,8 +8144,6 @@ RgSchCellCb          *cell;
 {
    RgrTtiIndInfo     *rgrTtiInd;
    
-   TRC2(rgSCHTomUtlSendSfnTick);
-
    /* TTI to be sent to RRM only once per system frame */
    /* Added support for period = 0 to disable tick to RRM */
    if ((cell->rrmTtiIndPrd != 0) && 
@@ -8285,7 +8186,7 @@ RgSchCellCb          *cell;
  *     Function: rgSCHDynTDDMrkCrntSfIdx 
  *     Purpose:  update the dyn tdd sunframe index
  *  @param[in]  Inst   schInst
- *  @RETVALUE   None
+ *  @return    None
  */
 #ifdef UNUSED_FUNC
 #ifdef ANSI
@@ -8300,7 +8201,6 @@ Inst   schInst;
 {
    RgSchDynTddCb  *rgSchDynTddInfo = &(rgSchCb[schInst].rgSchDynTdd);
 
-   TRC2(rgSCHDynTDDMrkCrntSfIdx)
 
 	RG_SCH_DYN_TDD_MARKTYPE(rgSchDynTddInfo, rgSchDynTddInfo->crntDTddSfIdx, 
 	                      RG_SCH_DYNTDD_NOTDEF);
@@ -8352,8 +8252,6 @@ RgSchCellCb        *cells[];
  
    CmLteTimingInfo frm;
      
-   TRC2 (rgSchTomFillCellTtiInfo);
-
    if (CM_LTE_MAX_CELLS < ttiInd->numCells)
    {
       RETVOID;
@@ -8522,8 +8420,6 @@ RgSchCellCb        *cell;
 #endif
 {
 
-   TRC2(rgSchTomTtiUlAndDlCmnChSch);
-
    cell->rlsHqArr[cell->crntHqIdx].numUes = 0;
    cell->crntHqIdx++;
    cell->crntHqIdx  = cell->crntHqIdx % RGSCH_NUM_SUB_FRAMES;
@@ -8602,8 +8498,6 @@ RgSchCellCb        *cell;
 {
    U8   suId = cell->tfuSap->sapCfg.suId;
     
-   TRC2(rgSchTomTtiMiscFunctions);
-
    /* Invoke RAM Tti Handler  */
    rgSCHRamTtiHndlr(cell);
 
@@ -8694,7 +8588,6 @@ PRIVATE Void rgSchTomTtiDlSch (cell)
 RgSchCellCb        *cell;
 #endif
 {
-   TRC2(rgSchTomTtiDlSch);
 
    if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE))
    {
@@ -8731,8 +8624,6 @@ RgSchCellCb        *cell;
    
    dlSf = rgSCHUtlSubFrmGet(cell, cellSch->dl.time);
    
-   TRC2(rgSchTomTtiCnsldtSfAlloc);
-
    /* Prepare Subframe allocation info and send to MAC */
    rgSCHCmnCnsldtSfAlloc(cell); 
    
@@ -8772,8 +8663,6 @@ RgTfuCntrlReqInfo  *cntrlInfo;
    RgSchDlSf *ulSf = rgSCHUtlSubFrmGet (cell, cell->hiDci0Time);
    RgSchErrInfo    err;
 
-   TRC2(rgSchTomTtiL1DlAndUlCfg);
-
    rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, &err);
    /* Mark this frame as sent */
    dlSf->txDone = TRUE;
@@ -8813,7 +8702,6 @@ PRIVATE Void rgSchTomUtlTddRlsSfAndHarq (cell)
 RgSchCellCb        *cell;
 #endif
 {
-   TRC2(rgSchTomUtlTddRlsSfAndHarq); 
 
    /* ccpu00132341-MOD- rgSchTddRlsDlSubfrmTbl is dependent on DELTA(=2).
     * Instead rgSchTddDlAscSetIdxKTbl can be used as the K set gives proper
@@ -8856,8 +8744,6 @@ RgSchCellCb        *cell;
 {
    RgSchErrInfo    err;
    
-   TRC2(rgSCHTomUtlProcTddUlSf); 
-
    if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx]
          [cell->rcpReqTime.subframe] == RG_SCH_TDD_UL_SUBFRAME)
    {