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

diff --git a/src/cm/ctf.c b/src/cm/ctf.c
index bb17d5f74..cf5c07898 100755
--- a/src/cm/ctf.c
+++ b/src/cm/ctf.c
@@ -64,21 +64,20 @@
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfBndReq
+S16 cmPkCtfBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 cmPkCtfBndReq(pst, suId, spId)
+S16 cmPkCtfBndReq(pst, suId, spId)
 Pst* pst;
 SuId suId;
 SpId spId;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfBndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -128,14 +127,14 @@ SpId spId;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfBndReq
+S16 cmUnpkCtfBndReq
 (
 CtfBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfBndReq(func, pst, mBuf)
+S16 cmUnpkCtfBndReq(func, pst, mBuf)
 CtfBndReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -144,7 +143,6 @@ Buffer *mBuf;
    SuId suId = 0;
    SpId spId = 0;
    
-   TRC3(cmUnpkCtfBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -181,26 +179,25 @@ 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 cmPkCtfBndCfm
+S16 cmPkCtfBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
-PUBLIC S16 cmPkCtfBndCfm(pst, suId, status)
+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,28 +243,27 @@ 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 cmUnpkCtfBndCfm
+S16 cmUnpkCtfBndCfm
 (
 CtfBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfBndCfm(func, pst, mBuf)
+S16 cmUnpkCtfBndCfm(func, pst, mBuf)
 CtfBndCfm func;
 Pst *pst;
 Buffer *mBuf;
 #endif
 {
    SuId suId = 0;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCtfBndCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -308,21 +304,20 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfUbndReq
+S16 cmPkCtfUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 cmPkCtfUbndReq(pst, spId, reason)
+S16 cmPkCtfUbndReq(pst, spId, reason)
 Pst* pst;
 SpId spId;
 Reason reason;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfUbndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -372,14 +367,14 @@ Reason reason;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfUbndReq
+S16 cmUnpkCtfUbndReq
 (
 CtfUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfUbndReq(func, pst, mBuf)
+S16 cmUnpkCtfUbndReq(func, pst, mBuf)
 CtfUbndReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -388,7 +383,6 @@ Buffer *mBuf;
    SpId spId = 0;
    Reason reason = 0;
    
-   TRC3(cmUnpkCtfUbndReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -475,13 +469,13 @@ CtfCfgReqInfo *param;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfNhKeyInfo
+S16 cmPkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfNhKeyInfo(param, mBuf)
+S16 cmPkCtfNhKeyInfo(param, mBuf)
 CtfNhKeyInfo *param;
 Buffer *mBuf;
 #endif
@@ -489,7 +483,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfNhKeyInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -522,13 +515,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfKenbStarInfo
+S16 cmPkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfKenbStarInfo(param, mBuf)
+S16 cmPkCtfKenbStarInfo(param, mBuf)
 CtfKenbStarInfo *param;
 Buffer *mBuf;
 #endif
@@ -536,7 +529,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfKenbStarInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -570,13 +562,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfAskeyInfo
+S16 cmPkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfAskeyInfo(param, mBuf)
+S16 cmPkCtfAskeyInfo(param, mBuf)
 CtfAsKeyInfo *param;
 Buffer *mBuf;
 #endif
@@ -584,7 +576,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfAskeyInfo)
 
          
    for(idx=31;idx>=0;idx--)
@@ -618,19 +609,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfKdfReqInfo
+S16 cmPkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
  )
 #else
-PUBLIC S16 cmPkCtfKdfReqInfo(param, mBuf)
+S16 cmPkCtfKdfReqInfo(param, mBuf)
 CtfKdfReqInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfKdfReqInfo)
 
    switch (param->keyDerType)
     {
@@ -667,7 +657,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfKdfReq
+S16 cmPkCtfKdfReq
 (
 Pst* pst,
 SpId spId,
@@ -675,7 +665,7 @@ CtfCfgTransId transId,
 CtfKdfReqInfo* kdfReqInfo
 )
 #else
-PUBLIC S16 cmPkCtfKdfReq(pst, spId, transId, kdfReqInfo)
+S16 cmPkCtfKdfReq(pst, spId, transId, kdfReqInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId transId;
@@ -685,7 +675,6 @@ CtfKdfReqInfo* kdfReqInfo;
    Buffer *mBuf = NULLP;
 
 
-   TRC3(cmPkCtfKdfReq)
    
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -755,7 +744,7 @@ CtfKdfReqInfo* kdfReqInfo;
                               /*START OF CNM PACK & UNPACK FUNCTIONS*/
 /********************************************************************************************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCnmVendorSpecificInfo
+S16 cmPkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
@@ -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);
@@ -779,19 +767,18 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCtfCnmCellSyncReq
+S16 cmPkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCtfCnmCellSyncReq(param, mBuf)
+S16 cmPkCtfCtfCnmCellSyncReq(param, mBuf)
 CtfCnmCellSyncReq *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCtfCnmCellSyncReq);
    CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf);
    CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf);
@@ -804,19 +791,18 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmPkCtfcfgReqInfo
+S16 cmPkCtfcfgReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfcfgReqInfo(param, mBuf)
+S16 cmPkCtfcfgReqInfo(param, mBuf)
 CtfCnmInitSyncReq *param;
 Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmPkCtfcfgReqInfo);
 
    CMCHKPK(oduUnpackUInt8, param->searchType, mBuf);
    CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf);
@@ -834,19 +820,18 @@ Buffer *mBuf;
 
 }
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmVendorSpecificInfo
+S16 cmUnpkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmVendorSpecificInfo(param, mBuf)
+S16 cmUnpkCtfCnmVendorSpecificInfo(param, mBuf)
 CtfCnmVendorSpecificInfo *param;
 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++)
@@ -857,18 +842,17 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCtfCnmCellSyncReq
+S16 cmUnpkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCtfCnmCellSyncReq(param, mBuf)
+S16 cmUnpkCtfCtfCnmCellSyncReq(param, mBuf)
 CtfCnmCellSyncReq *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkCtfCtfCnmCellSyncReq);
 
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
@@ -883,19 +867,18 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfsyncReqInfo
+S16 cmUnpkCtfsyncReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfsyncReqInfo(param, mBuf)
+S16 cmUnpkCtfsyncReqInfo(param, mBuf)
 CtfCnmInitSyncReq *param;
 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++)
@@ -925,7 +908,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCnmCellSyncReq
+S16 cmPkCtfCnmCellSyncReq
 (
 Pst* pst,
 SpId spId,
@@ -933,7 +916,7 @@ CtfCfgTransId *transId,
 CtfCnmCellSyncReq * cfgReqInfo
 )
 #else
-PUBLIC S16 cmPkCtfCnmCellSyncReq(pst, spId, transId, cfgReqInfo)
+S16 cmPkCtfCnmCellSyncReq(pst, spId, transId, cfgReqInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId *transId;
@@ -943,7 +926,6 @@ CtfCnmCellSyncReq * cfgReqInfo;
 
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkCtfCnmCellSyncReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1027,14 +1009,14 @@ CtfCnmCellSyncReq * cfgReqInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmCellSyncReq
+S16 cmUnpkCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmCellSyncReq(func, pst, mBuf)
+S16 cmUnpkCtfCnmCellSyncReq(func, pst, mBuf)
 CtfCnmCellSyncReqMsg func;
 Pst *pst;
 Buffer *mBuf;
@@ -1044,7 +1026,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncReq *SyncReqMsg = NULLP;
-   TRC3(cmUnpkCtfCnmCellSyncReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1119,7 +1100,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCnmInitSyncReq
+S16 cmPkCtfCnmInitSyncReq
 (
 Pst* pst,
 SpId spId,
@@ -1127,7 +1108,7 @@ CtfCfgTransId *transId,
 CtfCnmInitSyncReq * cfgReqInfo
 )
 #else
-PUBLIC S16 cmPkCtfCnmInitSyncReq(pst, spId, transId, cfgReqInfo)
+S16 cmPkCtfCnmInitSyncReq(pst, spId, transId, cfgReqInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId *transId;
@@ -1136,7 +1117,6 @@ CtfCnmInitSyncReq * cfgReqInfo;
 {
    Buffer *mBuf = NULLP;
 
-   TRC3(cmPkCtfCnmInitSyncReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1222,14 +1202,14 @@ CtfCnmInitSyncReq * cfgReqInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmInitSyncReq
+S16 cmUnpkCtfCnmInitSyncReq
 (
 CtfCnmInitSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmInitSyncReq(func, pst, mBuf)
+S16 cmUnpkCtfCnmInitSyncReq(func, pst, mBuf)
 CtfCnmInitSyncReqMsg func;
 Pst *pst;
 Buffer *mBuf;
@@ -1239,7 +1219,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmInitSyncReq *syncReqInfo = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1297,18 +1276,17 @@ Buffer *mBuf;
 /*-----------------------------------------------------------------------------*/
 
 #ifdef ANSI
-PUBLIC S16 cmPkCtfctfCnmMibInfo
+S16 cmPkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfctfCnmMibInfo(param, mBuf)
+S16 cmPkCtfctfCnmMibInfo(param, mBuf)
 CtfCnmMibInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkCtfctfCnmMibInfo)
 
    CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
    CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf);
@@ -1320,18 +1298,17 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmPkCtfctfCnmInitSyncInfo
+S16 cmPkCtfctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfctfCnmInitSyncInfo(param, mBuf)
+S16 cmPkCtfctfCnmInitSyncInfo(param, mBuf)
 CtfCnmInitSyncInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkCtfctfCnmInitSyncInfo)
 
    CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
@@ -1344,19 +1321,18 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmPkCtfcfgRspInfo
+S16 cmPkCtfcfgRspInfo
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfcfgRspInfo(param, mBuf)
+S16 cmPkCtfcfgRspInfo(param, mBuf)
 CtfCnmInitSyncRsp *param;
 Buffer *mBuf;
 #endif
 {
    S32 i;
-   TRC3(cmPkCtfcfgRspInfo)
 
 
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
@@ -1389,7 +1365,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCnmInitSyncRsp
+S16 cmPkCtfCnmInitSyncRsp
 (
 Pst* pst,
 SpId spId,
@@ -1397,7 +1373,7 @@ CtfCfgTransId *transId,
 CtfCnmInitSyncRsp * cfgRspInfo
 )
 #else
-PUBLIC S16 cmPkCtfCnmInitSyncRsp(pst, spId, transId, cfgRspInfo)
+S16 cmPkCtfCnmInitSyncRsp(pst, spId, transId, cfgRspInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId *transId;
@@ -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)
@@ -1477,18 +1452,17 @@ CtfCnmInitSyncRsp * cfgRspInfo;
 /*-----------------------------------------------------------------------------*/
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfctfCnmMibInfo
+S16 cmUnpkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfctfCnmMibInfo(param, mBuf)
+S16 cmUnpkCtfctfCnmMibInfo(param, mBuf)
 CtfCnmMibInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkCtfctfCnmMibInfo);
 
 
    CMCHKUNPK(oduPackUInt8, &param->dlSystemBandWidht, mBuf);
@@ -1501,18 +1475,17 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkctfCnmInitSyncInfo
+S16 cmUnpkctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkctfCnmInitSyncInfo(param, mBuf)
+S16 cmUnpkctfCnmInitSyncInfo(param, mBuf)
 CtfCnmInitSyncInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkctfCnmInitSyncInfo);
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, &param->ctfCnmMibInfo, mBuf);
@@ -1525,19 +1498,18 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmInitSyncRspMsg
+S16 cmUnpkCtfCnmInitSyncRspMsg
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmInitSyncRspMsg(param, mBuf)
+S16 cmUnpkCtfCnmInitSyncRspMsg(param, mBuf)
 CtfCnmInitSyncRsp *param;
 Buffer *mBuf;
 #endif
 {
     S32 i;
-    TRC3(cmUnpkCtfCnmInitSyncRspMsg);
 
 
     CMCHKUNPK(oduPackUInt8, &param->numOfNeighbourInfo, mBuf);
@@ -1565,14 +1537,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmInitSyncRsp
+S16 cmUnpkCtfCnmInitSyncRsp
 (
 CtfCnmInitSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmInitSyncRsp(func, pst, mBuf)
+S16 cmUnpkCtfCnmInitSyncRsp(func, pst, mBuf)
 CtfCnmInitSyncRspMsg func;
 Pst *pst;
 Buffer *mBuf;
@@ -1582,7 +1554,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmInitSyncRsp *syncRspInfo = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1641,19 +1612,18 @@ Buffer *mBuf;
 /*-----------------------------------------------------------------------*/
 
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCellSyncRsp 
+S16 cmPkCtfCellSyncRsp 
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCellSyncRsp(param, mBuf)
+S16 cmPkCtfCellSyncRsp(param, mBuf)
 CtfCnmCellSyncRsp *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellSyncRsp)
 
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    return ROK;
@@ -1675,7 +1645,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCnmCellSyncRsp
+S16 cmPkCtfCnmCellSyncRsp
 (
 Pst* pst,
 SpId spId,
@@ -1683,7 +1653,7 @@ CtfCfgTransId *transId,
 CtfCnmCellSyncRsp * cfgRspInfo
 )
 #else
-PUBLIC S16 cmPkCtfCnmCellSyncRsp(pst, spId, transId, cfgRspInfo)
+S16 cmPkCtfCnmCellSyncRsp(pst, spId, transId, cfgRspInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId *transId;
@@ -1692,7 +1662,6 @@ CtfCnmCellSyncRsp * cfgRspInfo;
 {
 
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmCellSyncRsp)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1765,19 +1734,18 @@ CtfCnmCellSyncRsp * cfgRspInfo;
 /*------------------------------------------------------------*/
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmSyncRspMsg
+S16 cmUnpkCtfCnmSyncRspMsg
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmSyncRspMsg(param, mBuf)
+S16 cmUnpkCtfCnmSyncRspMsg(param, mBuf)
 CtfCnmCellSyncRsp *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCnmSyncRspMsg);
 
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
@@ -1798,14 +1766,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmCellSyncRsp
+S16 cmUnpkCtfCnmCellSyncRsp
 (
 CtfCnmCellSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmCellSyncRsp(func, pst, mBuf)
+S16 cmUnpkCtfCnmCellSyncRsp(func, pst, mBuf)
 CtfCnmCellSyncRspMsg func;
 Pst *pst;
 Buffer *mBuf;
@@ -1815,7 +1783,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncRsp *syncRspMsg = NULLP;
-   TRC3(cmUnpkCtfCnmCellSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1874,19 +1841,18 @@ Buffer *mBuf;
 /*---------------------------------------------------------------*/
 
 #ifdef ANSI
-PUBLIC S16 cmPkCtfcfgIndInfo
+S16 cmPkCtfcfgIndInfo
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfcfgIndInfo(param, mBuf)
+S16 cmPkCtfcfgIndInfo(param, mBuf)
 CtfCnmCellSyncInd *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfcfgIndInfo);
 
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
@@ -1909,7 +1875,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCnmCellSyncInd
+S16 cmPkCtfCnmCellSyncInd
 (
 Pst* pst,
 SpId spId,
@@ -1917,7 +1883,7 @@ CtfCfgTransId *transId,
 CtfCnmCellSyncInd * cfgIndInfo
 )
 #else
-PUBLIC S16 cmPkCtfCnmCellSyncInd(pst, spId, transId, cfgIndInfo)
+S16 cmPkCtfCnmCellSyncInd(pst, spId, transId, cfgIndInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId *transId;
@@ -1926,7 +1892,6 @@ CtfCnmCellSyncInd * cfgIndInfo;
 {
    
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfCnmCellSyncInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1999,19 +1964,18 @@ CtfCnmCellSyncInd * cfgIndInfo;
 /*---------------------------------------------------------------*/
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmSyncIndMsg
+S16 cmUnpkCtfCnmSyncIndMsg
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmSyncIndMsg(param, mBuf)
+S16 cmUnpkCtfCnmSyncIndMsg(param, mBuf)
 CtfCnmCellSyncInd *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCnmSyncIndMsg);
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
@@ -2033,14 +1997,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCnmCellSyncInd
+S16 cmUnpkCtfCnmCellSyncInd
 (
 CtfCnmCellSyncIndMsg func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCnmCellSyncInd(func, pst, mBuf)
+S16 cmUnpkCtfCnmCellSyncInd(func, pst, mBuf)
 CtfCnmCellSyncIndMsg func;
 Pst *pst;
 Buffer *mBuf;
@@ -2050,7 +2014,6 @@ Buffer *mBuf;
    SpId spId = 0;
    CtfCfgTransId transId;
    CtfCnmCellSyncInd *syncIndMsg = NULLP;
-   TRC3(cmUnpkCtfCnmInitSyncRsp)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2130,7 +2093,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCfgReq
+S16 cmPkCtfCfgReq
 (
 Pst* pst,
 SpId spId,
@@ -2138,7 +2101,7 @@ CtfCfgTransId transId,
 CtfCfgReqInfo* cfgReqInfo
 )
 #else
-PUBLIC S16 cmPkCtfCfgReq(pst, spId, transId, cfgReqInfo)
+S16 cmPkCtfCfgReq(pst, spId, transId, cfgReqInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId transId;
@@ -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)
@@ -2233,21 +2195,20 @@ CtfCfgReqInfo* cfgReqInfo;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfNhKeyInfo
+S16 cmUnpkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfNhKeyInfo(param, mBuf)
+S16 cmUnpkCtfNhKeyInfo(param, mBuf)
 CtfNhKeyInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfNhKeyInfo)
          
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
@@ -2277,21 +2238,20 @@ Buffer *mBuf;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfKenbStarInfo
+S16 cmUnpkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfKenbStarInfo(param, mBuf)
+S16 cmUnpkCtfKenbStarInfo(param, mBuf)
 CtfKenbStarInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfKenbStarInfo)
          
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
@@ -2322,21 +2282,20 @@ Buffer *mBuf;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfAskeyInfo
+S16 cmUnpkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfAskeyInfo(param, mBuf)
+S16 cmUnpkCtfAskeyInfo(param, mBuf)
 CtfAskeyInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfAskeyInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->intgAlgoType, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ciphAlgoType, mBuf);
@@ -2366,19 +2325,18 @@ Buffer *mBuf;
  *
  *  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfKdfReqInfo
+S16 cmUnpkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
  )
 #else
