[Epic-ID: ODUHIGH-461][Task-ID: ODUHIGH-468]Unused files and functions removed/disabled

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

diff --git a/src/cm/crg.c b/src/cm/crg.c
index ba3244d..0d7ffbe 100755 (executable)
--- a/src/cm/crg.c
+++ b/src/cm/crg.c
@@ -55,22 +55,14 @@
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgBndReq
+S16 cmPkCrgBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-PUBLIC S16 cmPkCrgBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgBndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -78,7 +70,7 @@ SpId spId;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG001, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SPkS16(spId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -87,7 +79,7 @@ SpId spId;
          (ErrVal)ECRG002, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SPkS16(suId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -96,10 +88,10 @@ SpId spId;
          (ErrVal)ECRG003, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    pst->event = (Event) EVTCRGBNDREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -116,24 +108,16 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgBndReq
+S16 cmUnpkCrgBndReq
 (
 CrgBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgBndReq(func, pst, mBuf)
-CrgBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    SpId spId;
    
-   TRC3(cmUnpkCrgBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -142,7 +126,7 @@ Buffer *mBuf;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG004, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -151,10 +135,10 @@ Buffer *mBuf;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG005, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, suId, spId));
+   return ((*func)(pst, suId, spId));
 }
 
 \f
@@ -168,26 +152,18 @@ Buffer *mBuf;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgBndCfm
+S16 cmPkCrgBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
-#else
-PUBLIC S16 cmPkCrgBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -195,16 +171,16 @@ U8 status;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG006, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   if (SPkU8(status, 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)ECRG007, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SPkS16(suId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -213,10 +189,10 @@ U8 status;
          (ErrVal)ECRG008, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    pst->event = (Event) EVTCRGBNDCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -230,28 +206,20 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgBndCfm
+S16 cmUnpkCrgBndCfm
 (
 CrgBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgBndCfm(func, pst, mBuf)
-CrgBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCrgBndCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -260,19 +228,19 @@ Buffer *mBuf;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG009, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   if (SUnpkU8(&status, 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)ECRG010, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, suId, status));
+   return ((*func)(pst, suId, status));
 }
 
 \f
@@ -289,22 +257,14 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUbndReq
+S16 cmPkCrgUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-PUBLIC S16 cmPkCrgUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgUbndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -312,7 +272,7 @@ Reason reason;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG011, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SPkS16(reason, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -321,7 +281,7 @@ Reason reason;
          (ErrVal)ECRG012, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SPkS16(spId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -330,10 +290,10 @@ Reason reason;
          (ErrVal)ECRG013, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    pst->event = (Event) EVTCRGUBNDREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -350,24 +310,16 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUbndReq
+S16 cmUnpkCrgUbndReq
 (
 CrgUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgUbndReq(func, pst, mBuf)
-CrgUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    Reason reason;
    
-   TRC3(cmUnpkCrgUbndReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -376,7 +328,7 @@ Buffer *mBuf;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG014, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SUnpkS16(&reason, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -385,176 +337,10 @@ Buffer *mBuf;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG015, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
-   }
-   SPutMsg(mBuf);
-   RETVALUE((*func)(pst, spId, reason));
-}
-
-\f
-/**
-* @brief Configuration Request from RRC to MAC for 
- * configuring Cell/Ue/Lc
-*
-* @details
-*
-*     Function : cmPkCrgCfgReq
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SpId  spId
-*  @param[in]   CrgCfgTransId  transId
-*  @param[in]   CrgCfgReqInfo  *  cfgReqInfo
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfgReq
-(
-Pst* pst,
-SpId spId,
-CrgCfgTransId transId,
-CrgCfgReqInfo  * cfgReqInfo
-)
-#else
-PUBLIC S16 cmPkCrgCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CrgCfgTransId transId;
-CrgCfgReqInfo  * cfgReqInfo;
-#endif
-{
-   Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgCfgReq)
-
-   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)ECRG016, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
-      RETVALUE(RFAILED);
-   }
-   if (cmPkCrgCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ECRG017, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-/* crg_c_001.main_5: MOD - Updating ERR code */
-   if (cmPkCrgCfgTransId(&transId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ECRG018, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
-      SPutMsg(mBuf);
-      RETVALUE(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)ECRG019, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-   if (SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ECRG020, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-   pst->event = (Event) EVTCRGCFGREQ;
-   RETVALUE(SPstTsk(pst,mBuf));
-}
-
-\f
-/**
-* @brief Configuration Request from RRC to MAC for 
- * configuring Cell/Ue/Lc
-*
-* @details
-*
-*     Function : cmUnpkCrgCfgReq
-*
-*  @param[in]   Pst*  pst
-*  @param[in]   SpId  spId
-*  @param[in]   CrgCfgTransId  transId
-*  @param[in]   CrgCfgReqInfo  *  cfgReqInfo
-*  @return   S16
-*      -# ROK
-**/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgReq
-(
-CrgCfgReq func,
-Pst *pst,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgCfgReq(func, pst, mBuf)
-CrgCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
-{
-   SpId spId;
-   CrgCfgTransId transId;
-   CrgCfgReqInfo *cfgReqInfo;
-   
-   TRC3(cmUnpkCrgCfgReq)
-
-   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)ECRG021, (ErrVal)0, "Packing failed");
-#endif
-      RETVALUE(RFAILED);
-   }
-   if (cmUnpkCrgCfgTransId(&transId, mBuf) != ROK) {
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ECRG022, (ErrVal)0, "Packing failed");
-#endif
-      RETVALUE(RFAILED);
-   }
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CrgCfgReqInfo))) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ECRG023, (ErrVal)0, "Packing failed");
-#endif
-      SPutMsg(mBuf);
-      RETVALUE(RFAILED);
-   }
-    
-   if (cmUnpkCrgCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
-      SPutMsg(mBuf);
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ECRG024, (ErrVal)0, "Packing failed");
-#endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, spId, transId, cfgReqInfo));
+   return ((*func)(pst, spId, reason));
 }
 
 \f
