X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgm.c;h=9857653176205cbcd1a5b2fa5e7ed56ee0d8aea9;hb=97a2285207414a7948f5e1dfcb5318fa9507c123;hp=d315a184246ba7e2e72c360fdbfdfb28e91682ee;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/cm/rgm.c b/src/cm/rgm.c
index d315a1842..985765317 100755
--- a/src/cm/rgm.c
+++ b/src/cm/rgm.c
@@ -57,22 +57,14 @@
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmBndReq
+S16 cmPkLwLcRgmBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-PUBLIC S16 cmPkLwLcRgmBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLwLcRgmBndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -109,25 +101,17 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkLwLcRgmBndReq
+S16 cmUnpkLwLcRgmBndReq
 (
 RgmBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkLwLcRgmBndReq(func, pst, mBuf)
-RgmBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
    S16  ret;
    
-   TRC3(cmUnpkLwLcRgmBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -161,22 +145,14 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmUbndReq
+S16 cmPkLwLcRgmUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-PUBLIC S16 cmPkLwLcRgmUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLwLcRgmUbndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -207,26 +183,18 @@ Reason reason;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmBndCfm
+S16 cmPkLwLcRgmBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
-#else
-PUBLIC S16 cmPkLwLcRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLwLcRgmBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -260,28 +228,20 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkLwLcRgmBndCfm
+S16 cmUnpkLwLcRgmBndCfm
 (
 RgmBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkLwLcRgmBndCfm(func, pst, mBuf)
-RgmBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkLwLcRgmBndCfm)
 
    if (oduPackUInt8(&status, mBuf) != ROK) 
    {
@@ -312,40 +272,32 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmCfgPrbRprt
+S16 cmPkLwLcRgmCfgPrbRprt
 (
 Pst* pst,
 SpId spId,
 RgmPrbRprtCfg  * prbRprtCfg
 )
-#else
-PUBLIC S16 cmPkLwLcRgmCfgPrbRprt(pst, spId, prbRprtCfg)
-Pst* pst;
-SpId spId;
-RgmPrbRprtCfg  * prbRprtCfg;
-#endif
 {
    Buffer *mBuf = NULLP;
-   U32 len = sizeof(RgmPrbRprtCfg);
-   TRC3(cmPkLwLcRgmCfgPrbRprt)
+   uint32_t len = sizeof(RgmPrbRprtCfg);
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
       return RFAILED;
    }
 
     if(oduPackPointer((PTR)prbRprtCfg, mBuf) != ROK)
     {
        SPutMsg(mBuf); 
-       SPutSBuf(pst->region, pst->pool, (Data*)prbRprtCfg, len);
+       SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data*)prbRprtCfg, len);
        return RFAILED;
     }
 
    if (SPkS16(spId, mBuf) != ROK) 
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -368,25 +320,17 @@ RgmPrbRprtCfg  * prbRprtCfg;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkLwLcRgmCfgPrbRprt
+S16 cmUnpkLwLcRgmCfgPrbRprt
 (
 RgmCfgPrbRprtFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkLwLcRgmCfgPrbRprt(func, pst, mBuf)
-RgmCfgPrbRprtFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    S16 ret;
    SpId spId;
    RgmPrbRprtCfg *prbRprtCfg;
    
-   TRC3(cmUnpkLwLcRgmCfgPrbRprt)
 
    if (SUnpkS16(&spId, mBuf) != ROK) 
    {
@@ -397,7 +341,7 @@ Buffer *mBuf;
    if (oduUnpackPointer((PTR *)&prbRprtCfg, mBuf) != ROK)
    {
       SPutMsg(mBuf);
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
       return RFAILED;
    }
 
@@ -421,39 +365,31 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmPrbRprtInd
+S16 cmPkLwLcRgmPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd  * prbRprtInd
 )
-#else
-PUBLIC S16 cmPkLwLcRgmPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd  * prbRprtInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkLwLcRgmPrbRprtInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
       return RFAILED;
    }
 
    if(oduPackPointer((PTR)prbRprtInd, mBuf) != ROK)
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
    if (SPkS16(suId, mBuf) != ROK) 
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -476,25 +412,17 @@ RgmPrbRprtInd  * prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkLwLcRgmPrbRprtInd
+S16 cmUnpkLwLcRgmPrbRprtInd
 (
 RgmPrbRprtIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkLwLcRgmPrbRprtInd(func, pst, mBuf)
-RgmPrbRprtIndFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgmPrbRprtInd *prbRprtInd;
    S16 ret;
    
-   TRC3(cmUnpkLwLcRgmPrbRprtInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -505,7 +433,7 @@ Buffer *mBuf;
    if (oduUnpackPointer((PTR *)&prbRprtInd, mBuf) != ROK) 
    {
       SPutMsg(mBuf);
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
       return RFAILED;
    }
 
@@ -532,22 +460,14 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkRgmBndReq
+S16 cmPkRgmBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-PUBLIC S16 cmPkRgmBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkRgmBndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -584,25 +504,17 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRgmBndReq
+S16 cmUnpkRgmBndReq
 (
 RgmBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkRgmBndReq(func, pst, mBuf)
-RgmBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
    S16  ret;
    
-   TRC3(cmUnpkRgmBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -636,22 +548,14 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkRgmUbndReq
+S16 cmPkRgmUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-PUBLIC S16 cmPkRgmUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkRgmUbndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -687,24 +591,16 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRgmUbndReq
+S16 cmUnpkRgmUbndReq
 (
 RgmUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkRgmUbndReq(func, pst, mBuf)
-RgmUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    Reason reason;
    
-   TRC3(cmUnpkRgmUbndReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) 
    {
@@ -731,26 +627,18 @@ Buffer *mBuf;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkRgmBndCfm
+S16 cmPkRgmBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
-#else
-PUBLIC S16 cmPkRgmBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkRgmBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -784,28 +672,20 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRgmBndCfm
+S16 cmUnpkRgmBndCfm
 (
 RgmBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkRgmBndCfm(func, pst, mBuf)
-RgmBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkRgmBndCfm)
 
    if (oduPackUInt8(&status, mBuf) != ROK) 
    {
@@ -837,19 +717,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkCfgPrbRprt
+S16 cmPkCfgPrbRprt
 (
 RgmPrbRprtCfg  * prbRprtCfg,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCfgPrbRprt(prbRprtCfg, mBuf)
-RgmPrbRprtCfg  * prbRprtCfg;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkCfgPrbRprt);
    CMCHKPK(oduUnpackUInt16, prbRprtCfg->usPrbAvgPeriodicty, mBuf);
    CMCHKPK(oduUnpackUInt8, prbRprtCfg->bConfigType, mBuf);
    CMCHKPK(oduUnpackUInt8, prbRprtCfg->bCellId, mBuf);
@@ -867,19 +740,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnPkCfgPrbRprt
+S16 cmUnPkCfgPrbRprt
 (
 RgmPrbRprtCfg  * prbRprtCfg,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnPkCfgPrbRprt(prbRprtCfg, mBuf)
-RgmPrbRprtCfg  * prbRprtCfg;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnPkCfgPrbRprt);
    CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bCellId, mBuf);
    CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bConfigType, mBuf);
    CMCHKUNPK(oduPackUInt16, &prbRprtCfg->usPrbAvgPeriodicty, mBuf);
@@ -902,45 +768,37 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkRgmCfgPrbRprt
+S16 cmPkRgmCfgPrbRprt
 (
 Pst* pst,
 SpId spId,
 RgmPrbRprtCfg  * prbRprtCfg
 )
-#else
-PUBLIC S16 cmPkRgmCfgPrbRprt(pst, spId, prbRprtCfg)
-Pst* pst;
-SpId spId;
-RgmPrbRprtCfg  * prbRprtCfg;
-#endif
 {
    Buffer *mBuf = NULLP;
-   U32 len = sizeof(RgmPrbRprtCfg);
-   TRC3(cmPkRgmCfgPrbRprt)
+   uint32_t len = sizeof(RgmPrbRprtCfg);
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
       return RFAILED;
    }
 
     if(cmPkCfgPrbRprt(prbRprtCfg, mBuf) != ROK)
     {
        SPutMsg(mBuf); 
-       SPutSBuf(pst->region, pst->pool, (Data*)prbRprtCfg, len);
+       SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data*)prbRprtCfg, len);
        return RFAILED;
     }
 
    if (SPkS16(spId, mBuf) != ROK) 
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
-   SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
+   SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg));
 
    pst->event = (Event) EVTRGMCFGPRBRPRT;
    return (SPstTsk(pst,mBuf));
@@ -961,25 +819,17 @@ RgmPrbRprtCfg  * prbRprtCfg;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRgmCfgPrbRprt
+S16 cmUnpkRgmCfgPrbRprt
 (
 RgmCfgPrbRprtFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkRgmCfgPrbRprt(func, pst, mBuf)
-RgmCfgPrbRprtFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    RgmPrbRprtCfg *prbRprtCfg;
 
-   TRC3(cmUnpkRgmCfgPrbRprt)
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&prbRprtCfg, sizeof(RgmPrbRprtCfg))) != ROK)
+   if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&prbRprtCfg, sizeof(RgmPrbRprtCfg))) != ROK)
       {
          SPutMsg(mBuf);
          return RFAILED;
@@ -1015,17 +865,11 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkRgmPrbQciRpt 
+S16 cmPkRgmPrbQciRpt 
 (
- RgmPrbRptPerQci *qciPrbRprt,
- Buffer *mBuf
- )
-#else
-PUBLIC S16 cmPkRgmPrbQciRpt(qciPrbRprt, mBuf)
-RgmPrbRptPerQci *qciPrbRprt;
-Buffer *mBuf = NULLP;
-#endif
+RgmPrbRptPerQci *qciPrbRprt,
+Buffer *mBuf
+)
 {
    CMCHKPK(oduUnpackUInt8, qciPrbRprt->bQci, mBuf);
    CMCHKPK(oduUnpackUInt8, qciPrbRprt->bAvgPrbUlUsage, mBuf);
@@ -1046,17 +890,11 @@ Buffer *mBuf = NULLP;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRgmPrbQciRpt 
+S16 cmUnpkRgmPrbQciRpt 
 (
- RgmPrbRptPerQci *qciPrbRprt,
- Buffer *mBuf
- )
-#else
-PUBLIC S16 cmUnpkRgmPrbQciRpt(qciPrbRprt, mBuf)
-RgmPrbRptPerQci *qciPrbRprt;
-Buffer *mBuf = NULLP;
-#endif
+RgmPrbRptPerQci *qciPrbRprt,
+Buffer *mBuf
+)
 {
    CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbDlUsage, mBuf);
    CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbUlUsage, mBuf);
