remove/replaced PRIVATE and EXTERN keywords

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

diff --git a/src/cm/lrg.c b/src/cm/lrg.c
index 154b0e9..7a0f38e 100755 (executable)
--- a/src/cm/lrg.c
+++ b/src/cm/lrg.c
@@ -57,19 +57,18 @@ Configuration Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgCfgReq
+S16 cmPkLrgCfgReq
 (
 Pst * pst,
 RgMngmt * cfg
 )
 #else
-PUBLIC S16 cmPkLrgCfgReq(pst, cfg)
+S16 cmPkLrgCfgReq(pst, cfg)
 Pst * pst;
 RgMngmt * cfg;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgCfgReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -77,7 +76,7 @@ RgMngmt * cfg;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG001, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfg, EVTLRGCFGREQ, mBuf) != ROK) {
@@ -87,11 +86,11 @@ RgMngmt * cfg;
             (ErrVal)ELRG002, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    pst->event = (Event) EVTLRGCFGREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -109,14 +108,14 @@ Configuration Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgCfgReq
+S16 cmUnpkLrgCfgReq
 (
 LrgCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgCfgReq(func, pst, mBuf)
+S16 cmUnpkLrgCfgReq(func, pst, mBuf)
 LrgCfgReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -125,7 +124,6 @@ Buffer *mBuf;
    /* lrg_c_001.main_2: Changed Pointer across Interface */
    RgMngmt cfg;
    
-   TRC3(cmUnpkLrgCfgReq)
    
    if (cmUnpkRgMngmt(pst, &cfg, EVTLRGCFGREQ, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -134,10 +132,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG003, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cfg));
+   return ((*func)(pst, &cfg));
 }
 
 \f
@@ -155,19 +153,18 @@ Configuration Request from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchCfgReq
+S16 cmPkLrgSchCfgReq
 (
 Pst * pst,
 RgMngmt * cfg
 )
 #else
-PUBLIC S16 cmPkLrgSchCfgReq(pst, cfg)
+S16 cmPkLrgSchCfgReq(pst, cfg)
 Pst * pst;
 RgMngmt * cfg;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchCfgReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -175,7 +172,7 @@ RgMngmt * cfg;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG004, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) {
@@ -185,11 +182,11 @@ RgMngmt * cfg;
             (ErrVal)ELRG005, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -207,14 +204,14 @@ Configuration Request from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchCfgReq
+S16 cmUnpkLrgSchCfgReq
 (
 LrgSchCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchCfgReq(func, pst, mBuf)
+S16 cmUnpkLrgSchCfgReq(func, pst, mBuf)
 LrgSchCfgReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -223,7 +220,6 @@ Buffer *mBuf;
    /* lrg_c_001.main_2: Changed Pointer across Interface */
    RgMngmt cfg;
    
-   TRC3(cmUnpkLrgSchCfgReq)
 
    if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -232,10 +228,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG006, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cfg));
+   return ((*func)(pst, &cfg));
 }
 
 \f
@@ -253,19 +249,18 @@ Configuration Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgCfgCfm
+uint8_t cmPkLrgCfgCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
 #else
