X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgr.c;h=070d06b01447a945d6377bf6c67cb63d60134442;hb=05d098e6b94f629a932caaff404f2b703b123852;hp=742a6d87ac7031f6aa51aa3d28b12ecb5fcfb54c;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git

diff --git a/src/cm/rgr.c b/src/cm/rgr.c
index 742a6d87a..070d06b01 100755
--- a/src/cm/rgr.c
+++ b/src/cm/rgr.c
@@ -44,10 +44,11 @@
 
 /***********************************************************
 *
-*     Func : cmPkRgrBndReq
+*     Func : cmUnpkRgrCfgReq
 *
 *
-*     Desc : Request from RRM to MAC to bind the interface saps
+*     Desc : Configuration Request from RRM to MAC for 
+ * configuring Cell/Ue/Lc
 *
 *
 *     Ret  : S16
@@ -57,59 +58,70 @@
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrBndReq
+S16 cmUnpkRgrCfgReq
 (
-Pst* pst,
-SuId suId,
-SpId spId
+RgrCfgReq func,
+Pst *pst,
+Buffer *mBuf
 )
-#else
-S16 cmPkRgrBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
-   Buffer *mBuf = NULLP;
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
+   RgrCfgTransId transId;
+   RgrCfgReqInfo *cfgReqInfo;
+   
+#if 0
+   if (SUnpkS16(&spId, mBuf) != ROK) {
+      SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR001, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR021, (ErrVal)0, "Packing failed");
 #endif
       return RFAILED;
    }
-   if (SPkS16(spId, mBuf) != ROK) {
+#endif
+
+   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
+      SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR002, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR022, (ErrVal)0, "Packing failed");
 #endif
-      SPutMsg(mBuf);
       return RFAILED;
    }
-   if (SPkS16(suId, mBuf) != ROK) {
+   if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&cfgReqInfo,sizeof(RgrCfgReqInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR003, (ErrVal)0, "Packing failed");
+            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
+            (ErrVal)ERGR023, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
       return RFAILED;
    }
-   pst->event = (Event) EVTRGRBNDREQ;
-   return (SPstTsk(pst,mBuf));
+   memset(cfgReqInfo, 0, sizeof(RgrCfgReqInfo));
+   if (pst->selector == ODU_SELECTOR_LC) 
+      if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
+         SPutMsg(mBuf);
+#if (ERRCLASS & ERRCLS_ADD_RES)
+         SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
+               __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
+               (ErrVal)ERGR024, (ErrVal)0, "Packing failed");
+#endif
+         return RFAILED;
+      }
+   SPutMsg(mBuf);
+   return ((*func)(pst, transId, cfgReqInfo));
 }
 
+/* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrBndReq
+*     Func : cmPkRgrTtiIndInfo
 *
 *
-*     Desc : Request from RRM to MAC to bind the interface saps
+*     Desc : Packs the TTI indication information.
 *
 *
 *     Ret  : S16
@@ -119,54 +131,50 @@ SpId spId;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrBndReq
+S16 cmPkRgrTtiIndInfo
 (
-RgrBndReq func,
-Pst *pst,
+RgrTtiIndInfo *param,
+Buffer        *mBuf
+)
+{
+   CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
+   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
+   return ROK;
+}
+
+/***********************************************************
+*
+*     Func : cmUnpkRgrTtiIndInfo
+*
+*
+*     Desc : Unpacking for RgrTtiIndInfo
+*
+*     Ret  : S16
+*
+*     Notes:
+*
+*     File  : 
+*
+**********************************************************/
+S16 cmUnpkRgrTtiIndInfo
+(
+RgrTtiIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrBndReq(func, pst, mBuf)
-RgrBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SuId suId;
-   SpId spId;
-   
 
-   if (SUnpkS16(&suId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR004, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (SUnpkS16(&spId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR005, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   SPutMsg(mBuf);
-   return ((*func)(pst, suId, spId));
+   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
+   return ROK;
 }
 
 
 /***********************************************************
 *
-*     Func : cmPkRgrBndCfm
+*     Func : cmPkRgrTtiInd
 *
 *
-*     Desc : Confirmation from MAC to RRM for the bind/Unbind 
- * request for the interface saps
+*     Desc : TTI indication  from MAC to RRM
 *
 *
 *     Ret  : S16
@@ -176,19 +184,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrBndCfm
+S16 cmPkRgrTtiInd
 (
 Pst* pst,
 SuId suId,
-U8 status
+RgrTtiIndInfo *ttiInd
 )
-#else
-S16 cmPkRgrBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -196,16 +197,17 @@ U8 status;
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR006, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR025, (ErrVal)0, "Packing failed");
 #endif
       return RFAILED;
    }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (cmPkRgrTtiIndInfo(ttiInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR007, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR026, (ErrVal)0, "Packing failed");
 #endif
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -213,23 +215,24 @@ U8 status;
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR008, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR027, (ErrVal)0, "Packing failed");
 #endif
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
-   pst->event = (Event) EVTRGRBNDCFM;
+   SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo));
+   pst->event = (Event) EVTRGRTTIIND;
    return (SPstTsk(pst,mBuf));
 }
 
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrBndCfm
+*     Func : cmUnpkRgrTtiInd
 *
 *
-*     Desc : Confirmation from MAC to RRM for the bind/Unbind 
- * request for the interface saps
+*     Desc : TTI indication from MAC to RRM
 *
 *
 *     Ret  : S16
@@ -239,22 +242,15 @@ U8 status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrBndCfm
+S16 cmUnpkRgrTtiInd
 (
-RgrBndCfm func,
+RgrTtiInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrBndCfm(func, pst, mBuf)
-RgrBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
-   U8 status;
+   RgrTtiIndInfo *ttiInd;
    
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
@@ -262,30 +258,45 @@ Buffer *mBuf;
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR009, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR028, (ErrVal)0, "Packing failed");
 #endif
       return RFAILED;
    }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ttiInd, sizeof(RgrTtiIndInfo))) != ROK) 
+   {
+#if (ERRCLASS & ERRCLS_ADD_RES)      
+      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
+          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
+          (ErrVal)ERGR029, (ErrVal)0, "UnPacking failed");
+#endif      
+      SPutMsg(mBuf);
+      return RFAILED;
+   }
+ 
+   if (cmUnpkRgrTtiIndInfo(ttiInd, mBuf) != ROK) {
+      /*ccpu00114888- Memory Leak issue- Start*/
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ttiInd, 
+            sizeof(RgrTtiIndInfo));
+      /*ccpu00114888- Memory Leak issue- End*/
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR010, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR030, (ErrVal)0, "Packing failed");
 #endif
       return RFAILED;
    }
    SPutMsg(mBuf);
-   return ((*func)(pst, suId, status));
+   return ((*func)(pst, suId, ttiInd));
 }
 
 
 /***********************************************************
 *
-*     Func : cmPkRgrUbndReq
+*     Func : cmPkRgrCfgCfm
 *
 *
-*     Desc : Request from RRM to MAC to Unbind the interface saps
+*     Desc : Configuration Confirm from MAC to RRM
 *
 *
 *     Ret  : S16
@@ -295,19 +306,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrUbndReq
+S16 cmPkRgrCfgCfm
 (
 Pst* pst,
-SpId spId,
-Reason reason
-)
-#else
-S16 cmPkRgrUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
+RgrCfgTransId transId,
+uint8_t status
+)
 {
    Buffer *mBuf = NULLP;
 
@@ -315,39 +319,39 @@ Reason reason;
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR011, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR031, (ErrVal)0, "Packing failed");
 #endif
       return RFAILED;
    }
-   if (SPkS16(reason, mBuf) != ROK) {
+   if (oduUnpackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR012, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR032, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
       return RFAILED;
    }
-   if (SPkS16(spId, mBuf) != ROK) {
+   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR013, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR033, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
       return RFAILED;
    }
-   pst->event = (Event) EVTRGRUBNDREQ;
+   pst->event = (Event) EVTMACSCHCFGCFM;
    return (SPstTsk(pst,mBuf));
 }
 
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrUbndReq
+*     Func : cmUnpkRgrCfgCfm
 *
 *
-*     Desc : Request from RRM to MAC to Unbind the interface saps
+*     Desc : Configuration Confirm from MAC to RRM
 *
 *
 *     Ret  : S16
@@ -357,54 +361,46 @@ Reason reason;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrUbndReq
+S16 cmUnpkRgrCfgCfm
 (
-RgrUbndReq func,
+RgrCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUbndReq(func, pst, mBuf)
-RgrUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SpId spId;
-   Reason reason;
+   RgrCfgTransId transId;
+   uint8_t status;
    
 
-   if (SUnpkS16(&spId, mBuf) != ROK) {
+   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR014, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR036, (ErrVal)0, "Packing failed");
 #endif
       return RFAILED;
    }
-   if (SUnpkS16(&reason, mBuf) != ROK) {
+   if (oduPackUInt8(&status, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR015, (ErrVal)0, "Packing failed");
+         (ErrVal)ERGR037, (ErrVal)0, "Packing failed");
 #endif
       return RFAILED;
    }
    SPutMsg(mBuf);
-   return ((*func)(pst, spId, reason));
+   return ((*func)(pst, transId, status));
 }
 
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrCfgReq
+*     Func : cmPkRgrCfgTransId
 *
 *
-*     Desc : Configuration Request from RRM to MAC for 
- * configuring Cell/Ue/Lc
+*     Desc : Transaction ID between MAC and RRM
 *
 *
 *     Ret  : S16
@@ -414,77 +410,29 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrCfgReq
+S16 cmPkRgrCfgTransId
 (
-RgrCfgReq func,
-Pst *pst,
+RgrCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfgReq(func, pst, mBuf)
-RgrCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   RgrCfgTransId transId;
-   RgrCfgReqInfo *cfgReqInfo;
-   
-#if 0
-   if (SUnpkS16(&spId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR021, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-#endif
 
-   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR022, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo,sizeof(RgrCfgReqInfo))) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR023, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
+   S32 i;
+
+   for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) {
+      CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
    }
-   memset(cfgReqInfo, 0, sizeof(RgrCfgReqInfo));
-   if (pst->selector == ODU_SELECTOR_LC) 
-      if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
-         SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-         SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-               __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-               (ErrVal)ERGR024, (ErrVal)0, "Packing failed");
-#endif
-         return RFAILED;
-      }
-   SPutMsg(mBuf);
-   return ((*func)(pst, transId, cfgReqInfo));
+   return ROK;
 }
 
-/* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */
+
 
 /***********************************************************
 *
-*     Func : cmPkRgrTtiIndInfo
+*     Func : cmUnpkRgrCfgTransId
 *
 *
-*     Desc : Packs the TTI indication information.
+*     Desc : Transaction ID between MAC and RRM
 *
 *
 *     Ret  : S16
@@ -494,29 +442,30 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrTtiIndInfo
+S16 cmUnpkRgrCfgTransId
 (
-RgrTtiIndInfo *param,
-Buffer        *mBuf
+RgrCfgTransId *param,
+Buffer *mBuf
 )
-#else
-S16 cmPkRgrTtiIndInfo(param, mBuf)
-RgrTtiIndInfo *param;
-Buffer        *mBuf;
-#endif
 {
-   CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
+
+   S32 i;
+
+   for (i=0; i<RGR_CFG_TRANSID_SIZE; i++) {
+      CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
+   }
    return ROK;
 }
+
+
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrTtiIndInfo
+*     Func : cmPkRgrDlHqCfg
 *
 *
-*     Desc : Unpacking for RgrTtiIndInfo
+*     Desc :  Downlink HARQ configuration per Cell
+*
 *
 *     Ret  : S16
 *
@@ -525,31 +474,27 @@ Buffer        *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrTtiIndInfo
+S16 cmPkRgrDlHqCfg
 (
-RgrTtiIndInfo *param,
+RgrDlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTtiIndInfo(param, mBuf)
-RgrTtiIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
+
+   CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf);
    return ROK;
 }
 
+
 
 /***********************************************************
 *
-*     Func : cmPkRgrTtiInd
+*     Func : cmUnpkRgrDlHqCfg
 *
 *
-*     Desc : TTI indication  from MAC to RRM
+*     Desc :  Downlink HARQ configuration per Cell
 *
 *
 *     Ret  : S16
@@ -559,62 +504,27 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrTtiInd
+S16 cmUnpkRgrDlHqCfg
 (
-Pst* pst,
-SuId suId,
-RgrTtiIndInfo *ttiInd
+RgrDlHqCfg *param,
+Buffer *mBuf
 )
-#else
-S16 cmPkRgrTtiInd(pst, suId, ttiInd)
-Pst* pst;
-SuId suId;
-RgrTtiIndInfo *ttiInd;
-#endif
 {
-   Buffer *mBuf = NULLP;
 
-   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)ERGR025, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (cmPkRgrTtiIndInfo(ttiInd, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR026, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (SPkS16(suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR027, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo));
-   pst->event = (Event) EVTRGRTTIIND;
-   return (SPstTsk(pst,mBuf));
+
+   CMCHKUNPK(oduPackUInt8, &param->maxDlHqTx, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->maxMsg4HqTx, mBuf);
+   return ROK;
 }
 
+
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrTtiInd
+*     Func : cmPkRgrRntiCfg
 *
 *
-*     Desc : TTI indication from MAC to RRM
+*     Desc : Range of RNTIs managed by MAC
 *
 *
 *     Ret  : S16
@@ -624,68 +534,26 @@ RgrTtiIndInfo *ttiInd;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrTtiInd
+S16 cmPkRgrRntiCfg
 (
-RgrTtiInd func,
-Pst *pst,
+RgrRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTtiInd(func, pst, mBuf)
-RgrTtiInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SuId suId;
-   RgrTtiIndInfo *ttiInd;
-   
 
-   if (SUnpkS16(&suId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR028, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd, sizeof(RgrTtiIndInfo))) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)      
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-          (ErrVal)ERGR029, (ErrVal)0, "UnPacking failed");
-#endif      
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
- 
-   if (cmUnpkRgrTtiIndInfo(ttiInd, mBuf) != ROK) {
-      /*ccpu00114888- Memory Leak issue- Start*/
-      SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, 
-            sizeof(RgrTtiIndInfo));
-      /*ccpu00114888- Memory Leak issue- End*/
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR030, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   SPutMsg(mBuf);
-   return ((*func)(pst, suId, ttiInd));
+   CMCHKPK(oduUnpackUInt16, param->size, mBuf);
+   CMCHKPK(cmPkLteRnti, param->startRnti, mBuf);
+   return ROK;
 }
 