@@ -1078,21 +916,14 @@ Buffer *mBuf = NULLP;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkPrbRprtInd
+S16 cmPkPrbRprtInd
 (
- RgmPrbRprtInd  * prbRprtInd,
- Buffer *mBuf
- )
-#else
-PUBLIC S16 cmPkPrbRprtInd(prbRprtInd, mBuf)
-   RgmPrbRprtInd  * prbRprtInd;
-   Buffer *mBuf = NULLP;
-#endif
+RgmPrbRprtInd  * prbRprtInd,
+Buffer *mBuf
+)
 {
    S32 idx = 0;
 
-   TRC3(cmPkPrbRprtInd); 
    
    /* RRM_SP1_START */
    for(idx = RGM_MAX_QCI_REPORTS-1; idx >= 0; idx--)
@@ -1117,21 +948,14 @@ PUBLIC S16 cmPkPrbRprtInd(prbRprtInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkPrbRprtInd
+S16 cmUnpkPrbRprtInd
 (
- RgmPrbRprtInd  * prbRprtInd,
- Buffer *mBuf
- )
-#else
-PUBLIC S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf)
-   RgmPrbRprtInd  * prbRprtInd;
-   Buffer *mBuf;
-#endif
+RgmPrbRprtInd  * prbRprtInd,
+Buffer *mBuf
+)
 {
-   U32 idx = 0;
+   uint32_t idx = 0;
 
-   TRC3(cmUnpkPrbRprtInd);
 
    /* RRM_SP1_START */
    CMCHKUNPK(oduPackUInt8, &prbRprtInd->bCellId, mBuf);
@@ -1160,44 +984,36 @@ PUBLIC S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkRgmPrbRprtInd
+S16 cmPkRgmPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd  * prbRprtInd
 )
