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

diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c
index cee0dd6b2..b002d90e0 100755
--- a/src/5gnrsch/rg_sch.c
+++ b/src/5gnrsch/rg_sch.c
@@ -101,13 +101,13 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchCntrlReq
+S16 RgMiLrgSchCntrlReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cntrl   /* control structure  */
 )
 #else
-PUBLIC S16 RgMiLrgSchCntrlReq(pst, cntrl)
+S16 RgMiLrgSchCntrlReq(pst, cntrl)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cntrl;  /* control structure  */
 #endif    
@@ -117,8 +117,6 @@ RgMngmt  *cntrl;  /* control structure  */
    RgMngmt   cfm;
    
    Inst      inst = (pst->dstInst - SCH_INST_START); /* Scheduler instance Id */
-   TRC3(RgMiLrgSchCntrlReq)
-   
 
    /* Fill the post structure for sending the confirmation */
    SchFillCfmPst(pst, &cfmPst, cntrl);
@@ -131,7 +129,7 @@ RgMngmt  *cntrl;  /* control structure  */
       SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt));
       return ROK;
    } */
-   cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt));
+   memset(&cfm, 0, sizeof(RgMngmt));
 
 #ifdef LMINT3
    cfm.hdr.transId =
@@ -193,13 +191,13 @@ RgMngmt  *cntrl;  /* control structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchL2MeasReq
+S16 RgMiLrgSchL2MeasReq
 (
 Pst               *pst,     /* post structure  */
 LrgSchMeasReqInfo *measInfo /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo)
+S16 RgMiLrgSchL2MeasReq(pst, measInfo)
    Pst               *pst;     /* post structure  */
    LrgSchMeasReqInfo *measInfo; /* Meas Req Info */
 #endif    
@@ -221,8 +219,6 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo)
    err.errType  = 0;
    err.errCause = 0;
 
-   TRC3(RgMiLrgSchL2MeasReq)
-
 
    /* Find the cellCb using cellId in measInfo. Iterate through all cells
     * in rgrsapCb in RgschCb */
@@ -309,13 +305,13 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo)
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchL2MeasStopReq
+S16 RgMiLrgSchL2MeasStopReq
 (
 Pst               *pst,     /* post structure  */
 LrgSchMeasStopReqInfo *measInfo /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
+S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
    Pst               *pst;     /* post structure  */
    LrgSchMeasStopReqInfo *measInfo; /* Meas Req Info */
 #endif
@@ -328,10 +324,6 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
    LrgSchMeasCfmInfo measCfm;
    U8                  idx;
 
-
-   TRC3(RgMiLrgSchL2MeasStopReq)
-
-
    for (idx = 0; idx < instCb->numSaps; idx++)
    {
       if ( instCb->rgrSap[idx].cell->cellId == measInfo->cellId)
@@ -347,7 +339,7 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
                "Stop req Failed.Invalid Cell Id ");
       return RFAILED;
    }
-   cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
+   memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
    node = cell->l2mList.first;
    while(node != NULLP)
    {
@@ -363,7 +355,7 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
    {
       RgInfL2MeasStopReq measStopReq;
       Pst               pstMac;
-      cmMemset((U8 *)&measStopReq, 0, sizeof(RgInfL2MeasStopReq));
+      memset(&measStopReq, 0, sizeof(RgInfL2MeasStopReq));
       measStopReq.transId  = measInfo->hdr.transId;
       measStopReq.measType = measInfo->measType;
       /* measReq.timePrd  = measInfo->timePrd; */
@@ -394,13 +386,13 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo)
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgSchL2MeasSendReq
+S16 RgMiLrgSchL2MeasSendReq
 (
 Pst               *pst,     /* post structure  */
 LrgSchMeasSndReqInfo *measInfo /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo)
+S16 RgMiLrgSchL2MeasSendReq(pst, measInfo)
    Pst               *pst;     /* post structure  */
    LrgSchMeasSndReqInfo *measInfo; /* Meas Req Info */
 #endif
@@ -410,10 +402,6 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo)
    RgSchCb             *instCb =  &rgSchCb[(pst->dstInst - SCH_INST_START)];
    U8                  idx;
 
