Jira id - ODUHIGH-227

[o-du/l2.git] / src / 5gnrrlc / kw_udx.c

diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c
index 59e5479..7c18958 100755 (executable)
--- a/src/5gnrrlc/kw_udx.c
+++ b/src/5gnrrlc/kw_udx.c
@@ -72,7 +72,7 @@ MsgLen    size;
     MsgLen tmpLen;
 
     TRC3(cmUnpkUdxStruct)
-    RETVALUE(SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen));
+    return (SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen));
 
 } /*end of function cmPkUdxBndReq*/
 
@@ -105,7 +105,7 @@ Buffer *dstMBuf;
 {
 
     TRC3(cmPkUdxStruct)
-    RETVALUE(SAddPstMsgMult(srcBuf,size,dstMBuf));
+    return (SAddPstMsgMult(srcBuf,size,dstMBuf));
 
 } /*end of function cmPkUdxBndReq*/
 /*
@@ -122,14 +122,14 @@ Buffer *dstMBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxBndReq
+S16 cmPkUdxBndReq
 (
 Pst *pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 cmPkUdxBndReq(pst, suId, spId)
+S16 cmPkUdxBndReq(pst, suId, spId)
 Pst *pst;
 SuId suId;
 SpId spId;
@@ -150,13 +150,13 @@ SpId spId;
                (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_BND_REQ;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /*end of function cmPkUdxBndReq*/
 \f
 /*
@@ -173,14 +173,14 @@ SpId spId;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxUbndReq
+S16 cmPkUdxUbndReq
 (
 Pst *pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 cmPkUdxUbndReq(pst, spId, reason)
+S16 cmPkUdxUbndReq(pst, spId, reason)
 Pst *pst;
 SpId spId;
 Reason reason;
@@ -201,13 +201,13 @@ Reason reason;
                (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
     CMCHKPKLOG(SPkS16, reason, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_UBND_REQ;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /*end of function cmPkUdxUbndReq*/
 \f
 /*
@@ -224,14 +224,14 @@ Reason reason;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxBndCfm
+S16 cmPkUdxBndCfm
 (
 Pst *pst,
 SuId suId,
 U8 status
 )
 #else
-PUBLIC S16 cmPkUdxBndCfm(pst, suId, status)
+S16 cmPkUdxBndCfm(pst, suId, status)
 Pst *pst;
 SuId suId;
 U8 status;
@@ -253,13 +253,13 @@ U8 status;
        }
 
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
-    CMCHKPKLOG(SPkU8, status, mBuf, EUDXXXX, pst);
+    CMCHKPKLOG(oduUnpackUInt8, status, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_BND_CFM;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /*end of function cmPkUdxBndCfm*/
 
 \f
@@ -277,17 +277,17 @@ U8 status;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxCfgReq
+S16 cmPkUdxCfgReq
 (
 Pst               *pst,
 SpId              spId,
-CkwCfgInfo        *cfgInfo
+RlcCfgInfo        *cfgInfo
 )
 #else
-PUBLIC S16 cmPkUdxCfgReq(pst, spId, cfgInfo)
+S16 cmPkUdxCfgReq(pst, spId, cfgInfo)
 Pst               *pst;
 SpId              spId;
-CkwCfgInfo        *cfgInfo;
+RlcCfgInfo        *cfgInfo;
 #endif
 {
     S16 ret1;
@@ -305,7 +305,7 @@ CkwCfgInfo        *cfgInfo;
                (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     switch(pst->selector)
@@ -313,14 +313,14 @@ CkwCfgInfo        *cfgInfo;
 #ifdef LCUDX
        case UDX_SEL_LC:
           {
-             cmPkUdxStruct((U8 *)cfgInfo, sizeof(CkwCfgInfo),mBuf);
+             cmPkUdxStruct((U8 *)cfgInfo, sizeof(RlcCfgInfo),mBuf);
              /* Need Not free CfgInfo here as it is stored 
                 in UL */
              break;
           }
         case UDX_SEL_LWLC:
           {
-             CMCHKPKLOG(cmPkPtr,(PTR)cfgInfo,mBuf,EUDXXXX,pst);
+             CMCHKPKLOG(oduPackPointer,(PTR)cfgInfo,mBuf,EUDXXXX,pst);
              break;
           }
 #endif /* LCUDX */
@@ -329,7 +329,7 @@ CkwCfgInfo        *cfgInfo;
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_CFG_REQ;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /* cmPkUdxCfgReq */
 
 \f
@@ -347,17 +347,17 @@ CkwCfgInfo        *cfgInfo;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxCfgCfm
+S16 cmPkUdxCfgCfm
 (
 Pst               *pst,
 SuId              suId,
-CkwCfgCfmInfo     *cfgCfmInfo
+RlcCfgCfmInfo     *cfgCfmInfo
 )
 #else
-PUBLIC S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo)
+S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo)
 Pst               *pst;
 SuId              suId;