+
 
 /***********************************************************
 *
-*     Func : cmPkRgrCfgCfm
+*     Func : cmUnpkRgrRntiCfg
 *
 *
-*     Desc : Configuration Confirm from MAC to RRM
+*     Desc : Range of RNTIs managed by MAC
 *
 *
 *     Ret  : S16
@@ -695,59 +563,26 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrCfgCfm
+S16 cmUnpkRgrRntiCfg
 (
-Pst* pst,
-RgrCfgTransId transId,
-U8 status
+RgrRntiCfg *param,
+Buffer *mBuf
 )
-#else
-S16 cmPkRgrCfgCfm(pst, transId, status)
-Pst* pst;
-RgrCfgTransId transId;
-U8 status;
-#endif
 {
-   Buffer *mBuf = NULLP;
 
-   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)ERGR031, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR032, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR033, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   pst->event = (Event) EVTMACSCHCFGCFM;
-   return (SPstTsk(pst,mBuf));
+
+   CMCHKUNPK(cmUnpkLteRnti, &param->startRnti, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->size, mBuf);
+   return ROK;
 }
 
-
+#ifdef EMTC_ENABLE
 /***********************************************************
 *
-*     Func : cmUnpkRgrCfgCfm
+*     Func : cmPkRgrEmtcRntiCfg
 *
 *
-*     Desc : Configuration Confirm from MAC to RRM
+*     Desc : Range of Emtc RNTIs managed by MAC
 *
 *
 *     Ret  : S16
@@ -757,54 +592,30 @@ U8 status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrCfgCfm
+S16 cmPkRgrEmtcRntiCfg
 (
-RgrCfgCfm func,
-Pst *pst,
+RgrEmtcRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfgCfm(func, pst, mBuf)
-RgrCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   RgrCfgTransId transId;
-   U8 status;
-   
 
-   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR036, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR037, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   SPutMsg(mBuf);
-   return ((*func)(pst, transId, status));
+
+   CMCHKPK(oduUnpackUInt16, param->size, mBuf);
+   CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf);
+   CMCHKPK(cmPkLteRnti, param->rntiCeModeBStart, mBuf);
+   CMCHKPK(cmPkLteRnti, param->rntiCeModeARange, mBuf);
+   CMCHKPK(cmPkLteRnti, param->rntiCeModeAStart, mBuf);
+   return ROK;
 }
 
-/* rgr_c_001.main_4: ADD-Added for SI Enhancement. */
-#ifdef RGR_SI_SCH
+
+
 /***********************************************************
 *
-*     Func : cmPkRgrSiCfgCfm
+*     Func : cmUnpkRgrEmtcRntiCfg
 *
 *
-*     Desc : SI Configuration Confirm from MAC to RRM
+*     Desc : Range of Emtc RNTIs managed by MAC
 *
 *
 *     Ret  : S16
@@ -814,72 +625,31 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrSiCfgCfm
+S16 cmUnpkRgrEmtcRntiCfg
 (
-Pst* pst,
-SuId suId,
-RgrCfgTransId transId,
-U8 status
-)
-#else
-S16 cmPkRgrSiCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-RgrCfgTransId transId;
-U8 status;
-#endif
+RgrEmtcRntiCfg *param,
+Buffer *mBuf
+)
 {
-   Buffer *mBuf = NULLP;
 
 
-   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)ERGR038, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR039, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR040, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (SPkS16(suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR041, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
+   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeAStart, mBuf);
+   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeARange, mBuf);
+   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeBStart, mBuf);
+   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeBRange, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->size, mBuf);
 
-   pst->event = (Event) EVTRGRSICFGCFM;
-   return (SPstTsk(pst,mBuf));
+   return ROK;
 }
+#endif
 
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrSiCfgCfm
+*     Func : cmPkRgrDlCmnCodeRateCfg
 *
 *
-*     Desc : Configuration Confirm from MAC to RRM
+*     Desc : Downlink common channel code rate configuration per cell
 *
 *
 *     Ret  : S16
@@ -889,91 +659,16 @@ U8 status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrSiCfgCfm
+S16 cmPkRgrDlCmnCodeRateCfg
 (
-RgrSiCfgCfm func,
-Pst *pst,
+RgrDlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSiCfgCfm(func, pst, mBuf)
-RgrSiCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SuId suId;
-   RgrCfgTransId transId;
-   U8 status;
-   
 
-   if (SUnpkS16(&suId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR042, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR043, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR044, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   SPutMsg(mBuf);
-   return ((*func)(pst, suId, transId, status));
-}
-#endif/*RGR_SI_SCH*/
-
-
-/***********************************************************
-*
-*     Func : cmPkRgrCfgTransId
-*
-*
-*     Desc : Transaction ID between MAC and RRM
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrCfgTransId
-(
-RgrCfgTransId *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrCfgTransId(param, mBuf)
-RgrCfgTransId *param;
-Buffer *mBuf;
-#endif
-{
-
-   S32 i;
-
-   for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
-   }
+   CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf);
    return ROK;
 }
 
@@ -981,10 +676,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrCfgTransId
+*     Func : cmUnpkRgrDlCmnCodeRateCfg
 *
 *
-*     Desc : Transaction ID between MAC and RRM
+*     Desc : Downlink common channel code rate configuration per cell
 *
 *
 *     Ret  : S16
@@ -994,24 +689,16 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrCfgTransId
+S16 cmUnpkRgrDlCmnCodeRateCfg
 (
-RgrCfgTransId *param,
+RgrDlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfgTransId(param, mBuf)
-RgrCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
-   S32 i;
-
-   for (i=0; i<RGR_CFG_TRANSID_SIZE; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
-   }
+   CMCHKUNPK(oduPackUInt16, &param->bcchPchRaCodeRate, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->pdcchCodeRate, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->ccchCqi, mBuf);
    return ROK;
 }
 
@@ -1019,10 +706,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmPkRgrDlHqCfg
+*     Func : cmPkRgrCfiCfg
 *
 *
-*     Desc :  Downlink HARQ configuration per Cell
+*     Desc : Control Format Indicator (CFI) configuration per cell
 *
 *
 *     Ret  : S16
@@ -1032,22 +719,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrDlHqCfg
+S16 cmPkRgrCfiCfg
 (
-RgrDlHqCfg *param,
+RgrCfiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlHqCfg(param, mBuf)
-RgrDlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
-
-
-   CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->cfi, mBuf);
    return ROK;
 }
 
@@ -1055,10 +733,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrDlHqCfg
+*     Func : cmUnpkRgrCfiCfg
 *
 *
-*     Desc :  Downlink HARQ configuration per Cell
+*     Desc : Control Format Indicator (CFI) configuration per cell
 *
 *
 *     Ret  : S16
@@ -1068,22 +746,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrDlHqCfg
+S16 cmUnpkRgrCfiCfg
 (
-RgrDlHqCfg *param,
+RgrCfiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlHqCfg(param, mBuf)
-RgrDlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
-   CMCHKUNPK(oduPackUInt8, &param->maxDlHqTx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxMsg4HqTx, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->cfi, mBuf);
    return ROK;
 }
 
@@ -1091,10 +761,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmPkRgrRntiCfg
+*     Func : cmPkRgrPuschSubBandCfg
 *
 *
-*     Desc : Range of RNTIs managed by MAC
+*     Desc : PUSCH sub-band configuration per cell
 *
 *
 *     Ret  : S16
@@ -1104,22 +774,21 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrRntiCfg
+S16 cmPkRgrPuschSubBandCfg
 (
-RgrRntiCfg *param,
+RgrPuschSubBandCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrRntiCfg(param, mBuf)
-RgrRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
+   S32 i;
 
-   CMCHKPK(oduUnpackUInt16, param->size, mBuf);
-   CMCHKPK(cmPkLteRnti, param->startRnti, mBuf);
+   for (i=param->numSubbands-1; i >= 0; i--) {
+      CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf);
+   }
+   CMCHKPK(oduUnpackUInt8, param->size, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->numSubbands, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->subbandStart, mBuf);
    return ROK;
 }
 
@@ -1127,45 +796,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrRntiCfg
-*
-*
-*     Desc : Range of RNTIs managed by MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrRntiCfg
-(
-RgrRntiCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrRntiCfg(param, mBuf)
-RgrRntiCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-
-   CMCHKUNPK(cmUnpkLteRnti, &param->startRnti, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->size, mBuf);
-   return ROK;
-}
-
-#ifdef EMTC_ENABLE
-/***********************************************************
-*
-*     Func : cmPkRgrEmtcRntiCfg
+*     Func : cmUnpkRgrPuschSubBandCfg
 *
 *
-*     Desc : Range of Emtc RNTIs managed by MAC
+*     Desc : PUSCH sub-band configuration per cell
 *
 *
 *     Ret  : S16
@@ -1175,25 +809,20 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrEmtcRntiCfg
+S16 cmUnpkRgrPuschSubBandCfg
 (
-RgrEmtcRntiCfg *param,
+RgrPuschSubBandCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcRntiCfg(param, mBuf)
-RgrEmtcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
-   CMCHKPK(oduUnpackUInt16, param->size, mBuf);
-   CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf);
-   CMCHKPK(cmPkLteRnti, param->rntiCeModeBStart, mBuf);
-   CMCHKPK(cmPkLteRnti, param->rntiCeModeARange, mBuf);
-   CMCHKPK(cmPkLteRnti, param->rntiCeModeAStart, mBuf);
+   S32 i;
+   CMCHKUNPK(oduPackUInt8, &param->subbandStart, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numSubbands, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->size, mBuf);
+   for (i=0; i<param->numSubbands; i++) {
+      CMCHKUNPK(oduPackUInt8, &param->dmrs[i], mBuf);
+   }
    return ROK;
 }
 
@@ -1201,10 +830,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrEmtcRntiCfg
+*     Func : cmPkRgrUlCmnCodeRateCfg
 *
 *
-*     Desc : Range of Emtc RNTIs managed by MAC
+*     Desc : Uplink common channel code rate configuration per cell
 *
 *
 *     Ret  : S16
@@ -1214,37 +843,24 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrEmtcRntiCfg
+S16 cmPkRgrUlCmnCodeRateCfg
 (
-RgrEmtcRntiCfg *param,
+RgrUlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcRntiCfg(param, mBuf)
-RgrEmtcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
-
-
-   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeAStart, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeARange, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeBStart, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeBRange, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->size, mBuf);
-
+   CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
    return ROK;
 }
-#endif
+
 
 
 /***********************************************************
 *
-*     Func : cmPkRgrDlCmnCodeRateCfg
+*     Func : cmUnpkRgrUlCmnCodeRateCfg
 *
 *
-*     Desc : Downlink common channel code rate configuration per cell
+*     Desc : Uplink common channel code rate configuration per cell
 *
 *
 *     Ret  : S16
@@ -1254,22 +870,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrDlCmnCodeRateCfg
+S16 cmUnpkRgrUlCmnCodeRateCfg
 (
-RgrDlCmnCodeRateCfg *param,
+RgrUlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlCmnCodeRateCfg(param, mBuf)
-RgrDlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->ccchCqi, mBuf);
    return ROK;
 }
 
@@ -1277,10 +885,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrDlCmnCodeRateCfg
+*     Func : cmPkRgrUlTrgCqiCfg
 *
 *
-*     Desc : Downlink common channel code rate configuration per cell
+*     Desc : Target Uplink CQI to achieve through group power control configured per cell
 *
 *
 *     Ret  : S16
@@ -1290,22 +898,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrDlCmnCodeRateCfg
+S16 cmPkRgrUlTrgCqiCfg
 (
-RgrDlCmnCodeRateCfg *param,
+RgrUlTrgCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlCmnCodeRateCfg(param, mBuf)
-RgrDlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
 {
-
-   CMCHKUNPK(oduPackUInt16, &param->bcchPchRaCodeRate, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->pdcchCodeRate, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ccchCqi, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf);
    return ROK;
 }
 
@@ -1313,10 +912,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmPkRgrCfiCfg
+*     Func : cmUnpkRgrUlTrgCqiCfg
 *
 *
-*     Desc : Control Format Indicator (CFI) configuration per cell
+*     Desc : Target Uplink CQI to achieve through group power control configured per cell
 *
 *
 *     Ret  : S16
@@ -1326,20 +925,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrCfiCfg
+S16 cmUnpkRgrUlTrgCqiCfg
 (
-RgrCfiCfg *param,
+RgrUlTrgCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCfiCfg(param, mBuf)
-RgrCfiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   CMCHKPK(oduUnpackUInt8, param->cfi, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->trgCqi, mBuf);
    return ROK;
 }
 
@@ -1347,10 +940,10 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrCfiCfg
+*     Func : cmPkRgrBwCfg
 *
 *
-*     Desc : Control Format Indicator (CFI) configuration per cell
+*     Desc : Bandwidth configuration per cell
 *
 *
 *     Ret  : S16
@@ -1360,291 +953,27 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrCfiCfg
+S16 cmPkRgrBwCfg
 (
-RgrCfiCfg *param,
+RgrBwCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfiCfg(param, mBuf)
-RgrCfiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->cfi, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf);
    return ROK;
 }
 
 
-
-/***********************************************************
-*
-*     Func : cmPkRgrPuschSubBandCfg
-*
-*
-*     Desc : PUSCH sub-band configuration per cell
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrPuschSubBandCfg
+#ifdef EMTC_ENABLE 
+/* EMTC related pack changes start*/
+
+S16 cmPkRgrEmtcSiCfg
 (
-RgrPuschSubBandCfg *param,
+RgrEmtcSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPuschSubBandCfg(param, mBuf)
-RgrPuschSubBandCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   S32 i;
-
-   for (i=param->numSubbands-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf);
-   }
-   CMCHKPK(oduUnpackUInt8, param->size, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numSubbands, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->subbandStart, mBuf);
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrPuschSubBandCfg
-*
-*
-*     Desc : PUSCH sub-band configuration per cell
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrPuschSubBandCfg
-(
-RgrPuschSubBandCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrPuschSubBandCfg(param, mBuf)
-RgrPuschSubBandCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   S32 i;
-
-   CMCHKUNPK(oduPackUInt8, &param->subbandStart, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numSubbands, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->size, mBuf);
-   for (i=0; i<param->numSubbands; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->dmrs[i], mBuf);
-   }
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmPkRgrUlCmnCodeRateCfg
-*
-*
-*     Desc : Uplink common channel code rate configuration per cell
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrUlCmnCodeRateCfg
-(
-RgrUlCmnCodeRateCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrUlCmnCodeRateCfg(param, mBuf)
-RgrUlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrUlCmnCodeRateCfg
-*
-*
-*     Desc : Uplink common channel code rate configuration per cell
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrUlCmnCodeRateCfg
-(
-RgrUlCmnCodeRateCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrUlCmnCodeRateCfg(param, mBuf)
-RgrUlCmnCodeRateCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   CMCHKUNPK(oduPackUInt8, &param->ccchCqi, mBuf);
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmPkRgrUlTrgCqiCfg
-*
-*
-*     Desc : Target Uplink CQI to achieve through group power control configured per cell
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrUlTrgCqiCfg
-(
-RgrUlTrgCqiCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrUlTrgCqiCfg(param, mBuf)
-RgrUlTrgCqiCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf);
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrUlTrgCqiCfg
-*
-*
-*     Desc : Target Uplink CQI to achieve through group power control configured per cell
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrUlTrgCqiCfg
-(
-RgrUlTrgCqiCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrUlTrgCqiCfg(param, mBuf)
-RgrUlTrgCqiCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   CMCHKUNPK(oduPackUInt8, &param->trgCqi, mBuf);
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmPkRgrBwCfg
-*
-*
-*     Desc : Bandwidth configuration per cell
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrBwCfg
-(
-RgrBwCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrBwCfg(param, mBuf)
-RgrBwCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf);
-   return ROK;
-}
-
-
-#ifdef EMTC_ENABLE 
-/* EMTC related pack changes start*/
-
-#ifdef ANSI
-S16 cmPkRgrEmtcSiCfg
-(
-RgrEmtcSiCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrEmtcSiCfg(param, mBuf)
-RgrEmtcSiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1690,17 +1019,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcRachCfg
 (
 RgrEmtcRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcRachCfg(param, mBuf)
-RgrEmtcRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1720,17 +1043,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPdschCfg
 (
 RgrEmtcPdschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPdschCfg(param, mBuf)
-RgrEmtcPdschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf);
@@ -1739,17 +1056,11 @@ Buffer *mBuf;
  return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPuschCfg
 (
 RgrEmtcPuschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPuschCfg(param, mBuf)
-RgrEmtcPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf);
    CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf);
@@ -1759,24 +1070,18 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPucchCfg
 (
 RgrEmtcPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPucchCfg(param, mBuf)
-RgrEmtcPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-
-   for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) {
+   for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) 
+   {
    	  CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf);
-  	}
+   }
 
  	CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf);
  	CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf);
