Replaced old SSI function with new macros jira id - ODUHIGH-212

[o-du/l2.git] / src / cm / ckw.c

diff --git a/src/cm/ckw.c b/src/cm/ckw.c
index caad5b4..e3aaffa 100755 (executable)
--- a/src/cm/ckw.c
+++ b/src/cm/ckw.c
@@ -83,13 +83,13 @@ SpId spId;
                (ErrVal)ECKW001, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
     CMCHKPKLOG(SPkS16, spId, mBuf, ECKW002, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, ECKW003, pst);
     pst->event = (Event) CKW_EVT_BND_REQ;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /*end of function cmPkCkwBndReq*/
 \f
 /*
@@ -134,13 +134,13 @@ Reason reason;
                (ErrVal)ECKW004, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
     CMCHKPKLOG(SPkS16, reason, mBuf, ECKW005, pst);
     CMCHKPKLOG(SPkS16, spId, mBuf, ECKW006, pst);
     pst->event = (Event) CKW_EVT_UBND_REQ;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /*end of function cmPkCkwUbndReq*/
 \f
 /*
@@ -186,13 +186,13 @@ U8 status;
        }
 
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
-    CMCHKPKLOG(SPkU8, status, mBuf, ECKW008, pst);
+    CMCHKPKLOG(oduUnpackUInt8, status, mBuf, ECKW008, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, ECKW009, pst);
     pst->event = (Event) CKW_EVT_BND_CFM;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /*end of function cmPkCkwBndCfm*/
 
 \f