-CkwCfgCfmInfo     *cfgCfmInfo;
+RlcCfgCfmInfo     *cfgCfmInfo;
 #endif
 {
     S16 ret1;
@@ -375,7 +375,7 @@ CkwCfgCfmInfo     *cfgCfmInfo;
                (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     switch(pst->selector)
@@ -383,16 +383,16 @@ CkwCfgCfmInfo     *cfgCfmInfo;
 #ifdef LCUDX
        case UDX_SEL_LC:
           {
-             cmPkUdxStruct((U8 *)cfgCfmInfo, sizeof(CkwCfgCfmInfo),mBuf);
+             cmPkUdxStruct((U8 *)cfgCfmInfo, sizeof(RlcCfgCfmInfo),mBuf);
              /* Need to free the cfgCfmInfo here as it is allocated 
                                         buffer call SPutStaticBuffer */
              SPutStaticBuffer(pst->region,pst->pool,(Data *) cfgCfmInfo,
-                          sizeof(CkwCfgCfmInfo),0);
+                          sizeof(RlcCfgCfmInfo),0);
              break;
           }
         case UDX_SEL_LWLC:
           {
-             CMCHKPKLOG(cmPkPtr,(PTR)cfgCfmInfo,mBuf,EUDXXXX,pst);
+             CMCHKPKLOG(oduPackPointer,(PTR)cfgCfmInfo,mBuf,EUDXXXX,pst);
              break;
           }
 #endif /* LCUDX */
@@ -401,7 +401,7 @@ CkwCfgCfmInfo     *cfgCfmInfo;
     CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_CFG_CFM;
 
-    RETVALUE(SPstTsk(pst,mBuf));
+    return (SPstTsk(pst,mBuf));
 } /* cmPkUdxCfgCfm */
 
 
@@ -419,7 +419,7 @@ CkwCfgCfmInfo     *cfgCfmInfo;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgReq
+S16 cmPkUdxUeIdChgReq
 (
 Pst               *pst,
 SpId              spId,
@@ -428,7 +428,7 @@ CkwUeInfo         *ueInfo,
 CkwUeInfo         *newUeInfo
 )
 #else
-PUBLIC S16 cmPkUdxUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
+S16 cmPkUdxUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
 Pst               *pst;
 SpId              spId;
 U32               transId;
@@ -452,7 +452,7 @@ CkwUeInfo         *newUeInfo;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
 
     switch(pst->selector)
@@ -467,8 +467,8 @@ CkwUeInfo         *newUeInfo;
        }
        case UDX_SEL_LWLC:
           {
-             CMCHKPKLOG(cmPkPtr,(PTR)newUeInfo,mBuf,EUDXXXX,pst);
-             CMCHKPKLOG(cmPkPtr,(PTR)ueInfo,mBuf,EUDXXXX,pst);
+             CMCHKPKLOG(oduPackPointer,(PTR)newUeInfo,mBuf,EUDXXXX,pst);
+             CMCHKPKLOG(oduPackPointer,(PTR)ueInfo,mBuf,EUDXXXX,pst);
              break;
           }
        default:
@@ -478,11 +478,11 @@ CkwUeInfo         *newUeInfo;
        }
 #endif
     }
-    CMCHKPKLOG(SPkU32, transId, mBuf, EUDXXXX, pst);
+    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_UEIDCHG_REQ;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkUdxUeIdChgReq */
 
@@ -500,7 +500,7 @@ CkwUeInfo         *newUeInfo;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgCfm
+S16 cmPkUdxUeIdChgCfm
 (
 Pst               *pst,
 SuId              suId,
@@ -508,7 +508,7 @@ U32               transId,
 CmStatus          status
 )
 #else
-PUBLIC S16 cmPkUdxUeIdChgCfm(pst, suId, transId, status)
+S16 cmPkUdxUeIdChgCfm(pst, suId, transId, status)
 Pst               *pst;
 SuId              suId;
 U32               transId;
@@ -530,15 +530,15 @@ CmStatus          status;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     CMCHKPK(cmPkCmStatus, &status, mBuf); 
-    CMCHKPKLOG(SPkU32, transId, mBuf, EUDXXXX, pst);
+    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_UEIDCHG_CFM;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkUdxUeIdChgCfm */
 
@@ -556,19 +556,19 @@ CmStatus          status;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxStaUpdCfm
+S16 cmPkUdxStaUpdCfm
 (
 Pst               *pst,
 SuId              suId,
 CmLteRlcId        *rlcId,
-KwUdxBufLst       *pStaPdu
+RlcUdxBufLst       *pStaPdu
 )
 #else
-PUBLIC S16 cmPkUdxStaUpdCfm(pst, suId, rlcId,pStaPdu)
+S16 cmPkUdxStaUpdCfm(pst, suId, rlcId,pStaPdu)
 Pst               *pst;
 SuId              suId;
 CmLteRlcId        *rlcId;
-KwUdxBufLst       *pStaPdu;
+RlcUdxBufLst       *pStaPdu;
 #endif
 {
     S16    ret1;
@@ -587,28 +587,28 @@ KwUdxBufLst       *pStaPdu;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     switch (pst->selector)
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxBufLst),mBuf);
+         cmPkUdxStruct((U8 *)pStaPdu, sizeof(RlcUdxBufLst),mBuf);
          cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
          break;
        }
        case UDX_SEL_LWLC:
        {
-         CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf);
-         CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); 
+         CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf);
+         CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); 
          break;
        }
     }
     CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_STA_UPD_CFM;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkUdxStaUpdCfm */
 
@@ -626,14 +626,14 @@ KwUdxBufLst       *pStaPdu;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxStaProhTmrStart
+S16 cmPkUdxStaProhTmrStart
 (
 Pst               *pst,
 SpId              spId,
 CmLteRlcId        *rlcId
 )
 #else
-PUBLIC S16 cmPkUdxStaProhTmrStart(pst, suId, rlcId)
+S16 cmPkUdxStaProhTmrStart(pst, suId, rlcId)
 Pst               *pst;
 SpId              spId;
 CmLteRlcId        *rlcId;
@@ -655,7 +655,7 @@ CmLteRlcId        *rlcId;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     switch (pst->selector)
@@ -667,14 +667,14 @@ CmLteRlcId        *rlcId;
        }
        case UDX_SEL_LWLC:
        {
-         CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); 
+         CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); 
          break;
        }
     }
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_STA_PHBT_TMR_START;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkUdxStaProhTmrStart */
 
@@ -692,19 +692,19 @@ CmLteRlcId        *rlcId;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxStaUpdReq
+S16 cmPkUdxStaUpdReq
 (
 Pst               *pst,
 SpId              spId,
 CmLteRlcId        *rlcId,
-KwUdxStaPdu      *pStaPdu
+RlcUdxStaPdu      *pStaPdu
 )
 #else
-PUBLIC S16 cmPkUdxStaUpdReq(pst, suId, rlcId,pStaPdu)
+S16 cmPkUdxStaUpdReq(pst, suId, rlcId,pStaPdu)
 Pst               *pst;
 SpId              spId;
 CmLteRlcId        *rlcId;
-KwUdxStaPdu       *pStaPdu;
+RlcUdxStaPdu       *pStaPdu;
 #endif
 {
     S16    ret1;
@@ -723,31 +723,31 @@ KwUdxStaPdu       *pStaPdu;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     switch (pst->selector)
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxStaPdu),mBuf);
+         cmPkUdxStruct((U8 *)pStaPdu, sizeof(RlcUdxStaPdu),mBuf);
          cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
          SPutStaticBuffer(pst->region,pst->pool,(Data *) pStaPdu,
-                          sizeof(KwUdxStaPdu),0);
+                          sizeof(RlcUdxStaPdu),0);
 
          break;
        }
        case UDX_SEL_LWLC:
        {
-         CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf);
-         CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); 
+         CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf);
+         CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); 
          break;
        }
     }
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_STA_UPD_REQ;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkUdxStaUpdReq */
 
@@ -765,19 +765,19 @@ KwUdxStaPdu       *pStaPdu;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxStaPduReq
+S16 cmPkUdxStaPduReq
 (
 Pst               *pst,
 SpId              spId,
 CmLteRlcId        *rlcId,
-KwUdxDlStaPdu     *pStaPdu
+RlcUdxDlStaPdu     *pStaPdu
 )
 #else
-PUBLIC S16 cmPkUdxStaPduReq(pst, suId, rlcId,pStaPdu)
+S16 cmPkUdxStaPduReq(pst, suId, rlcId,pStaPdu)
 Pst               *pst;
 SpId              spId;
 CmLteRlcId        *rlcId;
