Merge "O-DU High Architecture updated"

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

diff --git a/src/cm/ctf.c b/src/cm/ctf.c
index 595d6d4..08e00ea 100755 (executable)
--- a/src/cm/ctf.c
+++ b/src/cm/ctf.c
@@ -78,7 +78,6 @@ SpId spId;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfBndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -144,7 +143,6 @@ Buffer *mBuf;
    SuId suId = 0;
    SpId spId = 0;
    
-   TRC3(cmUnpkCtfBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -181,7 +179,7 @@ Buffer *mBuf;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -190,17 +188,16 @@ S16 cmPkCtfBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
 S16 cmPkCtfBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -246,7 +243,7 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -265,9 +262,8 @@ Buffer *mBuf;
 #endif
 {
    SuId suId = 0;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCtfBndCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -322,7 +318,6 @@ Reason reason;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfUbndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -388,7 +383,6 @@ Buffer *mBuf;
    SpId spId = 0;
    Reason reason = 0;
    
-   TRC3(cmUnpkCtfUbndReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -430,13 +424,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PRIVATE S16 cmRelCtfCfgReq
+static S16 cmRelCtfCfgReq
 (
 Pst  *pst,
 CtfCfgReqInfo *cfgReqInfo
 )
 #else
-PRIVATE S16 cmRelCtfCfgReq(pst,cfgReqInfo)
+static S16 cmRelCtfCfgReq(pst,cfgReqInfo)
 Pst  *pst;
 CtfCfgReqInfo *param;
 #endif
@@ -489,7 +483,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfNhKeyInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -536,7 +529,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfKenbStarInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -584,7 +576,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfAskeyInfo)
 
          
    for(idx=31;idx>=0;idx--)
@@ -630,7 +621,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfKdfReqInfo)
 
    switch (param->keyDerType)
     {
@@ -685,7 +675,6 @@ CtfKdfReqInfo* kdfReqInfo;
    Buffer *mBuf = NULLP;
 
 
-   TRC3(cmPkCtfKdfReq)
    
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -766,12 +755,11 @@ Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmPkCtfCnmVendorSpecificInfo);
    if(param->numOfVendorSpecifcParam <= CTF_CNM_MAX_VENDOR_PARAMS)
    {
       for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--)
       {
-         CMCHKPK(oduUnpackUInt32,(U32)param->vendorSpecifcParam[i], mBuf);
+         CMCHKPK(oduUnpackUInt32,(uint32_t)param->vendorSpecifcParam[i], mBuf);
       }
    }
    CMCHKPK(oduUnpackUInt16, param->numOfVendorSpecifcParam, mBuf);
@@ -791,7 +779,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCtfCnmCellSyncReq);
    CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf);
    CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf);
@@ -816,7 +803,6 @@ Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmPkCtfcfgReqInfo);
 
    CMCHKPK(oduUnpackUInt8, param->searchType, mBuf);
    CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf);
@@ -846,7 +832,6 @@ Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmUnpkCtfCnmVendorSpecificInfo);
 
    CMCHKUNPK(oduPackUInt16, &param->numOfVendorSpecifcParam, mBuf);
    for(i=0; (i<param->numOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++)
@@ -868,7 +853,6 @@ CtfCnmCellSyncReq *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkCtfCtfCnmCellSyncReq);
 
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
@@ -895,7 +879,6 @@ Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmUnpkCtfsyncReqInfo);
 
    CMCHKUNPK(oduPackUInt16, &param->numOfPciList, mBuf);
    for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
@@ -943,7 +926,6 @@ CtfCnmCellSyncReq * cfgReqInfo;
 
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkCtfCnmCellSyncReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1044,7 +1026,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncReq *SyncReqMsg = NULLP;
-   TRC3(cmUnpkCtfCnmCellSyncReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1136,7 +1117,6 @@ CtfCnmInitSyncReq * cfgReqInfo;
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkCtfCnmInitSyncReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1239,7 +1219,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmInitSyncReq *syncReqInfo = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1308,7 +1287,6 @@ CtfCnmMibInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkCtfctfCnmMibInfo)
 
    CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
    CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf);
@@ -1331,7 +1309,6 @@ CtfCnmInitSyncInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkCtfctfCnmInitSyncInfo)
 
    CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