-#else
-PUBLIC S16 cmPkRgmPrbRprtInd(pst, suId, prbRprtInd)
-Pst* pst;
-SuId suId;
-RgmPrbRprtInd  * prbRprtInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkRgmPrbRprtInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
       return RFAILED;
    }
 
    if(cmPkPrbRprtInd(prbRprtInd, mBuf) != ROK)
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
    if (SPkS16(suId, mBuf) != ROK) 
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
-   SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
+   SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
 
    pst->event = (Event) EVTRGMPRBRPRTIND;
    return (SPstTsk(pst,mBuf));
@@ -1215,24 +1031,16 @@ RgmPrbRprtInd  * prbRprtInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRgmPrbRprtInd
+S16 cmUnpkRgmPrbRprtInd
 (
 RgmPrbRprtIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkRgmPrbRprtInd(func, pst, mBuf)
-RgmPrbRprtIndFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgmPrbRprtInd prbRprtInd;
    
-   TRC3(cmUnpkRgmPrbRprtInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -1262,19 +1070,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkTransModeInd
+S16 cmPkTransModeInd
 (
- RgmTransModeInd *transModeInd,
- Buffer *mBuf
- )
-#else
-PUBLIC S16 cmPkTransModeInd(transModeInd, mBuf)
-   RgmTransModeInd *transModeInd;
-   Buffer *mBuf;
-#endif
+RgmTransModeInd *transModeInd,
+Buffer *mBuf
+)
 {
-   TRC3(cmPkTransModeInd); 
    CMCHKPK(oduUnpackUInt32, transModeInd->eMode, mBuf);
    CMCHKPK(oduUnpackUInt16, transModeInd->usCrnti, mBuf);
    CMCHKPK(oduUnpackUInt8, transModeInd->bCellId, mBuf);
@@ -1293,23 +1094,16 @@ PUBLIC S16 cmPkTransModeInd(transModeInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkTransModeInd
+S16 cmUnpkTransModeInd
 (
- RgmTransModeInd *transModeInd,
- Buffer *mBuf
- )
-#else
-PUBLIC S16 cmUnpkTransModeInd(transModeInd, mBuf)
-   RgmTransModeInd *transModeInd;
-   Buffer *mBuf;
-#endif
+RgmTransModeInd *transModeInd,
+Buffer *mBuf
+)
 {
-   U32 tmpModeEnum;
-   TRC3(cmUnpkTransModeInd);
+   uint32_t tmpModeEnum;
    CMCHKUNPK(oduPackUInt8, &transModeInd->bCellId, mBuf);
    CMCHKUNPK(oduPackUInt16, &transModeInd->usCrnti, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpModeEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpModeEnum, mBuf);
    transModeInd->eMode = (RgmTxnMode)tmpModeEnum;
    return ROK;
 }
@@ -1326,44 +1120,37 @@ PUBLIC S16 cmUnpkTransModeInd(transModeInd, mBuf)
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkRgmTransModeInd 
+
+S16 cmPkRgmTransModeInd 
 (
 Pst* pst,
 SuId suId,
 RgmTransModeInd *transModeInd
 )
-#else
-PUBLIC S16 cmPkRgmTransModeInd(pst, suId, transModeInd)
-Pst* pst;
-SuId suId;
-RgmTransModeInd *transModeInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkRgmTransModeInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
       return RFAILED;
    }
 
    if(cmPkTransModeInd(transModeInd, mBuf) != ROK)
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
    if (SPkS16(suId, mBuf) != ROK) 
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
-   SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
+   SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
 
    pst->event = (Event) EVTRGMTRANSMODEIND;
    return (SPstTsk(pst,mBuf));
@@ -1381,24 +1168,16 @@ RgmTransModeInd *transModeInd;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRgmTransModeInd
+S16 cmUnpkRgmTransModeInd
 (
 RgmTransModeIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkRgmTransModeInd(func, pst, mBuf)
-RgmTransModeIndFptr func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgmTransModeInd transModeInd;
    
-   TRC3(cmUnpkRgmTransModeInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {