X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_dbm.c;h=da8d94586162369099521e80fefd8f8277f8eda1;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=505f9da1ce951f6d7eab2274000dab59d8cf1a6b;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c
index 505f9da1c..da8d94586 100755
--- a/src/5gnrmac/rg_dbm.c
+++ b/src/5gnrmac/rg_dbm.c
@@ -53,14 +53,14 @@
 #include "rg.x"
 
 /* local defines */
-PRIVATE S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, U16 numBins));
-PRIVATE Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb));
-PRIVATE Void rgDBMInitCmnLcLst ARGS((RgCellCb *cellCb));
-PRIVATE Void rgDBMInitRachLst ARGS((RgCellCb *cellCb));
+static S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, uint16_t numBins));
+static Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb));
+static Void rgDBMInitCmnLcLst ARGS((RgCellCb *cellCb));
+static Void rgDBMInitRachLst ARGS((RgCellCb *cellCb));
 #ifdef LTEMAC_SPS
-PRIVATE S16 rgDBMInitSpsUeCbLst ARGS((
+static S16 rgDBMInitSpsUeCbLst ARGS((
 RgCellCb       *cellCb,
-U16            numBins
+uint16_t       numBins
 ));
 #endif
 
@@ -86,19 +86,17 @@ U16            numBins
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMInitCell
+S16 rgDBMInitCell
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgDBMInitCell(cellCb)
+S16 rgDBMInitCell(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
    S16 ret;
    
-   TRC2(rgDBMInitCell);
-
    /* Initialize ue list */
    if ((ret = rgDBMInitUeCbLst(cellCb, RG_MAX_UE_BIN_PER_CELL)) != ROK)
       return (ret);
@@ -135,22 +133,21 @@ RgCellCb       *cellCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgDBMInitUeCbLst
+static S16 rgDBMInitUeCbLst
 (
 RgCellCb       *cellCb,
-U16            numBins
+uint16_t       numBins
 )
 #else
-PRIVATE S16 rgDBMInitUeCbLst(cellCb, numBins)
+static S16 rgDBMInitUeCbLst(cellCb, numBins)
 RgCellCb       *cellCb;
-U16            numBins;
+uint16_t       numBins;
 #endif
 {
    Inst inst = cellCb->macInst - RG_INST_START;
    RgUeCb ue;  
-   TRC2(rgDBMInitUeCbLst)
 
-   return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, 
+   return (cmHashListInit(&cellCb->ueLst, numBins, (uint16_t)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, 
                CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool));
 
 }  /* rgDBMInitUeCbLst */
@@ -169,16 +166,15 @@ U16            numBins;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMDeInitUeCbLst
+S16 rgDBMDeInitUeCbLst
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgDBMDeInitUeCbLst(cellCb)
+S16 rgDBMDeInitUeCbLst(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMDeInitUeCbLst)
 
    return (cmHashListDeinit(&cellCb->ueLst));
 
@@ -200,22 +196,21 @@ RgCellCb       *cellCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgDBMInitSpsUeCbLst
+static S16 rgDBMInitSpsUeCbLst
 (
 RgCellCb       *cellCb,
-U16            numBins
+uint16_t       numBins
 )
 #else
-PRIVATE S16 rgDBMInitSpsUeCbLst(cellCb, numBins)
+static S16 rgDBMInitSpsUeCbLst(cellCb, numBins)
 RgCellCb       *cellCb;
-U16            numBins;
+uint16_t       numBins;
 #endif
 {
    Inst inst = cellCb->macInst - RG_INST_START;
    RgUeCb ue;
-   TRC2(rgDBMInitSpsUeCbLst)
 
-   return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, 
+   return (cmHashListInit(&cellCb->spsUeLst, numBins, (uint16_t) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, 
                CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool));
 
 }  /* rgDBMInitSpsUeCbLst */
@@ -234,16 +229,15 @@ U16            numBins;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMDeInitSpsUeCbLst
+S16 rgDBMDeInitSpsUeCbLst
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgDBMDeInitSpsUeCbLst(cellCb)
+S16 rgDBMDeInitSpsUeCbLst(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMDeInitSpsUeCbLst)
 
    return (cmHashListDeinit(&cellCb->spsUeLst));
 
@@ -266,21 +260,19 @@ RgCellCb       *cellCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMInsUeCb
+S16 rgDBMInsUeCb
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgDBMInsUeCb(cellCb, ueCb)
+S16 rgDBMInsUeCb(cellCb, ueCb)
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMInsUeCb)
-
    return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, 
-      (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId)));
+      (uint8_t *)&ueCb->ueId, (uint16_t)sizeof(ueCb->ueId)));
 
 }  /* rgDBMInsUeCb */
 
