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=9464325df16a13b2a5eefafa3e620711424bfbcb;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c
index 9464325df..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
 
@@ -97,8 +97,6 @@ RgCellCb       *cellCb;
 {
    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 */
@@ -178,7 +175,6 @@ 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 */
@@ -243,7 +238,6 @@ S16 rgDBMDeInitSpsUeCbLst(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMDeInitSpsUeCbLst)
 
    return (cmHashListDeinit(&cellCb->spsUeLst));
 
@@ -277,10 +271,8 @@ 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 */
 
@@ -311,10 +303,9 @@ 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 */
 
@@ -347,9 +338,7 @@ CmLteRnti      ueId;
 {
    RgUeCb *ueCb = NULLP; 
 
-   TRC2(rgDBMGetUeCb)
-
-   cmHashListFind(&cellCb->ueLst, (U8 *)&ueId,
+   cmHashListFind(&cellCb->ueLst, (uint8_t *)&ueId,
       sizeof(ueId), 0, (PTR *)&ueCb);
    return (ueCb);
 }  /* rgDBMGetUeCb */
@@ -382,9 +371,7 @@ CmLteRnti      spsRnti;
 {
    RgUeCb *ueCb = NULLP; 
 
-   TRC2(rgDBMGetSpsUeCb)
-
-   cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti,
+   cmHashListFind(&cellCb->spsUeLst, (uint8_t *)&spsRnti,
       sizeof(spsRnti), 0, (PTR *)&ueCb);
    return (ueCb);
 }  /* rgDBMGetSpsUeCb */
@@ -418,8 +405,6 @@ RgUeCb         *ueCb;
 {
    RgUeCb *nextUeCb = NULLP; 
 
-   TRC2(rgDBMGetNextUeCb)
-
    cmHashListGetNext(&cellCb->ueLst, (PTR) ueCb, (PTR *)&nextUeCb);
    return (nextUeCb);
 }  /* rgDBMGetNextUeCb */
@@ -452,8 +437,6 @@ RgUeCb         *ueCb;
 {
    RgUeCb *nextUeCb = NULLP; 
 
-   TRC2(rgDBMGetNextSpsUeCb)
-
    cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb);
    return (nextUeCb);
 }  /* end of rgDBMGetNextSpsUeCb */
@@ -488,8 +471,6 @@ RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMDelUeCb)
-
    return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCb));
 }  /* rgDBMDelUeCb */
 
@@ -521,7 +502,6 @@ RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMDelSpsUeCb)
 
    return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
 }  /* end of rgDBMDelSpsUeCb */
@@ -554,11 +534,9 @@ 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 */
 
 /**
@@ -687,9 +661,7 @@ 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 */
 
 /**
@@ -728,13 +700,12 @@ 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 */
 
 /**
@@ -760,12 +731,10 @@ 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 */
 
@@ -793,8 +762,6 @@ RgUeCb         *ueCb;
 CmLteLcId        idx;
 #endif
 {
-   TRC2(rgDBMGetDlDedLcCb);
-
    if (idx > RG_DEDLC_MAX_LCID || idx <= 0)
    {
       return (NULLP);
@@ -828,14 +795,14 @@ Void rgDBMInsUlDedLcCb
 RgUeCb         *ueCb, 
 CmLteLcId      idx,
 LteLcgId       gId,
-U8             qci
+uint8_t             qci
 )
 #else
 Void rgDBMInsUlDedLcCb(ueCb, idx, gId, qci)
 RgUeCb         *ueCb; 
 CmLteLcId      idx;
 LteLcgId       gId;
-U8             qci;
+uint8_t             qci;
 #endif
 #else
 #ifdef ANSI
@@ -853,7 +820,6 @@ 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 */
 
@@ -901,8 +867,6 @@ 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 */
 
 /**
@@ -945,7 +909,6 @@ 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 */
 
 /**
@@ -985,7 +948,6 @@ RgUeCb         *ueCb;
 CmLteLcId        idx;
 #endif
 {
-   TRC2(rgDBMGetUlDedLcCb)
 
    if (idx > RG_DEDLC_MAX_LCID || idx < RG_DEDLC_MIN_LCID)
    {
@@ -1026,9 +988,7 @@ RgCellCb       *cellCb;
 CmLteLcId        lcId;
 #endif
 {
-   U8 idx;
-
-   TRC2(rgDBMChkCmnLcCb)
+   uint8_t idx;
 
    if(cellCb->bcchBchInfo.lcId == lcId)
    {
@@ -1071,7 +1031,6 @@ RgBcchBchLcCb* rgDBMGetBcchOnBch(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMGetBcchOnBch)
 
    if(cellCb->bcchBchInfo.lcId != RG_INVALID_LC_ID)
    {
@@ -1105,9 +1064,7 @@ RgCellCb       *cellCb;
 CmLteLcId      lcId;
 #endif
 {
-   U8 idx;
-
-   TRC2(rgDBMGetBcchOnDlsch)
+   uint8_t idx;
 
    for (idx = 0; idx < RG_MAX_BCCH_DLSCH; idx++)
    {
@@ -1140,7 +1097,6 @@ RgPcchLcCb* rgDBMGetPcch(cellCb)
 RgCellCb       *cellCb;
 #endif
 {
-   TRC2(rgDBMGetPcch)
  
    if(cellCb->pcchInfo.lcId != RG_INVALID_LC_ID)
    {
@@ -1173,12 +1129,11 @@ RgCellCb       *cellCb;
 CmLteLcId      idx;
 #endif
 {
-   TRC2(rgDBMInsBcchOnBch)
 
    cellCb->bcchBchInfo.lcId = idx;
 
   /* Stack Crash problem for TRACE5 Changes. Added the return below */
-  RETVOID;
+  return;
 }  /* rgDBMInsBcchOnBch */
 
 /**
@@ -1205,13 +1160,12 @@ 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 */
 
 
@@ -1238,12 +1192,11 @@ 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 */
 
 /**
@@ -1297,11 +1249,10 @@ RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMInsUeCbInRachLst)
 
    cmLListAdd2Tail(&cellCb->raInfo.ueRachLst,&ueCb->rachLstEnt);
 
-   RETVOID;
+   return;
 }  /* rgDBMInsUeCbInRachLst */
 
 /**
@@ -1330,8 +1281,6 @@ CmLteRnti      key;
 {
    CmLList *tmpNode;
 
-   TRC2(rgDBMGetUeCbFromRachLst)
-
    CM_LLIST_FIRST_NODE(&cellCb->raInfo.ueRachLst,tmpNode);
    while(tmpNode)
    {
@@ -1368,7 +1317,6 @@ RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMGetNextUeCbFromRachLst)
 
    if(!ueCb)
    {
@@ -1403,10 +1351,9 @@ RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 #endif
 {
-   TRC2(rgDBMDelUeCbFromRachLst)
 
    cmLListDelFrm(&cellCb->raInfo.ueRachLst, &ueCb->rachLstEnt);
-   RETVOID;
+   return;
 }  /* rgDBMDelUeCbFromRachLst */
 
 /**********************************************************************