-   TRC3(RgMiLrgSchL2MeasSendReq)
-
-
-
    cell = NULLP;
    for (idx = 0; idx < instCb->numSaps; idx++)
    {
@@ -435,7 +423,7 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo)
    {
       RgInfL2MeasSndReq measSndReq;
       Pst               pstMac;
-      cmMemset((U8 *)&measSndReq, 0, sizeof(RgInfL2MeasSndReq));
+      memset(&measSndReq, 0, sizeof(RgInfL2MeasSndReq));
       measSndReq.transId  = measInfo->hdr.transId;
       measSndReq.measType = measInfo->measType;
       measSndReq.timePrd  = measInfo->timePrd;
@@ -476,14 +464,14 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrBndReq
+S16 RgUiRgrBndReq
 (
  Pst   *pst, 
  SuId  suId,
  SpId  spId
  )
 #else
-PUBLIC S16 RgUiRgrBndReq(pst, suId, spId)
+S16 RgUiRgrBndReq(pst, suId, spId)
    Pst   *pst; 
    SuId  suId;
    SpId  spId;
@@ -494,9 +482,6 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId)
    Inst      instId = pst->dstInst-SCH_INST_START;
    RgUstaDgn dgn;      /* Alarm diagnostics structure */
 
-   TRC3(RgUiRgrBndReq)
-
-
    tmpPst.prior       = pst->prior;
    tmpPst.route       = pst->route;
    tmpPst.selector    = pst->selector;
@@ -575,22 +560,20 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrUbndReq
+S16 RgUiRgrUbndReq
 (
  Pst    *pst,
  SpId   spId,
  Reason reason
  )
 #else
-PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason)
+S16 RgUiRgrUbndReq(pst, spId, reason)
    Pst    *pst; 
    SpId   spId;
    Reason reason;
 #endif
 {
    Inst instId = pst->dstInst-SCH_INST_START;
-   TRC3(RgUiRgrUbndReq)
-
 
    /* SAP Id validation */
    if (spId < rgSchCb[instId].numSaps)
@@ -646,7 +629,7 @@ PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrSiCfgReq
+S16 RgUiRgrSiCfgReq
 (
 Pst           *pst, 
 SpId          spId,
@@ -654,7 +637,7 @@ RgrCfgTransId transId,
 RgrSiCfgReqInfo *cfgReqInfo
 )
 #else
-PUBLIC S16 RgUiRgrSiCfgReq(pst, spId, transId, cfgReqInfo)
+S16 RgUiRgrSiCfgReq(pst, spId, transId, cfgReqInfo)
 Pst           *pst; 
 SpId          spId;
 RgrCfgTransId transId;
@@ -666,9 +649,7 @@ RgrSiCfgReqInfo *cfgReqInfo;
    U8        prntTrans[RGR_CFG_TRANSID_SIZE+1];
    Inst      instId = pst->dstInst-SCH_INST_START;
 
-   TRC2(RgUiRgrSiCfgReq);
-
-   cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE);
+   memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
    prntTrans[RGR_CFG_TRANSID_SIZE] = '\0';
 
 
@@ -760,7 +741,7 @@ else
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrWarningSiCfgReq
+S16 RgUiRgrWarningSiCfgReq
 (
 Pst           *pst, 
 SpId          spId,
@@ -768,7 +749,7 @@ RgrCfgTransId transId,
 RgrWarningSiCfgReqInfo *warningSiCfgReqInfo
 )
 #else
-PUBLIC S16 RgUiRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo)
+S16 RgUiRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo)
 Pst           *pst; 
 SpId          spId;
 RgrCfgTransId transId;
@@ -780,9 +761,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
    U8       cfmStatus = RGR_CFG_CFM_NOK;
    U8       prntTrans[RGR_CFG_TRANSID_SIZE+1];
 
-   TRC2(RgUiRgrWarningSiCfgReq);
-
-   cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE);
+   memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
    prntTrans[RGR_CFG_TRANSID_SIZE] = '\0';
 
 
@@ -877,7 +856,7 @@ else
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrWarningSiStopReq
+S16 RgUiRgrWarningSiStopReq
 (
 Pst           *pst,
 SpId          spId,
@@ -885,7 +864,7 @@ RgrCfgTransId transId,
 U8            siId
 )
 #else