-PUBLIC S16 cmPkLrgCfgCfm(pst, cfm)
+uint8_t cmPkLrgCfgCfm(pst, cfm)
 Pst * pst;
 RgMngmt * cfm;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgCfgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -273,7 +268,7 @@ RgMngmt * cfm;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG007, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGCFGCFM, mBuf) != ROK) {
@@ -283,12 +278,12 @@ RgMngmt * cfm;
             (ErrVal)ELRG008, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGCFGCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -306,14 +301,14 @@ Configuration Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgCfgCfm
+S16 cmUnpkLrgCfgCfm
 (
 LrgCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgCfgCfm(func, pst, mBuf)
+S16 cmUnpkLrgCfgCfm(func, pst, mBuf)
 LrgCfgCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -321,7 +316,6 @@ Buffer *mBuf;
 {
    RgMngmt cfm;
    
-   TRC3(cmUnpkLrgCfgCfm)
 
    if (cmUnpkRgMngmt(pst, &cfm, EVTLRGCFGCFM, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -330,10 +324,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG009, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cfm));
+   return ((*func)(pst, &cfm));
 }
 
 \f
@@ -351,19 +345,18 @@ Configuration Confirm from SCH to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchCfgCfm
+uint8_t cmPkLrgSchCfgCfm
 (
 Pst * pst,
 RgMngmt * cfg
 )
 #else
-PUBLIC S16 cmPkLrgSchCfgCfm(pst, cfg)
+uint8_t cmPkLrgSchCfgCfm(pst, cfg)
 Pst * pst;
 RgMngmt * cfg;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchCfgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -371,7 +364,7 @@ RgMngmt * cfg;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG010, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) {
@@ -381,12 +374,12 @@ RgMngmt * cfg;
             (ErrVal)ELRG011, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTMACSCHGENCFGCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -404,14 +397,14 @@ Configuration Confirm from SCH to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchCfgCfm
+S16 cmUnpkLrgSchCfgCfm
 (
 LrgSchCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchCfgCfm(func, pst, mBuf)
+S16 cmUnpkLrgSchCfgCfm(func, pst, mBuf)
 LrgSchCfgCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -419,8 +412,6 @@ Buffer *mBuf;
 {
    RgMngmt cfg;
    
-   TRC3(cmUnpkLrgSchCfgCfm)
-  
    if (cmUnpkRgMngmt(pst, &cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -428,10 +419,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG012, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cfg));
+   return ((*func)(pst, &cfg));
 }
 
 \f
@@ -449,19 +440,18 @@ Statistics Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgStsReq
+S16 cmPkLrgStsReq
 (
 Pst * pst,
 RgMngmt * sts
 )
 #else
-PUBLIC S16 cmPkLrgStsReq(pst, sts)
+S16 cmPkLrgStsReq(pst, sts)
 Pst * pst;
 RgMngmt * sts;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgStsReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -469,7 +459,7 @@ RgMngmt * sts;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG013, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, sts, EVTLRGSTSREQ, mBuf) != ROK) {
@@ -479,12 +469,12 @@ RgMngmt * sts;
             (ErrVal)ELRG014, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGSTSREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -502,14 +492,14 @@ Statistics Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgStsReq
+S16 cmUnpkLrgStsReq
 (
 LrgStsReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgStsReq(func, pst, mBuf)
+S16 cmUnpkLrgStsReq(func, pst, mBuf)
 LrgStsReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -517,7 +507,6 @@ Buffer *mBuf;
 {
    RgMngmt sts;
    
-   TRC3(cmUnpkLrgStsReq)
 
    if (cmUnpkRgMngmt(pst, &sts, EVTLRGSTSREQ, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -526,10 +515,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG015, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &sts));
+   return ((*func)(pst, &sts));
 }
 
 \f
@@ -547,19 +536,18 @@ Statistics Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgStsCfm
+S16 cmPkLrgStsCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
 #else
-PUBLIC S16 cmPkLrgStsCfm(pst, cfm)
+S16 cmPkLrgStsCfm(pst, cfm)
 Pst * pst;
 RgMngmt * cfm;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgStsCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -567,7 +555,7 @@ RgMngmt * cfm;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG016, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGSTSCFM, mBuf) != ROK) {
@@ -577,12 +565,12 @@ RgMngmt * cfm;
             (ErrVal)ELRG017, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGSTSCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -600,14 +588,14 @@ Statistics Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgStsCfm
+S16 cmUnpkLrgStsCfm
 (
 LrgStsCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgStsCfm(func, pst, mBuf)
+S16 cmUnpkLrgStsCfm(func, pst, mBuf)
 LrgStsCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -615,7 +603,6 @@ Buffer *mBuf;
 {
    RgMngmt cfm;
    
-   TRC3(cmUnpkLrgStsCfm)
 
    if (cmUnpkRgMngmt(pst, &cfm, EVTLRGSTSCFM, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -624,10 +611,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG018, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cfm));
+   return ((*func)(pst, &cfm));
 }
 
 \f
@@ -645,19 +632,18 @@ Status Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgStaReq
+S16 cmPkLrgStaReq
 (
 Pst * pst,
 RgMngmt * sta
 )
 #else
-PUBLIC S16 cmPkLrgStaReq(pst, sta)
+S16 cmPkLrgStaReq(pst, sta)
 Pst * pst;
 RgMngmt * sta;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgStaReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -665,7 +651,7 @@ RgMngmt * sta;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG019, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (cmPkRgMngmt(pst, sta, EVTLRGSSTAREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -674,11 +660,11 @@ RgMngmt * sta;
             (ErrVal)ELRG020, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    pst->event = (Event) EVTLRGSSTAREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -696,14 +682,14 @@ Status Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgStaReq
+S16 cmUnpkLrgStaReq
 (
 LrgStaReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgStaReq(func, pst, mBuf)
+S16 cmUnpkLrgStaReq(func, pst, mBuf)
 LrgStaReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -711,9 +697,8 @@ Buffer *mBuf;
 {
    RgMngmt sta;
    
-   TRC3(cmUnpkLrgStaReq)
    
-   cmMemset((U8 *)&sta, 0, sizeof(RgMngmt));
+   memset(&sta, 0, sizeof(RgMngmt));
    if (cmUnpkRgMngmt(pst, &sta, EVTLRGSSTAREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -721,10 +706,10 @@ Buffer *mBuf;
             (ErrVal)ELRG021, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &sta));
+   return ((*func)(pst, &sta));
 }
 
 \f
@@ -742,19 +727,18 @@ Status Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgStaCfm
+S16 cmPkLrgStaCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
 #else
-PUBLIC S16 cmPkLrgStaCfm(pst, cfm)
+S16 cmPkLrgStaCfm(pst, cfm)
 Pst * pst;
 RgMngmt * cfm;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgStaCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -762,7 +746,7 @@ RgMngmt * cfm;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG022, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (cmPkRgMngmt(pst, cfm, EVTLRGSSTACFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -771,11 +755,11 @@ RgMngmt * cfm;
             (ErrVal)ELRG023, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    pst->event = (Event) EVTLRGSSTACFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -793,14 +777,14 @@ Status Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgStaCfm
+S16 cmUnpkLrgStaCfm
 (
 LrgStaCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgStaCfm(func, pst, mBuf)
+S16 cmUnpkLrgStaCfm(func, pst, mBuf)
 LrgStaCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -808,9 +792,8 @@ Buffer *mBuf;
 {
    RgMngmt cfm;
    
-   TRC3(cmUnpkLrgStaCfm)
   
-   cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt));
+   memset(&cfm, 0, sizeof(RgMngmt));
    if (cmUnpkRgMngmt(pst, &cfm, EVTLRGSSTACFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -818,10 +801,10 @@ Buffer *mBuf;
             (ErrVal)ELRG024, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cfm));
+   return ((*func)(pst, &cfm));
 }
 
 \f
@@ -839,19 +822,18 @@ Status Indication from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgStaInd
+S16 cmPkLrgStaInd
 (
 Pst * pst,
 RgMngmt * usta
 )
 #else
-PUBLIC S16 cmPkLrgStaInd(pst, usta)
+S16 cmPkLrgStaInd(pst, usta)
 Pst * pst;
 RgMngmt * usta;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgStaInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -859,7 +841,7 @@ RgMngmt * usta;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG025, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, usta, EVTLRGUSTAIND, mBuf) != ROK) {
@@ -869,12 +851,12 @@ RgMngmt * usta;
             (ErrVal)ELRG026, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGUSTAIND;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -892,14 +874,14 @@ Status Indication from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgStaInd
+S16 cmUnpkLrgStaInd
 (
 LrgStaInd func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgStaInd(func, pst, mBuf)
+S16 cmUnpkLrgStaInd(func, pst, mBuf)
 LrgStaInd func;
 Pst *pst;
 Buffer *mBuf;
@@ -907,7 +889,6 @@ Buffer *mBuf;
 {
    RgMngmt usta;
    
-   TRC3(cmUnpkLrgStaInd)
 
    if (cmUnpkRgMngmt(pst, &usta, EVTLRGUSTAIND, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -916,10 +897,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG027, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &usta));
+   return ((*func)(pst, &usta));
 }
 
 \f
@@ -937,19 +918,18 @@ Status Indication from SCH to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchStaInd
+S16 cmPkLrgSchStaInd
 (
 Pst * pst,
 RgMngmt * sta
 )
 #else
-PUBLIC S16 cmPkLrgSchStaInd(pst, sta)
+S16 cmPkLrgSchStaInd(pst, sta)
 Pst * pst;
 RgMngmt * sta;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchStaInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -957,7 +937,7 @@ RgMngmt * sta;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG028, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, sta, EVTLRGSCHSTAIND, mBuf) != ROK) {
@@ -967,12 +947,12 @@ RgMngmt * sta;
             (ErrVal)ELRG029, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGSCHSTAIND;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -990,14 +970,14 @@ Status Indication from SCH to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchStaInd
+S16 cmUnpkLrgSchStaInd
 (
 LrgSchStaInd func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchStaInd(func, pst, mBuf)
+S16 cmUnpkLrgSchStaInd(func, pst, mBuf)
 LrgSchStaInd func;
 Pst *pst;
 Buffer *mBuf;
@@ -1005,7 +985,6 @@ Buffer *mBuf;
 {
    RgMngmt sta;
    
-   TRC3(cmUnpkLrgSchStaInd)
 
    if (cmUnpkRgMngmt(pst, &sta, EVTLRGSCHSTAIND, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1014,10 +993,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG030, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &sta));
+   return ((*func)(pst, &sta));
 }
 
 \f
@@ -1035,19 +1014,18 @@ Control Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgCntrlReq
+S16 cmPkLrgCntrlReq
 (
 Pst * pst,
 RgMngmt * cntrl
 )
 #else
-PUBLIC S16 cmPkLrgCntrlReq(pst, cntrl)
+S16 cmPkLrgCntrlReq(pst, cntrl)
 Pst * pst;
 RgMngmt * cntrl;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgCntrlReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1055,7 +1033,7 @@ RgMngmt * cntrl;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG031, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) {
@@ -1065,12 +1043,12 @@ RgMngmt * cntrl;
             (ErrVal)ELRG032, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGCNTRLREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -1088,14 +1066,14 @@ Control Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgCntrlReq
+S16 cmUnpkLrgCntrlReq
 (
 LrgCntrlReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgCntrlReq(func, pst, mBuf)
+S16 cmUnpkLrgCntrlReq(func, pst, mBuf)
 LrgCntrlReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -1103,7 +1081,6 @@ Buffer *mBuf;
 {
    RgMngmt cntrl;
    
-   TRC3(cmUnpkLrgCntrlReq)
 
    if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1112,10 +1089,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG033, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cntrl));
+   return ((*func)(pst, &cntrl));
 }
 
 \f
@@ -1133,19 +1110,18 @@ Control Request from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchCntrlReq
+S16 cmPkLrgSchCntrlReq
 (
 Pst * pst,
 RgMngmt * cntrl
 )
 #else
-PUBLIC S16 cmPkLrgSchCntrlReq(pst, cntrl)
+S16 cmPkLrgSchCntrlReq(pst, cntrl)
 Pst * pst;
 RgMngmt * cntrl;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchCntrlReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1153,7 +1129,7 @@ RgMngmt * cntrl;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG034, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) {
@@ -1163,12 +1139,12 @@ RgMngmt * cntrl;
             (ErrVal)ELRG035, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGSCHCNTRLREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -1186,14 +1162,14 @@ Control Request from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchCntrlReq
+S16 cmUnpkLrgSchCntrlReq
 (
 LrgSchCntrlReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchCntrlReq(func, pst, mBuf)
+S16 cmUnpkLrgSchCntrlReq(func, pst, mBuf)
 LrgSchCntrlReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -1201,7 +1177,6 @@ Buffer *mBuf;
 {
    RgMngmt cntrl;
    
-   TRC3(cmUnpkLrgSchCntrlReq)
 
    if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1210,10 +1185,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG036, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cntrl));
+   return ((*func)(pst, &cntrl));
 }
 
 \f
@@ -1231,19 +1206,18 @@ Control Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgCntrlCfm
+S16 cmPkLrgCntrlCfm
 (
 Pst * pst,
 RgMngmt * cfm
 )
 #else
-PUBLIC S16 cmPkLrgCntrlCfm(pst, cfm)
+S16 cmPkLrgCntrlCfm(pst, cfm)
 Pst * pst;
 RgMngmt * cfm;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgCntrlCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1251,7 +1225,7 @@ RgMngmt * cfm;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG037, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGCNTRLCFM, mBuf) != ROK) {
@@ -1261,12 +1235,12 @@ RgMngmt * cfm;
             (ErrVal)ELRG038, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGCNTRLCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -1284,14 +1258,14 @@ Control Confirm from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgCntrlCfm
+S16 cmUnpkLrgCntrlCfm
 (
 LrgCntrlCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgCntrlCfm(func, pst, mBuf)
+S16 cmUnpkLrgCntrlCfm(func, pst, mBuf)
 LrgCntrlCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -1299,7 +1273,6 @@ Buffer *mBuf;
 {
    RgMngmt cfm;
    
-   TRC3(cmUnpkLrgCntrlCfm)
 
    if (cmUnpkRgMngmt(pst, &cfm, EVTLRGCNTRLCFM, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1308,10 +1281,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG039, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cfm));
+   return ((*func)(pst, &cfm));
 }
 
 \f
@@ -1329,19 +1302,18 @@ Control Confirm from SCH to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchCntrlCfm
+S16 cmPkLrgSchCntrlCfm
 (
 Pst * pst,
 RgMngmt * cntrl
 )
 #else
-PUBLIC S16 cmPkLrgSchCntrlCfm(pst, cntrl)
+S16 cmPkLrgSchCntrlCfm(pst, cntrl)
 Pst * pst;
 RgMngmt * cntrl;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchCntrlCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1349,7 +1321,7 @@ RgMngmt * cntrl;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG040, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) {
@@ -1359,12 +1331,12 @@ RgMngmt * cntrl;
             (ErrVal)ELRG041, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    }
    
    pst->event = (Event) EVTLRGSCHCNTRLCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -1382,14 +1354,14 @@ Control Confirm from SCH to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchCntrlCfm
+S16 cmUnpkLrgSchCntrlCfm
 (
 LrgSchCntrlCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchCntrlCfm(func, pst, mBuf)
+S16 cmUnpkLrgSchCntrlCfm(func, pst, mBuf)
 LrgSchCntrlCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -1397,7 +1369,6 @@ Buffer *mBuf;
 {
    RgMngmt cntrl;
    
-   TRC3(cmUnpkLrgSchCntrlCfm)
 
    if (cmUnpkRgMngmt(pst, &cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1406,10 +1377,10 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG042, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &cntrl));
+   return ((*func)(pst, &cntrl));
 }
 
 \f
@@ -1428,21 +1399,20 @@ Trace Indication from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgTrcInd
+S16 cmPkLrgTrcInd
 (
 Pst * pst,
 RgMngmt * trc,
 Buffer * trcBuf
 )
 #else
-PUBLIC S16 cmPkLrgTrcInd(pst, trc, trcBuf)
+S16 cmPkLrgTrcInd(pst, trc, trcBuf)
 Pst * pst;
 RgMngmt * trc;
 Buffer * trcBuf;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgTrcInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1451,7 +1421,7 @@ Buffer * trcBuf;
          (ErrVal)ELRG043, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(trcBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       MsgLen msgLen;
@@ -1462,7 +1432,7 @@ Buffer * trcBuf;
             (ErrVal)ELRG044, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(trcBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       if (SCatMsg(mBuf, trcBuf, M1M2) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1471,7 +1441,7 @@ Buffer * trcBuf;
             (ErrVal)ELRG045, (ErrVal)0, "Packing failed");
 #endif
          SPutMsg(trcBuf);
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
       SPutMsg(trcBuf);
       CMCHKPK(cmPkMsgLen, msgLen, mBuf);
@@ -1484,11 +1454,11 @@ Buffer * trcBuf;
 #endif
       SPutMsg(trcBuf);
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    
    pst->event = (Event) EVTLRGTRCIND;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -1507,14 +1477,14 @@ Trace Indication from MAC to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgTrcInd
+S16 cmUnpkLrgTrcInd
 (
 LrgTrcInd func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgTrcInd(func, pst, mBuf)
+S16 cmUnpkLrgTrcInd(func, pst, mBuf)
 LrgTrcInd func;
 Pst *pst;
 Buffer *mBuf;
@@ -1524,7 +1494,6 @@ Buffer *mBuf;
   /* lrg_c_001.main_3 - MODIFY -  Modified trcBuf to have it initialized to NULLP */
    Buffer *trcBuf = NULLP;
    
-   TRC3(cmUnpkLrgTrcInd)
    
    if (cmUnpkRgMngmt(pst, &trc, EVTLRGTRCIND, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1533,18 +1502,18 @@ Buffer *mBuf;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ELRG047, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (pst->selector == ODU_SELECTOR_LC) {
       MsgLen msgLen, totalMsgLen;
       CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
       if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
-         RETVALUE(RFAILED);
+         return RFAILED;
       if (SSegMsg(mBuf, totalMsgLen-msgLen, &trcBuf) != ROK)
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &trc, trcBuf));
+   return ((*func)(pst, &trc, trcBuf));
 }
 
 \f
@@ -1564,30 +1533,29 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgGenCfg
+S16 cmPkRgGenCfg
 (
 RgGenCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgGenCfg(param, mBuf)
+S16 cmPkRgGenCfg(param, mBuf)
 RgGenCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgGenCfg)
 
 #ifdef LTE_ADV
-   CMCHKPK(SPkU8, param->isSCellActDeactAlgoEnable, mBuf);
-   CMCHKPK(SPkU8, param->forceCntrlSrbBoOnPCel, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->isSCellActDeactAlgoEnable, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->forceCntrlSrbBoOnPCel, mBuf);
 #endif
-   CMCHKPK(SPkU8, param->startCellId, mBuf);
-   CMCHKPK(SPkU8, param->numRguSaps, mBuf);
-   CMCHKPK(SPkU8, param->tmrRes, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->startCellId, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->numRguSaps, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->tmrRes, mBuf);
    CMCHKPK(cmPkMemoryId, &param->mem, mBuf);
    CMCHKPK(cmPkPst, &param->lmPst, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1608,30 +1576,29 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgGenCfg
+S16 cmUnpkRgGenCfg
 (
 RgGenCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgGenCfg(param, mBuf)
+S16 cmUnpkRgGenCfg(param, mBuf)
 RgGenCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgGenCfg)
 
    CMCHKUNPK(cmUnpkPst, &param->lmPst, mBuf);
    CMCHKUNPK(cmUnpkMemoryId, &param->mem, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->tmrRes, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->numRguSaps, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->startCellId, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->tmrRes, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numRguSaps, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->startCellId, mBuf);
 #ifdef LTE_ADV
-   CMCHKUNPK(SUnpkU8, &param->forceCntrlSrbBoOnPCel, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->isSCellActDeactAlgoEnable, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->forceCntrlSrbBoOnPCel, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->isSCellActDeactAlgoEnable, mBuf);
 #endif
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1652,30 +1619,29 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgUpSapCfg
+S16 cmPkRgUpSapCfg
 (
 RgUpSapCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgUpSapCfg(param, mBuf)
+S16 cmPkRgUpSapCfg(param, mBuf)
 RgUpSapCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgUpSapCfg)
 
    CMCHKPK(SPkS16, param->suId, mBuf);
    CMCHKPK(SPkS16, param->spId, mBuf);
-   CMCHKPK(SPkU8, param->route, mBuf);
-   CMCHKPK(SPkU8, param->inst, mBuf);
-   CMCHKPK(SPkU8, param->ent, mBuf);
-   CMCHKPK(SPkU16, param->procId, mBuf);
-   CMCHKPK(SPkU8, param->prior, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->route, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->inst, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->ent, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->procId, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->prior, mBuf);
    CMCHKPK(cmPkMemoryId, &param->mem, mBuf);
-   CMCHKPK(SPkU8, param->selector, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->selector, mBuf);
+   return ROK;
 }
 
 
@@ -1696,30 +1662,29 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgUpSapCfg
+S16 cmUnpkRgUpSapCfg
 (
 RgUpSapCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgUpSapCfg(param, mBuf)
+S16 cmUnpkRgUpSapCfg(param, mBuf)
 RgUpSapCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgUpSapCfg)
 
-   CMCHKUNPK(SUnpkU8, &param->selector, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->selector, mBuf);
    CMCHKUNPK(cmUnpkMemoryId, &param->mem, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->prior, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->procId, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->ent, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->inst, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->route, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->prior, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->procId, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->ent, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->inst, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->route, mBuf);
    CMCHKUNPK(SUnpkS16, &param->spId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->suId, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1740,31 +1705,30 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgLowSapCfg
+S16 cmPkRgLowSapCfg
 (
 RgLowSapCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgLowSapCfg(param, mBuf)
+S16 cmPkRgLowSapCfg(param, mBuf)
 RgLowSapCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgLowSapCfg)
 
    CMCHKPK(cmPkTmrCfg, &param->bndTmr, mBuf);
    CMCHKPK(SPkS16, param->suId, mBuf);
    CMCHKPK(SPkS16, param->spId, mBuf);
-   CMCHKPK(SPkU8, param->route, mBuf);
-   CMCHKPK(SPkU8, param->inst, mBuf);
-   CMCHKPK(SPkU8, param->ent, mBuf);
-   CMCHKPK(SPkU16, param->procId, mBuf);
-   CMCHKPK(SPkU8, param->prior, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->route, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->inst, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->ent, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->procId, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->prior, mBuf);
    CMCHKPK(cmPkMemoryId, &param->mem, mBuf);
-   CMCHKPK(SPkU8, param->selector, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->selector, mBuf);
+   return ROK;
 }
 
 
@@ -1785,31 +1749,30 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgLowSapCfg
+S16 cmUnpkRgLowSapCfg
 (
 RgLowSapCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgLowSapCfg(param, mBuf)
+S16 cmUnpkRgLowSapCfg(param, mBuf)
 RgLowSapCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgLowSapCfg)
 
-   CMCHKUNPK(SUnpkU8, &param->selector, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->selector, mBuf);
    CMCHKUNPK(cmUnpkMemoryId, &param->mem, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->prior, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->procId, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->ent, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->inst, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->route, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->prior, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->procId, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->ent, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->inst, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->route, mBuf);
    CMCHKUNPK(SUnpkS16, &param->spId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->suId, mBuf);
    CMCHKUNPK(cmUnpkTmrCfg, &param->bndTmr, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef MAC_SCH_STATS
@@ -1831,25 +1794,24 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgAckNack
+S16 cmPkRgAckNack
 (
 RgAckNack *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgAckNack (param, mBuf)
+S16 cmPkRgAckNack (param, mBuf)
 RgAckNack *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgAckNack)
 
-   CMCHKPK(SPkU16, param->numOfAcks, mBuf);
-   CMCHKPK(SPkU16, param->numOfNacks, mBuf);
-   CMCHKPK(SPkU8, param->mcs, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->numOfAcks, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->numOfNacks, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->mcs, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmPkRgAckNack */
 
 \f
@@ -1869,20 +1831,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSchNackAckStats
+S16 cmPkRgSchNackAckStats
 (
 RgSchNackAckStats *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSchNackAckStats (param, mBuf)
+S16 cmPkRgSchNackAckStats (param, mBuf)
 RgSchNackAckStats *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmPkRgSchNackAckStats)
 
    for (i=14; i >= 0; i--) {
       CMCHKPK(cmPkRgAckNack, &param->ulCqiStat[i], mBuf);
@@ -1892,7 +1853,7 @@ Buffer *mBuf;
       CMCHKPK(cmPkRgAckNack, &param->dlCqiStat[i], mBuf);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -1912,27 +1873,26 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgHqNumRetx
+S16 cmPkRgHqNumRetx
 (
 RgSchHqNumRetx *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgHqNumRetx (param, mBuf)
+S16 cmPkRgHqNumRetx (param, mBuf)
 RgSchHqNumRetx *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkRgHqNumRetx)
 
-   CMCHKPK(SPkU32, param->totalTx, mBuf);
-   CMCHKPK(SPkU16, param->numOfHQ_4, mBuf);
-   CMCHKPK(SPkU16, param->numOfHQ_3, mBuf);
-   CMCHKPK(SPkU16, param->numOfHQ_2, mBuf);
-   CMCHKPK(SPkU16, param->numOfHQ_1, mBuf);
-   CMCHKPK(SPkU8, param->mcs, mBuf);
+   CMCHKPK(oduUnpackUInt32, param->totalTx, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->numOfHQ_4, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->numOfHQ_3, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->numOfHQ_2, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->numOfHQ_1, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->mcs, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmPkRgHqNumRetx */
 
 \f
@@ -1952,20 +1912,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSchHqRetxStats
+S16 cmPkRgSchHqRetxStats
 (
 RgSchHqRetxStats *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSchHqRetxStats (param, mBuf)
+S16 cmPkRgSchHqRetxStats (param, mBuf)
 RgSchHqRetxStats *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmPkRgSchHqRetxStats)
 
    for (i=14; i >= 0; i--) {
       CMCHKPK(cmPkRgHqNumRetx, &param->ulCqiStat[i], mBuf);
@@ -1975,7 +1934,7 @@ Buffer *mBuf;
       CMCHKPK(cmPkRgHqNumRetx, &param->dlCqiStat[i], mBuf);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmPkRgSchHqRetxStats */
 
 /* unpcaking functions */
@@ -1996,25 +1955,24 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgAckNack
+S16 cmUnpkRgAckNack
 (
 RgAckNack *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgAckNack (param, mBuf)
+S16 cmUnpkRgAckNack (param, mBuf)
 RgAckNack *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgAckNack)
 
-   CMCHKUNPK(SUnpkU8, &param->mcs, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numOfNacks, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numOfAcks, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->mcs, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numOfNacks, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numOfAcks, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmUnkRgAckNack */
 
 \f
@@ -2034,19 +1992,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSchNackAckStats
+S16 cmUnpkRgSchNackAckStats
 (
 RgSchNackAckStats *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSchNackAckStats (param, mBuf)
+S16 cmUnpkRgSchNackAckStats (param, mBuf)
 RgSchNackAckStats *param;
 Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmUnpkRgSchNackAckStats)
 
    for (i=0; i <= 14; i++) {
       CMCHKUNPK(cmUnpkRgAckNack, &param->dlCqiStat[i], mBuf);
@@ -2056,7 +2013,7 @@ Buffer *mBuf;
       CMCHKUNPK(cmUnpkRgAckNack, &param->ulCqiStat[i], mBuf);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmUnpkRgSchNackAckStats */
 
 \f
@@ -2076,27 +2033,26 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgHqNumRetx
+S16 cmUnpkRgHqNumRetx
 (
 RgSchHqNumRetx *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgHqNumRetx (param, mBuf)
+S16 cmUnpkRgHqNumRetx (param, mBuf)
 RgSchHqNumRetx *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkRgHqNumRetx)
 
-   CMCHKUNPK(SUnpkU8, &param->mcs, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numOfHQ_1, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numOfHQ_2, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numOfHQ_3, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numOfHQ_4, mBuf);
-   CMCHKUNPK(SUnpkU32, &param->totalTx, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->mcs, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_1, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_2, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_3, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_4, mBuf);
+   CMCHKUNPK(oduPackUInt32, &param->totalTx, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmUnpkRgHqNumRetx */
 
 \f
@@ -2116,19 +2072,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSchHqRetxStats
+S16 cmUnpkRgSchHqRetxStats
 (
 RgSchHqRetxStats *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSchHqRetxStats (param, mBuf)
+S16 cmUnpkRgSchHqRetxStats (param, mBuf)
 RgSchHqRetxStats *param;
 Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmUnpkRgSchHqRetxStats)
 
    for (i=0; i <= 14; i++) {
       CMCHKUNPK(cmUnpkRgHqNumRetx, &param->dlCqiStat[i], mBuf);
@@ -2138,7 +2093,7 @@ Buffer *mBuf;
       CMCHKUNPK(cmUnpkRgHqNumRetx, &param->ulCqiStat[i], mBuf);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* cmUnpkRgSchHqRetxStats */
 
 #endif /* MAC_SCH_STATS */
@@ -2160,28 +2115,27 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgGenSts
+S16 cmPkRgGenSts
 (
 RgGenSts *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgGenSts(param, mBuf)
+S16 cmPkRgGenSts(param, mBuf)
 RgGenSts *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgGenSts)
 
 #ifdef MAC_SCH_STATS
    CMCHKPK(cmPkRgSchHqRetxStats, &param->hqRetxStats, mBuf);
    CMCHKPK(cmPkRgSchNackAckStats, &param->nackAckStats, mBuf);
 #endif /* MAC_SCH_STATS */
-   CMCHKPK(SPkU16, param->numCellCfg, mBuf);
-   CMCHKPK(SPkU32, param->numUeCfg, mBuf);
-   CMCHKPK(SPkU32, param->numHarqFail, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt16, param->numCellCfg, mBuf);
+   CMCHKPK(oduUnpackUInt32, param->numUeCfg, mBuf);
+   CMCHKPK(oduUnpackUInt32, param->numHarqFail, mBuf);
+   return ROK;
 }
 
 
@@ -2202,28 +2156,27 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgGenSts
+S16 cmUnpkRgGenSts
 (
 RgGenSts *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgGenSts(param, mBuf)
+S16 cmUnpkRgGenSts(param, mBuf)
 RgGenSts *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgGenSts)
 
-   CMCHKUNPK(SUnpkU32, &param->numHarqFail, mBuf);
-   CMCHKUNPK(SUnpkU32, &param->numUeCfg, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numCellCfg, mBuf);
+   CMCHKUNPK(oduPackUInt32, &param->numHarqFail, mBuf);
+   CMCHKUNPK(oduPackUInt32, &param->numUeCfg, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numCellCfg, mBuf);
 #ifdef MAC_SCH_STATS
    CMCHKUNPK(cmUnpkRgSchNackAckStats, &param->nackAckStats, mBuf);
    CMCHKUNPK(cmUnpkRgSchHqRetxStats, &param->hqRetxStats, mBuf);
 #endif /* MAC_SCH_STATS */
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2244,24 +2197,23 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSapSts
+S16 cmPkRgSapSts
 (
 RgSapSts *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSapSts(param, mBuf)
+S16 cmPkRgSapSts(param, mBuf)
 RgSapSts *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgSapSts)
 
-   CMCHKPK(SPkU32, param->numPduDrop, mBuf);
-   CMCHKPK(SPkU32, param->numPduTxmit, mBuf);
-   CMCHKPK(SPkU32, param->numPduRcvd, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf);
+   CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf);
+   CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf);
+   return ROK;
 }
 
 
@@ -2282,24 +2234,23 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSapSts
+S16 cmUnpkRgSapSts
 (
 RgSapSts *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSapSts(param, mBuf)
+S16 cmUnpkRgSapSts(param, mBuf)
 RgSapSts *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgSapSts)
 
-   CMCHKUNPK(SUnpkU32, &param->numPduRcvd, mBuf);
-   CMCHKUNPK(SUnpkU32, &param->numPduTxmit, mBuf);
-   CMCHKUNPK(SUnpkU32, &param->numPduDrop, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt32, &param->numPduRcvd, mBuf);
+   CMCHKUNPK(oduPackUInt32, &param->numPduTxmit, mBuf);
+   CMCHKUNPK(oduPackUInt32, &param->numPduDrop, mBuf);
+   return ROK;
 }
 
 
@@ -2320,20 +2271,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSchInstCfg
+S16 cmPkRgSchInstCfg
 (
 RgSchInstCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSchInstCfg(param, mBuf)
+S16 cmPkRgSchInstCfg(param, mBuf)
 RgSchInstCfg *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmPkRgSchInstCfg)
 
    for (i=param->numSaps-1; i >= 0; i--) {
       CMCHKPK(cmPkRgLowSapCfg, &param->tfuSap[i], mBuf);
@@ -2344,10 +2294,10 @@ Buffer *mBuf;
    for (i=param->numSaps-1; i >= 0; i--) {
       CMCHKPK(cmPkRgUpSapCfg, &param->rgmSap[i], mBuf);
    }
-   CMCHKPK(SPkU8, param->numSaps, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->numSaps, mBuf);
    CMCHKPK(cmPkRgGenCfg, &param->genCfg, mBuf);
-   CMCHKPK(SPkU8, param->instId, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->instId, mBuf);
+   return ROK;
 }
 
 
@@ -2368,24 +2318,23 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSchInstCfg
+S16 cmUnpkRgSchInstCfg
 (
 RgSchInstCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSchInstCfg(param, mBuf)
+S16 cmUnpkRgSchInstCfg(param, mBuf)
 RgSchInstCfg *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmUnpkRgSchInstCfg)
 
-   CMCHKUNPK(SUnpkU8, &param->instId, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->instId, mBuf);
    CMCHKUNPK(cmUnpkRgGenCfg, &param->genCfg, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->numSaps, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numSaps, mBuf);
    for (i=0; i<param->numSaps; i++) {
       CMCHKUNPK(cmUnpkRgUpSapCfg, &param->rgmSap[i], mBuf);
    }
@@ -2395,7 +2344,7 @@ Buffer *mBuf;
    for (i=0; i<param->numSaps; i++) {
       CMCHKUNPK(cmUnpkRgLowSapCfg, &param->tfuSap[i], mBuf);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2416,21 +2365,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgCfg
+S16 cmPkRgCfg
 (
 RgCfg *param,
 S16 elmnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgCfg(param, elmnt, mBuf)
+S16 cmPkRgCfg(param, elmnt, mBuf)
 RgCfg *param;
 S16 elmnt;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgCfg)
 
       switch(elmnt) {
          case STSCHINST:
@@ -2449,9 +2397,9 @@ Buffer *mBuf;
             CMCHKPK(cmPkRgGenCfg, &param->s.genCfg, mBuf);
             break;
          default :
-            RETVALUE(RFAILED);
+            return RFAILED;
       }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2472,21 +2420,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgCfg
+S16 cmUnpkRgCfg
 (
 RgCfg *param,
 S16 elmnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgCfg(param, elmnt, mBuf)
+S16 cmUnpkRgCfg(param, elmnt, mBuf)
 RgCfg *param;
 S16 elmnt;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgCfg)
 
       switch(elmnt) {
          case STGEN:
@@ -2505,9 +2452,9 @@ Buffer *mBuf;
             CMCHKUNPK(cmUnpkRgSchInstCfg, &param->s.schInstCfg, mBuf);
             break;
          default :
-            RETVALUE(RFAILED);
+            return RFAILED;
       }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2528,22 +2475,21 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSapSta
+S16 cmPkRgSapSta
 (
 RgSapSta *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSapSta(param, mBuf)
+S16 cmPkRgSapSta(param, mBuf)
 RgSapSta *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgSapSta)
 
-   CMCHKPK(SPkU8, param->sapState, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->sapState, mBuf);
+   return ROK;
 }
 
 
@@ -2564,22 +2510,21 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSapSta
+S16 cmUnpkRgSapSta
 (
 RgSapSta *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSapSta(param, mBuf)
+S16 cmUnpkRgSapSta(param, mBuf)
 RgSapSta *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgSapSta)
 
-   CMCHKUNPK(SUnpkU8, &param->sapState, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt8, &param->sapState, mBuf);
+   return ROK;
 }
 
 
@@ -2600,21 +2545,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSts
+S16 cmPkRgSts
 (
 RgSts *param,
 S16 elmnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSts(param, elmnt, mBuf)
+S16 cmPkRgSts(param, elmnt, mBuf)
 RgSts *param;
 S16 elmnt;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgSts)
 
       switch(elmnt) {
          case STTFUSAP:
@@ -2636,9 +2580,9 @@ Buffer *mBuf;
             break;
       }
    CMCHKPK(cmPkAction, param->action, mBuf);
-   CMCHKPK(SPkU8, param->sapInst, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->sapInst, mBuf);
    CMCHKPK(cmPkDateTime, &param->dt, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2659,24 +2603,23 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSts
+S16 cmUnpkRgSts
 (
 RgSts *param,
 S16 elmnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSts(param, elmnt, mBuf)
+S16 cmUnpkRgSts(param, elmnt, mBuf)
 RgSts *param;
 S16 elmnt;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgSts)
 
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->sapInst, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->sapInst, mBuf);
    CMCHKUNPK(cmUnpkAction, &param->action, mBuf);
       switch(elmnt) {
          case STGEN:
@@ -2697,7 +2640,7 @@ Buffer *mBuf;
          default :
             break;
       }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2718,30 +2661,29 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSsta
+S16 cmPkRgSsta
 (
 Pst *pst,
 RgSsta *param,
 S16 elmnt,
 #ifdef LRG_V1
-U8 eventType,
+uint8_t eventType,
 #endif
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSsta(pst, param, elmnt, eventType, mBuf)
+S16 cmPkRgSsta(pst, param, elmnt, eventType, mBuf)
 Pst *pst;
 RgSsta *param;
 S16 elmnt;
 /* lrg_c_001.main_3 - ADD -  Added the extra parameter eventType  to the function  */
 #ifdef LRG_V1
-U8 eventType;
+uint8_t eventType;
 #endif
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgSsta)
 
       switch(elmnt) {
          case STTFUSAP:
@@ -2780,9 +2722,9 @@ Buffer *mBuf;
          default :
             break;
       }
-   CMCHKPK(SPkU8, param->sapInst, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->sapInst, mBuf);
    CMCHKPK(cmPkDateTime, &param->dt, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2803,7 +2745,7 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSsta
+S16 cmUnpkRgSsta
 (
 Pst    *pst,
 RgSsta *param,
@@ -2811,7 +2753,7 @@ S16 elmnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSsta(pst, param, elmnt, mBuf)
+S16 cmUnpkRgSsta(pst, param, elmnt, mBuf)
 Pst    *pst;
 RgSsta *param;
 S16 elmnt;
@@ -2819,10 +2761,9 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgSsta)
 
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->sapInst, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->sapInst, mBuf);
       switch(elmnt) {
          case STGEN:
             /*ccpu00118255 - ADD - Check for eventType before Unpack */
@@ -2837,12 +2778,12 @@ Buffer *mBuf;
                         (ErrVal)ELRG048, (ErrVal)0, "Packing failed");
 #endif
                   SPutMsg(mBuf);
-                  RETVALUE(RFAILED);
+                  return RFAILED;
                }
                /* KWORK_FIX: Moved the memset under the NULL check */
                if (param->s.sysId.ptNmb != NULLP)
                {
-                  cmMemset((U8 *)param->s.sysId.ptNmb, 0, LRG_MAX_PT_NUM_SIZE);
+                  memset(param->s.sysId.ptNmb, 0, LRG_MAX_PT_NUM_SIZE);
                   CMCHKUNPK(cmUnpkSystemId, &param->s.sysId, mBuf);
                }
             }
@@ -2862,7 +2803,7 @@ Buffer *mBuf;
          default :
             break;
       }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2883,19 +2824,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgUstaDgn
+S16 cmPkRgUstaDgn
 (
 RgUstaDgn *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgUstaDgn(param, mBuf)
+S16 cmPkRgUstaDgn(param, mBuf)
 RgUstaDgn *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgUstaDgn)
 
       switch(param->type) {
          case LRG_USTA_DGNVAL_MEM:
@@ -2904,8 +2844,8 @@ Buffer *mBuf;
          default :
             break;
       }
-   CMCHKPK(SPkU8, param->type, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->type, mBuf);
+   return ROK;
 }
 
 
@@ -2926,21 +2866,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgUstaDgn
+S16 cmUnpkRgUstaDgn
 (
 RgUstaDgn *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgUstaDgn(param, mBuf)
+S16 cmUnpkRgUstaDgn(param, mBuf)
 RgUstaDgn *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgUstaDgn)
 
-   CMCHKUNPK(SUnpkU8, &param->type, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->type, mBuf);
       switch(param->type) {
          case LRG_USTA_DGNVAL_MEM:
             CMCHKUNPK(cmUnpkMemoryId, &param->u.mem, mBuf);
@@ -2948,7 +2887,7 @@ Buffer *mBuf;
          default :
             break;
       }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -2969,23 +2908,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgUsta
+S16 cmPkRgUsta
 (
 RgUsta *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgUsta(param, mBuf)
+S16 cmPkRgUsta(param, mBuf)
 RgUsta *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgUsta)
 
    CMCHKPK(cmPkRgUstaDgn, &param->dgn, mBuf);
    CMCHKPK(cmPkCmAlarm, &param->cmAlarm, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3006,23 +2944,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgUsta
+S16 cmUnpkRgUsta
 (
 RgUsta *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgUsta(param, mBuf)
+S16 cmUnpkRgUsta(param, mBuf)
 RgUsta *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgUsta)
 
    CMCHKUNPK(cmUnpkCmAlarm, &param->cmAlarm, mBuf);
    CMCHKUNPK(cmUnpkRgUstaDgn, &param->dgn, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3043,23 +2980,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgTrc
+S16 cmPkRgTrc
 (
 RgTrc *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgTrc(param, mBuf)
+S16 cmPkRgTrc(param, mBuf)
 RgTrc *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgTrc)
 
-   CMCHKPK(SPkU8, param->evnt, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->evnt, mBuf);
    CMCHKPK(cmPkDateTime, &param->dt, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3080,23 +3016,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgTrc
+S16 cmUnpkRgTrc
 (
 RgTrc *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgTrc(param, mBuf)
+S16 cmUnpkRgTrc(param, mBuf)
 RgTrc *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgTrc)
 
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->evnt, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt8, &param->evnt, mBuf);
+   return ROK;
 }
 
 
@@ -3117,22 +3052,21 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgDbgCntrl
+S16 cmPkRgDbgCntrl
 (
 RgDbgCntrl *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgDbgCntrl(param, mBuf)
+S16 cmPkRgDbgCntrl(param, mBuf)
 RgDbgCntrl *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgDbgCntrl)
 
-   CMCHKPK(SPkU32, param->dbgMask, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt32, param->dbgMask, mBuf);
+   return ROK;
 }
 
 #ifdef PHY_ERROR_LOGING
@@ -3152,27 +3086,26 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSchUlAllocCntrl
+S16 cmPkRgSchUlAllocCntrl
 (
 RgSchUlAllocCntrl *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSchUlAllocCntrl(param, mBuf)
+S16 cmPkRgSchUlAllocCntrl(param, mBuf)
 RgSchUlAllocCntrl *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkRgSchUlAllocCntrl)
 
-   CMCHKPK(SPkU8, param->mcs, mBuf);
-   CMCHKPK(SPkU16, param->numOfRb, mBuf);
-   CMCHKPK(SPkU16, param->rbStart, mBuf);
-   CMCHKPK(SPkU8, param->testStart, mBuf);
-   CMCHKPK(SPkU8, param->enaLog, mBuf);
-   CMCHKPK(SPkU16, param->logTime, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->mcs, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->numOfRb, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->rbStart, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->testStart, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->enaLog, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->logTime, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /***********************************************************
@@ -3191,27 +3124,26 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSchUlAllocCntrl
+S16 cmUnpkRgSchUlAllocCntrl
 (
 RgSchUlAllocCntrl *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSchUlAllocCntrl(param, mBuf)
+S16 cmUnpkRgSchUlAllocCntrl(param, mBuf)
 RgSchUlAllocCntrl *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkRgSchUlAllocCntrl)
 
-   CMCHKUNPK(SUnpkU16, &param->logTime, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->enaLog, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->testStart, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->rbStart, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->numOfRb, mBuf);   
-   CMCHKUNPK(SUnpkU8, &param->mcs, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->logTime, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->enaLog, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->testStart, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->rbStart, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->numOfRb, mBuf);   
+   CMCHKUNPK(oduPackUInt8, &param->mcs, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3233,22 +3165,21 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgDbgCntrl
+S16 cmUnpkRgDbgCntrl
 (
 RgDbgCntrl *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgDbgCntrl(param, mBuf)
+S16 cmUnpkRgDbgCntrl(param, mBuf)
 RgDbgCntrl *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgDbgCntrl)
 
-   CMCHKUNPK(SUnpkU32, &param->dbgMask, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt32, &param->dbgMask, mBuf);
+   return ROK;
 }
 
 
@@ -3269,23 +3200,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgSapCntrl
+S16 cmPkRgSapCntrl
 (
 RgSapCntrl *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgSapCntrl(param, mBuf)
+S16 cmPkRgSapCntrl(param, mBuf)
 RgSapCntrl *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgSapCntrl)
 
    CMCHKPK(SPkS16, param->spId, mBuf);
    CMCHKPK(SPkS16, param->suId, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3306,23 +3236,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgSapCntrl
+S16 cmUnpkRgSapCntrl
 (
 RgSapCntrl *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgSapCntrl(param, mBuf)
+S16 cmUnpkRgSapCntrl(param, mBuf)
 RgSapCntrl *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgSapCntrl)
 
    CMCHKUNPK(SUnpkS16, &param->suId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->spId, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3343,21 +3272,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgCntrl
+S16 cmPkRgCntrl
 (
 RgCntrl *param,
 S16 elmnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgCntrl(param, elmnt, mBuf)
+S16 cmPkRgCntrl(param, elmnt, mBuf)
 RgCntrl *param;
 S16 elmnt;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgCntrl)
 
       switch(elmnt) {
          case STTFUSAP:
@@ -3382,7 +3310,7 @@ Buffer *mBuf;
                   break;
 #ifdef SS_DIAG
                case SALOG:
-                  CMCHKPK(SPkU32,  param->s.logMask, mBuf);
+                  CMCHKPK(oduUnpackUInt32,  param->s.logMask, mBuf);
                   break;
 #endif
 #ifdef PHY_ERROR_LOGING
@@ -3397,10 +3325,10 @@ Buffer *mBuf;
          default :
             break;
       }
-   CMCHKPK(SPkU8, param->subAction, mBuf);
-   CMCHKPK(SPkU8, param->action, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->subAction, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->action, mBuf);
    CMCHKPK(cmPkDateTime, &param->dt, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3421,25 +3349,24 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgCntrl
+S16 cmUnpkRgCntrl
 (
 RgCntrl *param,
 S16 elmnt,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgCntrl(param, elmnt, mBuf)
+S16 cmUnpkRgCntrl(param, elmnt, mBuf)
 RgCntrl *param;
 S16 elmnt;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgCntrl)
 
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->action, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->subAction, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->action, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->subAction, mBuf);
       switch(elmnt) {
          case STGEN:
             switch(param->subAction) {
@@ -3453,7 +3380,7 @@ Buffer *mBuf;
                   break;
 #ifdef SS_DIAG
                case SALOG:
-                  CMCHKUNPK(SUnpkU32, &param->s.logMask, mBuf);
+                  CMCHKUNPK(oduPackUInt32, &param->s.logMask, mBuf);
                   break;
 #endif
 #ifdef PHY_ERROR_LOGING
@@ -3478,7 +3405,7 @@ Buffer *mBuf;
          default :
             break;
       }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3499,23 +3426,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkRgMngmt
+S16 cmPkRgMngmt
 (
 Pst *pst,
 RgMngmt *param,
-U8 eventType,
+uint8_t eventType,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkRgMngmt(pst, param, eventType, mBuf)
+S16 cmPkRgMngmt(pst, param, eventType, mBuf)
 Pst *pst;
 RgMngmt *param;
-U8 eventType;
+uint8_t eventType;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkRgMngmt)
 
       switch(eventType) {
          case EVTLRGCNTRLREQ:
@@ -3523,7 +3449,7 @@ Buffer *mBuf;
          case EVTLRGSCHCNTRLREQ:
          case  EVTLRGSCHCNTRLCFM:
             if(cmPkRgCntrl(&param->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          case EVTLRGTRCIND:
             CMCHKPK(cmPkRgTrc, &param->t.trc, mBuf);
@@ -3538,33 +3464,33 @@ Buffer *mBuf;
 #ifdef LRG_V1
             if(cmPkRgSsta(pst, &param->t.ssta, param->hdr.elmId.elmnt,
                      eventType, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
 #else /* LRG_V1 is not defined */
             if(cmPkRgSsta(pst, &param->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
 #endif /* end of LRG_V1*/            
             break;
          case EVTLRGSTSREQ:
          case  EVTLRGSTSCFM:
             if(cmPkRgSts(&param->t.sts, param->hdr.elmId.elmnt, mBuf)!= ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          case EVTLRGCFGREQ:
          case  EVTLRGCFGCFM:
             if(cmPkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          case EVTMACSCHGENCFGREQ:
          case  EVTMACSCHGENCFGCFM:
             if(cmPkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          default :
-            RETVALUE(RFAILED);
+            return RFAILED;
       }
    CMCHKPK(cmPkCmStatus, &param->cfm, mBuf);
    CMCHKPK(cmPkHeader, &param->hdr, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -3585,23 +3511,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkRgMngmt
+S16 cmUnpkRgMngmt
 (
 Pst *pst,
 RgMngmt *param,
-U8 eventType,
+uint8_t eventType,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkRgMngmt(pst, param, eventType, mBuf)
+S16 cmUnpkRgMngmt(pst, param, eventType, mBuf)
 Pst *pst;
 RgMngmt *param;
-U8 eventType;
+uint8_t eventType;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRgMngmt)
 
    CMCHKUNPK(cmUnpkHeader, &param->hdr, mBuf);
    CMCHKUNPK(cmUnpkCmStatus, &param->cfm, mBuf);
@@ -3611,17 +3536,17 @@ Buffer *mBuf;
          case EVTMACSCHGENCFGREQ:
          case  EVTMACSCHGENCFGCFM:
             if(cmUnpkRgCfg(&param->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          case EVTLRGSTSREQ:
          case  EVTLRGSTSCFM:
             if(cmUnpkRgSts(&param->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          case EVTLRGSSTAREQ:
          case  EVTLRGSSTACFM:
             if(cmUnpkRgSsta(pst, &param->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          case EVTLRGUSTAIND:
          case EVTLRGSCHSTAIND:
@@ -3635,12 +3560,12 @@ Buffer *mBuf;
          case EVTLRGSCHCNTRLREQ:
          case  EVTLRGSCHCNTRLCFM:
             if(cmUnpkRgCntrl(&param->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK)
-               RETVALUE(RFAILED);
+               return RFAILED;
             break;
          default :
-            RETVALUE(RFAILED);
+            return RFAILED;
       }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /* lrg_c_001.main_3 - ADD -  Added the functions pertaining to LTE_L2_MEAS  */
@@ -3660,28 +3585,27 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16  cmPkNmbActvUeQciReq
+static S16  cmPkNmbActvUeQciReq
 (
 LrgNmbActvUeQCI   *nmbActvUeQci, 
 Buffer        *mBuf
 )
 #else
-PRIVATE S16 cmPkNmbActvUeQciReq(nmbActvUeQci, mBuf)
+static S16 cmPkNmbActvUeQciReq(nmbActvUeQci, mBuf)
 LrgNmbActvUeQCI   *nmbActvUeQci;
 Buffer        *mBuf;
 #endif
 {
-   U8      idx;
+   uint8_t      idx;
 
-   TRC3(cmPkNmbActvUeQciReq)
    
    for(idx = 0; idx < nmbActvUeQci->numQci; idx++)
    {
-       CMCHKPK(SPkU8, nmbActvUeQci->qci[idx], mBuf);
+       CMCHKPK(oduUnpackUInt8, nmbActvUeQci->qci[idx], mBuf);
    }
-   CMCHKPK(SPkU8, nmbActvUeQci->numQci, mBuf);
-   CMCHKPK(SPkU8, nmbActvUeQci->sampPrd, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, nmbActvUeQci->numQci, mBuf);
+   CMCHKPK(oduUnpackUInt8, nmbActvUeQci->sampPrd, mBuf);
+   return ROK;
 }
 \f
 /**
@@ -3698,27 +3622,25 @@ Buffer        *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16  cmPkAvgPrbQciReq
+static S16  cmPkAvgPrbQciReq
 (
 LrgAvgPrbQCI  *avgPrbQciReq,
 Buffer        *mBuf
 )
 #else
-PRIVATE S16 cmPkAvgPrbQciReq(avgPrbQciReq, mBuf)
+static S16 cmPkAvgPrbQciReq(avgPrbQciReq, mBuf)
 LrgAvgPrbQCI  *avgPrbQciReq;
 Buffer        *mBuf;
 #endif
 {
-   U8      idx;
+   uint8_t      idx;
 
-   TRC3(cmPkAvgPrbQciReq)
-   
    for(idx = 0; idx < avgPrbQciReq->numQci; idx++)
    {
-       CMCHKPK(SPkU8, avgPrbQciReq->qci[idx], mBuf);
+       CMCHKPK(oduUnpackUInt8, avgPrbQciReq->qci[idx], mBuf);
    }
-   CMCHKPK(SPkU8, avgPrbQciReq->numQci, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, avgPrbQciReq->numQci, mBuf);
+   return ROK;
 
 }
 \f
@@ -3736,19 +3658,18 @@ L2 Measurement Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchL2MeasReq
+S16 cmPkLrgSchL2MeasReq
 (
 Pst * pst,
 LrgSchMeasReqInfo  *measInfo
 )
 #else
-PUBLIC S16 cmPkLrgSchL2MeasReq(pst, measInfo)
+S16 cmPkLrgSchL2MeasReq(pst, measInfo)
 Pst * pst;
 LrgSchMeasReqInfo  *measInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchL2MeasReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3756,7 +3677,7 @@ LrgSchMeasReqInfo  *measInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if(measInfo->measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL)
    {
@@ -3776,11 +3697,11 @@ LrgSchMeasReqInfo  *measInfo;
    }
 
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
-   CMCHKPK(SPkU32, measInfo->timePrd, mBuf);
-   CMCHKPK(SPkU16, measInfo->measType, mBuf);
+   CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf);
+   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 /**
 * @brief This API is used to stop a 
@@ -3796,19 +3717,18 @@ L2 Measurement Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchL2MeasStopReq
+S16 cmPkLrgSchL2MeasStopReq
 (
 Pst * pst,
 LrgSchMeasStopReqInfo *measInfo
 )
 #else
-PUBLIC S16 cmPkLrgSchL2MeasStopReq(pst, measInfo)
+S16 cmPkLrgSchL2MeasStopReq(pst, measInfo)
 Pst * pst;
 LrgSchMeasStopReqInfo *measInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchL2MeasStopReq)
 
  if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3816,14 +3736,14 @@ LrgSchMeasStopReqInfo *measInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
-   /*CMCHKPK(SPkU16, measInfo->timePrd, mBuf);*/
-   CMCHKPK(SPkU16, measInfo->measType, mBuf);
+   /*CMCHKPK(oduUnpackUInt16, measInfo->timePrd, mBuf);*/
+   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASSTOPREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }/*cmPkLrgSchL2MeasStopReq*/
 
 /**
@@ -3840,33 +3760,32 @@ L2 Measurement Request from LM to MAC.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchL2MeasSendReq
+S16 cmPkLrgSchL2MeasSendReq
 (
 Pst * pst,
 LrgSchMeasSndReqInfo *measInfo
 )
 #else
-PUBLIC S16 cmPkLrgSchL2MeasSendReq(pst, measInfo)
+S16 cmPkLrgSchL2MeasSendReq(pst, measInfo)
 Pst * pst;
 LrgSchMeasSndReqInfo *measInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkLrgSchL2MeasSendReq)
  if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
-   CMCHKPK(SPkU32, measInfo->timePrd, mBuf);
-   CMCHKPK(SPkU16, measInfo->measType, mBuf);
+   CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf);
+   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASSENDREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }/*cmPkLrgSchL2MeasSendReq*/
 \f
 /**
@@ -3882,29 +3801,27 @@ LrgSchMeasSndReqInfo *measInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmUnpkNmbActvUeQciReq
+static S16 cmUnpkNmbActvUeQciReq
 (
 LrgNmbActvUeQCI  *param,
 Buffer           *mBuf
 )
 #else
-PRIVATE S16 cmUnpkNmbActvUeQciReq(param, mBuf)
+static S16 cmUnpkNmbActvUeQciReq(param, mBuf)
 LrgNmbActvUeQCI  *param;
 Buffer           *mBuf;
 #endif
 {
-   U8     idx;
+   uint8_t     idx;
 
-   TRC3(cmUnpkNmbActvUeQciReq)
-
-   CMCHKUNPK(SUnpkU8, &param->sampPrd, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->numQci, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->sampPrd, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
-      CMCHKUNPK(SUnpkU8, &param->qci[idx - 1], mBuf);
+      CMCHKUNPK(oduPackUInt8, &param->qci[idx - 1], mBuf);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 \f
 /**
@@ -3920,27 +3837,26 @@ Buffer           *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmUnpkAvgPrbQciReq
+static S16 cmUnpkAvgPrbQciReq
 (
 LrgAvgPrbQCI     *param,
 Buffer           *mBuf
 )
 #else
-PRIVATE S16 cmUnpkAvgPrbQciReq (param, mBuf)
+static S16 cmUnpkAvgPrbQciReq (param, mBuf)
 LrgAvgPrbQCI     *param;
 Buffer           *mBuf;
 #endif
 {
-   U8     idx;
+   uint8_t     idx;
 
-   TRC3(cmUnpkAvgPrbQciReq)
 
-   CMCHKUNPK(SUnpkU8, &param->numQci, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
-      CMCHKUNPK(SUnpkU8, &param->qci[idx - 1], mBuf);
+      CMCHKUNPK(oduPackUInt8, &param->qci[idx - 1], mBuf);
    }
-   RETVALUE(ROK);
+   return ROK;
 
 }
 \f
@@ -3959,14 +3875,14 @@ Measurement  Request from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchL2MeasReq
+S16 cmUnpkLrgSchL2MeasReq
 (
 LrgSchL2MeasReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchL2MeasReq(func, pst, mBuf)
+S16 cmUnpkLrgSchL2MeasReq(func, pst, mBuf)
 LrgSchL2MeasReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -3974,11 +3890,10 @@ Buffer *mBuf;
 {
    LrgSchMeasReqInfo  measInfo;
 
-   TRC3(cmUnpkLrgSchL2MeasReq)
 
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf);
-   CMCHKUNPK(SUnpkU32, &measInfo.timePrd, mBuf);
+   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    if(measInfo.measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL)
    {
@@ -3997,7 +3912,7 @@ Buffer *mBuf;
       CMCHKUNPK(cmUnpkNmbActvUeQciReq, &measInfo.nmbActvUeQciDl, mBuf);
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &measInfo));
+   return ((*func)(pst, &measInfo));
 }
 
 /**
@@ -4015,14 +3930,14 @@ Measurement  Request from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchL2MeasStopReq
+S16 cmUnpkLrgSchL2MeasStopReq
 (
 LrgSchL2MeasStopReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchL2MeasStopReq(func, pst, mBuf)
+S16 cmUnpkLrgSchL2MeasStopReq(func, pst, mBuf)
 LrgSchL2MeasStopReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -4030,14 +3945,12 @@ Buffer *mBuf;
 {
    LrgSchMeasStopReqInfo measInfo;
 
-   TRC3(cmUnpkLrgSchL2MeasStopReq)
-
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf);
-   /*CMCHKUNPK(SUnpkU16, &measInfo.timePrd, mBuf);*/
+   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
+   /*CMCHKUNPK(oduPackUInt16, &measInfo.timePrd, mBuf);*/
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &measInfo));
+   return ((*func)(pst, &measInfo));
 }/*cmUnpkLrgSchL2MeasStopReq*/
 
 /**
@@ -4055,14 +3968,14 @@ Measurement  Request from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchL2MeasSendReq
+S16 cmUnpkLrgSchL2MeasSendReq
 (
 LrgSchL2MeasSendReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchL2MeasSendReq(func, pst, mBuf)
+S16 cmUnpkLrgSchL2MeasSendReq(func, pst, mBuf)
 LrgSchL2MeasSendReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -4070,11 +3983,11 @@ Buffer *mBuf;
 {
    LrgSchMeasSndReqInfo measInfo;
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf);
-   CMCHKUNPK(SUnpkU32, &measInfo.timePrd, mBuf);
+   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &measInfo));
+   return ((*func)(pst, &measInfo));
 }/*cmUnpkLrgSchL2MeasSendReq*/
 
 /**
@@ -4091,34 +4004,33 @@ L2 Measurement confirm from MAC to LM
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchL2MeasStopCfm
+S16 cmPkLrgSchL2MeasStopCfm
 (
 Pst * pst,
 LrgSchMeasCfmInfo  *measInfo
 )
 #else
-PUBLIC S16 cmPkLrgSchL2MeasStopCfm(pst, measInfo)
+S16 cmPkLrgSchL2MeasStopCfm(pst, measInfo)
 Pst * pst;
 LrgSchMeasCfmInfo  *measInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkLrgSchL2MeasStopCfm)
  if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG050, (ErrVal)0, "SGetMsg failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
    CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf);
-   CMCHKPK(SPkU16, measInfo->measType, mBuf);
+   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASSTOPCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }/*cmPkLrgSchL2MeasStopCfm*/
 /**
 * @brief This API is used to Send a 
@@ -4134,14 +4046,14 @@ Measurement  Confirm from SCH to LM.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchL2MeasStopCfm
+S16 cmUnpkLrgSchL2MeasStopCfm
 (
 LrgSchL2MeasStopCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchL2MeasStopCfm(func, pst, mBuf)
+S16 cmUnpkLrgSchL2MeasStopCfm(func, pst, mBuf)
 LrgSchL2MeasStopCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -4149,15 +4061,14 @@ Buffer *mBuf;
 {
    LrgSchMeasCfmInfo  measInfo;
 
-   TRC3(cmUnpkLrgSchL2MeasCfm)
 
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
    CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
 
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &measInfo));
+   return ((*func)(pst, &measInfo));
 }/*cmUnpkLrgSchL2MeasStopCfm*/
 \f
 /**
@@ -4173,30 +4084,29 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmPkNumUeQciCfm
+static S16 cmPkNumUeQciCfm
 (
 LrgNumActvUeQCICfm  *param,
 Buffer              *mBuf
 )
 #else
-PRIVATE S16 cmPkNumUeQciCfm(param, mBuf)
+static S16 cmPkNumUeQciCfm(param, mBuf)
 LrgNumActvUeQCICfm *param;
 Buffer             *mBuf;
 #endif
 {
-   U8         idx;
+   uint8_t         idx;
 
-   TRC3(cmPkNumUeQciCfm)
    
    for(idx = 0; idx < param->numQci; idx++)
    {
 /*LRG : Review Tag*/
-     CMCHKPK(SPkU8, param->numActvUeQci[idx].qciValue, mBuf);
-     CMCHKPK(SPkU8, param->numActvUeQci[idx].numActvUeQci, mBuf);
+     CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].qciValue, mBuf);
+     CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].numActvUeQci, mBuf);
 /*LRG : Review Tag*/
    }
-   CMCHKPK(SPkU8, param->numQci, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->numQci, mBuf);
+   return ROK;
 }
 \f
 /**
@@ -4212,29 +4122,28 @@ Buffer             *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmPkAvgPrbQciCfm
+static S16 cmPkAvgPrbQciCfm
 (
 LrgAvgPrbQCICfm    *param,
 Buffer             *mBuf
 )
 #else
-PRIVATE S16  cmPkAvgPrbQciCfm(param, mBuf)
+static S16  cmPkAvgPrbQciCfm(param, mBuf)
 LrgAvgPrbQCICfm    *param;
 Buffer             *mBuf;
 #endif
 {
-   U8         idx;
+   uint8_t         idx;
 
-   TRC3(cmPkAvgPrbQciCfm)
    for(idx = 0; idx < param->numQci; idx++)
    {
 /*LRG : Review Tag*/
-      CMCHKPK(SPkU8, param->prbPercQci[idx].qciValue, mBuf);
-      CMCHKPK(SPkU8, param->prbPercQci[idx].prbPercQci, mBuf);
+      CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].qciValue, mBuf);
+      CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].prbPercQci, mBuf);
 /*LRG : Review Tag*/
    } 
-   CMCHKPK(SPkU8, param->numQci, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->numQci, mBuf);
+   return ROK;
 }
 \f
 /**
@@ -4250,23 +4159,22 @@ Buffer             *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmPkRaPrmbsCfm
+static S16 cmPkRaPrmbsCfm
 (
 LrgRaPreamblesCfm  *param,
 Buffer             *mBuf
 )
 #else
-PRIVATE S16 cmPkRaPrmbsCfm(param, mBuf)
+static S16 cmPkRaPrmbsCfm(param, mBuf)
 LrgRaPreamblesCfm  *param;
 Buffer             *mBuf;
 #endif
 {
 
-   TRC3(cmPkRaPrmbsCfm)
-   CMCHKPK(SPkU16, param->randSelPreHighRange, mBuf);
-   CMCHKPK(SPkU16, param->randSelPreLowRange, mBuf);
-   CMCHKPK(SPkU16, param->dedPreambles, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt16, param->randSelPreHighRange, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->randSelPreLowRange, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->dedPreambles, mBuf);
+   return ROK;
 }
 \f
 /**
@@ -4282,21 +4190,20 @@ Buffer             *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmPkAvgPrbCfm 
+static S16 cmPkAvgPrbCfm 
 (
 LrgAvgPrbCfm  *param,
 Buffer        *mBuf
 )
 #else
-PRIVATE S16 cmPkAvgPrbCfm(param, mBuf)
+static S16 cmPkAvgPrbCfm(param, mBuf)
 LrgAvgPrbCfm  *param;
 Buffer        *mBuf;
 #endif
 {
 
-   TRC3(cmPkAvgPrbCfm)
-   CMCHKPK(SPkU8, param->prbPerc, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->prbPerc, mBuf);
+   return ROK;
 }
 \f
 /**
@@ -4313,20 +4220,19 @@ L2 Measurement confirm from MAC to LM
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkLrgSchL2MeasCfm
+S16 cmPkLrgSchL2MeasCfm
 (
 Pst * pst,
 LrgSchMeasCfmInfo  *measInfo
 )
 #else
-PUBLIC S16 cmPkLrgSchL2MeasCfm(pst, measInfo)
+S16 cmPkLrgSchL2MeasCfm(pst, measInfo)
 Pst * pst;
 LrgSchMeasCfmInfo  *measInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkLrgSchL2MeasCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -4334,7 +4240,7 @@ LrgSchMeasCfmInfo  *measInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ELRG050, (ErrVal)0, "SGetMsg failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if(measInfo->measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL)
    {
@@ -4366,26 +4272,26 @@ LrgSchMeasCfmInfo  *measInfo;
    }
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_COUNT)
    {
-      CMCHKPK(SPkU32, measInfo->tbTransDlTotalCnt, mBuf);
+      CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlTotalCnt, mBuf);
    }   
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT)
    {
-      CMCHKPK(SPkU32, measInfo->tbTransDlFaulty, mBuf);
+      CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlFaulty, mBuf);
    }   
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_COUNT)
    {
-      CMCHKPK(SPkU32, measInfo->tbTransUlTotalCnt, mBuf);
+      CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlTotalCnt, mBuf);
    }   
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT)
    {
-      CMCHKPK(SPkU32, measInfo->tbTransUlFaulty, mBuf);
+      CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlFaulty, mBuf);
    }   
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
    CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf);
-   CMCHKPK(SPkU16, measInfo->measType, mBuf);
+   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 \f
 /**
@@ -4401,29 +4307,28 @@ LrgSchMeasCfmInfo  *measInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmUnpkNumUeQciCfm
+static S16 cmUnpkNumUeQciCfm
 (
 LrgNumActvUeQCICfm *param,
 Buffer          *mBuf
 )
 #else
-PRIVATE S16 cmUnpkNumUeQciCfm(param, mBuf)
+static S16 cmUnpkNumUeQciCfm(param, mBuf)
 LrgNumActvUeQCICfm *param; 
 Buffer          *mBuf;
 #endif
 {
-   U8          idx;
+   uint8_t          idx;
 
-   TRC3(cmUnpkNumUeQciCfm)
-   CMCHKUNPK(SUnpkU8, &param->numQci, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
 /*LRG : Review Tag*/
-       CMCHKUNPK(SUnpkU8, &param->numActvUeQci[idx - 1].numActvUeQci, mBuf);
-       CMCHKUNPK(SUnpkU8, &param->numActvUeQci[idx - 1].qciValue, mBuf);
+       CMCHKUNPK(oduPackUInt8, &param->numActvUeQci[idx - 1].numActvUeQci, mBuf);
+       CMCHKUNPK(oduPackUInt8, &param->numActvUeQci[idx - 1].qciValue, mBuf);
 /*LRG : Review Tag*/
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 \f
 /**
@@ -4439,30 +4344,29 @@ Buffer          *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmUnpkAvgPrbQciCfm
+static S16 cmUnpkAvgPrbQciCfm
 (
 LrgAvgPrbQCICfm *param,
 Buffer          *mBuf
 )
 #else
-PRIVATE S16 cmUnpkAvgPrbQciCfm(param, mBuf)
+static S16 cmUnpkAvgPrbQciCfm(param, mBuf)
 LrgAvgPrbQCICfm *param; 
 Buffer          *mBuf;
 #endif
 {
-   U8          idx;
+   uint8_t          idx;
 
-   TRC3(cmUnpkAvgPrbQciCfm)
 
-   CMCHKUNPK(SUnpkU8, &param->numQci, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
 /*LRG : Review Tag*/
-      CMCHKUNPK(SUnpkU8, &param->prbPercQci[idx - 1].prbPercQci, mBuf);
-      CMCHKUNPK(SUnpkU8, &param->prbPercQci[idx - 1].qciValue, mBuf);
+      CMCHKUNPK(oduPackUInt8, &param->prbPercQci[idx - 1].prbPercQci, mBuf);
+      CMCHKUNPK(oduPackUInt8, &param->prbPercQci[idx - 1].qciValue, mBuf);
 /*LRG : Review Tag*/
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 \f
 /**
@@ -4478,24 +4382,23 @@ Buffer          *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmUnpkRaPrmbsCfm
+static S16 cmUnpkRaPrmbsCfm
 (
 LrgRaPreamblesCfm *param,
 Buffer         *mBuf
 )
 #else
-PRIVATE S16 cmUnpkRaPrmbsCfm(param, mBuf)
+static S16 cmUnpkRaPrmbsCfm(param, mBuf)
 LrgRaPreamblesCfm *param; 
 Buffer         *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkRaPrmbsCfm)
 
-   CMCHKUNPK(SUnpkU16, &param->dedPreambles, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->randSelPreLowRange, mBuf);
-   CMCHKUNPK(SUnpkU16, &param->randSelPreHighRange, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt16, &param->dedPreambles, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->randSelPreLowRange, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->randSelPreHighRange, mBuf);
+   return ROK;
 }
 \f
 /**
@@ -4511,22 +4414,21 @@ Buffer         *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16 cmUnpkAvgPrbCfm
+static S16 cmUnpkAvgPrbCfm
 (
 LrgAvgPrbCfm   *param, 
 Buffer         *mBuf
 )
 #else
-PRIVATE S16  cmUnpkAvgPrbCfm(param, mBuf)
+static S16  cmUnpkAvgPrbCfm(param, mBuf)
 LrgAvgPrbCfm   *param; 
 Buffer         *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkAvgPrbCfm)
 
-   CMCHKUNPK(SUnpkU8, &param->prbPerc, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt8, &param->prbPerc, mBuf);
+   return ROK;
 }
 \f
 /**
@@ -4543,14 +4445,14 @@ Measurement  Confirm from LM to SCH.
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkLrgSchL2MeasCfm
+S16 cmUnpkLrgSchL2MeasCfm
 (
 LrgSchL2MeasCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkLrgSchL2MeasCfm(func, pst, mBuf)
+S16 cmUnpkLrgSchL2MeasCfm(func, pst, mBuf)
 LrgSchL2MeasCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -4558,27 +4460,26 @@ Buffer *mBuf;
 {
    LrgSchMeasCfmInfo  measInfo;
 
-   TRC3(cmUnpkLrgSchL2MeasCfm)
 
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
    CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT)
    {
-      CMCHKPK(SUnpkU32, &measInfo.tbTransUlFaulty, mBuf);
+      CMCHKPK(oduPackUInt32, &measInfo.tbTransUlFaulty, mBuf);
    }    
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_COUNT)
    {
-      CMCHKPK(SUnpkU32, &measInfo.tbTransUlTotalCnt, mBuf);
+      CMCHKPK(oduPackUInt32, &measInfo.tbTransUlTotalCnt, mBuf);
    }   
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT)
    {
-      CMCHKPK(SUnpkU32, &measInfo.tbTransDlFaulty, mBuf);
+      CMCHKPK(oduPackUInt32, &measInfo.tbTransDlFaulty, mBuf);
    }   
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_COUNT)
    {
-      CMCHKPK(SUnpkU32, &measInfo.tbTransDlTotalCnt, mBuf);
+      CMCHKPK(oduPackUInt32, &measInfo.tbTransDlTotalCnt, mBuf);
    }   
    if(measInfo.measType & LRG_L2MEAS_AVG_PRB_UL)
    {
@@ -4609,7 +4510,7 @@ Buffer *mBuf;
      CMCHKUNPK(cmUnpkNumUeQciCfm, &measInfo.numUeQciDlCfm, mBuf);
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, &measInfo));
+   return ((*func)(pst, &measInfo));
 }
 #endif
 #endif