@@ -300,21 +292,20 @@ RgUeCb         *ueCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMInsSpsUeCb
+S16 rgDBMInsSpsUeCb
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgDBMInsSpsUeCb(cellCb, ueCb)
+S16 rgDBMInsSpsUeCb(cellCb, ueCb)
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMInsSpsUeCb)
 
    return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
-      (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti)));
+      (uint8_t *)&ueCb->spsRnti, (uint16_t)sizeof(ueCb->spsRnti)));
 
 }  /* end of rgDBMInsSpsUeCb */
 
@@ -334,22 +325,20 @@ RgUeCb         *ueCb;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgUeCb* rgDBMGetUeCb
+RgUeCb* rgDBMGetUeCb
 (
 RgCellCb       *cellCb, 
 CmLteRnti      ueId
 )
 #else
-PUBLIC RgUeCb* rgDBMGetUeCb(cellCb, ueId)
+RgUeCb* rgDBMGetUeCb(cellCb, ueId)
 RgCellCb       *cellCb;
 CmLteRnti      ueId;
 #endif
 {
    RgUeCb *ueCb = NULLP; 
 
-   TRC2(rgDBMGetUeCb)
-
-   cmHashListFind(&cellCb->ueLst, (U8 *)&ueId,
+   cmHashListFind(&cellCb->ueLst, (uint8_t *)&ueId,
       sizeof(ueId), 0, (PTR *)&ueCb);
    return (ueCb);
 }  /* rgDBMGetUeCb */
@@ -369,22 +358,20 @@ CmLteRnti      ueId;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgUeCb* rgDBMGetSpsUeCb
+RgUeCb* rgDBMGetSpsUeCb
 (
 RgCellCb       *cellCb, 
 CmLteRnti      spsRnti
 )
 #else
-PUBLIC RgUeCb* rgDBMGetSpsUeCb(cellCb, spsRnti)
+RgUeCb* rgDBMGetSpsUeCb(cellCb, spsRnti)
 RgCellCb       *cellCb;
 CmLteRnti      spsRnti;
 #endif
 {
    RgUeCb *ueCb = NULLP; 
 
-   TRC2(rgDBMGetSpsUeCb)
-
-   cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti,
+   cmHashListFind(&cellCb->spsUeLst, (uint8_t *)&spsRnti,
       sizeof(spsRnti), 0, (PTR *)&ueCb);
    return (ueCb);
 }  /* rgDBMGetSpsUeCb */
@@ -405,21 +392,19 @@ CmLteRnti      spsRnti;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgUeCb* rgDBMGetNextUeCb
+RgUeCb* rgDBMGetNextUeCb
 (
 RgCellCb       *cellCb, 
 RgUeCb         *ueCb
 )
 #else
-PUBLIC RgUeCb* rgDBMGetNextUeCb(cellCb, ueCb)
+RgUeCb* rgDBMGetNextUeCb(cellCb, ueCb)
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
    RgUeCb *nextUeCb = NULLP; 
 
-   TRC2(rgDBMGetNextUeCb)
-
    cmHashListGetNext(&cellCb->ueLst, (PTR) ueCb, (PTR *)&nextUeCb);
    return (nextUeCb);
 }  /* rgDBMGetNextUeCb */
