X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_cfg.c;h=db04bfd9140c76eba98a31cd523305d0a7e5204b;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=41003e636a9826d2a5b9f29b43fc4e48ae8c9242;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c
index 41003e636..db04bfd91 100755
--- a/src/5gnrsch/rg_sch_cfg.c
+++ b/src/5gnrsch/rg_sch_cfg.c
@@ -63,10 +63,10 @@ static int RLOG_MODULE_ID=4096;
 
 
 /* LTE-MAC Scheduler instance control block structures */
-PUBLIC RgSchCb rgSchCb[RGSCH_MAX_INST];
+RgSchCb rgSchCb[RGSCH_MAX_INST];
 
 #ifdef PHY_ERROR_LOGING
-PUBLIC RgSchUlAllocCntr rgSchUlAllocCntr;
+RgSchUlAllocCntr rgSchUlAllocCntr;
 #endif
 
 #ifdef EMTC_ENABLE
@@ -89,7 +89,7 @@ U16       reTxTmr
 ));
 #endif
 
-PUBLIC S16 rgSCHEnbPfsDlCfg ARGS((
+S16 rgSCHEnbPfsDlCfg ARGS((
          Inst                instIdx,
          RgSchErrInfo       *err
          ));
@@ -132,7 +132,7 @@ PRIVATE Void rgSCHCfgRgrUePhrMsg3 ARGS(( RgSchCellCb *cell,
              RgSchRaCb *raCb,RgSchUeCb *ue, RgSchErrInfo *errInfo));
 PRIVATE S16 rgSCHCfgRgrCmnLcCfg ARGS((RgSchCellCb *cell, RgrCmnLchCfg *lcCfg,
                          RgSchErrInfo *errInfo));
-PUBLIC Void rgSCHSCellFreeBuf ARGS((Inst inst,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,U8 idx));    
+Void rgSCHSCellFreeBuf ARGS((Inst inst,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,U8 idx));    
 #ifdef RGR_SI_SCH
 PRIVATE S16 rgSCHCfgVldtRgrCellSiCfg ARGS(( Inst inst, RgrSiCfg  *siCfg));
 #endif/*RGR_SI_SCH */
@@ -154,70 +154,70 @@ PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg ARGS((Inst inst,
                           RgrCellCsgParamCfg   *csgParam));
 #ifdef TFU_UPGRADE
 
-PUBLIC S16 rgSCHCfgACqiUeCfg ARGS(( RgSchCellCb *cellCb,RgSchUeCb *ue, RgSchUeACqiCb *aCqiCb, 
+S16 rgSCHCfgACqiUeCfg ARGS(( RgSchCellCb *cellCb,RgSchUeCb *ue, RgSchUeACqiCb *aCqiCb, 
                      RgrTxMode ueTxMode,RgrUeAprdDlCqiCfg *aCqiCfg, CmLteUeCategory ueCat ));
 
-PUBLIC S16 rgSCHCfgAcqiUeReCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, 
+S16 rgSCHCfgAcqiUeReCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, 
  RgrUeAprdDlCqiCfg   *acqiCfg, CmLteUeCategory  ueCat ));
 
-PUBLIC S16 rgSCHUtlGetCfgPerOff ARGS(( RgSchPerTbl tbl, U16  cfgIdx, 
+S16 rgSCHUtlGetCfgPerOff ARGS(( RgSchPerTbl tbl, U16  cfgIdx, 
          U16 *peri, U16 *offset ));
 
-PUBLIC S16 rgSCHCfgRiUeCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb    *ueCb, 
+S16 rgSCHCfgRiUeCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb    *ueCb, 
                    RgrUePrdDlCqiCfg *cqiCfg, CmLteUeCategory ueCat ));
 
-PUBLIC S16 rgSCHCfgPCqiUeCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb    *ueCb, 
+S16 rgSCHCfgPCqiUeCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb    *ueCb, 
                      RgrUePrdDlCqiCfg *cqiCfg,CmLteUeCategory ueCat ));
 
-PUBLIC S16 rgSCHCfgSrsUeCfg ARGS((RgSchCellCb   *cellCb,RgSchUeCb     *ueCb,
+S16 rgSCHCfgSrsUeCfg ARGS((RgSchCellCb   *cellCb,RgSchUeCb     *ueCb,
                      RgrUeUlSrsCfg *srsCfg ));
 
-PUBLIC S16 rgSCHCfgSrUeCfg ARGS((RgSchCellCb   *cellCb,RgSchUeCb     *ueCb,
+S16 rgSCHCfgSrUeCfg ARGS((RgSchCellCb   *cellCb,RgSchUeCb     *ueCb,
                      RgrUeSrCfg    *srCfg));
 
-PUBLIC S16 rgSCHCfgPCqiUeReCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb *ueCb, 
+S16 rgSCHCfgPCqiUeReCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb *ueCb, 
                      RgrUePrdDlCqiCfg *cqiCfg,CmLteUeCategory ueCat));
 
-PUBLIC S16 rgSCHCfgSrsUeReCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb *ueCb, 
+S16 rgSCHCfgSrsUeReCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb *ueCb, 
                      RgrUeUlSrsCfg *srsCfg));
 
-PUBLIC S16 rgSCHCfgSrUeReCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb *ueCb, 
+S16 rgSCHCfgSrUeReCfg ARGS((RgSchCellCb  *cellCb, RgSchUeCb *ueCb, 
                       RgrUeSrCfg   *srCfg));
 
-PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode ARGS((RgSchCellCb  *cellCb,
+S16 rgSCHCfgVldtRgrTxmodePuschMode ARGS((RgSchCellCb  *cellCb,
          RgrTxMode  txMde, RgrAprdCqiMode puschMode,RgSchErrInfo *errInfo));
 
-PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg ARGS(( RgSchCellCb *cellCb,
+S16 rgSCHCfgVldtRgrUeACqiCfg ARGS(( RgSchCellCb *cellCb,
          CmLteRnti  crnti, RgrUeAprdDlCqiCfg *acqiCfg, RgrUeTxModeCfg txMode,
          RgSchErrInfo  *errInfo ));
 
-PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode ARGS((RgSchCellCb  *cellCb,
+S16 rgSCHCfgVldtRgrTxmodePucchMode ARGS((RgSchCellCb  *cellCb,
          RgrTxMode  txMde, RgrPrdCqiMode pucchMode,RgSchErrInfo *errInfo));
 
 #ifdef LTEMAC_HDFDD
-PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb,
+S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb,
          CmLteRnti  crnti, RgrUePrdDlCqiCfg *cqiCfg, Bool hdFdd,
          RgrUeTxModeCfg txMode, RgSchErrInfo *errInfo));
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb,
+S16 rgSCHCfgVldtRgrUePCqiCfg ARGS(( RgSchCellCb *cellCb,
          CmLteRnti  crnti, RgrUePrdDlCqiCfg *cqiCfg, RgrUeTxModeCfg txMode,
          RgSchErrInfo *errInfo));         
 #endif
 #ifdef LTEMAC_HDFDD
-PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg  ARGS ((RgSchCellCb *cellCb,
+S16 rgSCHCfgVldtRgrUeUlSrsCfg  ARGS ((RgSchCellCb *cellCb,
              CmLteRnti crnti, RgrUeUlSrsCfg *srsCfg, Bool hdFdd, 
              RgSchErrInfo *errInfo));
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg  ARGS ((RgSchCellCb *cellCb,
+S16 rgSCHCfgVldtRgrUeUlSrsCfg  ARGS ((RgSchCellCb *cellCb,
          CmLteRnti crnti, RgrUeUlSrsCfg *srsCfg, 
          RgSchErrInfo *errInfo));
 #endif
 
 #ifdef LTEMAC_HDFDD
-PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg  ARGS((RgSchCellCb *cellCb, CmLteRnti crnti,  
+S16 rgSCHCfgVldtRgrUeSrCfg  ARGS((RgSchCellCb *cellCb, CmLteRnti crnti,  
          RgrUeSrCfg *srCfg, Bool hdFdd, RgSchErrInfo *errInfo));
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg  ARGS((RgSchCellCb *cellCb, CmLteRnti crnti,  
+S16 rgSCHCfgVldtRgrUeSrCfg  ARGS((RgSchCellCb *cellCb, CmLteRnti crnti,  
          RgrUeSrCfg *srCfg, RgSchErrInfo *errInfo));
 #endif
 PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg ARGS (( RgSchCellCb       *cellCb,
@@ -229,7 +229,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg ARGS (( RgSchCellCb  *cellCb,
                                                RgrUeRecfg   *ueReCfg,  
                                                RgSchErrInfo *errInfo ));
 
-PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel ARGS ((RgSchCellCb *cellCb, 
+S16 rgSCHCfgPCqiSrsSrUeDel ARGS ((RgSchCellCb *cellCb, 
                                          RgSchUeCb *ueCb));
 
 PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz ARGS (( RgSchUeACqiCb *acqiCb,U8  numTxAnt,
@@ -248,20 +248,20 @@ PRIVATE Void rgSCHCfgUeTaRecfg ARGS (( RgSchCellCb  *cellCb,
                                                RgrUeRecfg   *ueReCfg,  
                                                RgSchErrInfo *errInfo ));
 #ifdef LTE_ADV
-PUBLIC S16 rgSCHSCellCfgUeCfg ARGS((
+S16 rgSCHSCellCfgUeCfg ARGS((
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 ));
 
-PUBLIC S16 rgSCHSCellCfgUePucchReCfg ARGS((
+S16 rgSCHSCellCfgUePucchReCfg ARGS((
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
 RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 ));
-PUBLIC S16 rgSCHCfgVldtRgrUeSCellRecfg ARGS((
+S16 rgSCHCfgVldtRgrUeSCellRecfg ARGS((
 RgrUeRecfg     *ueRecfg,
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
@@ -293,11 +293,11 @@ RgrUeRecfg     *ueRecfg
 PRIVATE S16 rgSchAddToL2Meas ARGS ((RgSchCellCb *cellCb,RgSchDlLcCb *dlLc));
 #endif
 #ifdef EMTC_ENABLE
-PUBLIC S16 rgSCHEmtcCfgVldtDrxOnDurCfg
+S16 rgSCHEmtcCfgVldtDrxOnDurCfg
 (
 U16      onDurTmr 
 );
-PUBLIC Void rgSCHUtlUpdEmtcY
+Void rgSCHUtlUpdEmtcY
 (
 RgSchUeCb                  *ue
 );
@@ -478,20 +478,19 @@ EXTERN S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb  *cell))
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrSchedEnbCfg
+S16 rgSCHCfgVldtRgrSchedEnbCfg
 (
 Inst              inst,
 RgrSchedEnbCfg   *schedEnbCfg,
 RgSchErrInfo     *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrSchedEnbCfg(inst, schedEnbCfg, errInfo)
+S16 rgSCHCfgVldtRgrSchedEnbCfg(inst, schedEnbCfg, errInfo)
 Inst              inst;
 RgrSchedEnbCfg   *schedEnbCfg;
 RgSchErrInfo     *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrSchedEnbCfg);
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR SCH ENB CONFIG: \n"));
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_ENB_CFG;
@@ -554,7 +553,7 @@ RgSchErrInfo     *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrCellCfg
+S16 rgSCHCfgVldtRgrCellCfg
 (
 Inst         inst,
 RgrCellCfg   *cellCfg,
@@ -562,15 +561,13 @@ RgSchCellCb  *cell,
 RgSchErrInfo *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrCellCfg(inst, cellCfg, cell, errInfo)
+S16 rgSCHCfgVldtRgrCellCfg(inst, cellCfg, cell, errInfo)
 Inst         inst;
 RgrCellCfg   *cellCfg;
 RgSchCellCb  *cell;
 RgSchErrInfo *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrCellCfg);
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_CFG;
 
    /* check if cell exists already */
@@ -840,19 +837,17 @@ RgSchErrInfo *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrSchCfg
+S16 rgSCHCfgVldtRgrSchCfg
 (
 Inst         inst,
 RgrSchedEnbCfg   *rgSchedCfg
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrSchCfg(inst, rgSchedCfg)
+S16 rgSCHCfgVldtRgrSchCfg(inst, rgSchedCfg)
 Inst         inst;
 RgrSchedCfg   *rgSchedCfg;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrSchCfg);
-
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Validating \
                scheduler related Configuration"));
    if (rgSchedCfg->ulSchdType > (RGSCH_NUM_SCHEDULERS - 1))
@@ -891,18 +886,17 @@ RgrSchedCfg   *rgSchedCfg;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrCellSchCfg
+S16 rgSCHCfgVldtRgrCellSchCfg
 (
 Inst         inst,
 RgrCellCfg   *cellCfg
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg)
+S16 rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg)
 Inst         inst;
 RgrCellCfg   *cellCfg;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrCellSchCfg);
 
 #if RGSCH_NUM_DLFS_SCHEDULERS
    if (cellCfg->dlfsSchdType > RGSCH_NUM_DLFS_SCHEDULERS - 1)
@@ -936,19 +930,17 @@ RgrCellCfg   *cellCfg;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrCellRACfg
+S16 rgSCHCfgVldtRgrCellRACfg
 (
 Inst         inst,
 RgrCellCfg   *cellCfg
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrCellRACfg(inst, cellCfg)
+S16 rgSCHCfgVldtRgrCellRACfg(inst, cellCfg)
 Inst         inst;
 RgrCellCfg   *cellCfg;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrCellRACfg);
-
 
 #ifdef LTE_TDD
    if ((cellCfg->rachCfg.preambleFormat > RGSCH_MAX_TDD_RA_PREAMBLE_FMT) ||
@@ -1058,7 +1050,7 @@ RgrCellCfg   *cellCfg;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeCfg
+S16 rgSCHCfgVldtRgrUeCfg
 (
 Inst         inst,
 RgrUeCfg     *ueCfg,
@@ -1066,15 +1058,13 @@ RgSchCellCb  **cell,
 RgSchErrInfo *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeCfg(inst, ueCfg, cell, errInfo)
+S16 rgSCHCfgVldtRgrUeCfg(inst, ueCfg, cell, errInfo)
 Inst         inst;
 RgrUeCfg     *ueCfg;
 RgSchCellCb  **cell;
 RgSchErrInfo *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrUeCfg);
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_CFG;
 
    if (((*cell) == NULLP) || 
@@ -1264,7 +1254,7 @@ RgSchErrInfo *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrCellRecfg
+S16 rgSCHCfgVldtRgrCellRecfg
 (
 Inst          inst,
 RgrCellRecfg  *cellRecfg,
@@ -1272,15 +1262,13 @@ RgSchCellCb   **cell,
 RgSchErrInfo  *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrCellRecfg(inst, cellRecfg, cell, errInfo)
+S16 rgSCHCfgVldtRgrCellRecfg(inst, cellRecfg, cell, errInfo)
 Inst          inst;
 RgrCellRecfg  *cellRecfg;
 RgSchCellCb   **cell;
 RgSchErrInfo  *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrCellRecfg);
-
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CELL_RECFG;
    
@@ -1459,7 +1447,7 @@ RgSchErrInfo  *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellCfgUeCfg
+S16 rgSCHSCellCfgUeCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -1467,7 +1455,7 @@ RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSCellCfgUeCfg(cell, ue, ueRecfg, err)
+S16 rgSCHSCellCfgUeCfg(cell, ue, ueRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
@@ -1485,8 +1473,6 @@ RgSchErrInfo *err;
    RgrUePrdDlCqiCfg    *pCqiCfg;  
 #endif
 
-   TRC2(rgSCHSCellCfgUeCfg);
- 
    RLOG0(L_INFO, "SCELL recfg received from APP \n");  
 
    RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), 
@@ -1722,7 +1708,7 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHSCellCfgUePucchReCfg
+S16 rgSCHSCellCfgUePucchReCfg
 (
 RgSchCellCb  *cell,
 RgSchUeCb    *ue,
@@ -1730,7 +1716,7 @@ RgrUeRecfg   *ueRecfg,
 RgSchErrInfo *err
 )
 #else
-PUBLIC S16 rgSCHSCellCfgUePucchReCfg(cell, ue, ueRecfg, err)
+S16 rgSCHSCellCfgUePucchReCfg(cell, ue, ueRecfg, err)
 RgSchCellCb  *cell;
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
@@ -1741,7 +1727,6 @@ RgSchErrInfo *err;
    RgrUeSCellAckPucchCfg *sCellPucchRecfg = NULLP;
    U8 idx;
 
-   TRC2(rgSCHSCellCfgUePucchReCfg);
    RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), 
      "--------------------------------------------------------------------\n"
      "UE SCell PUCCH ReConfiguration at SCH: rnti (%u) cell(%u)\n"
@@ -1826,7 +1811,7 @@ RgSchErrInfo *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeSCellRecfg
+S16 rgSCHCfgVldtRgrUeSCellRecfg
 (
 RgrUeRecfg     *ueRecfg,
 RgSchCellCb    *cell,
@@ -1834,7 +1819,7 @@ RgSchUeCb      *ue,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeSCellRecfg(inst, ueRecfg, cell, ue, errInfo)
+S16 rgSCHCfgVldtRgrUeSCellRecfg(inst, ueRecfg, cell, ue, errInfo)
 RgrUeRecfg     *ueRecfg;
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
@@ -1845,7 +1830,6 @@ RgSchErrInfo   *errInfo;
    RgSchCellCb          *sCell = NULLP;
    Inst    inst = cell->instIdx;
 
-   TRC2(rgSCHCfgVldtRgrUeSCellRecfg);
 
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "VALIDATE RGR UE SCELL RECONFIG: cellId %d "
             "oldUeId %d cell %p \n", ueRecfg->cellId, ueRecfg->oldCrnti));
@@ -1979,8 +1963,6 @@ RgrUeRecfg   *ueRecfg;
    RgSchUeCellInfo     *sCellInfo = NULLP;
    RgSchCmnCell        *cellSch   = NULLP;
 
-   TRC2(rgSCHSCellCfgUeCfgRollBack);
-   
    RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), 
      "--------------------------------------------------------------------\n"
      "UE SCell config roll back at SCH: rnti (%u) cell(%u)\n"
@@ -2052,7 +2034,7 @@ RgrUeRecfg   *ueRecfg;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeRecfg
+S16 rgSCHCfgVldtRgrUeRecfg
 (
 Inst           inst,
 RgrUeRecfg     *ueRecfg,
@@ -2061,7 +2043,7 @@ RgSchUeCb      **ue,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeRecfg(inst, ueRecfg, cell, ue, errInfo)
+S16 rgSCHCfgVldtRgrUeRecfg(inst, ueRecfg, cell, ue, errInfo)
 Inst           inst;
 RgrUeRecfg     *ueRecfg;
 RgSchCellCb    **cell;
@@ -2070,8 +2052,6 @@ RgSchErrInfo   *errInfo;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtRgrUeRecfg);
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RECFG;
    
    if (((*cell) == NULLP) ||
@@ -2281,7 +2261,7 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrLchRecfg
+S16 rgSCHCfgVldtRgrLchRecfg
 (
 Inst           inst,
 RgrLchRecfg    *lcRecfg,
@@ -2291,7 +2271,7 @@ RgSchDlLcCb    **dlLc,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrLchRecfg(inst, lcRecfg, cell, ue, dlLc, errInfo)
+S16 rgSCHCfgVldtRgrLchRecfg(inst, lcRecfg, cell, ue, dlLc, errInfo)
 Inst            inst;
 RgrLchRecfg     *lcRecfg;
 RgSchCellCb     **cell;
@@ -2300,8 +2280,6 @@ RgSchDlLcCb     **dlLc;
 RgSchErrInfo    *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrLchRecfg);
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LC_RECFG;
 
    if (((*cell) == NULLP) ||
@@ -2355,7 +2333,7 @@ RgSchErrInfo    *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeReset
+S16 rgSCHCfgVldtRgrUeReset
 (
 Inst         inst,
 RgrRst       *reset,
@@ -2364,7 +2342,7 @@ RgSchUeCb    **ue,
 RgSchErrInfo *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeReset(inst, reset, cell, ue, errInfo)
+S16 rgSCHCfgVldtRgrUeReset(inst, reset, cell, ue, errInfo)
 Inst         inst;
 RgrRst       *reset;
 RgSchCellCb  *cell;
@@ -2372,8 +2350,6 @@ RgSchUeCb    **ue;
 RgSchErrInfo *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrUeReset);
-   
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_RESET;
    
@@ -2425,7 +2401,7 @@ RgSchErrInfo *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrLcgRecfg
+S16 rgSCHCfgVldtRgrLcgRecfg
 (
 Inst           inst,
 RgrLcgRecfg    *lcgRecfg,
@@ -2434,7 +2410,7 @@ RgSchUeCb      **ue,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrLcgRecfg(inst, lcgRecfg, cell, ue, errInfo)
+S16 rgSCHCfgVldtRgrLcgRecfg(inst, lcgRecfg, cell, ue, errInfo)
 Inst            inst;
 RgrLcgRecfg     *lcgRecfg;
 RgSchCellCb     *cell;
@@ -2442,8 +2418,6 @@ RgSchUeCb       **ue;
 RgSchErrInfo    *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrLcgRecfg);
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LCG_RECFG;
 
    if (((cell) == NULLP) ||
@@ -2512,8 +2486,6 @@ RgrCellCfg    *cellCfg;
    U16       numDlSf;
 #endif    
 
-   TRC2(rgSCHDynCfiCfg);
-
    cell->dynCfiCb.isDynCfiEnb = cellCfg->isDynCfiEnb;
 
    /* Initializing Failure Sample Period */
@@ -2624,7 +2596,7 @@ RgrCellCfg    *cellCfg;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrSchedEnbCfg
+S16 rgSCHCfgRgrSchedEnbCfg
 (
 Inst            inst,
 SpId            spId,
@@ -2632,14 +2604,13 @@ RgrSchedEnbCfg *schedEnbCfg,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrSchedEnbCfg(inst, spId, schedEnbCfg, errInfo)
+S16 rgSCHCfgRgrSchedEnbCfg(inst, spId, schedEnbCfg, errInfo)
 Inst             inst,
 SpId             spId;
 RgrSchedEnbCfg  *schedEnbCfg;
 RgSchErrInfo    *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgRgrSchedEnbCfg);
 
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "APPLYING RGR SCH ENB CONFIG: \n"));
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_ENB_CFG;
@@ -2680,21 +2651,19 @@ RgSchErrInfo    *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCH5gtfCellCfg
+S16 rgSCH5gtfCellCfg
 (
 RgSchCellCb   *cell,
 RgrCellCfg    *cellCfg
 )
 #else
-PUBLIC S16 rgSCH5gtfCellCfg(cell, cellCfg)
+S16 rgSCH5gtfCellCfg(cell, cellCfg)
 RgSchCellCb   *cell;
 RgrCellCfg    *cellCfg;
 #endif
 {
    U8           idx;
 
-   TRC2(rgSCHCfgRgrCellCfg);
-
    for(idx = 0; idx < MAX_5GTF_GROUP; idx++)
    {
       cell->cell5gtfCb.ueGrp5gConf[idx].beamBitMask = 0;
@@ -2744,7 +2713,7 @@ EXTERN U16 gWrMaxUlItbs;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrCellCfg
+S16 rgSCHCfgRgrCellCfg
 (
 RgSchCb       *instCb,
 SpId          spId,
@@ -2752,7 +2721,7 @@ RgrCellCfg    *cellCfg,
 RgSchErrInfo  *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrCellCfg(instCb, spId, cellCfg, errInfo)
+S16 rgSCHCfgRgrCellCfg(instCb, spId, cellCfg, errInfo)
 RgSchCb       *instCb;
 SpId           spId;
 RgrCellCfg    *cellCfg;
@@ -2767,11 +2736,9 @@ RgSchErrInfo  *errInfo;
    Inst         inst = instCb->rgSchInit.inst;
    U32          Idx1 = (U8)((cellCfg->cellId - instCb->genCfg.startCellId)&(CM_LTE_MAX_CELLS-1));
 
-   TRC2(rgSCHCfgRgrCellCfg);
-
    errInfo->errCause = RGSCHERR_CFG_RGR_CELL_CFG;
    
-   cmMemset((U8*)&pst, (U8)0, sizeof(Pst));
+   memset(&pst, 0, sizeof(Pst));
     
    /* Allocate the scheduler's cell control block */
    if((ret = rgSCHUtlAllocSBuf(inst, (Data**)&cell, sizeof(RgSchCellCb))) 
@@ -2809,7 +2776,7 @@ RgSchErrInfo  *errInfo;
    {
       cell->lteAdvCb.absCfg =
          cellCfg->rgrLteAdvCfg.absCfg;
-      cmMemset((U8*)cell->lteAdvCb.absLoadInfo, 0, sizeof(U32)*RGR_ABS_PATTERN_LEN);
+      memset(cell->lteAdvCb.absLoadInfo, 0, sizeof(U32)*RGR_ABS_PATTERN_LEN);
       cell->lteAdvCb.absLoadTtiCnt = 0;
    }
 
@@ -2857,7 +2824,7 @@ RgSchErrInfo  *errInfo;
    cell->t300TmrVal = cellCfg->t300TmrVal;
 #ifdef RGR_SI_SCH
    /*Initialize the SI CB in Cell CB */
-   cmMemset((U8 *)&cell->siCb, 0, sizeof(RgSchSiCb));
+   memset(&cell->siCb, 0, sizeof(RgSchSiCb));
 #endif
    /*Fix: Added Guard Pool for RNTI which will contain RNTIs 
        *for UEs deleted from Scheduler but not yet from MAC*/
@@ -3128,14 +3095,14 @@ RgSchErrInfo  *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrUeCfg
+S16 rgSCHCfgRgrUeCfg
 (
 RgSchCellCb  *cell,
 RgrUeCfg     *ueCfg,
 RgSchErrInfo *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrUeCfg(cell, ueCfg, errInfo)
+S16 rgSCHCfgRgrUeCfg(cell, ueCfg, errInfo)
 RgSchCellCb  *cell;
 RgrUeCfg     *ueCfg;
 RgSchErrInfo *errInfo;
@@ -3156,7 +3123,6 @@ RgSchErrInfo *errInfo;
 #ifdef TFU_UPGRADE
    RgSchUePCqiCb *cqiCb = NULLP;
 #endif
-   TRC2(rgSCHCfgRgrUeCfg);
 
   do {
      errInfo->errCause = RGSCHERR_CFG_RGR_UE_CFG;
@@ -3541,8 +3507,6 @@ RgSchErrInfo *errInfo;
 #endif
 {
 
-   TRC2(rgSCHCfgRgrUePhrMsg3);
-
    /* Record msg3 allocation in the UE */
    rgSCHUtlRecMsg3Alloc(cell, ue, raCb);
 
@@ -3569,13 +3533,13 @@ RgSchErrInfo *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDynCfiReCfg
+Void rgSCHDynCfiReCfg
 (
 RgSchCellCb   *cell,
 Bool          isDynCfiEnb
 )
 #else
-PUBLIC Void rgSCHDynCfiReCfg(cell, isDynCfiEnb)
+Void rgSCHDynCfiReCfg(cell, isDynCfiEnb)
 RgSchCellCb   *cell;
 Bool          isDynCfiEnb;
 #endif 
@@ -3583,8 +3547,6 @@ Bool          isDynCfiEnb;
    U8                idx;
    RgSchCmnDlCell    *cellSchDl = RG_SCH_CMN_GET_DL_CELL(cell);
 
-   TRC2(rgSCHDynCfiReCfg);
-
    if(isDynCfiEnb)
    {
       cell->dynCfiCb.ttiCnt = 0;
@@ -3629,14 +3591,14 @@ Bool          isDynCfiEnb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrCellRecfg
+S16 rgSCHCfgRgrCellRecfg
 (
 RgSchCellCb   *cell,
 RgrCellRecfg  *cellRecfg,
 RgSchErrInfo  *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrCellRecfg(cell, cellRecfg, errInfo)
+S16 rgSCHCfgRgrCellRecfg(cell, cellRecfg, errInfo)
 RgSchCellCb   *cell;
 RgrCellRecfg  *cellRecfg;
 RgSchErrInfo  *errInfo;
@@ -3649,9 +3611,6 @@ RgSchErrInfo  *errInfo;
    U16     len; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
 /* LTE_ADV_FLAG_REMOVED_END */
    
-   TRC2(rgSCHCfgRgrCellRecfg);
-
-
    errInfo->errCause = RGSCHERR_CFG_RGR_CELL_RECFG;
    
    /* Invoke scheduler to update scheduler specific information */
@@ -3748,7 +3707,7 @@ RgSchErrInfo  *errInfo;
       }
       if(cellRecfg->rgrLteAdvCfg.pres & RGR_SFR)
       {
-         cmMemcpy((U8 *)&cell->lteAdvCb.sfrCfg, (U8 *)&cellRecfg->rgrLteAdvCfg.sfrCfg,
+         memcpy(&cell->lteAdvCb.sfrCfg, &cellRecfg->rgrLteAdvCfg.sfrCfg,
                sizeof(RgrSfrConfig));
          /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
          if (cellRecfg->rgrLteAdvCfg.sfrCfg.status == RGR_ENABLE)
@@ -3926,8 +3885,6 @@ RgSchErrInfo   *errInfo;
    RgSchDlHqEnt **hqEnt = &(RG_SCH_CMN_GET_UE_HQE(ue, cell));
    U8           idx;
     
-   TRC2(rgSCHCfgRgrUeRecfgRntiChg);
-
    /* Handle CRNTI change in reconfiguration */
    if (ueRecfg->oldCrnti != ueRecfg->newCrnti)
    {
@@ -4118,7 +4075,7 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrUeRecfg
+S16 rgSCHCfgRgrUeRecfg
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
@@ -4126,7 +4083,7 @@ RgrUeRecfg     *ueRecfg,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrUeRecfg(cell, ue, ueRecfg, errInfo)
+S16 rgSCHCfgRgrUeRecfg(cell, ue, ueRecfg, errInfo)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgrUeRecfg     *ueRecfg;
@@ -4138,8 +4095,6 @@ RgSchErrInfo   *errInfo;
    Bool dciChange = TRUE;
 #endif
    
-   TRC2(rgSCHCfgRgrUeRecfg);
-
    errInfo->errCause = RGSCHERR_CFG_RGR_UE_RECFG;
 
 #ifdef LTE_ADV
@@ -4385,7 +4340,7 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrLchRecfg
+S16 rgSCHCfgRgrLchRecfg
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
@@ -4394,7 +4349,7 @@ RgrLchRecfg    *lcRecfg,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrLchRecfg(cell, ue, dlLc, lcRecfg, errInfo)
+S16 rgSCHCfgRgrLchRecfg(cell, ue, dlLc, lcRecfg, errInfo)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgSchDlLcCb    *dlLc;
@@ -4404,8 +4359,6 @@ RgSchErrInfo   *errInfo;
 {
    S16     ret = ROK;
 
-   TRC2(rgSCHCfgRgrLchRecfg);
-
    errInfo->errCause = RGSCHERR_CFG_RGR_LC_RECFG;
    /* Invoke Scheduler to update the new configuration */
    ret = rgSCHUtlRgrLcRecfg(cell, ue, dlLc, lcRecfg, errInfo);
@@ -4442,7 +4395,7 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrLcgRecfg
+S16 rgSCHCfgRgrLcgRecfg
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
@@ -4450,7 +4403,7 @@ RgrLcgRecfg    *lcgRecfg,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrLcgRecfg(cell, ue, lcgRecfg, errInfo)
+S16 rgSCHCfgRgrLcgRecfg(cell, ue, lcgRecfg, errInfo)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgrLcgRecfg    *lcgRecfg;
@@ -4459,8 +4412,6 @@ RgSchErrInfo   *errInfo;
 {
    S16     ret = ROK;
 
-   TRC2(rgSCHCfgRgrLcgRecfg);
-
    errInfo->errCause = RGSCHERR_CFG_RGR_LCG_RECFG;
   
    /*Added for handling LCG ReConfig if the LCG was deleted */
@@ -4500,7 +4451,7 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrUeReset
+S16 rgSCHCfgRgrUeReset
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
@@ -4508,7 +4459,7 @@ RgrRst         *reset,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrUeReset(cell, ue, reset, errInfo)
+S16 rgSCHCfgRgrUeReset(cell, ue, reset, errInfo)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgrRst         *reset;
@@ -4518,9 +4469,6 @@ RgSchErrInfo   *errInfo;
    U32     idx;
    RgSchRaCb *raCb;
 
-   TRC2(rgSCHCfgRgrUeReset);
-
-
    errInfo->errCause = RGSCHERR_CFG_RGR_UE_RESET;
   
    /* Setting BO of Each Logical Channel of the UE to 0 */
@@ -4612,21 +4560,19 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrCellDel
+S16 rgSCHCfgRgrCellDel
 (
 RgSchCellCb    *cell,
 RgrDel         *cellDelInfo,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrCellDel(cell, cellDelInfo, errInfo)
+S16 rgSCHCfgRgrCellDel(cell, cellDelInfo, errInfo)
 RgSchCellCb    *cell;
 RgrDel         *cellDelInfo;
 RgSchErrInfo   *errInfo;
 #endif
 { 
-   TRC2(rgSCHCfgRgrCellDel);
-
 
    errInfo->errCause = RGSCHERR_CFG_RGR_CELL_DEL;
 
@@ -4666,14 +4612,14 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrUeDel
+S16 rgSCHCfgRgrUeDel
 (
 RgSchCellCb         *cell,
 RgrDel              *ueDelInfo,
 RgSchErrInfo        *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrUeDel(cell, ueDelInfo, errInfo)
+S16 rgSCHCfgRgrUeDel(cell, ueDelInfo, errInfo)
 RgSchCellCb         *cell;
 RgrDel              *ueDelInfo;
 RgSchErrInfo        *errInfo;
@@ -4686,7 +4632,6 @@ RgSchErrInfo        *errInfo;
    RgSchCellCb      *secCellCb = NULLP;
 #endif
 
-   TRC2(rgSCHCfgRgrUeDel);
    errInfo->errCause = RGSCHERR_CFG_RGR_UE_DEL;
 
    if (cell->cellId != ueDelInfo->u.ueDel.cellId)
@@ -4809,14 +4754,14 @@ RgSchErrInfo        *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrLcDel
+S16 rgSCHCfgRgrLcDel
 (
 RgSchCellCb    *cell,
 RgrDel         *lcDelInfo,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrLcDel(cell, lcDelInfo, errInfo)
+S16 rgSCHCfgRgrLcDel(cell, lcDelInfo, errInfo)
 RgSchCellCb    *cell;
 RgrDel         *lcDelInfo;
 RgSchErrInfo   *errInfo;
@@ -4830,8 +4775,6 @@ RgSchErrInfo   *errInfo;
    RgSchUlLcCb  *ulLc; 
 #endif
 
-   TRC2(rgSCHCfgRgrLcDel);
-
    errInfo->errCause = RGSCHERR_CFG_RGR_LC_DEL;
 
    /* Fetch the Active cell */
@@ -4937,14 +4880,14 @@ RgSchErrInfo   *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrLcgDel
+S16 rgSCHCfgRgrLcgDel
 (
 RgSchCellCb    *cell,
 RgrDel         *lcDelInfo,
 RgSchErrInfo   *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrLcgDel(cell, lcDelInfo, errInfo)
+S16 rgSCHCfgRgrLcgDel(cell, lcDelInfo, errInfo)
 RgSchCellCb    *cell;
 RgrDel         *lcDelInfo;
 RgSchErrInfo   *errInfo;
@@ -4956,9 +4899,6 @@ RgSchErrInfo   *errInfo;
 #endif
    U8           lcgId = 0;
 
-   TRC2(rgSCHCfgRgrLcgDel);
-
-
    lcgId = lcDelInfo->u.lcgDel.lcgId;
 
    errInfo->errCause = RGSCHERR_CFG_RGR_LCG_DEL;
@@ -5033,7 +4973,7 @@ RgSchErrInfo   *errInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrLcCfg
+S16 rgSCHCfgVldtRgrLcCfg
 (
 Inst             inst,
 RgrLchCfg     *lcCfg,
@@ -5042,7 +4982,7 @@ RgSchUeCb        **ue,
 RgSchErrInfo     *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrLcCfg(inst, lcCfg, cell, ue, errInfo)
+S16 rgSCHCfgVldtRgrLcCfg(inst, lcCfg, cell, ue, errInfo)
 Inst             inst;
 RgrLchCfg     *lcCfg;
 RgSchCellCb      **cell;
@@ -5050,8 +4990,6 @@ RgSchUeCb        **ue;
 RgSchErrInfo     *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrLcCfg);
-
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LC_CFG;
 
@@ -5107,7 +5045,7 @@ RgSchErrInfo     *errInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrLcgCfg
+S16 rgSCHCfgVldtRgrLcgCfg
 (
 Inst             inst,
 RgrLcgCfg        *lcgCfg,
@@ -5116,7 +5054,7 @@ RgSchUeCb        **ue,
 RgSchErrInfo     *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrLcgCfg(inst, lcgCfg, cell, ue, errInfo)
+S16 rgSCHCfgVldtRgrLcgCfg(inst, lcgCfg, cell, ue, errInfo)
 Inst             inst;
 RgrLcgCfg        *lcgCfg;
 RgSchCellCb      **cell;
@@ -5124,8 +5062,6 @@ RgSchUeCb        **ue;
 RgSchErrInfo     *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrLcgCfg);
-
 
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_DED_LCG_CFG;
 
@@ -5187,8 +5123,6 @@ RgSchErrInfo     *errInfo;
    UNUSED(cellCfg);
    UNUSED(errInfo);
 
-   TRC2(rgSCHCfgVldtRgrCellPwrCfg);
-
    /* This function does nothing now, placeholder for
     * subsequent power config validations that may be needed */
 
@@ -5236,8 +5170,6 @@ RgSchErrInfo     *errInfo;
    U8            bitMask = 0x00;
    U8            cnt=0;
 
-   TRC2(rgSCHCfgVldtRgrCmnLcCfg);
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_CMN_LC_CFG;
    
    for (idx = 0; idx < cellCfg->numCmnLcs; idx++)
@@ -5366,8 +5298,6 @@ RgrUeDlCqiCfg     *ueDlCqiCfg;
 #endif
 {
    
-    TRC2(rgSCHCfgVldtUeCqiModeCfg)
-
 #ifndef TFU_UPGRADE
    if((ueDlCqiCfg->prdCqiCfg.cqiPmiCfgIdx < 1) || 
          (ueDlCqiCfg->prdCqiCfg.cqiPmiCfgIdx > 1024))
@@ -5450,8 +5380,6 @@ RgrUeCfg          *ueCfg;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtUeMeasGapAckNakRepCfg)
-      
 #ifdef LTE_TDD
    if ((ueCfg->ackNackModeEnum == RGR_TDD_ACKNACK_MODE_MULT) &&
          (ueCfg->ueAckNackCfg.isAckNackEnabled == TRUE))
@@ -5541,7 +5469,6 @@ RgrUeRecfg        *ueRecfg;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtUeMeasGapAckNakRepRecfg)
    if((ueRecfg->ueAckNackRecfg.isAckNackEnabled == FALSE) &&
           (!ueRecfg->ueMeasGapRecfg.isMesGapEnabled))
    {
@@ -5623,8 +5550,6 @@ RgrUeSpsDlCfg     *dlSpsCfg;
 
    U8                 idx = 0;
 
-   TRC2(rgSCHCfgVldtUeDlSpsCfg);
-
    /* peridicity validation done in SPS module */
    if ((dlSpsCfg->numPucchVal > RG_SCH_MAX_NUM_N1PUCCH_PER_UE) ||
          (dlSpsCfg->numPucchVal == 0))
@@ -5690,8 +5615,6 @@ RgrUeUlPwrCfg     *pwrCfg;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtUePwrCfg);
-
    /* Group power control works only in accumulated mode */
    if (!pwrCfg->isAccumulated)
    {
@@ -5749,8 +5672,6 @@ RgrUeGrpPwrCfg *grpPwrCfg;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtUeGrpPwrCfg);
-
    if ((grpPwrCfg->pres) &&
        (((grpPwrCfg->tpcRnti > cell->rntiDb.rntiStart) &&
         ((grpPwrCfg->tpcRnti <
@@ -5797,7 +5718,6 @@ RgrUeRecfg     *ueRecfg;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtSpsReCfg);
    if ((ueRecfg->ueRecfgTypes & RGR_UE_DLSPS_RECFG) &&
          (ueRecfg->ueSpsRecfg.dlSpsCfg.isDlSpsEnabled)) 
    {
@@ -5895,7 +5815,6 @@ RgrUeRecfg     *ueRecfg;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtCqiReptReCfg);
    /* Validate DL Power Control Config parameters */
    if (ueRecfg->ueCqiReptCfg.numColltdCqiRept > RGR_CQIRPTS_MAXN)
    {
@@ -5927,7 +5846,7 @@ RgrUeRecfg     *ueRecfg;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrLchCfg
+S16 rgSCHCfgRgrLchCfg
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -5935,7 +5854,7 @@ RgrLchCfg     *lcCfg,
 RgSchErrInfo     *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrLchCfg(cell, ue, lcCfg, errInfo)
+S16 rgSCHCfgRgrLchCfg(cell, ue, lcCfg, errInfo)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 RgrLchCfg     *lcCfg;
@@ -5949,8 +5868,6 @@ RgSchErrInfo     *errInfo;
    RgSchUlLcCb  *ulLc; 
 #endif
 
-   TRC2(rgSCHCfgRgrLchCfg);
-
    errInfo->errCause = RGSCHERR_CFG_RGR_DED_LC_CFG;
 
    /* Allocate the downlink logical channel control block */
@@ -6052,7 +5969,7 @@ RgSchErrInfo     *errInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRgrLcgCfg
+S16 rgSCHCfgRgrLcgCfg
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue,
@@ -6060,7 +5977,7 @@ RgrLcgCfg        *lcgCfg,
 RgSchErrInfo     *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgRgrLcgCfg(cell, ue, lcgCfg, errInfo)
+S16 rgSCHCfgRgrLcgCfg(cell, ue, lcgCfg, errInfo)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue;
 RgrLcgCfg        *lcgCfg;
@@ -6074,7 +5991,6 @@ RgSchErrInfo     *errInfo;
    U32          idx;
    RgSchUlLcCb  *ulLc; 
 #endif
-   TRC2(rgSCHCfgRgrLcgCfg);
 
    errInfo->errCause = RGSCHERR_CFG_RGR_DED_LCG_CFG;
 
@@ -6160,11 +6076,10 @@ RgSchErrInfo        *errInfo;
 #endif
 {
    RgSchClcDlLcCb cmnLcCb;
-   TRC2(rgSCHCfgRgrCmnLcCfg);
 
    errInfo->errCause = RGSCHERR_CFG_RGR_CMN_LC_CFG;
 
-   cmMemset((U8 *)&cmnLcCb, 0, sizeof(cmnLcCb));
+   memset(&cmnLcCb, 0, sizeof(cmnLcCb));
 
    /* Handle configuration for CCCH/BCCH/PCCH */
    if (lcCfg->lcType == CM_LTE_LCH_CCCH)
@@ -6238,7 +6153,6 @@ RgSchDlLcCb      *dlLc;
 #endif
 {
    Inst    inst = cell->instIdx;
-   TRC2(rgSCHCfgFreeDlDedLcCb);
 
    rgSCHUtlFreeDlLc(cell, ue, dlLc);
 
@@ -6280,9 +6194,8 @@ PRIVATE Void rgSCHCfgFreeDlCmnLcCb(cmnDlLc)
 RgSchClcDlLcCb      *cmnDlLc;
 #endif
 {
-   TRC2(rgSCHCfgFreeDlCmnLcCb);
  
-   cmMemset((U8*)cmnDlLc, 0, sizeof(*cmnDlLc));
+   memset(cmnDlLc, 0, sizeof(*cmnDlLc));
    cmnDlLc->lcId = RGSCH_INVALID_LC_ID;
    RETVOID;
 }  /* rgSCHCfgFreeDlCmnLcCb */
@@ -6305,12 +6218,12 @@ RgSchClcDlLcCb      *cmnDlLc;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHCfgFreeCellCb
+Void rgSCHCfgFreeCellCb
 (
 RgSchCellCb      *cell
 )
 #else
-PUBLIC Void rgSCHCfgFreeCellCb(cell)
+Void rgSCHCfgFreeCellCb(cell)
 RgSchCellCb      *cell;
 #endif
 {
@@ -6321,7 +6234,6 @@ RgSchCellCb      *cell;
    RgSchWarningSiPdu  *warningSiPdu;
    U8                  idx;
  
-   TRC2(rgSCHCfgFreeCellCb);
    /* ccpu00132385- SI Warning PDUs which are not processed need to be deleted */
    /* Search for used index in WarningSi */
    for(idx = 0; idx < RGR_MAX_NUM_WARNING_SI; idx++)
@@ -6443,7 +6355,6 @@ RgSchUeCb      *ue;
    Inst    inst = cell->instIdx;
    U8 lcCnt; 
    U8 lcgId; 
-   TRC2(rgSCHCfgFreeUeCb);
 
    /* Free all logical channel info per UE */
    while((dlLc = rgSCHDbmGetNextDlDedLcCb(ue, NULLP)) != NULLP)
@@ -6566,8 +6477,6 @@ RgSchCellCb      *cell;
    RgSchCfgElem  *rgCfgElem;
    Inst    inst = cell->instIdx;
 
-   TRC2(rgSCHCfgFreeRgrCfgLst);
-
    /* Free CURRENT RGR cfg list */
    while ((rgCfgElem = rgSCHDbmGetNextCrntRgrCfgElem(cell, NULLP)) != NULLP)
    {
@@ -6621,7 +6530,6 @@ RgSchCellCb      *cell;
 {
    RgSchClcDlLcCb *dlCmnLc;
 
-   TRC2(rgSCHCfgFreeCmnLcLst);
 
    if ((dlCmnLc = rgSCHDbmGetBcchOnBch(cell)) != NULLP)
    {
@@ -6678,7 +6586,6 @@ RgSchCellCb      *cell;
    RgSchUeCellInfo *sCellInfo;       
    CmLList         *node;
 #endif
-   TRC2(rgSCHCfgFreeUeLst);
 
    /* Free Ues in the list */
    while ((ue = rgSCHDbmGetNextUeCb(cell, NULLP)) != NULLP)
@@ -6746,8 +6653,6 @@ RgSchCellCb      *cell;
 {
    RgSchUeCb     *ue;
 
-   TRC2(rgSCHCfgFreeSpsUeLst);
-
    /* Free Ues in the list */
    while ((ue = rgSCHDbmGetNextSpsUeCb(cell, NULLP)))
    {
@@ -6793,9 +6698,6 @@ RgrSiCfg       *siCfg;
 
    UNUSED(inst);
 
-   TRC2(rgSCHCfgVldtRgrCellSiCfg);
-
-
 #ifndef LTE_TDD
    /* Check that retxCnt value should be <= value of siWinSize.
    This validation is only applicable for FDD mode. */
@@ -6877,9 +6779,6 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw)
    U32 idx;
    UNUSED(inst);
 
-   TRC2(rgSCHCfgVldtRgrCellLteAdvCfg);
-
-
    if((lteAdvCfg->pres & RGR_SFR) && (RGR_ENABLE == lteAdvCfg->sfrCfg.status))
    {
       if(lteAdvCfg->sfrCfg.cellEdgeRbRange.startRb > lteAdvCfg->sfrCfg.cellEdgeRbRange.endRb)
@@ -6912,7 +6811,7 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw)
          return RFAILED;
       }
 
-       cmMemcpy(temp,  (U8 *) lteAdvCfg->absCfg.absPattern,RGR_ABS_PATTERN_LEN);
+       memcpy(temp, lteAdvCfg->absCfg.absPattern,RGR_ABS_PATTERN_LEN);
       
        /* Added validation for ABS pattern len */
       for(idx = 0; idx < RGR_ABS_PATTERN_LEN; idx++)
@@ -6958,8 +6857,6 @@ RgrCellCsgParamCfg       *csgParam;
 #endif
 {
 
-   TRC2(rgSCHCfgVldtRgrCellCsgParamCfg);
-
    RGSCHDBGPRM(inst, (rgSchPBuf(inst), "Validating CSG Parameters \n"));
 
    if(csgParam->minDlResNonCsg > 100)
@@ -7001,7 +6898,7 @@ RgrCellCsgParamCfg       *csgParam;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrSiCfg
+S16 rgSCHCfgVldtRgrSiCfg
 (
 Inst         inst,
 RgrSiCfgReqInfo *siCfg,
@@ -7009,7 +6906,7 @@ RgSchCellCb      *cell,
 RgSchErrInfo *errInfo
 )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrSiCfg(inst, siCfg, cell, errInfo)
+S16 rgSCHCfgVldtRgrSiCfg(inst, siCfg, cell, errInfo)
 Inst         inst;
 RgrSiCfgReqInfo *siCfg;
 RgSchCellCb      *cell;
@@ -7019,9 +6916,6 @@ RgSchErrInfo *errInfo;
    MsgLen  msgLen = 0;
    U8      numSi;
 
-   TRC2(rgSCHCfgVldtRgrSiCfg);
-
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_SI_CFG;
 
    /*Validate the cfgType parameter */
@@ -7136,7 +7030,7 @@ RgSchErrInfo *errInfo;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrLoadInf
+S16 rgSCHCfgVldtRgrLoadInf
 (
  Inst              inst,
  RgrLoadInfReqInfo *loadInfReq,
@@ -7144,7 +7038,7 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf
  RgSchErrInfo      *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo)
+S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo)
    Inst              inst;
    RgrLoadInfReqInfo *loadInfReq;
    RgSchCellCb       *cell;
@@ -7152,9 +7046,6 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo)
 #endif
 {
 
-   TRC2(rgSCHCfgVldtRgrLoadInf);
-
-
    errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_LOAD_INF;
 
    /* Validate if the CC startRb which we have received from DSFR lies in CE sub-band of the receiving eNB */
@@ -7211,7 +7102,7 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode 
+S16 rgSCHCfgVldtRgrTxmodePuschMode 
 (
  RgSchCellCb     *cellCb,
  RgrTxMode       txMde,
@@ -7219,15 +7110,13 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode
  RgSchErrInfo    *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo)
+S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo)
    RgSchCellCb     *cellCb;
    RgrTxMode       txMde;
    RgrAprdCqiMode  puschMode;
    RgSchErrInfo    *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrTxmodePuschMode);
-
 
    if (txMde == RGR_UE_TM_1 ||  txMde == RGR_UE_TM_2 ||
          txMde == RGR_UE_TM_3 || txMde == RGR_UE_TM_7)
@@ -7297,7 +7186,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg 
+S16 rgSCHCfgVldtRgrUeACqiCfg 
 (
  RgSchCellCb        *cellCb,
  CmLteRnti          crnti,  
@@ -7306,7 +7195,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg
  RgSchErrInfo       *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo)
+S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo)
    RgSchCellCb        *cellCb;
    CmLteRnti          crnti; 
    RgrUeAprdDlCqiCfg  *acqiCfg;
@@ -7316,8 +7205,6 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo)
 {
    RgrTxMode      txMde;
    RgrAprdCqiMode puschMode; 
-   TRC2(rgSCHCfgVldtRgrUeACqiCfg);
-
 
    if(acqiCfg->pres)
    {
@@ -7361,7 +7248,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode 
+S16 rgSCHCfgVldtRgrTxmodePucchMode 
 (
    RgSchCellCb     *cellCb,
    RgrTxMode       txMde,
@@ -7369,15 +7256,13 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode
    RgSchErrInfo    *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo)
+S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo)
    RgSchCellCb     *cellCb;
    RgrTxMode       txMde;
    RgrPrdCqiMode   pucchMode;
    RgSchErrInfo    *errInfo;
 #endif
 {
-   TRC2(rgSCHCfgVldtRgrTxmodePucchMode);
-   
 
   if (pucchMode == RGR_PRD_CQI_MOD10 || pucchMode == RGR_PRD_CQI_MOD20 )
   {
@@ -7424,7 +7309,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo)
  */
 #ifdef LTEMAC_HDFDD
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg 
+S16 rgSCHCfgVldtRgrUePCqiCfg 
 (
  RgSchCellCb        *cellCb,
  CmLteRnti          crnti,  
@@ -7434,7 +7319,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg
  RgSchErrInfo       *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd, 
+S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd, 
        txMode, errInfo)
    RgSchCellCb        *cellCb;
    CmLteRnti          crnti; 
@@ -7445,7 +7330,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, hdFdd,
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg 
+S16 rgSCHCfgVldtRgrUePCqiCfg 
    (
     RgSchCellCb        *cellCb,
     CmLteRnti          crnti,  
@@ -7454,7 +7339,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg
     RgSchErrInfo       *errInfo
    )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg,  txMode, errInfo)
+S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg,  txMode, errInfo)
    RgSchCellCb        *cellCb;
    CmLteRnti          crnti; 
    RgrUePrdDlCqiCfg   *cqiCfg;
@@ -7466,8 +7351,6 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg,  txMode, errInfo)
    RgrTxMode     txMde; 
    RgrPrdCqiMode pucchMode; 
 
-   TRC2(rgSCHCfgVldtRgrUePCqiCfg);
-   
    txMde = RGR_UE_TM_1;
    pucchMode = RGR_PRD_CQI_MOD20;
    if ( RGR_SCH_PCQI_SETUP == cqiCfg->type )
@@ -7649,7 +7532,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg,  txMode, errInfo)
  */
 #ifdef LTEMAC_HDFDD
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg 
+S16 rgSCHCfgVldtRgrUeUlSrsCfg 
 (
  RgSchCellCb       *cellCb,
  CmLteRnti         crnti,  
@@ -7658,7 +7541,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg
  RgSchErrInfo      *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo)
+S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo)
    RgSchCellCb     *cellCb;
    CmLteRnti       crnti; 
    RgrUeUlSrsCfg   *srsCfg;
@@ -7667,7 +7550,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, hdFdd, errInfo)
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg 
+S16 rgSCHCfgVldtRgrUeUlSrsCfg 
 (
  RgSchCellCb       *cellCb,
  CmLteRnti         crnti,  
@@ -7675,7 +7558,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg
  RgSchErrInfo      *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg,  errInfo)
+S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg,  errInfo)
    RgSchCellCb     *cellCb;
    CmLteRnti       crnti; 
    RgrUeUlSrsCfg   *srsCfg;
@@ -7687,9 +7570,6 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg,  errInfo)
    U16    srsOffset=0;
    U8     srsSubframe=0;
    
-   TRC2(rgSCHCfgVldtRgrUeUlSrsCfg);
-
-
    if ( RGR_SCH_SRS_SETUP == srsCfg->type )
    {
 
@@ -7814,7 +7694,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg,  errInfo)
  */
 #ifdef LTEMAC_HDFDD 
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg 
+S16 rgSCHCfgVldtRgrUeSrCfg 
 (
  RgSchCellCb      *cellCb,
  CmLteRnti        crnti,  
@@ -7823,7 +7703,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg
  RgSchErrInfo     *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo)
+S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo)
    RgSchCellCb    *cellCb;
    CmLteRnti      crnti; 
    RgrUeSrCfg     *srCfg;
@@ -7832,7 +7712,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, hdFdd, errInfo)
 #endif
 #else
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg 
+S16 rgSCHCfgVldtRgrUeSrCfg 
 (
  RgSchCellCb      *cellCb,
  CmLteRnti        crnti,  
@@ -7840,7 +7720,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg
  RgSchErrInfo     *errInfo
  )
 #else
-PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo)
+S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo)
    RgSchCellCb    *cellCb;
    CmLteRnti      crnti; 
    RgrUeSrCfg     *srCfg;
@@ -7849,10 +7729,6 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo)
 #endif
 {
 
-   TRC2(rgSCHCfgVldtRgrUeSrCfg);
-
-
-
    if ( RGR_SCH_SR_SETUP == srCfg->type )
    {
       /* 1. Validate SR Configuration related parameter values  */
@@ -7939,9 +7815,6 @@ PRIVATE S16  rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg,  errInfo)
 #endif
 {
 
-   TRC2(rgSCHCfgVldtCqiSrSrsUeCfg);
-
-
    /*  1. Validate UE Aperiodic CQI related parameters */
    if ( ROK != rgSCHCfgVldtRgrUeACqiCfg (cellCb, ueCfg->crnti,
             &ueCfg->ueDlCqiCfg.aprdCqiCfg, ueCfg->txMode, errInfo ))
@@ -8045,7 +7918,6 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo)
 #endif
 {
    RgrUeTxModeCfg     txMode;
-   TRC3(rgSCHCfgVldtCqiSrSrsUeReCfg);
 
    txMode.pres = TRUE;
    txMode.tmTrnstnState = RGR_TXMODE_RECFG_CMPLT;
@@ -8157,7 +8029,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo)
     *
     **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgACqiUeCfg
+S16 rgSCHCfgACqiUeCfg
 (
 RgSchCellCb        *cellCb, 
 RgSchUeCb          *ue, 
@@ -8167,7 +8039,7 @@ RgrUeAprdDlCqiCfg  *aCqiCfg,
 CmLteUeCategory     ueCat
 )
 #else
-PUBLIC S16 rgSCHCfgACqiUeCfg(cellCb,ue,acqiCb ueTxMode, aCqiCfg, ueCat)
+S16 rgSCHCfgACqiUeCfg(cellCb,ue,acqiCb ueTxMode, aCqiCfg, ueCat)
 RgSchCellCb       *cellCb; 
 RgSchUeCb          *ue; 
 RgSchUeACqiCb     *acqiCb;
@@ -8182,8 +8054,6 @@ CmLteUeCategory   ueCat;
    U8     cqiPmiSzR1;   /*CQIPMI Size for Rank =1*/
    U8     cqiPmiSzRn1; /*CQIPMI Size for Rank > 1*/
 
-   TRC3(rgSCHCfgACqiUeCfg);
-
    cqiPmiSzR1 = 0;
    cqiPmiSzRn1 = 0;
    
@@ -8296,7 +8166,7 @@ CmLteUeCategory   ueCat;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgPCqiUeCfg
+S16 rgSCHCfgPCqiUeCfg
 (
  RgSchCellCb         *cellCb, 
  RgSchUeCb           *ueCb, 
@@ -8304,7 +8174,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg
  CmLteUeCategory     ueCat
  )
 #else
-PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
+S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
    RgSchCellCb       *cellCb; 
    RgSchUeCb         *ueCb; 
    RgrUePrdDlCqiCfg  *cqiCfg;
@@ -8318,7 +8188,6 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
    U8     temp; 
    U8     loop;
    RgSchUePCqiCb *cqiCb = NULLP;
-   TRC3(rgSCHCfgPCqiUeCfg);
 
    crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)+
                   (cellCb->crntTime.slot);
@@ -8332,7 +8201,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
          ueCb->rawCqiBitW[loop].type = TFU_RECP_REQ_INVLD; /* setting invalid  type*/
       }
       /*  1. Copy the Received CQI Cfg parameters to ueCb  */
-      cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg, 
+      memcpy(&cqiCb->cqiCfg, cqiCfg, 
             sizeof(RgrUePrdDlCqiCfg));
 
       /*  2. Compute Periodic CQI Periodicity and subframe offset   */
@@ -8470,7 +8339,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgRiUeCfg
+S16 rgSCHCfgRiUeCfg
 (
  RgSchCellCb        *cellCb, 
  RgSchUeCb          *ueCb, 
@@ -8478,7 +8347,7 @@ PUBLIC S16 rgSCHCfgRiUeCfg
  CmLteUeCategory    ueCat
  )
 #else
-PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
+S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
    RgSchCellCb       *cellCb; 
    RgSchUeCb         *ueCb; 
    RgrUePrdDlCqiCfg  *cqiCfg;
@@ -8492,10 +8361,6 @@ PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
    U16    tempIdx; 
    RgSchUePCqiCb *cqiCb = NULLP;
 
-   TRC3(rgSCHCfgRiUeCfg);
-
-
-
    crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)
       +(cellCb->crntTime.slot);
    cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb);
@@ -8656,14 +8521,14 @@ PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgSrsUeCfg
+S16 rgSCHCfgSrsUeCfg
 (
  RgSchCellCb     *cellCb,
  RgSchUeCb       *ueCb,
  RgrUeUlSrsCfg   *srsCfg 
  )
 #else
-PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg)
+S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg)
    RgSchCellCb     *cellCb;
    RgSchUeCb       *ueCb;
    RgrUeUlSrsCfg   *srsCfg;
@@ -8673,16 +8538,13 @@ PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg)
    U16      crntTime;  
    U16      tempIdx;
 
-   TRC3(rgSCHCfgSrsUeCfg);
-
-
    crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)
       +(cellCb->crntTime.slot);
 
    if(RGR_SCH_SRS_SETUP == srsCfg->type) 
    {
       /*  1. Copy the Received Cfg parameters to local cb  */
-      cmMemcpy((U8 *)&ueCb->srsCb.srsCfg, (U8 *)srsCfg, sizeof(RgrUeUlSrsCfg));
+      memcpy(&ueCb->srsCb.srsCfg, srsCfg, sizeof(RgrUeUlSrsCfg));
 
 #ifndef LTE_TDD
       /* 2.  Compute SRS Offset and Periodicity */
@@ -8806,14 +8668,14 @@ PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgSrUeCfg
+S16 rgSCHCfgSrUeCfg
 (
  RgSchCellCb      *cellCb,
  RgSchUeCb        *ueCb,
  RgrUeSrCfg       *srCfg
  )
 #else
-PUBLIC S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg)
+S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg)
    RgSchCellCb    *cellCb;
    RgSchUeCb      *ueCb;
    RgrUeSrCfg     *srCfg;
@@ -8822,15 +8684,13 @@ PUBLIC S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg)
    U16     srTrInsTime;
    U16     crntTime;
 
-   TRC3(rgSCHCfgSrUeCfg);
-
 
    crntTime = (cellCb->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G)
       +(cellCb->crntTime.slot);
    if(srCfg->type == RGR_SCH_SR_SETUP) 
    {
       /*  1. Copy the Received Cfg parameters to local cb  */
-      cmMemcpy((U8 *)&ueCb->srCb.srCfg, (U8 *)srCfg, sizeof(RgrUeSrCfg));
+      memcpy(&ueCb->srCb.srCfg, srCfg, sizeof(RgrUeSrCfg));
 
 
       /*  2. Compute SR periodicity and offset */
@@ -8948,7 +8808,7 @@ PUBLIC S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg)
  *
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgPCqiUeReCfg
+S16 rgSCHCfgPCqiUeReCfg
 (
  RgSchCellCb        *cellCb, 
  RgSchUeCb          *ueCb, 
@@ -8956,7 +8816,7 @@ PUBLIC S16 rgSCHCfgPCqiUeReCfg
  CmLteUeCategory      ueCat
  )
 #else
-PUBLIC S16  rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat)
+S16  rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat)
    RgSchCellCb       *cellCb; 
    RgSchUeCb         *ueCb; 
    RgrUePrdDlCqiCfg  *cqiCfg;
@@ -8965,7 +8825,6 @@ PUBLIC S16  rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat)
 {
 
    RgSchUePCqiCb *cqiCb = NULLP;
-   TRC3(rgSCHCfgPCqiUeReCfg);
 
    cqiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb);
    /* Fix: ccpu00124008 Fix for incorrect check causing missed CQI reception instance */
@@ -9063,23 +8922,20 @@ PUBLIC S16  rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgSrsUeReCfg
+S16 rgSCHCfgSrsUeReCfg
 (
  RgSchCellCb        *cellCb, 
  RgSchUeCb          *ueCb, 
  RgrUeUlSrsCfg      *srsCfg
  )
 #else
-PUBLIC S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg)
+S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg)
    RgSchCellCb      *cellCb; 
    RgSchUeCb        *ueCb; 
    RgrUeUlSrsCfg    *srsCfg;
 #endif
 {
 
-   TRC3(rgSCHCfgSrsUeReCfg);
-
-
 
    if(( RGR_SCH_SRS_SETUP == srsCfg->type) ||
          ( RGR_SCH_SRS_SETUP != ueCb->srsCb.srsCfg.type ))
@@ -9162,21 +9018,19 @@ PUBLIC S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgSrUeReCfg
+S16 rgSCHCfgSrUeReCfg
 (
  RgSchCellCb    *cellCb, 
  RgSchUeCb      *ueCb, 
  RgrUeSrCfg     *srCfg
  )
 #else
-PUBLIC S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg)
+S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg)
    RgSchCellCb   *cellCb; 
    RgSchUeCb     *ueCb; 
    RgrUeSrCfg    *srCfg;
 #endif
 {
-   TRC3(rgSCHCfgSrUeReCfg);
-
 
    /* Fix : syed Incorrect check for SR RECFG */
    if((srCfg->type == RGR_SCH_SR_SETUP) &&
@@ -9245,7 +9099,7 @@ PUBLIC S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg)
  *      -# RFAILED
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgAcqiUeReCfg
+S16 rgSCHCfgAcqiUeReCfg
 (
  RgSchCellCb    *cellCb, 
  RgSchUeCb      *ueCb, 
@@ -9253,14 +9107,13 @@ PUBLIC S16 rgSCHCfgAcqiUeReCfg
  CmLteUeCategory   ueCat
  )
 #else
-PUBLIC S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat)
+S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat)
    RgSchCellCb   *cellCb; 
    RgSchUeCb     *ueCb; 
    RgrUeAprdDlCqiCfg   *acqiCfg;
    CmLteUeCategory   ueCat;
 #endif
 {
-   TRC3(rgSCHCfgAcqiUeReCfg);
 
    return (rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb))
                                     ,ueCb->mimoInfo.txMode, acqiCfg, ueCat));
@@ -9306,13 +9159,13 @@ PUBLIC S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat)
  *      -# ROK
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel 
+S16 rgSCHCfgPCqiSrsSrUeDel 
 (
  RgSchCellCb      *cellCb,
  RgSchUeCb        *ueCb
  )
 #else
-PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb)
+S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb)
    RgSchCellCb    *cellCb;
    RgSchUeCb      *ueCb;
 #endif
@@ -9322,7 +9175,6 @@ PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb)
    U32 sCellCnt = 0;
 #endif
    RgSchUePCqiCb *cqiRiCb = NULLP;
-   TRC3(rgSCHCfgPCqiSrsSrUeDel);
 
    cqiRiCb = RG_SCH_GET_UE_CELL_CQI_CB(ueCb,cellCb);
 
@@ -9427,7 +9279,7 @@ PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb)
  *
  */
 #ifdef ANSI
-PUBLIC S16 rgSCHUtlGetCfgPerOff
+S16 rgSCHUtlGetCfgPerOff
 (
  RgSchPerTbl     tbl,
  U16             cfgIdx, 
@@ -9435,7 +9287,7 @@ PUBLIC S16 rgSCHUtlGetCfgPerOff
  U16             *offset
  )
 #else
-PUBLIC S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset)
+S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset)
    RgSchPerTbl   tbl;
    U16           cfgIdx;
    U16           *peri; 
@@ -9446,7 +9298,6 @@ PUBLIC S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset)
    U8     min = 0;
    U8     max = 0;
    CONSTANT RgSchUePCqiSrsSrCfgIdxTbl* table;
-   TRC3(rgSCHUtlGetCfgPerOff);
   
    /* Added the function instead of the MACRO to get the 
     * periodicity table */
@@ -9511,9 +9362,6 @@ PRIVATE  Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn
 
    U32               confRepMode;
 
-                     
-   TRC3(rgSCHCfgUtlFetchAcqiBitSz);
-
    confRepMode = acqiCb->aCqiCfg.aprdModeEnum;
    switch(confRepMode)
    {
@@ -9613,7 +9461,6 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl *  rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy
 #endif
 {
     CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * table;
-    TRC3(rgSCHCfgUtlGetPcqiCrsSrRiTbl);
     
     switch (tblType)
     {
@@ -9702,8 +9549,6 @@ RgSchCellCb       *cell;
 RgrUeDrxCfg       *ueDrxCfg;
 #endif
 {
-   TRC2(rgSCHCfgVldtDrxUeCfg)
-
 
    if (ueDrxCfg->isDrxEnabled == FALSE)
    {
@@ -9901,7 +9746,6 @@ PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr)
 U8      onDurTmr;
 #endif
 {
-   TRC2(rgSCHCfgVldtDrxOnDurCfg)
 
    switch ( onDurTmr )
    {
@@ -9959,8 +9803,6 @@ PRIVATE S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr)
 U16      inActvTmr;
 #endif
 {
-   TRC2(rgSCHCfgVldtDrxInActvCfg)
-
    switch ( inActvTmr )
    {
       case RGR_DRX_PRD_1PSF:
@@ -10023,8 +9865,6 @@ PRIVATE S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr)
 U8       reTxTmr;
 #endif
 {
-   TRC2(rgSCHCfgVldtDrxReTxCfg)
-
    switch ( reTxTmr )
    {
       case RGR_DRX_PRD_1PSF:
@@ -10074,8 +9914,6 @@ PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg(lngCycleOffst)
 RgrDrxLongCycleOffst       lngCycleOffst;
 #endif
 {
-   TRC2(rgSCHCfgVldtDrxLngCycCfg)
-
    if ( rgSCHCfgVldtDrxLngCyclTmrs(lngCycleOffst.longDrxCycle) != ROK )
    {
       return RFAILED;
@@ -10117,7 +9955,6 @@ PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs(val)
 U16      val;
 #endif
 {
-   TRC2(rgSCHCfgVldtDrxLngCyclTmrs)
 
    switch ( val )
    {
@@ -10176,8 +10013,6 @@ PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg(shrtCycCfg)
 RgrDrxShortDrx      shrtCycCfg;
 #endif
 {
-   TRC2(rgSCHCfgVldtDrxShrtCycCfg)
-
    switch(shrtCycCfg.shortDrxCycle)
    {
       case RGR_DRX_PRD_2SF:
@@ -10249,8 +10084,6 @@ RgrUeRecfg        *ueCfg;
 RgSchErrInfo      *err;
 #endif
 {
-   TRC2(rgSCHCfgUeTaRecfg)
-
    UNUSED(err);
 
    /* Update the TA related information */
@@ -10312,7 +10145,6 @@ RgrUeRecfg     *ueRecfg;
 #endif
 {
    S16 retVal;
-   TRC3(rgSCHCfgUeCqiReptReCfg)
 
    /* Check has it been disabled */
    if(ueRecfg->ueCqiReptCfg.numColltdCqiRept)
@@ -10400,7 +10232,7 @@ PRIVATE S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)
  *  @return  VOID
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHSCellFreeBuf
+Void rgSCHSCellFreeBuf
 (
 Inst         inst,         
 RgSchUeCb    *ue,
@@ -10408,7 +10240,7 @@ RgrUeRecfg   *ueRecfg,
 U8           idx
 )
 #else
-PUBLIC Void rgSCHSCellFreeBuf(inst ,ue, ueRecfg, idx)
+Void rgSCHSCellFreeBuf(inst ,ue, ueRecfg, idx)
 Inst         inst;         
 RgSchUeCb    *ue;
 RgrUeRecfg   *ueRecfg;
@@ -10418,7 +10250,6 @@ U8           idx;
    RgSchUeCellInfo *sCellInfo = NULLP;
    RgrUeSecCellCfg *sCellInfoRecfg = NULLP;
    
-   TRC2(rgSCHSCellFreeBuf);
 
    for(U8 i = 0; i <= idx; i++)
    {