-KwUdxDlStaPdu     *pStaPdu;
+RlcUdxDlStaPdu     *pStaPdu;
 #endif
 {
     S16    ret1;
@@ -796,31 +796,31 @@ KwUdxDlStaPdu     *pStaPdu;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     switch (pst->selector)
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxDlStaPdu),mBuf);
+         cmPkUdxStruct((U8 *)pStaPdu, sizeof(RlcUdxDlStaPdu),mBuf);
          cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
          /* Free status Pdu here for LC */
          SPutStaticBuffer(pst->region,pst->pool,(Data *) pStaPdu,
-                          sizeof(KwUdxDlStaPdu),0);
+                          sizeof(RlcUdxDlStaPdu),0);
          break;
        }
        case UDX_SEL_LWLC:
        {
-         CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf);
-         CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); 
+         CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf);
+         CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); 
          break;
        }
     }
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_STA_PDU_REQ;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkUdxStaUpdReq */
 
@@ -836,15 +836,15 @@ KwUdxDlStaPdu     *pStaPdu;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasReq
+S16 cmPkUdxL2MeasReq
 (
 Pst               *pst,
-KwL2MeasReqEvt    *measReqEvt 
+RlcL2MeasReqEvt    *measReqEvt 
 )
 #else
-PUBLIC S16 cmPkUdxL2MeasReq(pst, measReqEvt)
+S16 cmPkUdxL2MeasReq(pst, measReqEvt)
 Pst               *pst;
-KwL2MeasReqEvt    *measReqEvt; 
+RlcL2MeasReqEvt    *measReqEvt; 
 #endif
 {
     S16    ret1;
@@ -863,25 +863,25 @@ KwL2MeasReqEvt    *measReqEvt;
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     switch (pst->selector)
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)measReqEvt, sizeof(KwL2MeasReqEvt),mBuf);
+         cmPkUdxStruct((U8 *)measReqEvt, sizeof(RlcL2MeasReqEvt),mBuf);
          break;
        }
        case UDX_SEL_LWLC:
        {
-         CMCHKPK(cmPkPtr,(PTR) measReqEvt, mBuf);
+         CMCHKPK(oduPackPointer,(PTR) measReqEvt, mBuf);
          break;
        }
     }
     pst->event = (Event) UDX_EVT_L2MEAS_REQ;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } /* cmPkUdxStaUpdReq */
 
@@ -896,13 +896,13 @@ KwL2MeasReqEvt    *measReqEvt;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasSendReq
+S16 cmPkUdxL2MeasSendReq
 (
 Pst              *pst,
 U8               measType
 )
 #else
-PUBLIC S16 cmPkUdxL2MeasSendReq(pst, measReqEvt)
+S16 cmPkUdxL2MeasSendReq(pst, measReqEvt)
 Pst               *pst;
 U8                measType
 #endif
@@ -923,7 +923,7 @@ U8                measType
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     switch (pst->selector)
@@ -931,13 +931,13 @@ U8                measType
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKPKLOG(SPkU8, measType, mBuf, EUDXXXX, pst);
+          CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst);
           break;
        }
     }
     pst->event = (Event) UDX_EVT_L2MEAS_SEND_REQ;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } 
 
@@ -952,13 +952,13 @@ U8                measType
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasStopReq
+S16 cmPkUdxL2MeasStopReq
 (
 Pst              *pst,
 U8               measType
 )
 #else
-PUBLIC S16 cmPkUdxL2MeasStopReq(pst, measType)
+S16 cmPkUdxL2MeasStopReq(pst, measType)
 Pst               *pst;
 U8                measType
 #endif
@@ -979,7 +979,7 @@ U8                measType
        }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
 
-       RETVALUE(ret1);
+       return (ret1);
     }
     
     switch (pst->selector)
@@ -987,13 +987,13 @@ U8                measType
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKPKLOG(SPkU8, measType, mBuf, EUDXXXX, pst);
+          CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst);
           break;
        }
     }
     pst->event = (Event) UDX_EVT_L2MEAS_STOP_REQ;
 
-    RETVALUE(SPstTsk(pst, mBuf));
+    return (SPstTsk(pst, mBuf));
 
 } 
 #endif