@@ -439,21 +424,19 @@ RgUeCb         *ueCb;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgUeCb* rgDBMGetNextSpsUeCb
+RgUeCb* rgDBMGetNextSpsUeCb
 (
 RgCellCb       *cellCb, 
 RgUeCb         *ueCb
 )
 #else
-PUBLIC RgUeCb* rgDBMGetNextSpsUeCb(cellCb, ueCb)
+RgUeCb* rgDBMGetNextSpsUeCb(cellCb, ueCb)
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
    RgUeCb *nextUeCb = NULLP; 
 
-   TRC2(rgDBMGetNextSpsUeCb)
-
    cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb);
    return (nextUeCb);
 }  /* end of rgDBMGetNextSpsUeCb */
@@ -477,19 +460,17 @@ RgUeCb         *ueCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMDelUeCb
+S16 rgDBMDelUeCb
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgDBMDelUeCb(cellCb, ueCb)
+S16 rgDBMDelUeCb(cellCb, ueCb)
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMDelUeCb)
-
    return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCb));
 }  /* rgDBMDelUeCb */
 
@@ -510,18 +491,17 @@ RgUeCb         *ueCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMDelSpsUeCb
+S16 rgDBMDelSpsUeCb
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb
 )
 #else
-PUBLIC S16 rgDBMDelSpsUeCb(cellCb, ueCb)
+S16 rgDBMDelSpsUeCb(cellCb, ueCb)
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMDelSpsUeCb)
 
    return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
 }  /* end of rgDBMDelSpsUeCb */
@@ -544,21 +524,19 @@ RgUeCb         *ueCb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMInitUe
+Void rgDBMInitUe
 (
 RgUeCb       *ueCb
 )
 #else
-PUBLIC Void rgDBMInitUe(ueCb)
+Void rgDBMInitUe(ueCb)
 RgUeCb       *ueCb;
 #endif
 {
 #ifdef LTEMAC_SPS
-   U8        idx;
+   uint8_t        idx;
 #endif
 
-   TRC2(rgDBMInitUe);
-
    /* Initialize Dedicated logical channels */
    rgDBMInitDedLcLst(ueCb);
 
@@ -571,7 +549,7 @@ RgUeCb       *ueCb;
 #endif
 
 
-   RETVOID;
+   return;
 } /* rgDBMInitUe */
 
 /**
@@ -587,19 +565,17 @@ RgUeCb       *ueCb;
  *  @return     Void 
  **/
 #ifdef ANSI
-PRIVATE Void rgDBMInitDedLcLst
+static Void rgDBMInitDedLcLst
 (
 RgUeCb       *ueCb
 )
 #else
-PRIVATE Void rgDBMInitDedLcLst(ueCb)
+static Void rgDBMInitDedLcLst(ueCb)
 RgUeCb       *ueCb;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
    
