UL data path changes at Phy stub, RLC UL UM and DU APP [Issue-ID: ODUHIGH-262]

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

diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c
index a793ed9..0959f75 100755 (executable)
--- a/src/5gnrrlc/kw_udx.c
+++ b/src/5gnrrlc/kw_udx.c
@@ -53,25 +53,10 @@
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PRIVATE S16 cmUnpkUdxStruct
-(
-Buffer *srcMBuf,
-U32  offset,
-U8     *dstBuf,
-U32    size
-)
-#else
-PRIVATE S16 cmUnpkUdxStruct(dstMBuf,srcBuf,size)
-Buffer *srcMBuf;
-U32  offset;
-U8     *dstBuf;
-MsgLen    size;
-#endif
+static S16 cmUnpkUdxStruct(Buffer *srcMBuf,uint32_t offset,uint8_t *dstBuf,uint32_t size)
 {
     MsgLen tmpLen;
 
-    TRC3(cmUnpkUdxStruct)
     return (SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen));
 
 } /*end of function cmPkUdxBndReq*/
@@ -89,22 +74,9 @@ MsgLen    size;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PRIVATE S16 cmPkUdxStruct
-(
-U8     *srcBuf,
-MsgLen    size,
-Buffer *dstMBuf
-)
-#else
-PRIVATE S16 cmPkUdxStruct(dstMBuf,srcBuf,size)
-U8     *srcBuf;
-MsgLen    size;
-Buffer *dstMBuf;
-#endif
+static S16 cmPkUdxStruct(uint8_t *srcBuf,MsgLen size,Buffer *dstMBuf)
 {
 
-    TRC3(cmPkUdxStruct)
     return (SAddPstMsgMult(srcBuf,size,dstMBuf));
 
 } /*end of function cmPkUdxBndReq*/