-PUBLIC S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId)
+S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId)
 Pst           *pst;
 SpId          spId;
 RgrCfgTransId transId;
@@ -894,10 +873,6 @@ U8            siId;
 {         
    Inst         instId = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgUiRgrWarningSiStopReq)
-
-
-
    if (spId < rgSchCb[instId].numSaps)
    {
       if(LRG_BND != rgSchCb[instId].rgrSap[spId].sapSta.sapState)
@@ -951,7 +926,7 @@ U8            siId;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgrLoadInfReq
+S16 RgUiRgrLoadInfReq
 (
  Pst               *pst,
  SpId              spId,
@@ -959,7 +934,7 @@ PUBLIC S16 RgUiRgrLoadInfReq
  RgrLoadInfReqInfo *loadInfReq
  )
 #else
-PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq)
+S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq)
    Pst               *pst;
    SpId              spId;
    RgrCfgTransId     transId;
@@ -970,9 +945,7 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq)
    U8        prntTrans[RGR_CFG_TRANSID_SIZE+1];
    Inst      instId = pst->dstInst-SCH_INST_START;
 
-   TRC2(RgUiRgrLoadInfReq);
-
-   cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, RGR_CFG_TRANSID_SIZE);
+   memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE);
    prntTrans[RGR_CFG_TRANSID_SIZE] = '\0';
 
 
@@ -1042,13 +1015,13 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq)
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchDedBoUpdtReq
+S16 RgMacSchDedBoUpdtReq
 (
 Pst*           pst,
 RgInfDedBoRpt  *boRpt
 )
 #else
-PUBLIC S16 RgMacSchDedBoUpdtReq(pst, boRpt)
+S16 RgMacSchDedBoUpdtReq(pst, boRpt)
 Pst*           pst;
 RgInfDedBoRpt  *boRpt;
 #endif
@@ -1063,7 +1036,6 @@ RgInfDedBoRpt  *boRpt;
    Inst          inst = (pst->dstInst - SCH_INST_START);
    S16           cellSapId = boRpt->cellSapId;
 
-   TRC3(RgMacSchDedBoUpdtReq)
 /*
    RLOG_ARG2(L_DEBUG,DBG_CELLID,boRpt->cellId,"rgMacSchDedBoUpdtReq():"
             " boRpt->rnti = %u  boRpt->lcId = %u",boRpt->rnti, boRpt->lcId);
@@ -1181,13 +1153,13 @@ RgInfDedBoRpt  *boRpt;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchCmnBoUpdtReq
+S16 RgMacSchCmnBoUpdtReq
 (
 Pst*           pst,
 RgInfCmnBoRpt  *boRpt
 )
 #else
-PUBLIC S16 RgMacSchCmnBoUpdtReq(pst, boRpt)
+S16 RgMacSchCmnBoUpdtReq(pst, boRpt)
 Pst*           pst;
 RgInfCmnBoRpt  *boRpt;
 #endif
@@ -1196,7 +1168,6 @@ RgInfCmnBoRpt  *boRpt;
    Inst          inst = (pst->dstInst - SCH_INST_START);
    S16           cellSapId = boRpt->cellSapId;
 
-   TRC3(RgMacSchCmnBoUpdtReq)
 
    /* No need to chk for cell being NULL as MAC would not have found instance if
     * it doesnt exist */
@@ -1239,13 +1210,13 @@ RgInfCmnBoRpt  *boRpt;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchUeDelInd
+S16 RgMacSchUeDelInd
 (
 Pst*             pst,
 RgInfUeDelInd    *ueDelInd
 )
 #else
-PUBLIC S16 RgMacSchUeDelInd(pst, ueDelInd)
+S16 RgMacSchUeDelInd(pst, ueDelInd)
 Pst*             pst;
 RgInfUeDelInd    *ueDelInd;
 #endif
@@ -1256,8 +1227,6 @@ RgInfUeDelInd    *ueDelInd;
    CmLList           *tmp;
    RgSchRntiLnk      *rntiLnk=NULL;
    
-   TRC3(RgMacSchUeDelInd)
-
    if (rgSchCb[inst].rgrSap == NULLP || rgSchCb[inst].rgrSap[cellSapId].cell == NULLP)
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,ueDelInd->cellId,"rgrSap or cell is not configured");
@@ -1327,13 +1296,13 @@ RgInfUeDelInd    *ueDelInd;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchSfRecpInd
+S16 RgMacSchSfRecpInd
 (
 Pst*             pst,
 RgInfSfDatInd    *subfrmInfo
 )
 #else
