replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces...

[o-du/l2.git] / src / 5gnrsch / rg_sch_dbm.c

diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c
index eebf74c..863d1f0 100755 (executable)
--- a/src/5gnrsch/rg_sch_dbm.c
+++ b/src/5gnrsch/rg_sch_dbm.c
@@ -76,7 +76,7 @@ PRIVATE Void rgSCHDbmInitCrntRgrCfgLst ARGS(( RgSchCellCb *cellCb));
 PRIVATE Void rgSCHDbmInitPndngRgrCfgLst ARGS(( RgSchCellCb *cellCb));
 
 #ifdef EMTC_ENABLE
-PUBLIC  S16 rgSCHDbmPutEmtcRnti ARGS((RgSchCellCb *cellCb,RgSchRntiLnk *rntiLnk));
+ S16 rgSCHDbmPutEmtcRnti ARGS((RgSchCellCb *cellCb,RgSchRntiLnk *rntiLnk));
 #endif
 
 /* local typedefs */
@@ -101,19 +101,17 @@ PUBLIC  S16 rgSCHDbmPutEmtcRnti ARGS((RgSchCellCb *cellCb,RgSchRntiLnk *rntiLnk)
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmInitCell
+S16 rgSCHDbmInitCell
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgSCHDbmInitCell(cellCb)
+S16 rgSCHDbmInitCell(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
    S16 ret;
    
-   TRC2(rgSCHDbmInitCell);
-
    /* Initialize ue list */
    if ((ret = rgSCHDbmInitUeCbLst(cellCb, RGSCH_MAX_UE_BIN_PER_CELL)) != ROK)
       return (ret);
@@ -180,7 +178,6 @@ U16            numBins;
 #endif
 {
    RgSchUeCellInfo ueCellInfo;
-   TRC2(rgSCHDbmInitUeCbLst)
 
    /* Fix: syed It is better to compute offset dynamically
     * rather than hardcoding it as 0 */      
@@ -205,16 +202,15 @@ U16            numBins;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmDeInitUeCbLst
+S16 rgSCHDbmDeInitUeCbLst
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgSCHDbmDeInitUeCbLst(cellCb)
+S16 rgSCHDbmDeInitUeCbLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmDeInitUeCbLst)
 
    return (cmHashListDeinit(&cellCb->ueLst));
 
@@ -248,7 +244,6 @@ U16               numBins;
 #endif
 {
    RgSchUeCb ue;
-   TRC2(rgSCHDbmInitSpsUeCbLst)
 
    return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, 
                CM_HASH_KEYTYPE_CONID,
@@ -271,16 +266,15 @@ U16               numBins;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmDeInitSpsUeCbLst
+S16 rgSCHDbmDeInitSpsUeCbLst
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgSCHDbmDeInitSpsUeCbLst(cellCb)
+S16 rgSCHDbmDeInitSpsUeCbLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmDeInitSpsUeCbLst)
 
    return (cmHashListDeinit(&cellCb->spsUeLst));
 
@@ -303,19 +297,18 @@ RgSchCellCb       *cellCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmInsUeCb
+S16 rgSCHDbmInsUeCb
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgSCHDbmInsUeCb(cellCb, ueCb)
+S16 rgSCHDbmInsUeCb(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
-   TRC2(rgSCHDbmInsUeCb)
 
    ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]];
 
@@ -340,19 +333,17 @@ RgSchUeCb         *ueCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmInsSpsUeCb
+S16 rgSCHDbmInsSpsUeCb
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgSCHDbmInsSpsUeCb(cellCb, ueCb)
+S16 rgSCHDbmInsSpsUeCb(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
 {
-   TRC2(rgSCHDbmInsSpsUeCb)
-
    return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
       (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti)));
 
@@ -374,21 +365,19 @@ RgSchUeCb         *ueCb;
  *  @return  RgSchUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchUeCb* rgSCHDbmGetUeCb
+RgSchUeCb* rgSCHDbmGetUeCb
 (
 RgSchCellCb       *cellCb, 
 CmLteRnti      ueId
 )
 #else
-PUBLIC RgSchUeCb* rgSCHDbmGetUeCb(cellCb, ueId)
+RgSchUeCb* rgSCHDbmGetUeCb(cellCb, ueId)
 RgSchCellCb       *cellCb;
 CmLteRnti      ueId;
 #endif
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
 
-   TRC2(rgSCHDbmGetUeCb)
-
    cmHashListFind(&cellCb->ueLst, (U8 *)&ueId,
       sizeof(ueId), 0, (PTR *)&ueCellInfo);
 
@@ -410,21 +399,19 @@ CmLteRnti      ueId;
  *  @return  RgSchUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchUeCb* rgSCHDbmGetSpsUeCb
+RgSchUeCb* rgSCHDbmGetSpsUeCb
 (
 RgSchCellCb       *cellCb, 
 CmLteRnti         spsRnti
 )
 #else
-PUBLIC RgSchUeCb* rgSCHDbmGetSpsUeCb(cellCb, spsRnti)
+RgSchUeCb* rgSCHDbmGetSpsUeCb(cellCb, spsRnti)
 RgSchCellCb       *cellCb;
 CmLteRnti         spsRnti;
 #endif
 {
    RgSchUeCb *ueCb = NULLP; 
 
-   TRC2(rgSCHDbmGetSpsUeCb)
-
    cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti,
       sizeof(spsRnti), 0, (PTR *)&ueCb);
    return (ueCb);
@@ -445,13 +432,13 @@ CmLteRnti         spsRnti;
  *  @return  RgSchUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchUeCb* rgSCHDbmGetNextUeCb
+RgSchUeCb* rgSCHDbmGetNextUeCb
 (
 RgSchCellCb       *cellCb, 
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC RgSchUeCb* rgSCHDbmGetNextUeCb(cellCb, ueCb)
+RgSchUeCb* rgSCHDbmGetNextUeCb(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
@@ -459,8 +446,6 @@ RgSchUeCb         *ueCb;
    RgSchUeCellInfo *ueCellInfo = NULLP;
    RgSchUeCellInfo *nextUeCellInfo = NULLP;
 
-   TRC2(rgSCHDbmGetNextUeCb)
-
    if (ueCb)
    {
       ueCellInfo = ueCb->cellInfo[
@@ -486,21 +471,19 @@ RgSchUeCb         *ueCb;
  *  @return  RgSchUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchUeCb* rgSCHDbmGetNextSpsUeCb
+RgSchUeCb* rgSCHDbmGetNextSpsUeCb
 (
 RgSchCellCb       *cellCb, 
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC RgSchUeCb* rgSCHDbmGetNextSpsUeCb(cellCb, ueCb)
+RgSchUeCb* rgSCHDbmGetNextSpsUeCb(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
 {
    RgSchUeCb *nextUeCb = NULLP; 
 
-   TRC2(rgSCHDbmGetNextSpsUeCb)
-
    cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb);
    return (nextUeCb);
 }  /* end of rgSCHDbmGetNextSpsUeCb */
@@ -524,13 +507,13 @@ RgSchUeCb         *ueCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmDelL2MUe
+S16 rgSCHDbmDelL2MUe
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgSCHDbmDelL2MUe(cellCb, ueCb)
+S16 rgSCHDbmDelL2MUe(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
@@ -538,8 +521,6 @@ RgSchUeCb         *ueCb;
    U8 lcCnt = 0;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
 
-   TRC2(rgSCHDbmDelL2MUe)
-
    ueUl->hqEnt.numBusyHqProcs = 0;
    /* Clean cell level UE Active Count */
    for (lcCnt =0; lcCnt < RGSCH_MAX_LC_PER_UE; lcCnt++)
@@ -587,19 +568,18 @@ RgSchUeCb         *ueCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmDelUeCb
+S16 rgSCHDbmDelUeCb
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgSCHDbmDelUeCb(cellCb, ueCb)
+S16 rgSCHDbmDelUeCb(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
 {
    RgSchUeCellInfo *ueCellInfo = NULLP;
-   TRC2(rgSCHDbmDelUeCb)
 
    ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]];
 
@@ -623,18 +603,17 @@ RgSchUeCb         *ueCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmDelSpsUeCb
+S16 rgSCHDbmDelSpsUeCb
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgSCHDbmDelSpsUeCb(cellCb, ueCb)
+S16 rgSCHDbmDelSpsUeCb(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 #endif
 {
-   TRC2(rgSCHDbmDelSpsUeCb)
 
    return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
 }  /* end of rgSCHDbmDelSpsUeCb */
@@ -657,19 +636,17 @@ RgSchUeCb         *ueCb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmInitUe
+S16 rgSCHDbmInitUe
 (
 RgSchUeCb       *ueCb
 )
 #else
-PUBLIC S16 rgSCHDbmInitUe(ueCb)
+S16 rgSCHDbmInitUe(ueCb)
 RgSchUeCb       *ueCb;
 #endif
 {
    S16 ret = ROK;
    
-   TRC2(rgSCHDbmInitUe);
-
    /* Initialize Dedicated logical channels */
    rgSCHDbmInitDedLcLst(ueCb);
 
@@ -700,8 +677,6 @@ RgSchUeCb       *ueCb;
 {
    U8 idx;
    
-   TRC2(rgSCHDbmInitDedLcLst);
-
    for (idx = 0; idx < RGSCH_MAX_LC_PER_UE; ++idx)
    {
       /* Set Dedicated LCs as not configured */
@@ -742,8 +717,6 @@ RgSchCellCb       *cellCb;
 {
    U8 idx;
    
-   TRC2(rgSCHDbmInitCmnLcLst);
-
    for (idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++)
    {
       cellCb->cmnLcCb[idx].lcId = RGSCH_INVALID_LC_ID;
@@ -766,18 +739,17 @@ RgSchCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInsDlDedLcCb
+Void rgSCHDbmInsDlDedLcCb
 (
 RgSchUeCb         *ueCb, 
 RgSchDlLcCb       *dlLcCb 
 )
 #else
-PUBLIC Void rgSCHDbmInsDlDedLcCb(ueCb, dlLcCb)
+Void rgSCHDbmInsDlDedLcCb(ueCb, dlLcCb)
 RgSchUeCb         *ueCb; 
 RgSchDlLcCb       *dlLcCb; 
 #endif
 {
-   TRC2(rgSCHDbmInsDlDedLcCb);
 
    ueCb->dl.lcCb[dlLcCb->lcId - 1] = dlLcCb;
 
@@ -795,18 +767,17 @@ RgSchDlLcCb       *dlLcCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmDelDlDedLcCb
+Void rgSCHDbmDelDlDedLcCb
 (
 RgSchUeCb         *ueCb, 
 RgSchDlLcCb       *dlLcCb 
 )
 #else
-PUBLIC Void rgSCHDbmDelDlDedLcCb(ueCb, dlLcCb)
+Void rgSCHDbmDelDlDedLcCb(ueCb, dlLcCb)
 RgSchUeCb         *ueCb; 
 RgSchDlLcCb       *dlLcCb; 
 #endif
 {
-   TRC2(rgSCHDbmDelDlDedLcCb);
 
 #ifdef LTE_L2_MEAS
    /* Clean cell level UE Active Count */
@@ -845,19 +816,17 @@ RgSchDlLcCb       *dlLcCb;
  *  @return  RgSchDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchDlLcCb* rgSCHDbmGetDlDedLcCb
+RgSchDlLcCb* rgSCHDbmGetDlDedLcCb
 (
 RgSchUeCb         *ueCb, 
 CmLteLcId        idx
 )
 #else
-PUBLIC RgSchDlLcCb* rgSCHDbmGetDlDedLcCb(ueCb, idx)
+RgSchDlLcCb* rgSCHDbmGetDlDedLcCb(ueCb, idx)
 RgSchUeCb         *ueCb; 
 CmLteLcId        idx;
 #endif
 {
-   TRC2(rgSCHDbmGetDlDedLcCb);
-
    if (idx < RGSCH_DEDLC_MIN_LCID || idx > RGSCH_DEDLC_MAX_LCID)
    {
       return (NULLP);
@@ -879,17 +848,16 @@ CmLteLcId        idx;
  *  @return  RgSchDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb
+RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb
 (
 RgSchUeCb         *ueCb
 )
 #else
-PUBLIC RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb(ueCb)
+RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb(ueCb)
 RgSchUeCb         *ueCb; 
 #endif
 {
    U8 idx;
-   TRC2(rgSCHDbmGetFirstDlDedLcCb)
    
    for(idx = 0; idx < RGSCH_DEDLC_MAX_LCID; idx++)
    {
@@ -914,19 +882,18 @@ RgSchUeCb         *ueCb;
  *  @return  RgSchDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb
+RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb
 (
 RgSchUeCb         *ueCb,
 RgSchDlLcCb       *lcCb
 )
 #else
-PUBLIC RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb(ueCb, lcCb)
+RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb(ueCb, lcCb)
 RgSchUeCb         *ueCb; 
 RgSchDlLcCb       *lcCb;
 #endif
 {
    U8 idx;
-   TRC2(rgSCHDbmGetNextDlDedLcCb);
 
    if (!lcCb)
    {
@@ -957,21 +924,19 @@ RgSchDlLcCb       *lcCb;
  *  @return  RgSchClcDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb
+RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb
 (
 RgSchCellCb       *cellCb, 
 CmLteLcId         lcId
 )
 #else
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb(cellCb, lcId)
+RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb(cellCb, lcId)
 RgSchCellCb       *cellCb;
 CmLteLcId         lcId;
 #endif
 {
    U8 idx;
 
-   TRC2(rgSCHDbmGetCmnLcCb)
-
    for(idx = 0; idx < RGSCH_MAX_CMN_LC_CB; idx++)
    {
       if(cellCb->cmnLcCb[idx].lcId == lcId)
@@ -995,16 +960,15 @@ CmLteLcId         lcId;
  *  @return  RgSchClcDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch
+RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch
 (
 RgSchCellCb       *cellCb 
 )
 #else
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch(cellCb)
+RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmGetBcchOnBch)
  
    if(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId != RGSCH_INVALID_LC_ID)
    {
@@ -1026,16 +990,15 @@ RgSchCellCb       *cellCb;
  *  @return  RgSchClcDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch
+RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch(cellCb)
+RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmGetFirstBcchOnDlsch)
 
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId != RGSCH_INVALID_LC_ID)
    {
@@ -1057,16 +1020,15 @@ RgSchCellCb       *cellCb;
  *  @return  RgSchClcDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch
+RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch(cellCb)
+RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmGetSecondBcchOnDlsch)
 
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2].lcId != RGSCH_INVALID_LC_ID)
    {
@@ -1087,16 +1049,15 @@ RgSchCellCb       *cellCb;
  *  @return  RgSchClcDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetPcch
+RgSchClcDlLcCb* rgSCHDbmGetPcch
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC RgSchClcDlLcCb* rgSCHDbmGetPcch(cellCb)
+RgSchClcDlLcCb* rgSCHDbmGetPcch(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmGetPcch)
  
    if(cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId != RGSCH_INVALID_LC_ID)
    {
@@ -1118,18 +1079,17 @@ RgSchCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInsBcchOnBch
+Void rgSCHDbmInsBcchOnBch
 (
 RgSchCellCb       *cellCb, 
 RgSchClcDlLcCb   *cmnDlLcCb
 )
 #else
-PUBLIC Void rgSCHDbmInsBcchOnBch(cellCb, cmnDlLcCb)
+Void rgSCHDbmInsBcchOnBch(cellCb, cmnDlLcCb)
 RgSchCellCb       *cellCb;
 RgSchClcDlLcCb   *cmnDlLcCb;
 #endif
 {
-   TRC2(rgSCHDbmInsBcchOnBch)
 
    cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId = cmnDlLcCb->lcId;
    cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].boLst = cmnDlLcCb->boLst;
@@ -1152,19 +1112,17 @@ RgSchClcDlLcCb   *cmnDlLcCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInsBcchOnDlsch
+Void rgSCHDbmInsBcchOnDlsch
 (
 RgSchCellCb       *cellCb, 
 RgSchClcDlLcCb   *cmnDlLcCb
 )
 #else
-PUBLIC Void rgSCHDbmInsBcchOnDlsch(cellCb, cmnDlLcCb)
+Void rgSCHDbmInsBcchOnDlsch(cellCb, cmnDlLcCb)
 RgSchCellCb       *cellCb;
 RgSchClcDlLcCb   *cmnDlLcCb;
 #endif
 {
-   TRC2(rgSCHDbmInsBcchOnDlsch)
-
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId == RGSCH_INVALID_LC_ID)   
    { 
       cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId = cmnDlLcCb->lcId;
@@ -1196,18 +1154,17 @@ RgSchClcDlLcCb   *cmnDlLcCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInsPcch
+Void rgSCHDbmInsPcch
 (
 RgSchCellCb       *cellCb, 
 RgSchClcDlLcCb   *cmnDlLcCb
 )
 #else
-PUBLIC Void rgSCHDbmInsPcch(cellCb, cmnDlLcCb)
+Void rgSCHDbmInsPcch(cellCb, cmnDlLcCb)
 RgSchCellCb       *cellCb;
 RgSchClcDlLcCb   *cmnDlLcCb;
 #endif
 {
-   TRC2(rgSCHDbmInsPcch)
 
    cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId = cmnDlLcCb->lcId;
    cellCb->cmnLcCb[RGSCH_PCCH_IDX].boLst = cmnDlLcCb->boLst;
@@ -1229,16 +1186,15 @@ RgSchClcDlLcCb   *cmnDlLcCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInitCmnLcBoLst
+Void rgSCHDbmInitCmnLcBoLst
 (
 RgSchClcDlLcCb       *cmnDlLcCb
 )
 #else
-PUBLIC Void rgSCHDbmInitCmnLcBoLst(cmnDlLcCb)
+Void rgSCHDbmInitCmnLcBoLst(cmnDlLcCb)
 RgSchClcDlLcCb       *cmnDlLcCb;
 #endif
 {
-   TRC2(rgSCHDbmInitCmnLcBoLst)
 
    cmLListInit(&cmnDlLcCb->boLst);
    RETVOID;
@@ -1257,19 +1213,17 @@ RgSchClcDlLcCb       *cmnDlLcCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInsCmnLcBoRpt
+Void rgSCHDbmInsCmnLcBoRpt
 (
 RgSchClcDlLcCb    *cmnDlLcCb,
 RgSchClcBoRpt     *cmnBoRpt
 )
 #else
-PUBLIC Void rgSCHDbmInsCmnLcBoRpt(cmnDlLcCb, cmnBoRpt)
+Void rgSCHDbmInsCmnLcBoRpt(cmnDlLcCb, cmnBoRpt)
 RgSchClcDlLcCb    *cmnDlLcCb;
 RgSchClcBoRpt     *cmnBoRpt;
 #endif
 {
-   TRC2(rgSCHDbmInsCmnLcBoRpt)
-
    cmnBoRpt->boLstEnt.next = NULLP;
    cmnBoRpt->boLstEnt.prev = NULLP;
    cmnBoRpt->boLstEnt.node = (PTR)cmnBoRpt;
@@ -1299,7 +1253,6 @@ PRIVATE Void rgSCHDbmInitRaCbLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmInitRaCbLst)
 
    cmLListInit(&cellCb->raInfo.raCbLst);
    RETVOID;
@@ -1319,21 +1272,19 @@ RgSchCellCb       *cellCb;
  *  @return  RgSchRaCb*
  **/
 #ifdef ANSI
-PUBLIC RgSchRaCb* rgSCHDbmGetRaCb
+RgSchRaCb* rgSCHDbmGetRaCb
 (
 RgSchCellCb       *cellCb, 
 CmLteRnti      key
 )
 #else
-PUBLIC RgSchRaCb* rgSCHDbmGetRaCb(cellCb, key)
+RgSchRaCb* rgSCHDbmGetRaCb(cellCb, key)
 RgSchCellCb       *cellCb; 
 CmLteRnti      key;
 #endif
 {
    CmLList *tmpNode;
 
-   TRC2(rgSCHDbmGetRaCb)
-
    CM_LLIST_FIRST_NODE(&cellCb->raInfo.raCbLst,tmpNode);
    while(tmpNode)
    {
@@ -1370,8 +1321,6 @@ RgSchCellCb       *cellCb;
 {
    U8 idx;
 
-   TRC2(rgSCHDbmInitRaReqLst)
-
    /* ccpu00133557- Memory Leak Fix- initializing for the all nodes 
     * in RAREQ list*/
    for(idx = 0; idx < RGSCH_RAREQ_ARRAY_SIZE; idx++)
@@ -1403,7 +1352,6 @@ PRIVATE Void rgSCHDbmInitCrntRgrCfgLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmInitCrntRgrCfgLst)
 
    cmLListInit(&cellCb->rgCfgInfo.crntRgrCfgLst);
    RETVOID;
@@ -1430,7 +1378,6 @@ PRIVATE Void rgSCHDbmInitPndngRgrCfgLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmInitPndngRgrCfgLst)
 
    cmLListInit(&cellCb->rgCfgInfo.pndngRgrCfgLst);
    RETVOID;
@@ -1449,19 +1396,17 @@ RgSchCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInsCrntRgrCfgElem
+Void rgSCHDbmInsCrntRgrCfgElem
 (
 RgSchCellCb       *cellCb,
 RgSchCfgElem      *cfgElem
 )
 #else
-PUBLIC Void rgSCHDbmInsCrntRgrCfgElem(cellCb, cfgElem)
+Void rgSCHDbmInsCrntRgrCfgElem(cellCb, cfgElem)
 RgSchCellCb       *cellCb;
 RgSchCfgElem      *cfgElem;
 #endif
 {
-   TRC2(rgSCHDbmInsCrntRgrCfgElem)
-
    cfgElem->cfgReqLstEnt.next = NULLP;
    cfgElem->cfgReqLstEnt.prev = NULLP;
    cmLListAdd2Tail(&cellCb->rgCfgInfo.crntRgrCfgLst, &cfgElem->cfgReqLstEnt);
@@ -1481,18 +1426,17 @@ RgSchCfgElem      *cfgElem;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmInsPndngRgrCfgElem
+Void rgSCHDbmInsPndngRgrCfgElem
 (
 RgSchCellCb       *cellCb,
 RgSchCfgElem      *cfgElem
 )
 #else
-PUBLIC Void rgSCHDbmInsPndngRgrCfgElem(cellCb, cfgElem)
+Void rgSCHDbmInsPndngRgrCfgElem(cellCb, cfgElem)
 RgSchCellCb       *cellCb;
 RgSchCfgElem      *cfgElem;
 #endif
 {
-   TRC2(rgSCHDbmInsPndngRgrCfgElem)
 
    cfgElem->cfgReqLstEnt.next = NULLP;
    cfgElem->cfgReqLstEnt.prev = NULLP;
@@ -1514,18 +1458,17 @@ RgSchCfgElem      *cfgElem;
  *  @return  RgSchCfgElem*
  **/
 #ifdef ANSI
-PUBLIC RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem
+RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem
 (
 RgSchCellCb       *cellCb,
 RgSchCfgElem      *cfgElem
 )
 #else
-PUBLIC RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem(cellCb, cfgElem)
+RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem(cellCb, cfgElem)
 RgSchCellCb       *cellCb; 
 RgSchCfgElem      *cfgElem;
 #endif
 {
-   TRC2(rgSCHDbmGetNextCrntRgrCfgElem)
 
    if(!cfgElem)
    {
@@ -1549,18 +1492,17 @@ RgSchCfgElem      *cfgElem;
  *  @return  RgSchCfgElem*
  **/
 #ifdef ANSI
-PUBLIC RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem
+RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem
 (
 RgSchCellCb       *cellCb,
 RgSchCfgElem      *cfgElem
 )
 #else
-PUBLIC RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem(cellCb, cfgElem)
+RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem(cellCb, cfgElem)
 RgSchCellCb       *cellCb; 
 RgSchCfgElem      *cfgElem;
 #endif
 {
-   TRC2(rgSCHDbmGetNextPndngRgrCfgElem)
 
    if(!cfgElem)
    {
@@ -1584,21 +1526,19 @@ RgSchCfgElem      *cfgElem;
  *  @return  RgSchCfgElem*
  **/
 #ifdef ANSI
-PUBLIC RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey
+RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey
 (
 RgSchCellCb          *cellCb,
 CmLteTimingInfo   key
 )
 #else
-PUBLIC RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey(cellCb, key)
+RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey(cellCb, key)
 RgSchCellCb          *cellCb;
 CmLteTimingInfo   key;
 #endif
 {
    CmLList  *tmpNode;
 
-   TRC2(rgSCHDbmGetPndngRgrCfgElemByKey)
-
    CM_LLIST_FIRST_NODE(&cellCb->rgCfgInfo.pndngRgrCfgLst,tmpNode);
    while(tmpNode)
    {
@@ -1625,18 +1565,17 @@ CmLteTimingInfo   key;
  *  @return  RgSchCfgElem*
  **/
 #ifdef ANSI
-PUBLIC RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem
+RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem
 (
 RgSchCellCb       *cellCb,
 RgSchCfgElem      *cfgElem
 )
 #else
-PUBLIC RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem(cellCb, cfgElem)
+RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem(cellCb, cfgElem)
 RgSchCellCb       *cellCb;
 RgSchCfgElem      *cfgElem;
 #endif
 {
-   TRC2(rgSCHDbmDelCrntRgrCfgElem)
 
    if(cmLListDelFrm(&cellCb->rgCfgInfo.crntRgrCfgLst,&cfgElem->cfgReqLstEnt))
    {
@@ -1658,19 +1597,17 @@ RgSchCfgElem      *cfgElem;
  *  @return  RgSchCfgElem*
  **/
 #ifdef ANSI
-PUBLIC RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem
+RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem
 (
 RgSchCellCb       *cellCb,
 RgSchCfgElem      *cfgElem
 )
 #else
-PUBLIC RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem(cellCb, cfgElem)
+RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem(cellCb, cfgElem)
 RgSchCellCb       *cellCb;
 RgSchCfgElem      *cfgElem;
 #endif
 {
-   TRC2(rgSCHDbmDelPndngRgrCfgElem)
-
    if(cmLListDelFrm(&cellCb->rgCfgInfo.pndngRgrCfgLst,&cfgElem->cfgReqLstEnt))
    {
       return ((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node));
@@ -1694,14 +1631,14 @@ RgSchCfgElem      *cfgElem;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmRntiDbInit
+S16 rgSCHDbmRntiDbInit
 (
 RgSchCellCb       *cellCb,
 U16            rntiStart,
 U16            maxRntis
 )
 #else
-PUBLIC S16 rgSCHDbmRntiDbInit(cellCb, rntiStart, maxRntis)
+S16 rgSCHDbmRntiDbInit(cellCb, rntiStart, maxRntis)
 RgSchCellCb       *cellCb;
 U16            rntiStart;
 U16            maxRntis;
@@ -1710,9 +1647,7 @@ U16            maxRntis;
    U16 rnti;
    RgSchRntiLnk   *rntiPool;
 
-   TRC2(rgSCHDbmRntiDbInit)
-
-      /* Fix for Change Request ccpu00099150 */
+   /* Fix for Change Request ccpu00099150 */
    if(rgSCHUtlAllocSBuf(cellCb->instIdx, 
        (Data **)&cellCb->rntiDb.rntiPool,maxRntis*sizeof(RgSchRntiLnk)) != ROK)
    {
@@ -1765,17 +1700,15 @@ U16            maxRntis;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmRntiDbDeInit
+Void rgSCHDbmRntiDbDeInit
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC Void rgSCHDbmRntiDbDeInit(cellCb)
+Void rgSCHDbmRntiDbDeInit(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmRntiDbDeInit)
-
    /* ccpu00117052 - MOD - Passing double pointer
    for proper NULLP assignment*/
    rgSCHUtlFreeSBuf(cellCb->instIdx, (Data **)(&(cellCb->rntiDb.rntiPool)),
@@ -1802,19 +1735,17 @@ RgSchCellCb       *cellCb;
  *  @return  RgSchRntiLnk*
  **/
 #ifdef ANSI
-PUBLIC RgSchRntiLnk* rgSCHDbmGetRnti
+RgSchRntiLnk* rgSCHDbmGetRnti
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC RgSchRntiLnk* rgSCHDbmGetRnti(cellCb)
+RgSchRntiLnk* rgSCHDbmGetRnti(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
    RgSchRntiLnk *rntiLnk;
 
-   TRC2(rgSCHDbmGetRnti)
-
    if (!(cellCb->rntiDb.freeRnti))
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI exhausted count:%d",
@@ -1857,18 +1788,17 @@ RgSchCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHDbmRlsRnti
+Void rgSCHDbmRlsRnti
 (
 RgSchCellCb       *cellCb,
 RgSchRntiLnk      *rntiLnk
 )
 #else
-PUBLIC Void rgSCHDbmRlsRnti(cellCb, rntiLnk)
+Void rgSCHDbmRlsRnti(cellCb, rntiLnk)
 RgSchCellCb       *cellCb;
 RgSchRntiLnk      *rntiLnk;
 #endif
 {
-   TRC2(rgSCHDbmRlsRnti)
 #ifdef EMTC_ENABLE
       if(ROK==rgSCHDbmPutEmtcRnti(cellCb,rntiLnk))
 {      
@@ -1923,7 +1853,6 @@ U16            numBins;
 #endif
 {
    RgSchUePucchRecpInfo pucchInfo;
-   TRC2(rgSCHDbmInitUeTfuPendLst)
 
    /* Fix: syed It is better to compute offset dynamically
     * rather than hardcoding it as 0 */      
@@ -1953,16 +1882,15 @@ U16            numBins;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHDbmDeInitUeTfuPendLst
+S16 rgSCHDbmDeInitUeTfuPendLst
 (
 RgSchCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgSCHDbmDeInitUeTfuPendLst(cellCb)
+S16 rgSCHDbmDeInitUeTfuPendLst(cellCb)
 RgSchCellCb       *cellCb;
 #endif
 {
-   TRC2(rgSCHDbmDeInitUeTfuPendLst)
 
    cmHashListDeinit(&cellCb->ueTfuPendLst);