-   TRC2(rgDBMInitDedLcLst);
-
    for (idx = 0; idx < RG_MAX_LC_PER_UE; ++idx)
    {
       /* Set Dedicated LCs as not configured */
@@ -616,7 +592,7 @@ RgUeCb       *ueCb;
    }
 
    /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 } /* rgDBMInitDedLcLst */
 
 /**
@@ -635,18 +611,16 @@ RgUeCb       *ueCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PRIVATE Void rgDBMInitCmnLcLst
+static Void rgDBMInitCmnLcLst
 (
 RgCellCb       *cellCb
 )
 #else
-PRIVATE Void rgDBMInitCmnLcLst(cellCb)
+static Void rgDBMInitCmnLcLst(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   U8 idx;
-   
-   TRC2(rgDBMInitCmnLcLst);
+   uint8_t idx;
    
    cellCb->bcchBchInfo.lcId = RG_INVALID_LC_ID;
    cellCb->pcchInfo.lcId = RG_INVALID_LC_ID;
@@ -659,7 +633,7 @@ RgCellCb       *cellCb;
    }
 
    /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 } /* rgDBMInitCmnLcLst */
 
 /**
@@ -678,18 +652,16 @@ RgCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMFreeCmnLcLst
+Void rgDBMFreeCmnLcLst
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC Void rgDBMFreeCmnLcLst(cellCb)
+Void rgDBMFreeCmnLcLst(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   U8 idx;
-   
-   TRC2(rgDBMFreeCmnLcLst);
+   uint8_t idx;
    
    cellCb->bcchBchInfo.lcId = RG_INVALID_LC_ID;
    cellCb->pcchInfo.lcId = RG_INVALID_LC_ID;
@@ -702,7 +674,7 @@ RgCellCb       *cellCb;
    cellCb->numBcchDlschInfo = 0;
 
    /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 } /* rgDBMFreeCmnLcLst */
 
 /**
@@ -717,24 +689,23 @@ RgCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMInsDlDedLcCb
+Void rgDBMInsDlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId        idx
 )
 #else
-PUBLIC Void rgDBMInsDlDedLcCb(ueCb, idx)
+Void rgDBMInsDlDedLcCb(ueCb, idx)
 RgUeCb         *ueCb; 
 CmLteLcId        idx;
 #endif
 {
-   TRC2(rgDBMInsDlDedLcCb);
    if( idx >= RG_DEDLC_MIN_LCID )
    {
       ueCb->dl.lcCb[idx-1].lcId = idx;
    }
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 }  /* rgDBMInsDlDedLcCb */
 
 /**
@@ -749,23 +720,21 @@ CmLteLcId        idx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMDelDlDedLcCb
+Void rgDBMDelDlDedLcCb
 (
 RgUeCb         *ueCb, 
 RgDlLcCb       *dlLcCb 
 )
 #else
-PUBLIC Void rgDBMDelDlDedLcCb(ueCb, dlLcCb)
+Void rgDBMDelDlDedLcCb(ueCb, dlLcCb)
 RgUeCb         *ueCb; 
 RgDlLcCb       *dlLcCb; 
 #endif
 {
-   TRC2(rgDBMDelDlDedLcCb);
-
    ueCb->dl.lcCb[dlLcCb->lcId - 1].lcId = RG_INVALID_LC_ID;
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
   
 }  /* rgDBMDelDlDedLcCb */
 
@@ -782,19 +751,17 @@ RgDlLcCb       *dlLcCb;
  *  @return  RgDlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgDlLcCb* rgDBMGetDlDedLcCb
+RgDlLcCb* rgDBMGetDlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId        idx
 )
 #else
-PUBLIC RgDlLcCb* rgDBMGetDlDedLcCb(ueCb, idx)
+RgDlLcCb* rgDBMGetDlDedLcCb(ueCb, idx)
 RgUeCb         *ueCb; 
 CmLteLcId        idx;
 #endif
 {
-   TRC2(rgDBMGetDlDedLcCb);
-
    if (idx > RG_DEDLC_MAX_LCID || idx <= 0)
    {
       return (NULLP);
@@ -823,37 +790,36 @@ CmLteLcId        idx;
  **/
 #ifdef LTE_L2_MEAS
 #ifdef ANSI
-PUBLIC Void rgDBMInsUlDedLcCb
+Void rgDBMInsUlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId      idx,
 LteLcgId       gId,
-U8             qci
+uint8_t             qci
 )
 #else
-PUBLIC Void rgDBMInsUlDedLcCb(ueCb, idx, gId, qci)
+Void rgDBMInsUlDedLcCb(ueCb, idx, gId, qci)
 RgUeCb         *ueCb; 
 CmLteLcId      idx;
 LteLcgId       gId;
-U8             qci;
+uint8_t             qci;
 #endif
 #else
 #ifdef ANSI
-PUBLIC Void rgDBMInsUlDedLcCb
+Void rgDBMInsUlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId      idx,
 LteLcgId       gId
 )
 #else
-PUBLIC Void rgDBMInsUlDedLcCb(ueCb, idx, gId)
+Void rgDBMInsUlDedLcCb(ueCb, idx, gId)
 RgUeCb         *ueCb; 
 CmLteLcId      idx;
 LteLcgId       gId;
 #endif
 #endif
 {
-   TRC2(rgDBMInsUlDedLcCb);
    if ( idx >= RG_DEDLC_MIN_LCID)
    {
       ueCb->ul.lcCb[idx - 1].lcId = idx;
@@ -870,7 +836,7 @@ LteLcgId       gId;
 
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 
 }  /* rgDBMInsUlDedLcCb */
 
@@ -888,21 +854,19 @@ LteLcgId       gId;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMUpdUlDedLcCb
+Void rgDBMUpdUlDedLcCb
 (
 RgUeCb         *ueCb, 
 RgUlLcCb       *ulLcCb,
 LteLcgId       gId
 )
 #else
-PUBLIC Void rgDBMUpdUlDedLcCb(ueCb, ulLcCb, gId)
+Void rgDBMUpdUlDedLcCb(ueCb, ulLcCb, gId)
 RgUeCb         *ueCb; 
 RgUlLcCb       *ulLcCb; 
 LteLcgId       gId;
 #endif
 {
-   TRC2(rgDBMUpdUlDedLcCb);
-
    ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount = 
                ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount - 1;
    if(ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount == 0)
@@ -918,7 +882,7 @@ LteLcgId       gId;
    ueCb->ul.lcgArr[gId].lcCount = ueCb->ul.lcgArr[gId].lcCount + 1;
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 }  /* rgDBMUpdUlDedLcCb */
 
 /**
@@ -934,18 +898,17 @@ LteLcgId       gId;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMDelUlDedLcCb
+Void rgDBMDelUlDedLcCb
 (
 RgUeCb         *ueCb, 
 RgUlLcCb       *ulLcCb 
 )
 #else
-PUBLIC Void rgDBMDelUlDedLcCb(ueCb, ulLcCb)
+Void rgDBMDelUlDedLcCb(ueCb, ulLcCb)
 RgUeCb         *ueCb; 
 RgUlLcCb       *ulLcCb; 
 #endif
 {
-   TRC2(rgDBMDelUlDedLcCb);
 
    ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount = 
                ueCb->ul.lcgArr[ulLcCb->lcgId].lcCount - 1;
@@ -957,7 +920,7 @@ RgUlLcCb       *ulLcCb;
    ueCb->ul.lcCb[ulLcCb->lcId - 1].lcId = RG_INVALID_LC_ID;
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 }  /* rgDBMDelUlDedLcCb */
 
 /**
@@ -974,18 +937,17 @@ RgUlLcCb       *ulLcCb;
  *  @return  RgUlLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgUlLcCb* rgDBMGetUlDedLcCb
+RgUlLcCb* rgDBMGetUlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId        idx
 )
 #else
-PUBLIC RgUlLcCb* rgDBMGetUlDedLcCb(ueCb, idx)
+RgUlLcCb* rgDBMGetUlDedLcCb(ueCb, idx)
 RgUeCb         *ueCb; 
 CmLteLcId        idx;
 #endif
 {
-   TRC2(rgDBMGetUlDedLcCb)
 
    if (idx > RG_DEDLC_MAX_LCID || idx < RG_DEDLC_MIN_LCID)
    {
@@ -1015,20 +977,18 @@ CmLteLcId        idx;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMChkCmnLcCb
+S16 rgDBMChkCmnLcCb
 (
 RgCellCb       *cellCb, 
 CmLteLcId        lcId
 )
 #else
-PUBLIC S16 rgDBMChkCmnLcCb(cellCb, lcId)
+S16 rgDBMChkCmnLcCb(cellCb, lcId)
 RgCellCb       *cellCb;
 CmLteLcId        lcId;
 #endif
 {
-   U8 idx;
-
-   TRC2(rgDBMChkCmnLcCb)
+   uint8_t idx;
 
    if(cellCb->bcchBchInfo.lcId == lcId)
    {
@@ -1062,16 +1022,15 @@ CmLteLcId        lcId;
  *  @return  RgBcchBchLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgBcchBchLcCb* rgDBMGetBcchOnBch
+RgBcchBchLcCb* rgDBMGetBcchOnBch
 (
 RgCellCb       *cellCb 
 )
 #else
-PUBLIC RgBcchBchLcCb* rgDBMGetBcchOnBch(cellCb)
+RgBcchBchLcCb* rgDBMGetBcchOnBch(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMGetBcchOnBch)
 
    if(cellCb->bcchBchInfo.lcId != RG_INVALID_LC_ID)
    {
@@ -1094,20 +1053,18 @@ RgCellCb       *cellCb;
  *  @return  RgBcchDlschLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgBcchDlschLcCb* rgDBMGetBcchOnDlsch
+RgBcchDlschLcCb* rgDBMGetBcchOnDlsch
 (
 RgCellCb       *cellCb,
 CmLteLcId      lcId
 )
 #else
-PUBLIC RgBcchDlschLcCb* rgDBMGetBcchOnDlsch(cellCb,lcId)
+RgBcchDlschLcCb* rgDBMGetBcchOnDlsch(cellCb,lcId)
 RgCellCb       *cellCb;
 CmLteLcId      lcId;
 #endif
 {
-   U8 idx;
-
-   TRC2(rgDBMGetBcchOnDlsch)
+   uint8_t idx;
 
    for (idx = 0; idx < RG_MAX_BCCH_DLSCH; idx++)
    {
@@ -1131,16 +1088,15 @@ CmLteLcId      lcId;
  *  @return  RgPcchLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgPcchLcCb* rgDBMGetPcch
+RgPcchLcCb* rgDBMGetPcch
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC RgPcchLcCb* rgDBMGetPcch(cellCb)
+RgPcchLcCb* rgDBMGetPcch(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMGetPcch)
  
    if(cellCb->pcchInfo.lcId != RG_INVALID_LC_ID)
    {
@@ -1162,23 +1118,22 @@ RgCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMInsBcchOnBch
+Void rgDBMInsBcchOnBch
 (
 RgCellCb       *cellCb, 
 CmLteLcId      idx
 )
 #else
-PUBLIC Void rgDBMInsBcchOnBch(cellCb, idx)
+Void rgDBMInsBcchOnBch(cellCb, idx)
 RgCellCb       *cellCb;
 CmLteLcId      idx;
 #endif
 {
-   TRC2(rgDBMInsBcchOnBch)
 
    cellCb->bcchBchInfo.lcId = idx;
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 }  /* rgDBMInsBcchOnBch */
 
 /**
@@ -1194,24 +1149,23 @@ CmLteLcId      idx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMInsBcchOnDlsch
+Void rgDBMInsBcchOnDlsch
 (
 RgCellCb       *cellCb, 
 CmLteLcId      idx
 )
 #else
-PUBLIC Void rgDBMInsBcchOnDlsch(cellCb, idx)
+Void rgDBMInsBcchOnDlsch(cellCb, idx)
 RgCellCb       *cellCb;
 CmLteLcId      idx;
 #endif
 {
-   TRC2(rgDBMInsBcchOnDlsch)
 
    cellCb->bcchDlschInfo[cellCb->numBcchDlschInfo].lcId = idx;
    cellCb->numBcchDlschInfo++;
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 }  /* rgDBMInsBcchOnDlsch */
 
 
@@ -1227,23 +1181,22 @@ CmLteLcId      idx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMInsPcch
+Void rgDBMInsPcch
 (
 RgCellCb       *cellCb, 
 CmLteLcId      idx
 )
 #else
-PUBLIC Void rgDBMInsPcch(cellCb, idx)
+Void rgDBMInsPcch(cellCb, idx)
 RgCellCb       *cellCb;
 CmLteLcId      idx;
 #endif
 {
-   TRC2(rgDBMInsPcch)
 
    cellCb->pcchInfo.lcId = idx;
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 }  /* rgDBMInsPcch */
 
 /**
@@ -1258,19 +1211,18 @@ CmLteLcId      idx;
  *  @return  Void
  **/
 #ifdef ANSI
-PRIVATE Void rgDBMInitRachLst
+static Void rgDBMInitRachLst
 (
 RgCellCb       *cellCb
 )
 #else
-PRIVATE Void rgDBMInitRachLst(cellCb)
+static Void rgDBMInitRachLst(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMInitRachLst)
 
    cmLListInit(&cellCb->raInfo.ueRachLst);
-   RETVOID;
+   return;
 }  /* rgDBMInitRachLst */
 
 /**
@@ -1286,22 +1238,21 @@ RgCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMInsUeCbInRachLst
+Void rgDBMInsUeCbInRachLst
 (
 RgCellCb       *cellCb, 
 RgUeCb         *ueCb
 )
 #else
-PUBLIC Void rgDBMInsUeCbInRachLst(cellCb, ueCb)
+Void rgDBMInsUeCbInRachLst(cellCb, ueCb)
 RgCellCb       *cellCb; 
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMInsUeCbInRachLst)
 
    cmLListAdd2Tail(&cellCb->raInfo.ueRachLst,&ueCb->rachLstEnt);
 
-   RETVOID;
+   return;
 }  /* rgDBMInsUeCbInRachLst */
 
 /**
@@ -1317,21 +1268,19 @@ RgUeCb         *ueCb;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgUeCb* rgDBMGetUeCbFromRachLst
+RgUeCb* rgDBMGetUeCbFromRachLst
 (
 RgCellCb       *cellCb, 
 CmLteRnti      key
 )
 #else
-PUBLIC RgUeCb* rgDBMGetUeCbFromRachLst(cellCb, key)
+RgUeCb* rgDBMGetUeCbFromRachLst(cellCb, key)
 RgCellCb       *cellCb; 
 CmLteRnti      key;
 #endif
 {
    CmLList *tmpNode;
 
-   TRC2(rgDBMGetUeCbFromRachLst)
-
    CM_LLIST_FIRST_NODE(&cellCb->raInfo.ueRachLst,tmpNode);
    while(tmpNode)
    {
@@ -1357,18 +1306,17 @@ CmLteRnti      key;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgUeCb* rgDBMGetNextUeCbFromRachLst
+RgUeCb* rgDBMGetNextUeCbFromRachLst
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb
 )
 #else
-PUBLIC RgUeCb* rgDBMGetNextUeCbFromRachLst(cellCb, ueCb)
+RgUeCb* rgDBMGetNextUeCbFromRachLst(cellCb, ueCb)
 RgCellCb       *cellCb; 
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMGetNextUeCbFromRachLst)
 
    if(!ueCb)
    {
@@ -1392,21 +1340,20 @@ RgUeCb         *ueCb;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMDelUeCbFromRachLst
+Void rgDBMDelUeCbFromRachLst
 (
 RgCellCb       *cellCb, 
 RgUeCb         *ueCb 
 )
 #else
-PUBLIC Void rgDBMDelUeCbFromRachLst(cellCb, ueCb)
+Void rgDBMDelUeCbFromRachLst(cellCb, ueCb)
 RgCellCb       *cellCb; 
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMDelUeCbFromRachLst)
 
    cmLListDelFrm(&cellCb->raInfo.ueRachLst, &ueCb->rachLstEnt);
-   RETVOID;
+   return;
 }  /* rgDBMDelUeCbFromRachLst */
 
 /**********************************************************************