-PUBLIC S16 RgMacSchSfRecpInd(pst, subfrmInfo)
+S16 RgMacSchSfRecpInd(pst, subfrmInfo)
 Pst*             pst;
 RgInfSfDatInd    *subfrmInfo;
 #endif
@@ -1365,7 +1334,6 @@ RgInfSfDatInd    *subfrmInfo;
    U16              diffBits = 0;
    U8               lcCount;
 #endif
-   TRC3(RgMacSchSfRecpInd)
 
    /* No need to chk for cell being NULL as MAC wouldn't have found instance if
     * it doesnt exist */
@@ -1603,13 +1571,13 @@ RgInfSfDatInd    *subfrmInfo;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchSpsRelInd
+S16 RgMacSchSpsRelInd
 (
 Pst                *pst, 
 RgInfSpsRelInfo    *relInfo
 )
 #else
-PUBLIC S16 RgMacSchSpsRelInd(pst, relInfo)
+S16 RgMacSchSpsRelInd(pst, relInfo)
 Pst                *pst;
 RgInfSpsRelInfo    *relInfo;
 #endif
@@ -1618,7 +1586,6 @@ RgInfSpsRelInfo    *relInfo;
    RgSchCellCb     *cell;
    Inst            inst = (pst->dstInst - SCH_INST_START);
 
-   TRC2(RgMacSchSpsRelInd);
 
    /* No need to chk for cell being NULL as MAC wouldn't have found instance if
     * it doesnt exist */
@@ -1664,13 +1631,13 @@ RgInfSpsRelInfo    *relInfo;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchL2MeasCfm
+S16 RgMacSchL2MeasCfm
 (
 Pst                *pst, 
 RgInfL2MeasCfm     *measCfm
 )
 #else
-PUBLIC S16 RgMacSchL2MeasCfm(pst, measCfm)
+S16 RgMacSchL2MeasCfm(pst, measCfm)
 Pst                *pst;
 RgInfL2MeasCfm     *measCfm;
 #endif
@@ -1685,7 +1652,6 @@ RgInfL2MeasCfm     *measCfm;
    U8                qciVal;
    U8                idx1; /*LTE_L2_MEAS_PHASE2*/ 
    U8                qciVal1;
-   TRC2(RgMacSchL2MeasCfm);
 
    /* Find the cellCb using cellId in measInfo. Iterate through all cells
     * in rgrsapCb in RgschCb */
@@ -1738,7 +1704,7 @@ RgInfL2MeasCfm     *measCfm;
       /* ccpu00117052 - MOD - Passing double pointer
          for proper NULLP assignment*/
       rgSCHUtlFreeSBuf(cell->instIdx, (Data **)&measCb, sizeof(RgSchL2MeasCb));
-      cmMemset((U8 *)&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo));
+      memset(&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo));
       schMeasCfm.measType     = measCfm->measType;
       schMeasCfm.cfm          = measCfm->cfm;
       schMeasCfm.hdr.transId  = measCfm->transId;
@@ -1791,13 +1757,13 @@ RgInfL2MeasCfm     *measCfm;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgMacSchL2MeasStopCfm
+S16 RgMacSchL2MeasStopCfm
 (
 Pst                *pst,
 RgInfL2MeasCfm     *measCfm
 )
 #else
-PUBLIC S16 RgMacSchL2MeasStopCfm(pst, measCfm)
+S16 RgMacSchL2MeasStopCfm(pst, measCfm)
 Pst                *pst;
 RgInfL2MeasCfm     *measCfm;
 #endif
@@ -1806,9 +1772,7 @@ RgInfL2MeasCfm     *measCfm;
    Inst              inst = (pst->dstInst - SCH_INST_START);
    RgSchCb           *instCb =  &rgSchCb[inst];
 
-   TRC2(RgMacSchL2MeasStopCfm);
-
-   cmMemset((U8 *)&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo));
+   memset(&schMeasCfm, 0, sizeof(LrgSchMeasCfmInfo));
    schMeasCfm.measType     = measCfm->measType;
    schMeasCfm.cfm          = measCfm->cfm;
    schMeasCfm.hdr.transId  = measCfm->transId;