@@ -223,9 +223,9 @@ Buffer         *mBuf;
 {
     TRC3(cmPkRlcTmInfo)
 
-    CMCHKPK(SPkU32, param->dl.buffSize, mBuf);
+    CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkRlcTmInfo */
 
 \f
@@ -260,26 +260,26 @@ Buffer         *mBuf;
     {
        case CKW_CFG_DIR_DL:
           {
-             CMCHKPK(SPkU8, param->m.umInfo.dl.snLen, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf);
              break;
           }
        case CKW_CFG_DIR_UL:
           {
-             CMCHKPK(SPkU8, param->m.umInfo.ul.reOrdTmr, mBuf);
-             CMCHKPK(SPkU8, param->m.umInfo.ul.snLen, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reOrdTmr, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
              break;
           }
        /* Patch ckw_c_001.main_3 */
        case CKW_CFG_DIR_BOTH:
           {
-             CMCHKPK(SPkU8, param->m.umInfo.dl.snLen, mBuf);
-             CMCHKPK(SPkU8, param->m.umInfo.ul.reOrdTmr, mBuf);
-             CMCHKPK(SPkU8, param->m.umInfo.ul.snLen, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reOrdTmr, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
              break;
           }
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkRlcUmInfo */
 
 \f
@@ -311,18 +311,18 @@ Buffer         *mBuf;
     TRC3(cmPkRlcAmInfo)
 
     /* UP LINK */
-    CMCHKPK(SPkU8, param->ul.reOrdTmr, mBuf);
-    CMCHKPK(SPkU16, param->ul.staProhTmr, mBuf);
-    CMCHKPK(SPkU8, param->ul.snLen, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->ul.reOrdTmr, mBuf);
+    CMCHKPK(oduUnpackUInt16, param->ul.staProhTmr, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->ul.snLen, mBuf);
 
     /* DOWN LINK */
-    CMCHKPK(SPkU8, param->dl.maxRetx, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->dl.maxRetx, mBuf);
     CMCHKPK(SPkS32, param->dl.pollByte, mBuf);
     CMCHKPK(SPkS16, param->dl.pollPdu, mBuf);
-    CMCHKPK(SPkU16, param->dl.pollRetxTmr, mBuf);
-    CMCHKPK(SPkU8, param->dl.snLen, mBuf);
+    CMCHKPK(oduUnpackUInt16, param->dl.pollRetxTmr, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->dl.snLen, mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkRlcAmInfo */
 
 \f
@@ -353,10 +353,10 @@ Buffer         *mBuf;
 {
     TRC3(cmPkCkwLChInfo)
 
-    CMCHKPK(SPkU8, param->type, mBuf);
-    CMCHKPK(SPkU8, param->lChId, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->type, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->lChId, mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkCkwLChInfo */
 
 \f
@@ -428,14 +428,14 @@ Buffer         *mBuf;
     CMCHKPK(SPkS16, param->rguSapId, mBuf);
 #endif
     CMCHKPK(SPkS16, param->discardTmr, mBuf);
-    CMCHKPK(SPkU8, param->dir, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->dir, mBuf);
     CMCHKPK(cmPkLteRlcMode, param->entMode, mBuf);
-    CMCHKPK(SPkU8, param->qci, mBuf);
-    CMCHKPK(SPkU8, param->rbType, mBuf);
-    CMCHKPK(SPkU8, param->rbId, mBuf);
-    CMCHKPK(SPkU8, param->cfgType, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->rbId, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkRlcEntCfgInfo */
 
 \f
@@ -475,12 +475,12 @@ Buffer         *mBuf;
        CMCHKPK(cmPkRlcEntCfgInfo, &(param->entCfg[idx]), mBuf);
     }
 
-    CMCHKPK(SPkU8, param->numEnt, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf);
     CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
     CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
-    CMCHKPKLOG(SPkU32, param->transId, mBuf, ECKW010, pst);
+    CMCHKPKLOG(oduUnpackUInt32, param->transId, mBuf, ECKW010, pst);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkRlcCfgInfo */
 
 \f
@@ -512,10 +512,10 @@ Buffer            *mBuf;
     TRC3(cmPkRlcEntCfgCfmInfo)
 
     CMCHKPK(cmPkCmStatus, &(param->status), mBuf);
-    CMCHKPK(SPkU8, param->rbType, mBuf);
-    CMCHKPK(SPkU8, param->rbId, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->rbId, mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkRlcEntCfgCfmInfo */
 
 \f
@@ -555,12 +555,12 @@ Buffer         *mBuf;
        CMCHKPK(cmPkRlcEntCfgCfmInfo, &(param->entCfgCfm[(U8)idx]), mBuf);
     }
 
-    CMCHKPK(SPkU8, param->numEnt, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf);
     CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
     CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
-    CMCHKPKLOG(SPkU32, param->transId, mBuf, ECKW014, pst);
+    CMCHKPKLOG(oduUnpackUInt32, param->transId, mBuf, ECKW014, pst);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmPkRlcCfgCfmInfo */
 
 \f
@@ -606,7 +606,7 @@ RlcCfgCfmInfo     *cfgCfmInfo;
                (ErrVal)ECKW015, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     switch(pst->selector)
@@ -622,14 +622,14 @@ RlcCfgCfmInfo     *cfgCfmInfo;
                 SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
                       __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
                       (ErrVal)ECKW016, (ErrVal)ret1, "Packing failure");
-                RETVALUE( ret1 );
+                return ( ret1 );
              }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
              if (SPutSBuf(pst->region, pst->pool, (Data *)cfgCfmInfo,
                       sizeof(RlcCfgCfmInfo)) != ROK)
              {
                 SPutMsg(mBuf);
-                RETVALUE(RFAILED);
+                return RFAILED;
              }
 
              break;
@@ -640,7 +640,7 @@ RlcCfgCfmInfo     *cfgCfmInfo;
     CMCHKPKLOG(SPkS16, suId, mBuf, ECKW017, pst);
     pst->event = (Event) CKW_EVT_CFG_CFM;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /* cmPkRlcCfgCfm */
 
 /*
@@ -673,7 +673,7 @@ Buffer    *mBuf;
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -723,7 +723,7 @@ CkwUeInfo         *newUeInfo;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     CMCHKPK(cmPkCkwUeInfo, newUeInfo, mBuf);
@@ -731,20 +731,20 @@ CkwUeInfo         *newUeInfo;
              sizeof(CkwUeInfo)) != ROK)
     {
        SPutMsg(mBuf);
-       RETVALUE(RFAILED);
+       return RFAILED;
     }
     CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf);
     if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo,
              sizeof(CkwUeInfo)) != ROK)
     {
        SPutMsg(mBuf);
-       RETVALUE(RFAILED);
+       return RFAILED;
     }
-    CMCHKPKLOG(SPkU32, transId, mBuf, ECKW019, pst);
+    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, ECKW019, pst);
     CMCHKPKLOG(SPkS16, spId, mBuf, ECKW020, pst);
     pst->event = (Event) CKW_EVT_UEIDCHG_REQ;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkCkwUeIdChgReq */
 
@@ -795,7 +795,7 @@ CmStatus          status;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     CMCHKPK(cmPkCmStatus, &status, mBuf); 
@@ -804,13 +804,13 @@ CmStatus          status;
              sizeof(CkwUeInfo)) != ROK)
     {
        SPutMsg(mBuf);
-       RETVALUE(RFAILED);
+       return RFAILED;
     }
-    CMCHKPKLOG(SPkU32, transId, mBuf, ECKW022, pst);
+    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, ECKW022, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, ECKW023, pst);
     pst->event = (Event) CKW_EVT_UEIDCHG_CFM;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkCkwUeIdChgCfm */
 
@@ -855,7 +855,7 @@ Buffer         *mBuf;
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW025, pst);
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, spId));
+    return ((*func)(pst, suId, spId));
 } /*end of function cmUnpkCkwBndReq*/
 \f
 /*
@@ -893,7 +893,7 @@ Buffer         *mBuf;
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW026, pst);
     CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, ECKW027, pst);
     SPutMsg(mBuf);
-    RETVALUE((*func)(pst, spId, reason));
+    return ((*func)(pst, spId, reason));
 } /*end of function cmUnpkCkwUbndReq*/
 \f
 /*
@@ -929,10 +929,10 @@ Buffer         *mBuf;
     TRC3(cmUnpkCkwBndCfm)
 
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst);
-    CMCHKUNPKLOG(SUnpkU8, &status, mBuf, ECKW029, pst);
+    CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, ECKW029, pst);
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, status));
+    return ((*func)(pst, suId, status));
 } /*end of function cmUnpkCkwBndCfm*/
 
 \f
