X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcrg.c;h=d6c0c79fc2dbe28fa11d371b854133253c3db376;hb=97a2285207414a7948f5e1dfcb5318fa9507c123;hp=ba6a7fe3482cbf5c9e5f0caef548c876ec01bf94;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/cm/crg.c b/src/cm/crg.c
index ba6a7fe34..d6c0c79fc 100755
--- 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)
@@ -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);
@@ -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)
@@ -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);
@@ -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)
@@ -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);
@@ -407,24 +359,15 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfgReq
+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)
@@ -432,7 +375,7 @@ CrgCfgReqInfo  * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG016, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
       return RFAILED;
    }
    if (cmPkCrgCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
@@ -441,7 +384,7 @@ CrgCfgReqInfo  * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG017, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -452,7 +395,7 @@ CrgCfgReqInfo  * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG018, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
@@ -462,11 +405,11 @@ CrgCfgReqInfo  * cfgReqInfo;
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
          (ErrVal)ECRG019, (ErrVal)0, "Packing failed");
 #endif
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
       SPutMsg(mBuf);
       return RFAILED;
    }
-   if (SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo)) != ROK) {
+   if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,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,
@@ -495,25 +438,17 @@ CrgCfgReqInfo  * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgReq
+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);
@@ -533,7 +468,7 @@ Buffer *mBuf;
 #endif
       return RFAILED;
    }
-   if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CrgCfgReqInfo))) != ROK) {
+   if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,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,
@@ -544,7 +479,7 @@ Buffer *mBuf;
    }
     
    if (cmUnpkCrgCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
-      SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
+      SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo));
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -568,28 +503,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)
@@ -642,29 +568,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);
@@ -713,21 +631,14 @@ 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(oduUnpackUInt8, param->trans[i], mBuf);
@@ -752,21 +663,14 @@ 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(oduPackUInt8, &param->trans[i], mBuf);
@@ -791,20 +695,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgBwCfg
+S16 cmPkCrgBwCfg
 (
 CrgBwCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgBwCfg(param, mBuf)
-CrgBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgBwCfg)
 
    CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf);
    CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf);
@@ -828,20 +725,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgBwCfg
+S16 cmUnpkCrgBwCfg
 (
 CrgBwCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgBwCfg(param, mBuf)
-CrgBwCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgBwCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->dlTotalBw, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ulTotalBw, mBuf);
@@ -865,20 +755,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgRachCfg
+S16 cmPkCrgRachCfg
 (
 CrgRachCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgRachCfg(param, mBuf)
-CrgRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgRachCfg)
 
    CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf);
    return ROK;
@@ -901,20 +784,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgRachCfg
+S16 cmUnpkCrgRachCfg
 (
 CrgRachCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgRachCfg(param, mBuf)
-CrgRachCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgRachCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->maxMsg3Tx, mBuf);
    return ROK;
@@ -937,21 +813,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCellCfg
+S16 cmPkCrgCellCfg
 (
 CrgCellCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgCellCfg(param, mBuf)
-CrgCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgCellCfg)
-
 #ifdef EMTC_ENABLE
    CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf);
 #endif
@@ -982,20 +850,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCellCfg
+S16 cmUnpkCrgCellCfg
 (
 CrgCellCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgCellCfg(param, mBuf)
-CrgCellCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgCellCfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkCrgRachCfg, &param->rachCfg, mBuf);
@@ -1027,20 +888,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeUlHqCfg
+S16 cmPkCrgUeUlHqCfg
 (
 CrgUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgUeUlHqCfg(param, mBuf)
-CrgUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgUeUlHqCfg)
 
    CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf);
    return ROK;
@@ -1062,17 +916,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkCrgUeSCellCfg
+static 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);
@@ -1096,17 +944,11 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnpkCrgUeSCellCfg
+static S16 cmUnpkCrgUeSCellCfg
 (
 CrgUeSCellInfo *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkCrgUeSCellCfg(param, mBuf)
-CrgUeSCellInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->macInst, mBuf);
@@ -1129,22 +971,16 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeSecCellInfo
+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(cmPkCrgUeSCellCfg, &param->ueSCellCfg[(uint8_t)idx], mBuf);
    }
 
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
@@ -1168,19 +1004,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeSecCellInfo
+S16 cmUnpkCrgUeSecCellInfo
 (
 CrgUeSecCellInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgUeSecCellInfo(param, mBuf)
-CrgUeSecCellInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->isSCellCfgPres, mBuf);
    if(TRUE == param->isSCellCfgPres)
