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

diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c
index b12ac8c03..eebf74c34 100755
--- a/src/5gnrsch/rg_sch_dbm.c
+++ b/src/5gnrsch/rg_sch_dbm.c
@@ -35,16 +35,7 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_FILE_ID=230;
 static int RLOG_MODULE_ID=4096;
 /* 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 "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -55,15 +46,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_sch_cmn.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 "lrg.x"
 #include "rgr.x"
 #include "tfu.x"
@@ -134,17 +116,17 @@ RgSchCellCb       *cellCb;
 
    /* Initialize ue list */
    if ((ret = rgSCHDbmInitUeCbLst(cellCb, RGSCH_MAX_UE_BIN_PER_CELL)) != ROK)
-      RETVALUE(ret);
+      return (ret);
 #ifdef LTE_TDD
    if ((ret = rgSCHDbmInitUeTfuPendLst(cellCb, 
                                        RGSCH_MAX_UE_BIN_PER_CELL)) != ROK)
-      RETVALUE(ret);
+      return (ret);
 #endif
 
 #ifdef LTEMAC_SPS
    /* Initialize SPS Ue list */
    if ((ret = rgSCHDbmInitSpsUeCbLst(cellCb, RGSCH_MAX_UE_BIN_PER_CELL)) != ROK)
-      RETVALUE(ret);
+      return (ret);
 #endif /* LTEMAC_SPS */
 
    /* Initialize BCCH/PCCH logical channels */
@@ -167,7 +149,7 @@ RgSchCellCb       *cellCb;
    cmLListInit(&cellCb->l2mList);
 #endif /* LTE_L2_MEAS */
 
-   RETVALUE(ret);
+   return (ret);
 
 } /* rgSCHDbmInitCell */
 
@@ -202,7 +184,7 @@ U16            numBins;
 
    /* Fix: syed It is better to compute offset dynamically
     * rather than hardcoding it as 0 */      
-   RETVALUE(cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, 
+   return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, 
                CM_HASH_KEYTYPE_CONID,
                rgSchCb[cellCb->instIdx].rgSchInit.region, 
                rgSchCb[cellCb->instIdx].rgSchInit.pool));
@@ -234,7 +216,7 @@ RgSchCellCb       *cellCb;
 {
    TRC2(rgSCHDbmDeInitUeCbLst)
 
-   RETVALUE(cmHashListDeinit(&cellCb->ueLst));
+   return (cmHashListDeinit(&cellCb->ueLst));
 
 }  /* rgSCHDbmDeInitUeCbLst */
 
@@ -268,7 +250,7 @@ U16               numBins;
    RgSchUeCb ue;
    TRC2(rgSCHDbmInitSpsUeCbLst)
 
-   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,
                rgSchCb[cellCb->instIdx].rgSchInit.region, 
                rgSchCb[cellCb->instIdx].rgSchInit.pool));
@@ -300,7 +282,7 @@ RgSchCellCb       *cellCb;
 {
    TRC2(rgSCHDbmDeInitSpsUeCbLst)
 
-   RETVALUE(cmHashListDeinit(&cellCb->spsUeLst));
+   return (cmHashListDeinit(&cellCb->spsUeLst));
 
 }  /* rgSCHDbmDeInitSpsUeCbLst */
 
@@ -337,7 +319,7 @@ RgSchUeCb         *ueCb;
 
    ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]];
 
-   RETVALUE(cmHashListInsert(&cellCb->ueLst, (PTR)ueCellInfo, 
+   return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCellInfo, 
       (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId)));
 
 }  /* rgSCHDbmInsUeCb */
@@ -371,7 +353,7 @@ RgSchUeCb         *ueCb;
 {
    TRC2(rgSCHDbmInsSpsUeCb)
 
-   RETVALUE(cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
+   return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, 
       (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti)));
 
 }  /* end of rgSCHDbmInsSpsUeCb */
@@ -410,7 +392,7 @@ CmLteRnti      ueId;
    cmHashListFind(&cellCb->ueLst, (U8 *)&ueId,
       sizeof(ueId), 0, (PTR *)&ueCellInfo);
 
-   RETVALUE(!ueCellInfo?NULLP:ueCellInfo->ue);
+   return (!ueCellInfo?NULLP:ueCellInfo->ue);
 }  /* rgSCHDbmGetUeCb */
 
 #ifdef LTEMAC_SPS
@@ -445,7 +427,7 @@ CmLteRnti         spsRnti;
 
    cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti,
       sizeof(spsRnti), 0, (PTR *)&ueCb);
-   RETVALUE(ueCb);
+   return (ueCb);
 }  /* rgSCHDbmGetSpsUeCb */
 #endif
 
@@ -486,7 +468,7 @@ RgSchUeCb         *ueCb;
    }
 
    cmHashListGetNext(&cellCb->ueLst, (PTR) ueCellInfo, (PTR *)&nextUeCellInfo);
-   RETVALUE(!nextUeCellInfo?NULLP:nextUeCellInfo->ue);
+   return (!nextUeCellInfo?NULLP:nextUeCellInfo->ue);
 }  /* rgSCHDbmGetNextUeCb */
 
 #ifdef LTEMAC_SPS
@@ -520,7 +502,7 @@ RgSchUeCb         *ueCb;
    TRC2(rgSCHDbmGetNextSpsUeCb)
 
    cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb);
-   RETVALUE(nextUeCb);
+   return (nextUeCb);
 }  /* end of rgSCHDbmGetNextSpsUeCb */
 
 #endif /* LTEMAC_SPS */
@@ -584,7 +566,7 @@ RgSchUeCb         *ueCb;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHDbmDelL2MUe */
 
 #endif
@@ -621,7 +603,7 @@ RgSchUeCb         *ueCb;
 
    ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]];
 
-   RETVALUE(cmHashListDelete(&cellCb->ueLst, (PTR)ueCellInfo));
+   return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCellInfo));
 }  /* rgSCHDbmDelUeCb */
 
 #ifdef LTEMAC_SPS
@@ -654,7 +636,7 @@ RgSchUeCb         *ueCb;
 {
    TRC2(rgSCHDbmDelSpsUeCb)
 
-   RETVALUE(cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
+   return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb));
 }  /* end of rgSCHDbmDelSpsUeCb */
 
 #endif /* LTEMAC_SPS */
@@ -691,7 +673,7 @@ RgSchUeCb       *ueCb;
    /* Initialize Dedicated logical channels */
    rgSCHDbmInitDedLcLst(ueCb);
 
-   RETVALUE(ret);
+   return (ret);
 } /* rgSCHDbmInitUe */
 
 /**
@@ -878,9 +860,9 @@ CmLteLcId        idx;
 
    if (idx < RGSCH_DEDLC_MIN_LCID || idx > RGSCH_DEDLC_MAX_LCID)
    {
-      RETVALUE(NULLP);
+      return (NULLP);
    }
-   RETVALUE(ueCb->dl.lcCb[idx-1]);
+   return (ueCb->dl.lcCb[idx-1]);
 
 }  /* rgSCHDbmGetDlDedLcCb */
 