@@ -963,9 +963,9 @@ Buffer         *mBuf;
 {
     TRC3(cmUnpkRlcTmInfo)
 
-    CMCHKUNPK(SUnpkU32, &(param->dl.buffSize), mBuf);
+    CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkRlcTmInfo */
 
 \f
@@ -1000,26 +1000,26 @@ Buffer         *mBuf;
     {
        case CKW_CFG_DIR_DL:
           {
-             CMCHKUNPK(SUnpkU8, &(param->m.umInfo.dl.snLen), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
              break;
           }
        case CKW_CFG_DIR_UL:
           {
-             CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.snLen), mBuf);
-             CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.reOrdTmr), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reOrdTmr), mBuf);
              break;
           }
        /* Patch ckw_c_001.main_3 */
        case CKW_CFG_DIR_BOTH:
           {
-             CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.snLen), mBuf);
-             CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.reOrdTmr), mBuf);
-             CMCHKUNPK(SUnpkU8, &(param->m.umInfo.dl.snLen), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reOrdTmr), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
              break;
           }
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkRlcUmInfo */
 
 \f
@@ -1051,18 +1051,18 @@ Buffer         *mBuf;
     TRC3(cmUnpkRlcAmInfo)
 
     /* DOWN LINK */
-    CMCHKUNPK(SUnpkU8, &(param->dl.snLen), mBuf);
-    CMCHKUNPK(SUnpkU16, &(param->dl.pollRetxTmr), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->dl.snLen), mBuf);
+    CMCHKUNPK(oduPackUInt16, &(param->dl.pollRetxTmr), mBuf);
     CMCHKUNPK(SUnpkS16, &(param->dl.pollPdu), mBuf);
     CMCHKUNPK(SUnpkS32, &(param->dl.pollByte), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->dl.maxRetx), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->dl.maxRetx), mBuf);
 
     /* UP LINK */
-    CMCHKUNPK(SUnpkU8, &(param->ul.snLen), mBuf);
-    CMCHKUNPK(SUnpkU16, &(param->ul.staProhTmr), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->ul.reOrdTmr), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->ul.snLen), mBuf);
+    CMCHKUNPK(oduPackUInt16, &(param->ul.staProhTmr), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->ul.reOrdTmr), mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkRlcAmInfo */
 
 \f
@@ -1093,10 +1093,10 @@ Buffer         *mBuf;
 {
     TRC3(cmUnpkCkwLChInfo)
 
-    CMCHKUNPK(SUnpkU8, &(param->lChId), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->type), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->type), mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkCkwLChInfo */
 
 \f
@@ -1127,11 +1127,11 @@ Buffer            *mBuf;
 {
     TRC3(cmUnpkRlcEntCfgCfmInfo)
 
-    CMCHKUNPK(SUnpkU8, &(param->rbId), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->rbType), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf);
     CMCHKUNPK(cmUnpkCmStatus, &(param->status), mBuf);
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkRlcEntCfgCfmInfo */
 
 \f
@@ -1166,17 +1166,17 @@ Buffer         *mBuf;
 
     TRC3(cmUnpkRlcCfgCfmInfo)
 
-    CMCHKUNPKLOG(SUnpkU32, &(param->transId), mBuf, ECKW030, pst);
+    CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst);
     CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
     CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->numEnt), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->numEnt), mBuf);
 
     for (idx = 0; idx < param->numEnt; idx++)
     {
        CMCHKUNPK(cmUnpkRlcEntCfgCfmInfo, &(param->entCfgCfm[idx]), mBuf);
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkRlcCfgCfmInfo */
 
 \f
@@ -1207,12 +1207,12 @@ Buffer         *mBuf;
 {
     TRC3(cmUnpkRlcEntCfgInfo)
 
-    CMCHKUNPK(SUnpkU8, &(param->cfgType), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->rbId), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->rbType), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->qci), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->qci), mBuf);
     CMCHKUNPK(cmUnpkLteRlcMode, &(param->entMode), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->dir), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->dir), mBuf);
     CMCHKUNPK(SUnpkS16, &(param->discardTmr), mBuf);
 #ifdef TENB_MULT_CELL_SUPPRT
     CMCHKUNPK(SUnpkS16, &(param->rguSapId), mBuf);