@@ -1356,7 +1333,6 @@ Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmPkCtfcfgRspInfo)
 
 
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
@@ -1405,7 +1381,6 @@ CtfCnmInitSyncRsp * cfgRspInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmInitSyncRsp)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1488,7 +1463,6 @@ CtfCnmMibInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkCtfctfCnmMibInfo);
 
 
    CMCHKUNPK(oduPackUInt8, &param->dlSystemBandWidht, mBuf);
@@ -1512,7 +1486,6 @@ CtfCnmInitSyncInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkctfCnmInitSyncInfo);
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, &param->ctfCnmMibInfo, mBuf);
@@ -1537,7 +1510,6 @@ Buffer *mBuf;
 #endif
 {
     S32 i;
-    TRC3(cmUnpkCtfCnmInitSyncRspMsg);
 
 
     CMCHKUNPK(oduPackUInt8, &param->numOfNeighbourInfo, mBuf);
@@ -1582,7 +1554,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmInitSyncRsp *syncRspInfo = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1653,7 +1624,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellSyncRsp)
 
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    return ROK;
@@ -1692,7 +1662,6 @@ CtfCnmCellSyncRsp * cfgRspInfo;
 {
 
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmCellSyncRsp)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1777,7 +1746,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCnmSyncRspMsg);
 
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
@@ -1815,7 +1783,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncRsp *syncRspMsg = NULLP;
-   TRC3(cmUnpkCtfCnmCellSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1886,7 +1853,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfcfgIndInfo);
 
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
@@ -1926,7 +1892,6 @@ CtfCnmCellSyncInd * cfgIndInfo;
 {
    
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmCellSyncInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2011,7 +1976,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCnmSyncIndMsg);
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
@@ -2050,7 +2014,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncInd *syncIndMsg = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2146,7 +2109,6 @@ CtfCfgReqInfo* cfgReqInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCfgReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2245,9 +2207,8 @@ Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfNhKeyInfo)
          
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
@@ -2289,9 +2250,8 @@ Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfKenbStarInfo)
          
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
@@ -2334,9 +2294,8 @@ Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfAskeyInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->intgAlgoType, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ciphAlgoType, mBuf);
@@ -2378,7 +2337,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfKdfReqInfo)
 
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
      switch (param->keyDerType)
@@ -2431,7 +2389,6 @@ Buffer *mBuf;
    CtfCfgTransId transId;
    CtfKdfReqInfo *kdfReqInfo = NULLP;
    
-   TRC3(cmUnpkCtfKdfReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2527,7 +2484,6 @@ Buffer *mBuf;
    CtfCfgTransId transId;
    CtfCfgReqInfo *cfgReqInfo = NULLP;
    
-   TRC3(cmUnpkCtfCfgReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2617,7 +2573,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfNhKeyCfmInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2659,7 +2614,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfKenbStarCfmInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2702,7 +2656,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfCtfAskeyCfmInfo)
 
    for(idx=15;idx>=0;idx--)
    {
@@ -2750,7 +2703,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfKdfCfmInfo)
 
    switch (param->keyDerType)
     {
@@ -2780,7 +2732,7 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -2791,18 +2743,17 @@ Pst* pst,
 SuId suId,
 CtfCfgTransId transId,
 CtfKdfCfmInfo *kdfCfmInfo,
-U8 status
+uint8_t status
 )
 #else
 S16 cmPkCtfKdfCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 CtfCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfKdfCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2890,7 +2841,7 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -2900,18 +2851,17 @@ S16 cmPkCtfCfgCfm
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
 S16 cmPkCtfCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 CtfCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCfgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2984,7 +2934,6 @@ CtfCfgTransId transId;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfEnbStopInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3051,9 +3000,8 @@ Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfNhKeyCfmInfo)
          
    for(idx=0;idx<32;idx++)
    {
@@ -3093,9 +3041,8 @@ Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfKenbStarCfmInfo)
          
    for(idx=0;idx<32;idx++)
    {
@@ -3136,9 +3083,8 @@ Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfCtfAskeyCfmInfo)
          
    for(idx=0;idx<16;idx++)
    {
@@ -3186,7 +3132,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfKdfCfmInfo)
 
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
    switch (param->keyDerType)
@@ -3216,7 +3161,7 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -3236,10 +3181,9 @@ Buffer *mBuf;
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   U8 status;
+   uint8_t status;
    CtfKdfCfmInfo kdfCfmInfo;
    
-   TRC3(cmUnpkCtfKdfCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3298,7 +3242,7 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -3318,9 +3262,8 @@ Buffer *mBuf;
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCtfCfgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3386,7 +3329,6 @@ Buffer *mBuf;
    SuId suId = 0;
    CtfCfgTransId transId;
    
-   TRC3(cmUnpkCtfCfgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3447,7 +3389,6 @@ CtfUeInfo * newUeInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfUeIdChgReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3601,7 +3542,6 @@ Buffer *mBuf;
    CtfUeInfo *ueInfo = NULLP;
    CtfUeInfo *newUeInfo = NULLP;
    
-   TRC3(cmUnpkCtfUeIdChgReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3701,7 +3641,7 @@ Buffer *mBuf;
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
 *  @param[in]   CtfUeInfo *  ueInfo
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -3724,7 +3664,6 @@ CmStatus status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfUeIdChgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3823,7 +3762,7 @@ CmStatus status;
 *  @param[in]   SuId  suId
 *  @param[in]   CtfCfgTransId  transId
 *  @param[in]   CtfUeInfo *  ueInfo
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
@@ -3846,7 +3785,6 @@ Buffer *mBuf;
    CtfUeInfo *ueInfo = NULLP;
    CmStatus status;
    
-   TRC3(cmUnpkCtfUeIdChgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3943,7 +3881,6 @@ Buffer *mBuf;
 {
 
    S32 i;
-   TRC3(cmPkCtfCfgTransId)
 
    for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) {
       CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
@@ -3982,7 +3919,6 @@ Buffer *mBuf;
 {
 
    S32 i;
-   TRC3(cmUnpkCtfCfgTransId)
 
    for (i=0; i<CTF_CFG_TRANSID_SIZE; i++) {
       CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
@@ -4020,7 +3956,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfUeInfo)
 
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -4057,7 +3992,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfUeInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -4096,7 +4030,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfBwCfgInfo)
 
    CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf);
    CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf);
@@ -4137,13 +4070,12 @@ Buffer *mBuf;
 #endif
 {
 
-   U32 tmpEnum;
-   TRC3(cmUnpkCtfBwCfgInfo)
+   uint32_t tmpEnum;
 
    /* ctf_c_001.main_4: Removed UnPacking of param->pres */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->dlBw = (CtfBandwidth)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ulBw = (CtfBandwidth)tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->eUtraBand, mBuf);
    return ROK;
@@ -4180,7 +4112,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfTxSchemeCfg)
 
    CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf);
    CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf);
@@ -4219,16 +4150,15 @@ CtfTxSchemeCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfTxSchemeCfg)
 
    /* ctf_c_001.main_4: Removed UnPacking of param->pres */
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->duplexMode = (CtfDuplexMode)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->scSpacing = (CtfSCSpacing)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->cycPfx = (CtfCPCfg)tmpEnum;
    return ROK;
 }
@@ -4265,7 +4195,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfAntennaCfgInfo)
 
    CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf);
    return ROK;
@@ -4302,10 +4231,9 @@ CtfAntennaCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfAntennaCfgInfo)
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum;
    return ROK;
 }
@@ -4348,7 +4276,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPrachCfgInfo)
 
    /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4401,7 +4328,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPrachCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4448,7 +4374,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPdschCfgInfo)
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4491,7 +4416,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPdschCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4535,7 +4459,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPuschCfgBasic)
 
    CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf);
    CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf);
@@ -4575,12 +4498,11 @@ CtfPuschCfgBasic *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfPuschCfgBasic)
 
    CMCHKUNPK(oduPackUInt8, &param->noOfsubBands, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->hoppingMode = (CtfPuschHoppingMode)tmpEnum;
    CMCHKUNPK(oduPackUInt8, &param->hoppingOffset, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->enable64QAM, mBuf);
@@ -4619,7 +4541,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPuschUlRS)
 
    CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf);
    CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf);
@@ -4660,7 +4581,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPuschUlRS)
 
    CMCHKUNPK(oduPackUInt8, &param->grpHopEnabled, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->seqHopEnabled, mBuf);
@@ -4701,7 +4621,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPuschCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4745,7 +4664,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPuschCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4789,7 +4707,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPhichCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4832,17 +4749,16 @@ CtfPhichCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfPhichCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-     CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+     CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
      param->duration = (CtfPhichDuration)tmpEnum;
-     CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+     CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
      param->resource = (CtfPhichResource)tmpEnum;
    }
    return ROK;
@@ -4880,7 +4796,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPucchCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4925,9 +4840,8 @@ CtfPucchCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfPucchCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4936,7 +4850,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8, &param->nRB, mBuf);
       CMCHKUNPK(oduPackUInt8, &param->nCS, mBuf);
       CMCHKUNPK(oduPackUInt16, &param->n1PUCCH, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->deltaShift = (CtfPucchDeltaShift)tmpEnum;
    }
    return ROK;