@@ -1015,14 +1015,14 @@ U8                measType
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxBndReq
+S16 cmUnpkUdxBndReq
 (
 UdxBndReq      func,
 Pst            *pst,
 Buffer         *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxBndReq(func, pst, mBuf)
+S16 cmUnpkUdxBndReq(func, pst, mBuf)
 UdxBndReq      func;
 Pst            *pst;
 Buffer         *mBuf;
@@ -1037,7 +1037,7 @@ Buffer         *mBuf;
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, spId));
+    return ((*func)(pst, suId, spId));
 } /*end of function cmUnpkUdxBndReq*/
 \f
 /*
@@ -1054,14 +1054,14 @@ Buffer         *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxUbndReq
+S16 cmUnpkUdxUbndReq
 (
 UdxUbndReq     func,
 Pst            *pst,
 Buffer         *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxUbndReq(func, pst, mBuf)
+S16 cmUnpkUdxUbndReq(func, pst, mBuf)
 UdxUbndReq     func;
 Pst            *pst;
 Buffer         *mBuf;
@@ -1075,7 +1075,7 @@ Buffer         *mBuf;
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
     CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
-    RETVALUE((*func)(pst, spId, reason));
+    return ((*func)(pst, spId, reason));
 } /*end of function cmUnpkUdxUbndReq*/
 \f
 /*
@@ -1092,14 +1092,14 @@ Buffer         *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxBndCfm
+S16 cmUnpkUdxBndCfm
 (
 UdxBndCfm      func,
 Pst            *pst,
 Buffer         *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxBndCfm(func, pst, mBuf)
+S16 cmUnpkUdxBndCfm(func, pst, mBuf)
 UdxBndCfm      func;
 Pst            *pst;
 Buffer         *mBuf;
@@ -1111,10 +1111,10 @@ Buffer         *mBuf;
     TRC3(cmUnpkUdxBndCfm)
 
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
-    CMCHKUNPKLOG(SUnpkU8, &status, mBuf, EUDXXXX, pst);
+    CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, status));
+    return ((*func)(pst, suId, status));
 } /*end of function cmUnpkUdxBndCfm*/
 
 \f
@@ -1132,14 +1132,14 @@ Buffer         *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxCfgReq
+S16 cmUnpkUdxCfgReq
 (
 UdxCfgReq         func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxCfgReq(func, pst, mBuf)
+S16 cmUnpkUdxCfgReq(func, pst, mBuf)
 UdxCfgReq         func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1149,8 +1149,8 @@ Buffer            *mBuf;
     S16           ret1;
 #endif /* ERRCLASS & ERRCLS_DEBUG */
     SpId          spId = 0;
-    CkwCfgInfo     tmpCfgInfo;
-    CkwCfgInfo    *cfgInfo; /*stack Variable because it is not freed */
+    RlcCfgInfo     tmpCfgInfo;
+    RlcCfgInfo    *cfgInfo; /*stack Variable because it is not freed */
     
     TRC3(cmUnpkUdxCfgReq)
 
@@ -1161,31 +1161,31 @@ Buffer            *mBuf;
        case UDX_SEL_LC:
        {
 #if(ERRCLASS & ERRCLS_DEBUG)
-          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(CkwCfgInfo));
+          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(RlcCfgInfo));
           if(ret1 != ROK)
           {
              SPutMsg(mBuf);
              SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
                    __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
                   (ErrVal)EUDXXXX, (ErrVal)ret1, "Unpacking failure");
-             RETVALUE( ret1 );
+             return ( ret1 );
           }
 #else
-         cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(CkwCfgInfo));
+         cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(RlcCfgInfo));
 #endif /* ERRCLASS & ERRCLS_DEBUG */
           cfgInfo = &tmpCfgInfo;
           break;
        }
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgInfo, mBuf);
+          CMCHKUNPK(oduUnpackPointer,(PTR *) &cfgInfo, mBuf);
           break;
        }
 #endif /* LCUDX */
     }
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, spId, cfgInfo));
+    return ((*func)(pst, spId, cfgInfo));
 } /* cmUnpkUdxCfgReq */
 
 \f
@@ -1203,14 +1203,14 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxCfgCfm
+S16 cmUnpkUdxCfgCfm
 (
 UdxCfgCfm         func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxCfgCfm(func, pst, mBuf)
+S16 cmUnpkUdxCfgCfm(func, pst, mBuf)
 UdxCfgCfm         func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1218,7 +1218,7 @@ Buffer            *mBuf;
 {
     S16 ret1;
     SuId             suId = 0;
-    CkwCfgCfmInfo    *cfgCfmInfo = NULLP;
+    RlcCfgCfmInfo    *cfgCfmInfo = NULLP;
     
     TRC3(cmUnpkUdxCfgCfm)
 
@@ -1230,7 +1230,7 @@ Buffer            *mBuf;
        case UDX_SEL_LC:
        {
            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&cfgCfmInfo,\
-                       sizeof(CkwCfgCfmInfo),0)) != ROK)
+                       sizeof(RlcCfgCfmInfo),0)) != ROK)
            {
 #if (ERRCLASS & ERRCLS_ADD_RES)
               if(ret1 != ROK)
@@ -1240,10 +1240,10 @@ Buffer            *mBuf;
                       (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
               }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-              RETVALUE(ret1);
+              return (ret1);
            }
 