-PUBLIC S16 cmUnpkCtfKdfReqInfo(param, mBuf)
+S16 cmUnpkCtfKdfReqInfo(param, mBuf)
 CtfKdfReqInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfKdfReqInfo)
 
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
      switch (param->keyDerType)
@@ -2414,14 +2372,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfKdfReq
+S16 cmUnpkCtfKdfReq
 (
 CtfKdfReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfKdfReq(func, pst, mBuf)
+S16 cmUnpkCtfKdfReq(func, pst, mBuf)
 CtfKdfReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -2431,7 +2389,6 @@ Buffer *mBuf;
    CtfCfgTransId transId;
    CtfKdfReqInfo *kdfReqInfo = NULLP;
    
-   TRC3(cmUnpkCtfKdfReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2510,14 +2467,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCfgReq
+S16 cmUnpkCtfCfgReq
 (
 CtfCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCfgReq(func, pst, mBuf)
+S16 cmUnpkCtfCfgReq(func, pst, mBuf)
 CtfCfgReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -2527,7 +2484,6 @@ Buffer *mBuf;
    CtfCfgTransId transId;
    CtfCfgReqInfo *cfgReqInfo = NULLP;
    
-   TRC3(cmUnpkCtfCfgReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -2603,13 +2559,13 @@ Buffer *mBuf;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfNhKeyCfmInfo
+S16 cmPkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfNhKeyCfmInfo(param, mBuf)
+S16 cmPkCtfNhKeyCfmInfo(param, mBuf)
 CtfNhKeyCfmInfo *param;
 Buffer *mBuf;
 #endif
@@ -2617,7 +2573,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfNhKeyCfmInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2645,13 +2600,13 @@ Buffer *mBuf;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfKenbStarCfmInfo
+S16 cmPkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfKenbStarCfmInfo(param, mBuf)
+S16 cmPkCtfKenbStarCfmInfo(param, mBuf)
 CtfKenbStarCfmInfo *param;
 Buffer *mBuf;
 #endif
@@ -2659,7 +2614,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfKenbStarCfmInfo)
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2688,13 +2642,13 @@ Buffer *mBuf;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfAskeyCfmInfo
+S16 cmPkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfAskeyCfmInfo(param, mBuf)
+S16 cmPkCtfAskeyCfmInfo(param, mBuf)
 CtfAskeyCfmInfo *param;
 Buffer *mBuf;
 #endif
@@ -2702,7 +2656,6 @@ Buffer *mBuf;
 
    S16  idx;
 
-   TRC3(cmPkCtfCtfAskeyCfmInfo)
 
    for(idx=15;idx>=0;idx--)
    {
@@ -2738,19 +2691,18 @@ Buffer *mBuf;
  *
  *  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfKdfCfmInfo
+S16 cmPkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
  )
 #else
-PUBLIC S16 cmPkCtfKdfCfmInfo(param, mBuf)
+S16 cmPkCtfKdfCfmInfo(param, mBuf)
 CtfKdfCfmInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfKdfCfmInfo)
 
    switch (param->keyDerType)
     {
@@ -2780,29 +2732,28 @@ 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
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfKdfCfm
+S16 cmPkCtfKdfCfm
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId,
 CtfKdfCfmInfo *kdfCfmInfo,
-U8 status
+uint8_t status
 )
 #else
-PUBLIC S16 cmPkCtfKdfCfm(pst, suId, transId, status)
+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,28 +2841,27 @@ 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
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCfgCfm
+S16 cmPkCtfCfgCfm
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
-PUBLIC S16 cmPkCtfCfgCfm(pst, suId, transId, status)
+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)
@@ -2970,21 +2920,20 @@ U8 status;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfEnbStopInd
+S16 cmPkCtfEnbStopInd
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId
 )
 #else