@@ -4974,7 +4888,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfSrsUlCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5021,7 +4934,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfSrsUlCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -5068,7 +4980,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfTddSfCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5112,7 +5023,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfVendorSpecParams)
    if( param->buffLen != 0) {
      SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf);   
    }
@@ -5153,7 +5063,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfVendorSpecParams)
 
    CMCHKUNPK(oduPackUInt16, &param->buffLen, mBuf);
 
@@ -5206,7 +5115,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfTddSfCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -5233,20 +5141,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PRIVATE S16 cmPkCtfUnLicnsdCellParam
+static S16 cmPkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PRIVATE S16 cmPkCtfUnLicnsdCellParam(param, mBuf)
+static S16 cmPkCtfUnLicnsdCellParam(param, mBuf)
 CtfUnLicnsdCfgInfo  *param;
 Buffer *mBuf;
 #endif
 {
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmPkCtfUnLicnsdCellParam)
 
    CMCHKPK(SPkS32, param->txPowerLimit, mBuf);
    CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf);
@@ -5301,7 +5208,6 @@ Buffer *mBuf;
 #ifdef EMTC_ENABLE
    S32 i;
 #endif
-   TRC3(cmPkCtfCellCfgInfo)
 
 #ifdef EMTC_ENABLE
    for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) {
@@ -5412,20 +5318,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PRIVATE S16 cmUnpkCtfUnLicnsdCellParam
+static S16 cmUnpkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PRIVATE S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf)
+static S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf)
 CtfUnLicnsdCfgInfo  *param;
 Buffer *mBuf;
 #endif
 {
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmPkCtfUnLicnsdCellParam)
 
    CMCHKUNPK(oduPackUInt8, &param->numFreq, mBuf);
 
@@ -5481,7 +5386,6 @@ Buffer *mBuf;
 #ifdef EMTC_ENABLE
    S32 i;
 #endif
-   TRC3(cmUnpkCtfCellCfgInfo)
 
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -5613,7 +5517,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellRecfgInfo)
 
 #ifdef ENABLE_API_LOG
    CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf);
@@ -5720,11 +5623,10 @@ Buffer *mBuf;
 #endif
 {
 
-   U32 tmpEnum;
-   TRC3(cmUnpkCtfCellRecfgInfo)
+   uint32_t tmpEnum;
    
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ctfReCfgType = (CtfReCfgType)tmpEnum;
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->cellIdGrpId, mBuf);   
@@ -5830,7 +5732,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedPdschCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5870,14 +5771,13 @@ CtfDedPdschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
-   TRC3(cmUnpkCtfDedPdschCfgInfo)
+   uint32_t tmpEnum;
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->pA = (CtfPdschPaParam)tmpEnum;
    }
    return ROK;
@@ -5915,7 +5815,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedPucchCfgInfo)
 
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
@@ -5979,7 +5878,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedPucchCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -5992,10 +5890,10 @@ Buffer *mBuf;
  
        if (param->pucchSetup.repFactPres)
        {
-          CMCHKUNPK(oduPackUInt32, (U32 *)&param->pucchSetup.repFact, mBuf);
+          CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
        }
 #else
-        CMCHKUNPK(oduPackUInt32, (U32 *)&param->pucchSetup.repFact, mBuf);
+        CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
 #endif /*CTF_VER3 */
       CMCHKUNPK(oduPackUInt16, &param->pucchSetup.n1PUCCHRep, mBuf);
 #ifdef CTF_VER3
@@ -6004,7 +5902,7 @@ Buffer *mBuf;
 
       if (param->tddAckNackCfgPres != FALSE)
       {
-         CMCHKUNPK(oduPackUInt32, (U32 *)&param->tddAckNackFBMode, mBuf);
+         CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->tddAckNackFBMode, mBuf);
       }
 #endif /* CTF_VER3 */
    }
@@ -6043,7 +5941,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedPuschCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6088,7 +5985,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedPuschCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6134,10 +6030,9 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCqiRptModePeriodic)
 /* ctf_c_001.main_2: added packning for cqiMask*/
 #ifdef CTF_VER1