@@ -121,24 +93,11 @@ Buffer *dstMBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxBndReq
-(
-Pst *pst,
-SuId suId,
-SpId spId
-)
-#else
-PUBLIC S16 cmPkUdxBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
+S16 cmPkUdxBndReq(Pst *pst,SuId suId,SpId spId)
 {
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxBndReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -172,24 +131,11 @@ SpId spId;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxUbndReq
-(
-Pst *pst,
-SpId spId,
-Reason reason
-)
-#else
-PUBLIC S16 cmPkUdxUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
+S16 cmPkUdxUbndReq(Pst *pst,SpId spId,Reason reason)
 {
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxUbndReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -223,24 +169,11 @@ Reason reason;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxBndCfm
-(
-Pst *pst,
-SuId suId,
-U8 status
-)
-#else
-PUBLIC S16 cmPkUdxBndCfm(pst, suId, status)
-Pst *pst;
-SuId suId;
-U8 status;
-#endif
+S16 cmPkUdxBndCfm(Pst *pst,SuId suId,uint8_t status)
 {
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxBndCfm)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -276,24 +209,11 @@ U8 status;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxCfgReq
-(
-Pst               *pst,
-SpId              spId,
-RlcCfgInfo        *cfgInfo
-)
-#else
-PUBLIC S16 cmPkUdxCfgReq(pst, spId, cfgInfo)
-Pst               *pst;
-SpId              spId;
-RlcCfgInfo        *cfgInfo;
-#endif
+S16 cmPkUdxCfgReq(Pst *pst,SpId  spId,RlcCfgInfo *cfgInfo)
 {
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxCfgReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -313,7 +233,7 @@ RlcCfgInfo        *cfgInfo;
 #ifdef LCUDX
        case UDX_SEL_LC:
           {
-             cmPkUdxStruct((U8 *)cfgInfo, sizeof(RlcCfgInfo),mBuf);
+             cmPkUdxStruct((uint8_t *)cfgInfo, sizeof(RlcCfgInfo),mBuf);
              /* Need Not free CfgInfo here as it is stored 
                 in UL */
              break;
@@ -346,24 +266,11 @@ RlcCfgInfo        *cfgInfo;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxCfgCfm
-(
-Pst               *pst,
-SuId              suId,
-RlcCfgCfmInfo     *cfgCfmInfo
-)
-#else
-PUBLIC S16 cmPkUdxCfgCfm(pst, suId, cfgCfmInfo)
-Pst               *pst;
-SuId              suId;
-RlcCfgCfmInfo     *cfgCfmInfo;
-#endif
+S16 cmPkUdxCfgCfm(Pst *pst,SuId suId,RlcCfgCfmInfo  *cfgCfmInfo)
 {
     S16 ret1;
     Buffer *mBuf;
     mBuf = NULLP;
-    TRC3(cmPkUdxCfgCfm)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -383,7 +290,7 @@ RlcCfgCfmInfo     *cfgCfmInfo;
 #ifdef LCUDX
        case UDX_SEL_LC:
           {
-             cmPkUdxStruct((U8 *)cfgCfmInfo, sizeof(RlcCfgCfmInfo),mBuf);
+             cmPkUdxStruct((uint8_t *)cfgCfmInfo, sizeof(RlcCfgCfmInfo),mBuf);
              /* Need to free the cfgCfmInfo here as it is allocated 
                                         buffer call SPutStaticBuffer */
              SPutStaticBuffer(pst->region,pst->pool,(Data *) cfgCfmInfo,
@@ -418,28 +325,18 @@ RlcCfgCfmInfo     *cfgCfmInfo;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgReq
+S16 cmPkUdxUeIdChgReq
 (
-Pst               *pst,
-SpId              spId,
-U32               transId,
-CkwUeInfo         *ueInfo,
-CkwUeInfo         *newUeInfo
+Pst        *pst,
+SpId       spId,
+uint32_t   transId,
+CkwUeInfo  *ueInfo,
+CkwUeInfo  *newUeInfo
 )
-#else
-PUBLIC S16 cmPkUdxUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst               *pst;
-SpId              spId;
-U32               transId;
-CkwUeInfo         *ueInfo;
-CkwUeInfo         *newUeInfo;
-#endif
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxUeIdChgReq)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -460,8 +357,8 @@ CkwUeInfo         *newUeInfo;
 #ifdef LCUDX
        case UDX_SEL_LC:
        {
-            cmPkUdxStruct((U8 *)newUeInfo, sizeof(CkwUeInfo),mBuf);
-            cmPkUdxStruct((U8 *)ueInfo, sizeof(CkwUeInfo),mBuf);
+            cmPkUdxStruct((uint8_t *)newUeInfo, sizeof(CkwUeInfo),mBuf);
+            cmPkUdxStruct((uint8_t *)ueInfo, sizeof(CkwUeInfo),mBuf);
             /* No need to free ueInfo here as it is stored */
             break;
        }
@@ -499,25 +396,10 @@ CkwUeInfo         *newUeInfo;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxUeIdChgCfm
-(
-Pst               *pst,
-SuId              suId,
-U32               transId,
-CmStatus          status
-)
-#else
-PUBLIC S16 cmPkUdxUeIdChgCfm(pst, suId, transId, status)
-Pst               *pst;
-SuId              suId;
-U32               transId;
-CmStatus          status;
-#endif
+S16 cmPkUdxUeIdChgCfm(Pst *pst,SuId suId,uint32_t transId,CmStatus status)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
-    TRC3(cmPkUdxUeIdChgCfm)
 
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
@@ -555,27 +437,11 @@ CmStatus          status;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaUpdCfm
-(
-Pst               *pst,
-SuId              suId,
-CmLteRlcId        *rlcId,
-KwUdxBufLst       *pStaPdu
-)
-#else
-PUBLIC S16 cmPkUdxStaUpdCfm(pst, suId, rlcId,pStaPdu)
-Pst               *pst;
-SuId              suId;
-CmLteRlcId        *rlcId;
-KwUdxBufLst       *pStaPdu;
-#endif
+S16 cmPkUdxStaUpdCfm(Pst *pst,SuId suId,CmLteRlcId *rlcId,RlcUdxBufLst *pStaPdu)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaUpdCfm)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -594,8 +460,8 @@ KwUdxBufLst       *pStaPdu;
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxBufLst),mBuf);
-         cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
+         cmPkUdxStruct((uint8_t *)pStaPdu, sizeof(RlcUdxBufLst),mBuf);
+         cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf);
          break;
        }
        case UDX_SEL_LWLC:
@@ -625,25 +491,11 @@ KwUdxBufLst       *pStaPdu;
 *    File:   Kw_udx.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaProhTmrStart
-(
-Pst               *pst,
-SpId              spId,
-CmLteRlcId        *rlcId
-)
-#else
-PUBLIC S16 cmPkUdxStaProhTmrStart(pst, suId, rlcId)
-Pst               *pst;
-SpId              spId;
-CmLteRlcId        *rlcId;
-#endif
+S16 cmPkUdxStaProhTmrStart(Pst *pst,SpId spId,CmLteRlcId *rlcId)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaProhTmrStart)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -662,7 +514,7 @@ CmLteRlcId        *rlcId;
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
+         cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf);
          break;
        }
        case UDX_SEL_LWLC:
@@ -691,27 +543,11 @@ CmLteRlcId        *rlcId;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaUpdReq
-(
-Pst               *pst,
-SpId              spId,
-CmLteRlcId        *rlcId,
-KwUdxStaPdu      *pStaPdu
-)
-#else
-PUBLIC S16 cmPkUdxStaUpdReq(pst, suId, rlcId,pStaPdu)
-Pst               *pst;
-SpId              spId;
-CmLteRlcId        *rlcId;
-KwUdxStaPdu       *pStaPdu;
-#endif
+S16 cmPkUdxStaUpdReq(Pst *pst,SpId spId,CmLteRlcId *rlcId,RlcUdxStaPdu *pStaPdu)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaUpdReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -730,10 +566,10 @@ KwUdxStaPdu       *pStaPdu;
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxStaPdu),mBuf);
-         cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
+         cmPkUdxStruct((uint8_t *)pStaPdu, sizeof(RlcUdxStaPdu),mBuf);
+         cmPkUdxStruct((uint8_t *)rlcId, sizeof(CmLteRlcId),mBuf);
          SPutStaticBuffer(pst->region,pst->pool,(Data *) pStaPdu,
-                          sizeof(KwUdxStaPdu),0);
+                          sizeof(RlcUdxStaPdu),0);
 
          break;
        }
@@ -764,27 +600,11 @@ KwUdxStaPdu       *pStaPdu;
 *    File:   ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxStaPduReq
-(
-Pst               *pst,
-SpId              spId,
-CmLteRlcId        *rlcId,
-KwUdxDlStaPdu     *pStaPdu
-)
-#else
-PUBLIC S16 cmPkUdxStaPduReq(pst, suId, rlcId,pStaPdu)
-Pst               *pst;
-SpId              spId;
-CmLteRlcId        *rlcId;
-KwUdxDlStaPdu     *pStaPdu;
-#endif
+S16 cmPkUdxStaPduReq(Pst *pst,SpId spId,CmLteRlcId *rlcId,RlcUdxDlStaPdu *pStaPdu)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxStaUpdReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -803,11 +623,11 @@ KwUdxDlStaPdu     *pStaPdu;
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)pStaPdu, sizeof(KwUdxDlStaPdu),mBuf);
-         cmPkUdxStruct((U8 *)rlcId, sizeof(CmLteRlcId),mBuf);
+         cmPkUdxStruct((uint8_t *)pStaPdu, sizeof(RlcUdxDlStaPdu),mBuf);
+         cmPkUdxStruct((uint8_t *)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:
@@ -835,23 +655,11 @@ KwUdxDlStaPdu     *pStaPdu;
 *
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasReq
-(
-Pst               *pst,
-KwL2MeasReqEvt    *measReqEvt 
-)
-#else
-PUBLIC S16 cmPkUdxL2MeasReq(pst, measReqEvt)
-Pst               *pst;
-KwL2MeasReqEvt    *measReqEvt; 
-#endif
+S16 cmPkUdxL2MeasReq(Pst  *pst,RlcL2MeasReqEvt *measReqEvt)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxL2MeasReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -870,7 +678,7 @@ KwL2MeasReqEvt    *measReqEvt;
     {
        case UDX_SEL_LC:
        {
-         cmPkUdxStruct((U8 *)measReqEvt, sizeof(KwL2MeasReqEvt),mBuf);
+         cmPkUdxStruct((uint8_t *)measReqEvt, sizeof(RlcL2MeasReqEvt),mBuf);
          break;
        }
        case UDX_SEL_LWLC:
@@ -895,23 +703,11 @@ KwL2MeasReqEvt    *measReqEvt;
 *
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasSendReq
-(
-Pst              *pst,
-U8               measType
-)
-#else
-PUBLIC S16 cmPkUdxL2MeasSendReq(pst, measReqEvt)
-Pst               *pst;
-U8                measType
-#endif
+S16 cmPkUdxL2MeasSendReq(Pst  *pst,uint8_t measType)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxL2MeasSendReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -951,23 +747,11 @@ U8                measType
 *
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmPkUdxL2MeasStopReq
-(
-Pst              *pst,
-U8               measType
-)
-#else
-PUBLIC S16 cmPkUdxL2MeasStopReq(pst, measType)
-Pst               *pst;
-U8                measType
-#endif
+S16 cmPkUdxL2MeasStopReq(Pst *pst,uint8_t measType)
 {
     S16    ret1;
     Buffer *mBuf = NULLP;
 
-    TRC3(cmPkUdxL2MeasStopReq)
-
     if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1014,25 +798,11 @@ U8                measType
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxBndReq
-(
-UdxBndReq      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxBndReq(func, pst, mBuf)
-UdxBndReq      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkUdxBndReq(UdxBndReq func,Pst  *pst,Buffer *mBuf)
 {
     SuId       suId = 0;
     SpId       spId = 0;
     
-    TRC3(cmUnpkUdxBndReq)
-
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
@@ -1053,25 +823,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxUbndReq
-(
-UdxUbndReq     func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxUbndReq(func, pst, mBuf)
-UdxUbndReq     func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkUdxUbndReq(UdxUbndReq func,Pst *pst,Buffer *mBuf)
 {
     SpId       spId = 0;
     Reason     reason = 0;
     
-    TRC3(cmUnpkUdxUbndReq)
-
     CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst);
     CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
@@ -1091,25 +847,11 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxBndCfm
-(
-UdxBndCfm      func,
-Pst            *pst,
-Buffer         *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxBndCfm(func, pst, mBuf)
-UdxBndCfm      func;
-Pst            *pst;
-Buffer         *mBuf;
-#endif
+S16 cmUnpkUdxBndCfm(UdxBndCfm func,Pst *pst,Buffer *mBuf)
 {
     SuId       suId = 0;
-    U8         status = 0;
+    uint8_t         status = 0;
     
-    TRC3(cmUnpkUdxBndCfm)
-
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
     CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst);
     SPutMsg(mBuf);
@@ -1131,19 +873,7 @@ Buffer         *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxCfgReq
-(
-UdxCfgReq         func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxCfgReq(func, pst, mBuf)
-UdxCfgReq         func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxCfgReq(UdxCfgReq func,Pst  *pst,Buffer *mBuf)
 {
 #if(ERRCLASS & ERRCLS_DEBUG)
     S16           ret1;
@@ -1152,8 +882,6 @@ Buffer            *mBuf;
     RlcCfgInfo     tmpCfgInfo;
     RlcCfgInfo    *cfgInfo; /*stack Variable because it is not freed */
     
-    TRC3(cmUnpkUdxCfgReq)
-
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
     switch(pst->selector)
     {
@@ -1161,7 +889,7 @@ Buffer            *mBuf;
        case UDX_SEL_LC:
        {
 #if(ERRCLASS & ERRCLS_DEBUG)
-          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(RlcCfgInfo));
+          ret1 = cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpCfgInfo,sizeof(RlcCfgInfo));
           if(ret1 != ROK)
           {
              SPutMsg(mBuf);
@@ -1171,7 +899,7 @@ Buffer            *mBuf;
              return ( ret1 );
           }
 #else
-         cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(RlcCfgInfo));
+         cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpCfgInfo,sizeof(RlcCfgInfo));
 #endif /* ERRCLASS & ERRCLS_DEBUG */
           cfgInfo = &tmpCfgInfo;
           break;
@@ -1202,26 +930,12 @@ Buffer            *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxCfgCfm
-(
-UdxCfgCfm         func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxCfgCfm(func, pst, mBuf)
-UdxCfgCfm         func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxCfgCfm(UdxCfgCfm func,Pst  *pst,Buffer *mBuf)
 {
     S16 ret1;
     SuId             suId = 0;
     RlcCfgCfmInfo    *cfgCfmInfo = NULLP;
     
-    TRC3(cmUnpkUdxCfgCfm)
-
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
 
     switch(pst->selector)
@@ -1243,7 +957,7 @@ Buffer            *mBuf;
               return (ret1);
            }
 
-          ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)cfgCfmInfo, sizeof(RlcCfgCfmInfo));
+          ret1 = cmUnpkUdxStruct(mBuf,0,(uint8_t *)cfgCfmInfo, sizeof(RlcCfgCfmInfo));
 #if(ERRCLASS & ERRCLS_DEBUG)
           if(ret1 != ROK)
           {
@@ -1281,30 +995,15 @@ Buffer            *mBuf;
 *    File:     ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxUeIdChgReq
-(
-UdxUeIdChgReq     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxUeIdChgReq(func, pst, mBuf)
-UdxUeIdChgReq     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxUeIdChgReq(UdxUeIdChgReq func,Pst *pst,Buffer *mBuf)
 {
     SpId      spId = 0;
-    U32       transId = 0;
+    uint32_t  transId = 0;
     CkwUeInfo tmpUeInfo;
     CkwUeInfo tmpNewUeInfo;
     CkwUeInfo *ueInfo;
     CkwUeInfo *newUeInfo;
     
-    TRC3(cmUnpkUdxUeIdChgReq)
-
-
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
     CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
 
@@ -1313,8 +1012,8 @@ Buffer            *mBuf;
 #ifdef LCUDX
        case UDX_SEL_LC:
        {
-          cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpNewUeInfo, sizeof(CkwUeInfo));
-          cmUnpkUdxStruct(mBuf,sizeof(CkwUeInfo),(U8 *)&tmpUeInfo, sizeof(CkwUeInfo));
+          cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpNewUeInfo, sizeof(CkwUeInfo));
+          cmUnpkUdxStruct(mBuf,sizeof(CkwUeInfo),(uint8_t *)&tmpUeInfo, sizeof(CkwUeInfo));
 
           ueInfo =  &tmpUeInfo;
           newUeInfo =  &tmpNewUeInfo;
@@ -1353,27 +1052,13 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxUeIdChgCfm
-(
-UdxUeIdChgCfm     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxUeIdChgCfm(func, pst, mBuf)
-UdxUeIdChgCfm     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxUeIdChgCfm(UdxUeIdChgCfm func,Pst  *pst,Buffer *mBuf)
 {
     SuId      suId = 0;
-    U32       transId = 0;
+    uint32_t  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);
@@ -1399,26 +1084,12 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaUpdCfm
-(
-UdxStaUpdCfm     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaUpdCfm(func, pst, mBuf)
-UdxStaUpdCfm     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaUpdCfm(UdxStaUpdCfm func,Pst *pst,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)
     {
@@ -1453,35 +1124,21 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaUpdReq
-(
-UdxStaUpdReq     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaUpdReq(func, pst, mBuf)
-UdxStaUpdReq     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaUpdReq(UdxStaUpdReq func,Pst *pst,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 +1150,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,(uint8_t *)pStaPdu, sizeof(RlcUdxStaPdu));
+          ret1 = cmUnpkUdxStruct(mBuf,sizeof(RlcUdxStaPdu),(uint8_t *)&tmpRlcId,sizeof(CmLteRlcId));
           rlcId = &tmpRlcId; 
           break;
        }
@@ -1525,35 +1182,21 @@ Buffer            *mBuf;
 *    File:    ckw.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaPduReq
-(
-UdxStaPduReq     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaPduReq(func, pst, mBuf)
-UdxStaPduReq     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaPduReq(UdxStaPduReq func,Pst *pst,Buffer *mBuf)
 {
     S16       ret1;
     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 +1208,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, (uint8_t *)pStaPdu, sizeof(RlcUdxDlStaPdu));
+          ret1 = cmUnpkUdxStruct(mBuf,sizeof(RlcUdxDlStaPdu),(uint8_t *)&tmpRlcId,sizeof(CmLteRlcId));
           rlcId = &tmpRlcId; 
            break;
        }
@@ -1596,32 +1239,18 @@ Buffer            *mBuf;
 *    File:    kw_udx.c
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxStaProhTmrStart
-(
-UdxStaProhTmrStart     func,
-Pst               *pst,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxStaProhTmrStart(func, pst, mBuf)
-UdxStaProhTmrStart     func;
-Pst               *pst;
-Buffer            *mBuf;
-#endif
+S16 cmUnpkUdxStaProhTmrStart(UdxStaProhTmrStart func,Pst *pst,Buffer *mBuf)
 {
     SpId      spId = 0;
     CmLteRlcId tmpRlcId;
     CmLteRlcId *rlcId = NULLP; /* KW_FIX */
     
-    TRC3(cmUnpkUdxStaProhTmrStart)
-
     CMCHKUNPK(SUnpkS16, &spId, mBuf);
     switch (pst->selector)
     {
        case UDX_SEL_LC:
        {
-          cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpRlcId,sizeof(CmLteRlcId));
+          cmUnpkUdxStruct(mBuf,0,(uint8_t *)&tmpRlcId,sizeof(CmLteRlcId));
           rlcId = &tmpRlcId;
           break;
        }
@@ -1650,30 +1279,16 @@ Buffer            *mBuf;
 *
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasReq
-(
-UdxL2MeasReq     func,
-Pst              *pst,
-Buffer           *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxL2MeasReq(func, pst, mBuf)
-UdxL2MeasReq     func;
-Pst              *pst;
-Buffer           *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasReq(UdxL2MeasReq func,Pst *pst,Buffer *mBuf)
 {
-    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,(uint8_t *)&tmpMeasReqEvt,sizeof(RlcL2MeasReqEvt));
           measReqEvt = &tmpMeasReqEvt;
           break;
        }
@@ -1699,23 +1314,9 @@ Buffer           *mBuf;
 *
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasSendReq
-(
-UdxL2MeasSendReq   func,
-Pst                *pst,
-Buffer             *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxL2MeasSendReq(func, pst, mBuf)
-UdxL2MeasSendReq   func;
-Pst                *pst;
-Buffer             *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasSendReq(UdxL2MeasSendReq func,Pst *pst,Buffer *mBuf)
 {
-    U8     measType = 0;  /* KW_FIX */
-
-    TRC3(cmUnpkUdxL2MeasSendReq)
+    uint8_t     measType = 0;  /* KW_FIX */
 
     switch (pst->selector)
     {
@@ -1742,23 +1343,9 @@ Buffer             *mBuf;
 *
 *
 */
-#ifdef ANSI
-PUBLIC S16 cmUnpkUdxL2MeasStopReq
-(
-UdxL2MeasStopReq   func,
-Pst                *pst,
-Buffer             *mBuf
-)
-#else
-PUBLIC S16 cmUnpkUdxL2MeasStopReq(func, pst, mBuf)
-UdxL2MeasSendReq     func;
-Pst                  *pst;
-Buffer               *mBuf;
-#endif
+S16 cmUnpkUdxL2MeasStopReq(UdxL2MeasStopReq func,Pst *pst,Buffer *mBuf)
 {
-    U8     measType = 0; /* KW_FIX */
-
-    TRC3(cmUnpkUdxL2MeasStopReq)
+    uint8_t     measType = 0; /* KW_FIX */
 
     switch (pst->selector)
     {