X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_dbm.c;h=9464325df16a13b2a5eefafa3e620711424bfbcb;hb=9076bc05cb36d3ed99890b2e3f57f6d06f4a7e93;hp=936d4d0f3f199e27bf571e56d3fcf72680e06378;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c
index 936d4d0f3..9464325df 100755
--- a/src/5gnrmac/rg_dbm.c
+++ b/src/5gnrmac/rg_dbm.c
@@ -33,43 +33,25 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
+#include "tfu.h"
+#include "du_app_mac_inf.h"
 #include "lrg.h"
 #include "crg.h"
 #include "rgu.h"
-#include "tfu.h"
 #include "rg_sch_inf.h"
 #include "rg_env.h"
 #include "rg.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
+#include "tfu.x"
 #include "lrg.x"
 #include "crg.x"
 #include "rgu.x"
-#include "tfu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"       /* PRG interface typedefs*/
 #include "rg.x"
 
-
 /* local defines */
 PRIVATE S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, U16 numBins));
 PRIVATE Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb));
@@ -104,12 +86,12 @@ U16            numBins
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgDBMInitCell
+S16 rgDBMInitCell
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC S16 rgDBMInitCell(cellCb)
+S16 rgDBMInitCell(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
@@ -119,12 +101,12 @@ RgCellCb       *cellCb;
 
    /* Initialize ue list */
    if ((ret = rgDBMInitUeCbLst(cellCb, RG_MAX_UE_BIN_PER_CELL)) != ROK)
-      RETVALUE(ret);
+      return (ret);
 
 #ifdef LTEMAC_SPS
    /* Initialize SPS Ue list */
    if ((ret = rgDBMInitSpsUeCbLst(cellCb, RG_MAX_UE_BIN_PER_CELL)) != ROK)
-      RETVALUE(ret);
+      return (ret);
 #endif /* LTEMAC_SPS */
 
    /* Initialize BCCH/PCCH logical channels */
@@ -134,7 +116,7 @@ RgCellCb       *cellCb;
    /* Initialize rach ue list */
    rgDBMInitRachLst(cellCb);
 
-   RETVALUE(ret);
+   return (ret);
 
 } /* rgDBMInitCell */
 
@@ -168,7 +150,7 @@ U16            numBins;
    RgUeCb ue;  
    TRC2(rgDBMInitUeCbLst)
 
-   RETVALUE(cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, 
+   return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, 
                CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool));
 
 }  /* rgDBMInitUeCbLst */
@@ -187,18 +169,18 @@ 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)
 
-   RETVALUE(cmHashListDeinit(&cellCb->ueLst));
+   return (cmHashListDeinit(&cellCb->ueLst));
 
 }  /* rgDBMDeInitUeCbLst */
 
@@ -233,7 +215,7 @@ U16            numBins;
    RgUeCb ue;
    TRC2(rgDBMInitSpsUeCbLst)
 
-   RETVALUE(cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, 
+   return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, 
                CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool));
 
 }  /* rgDBMInitSpsUeCbLst */
@@ -252,18 +234,18 @@ 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)
 
-   RETVALUE(cmHashListDeinit(&cellCb->spsUeLst));
+   return (cmHashListDeinit(&cellCb->spsUeLst));
 
 }  /* rgDBMDeInitSpsUeCbLst */
 
@@ -284,20 +266,20 @@ 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)
 
-   RETVALUE(cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, 
+   return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, 
       (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId)));
 
 }  /* rgDBMInsUeCb */
@@ -318,20 +300,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)
 
-   RETVALUE(cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
+   return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
       (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti)));
 
 }  /* end of rgDBMInsSpsUeCb */
@@ -352,13 +334,13 @@ 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
@@ -369,7 +351,7 @@ CmLteRnti      ueId;
 
    cmHashListFind(&cellCb->ueLst, (U8 *)&ueId,
       sizeof(ueId), 0, (PTR *)&ueCb);
-   RETVALUE(ueCb);
+   return (ueCb);
 }  /* rgDBMGetUeCb */
 
 #ifdef LTEMAC_SPS
@@ -387,13 +369,13 @@ 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
@@ -404,7 +386,7 @@ CmLteRnti      spsRnti;
 
    cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti,
       sizeof(spsRnti), 0, (PTR *)&ueCb);