@@ -1838,14 +1802,14 @@ RgInfL2MeasCfm     *measCfm;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuSchBndCfm 
+S16 RgLiTfuSchBndCfm 
 (
 Pst     *pst,
 SuId    suId, 
 U8      status
 )
 #else
-PUBLIC S16 RgLiTfuSchBndCfm(pst, suId, status)
+S16 RgLiTfuSchBndCfm(pst, suId, status)
 Pst     *pst; 
 SuId    suId; 
 U8      status;
@@ -1855,9 +1819,6 @@ U8      status;
    RgSchLowSapCb  *tfuSap;
    Inst  instId = pst->dstInst - SCH_INST_START;
 
-   TRC3(RgLiTfuSchBndCfm);
-
-
    if(suId >= rgSchCb[instId].numSaps)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Incorrect SuId");
@@ -1895,14 +1856,14 @@ U8      status;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuRaReqInd
+S16 RgLiTfuRaReqInd
 (
 Pst              *pst, 
 SuId             suId, 
 TfuRaReqIndInfo  *raReqInd
 )
 #else
-PUBLIC S16 RgLiTfuRaReqInd(pst, suId, raReqInd)
+S16 RgLiTfuRaReqInd(pst, suId, raReqInd)
 Pst              *pst; 
 SuId             suId; 
 TfuRaReqIndInfo  *raReqInd;
@@ -1911,8 +1872,6 @@ TfuRaReqIndInfo  *raReqInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuRaReqInd);
-
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
       RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"SAP Validation failed SuId(%d)", suId);
@@ -1959,14 +1918,14 @@ TfuRaReqIndInfo  *raReqInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuUlCqiInd
+S16 RgLiTfuUlCqiInd
 (
 Pst              *pst, 
 SuId             suId, 
 TfuUlCqiIndInfo  *ulCqiInd
 )
 #else
-PUBLIC S16 RgLiTfuUlCqiInd(pst, suId, ulCqiInd)
+S16 RgLiTfuUlCqiInd(pst, suId, ulCqiInd)
 Pst              *pst; 
 SuId             suId; 
 TfuUlCqiIndInfo  *ulCqiInd;
@@ -1975,8 +1934,6 @@ TfuUlCqiIndInfo  *ulCqiInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuUlCqiInd);
-
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed");
@@ -2016,14 +1973,14 @@ TfuUlCqiIndInfo  *ulCqiInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuPucchDeltaPwrInd
+S16 RgLiTfuPucchDeltaPwrInd
 (
 Pst                     *pst,
 SuId                    suId,
 TfuPucchDeltaPwrIndInfo *pucchDeltaPwr
 )
 #else
-PUBLIC S16 RgLiTfuPucchDeltaPwrInd(pst, suId, pucchDeltaPwr)
+S16 RgLiTfuPucchDeltaPwrInd(pst, suId, pucchDeltaPwr)
 Pst                     *pst;
 SuId                    suId;
 TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
@@ -2032,8 +1989,6 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuPucchDeltaPwrInd);
-
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed");
@@ -2074,14 +2029,14 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuHqInd
+S16 RgLiTfuHqInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuHqIndInfo       *harqAckInd
 )
 #else
-PUBLIC S16 RgLiTfuHqInd(pst, suId, harqAckInd)
+S16 RgLiTfuHqInd(pst, suId, harqAckInd)
 Pst                *pst; 
 SuId               suId; 
 TfuHqIndInfo       *harqAckInd;
@@ -2090,7 +2045,6 @@ TfuHqIndInfo       *harqAckInd;
    S16   ret;
    Inst  inst = (pst->dstInst - SCH_INST_START);
 
-   TRC3(RgLiTfuHqInd);
 
 #ifndef NO_ERRCLS
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
@@ -2134,14 +2088,14 @@ TfuHqIndInfo       *harqAckInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuSrInd
+S16 RgLiTfuSrInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuSrIndInfo       *srInd
 )
 #else 
-PUBLIC S16 RgLiTfuSrInd(pst, suId, srInd)
+S16 RgLiTfuSrInd(pst, suId, srInd)
 Pst                *pst; 
 SuId               suId; 
 TfuSrIndInfo       *srInd;
