X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_udx.c;h=73bdee10c5152305b0bc07e2500c7fc335da2886;hb=694adde1a08c393a8443fd5bbd4f036f5cf85403;hp=a793ed9f6c0acf647cb54776a2cabb9d0ea84abe;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c
index a793ed9f6..73bdee10c 100755
--- a/src/5gnrrlc/kw_udx.c
+++ b/src/5gnrrlc/kw_udx.c
@@ -71,7 +71,6 @@ MsgLen    size;
 {
     MsgLen tmpLen;
 
-    TRC3(cmUnpkUdxStruct)
     return (SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen));
 
 } /*end of function cmPkUdxBndReq*/
@@ -104,7 +103,6 @@ Buffer *dstMBuf;
 #endif
 {
 
-    TRC3(cmPkUdxStruct)
     return (SAddPstMsgMult(srcBuf,size,dstMBuf));
 
 } /*end of function cmPkUdxBndReq*/
@@ -122,14 +120,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;
@@ -138,7 +136,6 @@ SpId spId;
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxBndReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -173,14 +170,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;
@@ -189,7 +186,6 @@ Reason reason;
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxUbndReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -224,14 +220,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;
@@ -240,7 +236,6 @@ U8 status;
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxBndCfm)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -277,14 +272,14 @@ U8 status;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxCfgReq
+S16 cmPkUdxCfgReq
 (
 Pst               *pst,
 SpId              spId,
 RlcCfgInfo        *cfgInfo
 )
 #else
-PUBLIC S16 cmPkUdxCfgReq(pst, spId, cfgInfo)
+S16 cmPkUdxCfgReq(pst, spId, cfgInfo)
 Pst               *pst;
 SpId              spId;
 RlcCfgInfo        *cfgInfo;
@@ -293,7 +288,6 @@ RlcCfgInfo        *cfgInfo;
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxCfgReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -347,14 +341,14 @@ RlcCfgInfo        *cfgInfo;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxCfgCfm
+S16 cmPkUdxCfgCfm
 (
 Pst               *pst,
 SuId              suId,
 RlcCfgCfmInfo     *cfgCfmInfo
 )
 #else
-PUBLIC S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo)
+S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo)
 Pst               *pst;
 SuId              suId;
 RlcCfgCfmInfo     *cfgCfmInfo;
@@ -363,7 +357,6 @@ RlcCfgCfmInfo     *cfgCfmInfo;
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxCfgCfm)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -419,7 +412,7 @@ RlcCfgCfmInfo     *cfgCfmInfo;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgReq
+S16 cmPkUdxUeIdChgReq
 (
 Pst               *pst,
 SpId              spId,
@@ -428,7 +421,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;
@@ -439,7 +432,6 @@ CkwUeInfo         *newUeInfo;
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxUeIdChgReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -500,7 +492,7 @@ CkwUeInfo         *newUeInfo;
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgCfm
+S16 cmPkUdxUeIdChgCfm
 (
 Pst               *pst,
 SuId              suId,
@@ -508,7 +500,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;
@@ -517,7 +509,6 @@ CmStatus          status;
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
-    TRC3(cmPkUdxUeIdChgCfm)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -556,26 +547,24 @@ 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;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaUpdCfm)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -594,7 +583,7 @@ KwUdxBufLst       *pStaPdu;
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxBufLst),mBuf);
+         cmPkUdxStruct((U8 *)pStaPdu, sizeof(RlcUdxBufLst),mBuf);
          cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
          break;
        }
@@ -626,14 +615,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;
@@ -642,8 +631,6 @@ CmLteRlcId        *rlcId;
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaProhTmrStart)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -692,26 +679,24 @@ 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;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaUpdReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -730,10 +715,10 @@ KwUdxStaPdu       *pStaPdu;
     {
        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;
        }
@@ -765,26 +750,24 @@ 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;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaUpdReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -803,11 +786,11 @@ KwUdxDlStaPdu     *pStaPdu;
     {
        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:
@@ -836,22 +819,20 @@ 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;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxL2MeasReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -870,7 +851,7 @@ KwL2MeasReqEvt    *measReqEvt;
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)measReqEvt, sizeof(KwL2MeasReqEvt),mBuf);
+         cmPkUdxStruct((U8 *)measReqEvt, sizeof(RlcL2MeasReqEvt),mBuf);
          break;
        }
        case UDX_SEL_LWLC:
@@ -896,13 +877,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
@@ -910,8 +891,6 @@ U8                measType
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxL2MeasSendReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -952,13 +931,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
@@ -966,8 +945,6 @@ U8                measType
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxL2MeasStopReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1015,14 +992,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;
@@ -1031,8 +1008,6 @@ Buffer         *mBuf;
     SuId       suId = 0;
     SpId       spId = 0;
     
-    TRC3(cmUnpkUdxBndReq)
-
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
@@ -1054,14 +1029,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;
@@ -1070,8 +1045,6 @@ Buffer         *mBuf;
     SpId       spId = 0;
     Reason     reason = 0;
     
-    TRC3(cmUnpkUdxUbndReq)
-
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
     CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