-PUBLIC S16 cmPkCtfEnbStopInd(pst, suId, transId)
+S16 cmPkCtfEnbStopInd(pst, suId, transId)
 Pst* pst;
 SuId suId;
 CtfCfgTransId transId;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCtfEnbStopInd)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -3039,21 +2988,20 @@ CtfCfgTransId transId;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfNhKeyCfmInfo
+S16 cmUnpkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfNhKeyCfmInfo(param, mBuf)
+S16 cmUnpkCtfNhKeyCfmInfo(param, mBuf)
 CtfNhKeyCfmInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfNhKeyCfmInfo)
          
    for(idx=0;idx<32;idx++)
    {
@@ -3081,21 +3029,20 @@ Buffer *mBuf;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfKenbStarCfmInfo
+S16 cmUnpkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfKenbStarCfmInfo(param, mBuf)
+S16 cmUnpkCtfKenbStarCfmInfo(param, mBuf)
 CtfKenbStarCfmInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfKenbStarCfmInfo)
          
    for(idx=0;idx<32;idx++)
    {
@@ -3124,21 +3071,20 @@ Buffer *mBuf;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfAskeyCfmInfo
+S16 cmUnpkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfAskeyCfmInfo(param, mBuf)
+S16 cmUnpkCtfAskeyCfmInfo(param, mBuf)
 CtfAskeyCfmInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmUnpkCtfCtfAskeyCfmInfo)
          
    for(idx=0;idx<16;idx++)
    {
@@ -3174,19 +3120,18 @@ Buffer *mBuf;
  *
  *  **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfKdfCfmInfo
+S16 cmUnpkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
  )
 #else
-PUBLIC S16 cmUnpkCtfKdfCfmInfo(param, mBuf)
+S16 cmUnpkCtfKdfCfmInfo(param, mBuf)
 CtfKdfCfmInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfKdfCfmInfo)
 
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
    switch (param->keyDerType)
@@ -3216,19 +3161,19 @@ 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
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfKdfCfm
+S16 cmUnpkCtfKdfCfm
 (
 CtfKdfCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
+S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
 CtfKdfCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -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,19 +3242,19 @@ 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
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCfgCfm
+S16 cmUnpkCtfCfgCfm
 (
 CtfCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
+S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
 CtfCfgCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -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);
@@ -3370,14 +3313,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfEnbStopInd
+S16 cmUnpkCtfEnbStopInd
 (
 CtfEnbStopInd func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfEnbStopInd(func, pst, mBuf)
+S16 cmUnpkCtfEnbStopInd(func, pst, mBuf)
 CtfEnbStopInd func;
 Pst *pst;
 Buffer *mBuf;
@@ -3386,7 +3329,6 @@ Buffer *mBuf;
    SuId suId = 0;
    CtfCfgTransId transId;
    
-   TRC3(cmUnpkCtfCfgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3429,7 +3371,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfUeIdChgReq
+S16 cmPkCtfUeIdChgReq
 (
 Pst* pst,
 SpId spId,
@@ -3438,7 +3380,7 @@ CtfUeInfo * ueInfo,
 CtfUeInfo * newUeInfo
 )
 #else
-PUBLIC S16 cmPkCtfUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
+S16 cmPkCtfUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
 Pst* pst;
 SpId spId;
 CtfCfgTransId transId;
@@ -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)
@@ -3583,14 +3524,14 @@ CtfUeInfo * newUeInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfUeIdChgReq
+S16 cmUnpkCtfUeIdChgReq
 (
 CtfUeIdChgReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfUeIdChgReq(func, pst, mBuf)
+S16 cmUnpkCtfUeIdChgReq(func, pst, mBuf)
 CtfUeIdChgReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -3601,7 +3542,6 @@ Buffer *mBuf;
    CtfUeInfo *ueInfo = NULLP;
    CtfUeInfo *newUeInfo = NULLP;
    
-   TRC3(cmUnpkCtfUeIdChgReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3701,12 +3641,12 @@ 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
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfUeIdChgCfm
+S16 cmPkCtfUeIdChgCfm
 (
 Pst* pst,
 SuId suId,
@@ -3715,7 +3655,7 @@ CtfUeInfo * ueInfo,
 CmStatus status
 )
 #else
-PUBLIC S16 cmPkCtfUeIdChgCfm(pst, suId, transId, ueInfo, status)
+S16 cmPkCtfUeIdChgCfm(pst, suId, transId, ueInfo, status)
 Pst* pst;
 SuId suId;
 CtfCfgTransId transId;
@@ -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,19 +3762,19 @@ 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
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfUeIdChgCfm
+S16 cmUnpkCtfUeIdChgCfm
 (
 CtfUeIdChgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfUeIdChgCfm(func, pst, mBuf)
+S16 cmUnpkCtfUeIdChgCfm(func, pst, mBuf)
 CtfUeIdChgCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -3846,7 +3785,6 @@ Buffer *mBuf;
    CtfUeInfo *ueInfo = NULLP;
    CmStatus status;
    
-   TRC3(cmUnpkCtfUeIdChgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3930,20 +3868,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCfgTransId
+S16 cmPkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCfgTransId(param, mBuf)
+S16 cmPkCtfCfgTransId(param, mBuf)
 CtfCfgTransId *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmPkCtfCfgTransId)
 
    for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) {
       CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
@@ -3969,20 +3906,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCfgTransId
+S16 cmUnpkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCfgTransId(param, mBuf)
+S16 cmUnpkCtfCfgTransId(param, mBuf)
 CtfCfgTransId *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmUnpkCtfCfgTransId)
 
    for (i=0; i<CTF_CFG_TRANSID_SIZE; i++) {
       CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
@@ -4008,19 +3944,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfUeInfo
+S16 cmPkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfUeInfo(param, mBuf)
+S16 cmPkCtfUeInfo(param, mBuf)
 CtfUeInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfUeInfo)
 
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -4045,19 +3980,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfUeInfo
+S16 cmUnpkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfUeInfo(param, mBuf)
+S16 cmUnpkCtfUeInfo(param, mBuf)
 CtfUeInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfUeInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -4084,19 +4018,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfBwCfgInfo
+S16 cmPkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfBwCfgInfo(param, mBuf)
+S16 cmPkCtfBwCfgInfo(param, mBuf)
 CtfBwCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfBwCfgInfo)
 
    CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf);
    CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf);
@@ -4125,25 +4058,24 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfBwCfgInfo
+S16 cmUnpkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfBwCfgInfo(param, mBuf)
+S16 cmUnpkCtfBwCfgInfo(param, mBuf)
 CtfBwCfgInfo *param;
 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;
@@ -4168,19 +4100,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfTxSchemeCfg
+S16 cmPkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfTxSchemeCfg(param, mBuf)
+S16 cmPkCtfTxSchemeCfg(param, mBuf)
 CtfTxSchemeCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfTxSchemeCfg)
 
    CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf);
    CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf);
