X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_prg.c;h=ea572fc2e1d7dc8d00048633e67f5f5014cbcee6;hb=de6a435729e3cad9d4a66329080b8206a64f452c;hp=8527728665fdb00e93b6c9995a7c9b0221f35949;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c
index 852772866..ea572fc2e 100755
--- a/src/5gnrmac/rg_prg.c
+++ b/src/5gnrmac/rg_prg.c
@@ -65,23 +65,11 @@
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellCfgReq
-(
-Pst           *pst,
-RgPrgUeSCellCfgInfo   *ueSCellCfgInfo
-)
-#else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellCfgReq(pst, ueSCellCfgInfo)
-Pst            *pst;
-RgPrgUeSCellCfgInfo    *ueSCellCfgInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellCfgReq(Pst  *pst,RgPrgUeSCellCfgInfo   *ueSCellCfgInfo)
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellCfgReq)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+   if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) 
    {
       return RFAILED;
    }
@@ -110,24 +98,10 @@ RgPrgUeSCellCfgInfo    *ueSCellCfgInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellCfgReq
-(
-RgPrgUeSCellCfgReq   func,
-Pst                  *pst,
-Buffer               *mBuf
-)
-#else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellCfgReq(func, pst, mBuf)
-RgPrgUeSCellCfgReq   func;
-Pst                  *pst;
-Buffer               *mBuf;
-#endif
+S16 cmUnpkPrgPMacSMacUeSCellCfgReq(RgPrgUeSCellCfgReq   func,Pst *pst,Buffer  *mBuf)
 {
    RgPrgUeSCellCfgInfo    ueSCellCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellCfgReq)
-
    if(SRemPreMsgMult((Data *)&ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
@@ -151,23 +125,11 @@ Buffer               *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmPkPrgSMacPMacCfgCfm
-(
-Pst               *pst,
-RgPrgCfgCfmInfo   *cfgCfm
-)
-#else
-PUBLIC S16 cmPkPrgSMacPMacCfgCfm(pst, cfgCfm)
-Pst                *pst;
-RgPrgCfgCfmInfo    *cfgCfm;
-#endif
+S16 cmPkPrgSMacPMacCfgCfm(Pst *pst,RgPrgCfgCfmInfo   *cfgCfm)
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgSMacPMacCfgCfm)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+   if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) 
    {
       return RFAILED;
    }
@@ -217,24 +179,15 @@ RgPrgCfgCfmInfo    *cfgCfm;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkPrgSMacPMacCfgCfm
+S16 cmUnpkPrgSMacPMacCfgCfm
 (
 RgSMacPMacCfgCfm    func,
 Pst                 *pst,
 Buffer              *mBuf
 )
-#else
-PUBLIC S16 cmUnpkPrgSMacPMacCfgCfm(func, pst, mBuf)
-RgSMacPMacCfgCfm    func;
-Pst                 *pst;
-Buffer              *mBuf;
-#endif
 {
    RgPrgCfgCfmInfo   cfgCfm;
    
-   TRC2(cmUnpkPrgSMacPMacCfgCfm)
-
    if(SRemPreMsgMult((Data *)&cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
@@ -258,23 +211,11 @@ Buffer              *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellDelReq
-(
-Pst                   *pst,
-RgPrgUeSCellDelInfo   *ueSCellDelInfo
-)
-#else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
-Pst                    *pst;
-RgPrgUeSCellDelInfo    *ueSCellDelInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellDelReq(Pst *pst,RgPrgUeSCellDelInfo   *ueSCellDelInfo)
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellDelReq)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+   if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) 
    {
       return RFAILED;
    }
@@ -304,24 +245,15 @@ RgPrgUeSCellDelInfo    *ueSCellDelInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellDelReq
+S16 cmUnpkPrgPMacSMacUeSCellDelReq
 (
 RgUeSCellDelReq    func,
 Pst                *pst,
 Buffer             *mBuf
 )
-#else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellDelReq(func, pst, mBuf)
-RgUeSCellDelReq  func;
-Pst              *pst;
-Buffer           *mBuf;
-#endif
 {
   RgPrgUeSCellDelInfo ueSCellDelInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellDelReq)
-
    if(SRemPreMsgMult((Data *)&ueSCellDelInfo, sizeof(RgPrgUeSCellDelInfo),\
             mBuf) != ROK)
    {
@@ -346,23 +278,11 @@ Buffer           *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchAddReq
-(
-Pst                      *pst,
-RgPrgUeSCellLchAddInfo   *lchCfgInfo,
-)
-#else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchAddReq(pst, lchCfgInfo)
-Pst                       *pst;
-RgPrgUeSCellLchAddInfo    *lchCfgInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellLchAddReq(Pst *pst,RgPrgUeSCellLchAddInfo   *lchCfgInfo)
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellLchAddReq)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+   if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) 
    {
       return RFAILED;
    }