@@ -1256,7 +1256,7 @@ Buffer         *mBuf;
           }
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkRlcEntCfgInfo */
 
 \f
@@ -1291,17 +1291,17 @@ Buffer         *mBuf;
 
     TRC3(cmUnpkRlcCfgInfo)
 
-    CMCHKUNPKLOG(SUnpkU32, &(param->transId), mBuf, ECKW031, pst);
+    CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst);
     CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
     CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
-    CMCHKUNPK(SUnpkU8, &(param->numEnt), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->numEnt), mBuf);
 
     for (idx = 0; idx < param->numEnt; idx++)
     {
        CMCHKUNPKLOG(cmUnpkRlcEntCfgInfo,&(param->entCfg[idx]), mBuf, ECKW032, pst);
     }
 
-    RETVALUE(ROK);
+    return ROK;
 } /* cmUnpkRlcCfgInfo */
 
 \f
@@ -1349,7 +1349,7 @@ Buffer            *mBuf;
                (ErrVal)ECKW035, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     cmMemset((U8 *)cfgCfmInfo, 0, sizeof(RlcCfgCfmInfo));
@@ -1369,7 +1369,7 @@ Buffer            *mBuf;
              SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
                    __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
                   (ErrVal)ECKW036, (ErrVal)ret1, "Unpacking failure");
-             RETVALUE( ret1 );
+             return ( ret1 );
           }
 #endif /* ERRCLASS & ERRCLS_DEBUG */
           break;
@@ -1378,7 +1378,7 @@ Buffer            *mBuf;
     }
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, cfgCfmInfo));
+    return ((*func)(pst, suId, cfgCfmInfo));
 } /* cmUnpkRlcCfgCfm */
 
 /*
@@ -1411,7 +1411,7 @@ Buffer    *mBuf;
    CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*
@@ -1451,7 +1451,7 @@ Buffer            *mBuf;
 
 
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
-    CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, ECKW037, pst);
+    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW037, pst);
 
     if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo,\
                 sizeof(CkwUeInfo))) != ROK)
@@ -1463,7 +1463,7 @@ Buffer            *mBuf;
                (ErrVal)ECKW038, (ErrVal)0, "SGetMsg() failed");
       
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     cmMemset((U8 *)ueInfo, 0, sizeof(CkwUeInfo));
@@ -1476,7 +1476,7 @@ Buffer            *mBuf;
        SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
              __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
              (ErrVal)ECKW039, (ErrVal)ret1, "Unpacking failure");
-       RETVALUE( ret1 );
+       return ( ret1 );
     }
 #endif /* ERRCLASS & ERRCLS_DEBUG */
 
@@ -1490,7 +1490,7 @@ Buffer            *mBuf;
                (ErrVal)ECKW040, (ErrVal)0, "SGetMsg() failed");
        
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     cmMemset((U8 *)newUeInfo, 0, sizeof(CkwUeInfo));
@@ -1503,13 +1503,13 @@ Buffer            *mBuf;
        SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
              __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
              (ErrVal)ECKW041, (ErrVal)ret1, "Unpacking failure");
-       RETVALUE( ret1 );
+       return ( ret1 );
     }
 #endif /* ERRCLASS & ERRCLS_DEBUG */
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo));
+    return ((*func)(pst, spId, transId, ueInfo, newUeInfo));
 
 } /* cmUnpkCkwUeIdChgReq */
 
@@ -1551,7 +1551,7 @@ Buffer            *mBuf;
     cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus));
 
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
-    CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, ECKW042, pst);
+    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst);
 
     if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo,\
                 sizeof(CkwUeInfo))) != ROK)
@@ -1564,7 +1564,7 @@ Buffer            *mBuf;
                (ErrVal)ECKW043, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     cmMemset((U8 *)ueInfo, 0, sizeof(CkwUeInfo));
@@ -1577,7 +1577,7 @@ Buffer            *mBuf;
        SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
              __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
              (ErrVal)ECKW044, (ErrVal)ret1, "Unpacking failure");
-       RETVALUE( ret1 );
+       return ( ret1 );
     }
 #endif /* ERRCLASS & ERRCLS_DEBUG */
 
@@ -1585,7 +1585,7 @@ Buffer            *mBuf;
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, transId, ueInfo, status));
+    return ((*func)(pst, suId, transId, ueInfo, status));
 
 } /* cmUnpkCkwUeIdChgCfm */