@@ -913,10 +895,10 @@ RgSchUeCb         *ueCb;
    {
       if(ueCb->dl.lcCb[idx])
       {
-         RETVALUE(ueCb->dl.lcCb[idx]);
+         return (ueCb->dl.lcCb[idx]);
       }
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetFirstDlDedLcCb */
 /**
  * @brief Handler for accessing the existing next dl dedicated lcCb at idx 
@@ -948,17 +930,17 @@ RgSchDlLcCb       *lcCb;
 
    if (!lcCb)
    {
-      RETVALUE(rgSCHDbmGetFirstDlDedLcCb(ueCb));
+      return (rgSCHDbmGetFirstDlDedLcCb(ueCb));
    }
 
    for(idx = lcCb->lcId; idx < RGSCH_DEDLC_MAX_LCID; idx++)
    {
       if(ueCb->dl.lcCb[idx])
       {
-         RETVALUE(ueCb->dl.lcCb[idx]);
+         return (ueCb->dl.lcCb[idx]);
       }
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetNextDlDedLcCb */
 
 /**
@@ -994,10 +976,10 @@ CmLteLcId         lcId;
    {
       if(cellCb->cmnLcCb[idx].lcId == lcId)
       {
-         RETVALUE(&(cellCb->cmnLcCb[idx]));
+         return (&(cellCb->cmnLcCb[idx]));
       }
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetCmnLcCb */
 
 /**
@@ -1026,9 +1008,9 @@ RgSchCellCb       *cellCb;
  
    if(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId != RGSCH_INVALID_LC_ID)
    {
-      RETVALUE(&(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX]));
+      return (&(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX]));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetBcchOnBch */
 
 /**
@@ -1057,9 +1039,9 @@ RgSchCellCb       *cellCb;
 
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId != RGSCH_INVALID_LC_ID)
    {
-      RETVALUE(&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1]));
+      return (&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1]));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetFirstBcchOnDlsch */
 
 /**
@@ -1088,9 +1070,9 @@ RgSchCellCb       *cellCb;
 
    if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2].lcId != RGSCH_INVALID_LC_ID)
    {
-      RETVALUE(&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2]));
+      return (&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2]));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetSecondBcchOnDlsch */
 
 /**
@@ -1118,9 +1100,9 @@ RgSchCellCb       *cellCb;
  
    if(cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId != RGSCH_INVALID_LC_ID)
    {
-      RETVALUE(&(cellCb->cmnLcCb[RGSCH_PCCH_IDX]));
+      return (&(cellCb->cmnLcCb[RGSCH_PCCH_IDX]));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetPcch */
 
 /**
@@ -1357,11 +1339,11 @@ CmLteRnti      key;
    {
       if(((RgSchRaCb *)tmpNode->node)->tmpCrnti == key)
       {
-         RETVALUE((RgSchRaCb *)(tmpNode->node));
+         return ((RgSchRaCb *)(tmpNode->node));
       }
       CM_LLIST_NEXT_NODE(&cellCb->raInfo.raCbLst,tmpNode);
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetRaCb */
 
 #ifndef LTE_TDD
@@ -1547,10 +1529,10 @@ RgSchCfgElem      *cfgElem;
 
    if(!cfgElem)
    {
-      RETVALUE( cellCb->rgCfgInfo.crntRgrCfgLst.first ? 
+      return ( cellCb->rgCfgInfo.crntRgrCfgLst.first ? 
                (RgSchCfgElem *)(cellCb->rgCfgInfo.crntRgrCfgLst.first->node) : NULLP );
    }
-   RETVALUE( cfgElem->cfgReqLstEnt.next ? 
+   return ( cfgElem->cfgReqLstEnt.next ? 
                (RgSchCfgElem *)(cfgElem->cfgReqLstEnt.next->node) : NULLP );
 }  /* rgSCHDbmGetNextCrntRgrCfgElem */
 
@@ -1582,10 +1564,10 @@ RgSchCfgElem      *cfgElem;
 
    if(!cfgElem)
    {
-      RETVALUE( cellCb->rgCfgInfo.pndngRgrCfgLst.first ? 
+      return ( cellCb->rgCfgInfo.pndngRgrCfgLst.first ? 
                (RgSchCfgElem *)(cellCb->rgCfgInfo.pndngRgrCfgLst.first->node) : NULLP );
    }
-   RETVALUE( cfgElem->cfgReqLstEnt.next ? 
+   return ( cfgElem->cfgReqLstEnt.next ? 
                (RgSchCfgElem *)(cfgElem->cfgReqLstEnt.next->node) : NULLP );
 }  /* rgSCHDbmGetNextPndngRgrCfgElem */
 
@@ -1623,11 +1605,11 @@ CmLteTimingInfo   key;
       if((((RgSchCfgElem *)tmpNode->node)->actvTime.sfn == key.sfn) &&
             (((RgSchCfgElem *)tmpNode->node)->actvTime.slot == key.slot))
       {
-         RETVALUE((RgSchCfgElem *)(tmpNode->node));
+         return ((RgSchCfgElem *)(tmpNode->node));
       }
       CM_LLIST_NEXT_NODE(&cellCb->rgCfgInfo.pndngRgrCfgLst,tmpNode);
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmGetPndngRgrCfgElemByKey */
 
 /**
@@ -1658,9 +1640,9 @@ RgSchCfgElem      *cfgElem;
 
    if(cmLListDelFrm(&cellCb->rgCfgInfo.crntRgrCfgLst,&cfgElem->cfgReqLstEnt))
    {
-      RETVALUE((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node));
+      return ((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmDelCrntRgrCfgElem */
 
 /**
@@ -1691,9 +1673,9 @@ RgSchCfgElem      *cfgElem;
 
    if(cmLListDelFrm(&cellCb->rgCfgInfo.pndngRgrCfgLst,&cfgElem->cfgReqLstEnt))
    {
-      RETVALUE((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node));
+      return ((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node));
    }
-   RETVALUE(NULLP);
+   return (NULLP);
 }  /* rgSCHDbmDelPndngRgrCfgElem */
 
 /**
@@ -1734,7 +1716,7 @@ U16            maxRntis;
    if(rgSCHUtlAllocSBuf(cellCb->instIdx, 
        (Data **)&cellCb->rntiDb.rntiPool,maxRntis*sizeof(RgSchRntiLnk)) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    cellCb->rntiDb.rntiStart = rntiStart;
    cellCb->rntiDb.maxRntis = maxRntis;
@@ -1768,7 +1750,7 @@ U16            maxRntis;
       cellCb->rntiDb.lastRnti = &rntiPool[idx];
    }
    cellCb->rntiDb.freeRnti = &rntiPool[0];
-   RETVALUE(ROK);
+   return ROK;
 } /* rgSCHDbmRntiDbInit */
 
 /**
@@ -1837,7 +1819,7 @@ RgSchCellCb       *cellCb;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI exhausted count:%d",
                 cellCb->rntiDb.count);
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
    rntiLnk = cellCb->rntiDb.freeRnti;
@@ -1859,7 +1841,7 @@ RgSchCellCb       *cellCb;
    cellCb->rntiDb.count--;
 
    printf("rgSCHDbmGetRnti::rntiLnk->rnti %u\n",rntiLnk->rnti);
-   RETVALUE(rntiLnk);
+   return (rntiLnk);
 } /* rgSCHDbmGetRnti */
 
 /**
@@ -1950,10 +1932,10 @@ U16            numBins;
                rgSchCb[cellCb->instIdx].rgSchInit.region, 
                rgSchCb[cellCb->instIdx].rgSchInit.pool) != ROK)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 
 }  /* rgSCHDbmInitUeTfuPendLst */
 
@@ -1984,7 +1966,7 @@ RgSchCellCb       *cellCb;
 
    cmHashListDeinit(&cellCb->ueTfuPendLst);
    
-   RETVALUE(ROK);
+   return ROK;
 }  /* rgSCHDbmDeInitUeTfuPendLst */
 #endif