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

diff --git a/src/cm/rgm.c b/src/cm/rgm.c
index d315a1842..0dd9f6848 100755
--- a/src/cm/rgm.c
+++ b/src/cm/rgm.c
@@ -58,21 +58,20 @@
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmBndReq
+S16 cmPkLwLcRgmBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 cmPkLwLcRgmBndReq(pst, suId, spId)
+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) 
    {
@@ -110,14 +109,14 @@ SpId spId;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLwLcRgmBndReq
+S16 cmUnpkLwLcRgmBndReq
 (
 RgmBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLwLcRgmBndReq(func, pst, mBuf)
+S16 cmUnpkLwLcRgmBndReq(func, pst, mBuf)
 RgmBndReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -127,7 +126,6 @@ Buffer *mBuf;
    SpId spId;
    S16  ret;
    
-   TRC3(cmUnpkLwLcRgmBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -162,21 +160,20 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmUbndReq
+S16 cmPkLwLcRgmUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 cmPkLwLcRgmUbndReq(pst, spId, reason)
+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 +204,25 @@ 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)
+S16 cmPkLwLcRgmBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLwLcRgmBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -260,28 +256,27 @@ 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)
+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) 
    {
@@ -313,22 +308,21 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmCfgPrbRprt
+S16 cmPkLwLcRgmCfgPrbRprt
 (
 Pst* pst,
 SpId spId,
 RgmPrbRprtCfg  * prbRprtCfg
 )
 #else
-PUBLIC S16 cmPkLwLcRgmCfgPrbRprt(pst, spId, prbRprtCfg)
+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) 
    {
@@ -369,14 +363,14 @@ RgmPrbRprtCfg  * prbRprtCfg;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLwLcRgmCfgPrbRprt
+S16 cmUnpkLwLcRgmCfgPrbRprt
 (
 RgmCfgPrbRprtFptr func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLwLcRgmCfgPrbRprt(func, pst, mBuf)
+S16 cmUnpkLwLcRgmCfgPrbRprt(func, pst, mBuf)
 RgmCfgPrbRprtFptr func;
 Pst *pst;
 Buffer *mBuf;
@@ -386,7 +380,6 @@ Buffer *mBuf;
    SpId spId;
    RgmPrbRprtCfg *prbRprtCfg;
    
-   TRC3(cmUnpkLwLcRgmCfgPrbRprt)
 
    if (SUnpkS16(&spId, mBuf) != ROK) 
    {
@@ -422,14 +415,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLwLcRgmPrbRprtInd
+S16 cmPkLwLcRgmPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd  * prbRprtInd
 )
 #else
-PUBLIC S16 cmPkLwLcRgmPrbRprtInd(pst, suId, prbRprtInd)
+S16 cmPkLwLcRgmPrbRprtInd(pst, suId, prbRprtInd)
 Pst* pst;
 SuId suId;
 RgmPrbRprtInd  * prbRprtInd;
@@ -437,7 +430,6 @@ RgmPrbRprtInd  * prbRprtInd;
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkLwLcRgmPrbRprtInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
@@ -477,14 +469,14 @@ RgmPrbRprtInd  * prbRprtInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLwLcRgmPrbRprtInd
+S16 cmUnpkLwLcRgmPrbRprtInd
 (
 RgmPrbRprtIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLwLcRgmPrbRprtInd(func, pst, mBuf)
+S16 cmUnpkLwLcRgmPrbRprtInd(func, pst, mBuf)
 RgmPrbRprtIndFptr func;
 Pst *pst;
 Buffer *mBuf;
@@ -494,7 +486,6 @@ Buffer *mBuf;
    RgmPrbRprtInd *prbRprtInd;
    S16 ret;
    
-   TRC3(cmUnpkLwLcRgmPrbRprtInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -533,21 +524,20 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkRgmBndReq
+S16 cmPkRgmBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 cmPkRgmBndReq(pst, suId, spId)
+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) 
    {
@@ -585,14 +575,14 @@ SpId spId;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgmBndReq
+S16 cmUnpkRgmBndReq
 (
 RgmBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgmBndReq(func, pst, mBuf)
+S16 cmUnpkRgmBndReq(func, pst, mBuf)
 RgmBndReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -602,7 +592,6 @@ Buffer *mBuf;
    SpId spId;
    S16  ret;
    
-   TRC3(cmUnpkRgmBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -637,21 +626,20 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkRgmUbndReq
+S16 cmPkRgmUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 cmPkRgmUbndReq(pst, spId, reason)
+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) 
    {
@@ -688,14 +676,14 @@ Reason reason;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgmUbndReq
+S16 cmUnpkRgmUbndReq
 (
 RgmUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgmUbndReq(func, pst, mBuf)
+S16 cmUnpkRgmUbndReq(func, pst, mBuf)
 RgmUbndReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -704,7 +692,6 @@ Buffer *mBuf;
    SpId spId;
    Reason reason;
    
-   TRC3(cmUnpkRgmUbndReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) 
    {
@@ -731,26 +718,25 @@ 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)
+S16 cmPkRgmBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkRgmBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
    {
@@ -784,28 +770,27 @@ 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)
+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) 
    {
@@ -838,18 +823,17 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCfgPrbRprt
+S16 cmPkCfgPrbRprt
 (
 RgmPrbRprtCfg  * prbRprtCfg,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCfgPrbRprt(prbRprtCfg, mBuf)
+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);
@@ -868,18 +852,17 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnPkCfgPrbRprt
+S16 cmUnPkCfgPrbRprt
 (
 RgmPrbRprtCfg  * prbRprtCfg,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnPkCfgPrbRprt(prbRprtCfg, mBuf)
+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);
@@ -903,22 +886,21 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkRgmCfgPrbRprt
+S16 cmPkRgmCfgPrbRprt
 (
 Pst* pst,
 SpId spId,
 RgmPrbRprtCfg  * prbRprtCfg
 )
 #else
-PUBLIC S16 cmPkRgmCfgPrbRprt(pst, spId, prbRprtCfg)
+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) 
    {
@@ -962,14 +944,14 @@ RgmPrbRprtCfg  * prbRprtCfg;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgmCfgPrbRprt
+S16 cmUnpkRgmCfgPrbRprt
 (
 RgmCfgPrbRprtFptr func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgmCfgPrbRprt(func, pst, mBuf)
+S16 cmUnpkRgmCfgPrbRprt(func, pst, mBuf)
 RgmCfgPrbRprtFptr func;
 Pst *pst;
 Buffer *mBuf;
@@ -978,7 +960,6 @@ Buffer *mBuf;
    SpId spId;
    RgmPrbRprtCfg *prbRprtCfg;
 
-   TRC3(cmUnpkRgmCfgPrbRprt)
    if ((SGetSBuf(pst->region, pst->pool, (Data **)&prbRprtCfg, sizeof(RgmPrbRprtCfg))) != ROK)
       {
          SPutMsg(mBuf);
@@ -1016,13 +997,13 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkRgmPrbQciRpt 
+S16 cmPkRgmPrbQciRpt 
 (
  RgmPrbRptPerQci *qciPrbRprt,
  Buffer *mBuf
  )
 #else
-PUBLIC S16 cmPkRgmPrbQciRpt(qciPrbRprt, mBuf)
+S16 cmPkRgmPrbQciRpt(qciPrbRprt, mBuf)
 RgmPrbRptPerQci *qciPrbRprt;
 Buffer *mBuf = NULLP;
 #endif
@@ -1047,13 +1028,13 @@ Buffer *mBuf = NULLP;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgmPrbQciRpt 
+S16 cmUnpkRgmPrbQciRpt 
 (
  RgmPrbRptPerQci *qciPrbRprt,
  Buffer *mBuf
  )
 #else
-PUBLIC S16 cmUnpkRgmPrbQciRpt(qciPrbRprt, mBuf)
+S16 cmUnpkRgmPrbQciRpt(qciPrbRprt, mBuf)
 RgmPrbRptPerQci *qciPrbRprt;
 Buffer *mBuf = NULLP;
 #endif
@@ -1079,20 +1060,19 @@ Buffer *mBuf = NULLP;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkPrbRprtInd
+S16 cmPkPrbRprtInd
 (
  RgmPrbRprtInd  * prbRprtInd,
  Buffer *mBuf
  )
 #else
-PUBLIC S16 cmPkPrbRprtInd(prbRprtInd, mBuf)
+S16 cmPkPrbRprtInd(prbRprtInd, mBuf)
    RgmPrbRprtInd  * prbRprtInd;
    Buffer *mBuf = NULLP;
 #endif
 {
    S32 idx = 0;
 
-   TRC3(cmPkPrbRprtInd); 
    
    /* RRM_SP1_START */
    for(idx = RGM_MAX_QCI_REPORTS-1; idx >= 0; idx--)
@@ -1118,20 +1098,19 @@ PUBLIC S16 cmPkPrbRprtInd(prbRprtInd, mBuf)
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPrbRprtInd
+S16 cmUnpkPrbRprtInd
 (
  RgmPrbRprtInd  * prbRprtInd,
  Buffer *mBuf
  )
 #else
-PUBLIC S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf)
+S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf)
    RgmPrbRprtInd  * prbRprtInd;
    Buffer *mBuf;
 #endif
 {
-   U32 idx = 0;
+   uint32_t idx = 0;
 
-   TRC3(cmUnpkPrbRprtInd);
 
    /* RRM_SP1_START */
    CMCHKUNPK(oduPackUInt8, &prbRprtInd->bCellId, mBuf);
@@ -1161,14 +1140,14 @@ PUBLIC S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf)
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkRgmPrbRprtInd
+S16 cmPkRgmPrbRprtInd
 (
 Pst* pst,
 SuId suId,
 RgmPrbRprtInd  * prbRprtInd
 )
 #else
-PUBLIC S16 cmPkRgmPrbRprtInd(pst, suId, prbRprtInd)
+S16 cmPkRgmPrbRprtInd(pst, suId, prbRprtInd)
 Pst* pst;
 SuId suId;
 RgmPrbRprtInd  * prbRprtInd;
@@ -1176,7 +1155,6 @@ RgmPrbRprtInd  * prbRprtInd;
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkRgmPrbRprtInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd));
@@ -1216,14 +1194,14 @@ RgmPrbRprtInd  * prbRprtInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgmPrbRprtInd
+S16 cmUnpkRgmPrbRprtInd
 (
 RgmPrbRprtIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgmPrbRprtInd(func, pst, mBuf)
+S16 cmUnpkRgmPrbRprtInd(func, pst, mBuf)
 RgmPrbRprtIndFptr func;
 Pst *pst;
 Buffer *mBuf;
@@ -1232,7 +1210,6 @@ Buffer *mBuf;
    SuId suId;
    RgmPrbRprtInd prbRprtInd;
    
-   TRC3(cmUnpkRgmPrbRprtInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {
@@ -1263,18 +1240,17 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkTransModeInd
+S16 cmPkTransModeInd
 (
  RgmTransModeInd *transModeInd,
  Buffer *mBuf
  )
 #else
-PUBLIC S16 cmPkTransModeInd(transModeInd, mBuf)
+S16 cmPkTransModeInd(transModeInd, mBuf)
    RgmTransModeInd *transModeInd;
    Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkTransModeInd); 
    CMCHKPK(oduUnpackUInt32, transModeInd->eMode, mBuf);
    CMCHKPK(oduUnpackUInt16, transModeInd->usCrnti, mBuf);
    CMCHKPK(oduUnpackUInt8, transModeInd->bCellId, mBuf);
@@ -1294,22 +1270,21 @@ PUBLIC S16 cmPkTransModeInd(transModeInd, mBuf)
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkTransModeInd
+S16 cmUnpkTransModeInd
 (
  RgmTransModeInd *transModeInd,
  Buffer *mBuf
  )
 #else
-PUBLIC S16 cmUnpkTransModeInd(transModeInd, mBuf)
+S16 cmUnpkTransModeInd(transModeInd, mBuf)
    RgmTransModeInd *transModeInd;
    Buffer *mBuf;
 #endif
 {
-   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;
 }
@@ -1327,14 +1302,14 @@ PUBLIC S16 cmUnpkTransModeInd(transModeInd, mBuf)
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkRgmTransModeInd 
+S16 cmPkRgmTransModeInd 
 (
 Pst* pst,
 SuId suId,
 RgmTransModeInd *transModeInd
 )
 #else
-PUBLIC S16 cmPkRgmTransModeInd(pst, suId, transModeInd)
+S16 cmPkRgmTransModeInd(pst, suId, transModeInd)
 Pst* pst;
 SuId suId;
 RgmTransModeInd *transModeInd;
@@ -1342,7 +1317,6 @@ RgmTransModeInd *transModeInd;
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkRgmTransModeInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd));
@@ -1382,14 +1356,14 @@ RgmTransModeInd *transModeInd;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgmTransModeInd
+S16 cmUnpkRgmTransModeInd
 (
 RgmTransModeIndFptr func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgmTransModeInd(func, pst, mBuf)
+S16 cmUnpkRgmTransModeInd(func, pst, mBuf)
 RgmTransModeIndFptr func;
 Pst *pst;
 Buffer *mBuf;
@@ -1398,7 +1372,6 @@ Buffer *mBuf;
    SuId suId;
    RgmTransModeInd transModeInd;
    
-   TRC3(cmUnpkRgmTransModeInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) 
    {