-   RETVALUE(ueCb);
+   return (ueCb);
 }  /* rgDBMGetSpsUeCb */
 
 #endif /* LTEMAC_SPS */
@@ -423,13 +405,13 @@ 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
@@ -439,7 +421,7 @@ RgUeCb         *ueCb;
    TRC2(rgDBMGetNextUeCb)
 
    cmHashListGetNext(&cellCb->ueLst, (PTR) ueCb, (PTR *)&nextUeCb);
-   RETVALUE(nextUeCb);
+   return (nextUeCb);
 }  /* rgDBMGetNextUeCb */
 
 #ifdef LTEMAC_SPS
@@ -457,13 +439,13 @@ 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
@@ -473,7 +455,7 @@ RgUeCb         *ueCb;
    TRC2(rgDBMGetNextSpsUeCb)
 
    cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb);
-   RETVALUE(nextUeCb);
+   return (nextUeCb);
 }  /* end of rgDBMGetNextSpsUeCb */
 
 #endif /* LTEMAC_SPS */
@@ -495,20 +477,20 @@ 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)
 
-   RETVALUE(cmHashListDelete(&cellCb->ueLst, (PTR)ueCb));
+   return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCb));
 }  /* rgDBMDelUeCb */
 
 #ifdef LTEMAC_SPS
@@ -528,20 +510,20 @@ 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)
 
-   RETVALUE(cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
+   return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
 }  /* end of rgDBMDelSpsUeCb */
 
 #endif /* LTEMAC_SPS */
@@ -562,12 +544,12 @@ RgUeCb         *ueCb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMInitUe
+Void rgDBMInitUe
 (
 RgUeCb       *ueCb
 )
 #else
-PUBLIC Void rgDBMInitUe(ueCb)
+Void rgDBMInitUe(ueCb)
 RgUeCb       *ueCb;
 #endif
 {
@@ -696,12 +678,12 @@ RgCellCb       *cellCb;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgDBMFreeCmnLcLst
+Void rgDBMFreeCmnLcLst
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC Void rgDBMFreeCmnLcLst(cellCb)
+Void rgDBMFreeCmnLcLst(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
@@ -735,13 +717,13 @@ 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
@@ -767,13 +749,13 @@ 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
@@ -800,13 +782,13 @@ 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
@@ -815,14 +797,14 @@ CmLteLcId        idx;
 
    if (idx > RG_DEDLC_MAX_LCID || idx <= 0)
    {
-      RETVALUE(NULLP);
+      return (NULLP);
    }
    if(ueCb->dl.lcCb[idx-1].lcId == RG_INVALID_LC_ID)
    {
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
-   RETVALUE(&ueCb->dl.lcCb[idx-1]);
+   return (&ueCb->dl.lcCb[idx-1]);
 
 }  /* rgDBMGetDlDedLcCb */
 
@@ -841,7 +823,7 @@ CmLteLcId        idx;
  **/
 #ifdef LTE_L2_MEAS
 #ifdef ANSI
-PUBLIC Void rgDBMInsUlDedLcCb
+Void rgDBMInsUlDedLcCb
 (
 RgUeCb         *ueCb, 
 CmLteLcId      idx,
@@ -849,7 +831,7 @@ LteLcgId       gId,
 U8             qci
 )
 #else
-PUBLIC Void rgDBMInsUlDedLcCb(ueCb, idx, gId, qci)
+Void rgDBMInsUlDedLcCb(ueCb, idx, gId, qci)
 RgUeCb         *ueCb; 
 CmLteLcId      idx;
 LteLcgId       gId;
@@ -857,14 +839,14 @@ U8             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;
@@ -906,14 +888,14 @@ 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;
@@ -952,13 +934,13 @@ 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
@@ -992,13 +974,13 @@ 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
@@ -1007,14 +989,14 @@ CmLteLcId        idx;
 
    if (idx > RG_DEDLC_MAX_LCID || idx < RG_DEDLC_MIN_LCID)
    {
-      RETVALUE(NULLP);
+      return (NULLP);
    }
    if(ueCb->ul.lcCb[idx-1].lcId == RG_INVALID_LC_ID)
    {
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
-   RETVALUE(&ueCb->ul.lcCb[idx-1]);
+   return (&ueCb->ul.lcCb[idx-1]);
 }  /* rgDBMGetDlDedLcCb */
 
 /**
@@ -1033,13 +1015,13 @@ 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
@@ -1050,21 +1032,21 @@ CmLteLcId        lcId;
 
    if(cellCb->bcchBchInfo.lcId == lcId)
    {
-      RETVALUE(ROK);
+      return ROK;
    } 
    if(cellCb->pcchInfo.lcId == lcId)
    {
-      RETVALUE(ROK);
+      return ROK;
    }
 
    for (idx = 0; idx < cellCb->numBcchDlschInfo; idx++)
    {
       if(cellCb->bcchDlschInfo[idx].lcId == lcId)
       {
-         RETVALUE(ROK);
+         return ROK;
       } 
    }
-   RETVALUE(RFAILED);
+   return RFAILED;
 }  /* rgDBMChkCmnLcCb */
 
 /**
@@ -1080,12 +1062,12 @@ CmLteLcId        lcId;
  *  @return  RgBcchBchLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgBcchBchLcCb* rgDBMGetBcchOnBch
+RgBcchBchLcCb* rgDBMGetBcchOnBch
 (
 RgCellCb       *cellCb 
 )
 #else
-PUBLIC RgBcchBchLcCb* rgDBMGetBcchOnBch(cellCb)
+RgBcchBchLcCb* rgDBMGetBcchOnBch(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
@@ -1093,9 +1075,9 @@ RgCellCb       *cellCb;
 
    if(cellCb->bcchBchInfo.lcId != RG_INVALID_LC_ID)
    {
-      RETVALUE(&(cellCb->bcchBchInfo));
+      return (&(cellCb->bcchBchInfo));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgDBMGetBcchOnBch */
 
 /**
@@ -1112,13 +1094,13 @@ 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
@@ -1131,10 +1113,10 @@ CmLteLcId      lcId;
    {
       if(cellCb->bcchDlschInfo[idx].lcId == lcId)
       {
-         RETVALUE(&(cellCb->bcchDlschInfo[idx]));
+         return (&(cellCb->bcchDlschInfo[idx]));
       }
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgDBMGetBcchOnDlsch */
 
 /**
@@ -1149,12 +1131,12 @@ CmLteLcId      lcId;
  *  @return  RgPcchLcCb*
  **/
 #ifdef ANSI
-PUBLIC RgPcchLcCb* rgDBMGetPcch
+RgPcchLcCb* rgDBMGetPcch
 (
 RgCellCb       *cellCb
 )
 #else
-PUBLIC RgPcchLcCb* rgDBMGetPcch(cellCb)
+RgPcchLcCb* rgDBMGetPcch(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
@@ -1162,9 +1144,9 @@ RgCellCb       *cellCb;
  
    if(cellCb->pcchInfo.lcId != RG_INVALID_LC_ID)
    {
-      RETVALUE(&(cellCb->pcchInfo));
+      return (&(cellCb->pcchInfo));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgDBMGetPcch */
 
 /**
@@ -1180,13 +1162,13 @@ 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
@@ -1212,13 +1194,13 @@ 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
@@ -1245,13 +1227,13 @@ 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
@@ -1304,13 +1286,13 @@ 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
@@ -1335,13 +1317,13 @@ 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
@@ -1355,11 +1337,11 @@ CmLteRnti      key;
    {
       if(((RgUeCb *)tmpNode->node)->ueId == key)
       {
-         RETVALUE((RgUeCb *)(tmpNode->node));
+         return ((RgUeCb *)(tmpNode->node));
       }
       CM_LLIST_NEXT_NODE(&cellCb->raInfo.ueRachLst,tmpNode);
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgDBMGetUeCbFromRachLst */
 
 /**
@@ -1375,13 +1357,13 @@ 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
@@ -1390,10 +1372,10 @@ RgUeCb         *ueCb;
 
    if(!ueCb)
    {
-      RETVALUE( cellCb->raInfo.ueRachLst.first ? 
+      return ( cellCb->raInfo.ueRachLst.first ? 
                (RgUeCb *)(cellCb->raInfo.ueRachLst.first->node) : NULLP );
    }
-   RETVALUE( ueCb->rachLstEnt.next ? 
+   return ( ueCb->rachLstEnt.next ? 
                (RgUeCb *)(ueCb->rachLstEnt.next->node) : NULLP );
 }  /* rgDBMGetNextUeCbFromRachLst */
 
@@ -1410,13 +1392,13 @@ 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