X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fctf.c;h=03bca9207dda0bafb84f4d45506aedae93661311;hb=be872311899d115fdf4565e4811cc8b37226ac53;hp=59d23930f2007fbc754535ac6d7712337fdeb7f8;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git

diff --git a/src/cm/ctf.c b/src/cm/ctf.c
index 59d23930f..03bca9207 100755
--- a/src/cm/ctf.c
+++ b/src/cm/ctf.c
@@ -63,19 +63,12 @@
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
-#else
-S16 cmPkCtfBndReq(pst, suId, spId)
-Pst* pst;
-SuId suId;
-SpId spId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -126,19 +119,12 @@ SpId spId;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfBndReq
 (
 CtfBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBndReq(func, pst, mBuf)
-CtfBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    SpId spId = 0;
@@ -179,23 +165,16 @@ Buffer *mBuf;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
-#else
-S16 cmPkCtfBndCfm(pst, suId, status)
-Pst* pst;
-SuId suId;
-U8 status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -243,26 +222,19 @@ U8 status;
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfBndCfm
 (
 CtfBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBndCfm(func, pst, mBuf)
-CtfBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
-   U8 status;
+   uint8_t status;
    
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
@@ -303,19 +275,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
-#else
-S16 cmPkCtfUbndReq(pst, spId, reason)
-Pst* pst;
-SpId spId;
-Reason reason;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -366,19 +331,12 @@ Reason reason;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUbndReq
 (
 CtfUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUbndReq(func, pst, mBuf)
-CtfUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    Reason reason = 0;
@@ -423,17 +381,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmRelCtfCfgReq
+static S16 cmRelCtfCfgReq
 (
 Pst  *pst,
 CtfCfgReqInfo *cfgReqInfo
 )
-#else
-PRIVATE S16 cmRelCtfCfgReq(pst,cfgReqInfo)
-Pst  *pst;
-CtfCfgReqInfo *param;
-#endif
 {
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
@@ -468,17 +420,11 @@ CtfCfgReqInfo *param;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfNhKeyInfo(param, mBuf)
-CtfNhKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
@@ -514,17 +460,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfKenbStarInfo(param, mBuf)
-CtfKenbStarInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
@@ -561,22 +501,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAskeyInfo(param, mBuf)
-CtfAsKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    S16  idx;
-
-
          
    for(idx=31;idx>=0;idx--)
    {
@@ -608,17 +539,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmPkCtfKdfReqInfo(param, mBuf)
-CtfKdfReqInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
 
@@ -656,7 +581,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfKdfReq
 (
 Pst* pst,
@@ -664,18 +588,9 @@ SpId spId,
 CtfCfgTransId transId,
 CtfKdfReqInfo* kdfReqInfo
 )
-#else
-S16 cmPkCtfKdfReq(pst, spId, transId, kdfReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfKdfReqInfo* kdfReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
-
-   
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -743,40 +658,29 @@ CtfKdfReqInfo* kdfReqInfo;
 /********************************************************************************************************************************/
                               /*START OF CNM PACK & UNPACK FUNCTIONS*/
 /********************************************************************************************************************************/
-#ifdef ANSI
 S16 cmPkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
 )
-#else
-CtfCnmVendorSpecificInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
    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);
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmPkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCtfCnmCellSyncReq(param, mBuf)
-CtfCnmCellSyncReq *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf);
@@ -790,17 +694,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfcfgReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgReqInfo(param, mBuf)
-CtfCnmInitSyncReq *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -819,17 +717,11 @@ Buffer *mBuf;
    return ROK;
 
 }
-#ifdef ANSI
 S16 cmUnpkCtfCnmVendorSpecificInfo
 (
 CtfCnmVendorSpecificInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmVendorSpecificInfo(param, mBuf)
-CtfCnmVendorSpecificInfo *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -841,20 +733,13 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCtfCnmCellSyncReq(param, mBuf)
-CtfCnmCellSyncReq *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->nbrSpecSfCfg, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->nbrCellNRb, mBuf);
@@ -866,17 +751,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfsyncReqInfo
 (
 CtfCnmInitSyncReq *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfsyncReqInfo(param, mBuf)
-CtfCnmInitSyncReq *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
@@ -907,7 +786,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncReq
 (
 Pst* pst,
@@ -915,18 +793,10 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncReq * cfgReqInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncReq * cfgReqInfo;
-#endif
 {
 
    Buffer *mBuf = NULLP;
 
-
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1008,19 +878,12 @@ CtfCnmCellSyncReq * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncReq
 (
 CtfCnmCellSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncReq(func, pst, mBuf)
-CtfCnmCellSyncReqMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1099,7 +962,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmInitSyncReq
 (
 Pst* pst,
@@ -1107,13 +969,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmInitSyncReq * cfgReqInfo
 )
-#else
-S16 cmPkCtfCnmInitSyncReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmInitSyncReq * cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1201,19 +1056,12 @@ CtfCnmInitSyncReq * cfgReqInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncReq
 (
 CtfCnmInitSyncReqMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncReq(func, pst, mBuf)
-CtfCnmInitSyncReqMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1275,17 +1123,11 @@ Buffer *mBuf;
 }
 /*-----------------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfctfCnmMibInfo(param, mBuf)
-CtfCnmMibInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
@@ -1297,17 +1139,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfctfCnmInitSyncInfo(param, mBuf)
-CtfCnmInitSyncInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
@@ -1320,21 +1156,14 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmPkCtfcfgRspInfo
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgRspInfo(param, mBuf)
-CtfCnmInitSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
    S32 i;
 
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf);
    if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH)
@@ -1364,7 +1193,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmInitSyncRsp
 (
 Pst* pst,
@@ -1372,13 +1200,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmInitSyncRsp * cfgRspInfo
 )
-#else
-S16 cmPkCtfCnmInitSyncRsp(pst, spId, transId, cfgRspInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmInitSyncRsp * cfgRspInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -1451,20 +1272,13 @@ CtfCnmInitSyncRsp * cfgRspInfo;
 }
 /*-----------------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfctfCnmMibInfo
 (
 CtfCnmMibInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfctfCnmMibInfo(param, mBuf)
-CtfCnmMibInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->dlSystemBandWidht, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->phichResource, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->phichDuration, mBuf);
@@ -1474,17 +1288,11 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkctfCnmInitSyncInfo
 (
 CtfCnmInitSyncInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkctfCnmInitSyncInfo(param, mBuf)
-CtfCnmInitSyncInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
@@ -1497,21 +1305,14 @@ Buffer *mBuf;
 
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncRspMsg
 (
 CtfCnmInitSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncRspMsg(param, mBuf)
-CtfCnmInitSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
     S32 i;
 
-
     CMCHKUNPK(oduPackUInt8, &param->numOfNeighbourInfo, mBuf);
     for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
     {
@@ -1536,19 +1337,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmInitSyncRsp
 (
 CtfCnmInitSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmInitSyncRsp(func, pst, mBuf)
-CtfCnmInitSyncRspMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1611,20 +1405,13 @@ Buffer *mBuf;
 }
 /*-----------------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfCellSyncRsp 
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellSyncRsp(param, mBuf)
-CtfCnmCellSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    return ROK;
 
@@ -1644,7 +1431,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncRsp
 (
 Pst* pst,
@@ -1652,13 +1438,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncRsp * cfgRspInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncRsp(pst, spId, transId, cfgRspInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncRsp * cfgRspInfo;
-#endif
 {
 
    Buffer *mBuf = NULLP;
@@ -1733,20 +1512,13 @@ CtfCnmCellSyncRsp * cfgRspInfo;
 }
 /*------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmSyncRspMsg
 (
 CtfCnmCellSyncRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmSyncRspMsg(param, mBuf)
-CtfCnmCellSyncRsp *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
 
@@ -1765,19 +1537,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncRsp
 (
 CtfCnmCellSyncRspMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncRsp(func, pst, mBuf)
-CtfCnmCellSyncRspMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -1840,20 +1605,13 @@ Buffer *mBuf;
 }
 /*---------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmPkCtfcfgIndInfo
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfcfgIndInfo(param, mBuf)
-CtfCnmCellSyncInd *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->status, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    return ROK;
@@ -1874,7 +1632,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCnmCellSyncInd
 (
 Pst* pst,
@@ -1882,13 +1639,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfCnmCellSyncInd * cfgIndInfo
 )
-#else
-S16 cmPkCtfCnmCellSyncInd(pst, spId, transId, cfgIndInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfCnmCellSyncInd * cfgIndInfo;
-#endif
 {
    
    Buffer *mBuf = NULLP;
@@ -1963,20 +1713,13 @@ CtfCnmCellSyncInd * cfgIndInfo;
 
 /*---------------------------------------------------------------*/
 
-#ifdef ANSI
 S16 cmUnpkCtfCnmSyncIndMsg
 (
 CtfCnmCellSyncInd *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmSyncIndMsg(param, mBuf)
-CtfCnmCellSyncInd *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
    return ROK;
@@ -1996,19 +1739,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCnmCellSyncInd
 (
 CtfCnmCellSyncIndMsg func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCnmCellSyncInd(func, pst, mBuf)
-CtfCnmCellSyncIndMsg func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
 
    SpId spId = 0;
@@ -2092,7 +1828,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfCfgReq
 (
 Pst* pst,
@@ -2100,13 +1835,6 @@ SpId spId,
 CtfCfgTransId transId,
 CtfCfgReqInfo* cfgReqInfo
 )
-#else
-S16 cmPkCtfCfgReq(pst, spId, transId, cfgReqInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfCfgReqInfo* cfgReqInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2194,22 +1922,15 @@ CtfCfgReqInfo* cfgReqInfo;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfNhKeyInfo
 (
 CtfNhKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfNhKeyInfo(param, mBuf)
-CtfNhKeyInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
-
-         
+   uint8_t  idx;
+        
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
@@ -2237,22 +1958,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKenbStarInfo
 (
 CtfKenbStarInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKenbStarInfo(param, mBuf)
-CtfKenbStarInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-         
    CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
@@ -2281,21 +1995,13 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAskeyInfo
 (
 CtfAsKeyInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAskeyInfo(param, mBuf)
-CtfAskeyInfo *param;
-Buffer *mBuf;
-#endif
 {
-
-   U8  idx;
-
+   uint8_t  idx;
 
    CMCHKUNPK(oduPackUInt8, &param->intgAlgoType, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ciphAlgoType, mBuf);
@@ -2324,20 +2030,13 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKdfReqInfo
 (
 CtfKdfReqInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmUnpkCtfKdfReqInfo(param, mBuf)
-CtfKdfReqInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-
     CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
      switch (param->keyDerType)
     {
@@ -2371,19 +2070,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfKdfReq
 (
 CtfKdfReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKdfReq(func, pst, mBuf)
-CtfKdfReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
@@ -2466,19 +2158,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfCfgReq
 (
 CtfCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgReq(func, pst, mBuf)
-CtfCfgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
@@ -2558,21 +2243,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfNhKeyCfmInfo(param, mBuf)
-CtfNhKeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
-
          
    for(idx=31;idx>=0;idx--)
    {
@@ -2599,17 +2277,11 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfKenbStarCfmInfo(param, mBuf)
-CtfKenbStarCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
@@ -2641,22 +2313,15 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAskeyCfmInfo(param, mBuf)
-CtfAskeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    S16  idx;
 
-
    for(idx=15;idx>=0;idx--)
    {
       CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf);
@@ -2690,22 +2355,15 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmPkCtfKdfCfmInfo(param, mBuf)
-CtfKdfCfmInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
-
    switch (param->keyDerType)
-    {
+   {
          case CTF_KDF_TYPE1:
              CMCHKPK(cmPkCtfAskeyCfmInfo, &param->u.kEnbInf, mBuf);
              break;
@@ -2732,26 +2390,18 @@ 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
 S16 cmPkCtfKdfCfm
 (
 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;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2841,25 +2491,17 @@ 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
 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;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2919,19 +2561,12 @@ U8 status;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfEnbStopInd
 (
 Pst* pst,
 SuId suId,
 CtfCfgTransId transId
 )
-#else
-S16 cmPkCtfEnbStopInd(pst, suId, transId)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -2987,22 +2622,15 @@ CtfCfgTransId transId;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfNhKeyCfmInfo
 (
 CtfNhKeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfNhKeyCfmInfo(param, mBuf)
-CtfNhKeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
-         
    for(idx=0;idx<32;idx++)
    {
       CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
@@ -3028,21 +2656,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKenbStarCfmInfo
 (
 CtfKenbStarCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfKenbStarCfmInfo(param, mBuf)
-CtfKenbStarCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
-
+   uint8_t  idx;
          
    for(idx=0;idx<32;idx++)
    {
@@ -3070,20 +2691,14 @@ Buffer *mBuf;
  *     File:
  *
  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAskeyCfmInfo
 (
 CtfAskeyCfmInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAskeyCfmInfo(param, mBuf)
-CtfAskeyCfmInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U8  idx;
+   uint8_t  idx;
 
          
    for(idx=0;idx<16;idx++)
@@ -3119,17 +2734,11 @@ Buffer *mBuf;
  *     File:
  *
  *  **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfKdfCfmInfo
 (
 CtfKdfCfmInfo *param,
 Buffer *mBuf
- )
-#else
-S16 cmUnpkCtfKdfCfmInfo(param, mBuf)
-CtfKdfCfmInfo *param;
-Buffer *mBuf;
-#endif
+)
 {
 
 
@@ -3161,27 +2770,20 @@ 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
 S16 cmUnpkCtfKdfCfm
 (
 CtfKdfCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
-CtfKdfCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   U8 status;
+   uint8_t status;
    CtfKdfCfmInfo kdfCfmInfo;
    
 
@@ -3242,27 +2844,20 @@ 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
 S16 cmUnpkCtfCfgCfm
 (
 CtfCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgCfm(func, pst, mBuf)
-CtfCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   U8 status;
+   uint8_t status;
    
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
@@ -3312,23 +2907,15 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfEnbStopInd
 (
 CtfEnbStopInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfEnbStopInd(func, pst, mBuf)
-CtfEnbStopInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
-   
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -3370,7 +2957,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfUeIdChgReq
 (
 Pst* pst,
@@ -3379,14 +2965,6 @@ CtfCfgTransId transId,
 CtfUeInfo * ueInfo,
 CtfUeInfo * newUeInfo
 )
-#else
-S16 cmPkCtfUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst* pst;
-SpId spId;
-CtfCfgTransId transId;
-CtfUeInfo * ueInfo;
-CtfUeInfo * newUeInfo;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -3523,19 +3101,12 @@ CtfUeInfo * newUeInfo;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkCtfUeIdChgReq
 (
 CtfUeIdChgReq func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeIdChgReq(func, pst, mBuf)
-CtfUeIdChgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId = 0;
    CtfCfgTransId transId;
@@ -3641,11 +3212,10 @@ 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
 S16 cmPkCtfUeIdChgCfm
 (
 Pst* pst,
@@ -3654,14 +3224,6 @@ CtfCfgTransId transId,
 CtfUeInfo * ueInfo,
 CmStatus status
 )
-#else
-S16 cmPkCtfUeIdChgCfm(pst, suId, transId, ueInfo, status)
-Pst* pst;
-SuId suId;
-CtfCfgTransId transId;
-CtfUeInfo * ueInfo;
-CmStatus status;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -3762,23 +3324,16 @@ 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
 S16 cmUnpkCtfUeIdChgCfm
 (
 CtfUeIdChgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeIdChgCfm(func, pst, mBuf)
-CtfUeIdChgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;
@@ -3867,21 +3422,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgTransId(param, mBuf)
-CtfCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
-
    for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) {
       CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
    }
@@ -3905,17 +3453,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgTransId
 (
 CtfCfgTransId *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgTransId(param, mBuf)
-CtfCfgTransId *param;
-Buffer *mBuf;
-#endif
 {
 
    S32 i;
@@ -3943,20 +3485,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeInfo(param, mBuf)
-CtfUeInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
@@ -3979,20 +3514,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeInfo
 (
 CtfUeInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeInfo(param, mBuf)
-CtfUeInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    return ROK;
@@ -4017,17 +3545,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfBwCfgInfo(param, mBuf)
-CtfBwCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4057,25 +3579,19 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfBwCfgInfo
 (
 CtfBwCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfBwCfgInfo(param, mBuf)
-CtfBwCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U32 tmpEnum;
+   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;
@@ -4099,20 +3615,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfTxSchemeCfg(param, mBuf)
-CtfTxSchemeCfg *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf);
    CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf);
    CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf);
@@ -4138,27 +3647,21 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfTxSchemeCfg
 (
 CtfTxSchemeCfg *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfTxSchemeCfg(param, mBuf)
-CtfTxSchemeCfg *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   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->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;
 }
@@ -4182,20 +3685,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfAntennaCfgInfo(param, mBuf)
-CtfAntennaCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf);
    return ROK;
 }
@@ -4219,21 +3715,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfAntennaCfgInfo
 (
 CtfAntennaCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfAntennaCfgInfo(param, mBuf)
-CtfAntennaCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum;
    return ROK;
 }
@@ -4263,20 +3753,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPrachCfgInfo(param, mBuf)
-CtfPrachCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4315,20 +3798,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPrachCfgInfo
 (
 CtfPrachCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPrachCfgInfo(param, mBuf)
-CtfPrachCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4361,17 +3837,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPdschCfgInfo(param, mBuf)
-CtfPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 /*ctf_c_001.main_1*/
@@ -4403,20 +3873,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPdschCfgInfo
 (
 CtfPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPdschCfgInfo(param, mBuf)
-CtfPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4446,20 +3909,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschCfgBasic(param, mBuf)
-CtfPuschCfgBasic *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf);
    CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf);
    CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf);
@@ -4486,23 +3942,16 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschCfgBasic
 (
 CtfPuschCfgBasic *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschCfgBasic(param, mBuf)
-CtfPuschCfgBasic *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-
+   uint32_t tmpEnum;
 
    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);
@@ -4528,20 +3977,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschUlRS(param, mBuf)
-CtfPuschUlRS *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf);
    CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf);
    CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf);
@@ -4568,17 +4010,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschUlRS
 (
 CtfPuschUlRS *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschUlRS(param, mBuf)
-CtfPuschUlRS *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4608,20 +4044,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPuschCfgInfo(param, mBuf)
-CtfPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4651,20 +4080,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPuschCfgInfo
 (
 CtfPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPuschCfgInfo(param, mBuf)
-CtfPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4694,20 +4116,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPhichCfgInfo(param, mBuf)
-CtfPhichCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4737,28 +4152,21 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPhichCfgInfo
 (
 CtfPhichCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPhichCfgInfo(param, mBuf)
-CtfPhichCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-
+   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->duration = (CtfPhichDuration)tmpEnum;
-     CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+     CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
      param->resource = (CtfPhichResource)tmpEnum;
    }
    return ROK;
@@ -4783,17 +4191,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPucchCfgInfo(param, mBuf)
-CtfPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -4828,20 +4230,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfPucchCfgInfo
 (
 CtfPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPucchCfgInfo(param, mBuf)
-CtfPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
-
+   uint32_t tmpEnum;
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
@@ -4850,7 +4245,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;
@@ -4875,20 +4270,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfSrsUlCfgInfo(param, mBuf)
-CtfSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4921,20 +4309,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfSrsUlCfgInfo
 (
 CtfSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfSrsUlCfgInfo(param, mBuf)
-CtfSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -4967,20 +4348,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfTddSfCfgInfo(param, mBuf)
-CtfTddSfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -5010,17 +4384,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfVendorSpecParams
 (
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfVendorSpecParams(param, mBuf)
-CtfVendorSpecific *param;
-Buffer *mBuf;
-#endif
 {
 
    if( param->buffLen != 0) {
@@ -5048,22 +4416,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfVendorSpecParams
 (
 Pst *pst,
 CtfVendorSpecific *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfVendorSpecParams(pst, param, mBuf)
-Pst *pst;
-CtfVendorSpecific *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt16, &param->buffLen, mBuf);
 
    if(param->buffLen != 0) {
@@ -5102,20 +4462,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfTddSfCfgInfo
 (
 CtfTddSfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfTddSfCfgInfo(param, mBuf)
-CtfTddSfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -5140,19 +4493,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmPkCtfUnLicnsdCellParam
+static S16 cmPkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmPkCtfUnLicnsdCellParam(param, mBuf)
-CtfUnLicnsdCfgInfo  *param;
-Buffer *mBuf;
-#endif
 {
-   U8  idx;
+   uint8_t  idx;
 
 
    CMCHKPK(SPkS32, param->txPowerLimit, mBuf);
@@ -5193,17 +4540,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellCfgInfo(param, mBuf)
-CtfCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef EMTC_ENABLE
    S32 i;
@@ -5220,7 +4561,7 @@ Buffer *mBuf;
 #endif
    if(param->unLicnsdCfgPres)
    {   
-      printf("pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres);
+      DU_LOG("\nDEBUG  -->  pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres);
       CMCHKPK(cmPkCtfUnLicnsdCellParam, &param->lteUCfg, mBuf);
    }
    CMCHKPK(oduUnpackUInt8, param->unLicnsdCfgPres, mBuf);
@@ -5317,20 +4658,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
-PRIVATE S16 cmUnpkCtfUnLicnsdCellParam
+static S16 cmUnpkCtfUnLicnsdCellParam
 (
 CtfUnLicnsdCfgInfo *param,
 Buffer *mBuf
 )
-#else
-PRIVATE S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf)
-CtfUnLicnsdCfgInfo  *param;
-Buffer *mBuf;
-#endif
 {
-   U8  idx;
-
+   uint8_t  idx;
 
    CMCHKUNPK(oduPackUInt8, &param->numFreq, mBuf);
 
@@ -5371,17 +4705,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellCfgInfo
 (
 CtfCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellCfgInfo(param, mBuf)
-CtfCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef EMTC_ENABLE
    S32 i;
@@ -5467,7 +4795,7 @@ Buffer *mBuf;
 
    if(param->unLicnsdCfgPres)
    {
-      printf("pverma param->unLicnsdCfgPres 2 -->%d \n",param->unLicnsdCfgPres);
+      DU_LOG("\nDEBUG  -->  pverma param->unLicnsdCfgPres 2 -->%d \n",param->unLicnsdCfgPres);
       CMCHKUNPK(cmUnpkCtfUnLicnsdCellParam, &param->lteUCfg, mBuf);
    }   
 #ifdef EMTC_ENABLE
@@ -5504,17 +4832,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellRecfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5610,23 +4932,17 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellRecfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellRecfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-   U32 tmpEnum;
+   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);   
@@ -5693,7 +5009,7 @@ Buffer *mBuf;
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
-   printf("param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); 
+   DU_LOG("\nDEBUG  -->  param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); 
 #ifdef ENABLE_API_LOG
    CMCHKUNPK(oduPackUInt8, &param->enableAPILog, mBuf);
 #endif /* ENABLE_API_LOG */
@@ -5719,20 +5035,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPdschCfgInfo(param, mBuf)
-CtfDedPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
       CMCHKPK(oduUnpackUInt32, param->pA, mBuf);
@@ -5759,25 +5068,19 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPdschCfgInfo
 (
 CtfDedPdschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPdschCfgInfo(param, mBuf)
-CtfDedPdschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-   U32 tmpEnum;
+   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;
@@ -5802,17 +5105,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPucchCfgInfo(param, mBuf)
-CtfDedPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5865,17 +5162,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPucchCfgInfo
 (
 CtfDedPucchCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPucchCfgInfo(param, mBuf)
-CtfDedPucchCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -5890,10 +5181,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
@@ -5902,7 +5193,7 @@ Buffer *mBuf;
 
       if (param->tddAckNackCfgPres != FALSE)
       {
-         CMCHKUNPK(oduPackUInt32, (U32 *)&param->tddAckNackFBMode, mBuf);
+         CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->tddAckNackFBMode, mBuf);
       }
 #endif /* CTF_VER3 */
    }
@@ -5928,20 +5219,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedPuschCfgInfo(param, mBuf)
-CtfDedPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -5972,20 +5256,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedPuschCfgInfo
 (
 CtfDedPuschCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedPuschCfgInfo(param, mBuf)
-CtfDedPuschCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6017,22 +5294,16 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCqiRptModePeriodic(param, mBuf)
-CtfCqiRptModePeriodic *param;
-Buffer *mBuf;
-#endif
 {
 
 /* 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);
@@ -6065,20 +5336,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCqiRptModePeriodic
 (
 CtfCqiRptModePeriodic *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCqiRptModePeriodic(param, mBuf)
-CtfCqiRptModePeriodic *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef CTF_VER1    
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 #endif   
 
    CMCHKUNPK(oduPackUInt8, &param->cqiPeriodicCfgType, mBuf);
@@ -6092,7 +5357,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;
@@ -6117,20 +5382,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCqiReportCfgInfo(param, mBuf)
-CtfCqiReportCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -6196,20 +5454,14 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCqiReportCfgInfo
 (
 CtfCqiReportCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCqiReportCfgInfo(param, mBuf)
-CtfCqiReportCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #if defined (CTF_VER1) || defined (CTF_VER2)
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 #endif
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
@@ -6219,7 +5471,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 */
 
@@ -6237,7 +5489,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;
       }
@@ -6247,7 +5499,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);
@@ -6279,20 +5531,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedSrsUlCfgInfo(param, mBuf)
-CtfDedSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -6328,20 +5573,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedSrsUlCfgInfo
 (
 CtfDedSrsUlCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedSrsUlCfgInfo(param, mBuf)
-CtfDedSrsUlCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
@@ -6377,20 +5615,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedSRCfgInfo(param, mBuf)
-CtfDedSRCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
   {
@@ -6421,17 +5652,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedSRCfgInfo
 (
 CtfDedSRCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedSRCfgInfo(param, mBuf)
-CtfDedSRCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6466,21 +5691,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedAntCfgInfo(param, mBuf)
-CtfDedAntCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    
 #ifdef CTF_VER2
-   U8  idx;
+   uint8_t  idx;
 #endif  /* CTF_VER2 */
 
 
@@ -6490,7 +5709,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
@@ -6567,23 +5786,17 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedAntCfgInfo
 (
 CtfDedAntCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedAntCfgInfo(param, mBuf)
-CtfDedAntCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 #ifdef CTF_VER2
    S16  idx;
 #endif /* CTF_VER2 */
    
-   U32 tmpEnum;
+   uint32_t tmpEnum;
 
 
    CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
@@ -6594,7 +5807,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)
       {
@@ -6645,10 +5858,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;
@@ -6671,17 +5884,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeSecCellCfgInfo(*param, mBuf)
-CtfUeSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
@@ -6704,23 +5911,17 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfSecCellCfgInfo(*param, mBuf)
-CtfSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    S8 idx;
 
    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);
@@ -6744,17 +5945,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeSecCellCfgInfo
 (
 CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeSecCellCfgInfo(*param, mBuf)
-CtfUeSecCellCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
    CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
    CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
@@ -6779,22 +5974,16 @@ Buffer *mBuf;
 *
 **********************************************************/
 
-#ifdef ANSI
 S16 cmUnpkCtfSecCellCfgInfo
 (
 CtfSecCellCfgInfo *param,
 Buffer *mBuf
 )
-#else
-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);
@@ -6821,17 +6010,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfUeCatCfgInfo(param, mBuf)
-CtfUeCatCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -6861,24 +6044,18 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfUeCatCfgInfo
 (
 CtfUeCatCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfUeCatCfgInfo(param, mBuf)
-CtfUeCatCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
    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;
 }
 
@@ -6901,17 +6078,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedCfgInfo(param, mBuf)
-CtfDedCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef EMTC_ENABLE
@@ -6951,20 +6122,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedCfgInfo
 (
 CtfDedCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedCfgInfo(param, mBuf)
-CtfDedCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkCtfUeCatCfgInfo, &param->ueCatCfg, mBuf);
@@ -7002,20 +6166,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedRecfgInfo(param, mBuf)
-CtfDedRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
    /*ctf_c_001.main_1*/
    CMCHKPK(cmPkCtfDedAntCfgInfo, &param->antInfo, mBuf);
@@ -7058,20 +6215,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedRecfgInfo
 (
 CtfDedRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedRecfgInfo(param, mBuf)
-CtfDedRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    /* ctf_c_001.main_4: ReEst Fix */
@@ -7116,20 +6266,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellReleaseInfo(param, mBuf)
-CtfCellReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
 }
@@ -7153,20 +6296,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellReleaseInfo
 (
 CtfCellReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellReleaseInfo(param, mBuf)
-CtfCellReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    return ROK;
 }
@@ -7190,17 +6326,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfDedReleaseInfo(param, mBuf)
-CtfDedReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(cmPkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
@@ -7228,20 +6358,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfDedReleaseInfo
 (
 CtfDedReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfDedReleaseInfo(param, mBuf)
-CtfDedReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, &param->sCellInfo,mBuf);
@@ -7267,20 +6390,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgInfo(param, mBuf)
-CtfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
       switch(param->cfgElem) {
          case CTF_UE_CFG:
             CMCHKPK(cmPkCtfDedCfgInfo, &param->u.dedCfg, mBuf);
@@ -7314,17 +6430,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgInfo
 (
 CtfCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgInfo(param, mBuf)
-CtfCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7361,17 +6471,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfReCfgInfo(param, mBuf)
-CtfReCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7417,17 +6521,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfReCfgInfo
 (
 CtfReCfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfReCfgInfo(param, mBuf)
-CtfReCfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7472,17 +6570,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfReleaseInfo(param, mBuf)
-CtfReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7519,17 +6611,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfReleaseInfo
 (
 CtfReleaseInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfReleaseInfo(param, mBuf)
-CtfReleaseInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 
@@ -7569,20 +6655,13 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCfgReqInfo
 (
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCfgReqInfo(param, mBuf)
-CtfCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /* ctf_c_001.main_4: Added support for vendor specific parameters */
 #ifdef CTF_VER3
    CMCHKPK(cmPkCtfVendorSpecParams, &param->vendorParams, mBuf);
@@ -7628,19 +6707,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCfgReqInfo
 (
 Pst  *pst,
 CtfCfgReqInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCfgReqInfo(param, mBuf)
-Pst  *pst;
-CtfCfgReqInfo *param;
-Buffer *mBuf;
-#endif
 {
 
 #ifdef CTF_VER3
@@ -7687,22 +6759,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellPwrcfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /* 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);
@@ -7731,19 +6796,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellPwrcfgInfo
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellPwrcfgInfo(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
@@ -7752,7 +6810,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;
 }
@@ -7774,22 +6832,15 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfCellStop(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
 
-
    /* 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);
@@ -7816,19 +6867,12 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmUnpkCtfCellStop
 (
 CtfCellRecfgInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfCellStop(param, mBuf)
-CtfCellRecfgInfo *param;
-Buffer *mBuf;
-#endif
 {
-
    
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
 
@@ -7836,7 +6880,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;
 }
@@ -7858,17 +6902,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkPerRemScanCellInfo(param, mBuf)
-CtfPeriodicRemCellInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKPK(oduUnpackUInt16,param->pci, mBuf);
@@ -7895,17 +6933,11 @@ Buffer *mBuf;
 *     File: 
 *
 **********************************************************/
-#ifdef ANSI
 S16 cmPkCtfPeriodicCellSearchRsp
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmPkCtfPeriodicCellSearchRsp(param, mBuf)
-CtfPeriodicRemCellSearchRsp *param;
-Buffer *mBuf;
-#endif
 {
    S16 idx;
 
@@ -7933,7 +6965,6 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmPkCtfPeriodicRemCellSearchRsp
 (
 Pst* pst,
@@ -7941,13 +6972,6 @@ SpId spId,
 CtfCfgTransId *transId,
 CtfPeriodicRemCellSearchRsp *CellCfgRsp
 )
-#else
-S16 cmPkCtfPeriodicRemCellSearchRsp(pst, spId, transId, CellCfgRsp)
-Pst* pst;
-SpId spId;
-CtfCfgTransId *transId;
-CtfPeriodicRemCellSearchRsp *CellCfgRsp;
-#endif
 {
    Buffer *mBuf = NULLP;
 
@@ -8024,17 +7048,11 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
    return (SPstTsk(pst,mBuf));
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfPerRemScanCellInfo
 (
 CtfPeriodicRemCellInfo *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPerRemScanCellInfo(param, mBuf)
-CtfPeriodicRemCellInfo *param;
-Buffer *mBuf;
-#endif
 {
 
    CMCHKUNPK(oduPackUInt8, &param->numTx, mBuf);
@@ -8044,17 +7062,11 @@ Buffer *mBuf;
    return ROK;
 }
 
-#ifdef ANSI
 S16 cmUnpkCtfPerRemCellSrch
 (
 CtfPeriodicRemCellSearchRsp *param,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkCtfPerRemCellSrch(param, mBuf)
-CtfPeriodicRemCellSearchRsp *param;
-Buffer *mBuf;
-#endif
 {
    S16 idx;
 
@@ -8080,19 +7092,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 S16 cmUnpkPerRemCellSrchRsp
 (
 CtfPerRemCellSrchRsp func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-S16 cmUnpkPerRemCellSrchRsp(func, pst, mBuf)
-CtfPerRemCellSrchRsp func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId = 0;
    CtfCfgTransId transId;