@@ -4208,27 +4139,26 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfTxSchemeCfg
+S16 cmUnpkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfTxSchemeCfg(param, mBuf)
+S16 cmUnpkCtfTxSchemeCfg(param, mBuf)
 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;
 }
@@ -4253,19 +4183,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfAntennaCfgInfo
+S16 cmPkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfAntennaCfgInfo(param, mBuf)
+S16 cmPkCtfAntennaCfgInfo(param, mBuf)
 CtfAntennaCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfAntennaCfgInfo)
 
    CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf);
    return ROK;
@@ -4291,21 +4220,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfAntennaCfgInfo
+S16 cmUnpkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfAntennaCfgInfo(param, mBuf)
+S16 cmUnpkCtfAntennaCfgInfo(param, mBuf)
 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;
 }
@@ -4336,19 +4264,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPrachCfgInfo
+S16 cmPkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPrachCfgInfo(param, mBuf)
+S16 cmPkCtfPrachCfgInfo(param, mBuf)
 CtfPrachCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPrachCfgInfo)
 
    /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4389,19 +4316,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPrachCfgInfo
+S16 cmUnpkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPrachCfgInfo(param, mBuf)
+S16 cmUnpkCtfPrachCfgInfo(param, mBuf)
 CtfPrachCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPrachCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4436,19 +4362,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPdschCfgInfo
+S16 cmPkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPdschCfgInfo(param, mBuf)
+S16 cmPkCtfPdschCfgInfo(param, mBuf)
 CtfPdschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPdschCfgInfo)
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4479,19 +4404,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPdschCfgInfo
+S16 cmUnpkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPdschCfgInfo(param, mBuf)
+S16 cmUnpkCtfPdschCfgInfo(param, mBuf)
 CtfPdschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPdschCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4523,19 +4447,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPuschCfgBasic
+S16 cmPkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPuschCfgBasic(param, mBuf)
+S16 cmPkCtfPuschCfgBasic(param, mBuf)
 CtfPuschCfgBasic *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPuschCfgBasic)
 
    CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf);
    CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf);
@@ -4564,23 +4487,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPuschCfgBasic
+S16 cmUnpkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPuschCfgBasic(param, mBuf)
+S16 cmUnpkCtfPuschCfgBasic(param, mBuf)
 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);
@@ -4607,19 +4529,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPuschUlRS
+S16 cmPkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPuschUlRS(param, mBuf)
+S16 cmPkCtfPuschUlRS(param, mBuf)
 CtfPuschUlRS *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPuschUlRS)
 
    CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf);
    CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf);
@@ -4648,19 +4569,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPuschUlRS
+S16 cmUnpkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPuschUlRS(param, mBuf)
+S16 cmUnpkCtfPuschUlRS(param, mBuf)
 CtfPuschUlRS *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPuschUlRS)
 
    CMCHKUNPK(oduPackUInt8, &param->grpHopEnabled, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->seqHopEnabled, mBuf);
@@ -4689,19 +4609,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPuschCfgInfo
+S16 cmPkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPuschCfgInfo(param, mBuf)
+S16 cmPkCtfPuschCfgInfo(param, mBuf)
 CtfPuschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPuschCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4733,19 +4652,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPuschCfgInfo
+S16 cmUnpkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPuschCfgInfo(param, mBuf)
+S16 cmUnpkCtfPuschCfgInfo(param, mBuf)
 CtfPuschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfPuschCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4777,19 +4695,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPhichCfgInfo
+S16 cmPkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPhichCfgInfo(param, mBuf)
+S16 cmPkCtfPhichCfgInfo(param, mBuf)
 CtfPhichCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPhichCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4821,28 +4738,27 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPhichCfgInfo
+S16 cmUnpkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPhichCfgInfo(param, mBuf)
+S16 cmUnpkCtfPhichCfgInfo(param, mBuf)
 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;
@@ -4868,19 +4784,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPucchCfgInfo
+S16 cmPkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPucchCfgInfo(param, mBuf)
+S16 cmPkCtfPucchCfgInfo(param, mBuf)
 CtfPucchCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfPucchCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4914,20 +4829,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPucchCfgInfo
+S16 cmUnpkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPucchCfgInfo(param, mBuf)
+S16 cmUnpkCtfPucchCfgInfo(param, mBuf)
 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;
@@ -4962,19 +4876,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfSrsUlCfgInfo
+S16 cmPkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfSrsUlCfgInfo(param, mBuf)
+S16 cmPkCtfSrsUlCfgInfo(param, mBuf)
 CtfSrsUlCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfSrsUlCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5009,19 +4922,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfSrsUlCfgInfo
+S16 cmUnpkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfSrsUlCfgInfo(param, mBuf)
+S16 cmUnpkCtfSrsUlCfgInfo(param, mBuf)
 CtfSrsUlCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfSrsUlCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -5056,19 +4968,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfTddSfCfgInfo
+S16 cmPkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfTddSfCfgInfo(param, mBuf)
+S16 cmPkCtfTddSfCfgInfo(param, mBuf)
 CtfTddSfCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfTddSfCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5100,19 +5011,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfVendorSpecParams
+S16 cmPkCtfVendorSpecParams
 (
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfVendorSpecParams(param, mBuf)
+S16 cmPkCtfVendorSpecParams(param, mBuf)
 CtfVendorSpecific *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfVendorSpecParams)
    if( param->buffLen != 0) {
      SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf);   
    }
@@ -5139,21 +5049,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfVendorSpecParams
+S16 cmUnpkCtfVendorSpecParams
 (
 Pst *pst,
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfVendorSpecParams(pst, param, mBuf)
+S16 cmUnpkCtfVendorSpecParams(pst, param, mBuf)
 Pst *pst;
 CtfVendorSpecific *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfVendorSpecParams)
 
    CMCHKUNPK(oduPackUInt16, &param->buffLen, mBuf);
 
@@ -5194,19 +5103,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfTddSfCfgInfo
+S16 cmUnpkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfTddSfCfgInfo(param, mBuf)
+S16 cmUnpkCtfTddSfCfgInfo(param, mBuf)
 CtfTddSfCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfTddSfCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -5244,9 +5152,8 @@ CtfUnLicnsdCfgInfo  *param;
 Buffer *mBuf;
 #endif
 {
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmPkCtfUnLicnsdCellParam)
 
    CMCHKPK(SPkS32, param->txPowerLimit, mBuf);
    CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf);
@@ -5287,13 +5194,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCellCfgInfo
+S16 cmPkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCellCfgInfo(param, mBuf)
+S16 cmPkCtfCellCfgInfo(param, mBuf)
 CtfCellCfgInfo *param;
 Buffer *mBuf;
 #endif
@@ -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--) {
@@ -5423,9 +5329,8 @@ CtfUnLicnsdCfgInfo  *param;
 Buffer *mBuf;
 #endif
 {
-   U8  idx;
+   uint8_t  idx;
 
-   TRC3(cmPkCtfUnLicnsdCellParam)
 
    CMCHKUNPK(oduPackUInt8, &param->numFreq, mBuf);
 
@@ -5467,13 +5372,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCellCfgInfo
+S16 cmUnpkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCellCfgInfo(param, mBuf)
+S16 cmUnpkCtfCellCfgInfo(param, mBuf)
 CtfCellCfgInfo *param;
 Buffer *mBuf;
 #endif
@@ -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);
@@ -5601,19 +5505,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCellRecfgInfo
+S16 cmPkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCellRecfgInfo(param, mBuf)
+S16 cmPkCtfCellRecfgInfo(param, mBuf)
 CtfCellRecfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellRecfgInfo)
 
 #ifdef ENABLE_API_LOG
    CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf);
@@ -5708,23 +5611,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCellRecfgInfo
+S16 cmUnpkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCellRecfgInfo(param, mBuf)
+S16 cmUnpkCtfCellRecfgInfo(param, mBuf)
 CtfCellRecfgInfo *param;
 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);   
@@ -5818,19 +5720,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedPdschCfgInfo
+S16 cmPkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedPdschCfgInfo(param, mBuf)
+S16 cmPkCtfDedPdschCfgInfo(param, mBuf)
 CtfDedPdschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedPdschCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5859,25 +5760,24 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedPdschCfgInfo
+S16 cmUnpkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedPdschCfgInfo(param, mBuf)
+S16 cmUnpkCtfDedPdschCfgInfo(param, mBuf)
 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;
@@ -5903,19 +5803,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedPucchCfgInfo
+S16 cmPkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedPucchCfgInfo(param, mBuf)
+S16 cmPkCtfDedPucchCfgInfo(param, mBuf)
 CtfDedPucchCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedPucchCfgInfo)
 
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
@@ -5967,19 +5866,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedPucchCfgInfo
+S16 cmUnpkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedPucchCfgInfo(param, mBuf)
+S16 cmUnpkCtfDedPucchCfgInfo(param, mBuf)
 CtfDedPucchCfgInfo *param;
 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 */
    }
@@ -6031,19 +5929,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedPuschCfgInfo
+S16 cmPkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedPuschCfgInfo(param, mBuf)
+S16 cmPkCtfDedPuschCfgInfo(param, mBuf)
 CtfDedPuschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedPuschCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6076,19 +5973,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedPuschCfgInfo
+S16 cmUnpkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedPuschCfgInfo(param, mBuf)
+S16 cmUnpkCtfDedPuschCfgInfo(param, mBuf)
 CtfDedPuschCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedPuschCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6122,22 +6018,21 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCqiRptModePeriodic
+S16 cmPkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCqiRptModePeriodic(param, mBuf)
+S16 cmPkCtfCqiRptModePeriodic(param, mBuf)
 CtfCqiRptModePeriodic *param;
 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);
@@ -6171,21 +6066,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCqiRptModePeriodic
+S16 cmUnpkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCqiRptModePeriodic(param, mBuf)
+S16 cmUnpkCtfCqiRptModePeriodic(param, mBuf)
 CtfCqiRptModePeriodic *param;
 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;
