X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fctf.c;h=a13d19a71005182fb058ff227ce122cc1d7f43b3;hb=49856df248fd976b4a9882ca4e650fc0bc3e4ee3;hp=59d23930f2007fbc754535ac6d7712337fdeb7f8;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git diff --git a/src/cm/ctf.c b/src/cm/ctf.c index 59d23930f..a13d19a71 100755 --- a/src/cm/ctf.c +++ b/src/cm/ctf.c @@ -40,10 +40,10 @@ #include "ctf.x" #ifdef TENB_AS_SECURITY -#define cmPkCtfCrnti oduUnpackUInt16 -#define cmPkCtfCellId oduUnpackUInt16 -#define cmUnpkCtfCellId oduPackUInt16 -#define cmUnpkCtfCrnti oduPackUInt16 +#define cmPkCtfCrnti oduPackUInt16 +#define cmPkCtfCellId oduPackUInt16 +#define cmUnpkCtfCellId oduUnpackUInt16 +#define cmUnpkCtfCrnti oduUnpackUInt16 #endif @@ -63,19 +63,12 @@ * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfBndReq ( Pst* pst, SuId suId, SpId spId ) -#else -S16 cmPkCtfBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { Buffer *mBuf = NULLP; @@ -126,19 +119,12 @@ SpId spId; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfBndReq ( CtfBndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfBndReq(func, pst, mBuf) -CtfBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; SpId spId = 0; @@ -179,23 +165,16 @@ Buffer *mBuf; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) -#else -S16 cmPkCtfBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -U8 status; -#endif { Buffer *mBuf = NULLP; @@ -208,7 +187,7 @@ U8 status; #endif return RFAILED; } - if (oduUnpackUInt8(status, mBuf) != ROK) { + if (oduPackUInt8(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, @@ -243,26 +222,19 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfBndCfm ( CtfBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfBndCfm(func, pst, mBuf) -CtfBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; - U8 status; + uint8_t status; if (SUnpkS16(&suId, mBuf) != ROK) { @@ -275,7 +247,7 @@ Buffer *mBuf; #endif return RFAILED; } - if (oduPackUInt8(&status, mBuf) != ROK) { + if (oduUnpackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -303,19 +275,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfUbndReq ( Pst* pst, SpId spId, Reason reason ) -#else -S16 cmPkCtfUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif { Buffer *mBuf = NULLP; @@ -366,19 +331,12 @@ Reason reason; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfUbndReq ( CtfUbndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfUbndReq(func, pst, mBuf) -CtfUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; Reason reason = 0; @@ -423,27 +381,21 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmRelCtfCfgReq +static S16 cmRelCtfCfgReq ( Pst *pst, CtfCfgReqInfo *cfgReqInfo ) -#else -PRIVATE S16 cmRelCtfCfgReq(pst,cfgReqInfo) -Pst *pst; -CtfCfgReqInfo *param; -#endif { /* ctf_c_001.main_4: Added support for vendor specific parameters */ #ifdef CTF_VER3 if(cfgReqInfo->vendorParams.paramBuffer != NULLP) { - SPutSBuf(pst->region, pst->pool, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo->vendorParams.paramBuffer, cfgReqInfo->vendorParams.buffLen); } #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCfgReqInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCfgReqInfo)); return ROK; } @@ -468,17 +420,11 @@ CtfCfgReqInfo *param; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfNhKeyInfo ( CtfNhKeyInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfNhKeyInfo(param, mBuf) -CtfNhKeyInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -486,10 +432,10 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf); - CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf); + CMCHKPK(oduPackUInt16, param->physCellId, mBuf); + CMCHKPK(oduPackUInt16, param->dlCarrFreq, mBuf); return ROK; } @@ -514,17 +460,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKenbStarInfo ( CtfKenbStarInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfKenbStarInfo(param, mBuf) -CtfKenbStarInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -532,10 +472,10 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf); - CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf); + CMCHKPK(oduPackUInt16, param->physCellId, mBuf); + CMCHKPK(oduPackUInt16, param->dlCarrFreq, mBuf); return ROK; } @@ -561,29 +501,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfAskeyInfo ( CtfAsKeyInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfAskeyInfo(param, mBuf) -CtfAsKeyInfo *param; -Buffer *mBuf; -#endif { - S16 idx; - - for(idx=31;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(oduUnpackUInt8, param->ciphAlgoType, mBuf); - CMCHKPK(oduUnpackUInt8, param->intgAlgoType, mBuf); + CMCHKPK(oduPackUInt8, param->ciphAlgoType, mBuf); + CMCHKPK(oduPackUInt8, param->intgAlgoType, mBuf); return ROK; } @@ -608,17 +539,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKdfReqInfo ( CtfKdfReqInfo *param, Buffer *mBuf - ) -#else -S16 cmPkCtfKdfReqInfo(param, mBuf) -CtfKdfReqInfo *param; -Buffer *mBuf; -#endif +) { @@ -636,7 +561,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf); + CMCHKPK(oduPackUInt8, param->keyDerType, mBuf); return ROK; } @@ -656,7 +581,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfKdfReq ( Pst* pst, @@ -664,18 +588,9 @@ SpId spId, CtfCfgTransId transId, CtfKdfReqInfo* kdfReqInfo ) -#else -S16 cmPkCtfKdfReq(pst, spId, transId, kdfReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId transId; -CtfKdfReqInfo* kdfReqInfo; -#endif { Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -683,7 +598,7 @@ CtfKdfReqInfo* kdfReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { @@ -694,7 +609,7 @@ CtfKdfReqInfo* kdfReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); return RFAILED; } @@ -708,7 +623,7 @@ CtfKdfReqInfo* kdfReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF019, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); return RFAILED; } @@ -719,12 +634,12 @@ CtfKdfReqInfo* kdfReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF020, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if (SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)) != ROK) { + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -743,71 +658,54 @@ CtfKdfReqInfo* kdfReqInfo; /********************************************************************************************************************************/ /*START OF CNM PACK & UNPACK FUNCTIONS*/ /********************************************************************************************************************************/ -#ifdef ANSI S16 cmPkCtfCnmVendorSpecificInfo ( CtfCnmVendorSpecificInfo *param, Buffer *mBuf ) -#else -CtfCnmVendorSpecificInfo *param; -Buffer *mBuf; -#endif { S32 i; if(param->numOfVendorSpecifcParam <= CTF_CNM_MAX_VENDOR_PARAMS) { for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt32,(U32)param->vendorSpecifcParam[i], mBuf); + CMCHKPK(oduPackUInt32,(uint32_t)param->vendorSpecifcParam[i], mBuf); } } - CMCHKPK(oduUnpackUInt16, param->numOfVendorSpecifcParam, mBuf); + CMCHKPK(oduPackUInt16, param->numOfVendorSpecifcParam, mBuf); return ROK; } -#ifdef ANSI S16 cmPkCtfCtfCnmCellSyncReq ( CtfCnmCellSyncReq *param, Buffer *mBuf ) -#else -S16 cmPkCtfCtfCnmCellSyncReq(param, mBuf) -CtfCnmCellSyncReq *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf); - 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(oduPackUInt16, param->nbrEarfcn, mBuf); + CMCHKPK(oduPackUInt16, param->nbrPCellId, mBuf); + CMCHKPK(oduPackUInt8, param->nbrTxAntCount, mBuf); + CMCHKPK(oduPackUInt8, param->nbrCellCp, mBuf); + CMCHKPK(oduPackUInt8, param->nbrCellNRb, mBuf); + CMCHKPK(oduPackUInt8, param->nbrSpecSfCfg, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); return ROK; } -#ifdef ANSI S16 cmPkCtfcfgReqInfo ( CtfCnmInitSyncReq *param, Buffer *mBuf ) -#else -S16 cmPkCtfcfgReqInfo(param, mBuf) -CtfCnmInitSyncReq *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKPK(oduUnpackUInt8, param->searchType, mBuf); - CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf); - CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf); - CMCHKPK(oduUnpackUInt8, param->measBandWidth, mBuf); + CMCHKPK(oduPackUInt8, param->searchType, mBuf); + CMCHKPK(oduPackUInt8, param->mibRequest, mBuf); + CMCHKPK(oduPackUInt16, param->earfcn, mBuf); + CMCHKPK(oduPackUInt8, param->measBandWidth, mBuf); if(param->numOfPciList <= CTF_CNM_MAX_CELL_SEARCH) { for(i= param->numOfPciList-1; i >= 0; i--) @@ -815,81 +713,62 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf); } } - CMCHKPK(oduUnpackUInt16, param->numOfPciList, mBuf); + CMCHKPK(oduPackUInt16, param->numOfPciList, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkCtfCnmVendorSpecificInfo ( CtfCnmVendorSpecificInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmVendorSpecificInfo(param, mBuf) -CtfCnmVendorSpecificInfo *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKUNPK(oduPackUInt16, ¶m->numOfVendorSpecifcParam, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->numOfVendorSpecifcParam, mBuf); for(i=0; (inumOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++) { - CMCHKUNPK(oduPackUInt32, ¶m->vendorSpecifcParam[i], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->vendorSpecifcParam[i], mBuf); } return ROK; } -#ifdef ANSI S16 cmUnpkCtfCtfCnmCellSyncReq ( CtfCnmCellSyncReq *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCtfCnmCellSyncReq(param, mBuf) -CtfCnmCellSyncReq *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - 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); + CMCHKUNPK(oduUnpackUInt8, ¶m->nbrSpecSfCfg, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->nbrCellNRb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->nbrCellCp, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->nbrTxAntCount, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->nbrPCellId, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->nbrEarfcn, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkCtfsyncReqInfo ( CtfCnmInitSyncReq *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfsyncReqInfo(param, mBuf) -CtfCnmInitSyncReq *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKUNPK(oduPackUInt16, ¶m->numOfPciList, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->numOfPciList, mBuf); for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) { CMCHKUNPK(cmUnpkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->measBandWidth, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->mibRequest, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->searchType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->measBandWidth, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->earfcn, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->mibRequest, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->searchType, mBuf); return ROK; } /** @@ -907,7 +786,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmCellSyncReq ( Pst* pst, @@ -915,18 +793,10 @@ SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncReq * cfgReqInfo ) -#else -S16 cmPkCtfCnmCellSyncReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmCellSyncReq * cfgReqInfo; -#endif { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -934,7 +804,7 @@ CtfCnmCellSyncReq * cfgReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { @@ -945,7 +815,7 @@ CtfCnmCellSyncReq * cfgReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); return RFAILED; } @@ -959,7 +829,7 @@ CtfCnmCellSyncReq * cfgReqInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF018, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); return RFAILED; } @@ -972,7 +842,7 @@ CtfCnmCellSyncReq * cfgReqInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF019, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); return RFAILED; } @@ -983,12 +853,12 @@ CtfCnmCellSyncReq * cfgReqInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF020, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); } pst->event = (Event)EVTCTFCNMSYNCREQ; return (SPstTsk(pst,mBuf)); @@ -1008,19 +878,12 @@ CtfCnmCellSyncReq * cfgReqInfo; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmCellSyncReq ( CtfCnmCellSyncReqMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmCellSyncReq(func, pst, mBuf) -CtfCnmCellSyncReqMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1048,7 +911,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&SyncReqMsg, sizeof(CtfCnmCellSyncReq))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&SyncReqMsg, sizeof(CtfCnmCellSyncReq))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1067,7 +930,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfCtfCnmCellSyncReq(SyncReqMsg, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)SyncReqMsg, sizeof(CtfCnmCellSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)SyncReqMsg, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1099,7 +962,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmInitSyncReq ( Pst* pst, @@ -1107,13 +969,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmInitSyncReq * cfgReqInfo ) -#else -S16 cmPkCtfCnmInitSyncReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmInitSyncReq * cfgReqInfo; -#endif { Buffer *mBuf = NULLP; @@ -1125,7 +980,7 @@ CtfCnmInitSyncReq * cfgReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { @@ -1136,7 +991,7 @@ CtfCnmInitSyncReq * cfgReqInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); return RFAILED; } @@ -1150,7 +1005,7 @@ CtfCnmInitSyncReq * cfgReqInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF018, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); return RFAILED; } @@ -1163,7 +1018,7 @@ CtfCnmInitSyncReq * cfgReqInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF019, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); return RFAILED; } @@ -1174,12 +1029,12 @@ CtfCnmInitSyncReq * cfgReqInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF020, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); } pst->event = (Event)EVTCTFCNMINITSYNCREQ; return (SPstTsk(pst,mBuf)); @@ -1201,19 +1056,12 @@ CtfCnmInitSyncReq * cfgReqInfo; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmInitSyncReq ( CtfCnmInitSyncReqMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmInitSyncReq(func, pst, mBuf) -CtfCnmInitSyncReqMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1241,7 +1089,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncReqInfo, sizeof(CtfCnmInitSyncReq))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncReqInfo, sizeof(CtfCnmInitSyncReq))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1260,7 +1108,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfsyncReqInfo(syncReqInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)syncReqInfo, sizeof(CtfCnmInitSyncReq)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1275,68 +1123,49 @@ Buffer *mBuf; } /*-----------------------------------------------------------------------------*/ -#ifdef ANSI S16 cmPkCtfctfCnmMibInfo ( CtfCnmMibInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfctfCnmMibInfo(param, mBuf) -CtfCnmMibInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); - CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf); - CMCHKPK(oduUnpackUInt8, param->phichDuration, mBuf); - CMCHKPK(oduUnpackUInt8, param->phichResource, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlSystemBandWidht, mBuf); + CMCHKPK(oduPackUInt16, param->sfn, mBuf); + CMCHKPK(oduPackUInt8, param->numTxAntennas, mBuf); + CMCHKPK(oduPackUInt8, param->phichDuration, mBuf); + CMCHKPK(oduPackUInt8, param->phichResource, mBuf); + CMCHKPK(oduPackUInt8, param->dlSystemBandWidht, mBuf); return ROK; } -#ifdef ANSI S16 cmPkCtfctfCnmInitSyncInfo ( CtfCnmInitSyncInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfctfCnmInitSyncInfo(param, mBuf) -CtfCnmInitSyncInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->pci, mBuf); - CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); - CMCHKPK(oduUnpackUInt8, param->mibValidFlag, mBuf); - CMCHKPK(oduUnpackUInt16, param->localSfn, mBuf); + CMCHKPK(oduPackUInt16, param->pci, mBuf); + CMCHKPK(oduPackUInt8, param->rsrp, mBuf); + CMCHKPK(oduPackUInt8, param->mibValidFlag, mBuf); + CMCHKPK(oduPackUInt16, param->localSfn, mBuf); CMCHKPK(cmPkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); return ROK; } -#ifdef ANSI S16 cmPkCtfcfgRspInfo ( CtfCnmInitSyncRsp *param, Buffer *mBuf ) -#else -S16 cmPkCtfcfgRspInfo(param, mBuf) -CtfCnmInitSyncRsp *param; -Buffer *mBuf; -#endif { S32 i; - - CMCHKPK(oduUnpackUInt8, param->status, mBuf); - CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf); + CMCHKPK(oduPackUInt8, param->status, mBuf); + CMCHKPK(oduPackUInt16, param->earfcn, mBuf); if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH) { for(i= param->numOfNeighbourInfo-1; i >= 0; i--) @@ -1344,7 +1173,7 @@ Buffer *mBuf; CMCHKPK(cmPkCtfctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf); } } - CMCHKPK(oduUnpackUInt8, param->numOfNeighbourInfo, mBuf); + CMCHKPK(oduPackUInt8, param->numOfNeighbourInfo, mBuf); return ROK; } @@ -1364,7 +1193,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmInitSyncRsp ( Pst* pst, @@ -1372,13 +1200,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmInitSyncRsp * cfgRspInfo ) -#else -S16 cmPkCtfCnmInitSyncRsp(pst, spId, transId, cfgRspInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmInitSyncRsp * cfgRspInfo; -#endif { Buffer *mBuf = NULLP; @@ -1389,7 +1210,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { @@ -1400,7 +1221,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); return RFAILED; } @@ -1414,7 +1235,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF018, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); return RFAILED; } @@ -1427,7 +1248,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF019, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); return RFAILED; } @@ -1438,12 +1259,12 @@ CtfCnmInitSyncRsp * cfgRspInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF020, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); } pst->event = (Event)EVTCTFCNMINITSYNCRSP; return (SPstTsk(pst,mBuf)); @@ -1451,74 +1272,54 @@ CtfCnmInitSyncRsp * cfgRspInfo; } /*-----------------------------------------------------------------------------*/ -#ifdef ANSI S16 cmUnpkCtfctfCnmMibInfo ( CtfCnmMibInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfctfCnmMibInfo(param, mBuf) -CtfCnmMibInfo *param; -Buffer *mBuf; -#endif { - - 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); + CMCHKUNPK(oduUnpackUInt8, ¶m->dlSystemBandWidht, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->phichResource, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->phichDuration, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numTxAntennas, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->sfn, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkctfCnmInitSyncInfo ( CtfCnmInitSyncInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkctfCnmInitSyncInfo(param, mBuf) -CtfCnmInitSyncInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->localSfn, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->mibValidFlag, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->localSfn, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->mibValidFlag, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->rsrp, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pci, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkCtfCnmInitSyncRspMsg ( CtfCnmInitSyncRsp *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmInitSyncRspMsg(param, mBuf) -CtfCnmInitSyncRsp *param; -Buffer *mBuf; -#endif { S32 i; - - CMCHKUNPK(oduPackUInt8, ¶m->numOfNeighbourInfo, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numOfNeighbourInfo, mBuf); for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) { CMCHKUNPK(cmUnpkctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf); } - CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->earfcn, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->status, mBuf); return ROK; } @@ -1536,19 +1337,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmInitSyncRsp ( CtfCnmInitSyncRspMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmInitSyncRsp(func, pst, mBuf) -CtfCnmInitSyncRspMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1576,7 +1370,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspInfo, sizeof(CtfCnmInitSyncRsp))) != ROK) { + if((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncRspInfo, sizeof(CtfCnmInitSyncRsp))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1595,7 +1389,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if(cmUnpkCtfCnmInitSyncRspMsg(syncRspInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)syncRspInfo, sizeof(CtfCnmInitSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1611,21 +1405,14 @@ Buffer *mBuf; } /*-----------------------------------------------------------------------*/ -#ifdef ANSI S16 cmPkCtfCellSyncRsp ( CtfCnmCellSyncRsp *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellSyncRsp(param, mBuf) -CtfCnmCellSyncRsp *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt8, param->status, mBuf); + CMCHKPK(oduPackUInt8, param->status, mBuf); return ROK; } @@ -1644,7 +1431,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmCellSyncRsp ( Pst* pst, @@ -1652,13 +1438,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncRsp * cfgRspInfo ) -#else -S16 cmPkCtfCnmCellSyncRsp(pst, spId, transId, cfgRspInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmCellSyncRsp * cfgRspInfo; -#endif { Buffer *mBuf = NULLP; @@ -1670,7 +1449,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { @@ -1681,7 +1460,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); return RFAILED; } @@ -1695,7 +1474,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF018, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); return RFAILED; } @@ -1708,7 +1487,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF019, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); return RFAILED; } @@ -1719,12 +1498,12 @@ CtfCnmCellSyncRsp * cfgRspInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF020, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); } pst->event = (Event)EVTCTFCNMSYNCRSP; return (SPstTsk(pst,mBuf)); @@ -1733,21 +1512,14 @@ CtfCnmCellSyncRsp * cfgRspInfo; } /*------------------------------------------------------------*/ -#ifdef ANSI S16 cmUnpkCtfCnmSyncRspMsg ( CtfCnmCellSyncRsp *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmSyncRspMsg(param, mBuf) -CtfCnmCellSyncRsp *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->status, mBuf); return ROK; } @@ -1765,19 +1537,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmCellSyncRsp ( CtfCnmCellSyncRspMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmCellSyncRsp(func, pst, mBuf) -CtfCnmCellSyncRspMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1805,7 +1570,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspMsg, sizeof(CtfCnmCellSyncRsp))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncRspMsg, sizeof(CtfCnmCellSyncRsp))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1824,7 +1589,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfCnmSyncRspMsg(syncRspMsg, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)syncRspMsg, sizeof(CtfCnmCellSyncRsp)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncRspMsg, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1840,21 +1605,14 @@ Buffer *mBuf; } /*---------------------------------------------------------------*/ -#ifdef ANSI S16 cmPkCtfcfgIndInfo ( CtfCnmCellSyncInd *param, Buffer *mBuf ) -#else -S16 cmPkCtfcfgIndInfo(param, mBuf) -CtfCnmCellSyncInd *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt8, param->status, mBuf); + CMCHKPK(oduPackUInt8, param->status, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); return ROK; @@ -1874,7 +1632,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmCellSyncInd ( Pst* pst, @@ -1882,13 +1639,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncInd * cfgIndInfo ) -#else -S16 cmPkCtfCnmCellSyncInd(pst, spId, transId, cfgIndInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmCellSyncInd * cfgIndInfo; -#endif { Buffer *mBuf = NULLP; @@ -1900,7 +1650,7 @@ CtfCnmCellSyncInd * cfgIndInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { @@ -1911,7 +1661,7 @@ CtfCnmCellSyncInd * cfgIndInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); return RFAILED; } @@ -1925,7 +1675,7 @@ CtfCnmCellSyncInd * cfgIndInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF018, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); return RFAILED; } @@ -1938,7 +1688,7 @@ CtfCnmCellSyncInd * cfgIndInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF019, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); return RFAILED; } @@ -1949,12 +1699,12 @@ CtfCnmCellSyncInd * cfgIndInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF020, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); } pst->event = (Event)EVTCTFCNMSYNCIND; return (SPstTsk(pst,mBuf)); @@ -1963,22 +1713,15 @@ CtfCnmCellSyncInd * cfgIndInfo; /*---------------------------------------------------------------*/ -#ifdef ANSI S16 cmUnpkCtfCnmSyncIndMsg ( CtfCnmCellSyncInd *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmSyncIndMsg(param, mBuf) -CtfCnmCellSyncInd *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->status, mBuf); return ROK; } @@ -1996,19 +1739,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmCellSyncInd ( CtfCnmCellSyncIndMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmCellSyncInd(func, pst, mBuf) -CtfCnmCellSyncIndMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -2036,7 +1772,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncIndMsg, sizeof(CtfCnmCellSyncInd))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&syncIndMsg, sizeof(CtfCnmCellSyncInd))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2055,7 +1791,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfCnmSyncIndMsg(syncIndMsg, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)syncIndMsg, sizeof(CtfCnmCellSyncInd)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)syncIndMsg, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -2092,7 +1828,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCfgReq ( Pst* pst, @@ -2100,13 +1835,6 @@ SpId spId, CtfCfgTransId transId, CtfCfgReqInfo* cfgReqInfo ) -#else -S16 cmPkCtfCfgReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId transId; -CtfCfgReqInfo* cfgReqInfo; -#endif { Buffer *mBuf = NULLP; @@ -2194,27 +1922,20 @@ CtfCfgReqInfo* cfgReqInfo; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfNhKeyInfo ( CtfNhKeyInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfNhKeyInfo(param, mBuf) -CtfNhKeyInfo *param; -Buffer *mBuf; -#endif { - U8 idx; - - - CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); + uint8_t idx; + + CMCHKUNPK(oduUnpackUInt16, ¶m->dlCarrFreq, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->secKey[idx],mBuf); } return ROK; } @@ -2237,27 +1958,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKenbStarInfo ( CtfKenbStarInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfKenbStarInfo(param, mBuf) -CtfKenbStarInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - - CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dlCarrFreq, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->secKey[idx],mBuf); } return ROK; } @@ -2281,27 +1995,19 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfAskeyInfo ( CtfAsKeyInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfAskeyInfo(param, mBuf) -CtfAskeyInfo *param; -Buffer *mBuf; -#endif { + uint8_t idx; - U8 idx; - - - CMCHKUNPK(oduPackUInt8, ¶m->intgAlgoType, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ciphAlgoType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->intgAlgoType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ciphAlgoType, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->secKey[idx],mBuf); } return ROK; } @@ -2324,21 +2030,14 @@ Buffer *mBuf; * File: * * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKdfReqInfo ( CtfKdfReqInfo *param, Buffer *mBuf - ) -#else -S16 cmUnpkCtfKdfReqInfo(param, mBuf) -CtfKdfReqInfo *param; -Buffer *mBuf; -#endif +) { - - CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) { case CTF_KDF_TYPE1: @@ -2371,19 +2070,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfKdfReq ( CtfKdfReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfKdfReq(func, pst, mBuf) -CtfKdfReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; CtfCfgTransId transId; @@ -2413,7 +2105,7 @@ Buffer *mBuf; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&kdfReqInfo, sizeof(CtfKdfReqInfo))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&kdfReqInfo, sizeof(CtfKdfReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2434,7 +2126,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -2466,19 +2158,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCfgReq ( CtfCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgReq(func, pst, mBuf) -CtfCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; CtfCfgTransId transId; @@ -2506,7 +2191,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CtfCfgReqInfo))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CtfCfgReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2558,25 +2243,18 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfNhKeyCfmInfo ( CtfNhKeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfNhKeyCfmInfo(param, mBuf) -CtfNhKeyCfmInfo *param; -Buffer *mBuf; -#endif { S16 idx; - for(idx=31;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf); } return ROK; } @@ -2599,17 +2277,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKenbStarCfmInfo ( CtfKenbStarCfmInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfKenbStarCfmInfo(param, mBuf) -CtfKenbStarCfmInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -2617,7 +2289,7 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf); } return ROK; } @@ -2641,33 +2313,26 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfAskeyCfmInfo ( CtfAskeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfAskeyCfmInfo(param, mBuf) -CtfAskeyCfmInfo *param; -Buffer *mBuf; -#endif { S16 idx; - for(idx=15;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->cpCiphKey[idx],mBuf); } for(idx=15;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->upCiphKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->upCiphKey[idx],mBuf); } for(idx=15;idx>=0;idx--) { - CMCHKPK(oduUnpackUInt8,param->intKey[idx],mBuf); + CMCHKPK(oduPackUInt8,param->intKey[idx],mBuf); } return ROK; } @@ -2690,22 +2355,15 @@ Buffer *mBuf; * File: * * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKdfCfmInfo ( CtfKdfCfmInfo *param, Buffer *mBuf - ) -#else -S16 cmPkCtfKdfCfmInfo(param, mBuf) -CtfKdfCfmInfo *param; -Buffer *mBuf; -#endif +) { - switch (param->keyDerType) - { + { case CTF_KDF_TYPE1: CMCHKPK(cmPkCtfAskeyCfmInfo, ¶m->u.kEnbInf, mBuf); break; @@ -2718,7 +2376,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf); + CMCHKPK(oduPackUInt8, param->keyDerType, mBuf); return ROK; } @@ -2732,26 +2390,18 @@ Buffer *mBuf; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CtfCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfKdfCfm ( Pst* pst, SuId suId, CtfCfgTransId transId, CtfKdfCfmInfo *kdfCfmInfo, -U8 status +uint8_t status ) -#else -S16 cmPkCtfKdfCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -U8 status; -#endif { Buffer *mBuf = NULLP; @@ -2762,18 +2412,18 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); return RFAILED; } - if (oduUnpackUInt8(status, mBuf) != ROK) { + if (oduPackUInt8(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, (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF027, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); return RFAILED; } @@ -2785,7 +2435,7 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); return RFAILED; } @@ -2797,7 +2447,7 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); return RFAILED; } @@ -2809,12 +2459,12 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); return RFAILED; } - if (SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)) != ROK) + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -2841,25 +2491,17 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CtfCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCfgCfm ( Pst* pst, SuId suId, CtfCfgTransId transId, -U8 status +uint8_t status ) -#else -S16 cmPkCtfCfgCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -U8 status; -#endif { Buffer *mBuf = NULLP; @@ -2872,7 +2514,7 @@ U8 status; #endif return RFAILED; } - if (oduUnpackUInt8(status, mBuf) != ROK) { + if (oduPackUInt8(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, @@ -2919,19 +2561,12 @@ U8 status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfEnbStopInd ( Pst* pst, SuId suId, CtfCfgTransId transId ) -#else -S16 cmPkCtfEnbStopInd(pst, suId, transId) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -#endif { Buffer *mBuf = NULLP; @@ -2987,25 +2622,18 @@ CtfCfgTransId transId; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfNhKeyCfmInfo ( CtfNhKeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfNhKeyCfmInfo(param, mBuf) -CtfNhKeyCfmInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - for(idx=0;idx<32;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->secKey[idx],mBuf); } return ROK; } @@ -3028,25 +2656,18 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKenbStarCfmInfo ( CtfKenbStarCfmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfKenbStarCfmInfo(param, mBuf) -CtfKenbStarCfmInfo *param; -Buffer *mBuf; -#endif { - U8 idx; - + uint8_t idx; for(idx=0;idx<32;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->secKey[idx],mBuf); } return ROK; } @@ -3070,33 +2691,27 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfAskeyCfmInfo ( CtfAskeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfAskeyCfmInfo(param, mBuf) -CtfAskeyCfmInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; for(idx=0;idx<16;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->intKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->intKey[idx],mBuf); } for(idx=0;idx<16;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->upCiphKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->upCiphKey[idx],mBuf); } for(idx=0;idx<16;idx++) { - CMCHKUNPK(oduPackUInt8,¶m->cpCiphKey[idx],mBuf); + CMCHKUNPK(oduUnpackUInt8,¶m->cpCiphKey[idx],mBuf); } return ROK; } @@ -3119,21 +2734,15 @@ Buffer *mBuf; * File: * * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKdfCfmInfo ( CtfKdfCfmInfo *param, Buffer *mBuf - ) -#else -S16 cmUnpkCtfKdfCfmInfo(param, mBuf) -CtfKdfCfmInfo *param; -Buffer *mBuf; -#endif +) { - CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) { case CTF_KDF_TYPE1: @@ -3161,27 +2770,20 @@ Buffer *mBuf; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CtfCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfKdfCfm ( CtfKdfCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgCfm(func, pst, mBuf) -CtfKdfCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; - U8 status; + uint8_t status; CtfKdfCfmInfo kdfCfmInfo; @@ -3216,7 +2818,7 @@ Buffer *mBuf; return RFAILED; } - if (oduPackUInt8(&status, mBuf) != ROK) { + if (oduUnpackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3242,27 +2844,20 @@ Buffer *mBuf; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CtfCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCfgCfm ( CtfCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgCfm(func, pst, mBuf) -CtfCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; - U8 status; + uint8_t status; if (SUnpkS16(&suId, mBuf) != ROK) { @@ -3285,7 +2880,7 @@ Buffer *mBuf; #endif return RFAILED; } - if (oduPackUInt8(&status, mBuf) != ROK) { + if (oduUnpackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3312,23 +2907,15 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfEnbStopInd ( CtfEnbStopInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfEnbStopInd(func, pst, mBuf) -CtfEnbStopInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; - if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3370,7 +2957,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfUeIdChgReq ( Pst* pst, @@ -3379,14 +2965,6 @@ CtfCfgTransId transId, CtfUeInfo * ueInfo, CtfUeInfo * newUeInfo ) -#else -S16 cmPkCtfUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo) -Pst* pst; -SpId spId; -CtfCfgTransId transId; -CtfUeInfo * ueInfo; -CtfUeInfo * newUeInfo; -#endif { Buffer *mBuf = NULLP; @@ -3397,8 +2975,8 @@ CtfUeInfo * newUeInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF033, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { @@ -3409,8 +2987,8 @@ CtfUeInfo * newUeInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF034, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3423,8 +3001,8 @@ CtfUeInfo * newUeInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF035, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3437,8 +3015,8 @@ CtfUeInfo * newUeInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF036, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3451,8 +3029,8 @@ CtfUeInfo * newUeInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF037, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3464,8 +3042,8 @@ CtfUeInfo * newUeInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF038, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3476,13 +3054,13 @@ CtfUeInfo * newUeInfo; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF039, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) { + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3492,7 +3070,7 @@ CtfUeInfo * newUeInfo; SPutMsg(mBuf); return RFAILED; } - if (SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)) != ROK) { + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3523,19 +3101,12 @@ CtfUeInfo * newUeInfo; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfUeIdChgReq ( CtfUeIdChgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeIdChgReq(func, pst, mBuf) -CtfUeIdChgReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; CtfCfgTransId transId; @@ -3564,7 +3135,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3583,7 +3154,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3594,7 +3165,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&newUeInfo, sizeof(CtfUeInfo))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&newUeInfo, sizeof(CtfUeInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3602,7 +3173,7 @@ Buffer *mBuf; (ErrVal)ECTF046, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); return RFAILED; } } @@ -3614,8 +3185,8 @@ Buffer *mBuf; } 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)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3641,11 +3212,10 @@ Buffer *mBuf; * @param[in] SuId suId * @param[in] CtfCfgTransId transId * @param[in] CtfUeInfo * ueInfo -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfUeIdChgCfm ( Pst* pst, @@ -3654,14 +3224,6 @@ CtfCfgTransId transId, CtfUeInfo * ueInfo, CmStatus status ) -#else -S16 cmPkCtfUeIdChgCfm(pst, suId, transId, ueInfo, status) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -CtfUeInfo * ueInfo; -CmStatus status; -#endif { Buffer *mBuf = NULLP; @@ -3672,7 +3234,7 @@ CmStatus status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF048, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); return RFAILED; } if (cmPkCmStatus(&status, mBuf) != ROK) { @@ -3682,7 +3244,7 @@ CmStatus status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF049, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3694,7 +3256,7 @@ CmStatus status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF050, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3707,7 +3269,7 @@ CmStatus status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF051, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3719,7 +3281,7 @@ CmStatus status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF052, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } @@ -3730,12 +3292,12 @@ CmStatus status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF053, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) { + if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3762,23 +3324,16 @@ CmStatus status; * @param[in] SuId suId * @param[in] CtfCfgTransId transId * @param[in] CtfUeInfo * ueInfo -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfUeIdChgCfm ( CtfUeIdChgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeIdChgCfm(func, pst, mBuf) -CtfUeIdChgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; @@ -3807,7 +3362,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3826,7 +3381,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3837,7 +3392,7 @@ Buffer *mBuf; return RFAILED; } if (cmUnpkCmStatus(&status, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3867,23 +3422,16 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCfgTransId ( CtfCfgTransId *param, Buffer *mBuf ) -#else -S16 cmPkCtfCfgTransId(param, mBuf) -CtfCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; - for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); + CMCHKPK(oduPackUInt8, param->trans[i], mBuf); } return ROK; } @@ -3905,23 +3453,17 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCfgTransId ( CtfCfgTransId *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgTransId(param, mBuf) -CtfCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; for (i=0; itrans[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->trans[i], mBuf); } return ROK; } @@ -3943,20 +3485,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfUeInfo ( CtfUeInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfUeInfo(param, mBuf) -CtfUeInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; @@ -3979,20 +3514,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfUeInfo ( CtfUeInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeInfo(param, mBuf) -CtfUeInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); return ROK; @@ -4017,23 +3545,17 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfBwCfgInfo ( CtfBwCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfBwCfgInfo(param, mBuf) -CtfBwCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf); - CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf); - CMCHKPK(oduUnpackUInt32, param->dlBw, mBuf); + CMCHKPK(oduPackUInt8, param->eUtraBand, mBuf); + CMCHKPK(oduPackUInt32, param->ulBw, mBuf); + CMCHKPK(oduPackUInt32, param->dlBw, mBuf); /* ctf_c_001.main_4: Removed packing of param->pres */ return ROK; } @@ -4057,27 +3579,21 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfBwCfgInfo ( CtfBwCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfBwCfgInfo(param, mBuf) -CtfBwCfgInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; /* ctf_c_001.main_4: Removed UnPacking of param->pres */ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->dlBw = (CtfBandwidth)tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ulBw = (CtfBandwidth)tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->eUtraBand, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->eUtraBand, mBuf); return ROK; } @@ -4099,23 +3615,16 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfTxSchemeCfg ( CtfTxSchemeCfg *param, Buffer *mBuf ) -#else -S16 cmPkCtfTxSchemeCfg(param, mBuf) -CtfTxSchemeCfg *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf); - CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf); - CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf); + CMCHKPK(oduPackUInt32, param->cycPfx, mBuf); + CMCHKPK(oduPackUInt32, param->scSpacing, mBuf); + CMCHKPK(oduPackUInt32, param->duplexMode, mBuf); /* ctf_c_001.main_4: Removed packing of param->pres */ return ROK; } @@ -4138,27 +3647,21 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfTxSchemeCfg ( CtfTxSchemeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfTxSchemeCfg(param, mBuf) -CtfTxSchemeCfg *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; /* ctf_c_001.main_4: Removed UnPacking of param->pres */ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->duplexMode = (CtfDuplexMode)tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->scSpacing = (CtfSCSpacing)tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->cycPfx = (CtfCPCfg)tmpEnum; return ROK; } @@ -4182,21 +3685,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfAntennaCfgInfo ( CtfAntennaCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfAntennaCfgInfo(param, mBuf) -CtfAntennaCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf); + CMCHKPK(oduPackUInt32, param->antPortsCnt, mBuf); return ROK; } @@ -4219,21 +3715,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfAntennaCfgInfo ( CtfAntennaCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfAntennaCfgInfo(param, mBuf) -CtfAntennaCfgInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum; return ROK; } @@ -4263,30 +3753,23 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPrachCfgInfo ( CtfPrachCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPrachCfgInfo(param, mBuf) -CtfPrachCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - 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(oduPackUInt8, param->prachFreqOffset, mBuf); + CMCHKPK(oduPackUInt8, param->highSpeedFlag, mBuf); + CMCHKPK(oduPackUInt8, param->zeroCorrelationZoneCfg, mBuf); + CMCHKPK(oduPackUInt8, param->prachCfgIndex, mBuf); + CMCHKPK(oduPackUInt16, param->rootSequenceIndex, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4315,29 +3798,22 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPrachCfgInfo ( CtfPrachCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPrachCfgInfo(param, mBuf) -CtfPrachCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - 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); + CMCHKUNPK(oduUnpackUInt16, ¶m->rootSequenceIndex, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->prachCfgIndex, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->zeroCorrelationZoneCfg, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->highSpeedFlag, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->prachFreqOffset, mBuf); } return ROK; } @@ -4361,26 +3837,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPdschCfgInfo ( CtfPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPdschCfgInfo(param, mBuf) -CtfPdschCfgInfo *param; -Buffer *mBuf; -#endif { /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(oduUnpackUInt8, param->p_b, mBuf); + CMCHKPK(oduPackUInt8, param->p_b, mBuf); CMCHKPK(SPkS16, param->refSigPwr, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4403,26 +3873,19 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPdschCfgInfo ( CtfPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPdschCfgInfo(param, mBuf) -CtfPdschCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { CMCHKUNPK(SUnpkS16, ¶m->refSigPwr, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->p_b, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->p_b, mBuf); } return ROK; } @@ -4446,24 +3909,17 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPuschCfgBasic ( CtfPuschCfgBasic *param, Buffer *mBuf ) -#else -S16 cmPkCtfPuschCfgBasic(param, mBuf) -CtfPuschCfgBasic *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf); - CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf); - CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf); - CMCHKPK(oduUnpackUInt8, param->noOfsubBands, mBuf); + CMCHKPK(oduPackUInt8, param->enable64QAM, mBuf); + CMCHKPK(oduPackUInt8, param->hoppingOffset, mBuf); + CMCHKPK(oduPackUInt32, param->hoppingMode, mBuf); + CMCHKPK(oduPackUInt8, param->noOfsubBands, mBuf); return ROK; } @@ -4486,26 +3942,19 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPuschCfgBasic ( CtfPuschCfgBasic *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPuschCfgBasic(param, mBuf) -CtfPuschCfgBasic *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - - CMCHKUNPK(oduPackUInt8, ¶m->noOfsubBands, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->noOfsubBands, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->hoppingMode = (CtfPuschHoppingMode)tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->hoppingOffset, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->enable64QAM, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->hoppingOffset, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->enable64QAM, mBuf); return ROK; } @@ -4528,24 +3977,17 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPuschUlRS ( CtfPuschUlRS *param, Buffer *mBuf ) -#else -S16 cmPkCtfPuschUlRS(param, mBuf) -CtfPuschUlRS *param; -Buffer *mBuf; -#endif { - - CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf); - CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf); - CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf); - CMCHKPK(oduUnpackUInt8, param->grpHopEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->cycShift, mBuf); + CMCHKPK(oduPackUInt8, param->grpNum, mBuf); + CMCHKPK(oduPackUInt8, param->seqHopEnabled, mBuf); + CMCHKPK(oduPackUInt8, param->grpHopEnabled, mBuf); return ROK; } @@ -4568,24 +4010,18 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPuschUlRS ( CtfPuschUlRS *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPuschUlRS(param, mBuf) -CtfPuschUlRS *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->grpHopEnabled, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->seqHopEnabled, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->grpNum, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cycShift, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->grpHopEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->seqHopEnabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->grpNum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cycShift, mBuf); return ROK; } @@ -4608,27 +4044,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPuschCfgInfo ( CtfPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPuschCfgInfo(param, mBuf) -CtfPuschCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { CMCHKPK(cmPkCtfPuschUlRS, ¶m->puschUlRS, mBuf); CMCHKPK(cmPkCtfPuschCfgBasic, ¶m->puschBasicCfg, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4651,21 +4080,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPuschCfgInfo ( CtfPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPuschCfgInfo(param, mBuf) -CtfPuschCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -4694,27 +4116,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPhichCfgInfo ( CtfPhichCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPhichCfgInfo(param, mBuf) -CtfPhichCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(oduUnpackUInt32, param->resource, mBuf); - CMCHKPK(oduUnpackUInt32, param->duration, mBuf); + CMCHKPK(oduPackUInt32, param->resource, mBuf); + CMCHKPK(oduPackUInt32, param->duration, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4737,28 +4152,21 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPhichCfgInfo ( CtfPhichCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPhichCfgInfo(param, mBuf) -CtfPhichCfgInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->duration = (CtfPhichDuration)tmpEnum; - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->resource = (CtfPhichResource)tmpEnum; } return ROK; @@ -4783,29 +4191,23 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPucchCfgInfo ( CtfPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPucchCfgInfo(param, mBuf) -CtfPucchCfgInfo *param; -Buffer *mBuf; -#endif { /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(oduUnpackUInt32, param->deltaShift, mBuf); - CMCHKPK(oduUnpackUInt16, param->n1PUCCH, mBuf); - CMCHKPK(oduUnpackUInt8, param->nCS, mBuf); - CMCHKPK(oduUnpackUInt8, param->nRB, mBuf); + CMCHKPK(oduPackUInt32, param->deltaShift, mBuf); + CMCHKPK(oduPackUInt16, param->n1PUCCH, mBuf); + CMCHKPK(oduPackUInt8, param->nCS, mBuf); + CMCHKPK(oduPackUInt8, param->nRB, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4828,29 +4230,22 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPucchCfgInfo ( CtfPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPucchCfgInfo(param, mBuf) -CtfPucchCfgInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; - + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(oduPackUInt8, ¶m->nRB, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->nCS, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->n1PUCCH, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->nRB, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->nCS, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->n1PUCCH, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->deltaShift = (CtfPucchDeltaShift)tmpEnum; } return ROK; @@ -4875,30 +4270,23 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfSrsUlCfgInfo ( CtfSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfSrsUlCfgInfo(param, mBuf) -CtfSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - 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(oduPackUInt8, param->srsSetup.srsMaxUpPts, mBuf); + CMCHKPK(oduPackUInt8, param->srsSetup.srsANSimultTx, mBuf); + CMCHKPK(oduPackUInt8, param->srsSetup.sfCfg, mBuf); + CMCHKPK(oduPackUInt8, param->srsSetup.srsBw, mBuf); + CMCHKPK(oduPackUInt8, param->srsCfgType, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -4921,29 +4309,22 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfSrsUlCfgInfo ( CtfSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfSrsUlCfgInfo(param, mBuf) -CtfSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - 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); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsCfgType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsSetup.srsBw, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsSetup.sfCfg, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsSetup.srsANSimultTx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsSetup.srsMaxUpPts, mBuf); } return ROK; } @@ -4967,27 +4348,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfTddSfCfgInfo ( CtfTddSfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfTddSfCfgInfo(param, mBuf) -CtfTddSfCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(oduUnpackUInt8, param->spclSfPatterns, mBuf); - CMCHKPK(oduUnpackUInt8, param->sfAssignment, mBuf); + CMCHKPK(oduPackUInt8, param->spclSfPatterns, mBuf); + CMCHKPK(oduPackUInt8, param->sfAssignment, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -5010,23 +4384,17 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfVendorSpecParams ( CtfVendorSpecific *param, Buffer *mBuf ) -#else -S16 cmPkCtfVendorSpecParams(param, mBuf) -CtfVendorSpecific *param; -Buffer *mBuf; -#endif { if( param->buffLen != 0) { SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf); } - CMCHKPK(oduUnpackUInt16,param->buffLen,mBuf); + CMCHKPK(oduPackUInt16,param->buffLen,mBuf); return ROK; } @@ -5048,26 +4416,18 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfVendorSpecParams ( Pst *pst, CtfVendorSpecific *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfVendorSpecParams(pst, param, mBuf) -Pst *pst; -CtfVendorSpecific *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt16, ¶m->buffLen, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->buffLen, mBuf); if(param->buffLen != 0) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)¶m->paramBuffer, param->buffLen)) != ROK) { + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)¶m->paramBuffer, param->buffLen)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, @@ -5102,26 +4462,19 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfTddSfCfgInfo ( CtfTddSfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfTddSfCfgInfo(param, mBuf) -CtfTddSfCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(oduPackUInt8, ¶m->sfAssignment, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->spclSfPatterns, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sfAssignment, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->spclSfPatterns, mBuf); } return ROK; } @@ -5140,38 +4493,32 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmPkCtfUnLicnsdCellParam +static S16 cmPkCtfUnLicnsdCellParam ( CtfUnLicnsdCfgInfo *param, Buffer *mBuf ) -#else -PRIVATE S16 cmPkCtfUnLicnsdCellParam(param, mBuf) -CtfUnLicnsdCfgInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; CMCHKPK(SPkS32, param->txPowerLimit, mBuf); - 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(oduPackUInt8, param->coExistMethod, mBuf); + CMCHKPK(oduPackUInt8, param->lteOnPeriod, mBuf); + CMCHKPK(oduPackUInt8, param->ccaMethod, mBuf); + CMCHKPK(oduPackUInt8, param->adaptiveTx, mBuf); + CMCHKPK(oduPackUInt16, param->transPeriod, mBuf); + CMCHKPK(oduPackUInt16, param->listenPrd, mBuf); CMCHKPK(SPkS16, param->energyTh, mBuf); - CMCHKPK(oduUnpackUInt16, param->scanTimePrd, mBuf); - CMCHKPK(oduUnpackUInt16, param->activityTh, mBuf); + CMCHKPK(oduPackUInt16, param->scanTimePrd, mBuf); + CMCHKPK(oduPackUInt16, param->activityTh, mBuf); for(idx = 0; idx < param->numFreq; idx++) { - CMCHKPK(oduUnpackUInt32, param->earfcn[idx], mBuf); + CMCHKPK(oduPackUInt32, param->earfcn[idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numFreq, mBuf); + CMCHKPK(oduPackUInt8, param->numFreq, mBuf); return ROK; } @@ -5193,17 +4540,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellCfgInfo ( CtfCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellCfgInfo(param, mBuf) -CtfCellCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE S32 i; @@ -5211,76 +4552,76 @@ Buffer *mBuf; #ifdef EMTC_ENABLE for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].lastPreamble, mBuf); - CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].firstPreamble, mBuf); + CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); + CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].lastPreamble, mBuf); + CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].firstPreamble, mBuf); } - CMCHKPK(oduUnpackUInt8, param->mPdcchStart, mBuf); - CMCHKPK(oduUnpackUInt8, param->catMenabled, mBuf); + CMCHKPK(oduPackUInt8, param->mPdcchStart, mBuf); + CMCHKPK(oduPackUInt8, param->catMenabled, mBuf); #endif if(param->unLicnsdCfgPres) { - printf("pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres); + DU_LOG("\nDEBUG --> pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres); CMCHKPK(cmPkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf); } - CMCHKPK(oduUnpackUInt8, param->unLicnsdCfgPres, mBuf); + CMCHKPK(oduPackUInt8, param->unLicnsdCfgPres, mBuf); /*Added for rgu dynamic delta*/ - CMCHKPK(oduUnpackUInt8, param->numDlUePerTti, mBuf); + CMCHKPK(oduPackUInt8, param->numDlUePerTti, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); - CMCHKPK(oduUnpackUInt16, param->ulEarfcn, mBuf); - CMCHKPK(oduUnpackUInt16, param->dlEarfcn, mBuf); + CMCHKPK(oduPackUInt16, param->ulEarfcn, mBuf); + CMCHKPK(oduPackUInt16, param->dlEarfcn, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); /* Packing PHY configuration parameters */ - CMCHKPK(oduUnpackUInt32, param->period, mBuf); - CMCHKPK(oduUnpackUInt32, param->counter, mBuf); - CMCHKPK(oduUnpackUInt16, param->opMode, mBuf); + CMCHKPK(oduPackUInt32, param->period, mBuf); + CMCHKPK(oduPackUInt32, param->counter, mBuf); + CMCHKPK(oduPackUInt16, param->opMode, mBuf); /* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/ - CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf); - CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf); + CMCHKPK(oduPackUInt8, param->rachSrRepModePres, mBuf); + CMCHKPK(oduPackUInt16, param->rachSrRepMode, mBuf); - CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf); - CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf); + CMCHKPK(oduPackUInt8, param->dataRepModePres, mBuf); + CMCHKPK(oduPackUInt16, param->dataRepMode, mBuf); - CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf); - CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf); + CMCHKPK(oduPackUInt8, param->phySyncModePres, mBuf); + CMCHKPK(oduPackUInt16, param->phySyncMode, mBuf); - CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf); + CMCHKPK(oduPackUInt8, param->rxAntennaPortsPres, mBuf); + CMCHKPK(oduPackUInt16, param->rxAntennaPorts, mBuf); - CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf); + CMCHKPK(oduPackUInt8, param->txAntennaPortsPres, mBuf); + CMCHKPK(oduPackUInt16, param->txAntennaPorts, mBuf); - CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf); + CMCHKPK(oduPackUInt8, param->pucchProbDtxAckPres, mBuf); + CMCHKPK(oduPackUInt16, param->pucchProbDtxAck, mBuf); - CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf); + CMCHKPK(oduPackUInt8, param->puschProbDtxAckPres, mBuf); + CMCHKPK(oduPackUInt16, param->puschProbDtxAck, mBuf); - CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf); + CMCHKPK(oduPackUInt8, param->srsDopEstFactorPres, mBuf); + CMCHKPK(oduPackUInt16, param->srsDopEstFactor, mBuf); - CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf); - CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf); + CMCHKPK(oduPackUInt8, param->prachPkRatio0Pres, mBuf); + CMCHKPK(oduPackUInt16, param->prachPkRatio0, mBuf); - CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf); - CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf); + CMCHKPK(oduPackUInt8, param->prachPkRatio4Pres, mBuf); + CMCHKPK(oduPackUInt16, param->prachPkRatio4, mBuf); - CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf); + CMCHKPK(oduPackUInt8, param->pucchNoiseGammaPres, mBuf); + CMCHKPK(oduPackUInt16, param->pucchNoiseGamma, mBuf); - CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf); + CMCHKPK(oduPackUInt8, param->extWinMarginPres, mBuf); + CMCHKPK(oduPackUInt16, param->extWinMargin, mBuf); - CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf); + CMCHKPK(oduPackUInt8, param->dciPowOsPres, mBuf); + CMCHKPK(oduPackUInt16, param->dciPowOs, mBuf); - CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf); + CMCHKPK(oduPackUInt8, param->cfiPowOsPres, mBuf); + CMCHKPK(oduPackUInt16, param->cfiPowOs, mBuf); - CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf); + CMCHKPK(oduPackUInt8, param->syncSigPowOsPres, mBuf); + CMCHKPK(oduPackUInt16, param->syncSigPowOs, mBuf); CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); @@ -5292,13 +4633,13 @@ Buffer *mBuf; CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf); + CMCHKPK(oduPackUInt8, param->physCellId, mBuf); + CMCHKPK(oduPackUInt8, param->physCellIdPres, mBuf); CMCHKPK(SPkS16, param->macSapId, mBuf); CMCHKPK(SPkS16, param->schSapId, mBuf); - CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf); + CMCHKPK(oduPackUInt8, param->cellIdGrpId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } @@ -5317,37 +4658,30 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI -PRIVATE S16 cmUnpkCtfUnLicnsdCellParam +static S16 cmUnpkCtfUnLicnsdCellParam ( CtfUnLicnsdCfgInfo *param, Buffer *mBuf ) -#else -PRIVATE S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf) -CtfUnLicnsdCfgInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - - CMCHKUNPK(oduPackUInt8, ¶m->numFreq, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numFreq, mBuf); for(idx = 0; idx < param->numFreq; idx++) { - CMCHKUNPK(oduPackUInt32, ¶m->earfcn[idx], mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->earfcn[idx], mBuf); } - CMCHKUNPK(oduPackUInt16, ¶m->activityTh, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->scanTimePrd, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->activityTh, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->scanTimePrd, mBuf); CMCHKUNPK(SUnpkS16, ¶m->energyTh, 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(oduUnpackUInt16, ¶m->listenPrd, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->transPeriod, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->adaptiveTx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ccaMethod, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->lteOnPeriod, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->coExistMethod, mBuf); CMCHKUNPK(SUnpkS32, ¶m->txPowerLimit, mBuf); return ROK; @@ -5371,17 +4705,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellCfgInfo ( CtfCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellCfgInfo(param, mBuf) -CtfCellCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE S32 i; @@ -5389,13 +4717,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(oduPackUInt8, ¶m->cellIdGrpId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cellIdGrpId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->schSapId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->macSapId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->physCellIdPres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->physCellId, mBuf); CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf); CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); @@ -5407,77 +4735,77 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->syncSigPowOs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->syncSigPowOsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cfiPowOs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfiPowOsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dciPowOs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dciPowOsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->extWinMargin, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->extWinMarginPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pucchNoiseGamma, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pucchNoiseGammaPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->prachPkRatio4, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->prachPkRatio4Pres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->prachPkRatio0, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->prachPkRatio0Pres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->srsDopEstFactor, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsDopEstFactorPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->puschProbDtxAck, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->puschProbDtxAckPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pucchProbDtxAck, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pucchProbDtxAckPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->txAntennaPorts, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->txAntennaPortsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->rxAntennaPorts, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->rxAntennaPortsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->phySyncMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->phySyncModePres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dataRepMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dataRepModePres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->rachSrRepMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->rachSrRepModePres, mBuf); /* UnPacking PHY configuration parameters */ - CMCHKUNPK(oduPackUInt16, ¶m->opMode, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->counter, mBuf); - CMCHKUNPK(oduPackUInt32, ¶m->period, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->opMode, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->counter, mBuf); + CMCHKUNPK(oduUnpackUInt32, ¶m->period, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->dlEarfcn, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->ulEarfcn, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dlEarfcn, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->ulEarfcn, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); /* Added for rgu dynamic delta change*/ - CMCHKUNPK(oduPackUInt8, ¶m->numDlUePerTti, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->unLicnsdCfgPres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numDlUePerTti, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->unLicnsdCfgPres, mBuf); if(param->unLicnsdCfgPres) { - printf("pverma param->unLicnsdCfgPres 2 -->%d \n",param->unLicnsdCfgPres); + DU_LOG("\nDEBUG --> pverma param->unLicnsdCfgPres 2 -->%d \n",param->unLicnsdCfgPres); CMCHKUNPK(cmUnpkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf); } #ifdef EMTC_ENABLE - CMCHKUNPK(oduPackUInt8, ¶m->catMenabled, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->mPdcchStart, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->catMenabled, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->mPdcchStart, mBuf); for (i = 0; i < CTF_MAX_CE_LEVEL; i++) { - CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].firstPreamble, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].lastPreamble, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ceLevelInfo[i].firstPreamble, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ceLevelInfo[i].lastPreamble, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); } #endif return ROK; @@ -5504,72 +4832,66 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellRecfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellRecfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { #ifdef ENABLE_API_LOG - CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf); + CMCHKPK(oduPackUInt8, 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(oduUnpackUInt8, param->rachSrRepModePres, mBuf); - CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf); + CMCHKPK(oduPackUInt8, param->rachSrRepModePres, mBuf); + CMCHKPK(oduPackUInt16, param->rachSrRepMode, mBuf); - CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf); - CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf); + CMCHKPK(oduPackUInt8, param->dataRepModePres, mBuf); + CMCHKPK(oduPackUInt16, param->dataRepMode, mBuf); - CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf); - CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf); + CMCHKPK(oduPackUInt8, param->phySyncModePres, mBuf); + CMCHKPK(oduPackUInt16, param->phySyncMode, mBuf); - CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf); + CMCHKPK(oduPackUInt8, param->rxAntennaPortsPres, mBuf); + CMCHKPK(oduPackUInt16, param->rxAntennaPorts, mBuf); - CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf); + CMCHKPK(oduPackUInt8, param->txAntennaPortsPres, mBuf); + CMCHKPK(oduPackUInt16, param->txAntennaPorts, mBuf); - CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf); + CMCHKPK(oduPackUInt8, param->pucchProbDtxAckPres, mBuf); + CMCHKPK(oduPackUInt16, param->pucchProbDtxAck, mBuf); - CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf); + CMCHKPK(oduPackUInt8, param->puschProbDtxAckPres, mBuf); + CMCHKPK(oduPackUInt16, param->puschProbDtxAck, mBuf); - CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf); + CMCHKPK(oduPackUInt8, param->srsDopEstFactorPres, mBuf); + CMCHKPK(oduPackUInt16, param->srsDopEstFactor, mBuf); - CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf); - CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf); + CMCHKPK(oduPackUInt8, param->prachPkRatio0Pres, mBuf); + CMCHKPK(oduPackUInt16, param->prachPkRatio0, mBuf); - CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf); - CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf); + CMCHKPK(oduPackUInt8, param->prachPkRatio4Pres, mBuf); + CMCHKPK(oduPackUInt16, param->prachPkRatio4, mBuf); - CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf); + CMCHKPK(oduPackUInt8, param->pucchNoiseGammaPres, mBuf); + CMCHKPK(oduPackUInt16, param->pucchNoiseGamma, mBuf); - CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf); + CMCHKPK(oduPackUInt8, param->extWinMarginPres, mBuf); + CMCHKPK(oduPackUInt16, param->extWinMargin, mBuf); - CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf); + CMCHKPK(oduPackUInt8, param->dciPowOsPres, mBuf); + CMCHKPK(oduPackUInt16, param->dciPowOs, mBuf); - CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf); + CMCHKPK(oduPackUInt8, param->cfiPowOsPres, mBuf); + CMCHKPK(oduPackUInt16, param->cfiPowOs, mBuf); - CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf); - CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf); + CMCHKPK(oduPackUInt8, param->syncSigPowOsPres, mBuf); + CMCHKPK(oduPackUInt16, param->syncSigPowOs, mBuf); CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); @@ -5583,11 +4905,11 @@ Buffer *mBuf; CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf); - CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf); - CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf); + CMCHKPK(oduPackUInt8, param->physCellId, mBuf); + CMCHKPK(oduPackUInt8, param->physCellIdPres, mBuf); + CMCHKPK(oduPackUInt8, param->cellIdGrpId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(oduUnpackUInt32, param->ctfReCfgType, mBuf); + CMCHKPK(oduPackUInt32, param->ctfReCfgType, mBuf); return ROK; } @@ -5610,28 +4932,22 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellRecfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellRecfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ctfReCfgType = (CtfReCfgType)tmpEnum; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cellIdGrpId, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cellIdGrpId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->physCellIdPres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->physCellId, mBuf); CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf); CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); @@ -5645,57 +4961,57 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->syncSigPowOs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->syncSigPowOsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cfiPowOs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfiPowOsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dciPowOs, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dciPowOsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->extWinMargin, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->extWinMarginPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pucchNoiseGamma, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pucchNoiseGammaPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->prachPkRatio4, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->prachPkRatio4Pres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->prachPkRatio0, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->prachPkRatio0Pres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->srsDopEstFactor, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->srsDopEstFactorPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->puschProbDtxAck, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->puschProbDtxAckPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pucchProbDtxAck, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pucchProbDtxAckPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->txAntennaPorts, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->txAntennaPortsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->rxAntennaPorts, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->rxAntennaPortsPres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->phySyncMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->phySyncModePres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dataRepMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dataRepModePres, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->rachSrRepMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶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); + DU_LOG("\nDEBUG --> param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); #ifdef ENABLE_API_LOG - CMCHKUNPK(oduPackUInt8, ¶m->enableAPILog, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->enableAPILog, mBuf); #endif /* ENABLE_API_LOG */ return ROK; } @@ -5719,24 +5035,17 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedPdschCfgInfo ( CtfDedPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedPdschCfgInfo(param, mBuf) -CtfDedPdschCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKPK(oduUnpackUInt32, param->pA, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt32, param->pA, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -5759,25 +5068,19 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedPdschCfgInfo ( CtfDedPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedPdschCfgInfo(param, mBuf) -CtfDedPdschCfgInfo *param; -Buffer *mBuf; -#endif { - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->pA = (CtfPdschPaParam)tmpEnum; } return ROK; @@ -5802,17 +5105,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedPucchCfgInfo ( CtfDedPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedPucchCfgInfo(param, mBuf) -CtfDedPucchCfgInfo *param; -Buffer *mBuf; -#endif { @@ -5823,26 +5120,26 @@ Buffer *mBuf; /*ctf_c_001.main_4:115549: packing tddAckNackFBMode and tddAckNackCfgPres */ if (param->tddAckNackCfgPres != FALSE) { - CMCHKPK(oduUnpackUInt32, param->tddAckNackFBMode, mBuf); + CMCHKPK(oduPackUInt32, param->tddAckNackFBMode, mBuf); } - CMCHKPK(oduUnpackUInt8, param->tddAckNackCfgPres, mBuf); + CMCHKPK(oduPackUInt8, param->tddAckNackCfgPres, mBuf); #endif /* CTF_VER3 */ - CMCHKPK(oduUnpackUInt16, param->pucchSetup.n1PUCCHRep, mBuf); + CMCHKPK(oduPackUInt16, param->pucchSetup.n1PUCCHRep, mBuf); #ifdef CTF_VER3 /*ctf_c_001.main_4:115549: packing pucchSetup.repFactPres */ if (param->pucchSetup.repFactPres) { - CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf); + CMCHKPK(oduPackUInt32, param->pucchSetup.repFact, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pucchSetup.repFactPres, mBuf); + CMCHKPK(oduPackUInt8, param->pucchSetup.repFactPres, mBuf); #else - CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf); + CMCHKPK(oduPackUInt32, param->pucchSetup.repFact, mBuf); #endif /* CTF_VER3 */ - CMCHKPK(oduUnpackUInt8, param->dedPucchCfgType, mBuf); + CMCHKPK(oduPackUInt8, param->dedPucchCfgType, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -5865,44 +5162,38 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedPucchCfgInfo ( CtfDedPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedPucchCfgInfo(param, mBuf) -CtfDedPucchCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(oduPackUInt8, ¶m->dedPucchCfgType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedPucchCfgType, mBuf); #ifdef CTF_VER3 /* ctf_c_001.main_4:115549: unpacking pucchSetup.repFactPres */ - CMCHKUNPK(oduPackUInt8, ¶m->pucchSetup.repFactPres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pucchSetup.repFactPres, mBuf); if (param->pucchSetup.repFactPres) { - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->pucchSetup.repFact, mBuf); } #else - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->pucchSetup.repFact, mBuf); #endif /*CTF_VER3 */ - CMCHKUNPK(oduPackUInt16, ¶m->pucchSetup.n1PUCCHRep, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pucchSetup.n1PUCCHRep, mBuf); #ifdef CTF_VER3 /*ctf_c_001.main_4:115549: unpacking tddAckNackCfgPres and tddAckNackFBMode */ - CMCHKUNPK(oduPackUInt8, ¶m->tddAckNackCfgPres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->tddAckNackCfgPres, mBuf); if (param->tddAckNackCfgPres != FALSE) { - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tddAckNackFBMode, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->tddAckNackFBMode, mBuf); } #endif /* CTF_VER3 */ } @@ -5928,28 +5219,21 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedPuschCfgInfo ( CtfDedPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedPuschCfgInfo(param, mBuf) -CtfDedPuschCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(oduUnpackUInt8, param->betaOffsetCqiIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->betaOffsetRiIdx, mBuf); - CMCHKPK(oduUnpackUInt8, param->betaOffsetAckIdx, mBuf); + CMCHKPK(oduPackUInt8, param->betaOffsetCqiIdx, mBuf); + CMCHKPK(oduPackUInt8, param->betaOffsetRiIdx, mBuf); + CMCHKPK(oduPackUInt8, param->betaOffsetAckIdx, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -5972,27 +5256,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedPuschCfgInfo ( CtfDedPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedPuschCfgInfo(param, mBuf) -CtfDedPuschCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetAckIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetRiIdx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetCqiIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->betaOffsetAckIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->betaOffsetRiIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->betaOffsetCqiIdx, mBuf); } return ROK; } @@ -6017,32 +5294,26 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCqiRptModePeriodic ( CtfCqiRptModePeriodic *param, Buffer *mBuf ) -#else -S16 cmPkCtfCqiRptModePeriodic(param, mBuf) -CtfCqiRptModePeriodic *param; -Buffer *mBuf; -#endif { /* ctf_c_001.main_2: added packning for cqiMask*/ #ifdef CTF_VER1 - CMCHKPK(oduUnpackUInt32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf); - CMCHKPK(oduUnpackUInt8, param->cqiSetup.cqiMask.pres, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf); + CMCHKPK(oduPackUInt8, param->cqiSetup.cqiMask.pres, mBuf); #endif /* CTF_VER1 */ - 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); + CMCHKPK(oduPackUInt8, param->cqiSetup.simultaneousAckNack, mBuf); + CMCHKPK(oduPackUInt16, param->cqiSetup.riCfgIndx, mBuf); + CMCHKPK(oduPackUInt8, param->cqiSetup.riCfgPres, mBuf); + CMCHKPK(oduPackUInt8, param->cqiSetup.subbandCqi.k, mBuf); + CMCHKPK(oduPackUInt8, param->cqiSetup.formatIndicator, mBuf); + CMCHKPK(oduPackUInt16, param->cqiSetup.cqiPmiCfgIndx, mBuf); + CMCHKPK(oduPackUInt16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf); + CMCHKPK(oduPackUInt8, param->cqiPeriodicCfgType, mBuf); return ROK; } @@ -6065,34 +5336,28 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCqiRptModePeriodic ( CtfCqiRptModePeriodic *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCqiRptModePeriodic(param, mBuf) -CtfCqiRptModePeriodic *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER1 - U32 tmpEnum; + uint32_t tmpEnum; #endif - CMCHKUNPK(oduPackUInt8, ¶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); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiPeriodicCfgType, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cqiSetup.cqiPmiCfgIndx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiSetup.formatIndicator, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiSetup.subbandCqi.k, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiSetup.riCfgPres, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->cqiSetup.riCfgIndx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiSetup.simultaneousAckNack, mBuf); /* ctf_c_001.main_2: added Unpackning for cqiMask*/ #ifdef CTF_VER1 - CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.cqiMask.pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cqiSetup.cqiMask.pres, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->cqiSetup.cqiMask.cqiMaskSetup = tmpEnum; #endif /* CTF_VER1 */ return ROK; @@ -6117,20 +5382,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCqiReportCfgInfo ( CtfCqiReportCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCqiReportCfgInfo(param, mBuf) -CtfCqiReportCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -6141,15 +5399,15 @@ Buffer *mBuf; */ if(param->reportMode.aPeriodicRpt.pres != FALSE) { - CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf); + CMCHKPK(oduPackUInt32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf); } - CMCHKPK(oduUnpackUInt8, param->reportMode.aPeriodicRpt.pres, mBuf); + CMCHKPK(oduPackUInt8, param->reportMode.aPeriodicRpt.pres, mBuf); if(param->reportMode.periodicRpt.pres != FALSE) { CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); } - CMCHKPK(oduUnpackUInt8, param->reportMode.periodicRpt.pres, mBuf); + CMCHKPK(oduPackUInt8, param->reportMode.periodicRpt.pres, mBuf); #else /* CTF_VER2 */ @@ -6158,22 +5416,22 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); break; case CTF_CQI_RPTMODE_APRDIOC: - CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt, mBuf); + CMCHKPK(oduPackUInt32, param->reportMode.aPeriodicRpt, mBuf); break; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->reportingMode, mBuf); + CMCHKPK(oduPackUInt8, param->reportingMode, mBuf); #endif /* CTF_VER2 */ /* ctf_c_001.main_2: added packning for pmiRiRpt*/ #ifdef CTF_VER1 - CMCHKPK(oduUnpackUInt32, param->pmiRiRpt.pmiRiRptSetup, mBuf); - CMCHKPK(oduUnpackUInt8, param->pmiRiRpt.pres, mBuf); + CMCHKPK(oduPackUInt32, param->pmiRiRpt.pmiRiRptSetup, mBuf); + CMCHKPK(oduPackUInt8, param->pmiRiRpt.pres, mBuf); #endif /* CTF_VER1 */ } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6196,30 +5454,24 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCqiReportCfgInfo ( CtfCqiReportCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCqiReportCfgInfo(param, mBuf) -CtfCqiReportCfgInfo *param; -Buffer *mBuf; -#endif { #if defined (CTF_VER1) || defined (CTF_VER2) - U32 tmpEnum; + uint32_t tmpEnum; #endif - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶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(oduPackUInt8, ¶m->pmiRiRpt.pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pmiRiRpt.pres, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->pmiRiRpt.pmiRiRptSetup = tmpEnum; #endif /* CTF_VER1 */ @@ -6228,26 +5480,26 @@ Buffer *mBuf; *ctf_c_001.main_2: Added provision to send Periodic and aPeriodic CQI *report configuration in the same message */ - CMCHKUNPK(oduPackUInt8, ¶m->reportMode.periodicRpt.pres, mBuf) + CMCHKUNPK(oduUnpackUInt8, ¶m->reportMode.periodicRpt.pres, mBuf) if(param->reportMode.periodicRpt.pres != FALSE) { CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); } - CMCHKUNPK(oduPackUInt8, ¶m->reportMode.aPeriodicRpt.pres, mBuf) + CMCHKUNPK(oduUnpackUInt8, ¶m->reportMode.aPeriodicRpt.pres, mBuf) if(param->reportMode.aPeriodicRpt.pres != FALSE) { - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->reportMode.aPeriodicRpt.aPeriodicRptMode = (CtfCqiRptModeAperiodic)tmpEnum; } #else /* CTF_VER2 */ - CMCHKUNPK(oduPackUInt8, ¶m->reportingMode, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->reportingMode, mBuf); switch(param->reportingMode) { case CTF_CQI_RPTMODE_APRDIOC: - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->reportMode.aPeriodicRpt, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->reportMode.aPeriodicRpt, mBuf); break; case CTF_CQI_RPTMODE_PRDIOC: CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); @@ -6279,33 +5531,26 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedSrsUlCfgInfo ( CtfDedSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedSrsUlCfgInfo(param, mBuf) -CtfDedSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - 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(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrsSetup.cyclicShift, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrsSetup.txComb, mBuf); + CMCHKPK(oduPackUInt16, param->dedSrsSetup.srsCfgIdx, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrsSetup.duration, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrsSetup.freqDmnPos, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrsSetup.srsHopngBw, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrsSetup.srsBw, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrsUlCfgType, mBuf); + } + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6328,32 +5573,25 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedSrsUlCfgInfo ( CtfDedSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedSrsUlCfgInfo(param, mBuf) -CtfDedSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - 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); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrsUlCfgType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrsSetup.srsBw, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrsSetup.srsHopngBw, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrsSetup.freqDmnPos, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrsSetup.duration, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dedSrsSetup.srsCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrsSetup.txComb, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrsSetup.cyclicShift, mBuf); } return ROK; } @@ -6377,28 +5615,21 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedSRCfgInfo ( CtfDedSRCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedSRCfgInfo(param, mBuf) -CtfDedSRCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(oduUnpackUInt8, param->dedSrSetup.srCfgIdx, mBuf); - CMCHKPK(oduUnpackUInt16, param->dedSrSetup.srPUCCHRi, mBuf); - CMCHKPK(oduUnpackUInt8, param->dedSRCfgType, mBuf); + CMCHKPK(oduPackUInt8, param->dedSrSetup.srCfgIdx, mBuf); + CMCHKPK(oduPackUInt16, param->dedSrSetup.srPUCCHRi, mBuf); + CMCHKPK(oduPackUInt8, param->dedSRCfgType, mBuf); } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6421,27 +5652,21 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedSRCfgInfo ( CtfDedSRCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedSRCfgInfo(param, mBuf) -CtfDedSRCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(oduPackUInt8, ¶m->dedSRCfgType, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->dedSrSetup.srPUCCHRi, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dedSrSetup.srCfgIdx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSRCfgType, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->dedSrSetup.srPUCCHRi, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dedSrSetup.srCfgIdx, mBuf); } return ROK; } @@ -6466,31 +5691,25 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedAntCfgInfo ( CtfDedAntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedAntCfgInfo(param, mBuf) -CtfDedAntCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER2 - U8 idx; + uint8_t idx; #endif /* CTF_VER2 */ /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(oduUnpackUInt32, param->ueTxAntSelection.txAntSelect, mBuf); - CMCHKPK(oduUnpackUInt8, param->ueTxAntSelection.cfgType, mBuf); + CMCHKPK(oduPackUInt32, param->ueTxAntSelection.txAntSelect, mBuf); + CMCHKPK(oduPackUInt8, param->ueTxAntSelection.cfgType, mBuf); /* ctf_c_001.main_3 txMode is of type enum and is 32bit length */ - CMCHKPK(oduUnpackUInt32, (U32)param->txMode, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t)param->txMode, mBuf); #ifdef CTF_VER2 /* *ctf_c_001.main_2: Added Packing of CodeBookSubsetRestriction parameter @@ -6498,53 +5717,53 @@ Buffer *mBuf; switch(param->codeBookSubsetRes.ctfCdBkRestType) { case N2TX_ANT_TM3: - CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm3, mBuf); break; case N4TX_ANT_TM3: - CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm3, mBuf); break; case N2TX_ANT_TM4: - CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm4, mBuf); break; case N4TX_ANT_TM4: for(idx = 0; idx < 8; idx++) - CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm4[idx], mBuf); break; case N2TX_ANT_TM5: - CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm5, mBuf); break; case N4TX_ANT_TM5: - CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm5, mBuf); break; case N2TX_ANT_TM6: - CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm6, mBuf); break; case N4TX_ANT_TM6: - CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduPackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm6, mBuf); break; default : break; } - CMCHKPK(oduUnpackUInt32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf); + CMCHKPK(oduPackUInt32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf); #endif /* CTF_VER2 */ } - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6567,26 +5786,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedAntCfgInfo ( CtfDedAntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedAntCfgInfo(param, mBuf) -CtfDedAntCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER2 S16 idx; #endif /* CTF_VER2 */ - U32 tmpEnum; + uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -6594,50 +5807,50 @@ Buffer *mBuf; /* * Added Unpacking for CodeBookSubsetRestriction parameter */ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->codeBookSubsetRes.ctfCdBkRestType = (CtfCdBkSubsetRestnType)tmpEnum; switch(param->codeBookSubsetRes.ctfCdBkRestType) { case N2TX_ANT_TM3: - CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm3, mBuf); break; case N4TX_ANT_TM3: - CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm3, mBuf); break; case N2TX_ANT_TM4: - CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm4, mBuf); break; case N4TX_ANT_TM4: for(idx = 7; idx >= 0; idx--) { - CMCHKUNPK(oduPackUInt8, &(param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt8, &(param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm4[idx]), mBuf); } break; case N2TX_ANT_TM5: - CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm5, mBuf); break; case N4TX_ANT_TM5: - CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm5, mBuf); break; case N2TX_ANT_TM6: - CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm6, mBuf); break; case N4TX_ANT_TM6: - CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduUnpackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm6, mBuf); break; default : @@ -6645,10 +5858,10 @@ Buffer *mBuf; } #endif /* CTF_VER2 */ /* ctf_c_001.main_3 Enum is 32bit length */ - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->txMode = (CtfUeTxAntMode)tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->ueTxAntSelection.cfgType, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->ueTxAntSelection.cfgType, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf); param->ueTxAntSelection.txAntSelect = (CtfUeTxAntSelectType)tmpEnum; } return ROK; @@ -6671,20 +5884,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfUeSecCellCfgInfo ( CtfUeSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfUeSecCellCfgInfo(*param, mBuf) -CtfUeSecCellCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); - CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); + CMCHKPK(oduPackUInt16, param->sCellId, mBuf); + CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf); return ROK; } @@ -6704,26 +5911,20 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfSecCellCfgInfo ( CtfSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfSecCellCfgInfo(*param, mBuf) -CtfSecCellCfgInfo *param; -Buffer *mBuf; -#endif { S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) { - CMCHKPK(cmPkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[(U8)idx], mBuf); + CMCHKPK(cmPkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[(uint8_t)idx], mBuf); } - CMCHKPK(oduUnpackUInt32, param->sCellAction, mBuf); - CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); + CMCHKPK(oduPackUInt32, param->sCellAction, mBuf); + CMCHKPK(oduPackUInt8, param->numSCells, mBuf); return ROK; } @@ -6744,20 +5945,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfUeSecCellCfgInfo ( CtfUeSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeSecCellCfgInfo(*param, mBuf) -CtfUeSecCellCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->sCellId, mBuf); return ROK; } @@ -6779,22 +5974,16 @@ Buffer *mBuf; * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfSecCellCfgInfo ( CtfSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfSecCellCfgInfo(*param, mBuf) -CtfSecCellCfgInfo *param; -Buffer *mBuf; -#endif { - U8 idx; + uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); - CMCHKUNPK(oduPackUInt32, (U32*)¶m->sCellAction, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t*)¶m->sCellAction, mBuf); for(idx = 0 ; idx < param->numSCells; idx++) { CMCHKUNPK(cmUnpkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[idx], mBuf); @@ -6821,24 +6010,18 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfUeCatCfgInfo ( CtfUeCatCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfUeCatCfgInfo(param, mBuf) -CtfUeCatCfgInfo *param; -Buffer *mBuf; -#endif { /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKPK(oduUnpackUInt32, param->ueCategory, mBuf); - CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduPackUInt32, param->ueCategory, mBuf); + CMCHKPK(oduPackUInt8, param->pres, mBuf); return ROK; } @@ -6861,24 +6044,18 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfUeCatCfgInfo ( CtfUeCatCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeCatCfgInfo(param, mBuf) -CtfUeCatCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ueCategory, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->ueCategory, mBuf); return ROK; } @@ -6901,21 +6078,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedCfgInfo ( CtfDedCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedCfgInfo(param, mBuf) -CtfDedCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE - CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf); + CMCHKPK(oduPackUInt8, param->isEmtcUe, mBuf); #endif CMCHKPK(cmPkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); #ifndef TFU_UPGRADE @@ -6951,20 +6122,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedCfgInfo ( CtfDedCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedCfgInfo(param, mBuf) -CtfDedCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkCtfUeCatCfgInfo, ¶m->ueCatCfg, mBuf); @@ -6978,7 +6142,7 @@ Buffer *mBuf; #endif /* TFU_UPGRADE */ CMCHKUNPK(cmUnpkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); #ifdef EMTC_ENABLE - CMCHKUNPK(oduPackUInt8, ¶m->isEmtcUe, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->isEmtcUe, mBuf); #endif return ROK; } @@ -7002,20 +6166,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedRecfgInfo ( CtfDedRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedRecfgInfo(param, mBuf) -CtfDedRecfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); /*ctf_c_001.main_1*/ CMCHKPK(cmPkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); @@ -7058,20 +6215,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedRecfgInfo ( CtfDedRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedRecfgInfo(param, mBuf) -CtfDedRecfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); /* ctf_c_001.main_4: ReEst Fix */ @@ -7116,20 +6266,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellReleaseInfo ( CtfCellReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellReleaseInfo(param, mBuf) -CtfCellReleaseInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } @@ -7153,20 +6296,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellReleaseInfo ( CtfCellReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellReleaseInfo(param, mBuf) -CtfCellReleaseInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); return ROK; } @@ -7190,17 +6326,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedReleaseInfo ( CtfDedReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedReleaseInfo(param, mBuf) -CtfDedReleaseInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); @@ -7228,20 +6358,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedReleaseInfo ( CtfDedReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedReleaseInfo(param, mBuf) -CtfDedReleaseInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); @@ -7267,20 +6390,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCfgInfo ( CtfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCfgInfo(param, mBuf) -CtfCfgInfo *param; -Buffer *mBuf; -#endif { - switch(param->cfgElem) { case CTF_UE_CFG: CMCHKPK(cmPkCtfDedCfgInfo, ¶m->u.dedCfg, mBuf); @@ -7291,7 +6407,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + CMCHKPK(oduPackUInt8, param->cfgElem, mBuf); return ROK; } @@ -7314,21 +6430,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCfgInfo ( CtfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgInfo(param, mBuf) -CtfCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellCfgInfo, ¶m->u.cellCfg, mBuf); @@ -7361,17 +6471,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfReCfgInfo ( CtfReCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfReCfgInfo(param, mBuf) -CtfReCfgInfo *param; -Buffer *mBuf; -#endif { @@ -7394,7 +6498,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + CMCHKPK(oduPackUInt8, param->cfgElem, mBuf); return ROK; } @@ -7417,21 +6521,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfReCfgInfo ( CtfReCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfReCfgInfo(param, mBuf) -CtfReCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellRecfgInfo, ¶m->u.cellRecfg, mBuf); @@ -7472,17 +6570,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfReleaseInfo ( CtfReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfReleaseInfo(param, mBuf) -CtfReleaseInfo *param; -Buffer *mBuf; -#endif { @@ -7496,7 +6588,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + CMCHKPK(oduPackUInt8, param->cfgElem, mBuf); return ROK; } @@ -7519,21 +6611,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfReleaseInfo ( CtfReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfReleaseInfo(param, mBuf) -CtfReleaseInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellReleaseInfo, ¶m->u.cellRel, mBuf); @@ -7569,20 +6655,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCfgReqInfo ( CtfCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCfgReqInfo(param, mBuf) -CtfCfgReqInfo *param; -Buffer *mBuf; -#endif { - /* ctf_c_001.main_4: Added support for vendor specific parameters */ #ifdef CTF_VER3 CMCHKPK(cmPkCtfVendorSpecParams, ¶m->vendorParams, mBuf); @@ -7600,7 +6679,7 @@ Buffer *mBuf; default : return RFAILED; } - CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); + CMCHKPK(oduPackUInt8, param->cfgType, mBuf); return ROK; } @@ -7628,19 +6707,12 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCfgReqInfo ( Pst *pst, CtfCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgReqInfo(param, mBuf) -Pst *pst; -CtfCfgReqInfo *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER3 @@ -7648,7 +6720,7 @@ Buffer *mBuf; #endif - CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { case CTF_CONFIG: CMCHKUNPK(cmUnpkCtfCfgInfo, ¶m->u.cfg, mBuf); @@ -7687,22 +6759,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellPwrcfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellPwrcfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - /* Added the pack for newly added reference signal Power*/ - CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); @@ -7731,19 +6796,12 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellPwrcfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellPwrcfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -7752,7 +6810,7 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->ctfCellStatus, mBuf); return ROK; } @@ -7774,22 +6832,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellStop ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellStop(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - /* Added the pack for newly added reference signal Power*/ - CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); + CMCHKPK(oduPackUInt32, (uint32_t)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); @@ -7816,19 +6867,12 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellStop ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellStop(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -7836,7 +6880,7 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf); + CMCHKUNPK(oduUnpackUInt32, (uint32_t *)¶m->ctfCellStatus, mBuf); return ROK; } @@ -7858,23 +6902,17 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkPerRemScanCellInfo ( CtfPeriodicRemCellInfo *param, Buffer *mBuf ) -#else -S16 cmPkPerRemScanCellInfo(param, mBuf) -CtfPeriodicRemCellInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16,param->pci, mBuf); - CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); - CMCHKPK(oduUnpackUInt8, param->dlBw, mBuf); - CMCHKPK(oduUnpackUInt8, param->numTx, mBuf); + CMCHKPK(oduPackUInt16,param->pci, mBuf); + CMCHKPK(oduPackUInt8, param->rsrp, mBuf); + CMCHKPK(oduPackUInt8, param->dlBw, mBuf); + CMCHKPK(oduPackUInt8, param->numTx, mBuf); return ROK; } @@ -7895,17 +6933,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPeriodicCellSearchRsp ( CtfPeriodicRemCellSearchRsp *param, Buffer *mBuf ) -#else -S16 cmPkCtfPeriodicCellSearchRsp(param, mBuf) -CtfPeriodicRemCellSearchRsp *param; -Buffer *mBuf; -#endif { S16 idx; @@ -7913,7 +6945,7 @@ Buffer *mBuf; { CMCHKPK(cmPkPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf); } - CMCHKPK(oduUnpackUInt8, param->numCells, mBuf); + CMCHKPK(oduPackUInt8, param->numCells, mBuf); return ROK; } @@ -7933,7 +6965,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfPeriodicRemCellSearchRsp ( Pst* pst, @@ -7941,13 +6972,6 @@ SpId spId, CtfCfgTransId *transId, CtfPeriodicRemCellSearchRsp *CellCfgRsp ) -#else -S16 cmPkCtfPeriodicRemCellSearchRsp(pst, spId, transId, CellCfgRsp) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfPeriodicRemCellSearchRsp *CellCfgRsp; -#endif { Buffer *mBuf = NULLP; @@ -7958,7 +6982,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); return RFAILED; } @@ -7970,7 +6994,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF017, (ErrVal)0, (Txt*)&"Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); return RFAILED; @@ -7985,7 +7009,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF018, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); return RFAILED; @@ -7999,7 +7023,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF019, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); return RFAILED; @@ -8011,54 +7035,42 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF020, (ErrVal)0, "Packing failed"); #endif - SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); } pst->event = (Event)EVTCTFPREMCELLSRCHRSP; return (SPstTsk(pst,mBuf)); } -#ifdef ANSI S16 cmUnpkCtfPerRemScanCellInfo ( CtfPeriodicRemCellInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPerRemScanCellInfo(param, mBuf) -CtfPeriodicRemCellInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->numTx, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->dlBw, mBuf); - CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf); - CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numTx, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->dlBw, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->rsrp, mBuf); + CMCHKUNPK(oduUnpackUInt16, ¶m->pci, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkCtfPerRemCellSrch ( CtfPeriodicRemCellSearchRsp *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPerRemCellSrch(param, mBuf) -CtfPeriodicRemCellSearchRsp *param; -Buffer *mBuf; -#endif { S16 idx; - CMCHKUNPK(oduPackUInt8, ¶m->numCells, mBuf); + CMCHKUNPK(oduUnpackUInt8, ¶m->numCells, mBuf); for(idx = 0; idx < (param->numCells); idx++) { CMCHKUNPK(cmUnpkCtfPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf); @@ -8080,19 +7092,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkPerRemCellSrchRsp ( CtfPerRemCellSrchRsp func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkPerRemCellSrchRsp(func, pst, mBuf) -CtfPerRemCellSrchRsp func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; @@ -8119,7 +7124,7 @@ Buffer *mBuf; return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&CellSrchRsp, + if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&CellSrchRsp, sizeof(CtfPeriodicRemCellSearchRsp))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -8139,7 +7144,7 @@ Buffer *mBuf; } else if (pst->selector == ODU_SELECTOR_LC) if (cmUnpkCtfPerRemCellSrch(CellSrchRsp, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)CellSrchRsp, + SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)CellSrchRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES)