Merge "Separation of logs Part - 2"

[o-du/l2.git] / src / 5gnrmac / rg_utl.c

diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c
index 87fe3e5..5736fc8 100755 (executable)
--- a/src/5gnrmac/rg_utl.c
+++ b/src/5gnrmac/rg_utl.c
@@ -70,13 +70,13 @@ static int RLOG_FILE_ID=179;
 /* local externs */
  
 /* forward references */
-PRIVATE S16 rgUtlHndlCrntiChng ARGS((
+static S16 rgUtlHndlCrntiChng ARGS((
          Inst            inst,
          RgCellCb        *cell,
          CmLteRnti       rnti,
          CmLteRnti       newRnti
          ));
-PRIVATE Void rgUtlHndlCrntiRls ARGS((
+static Void rgUtlHndlCrntiRls ARGS((
          RgCellCb        *cell,
          RgInfRlsRnti    *rlsRnti
          ));
@@ -87,7 +87,7 @@ S16 rgDelUeFrmAllSCell ARGS((
          ));
 
 #ifdef LTE_ADV
-PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs ARGS((
+static S16 rgUtlSndCrntiChngReq2AllSMacs ARGS((
          RgCellCb        *cell,
          CmLteRnti       rnti,
          CmLteRnti       newRnti
@@ -112,19 +112,12 @@ PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs ARGS((
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgAllocShrablSBuf
 (
 Inst    inst,
 Data    **pData,            /* Pointer of the data to be returned */
 Size    size                /* size */
 )
-#else
-S16 rgAllocShrablSBuf(inst,pData, size)
-Inst    inst;
-Data    **pData;            /* Pointer of the data to be returned */
-Size    size;               /* size */
-#endif
 {
    RgUstaDgn dgn;      /* Alarm diagnostics structure */
 
@@ -182,19 +175,12 @@ Size    size;               /* size */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgAllocSBuf
 (
 Inst    inst,
 Data    **pData,            /* Pointer of the data to be returned */
 Size    size                /* size */
 )
-#else
-S16 rgAllocSBuf(inst,pData, size)
-Inst    inst;
-Data    **pData;            /* Pointer of the data to be returned */
-Size    size;               /* size */
-#endif
 {
    RgUstaDgn dgn;      /* Alarm diagnostics structure */
 
@@ -237,7 +223,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
@@ -245,26 +231,19 @@ Size    size;               /* size */
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
 Void rgFreeSharableSBuf
 (
 Inst inst,
 Data **data,         /* address of pointer to data */
 Size size            /* size */
 )
-#else
-Void rgFreeSharableSBuf(inst,data, size)
-Inst inst;
-Data **data;         /* address of pointer to data */
-Size size;          /* size */
-#endif
 {
 
    S16 ret;
 
    if ((data == NULLP) || (*data == NULLP) || (size == 0))
    {
-      RETVOID;
+      return;
    }
 
    /* Deallocate buffer */
@@ -272,12 +251,12 @@ Size size;          /* size */
 
    if (ret != ROK)
    {
-      RETVOID;
+      return;
    }
 
    *data = NULLP;
 
-   RETVOID;
+   return;
 
 } /* end of rgFreeSharableBuf */
 
@@ -291,7 +270,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
@@ -299,26 +278,19 @@ Size size;          /* size */
 *
 *       File:  rg_utl.c
 */
-#ifdef ANSI
 Void rgFreeSBuf
 (
 Inst inst,
 Data **data,         /* address of pointer to data */
 Size size            /* size */
 )
-#else
-Void rgFreeSBuf(inst,data, size)
-Inst  inst;
-Data **data;         /* address of pointer to data */
-Size size;          /* size */
-#endif
 {
 
    S16 ret;
 
    if ((data == NULLP) || (*data == NULLP) || (size == 0))
    {
-      RETVOID;
+      return;
    }
 
 
@@ -331,12 +303,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 */
 
@@ -357,17 +329,11 @@ Size size;          /* size */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 S16 rgGetMsg
 (
 Inst    inst,
 Buffer  **mBuf            /* Message Buffer pointer be returned */
 )
-#else
-S16 rgGetMsg(inst,mBuf)
-Inst    inst;
-Buffer  **mBuf;           /* Message Buffer pointer be returned */
-#endif
 {
    S16         ret;
 
@@ -408,25 +374,18 @@ Buffer  **mBuf;           /* Message Buffer pointer be returned */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 Void rgFillDgnParams
 (
 Inst        inst,
 RgUstaDgn   *dgn,
-U8          dgnType
+uint8_t     dgnType
 )
-#else
-Void rgFillDgnParams(inst,dgn, dgnType)
-Inst        inst;
-RgUstaDgn   *dgn;
-U8          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 +394,7 @@ U8          dgnType;
       break;
    }
 
-   RETVOID;
+   return;
 } /* end of rgFillDgnParams */
 
 
@@ -455,24 +414,16 @@ U8          dgnType;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 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 */
-RgRguDedDatReq *datReq;   /* DatReq pointer */
-#endif
 {
-   U8 idx1,idx2;
-   U32 idx;
+   uint8_t idx1,idx2;
+   uint32_t idx;
 
    switch(stsType)
    {
@@ -510,7 +461,7 @@ RgRguDedDatReq *datReq;   /* DatReq pointer */
          break;
    }
    
-   RETVOID;
+   return;
 } /* rgUpdtRguDedSts */
 
 
@@ -530,19 +481,12 @@ RgRguDedDatReq *datReq;   /* DatReq pointer */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 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 */
-#endif
 {
 
    switch(stsType)
@@ -556,7 +500,7 @@ U8             stsType;   /* Statistics type to update */
          break;
    }
    
-   RETVOID;
+   return;
 } /* rgUpdtRguCmnSts */
 
 
@@ -577,17 +521,7 @@ U8             stsType;   /* Statistics type to update */
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-Void rgUpdtCellCnt
-(
-Inst inst,
-U8 updtType
-)
-#else
-Void rgUpdtCellCnt(inst,updtType)
-Inst inst;
-U8 updtType;
-#endif
+Void rgUpdtCellCnt(Inst inst,uint8_t updtType)
 {
 
    switch (updtType)
@@ -602,7 +536,7 @@ U8 updtType;
          break;
    }
 
-   RETVOID;
+   return;
 } /* rgUpdtCellCnt */
 
 
@@ -623,17 +557,7 @@ U8 updtType;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-Void rgUpdtUeCnt
-(
-Inst inst,
-U8 updtType
-)
-#else
-Void rgUpdtUeCnt (inst,updtType)
-Inst inst;
-U8 updtType;
-#endif
+Void rgUpdtUeCnt(Inst inst,uint8_t updtType)
 {
    switch (updtType)
    {
@@ -646,7 +570,7 @@ U8 updtType;
       default:
          break;
    }
-   RETVOID;
+   return;
 } /* rgUpdtUeCnt */
 
 /*
@@ -663,22 +587,16 @@ U8 updtType;
 *       File:  rg_utl.c
 *
 */
-#ifdef ANSI
 S16 rgAllocEventMem
 (
 Inst     inst,
 Ptr       *memPtr,
 Size      memSize
 )
-#else
-S16 rgAllocEventMem(inst,memPtr, memSize)
-Inst     inst;
-Ptr       *memPtr;
-Size      memSize;
-#endif
 {
-   Mem              sMem;
-   VOLATILE U32     startTime=0;
+   Mem               sMem;
+   volatile uint32_t startTime=0;
+
 
    sMem.region = rgCb[inst].rgInit.region;
    sMem.pool = rgCb[inst].rgInit.pool;
@@ -729,7 +647,6 @@ Size      memSize;
 *       File:  rg_utl.c
 *
 */
-#ifdef ANSI
 S16 rgGetEventMem
 (
 Inst      inst,
@@ -737,13 +654,6 @@ Ptr       *ptr,
 Size      len,
 Ptr       memCp
 )
-#else
-S16 rgGetEventMem(inst,ptr, len, memCp)
-Inst      inst;
-Ptr       *ptr;
-Size      len;
-Ptr       memCp;
-#endif
 {
    S16   ret;
 
@@ -772,19 +682,12 @@ Ptr       memCp;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
 Void rgGetPstToInst
 (
 Pst           *pst,
 Inst          srcInst,
 Inst          dstInst
 )
-#else
-Void rgGetPstToInst (pst, srcInst, dstInst)
-Pst           *pst;
-Inst          srcInst;
-Inst          dstInst;
-#endif
 {
 
    pst->srcEnt = rgCb[srcInst].rgInit.ent; 
@@ -801,7 +704,7 @@ Inst          dstInst;
    pst->intfVer   = 0;
    pst->route   = RTESPEC;
 
-   RETVOID; 
+   return; 
 } /* end of rgGetPstToInst */
 
 /***********************************************************
@@ -825,17 +728,7 @@ Inst          dstInst;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacLcgRegReq
-(
-Pst            *pst,
-RgInfLcgRegReq *lcgRegReq
-)
-#else
-S16 RgSchMacLcgRegReq (pst, lcgRegReq)
-Pst            *pst;
-RgInfLcgRegReq *lcgRegReq;
-#endif
+S16 RgSchMacLcgRegReq(Pst *pst,RgInfLcgRegReq *lcgRegReq)
 {
    Inst       inst;
    RgCellCb   *cell = NULLP;
@@ -882,17 +775,7 @@ RgInfLcgRegReq *lcgRegReq;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacUlSpsResetReq
-(
-Pst            *pst,
-RgInfUlSpsReset *ulSpsResetInfo
-)
-#else
-S16 RgSchMacUlSpsResetReq (pst, lcInfo)
-Pst            *pst;
-RgInfUlSpsReset *ulSpsResetInfo;
-#endif
+S16 RgSchMacUlSpsResetReq(Pst *pst,RgInfUlSpsReset *ulSpsResetInfo)
 {
    Inst       inst;
    RgCellCb   *cell = NULLP;
@@ -950,22 +833,12 @@ RgInfUlSpsReset *ulSpsResetInfo;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacSpsLcRegReq
-(
-Pst            *pst,
-RgInfSpsLcInfo *lcInfo
-)
-#else
-S16 RgSchMacSpsLcRegReq (pst, lcInfo)
-Pst            *pst;
-RgInfSpsLcInfo *lcInfo;
-#endif
+S16 RgSchMacSpsLcRegReq(Pst *pst,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;
@@ -1031,19 +904,7 @@ RgInfSpsLcInfo *lcInfo;
  *     File : rg_utl.c
  *
  **********************************************************/
-#ifdef ANSI
-S16 RgSchMacSpsLcDeregReq
-(
-Pst            *pst,
-CmLteCellId    cellId,
-CmLteRnti      crnti
-)
-#else
-S16 RgSchMacSpsLcDeregReq (pst, cellId, crnti)
-Pst            *pst;
-CmLteCellId    cellId;
-CmLteRnti      crnti;
-#endif
+S16 RgSchMacSpsLcDeregReq(Pst  *pst,CmLteCellId cellId,CmLteRnti crnti)
 {
    Inst       inst;
    RgCellCb   *cell = NULLP;
@@ -1097,21 +958,13 @@ CmLteRnti      crnti;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-PRIVATE S16 rgUtlHndlCrntiChng 
+static S16 rgUtlHndlCrntiChng 
 (
 Inst            inst,
 RgCellCb        *cell,
 CmLteRnti       rnti,
 CmLteRnti       newRnti
 )
-#else
-PRIVATE S16 rgUtlHndlCrntiChng(inst,cell, rnti, newRnti)
-Inst            inst;
-RgCellCb        *cell;
-CmLteRnti       rnti;
-CmLteRnti       newRnti;
-#endif
 {
    RgUeCb         *ue = NULLP;
    RgUeCb         *newUe = NULLP;
@@ -1163,20 +1016,10 @@ CmLteRnti       newRnti;
  *  @param[in] RgUeCb    *ue
  *  @return  ROK is SUCCESS 
  **/
-#ifdef ANSI
-S16 rgDelUeFrmAllSCell
-(
-RgCellCb      *cell,
-RgUeCb        *ue
-)
-#else
-S16 rgDelUeFrmAllSCell(cell, ue)
-RgCellCb      *cell;
-RgUeCb        *ue;
-#endif
+S16 rgDelUeFrmAllSCell(RgCellCb *cell,RgUeCb *ue)
 {
    Inst        inst     = cell->macInst - RG_INST_START;
-   U8          idx      = 0;
+   uint8_t     idx      = 0;
    Inst        sCellInstIdx;
    Pst         dstInstPst;
    RgPrgUeSCellDelInfo ueSCellDelInfo;
@@ -1218,19 +1061,7 @@ RgUeCb        *ue;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 rgUtlVltdAddSCellCfg
-(
- RgPrgUeSCellCfgInfo *ueSCellCb,
- RgCellCb    *cell,
- Inst        inst
-)
-#else
-S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
- RgPrgUeSCellCfgInfo *ueSCellCb;
- RgCellCb    *cell;
- Inst        inst;
-#endif
+S16 rgUtlVltdAddSCellCfg(RgPrgUeSCellCfgInfo *ueSCellCb,RgCellCb *cell,Inst inst)
 {
   S16 ret = ROK; 
   
@@ -1275,26 +1106,19 @@ S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs
+static S16 rgUtlSndCrntiChngReq2AllSMacs
 (
 RgCellCb        *cell,
 CmLteRnti       rnti,
 CmLteRnti       newRnti
 )
-#else
-PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs(cell, rnti, newRnti)
-RgCellCb        *cell;
-CmLteRnti       rnti;
-CmLteRnti       newRnti;
-#endif
 {
    Inst                inst = cell->macInst - RG_INST_START;
    Inst                sCellInstIdx;
    Pst                 dstInstPst;
    RgPrgUeSCellDelInfo ueIdChngReq;
    RgUeCb              *ue;
-   U8                  idx;
+   uint8_t                  idx;
 #ifdef L2_OPTMZ
 TfuDelDatReqInfo delDatReq;
 #endif
@@ -1357,17 +1181,7 @@ TfuDelDatReqInfo delDatReq;
  *  @param[in] CmLteRnti     rnti
  *  @return  Void 
  **/
-#ifdef ANSI
-PRIVATE Void rgUtlHndlCrntiRls
-(
-RgCellCb        *cell,
-RgInfRlsRnti    *rlsRnti
-)
-#else
-PRIVATE Void rgUtlHndlCrntiRls(cell, rlsRnti)
-RgCellCb        *cell;
-CmLteRnti       *rlsRnti;
-#endif
+static Void rgUtlHndlCrntiRls(RgCellCb *cell,RgInfRlsRnti *rlsRnti)
 {
    Inst           inst = cell->macInst - RG_INST_START;
    RgUeCb        *ue = NULLP;
@@ -1423,7 +1237,7 @@ CmLteRnti       *rlsRnti;
       }
    }
 
-   RETVOID;
+   return;
 } /* end of rgUtlHndlCrntiRls */
 
 /**
@@ -1445,17 +1259,7 @@ CmLteRnti       *rlsRnti;
  *  @return  S16
  *      -# ROK 
  **/
-#ifdef ANSI
-S16 RgSchMacRlsRntiReq
-(
-Pst                 *pst,
-RgInfRlsRnti        *rlsRnti
-)
-#else
-S16 RgSchMacRlsRntiReq(pst, rlsRnti)
-Pst                 *pst;
-RgInfRlsRnti        *rlsRnti;
-#endif
+S16 RgSchMacRlsRntiReq(Pst *pst,RgInfRlsRnti *rlsRnti)
 {
 //   Pst            schPst;
 //   RgInfUeDelInd  ueDelInd;
@@ -1540,15 +1344,7 @@ TfuDelDatReqInfo delDatReq;
 } /* end of RgSchMacRlsRntiReq */
 
 #ifdef L2_OPTMZ
-#ifdef ANSI
-Bool RgUtlIsTbMuxed
-(
- TfuDatReqTbInfo *tb
-)
-#else
-Bool RgUtlIsTbMuxed()
-   TfuDatReqTbInfo *tb
-#endif
+Bool RgUtlIsTbMuxed(TfuDatReqTbInfo *tb)
 {
    MsgLen len = 0;
    SFndLenMsg(tb->macHdr, &len);