X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_utl.c;h=2e2e3796444d5924c231ad4b810b31a81ca84a41;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=87fe3e59d14a5abc60af18172160d4a0b0320d5a;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c
index 87fe3e59d..2e2e37964 100755
--- a/src/5gnrmac/rg_utl.c
+++ b/src/5gnrmac/rg_utl.c
@@ -237,7 +237,7 @@ Size    size;               /* size */
 *              previously allocated by rgAllocSBuf() and size. It 
 *              deallocates the memory. 
 *
-*       Ret:   RETVOID
+*       Ret:   void
 *
 *       Notes: ccpu00117052 - MOD- changed the Data parameter from 
 *                             pointer to address of pointer so that
@@ -264,7 +264,7 @@ Size size;          /* size */
 
    if ((data == NULLP) || (*data == NULLP) || (size == 0))
    {
-      RETVOID;
+      return;
    }
 
    /* Deallocate buffer */
@@ -272,12 +272,12 @@ Size size;          /* size */
 
    if (ret != ROK)
    {
-      RETVOID;
+      return;
    }
 
    *data = NULLP;
 
-   RETVOID;
+   return;
 
 } /* end of rgFreeSharableBuf */
 
@@ -291,7 +291,7 @@ Size size;          /* size */
 *              previously allocated by rgAllocSBuf() and size. It 
 *              deallocates the memory. 
 *
-*       Ret:   RETVOID
+*       Ret:   void
 *
 *       Notes: ccpu00117052 - MOD- changed the Data parameter from 
 *                             pointer to address of pointer so that
@@ -318,7 +318,7 @@ Size size;          /* size */
 
    if ((data == NULLP) || (*data == NULLP) || (size == 0))
    {
-      RETVOID;
+      return;
    }
 
 
@@ -331,12 +331,12 @@ Size size;          /* size */
    if (ret != ROK)
    {
       RGLOGERROR(inst,ERRCLS_DEBUG, ERG029, (ErrVal) 0, "rgFreeSBuf failed.\n");
-      RETVOID;
+      return;
    }
 
    *data = NULLP;
 
-   RETVOID;
+   return;
 
 } /* end of rgFreeSBuf */
 
@@ -413,20 +413,20 @@ Void rgFillDgnParams
 (
 Inst        inst,
 RgUstaDgn   *dgn,
-U8          dgnType
+uint8_t          dgnType
 )
 #else
 Void rgFillDgnParams(inst,dgn, dgnType)
 Inst        inst;
 RgUstaDgn   *dgn;
-U8          dgnType;
+uint8_t          dgnType;
 #endif
 {
 
    switch(dgnType)
    {
       case LRG_USTA_DGNVAL_MEM:
-         dgn->type = (U8) LRG_USTA_DGNVAL_MEM;
+         dgn->type = (uint8_t) LRG_USTA_DGNVAL_MEM;
          dgn->u.mem.region  = rgCb[inst].rgInit.region;
          dgn->u.mem.pool    = rgCb[inst].rgInit.pool;
       break;
@@ -435,7 +435,7 @@ U8          dgnType;
       break;
    }
 
-   RETVOID;
+   return;
 } /* end of rgFillDgnParams */
 
 
@@ -459,20 +459,20 @@ U8          dgnType;
 Void rgUpdtRguDedSts
 (
 Inst           inst,
-RgUpSapCb     *rguDlSap,
-U8             stsType,   /* Statistics type to update */
+RgUpSapCb      *rguDlSap,
+uint8_t        stsType,   /* Statistics type to update */
 RgRguDedDatReq *datReq    /* DatReq pointer */
 )
 #else
 Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq)
 Inst           inst;
-RgUpSapCb     *rguDlSap;
-U8             stsType;   /* Statistics type to update */
+RgUpSapCb      *rguDlSap;
+uint8_t        stsType;   /* Statistics type to update */
 RgRguDedDatReq *datReq;   /* DatReq pointer */
 #endif
 {
-   U8 idx1,idx2;
-   U32 idx;
+   uint8_t idx1,idx2;
+   uint32_t idx;
 
    switch(stsType)
    {
@@ -510,7 +510,7 @@ RgRguDedDatReq *datReq;   /* DatReq pointer */
          break;
    }
    
-   RETVOID;
+   return;
 } /* rgUpdtRguDedSts */
 
 
@@ -535,13 +535,13 @@ Void rgUpdtRguCmnSts
 (
 Inst           inst,
 RgUpSapCb     *rguDlSap,
-U8             stsType   /* Statistics type to update */
+uint8_t       stsType   /* Statistics type to update */
 )
 #else
 Void rgUpdtRguCmnSts(inst,rguDlSap,stsType)
 Inst           inst;
 RgUpSapCb     *rguDlSap;
-U8             stsType;   /* Statistics type to update */
+uint8_t       stsType;   /* Statistics type to update */
 #endif
 {
 
@@ -556,7 +556,7 @@ U8             stsType;   /* Statistics type to update */
          break;
    }
    
-   RETVOID;
+   return;
 } /* rgUpdtRguCmnSts */
 
 
@@ -581,12 +581,12 @@ U8             stsType;   /* Statistics type to update */
 Void rgUpdtCellCnt
 (
 Inst inst,
-U8 updtType
+uint8_t updtType
 )
 #else
 Void rgUpdtCellCnt(inst,updtType)
 Inst inst;
-U8 updtType;
+uint8_t updtType;
 #endif
 {
 
@@ -602,7 +602,7 @@ U8 updtType;
          break;
    }
 
-   RETVOID;
+   return;
 } /* rgUpdtCellCnt */
 
 
@@ -627,12 +627,12 @@ U8 updtType;
 Void rgUpdtUeCnt
 (
 Inst inst,
-U8 updtType
+uint8_t updtType
 )
 #else
 Void rgUpdtUeCnt (inst,updtType)
 Inst inst;
-U8 updtType;
+uint8_t updtType;
 #endif
 {
    switch (updtType)
@@ -646,7 +646,7 @@ U8 updtType;
       default:
          break;
    }
-   RETVOID;
+   return;
 } /* rgUpdtUeCnt */
 
 /*
@@ -678,7 +678,7 @@ Size      memSize;
 #endif
 {
    Mem              sMem;
-   VOLATILE U32     startTime=0;
+   VOLATILE uint32_t     startTime=0;
 
    sMem.region = rgCb[inst].rgInit.region;
    sMem.pool = rgCb[inst].rgInit.pool;
@@ -801,7 +801,7 @@ Inst          dstInst;
    pst->intfVer   = 0;
    pst->route   = RTESPEC;
 
-   RETVOID; 
+   return; 
 } /* end of rgGetPstToInst */
 
 /***********************************************************
@@ -965,7 +965,7 @@ RgInfSpsLcInfo *lcInfo;
    Inst       inst;
    RgCellCb   *cell= NULLP;
    RgUeCb     *ue;
-   U8         idx;
+   uint8_t    idx;
 
    RG_IS_INST_VALID(pst->dstInst);
    inst   = pst->dstInst - RG_INST_START;
@@ -1176,7 +1176,7 @@ RgUeCb        *ue;
 #endif
 {
    Inst        inst     = cell->macInst - RG_INST_START;
-   U8          idx      = 0;
+   uint8_t     idx      = 0;
    Inst        sCellInstIdx;
    Pst         dstInstPst;
    RgPrgUeSCellDelInfo ueSCellDelInfo;
@@ -1294,7 +1294,7 @@ CmLteRnti       newRnti;
    Pst                 dstInstPst;
    RgPrgUeSCellDelInfo ueIdChngReq;
    RgUeCb              *ue;
-   U8                  idx;
+   uint8_t                  idx;
 #ifdef L2_OPTMZ
 TfuDelDatReqInfo delDatReq;
 #endif
@@ -1423,7 +1423,7 @@ CmLteRnti       *rlsRnti;
       }
    }
 
-   RETVOID;
+   return;
 } /* end of rgUtlHndlCrntiRls */
 
 /**