X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fctf.c;h=bb17d5f74d4ac73871166e8e7520c08e7a5002e3;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=2922e6e62b4686dbddbbf137bfd59e44defe4356;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/cm/ctf.c b/src/cm/ctf.c index 2922e6e62..bb17d5f74 100755 --- a/src/cm/ctf.c +++ b/src/cm/ctf.c @@ -30,36 +30,20 @@ *********************************************************************21*/ /* header include files (.h) */ -#include "envopt.h" /* Environment options */ -#include "envdep.h" /* Environment dependent options */ -#include "envind.h" /* Environment independent options */ -#include "gen.h" /* General layer */ -#include "ssi.h" /* System service interface */ -#include "cm5.h" /* Common timer library */ -#include "cm_llist.h" /* Common linked list library */ -#include "cm_hash.h" /* Common hash library */ -#include "cm_tkns.h" /* Common tokens */ -#include "cm_lte.h" /* Common LTE Defines */ +#include "common_def.h" #include "ctf.h" /* CTF interface defines */ /* header/extern include files (.x) */ -#include "gen.x" /* General layer */ -#include "ssi.x" /* System services interface */ -#include "cm_lib.x" /* Common linrary function */ -#include "cm_llist.x" /* Common link list library */ -#include "cm_hash.x" /* Common hash list library */ -#include "cm_tkns.x" /* Common tokens */ -#include "cm_lte.x" /* Common LTE library */ #ifdef TENB_AS_SECURITY #include "cm_mblk.x" #endif #include "ctf.x" #ifdef TENB_AS_SECURITY -#define cmPkCtfCrnti SPkU16 -#define cmPkCtfCellId SPkU16 -#define cmUnpkCtfCellId SUnpkU16 -#define cmUnpkCtfCrnti SUnpkU16 +#define cmPkCtfCrnti oduUnpackUInt16 +#define cmPkCtfCellId oduUnpackUInt16 +#define cmUnpkCtfCellId oduPackUInt16 +#define cmUnpkCtfCrnti oduPackUInt16 #endif @@ -103,7 +87,7 @@ SpId spId; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF001, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -113,7 +97,7 @@ SpId spId; (ErrVal)ECTF002, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -123,10 +107,10 @@ SpId spId; (ErrVal)ECTF003, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -170,7 +154,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF004, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -180,10 +164,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF005, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -225,9 +209,9 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF006, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -235,7 +219,7 @@ U8 status; (ErrVal)ECTF007, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -245,10 +229,10 @@ U8 status; (ErrVal)ECTF008, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -293,9 +277,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF009, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -303,10 +287,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF010, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -347,7 +331,7 @@ Reason reason; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF011, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -357,7 +341,7 @@ Reason reason; (ErrVal)ECTF012, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -367,10 +351,10 @@ Reason reason; (ErrVal)ECTF013, (ErrVal)0,(Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -414,7 +398,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF014, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { SPutMsg(mBuf); @@ -424,10 +408,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF015, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -466,7 +450,7 @@ CtfCfgReqInfo *param; } #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCfgReqInfo)); - RETVALUE(ROK); + return ROK; } #ifdef TENB_AS_SECURITY @@ -509,12 +493,12 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(SPkU16, param->physCellId, mBuf); - CMCHKPK(SPkU16, param->dlCarrFreq, mBuf); + CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -556,12 +540,12 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(SPkU16, param->physCellId, mBuf); - CMCHKPK(SPkU16, param->dlCarrFreq, mBuf); + CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf); - RETVALUE(ROK); + return ROK; } @@ -605,12 +589,12 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(SPkU8, param->ciphAlgoType, mBuf); - CMCHKPK(SPkU8, param->intgAlgoType, mBuf); + CMCHKPK(oduUnpackUInt8, param->ciphAlgoType, mBuf); + CMCHKPK(oduUnpackUInt8, param->intgAlgoType, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -660,11 +644,11 @@ Buffer *mBuf; CMCHKPK(cmPkCtfNhKeyInfo , ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->keyDerType, mBuf); + CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -711,9 +695,9 @@ CtfKdfReqInfo* kdfReqInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -723,10 +707,10 @@ CtfKdfReqInfo* kdfReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { + else if (pst->selector == ODU_SELECTOR_LWLC) { } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -737,7 +721,7 @@ CtfKdfReqInfo* kdfReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -748,9 +732,9 @@ CtfKdfReqInfo* kdfReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -759,11 +743,11 @@ CtfKdfReqInfo* kdfReqInfo; (ErrVal)ECTF021, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTCTFKDFREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #endif @@ -787,11 +771,11 @@ Buffer *mBuf; { for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--) { - CMCHKPK(SPkU32,(U32)param->vendorSpecifcParam[i], mBuf); + CMCHKPK(oduUnpackUInt32,(U32)param->vendorSpecifcParam[i], mBuf); } } - CMCHKPK(SPkU16, param->numOfVendorSpecifcParam, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->numOfVendorSpecifcParam, mBuf); + return ROK; } #ifdef ANSI @@ -808,14 +792,14 @@ Buffer *mBuf; { TRC3(cmPkCtfCtfCnmCellSyncReq); - CMCHKPK(SPkU16, param->nbrEarfcn, mBuf); - CMCHKPK(SPkU16, param->nbrPCellId, mBuf); - CMCHKPK(SPkU8, param->nbrTxAntCount, mBuf); - CMCHKPK(SPkU8, param->nbrCellCp, mBuf); - CMCHKPK(SPkU8, param->nbrCellNRb, mBuf); - CMCHKPK(SPkU8, param->nbrSpecSfCfg, mBuf); + CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf); + CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrCellCp, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrCellNRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrSpecSfCfg, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -834,10 +818,10 @@ Buffer *mBuf; S32 i; TRC3(cmPkCtfcfgReqInfo); - CMCHKPK(SPkU8, param->searchType, mBuf); - CMCHKPK(SPkU8, param->mibRequest, mBuf); - CMCHKPK(SPkU16, param->earfcn, mBuf); - CMCHKPK(SPkU8, param->measBandWidth, mBuf); + CMCHKPK(oduUnpackUInt8, param->searchType, mBuf); + CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf); + CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf); + CMCHKPK(oduUnpackUInt8, param->measBandWidth, mBuf); if(param->numOfPciList <= CTF_CNM_MAX_CELL_SEARCH) { for(i= param->numOfPciList-1; i >= 0; i--) @@ -845,8 +829,8 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf); } } - CMCHKPK(SPkU16, param->numOfPciList, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->numOfPciList, mBuf); + return ROK; } #ifdef ANSI @@ -864,12 +848,12 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkCtfCnmVendorSpecificInfo); - CMCHKUNPK(SUnpkU16, ¶m->numOfVendorSpecifcParam, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfVendorSpecifcParam, mBuf); for(i=0; (inumOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++) { - CMCHKUNPK(SUnpkU32, ¶m->vendorSpecifcParam[i], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->vendorSpecifcParam[i], mBuf); } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -888,13 +872,13 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrSpecSfCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrCellNRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrCellCp, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrTxAntCount, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->nbrPCellId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->nbrEarfcn, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->nbrSpecSfCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nbrCellNRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nbrCellCp, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nbrTxAntCount, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->nbrPCellId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->nbrEarfcn, mBuf); + return ROK; } @@ -913,17 +897,17 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkCtfsyncReqInfo); - CMCHKUNPK(SUnpkU16, ¶m->numOfPciList, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfPciList, mBuf); for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) { CMCHKUNPK(cmUnpkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->measBandWidth, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->earfcn, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mibRequest, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->searchType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->measBandWidth, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mibRequest, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->searchType, mBuf); + return ROK; } /** * @brief Configuration Request from App to CL for @@ -969,9 +953,9 @@ CtfCnmCellSyncReq * cfgReqInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfCtfCnmCellSyncReq(cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -981,12 +965,12 @@ CtfCnmCellSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { + else if (pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) { + if (oduPackPointer((PTR)cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -995,7 +979,7 @@ CtfCnmCellSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1008,7 +992,7 @@ CtfCnmCellSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1019,13 +1003,13 @@ CtfCnmCellSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); } pst->event = (Event)EVTCTFCNMSYNCREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -1070,7 +1054,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1080,9 +1064,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&SyncReqMsg, sizeof(CtfCnmCellSyncReq))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1091,16 +1075,16 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&SyncReqMsg, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&SyncReqMsg, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfCtfCnmCellSyncReq(SyncReqMsg, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)SyncReqMsg, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); @@ -1110,10 +1094,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, SyncReqMsg)); + return ((*func)(pst, spId, &transId, SyncReqMsg)); } /*-----------------------------------------------------*/ @@ -1162,9 +1146,9 @@ CtfCnmInitSyncReq * cfgReqInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfcfgReqInfo(cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1174,12 +1158,12 @@ CtfCnmInitSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { + else if (pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) { + if (oduPackPointer((PTR)cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1188,7 +1172,7 @@ CtfCnmInitSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1201,7 +1185,7 @@ CtfCnmInitSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1212,13 +1196,13 @@ CtfCnmInitSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); } pst->event = (Event)EVTCTFCNMINITSYNCREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*-----------------------------------------------------------------*/ @@ -1265,7 +1249,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1275,9 +1259,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncReqInfo, sizeof(CtfCnmInitSyncReq))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1286,16 +1270,16 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&syncReqInfo, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&syncReqInfo, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfsyncReqInfo(syncReqInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)syncReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); @@ -1305,10 +1289,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncReqInfo)); + return ((*func)(pst, spId, &transId, syncReqInfo)); } /*-----------------------------------------------------------------------------*/ @@ -1326,12 +1310,12 @@ Buffer *mBuf; { TRC3(cmPkCtfctfCnmMibInfo) - CMCHKPK(SPkU16, param->sfn, mBuf); - CMCHKPK(SPkU8, param->numTxAntennas, mBuf); - CMCHKPK(SPkU8, param->phichDuration, mBuf); - CMCHKPK(SPkU8, param->phichResource, mBuf); - CMCHKPK(SPkU8, param->dlSystemBandWidht, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); + CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf); + CMCHKPK(oduUnpackUInt8, param->phichDuration, mBuf); + CMCHKPK(oduUnpackUInt8, param->phichResource, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlSystemBandWidht, mBuf); + return ROK; } @@ -1349,13 +1333,13 @@ Buffer *mBuf; { TRC3(cmPkCtfctfCnmInitSyncInfo) - CMCHKPK(SPkU16, param->pci, mBuf); - CMCHKPK(SPkU8, param->rsrp, mBuf); - CMCHKPK(SPkU8, param->mibValidFlag, mBuf); - CMCHKPK(SPkU16, param->localSfn, mBuf); + CMCHKPK(oduUnpackUInt16, param->pci, mBuf); + CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); + CMCHKPK(oduUnpackUInt8, param->mibValidFlag, mBuf); + CMCHKPK(oduUnpackUInt16, param->localSfn, mBuf); CMCHKPK(cmPkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1375,8 +1359,8 @@ Buffer *mBuf; TRC3(cmPkCtfcfgRspInfo) - CMCHKPK(SPkU8, param->status, mBuf); - CMCHKPK(SPkU16, param->earfcn, mBuf); + CMCHKPK(oduUnpackUInt8, param->status, mBuf); + CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf); if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH) { for(i= param->numOfNeighbourInfo-1; i >= 0; i--) @@ -1384,8 +1368,8 @@ Buffer *mBuf; CMCHKPK(cmPkCtfctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf); } } - CMCHKPK(SPkU8, param->numOfNeighbourInfo, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numOfNeighbourInfo, mBuf); + return ROK; } @@ -1431,9 +1415,9 @@ CtfCnmInitSyncRsp * cfgRspInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfcfgRspInfo(cfgRspInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1443,12 +1427,12 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { + else if (pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)cfgRspInfo, mBuf) != ROK) { + if (oduPackPointer((PTR)cfgRspInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1457,7 +1441,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1470,7 +1454,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1481,13 +1465,13 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); } pst->event = (Event)EVTCTFCNMINITSYNCRSP; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*-----------------------------------------------------------------------------*/ @@ -1507,12 +1491,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfctfCnmMibInfo); - CMCHKUNPK(SUnpkU8, ¶m->dlSystemBandWidht, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phichResource, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phichDuration, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numTxAntennas, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sfn, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dlSystemBandWidht, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phichResource, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phichDuration, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numTxAntennas, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); + return ROK; } @@ -1532,11 +1516,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->localSfn, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mibValidFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rsrp, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pci, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->localSfn, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mibValidFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); + return ROK; } @@ -1556,14 +1540,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfCnmInitSyncRspMsg); - CMCHKUNPK(SUnpkU8, ¶m->numOfNeighbourInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numOfNeighbourInfo, mBuf); for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) { CMCHKUNPK(cmUnpkctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf); } - CMCHKUNPK(SUnpkU16, ¶m->earfcn, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->status, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + return ROK; } /** @@ -1608,7 +1592,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1618,9 +1602,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspInfo, sizeof(CtfCnmInitSyncRsp))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1629,16 +1613,16 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if(cmUnpkPtr((PTR *)&syncRspInfo, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if(oduUnpackPointer((PTR *)&syncRspInfo, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if(cmUnpkCtfCnmInitSyncRspMsg(syncRspInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)syncRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); @@ -1648,10 +1632,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncRspInfo)); + return ((*func)(pst, spId, &transId, syncRspInfo)); } /*-----------------------------------------------------------------------*/ @@ -1671,8 +1655,8 @@ Buffer *mBuf; TRC3(cmPkCtfCellSyncRsp) - CMCHKPK(SPkU8, param->status, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->status, mBuf); + return ROK; } /** @@ -1718,9 +1702,9 @@ CtfCnmCellSyncRsp * cfgRspInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfCellSyncRsp(cfgRspInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1730,12 +1714,12 @@ CtfCnmCellSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { + else if (pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)cfgRspInfo, mBuf) != ROK) { + if (oduPackPointer((PTR)cfgRspInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1744,7 +1728,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1757,7 +1741,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1768,13 +1752,13 @@ CtfCnmCellSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); } pst->event = (Event)EVTCTFCNMSYNCRSP; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1795,8 +1779,8 @@ Buffer *mBuf; TRC3(cmUnpkCtfCnmSyncRspMsg); - CMCHKUNPK(SUnpkU8, ¶m->status, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + return ROK; } /** @@ -1841,7 +1825,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1851,9 +1835,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspMsg, sizeof(CtfCnmCellSyncRsp))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1862,16 +1846,16 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&syncRspMsg, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&syncRspMsg, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfCnmSyncRspMsg(syncRspMsg, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)syncRspMsg, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); @@ -1881,10 +1865,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncRspMsg)); + return ((*func)(pst, spId, &transId, syncRspMsg)); } /*---------------------------------------------------------------*/ @@ -1904,9 +1888,9 @@ Buffer *mBuf; TRC3(cmPkCtfcfgIndInfo); - CMCHKPK(SPkU8, param->status, mBuf); + CMCHKPK(oduUnpackUInt8, param->status, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -1952,9 +1936,9 @@ CtfCnmCellSyncInd * cfgIndInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfcfgIndInfo(cfgIndInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1964,12 +1948,12 @@ CtfCnmCellSyncInd * cfgIndInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { + else if (pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)cfgIndInfo, mBuf) != ROK) { + if (oduPackPointer((PTR)cfgIndInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1978,7 +1962,7 @@ CtfCnmCellSyncInd * cfgIndInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1991,7 +1975,7 @@ CtfCnmCellSyncInd * cfgIndInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2002,13 +1986,13 @@ CtfCnmCellSyncInd * cfgIndInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); } pst->event = (Event)EVTCTFCNMSYNCIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2030,8 +2014,8 @@ Buffer *mBuf; TRC3(cmUnpkCtfCnmSyncIndMsg); CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->status, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + return ROK; } /** @@ -2076,7 +2060,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2086,9 +2070,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncIndMsg, sizeof(CtfCnmCellSyncInd))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -2097,16 +2081,16 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&syncIndMsg, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&syncIndMsg, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfCnmSyncIndMsg(syncIndMsg, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)syncIndMsg, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); @@ -2116,10 +2100,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncIndMsg)); + return ((*func)(pst, spId, &transId, syncIndMsg)); } @@ -2172,9 +2156,9 @@ CtfCfgReqInfo* cfgReqInfo; (ErrVal)ECTF016, (ErrVal)0, "Packing failed"); #endif cmRelCtfCfgReq(pst, cfgReqInfo); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfCfgReqInfo(cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -2184,11 +2168,11 @@ CtfCfgReqInfo* cfgReqInfo; #endif cmRelCtfCfgReq(pst, cfgReqInfo); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { - if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) { + else if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduPackPointer((PTR)cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2197,7 +2181,7 @@ CtfCfgReqInfo* cfgReqInfo; #endif cmRelCtfCfgReq(pst, cfgReqInfo); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -2209,7 +2193,7 @@ CtfCfgReqInfo* cfgReqInfo; #endif cmRelCtfCfgReq(pst, cfgReqInfo); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2220,13 +2204,13 @@ CtfCfgReqInfo* cfgReqInfo; #endif cmRelCtfCfgReq(pst, cfgReqInfo); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { cmRelCtfCfgReq(pst, cfgReqInfo); } pst->event = (Event) EVTCTFCFGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #ifdef TENB_AS_SECURITY @@ -2265,13 +2249,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfNhKeyInfo) - CMCHKUNPK(SUnpkU16, ¶m->dlCarrFreq, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2309,13 +2293,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfKenbStarInfo) - CMCHKUNPK(SUnpkU16, ¶m->dlCarrFreq, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } @@ -2354,13 +2338,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfAskeyInfo) - CMCHKUNPK(SUnpkU8, ¶m->intgAlgoType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ciphAlgoType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->intgAlgoType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ciphAlgoType, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2396,7 +2380,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfKdfReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->keyDerType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) { case CTF_KDF_TYPE1: @@ -2409,9 +2393,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfNhKeyInfo, ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -2457,7 +2441,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -2468,10 +2452,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&kdfReqInfo, sizeof(CtfKdfReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -2480,18 +2464,18 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - /*if (cmUnpkPtr((PTR *)&cfgReqInfo, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + /*if (oduUnpackPointer((PTR *)&cfgReqInfo, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; }*/ } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); @@ -2501,10 +2485,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, kdfReqInfo)); + return ((*func)(pst, spId, transId, kdfReqInfo)); } #endif @@ -2553,7 +2537,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2563,9 +2547,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CtfCfgReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -2574,16 +2558,16 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&cfgReqInfo, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&cfgReqInfo, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfCfgReqInfo(pst,cfgReqInfo, mBuf) != ROK) { cmRelCtfCfgReq(pst, cfgReqInfo); SPutMsg(mBuf); @@ -2593,10 +2577,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, cfgReqInfo)); + return ((*func)(pst, spId, transId, cfgReqInfo)); } #ifdef TENB_AS_SECURITY @@ -2637,9 +2621,9 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2679,9 +2663,9 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } @@ -2722,17 +2706,17 @@ Buffer *mBuf; for(idx=15;idx>=0;idx--) { - CMCHKPK(SPkU8,param->cpCiphKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf); } for(idx=15;idx>=0;idx--) { - CMCHKPK(SPkU8,param->upCiphKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->upCiphKey[idx],mBuf); } for(idx=15;idx>=0;idx--) { - CMCHKPK(SPkU8,param->intKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->intKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2780,10 +2764,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfNhKeyCfmInfo, ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->keyDerType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf); + return ROK; } /** @@ -2828,10 +2812,10 @@ U8 status; (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2840,7 +2824,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfKdfCfmInfo(kdfCfmInfo, mBuf) != ROK) { @@ -2852,7 +2836,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -2864,7 +2848,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { @@ -2876,7 +2860,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)) != ROK) @@ -2888,11 +2872,11 @@ U8 status; (ErrVal)ECTF021, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFKDFCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #endif @@ -2936,9 +2920,9 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2946,7 +2930,7 @@ U8 status; (ErrVal)ECTF027, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2956,7 +2940,7 @@ U8 status; (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2966,10 +2950,10 @@ U8 status; (ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -3009,7 +2993,7 @@ CtfCfgTransId transId; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3019,7 +3003,7 @@ CtfCfgTransId transId; (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3029,10 +3013,10 @@ CtfCfgTransId transId; (ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFENBSTOPIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #ifdef TENB_AS_SECURITY @@ -3073,9 +3057,9 @@ Buffer *mBuf; for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -3115,9 +3099,9 @@ Buffer *mBuf; for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } @@ -3158,17 +3142,17 @@ Buffer *mBuf; for(idx=0;idx<16;idx++) { - CMCHKUNPK(SUnpkU8,¶m->intKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->intKey[idx],mBuf); } for(idx=0;idx<16;idx++) { - CMCHKUNPK(SUnpkU8,¶m->upCiphKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->upCiphKey[idx],mBuf); } for(idx=0;idx<16;idx++) { - CMCHKUNPK(SUnpkU8,¶m->cpCiphKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->cpCiphKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -3204,7 +3188,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfKdfCfmInfo) - CMCHKUNPK(SUnpkU8, ¶m->keyDerType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) { case CTF_KDF_TYPE1: @@ -3217,9 +3201,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfNhKeyCfmInfo, ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -3265,7 +3249,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3275,7 +3259,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfKdfCfmInfo(&kdfCfmInfo, mBuf) != ROK) { SPutMsg(mBuf); @@ -3285,10 +3269,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3296,10 +3280,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF032, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId,&kdfCfmInfo, status)); + return ((*func)(pst, suId, transId,&kdfCfmInfo, status)); } #endif @@ -3346,7 +3330,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3356,9 +3340,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3366,10 +3350,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF032, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, status)); + return ((*func)(pst, suId, transId, status)); } /** @@ -3412,7 +3396,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3422,10 +3406,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId)); + return ((*func)(pst, suId, transId)); } @@ -3474,9 +3458,9 @@ CtfUeInfo * newUeInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfUeInfo(newUeInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3487,11 +3471,11 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { - if (cmPkPtr((PTR)newUeInfo, mBuf) != ROK) { + else if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduPackPointer((PTR)newUeInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3501,10 +3485,10 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfUeInfo(ueInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3515,11 +3499,11 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { - if (cmPkPtr((PTR)ueInfo, mBuf) != ROK) { + else if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduPackPointer((PTR)ueInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3529,7 +3513,7 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -3542,7 +3526,7 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3554,9 +3538,9 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3565,7 +3549,7 @@ CtfUeInfo * newUeInfo; (ErrVal)ECTF040, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3575,11 +3559,11 @@ CtfUeInfo * newUeInfo; (ErrVal)ECTF041, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTCTFUEIDCHGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3627,7 +3611,7 @@ Buffer *mBuf; (Txt*)& __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF042, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3637,9 +3621,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF043, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3648,16 +3632,16 @@ Buffer *mBuf; (ErrVal)ECTF044, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&ueInfo, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&ueInfo, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); @@ -3667,9 +3651,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF045, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&newUeInfo, sizeof(CtfUeInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3679,16 +3663,16 @@ Buffer *mBuf; #endif SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&newUeInfo, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&newUeInfo, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfUeInfo(newUeInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); @@ -3699,10 +3683,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF047, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo)); + return ((*func)(pst, spId, transId, ueInfo, newUeInfo)); } @@ -3750,7 +3734,7 @@ CmStatus status; (ErrVal)ECTF048, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCmStatus(&status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3761,9 +3745,9 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfUeInfo(ueInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3773,11 +3757,11 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { - if (cmPkPtr((PTR)ueInfo, mBuf) != ROK) { + else if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduPackPointer((PTR)ueInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3786,7 +3770,7 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -3798,7 +3782,7 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3809,9 +3793,9 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3820,11 +3804,11 @@ CmStatus status; (ErrVal)ECTF054, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTCTFUEIDCHGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3872,7 +3856,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF055, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3882,9 +3866,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF056, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3893,16 +3877,16 @@ Buffer *mBuf; (ErrVal)ECTF057, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&ueInfo, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&ueInfo, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); @@ -3912,7 +3896,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF058, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCmStatus(&status, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); @@ -3923,10 +3907,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF059, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, ueInfo, status)); + return ((*func)(pst, suId, transId, ueInfo, status)); } @@ -3962,9 +3946,9 @@ Buffer *mBuf; TRC3(cmPkCtfCfgTransId) for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->trans[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4001,9 +3985,9 @@ Buffer *mBuf; TRC3(cmUnpkCtfCfgTransId) for (i=0; itrans[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4040,7 +4024,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4077,7 +4061,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4114,11 +4098,11 @@ Buffer *mBuf; TRC3(cmPkCtfBwCfgInfo) - CMCHKPK(SPkU8, param->eUtraBand, mBuf); - CMCHKPK(SPkU32, param->ulBw, mBuf); - CMCHKPK(SPkU32, param->dlBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf); + CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf); + CMCHKPK(oduUnpackUInt32, param->dlBw, mBuf); /* ctf_c_001.main_4: Removed packing of param->pres */ - RETVALUE(ROK); + return ROK; } @@ -4157,12 +4141,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfBwCfgInfo) /* ctf_c_001.main_4: Removed UnPacking of param->pres */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->dlBw = (CtfBandwidth)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ulBw = (CtfBandwidth)tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->eUtraBand, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->eUtraBand, mBuf); + return ROK; } @@ -4198,11 +4182,11 @@ Buffer *mBuf; TRC3(cmPkCtfTxSchemeCfg) - CMCHKPK(SPkU32, param->cycPfx, mBuf); - CMCHKPK(SPkU32, param->scSpacing, mBuf); - CMCHKPK(SPkU32, param->duplexMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf); + CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf); + CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf); /* ctf_c_001.main_4: Removed packing of param->pres */ - RETVALUE(ROK); + return ROK; } @@ -4240,13 +4224,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfTxSchemeCfg) /* ctf_c_001.main_4: Removed UnPacking of param->pres */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->duplexMode = (CtfDuplexMode)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->scSpacing = (CtfSCSpacing)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->cycPfx = (CtfCPCfg)tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -4283,8 +4267,8 @@ Buffer *mBuf; TRC3(cmPkCtfAntennaCfgInfo) - CMCHKPK(SPkU32, param->antPortsCnt, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf); + return ROK; } @@ -4321,9 +4305,9 @@ Buffer *mBuf; U32 tmpEnum; TRC3(cmUnpkCtfAntennaCfgInfo) - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -4369,14 +4353,14 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->prachFreqOffset, mBuf); - CMCHKPK(SPkU8, param->highSpeedFlag, mBuf); - CMCHKPK(SPkU8, param->zeroCorrelationZoneCfg, mBuf); - CMCHKPK(SPkU8, param->prachCfgIndex, mBuf); - CMCHKPK(SPkU16, param->rootSequenceIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachFreqOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->highSpeedFlag, mBuf); + CMCHKPK(oduUnpackUInt8, param->zeroCorrelationZoneCfg, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachCfgIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->rootSequenceIndex, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4419,17 +4403,17 @@ Buffer *mBuf; TRC3(cmUnpkCtfPrachCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU16, ¶m->rootSequenceIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachCfgIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->zeroCorrelationZoneCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->highSpeedFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachFreqOffset, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rootSequenceIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachCfgIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->zeroCorrelationZoneCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->highSpeedFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachFreqOffset, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4468,11 +4452,11 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->p_b, mBuf); + CMCHKPK(oduUnpackUInt8, param->p_b, mBuf); CMCHKPK(SPkS16, param->refSigPwr, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4509,14 +4493,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfPdschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { CMCHKUNPK(SUnpkS16, ¶m->refSigPwr, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->p_b, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->p_b, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4553,11 +4537,11 @@ Buffer *mBuf; TRC3(cmPkCtfPuschCfgBasic) - CMCHKPK(SPkU8, param->enable64QAM, mBuf); - CMCHKPK(SPkU8, param->hoppingOffset, mBuf); - CMCHKPK(SPkU32, param->hoppingMode, mBuf); - CMCHKPK(SPkU8, param->noOfsubBands, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf); + CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->noOfsubBands, mBuf); + return ROK; } @@ -4595,12 +4579,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfPuschCfgBasic) - CMCHKUNPK(SUnpkU8, ¶m->noOfsubBands, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->noOfsubBands, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->hoppingMode = (CtfPuschHoppingMode)tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->hoppingOffset, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->enable64QAM, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingOffset, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->enable64QAM, mBuf); + return ROK; } @@ -4637,11 +4621,11 @@ Buffer *mBuf; TRC3(cmPkCtfPuschUlRS) - CMCHKPK(SPkU8, param->cycShift, mBuf); - CMCHKPK(SPkU8, param->grpNum, mBuf); - CMCHKPK(SPkU8, param->seqHopEnabled, mBuf); - CMCHKPK(SPkU8, param->grpHopEnabled, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf); + CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->grpHopEnabled, mBuf); + return ROK; } @@ -4678,11 +4662,11 @@ Buffer *mBuf; TRC3(cmUnpkCtfPuschUlRS) - CMCHKUNPK(SUnpkU8, ¶m->grpHopEnabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->seqHopEnabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->grpNum, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cycShift, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->grpHopEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->seqHopEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->grpNum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cycShift, mBuf); + return ROK; } @@ -4725,8 +4709,8 @@ Buffer *mBuf; CMCHKPK(cmPkCtfPuschUlRS, ¶m->puschUlRS, mBuf); CMCHKPK(cmPkCtfPuschCfgBasic, ¶m->puschBasicCfg, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4763,14 +4747,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfPuschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { CMCHKUNPK(cmUnpkCtfPuschCfgBasic, ¶m->puschBasicCfg, mBuf); CMCHKUNPK(cmUnpkCtfPuschUlRS, ¶m->puschUlRS, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4810,11 +4794,11 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU32, param->resource, mBuf); - CMCHKPK(SPkU32, param->duration, mBuf); + CMCHKPK(oduUnpackUInt32, param->resource, mBuf); + CMCHKPK(oduUnpackUInt32, param->duration, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4852,16 +4836,16 @@ Buffer *mBuf; TRC3(cmUnpkCtfPhichCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->duration = (CtfPhichDuration)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->resource = (CtfPhichResource)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -4901,13 +4885,13 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU32, param->deltaShift, mBuf); - CMCHKPK(SPkU16, param->n1PUCCH, mBuf); - CMCHKPK(SPkU8, param->nCS, mBuf); - CMCHKPK(SPkU8, param->nRB, mBuf); + CMCHKPK(oduUnpackUInt32, param->deltaShift, mBuf); + CMCHKPK(oduUnpackUInt16, param->n1PUCCH, mBuf); + CMCHKPK(oduUnpackUInt8, param->nCS, mBuf); + CMCHKPK(oduUnpackUInt8, param->nRB, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4945,17 +4929,17 @@ Buffer *mBuf; TRC3(cmUnpkCtfPucchCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->nRB, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nCS, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->n1PUCCH, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nRB, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nCS, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->n1PUCCH, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->deltaShift = (CtfPucchDeltaShift)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -4995,14 +4979,14 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->srsSetup.srsMaxUpPts, mBuf); - CMCHKPK(SPkU8, param->srsSetup.srsANSimultTx, mBuf); - CMCHKPK(SPkU8, param->srsSetup.sfCfg, mBuf); - CMCHKPK(SPkU8, param->srsSetup.srsBw, mBuf); - CMCHKPK(SPkU8, param->srsCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.srsMaxUpPts, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.srsANSimultTx, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.sfCfg, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.srsBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5039,17 +5023,17 @@ Buffer *mBuf; TRC3(cmUnpkCtfSrsUlCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->srsCfgType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.sfCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsANSimultTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsMaxUpPts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsCfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.sfCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsANSimultTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsMaxUpPts, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5089,11 +5073,11 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->spclSfPatterns, mBuf); - CMCHKPK(SPkU8, param->sfAssignment, mBuf); + CMCHKPK(oduUnpackUInt8, param->spclSfPatterns, mBuf); + CMCHKPK(oduUnpackUInt8, param->sfAssignment, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } /* ctf_c_001.main_4: Added support for vendor specific parameters */ @@ -5132,9 +5116,9 @@ Buffer *mBuf; if( param->buffLen != 0) { SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf); } - CMCHKPK(SPkU16,param->buffLen,mBuf); + CMCHKPK(oduUnpackUInt16,param->buffLen,mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5171,7 +5155,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfVendorSpecParams) - CMCHKUNPK(SUnpkU16, ¶m->buffLen, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->buffLen, mBuf); if(param->buffLen != 0) { if ((SGetSBuf(pst->region, pst->pool, (Data **)¶m->paramBuffer, param->buffLen)) != ROK) { @@ -5180,7 +5164,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF060, (ErrVal)0, (Txt*)&"Unpacking failed"); #endif - RETVALUE(RFAILED) ; + return RFAILED ; } SRemPreMsgMult(param->paramBuffer, param->buffLen,mBuf) ; } @@ -5188,7 +5172,7 @@ Buffer *mBuf; param->paramBuffer = NULLP ; } - RETVALUE(ROK); + return ROK; } #endif @@ -5224,14 +5208,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfTddSfCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->sfAssignment, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->spclSfPatterns, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sfAssignment, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->spclSfPatterns, mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -5265,24 +5249,24 @@ Buffer *mBuf; TRC3(cmPkCtfUnLicnsdCellParam) CMCHKPK(SPkS32, param->txPowerLimit, mBuf); - CMCHKPK(SPkU8, param->coExistMethod, mBuf); - CMCHKPK(SPkU8, param->lteOnPeriod, mBuf); - CMCHKPK(SPkU8, param->ccaMethod, mBuf); - CMCHKPK(SPkU8, param->adaptiveTx, mBuf); - CMCHKPK(SPkU16, param->transPeriod, mBuf); - CMCHKPK(SPkU16, param->listenPrd, mBuf); + CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf); + CMCHKPK(oduUnpackUInt8, param->lteOnPeriod, mBuf); + CMCHKPK(oduUnpackUInt8, param->ccaMethod, mBuf); + CMCHKPK(oduUnpackUInt8, param->adaptiveTx, mBuf); + CMCHKPK(oduUnpackUInt16, param->transPeriod, mBuf); + CMCHKPK(oduUnpackUInt16, param->listenPrd, mBuf); CMCHKPK(SPkS16, param->energyTh, mBuf); - CMCHKPK(SPkU16, param->scanTimePrd, mBuf); - CMCHKPK(SPkU16, param->activityTh, mBuf); + CMCHKPK(oduUnpackUInt16, param->scanTimePrd, mBuf); + CMCHKPK(oduUnpackUInt16, param->activityTh, mBuf); for(idx = 0; idx < param->numFreq; idx++) { - CMCHKPK(SPkU32, param->earfcn[idx], mBuf); + CMCHKPK(oduUnpackUInt32, param->earfcn[idx], mBuf); } - CMCHKPK(SPkU8, param->numFreq, mBuf); + CMCHKPK(oduUnpackUInt8, param->numFreq, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5321,76 +5305,76 @@ Buffer *mBuf; #ifdef EMTC_ENABLE for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); - CMCHKPK(SPkU8, param->ceLevelInfo[i].lastPreamble, mBuf); - CMCHKPK(SPkU8, param->ceLevelInfo[i].firstPreamble, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].lastPreamble, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].firstPreamble, mBuf); } - CMCHKPK(SPkU8, param->mPdcchStart, mBuf); - CMCHKPK(SPkU8, param->catMenabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->mPdcchStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->catMenabled, mBuf); #endif if(param->unLicnsdCfgPres) { printf("pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres); CMCHKPK(cmPkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf); } - CMCHKPK(SPkU8, param->unLicnsdCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->unLicnsdCfgPres, mBuf); /*Added for rgu dynamic delta*/ - CMCHKPK(SPkU8, param->numDlUePerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->numDlUePerTti, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); - CMCHKPK(SPkU16, param->ulEarfcn, mBuf); - CMCHKPK(SPkU16, param->dlEarfcn, mBuf); + CMCHKPK(oduUnpackUInt16, param->ulEarfcn, mBuf); + CMCHKPK(oduUnpackUInt16, param->dlEarfcn, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); /* Packing PHY configuration parameters */ - CMCHKPK(SPkU32, param->period, mBuf); - CMCHKPK(SPkU32, param->counter, mBuf); - CMCHKPK(SPkU16, param->opMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->period, mBuf); + CMCHKPK(oduUnpackUInt32, param->counter, mBuf); + CMCHKPK(oduUnpackUInt16, param->opMode, mBuf); /* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/ - CMCHKPK(SPkU8, param->rachSrRepModePres, mBuf); - CMCHKPK(SPkU16, param->rachSrRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf); - CMCHKPK(SPkU8, param->dataRepModePres, mBuf); - CMCHKPK(SPkU16, param->dataRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf); - CMCHKPK(SPkU8, param->phySyncModePres, mBuf); - CMCHKPK(SPkU16, param->phySyncMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf); - CMCHKPK(SPkU8, param->rxAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->rxAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->txAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->txAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->pucchProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->pucchProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->puschProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->puschProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->srsDopEstFactorPres, mBuf); - CMCHKPK(SPkU16, param->srsDopEstFactor, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio0Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio0, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio4Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio4, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf); - CMCHKPK(SPkU8, param->pucchNoiseGammaPres, mBuf); - CMCHKPK(SPkU16, param->pucchNoiseGamma, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf); - CMCHKPK(SPkU8, param->extWinMarginPres, mBuf); - CMCHKPK(SPkU16, param->extWinMargin, mBuf); + CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf); - CMCHKPK(SPkU8, param->dciPowOsPres, mBuf); - CMCHKPK(SPkU16, param->dciPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf); - CMCHKPK(SPkU8, param->cfiPowOsPres, mBuf); - CMCHKPK(SPkU16, param->cfiPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf); - CMCHKPK(SPkU8, param->syncSigPowOsPres, mBuf); - CMCHKPK(SPkU16, param->syncSigPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf); CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); @@ -5402,15 +5386,15 @@ Buffer *mBuf; CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf); - CMCHKPK(SPkU8, param->physCellId, mBuf); - CMCHKPK(SPkU8, param->physCellIdPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf); CMCHKPK(SPkS16, param->macSapId, mBuf); CMCHKPK(SPkS16, param->schSapId, mBuf); - CMCHKPK(SPkU8, param->cellIdGrpId, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -5443,25 +5427,25 @@ Buffer *mBuf; TRC3(cmPkCtfUnLicnsdCellParam) - CMCHKUNPK(SUnpkU8, ¶m->numFreq, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numFreq, mBuf); for(idx = 0; idx < param->numFreq; idx++) { - CMCHKUNPK(SUnpkU32, ¶m->earfcn[idx], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->earfcn[idx], mBuf); } - CMCHKUNPK(SUnpkU16, ¶m->activityTh, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->scanTimePrd, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->activityTh, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->scanTimePrd, mBuf); CMCHKUNPK(SUnpkS16, ¶m->energyTh, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->listenPrd, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->transPeriod, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->adaptiveTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ccaMethod, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->lteOnPeriod, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->coExistMethod, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->listenPrd, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->transPeriod, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->adaptiveTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ccaMethod, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lteOnPeriod, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->coExistMethod, mBuf); CMCHKUNPK(SUnpkS32, ¶m->txPowerLimit, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5501,13 +5485,13 @@ Buffer *mBuf; /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cellIdGrpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdGrpId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->schSapId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->macSapId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellIdPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf); CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf); CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); @@ -5519,63 +5503,63 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->syncSigPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->syncSigPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cfiPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cfiPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dciPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->extWinMargin, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->extWinMarginPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchNoiseGamma, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchNoiseGammaPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio4, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio4Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio0, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio0Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->srsDopEstFactor, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsDopEstFactorPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->puschProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->puschProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->txAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rxAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rxAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->phySyncMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phySyncModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dataRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dataRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rachSrRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rachSrRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf); /* UnPacking PHY configuration parameters */ - CMCHKUNPK(SUnpkU16, ¶m->opMode, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->counter, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->period, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->opMode, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->counter, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->period, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dlEarfcn, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->ulEarfcn, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dlEarfcn, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->ulEarfcn, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); /* Added for rgu dynamic delta change*/ - CMCHKUNPK(SUnpkU8, ¶m->numDlUePerTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->unLicnsdCfgPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numDlUePerTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->unLicnsdCfgPres, mBuf); if(param->unLicnsdCfgPres) { @@ -5583,16 +5567,16 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf); } #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8, ¶m->catMenabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mPdcchStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->catMenabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mPdcchStart, mBuf); for (i = 0; i < CTF_MAX_CE_LEVEL; i++) { - CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].firstPreamble, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].lastPreamble, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].firstPreamble, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].lastPreamble, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); } #endif - RETVALUE(ROK); + return ROK; } @@ -5632,57 +5616,57 @@ Buffer *mBuf; TRC3(cmPkCtfCellRecfgInfo) #ifdef ENABLE_API_LOG - CMCHKPK(SPkU8, param->enableAPILog, mBuf); + CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf); #endif /* ENABLE_API_LOG */ /* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/ CMCHKPK(SPkS16, param->secSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); - CMCHKPK(SPkU8, param->rachSrRepModePres, mBuf); - CMCHKPK(SPkU16, param->rachSrRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf); - CMCHKPK(SPkU8, param->dataRepModePres, mBuf); - CMCHKPK(SPkU16, param->dataRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf); - CMCHKPK(SPkU8, param->phySyncModePres, mBuf); - CMCHKPK(SPkU16, param->phySyncMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf); - CMCHKPK(SPkU8, param->rxAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->rxAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->txAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->txAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->pucchProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->pucchProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->puschProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->puschProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->srsDopEstFactorPres, mBuf); - CMCHKPK(SPkU16, param->srsDopEstFactor, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio0Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio0, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio4Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio4, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf); - CMCHKPK(SPkU8, param->pucchNoiseGammaPres, mBuf); - CMCHKPK(SPkU16, param->pucchNoiseGamma, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf); - CMCHKPK(SPkU8, param->extWinMarginPres, mBuf); - CMCHKPK(SPkU16, param->extWinMargin, mBuf); + CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf); - CMCHKPK(SPkU8, param->dciPowOsPres, mBuf); - CMCHKPK(SPkU16, param->dciPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf); - CMCHKPK(SPkU8, param->cfiPowOsPres, mBuf); - CMCHKPK(SPkU16, param->cfiPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf); - CMCHKPK(SPkU8, param->syncSigPowOsPres, mBuf); - CMCHKPK(SPkU16, param->syncSigPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf); CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); @@ -5696,12 +5680,12 @@ Buffer *mBuf; CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf); - CMCHKPK(SPkU8, param->physCellId, mBuf); - CMCHKPK(SPkU8, param->physCellIdPres, mBuf); - CMCHKPK(SPkU8, param->cellIdGrpId, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkU32, param->ctfReCfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->ctfReCfgType, mBuf); + return ROK; } @@ -5740,12 +5724,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfCellRecfgInfo) /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ctfReCfgType = (CtfReCfgType)tmpEnum; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cellIdGrpId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellIdPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdGrpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf); CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf); CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); @@ -5759,59 +5743,59 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->syncSigPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->syncSigPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cfiPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cfiPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dciPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->extWinMargin, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->extWinMarginPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchNoiseGamma, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchNoiseGammaPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio4, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio4Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio0, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio0Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->srsDopEstFactor, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsDopEstFactorPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->puschProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->puschProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->txAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rxAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rxAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->phySyncMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phySyncModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dataRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dataRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rachSrRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rachSrRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); printf("param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); #ifdef ENABLE_API_LOG - CMCHKUNPK(SUnpkU8, ¶m->enableAPILog, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->enableAPILog, mBuf); #endif /* ENABLE_API_LOG */ - RETVALUE(ROK); + return ROK; } @@ -5850,9 +5834,9 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKPK(SPkU32, param->pA, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->pA, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5889,14 +5873,14 @@ Buffer *mBuf; U32 tmpEnum; TRC3(cmUnpkCtfDedPdschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->pA = (CtfPdschPaParam)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -5940,27 +5924,27 @@ Buffer *mBuf; /*ctf_c_001.main_4:115549: packing tddAckNackFBMode and tddAckNackCfgPres */ if (param->tddAckNackCfgPres != FALSE) { - CMCHKPK(SPkU32, param->tddAckNackFBMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->tddAckNackFBMode, mBuf); } - CMCHKPK(SPkU8, param->tddAckNackCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->tddAckNackCfgPres, mBuf); #endif /* CTF_VER3 */ - CMCHKPK(SPkU16, param->pucchSetup.n1PUCCHRep, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchSetup.n1PUCCHRep, mBuf); #ifdef CTF_VER3 /*ctf_c_001.main_4:115549: packing pucchSetup.repFactPres */ if (param->pucchSetup.repFactPres) { - CMCHKPK(SPkU32, param->pucchSetup.repFact, mBuf); + CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf); } - CMCHKPK(SPkU8, param->pucchSetup.repFactPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchSetup.repFactPres, mBuf); #else - CMCHKPK(SPkU32, param->pucchSetup.repFact, mBuf); + CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf); #endif /* CTF_VER3 */ - CMCHKPK(SPkU8, param->dedPucchCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedPucchCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5997,34 +5981,34 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedPucchCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->dedPucchCfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedPucchCfgType, mBuf); #ifdef CTF_VER3 /* ctf_c_001.main_4:115549: unpacking pucchSetup.repFactPres */ - CMCHKUNPK(SUnpkU8, ¶m->pucchSetup.repFactPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchSetup.repFactPres, mBuf); if (param->pucchSetup.repFactPres) { - CMCHKUNPK(SUnpkU32, (U32 *)¶m->pucchSetup.repFact, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf); } #else - CMCHKUNPK(SUnpkU32, (U32 *)¶m->pucchSetup.repFact, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf); #endif /*CTF_VER3 */ - CMCHKUNPK(SUnpkU16, ¶m->pucchSetup.n1PUCCHRep, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchSetup.n1PUCCHRep, mBuf); #ifdef CTF_VER3 /*ctf_c_001.main_4:115549: unpacking tddAckNackCfgPres and tddAckNackFBMode */ - CMCHKUNPK(SUnpkU8, ¶m->tddAckNackCfgPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tddAckNackCfgPres, mBuf); if (param->tddAckNackCfgPres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)¶m->tddAckNackFBMode, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tddAckNackFBMode, mBuf); } #endif /* CTF_VER3 */ } - RETVALUE(ROK); + return ROK; } @@ -6064,12 +6048,12 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->betaOffsetCqiIdx, mBuf); - CMCHKPK(SPkU8, param->betaOffsetRiIdx, mBuf); - CMCHKPK(SPkU8, param->betaOffsetAckIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->betaOffsetCqiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->betaOffsetRiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->betaOffsetAckIdx, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6106,15 +6090,15 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedPuschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->betaOffsetAckIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->betaOffsetRiIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->betaOffsetCqiIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetAckIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetRiIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetCqiIdx, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -6153,18 +6137,18 @@ Buffer *mBuf; TRC3(cmPkCtfCqiRptModePeriodic) /* ctf_c_001.main_2: added packning for cqiMask*/ #ifdef CTF_VER1 - CMCHKPK(SPkU32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.cqiMask.pres, mBuf); + CMCHKPK(oduUnpackUInt32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.cqiMask.pres, mBuf); #endif /* CTF_VER1 */ - CMCHKPK(SPkU8, param->cqiSetup.simultaneousAckNack, mBuf); - CMCHKPK(SPkU16, param->cqiSetup.riCfgIndx, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.riCfgPres, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.subbandCqi.k, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.formatIndicator, mBuf); - CMCHKPK(SPkU16, param->cqiSetup.cqiPmiCfgIndx, mBuf); - CMCHKPK(SPkU16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf); - CMCHKPK(SPkU8, param->cqiPeriodicCfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.simultaneousAckNack, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiSetup.riCfgIndx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.riCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.subbandCqi.k, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.formatIndicator, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPmiCfgIndx, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPeriodicCfgType, mBuf); + return ROK; } @@ -6203,21 +6187,21 @@ Buffer *mBuf; #endif TRC3(cmUnpkCtfCqiRptModePeriodic) - CMCHKUNPK(SUnpkU8, ¶m->cqiPeriodicCfgType, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.cqiPmiCfgIndx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.formatIndicator, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.subbandCqi.k, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.riCfgPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.riCfgIndx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.simultaneousAckNack, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPeriodicCfgType, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.cqiPmiCfgIndx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.formatIndicator, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.subbandCqi.k, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.riCfgPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.riCfgIndx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.simultaneousAckNack, mBuf); /* ctf_c_001.main_2: added Unpackning for cqiMask*/ #ifdef CTF_VER1 - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.cqiMask.pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.cqiMask.pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->cqiSetup.cqiMask.cqiMaskSetup = tmpEnum; #endif /* CTF_VER1 */ - RETVALUE(ROK); + return ROK; } @@ -6264,15 +6248,15 @@ Buffer *mBuf; */ if(param->reportMode.aPeriodicRpt.pres != FALSE) { - CMCHKPK(SPkU32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf); } - CMCHKPK(SPkU8, param->reportMode.aPeriodicRpt.pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportMode.aPeriodicRpt.pres, mBuf); if(param->reportMode.periodicRpt.pres != FALSE) { CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); } - CMCHKPK(SPkU8, param->reportMode.periodicRpt.pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportMode.periodicRpt.pres, mBuf); #else /* CTF_VER2 */ @@ -6281,23 +6265,23 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); break; case CTF_CQI_RPTMODE_APRDIOC: - CMCHKPK(SPkU32, param->reportMode.aPeriodicRpt, mBuf); + CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->reportingMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportingMode, mBuf); #endif /* CTF_VER2 */ /* ctf_c_001.main_2: added packning for pmiRiRpt*/ #ifdef CTF_VER1 - CMCHKPK(SPkU32, param->pmiRiRpt.pmiRiRptSetup, mBuf); - CMCHKPK(SPkU8, param->pmiRiRpt.pres, mBuf); + CMCHKPK(oduUnpackUInt32, param->pmiRiRpt.pmiRiRptSetup, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmiRiRpt.pres, mBuf); #endif /* CTF_VER1 */ } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6336,14 +6320,14 @@ Buffer *mBuf; #endif TRC3(cmUnpkCtfCqiReportCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { /* ctf_c_001.main_2: added Unpackning for cqiMask*/ #ifdef CTF_VER1 - CMCHKUNPK(SUnpkU8, ¶m->pmiRiRpt.pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmiRiRpt.pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->pmiRiRpt.pmiRiRptSetup = tmpEnum; #endif /* CTF_VER1 */ @@ -6352,36 +6336,36 @@ Buffer *mBuf; *ctf_c_001.main_2: Added provision to send Periodic and aPeriodic CQI *report configuration in the same message */ - CMCHKUNPK(SUnpkU8, ¶m->reportMode.periodicRpt.pres, mBuf) + CMCHKUNPK(oduPackUInt8, ¶m->reportMode.periodicRpt.pres, mBuf) if(param->reportMode.periodicRpt.pres != FALSE) { CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->reportMode.aPeriodicRpt.pres, mBuf) + CMCHKUNPK(oduPackUInt8, ¶m->reportMode.aPeriodicRpt.pres, mBuf) if(param->reportMode.aPeriodicRpt.pres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->reportMode.aPeriodicRpt.aPeriodicRptMode = (CtfCqiRptModeAperiodic)tmpEnum; } #else /* CTF_VER2 */ - CMCHKUNPK(SUnpkU8, ¶m->reportingMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->reportingMode, mBuf); switch(param->reportingMode) { case CTF_CQI_RPTMODE_APRDIOC: - CMCHKUNPK(SUnpkU32, (U32 *)¶m->reportMode.aPeriodicRpt, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->reportMode.aPeriodicRpt, mBuf); break; case CTF_CQI_RPTMODE_PRDIOC: CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } #endif /* CTF_VER2 */ } - RETVALUE(ROK); + return ROK; } @@ -6421,17 +6405,17 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->dedSrsSetup.cyclicShift, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.txComb, mBuf); - CMCHKPK(SPkU16, param->dedSrsSetup.srsCfgIdx, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.duration, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.freqDmnPos, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.srsHopngBw, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.srsBw, mBuf); - CMCHKPK(SPkU8, param->dedSrsUlCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.cyclicShift, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.txComb, mBuf); + CMCHKPK(oduUnpackUInt16, param->dedSrsSetup.srsCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.duration, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.freqDmnPos, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsHopngBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsUlCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6468,20 +6452,20 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedSrsUlCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->dedSrsUlCfgType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.srsBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.srsHopngBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.freqDmnPos, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.duration, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dedSrsSetup.srsCfgIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.txComb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.cyclicShift, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsUlCfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.srsBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.srsHopngBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.freqDmnPos, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.duration, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dedSrsSetup.srsCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.txComb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.cyclicShift, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -6521,12 +6505,12 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->dedSrSetup.srCfgIdx, mBuf); - CMCHKPK(SPkU16, param->dedSrSetup.srPUCCHRi, mBuf); - CMCHKPK(SPkU8, param->dedSRCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrSetup.srCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt16, param->dedSrSetup.srPUCCHRi, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSRCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6563,15 +6547,15 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedSRCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->dedSRCfgType, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dedSrSetup.srPUCCHRi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrSetup.srCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSRCfgType, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dedSrSetup.srPUCCHRi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrSetup.srCfgIdx, mBuf); } - RETVALUE(ROK); + return ROK; } #endif /* TFU_UPGRADE */ @@ -6616,10 +6600,10 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU32, param->ueTxAntSelection.txAntSelect, mBuf); - CMCHKPK(SPkU8, param->ueTxAntSelection.cfgType, 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(SPkU32, (U32)param->txMode, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->txMode, mBuf); #ifdef CTF_VER2 /* *ctf_c_001.main_2: Added Packing of CodeBookSubsetRestriction parameter @@ -6627,54 +6611,54 @@ Buffer *mBuf; switch(param->codeBookSubsetRes.ctfCdBkRestType) { case N2TX_ANT_TM3: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm3, mBuf); break; case N4TX_ANT_TM3: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm3, mBuf); break; case N2TX_ANT_TM4: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm4, mBuf); break; case N4TX_ANT_TM4: for(idx = 0; idx < 8; idx++) - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm4[idx], mBuf); break; case N2TX_ANT_TM5: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm5, mBuf); break; case N4TX_ANT_TM5: - CMCHKPK(SPkU16, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm5, mBuf); break; case N2TX_ANT_TM6: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm6, mBuf); break; case N4TX_ANT_TM6: - CMCHKPK(SPkU16, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm6, mBuf); break; default : break; } - CMCHKPK(SPkU32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf); + CMCHKPK(oduUnpackUInt32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf); #endif /* CTF_VER2 */ } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6716,7 +6700,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedAntCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -6724,50 +6708,50 @@ Buffer *mBuf; /* * Added Unpacking for CodeBookSubsetRestriction parameter */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->codeBookSubsetRes.ctfCdBkRestType = (CtfCdBkSubsetRestnType)tmpEnum; switch(param->codeBookSubsetRes.ctfCdBkRestType) { case N2TX_ANT_TM3: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm3, mBuf); break; case N4TX_ANT_TM3: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm3, mBuf); break; case N2TX_ANT_TM4: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm4, mBuf); break; case N4TX_ANT_TM4: for(idx = 7; idx >= 0; idx--) { - CMCHKUNPK(SUnpkU8, &(param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, &(param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm4[idx]), mBuf); } break; case N2TX_ANT_TM5: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm5, mBuf); break; case N4TX_ANT_TM5: - CMCHKUNPK(SUnpkU16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm5, mBuf); break; case N2TX_ANT_TM6: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm6, mBuf); break; case N4TX_ANT_TM6: - CMCHKUNPK(SUnpkU16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm6, mBuf); break; default : @@ -6775,13 +6759,13 @@ Buffer *mBuf; } #endif /* CTF_VER2 */ /* ctf_c_001.main_3 Enum is 32bit length */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->txMode = (CtfUeTxAntMode)tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->ueTxAntSelection.cfgType, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ueTxAntSelection.cfgType, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ueTxAntSelection.txAntSelect = (CtfUeTxAntSelectType)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -6813,10 +6797,10 @@ CtfUeSecCellCfgInfo *param; Buffer *mBuf; #endif { - CMCHKPK(SPkU16, param->sCellId, mBuf); - CMCHKPK(SPkU8, param->sCellIdx, mBuf); + CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -6852,10 +6836,10 @@ Buffer *mBuf; { CMCHKPK(cmPkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[(U8)idx], mBuf); } - CMCHKPK(SPkU32, param->sCellAction, mBuf); - CMCHKPK(SPkU8, param->numSCells, mBuf); + CMCHKPK(oduUnpackUInt32, param->sCellAction, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -6886,10 +6870,10 @@ CtfUeSecCellCfgInfo *param; Buffer *mBuf; #endif { - CMCHKUNPK(SUnpkU8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -6923,14 +6907,14 @@ Buffer *mBuf; { U8 idx; - CMCHKUNPK(SUnpkU8, ¶m->numSCells, mBuf); - CMCHKUNPK(SUnpkU32, (U32*)¶m->sCellAction, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)¶m->sCellAction, mBuf); for(idx = 0 ; idx < param->numSCells; idx++) { CMCHKUNPK(cmUnpkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[idx], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -6968,9 +6952,9 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKPK(SPkU32, param->ueCategory, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->ueCategory, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -7007,11 +6991,11 @@ Buffer *mBuf; TRC3(cmUnpkCtfUeCatCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->ueCategory, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ueCategory, mBuf); + return ROK; } @@ -7048,7 +7032,7 @@ Buffer *mBuf; TRC3(cmPkCtfDedCfgInfo) #ifdef EMTC_ENABLE - CMCHKPK(SPkU8, param->isEmtcUe, mBuf); + CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf); #endif CMCHKPK(cmPkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); #ifndef TFU_UPGRADE @@ -7062,7 +7046,7 @@ Buffer *mBuf; CMCHKPK(cmPkCtfUeCatCfgInfo, ¶m->ueCatCfg, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7112,9 +7096,9 @@ Buffer *mBuf; #endif /* TFU_UPGRADE */ CMCHKUNPK(cmUnpkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8, ¶m->isEmtcUe, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isEmtcUe, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -7171,7 +7155,7 @@ Buffer *mBuf; #endif CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7230,7 +7214,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); - RETVALUE(ROK); + return ROK; } @@ -7268,7 +7252,7 @@ Buffer *mBuf; TRC3(cmPkCtfCellReleaseInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7306,7 +7290,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfCellReleaseInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7345,7 +7329,7 @@ Buffer *mBuf; CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7385,7 +7369,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); - RETVALUE(ROK); + return ROK; } @@ -7430,10 +7414,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCellCfgInfo, ¶m->u.cellCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgElem, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + return ROK; } @@ -7470,7 +7454,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellCfgInfo, ¶m->u.cellCfg, mBuf); @@ -7479,9 +7463,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfDedCfgInfo, ¶m->u.dedCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7535,10 +7519,10 @@ Buffer *mBuf; break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgElem, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + return ROK; } @@ -7575,7 +7559,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfReCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellRecfgInfo, ¶m->u.cellRecfg, mBuf); @@ -7592,9 +7576,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfCellStop, ¶m->u.cellRecfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7639,10 +7623,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCellReleaseInfo, ¶m->u.cellRel, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgElem, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + return ROK; } @@ -7679,7 +7663,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfReleaseInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellReleaseInfo, ¶m->u.cellRel, mBuf); @@ -7688,9 +7672,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfDedReleaseInfo, ¶m->u.dedRel, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7745,10 +7729,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCfgInfo, ¶m->u.cfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); + return ROK; } @@ -7796,7 +7780,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfCfgReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { case CTF_CONFIG: CMCHKUNPK(cmUnpkCtfCfgInfo, ¶m->u.cfg, mBuf); @@ -7808,13 +7792,13 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfReleaseInfo, ¶m->u.release, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } #ifdef CTF_VER3 if((retVal = cmUnpkCtfVendorSpecParams(pst, ¶m->vendorParams, mBuf)) != ROK) - RETVALUE(retVal); + return (retVal); #endif - RETVALUE(ROK); + return ROK; } /* Starts - Fix for CR ccpu00123185 */ @@ -7851,14 +7835,14 @@ Buffer *mBuf; TRC3(cmPkCtfCellPwrcfgInfo) /* Added the pack for newly added reference signal Power*/ - CMCHKPK(SPkU32, (U32)param->ctfCellStatus, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); CMCHKPK(SPkS16, param->pdschCfg.refSigPwr, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7902,9 +7886,9 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->ctfCellStatus, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -7940,14 +7924,14 @@ Buffer *mBuf; TRC3(cmPkCtfCellStop) /* Added the pack for newly added reference signal Power*/ - CMCHKPK(SPkU32, (U32)param->ctfCellStatus, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); CMCHKPK(SPkS16, param->pdschCfg.refSigPwr, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -7988,9 +7972,9 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->ctfCellStatus, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf); - RETVALUE(ROK); + return ROK; } /* Periodic REM Scan for TPM */ @@ -8024,11 +8008,11 @@ Buffer *mBuf; { TRC3(cmPkPerRemScanCellInfo) - CMCHKPK(SPkU16,param->pci, mBuf); - CMCHKPK(SPkU8, param->rsrp, mBuf); - CMCHKPK(SPkU8, param->dlBw, mBuf); - CMCHKPK(SPkU8, param->numTx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16,param->pci, mBuf); + CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->numTx, mBuf); + return ROK; } @@ -8067,9 +8051,9 @@ Buffer *mBuf; { CMCHKPK(cmPkPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf); } - CMCHKPK(SPkU8, param->numCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCells, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -8115,9 +8099,9 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; #endif SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == CTF_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfPeriodicCellSearchRsp(CellCfgRsp, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -8128,12 +8112,12 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LWLC) { + else if (pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)CellCfgRsp, mBuf) != ROK) { + if (oduPackPointer((PTR)CellCfgRsp, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -8143,7 +8127,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8157,7 +8141,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -8169,14 +8153,14 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); } pst->event = (Event)EVTCTFPREMCELLSRCHRSP; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #ifdef ANSI @@ -8193,11 +8177,11 @@ Buffer *mBuf; { TRC3(cmUnpkCtfPerRemScanCellInfo); - CMCHKUNPK(SUnpkU8, ¶m->numTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dlBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rsrp, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pci, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->numTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); + return ROK; } #ifdef ANSI @@ -8215,13 +8199,13 @@ Buffer *mBuf; S16 idx; TRC3(cmUnpkCtfPerRemCellSrch); - CMCHKUNPK(SUnpkU8, ¶m->numCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCells, mBuf); for(idx = 0; idx < (param->numCells); idx++) { CMCHKUNPK(cmUnpkCtfPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf); } - RETVALUE(ROK); + return ROK; } /** @@ -8264,7 +8248,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -8274,9 +8258,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != CTF_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&CellSrchRsp, sizeof(CtfPeriodicRemCellSearchRsp))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -8286,16 +8270,16 @@ Buffer *mBuf; (ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == CTF_SEL_LWLC) { - if (cmUnpkPtr((PTR *)&CellSrchRsp, mBuf) != ROK) { + if (pst->selector == ODU_SELECTOR_LWLC) { + if (oduUnpackPointer((PTR *)&CellSrchRsp, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == CTF_SEL_LC) + else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfPerRemCellSrch(CellSrchRsp, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)CellSrchRsp, sizeof(CtfPeriodicRemCellSearchRsp)); @@ -8306,11 +8290,11 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, &transId, CellSrchRsp)); + return ((*func)(pst, suId, &transId, CellSrchRsp)); } /* Periodic REM Scan for TPM End */