-      CMCHKPK(oduUnpackUInt32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
+      CMCHKPK(oduUnpackUInt32, (uint32_t )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
       CMCHKPK(oduUnpackUInt8, param->cqiSetup.cqiMask.pres, mBuf);
 #endif /* CTF_VER1 */
       CMCHKPK(oduUnpackUInt8, param->cqiSetup.simultaneousAckNack, mBuf);
@@ -6183,9 +6078,8 @@ Buffer *mBuf;
 #endif
 {
 #ifdef CTF_VER1    
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 #endif   
-   TRC3(cmUnpkCtfCqiRptModePeriodic)
 
    CMCHKUNPK(oduPackUInt8, &param->cqiPeriodicCfgType, mBuf);
       CMCHKUNPK(oduPackUInt16, &param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
@@ -6198,7 +6092,7 @@ Buffer *mBuf;
 /* ctf_c_001.main_2: added Unpackning for cqiMask*/
 #ifdef CTF_VER1
       CMCHKUNPK(oduPackUInt8, &param->cqiSetup.cqiMask.pres, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->cqiSetup.cqiMask.cqiMaskSetup = tmpEnum;
 #endif /* CTF_VER1 */
    return ROK;
@@ -6236,7 +6130,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCqiReportCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6316,9 +6209,8 @@ Buffer *mBuf;
 #endif
 {
 #if defined (CTF_VER1) || defined (CTF_VER2)
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 #endif
-   TRC3(cmUnpkCtfCqiReportCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6327,7 +6219,7 @@ Buffer *mBuf;
 /* ctf_c_001.main_2: added Unpackning for cqiMask*/
 #ifdef CTF_VER1
       CMCHKUNPK(oduPackUInt8, &param->pmiRiRpt.pres, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->pmiRiRpt.pmiRiRptSetup = tmpEnum;
 #endif /* CTF_VER1 */
 
@@ -6345,7 +6237,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8, &param->reportMode.aPeriodicRpt.pres, mBuf)
       if(param->reportMode.aPeriodicRpt.pres != FALSE)
       {
-        CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+        CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
          param->reportMode.aPeriodicRpt.aPeriodicRptMode =
             (CtfCqiRptModeAperiodic)tmpEnum;
       }
@@ -6355,7 +6247,7 @@ Buffer *mBuf;
       CMCHKUNPK(oduPackUInt8, &param->reportingMode, mBuf);
       switch(param->reportingMode) {
          case CTF_CQI_RPTMODE_APRDIOC:
-            CMCHKUNPK(oduPackUInt32, (U32 *)&param->reportMode.aPeriodicRpt, mBuf);
+            CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->reportMode.aPeriodicRpt, mBuf);
             break;
          case CTF_CQI_RPTMODE_PRDIOC:
             CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, &param->reportMode.periodicRpt, mBuf);
@@ -6400,7 +6292,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedSrsUlCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6450,7 +6341,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedSrsUlCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6500,7 +6390,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedSRCfgInfo)
 
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
@@ -6545,7 +6434,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedSRCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6592,10 +6480,9 @@ Buffer *mBuf;
 {
    
 #ifdef CTF_VER2
-   U8  idx;
+   uint8_t  idx;
 #endif  /* CTF_VER2 */
 
-   TRC3(cmPkCtfDedAntCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6603,7 +6490,7 @@ Buffer *mBuf;
       CMCHKPK(oduUnpackUInt32, param->ueTxAntSelection.txAntSelect, mBuf);
       CMCHKPK(oduUnpackUInt8, param->ueTxAntSelection.cfgType, mBuf);
      /* ctf_c_001.main_3 txMode is of type enum and is 32bit length */
-      CMCHKPK(oduUnpackUInt32, (U32)param->txMode, mBuf);
+      CMCHKPK(oduUnpackUInt32, (uint32_t)param->txMode, mBuf);
 #ifdef CTF_VER2
       /* 
        *ctf_c_001.main_2: Added Packing of CodeBookSubsetRestriction parameter
@@ -6696,9 +6583,8 @@ Buffer *mBuf;
    S16  idx;
 #endif /* CTF_VER2 */
    
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   TRC3(cmUnpkCtfDedAntCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6708,7 +6594,7 @@ Buffer *mBuf;
       /* 
        * Added Unpacking for CodeBookSubsetRestriction parameter
        */
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->codeBookSubsetRes.ctfCdBkRestType = (CtfCdBkSubsetRestnType)tmpEnum;
       switch(param->codeBookSubsetRes.ctfCdBkRestType)
       {
@@ -6759,10 +6645,10 @@ Buffer *mBuf;
       }
 #endif /* CTF_VER2 */
       /* ctf_c_001.main_3 Enum is 32bit length */
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->txMode = (CtfUeTxAntMode)tmpEnum;
       CMCHKUNPK(oduPackUInt8, &param->ueTxAntSelection.cfgType, mBuf);
-      CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->ueTxAntSelection.txAntSelect = (CtfUeTxAntSelectType)tmpEnum;
    }
    return ROK;
@@ -6834,7 +6720,7 @@ Buffer *mBuf;
 
    for(idx = param->numSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[(U8)idx], mBuf);
+      CMCHKPK(cmPkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[(uint8_t)idx], mBuf);
    }
    CMCHKPK(oduUnpackUInt32, param->sCellAction, mBuf);
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
@@ -6905,10 +6791,10 @@ CtfSecCellCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32*)&param->sCellAction, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->sCellAction, mBuf);
    for(idx = 0 ; idx < param->numSCells; idx++)
    {
       CMCHKUNPK(cmUnpkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[idx], mBuf);
@@ -6948,7 +6834,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfUeCatCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6989,12 +6874,11 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfUeCatCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
-      CMCHKUNPK(oduPackUInt32, (U32 *)&param->ueCategory, mBuf);
+      CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ueCategory, mBuf);
    return ROK;
 }
 
@@ -7030,7 +6914,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedCfgInfo)
 #ifdef EMTC_ENABLE
    CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf);
 #endif
@@ -7081,7 +6964,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedCfgInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -7133,7 +7015,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedRecfgInfo)
 
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    /*ctf_c_001.main_1*/
@@ -7190,7 +7071,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedRecfgInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -7249,7 +7129,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellReleaseInfo)
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
@@ -7287,7 +7166,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCellReleaseInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    return ROK;
@@ -7325,7 +7203,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedReleaseInfo)
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -7364,7 +7241,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedReleaseInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -7404,7 +7280,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCfgInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7452,7 +7327,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7500,7 +7374,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfReCfgInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7557,7 +7430,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfReCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7613,7 +7485,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfReleaseInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7661,7 +7532,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfReleaseInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7712,7 +7582,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCfgReqInfo)
 
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
@@ -7778,7 +7647,6 @@ Buffer *mBuf;
    S16 retVal;
 #endif
 