@@ -1214,20 +1044,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeUlHqCfg
+S16 cmUnpkCrgUeUlHqCfg
 (
 CrgUeUlHqCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgUeUlHqCfg(param, mBuf)
-CrgUeUlHqCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgUeUlHqCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->maxUlHqTx, mBuf);
    return ROK;
@@ -1250,20 +1073,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeCfg
+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);
@@ -1293,27 +1109,20 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeCfg
+S16 cmUnpkCrgUeCfg
 (
 CrgUeCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgUeCfg(param, mBuf)
-CrgUeCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
    
-   TRC3(cmUnpkCrgUeCfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
    CMCHKUNPK(cmUnpkCrgUeUlHqCfg, &param->ueUlHqCfg, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->txMode.pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->txMode.tm = (CrgTxMode) tmpEnum;
 #ifdef TENB_MULT_CELL_SUPPRT
    CMCHKUNPK(SUnpkS16, &param->rguUlSapId, mBuf);
@@ -1339,20 +1148,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgDlLchCfg
+S16 cmPkCrgDlLchCfg
 (
 CrgDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgDlLchCfg(param, mBuf)
-CrgDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgDlLchCfg)
 
    CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf);
    return ROK;
@@ -1375,20 +1177,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgDlLchCfg
+S16 cmUnpkCrgDlLchCfg
 (
 CrgDlLchCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgDlLchCfg(param, mBuf)
-CrgDlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgDlLchCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->dlTrchType, mBuf);
    return ROK;
@@ -1411,21 +1206,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUlLchCfg
+S16 cmPkCrgUlLchCfg
 (
 CrgUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgUlLchCfg(param, mBuf)
-CrgUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgUlLchCfg)
-
    CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf);
    return ROK;
@@ -1448,20 +1235,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUlLchCfg
+S16 cmUnpkCrgUlLchCfg
 (
 CrgUlLchCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgUlLchCfg(param, mBuf)
-CrgUlLchCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgUlLchCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->ulTrchType, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
@@ -1485,20 +1265,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgLchCfg
+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(oduUnpackUInt8, param->qci, mBuf);
@@ -1530,20 +1303,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgLchCfg
+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);
@@ -1576,20 +1342,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfg
+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:
@@ -1625,20 +1384,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfg
+S16 cmUnpkCrgCfg
 (
 CrgCfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgCfg(param, mBuf)
-CrgCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgType, mBuf);
       switch(param->cfgType) {
@@ -1674,20 +1426,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCellRecfg
+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);
@@ -1711,20 +1456,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCellRecfg
+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);
@@ -1748,20 +1486,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgUeRecfg
+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)
    {
@@ -1798,27 +1529,20 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeRecfg
+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(oduPackUInt8, &param->txMode.pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->txMode.tm, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->txMode.tm, mBuf);
 #ifdef LTE_ADV 
       CMCHKUNPK(cmUnpkCrgUeSecCellInfo, &param->crgSCellCfg, mBuf);
 #endif /* LTE_ADV */
@@ -1842,20 +1566,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgLchRecfg
+S16 cmPkCrgLchRecfg
 (
 CrgLchRecfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmPkCrgLchRecfg(param, mBuf)
-CrgLchRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmPkCrgLchRecfg)
 
       CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf);
    CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
@@ -1881,20 +1598,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgLchRecfg
+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);
@@ -1920,20 +1630,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgRecfg
+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:
@@ -1969,20 +1672,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgRecfg
+S16 cmUnpkCrgRecfg
 (
 CrgRecfg *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgRecfg(param, mBuf)
-CrgRecfg *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgRecfg)
 
    CMCHKUNPK(oduPackUInt8, &param->recfgType, mBuf);
       switch(param->recfgType) {
@@ -2018,20 +1714,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgDel
+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:
@@ -2071,20 +1760,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgDel
+S16 cmUnpkCrgDel
 (
 CrgDel *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgDel(param, mBuf)
-CrgDel *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgDel)
 
    CMCHKUNPK(oduPackUInt8, &param->delType, mBuf);
       switch(param->delType) {
@@ -2124,20 +1806,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgRst
+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);
@@ -2161,20 +1836,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgRst
+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);
@@ -2198,20 +1866,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkCrgCfgReqInfo
+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:
@@ -2250,20 +1911,13 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgReqInfo
+S16 cmUnpkCrgCfgReqInfo
 (
 CrgCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkCrgCfgReqInfo(param, mBuf)
-CrgCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   TRC3(cmUnpkCrgCfgReqInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->action, mBuf);
       switch(param->action) {