@@ -6224,19 +6118,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCqiReportCfgInfo
+S16 cmPkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCqiReportCfgInfo(param, mBuf)
+S16 cmPkCtfCqiReportCfgInfo(param, mBuf)
 CtfCqiReportCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCqiReportCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6304,21 +6197,20 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCqiReportCfgInfo
+S16 cmUnpkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCqiReportCfgInfo(param, mBuf)
+S16 cmUnpkCtfCqiReportCfgInfo(param, mBuf)
 CtfCqiReportCfgInfo *param;
 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);
@@ -6388,19 +6280,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedSrsUlCfgInfo
+S16 cmPkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedSrsUlCfgInfo(param, mBuf)
+S16 cmPkCtfDedSrsUlCfgInfo(param, mBuf)
 CtfDedSrsUlCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedSrsUlCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6438,19 +6329,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedSrsUlCfgInfo
+S16 cmUnpkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedSrsUlCfgInfo(param, mBuf)
+S16 cmUnpkCtfDedSrsUlCfgInfo(param, mBuf)
 CtfDedSrsUlCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedSrsUlCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6488,19 +6378,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedSRCfgInfo
+S16 cmPkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedSRCfgInfo(param, mBuf)
+S16 cmPkCtfDedSRCfgInfo(param, mBuf)
 CtfDedSRCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedSRCfgInfo)
 
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
@@ -6533,19 +6422,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedSRCfgInfo
+S16 cmUnpkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedSRCfgInfo(param, mBuf)
+S16 cmUnpkCtfDedSRCfgInfo(param, mBuf)
 CtfDedSRCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedSRCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -6579,23 +6467,22 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedAntCfgInfo
+S16 cmPkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedAntCfgInfo(param, mBuf)
+S16 cmPkCtfDedAntCfgInfo(param, mBuf)
 CtfDedAntCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
    
 #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
@@ -6681,13 +6568,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedAntCfgInfo
+S16 cmUnpkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedAntCfgInfo(param, mBuf)
+S16 cmUnpkCtfDedAntCfgInfo(param, mBuf)
 CtfDedAntCfgInfo *param;
 Buffer *mBuf;
 #endif
@@ -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;
@@ -6786,13 +6672,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfUeSecCellCfgInfo
+S16 cmPkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfUeSecCellCfgInfo(*param, mBuf)
+S16 cmPkCtfUeSecCellCfgInfo(*param, mBuf)
 CtfUeSecCellCfgInfo *param;
 Buffer *mBuf;
 #endif
@@ -6819,13 +6705,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfSecCellCfgInfo
+S16 cmPkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfSecCellCfgInfo(*param, mBuf)
+S16 cmPkCtfSecCellCfgInfo(*param, mBuf)
 CtfSecCellCfgInfo *param;
 Buffer *mBuf;
 #endif
@@ -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);
@@ -6859,13 +6745,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfUeSecCellCfgInfo
+S16 cmUnpkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfUeSecCellCfgInfo(*param, mBuf)
+S16 cmUnpkCtfUeSecCellCfgInfo(*param, mBuf)
 CtfUeSecCellCfgInfo *param;
 Buffer *mBuf;
 #endif
@@ -6894,21 +6780,21 @@ Buffer *mBuf;
 **********************************************************/
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfSecCellCfgInfo
+S16 cmUnpkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfSecCellCfgInfo(*param, mBuf)
+S16 cmUnpkCtfSecCellCfgInfo(*param, mBuf)
 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);
@@ -6936,19 +6822,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfUeCatCfgInfo
+S16 cmPkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfUeCatCfgInfo(param, mBuf)
+S16 cmPkCtfUeCatCfgInfo(param, mBuf)
 CtfUeCatCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfUeCatCfgInfo)
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6977,24 +6862,23 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfUeCatCfgInfo
+S16 cmUnpkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfUeCatCfgInfo(param, mBuf)
+S16 cmUnpkCtfUeCatCfgInfo(param, mBuf)
 CtfUeCatCfgInfo *param;
 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;
 }
 
@@ -7018,19 +6902,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedCfgInfo
+S16 cmPkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedCfgInfo(param, mBuf)
+S16 cmPkCtfDedCfgInfo(param, mBuf)
 CtfDedCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedCfgInfo)
 #ifdef EMTC_ENABLE
    CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf);
 #endif
@@ -7069,19 +6952,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedCfgInfo
+S16 cmUnpkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedCfgInfo(param, mBuf)
+S16 cmUnpkCtfDedCfgInfo(param, mBuf)
 CtfDedCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedCfgInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -7121,19 +7003,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedRecfgInfo
+S16 cmPkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedRecfgInfo(param, mBuf)
+S16 cmPkCtfDedRecfgInfo(param, mBuf)
 CtfDedRecfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedRecfgInfo)
 
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    /*ctf_c_001.main_1*/
@@ -7178,19 +7059,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedRecfgInfo
+S16 cmUnpkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedRecfgInfo(param, mBuf)
+S16 cmUnpkCtfDedRecfgInfo(param, mBuf)
 CtfDedRecfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedRecfgInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -7237,19 +7117,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCellReleaseInfo
+S16 cmPkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCellReleaseInfo(param, mBuf)
+S16 cmPkCtfCellReleaseInfo(param, mBuf)
 CtfCellReleaseInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCellReleaseInfo)
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
@@ -7275,19 +7154,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCellReleaseInfo
+S16 cmUnpkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCellReleaseInfo(param, mBuf)
+S16 cmUnpkCtfCellReleaseInfo(param, mBuf)
 CtfCellReleaseInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCellReleaseInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    return ROK;
@@ -7313,19 +7191,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfDedReleaseInfo
+S16 cmPkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfDedReleaseInfo(param, mBuf)
+S16 cmPkCtfDedReleaseInfo(param, mBuf)
 CtfDedReleaseInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfDedReleaseInfo)
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -7352,19 +7229,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfDedReleaseInfo
+S16 cmUnpkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfDedReleaseInfo(param, mBuf)
+S16 cmUnpkCtfDedReleaseInfo(param, mBuf)
 CtfDedReleaseInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfDedReleaseInfo)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
@@ -7392,19 +7268,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCfgInfo
+S16 cmPkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCfgInfo(param, mBuf)
+S16 cmPkCtfCfgInfo(param, mBuf)
 CtfCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCfgInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7440,19 +7315,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCfgInfo
+S16 cmUnpkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCfgInfo(param, mBuf)
+S16 cmUnpkCtfCfgInfo(param, mBuf)
 CtfCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7488,19 +7362,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfReCfgInfo
+S16 cmPkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfReCfgInfo(param, mBuf)
+S16 cmPkCtfReCfgInfo(param, mBuf)
 CtfReCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfReCfgInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7545,19 +7418,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfReCfgInfo
+S16 cmUnpkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfReCfgInfo(param, mBuf)
+S16 cmUnpkCtfReCfgInfo(param, mBuf)
 CtfReCfgInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfReCfgInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7601,19 +7473,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfReleaseInfo
+S16 cmPkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfReleaseInfo(param, mBuf)
+S16 cmPkCtfReleaseInfo(param, mBuf)
 CtfReleaseInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfReleaseInfo)
 
       switch(param->cfgElem) {
          case CTF_UE_CFG:
@@ -7649,19 +7520,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfReleaseInfo
+S16 cmUnpkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfReleaseInfo(param, mBuf)
+S16 cmUnpkCtfReleaseInfo(param, mBuf)
 CtfReleaseInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCtfReleaseInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
@@ -7700,19 +7570,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCfgReqInfo
+S16 cmPkCtfCfgReqInfo
 (
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCfgReqInfo(param, mBuf)
+S16 cmPkCtfCfgReqInfo(param, mBuf)
 CtfCfgReqInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCtfCfgReqInfo)
 
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
@@ -7760,14 +7629,14 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCfgReqInfo
+S16 cmUnpkCtfCfgReqInfo
 (
 Pst  *pst,
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCfgReqInfo(param, mBuf)
+S16 cmUnpkCtfCfgReqInfo(param, mBuf)
 Pst  *pst;
 CtfCfgReqInfo *param;
 Buffer *mBuf;
@@ -7778,7 +7647,6 @@ Buffer *mBuf;
    S16 retVal;
 #endif
 
-   TRC3(cmUnpkCtfCfgReqInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgType, mBuf);
       switch(param->cfgType) {
@@ -7820,22 +7688,21 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCellPwrcfgInfo
+S16 cmPkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCellPwrcfgInfo(param, mBuf)
+S16 cmPkCtfCellPwrcfgInfo(param, mBuf)
 CtfCellRecfgInfo *param;
 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);
@@ -7865,19 +7732,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCellPwrcfgInfo
+S16 cmUnpkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCellPwrcfgInfo(param, mBuf)
+S16 cmUnpkCtfCellPwrcfgInfo(param, mBuf)
 CtfCellRecfgInfo *param;
 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;
 }
@@ -7909,22 +7775,21 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfCellStop
+S16 cmPkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfCellStop(param, mBuf)
+S16 cmPkCtfCellStop(param, mBuf)
 CtfCellRecfgInfo *param;
 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);
@@ -7952,19 +7817,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfCellStop
+S16 cmUnpkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfCellStop(param, mBuf)
+S16 cmUnpkCtfCellStop(param, mBuf)
 CtfCellRecfgInfo *param;
 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;
 }
@@ -7995,18 +7859,17 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkPerRemScanCellInfo
+S16 cmPkPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkPerRemScanCellInfo(param, mBuf)
+S16 cmPkPerRemScanCellInfo(param, mBuf)
 CtfPeriodicRemCellInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmPkPerRemScanCellInfo)
 
    CMCHKPK(oduUnpackUInt16,param->pci, mBuf);
    CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
@@ -8033,19 +7896,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPeriodicCellSearchRsp
+S16 cmPkCtfPeriodicCellSearchRsp
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCtfPeriodicCellSearchRsp(param, mBuf)
+S16 cmPkCtfPeriodicCellSearchRsp(param, mBuf)
 CtfPeriodicRemCellSearchRsp *param;
 Buffer *mBuf;
 #endif
 {
    S16 idx;
-   TRC3(cmPkCtfPeriodicCellSearchRsp)
 
    for(idx = param->numCells - 1; idx >=0; idx--)
    {
@@ -8072,7 +7934,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCtfPeriodicRemCellSearchRsp
+S16 cmPkCtfPeriodicRemCellSearchRsp
 (
 Pst* pst,
 SpId spId,
@@ -8080,7 +7942,7 @@ CtfCfgTransId *transId,
 CtfPeriodicRemCellSearchRsp *CellCfgRsp
 )
 #else
-PUBLIC S16 cmPkCtfPeriodicRemCellSearchRsp(pst, spId, transId, CellCfgRsp)
+S16 cmPkCtfPeriodicRemCellSearchRsp(pst, spId, transId, CellCfgRsp)
 Pst* pst;
 SpId spId;
 CtfCfgTransId *transId;
@@ -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)
@@ -8164,18 +8025,17 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPerRemScanCellInfo
+S16 cmUnpkCtfPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPerRemScanCellInfo(param, mBuf)
+S16 cmUnpkCtfPerRemScanCellInfo(param, mBuf)
 CtfPeriodicRemCellInfo *param;
 Buffer *mBuf;
 #endif
 {
-   TRC3(cmUnpkCtfPerRemScanCellInfo);
 
    CMCHKUNPK(oduPackUInt8, &param->numTx, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->dlBw, mBuf);
@@ -8185,19 +8045,18 @@ Buffer *mBuf;
 }
 
 #ifdef ANSI
-PUBLIC S16 cmUnpkCtfPerRemCellSrch
+S16 cmUnpkCtfPerRemCellSrch
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCtfPerRemCellSrch(param, mBuf)
+S16 cmUnpkCtfPerRemCellSrch(param, mBuf)
 CtfPeriodicRemCellSearchRsp *param;
 Buffer *mBuf;
 #endif
 {
    S16 idx;
-   TRC3(cmUnpkCtfPerRemCellSrch);
 
    CMCHKUNPK(oduPackUInt8, &param->numCells, mBuf);
    for(idx = 0; idx < (param->numCells); idx++)
@@ -8222,14 +8081,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkPerRemCellSrchRsp
+S16 cmUnpkPerRemCellSrchRsp
 (
 CtfPerRemCellSrchRsp func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkPerRemCellSrchRsp(func, pst, mBuf)
+S16 cmUnpkPerRemCellSrchRsp(func, pst, mBuf)
 CtfPerRemCellSrchRsp func;
 Pst *pst;
 Buffer *mBuf;
@@ -8238,7 +8097,6 @@ Buffer *mBuf;
    SuId suId = 0;
    CtfCfgTransId transId;
    CtfPeriodicRemCellSearchRsp *CellSrchRsp = NULLP;  
-   TRC3(cmUnpkPerRemCellSrchRsp)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);