@@ -2150,8 +2104,6 @@ TfuSrIndInfo       *srInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuSrInd);
-
 #ifndef NO_ERRCLS
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
@@ -2193,14 +2145,14 @@ TfuSrIndInfo       *srInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuDlCqiInd
+S16 RgLiTfuDlCqiInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuDlCqiIndInfo    *dlCqiInd
 )
 #else
-PUBLIC S16 RgLiTfuDlCqiInd(pst, suId, dlCqiInd)
+S16 RgLiTfuDlCqiInd(pst, suId, dlCqiInd)
 Pst                *pst; 
 SuId               suId; 
 TfuDlCqiIndInfo    *dlCqiInd;
@@ -2209,8 +2161,6 @@ TfuDlCqiIndInfo    *dlCqiInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuDlCqiInd);
-
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed");
@@ -2250,14 +2200,14 @@ TfuDlCqiIndInfo    *dlCqiInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuRawCqiInd
+S16 RgLiTfuRawCqiInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuRawCqiIndInfo    *rawCqiInd
 )
 #else
-PUBLIC S16 RgLiTfuRawCqiInd(pst, suId, rawCqiInd)
+S16 RgLiTfuRawCqiInd(pst, suId, rawCqiInd)
 Pst                *pst; 
 SuId               suId; 
 TfuRawCqiIndInfo    *rawCqiInd;
@@ -2266,8 +2216,6 @@ TfuRawCqiIndInfo    *rawCqiInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuRawCqiInd);
-
 #ifdef NO_ERRCLS
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
@@ -2308,14 +2256,14 @@ TfuRawCqiIndInfo    *rawCqiInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuSrsInd
+S16 RgLiTfuSrsInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuSrsIndInfo    *srsInd
 )
 #else
-PUBLIC S16 RgLiTfuSrsInd(pst, suId, srsInd)
+S16 RgLiTfuSrsInd(pst, suId, srsInd)
 Pst                *pst; 
 SuId               suId; 
 TfuSrsIndInfo    *srsInd;
@@ -2324,8 +2272,6 @@ TfuSrsIndInfo    *srsInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuSrsInd);
-
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed");
@@ -2366,14 +2312,14 @@ TfuSrsIndInfo    *srsInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuDoaInd 
+S16 RgLiTfuDoaInd 
 (
 Pst                *pst, 
 SuId               suId, 
 TfuDoaIndInfo      *doaInd
 )
 #else
-PUBLIC S16 RgLiTfuDoaInd(pst, suId, doaInd)
+S16 RgLiTfuDoaInd(pst, suId, doaInd)
 Pst                *pst; 
 SuId               suId; 
 TfuDoaIndInfo      *doaInd;
@@ -2382,8 +2328,6 @@ TfuDoaIndInfo      *doaInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC2(RgLiTfuDoaInd);
-
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed");
@@ -2420,14 +2364,14 @@ TfuDoaIndInfo      *doaInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuCrcInd
+S16 RgLiTfuCrcInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuCrcIndInfo  *crcInd
 )
 #else
-PUBLIC S16 RgLiTfuCrcInd (pst, suId, crcInd)
+S16 RgLiTfuCrcInd (pst, suId, crcInd)
 Pst                *pst; 
 SuId               suId; 
 TfuCrcIndInfo  *crcInd;
@@ -2436,7 +2380,6 @@ TfuCrcIndInfo  *crcInd;
    S16              ret;
    Inst             inst      = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuCrcInd);
 #ifdef XEON_SPECIFIC_CHANGES
 struct timeval start6, end6;
 gettimeofday(&start6, NULL);
@@ -2484,14 +2427,14 @@ gettimeofday(&end6, NULL);
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuTimingAdvInd
+S16 RgLiTfuTimingAdvInd
 (
 Pst                  *pst, 
 SuId                 suId, 
 TfuTimingAdvIndInfo  *timingAdvInd
 )
 #else
-PUBLIC S16 RgLiTfuTimingAdvInd(pst, suId, timingAdvInd)
+S16 RgLiTfuTimingAdvInd(pst, suId, timingAdvInd)
 Pst                  *pst; 
 SuId                 suId; 
 TfuTimingAdvIndInfo  *timingAdvInd;