@@ -1092,14 +1065,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;
@@ -1108,8 +1081,6 @@ Buffer         *mBuf;
     SuId       suId = 0;
     U8         status = 0;
     
-    TRC3(cmUnpkUdxBndCfm)
-
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
     CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
@@ -1132,14 +1103,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;
@@ -1152,8 +1123,6 @@ Buffer            *mBuf;
     RlcCfgInfo     tmpCfgInfo;
     RlcCfgInfo    *cfgInfo; /*stack Variable because it is not freed */
     
-    TRC3(cmUnpkUdxCfgReq)
-
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
     switch(pst->selector)
     {
@@ -1203,14 +1172,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;
@@ -1220,8 +1189,6 @@ Buffer            *mBuf;
     SuId             suId = 0;
     RlcCfgCfmInfo    *cfgCfmInfo = NULLP;
     
-    TRC3(cmUnpkUdxCfgCfm)
-
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
 
     switch(pst->selector)
@@ -1282,14 +1249,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;
@@ -1302,9 +1269,6 @@ Buffer            *mBuf;
     CkwUeInfo *ueInfo;
     CkwUeInfo *newUeInfo;
     
-    TRC3(cmUnpkUdxUeIdChgReq)
-
-
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
     CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
 
@@ -1354,14 +1318,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;
@@ -1371,9 +1335,7 @@ Buffer            *mBuf;
     U32       transId = 0;
     CmStatus  status;
     
-    TRC3(cmUnpkUdxUeIdChgCfm)
-
-    cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus));
+    memset(&status, 0, sizeof(CmStatus));
 
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
     CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
@@ -1400,14 +1362,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,10 +1377,8 @@ Buffer            *mBuf;
 {
     SuId      suId = 0;
     CmLteRlcId *rlcId = NULLP;  /* KW_FIX */
-    KwUdxBufLst *pBufLst = NULLP; /* KW_FIX*/
+    RlcUdxBufLst *pBufLst = NULLP; /* KW_FIX*/
     
-    TRC3(cmUnpkUdxStaUpdCfm)
-
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
     switch (pst->selector)
     {
@@ -1454,14 +1414,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,19 +1429,17 @@ Buffer            *mBuf;
 {
     SpId      spId = 0;
     CmLteRlcId *rlcId = NULLP; /* KW_FIX */ 
-    KwUdxStaPdu *pStaPdu = NULLP; /* KW_FIX */
+    RlcUdxStaPdu *pStaPdu = NULLP; /* KW_FIX */
     S16 ret1;
     CmLteRlcId tmpRlcId;
     
-    TRC3(cmUnpkUdxStaUpdCfm)
-
     CMCHKUNPK(SUnpkS16, &spId, mBuf);
     switch (pst->selector)
     {
        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)
@@ -1493,8 +1451,8 @@ Buffer            *mBuf;
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
               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;
        }
@@ -1526,14 +1484,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,17 +1501,15 @@ Buffer            *mBuf;
     SpId      spId = 0;
     CmLteRlcId tmpRlcId;
     CmLteRlcId *rlcId = NULLP;  /* KW_FIX */
-    KwUdxDlStaPdu *pStaPdu = NULLP; /* KW_FIX */
+    RlcUdxDlStaPdu *pStaPdu = NULLP; /* KW_FIX */
     
-    TRC3(cmUnpkUdxStaUpdCfm)
-
     CMCHKUNPK(SUnpkS16, &spId, mBuf);
     switch (pst->selector)
     {
        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)
@@ -1565,8 +1521,8 @@ Buffer            *mBuf;
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
               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;
        }
@@ -1597,14 +1553,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;
@@ -1614,8 +1570,6 @@ Buffer            *mBuf;
     CmLteRlcId tmpRlcId;
     CmLteRlcId *rlcId = NULLP; /* KW_FIX */
     
-    TRC3(cmUnpkUdxStaProhTmrStart)
-
     CMCHKUNPK(SUnpkS16, &spId, mBuf);
     switch (pst->selector)
     {
@@ -1651,29 +1605,27 @@ 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 */
-
-    TRC3(cmUnpkUdxL2MeasReq)
+    RlcL2MeasReqEvt    tmpMeasReqEvt;
+    RlcL2MeasReqEvt    *measReqEvt = NULLP;  /* KW_FIX */
 
     switch (pst->selector)
     {
        case UDX_SEL_LC:
        {
-          cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpMeasReqEvt,sizeof(KwL2MeasReqEvt));
+          cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpMeasReqEvt,sizeof(RlcL2MeasReqEvt));
           measReqEvt = &tmpMeasReqEvt;
           break;
        }
@@ -1700,14 +1652,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;
@@ -1715,8 +1667,6 @@ Buffer             *mBuf;
 {
     U8     measType = 0;  /* KW_FIX */
 
-    TRC3(cmUnpkUdxL2MeasSendReq)
-
     switch (pst->selector)
     {
        case UDX_SEL_LC:
@@ -1743,14 +1693,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;
@@ -1758,8 +1708,6 @@ Buffer               *mBuf;
 {
     U8     measType = 0; /* KW_FIX */
 
-    TRC3(cmUnpkUdxL2MeasStopReq)
-
     switch (pst->selector)
     {
        case UDX_SEL_LC: