X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_com.c;h=039d3599c5ae77e7131cdcaaaad8998c040fc0a0;hb=37badc1a711fc7802d2f0b67924f3c15e569a7d5;hp=5dba24f54795387c03b846dd5e335511ea1022ae;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c
index 5dba24f54..039d3599c 100755
--- a/src/5gnrmac/rg_com.c
+++ b/src/5gnrmac/rg_com.c
@@ -61,11 +61,11 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_pom_scell.x"
 #endif
 /* local defines */
-PRIVATE S16 rgCOMHndlCfgReq ARGS((Inst inst,CrgCfg  *cfg, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId));
-PRIVATE S16 rgCOMHndlRecfgReq ARGS((Inst inst,CrgRecfg *recfg, RgErrInfo *errInfo, \
+static S16 rgCOMHndlCfgReq ARGS((Inst inst,CrgCfg  *cfg, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId));
+static S16 rgCOMHndlRecfgReq ARGS((Inst inst,CrgRecfg *recfg, RgErrInfo *errInfo, \
          CrgCfgTransId transId,Bool *isCfmRqrd));
-PRIVATE S16 rgCOMHndlDelReq ARGS((Inst inst,CrgDel *del, RgErrInfo *errInfo, Bool *isCfmRqrd, CrgCfgTransId transId));
-PRIVATE S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo));
+static S16 rgCOMHndlDelReq ARGS((Inst inst,CrgDel *del, RgErrInfo *errInfo, Bool *isCfmRqrd, CrgCfgTransId transId));
+static S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo));
 /* local typedefs */
  
 /* local externs */
@@ -97,19 +97,12 @@ PRIVATE S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo))
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgCOMCfgReq
 (
 Inst          inst,
 CrgCfgTransId transId,
 CrgCfgReqInfo *crgCfgReq
 )
-#else
-S16 rgCOMCfgReq(inst,transId, crgCfgReq)
-Inst          inst;
-CrgCfgTransId transId;
-CrgCfgReqInfo *crgCfgReq;
-#endif
 {
    S16             ret;
    uint8_t         cfmStatus = CRG_CFG_CFM_OK;
@@ -195,8 +188,7 @@ if(TRUE == isCfmRqrd)
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-PRIVATE S16 rgCOMHndlCfgReq
+static S16 rgCOMHndlCfgReq
 (
 Inst             inst,
 CrgCfg           *cfg,
@@ -204,14 +196,6 @@ RgErrInfo        *errInfo,
 Bool             *isCfmRqrd,
 CrgCfgTransId    transId
 )
-#else
-PRIVATE S16 rgCOMHndlCfgReq(inst,cfg, errInfo,isCfmRqrd,transId)
-Inst            inst;
-CrgCfg          *cfg;
-RgErrInfo       *errInfo;
-Bool            *isCfmRqrd;
-CrgCfgTransId   transId;
-#endif
 {
    S16       ret;
    RgCellCb  *cell = NULLP;
@@ -296,8 +280,7 @@ CrgCfgTransId   transId;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-PRIVATE S16 rgCOMHndlRecfgReq
+static S16 rgCOMHndlRecfgReq
 (
 Inst             inst,
 CrgRecfg         *recfg,
@@ -305,14 +288,6 @@ RgErrInfo        *errInfo,
 CrgCfgTransId    transId,
 Bool             *isCfmRqrd
 )
-#else
-PRIVATE S16 rgCOMHndlRecfgReq(inst,recfg, errInfo, transId, isCfmRqrd)
-Inst            inst;
-CrgRecfg        *recfg;
-RgErrInfo       *errInfo;
-CrgCfgTransId   transId;
-Bool            *isCfmRqrd;
-#endif
 {
    S16       ret;
    RgCellCb  *cell = rgCb[inst].cell;
@@ -433,19 +408,12 @@ Bool            *isCfmRqrd;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-PRIVATE S16 rgCOMHndlResetReq
+static S16 rgCOMHndlResetReq
 (
 Inst       inst,
 CrgRst     *reset,
 RgErrInfo  *errInfo
 )
-#else
-PRIVATE S16 rgCOMHndlResetReq(inst,reset, errInfo)
-Inst       inst;
-CrgRst     *reset;
-RgErrInfo  *errInfo;
-#endif
 {
    /* Fix : ccpu00126865: ignore CRG reset. Let SCH trigger it. */
    
@@ -477,8 +445,7 @@ RgErrInfo  *errInfo;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-PRIVATE S16 rgCOMHndlDelReq
+static S16 rgCOMHndlDelReq
 (
 Inst        inst,
 CrgDel      *del,
@@ -486,18 +453,10 @@ RgErrInfo   *errInfo,
 Bool        *isCfmRqrd,
 CrgCfgTransId transId
 )
-#else
-PRIVATE S16 rgCOMHndlDelReq(inst,del, errInfo,isCfmRqrd,transId)
-Inst        inst;
-CrgDel      *del;
-RgErrInfo   *errInfo;
-Bool        *isCfmRqrd;
-CrgCfgTransId transId;
-#endif
 {
 
-   S16            ret;
-   VOLATILE uint32_t   startTime=0;
+   S16      ret;
+   volatile uint32_t   startTime=0;
 
    errInfo->errType = RGERR_COM_DEL_REQ;
    
@@ -560,17 +519,11 @@ CrgCfgTransId transId;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgPrgPMacSMacUeSCellCfgReq
 (
 Pst         *pst,    
 RgPrgUeSCellCfgInfo *ueSCellCb
 )
-#else
-S16 RgPrgPMacSMacUeSCellCfgReq(pst, ueSCellCb)
-Pst         *pst;    
-RgPrgUeSCellCfgInfo *ueSCellCb;
-#endif
 {
    RgPrgCfgCfmInfo  cfgCfm;
    Inst             inst = pst->dstInst;
@@ -641,17 +594,11 @@ RgPrgUeSCellCfgInfo *ueSCellCb;
  *      -# ROK
  *      -# RFAILED
  **/
-#ifdef ANSI
 S16 RgPrgSMacPMacCfgCfm
 (
 Pst             *pst,    
 RgPrgCfgCfmInfo *cfgCfm
 )
-#else
-S16 RgPrgSMacPMacCfgCfm(pst, cfgCfm)
-Pst             *pst;    
-RgPrgCfgCfmInfo *cfgCfm;
-#endif
 {
    Inst      inst = pst->dstInst;
    RgCellCb *cell;
@@ -739,17 +686,11 @@ RgPrgCfgCfmInfo *cfgCfm;
  *  @param[in] RgPrgUeSCellDelInfo *ueSCellDelInfo
  *  @return  ROK is SUCCESS 
  **/
-#ifdef ANSI
 S16 RgPrgPMacSMacUeSCellDelReq
 (
 Pst                 *pst,
 RgPrgUeSCellDelInfo *ueSCellDelInfo
 )
-#else
-S16 RgPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
-Pst                 *pst;
-RgPrgUeSCellDelInfo *ueSCellDelInfo;
-#endif
 {
    Inst        inst     = pst->dstInst - RG_INST_START;
    RgCellCb    *sCell   = rgCb[inst].cell;