@@ -2500,8 +2443,6 @@ TfuTimingAdvIndInfo  *timingAdvInd;
    S16   ret;
    Inst  inst = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgLiTfuTimingAdvInd);
-
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {
       RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed");
@@ -2543,14 +2484,14 @@ TfuTimingAdvIndInfo  *timingAdvInd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgmBndReq
+S16 RgUiRgmBndReq
 (
 Pst   *pst, 
 SuId  suId,
 SpId  spId
 )
 #else
-PUBLIC S16 RgUiRgmBndReq(pst, suId, spId)
+S16 RgUiRgmBndReq(pst, suId, spId)
 Pst   *pst; 
 SuId  suId;
 SpId  spId;
@@ -2560,9 +2501,6 @@ SpId  spId;
    Pst       tmpPst;   /* Temporary Post Structure */
    Inst      instId = pst->dstInst-SCH_INST_START;
 
-   TRC3(RgUiRgmBndReq)
-   
-   
    tmpPst.prior       = pst->prior;
    tmpPst.route       = pst->route;
    tmpPst.selector    = pst->selector;
@@ -2644,22 +2582,20 @@ SpId  spId;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgmUbndReq
+S16 RgUiRgmUbndReq
 (
 Pst    *pst,
 SpId   spId,
 Reason reason
 )
 #else
-PUBLIC S16 RgUiRgmUbndReq(pst, spId, reason)
+S16 RgUiRgmUbndReq(pst, spId, reason)
 Pst    *pst; 
 SpId   spId;
 Reason reason;
 #endif
 {
    Inst instId = pst->dstInst-SCH_INST_START;
-   TRC3(RgUiRgmUbndReq)
-   
 
    /* SAP Id validation */
    if (spId < rgSchCb[instId].numSaps)
@@ -2713,14 +2649,14 @@ Reason reason;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgUiRgmCfgPrbRprt
+S16 RgUiRgmCfgPrbRprt
 (
 Pst   *pst, 
 SpId  spId,
 RgmPrbRprtCfg   *prbRprtCfg
 )
 #else
-PUBLIC S16 RgUiRgmCfgPrbRprt(pst, spId, prbRprtCfg)
+S16 RgUiRgmCfgPrbRprt(pst, spId, prbRprtCfg)
 Pst   *pst; 
 SpId  spId;
 RgmPrbRprtCfg   *prbRprtCfg;
@@ -2731,7 +2667,6 @@ RgmPrbRprtCfg   *prbRprtCfg;
    RgSchPrbUsage *prbUsage;
    Inst          inst = (pst->dstInst  - SCH_INST_START);
 
-   TRC2(RgUiRgmCfgPrbRprt);
    cell = rgSchCb[inst].rgmSap[spId].cell;
    prbUsage = &cell->prbUsage;
    prbUsage->prbRprtEnabld = prbRprtCfg->bConfigType;
@@ -2739,7 +2674,7 @@ RgmPrbRprtCfg   *prbRprtCfg;
    RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, prbUsage->startTime, 1);
 
    /* clear the qciPrbRpts for all GBR QCIs */
-   cmMemset((U8*)&prbUsage->qciPrbRpts[0], 0, 
+   memset(&prbUsage->qciPrbRpts[0], 0, 
              (RGM_MAX_QCI_REPORTS * sizeof(RgSchQciPrbUsage)));
 
    RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId,
@@ -2772,14 +2707,14 @@ RgmPrbRprtCfg   *prbRprtCfg;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuErrInd
+S16 RgLiTfuErrInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuErrIndInfo       *errInd
 )
 #else
-PUBLIC S16 RgLiTfuErrInd(pst, suId, errInd)
+S16 RgLiTfuErrInd(pst, suId, errInd)
 Pst                *pst; 
 SuId               suId; 
 TfuErrIndInfo       *errInd;
@@ -2790,8 +2725,6 @@ TfuErrIndInfo       *errInd;
    Inst  inst = (pst->dstInst - SCH_INST_START);
 #endif
 
-   TRC3(RgLiTfuErrInd);
-
 #ifndef NO_ERRCLS
    if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK)
    {