-   TRC3(cmUnpkCtfCfgReqInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgType, mBuf);
       switch(param->cfgType) {
@@ -7832,10 +7700,9 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellPwrcfgInfo)
 
    /* Added the pack for newly added reference signal Power*/
-   CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
@@ -7877,7 +7744,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCellPwrcfgInfo)
    
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -7886,7 +7752,7 @@ Buffer *mBuf;
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->ctfCellStatus, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
 
    return ROK;
 }
@@ -7921,10 +7787,9 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellStop)
 
    /* Added the pack for newly added reference signal Power*/
-   CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
@@ -7964,7 +7829,6 @@ Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCellStop)
    
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
 
@@ -7972,7 +7836,7 @@ Buffer *mBuf;
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->ctfCellStatus, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
 
    return ROK;
 }
@@ -8006,7 +7870,6 @@ CtfPeriodicRemCellInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkPerRemScanCellInfo)
 
    CMCHKPK(oduUnpackUInt16,param->pci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
@@ -8045,7 +7908,6 @@ Buffer *mBuf;
 #endif
 {
    S16 idx;
-   TRC3(cmPkCtfPeriodicCellSearchRsp)
 
    for(idx = param->numCells - 1; idx >=0; idx--)
    {
@@ -8088,7 +7950,6 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfPeriodicRemCellSearchRsp)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -8175,7 +8036,6 @@ CtfPeriodicRemCellInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkCtfPerRemScanCellInfo);
 
    CMCHKUNPK(oduPackUInt8, &param->numTx, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->dlBw, mBuf);
@@ -8197,7 +8057,6 @@ Buffer *mBuf;
 #endif
 {
    S16 idx;
-   TRC3(cmUnpkCtfPerRemCellSrch);
 
    CMCHKUNPK(oduPackUInt8, &param->numCells, mBuf);
    for(idx = 0; idx < (param->numCells); idx++)
@@ -8238,7 +8097,6 @@ Buffer *mBuf;
    SuId suId = 0;
    CtfCfgTransId transId;
    CtfPeriodicRemCellSearchRsp *CellSrchRsp = NULLP;  
-   TRC3(cmUnpkPerRemCellSrchRsp)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);