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

diff --git a/src/cm/crg.c b/src/cm/crg.c
index ba6a7fe34..2acd045ba 100755
--- a/src/cm/crg.c
+++ b/src/cm/crg.c
@@ -56,21 +56,20 @@
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgBndReq
+S16 cmPkCrgBndReq
 (
 Pst* pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 cmPkCrgBndReq(pst, suId, spId)
+S16 cmPkCrgBndReq(pst, suId, spId)
 Pst* pst;
 SuId suId;
 SpId spId;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgBndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -117,14 +116,14 @@ SpId spId;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgBndReq
+S16 cmUnpkCrgBndReq
 (
 CrgBndReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgBndReq(func, pst, mBuf)
+S16 cmUnpkCrgBndReq(func, pst, mBuf)
 CrgBndReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -133,7 +132,6 @@ Buffer *mBuf;
    SuId suId;
    SpId spId;
    
-   TRC3(cmUnpkCrgBndReq)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -168,26 +166,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 cmPkCrgBndCfm
+S16 cmPkCrgBndCfm
 (
 Pst* pst,
 SuId suId,
-U8 status
+uint8_t status
 )
 #else
-PUBLIC S16 cmPkCrgBndCfm(pst, suId, status)
+S16 cmPkCrgBndCfm(pst, suId, status)
 Pst* pst;
 SuId suId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgBndCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -230,28 +227,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 cmUnpkCrgBndCfm
+S16 cmUnpkCrgBndCfm
 (
 CrgBndCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgBndCfm(func, pst, mBuf)
+S16 cmUnpkCrgBndCfm(func, pst, mBuf)
 CrgBndCfm func;
 Pst *pst;
 Buffer *mBuf;
 #endif
 {
    SuId suId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCrgBndCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -290,21 +286,20 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgUbndReq
+S16 cmPkCrgUbndReq
 (
 Pst* pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 cmPkCrgUbndReq(pst, spId, reason)
+S16 cmPkCrgUbndReq(pst, spId, reason)
 Pst* pst;
 SpId spId;
 Reason reason;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgUbndReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -351,14 +346,14 @@ Reason reason;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgUbndReq
+S16 cmUnpkCrgUbndReq
 (
 CrgUbndReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgUbndReq(func, pst, mBuf)
+S16 cmUnpkCrgUbndReq(func, pst, mBuf)
 CrgUbndReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -367,7 +362,6 @@ Buffer *mBuf;
    SpId spId;
    Reason reason;
    
-   TRC3(cmUnpkCrgUbndReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -408,7 +402,7 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgCfgReq
+S16 cmPkCrgCfgReq
 (
 Pst* pst,
 SpId spId,
@@ -416,7 +410,7 @@ CrgCfgTransId transId,
 CrgCfgReqInfo  * cfgReqInfo
 )
 #else
-PUBLIC S16 cmPkCrgCfgReq(pst, spId, transId, cfgReqInfo)
+S16 cmPkCrgCfgReq(pst, spId, transId, cfgReqInfo)
 Pst* pst;
 SpId spId;
 CrgCfgTransId transId;
@@ -424,7 +418,6 @@ CrgCfgReqInfo  * cfgReqInfo;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgCfgReq)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -496,14 +489,14 @@ CrgCfgReqInfo  * cfgReqInfo;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgReq
+S16 cmUnpkCrgCfgReq
 (
 CrgCfgReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgCfgReq(func, pst, mBuf)
+S16 cmUnpkCrgCfgReq(func, pst, mBuf)
 CrgCfgReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -513,7 +506,6 @@ Buffer *mBuf;
    CrgCfgTransId transId;
    CrgCfgReqInfo *cfgReqInfo;
    
-   TRC3(cmUnpkCrgCfgReq)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -568,28 +560,27 @@ Buffer *mBuf;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CrgCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgCfgCfm
+S16 cmPkCrgCfgCfm
 (
 Pst* pst,
 SuId suId,
 CrgCfgTransId transId,
-U8 status
+uint8_t status
 )
 #else
-PUBLIC S16 cmPkCrgCfgCfm(pst, suId, transId, status)
+S16 cmPkCrgCfgCfm(pst, suId, transId, status)
 Pst* pst;
 SuId suId;
 CrgCfgTransId transId;
-U8 status;
+uint8_t status;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(cmPkCrgCfgCfm)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -642,19 +633,19 @@ U8 status;
 *  @param[in]   Pst*  pst
 *  @param[in]   SuId  suId
 *  @param[in]   CrgCfgTransId  transId
-*  @param[in]   U8  status
+*  @param[in]   uint8_t  status
 *  @return   S16
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgCfm
+S16 cmUnpkCrgCfgCfm
 (
 CrgCfgCfm func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgCfgCfm(func, pst, mBuf)
+S16 cmUnpkCrgCfgCfm(func, pst, mBuf)
 CrgCfgCfm func;
 Pst *pst;
 Buffer *mBuf;
@@ -662,9 +653,8 @@ Buffer *mBuf;
 {
    SuId suId;
    CrgCfgTransId transId;
-   U8 status;
+   uint8_t status;
    
-   TRC3(cmUnpkCrgCfgCfm)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -714,20 +704,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgCfgTransId
+S16 cmPkCrgCfgTransId
 (
 CrgCfgTransId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgCfgTransId(param, mBuf)
+S16 cmPkCrgCfgTransId(param, mBuf)
 CrgCfgTransId *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmPkCrgCfgTransId)
 
    for (i=CRG_CFG_TRANSID_SIZE-1; i >= 0; i--) {
       CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
@@ -753,20 +742,19 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgTransId
+S16 cmUnpkCrgCfgTransId
 (
 CrgCfgTransId *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgCfgTransId(param, mBuf)
+S16 cmUnpkCrgCfgTransId(param, mBuf)
 CrgCfgTransId *param;
 Buffer *mBuf;
 #endif
 {
 
    S32 i;
-   TRC3(cmUnpkCrgCfgTransId)
 
    for (i=0; i<CRG_CFG_TRANSID_SIZE; i++) {
       CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
@@ -792,19 +780,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgBwCfg
+S16 cmPkCrgBwCfg
 (
 CrgBwCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgBwCfg(param, mBuf)
+S16 cmPkCrgBwCfg(param, mBuf)
 CrgBwCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgBwCfg)
 
    CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf);
    CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf);
@@ -829,19 +816,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgBwCfg
+S16 cmUnpkCrgBwCfg
 (
 CrgBwCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgBwCfg(param, mBuf)
+S16 cmUnpkCrgBwCfg(param, mBuf)
 CrgBwCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgBwCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->dlTotalBw, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->ulTotalBw, mBuf);
@@ -866,19 +852,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgRachCfg
+S16 cmPkCrgRachCfg
 (
 CrgRachCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgRachCfg(param, mBuf)
+S16 cmPkCrgRachCfg(param, mBuf)
 CrgRachCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgRachCfg)
 
    CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf);
    return ROK;
@@ -902,19 +887,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgRachCfg
+S16 cmUnpkCrgRachCfg
 (
 CrgRachCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgRachCfg(param, mBuf)
+S16 cmUnpkCrgRachCfg(param, mBuf)
 CrgRachCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgRachCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->maxMsg3Tx, mBuf);
    return ROK;
@@ -938,19 +922,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgCellCfg
+S16 cmPkCrgCellCfg
 (
 CrgCellCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgCellCfg(param, mBuf)
+S16 cmPkCrgCellCfg(param, mBuf)
 CrgCellCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgCellCfg)
 
 #ifdef EMTC_ENABLE
    CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf);
@@ -983,19 +966,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgCellCfg
+S16 cmUnpkCrgCellCfg
 (
 CrgCellCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgCellCfg(param, mBuf)
+S16 cmUnpkCrgCellCfg(param, mBuf)
 CrgCellCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgCellCfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkCrgRachCfg, &param->rachCfg, mBuf);
@@ -1028,19 +1010,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgUeUlHqCfg
+S16 cmPkCrgUeUlHqCfg
 (
 CrgUeUlHqCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgUeUlHqCfg(param, mBuf)
+S16 cmPkCrgUeUlHqCfg(param, mBuf)
 CrgUeUlHqCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgUeUlHqCfg)
 
    CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf);
    return ROK;
@@ -1063,13 +1044,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PRIVATE S16 cmPkCrgUeSCellCfg
+static S16 cmPkCrgUeSCellCfg
 (
 CrgUeSCellInfo *param,
 Buffer *mBuf
 )
 #else
-PRIVATE S16 cmPkCrgUeSCellCfg(param, mBuf)
+static S16 cmPkCrgUeSCellCfg(param, mBuf)
 CrgUeSCellInfo *param;
 Buffer *mBuf;
 #endif
@@ -1097,13 +1078,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PRIVATE S16 cmUnpkCrgUeSCellCfg
+static S16 cmUnpkCrgUeSCellCfg
 (
 CrgUeSCellInfo *param,
 Buffer *mBuf
 )
 #else
-PRIVATE S16 cmUnpkCrgUeSCellCfg(param, mBuf)
+static S16 cmUnpkCrgUeSCellCfg(param, mBuf)
 CrgUeSCellInfo *param;
 Buffer *mBuf;
 #endif
@@ -1130,13 +1111,13 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgUeSecCellInfo
+S16 cmPkCrgUeSecCellInfo
 (
 CrgUeSecCellInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgUeSecCellInfo(param, mBuf)
+S16 cmPkCrgUeSecCellInfo(param, mBuf)
 CrgUeSecCellInfo *param;
 Buffer *mBuf;
 #endif
@@ -1144,7 +1125,7 @@ Buffer *mBuf;
    S8 idx;
    for(idx = param->numSCells - 1; idx >= 0; idx--)
    {
-      CMCHKPK(cmPkCrgUeSCellCfg, &param->ueSCellCfg[(U8)idx], mBuf);
+      CMCHKPK(cmPkCrgUeSCellCfg, &param->ueSCellCfg[(uint8_t)idx], mBuf);
    }
 
    CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
@@ -1169,18 +1150,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeSecCellInfo
+S16 cmUnpkCrgUeSecCellInfo
 (
 CrgUeSecCellInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgUeSecCellInfo(param, mBuf)
+S16 cmUnpkCrgUeSecCellInfo(param, mBuf)
 CrgUeSecCellInfo *param;
 Buffer *mBuf;
 #endif
 {
-   U8 idx;
+   uint8_t idx;
 
    CMCHKUNPK(oduPackUInt8, &param->isSCellCfgPres, mBuf);
    if(TRUE == param->isSCellCfgPres)
@@ -1215,19 +1196,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeUlHqCfg
+S16 cmUnpkCrgUeUlHqCfg
 (
 CrgUeUlHqCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgUeUlHqCfg(param, mBuf)
+S16 cmUnpkCrgUeUlHqCfg(param, mBuf)
 CrgUeUlHqCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgUeUlHqCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->maxUlHqTx, mBuf);
    return ROK;
@@ -1251,19 +1231,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgUeCfg
+S16 cmPkCrgUeCfg
 (
 CrgUeCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgUeCfg(param, mBuf)
+S16 cmPkCrgUeCfg(param, mBuf)
 CrgUeCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgUeCfg)
 #ifdef TENB_MULT_CELL_SUPPRT
    CMCHKPK(SPkS16, param->rguDlSapId, mBuf);
    CMCHKPK(SPkS16, param->rguUlSapId, mBuf);
@@ -1294,26 +1273,25 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeCfg
+S16 cmUnpkCrgUeCfg
 (
 CrgUeCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgUeCfg(param, mBuf)
+S16 cmUnpkCrgUeCfg(param, mBuf)
 CrgUeCfg *param;
 Buffer *mBuf;
 #endif
 {
-   U32 tmpEnum;
+   uint32_t tmpEnum;
    
-   TRC3(cmUnpkCrgUeCfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
    CMCHKUNPK(cmUnpkCrgUeUlHqCfg, &param->ueUlHqCfg, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->txMode.pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->txMode.tm = (CrgTxMode) tmpEnum;
 #ifdef TENB_MULT_CELL_SUPPRT
    CMCHKUNPK(SUnpkS16, &param->rguUlSapId, mBuf);
@@ -1340,19 +1318,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgDlLchCfg
+S16 cmPkCrgDlLchCfg
 (
 CrgDlLchCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgDlLchCfg(param, mBuf)
+S16 cmPkCrgDlLchCfg(param, mBuf)
 CrgDlLchCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgDlLchCfg)
 
    CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf);
    return ROK;
@@ -1376,19 +1353,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgDlLchCfg
+S16 cmUnpkCrgDlLchCfg
 (
 CrgDlLchCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgDlLchCfg(param, mBuf)
+S16 cmUnpkCrgDlLchCfg(param, mBuf)
 CrgDlLchCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgDlLchCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->dlTrchType, mBuf);
    return ROK;
@@ -1412,19 +1388,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgUlLchCfg
+S16 cmPkCrgUlLchCfg
 (
 CrgUlLchCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgUlLchCfg(param, mBuf)
+S16 cmPkCrgUlLchCfg(param, mBuf)
 CrgUlLchCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgUlLchCfg)
 
    CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
    CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf);
@@ -1449,19 +1424,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgUlLchCfg
+S16 cmUnpkCrgUlLchCfg
 (
 CrgUlLchCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgUlLchCfg(param, mBuf)
+S16 cmUnpkCrgUlLchCfg(param, mBuf)
 CrgUlLchCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgUlLchCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->ulTrchType, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
@@ -1486,19 +1460,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgLchCfg
+S16 cmPkCrgLchCfg
 (
 CrgLchCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgLchCfg(param, mBuf)
+S16 cmPkCrgLchCfg(param, mBuf)
 CrgLchCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgLchCfg)
 /* crg_c_001.main_5 - ADD - Added the packing for LTE_L2_MEAS. */
 #ifdef LTE_L2_MEAS
    CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
@@ -1531,19 +1504,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgLchCfg
+S16 cmUnpkCrgLchCfg
 (
 CrgLchCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgLchCfg(param, mBuf)
+S16 cmUnpkCrgLchCfg(param, mBuf)
 CrgLchCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgLchCfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
@@ -1577,19 +1549,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgCfg
+S16 cmPkCrgCfg
 (
 CrgCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgCfg(param, mBuf)
+S16 cmPkCrgCfg(param, mBuf)
 CrgCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgCfg)
 
       switch(param->cfgType) {
          case CRG_LCH_CFG:
@@ -1626,19 +1597,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfg
+S16 cmUnpkCrgCfg
 (
 CrgCfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgCfg(param, mBuf)
+S16 cmUnpkCrgCfg(param, mBuf)
 CrgCfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgCfg)
 
    CMCHKUNPK(oduPackUInt8, &param->cfgType, mBuf);
       switch(param->cfgType) {
@@ -1675,19 +1645,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgCellRecfg
+S16 cmPkCrgCellRecfg
 (
 CrgCellRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgCellRecfg(param, mBuf)
+S16 cmPkCrgCellRecfg(param, mBuf)
 CrgCellRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgCellRecfg)
 
    CMCHKPK(cmPkCrgRachCfg, &param->rachRecfg, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -1712,19 +1681,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgCellRecfg
+S16 cmUnpkCrgCellRecfg
 (
 CrgCellRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgCellRecfg(param, mBuf)
+S16 cmUnpkCrgCellRecfg(param, mBuf)
 CrgCellRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgCellRecfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkCrgRachCfg, &param->rachRecfg, mBuf);
@@ -1749,19 +1717,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgUeRecfg
+S16 cmPkCrgUeRecfg
 (
 CrgUeRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgUeRecfg(param, mBuf)
+S16 cmPkCrgUeRecfg(param, mBuf)
 CrgUeRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgUeRecfg)
 #ifdef LTE_ADV
    if(TRUE == param->crgSCellCfg.isSCellCfgPres)
    {
@@ -1799,26 +1766,25 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgUeRecfg
+S16 cmUnpkCrgUeRecfg
 (
 CrgUeRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgUeRecfg(param, mBuf)
+S16 cmUnpkCrgUeRecfg(param, mBuf)
 CrgUeRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgUeRecfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->oldCrnti, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->newCrnti, mBuf);
    CMCHKUNPK(cmUnpkCrgUeUlHqCfg, &param->ueUlHqRecfg, mBuf);
    CMCHKUNPK(oduPackUInt8, &param->txMode.pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (U32 *)&param->txMode.tm, mBuf);
+   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->txMode.tm, mBuf);
 #ifdef LTE_ADV 
       CMCHKUNPK(cmUnpkCrgUeSecCellInfo, &param->crgSCellCfg, mBuf);
 #endif /* LTE_ADV */
@@ -1843,19 +1809,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgLchRecfg
+S16 cmPkCrgLchRecfg
 (
 CrgLchRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgLchRecfg(param, mBuf)
+S16 cmPkCrgLchRecfg(param, mBuf)
 CrgLchRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgLchRecfg)
 
       CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf);
    CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
@@ -1882,19 +1847,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgLchRecfg
+S16 cmUnpkCrgLchRecfg
 (
 CrgLchRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgLchRecfg(param, mBuf)
+S16 cmUnpkCrgLchRecfg(param, mBuf)
 CrgLchRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgLchRecfg)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
@@ -1921,19 +1885,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgRecfg
+S16 cmPkCrgRecfg
 (
 CrgRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgRecfg(param, mBuf)
+S16 cmPkCrgRecfg(param, mBuf)
 CrgRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgRecfg)
 
       switch(param->recfgType) {
          case CRG_LCH_CFG:
@@ -1970,19 +1933,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgRecfg
+S16 cmUnpkCrgRecfg
 (
 CrgRecfg *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgRecfg(param, mBuf)
+S16 cmUnpkCrgRecfg(param, mBuf)
 CrgRecfg *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgRecfg)
 
    CMCHKUNPK(oduPackUInt8, &param->recfgType, mBuf);
       switch(param->recfgType) {
@@ -2019,19 +1981,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgDel
+S16 cmPkCrgDel
 (
 CrgDel *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgDel(param, mBuf)
+S16 cmPkCrgDel(param, mBuf)
 CrgDel *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgDel)
 
       switch(param->delType) {
          case CRG_LCH_CFG:
@@ -2072,19 +2033,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgDel
+S16 cmUnpkCrgDel
 (
 CrgDel *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgDel(param, mBuf)
+S16 cmUnpkCrgDel(param, mBuf)
 CrgDel *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgDel)
 
    CMCHKUNPK(oduPackUInt8, &param->delType, mBuf);
       switch(param->delType) {
@@ -2125,19 +2085,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgRst
+S16 cmPkCrgRst
 (
 CrgRst *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgRst(param, mBuf)
+S16 cmPkCrgRst(param, mBuf)
 CrgRst *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgRst)
 
    CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -2162,19 +2121,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgRst
+S16 cmUnpkCrgRst
 (
 CrgRst *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgRst(param, mBuf)
+S16 cmUnpkCrgRst(param, mBuf)
 CrgRst *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgRst)
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
@@ -2199,19 +2157,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmPkCrgCfgReqInfo
+S16 cmPkCrgCfgReqInfo
 (
 CrgCfgReqInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmPkCrgCfgReqInfo(param, mBuf)
+S16 cmPkCrgCfgReqInfo(param, mBuf)
 CrgCfgReqInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmPkCrgCfgReqInfo)
 
       switch(param->action) {
          case CRG_RESET:
@@ -2251,19 +2208,18 @@ Buffer *mBuf;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 cmUnpkCrgCfgReqInfo
+S16 cmUnpkCrgCfgReqInfo
 (
 CrgCfgReqInfo *param,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 cmUnpkCrgCfgReqInfo(param, mBuf)
+S16 cmUnpkCrgCfgReqInfo(param, mBuf)
 CrgCfgReqInfo *param;
 Buffer *mBuf;
 #endif
 {
 
-   TRC3(cmUnpkCrgCfgReqInfo)
 
    CMCHKUNPK(oduPackUInt8, &param->action, mBuf);
       switch(param->action) {