X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Flkw.c;h=25ebfd0be14c64b778ce34526544eadc6d35264f;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=340c77b055b6c424b92477f4c84f2bde757c1833;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/cm/lkw.c b/src/cm/lkw.c
index 340c77b05..25ebfd0be 100755
--- a/src/cm/lkw.c
+++ b/src/cm/lkw.c
@@ -18,7 +18,7 @@
 
 /********************************************************************20**
   
-        Name:     LTE-RLC Layer 
+        Name:     NR RLC Layer 
     
         Type:     C source file
   
@@ -58,47 +58,47 @@ Txt ptNmb[LKW_PART_NUM_STR_LEN];         /* Part number */
   
 /* forward references */
 
-PRIVATE S16 cmPkRlcMngmt ARGS ((RlcMngmt *param ,Event eventType, 
+static S16 cmPkRlcMngmt ARGS ((RlcMngmt *param ,Event eventType, 
                                Buffer *mBuf));
-PRIVATE S16 cmPkRlcCfg ARGS ((RlcMngmt *param ,Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmPkRlcCntrl ARGS ((RlcMngmt *cntrl, Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmPkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmPkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt etmnt, Event eventType,
+static S16 cmPkRlcCfg ARGS ((RlcMngmt *param ,Elmnt elmnt, Buffer *mBuf));
+static S16 cmPkRlcCntrl ARGS ((RlcMngmt *cntrl, Elmnt elmnt, Buffer *mBuf));
+static S16 cmPkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf));
+static S16 cmPkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt etmnt, Event eventType,
                               Buffer *mBuf));
-PRIVATE S16 cmPkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmPkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf));
-PRIVATE S16 cmPkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf));
-PRIVATE S16 cmPkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf));
+static S16 cmPkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf));
+static S16 cmPkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf));
+static S16 cmPkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf));
+static S16 cmPkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf));
 /* lkw_c_001.main_2 removed support of RGU sap statistics as it is reflecting
  * in general statstics.
  * */
-PRIVATE S16 cmPkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf));
+static S16 cmPkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf));
 
-PRIVATE S16 cmUnpkRlcMngmt ARGS ((RlcMngmt *param, Event eventType,
+static S16 cmUnpkRlcMngmt ARGS ((RlcMngmt *param, Event eventType,
                                  Buffer * mBuf));
-PRIVATE S16 cmUnpkRlcCfg ARGS ((RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmUnpkRlcCntrl ARGS ((RlcMngmt *param, Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmUnpkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmUnpkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt elmnt, Event eventType,
+static S16 cmUnpkRlcCfg ARGS ((RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf));
+static S16 cmUnpkRlcCntrl ARGS ((RlcMngmt *param, Elmnt elmnt, Buffer *mBuf));
+static S16 cmUnpkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf));
+static S16 cmUnpkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt elmnt, Event eventType,
                                 Buffer *mBuf));
-PRIVATE S16 cmUnpkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf));
-PRIVATE S16 cmUnpkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf));
-PRIVATE S16 cmUnpkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf));
-PRIVATE S16 cmUnpkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf));
+static S16 cmUnpkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf));
+static S16 cmUnpkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf));
+static S16 cmUnpkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf));
+static S16 cmUnpkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf));
 /* lkw_c_001.main_2 removed support of RGU sap statistics as it is reflecting
  * in general statstics.
  * */
-PRIVATE S16 cmUnpkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf));
+static S16 cmUnpkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf));
 
 
-PRIVATE S16 cmPkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf));
-PRIVATE S16 cmUnpkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf));
+static S16 cmPkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf));
+static S16 cmUnpkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf));
 
-PRIVATE S16 cmPkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf));
-PRIVATE S16 cmUnpkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf));
+static S16 cmPkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf));
+static S16 cmUnpkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf));
 
-PRIVATE S16 cmPkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf));
-PRIVATE S16 cmUnpkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf));
+static S16 cmPkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf));
+static S16 cmUnpkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf));
 
 /**
  * @brief
@@ -111,22 +111,15 @@ PRIVATE S16 cmUnpkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf));
  *      -# Failure : RFAILED 
  */
 
-#ifdef ANSI
 S16 packRlcConfigReq
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfg                 /* RLC LM structure */
 )
-#else
-S16 packRlcConfigReq(pst, cfg)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfg;                /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(packRlcConfigReq)
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -175,26 +168,18 @@ RlcMngmt *cfg;                /* RLC LM structure */
  *      -# Failure : RFAILED
  */
  
-#ifdef ANSI
-S16 unpackRlcConfigReq
+uint8_t unpackRlcConfigReq
 (
 RlcConfigReq func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 unpackRlcConfigReq(func, pst, mBuf)
-RlcConfigReq func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* Return value */
    RlcMngmt cfg;              /* RLC LM structure */
 
-   TRC3(unpackRlcConfigReq)
 
-   cmMemset((U8 *) &cfg, (U8) 0, (S16) sizeof(RlcMngmt));
+   memset(&cfg,  0, sizeof(RlcMngmt));
    ret1 = cmUnpkRlcMngmt(&cfg, LKW_EVT_CFG_REQ, mBuf);
 
     if(ret1 != ROK)
@@ -229,22 +214,15 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmPkLkwCntrlReq
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cntrl               /* RLC LM structure */  
 )
-#else
-S16 cmPkLkwCntrlReq(pst,cntrl)
-Pst *pst;                    /* post structure */
-RlcMngmt *cntrl;              /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(cmPkLkwCntrlReq)
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -293,24 +271,16 @@ RlcMngmt *cntrl;              /* RLC LM structure */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwCntrlReq
 (
 LkwCntrlReq func,            /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwCntrlReq(func, pst, mBuf)
-LkwCntrlReq func;            /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* return value */
    RlcMngmt cfm;              /* Confirmation */
 
-   TRC3(cmUnpkLkwCntrlReq)
 
    ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_CNTRL_REQ, mBuf);
 
@@ -342,22 +312,15 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
-S16 cmPkLkwCntrlCfm
+uint8_t cmPkLkwCntrlCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* RLC LM structure */
 )
-#else
-S16 cmPkLkwCntrlCfm(pst, cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(cmPkLkwCntrlCfm)
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -407,24 +370,16 @@ RlcMngmt *cfm;                /* RLC LM structure */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwCntrlCfm
 (
 LkwCntrlCfm func,            /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwCntrlCfm(func, pst, mBuf)
-LkwCntrlCfm func;            /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt cfm;              /* RLC LM structure */
    S16 ret1;                 /* return value */
 
-   TRC3(cmUnpkLkwCntrlCfm)
 
    ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_CNTRL_CFM, mBuf);
 
@@ -458,24 +413,16 @@ Buffer *mBuf;                /* message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStsCfm
 (
 LkwStsCfm func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStsCfm(func, pst, mBuf)
-LkwStsCfm func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt cfm;              /* RLC LM structure */
    S16 ret1;                 /* return value */
 
-   TRC3(cmUnpkLkwStsCfm)
 
    ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_STS_CFM, mBuf);
 
@@ -510,22 +457,15 @@ Buffer *mBuf;                /* message buffer */
  */
 
 
-#ifdef ANSI
-S16 packRlcConfigCfm
+uint8_t packRlcConfigCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* RLC LM structure */
 )
-#else
-S16 packRlcConfigCfm(pst,cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(packRlcConfigCfm)
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -574,24 +514,16 @@ RlcMngmt *cfm;                /* RLC LM structure */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-S16 unpackRlcConfigCfm
+uint8_t unpackRlcConfigCfm
 (
 RlcConfigCfm func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 unpackRlcConfigCfm(func, pst, mBuf)
-RlcConfigCfm func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* return value */
    RlcMngmt cfm;              /* RLC LM structure */
 
-   TRC3(unpackRlcConfigCfm)
 
    ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_CFG_CFM, mBuf);
 
@@ -626,22 +558,15 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmPkLkwStaInd
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *usta                /* RLC LM structure */
 )
-#else
-S16 cmPkLkwStaInd(pst,usta)
-Pst *pst;                    /* post structure */
-RlcMngmt *usta;               /* RLC LM structure */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(cmPkLkwStaInd)
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -691,24 +616,16 @@ RlcMngmt *usta;               /* RLC LM structure */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwStaInd
 (
 LkwStaInd func,             /* primitive pointer */
 Pst *pst,                   /* post structure */
 Buffer *mBuf                /* message buffer */
 )
-#else
-S16 cmUnpkLkwStaInd(func, pst, mBuf)
-LkwStaInd func;             /* primitive pointer */
-Pst *pst;                   /* post structure */
-Buffer *mBuf;               /* message buffer */
-#endif
 {
    RlcMngmt usta;            /* RLC LM structure */
    S16 ret1;                /* return value */
 
-   TRC3(cmUnpkLkwStaInd)
    
    ret1 = cmUnpkRlcMngmt(&usta, LKW_EVT_STA_IND, mBuf);
 
@@ -741,22 +658,15 @@ Buffer *mBuf;               /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmPkLkwStaReq
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *sta                 /* status */
 )
-#else
-S16 cmPkLkwStaReq(pst,sta)
-Pst *pst;                    /* post structure */
-RlcMngmt *sta;                /* status */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(cmPkLkwStaReq)
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -804,24 +714,16 @@ RlcMngmt *sta;                /* status */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStaCfm
 (
 LkwStaReq func,              /* primitive pointer */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStaCfm(func, pst, mBuf)
-LkwStaReq func;              /* primitive pointer */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt cfm;              /* RLC LM structure */
    S16 ret1;                 /* return value */
 
-   TRC3(cmUnpkLkwStaReq)
 
    ret1 = cmUnpkRlcMngmt(&cfm, LKW_EVT_STA_CFM, mBuf);
 
@@ -855,25 +757,17 @@ Buffer *mBuf;                /* message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStsReq
 (
 LkwStsReq func,              /* primitive pointer */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStsReq(func, pst, mBuf)
-LkwStsReq func;              /* primitive pointer */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt sts;              /* RLC LM structure */
    S16 ret1;                 /* return value */
    Action action;            /* Action */
 
-   TRC3(cmUnpkLkwStsReq)
 
    CMCHKUNPK(SUnpkS16, &action, mBuf);
 
@@ -909,24 +803,16 @@ Buffer *mBuf;                /* message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmUnpkLkwStaReq
 (
 LkwStaReq func,              /* primitive pointer */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwStaReq(func, pst, mBuf)
-LkwStaReq func;              /* primitive pointer */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    RlcMngmt sta;              /* RLC LM structure */
    S16 ret1;                 /* return value */
 
-   TRC3(cmUnpkLkwStaReq)
 
    ret1 = cmUnpkRlcMngmt(&sta, LKW_EVT_STA_REQ, mBuf);
 
@@ -961,24 +847,16 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
 S16 cmUnpkLkwTrcInd
 (
 LkwTrcInd func,              /* primitive to call */
 Pst *pst,                    /* post structure */
 Buffer *mBuf                 /* message buffer */
 )
-#else
-S16 cmUnpkLkwTrcInd(func, pst, mBuf)
-LkwTrcInd func;              /* primitive to call */
-Pst *pst;                    /* post structure */
-Buffer *mBuf;                /* message buffer */
-#endif
 {
    S16 ret1;                 /* return value */
    RlcMngmt trc;              /* RLC LM structure */
 
-   TRC3(cmUnpkLkwTrcInd)
 
    ret1 = cmUnpkRlcMngmt(&trc, LKW_EVT_TRC_IND, mBuf);
 
@@ -1013,19 +891,12 @@ Buffer *mBuf;                /* message buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
-PRIVATE S16 cmPkCkwSapSta 
+static S16 cmPkCkwSapSta 
 ( 
 RlcCkwCntSapSta *rcSap,         /* SAP statistics */      
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-PRIVATE S16 cmPkCkwSapSta(rcSap, mBuf)
-RlcCkwCntSapSta *rcSap;         /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
-   TRC3(cmPkCkwSapSta)
 
    CMCHKPK(cmPkState, rcSap->state, mBuf);
    CMCHKPK(SPkS16, rcSap->spId, mBuf);   
@@ -1044,19 +915,12 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkCkwSapSta 
+static S16 cmUnpkCkwSapSta 
 (
 RlcCkwCntSapSta *rcSap,         /* SAP statistics */ 
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-PRIVATE S16 cmUnpkCkwSapSta(rcSap, mBuf)
-RlcCkwCntSapSta *rcSap;         /* SAP statistics */ 
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
-   TRC3(cmUnpkCkwSapSta)
 
    CMCHKUNPK(SUnpkS16, &rcSap->spId, mBuf);
    CMCHKUNPK(cmUnpkState, &rcSap->state, mBuf);
@@ -1074,19 +938,12 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkKwuSapSta
+static S16 cmPkKwuSapSta
 (
 RlcKwuSapSta *rlSap,           /* SAP statistics */       
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-PRIVATE S16 cmPkKwuSapSta(rlSap, mBuf)
-RlcKwuSapSta *rlSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
-   TRC3(cmPkKwuSapSta)
 
    CMCHKPK(cmPkState, rlSap->state, mBuf);
    CMCHKPK(SPkS16, rlSap->spId, mBuf);
@@ -1105,19 +962,12 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkKwuSapSta
+static S16 cmUnpkKwuSapSta
 (
 RlcKwuSapSta *rlSap,           /* SAP statistics */                   
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-PRIVATE S16 cmUnpkKwuSapSta(rlSap, mBuf)
-RlcKwuSapSta *rlSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
-   TRC3(cmUnpkKwuSapSta)
 
    CMCHKUNPK(SUnpkS16, &rlSap->spId, mBuf);
    CMCHKUNPK(cmUnpkState, &rlSap->state, mBuf);
@@ -1136,19 +986,12 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkRguSapSta
+static S16 cmPkRguSapSta
 (
 RlcRguSapSta *mkSap,           /* SAP statistics */             
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-PRIVATE S16 cmPkRguSapSta(mkSap, mBuf)
-RlcRguSapSta *mkSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
-   TRC3(cmPkRguSapSta)
 
    CMCHKPK(cmPkState, mkSap->state, mBuf);
    CMCHKPK(cmPkSuId, mkSap->suId, mBuf);
@@ -1167,19 +1010,12 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRguSapSta
+static S16 cmUnpkRguSapSta
 (
 RlcRguSapSta *mkSap,           /* SAP statistics */              
 Buffer *mBuf                 /* Message buffer */
 )
-#else
-PRIVATE S16 cmUnpkRguSapSta(mkSap, mBuf)
-RlcRguSapSta *mkSap;           /* SAP statistics */
-Buffer *mBuf;                /* Message buffer */
-#endif
 {
-   TRC3(cmUnpkRguSapSta)
 
    CMCHKUNPK(cmUnpkSuId, &mkSap->suId, mBuf);
    CMCHKUNPK(cmUnpkState, &mkSap->state, mBuf);
@@ -1198,22 +1034,15 @@ Buffer *mBuf;                /* Message buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwStaCfm
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *cfm                 /* solicited status confirm */
 )
-#else
-S16 cmPkLkwStaCfm(pst, cfm)
-Pst *pst;                    /* post structure */
-RlcMngmt *cfm;                /* solicited status confirm */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(cmPkLkwStaCfm);
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -1260,24 +1089,16 @@ RlcMngmt *cfm;                /* solicited status confirm */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwTrcInd
 (
 Pst *pst,                    /* post structure */
 RlcMngmt *trc,                /* trace */
 Buffer *trcBuf                 /* trace buffer */
 )
-#else
-S16 cmPkLkwTrcInd(pst, trc, trcBuf)
-Pst *pst;                     /* post structure */
-RlcMngmt *trc;                 /* trace */
-Buffer *trcBuf;               /* trace buffer */
-#endif
 {
    S16      ret1 = ROK;       /* return value */
    Buffer   *mBuf = NULLP;    /* Buffer to trace */
 
-   TRC3(cmPkLkwTrcInd);
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -1346,25 +1167,17 @@ Buffer *trcBuf;               /* trace buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwStsReq
 (
 Pst *pst,                    /* post structure */
 Action action,               /* action */
 RlcMngmt *sts                 /* statistics request */
 )
-#else
-S16 cmPkLkwStsReq(pst, action, sts)
-Pst *pst;                    /* post structure */
-Action action;               /* action */
-RlcMngmt *sts;                /* statistics request */
-#endif
 {
 
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(cmPkLkwStsReq)
 
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
    if (ret1 != ROK)
@@ -1413,24 +1226,16 @@ RlcMngmt *sts;                /* statistics request */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
 S16 cmPkLkwStsCfm
 (
 Pst *pst,                    /* post structure */
 Action action,               /* action */
 RlcMngmt *cfm                 /* statistics confirmation */
 )
-#else
-S16 cmPkLkwStsCfm(pst, action, cfm)
-Pst *pst;                    /* post structure */
-Action action;               /* action */
-RlcMngmt *cfm;                /* statistics confirmation */
-#endif
 {
    Buffer *mBuf;             /* message buffer */
    S16 ret1;                 /* return value */
 
-   TRC3(cmPkLkwStsCfm);
    /* lkw_c_001.main_2 removed warning */
    UNUSED(action);
    ret1 = SGetMsg(pst->region, pst->pool, &mBuf);
@@ -1479,23 +1284,15 @@ RlcMngmt *cfm;                /* statistics confirmation */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
-PRIVATE S16 cmPkRlcMngmt
+static S16 cmPkRlcMngmt
 (
 RlcMngmt *param,              /* Managment */             
 Event eventType,             /* Event type */
 Buffer *mBuf                 /* Message Buffer */
 )
-#else
-PRIVATE S16 cmPkRlcMngmt(param ,eventType, mBuf)
-RlcMngmt *param;              /* Managment */
-Event eventType;             /* Event type */
-Buffer *mBuf;                /* Message Buffer */
-#endif
 {
     S16 ret1;                /* return value */
 
-    TRC3(cmPkRlcMngmt)
 
     switch( eventType )
     {
@@ -1569,21 +1366,13 @@ Buffer *mBuf;                /* Message Buffer */
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkRlcCfg
+static S16 cmPkRlcCfg
 (
 RlcMngmt *cfg,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRlcCfg(cfg, elmnt, mBuf)
-RlcMngmt *cfg;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
-    TRC3(cmPkRlcCfg)
 
     switch( elmnt )
     {
@@ -1634,23 +1423,15 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkRlcCntrl
+static S16 cmPkRlcCntrl
 (
 RlcMngmt *cntrl,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRlcCntrl(cntrl, elmnt, mBuf)
-RlcMngmt *cntrl;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
-    U8 subAction;            /* sub action */     
+    uint8_t subAction;            /* sub action */     
 
-    TRC3(cmPkRlcCntrl)
 
     switch( elmnt )
     {
@@ -1714,21 +1495,13 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkRlcUsta
+static S16 cmPkRlcUsta
 (
 RlcMngmt *usta,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRlcUsta(usta, elmnt, mBuf)
-RlcMngmt *usta;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkRlcUsta)
 
    /* lkw_c_001.main_2 removed warning */
    UNUSED(elmnt);
@@ -1756,24 +1529,15 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkRlcSsta
+static S16 cmPkRlcSsta
 (
 RlcMngmt *ssta,
 Elmnt elmnt,
 Event eventType,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRlcSsta(ssta, elmnt, eventType, mBuf)
-RlcMngmt *ssta;
-Elmnt elmnt;
-Event eventType;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;
-   TRC3(cmPkRlcSsta)
 
    ret1 = RFAILED;
    switch(elmnt)
@@ -1821,19 +1585,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkRlcTrc
+static S16 cmPkRlcTrc
 (
 RlcMngmt *trc,                /* trace */                 
 Buffer *mBuf                 /* data buffer */
 )
-#else
-PRIVATE S16 cmPkRlcTrc(trc, mBuf)
-RlcMngmt *trc;                /* trace */
-Buffer *mBuf;                /* data buffer */
-#endif
 {
-   TRC3(cmPkRlcTrc)
 
    CMCHKPK(oduUnpackUInt16, trc->t.trc.event, mBuf); 
    CMCHKPK(cmPkDateTime, &trc->t.trc.dt, mBuf);
@@ -1853,22 +1610,14 @@ Buffer *mBuf;                /* data buffer */
  *      -# Failure : RFAILED
  */
 
-#ifdef ANSI
-PRIVATE S16 cmPkRlcSts
+static S16 cmPkRlcSts
 (
 RlcMngmt *sts,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRlcSts(sts, elmnt, mBuf)
-RlcMngmt *sts;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;
-   TRC3(cmPkRlcSts)
 
    ret1 = RFAILED;
    switch(elmnt)
@@ -1912,19 +1661,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkGenSts
+static S16 cmPkGenSts
 (
 RlcGenSts *gen,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkGenSts(gen, mBuf)
-RlcGenSts *gen;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkGenSts)
 
    CMCHKPK(oduUnpackUInt32, gen->numSduDisc, mBuf);
    CMCHKPK(oduUnpackUInt32, gen->numOfRb, mBuf);
@@ -1952,19 +1694,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkCkwSapSts
+static S16 cmPkCkwSapSts
 (
 RlcCkwCntSts *rcSap,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkCkwSapSts(rcSap, mBuf)
-RlcCkwCntSts *rcSap;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkCkwSapSts)
 
    CMCHKPK(oduUnpackUInt32, rcSap->statMsgs, mBuf);
 
@@ -1981,19 +1716,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmPkKwuSapSts
+static S16 cmPkKwuSapSts
 (
 RlcKwuSapSts *ruSap,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkKwuSapSts(ruSap, mBuf)
-RlcKwuSapSts *ruSap;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmPkCkwSapSts)
 
    CMCHKPK(oduUnpackUInt32, ruSap->sduTx, mBuf);
    CMCHKPK(oduUnpackUInt32, ruSap->sduRx, mBuf);
@@ -2018,24 +1746,16 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRlcMngmt
+static S16 cmUnpkRlcMngmt
 (
 RlcMngmt *param,
 Event eventType,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRlcMngmt(param ,eventType, mBuf)
-RlcMngmt *param;
-Event eventType;
-Buffer *mBuf;
-#endif
 {
     S16 ret1;
-    TRC3(cmUnpkRlcMngmt)
 
-   cmMemset((U8 *) param, (U8) 0, (S16) sizeof(RlcMngmt));
+   memset(param, 0, sizeof(RlcMngmt));
 
    CMCHKUNPK(cmUnpkHeader, &param->hdr, mBuf);
    CMCHKUNPK(cmUnpkCmStatus, &param->cfm, mBuf);
@@ -2112,21 +1832,13 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRlcCfg
+static S16 cmUnpkRlcCfg
 (
 RlcMngmt *cfg,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRlcCfg(cfg ,elmnt, mBuf)
-RlcMngmt *cfg;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkRlcCfg)
 
    switch(elmnt)
    {
@@ -2177,25 +1889,17 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRlcCntrl
+static S16 cmUnpkRlcCntrl
 (
 RlcMngmt *cfm,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRlcCntrl(cfm, elmnt, mBuf)
-RlcMngmt *cfm;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
-   U8 subAction;
+   uint8_t subAction;
    RlcDbgCntrl *dbgCntrl;
    RlcTrcCntrl *trcCntrl;
 
-   TRC3(cmUnpkRlcCntrl);
    
    /* lkw_c_001.main_2 removed warning */
    UNUSED(elmnt);
@@ -2264,21 +1968,13 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRlcUsta
+static S16 cmUnpkRlcUsta
 (
 RlcMngmt *usta,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRlcUsta(usta ,elmnt, mBuf)
-RlcMngmt *usta;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkRlcUsta);
 
    /* lkw_c_001.main_2 removed warning */
    UNUSED(elmnt);
@@ -2305,24 +2001,15 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRlcSsta
+static S16 cmUnpkRlcSsta
 (
 RlcMngmt *ssta,
 Elmnt elmnt,
 Event eventType,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRlcSsta(ssta ,elmnt, eventType, mBuf)
-RlcMngmt *ssta;
-Elmnt elmnt;
-Event eventType;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;           /* return value */
-   TRC3(cmUnpkRlcSsta);
 
    CMCHKUNPK(cmUnpkDateTime, &ssta->t.ssta.dt, mBuf);
    switch(elmnt)
@@ -2331,7 +2018,7 @@ Buffer *mBuf;
          ret1 = ROK;
          if(eventType == LKW_EVT_STA_CFM)
          {
-            cmMemset((U8 *) ptNmb, (U8) 0, LKW_PART_NUM_STR_LEN);
+            memset( ptNmb, 0, LKW_PART_NUM_STR_LEN);
             ssta->t.ssta.s.sysId.ptNmb = ptNmb;
             CMCHKUNPK(cmUnpkSystemId, &ssta->t.ssta.s.sysId,mBuf);
          }
@@ -2370,19 +2057,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRlcTrc
+static S16 cmUnpkRlcTrc
 (
 RlcMngmt *trc,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRlcTrc(trc, mBuf)
-RlcMngmt *trc;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkRlcTrc);
 
    CMCHKUNPK(cmUnpkDateTime, &trc->t.trc.dt, mBuf);
    CMCHKUNPK(oduPackUInt16, &trc->t.trc.event, mBuf);
@@ -2402,22 +2082,14 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkRlcSts
+static S16 cmUnpkRlcSts
 (
 RlcMngmt *sts,
 Elmnt elmnt,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRlcSts(sts ,elmnt, mBuf)
-RlcMngmt *sts;
-Elmnt elmnt;
-Buffer *mBuf;
-#endif
 {
    S16 ret1;           /* return value */
-   TRC3(cmUnpkRlcSts);
 
    CMCHKUNPK(cmUnpkDateTime, &sts->t.sts.dt, mBuf);
 
@@ -2459,19 +2131,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkGenSts
+static S16 cmUnpkGenSts
 (
 RlcGenSts *gen,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkGenSts(gen, mBuf)
-RlcGenSts *gen;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkGenSts);
 
    CMCHKUNPK(oduPackUInt32, &gen->numUe, mBuf);
    CMCHKUNPK(oduPackUInt32, &gen->pdusRecv, mBuf);
@@ -2498,20 +2163,13 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkCkwSapSts
+static S16 cmUnpkCkwSapSts
 (
 RlcCkwCntSts *rcSap,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkCkwSapSts(rcSap ,mBuf)
-RlcCkwCntSts *rcSap;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCkwSapSts);
 
    CMCHKUNPK(oduPackUInt32, &rcSap->statMsgs, mBuf); 
 
@@ -2529,19 +2187,12 @@ Buffer *mBuf;
  *      -# Success : ROK
  *      -# Failure : RFAILED
  */
-#ifdef ANSI
-PRIVATE S16 cmUnpkKwuSapSts
+static S16 cmUnpkKwuSapSts
 (
 RlcKwuSapSts *ruSap,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkKwuSapSts(ruSap, mBuf)
-RlcKwuSapSts *ruSap;
-Buffer *mBuf;
-#endif
 {
-   TRC3(cmUnpkKwuSapSts)
 
    /* lkw_c_001.main_2 changed from suId to spId */
    CMCHKUNPK(cmUnpkSuId, &ruSap->spId, mBuf);
@@ -2554,20 +2205,13 @@ Buffer *mBuf;
 
 /* lkw_c_001.main_2 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 S16 cmPkLkwL2MeasReq
 (
 Pst * pst,
 RlcL2MeasReqEvt *measReqEvt
 )
-#else
-S16 cmPkLkwL2MeasReq(pst, measReqEvt)
-Pst * pst;
-RlcL2MeasReqEvt *measReqEvt;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLkwL2MeasReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2613,22 +2257,15 @@ RlcL2MeasReqEvt *measReqEvt;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmPkRlcL2MeasReqInfo
 (
 RlcL2MeasReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRlcL2MeasReqInfo(param, mBuf)
-RlcL2MeasReqInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
-   U16 idx1;
+   uint8_t idx;
+   uint16_t idx1;
 
-   TRC3(cmPkRlcL2MeasReqInfo)
 
    if((param->measType & LKW_L2MEAS_DL_IP) ||
          (param->measType & LKW_L2MEAS_UL_IP))
@@ -2661,21 +2298,14 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasStopReq
 (
 Pst *pst,
-U8  measType
+uint8_t  measType
 )
-#else
-S16 cmPkLkwL2MeasStopReq(pst, measType)
-Pst *pst;
-U8 measType;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkLkwL2MeasStopReq)
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2689,21 +2319,14 @@ U8 measType;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasSendReq
 (
 Pst *pst,
-U8  measType
+uint8_t  measType
 )
-#else
-S16 cmPkLkwL2MeasSendReq(pst, measType)
-Pst *pst;
-U8 measType;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkLkwL2MeasSendReq)
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2717,23 +2340,15 @@ U8 measType;
    return (SPstTsk(pst,mBuf));
 }
 #ifdef TENB_SPLIT_ARCH
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasReq
 (
 LkwL2MeasReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasReq(func, pst, mBuf)
-LkwL2MeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    RlcL2MeasReqEvt measReqEvt;
    
-   TRC3(cmUnpkLkwL2MeasReq)
 
    if (oduPackUInt32(&measReqEvt.transId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2768,24 +2383,16 @@ Buffer *mBuf;
    return ((*func)(pst, &measReqEvt));
 }
 #else
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasReq
 (
 LkwL2MeasReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasReq(func, pst, mBuf)
-LkwL2MeasReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    S16   ret;
    RlcL2MeasReqEvt *measReqEvt;
 
-   TRC3(cmUnpkLkwL2MeasReq)
 
 
    if((ret = SGetSBuf(pst->region, pst->pool, (Data **)&measReqEvt,\
@@ -2833,22 +2440,15 @@ Buffer *mBuf;
 }
 #endif
 
-#ifdef ANSI
 S16 cmUnpkRlcL2MeasReqInfo
 (
 RlcL2MeasReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRlcL2MeasReqInfo(param, mBuf)
-RlcL2MeasReqInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
-   U16 idx1; 
+   uint8_t idx;
+   uint16_t idx1; 
 
-   TRC3(cmUnpkRlcL2MeasReqInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->measType, mBuf);
 
@@ -2883,68 +2483,45 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasStopReq
 (
 LkwL2MeasStopReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasStopReq(func, pst, mBuf)
-LkwL2MeasStopReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   U8 measType;
-   TRC3(cmUnpkLkwL2MeasReq)
+   uint8_t measType;
 
    CMCHKUNPK(oduPackUInt8, &measType, mBuf);
    SPutMsg(mBuf);
    return ((*func)(pst, measType));
 }
 
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasSendReq
 (
 LkwL2MeasSendReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasSendReq(func, pst, mBuf)
-LkwL2MeasSendReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   U8    measType;
+   uint8_t    measType;
 
-   TRC3(cmUnpkLkwL2MeasSendReq)
 
    CMCHKUNPK(oduPackUInt8, &measType, mBuf); 
    SPutMsg(mBuf);
    return ((*func)(pst, measType));
 }
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasCfm
 (
 Pst * pst,
 RlcL2MeasCfmEvt *measCfmEvt
 )
-#else
-S16 cmPkLkwL2MeasCfm(pst, measCfmEvt)
-Pst * pst;
-RlcL2MeasCfmEvt *measCfmEvt;
-#endif
 {
    Buffer *mBuf = NULLP;
-   U8 idx;
-   U8 idx1;
+   uint8_t idx;
+   uint8_t idx1;
 
-   TRC3(cmPkLkwL2MeasCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3035,21 +2612,13 @@ RlcL2MeasCfmEvt *measCfmEvt;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmPkRlcL2MeasCfmInfo
 (
 RlcL2MeasCfmInfo *param,
 Buffer *mBuf,
-U8 measType
+uint8_t measType
 )
-#else
-S16 cmPkRlcL2MeasCfmInfo(param, mBuf, measType)
-RlcL2MeasCfmInfo *param;
-Buffer *mBuf;
-U8 measType;
-#endif
 {
-   TRC3(cmPkRlcL2MeasCfmInfo)
 
    if((measType & LKW_L2MEAS_DL_IP) ||
          (measType & LKW_L2MEAS_UL_IP))
@@ -3070,28 +2639,18 @@ U8 measType;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkLkwL2MeasCfm
 (
 LkwL2MeasCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasCfm(func, pst, mBuf)
-LkwL2MeasCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
-   U16 idx1;
+   uint8_t idx;
+   uint16_t idx1;
    RlcL2MeasCfmEvt measCfmEvt;
 
-   TRC3(cmUnpkLkwL2MeasCfm)
-
-   cmMemset((U8 *)&measCfmEvt, 0 , sizeof(RlcL2MeasCfmEvt));
-
+   memset(&measCfmEvt, 0 , sizeof(RlcL2MeasCfmEvt));
    if (oduPackUInt32(&measCfmEvt.transId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3167,21 +2726,13 @@ Buffer *mBuf;
    return ((*func)(pst, &measCfmEvt));
 }
 
-#ifdef ANSI
 S16 cmUnpkRlcL2MeasCfmInfo
 (
 RlcL2MeasCfmInfo *param,
 Buffer *mBuf,
-U8 measType
+uint8_t measType
 )
-#else
-S16 cmUnpkRlcL2MeasCfmInfo(param, mBuf, measType)
-RlcL2MeasCfmInfo *param;
-Buffer *mBuf;
-U8 measType;
-#endif
 {
-   TRC3(cmUnpkRlcL2MeasCfmInfo)
 
    if((measType & LKW_L2MEAS_DL_IP) ||
          (measType & LKW_L2MEAS_UL_IP))
@@ -3203,22 +2754,14 @@ U8 measType;
 }
 
 
-#ifdef ANSI
 S16 cmPkLkwL2MeasStopCfm
 (
 Pst * pst,
-U8 measType,
-U8 status
+uint8_t measType,
+uint8_t status
 )
-#else
-S16 cmPkLkwL2MeasStopCfm(pst, measType,status)
-Pst * pst;
-U8  measType;
-U8  status
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLkwL2MeasStopCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3234,23 +2777,16 @@ U8  status
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
+
 S16 cmUnpkLkwL2MeasStopCfm
 (
 LkwL2MeasStopCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkLkwL2MeasStopCfm(func, pst, mBuf)
-LkwL2MeasStopCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   U8 measType;
-   U8 status;
-   TRC3(cmUnpkLkwL2MeasCfm)
+   uint8_t measType;
+   uint8_t status;
    CMCHKUNPK(oduPackUInt8,  &measType, mBuf);
    CMCHKUNPK(oduPackUInt8,  &status, mBuf);
    SPutMsg(mBuf);