-          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)cfgCfmInfo, sizeof(CkwCfgCfmInfo));
+          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)cfgCfmInfo, sizeof(RlcCfgCfmInfo));
 #if(ERRCLASS & ERRCLS_DEBUG)
           if(ret1 != ROK)
           {
@@ -1251,21 +1251,21 @@ Buffer            *mBuf;
              SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId,
                    __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG,
                   (ErrVal)EUDXXXX, (ErrVal)ret1, "Unpacking failure");
-             RETVALUE( ret1 );
+             return ( ret1 );
           }
 #endif /* ERRCLASS & ERRCLS_DEBUG */
           break;
        }
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgCfmInfo, mBuf);
+          CMCHKUNPK(oduUnpackPointer,(PTR *) &cfgCfmInfo, mBuf);
           break;
        }
 #endif /* LCUDX */
     }
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, cfgCfmInfo));
+    return ((*func)(pst, suId, cfgCfmInfo));
 } /* cmUnpkUdxCfgCfm */
 
 /*
@@ -1282,14 +1282,14 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxUeIdChgReq
+S16 cmUnpkUdxUeIdChgReq
 (
 UdxUeIdChgReq     func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxUeIdChgReq(func, pst, mBuf)
+S16 cmUnpkUdxUeIdChgReq(func, pst, mBuf)
 UdxUeIdChgReq     func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1306,7 +1306,7 @@ Buffer            *mBuf;
 
 
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
-    CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, EUDXXXX, pst);
+    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
 
     switch(pst->selector)
     {
@@ -1322,8 +1322,8 @@ Buffer            *mBuf;
        }
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(cmUnpkPtr,(PTR *) &ueInfo, mBuf);
-          CMCHKUNPK(cmUnpkPtr,(PTR *) &newUeInfo, mBuf);
+          CMCHKUNPK(oduUnpackPointer,(PTR *) &ueInfo, mBuf);
+          CMCHKUNPK(oduUnpackPointer,(PTR *) &newUeInfo, mBuf);
           break;
        }
        default:
@@ -1336,7 +1336,7 @@ Buffer            *mBuf;
     }
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo));
+    return ((*func)(pst, spId, transId, ueInfo, newUeInfo));
 
 } /* cmUnpkUdxUeIdChgReq */
 
@@ -1354,14 +1354,14 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxUeIdChgCfm
+S16 cmUnpkUdxUeIdChgCfm
 (
 UdxUeIdChgCfm     func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxUeIdChgCfm(func, pst, mBuf)
+S16 cmUnpkUdxUeIdChgCfm(func, pst, mBuf)
 UdxUeIdChgCfm     func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1376,13 +1376,13 @@ Buffer            *mBuf;
     cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus));
 
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
-    CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, EUDXXXX, pst);
+    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
 
     CMCHKUNPK(cmUnpkCmStatus, &status, mBuf);
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, transId, status));
+    return ((*func)(pst, suId, transId, status));
 
 } /* cmUnpkUdxUeIdChgCfm */
 
@@ -1400,14 +1400,14 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaUpdCfm
+S16 cmUnpkUdxStaUpdCfm
 (
 UdxStaUpdCfm     func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxStaUpdCfm(func, pst, mBuf)
+S16 cmUnpkUdxStaUpdCfm(func, pst, mBuf)
 UdxStaUpdCfm     func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1415,7 +1415,7 @@ Buffer            *mBuf;
 {
     SuId      suId = 0;
     CmLteRlcId *rlcId = NULLP;  /* KW_FIX */
-    KwUdxBufLst *pBufLst = NULLP; /* KW_FIX*/
+    RlcUdxBufLst *pBufLst = NULLP; /* KW_FIX*/
     
     TRC3(cmUnpkUdxStaUpdCfm)
 
@@ -1428,15 +1428,15 @@ Buffer            *mBuf;
        }
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
-          CMCHKUNPK(cmUnpkPtr, (PTR *)&pBufLst,mBuf);
+          CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
+          CMCHKUNPK(oduUnpackPointer, (PTR *)&pBufLst,mBuf);
           break;
        }
     } 
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, suId, rlcId, pBufLst));
+    return ((*func)(pst, suId, rlcId, pBufLst));
 
 } /* cmUnpkUdxUeIdChgCfm */
 
