X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_prg.c;h=a8dbcb7634cccb6ad94c205c2a793c5366cb2ed2;hb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;hp=59e9f218976dd493800367572622c0a41b5a83e8;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c
index 59e9f2189..a8dbcb763 100755
--- a/src/5gnrmac/rg_prg.c
+++ b/src/5gnrmac/rg_prg.c
@@ -66,35 +66,33 @@
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellCfgReq
+S16 cmPkPrgPMacSMacUeSCellCfgReq
 (
 Pst           *pst,
 RgPrgUeSCellCfgInfo   *ueSCellCfgInfo
 )
 #else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellCfgReq(pst, ueSCellCfgInfo)
+S16 cmPkPrgPMacSMacUeSCellCfgReq(pst, ueSCellCfgInfo)
 Pst            *pst;
 RgPrgUeSCellCfgInfo    *ueSCellCfgInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellCfgReq)
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLCFGREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -111,14 +109,14 @@ RgPrgUeSCellCfgInfo    *ueSCellCfgInfo;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellCfgReq
+S16 cmUnpkPrgPMacSMacUeSCellCfgReq
 (
 RgPrgUeSCellCfgReq   func,
 Pst                  *pst,
 Buffer               *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellCfgReq(func, pst, mBuf)
+S16 cmUnpkPrgPMacSMacUeSCellCfgReq(func, pst, mBuf)
 RgPrgUeSCellCfgReq   func;
 Pst                  *pst;
 Buffer               *mBuf;
@@ -126,16 +124,14 @@ Buffer               *mBuf;
 {
    RgPrgUeSCellCfgInfo    ueSCellCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellCfgReq)
-
    if(SRemPreMsgMult((Data *)&ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &ueSCellCfgInfo));
+   return ((*func)(pst, &ueSCellCfgInfo));
 }
 
 /** 
@@ -152,30 +148,28 @@ Buffer               *mBuf;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmPkPrgSMacPMacCfgCfm
+S16 cmPkPrgSMacPMacCfgCfm
 (
 Pst               *pst,
 RgPrgCfgCfmInfo   *cfgCfm
 )
 #else
-PUBLIC S16 cmPkPrgSMacPMacCfgCfm(pst, cfgCfm)
+S16 cmPkPrgSMacPMacCfgCfm(pst, cfgCfm)
 Pst                *pst;
 RgPrgCfgCfmInfo    *cfgCfm;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgSMacPMacCfgCfm)
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    switch(cfgCfm->event)
    {
@@ -200,7 +194,7 @@ RgPrgCfgCfmInfo    *cfgCfm;
       }
       break;
    }
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -218,14 +212,14 @@ RgPrgCfgCfmInfo    *cfgCfm;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPrgSMacPMacCfgCfm
+S16 cmUnpkPrgSMacPMacCfgCfm
 (
 RgSMacPMacCfgCfm    func,
 Pst                 *pst,
 Buffer              *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPrgSMacPMacCfgCfm(func, pst, mBuf)
+S16 cmUnpkPrgSMacPMacCfgCfm(func, pst, mBuf)
 RgSMacPMacCfgCfm    func;
 Pst                 *pst;
 Buffer              *mBuf;
@@ -233,16 +227,14 @@ Buffer              *mBuf;
 {
    RgPrgCfgCfmInfo   cfgCfm;
    
-   TRC2(cmUnpkPrgSMacPMacCfgCfm)
-
    if(SRemPreMsgMult((Data *)&cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &cfgCfm));
+   return ((*func)(pst, &cfgCfm));
 }
 
 /** 
@@ -259,35 +251,33 @@ Buffer              *mBuf;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellDelReq
+S16 cmPkPrgPMacSMacUeSCellDelReq
 (
 Pst                   *pst,
 RgPrgUeSCellDelInfo   *ueSCellDelInfo
 )
 #else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
+S16 cmPkPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
 Pst                    *pst;
 RgPrgUeSCellDelInfo    *ueSCellDelInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellDelReq)
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)ueSCellDelInfo, sizeof(RgPrgUeSCellDelInfo), mBuf)\
          != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLDELREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -305,14 +295,14 @@ RgPrgUeSCellDelInfo    *ueSCellDelInfo;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellDelReq
+S16 cmUnpkPrgPMacSMacUeSCellDelReq
 (
 RgUeSCellDelReq    func,
 Pst                *pst,
 Buffer             *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellDelReq(func, pst, mBuf)
+S16 cmUnpkPrgPMacSMacUeSCellDelReq(func, pst, mBuf)
 RgUeSCellDelReq  func;
 Pst              *pst;
 Buffer           *mBuf;
@@ -320,17 +310,15 @@ Buffer           *mBuf;
 {
   RgPrgUeSCellDelInfo ueSCellDelInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellDelReq)
-
    if(SRemPreMsgMult((Data *)&ueSCellDelInfo, sizeof(RgPrgUeSCellDelInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &ueSCellDelInfo));
+   return ((*func)(pst, &ueSCellDelInfo));
 }
 
 /** 
@@ -347,35 +335,33 @@ Buffer           *mBuf;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchAddReq
+S16 cmPkPrgPMacSMacUeSCellLchAddReq
 (
 Pst                      *pst,
 RgPrgUeSCellLchAddInfo   *lchCfgInfo,
 )
 #else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchAddReq(pst, lchCfgInfo)
+S16 cmPkPrgPMacSMacUeSCellLchAddReq(pst, lchCfgInfo)
 Pst                       *pst;
 RgPrgUeSCellLchAddInfo    *lchCfgInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellLchAddReq)
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLLCHADDREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 /** 
@@ -393,14 +379,14 @@ RgPrgUeSCellLchAddInfo    *lchCfgInfo;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchAddReq
+S16 cmUnpkPrgPMacSMacUeSCellLchAddReq
 (
 RgPrgUeSCellLchAddInfo       func,
 Pst                          *pst,
 Buffer                       *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchAddReq(func, pst, mBuf)
+S16 cmUnpkPrgPMacSMacUeSCellLchAddReq(func, pst, mBuf)
 RgPrgUeSCellLchAddInfo       func;
 Pst                          *pst;
 Buffer                       *mBuf;
@@ -408,16 +394,14 @@ Buffer                       *mBuf;
 {
    RgPrgLchRecfgInfo    lchCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellLchAddReq)
-
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &lchCfgInfo));
+   return ((*func)(pst, &lchCfgInfo));
 }
 
 /** 
@@ -434,35 +418,33 @@ Buffer                       *mBuf;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchDelReq
+S16 cmPkPrgPMacSMacUeSCellLchDelReq
 (
 Pst                       *pst,
 RgPrgUeSCellLchDelInfo    *delLcCb
 )
 #else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
+S16 cmPkPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
 Pst                       *pst;
 RgPrgUeSCellLchDelInfo    *delLcCb;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellLchDelReq)
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)delLcCb, sizeof(RgPrgUeSCellLchDelInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLLCHDELREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 
@@ -480,35 +462,33 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchModReq
+S16 cmPkPrgPMacSMacUeSCellLchModReq
 (
 Pst                      *pst,
 RgPrgUeSCellLchModInfo   *lchCfgInfo
 )
 #else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchModReq(pst, lchCfgInfo)
+S16 cmPkPrgPMacSMacUeSCellLchModReq(pst, lchCfgInfo)
 Pst                       *pst;
 RgPrgUeSCellLchModInfo    *lchCfgInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellLchModReq)
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    if(SAddPstMsgMult((Data *)lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo),\
             mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    pst->event = (Event) EVTPRGUESCELLLCHMODREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 
@@ -527,14 +507,14 @@ RgPrgUeSCellLchModInfo    *lchCfgInfo;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchModReq
+S16 cmUnpkPrgPMacSMacUeSCellLchModReq
 (
 RgPrgUeScellModLchReq   func,
 Pst                     *pst,
 Buffer                  *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPrgPMacSMacAddLchCfgReq(func, pst, mBuf)
+S16 cmUnpkPrgPMacSMacAddLchCfgReq(func, pst, mBuf)
 RgPrgUeScellModLchReq   func;
 Pst                     *pst;
 Buffer                  *mBuf;
@@ -542,16 +522,14 @@ Buffer                  *mBuf;
 {
    RgPrgUeSCellLchModInfo   lchCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacAddLchCfgReq)
-
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &lchCfgInfo));
+   return ((*func)(pst, &lchCfgInfo));
 }
 
 
@@ -570,14 +548,14 @@ Buffer                  *mBuf;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchDelReq
+S16 cmUnpkPrgPMacSMacUeSCellLchDelReq
 (
 RgPrgUeScellDelLchReq   func,
 Pst                     *pst,
 Buffer                  *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchDelReq(func, pst, mBuf)
+S16 cmUnpkPrgPMacSMacUeSCellLchDelReq(func, pst, mBuf)
 RgPrgUeScellDelLchReq   func;
 Pst                     *pst;
 Buffer                  *mBuf;
@@ -585,16 +563,14 @@ Buffer                  *mBuf;
 {
    RgPrgUeSCellLchDelInfo   lchCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellLchDelReq)
-
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchDelInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    RGPRG_FREE_MSG(mBuf);
-   RETVALUE((*func)(pst, &lchCfgInfo));
+   return ((*func)(pst, &lchCfgInfo));
 }
 
 #endif /*LCPRG*/