@@ -392,24 +312,15 @@ RgPrgUeSCellLchAddInfo    *lchCfgInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchAddReq
+S16 cmUnpkPrgPMacSMacUeSCellLchAddReq
 (
 RgPrgUeSCellLchAddInfo       func,
 Pst                          *pst,
 Buffer                       *mBuf
 )
-#else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchAddReq(func, pst, mBuf)
-RgPrgUeSCellLchAddInfo       func;
-Pst                          *pst;
-Buffer                       *mBuf;
-#endif
 {
    RgPrgLchRecfgInfo    lchCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellLchAddReq)
-
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
@@ -433,23 +344,11 @@ Buffer                       *mBuf;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchDelReq
-(
-Pst                       *pst,
-RgPrgUeSCellLchDelInfo    *delLcCb
-)
-#else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
-Pst                       *pst;
-RgPrgUeSCellLchDelInfo    *delLcCb;
-#endif
+S16 cmPkPrgPMacSMacUeSCellLchDelReq(Pst *pst,RgPrgUeSCellLchDelInfo *delLcCb)
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellLchDelReq)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+   if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) 
    {
       return RFAILED;
    }
@@ -479,23 +378,11 @@ RgPrgUeSCellLchDelInfo    *delLcCb;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchModReq
-(
-Pst                      *pst,
-RgPrgUeSCellLchModInfo   *lchCfgInfo
-)
-#else
-PUBLIC S16 cmPkPrgPMacSMacUeSCellLchModReq(pst, lchCfgInfo)
-Pst                       *pst;
-RgPrgUeSCellLchModInfo    *lchCfgInfo;
-#endif
+S16 cmPkPrgPMacSMacUeSCellLchModReq(Pst  *pst,RgPrgUeSCellLchModInfo  *lchCfgInfo)
 {
    Buffer *mBuf = NULLP;
 
-   TRC2(cmPkPrgPMacSMacUeSCellLchModReq)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
+   if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) 
    {
       return RFAILED;
    }
@@ -526,24 +413,15 @@ RgPrgUeSCellLchModInfo    *lchCfgInfo;
  *  @return   S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchModReq
+S16 cmUnpkPrgPMacSMacUeSCellLchModReq
 (
 RgPrgUeScellModLchReq   func,
 Pst                     *pst,
 Buffer                  *mBuf
 )
-#else
-PUBLIC S16 cmUnpkPrgPMacSMacAddLchCfgReq(func, pst, mBuf)
-RgPrgUeScellModLchReq   func;
-Pst                     *pst;
-Buffer                  *mBuf;
-#endif
 {
    RgPrgUeSCellLchModInfo   lchCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacAddLchCfgReq)
-
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);
@@ -569,24 +447,15 @@ Buffer                  *mBuf;
  *  @return      S16
  *      -# ROK
  **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchDelReq
+S16 cmUnpkPrgPMacSMacUeSCellLchDelReq
 (
 RgPrgUeScellDelLchReq   func,
 Pst                     *pst,
 Buffer                  *mBuf
 )
-#else
-PUBLIC S16 cmUnpkPrgPMacSMacUeSCellLchDelReq(func, pst, mBuf)
-RgPrgUeScellDelLchReq   func;
-Pst                     *pst;
-Buffer                  *mBuf;
-#endif
 {
    RgPrgUeSCellLchDelInfo   lchCfgInfo;
    
-   TRC2(cmUnpkPrgPMacSMacUeSCellLchDelReq)
-
    if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchDelInfo), mBuf) != ROK)
    {
       RGPRG_FREE_MSG(mBuf);