@@ -1787,17 +1092,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPrachCeParamCfg
 (
 RgrEmtcPrachCEParamLst *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPrachCeParamCfg(param, mBuf)
-RgrEmtcPrachCEParamLst *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf);
    CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf);
@@ -1814,17 +1113,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcPrachCfg
 (
 RgrEmtcPrachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcPrachCfg(param, mBuf)
-RgrEmtcPrachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1841,17 +1134,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmPkRgrEmtcCfg
 (
 RgrEmtcCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrEmtcCfg(param, mBuf)
-RgrEmtcCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
    CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf);
@@ -1874,31 +1161,27 @@ Buffer *mBuf;
 
 /* EMTC related unpack changes start*/
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcSiCfg
 (
 RgrEmtcSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcSiCfg(param, mBuf)
-RgrEmtcSiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
      S32 i;
-     U32 tmpEnum; 
-     		 CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf); 
+     uint32_t tmpEnum; 
+     CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf); 
 
-	  for (i=0; i < param->numSi ; i++) {
-   	  	 CMCHKUNPK(oduPackUInt32,(U32*)&tmpEnum,mBuf);
-	  		 param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum;
+     for (i=0; i < param->numSi ; i++) 
+     {
+     	 CMCHKUNPK(oduPackUInt32,(uint32_t*)&tmpEnum,mBuf);
+	 param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum;
      }   
 
-     for (i=0; i < param->numSi ; i++) {
-   		 CMCHKUNPK(oduPackUInt16, &param->schdInfo[i].emtcSiTbs, mBuf);
-   		 CMCHKUNPK(oduPackUInt8, &param->schdInfo[i].emtcSiNarrowBand, mBuf);
+     for (i=0; i < param->numSi ; i++)
+     {
+   	 CMCHKUNPK(oduPackUInt16, &param->schdInfo[i].emtcSiTbs, mBuf);
+   	 CMCHKUNPK(oduPackUInt8, &param->schdInfo[i].emtcSiNarrowBand, mBuf);
      }
      //CMCHKUNPK(oduPackUInt16, &param->fddDlOrTddSfBitmapBR, mBuf);
      CMCHKUNPK(oduPackUInt8, &param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
@@ -1918,7 +1201,7 @@ Buffer *mBuf;
      CMCHKUNPK(oduPackUInt8, &param->siRepetition, mBuf);
      CMCHKUNPK(oduPackUInt8, &param->sib1Repetition, mBuf);
      CMCHKUNPK(oduPackUInt8, &param->siWinSizeBr, mBuf);
-     CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf);
+     CMCHKUNPK(oduPackUInt32, (uint32_t*)&tmpEnum, mBuf);
      param->modPrd = (RgrModPeriodicity) tmpEnum;
      CMCHKUNPK(oduPackUInt8, &param->siHoppingEnable, mBuf);
 
@@ -1928,17 +1211,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcRachCfg
 (
 RgrEmtcRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcRachCfg(param, mBuf)
-RgrEmtcRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -1955,17 +1232,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPdschCfg
 (
 RgrEmtcPdschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPdschCfg(param, mBuf)
-RgrEmtcPdschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeB, mBuf);
@@ -1973,17 +1244,11 @@ Buffer *mBuf;
  return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPuschCfg
 (
 RgrEmtcPuschCfg*param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPuschCfg(param, mBuf)
-RgrEmtcPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8,  &param->emtcHoppingOffset, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeB, mBuf);
@@ -1993,17 +1258,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPucchCfg
 (
 RgrEmtcPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPucchCfg(param, mBuf)
-RgrEmtcPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2021,17 +1280,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPrachCeParamCfg
 (
 RgrEmtcPrachCEParamLst *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPrachCeParamCfg(param, mBuf)
-RgrEmtcPrachCEParamLst *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8,  &param->emtcPrachHoppingCfg, mBuf);  
    CMCHKUNPK(oduPackUInt16, &param->emtcMpdcchNumRep, mBuf);
@@ -2048,17 +1301,11 @@ Buffer *mBuf;
 
 
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcPrachCfg
 (
 RgrEmtcPrachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcPrachCfg(param, mBuf)
-RgrEmtcPrachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2072,17 +1319,11 @@ Buffer *mBuf;
  return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkRgrEmtcCfg
 (
 RgrEmtcCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcCfg(param, mBuf)
-RgrEmtcCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->emtcPuschNbIdx, mBuf);
@@ -2127,17 +1368,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrBwCfg
 (
 RgrBwCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrBwCfg(param, mBuf)
-RgrBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->dlTotalBw, mBuf);
@@ -2162,17 +1397,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPhichCfg
 (
 RgrPhichCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPhichCfg(param, mBuf)
-RgrPhichCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf);
@@ -2197,22 +1426,16 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPhichCfg
 (
 RgrPhichCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPhichCfg(param, mBuf)
-RgrPhichCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ngEnum = (RgrPhichNg) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->isDurExtend, mBuf);
    return ROK;
@@ -2235,17 +1458,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPucchCfg
 (
 RgrPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPucchCfg(param, mBuf)
-RgrPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf);
@@ -2274,20 +1491,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPucchCfg
 (
 RgrPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPucchCfg(param, mBuf)
-RgrPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->resourceSize, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->n1PucchAn, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->deltaShift, mBuf);
@@ -2314,17 +1524,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSrsCfg
 (
 RgrSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSrsCfg(param, mBuf)
-RgrSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2352,25 +1556,18 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSrsCfg
 (
 RgrSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSrsCfg(param, mBuf)
-RgrSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-
+   uint32_t tmpEnum;
 
    CMCHKUNPK(oduPackUInt8, &param->isSrsCfgSetup, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsBwEnum = (RgrSrsBwCfg) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->srsSubFrameCfg, mBuf);
    return ROK;
@@ -2393,17 +1590,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrRachCfg
 (
 RgrRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrRachCfg(param, mBuf)
-RgrRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2445,19 +1636,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrRachCfg
 (
 RgrRachCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrRachCfg(param, mBuf)
-RgrRachCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
    S32 i;
 #ifdef RGR_V1 
@@ -2468,7 +1653,7 @@ Buffer *mBuf;
    CMCHKUNPK(oduPackUInt8, &param->preambleFormat, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->raWinSize, mBuf);
       CMCHKUNPK(oduPackUInt8, &param->raOccasion.size, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->raOccasion.sfnEnum = (RgrRaSfn) tmpEnum;
       for (i=0; i<param->raOccasion.size; i++) {
          CMCHKUNPK(oduPackUInt8, &param->raOccasion.subFrameNum[i], mBuf);
@@ -2498,17 +1683,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSiCfg
 (
 RgrSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSiCfg(param, mBuf)
-RgrSiCfg *param;
-Buffer *mBuf;
-#endif
 {
    /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */
 #ifdef RGR_SI_SCH
@@ -2523,12 +1702,12 @@ Buffer *mBuf;
                        sizeof(param->siPeriodicity[0]);
 
    for (idx=param->numSi-1; idx >= 0; idx--) {
-   /* Enum to be packed/unpacked as U32 instead of S32 */
+   /* Enum to be packed/unpacked as uint32_t instead of S32 */
       CMCHKPK(oduUnpackUInt32, param->siPeriodicity[idx], mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->numSi, mBuf);
    /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/
-   CMCHKPK(oduUnpackUInt32, (U32)param->modPrd, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->modPrd, mBuf);
 #endif/*RGR_SI_SCH*/
    CMCHKPK(oduUnpackUInt8, param->retxCnt, mBuf);
    CMCHKPK(oduUnpackUInt8, param->siWinSize, mBuf);
@@ -2552,19 +1731,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSiCfg
 (
 RgrSiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSiCfg(param, mBuf)
-RgrSiCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
    /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */
 #ifdef RGR_SI_SCH
    S16 idx;
@@ -2575,7 +1748,7 @@ Buffer *mBuf;
    CMCHKUNPK(oduPackUInt8, &param->retxCnt, mBuf);
 #ifdef RGR_SI_SCH
    /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->modPrd = (RgrModPeriodicity) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf);
 
@@ -2584,9 +1757,9 @@ Buffer *mBuf;
       param->numSi = sizeof(param->siPeriodicity)/
                        sizeof(param->siPeriodicity[0]);
 
-   /* Enum to be packed/unpacked as U32 instead of S32 */
+   /* Enum to be packed/unpacked as uint32_t instead of S32 */
    for (idx=0; idx < param->numSi; idx++) {
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->siPeriodicity[idx] = (RgrSiPeriodicity) tmpEnum;
    }
 #endif/*RGR_SI_SCH*/
@@ -2611,17 +1784,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTpcRntiCfg
 (
 RgrTpcRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrTpcRntiCfg(param, mBuf)
-RgrTpcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2647,17 +1814,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTpcRntiCfg
 (
 RgrTpcRntiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTpcRntiCfg(param, mBuf)
-RgrTpcRntiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2683,20 +1844,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlPwrCfg
 (
 RgrUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlPwrCfg(param, mBuf)
-RgrUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkRgrTpcRntiCfg, &param->puschPwrFmt3a, mBuf);
    CMCHKPK(cmPkRgrTpcRntiCfg, &param->puschPwrFmt3, mBuf);
    CMCHKPK(cmPkRgrTpcRntiCfg, &param->pucchPwrFmt3a, mBuf);
@@ -2725,23 +1879,17 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlPwrCfg
 (
 RgrUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlPwrCfg(param, mBuf)
-RgrUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(SUnpkS8, &param->p0NominalPusch, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->alpha = (RgrPwrAlpha) tmpEnum;
    CMCHKUNPK(SUnpkS8, &param->p0NominalPucch, mBuf);
    CMCHKUNPK(SUnpkS8, &param->deltaPreambleMsg3, mBuf);
@@ -2769,17 +1917,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPuschCfg
 (
 RgrPuschCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPuschCfg(param, mBuf)
-RgrPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2806,17 +1948,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPuschCfg
 (
 RgrPuschCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPuschCfg(param, mBuf)
-RgrPuschCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2843,17 +1979,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCodeBookRstCfg
 (
 RgrCodeBookRstCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCodeBookRstCfg(param, mBuf)
-RgrCodeBookRstCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2882,17 +2012,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCodeBookRstCfg
 (
 RgrCodeBookRstCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCodeBookRstCfg(param, mBuf)
-RgrCodeBookRstCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -2921,17 +2045,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrPreambleSetCfg
 (
 RgrPreambleSetCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrPreambleSetCfg(param, mBuf)
-RgrPreambleSetCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2958,17 +2076,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrPreambleSetCfg
 (
 RgrPreambleSetCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrPreambleSetCfg(param, mBuf)
-RgrPreambleSetCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -2995,20 +2107,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCmnLchCfg
 (
 RgrCmnLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCmnLchCfg(param, mBuf)
-RgrCmnLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf);
    CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf);
    CMCHKPK(oduUnpackUInt8, param->dir, mBuf);
@@ -3034,17 +2139,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCmnLchCfg
 (
 RgrCmnLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCmnLchCfg(param, mBuf)
-RgrCmnLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3073,17 +2172,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDlfsCfg
 (
 RgrDlfsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlfsCfg(param, mBuf)
-RgrDlfsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3109,17 +2202,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDlfsCfg
 (
 RgrDlfsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlfsCfg(param, mBuf)
-RgrDlfsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3149,17 +2236,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTddPrachInfo
 (
 RgrTddPrachInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrTddPrachInfo(param, mBuf)
-RgrTddPrachInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3187,23 +2268,17 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTddPrachInfo
 (
 RgrTddPrachInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTddPrachInfo(param, mBuf)
-RgrTddPrachInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->freqIdx, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->sfn = tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->halfFrm, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ulStartSfIdx, mBuf);
@@ -3227,17 +2302,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrTddPrachRscInfo
 (
 RgrTddPrachRscInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrTddPrachRscInfo(param, mBuf)
-RgrTddPrachRscInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -3266,17 +2335,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrTddPrachRscInfo
 (
 RgrTddPrachRscInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrTddPrachRscInfo(param, mBuf)
-RgrTddPrachRscInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -3309,17 +2372,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrEnbPfs
 (
 RgrEnbPfs  *param,
 Buffer    *mBuf
 )
-#else
-S16 cmPkRgrEnbPfs(param, mBuf)
-RgrEnbPfs  *param;
-Buffer    *mBuf;
-#endif
 {
    S32 idx;
    for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--)
@@ -3349,17 +2406,11 @@ Buffer    *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrEnbPfs
 (
 RgrEnbPfs *param,
 Buffer   *mBuf
 )
-#else
-S16 cmUnpkRgrEnbPfs(param, mBuf)
-RgrEnbPfs *param;
-Buffer *mBuf;
-#endif
 {
    S32 idx;
 
@@ -3390,17 +2441,11 @@ TODO: Check if this is to be added to re-configuration as well
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSpsCellCfg
 (
 RgrSpsCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSpsCellCfg(param, mBuf)
-RgrSpsCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf);
@@ -3428,17 +2473,11 @@ TODO: Check if this is to be added to re-configuration as well
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSpsDlCellCfg
 (
 RgrSpsCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSpsDlCellCfg(param, mBuf)
-RgrSpsCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3460,7 +2499,7 @@ Buffer           *mBuf
    for (idx = MAX_5GTF_SUBFRAME_INFO - 1; idx >= 0 ;--idx)
    {
 
-      CMCHKPK(oduUnpackUInt32, param->dynConfig[(U8)idx], mBuf);
+      CMCHKPK(oduUnpackUInt32, param->dynConfig[(uint8_t)idx], mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->uePerGrp, mBuf);
    CMCHKPK(oduUnpackUInt8, param->ueGrpPerTti, mBuf);
@@ -3488,7 +2527,7 @@ Buffer           *mBuf
    for (idx = 0; idx < MAX_5GTF_SUBFRAME_INFO ; ++idx)
    {
 
-      CMCHKUNPK(oduPackUInt32, &param->dynConfig[(U8)idx], mBuf);
+      CMCHKUNPK(oduPackUInt32, &param->dynConfig[(uint8_t)idx], mBuf);
    }
    return ROK;
 }
@@ -3511,17 +2550,11 @@ Buffer           *mBuf
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkRgrLteUCellCfg
+static S16 cmPkRgrLteUCellCfg
 (
 RgrLteUCfg *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRgrLteUCellCfg(param, mBuf)
-RgrLteUCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf);
@@ -3544,17 +2577,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnpkRgrLteUCellCfg
+static S16 cmUnpkRgrLteUCellCfg
 (
 RgrLteUCfg *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRgrLteUCellCfg(param, mBuf)
-RgrLteUCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -3579,17 +2606,11 @@ Buffer *mBuf;
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLteAdvancedUeConfig
 (
- RgrLteAdvancedUeConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrLteAdvancedUeConfig(param, mBuf)
-   RgrLteAdvancedUeConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedUeConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf);
@@ -3613,17 +2634,11 @@ S16 cmPkRgrLteAdvancedUeConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLteAdvancedUeConfig
 (
- RgrLteAdvancedUeConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf)
-   RgrLteAdvancedUeConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedUeConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKUNPK(oduPackUInt32, &param->pres, mBuf);
@@ -3647,24 +2662,18 @@ S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrAbsConfig
 (
- RgrAbsConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrAbsConfig(param, mBuf)
-   RgrAbsConfig *param;
-   Buffer *mBuf;
-#endif
+RgrAbsConfig *param,
+Buffer *mBuf
+)
 {
    S8   indx = 0;
 
-   CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
    for (indx = RGR_ABS_PATTERN_LEN-1; indx >= 0; indx--) 
    {
-      CMCHKPK(oduUnpackUInt8, param->absPattern[(U8)indx], mBuf);
+      CMCHKPK(oduUnpackUInt8, param->absPattern[(uint8_t)indx], mBuf);
    }
 
    CMCHKPK(oduUnpackUInt32, param->absPatternType, mBuf);
@@ -3688,20 +2697,14 @@ S16 cmPkRgrAbsConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSfrConfig
 (
- RgrSfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrSfrConfig(param, mBuf)
-   RgrSfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrSfrConfig *param,
+Buffer *mBuf
+)
 {
 
-   CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
 #ifdef TFU_UPGRADE   
    CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pHigh, mBuf);
    CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pLow, mBuf);
@@ -3729,20 +2732,14 @@ S16 cmPkRgrSfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDsfrConfig
 (
- RgrDsfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrDsfrConfig(param, mBuf)
-   RgrDsfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrDsfrConfig *param,
+Buffer *mBuf
+)
 {
 
-   CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
 
    return ROK;
 
@@ -3764,20 +2761,14 @@ S16 cmPkRgrDsfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDsfrConfig
 (
- RgrDsfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrDsfrConfig(param, mBuf)
-   RgrDsfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrDsfrConfig *param,
+Buffer *mBuf
+)
 {
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->status, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->status, mBuf);
    return ROK;
 
 }
@@ -3798,17 +2789,12 @@ S16 cmUnpkRgrDsfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
+
 S16 cmPkRgrCellLteAdvancedFeatureCfg
 (
- RgrLteAdvancedCellConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf)
-   RgrLteAdvancedCellConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedCellConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKPK(oduUnpackUInt32, param->pres, mBuf);
@@ -3836,17 +2822,11 @@ S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrAbsConfig
 (
- RgrAbsConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrAbsConfig(param, mBuf)
-   RgrAbsConfig *param;
-   Buffer *mBuf;
-#endif
+RgrAbsConfig *param,
+Buffer *mBuf
+)
 {
 
    S8 indx = 0;
@@ -3855,9 +2835,9 @@ S16 cmUnpkRgrAbsConfig(param, mBuf)
    CMCHKUNPK(oduPackUInt32, &param->absPatternType, mBuf);
    for (indx = 0; indx <RGR_ABS_PATTERN_LEN; indx++) 
    {
-      CMCHKUNPK(oduPackUInt8, &param->absPattern[(U8)indx], mBuf);
+      CMCHKUNPK(oduPackUInt8, &param->absPattern[(uint8_t)indx], mBuf);
    }
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->status, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->status, mBuf);
 
    return ROK;
 
@@ -3878,27 +2858,21 @@ S16 cmUnpkRgrAbsConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSfrConfig
 (
- RgrSfrConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrSfrConfig(param, mBuf)
-   RgrSfrConfig *param;
-   Buffer *mBuf;
-#endif
+RgrSfrConfig *param,
+Buffer *mBuf
+)
 {
 
 
    CMCHKUNPK(oduPackUInt8, &param->cellEdgeRbRange.startRb, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->cellEdgeRbRange.endRb, mBuf);
 #ifdef TFU_UPGRADE   
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->pwrThreshold.pLow, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->pwrThreshold.pHigh, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pwrThreshold.pLow, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pwrThreshold.pHigh, mBuf);
 #endif   
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->status, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->status, mBuf);
 
    return ROK;
 }
@@ -3918,17 +2892,11 @@ S16 cmUnpkRgrSfrConfig(param, mBuf)
  *     File  : 
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellLteAdvancedFeatureCfg
 (
- RgrLteAdvancedCellConfig *param,
- Buffer *mBuf
- )
-#else
-S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf)
-   RgrLteAdvancedCellConfig *param;
-   Buffer *mBuf;
-#endif
+RgrLteAdvancedCellConfig *param,
+Buffer *mBuf
+)
 {
 
    CMCHKUNPK(cmUnpkRgrAbsConfig, &param->absCfg, mBuf);
@@ -3954,17 +2922,11 @@ S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf)
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkMacSchedGnbCfg
 (
 MacSchedGnbCfg *param,
 Buffer         *mBuf
 )
-#else
-S16 cmPkMacSchedGnbCfg(param, mBuf)
-RgrSchedEnbCfg *param;
-Buffer         *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf);
@@ -3991,17 +2953,11 @@ Buffer         *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkMacSchedGnbCfg
 (
 MacSchedGnbCfg *param,
 Buffer         *mBuf
 )
-#else
-S16 cmUnpkMacSchedGnbCfg(param, mBuf)
-MacSchedGnbCfg *param;
-Buffer         *mBuf;
-#endif
 {
 
 
@@ -4030,17 +2986,11 @@ Buffer         *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellCfg
 (
 RgrCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellCfg(param, mBuf)
-RgrCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -4154,17 +3104,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellCfg
 (
 RgrCellCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellCfg(param, mBuf)
-RgrCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -4240,7 +3184,7 @@ Buffer *mBuf;
    CMCHKPK(oduPackUInt16, &param->phichTxPwrOffset, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->isDynCfiEnb, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->isAutoCfgModeEnb, mBuf);
-   CMCHKPK(oduPackUInt32, (U32*)&param->msg4pAVal, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t*)&param->msg4pAVal, mBuf);
    /*LAA: Unpack LAA Cell params*/
    CMCHKUNPK(cmUnpkRgrLteUCellCfg, &param->lteUCfg, mBuf);
    #ifdef LTE_ADV
@@ -4269,17 +3213,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeAprdDlCqiCfg
 (
 RgrUeAprdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeAprdDlCqiCfg(param, mBuf)
-RgrUeAprdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    /*Pack Aperiodic Trigger List only for Pcell */
@@ -4310,23 +3248,17 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeAprdDlCqiCfg
 (
 RgrUeAprdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeAprdDlCqiCfg(param, mBuf)
-RgrUeAprdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->aprdModeEnum = (RgrAprdCqiMode) tmpEnum;
 
 #ifdef LTE_ADV
@@ -4357,17 +3289,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4398,25 +3324,19 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdModeEnum = tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdicityEnum = tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->subframeOffst, mBuf);
    CMCHKUNPK(SUnpkS8, &param->cqiOffst, mBuf);
@@ -4445,17 +3365,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDlPCqiSetup
 (
 RgrUeDlPCqiSetup *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeDlPCqiSetup(param, mBuf)
-RgrUeDlPCqiSetup *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4488,19 +3402,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDlPCqiSetup
 (
 RgrUeDlPCqiSetup *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeDlPCqiSetup(param, mBuf)
-RgrUeDlPCqiSetup *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt16, &param->cqiPResIdx, mBuf);
@@ -4511,7 +3419,7 @@ Buffer *mBuf;
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
    CMCHKUNPK(oduPackUInt16, &param->riCfgIdx, mBuf); 
    CMCHKUNPK(oduPackUInt8, &param->sANCQI, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdModeEnum = (RgrPrdCqiMode) tmpEnum;
    return ROK;
 }
@@ -4533,17 +3441,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4569,17 +3471,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePrdDlCqiCfg
 (
 RgrUePrdDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf)
-RgrUePrdDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4606,17 +3502,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlSrsSetupCfg
 (
 RgrUeUlSrsSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlSrsSetupCfg(param, mBuf)
-RgrUeUlSrsSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4650,28 +3540,22 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlSrsSetupCfg
 (
 RgrUeUlSrsSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlSrsSetupCfg(param, mBuf)
-RgrUeUlSrsSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
    CMCHKUNPK(oduPackUInt16, &param->srsCfgIdx, mBuf); 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsBw = (RgrUlSrsBwInfo) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsHopBw = (RgrUlSrsHoBwInfo) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->cycShift = (RgrUlSrsCycShiftInfo) tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->duration, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->sANSrs, mBuf);
@@ -4697,17 +3581,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSrSetupCfg
 (
 RgrUeSrSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSrSetupCfg(param, mBuf)
-RgrUeSrSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4735,17 +3613,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSrSetupCfg
 (
 RgrUeSrSetupCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSrSetupCfg(param, mBuf)
-RgrUeSrSetupCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt16, &param->srResIdx, mBuf);
@@ -4772,17 +3644,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSrCfg
 (
 RgrUeSrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSrCfg(param, mBuf)
-RgrUeSrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4808,17 +3674,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSrCfg
 (
 RgrUeSrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSrCfg(param, mBuf)
-RgrUeSrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4845,17 +3705,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlSrsCfg
 (
 RgrUeUlSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlSrsCfg(param, mBuf)
-RgrUeUlSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4883,17 +3737,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlSrsCfg
 (
 RgrUeUlSrsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlSrsCfg(param, mBuf)
-RgrUeUlSrsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4922,17 +3770,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDlCqiCfg
 (
 RgrUeDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeDlCqiCfg(param, mBuf)
-RgrUeDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4967,17 +3809,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDlCqiCfg
 (
 RgrUeDlCqiCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeDlCqiCfg(param, mBuf)
-RgrUeDlCqiCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5003,17 +3839,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeMeasGapCfg
 (
 RgrUeMeasGapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeMeasGapCfg(param, mBuf)
-RgrUeMeasGapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5040,17 +3870,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeMeasGapCfg
 (
 RgrUeMeasGapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeMeasGapCfg(param, mBuf)
-RgrUeMeasGapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5077,17 +3901,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDrxLongCycleOffst
 (
 RgrDrxLongCycleOffst *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDrxLongCycleOffst(param, mBuf)
-RgrDrxLongCycleOffst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5113,17 +3931,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDrxLongCycleOffst
 (
 RgrDrxLongCycleOffst *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDrxLongCycleOffst(param, mBuf)
-RgrDrxLongCycleOffst *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5149,17 +3961,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDrxShortDrx
 (
 RgrDrxShortDrx *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDrxShortDrx(param, mBuf)
-RgrDrxShortDrx *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5186,17 +3992,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDrxShortDrx
 (
 RgrDrxShortDrx *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDrxShortDrx(param, mBuf)
-RgrDrxShortDrx *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5221,17 +4021,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDrxCfg
 (
 RgrUeDrxCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeDrxCfg(param, mBuf)
-RgrUeDrxCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5270,17 +4064,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDrxCfg
 (
 RgrUeDrxCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeDrxCfg(param, mBuf)
-RgrUeDrxCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5319,17 +4107,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCapCfg
 (
 RgrUeCapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCapCfg(param, mBuf)
-RgrUeCapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5358,17 +4140,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCapCfg
 (
 RgrUeCapCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCapCfg(param, mBuf)
-RgrUeCapCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5397,17 +4173,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeAckNackRepCfg
 (
 RgrUeAckNackRepCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeAckNackRepCfg(param, mBuf)
-RgrUeAckNackRepCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5434,24 +4204,18 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeAckNackRepCfg
 (
 RgrUeAckNackRepCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeAckNackRepCfg(param, mBuf)
-RgrUeAckNackRepCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->isAckNackEnabled, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->pucchAckNackRep, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ackNackRepFactor = (RgrAckNackRepFactor) tmpEnum;
    return ROK;
 }
@@ -5473,17 +4237,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeTxModeCfg
 (
 RgrUeTxModeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeTxModeCfg(param, mBuf)
-RgrUeTxModeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5511,26 +4269,20 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeTxModeCfg
 (
 RgrUeTxModeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeTxModeCfg(param, mBuf)
-RgrUeTxModeCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->tmTrnstnState = (RgrTxModeTrnstn) tmpEnum;
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->txModeEnum = (RgrTxMode) tmpEnum;
    return ROK;
 }
@@ -5552,17 +4304,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlHqCfg
 (
 RgrUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlHqCfg(param, mBuf)
-RgrUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5588,17 +4334,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlHqCfg
 (
 RgrUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlHqCfg(param, mBuf)
-RgrUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5624,17 +4364,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeGrpPwrCfg
 (
 RgrUeGrpPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeGrpPwrCfg(param, mBuf)
-RgrUeGrpPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5661,17 +4395,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeGrpPwrCfg
 (
 RgrUeGrpPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeGrpPwrCfg(param, mBuf)
-RgrUeGrpPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5699,17 +4427,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSpsDlCfg
 (
 RgrUeSpsDlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSpsDlCfg(param, mBuf)
-RgrUeSpsDlCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -5741,19 +4463,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSpsDlCfg
 (
 RgrUeSpsDlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSpsDlCfg(param, mBuf)
-RgrUeSpsDlCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
    S32 i;
 
@@ -5763,7 +4479,7 @@ Buffer *mBuf;
    for (i=0; i<param->numPucchVal; i++) {
       CMCHKUNPK(oduPackUInt32, &param->n1PucchVal[i], mBuf);
    }
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->dlSpsPrdctyEnum = tmpEnum;
    CMCHKUNPK(oduPackUInt16, &param->explicitRelCnt, mBuf);
    return ROK;
@@ -5786,17 +4502,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSpsUlCfg
 (
 RgrUeSpsUlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSpsUlCfg(param, mBuf)
-RgrUeSpsUlCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -5840,24 +4550,18 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSpsUlCfg
 (
 RgrUeSpsUlCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSpsUlCfg(param, mBuf)
-RgrUeSpsUlCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
    S32 i;
 
    CMCHKUNPK(oduPackUInt8, &param->isUlSpsEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->implicitRelCnt = tmpEnum;
 
 #ifdef LTE_TDD
@@ -5867,7 +4571,7 @@ Buffer *mBuf;
    CMCHKUNPK(oduPackUInt8, &param->pwrCfgPres, mBuf);
       CMCHKUNPK(SUnpkS8, &param->pwrCfg.p0NominalPuschVal, mBuf);
       CMCHKUNPK(SUnpkS8, &param->pwrCfg.p0UePuschVal, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ulSpsPrdctyEnum = tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->lcCnt, mBuf); 
    for (i=0; i<param->lcCnt; i++) {
@@ -5895,17 +4599,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSpsCfg
 (
 RgrUeSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSpsCfg(param, mBuf)
-RgrUeSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5932,17 +4630,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSpsCfg
 (
 RgrUeSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSpsCfg(param, mBuf)
-RgrUeSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5968,17 +4660,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeUlPwrCfg
 (
 RgrUeUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeUlPwrCfg(param, mBuf)
-RgrUeUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6010,17 +4696,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeUlPwrCfg
 (
 RgrUeUlPwrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeUlPwrCfg(param, mBuf)
-RgrUeUlPwrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6052,17 +4732,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeQosCfg
 (
 RgrUeQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeQosCfg(param, mBuf)
-RgrUeQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6089,17 +4763,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeQosCfg
 (
 RgrUeQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeQosCfg(param, mBuf)
-RgrUeQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6124,17 +4792,11 @@ Buffer *mBuf;
 *     File  :  
 * 
 **********************************************************/ 
-#ifdef ANSI 
 S16 cmPkRgrUePuschDedCfg 
 ( 
 RgrUePuschDedCfg *param, 
 Buffer *mBuf 
 ) 
-#else 
-S16 cmPkRgrUePuschDedCfg(param, mBuf) 
-RgrUePuschDedCfg *param; 
-Buffer *mBuf; 
-#endif 
 { 
  
  
@@ -6162,17 +4824,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePuschDedCfg
 (
 RgrUePuschDedCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePuschDedCfg(param, mBuf)
-RgrUePuschDedCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6198,17 +4854,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeTxAntSelCfg
 (
 RgrUeTxAntSelCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeTxAntSelCfg(param, mBuf)
-RgrUeTxAntSelCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6234,23 +4884,17 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeTxAntSelCfg
 (
 RgrUeTxAntSelCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeTxAntSelCfg(param, mBuf)
-RgrUeTxAntSelCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->selType = (RgrUeTxAntSelType) tmpEnum;
    return ROK;
 }
@@ -6271,17 +4915,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeTaTmrCfg
 (
 RgrUeTaTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeTaTmrCfg(param, mBuf)
-RgrUeTaTmrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6307,17 +4945,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeTaTmrCfg
 (
 RgrUeTaTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeTaTmrCfg(param, mBuf)
-RgrUeTaTmrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6328,17 +4960,11 @@ Buffer *mBuf;
 
 
 #ifdef EMTC_ENABLE
-#ifdef ANSI
 S16 cmUnpkRgrEmtcUeCfg
 (
 RgrUeEmtcCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrEmtcUeCfg(param, mBuf)
-RgrUeEmtcCfg *param;
-Buffer *mBuf;
-#endif
 {
    S32 indx=0;
    S32 idx=0;
@@ -6363,8 +4989,8 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf);
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf);
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf);
-      CMCHKUNPK(cmUnpkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
-      CMCHKUNPK(cmUnpkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
+      CMCHKUNPK(cmUnpkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
+      CMCHKUNPK(cmUnpkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
       CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf);
       CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf);
       for(idx = 0; idx < 5; idx++)
@@ -6377,7 +5003,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->setConfigId),mBuf);
 
    }
-   CMCHKUNPK(cmUnpkTknU32,&(emtcEpdcchCfg->startSymbolr11),mBuf);
+   CMCHKUNPK(cmUnpkTknUInt32,&(emtcEpdcchCfg->startSymbolr11),mBuf);
    for(indx = 0; indx < 5; indx++)
    {
       CMCHKUNPK(oduPackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf);
@@ -6449,7 +5075,7 @@ S16 cmPkRgrEmtcUeCfg
    {
       CMCHKPK(oduUnpackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf);
    }
-   CMCHKPK(cmPkTknU32,&emtcEpdcchCfg->startSymbolr11,mBuf);
+   CMCHKPK(cmPkTknUInt32,&emtcEpdcchCfg->startSymbolr11,mBuf);
    for(indx = RGR_MAX_EPDCCH_SET-1 ; indx >= 0; indx--)
    {
       epdcchAddModLst =  &(emtcEpdcchCfg->epdcchAddModLst[indx]);
@@ -6463,8 +5089,8 @@ S16 cmPkRgrEmtcUeCfg
       }
       CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf);
       CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf);
-      CMCHKPK(cmPkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
-      CMCHKPK(cmPkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
+      CMCHKPK(cmPkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
+      CMCHKPK(cmPkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
       CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf);
       CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf);
       CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf);
@@ -6570,17 +5196,11 @@ S16 cmPkRgr5gtfUeCfg
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCfg
 (
 RgrUeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCfg(param, mBuf)
-RgrUeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef RG_5GTF
@@ -6627,7 +5247,7 @@ Buffer *mBuf;
    CMCHKPK(oduUnpackUInt32, param->ackNackModeEnum, mBuf);
 
 #endif
-   CMCHKPK(cmPkTknU8, &param->dedPreambleId, mBuf);
+   CMCHKPK(cmPkTknUInt8, &param->dedPreambleId, mBuf);
    CMCHKPK(cmPkRgrCodeBookRstCfg, &param->ueCodeBookRstCfg, mBuf);
    CMCHKPK(cmPkRgrUeCapCfg, &param->ueCapCfg, mBuf);
    CMCHKPK(cmPkRgrUeMeasGapCfg, &param->ueMesGapCfg, mBuf);
@@ -6676,19 +5296,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCfg
 (
 RgrUeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCfg(param, mBuf)
-RgrUeCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -6704,7 +5318,7 @@ Buffer *mBuf;
     * retxBSR-timer */
    CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, &param->ueBsrTmrCfg, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ueCatEnum = (CmLteUeCategory) tmpEnum;
 /*rgr_c_001.main_9 ADD added changes for DRX*/
    
@@ -6719,10 +5333,10 @@ Buffer *mBuf;
    CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, &param->ueMesGapCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrUeCapCfg, &param->ueCapCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, &param->ueCodeBookRstCfg, mBuf);
-   CMCHKUNPK(cmUnpkTknU8, &param->dedPreambleId, mBuf);
+   CMCHKUNPK(cmUnpkTknUInt8, &param->dedPreambleId, mBuf);
 
 #ifdef LTE_TDD
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ackNackModeEnum = tmpEnum;
 
 #endif
@@ -6751,7 +5365,7 @@ Buffer *mBuf;
    /* LTE_ADV_FLAG_REMOVED_START */
    CMCHKUNPK(cmUnpkRgrLteAdvancedUeConfig, &param->ueLteAdvCfg, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->accessStratumRls, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->csgMmbrSta, mBuf);
 
 #ifdef EMTC_ENABLE
@@ -6782,17 +5396,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchQosCfg
 (
 RgrLchQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchQosCfg(param, mBuf)
-RgrLchQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6819,17 +5427,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchQosCfg
 (
 RgrLchQosCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchQosCfg(param, mBuf)
-RgrLchQosCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6856,17 +5458,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchSpsCfg
 (
 RgrLchSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchSpsCfg(param, mBuf)
-RgrLchSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6892,17 +5488,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchSpsCfg
 (
 RgrLchSpsCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchSpsCfg(param, mBuf)
-RgrLchSpsCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6927,17 +5517,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDlLchCfg
 (
 RgrDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDlLchCfg(param, mBuf)
-RgrDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_7 - Added support for SPS*/
@@ -6966,17 +5550,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDlLchCfg
 (
 RgrDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDlLchCfg(param, mBuf)
-RgrDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7009,17 +5587,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlLchCfg
 (
 RgrUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlLchCfg(param, mBuf)
-RgrUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7046,17 +5618,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlLchCfg
 (
 RgrUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlLchCfg(param, mBuf)
-RgrUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7083,17 +5649,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUlLcgCfg
 (
 RgrUlLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlLcgCfg(param, mBuf)
-RgrUlLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_9 ADD added changes for L2 measurements*/
@@ -7132,17 +5692,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUlLcgCfg
 (
 RgrUlLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlLcgCfg(param, mBuf)
-RgrUlLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_9 ADD added changes for L2 measurements*/
@@ -7165,34 +5719,22 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkRgrUlLchQciCfg
 (
 RgrUlLchQciCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUlLchQciCfg (param, mBuf)
-RgrUlLchQciCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt8, param->lcId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
    return ROK;
 }
-#ifdef ANSI
 S16 cmUnpkRgrUlLchQciCfg
 (
 RgrUlLchQciCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUlLchQciCfg (param, mBuf)
-RgrUlLchQciCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->qci, mBuf);
@@ -7216,17 +5758,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchCfg
 (
 RgrLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchCfg(param, mBuf)
-RgrLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
@@ -7256,17 +5792,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchCfg
 (
 RgrLchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchCfg(param, mBuf)
-RgrLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7281,17 +5811,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrLcgCfg
 (
 RgrLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLcgCfg(param, mBuf)
-RgrLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7302,17 +5826,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrLcgCfg
 (
 RgrLcgCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLcgCfg(param, mBuf)
-RgrLcgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7339,17 +5857,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCfg
 (
 RgrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCfg(param, mBuf)
-RgrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7393,17 +5905,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCfg
 (
 RgrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCfg(param, mBuf)
-RgrCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7447,17 +5953,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrActvTime
 (
 RgrActvTime *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrActvTime(param, mBuf)
-RgrActvTime *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7483,17 +5983,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrActvTime
 (
 RgrActvTime *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrActvTime(param, mBuf)
-RgrActvTime *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7519,17 +6013,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellRecfg
 (
 RgrCellRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellRecfg(param, mBuf)
-RgrCellRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkRgrCellCntrlCmdCfg, &param->cntrlCmdCfg, mBuf);
@@ -7577,17 +6065,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellRecfg
 (
 RgrCellRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellRecfg(param, mBuf)
-RgrCellRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7637,17 +6119,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeRecfg
 (
 RgrUeRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeRecfg(param, mBuf)
-RgrUeRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef EMTC_ENABLE
@@ -7729,7 +6205,7 @@ Buffer *mBuf;
 
    CMCHKPK(cmPkRgrUeAprdDlCqiCfg, &param->aprdDlCqiRecfg, mBuf);
    CMCHKPK(cmPkRgrUeTxModeCfg, &param->txMode, mBuf);
-   /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */
+   /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */
    /* LTE_ADV_FLAG_REMOVED_START */
    /* KW fix for LTE_ADV */
    CMCHKPK(oduUnpackUInt32, param->ueRecfgTypes, mBuf);
@@ -7757,26 +6233,20 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeRecfg
 (
 RgrUeRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeRecfg(param, mBuf)
-RgrUeRecfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->oldCrnti, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->newCrnti, mBuf);
    /* LTE_ADV_FLAG_REMOVED_START */
-   /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */
+   /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */
    /* KW fix for LTE_ADV */
    CMCHKUNPK(oduPackUInt32, &param->ueRecfgTypes, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
@@ -7811,7 +6281,7 @@ Buffer *mBuf;
    CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, &param->ueMeasGapRecfg, mBuf);
    CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, &param->ueCodeBookRstRecfg, mBuf);
 /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ueCatEnum = (CmLteUeCategory) tmpEnum;
    CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, &param->ulTxAntSel, mBuf);
    /*rgr_c_001.main_7 - Added support for SPS*/
@@ -7850,7 +6320,7 @@ Buffer *mBuf;
    CMCHKUNPK(cmUnpkRgrUeSCellAckPucchCfg, &param->sCellAckN1ResCfg,mBuf);
    CMCHKUNPK(oduPackUInt8, &param->simulAckNackCQIFormat3, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->accessStratumRls, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
 
    CMCHKUNPK(oduPackUInt8, &param->csgMmbrSta, mBuf);
 #ifdef EMTC_ENABLE
@@ -7877,17 +6347,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLchRecfg
 (
 RgrLchRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLchRecfg(param, mBuf)
-RgrLchRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 /*rgr_c_001.main_7 - Added support for SPS*/
@@ -7920,17 +6384,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLchRecfg
 (
 RgrLchRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLchRecfg(param, mBuf)
-RgrLchRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7947,17 +6405,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmPkRgrLcgRecfg
 (
 RgrLcgRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLcgRecfg(param, mBuf)
-RgrLcgRecfg *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef RG_UNUSED
    S32 i;
@@ -7979,17 +6431,11 @@ Buffer *mBuf;
 }
 
 
-#ifdef ANSI
 S16 cmUnpkRgrLcgRecfg
 (
 RgrLcgRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLcgRecfg(param, mBuf)
-RgrLcgRecfg *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef RG_UNUSED
    S32 i;
@@ -8029,17 +6475,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrRecfg
 (
 RgrRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrRecfg(param, mBuf)
-RgrRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8080,17 +6520,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrRecfg
 (
 RgrRecfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrRecfg(param, mBuf)
-RgrRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8130,17 +6564,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeDlSecCellRelInfo
 (
 RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf)
-RgrUeDlSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
@@ -8162,22 +6590,16 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSecCellRelInfo
 (
 RgrUeSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSecCellRelInfo(param, mBuf)
-RgrUeSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkRgrUeDlSecCellRelInfo, &param->ueSCellRelDedCfg[(U8)idx],mBuf);
+      CMCHKPK(cmPkRgrUeDlSecCellRelInfo, &param->ueSCellRelDedCfg[(uint8_t)idx],mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
 
@@ -8201,17 +6623,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrDel
 (
 RgrDel *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrDel(param, mBuf)
-RgrDel *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8267,17 +6683,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeDlSecCellRelInfo
 (
 RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRgrUeDlSecCellRelInfo(param, mBuf)
-RgrUeDlSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
@@ -8300,19 +6710,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSecCellRelInfo
 (
 RgrUeSecCellRelInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSecCellRelInfo(param, mBuf)
-RgrUeSecCellRelInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
 
@@ -8339,17 +6743,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrDel
 (
 RgrDel *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrDel(param, mBuf)
-RgrDel *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -8401,17 +6799,11 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSonPrbCfg
 (
 RgrPrbCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSonPrbCfg(param, mBuf)
-RgrPrbCfg *param;
-Buffer *mBuf;
-#endif
 {
    S32 count;
    for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --)
@@ -8447,17 +6839,11 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSonPrbCfg
 (
 RgrPrbCfg   *param,
 Buffer      *mBuf
 )
-#else
-S16 cmUnpkRgrSonPrbCfg(param, mBuf)
-RgrPrbCfg   *param;
-Buffer      *mBuf;
-#endif
 {
    S32   count;
    CMCHKUNPK(oduPackUInt8, &param->isSonIcicEnable, mBuf);
@@ -8473,1001 +6859,87 @@ Buffer      *mBuf;
    }
    for(count = 0; count < RGR_SCH_MAX_PA_PER_PRB; count ++)
    {
-      CMCHKUNPK(oduPackUInt32,(U32 *) &param->paLevelPerPrb[count], mBuf);
-   }
-   return ROK;
-}
-/***********************************************************
-*
-*     Func : cmPkRgrSonCfg
-*
-*
-*     Desc : SON Configuration info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  :
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrSonCfg
-(
-RgrSonCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrSonCfg(param, mBuf)
-RgrSonCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   switch(param->cfgType)
-   {
-      case RGR_SON_PRB_CFG :
-      CMCHKPK(cmPkRgrSonPrbCfg, &param->u.prbCfg, mBuf);
-      break;
-      default :
-      return RFAILED;
-   }
-   CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf);
-   return ROK;
-}
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrSon
-*
-*
-*     Desc : SON configuration info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  :
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrSonCfg
-(
-RgrSonCfg   *param,
-Buffer      *mBuf
-)
-#else
-S16 cmUnpkRgrSonCfg(param, mBuf)
-RgrSonCfg   *param;
-Buffer      *mBuf;
-#endif
-{
-
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->cfgType, mBuf);
-   switch(param->cfgType)
-   {
-      case RGR_SON_PRB_CFG :
-      {
-         CMCHKUNPK(cmUnpkRgrSonPrbCfg, &param->u.prbCfg, mBuf);
-         break;
-         default :
-         return RFAILED;
-      }
-   }
-   return ROK;
-}
-
-
-/***********************************************************
-*
-*     Func : cmPkRgrRst
-*
-*
-*     Desc : UE RESET info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrRst
-(
-RgrRst *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrRst(param, mBuf)
-RgrRst *param;
-Buffer *mBuf;
-#endif
-{
-
-
-   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrRst
-*
-*
-*     Desc : UE RESET info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrRst
-(
-RgrRst *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrRst(param, mBuf)
-RgrRst *param;
-Buffer *mBuf;
-#endif
-{
-
-
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   return ROK;
-}
-#ifdef LTE_ADV
-/***********************************************************
-*
-*     Func : cmUnPkRgrSCellActDeactInfo
-*
-*
-*     Desc : SCell Activation information of the UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnPkRgrSCellActDeactInfo
-(
-RgrSCellActDeactInfo *param,
-Buffer *mBuf
-)
-#else
-PRIVATE S16 cmUnPkRgrSCellActInfo(param, mBuf)
-RgrSCellActDeactInfo *param;
-Buffer *mBuf;
-#endif
-{
-
-   CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
-   return ROK;
-}
-
-/***********************************************************
-*
-*     Func : cmUnPkRgrSCellActDeactEvnt
-*
-*
-*     Desc : SCell Activation Configuration structure to SCH
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnPkRgrSCellActDeactEvnt
-(
-RgrSCellActDeactEvnt *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnPkRgrSCellActDeactEvnt(param, mBuf)
-RgrSCellActDeactEvnt *param;
-Buffer *mBuf;
-#endif
-{
-
-   U8 idx;
-
-   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numOfSCells, mBuf);
-
-   for(idx = 0; idx < param->numOfSCells;idx++)
-   {
-      CMCHKUNPK(cmUnPkRgrSCellActDeactInfo, &param->sCellActDeactInfo[idx],mBuf);
-   }
-
-   return ROK;
-}
-
-
-/***********************************************************
-*
-*     Func : cmPkRgrSCellActInfo
-*
-*
-*     Desc : SCell Activation information of the UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkRgrSCellActDeactInfo
-(
-RgrSCellActDeactInfo *param,
-Buffer *mBuf
-)
-#else
-PRIVATE S16 cmPkRgrSCellActDeactInfo(param, mBuf)
-RgrSCellActDeactInfo *param;
-Buffer *mBuf;
-#endif
-{
-
-   CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
-
-   return ROK;
-}
-
-/***********************************************************
-*
-*     Func : cmPkRgrSCellActDeactEvnt
-*
-*
-*     Desc : Basic Configuration structure at SCH
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrSCellActDeactEvnt
-(
-RgrSCellActDeactEvnt *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrSCellActDeactEvnt(param, mBuf)
-RgrSCellActDeactEvnt *param;
-Buffer *mBuf;
-#endif
-{
-
-
-   S8 idx;
-   for(idx = param->numOfSCells - 1; idx >= 0; idx--)
-   {
-      CMCHKPK(cmPkRgrSCellActDeactInfo, &param->sCellActDeactInfo[(U8)idx], mBuf);
-   }
-
-   CMCHKPK(oduUnpackUInt8, param->numOfSCells, mBuf);
-   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
-
-   return ROK;
-}
-
-
-#endif /* LTE_ADV */
-
-/***********************************************************
-*
-*     Func : cmPkRgrCfgReqInfo
-*
-*
-*     Desc : Basic RGR configuration/reconfiguration info at RRM
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrCfgReqInfo
-(
-RgrCfgReqInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrCfgReqInfo(param, mBuf)
-RgrCfgReqInfo *param;
-Buffer *mBuf;
-#endif
-{
-
-
-      switch(param->action) {
-         case RGR_SON_CFG:
-            CMCHKPK(cmPkRgrSonCfg, &param->u.sonCfg, mBuf);
-            break;
-         case RGR_RESET:
-            CMCHKPK(cmPkRgrRst, &param->u.rstInfo, mBuf);
-            break;
-         case RGR_DELETE:
-            CMCHKPK(cmPkRgrDel, &param->u.delInfo, mBuf);
-            break;
-         case RGR_RECONFIG:
-            CMCHKPK(cmPkRgrRecfg, &param->u.recfgInfo, mBuf);
-            break;
-         case SCH_CONFIG:
-            CMCHKPK(cmPkRgrCfg, &param->u.cfgInfo, mBuf);
-            break;
-#ifdef LTE_ADV
-         case RGR_SCELL_ACT:
-         case RGR_SCELL_DEACT:
-         case RGR_SCELL_READY:
-            CMCHKPK(cmPkRgrSCellActDeactEvnt, &param->u.sCellActDeactEvnt, mBuf);
-            break;
-#endif
-         default :
-            return RFAILED;
-      }
-   CMCHKPK(oduUnpackUInt8, param->action, mBuf);
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrCfgReqInfo
-*
-*
-*     Desc : Basic RGR configuration/reconfiguration info at RRM
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrCfgReqInfo
-(
-RgrCfgReqInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrCfgReqInfo(param, mBuf)
-RgrCfgReqInfo *param;
-Buffer *mBuf;
-#endif
-{
-
-
-   CMCHKUNPK(oduPackUInt8, &param->action, mBuf);
-      switch(param->action) {
-         case SCH_CONFIG:
-            CMCHKUNPK(cmUnpkRgrCfg, &param->u.cfgInfo, mBuf);
-            break;
-         case RGR_RECONFIG:
-            CMCHKUNPK(cmUnpkRgrRecfg, &param->u.recfgInfo, mBuf);
-            break;
-         case RGR_DELETE:
-            CMCHKUNPK(cmUnpkRgrDel, &param->u.delInfo, mBuf);
-            break;
-         case RGR_RESET:
-            CMCHKUNPK(cmUnpkRgrRst, &param->u.rstInfo, mBuf);
-            break;
-         case RGR_SON_CFG:
-            CMCHKUNPK(cmUnpkRgrSonCfg, &param->u.sonCfg, mBuf);
-            break;
-#ifdef LTE_ADV
-         case RGR_SCELL_ACT:
-         case RGR_SCELL_DEACT:
-         case RGR_SCELL_READY:
-            CMCHKUNPK(cmUnPkRgrSCellActDeactEvnt, &param->u.sCellActDeactEvnt, mBuf);
-            break;
-#endif /* LTE_ADV */
-         default :
-            return RFAILED;
-      }
-   return ROK;
-}
-#ifdef RGR_V1
-/* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and
- * retxBSR-timer */
-/***********************************************************
-*
-*     Func : cmPkRgrUeBsrTmrCfg
-*
-*
-*     Desc : BSR timer configuration per UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrUeBsrTmrCfg
-(
-RgrUeBsrTmrCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrUeBsrTmrCfg(param, mBuf)
-RgrUeBsrTmrCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-
-   CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isPrdBsrTmrPres, mBuf);
-   return ROK;
-}
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrUeBsrTmrCfg
-*
-*
-*     Desc : BSR timer configuration per UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrUeBsrTmrCfg
-(
-RgrUeBsrTmrCfg *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrUeBsrTmrCfg(param, mBuf)
-RgrUeBsrTmrCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-
-   CMCHKUNPK(oduPackUInt8, &param->isPrdBsrTmrPres, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->retxBsrTmr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->prdBsrTmr, mBuf);
-   return ROK;
-}
-#endif /* RGR_V1 */
-/* rgr_c_001.main_4-ADD-Added for SI Enhancement. */
-#ifdef RGR_SI_SCH
-/***********************************************************
-*
-*     Func : cmPkRgrSiCfgReq
-*
-*
-*     Desc : SI Configuration Request from RRM to MAC for 
-*            configuring SI
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrSiCfgReq
-(
-Pst* pst,
-SpId spId,
-RgrCfgTransId transId,
-RgrSiCfgReqInfo * cfgReqInfo
-)
-#else
-S16 cmPkRgrSiCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-RgrCfgTransId transId;
-RgrSiCfgReqInfo * cfgReqInfo;
-#endif
-{
-   Buffer *mBuf = NULLP;
-
-
-   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)ERGR045, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
-                 sizeof(RgrSiCfgReqInfo));
-      return RFAILED;
-   }
-   if (cmPkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR046, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
-                sizeof(RgrSiCfgReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR047, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
-               sizeof(RgrSiCfgReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (SPkS16(spId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR048, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
-               sizeof(RgrSiCfgReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
-               sizeof(RgrSiCfgReqInfo)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR049, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   pst->event = (Event) EVTRGRSICFGREQ;
-   return (SPstTsk(pst,mBuf));
-}
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrSiCfgReq
-*
-*
-*     Desc : SI Configuration Request from RRM to MAC for 
-*     configuring SI
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrSiCfgReq
-(
-RgrSiCfgReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrSiCfgReq(func, pst, mBuf)
-RgrSiCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
-{
-   SpId spId;
-   RgrCfgTransId transId;
-   RgrSiCfgReqInfo *cfgReqInfo;
-   
-
-   if (SUnpkS16(&spId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR050, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR051, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo,
-            sizeof(RgrSiCfgReqInfo))) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR052, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   memset(cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo));
-   if (pst->selector == ODU_SELECTOR_LC) 
-      if (cmUnpkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
-         SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
-                          sizeof(RgrSiCfgReqInfo));
-         SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-         SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-               __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-               (ErrVal)ERGR053, (ErrVal)0, "Packing failed");
-#endif
-         return RFAILED;
-      }
-   SPutMsg(mBuf);
-
-   return ((*func)(pst, spId, transId, cfgReqInfo));
-}
-
-/***********************************************************
-*
-*     Func : cmPkRgrSiCfgReqInfo
-*
-*
-*     Desc : Basic SI configuration/reconfiguration info at RRM
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrSiCfgReqInfo
-(
-RgrSiCfgReqInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmPkRgrSiCfgReqInfo(param, mBuf)
-RgrSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
-{
-  /* ccpu00111328: S16 is renamed as MsgLen */
-   MsgLen msgLen;
-
-
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   CMCHKPK(SPkS32, param->cfgType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->siId, mBuf);
-
-   if(NULLP != param->pdu)
-   {
-      if (SFndLenMsg(param->pdu, &msgLen) != ROK)
-         return RFAILED;
-      if (SCatMsg(mBuf, param->pdu, M1M2) != ROK)
-         return RFAILED;
-      SPutMsg(param->pdu);
-      CMCHKPK(cmPkMsgLen, msgLen, mBuf);
-   }
-   /*ccpu00140789*/
-   else
-   {
-      CMCHKPK(cmPkMsgLen, 0, mBuf);
-   }
-
-   return ROK;
-}
-
-/***********************************************************
-*
-*     Func : cmUnpkRgrSiCfgReqInfo
-*
-*
-*     Desc : Basic SI configuration/reconfiguration info at RRM
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrSiCfgReqInfo
-(
-RgrSiCfgReqInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkRgrSiCfgReqInfo(param, mBuf)
-RgrSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
-{
-   MsgLen  msgLen, totalMsgLen;
-   /*Merge from Mohit Changes*/
-   S32    cfgType;
-
-
-   SFndLenMsg(mBuf, &msgLen);
-   if(msgLen > 0)
-   {
-      CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
-      /*ccpu00140789*/
-      if(msgLen > 0)
-      {
-         if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
-            return RFAILED;
-         if (SSegMsg(mBuf, totalMsgLen-msgLen, &param->pdu) != ROK)
-            return RFAILED;
-      }
-      else
-      {
-         param->pdu = NULLP;
-      }
-   }
-
-   CMCHKUNPK(oduPackUInt8, &param->siId, mBuf);
-   /*CMCHKUNPK(SUnpkS32, (S32 *)&param->cfgType, mBuf);*/
-   /*Merge from Mohit Changes*/
-   CMCHKUNPK(SUnpkS32,(S32 *)&cfgType, mBuf);
-   param->cfgType = (RgrSiCfgType) cfgType;
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-
-   return ROK;
-}
-
-
-
-/***********************************************************
-*
-*     Func : cmPkRgrWarningSiCfgReq
-*
-*
-*     Desc : SI Configuration Request from RRM to MAC for 
-*            configuring warning SI
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-S16 cmPkRgrWarningSiCfgReq
-(
-Pst* pst,
-SpId spId,
-RgrCfgTransId transId,
-RgrWarningSiCfgReqInfo * warningSiCfgReqInfo
-)
-#else
-S16 cmPkRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo)
-Pst* pst;
-SpId spId;
-RgrCfgTransId transId;
-RgrWarningSiCfgReqInfo * warningSiCfgReqInfo;
-#endif
-{
-   Buffer *mBuf = NULLP;
-
-
-   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)ERGR061, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, 
-                 sizeof(RgrWarningSiCfgReqInfo));
-      return RFAILED;
-   }
-
-   if (cmPkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR062, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, 
-                sizeof(RgrWarningSiCfgReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR063, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, 
-               sizeof(RgrWarningSiCfgReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   if (SPkS16(spId, mBuf) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR064, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, 
-               sizeof(RgrWarningSiCfgReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   /* if the application wants to retain this structure, the below 
-    * code should be removed */
-   if (SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, 
-               sizeof(RgrWarningSiCfgReqInfo)) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR065, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   pst->event = (Event) EVTRGRWARNINGSICFGREQ;
-   return (SPstTsk(pst,mBuf));
-}/*cmPkRgrWarningSiCfgReq*/
-
-
+      CMCHKUNPK(oduPackUInt32,(uint32_t *) &param->paLevelPerPrb[count], mBuf);
+   }
+   return ROK;
+}
 /***********************************************************
 *
-*     Func : cmUnpkRgrWarningSiCfgReq
+*     Func : cmPkRgrSonCfg
 *
 *
-*     Desc : SI Configuration Request from RRM to MAC for  
-*            configuring warning SI
+*     Desc : SON Configuration info for MAC
 *
 *
 *     Ret  : S16
 *
 *     Notes:
 *
-*     File  : 
+*     File  :
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrWarningSiCfgReq
+S16 cmPkRgrSonCfg
 (
-RgrWarningSiCfgReq func,
-Pst *pst,
+RgrSonCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiCfgReq(func, pst, mBuf)
-RgrWarningSiCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SpId spId;
-   RgrCfgTransId transId;
-   RgrWarningSiCfgReqInfo *warningSiCfgReqInfo;
-   
-
-   if (SUnpkS16(&spId, mBuf) != ROK) 
-   {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR066, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-
-   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) 
-   {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR067, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
 
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&warningSiCfgReqInfo,
-            sizeof(RgrWarningSiCfgReqInfo))) != ROK) 
+   switch(param->cfgType)
    {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR068, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
+      case RGR_SON_PRB_CFG :
+      CMCHKPK(cmPkRgrSonPrbCfg, &param->u.prbCfg, mBuf);
+      break;
+      default :
       return RFAILED;
    }
+   CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf);
+   return ROK;
+}
 
+/***********************************************************
+*
+*     Func : cmUnpkRgrSon
+*
+*
+*     Desc : SON configuration info for MAC
+*
+*
+*     Ret  : S16
+*
+*     Notes:
+*
+*     File  :
+*
+**********************************************************/
+S16 cmUnpkRgrSonCfg
+(
+RgrSonCfg   *param,
+Buffer      *mBuf
+)
+{
 
-   if (pst->selector == ODU_SELECTOR_LC)
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->cfgType, mBuf);
+   switch(param->cfgType)
    {
-      if (cmUnpkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) 
+      case RGR_SON_PRB_CFG :
       {
-         SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, 
-                          sizeof(RgrWarningSiCfgReqInfo));
-         SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-         SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-               __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-               (ErrVal)ERGR069, (ErrVal)0, "Packing failed");
-#endif
+         CMCHKUNPK(cmUnpkRgrSonPrbCfg, &param->u.prbCfg, mBuf);
+         break;
+         default :
          return RFAILED;
       }
    }
-   SPutMsg(mBuf);
-
-   return ((*func)(pst, spId, transId, warningSiCfgReqInfo));
-} /* cmUnpkRgrWarningSiCfgReq */
+   return ROK;
+}
 
 
 /***********************************************************
 *
-*     Func : cmPkRgrWarningSiCfgReqInfo
+*     Func : cmPkRgrRst
 *
 *
-*     Desc : Basic warning SI configuration/reconfiguration 
-*            info at RRM
+*     Desc : UE RESET info for MAC
 *
 *
 *     Ret  : S16
@@ -9477,63 +6949,27 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrWarningSiCfgReqInfo
+S16 cmPkRgrRst
 (
-Pst *pst,
-RgrWarningSiCfgReqInfo *param,
+RgrRst *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrWarningSiCfgReqInfo(pst, param, mBuf)
-Pst *pst;
-RgrWarningSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
-   MsgLen   msgLen;
-   U32      count;
-   CmLList  *node, *prevNode;
-   RgrSegmentInfo   *pdu;
- 
 
-   CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf);
 
+   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->siId, mBuf);
-
-   count = param->siPduLst.count;
-   node = param->siPduLst.last;
-   while (node) 
-   {
-      pdu = (RgrSegmentInfo *)node->node;
-      prevNode= node->prev;
-      if(NULLP != pdu)
-      {
-         if (SFndLenMsg(pdu->pdu, &msgLen) != ROK)
-            return RFAILED;
-         if (SCatMsg(mBuf, pdu->pdu, M1M2) != ROK)
-            return RFAILED;
-         /* The PDU is not Released. This has to be done by 
-          * the caller of the packing function  */
-         CMCHKPK(cmPkMsgLen, msgLen, mBuf);
-         SPutMsg(pdu->pdu);
-      }
-      cmLListDelFrm(&param->siPduLst, node);
-      SPutSBuf(pst->region, pst->pool, (Data *)node, sizeof(RgrSegmentInfo));
-      node= prevNode;
-   }
-   CMCHKPK(oduUnpackUInt32, count, mBuf);
    return ROK;
 }
 
+
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrWarningSiCfgReqInfo
+*     Func : cmUnpkRgrRst
 *
 *
-*     Desc : Unpack warning SI configuration info at SCH 
+*     Desc : UE RESET info for MAC
 *
 *
 *     Ret  : S16
@@ -9543,205 +6979,87 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrWarningSiCfgReqInfo
+S16 cmUnpkRgrRst
 (
-Pst *pst,
-RgrWarningSiCfgReqInfo *param,
+RgrRst *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiCfgReqInfo(pst, param, mBuf)
-Pst *pst;
-RgrWarningSiCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
-   MsgLen   msgLen, totalMsgLen;
-   U32      count, loopCnt;
-   Buffer   *pdu;
-   CmLList  *node;
-
-
-   cmLListInit(&param->siPduLst);
-   CMCHKUNPK(oduPackUInt32, &count, mBuf);
-   for (loopCnt=0; loopCnt<count; loopCnt++) 
-   {
-      if(SFndLenMsg(mBuf, &msgLen) != ROK)
-      {
-         return RFAILED;
-      } 
 
-      if(msgLen > 0)
-      { 
-         CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
-         if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
-         { 
-            return RFAILED;
-         }   
-         if (SSegMsg(mBuf, totalMsgLen-msgLen, &pdu) != ROK)
-         {		 
-            return RFAILED;
-         }   
-      }
-      else
-      {
-         return RFAILED;
-      }
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&node,
-                  sizeof(CmLList))) != ROK)
-         return RFAILED;
-      node->node = (PTR)pdu;
-      cmLListAdd2Tail(&param->siPduLst, node);
-   }
 
-   CMCHKUNPK(oduPackUInt8, &param->siId, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKPK(oduPackUInt8, &param->emtcEnable, mBuf);
-
+   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
    return ROK;
 }
-
-
+#ifdef LTE_ADV
 /***********************************************************
 *
-*    Func : cmPkRgrWarningSiStopReq
+*     Func : cmUnPkRgrSCellActDeactInfo
+*
+*
+*     Desc : SCell Activation information of the UE
 *
-*    Desc : To stop the broadcast for SIB10, SIB11 and SIB12.
 *
 *     Ret  : S16
 *
 *     Notes:
 *
 *     File  : 
+*
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrWarningSiStopReq
+static S16 cmUnPkRgrSCellActDeactInfo
 (
-Pst           *pst,
-SpId          spId,
-RgrCfgTransId transId,
-U8            siId
-)
-#else
-S16 cmPkRgrWarningSiStopReq(pst,spId, transId, siId)
-Pst           *pst;
-SpId          spId;
-RgrCfgTransId transId;
-U8            siId;
-#endif
+RgrSCellActDeactInfo *param,
+Buffer *mBuf
+)
 {
-   Buffer *mBuf = NULLP;
-
-
-   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)ERGR070, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-
-   CMCHKPK(oduUnpackUInt8, siId, mBuf);
-
- 
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR082, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-
-   if (SPkS16(spId, mBuf) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR071, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
 
-   pst->event = (Event) EVTRGRWARNINGSISTOPREQ;
-   return (SPstTsk(pst,mBuf));
-}/*cmPkRgrWarningSiStopReq */
+   CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
+   return ROK;
+}
 
-
 /***********************************************************
 *
-*    Func : cmUnpkRgrWarningSiStopReq
+*     Func : cmUnPkRgrSCellActDeactEvnt
+*
+*
+*     Desc : SCell Activation Configuration structure to SCH
 *
-*    Desc : To stop the broadcast for SIB10, SIB11 and SIB12.
 *
 *     Ret  : S16
 *
 *     Notes:
 *
 *     File  : 
+*
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrWarningSiStopReq
+S16 cmUnPkRgrSCellActDeactEvnt
 (
-RgrWarningSiStopReq func,
-Pst *pst,
+RgrSCellActDeactEvnt *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiStopReq(param, mBuf)
-RgrWarningSiStopReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SpId          spId;
-   U8            siId;
-   RgrCfgTransId transId;
 
+   uint8_t idx;
 
-  if (SUnpkS16(&spId, mBuf) != ROK)
-  {
-     SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-     SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-           __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-           (ErrVal)ERGR072, (ErrVal)0, "Packing failed");
-#endif
-     return RFAILED;
-  }
+   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->numOfSCells, mBuf);
 
-    if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) 
+   for(idx = 0; idx < param->numOfSCells;idx++)
    {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR083, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
+      CMCHKUNPK(cmUnPkRgrSCellActDeactInfo, &param->sCellActDeactInfo[idx],mBuf);
    }
- 
-   CMCHKUNPK(oduPackUInt8, &siId, mBuf);
 
-   SPutMsg(mBuf);
+   return ROK;
+}
 
-   return ((*func)(pst, spId, transId, siId));
-} /*cmUnpkRgrWarningSiStopReq */
 
-
 /***********************************************************
 *
-*     Func : cmPkRgrWarningSiCfgCfm
+*     Func : cmPkRgrSCellActInfo
 *
 *
-*     Desc : Warning SI Configuration Confirm from MAC to RRM
+*     Desc : SCell Activation information of the UE
 *
 *
 *     Ret  : S16
@@ -9751,92 +7069,24 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrWarningSiCfgCfm
+static S16 cmPkRgrSCellActDeactInfo
 (
-Pst*          pst,
-SuId          suId,
-RgrCfgTransId transId,
-U8            siId,
-U8            status
-)
-#else
-S16 cmPkRgrWarningSiCfgCfm(pst, suId, transId, siId, status)
-Pst*          pst;
-SuId          suId;
-RgrCfgTransId transId;
-U8            siId;
-U8            status;
-#endif
+RgrSCellActDeactInfo *param,
+Buffer *mBuf
+)
 {
-   Buffer *mBuf = NULLP;
-
-
-   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)ERGR073, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-
-   if (oduUnpackUInt8(status, mBuf) != ROK)
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR074, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   if (oduUnpackUInt8(siId, mBuf) != ROK)
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR075, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) 
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR076, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
 
-   if (SPkS16(suId, mBuf) != ROK)
-   {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR077, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
+   CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
 
-   pst->event = (Event) EVTRGRWARNINGSICFGCFM;
-   return (SPstTsk(pst,mBuf));
-} /* cmPkRgrWarningSiCfgCfm */
+   return ROK;
+}
 
-
 /***********************************************************
 *
-*     Func : cmUnpkRgrwarningSiCfgCfm
+*     Func : cmPkRgrSCellActDeactEvnt
 *
 *
-*     Desc : Warning SI Configuration Confirm from MAC to RRM
+*     Desc : Basic Configuration structure at SCH
 *
 *
 *     Ret  : S16
@@ -9846,176 +7096,90 @@ U8            status;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrWarningSiCfgCfm
+S16 cmPkRgrSCellActDeactEvnt
 (
-RgrWarningSiCfgCfm func,
-Pst *pst,
+RgrSCellActDeactEvnt *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrWarningSiCfgCfm(func, pst, mBuf)
-RgrWarningSiCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SuId          suId;
-   U8            siId;
-   RgrCfgTransId transId;
-   U8            status;
 
 
-   if (SUnpkS16(&suId, mBuf) != ROK) 
+   S8 idx;
+   for(idx = param->numOfSCells - 1; idx >= 0; idx--)
    {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR078, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
+      CMCHKPK(cmPkRgrSCellActDeactInfo, &param->sCellActDeactInfo[(uint8_t)idx], mBuf);
    }
 
-   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) 
-   {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR079, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
+   CMCHKPK(oduUnpackUInt8, param->numOfSCells, mBuf);
+   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
 
-   if (oduPackUInt8(&siId, mBuf) != ROK) 
-   {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR080, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
+   return ROK;
+}
 
-   if (oduPackUInt8(&status, mBuf) != ROK) 
-   {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR081, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-   SPutMsg(mBuf);
-   return ((*func)(pst, suId, transId, siId, status));
-}/* cmUnpkRgrwarningSiCfgCfm */
-#endif/*RGR_SI_SCH*/
 
-/* LTE_ADV_FLAG_REMOVED_START */
+#endif /* LTE_ADV */
+
 /***********************************************************
 *
-*     Func : cmPkRgrLoadInfReq
+*     Func : cmPkRgrCfgReqInfo
 *
 *
-*     Desc : LOAD INF Configuration Request from RRM to MAC for
-*            configuring RNTP, ABS etc
+*     Desc : Basic RGR configuration/reconfiguration info at RRM
 *
 *
 *     Ret  : S16
 *
 *     Notes:
 *
-*     File  :
+*     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrLoadInfReq
+S16 cmPkRgrCfgReqInfo
 (
-Pst* pst,
-SpId spId,
-RgrCfgTransId transId,
-RgrLoadInfReqInfo * loadInfReq
-)
-#else
-S16 cmPkRgrLoadInfReq(pst, spId, transId, loadInfReq)
-Pst* pst;
-SpId spId;
-RgrCfgTransId transId;
-RgrLoadInfReqInfo * loadInfReq;
-#endif
+RgrCfgReqInfo *param,
+Buffer *mBuf
+)
 {
-   Buffer *mBuf = NULLP;
 
 
-   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)ERGR045, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
-                 sizeof(RgrLoadInfReqInfo));
-      return RFAILED;
-   }
-   if (cmPkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR046, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
-                sizeof(RgrLoadInfReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR047, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
-               sizeof(RgrLoadInfReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (SPkS16(spId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR048, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
-               sizeof(RgrLoadInfReqInfo));
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-   if (SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
-               sizeof(RgrLoadInfReqInfo)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR049, (ErrVal)0, "Packing failed");
+      switch(param->action) {
+         case RGR_SON_CFG:
+            CMCHKPK(cmPkRgrSonCfg, &param->u.sonCfg, mBuf);
+            break;
+         case RGR_RESET:
+            CMCHKPK(cmPkRgrRst, &param->u.rstInfo, mBuf);
+            break;
+         case RGR_DELETE:
+            CMCHKPK(cmPkRgrDel, &param->u.delInfo, mBuf);
+            break;
+         case RGR_RECONFIG:
+            CMCHKPK(cmPkRgrRecfg, &param->u.recfgInfo, mBuf);
+            break;
+         case SCH_CONFIG:
+            CMCHKPK(cmPkRgrCfg, &param->u.cfgInfo, mBuf);
+            break;
+#ifdef LTE_ADV
+         case RGR_SCELL_ACT:
+         case RGR_SCELL_DEACT:
+         case RGR_SCELL_READY:
+            CMCHKPK(cmPkRgrSCellActDeactEvnt, &param->u.sCellActDeactEvnt, mBuf);
+            break;
 #endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
-
-   pst->event = (Event) EVTRGRLOADINFREQ;
-   return (SPstTsk(pst,mBuf));
+         default :
+            return RFAILED;
+      }
+   CMCHKPK(oduUnpackUInt8, param->action, mBuf);
+   return ROK;
 }
+
+
 
 /***********************************************************
 *
-*     Func : cmUnpkRgrLoadInfReq
+*     Func : cmUnpkRgrCfgReqInfo
 *
 *
-*     Desc : LOAD INF Configuration Request from RRM to MAC for 
-*     configuring RNTP, ABS etc
+*     Desc : Basic RGR configuration/reconfiguration info at RRM
 *
 *
 *     Ret  : S16
@@ -10025,81 +7189,52 @@ RgrLoadInfReqInfo * loadInfReq;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrLoadInfReq
+S16 cmUnpkRgrCfgReqInfo
 (
-RgrLoadInfReq func,
-Pst *pst,
+RgrCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfReq(func, pst, mBuf)
-RgrLoadInfReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
-   SpId spId;
-   RgrCfgTransId transId;
-   RgrLoadInfReqInfo *loadInfReq;
-   
-
-   if (SUnpkS16(&spId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR050, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-
-   if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ERGR051, (ErrVal)0, "Packing failed");
-#endif
-      return RFAILED;
-   }
-
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&loadInfReq,
-            sizeof(RgrLoadInfReqInfo))) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ERGR052, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      return RFAILED;
-   }
 
-   memset(loadInfReq, 0, sizeof(RgrLoadInfReqInfo));
 
-   if (pst->selector == ODU_SELECTOR_LC) 
-      if (cmUnpkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) {
-         SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
-                          sizeof(RgrLoadInfReqInfo));
-         SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-         SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-               __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-               (ErrVal)ERGR053, (ErrVal)0, "Packing failed");
-#endif
-         return RFAILED;
+   CMCHKUNPK(oduPackUInt8, &param->action, mBuf);
+      switch(param->action) {
+         case SCH_CONFIG:
+            CMCHKUNPK(cmUnpkRgrCfg, &param->u.cfgInfo, mBuf);
+            break;
+         case RGR_RECONFIG:
+            CMCHKUNPK(cmUnpkRgrRecfg, &param->u.recfgInfo, mBuf);
+            break;
+         case RGR_DELETE:
+            CMCHKUNPK(cmUnpkRgrDel, &param->u.delInfo, mBuf);
+            break;
+         case RGR_RESET:
+            CMCHKUNPK(cmUnpkRgrRst, &param->u.rstInfo, mBuf);
+            break;
+         case RGR_SON_CFG:
+            CMCHKUNPK(cmUnpkRgrSonCfg, &param->u.sonCfg, mBuf);
+            break;
+#ifdef LTE_ADV
+         case RGR_SCELL_ACT:
+         case RGR_SCELL_DEACT:
+         case RGR_SCELL_READY:
+            CMCHKUNPK(cmUnPkRgrSCellActDeactEvnt, &param->u.sCellActDeactEvnt, mBuf);
+            break;
+#endif /* LTE_ADV */
+         default :
+            return RFAILED;
       }
-   SPutMsg(mBuf);
-
-   return ((*func)(pst, spId, transId, loadInfReq));
+   return ROK;
 }
-
+#ifdef RGR_V1
+/* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and
+ * retxBSR-timer */
 /***********************************************************
 *
-*     Func : cmPkRgrLoadInfReqInfo
+*     Func : cmPkRgrUeBsrTmrCfg
 *
 *
-*     Desc : Basic LOAD INF configuration/reconfiguration info at RRM
+*     Desc : BSR timer configuration per UE
 *
 *
 *     Ret  : S16
@@ -10109,32 +7244,26 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmPkRgrLoadInfReqInfo
+S16 cmPkRgrUeBsrTmrCfg
 (
-RgrLoadInfReqInfo *param,
+RgrUeBsrTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLoadInfReqInfo(param, mBuf)
-RgrLoadInfReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->rgrCcPHighStartRb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->rgrCcPHighEndRb, mBuf);
 
+   CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->isPrdBsrTmrPres, mBuf);
    return ROK;
 }
-
+
 /***********************************************************
 *
-*     Func : cmUnpkRgrLoadInfReqInfo
+*     Func : cmUnpkRgrUeBsrTmrCfg
 *
 *
-*     Desc : Basic LOAD INF configuration/reconfiguration info at RRM
+*     Desc : BSR timer configuration per UE
 *
 *
 *     Ret  : S16
@@ -10144,26 +7273,20 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-S16 cmUnpkRgrLoadInfReqInfo
+S16 cmUnpkRgrUeBsrTmrCfg
 (
-RgrLoadInfReqInfo *param,
+RgrUeBsrTmrCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfReqInfo(param, mBuf)
-RgrLoadInfReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->rgrCcPHighEndRb, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rgrCcPHighStartRb, mBuf);
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
 
+   CMCHKUNPK(oduPackUInt8, &param->isPrdBsrTmrPres, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->retxBsrTmr, mBuf);
+   CMCHKUNPK(oduPackUInt16, &param->prdBsrTmr, mBuf);
    return ROK;
 }
-/* LTE_ADV_FLAG_REMOVED_END */
+#endif /* RGR_V1 */
 
 /*rgr_c_001.main_9 ccpu00117452 - MOD - Changed macro name from
    RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */
@@ -10184,17 +7307,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCqiReptCfg
 (
 RgrUeCqiReptCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCqiReptCfg(param, mBuf)
-RgrUeCqiReptCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf);
@@ -10219,17 +7336,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCqiReptCfg
 (
 RgrUeCqiReptCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCqiReptCfg(param, mBuf)
-RgrUeCqiReptCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->numColltdCqiRept, mBuf);
@@ -10254,19 +7365,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrStaInd
 (
 Pst* pst,
 SuId suId,
 RgrStaIndInfo* staInd
 )
-#else
-S16 cmPkRgrStaInd(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RgrStaIndInfo* staInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -10277,7 +7381,7 @@ RgrStaIndInfo* staInd;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ERGR054, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)staInd, 
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, 
                sizeof(RgrStaIndInfo));
       return RFAILED;
    }
@@ -10289,7 +7393,7 @@ RgrStaIndInfo* staInd;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ERGR055, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -10301,13 +7405,13 @@ RgrStaIndInfo* staInd;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ERGR056, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)staInd, 
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, 
                   sizeof(RgrStaIndInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
-   if (SPutSBuf(pst->region, pst->pool, (Data *)staInd, 
+   if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd, 
                   sizeof(RgrStaIndInfo)) != ROK) 
    {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -10338,19 +7442,12 @@ RgrStaIndInfo* staInd;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrStaInd
 (
 RgrStaInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrStaInd(func, pst, mBuf)
-RgrStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrStaIndInfo *staInd;
@@ -10367,7 +7464,7 @@ Buffer *mBuf;
       return RFAILED;
    }
 
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&staInd,
+   if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&staInd,
                  sizeof(RgrStaIndInfo))) != ROK)
    {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -10381,7 +7478,7 @@ Buffer *mBuf;
 
    if (cmUnpkRgrStaIndInfo(staInd, mBuf) != ROK)
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)staInd,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)staInd,
              sizeof(RgrStaIndInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -10411,17 +7508,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrStaIndInfo
 (
 RgrStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrStaIndInfo(param, mBuf)
-RgrStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10446,17 +7537,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrStaIndInfo
 (
 RgrStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrStaIndInfo(param, mBuf)
-RgrStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10481,17 +7566,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCqiInfo
 (
 RgrUeCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCqiInfo(param, mBuf)
-RgrUeCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16 idx;
@@ -10520,20 +7599,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCqiInfo
 (
 RgrUeCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCqiInfo(param, mBuf)
-RgrUeCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numCqiRept, mBuf);
    for (idx = 0; idx < param->numCqiRept; idx++)
@@ -10558,17 +7631,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrSubBandCqiInfo 
 (
 RgrSubBandCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrSubBandCqiInfo(param, mBuf)
-RgrSubBandCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10594,20 +7661,14 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeCqiRept
 (
 RgrUeCqiRept *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeCqiRept(param, mBuf)
-RgrUeCqiRept *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
-   U8 count;
+   uint8_t count;
 
 
    CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf);
@@ -10636,17 +7697,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrSubBandCqiInfo 
 (
 RgrSubBandCqiInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrSubBandCqiInfo(param, mBuf)
-RgrSubBandCqiInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -10672,19 +7727,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeCqiRept
 (
 RgrUeCqiRept *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeCqiRept(param, mBuf)
-RgrUeCqiRept *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numSubBand, mBuf);
    for (idx = 0; idx < param->numSubBand; idx++)
@@ -10715,19 +7764,12 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLoadInfInd
 (
 Pst* pst,
 SuId suId,
 RgrLoadInfIndInfo* loadInfInd
 )
-#else
-S16 cmPkRgrLoadInfInd(pst, suId, loadInfInd)
-Pst* pst;
-SuId suId;
-RgrLoadInfIndInfo* loadInfInd;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -10738,7 +7780,7 @@ RgrLoadInfIndInfo* loadInfInd;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ERGR054, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd,
             sizeof(RgrLoadInfIndInfo));
       return RFAILED;
    }
@@ -10750,7 +7792,7 @@ RgrLoadInfIndInfo* loadInfInd;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ERGR055, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd,
             sizeof(RgrLoadInfIndInfo));
       SPutMsg(mBuf);
 
@@ -10764,13 +7806,13 @@ RgrLoadInfIndInfo* loadInfInd;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ERGR056, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd,
             sizeof(RgrLoadInfIndInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
-   if (SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd,
+   if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd,
                   sizeof(RgrLoadInfIndInfo)) != ROK)
    {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -10800,19 +7842,12 @@ RgrLoadInfIndInfo* loadInfInd;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLoadInfInd
 (
 RgrLoadInfInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfInd(func, pst, mBuf)
-RgrLoadInfInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrLoadInfIndInfo *loadInfInd = NULLP; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
@@ -10829,7 +7864,7 @@ Buffer *mBuf;
       return RFAILED;
    }
 
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&loadInfInd,
+   if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&loadInfInd,
                  sizeof(RgrLoadInfIndInfo))) != ROK)
    {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -10844,7 +7879,7 @@ Buffer *mBuf;
    /* dsfr_pal_fixes ** 22-March-2013 ** SKS */
    if (cmUnpkRgrLoadInfIndInfo(loadInfInd, pst, mBuf) != ROK)
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)loadInfInd,
              sizeof(RgrLoadInfIndInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -10874,19 +7909,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrLoadInfIndInfo
 (
 RgrLoadInfIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrLoadInfIndInfo(param, mBuf)
-RgrLoadInfIndInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U8                     idx;
+   uint8_t                     idx;
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(oduUnpackUInt16, param->bw, mBuf);
@@ -10921,25 +7950,18 @@ Buffer *mBuf;
 *     File  :
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrLoadInfIndInfo
 (
 RgrLoadInfIndInfo *param,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrLoadInfIndInfo(param, pst, mBuf)
-RgrLoadInfIndInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    S8          idx;
 
    /* dsfr_pal_fixes ** 21-March-2013 ** SKS */
    TknStrOSXL  *tknStr;
-   U16         ndx;
+   uint16_t         ndx;
 
 
    CMCHKUNPK(oduPackUInt32, &param->type, mBuf);
@@ -10947,7 +7969,7 @@ Buffer *mBuf;
    {
       for(idx = RGR_ABS_PATTERN_LEN -1 ; idx >= 0; idx--)
       {
-         CMCHKUNPK(oduPackUInt32, &param->u.absLoadInfo[(U8)idx], mBuf);
+         CMCHKUNPK(oduPackUInt32, &param->u.absLoadInfo[(uint8_t)idx], mBuf);
       }
    }
    else
@@ -10963,7 +7985,7 @@ Buffer *mBuf;
          /* Length */
          CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
 
-         if ((SGetSBuf(pst->region, pst->pool, (Data **)&tknStr->val,tknStr->len)) != ROK) {
+         if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&tknStr->val,tknStr->len)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
             SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
                __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -11008,17 +8030,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUepACfg
 (
 RgrUepACfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUepACfg(param, mBuf)
-RgrUepACfg *param;
-Buffer *mBuf;
-#endif
 {
 
    if(param->pAPrsnt)
@@ -11047,24 +8063,18 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUepACfg
 (
 RgrUepACfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUepACfg(param, mBuf)
-RgrUepACfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, (U8 *)&param->pAPrsnt, mBuf);
+   CMCHKUNPK(oduPackUInt8, (uint8_t *)&param->pAPrsnt, mBuf);
    if (param->pAPrsnt)
    {
-      CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t*)&tmpEnum, mBuf);
       param->pA = (RgrUeDlPwrCntrlPaCfg) tmpEnum;
    }
 
@@ -11087,17 +8097,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUePdschDedCfg
 (
 RgrUePdschDedCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUePdschDedCfg(param, mBuf)
-RgrUePdschDedCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkRgrUepACfg, &param->uepACfg, mBuf);
@@ -11122,17 +8126,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUePdschDedCfg
 (
 RgrUePdschDedCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUePdschDedCfg(param, mBuf)
-RgrUePdschDedCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkRgrUepACfg, &param->uepACfg, mBuf);
@@ -11159,17 +8157,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkRgrUeUlPwrDedSCellCfg
+static S16 cmPkRgrUeUlPwrDedSCellCfg
 (
 RgrUeUlPwrDedSCellCfg *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRgrUeUlPwrDedSCellCfg(param, mBuf)
-RgrUeUlPwrDedSCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf);
    CMCHKPK(SPkS8, param->p0UePusch, mBuf);
@@ -11194,17 +8186,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnpkRgrUeUlPwrDedSCellCfg
+static S16 cmUnpkRgrUeUlPwrDedSCellCfg
 (
 RgrUeUlPwrDedSCellCfg *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRgrUeUlPwrDedSCellCfg(param, mBuf)
-RgrUeUlPwrDedSCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11233,17 +8219,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkRgrUeSecCellCfg
+static S16 cmPkRgrUeSecCellCfg
 (
 RgrUeSecCellCfg *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkRgrUeSecCellCfg(param, mBuf)
-RgrUeSecCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(cmPkRgrUeUlPwrDedSCellCfg,&param->ueSCellUlDedPwrCfg, mBuf);
    CMCHKPK(oduUnpackUInt8, param->isUlCaEnabled, mBuf);
@@ -11253,7 +8233,7 @@ Buffer *mBuf;
    CMCHKPK(cmPkRgrUePdschDedCfg, &param->uePdschDedCfg, mBuf);
 #endif
    CMCHKPK(cmPkRgrUeDlCqiCfg,&param->ueSCellDlCqiCfg, mBuf);
-   CMCHKPK(cmPkTknU32, &param->sCellDeActTmr, mBuf);
+   CMCHKPK(cmPkTknUInt32, &param->sCellDeActTmr, mBuf);
    CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
 
@@ -11277,22 +8257,16 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSecCellInfo
 (
 RgrUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSecCellInfo(param, mBuf)
-RgrUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkRgrUeSecCellCfg, &param->ueSCellDedCfg[(U8)idx],mBuf);
+      CMCHKPK(cmPkRgrUeSecCellCfg, &param->ueSCellDedCfg[(uint8_t)idx],mBuf);
    }
 
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
@@ -11318,21 +8292,15 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnpkRgrUeSecCellCfg
+static S16 cmUnpkRgrUeSecCellCfg
 (
 RgrUeSecCellCfg *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkRgrUeSecCellCfg(param, mBuf)
-RgrUeSecCellCfg *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
-   CMCHKUNPK(cmUnpkTknU32, &param->sCellDeActTmr, mBuf);
+   CMCHKUNPK(cmUnpkTknUInt32, &param->sCellDeActTmr, mBuf);
    CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, &param->ueSCellDlCqiCfg, mBuf);
 #ifdef TFU_UPGRADE
    CMCHKUNPK(cmUnpkRgrUePdschDedCfg, &param->uePdschDedCfg, mBuf);
@@ -11362,19 +8330,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSecCellInfo
 (
 RgrUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSecCellInfo(param, mBuf)
-RgrUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->useExtBSRSizes, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
@@ -11402,17 +8364,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeSCellAckPucchCfg
 (
 RgrUeSCellAckPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeSCellAckPucchCfg(param, mBuf)
-RgrUeSCellAckPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
 
@@ -11420,14 +8376,14 @@ Buffer *mBuf;
    { 
       for(idx = param->u.format1Bcs.sCellAckN1ResTb2Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf);
 
       for(idx = param->u.format1Bcs.sCellAckN1ResTb1Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf);
@@ -11436,14 +8392,14 @@ Buffer *mBuf;
    {
       for(idx = param->u.format3.sCellAckN3ResAntP1Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP1Count, mBuf);
 
       for(idx = param->u.format3.sCellAckN3ResAntP0Count- 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(U8)idx], mBuf);
+         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(uint8_t)idx], mBuf);
       }
 
       CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf);
@@ -11468,22 +8424,16 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeSCellAckPucchCfg
 (
 RgrUeSCellAckPucchCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeSCellAckPucchCfg(param, mBuf)
-RgrUeSCellAckPucchCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
+   uint8_t idx;
 
 
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->pucchFormatType, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pucchFormatType, mBuf);
    //if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS)
    if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS || param->pucchFormatType == RG_SCH_UCI_FORMAT1A_1B)
    {
@@ -11542,19 +8492,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeStaInd
 (
 Pst* pst,
 SuId suId,
 RgrUeStaIndInfo* ueStaInd
 )
-#else
-S16 cmPkRgrUeStaInd(pst, suId, ueStaInd)
-Pst* pst;
-SuId suId;
-RgrUeStaIndInfo* ueStaInd;
-#endif
 {
    Buffer *mBuf = NULLP;
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
@@ -11564,7 +8507,7 @@ RgrUeStaIndInfo* ueStaInd;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ERGR054, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, 
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, 
                sizeof(RgrUeStaIndInfo));
       return RFAILED;
    }
@@ -11576,7 +8519,7 @@ RgrUeStaIndInfo* ueStaInd;
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ERGR055, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, 
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, 
                sizeof(RgrUeStaIndInfo));
       SPutMsg(mBuf);
       return RFAILED;
@@ -11589,13 +8532,13 @@ RgrUeStaIndInfo* ueStaInd;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ERGR056, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, 
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, 
                   sizeof(RgrUeStaIndInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
 
-   if (SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, 
+   if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd, 
                   sizeof(RgrUeStaIndInfo)) != ROK) 
    {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -11626,19 +8569,12 @@ RgrUeStaIndInfo* ueStaInd;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeStaInd
 (
 RgrUeStaInd  func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeStaInd(func, pst, mBuf)
-RgrUeStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RgrUeStaIndInfo *ueStaInd;
@@ -11655,7 +8591,7 @@ Buffer *mBuf;
       return RFAILED;
    }
 
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueStaInd,
+   if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueStaInd,
                  sizeof(RgrUeStaIndInfo))) != ROK)
    {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -11669,7 +8605,7 @@ Buffer *mBuf;
 
    if (cmUnpkRgrUeStaIndInfo(ueStaInd, mBuf) != ROK)
    {
-      SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd,
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueStaInd,
              sizeof(RgrUeStaIndInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -11698,17 +8634,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrUeStaIndInfo
 (
 RgrUeStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrUeStaIndInfo(param, mBuf)
-RgrUeStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11732,17 +8662,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrUeStaIndInfo
 (
 RgrUeStaIndInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrUeStaIndInfo(param, mBuf)
-RgrUeStaIndInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11769,17 +8693,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellCsgParamCfg 
 (
 RgrCellCsgParamCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellCsgParamCfg(param, mBuf)
-RgrCellCsgParamCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11803,17 +8721,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellCsgParamCfg
 (
 RgrCellCsgParamCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellCsgParamCfg(param, mBuf)
-RgrCellCsgParamCfg *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -11837,17 +8749,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkRgrCellCntrlCmdCfg
 (
 RgrCellCntrlCmdCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkRgrCellCntrlCmdCfg(param, mBuf)
-RgrCellCntrlCmdCfg *param;
-Buffer *mBuf;
-#endif
 {
 
    switch(param->cmdType)
@@ -11880,19 +8786,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkRgrCellCntrlCmdCfg
 (
 RgrCellCntrlCmdCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkRgrCellCntrlCmdCfg(param, mBuf)
-RgrCellCntrlCmdCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt32, &tmpEnum, mBuf);