@@ -1454,14 +1454,14 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaUpdReq
+S16 cmUnpkUdxStaUpdReq
 (
 UdxStaUpdReq     func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxStaUpdReq(func, pst, mBuf)
+S16 cmUnpkUdxStaUpdReq(func, pst, mBuf)
 UdxStaUpdReq     func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1469,7 +1469,7 @@ Buffer            *mBuf;
 {
     SpId      spId = 0;
     CmLteRlcId *rlcId = NULLP; /* KW_FIX */ 
-    KwUdxStaPdu *pStaPdu = NULLP; /* KW_FIX */
+    RlcUdxStaPdu *pStaPdu = NULLP; /* KW_FIX */
     S16 ret1;
     CmLteRlcId tmpRlcId;
     
@@ -1481,7 +1481,7 @@ Buffer            *mBuf;
        case UDX_SEL_LC:
        {
            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&pStaPdu,
-                       sizeof(KwUdxStaPdu),0)) != ROK)
+                       sizeof(RlcUdxStaPdu),0)) != ROK)
            {
 #if (ERRCLASS & ERRCLS_ADD_RES)
               if(ret1 != ROK)
@@ -1491,24 +1491,24 @@ Buffer            *mBuf;
                       (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
               }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-              RETVALUE(ret1);
+              return (ret1);
            }
-          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)pStaPdu, sizeof(KwUdxStaPdu));
-          ret1 = cmUnpkUdxStruct(mBuf,sizeof(KwUdxStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId));
+          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)pStaPdu, sizeof(RlcUdxStaPdu));
+          ret1 = cmUnpkUdxStruct(mBuf,sizeof(RlcUdxStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId));
           rlcId = &tmpRlcId; 
           break;
        }
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
-          CMCHKUNPK(cmUnpkPtr, (PTR *)&pStaPdu,mBuf);
+          CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
+          CMCHKUNPK(oduUnpackPointer, (PTR *)&pStaPdu,mBuf);
           break;
        }
     } 
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, spId, rlcId, pStaPdu));
+    return ((*func)(pst, spId, rlcId, pStaPdu));
 
 } /* cmUnpkUdxUeIdChgCfm */
 
@@ -1526,14 +1526,14 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaPduReq
+S16 cmUnpkUdxStaPduReq
 (
 UdxStaPduReq     func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxStaPduReq(func, pst, mBuf)
+S16 cmUnpkUdxStaPduReq(func, pst, mBuf)
 UdxStaPduReq     func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1543,7 +1543,7 @@ Buffer            *mBuf;
     SpId      spId = 0;
     CmLteRlcId tmpRlcId;
     CmLteRlcId *rlcId = NULLP;  /* KW_FIX */
-    KwUdxDlStaPdu *pStaPdu = NULLP; /* KW_FIX */
+    RlcUdxDlStaPdu *pStaPdu = NULLP; /* KW_FIX */
     
     TRC3(cmUnpkUdxStaUpdCfm)
 
@@ -1553,7 +1553,7 @@ Buffer            *mBuf;
        case UDX_SEL_LC:
        {
            if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&pStaPdu,
-                       sizeof(KwUdxDlStaPdu),0)) != ROK)
+                       sizeof(RlcUdxDlStaPdu),0)) != ROK)
            {
 #if (ERRCLASS & ERRCLS_ADD_RES)
               if(ret1 != ROK)
@@ -1563,23 +1563,23 @@ Buffer            *mBuf;
                       (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed");
               }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-              RETVALUE(ret1);
+              return (ret1);
            }
-          ret1 = cmUnpkUdxStruct(mBuf,0, (U8 *)pStaPdu, sizeof(KwUdxDlStaPdu));
-          ret1 = cmUnpkUdxStruct(mBuf,sizeof(KwUdxDlStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId));
+          ret1 = cmUnpkUdxStruct(mBuf,0, (U8 *)pStaPdu, sizeof(RlcUdxDlStaPdu));
+          ret1 = cmUnpkUdxStruct(mBuf,sizeof(RlcUdxDlStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId));
           rlcId = &tmpRlcId; 
            break;
        }
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
-          CMCHKUNPK(cmUnpkPtr, (PTR *)&pStaPdu,mBuf);
+          CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
+          CMCHKUNPK(oduUnpackPointer, (PTR *)&pStaPdu,mBuf);
           break;
        }
     } 
 
     SPutMsg(mBuf);