@@ -568,28 +354,19 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CrgCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfgCfm
+S16 cmPkCrgCfgCfm
 (
 Pst* pst,
 SuId suId,
 CrgCfgTransId transId,
-U8 status
+uint8_t status
 )
-#else
-PUBLIC S16 cmPkCrgCfgCfm(pst, suId, transId, status)
-Pst* pst;
-SuId suId;
-CrgCfgTransId transId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgCfgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -597,17 +374,17 @@ U8 status;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG025, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 /* crg_c_001.main_5 - ADD - Added the packing for status. */
-   if (SPkU8(status, 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)ECRG026, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (cmPkCrgCfgTransId(&transId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -616,7 +393,7 @@ U8 status;
          (ErrVal)ECRG027, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (SPkS16(suId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -625,10 +402,10 @@ U8 status;
          (ErrVal)ECRG028, (ErrVal)0, "Packing failed");
 #endif
       SPutMsg(mBuf);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    pst->event = (Event) EVTCRGCFGCFM;
-   RETVALUE(SPstTsk(pst,mBuf));
+   return (SPstTsk(pst,mBuf));
 }
 
 \f
@@ -642,29 +419,21 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CrgCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgCfm
+S16 cmUnpkCrgCfgCfm
 (
 CrgCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgCfgCfm(func, pst, mBuf)
-CrgCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    CrgCfgTransId transId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCrgCfgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -673,7 +442,7 @@ Buffer *mBuf;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG029, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (cmUnpkCrgCfgTransId(&transId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -682,19 +451,19 @@ Buffer *mBuf;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG030, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   if (SUnpkU8(&status, 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)ECRG031, (ErrVal)0, "Packing failed");
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    SPutMsg(mBuf);
-   RETVALUE((*func)(pst, suId, transId, status));
+   return ((*func)(pst, suId, transId, status));
 }
 
 \f
@@ -713,26 +482,19 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfgTransId
+S16 cmPkCrgCfgTransId
 (
 CrgCfgTransId *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgCfgTransId(param, mBuf)
-CrgCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-   TRC3(cmPkCrgCfgTransId)
 
    for (i=CRG_CFG_TRANSID_SIZE-1; i >= 0; i--) {
-      CMCHKPK(SPkU8, param->trans[i], mBuf);
+      CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -752,36 +514,29 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgTransId
+S16 cmUnpkCrgCfgTransId
 (
 CrgCfgTransId *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgCfgTransId(param, mBuf)
-CrgCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-   TRC3(cmUnpkCrgCfgTransId)
 
    for (i=0; i<CRG_CFG_TRANSID_SIZE; i++) {
-      CMCHKUNPK(SUnpkU8, &param->trans[i], mBuf);
+      CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
    }
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
 \f
 /***********************************************************
 *
-*     Func : cmPkCrgBwCfg
+*     Func : cmPkCrgUeUlHqCfg
 *
 *
-*     Desc : Bandwidth configuration per cell
+*     Desc : Uplink HARQ configuration per UE
 *
 *
 *     Ret  : S16
@@ -791,34 +546,25 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgBwCfg
+S16 cmPkCrgUeUlHqCfg
 (
-CrgBwCfg *param,
+CrgUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgBwCfg(param, mBuf)
-CrgBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgBwCfg)
 
-   CMCHKPK(SPkU8, param->ulTotalBw, mBuf);
-   CMCHKPK(SPkU8, param->dlTotalBw, mBuf);
-   RETVALUE(ROK);
+   CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf);
+   return ROK;
 }
 
-
-\f
+#ifdef LTE_ADV
 /***********************************************************
 *
-*     Func : cmUnpkCrgBwCfg
+*     Func : cmPkCrgUeSCellCfg
 *
 *
-*     Desc : Bandwidth configuration per cell
+*     Desc : Secondary Cell information of the UE
 *
 *
 *     Ret  : S16
@@ -828,34 +574,25 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgBwCfg
+static S16 cmPkCrgUeSCellCfg
 (
-CrgBwCfg *param,
+CrgUeSCellInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgBwCfg(param, mBuf)
-CrgBwCfg *param;
-Buffer *mBuf;
-#endif
 {
+   CMCHKPK(SPkS16, param->rguDlSapId, mBuf);
+   CMCHKPK(SPkS16, param->rguUlSapId, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->macInst, mBuf);
+   CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
 
-   TRC3(cmUnpkCrgBwCfg)
-
-   CMCHKUNPK(SUnpkU8, &param->dlTotalBw, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->ulTotalBw, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
-
-
-\f
 /***********************************************************
 *
-*     Func : cmPkCrgRachCfg
+*     Func : cmUnpkCrgUeSCellCfg
 *
 *
-*     Desc : RACH configuration per cell
+*     Desc : Secondary Cell information of the UE
 *
 *
 *     Ret  : S16
@@ -865,33 +602,24 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgRachCfg
+static S16 cmUnpkCrgUeSCellCfg
 (
-CrgRachCfg *param,
+CrgUeSCellInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgRachCfg(param, mBuf)
-CrgRachCfg *param;
-Buffer *mBuf;
-#endif
 {
-
-   TRC3(cmPkCrgRachCfg)
-
-   CMCHKPK(SPkU8, param->maxMsg3Tx, mBuf);
-   RETVALUE(ROK);
+   CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
+   CMCHKUNPK(oduPackUInt8, &param->macInst, mBuf);
+   CMCHKUNPK(SUnpkS16, &param->rguUlSapId, mBuf);
+   CMCHKUNPK(SUnpkS16, &param->rguDlSapId, mBuf);
+   return ROK;
 }
-
-
-\f
 /***********************************************************
 *
-*     Func : cmUnpkCrgRachCfg
+*     Func : cmPkCrgUeSecCellInfo
 *
 *
-*     Desc : RACH configuration per cell
+*     Desc : Secondary Cell information of the UE
 *
 *
 *     Ret  : S16
@@ -901,33 +629,30 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgRachCfg
+S16 cmPkCrgUeSecCellInfo
 (
-CrgRachCfg *param,
+CrgUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgRachCfg(param, mBuf)
-CrgRachCfg *param;
-Buffer *mBuf;
-#endif
 {
+   S8 idx;
+   for(idx = param->numSCells - 1; idx >= 0; idx--)
+   {
+      CMCHKPK(cmPkCrgUeSCellCfg, &param->ueSCellCfg[(uint8_t)idx], mBuf);
+   }
 
-   TRC3(cmUnpkCrgRachCfg)
+   CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
+   CMCHKPK(oduUnpackUInt8, param->isSCellCfgPres, mBuf);
 
-   CMCHKUNPK(SUnpkU8, &param->maxMsg3Tx, mBuf);
-   RETVALUE(ROK);
+   return ROK;
 }
 
-
-\f
 /***********************************************************
 *
-*     Func : cmPkCrgCellCfg
+*     Func : cmUnpkCrgUeSecCellInfo
 *
 *
-*     Desc : Cell configuration
+*     Desc : Secondary Cell information of the UE
 *
 *
 *     Ret  : S16
@@ -937,1355 +662,31 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCellCfg
+S16 cmUnpkCrgUeSecCellInfo
 (
-CrgCellCfg *param,
+CrgUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgCellCfg(param, mBuf)
-CrgCellCfg *param;
-Buffer *mBuf;
-#endif
 {
+   uint8_t idx;
 
-   TRC3(cmPkCrgCellCfg)
-
-#ifdef EMTC_ENABLE
-   CMCHKPK(SPkU8, param->emtcEnable, mBuf);
-#endif
-#ifdef TENB_MULT_CELL_SUPPRT
-   CMCHKPK(SPkS16, param->rguDlSapId, mBuf);
-   CMCHKPK(SPkS16, param->rguUlSapId, mBuf);
-#endif
-   CMCHKPK(cmPkCrgBwCfg, &param->bwCfg, mBuf);
-   CMCHKPK(cmPkCrgRachCfg, &param->rachCfg, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgCellCfg
-*
-*
-*     Desc : Cell configuration
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCellCfg
-(
-CrgCellCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgCellCfg(param, mBuf)
-CrgCellCfg *param;
-Buffer *mBuf;
-#endif
-{
+   CMCHKUNPK(oduPackUInt8, &param->isSCellCfgPres, mBuf);
+   if(TRUE == param->isSCellCfgPres)
+   {
+      CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
 
-   TRC3(cmUnpkCrgCellCfg)
+      for(idx = 0; idx < param->numSCells; idx++)
+      {
+         CMCHKUNPK(cmUnpkCrgUeSCellCfg, &param->ueSCellCfg[idx],mBuf);
+      }
+   }
 
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkCrgRachCfg, &param->rachCfg, mBuf);
-   CMCHKUNPK(cmUnpkCrgBwCfg, &param->bwCfg, mBuf);
-#ifdef TENB_MULT_CELL_SUPPRT
-   CMCHKUNPK(SUnpkS16, &param->rguUlSapId, mBuf);
-   CMCHKUNPK(SUnpkS16, &param->rguDlSapId, mBuf);
-#endif
-#ifdef EMTC_ENABLE
-   CMCHKUNPK(SUnpkU8, &param->emtcEnable, mBuf);
-#endif
-   RETVALUE(ROK);
+   return ROK;
 }
 
+#endif /* LTE_ADV */
 
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgUeUlHqCfg
-*
-*
-*     Desc : Uplink HARQ configuration per UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeUlHqCfg
-(
-CrgUeUlHqCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgUeUlHqCfg(param, mBuf)
-CrgUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgUeUlHqCfg)
-
-   CMCHKPK(SPkU8, param->maxUlHqTx, mBuf);
-   RETVALUE(ROK);
-}
-
-#ifdef LTE_ADV
-/***********************************************************
-*
-*     Func : cmPkCrgUeSCellCfg
-*
-*
-*     Desc : Secondary Cell information of the UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkCrgUeSCellCfg
-(
-CrgUeSCellInfo *param,
-Buffer *mBuf
-)
-#else
-PRIVATE S16 cmPkCrgUeSCellCfg(param, mBuf)
-CrgUeSCellInfo *param;
-Buffer *mBuf;
 #endif
-{
-   CMCHKPK(SPkS16, param->rguDlSapId, mBuf);
-   CMCHKPK(SPkS16, param->rguUlSapId, mBuf);
-   CMCHKPK(SPkU8, param->macInst, mBuf);
-   CMCHKPK(SPkU16, param->sCellId, mBuf);
-
-   RETVALUE(ROK);
-}
-/***********************************************************
-*
-*     Func : cmUnpkCrgUeSCellCfg
-*
-*
-*     Desc : Secondary Cell information of the UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnpkCrgUeSCellCfg
-(
-CrgUeSCellInfo *param,
-Buffer *mBuf
-)
-#else
-PRIVATE S16 cmUnpkCrgUeSCellCfg(param, mBuf)
-CrgUeSCellInfo *param;
-Buffer *mBuf;
-#endif
-{
-   CMCHKUNPK(SUnpkU16, &param->sCellId, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->macInst, mBuf);
-   CMCHKUNPK(SUnpkS16, &param->rguUlSapId, mBuf);
-   CMCHKUNPK(SUnpkS16, &param->rguDlSapId, mBuf);
-   RETVALUE(ROK);
-}
-/***********************************************************
-*
-*     Func : cmPkCrgUeSecCellInfo
-*
-*
-*     Desc : Secondary Cell information of the UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeSecCellInfo
-(
-CrgUeSecCellInfo *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgUeSecCellInfo(param, mBuf)
-CrgUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
-{
-   S8 idx;
-   for(idx = param->numSCells - 1; idx >= 0; idx--)
-   {
-      CMCHKPK(cmPkCrgUeSCellCfg, &param->ueSCellCfg[(U8)idx], mBuf);
-   }
-
-   CMCHKPK(SPkU8, param->numSCells, mBuf);
-   CMCHKPK(SPkU8, param->isSCellCfgPres, mBuf);
-
-   RETVALUE(ROK);
-}
-
-/***********************************************************
-*
-*     Func : cmUnpkCrgUeSecCellInfo
-*
-*
-*     Desc : Secondary Cell information of the UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeSecCellInfo
-(
-CrgUeSecCellInfo *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgUeSecCellInfo(param, mBuf)
-CrgUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
-{
-   U8 idx;
-
-   CMCHKUNPK(SUnpkU8, &param->isSCellCfgPres, mBuf);
-   if(TRUE == param->isSCellCfgPres)
-   {
-      CMCHKUNPK(SUnpkU8, &param->numSCells, mBuf);
-
-      for(idx = 0; idx < param->numSCells; idx++)
-      {
-         CMCHKUNPK(cmUnpkCrgUeSCellCfg, &param->ueSCellCfg[idx],mBuf);
-      }
-   }
-
-   RETVALUE(ROK);
-}
-
-#endif /* LTE_ADV */
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgUeUlHqCfg
-*
-*
-*     Desc : Uplink HARQ configuration per UE
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeUlHqCfg
-(
-CrgUeUlHqCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgUeUlHqCfg(param, mBuf)
-CrgUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgUeUlHqCfg)
-
-   CMCHKUNPK(SUnpkU8, &param->maxUlHqTx, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgUeCfg
-*
-*
-*     Desc : UE configuration
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeCfg
-(
-CrgUeCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgUeCfg(param, mBuf)
-CrgUeCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgUeCfg)
-#ifdef TENB_MULT_CELL_SUPPRT
-   CMCHKPK(SPkS16, param->rguDlSapId, mBuf);
-   CMCHKPK(SPkS16, param->rguUlSapId, mBuf);
-#endif
-   CMCHKPK(SPkU32, param->txMode.tm, mBuf);
-   CMCHKPK(SPkU8, param->txMode.pres, mBuf);
-   CMCHKPK(cmPkCrgUeUlHqCfg, &param->ueUlHqCfg, mBuf);
-   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgUeCfg
-*
-*
-*     Desc : UE configuration
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeCfg
-(
-CrgUeCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgUeCfg(param, mBuf)
-CrgUeCfg *param;
-Buffer *mBuf;
-#endif
-{
-   U32 tmpEnum;
-   
-   TRC3(cmUnpkCrgUeCfg)
-
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   CMCHKUNPK(cmUnpkCrgUeUlHqCfg, &param->ueUlHqCfg, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->txMode.pres, mBuf);
-   CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
-   param->txMode.tm = (CrgTxMode) tmpEnum;
-#ifdef TENB_MULT_CELL_SUPPRT
-   CMCHKUNPK(SUnpkS16, &param->rguUlSapId, mBuf);
-   CMCHKUNPK(SUnpkS16, &param->rguDlSapId, mBuf);
-#endif
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgDlLchCfg
-*
-*
-*     Desc : Logical channel configuration info for downlink logical channels
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgDlLchCfg
-(
-CrgDlLchCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgDlLchCfg(param, mBuf)
-CrgDlLchCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgDlLchCfg)
-
-   CMCHKPK(SPkU8, param->dlTrchType, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgDlLchCfg
-*
-*
-*     Desc : Logical channel configuration info for downlink logical channels
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgDlLchCfg
-(
-CrgDlLchCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgDlLchCfg(param, mBuf)
-CrgDlLchCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgDlLchCfg)
-
-   CMCHKUNPK(SUnpkU8, &param->dlTrchType, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgUlLchCfg
-*
-*
-*     Desc : Logical channel configuration info for uplink logical channels
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUlLchCfg
-(
-CrgUlLchCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgUlLchCfg(param, mBuf)
-CrgUlLchCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgUlLchCfg)
-
-   CMCHKPK(SPkU8, param->lcgId, mBuf);
-   CMCHKPK(SPkU8, param->ulTrchType, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgUlLchCfg
-*
-*
-*     Desc : Logical channel configuration info for uplink logical channels
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUlLchCfg
-(
-CrgUlLchCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgUlLchCfg(param, mBuf)
-CrgUlLchCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgUlLchCfg)
-
-   CMCHKUNPK(SUnpkU8, &param->ulTrchType, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->lcgId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgLchCfg
-*
-*
-*     Desc : Logical channel configuration info for common and dedicated channels
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgLchCfg
-(
-CrgLchCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgLchCfg(param, mBuf)
-CrgLchCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgLchCfg)
-/* crg_c_001.main_5 - ADD - Added the packing for LTE_L2_MEAS. */
-#ifdef LTE_L2_MEAS
-   CMCHKPK(SPkU8, param->qci, mBuf);
-#endif
-   CMCHKPK(cmPkCrgUlLchCfg, &param->ulInfo, mBuf);
-   CMCHKPK(cmPkCrgDlLchCfg, &param->dlInfo, mBuf);
-   CMCHKPK(SPkU8, param->dir, mBuf);
-   CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
-   CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
-   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgLchCfg
-*
-*
-*     Desc : Logical channel configuration info for common and dedicated channels
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgLchCfg
-(
-CrgLchCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgLchCfg(param, mBuf)
-CrgLchCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgLchCfg)
-
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
-   CMCHKUNPK(cmUnpkLteLcType, &param->lcType, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->dir, mBuf);
-   CMCHKUNPK(cmUnpkCrgDlLchCfg, &param->dlInfo, mBuf);
-   CMCHKUNPK(cmUnpkCrgUlLchCfg, &param->ulInfo, mBuf);
-/* crg_c_001.main_5 - ADD - Added the unpacking for LTE_L2_MEAS. */
-#ifdef LTE_L2_MEAS
-   CMCHKUNPK(SUnpkU8, &param->qci, mBuf);
-#endif
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgCfg
-*
-*
-*     Desc : Basic configuration info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfg
-(
-CrgCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgCfg(param, mBuf)
-CrgCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgCfg)
-
-      switch(param->cfgType) {
-         case CRG_LCH_CFG:
-            CMCHKPK(cmPkCrgLchCfg, &param->u.lchCfg, mBuf);
-            break;
-         case CRG_UE_CFG:
-            CMCHKPK(cmPkCrgUeCfg, &param->u.ueCfg, mBuf);
-            break;
-         case CRG_CELL_CFG:
-            CMCHKPK(cmPkCrgCellCfg, &param->u.cellCfg, mBuf);
-            break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   CMCHKPK(SPkU8, param->cfgType, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgCfg
-*
-*
-*     Desc : Basic configuration info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfg
-(
-CrgCfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgCfg(param, mBuf)
-CrgCfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgCfg)
-
-   CMCHKUNPK(SUnpkU8, &param->cfgType, mBuf);
-      switch(param->cfgType) {
-         case CRG_CELL_CFG:
-            CMCHKUNPK(cmUnpkCrgCellCfg, &param->u.cellCfg, mBuf);
-            break;
-         case CRG_UE_CFG:
-            CMCHKUNPK(cmUnpkCrgUeCfg, &param->u.ueCfg, mBuf);
-            break;
-         case CRG_LCH_CFG:
-            CMCHKUNPK(cmUnpkCrgLchCfg, &param->u.lchCfg, mBuf);
-            break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgCellRecfg
-*
-*
-*     Desc : Cell reconfiguration info
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCellRecfg
-(
-CrgCellRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgCellRecfg(param, mBuf)
-CrgCellRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgCellRecfg)
-
-   CMCHKPK(cmPkCrgRachCfg, &param->rachRecfg, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgCellRecfg
-*
-*
-*     Desc : Cell reconfiguration info
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCellRecfg
-(
-CrgCellRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgCellRecfg(param, mBuf)
-CrgCellRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgCellRecfg)
-
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkCrgRachCfg, &param->rachRecfg, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgUeRecfg
-*
-*
-*     Desc : UE reconfiguration info
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeRecfg
-(
-CrgUeRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgUeRecfg(param, mBuf)
-CrgUeRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgUeRecfg)
-#ifdef LTE_ADV
-   if(TRUE == param->crgSCellCfg.isSCellCfgPres)
-   {
-      CMCHKPK(cmPkCrgUeSecCellInfo, &param->crgSCellCfg, mBuf);
-   }
-   else
-   {
-      CMCHKPK(SPkU8, param->crgSCellCfg.isSCellCfgPres, mBuf);
-   }
-#endif /* LTE_ADV */
-   CMCHKPK(SPkU32, param->txMode.tm, mBuf);
-   CMCHKPK(SPkU8, param->txMode.pres, mBuf);
-   CMCHKPK(cmPkCrgUeUlHqCfg, &param->ueUlHqRecfg, mBuf);
-   CMCHKPK(cmPkLteRnti, param->newCrnti, mBuf);
-   CMCHKPK(cmPkLteRnti, param->oldCrnti, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgUeRecfg
-*
-*
-*     Desc : UE reconfiguration info
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeRecfg
-(
-CrgUeRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgUeRecfg(param, mBuf)
-CrgUeRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgUeRecfg)
-
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->oldCrnti, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->newCrnti, mBuf);
-   CMCHKUNPK(cmUnpkCrgUeUlHqCfg, &param->ueUlHqRecfg, mBuf);
-   CMCHKUNPK(SUnpkU8, &param->txMode.pres, mBuf);
-   CMCHKUNPK(SUnpkU32, (U32 *)&param->txMode.tm, mBuf);
-#ifdef LTE_ADV 
-      CMCHKUNPK(cmUnpkCrgUeSecCellInfo, &param->crgSCellCfg, mBuf);
-#endif /* LTE_ADV */
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgLchRecfg
-*
-*
-*     Desc : Logical channel reconfiguration info for dedicated channels only
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgLchRecfg
-(
-CrgLchRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgLchRecfg(param, mBuf)
-CrgLchRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgLchRecfg)
-
-      CMCHKPK(SPkU8, param->ulRecfg.lcgId, mBuf);
-   CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
-   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgLchRecfg
-*
-*
-*     Desc : Logical channel reconfiguration info for dedicated channels only
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgLchRecfg
-(
-CrgLchRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgLchRecfg(param, mBuf)
-CrgLchRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgLchRecfg)
-
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
-      CMCHKUNPK(SUnpkU8, &param->ulRecfg.lcgId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgRecfg
-*
-*
-*     Desc : Basic reconfiguration info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgRecfg
-(
-CrgRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgRecfg(param, mBuf)
-CrgRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgRecfg)
-
-      switch(param->recfgType) {
-         case CRG_LCH_CFG:
-            CMCHKPK(cmPkCrgLchRecfg, &param->u.lchRecfg, mBuf);
-            break;
-         case CRG_UE_CFG:
-            CMCHKPK(cmPkCrgUeRecfg, &param->u.ueRecfg, mBuf);
-            break;
-         case CRG_CELL_CFG:
-            CMCHKPK(cmPkCrgCellRecfg, &param->u.cellRecfg, mBuf);
-            break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   CMCHKPK(SPkU8, param->recfgType, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgRecfg
-*
-*
-*     Desc : Basic reconfiguration info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgRecfg
-(
-CrgRecfg *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgRecfg(param, mBuf)
-CrgRecfg *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgRecfg)
-
-   CMCHKUNPK(SUnpkU8, &param->recfgType, mBuf);
-      switch(param->recfgType) {
-         case CRG_CELL_CFG:
-            CMCHKUNPK(cmUnpkCrgCellRecfg, &param->u.cellRecfg, mBuf);
-            break;
-         case CRG_UE_CFG:
-            CMCHKUNPK(cmUnpkCrgUeRecfg, &param->u.ueRecfg, mBuf);
-            break;
-         case CRG_LCH_CFG:
-            CMCHKUNPK(cmUnpkCrgLchRecfg, &param->u.lchRecfg, mBuf);
-            break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgDel
-*
-*
-*     Desc : Basic Delete info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgDel
-(
-CrgDel *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgDel(param, mBuf)
-CrgDel *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgDel)
-
-      switch(param->delType) {
-         case CRG_LCH_CFG:
-            CMCHKPK(SPkU8, param->u.lchDel.dir, mBuf);
-            CMCHKPK(cmPkLteLcId, param->u.lchDel.lcId, mBuf);
-            CMCHKPK(cmPkLteRnti, param->u.lchDel.crnti, mBuf);
-            CMCHKPK(cmPkLteCellId, param->u.lchDel.cellId, mBuf);
-         break;
-         case CRG_UE_CFG:
-            CMCHKPK(cmPkLteRnti, param->u.ueDel.crnti, mBuf);
-            CMCHKPK(cmPkLteCellId, param->u.ueDel.cellId, mBuf);
-         break;
-         case CRG_CELL_CFG:
-            CMCHKPK(cmPkLteCellId, param->u.cellDel.cellId, mBuf);
-         break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   CMCHKPK(SPkU8, param->delType, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgDel
-*
-*
-*     Desc : Basic Delete info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgDel
-(
-CrgDel *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgDel(param, mBuf)
-CrgDel *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgDel)
-
-   CMCHKUNPK(SUnpkU8, &param->delType, mBuf);
-      switch(param->delType) {
-         case CRG_CELL_CFG:
-            CMCHKUNPK(cmUnpkLteCellId, &param->u.cellDel.cellId, mBuf);
-         break;
-         case CRG_UE_CFG:
-            CMCHKUNPK(cmUnpkLteCellId, &param->u.ueDel.cellId, mBuf);
-            CMCHKUNPK(cmUnpkLteRnti, &param->u.ueDel.crnti, mBuf);
-         break;
-         case CRG_LCH_CFG:
-            CMCHKUNPK(cmUnpkLteCellId, &param->u.lchDel.cellId, mBuf);
-            CMCHKUNPK(cmUnpkLteRnti, &param->u.lchDel.crnti, mBuf);
-            CMCHKUNPK(cmUnpkLteLcId, &param->u.lchDel.lcId, mBuf);
-            CMCHKUNPK(SUnpkU8, &param->u.lchDel.dir, mBuf);
-         break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgRst
-*
-*
-*     Desc : UE RESET info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgRst
-(
-CrgRst *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgRst(param, mBuf)
-CrgRst *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgRst)
-
-   CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
-   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgRst
-*
-*
-*     Desc : UE RESET info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgRst
-(
-CrgRst *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgRst(param, mBuf)
-CrgRst *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgRst)
-
-   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmPkCrgCfgReqInfo
-*
-*
-*     Desc : Config/Reconfig/Delete info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfgReqInfo
-(
-CrgCfgReqInfo *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmPkCrgCfgReqInfo(param, mBuf)
-CrgCfgReqInfo *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmPkCrgCfgReqInfo)
-
-      switch(param->action) {
-         case CRG_RESET:
-            CMCHKPK(cmPkCrgRst, &param->u.rstInfo, mBuf);
-            break;
-         case CRG_DELETE:
-            CMCHKPK(cmPkCrgDel, &param->u.delInfo, mBuf);
-            break;
-         case CRG_RECONFIG:
-            CMCHKPK(cmPkCrgRecfg, &param->u.recfgInfo, mBuf);
-            break;
-         case CRG_CONFIG:
-            CMCHKPK(cmPkCrgCfg, &param->u.cfgInfo, mBuf);
-            break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   CMCHKPK(SPkU8, param->action, mBuf);
-   RETVALUE(ROK);
-}
-
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkCrgCfgReqInfo
-*
-*
-*     Desc : Config/Reconfig/Delete info for MAC
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgReqInfo
-(
-CrgCfgReqInfo *param,
-Buffer *mBuf
-)
-#else
-PUBLIC S16 cmUnpkCrgCfgReqInfo(param, mBuf)
-CrgCfgReqInfo *param;
-Buffer *mBuf;
-#endif
-{
-
-   TRC3(cmUnpkCrgCfgReqInfo)
-
-   CMCHKUNPK(SUnpkU8, &param->action, mBuf);
-      switch(param->action) {
-         case CRG_CONFIG:
-            CMCHKUNPK(cmUnpkCrgCfg, &param->u.cfgInfo, mBuf);
-            break;
-         case CRG_RECONFIG:
-            CMCHKUNPK(cmUnpkCrgRecfg, &param->u.recfgInfo, mBuf);
-            break;
-         case CRG_DELETE:
-            CMCHKUNPK(cmUnpkCrgDel, &param->u.delInfo, mBuf);
-            break;
-         case CRG_RESET:
-            CMCHKUNPK(cmUnpkCrgRst, &param->u.rstInfo, mBuf);
-            break;
-         default :
-            RETVALUE(RFAILED);
-      }
-   RETVALUE(ROK);
-}
-#endif
-
 /**********************************************************************
          End of file
 **********************************************************************/