-    RETVALUE((*func)(pst, spId, rlcId, pStaPdu));
+    return ((*func)(pst, spId, rlcId, pStaPdu));
 
 } /* cmUnpkUdxUeIdChgCfm */
 
@@ -1597,14 +1597,14 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaProhTmrStart
+S16 cmUnpkUdxStaProhTmrStart
 (
 UdxStaProhTmrStart     func,
 Pst               *pst,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxStaProhTmrStart(func, pst, mBuf)
+S16 cmUnpkUdxStaProhTmrStart(func, pst, mBuf)
 UdxStaProhTmrStart     func;
 Pst               *pst;
 Buffer            *mBuf;
@@ -1627,14 +1627,14 @@ Buffer            *mBuf;
        }
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf);
+          CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf);
           break;
        }
     } 
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, spId, rlcId));
+    return ((*func)(pst, spId, rlcId));
 
 } /* cmUnpkUdxStaProhTmrStart */
 
@@ -1651,21 +1651,21 @@ Buffer            *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasReq
+S16 cmUnpkUdxL2MeasReq
 (
 UdxL2MeasReq     func,
 Pst              *pst,
 Buffer           *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxL2MeasReq(func, pst, mBuf)
+S16 cmUnpkUdxL2MeasReq(func, pst, mBuf)
 UdxL2MeasReq     func;
 Pst              *pst;
 Buffer           *mBuf;
 #endif
 {
-    KwL2MeasReqEvt    tmpMeasReqEvt;
-    KwL2MeasReqEvt    *measReqEvt = NULLP;  /* KW_FIX */
+    RlcL2MeasReqEvt    tmpMeasReqEvt;
+    RlcL2MeasReqEvt    *measReqEvt = NULLP;  /* KW_FIX */
 
     TRC3(cmUnpkUdxL2MeasReq)
 
@@ -1673,20 +1673,20 @@ Buffer           *mBuf;
     {
        case UDX_SEL_LC:
        {
-          cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpMeasReqEvt,sizeof(KwL2MeasReqEvt));
+          cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpMeasReqEvt,sizeof(RlcL2MeasReqEvt));
           measReqEvt = &tmpMeasReqEvt;
           break;
        }
        case UDX_SEL_LWLC:
        {
-         CMCHKUNPK(cmUnpkPtr, (PTR *)&measReqEvt,mBuf);
+         CMCHKUNPK(oduUnpackPointer, (PTR *)&measReqEvt,mBuf);
          break;
        }
     }
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, measReqEvt));
+    return ((*func)(pst, measReqEvt));
 } /* cmUnpkUdxL2MeasReq */
 
 /*
@@ -1700,14 +1700,14 @@ Buffer           *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasSendReq
+S16 cmUnpkUdxL2MeasSendReq
 (
 UdxL2MeasSendReq   func,
 Pst                *pst,
 Buffer             *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxL2MeasSendReq(func, pst, mBuf)
+S16 cmUnpkUdxL2MeasSendReq(func, pst, mBuf)
 UdxL2MeasSendReq   func;
 Pst                *pst;
 Buffer             *mBuf;
@@ -1722,14 +1722,14 @@ Buffer             *mBuf;
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(SUnpkU8, &measType, mBuf);
+          CMCHKUNPK(oduPackUInt8, &measType, mBuf);
          break;
        }
     }
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, measType));
+    return ((*func)(pst, measType));
 } /* cmUnpkUdxL2MeasReq */
 
 /*
@@ -1743,14 +1743,14 @@ Buffer             *mBuf;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasStopReq
+S16 cmUnpkUdxL2MeasStopReq
 (
 UdxL2MeasStopReq   func,
 Pst                *pst,
 Buffer             *mBuf
 )
 #else
-PUBLIC S16 cmUnpkUdxL2MeasStopReq(func, pst, mBuf)
+S16 cmUnpkUdxL2MeasStopReq(func, pst, mBuf)
 UdxL2MeasSendReq     func;
 Pst                  *pst;
 Buffer               *mBuf;
@@ -1765,14 +1765,14 @@ Buffer               *mBuf;
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(SUnpkU8, &measType, mBuf);
+          CMCHKUNPK(oduPackUInt8, &measType, mBuf);
          break;
        }
     }
 
     SPutMsg(mBuf);
 
-    RETVALUE((*func)(pst, measType));
+    return ((*func)(pst, measType));
 } /* cmUnpkUdxL2MeasStopReq */
 #endif
 #endif /* LCUDX */