#include "ctf.x"
#ifdef TENB_AS_SECURITY
-#define cmPkCtfCrnti SPkU16
-#define cmPkCtfCellId SPkU16
-#define cmUnpkCtfCellId SUnpkU16
-#define cmUnpkCtfCrnti SUnpkU16
+#define cmPkCtfCrnti oduUnpackUInt16
+#define cmPkCtfCellId oduUnpackUInt16
+#define cmUnpkCtfCellId oduPackUInt16
+#define cmUnpkCtfCrnti oduPackUInt16
#endif
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF001, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF002, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF003, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTCTFBNDREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF004, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SUnpkS16(&spId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF005, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, spId));
+ return ((*func)(pst, suId, spId));
}
\f
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF006, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SPkU8(status, mBuf) != ROK) {
+ if (oduUnpackUInt8(status, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
(ErrVal)ECTF007, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF008, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTCTFBNDCFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF009, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SUnpkU8(&status, mBuf) != ROK) {
+ if (oduPackUInt8(&status, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF010, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, status));
+ return ((*func)(pst, suId, status));
}
\f
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF011, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(reason, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF012, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF013, (ErrVal)0,(Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTCTFUBNDREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF014, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SUnpkS16(&reason, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF015, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, reason));
+ return ((*func)(pst, spId, reason));
}
\f
}
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCfgReqInfo));
- RETVALUE(ROK);
+ return ROK;
}
#ifdef TENB_AS_SECURITY
for(idx=31;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->secKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
}
- CMCHKPK(SPkU16, param->physCellId, mBuf);
- CMCHKPK(SPkU16, param->dlCarrFreq, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
for(idx=31;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->secKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
}
- CMCHKPK(SPkU16, param->physCellId, mBuf);
- CMCHKPK(SPkU16, param->dlCarrFreq, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
for(idx=31;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->secKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
}
- CMCHKPK(SPkU8, param->ciphAlgoType, mBuf);
- CMCHKPK(SPkU8, param->intgAlgoType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->ciphAlgoType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->intgAlgoType, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
CMCHKPK(cmPkCtfNhKeyInfo , ¶m->u.nhKeyInf, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, param->keyDerType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/**
(ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if (SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)) != ROK) {
(ErrVal)ECTF021, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
pst->event = (Event) EVTCTFKDFREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#endif
{
for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--)
{
- CMCHKPK(SPkU32,(U32)param->vendorSpecifcParam[i], mBuf);
+ CMCHKPK(oduUnpackUInt32,(U32)param->vendorSpecifcParam[i], mBuf);
}
}
- CMCHKPK(SPkU16, param->numOfVendorSpecifcParam, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt16, param->numOfVendorSpecifcParam, mBuf);
+ return ROK;
}
#ifdef ANSI
{
TRC3(cmPkCtfCtfCnmCellSyncReq);
- CMCHKPK(SPkU16, param->nbrEarfcn, mBuf);
- CMCHKPK(SPkU16, param->nbrPCellId, mBuf);
- CMCHKPK(SPkU8, param->nbrTxAntCount, mBuf);
- CMCHKPK(SPkU8, param->nbrCellCp, mBuf);
- CMCHKPK(SPkU8, param->nbrCellNRb, mBuf);
- CMCHKPK(SPkU8, param->nbrSpecSfCfg, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->nbrCellCp, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->nbrCellNRb, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->nbrSpecSfCfg, mBuf);
CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
S32 i;
TRC3(cmPkCtfcfgReqInfo);
- CMCHKPK(SPkU8, param->searchType, mBuf);
- CMCHKPK(SPkU8, param->mibRequest, mBuf);
- CMCHKPK(SPkU16, param->earfcn, mBuf);
- CMCHKPK(SPkU8, param->measBandWidth, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->searchType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->measBandWidth, mBuf);
if(param->numOfPciList <= CTF_CNM_MAX_CELL_SEARCH)
{
for(i= param->numOfPciList-1; i >= 0; i--)
CMCHKPK(cmPkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf);
}
}
- CMCHKPK(SPkU16, param->numOfPciList, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt16, param->numOfPciList, mBuf);
+ return ROK;
}
#ifdef ANSI
S32 i;
TRC3(cmUnpkCtfCnmVendorSpecificInfo);
- CMCHKUNPK(SUnpkU16, ¶m->numOfVendorSpecifcParam, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->numOfVendorSpecifcParam, mBuf);
for(i=0; (i<param->numOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++)
{
- CMCHKUNPK(SUnpkU32, ¶m->vendorSpecifcParam[i], mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->vendorSpecifcParam[i], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
#ifdef ANSI
CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nbrSpecSfCfg, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nbrCellNRb, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nbrCellCp, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nbrTxAntCount, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->nbrPCellId, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->nbrEarfcn, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->nbrSpecSfCfg, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nbrCellNRb, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nbrCellCp, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nbrTxAntCount, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->nbrPCellId, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->nbrEarfcn, mBuf);
+ return ROK;
}
S32 i;
TRC3(cmUnpkCtfsyncReqInfo);
- CMCHKUNPK(SUnpkU16, ¶m->numOfPciList, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->numOfPciList, mBuf);
for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
{
CMCHKUNPK(cmUnpkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf);
}
- CMCHKUNPK(SUnpkU8, ¶m->measBandWidth, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->earfcn, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->mibRequest, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->searchType, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->measBandWidth, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->mibRequest, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->searchType, mBuf);
+ return ROK;
}
/**
* @brief Configuration Request from App to CL for
(ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfCtfCnmCellSyncReq(cfgReqInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)cfgReqInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
}
pst->event = (Event)EVTCTFCNMSYNCREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&SyncReqMsg, sizeof(CtfCnmCellSyncReq))) != ROK) {
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&SyncReqMsg, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&SyncReqMsg, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, &transId, SyncReqMsg));
+ return ((*func)(pst, spId, &transId, SyncReqMsg));
}
/*-----------------------------------------------------*/
(ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfcfgReqInfo(cfgReqInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)cfgReqInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
}
pst->event = (Event)EVTCTFCNMINITSYNCREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
/*-----------------------------------------------------------------*/
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncReqInfo, sizeof(CtfCnmInitSyncReq))) != ROK) {
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&syncReqInfo, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&syncReqInfo, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, &transId, syncReqInfo));
+ return ((*func)(pst, spId, &transId, syncReqInfo));
}
/*-----------------------------------------------------------------------------*/
{
TRC3(cmPkCtfctfCnmMibInfo)
- CMCHKPK(SPkU16, param->sfn, mBuf);
- CMCHKPK(SPkU8, param->numTxAntennas, mBuf);
- CMCHKPK(SPkU8, param->phichDuration, mBuf);
- CMCHKPK(SPkU8, param->phichResource, mBuf);
- CMCHKPK(SPkU8, param->dlSystemBandWidht, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->phichDuration, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->phichResource, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dlSystemBandWidht, mBuf);
+ return ROK;
}
{
TRC3(cmPkCtfctfCnmInitSyncInfo)
- CMCHKPK(SPkU16, param->pci, mBuf);
- CMCHKPK(SPkU8, param->rsrp, mBuf);
- CMCHKPK(SPkU8, param->mibValidFlag, mBuf);
- CMCHKPK(SPkU16, param->localSfn, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->mibValidFlag, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->localSfn, mBuf);
CMCHKPK(cmPkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf);
CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmPkCtfcfgRspInfo)
- CMCHKPK(SPkU8, param->status, mBuf);
- CMCHKPK(SPkU16, param->earfcn, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->status, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf);
if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH)
{
for(i= param->numOfNeighbourInfo-1; i >= 0; i--)
CMCHKPK(cmPkCtfctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf);
}
}
- CMCHKPK(SPkU8, param->numOfNeighbourInfo, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->numOfNeighbourInfo, mBuf);
+ return ROK;
}
(ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfcfgRspInfo(cfgRspInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)cfgRspInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)cfgRspInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
}
pst->event = (Event)EVTCTFCNMINITSYNCRSP;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
/*-----------------------------------------------------------------------------*/
TRC3(cmUnpkCtfctfCnmMibInfo);
- CMCHKUNPK(SUnpkU8, ¶m->dlSystemBandWidht, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->phichResource, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->phichDuration, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->numTxAntennas, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->sfn, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->dlSystemBandWidht, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->phichResource, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->phichDuration, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->numTxAntennas, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf);
+ return ROK;
}
CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf);
CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->localSfn, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->mibValidFlag, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->rsrp, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->pci, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt16, ¶m->localSfn, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->mibValidFlag, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfCnmInitSyncRspMsg);
- CMCHKUNPK(SUnpkU8, ¶m->numOfNeighbourInfo, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->numOfNeighbourInfo, mBuf);
for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
{
CMCHKUNPK(cmUnpkctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf);
}
- CMCHKUNPK(SUnpkU16, ¶m->earfcn, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->status, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf);
+ return ROK;
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspInfo, sizeof(CtfCnmInitSyncRsp))) != ROK) {
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if(cmUnpkPtr((PTR *)&syncRspInfo, mBuf) != ROK) {
+ if(oduUnpackPointer((PTR *)&syncRspInfo, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, &transId, syncRspInfo));
+ return ((*func)(pst, spId, &transId, syncRspInfo));
}
/*-----------------------------------------------------------------------*/
TRC3(cmPkCtfCellSyncRsp)
- CMCHKPK(SPkU8, param->status, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->status, mBuf);
+ return ROK;
}
/**
(ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfCellSyncRsp(cfgRspInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)cfgRspInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)cfgRspInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
}
pst->event = (Event)EVTCTFCNMSYNCRSP;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
TRC3(cmUnpkCtfCnmSyncRspMsg);
- CMCHKUNPK(SUnpkU8, ¶m->status, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf);
+ return ROK;
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspMsg, sizeof(CtfCnmCellSyncRsp))) != ROK) {
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&syncRspMsg, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&syncRspMsg, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, &transId, syncRspMsg));
+ return ((*func)(pst, spId, &transId, syncRspMsg));
}
/*---------------------------------------------------------------*/
TRC3(cmPkCtfcfgIndInfo);
- CMCHKPK(SPkU8, param->status, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->status, mBuf);
CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/**
(ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfcfgIndInfo(cfgIndInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)cfgIndInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)cfgIndInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
}
pst->event = (Event)EVTCTFCNMSYNCIND;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
TRC3(cmUnpkCtfCnmSyncIndMsg);
CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->status, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf);
+ return ROK;
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncIndMsg, sizeof(CtfCnmCellSyncInd))) != ROK) {
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&syncIndMsg, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&syncIndMsg, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, &transId, syncIndMsg));
+ return ((*func)(pst, spId, &transId, syncIndMsg));
}
(ErrVal)ECTF016, (ErrVal)0, "Packing failed");
#endif
cmRelCtfCfgReq(pst, cfgReqInfo);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
#endif
cmRelCtfCfgReq(pst, cfgReqInfo);
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)cfgReqInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
cmRelCtfCfgReq(pst, cfgReqInfo);
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) {
#endif
cmRelCtfCfgReq(pst, cfgReqInfo);
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
cmRelCtfCfgReq(pst, cfgReqInfo);
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
cmRelCtfCfgReq(pst, cfgReqInfo);
}
pst->event = (Event) EVTCTFCFGREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef TENB_AS_SECURITY
TRC3(cmUnpkCtfNhKeyInfo)
- CMCHKUNPK(SUnpkU16, ¶m->dlCarrFreq, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->physCellId, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf);
for(idx=0;idx<32;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
TRC3(cmUnpkCtfKenbStarInfo)
- CMCHKUNPK(SUnpkU16, ¶m->dlCarrFreq, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->physCellId, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf);
for(idx=0;idx<32;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmUnpkCtfAskeyInfo)
- CMCHKUNPK(SUnpkU8, ¶m->intgAlgoType, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->ciphAlgoType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->intgAlgoType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->ciphAlgoType, mBuf);
for(idx=0;idx<32;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
TRC3(cmUnpkCtfKdfReqInfo)
- CMCHKUNPK(SUnpkU8, ¶m->keyDerType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf);
switch (param->keyDerType)
{
case CTF_KDF_TYPE1:
CMCHKUNPK(cmUnpkCtfNhKeyInfo, ¶m->u.nhKeyInf, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- /*if (cmUnpkPtr((PTR *)&cfgReqInfo, mBuf) != ROK) {
+ /*if (oduUnpackPointer((PTR *)&cfgReqInfo, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}*/
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, transId, kdfReqInfo));
+ return ((*func)(pst, spId, transId, kdfReqInfo));
}
#endif
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF023, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CtfCfgReqInfo))) != ROK) {
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&cfgReqInfo, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&cfgReqInfo, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, transId, cfgReqInfo));
+ return ((*func)(pst, spId, transId, cfgReqInfo));
}
#ifdef TENB_AS_SECURITY
for(idx=31;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->secKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
for(idx=31;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->secKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
for(idx=15;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->cpCiphKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf);
}
for(idx=15;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->upCiphKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->upCiphKey[idx],mBuf);
}
for(idx=15;idx>=0;idx--)
{
- CMCHKPK(SPkU8,param->intKey[idx],mBuf);
+ CMCHKPK(oduUnpackUInt8,param->intKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
CMCHKPK(cmPkCtfNhKeyCfmInfo, ¶m->u.nhKeyInf, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, param->keyDerType, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf);
+ return ROK;
}
/**
(ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SPkU8(status, mBuf) != ROK) {
+ if (oduUnpackUInt8(status, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmPkCtfKdfCfmInfo(kdfCfmInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)) != ROK)
(ErrVal)ECTF021, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTCTFKDFCFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#endif
\f
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SPkU8(status, mBuf) != ROK) {
+ if (oduUnpackUInt8(status, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
(ErrVal)ECTF027, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTCTFCFGCFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) EVTCTFENBSTOPIND;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef TENB_AS_SECURITY
for(idx=0;idx<32;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
for(idx=0;idx<32;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
for(idx=0;idx<16;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->intKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->intKey[idx],mBuf);
}
for(idx=0;idx<16;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->upCiphKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->upCiphKey[idx],mBuf);
}
for(idx=0;idx<16;idx++)
{
- CMCHKUNPK(SUnpkU8,¶m->cpCiphKey[idx],mBuf);
+ CMCHKUNPK(oduPackUInt8,¶m->cpCiphKey[idx],mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
TRC3(cmUnpkCtfKdfCfmInfo)
- CMCHKUNPK(SUnpkU8, ¶m->keyDerType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf);
switch (param->keyDerType)
{
case CTF_KDF_TYPE1:
CMCHKUNPK(cmUnpkCtfNhKeyCfmInfo, ¶m->u.nhKeyInf, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfKdfCfmInfo(&kdfCfmInfo, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SUnpkU8(&status, mBuf) != ROK) {
+ if (oduPackUInt8(&status, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF032, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, transId,&kdfCfmInfo, status));
+ return ((*func)(pst, suId, transId,&kdfCfmInfo, status));
}
#endif
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SUnpkU8(&status, mBuf) != ROK) {
+ if (oduPackUInt8(&status, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF032, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, transId, status));
+ return ((*func)(pst, suId, transId, status));
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, transId));
+ return ((*func)(pst, suId, transId));
}
\f
#endif
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfUeInfo(newUeInfo, mBuf) != ROK) {
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)newUeInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)newUeInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LC) {
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)ueInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)ueInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
(ErrVal)ECTF040, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
(ErrVal)ECTF041, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
pst->event = (Event) EVTCTFUEIDCHGREQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
(Txt*)& __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF042, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF043, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
(ErrVal)ECTF044, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&ueInfo, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&ueInfo, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF045, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&newUeInfo, sizeof(CtfUeInfo))) != ROK) {
#endif
SPutMsg(mBuf);
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&newUeInfo, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&newUeInfo, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF047, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo));
+ return ((*func)(pst, spId, transId, ueInfo, newUeInfo));
}
\f
(ErrVal)ECTF048, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmPkCmStatus(&status, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfUeInfo(ueInfo, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)ueInfo, mBuf) != ROK) {
+ if (oduPackPointer((PTR)ueInfo, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) {
#endif
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(suId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
(ErrVal)ECTF054, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
pst->event = (Event) EVTCTFUEIDCHGCFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
\f
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF055, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF056, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
(ErrVal)ECTF057, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&ueInfo, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&ueInfo, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF058, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCmStatus(&status, mBuf) != ROK) {
SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF059, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, transId, ueInfo, status));
+ return ((*func)(pst, suId, transId, ueInfo, status));
}
\f
TRC3(cmPkCtfCfgTransId)
for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) {
- CMCHKPK(SPkU8, param->trans[i], mBuf);
+ CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmUnpkCtfCfgTransId)
for (i=0; i<CTF_CFG_TRANSID_SIZE; i++) {
- CMCHKUNPK(SUnpkU8, ¶m->trans[i], mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->trans[i], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmPkCtfBwCfgInfo)
- CMCHKPK(SPkU8, param->eUtraBand, mBuf);
- CMCHKPK(SPkU32, param->ulBw, mBuf);
- CMCHKPK(SPkU32, param->dlBw, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->dlBw, mBuf);
/* ctf_c_001.main_4: Removed packing of param->pres */
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmUnpkCtfBwCfgInfo)
/* ctf_c_001.main_4: Removed UnPacking of param->pres */
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->dlBw = (CtfBandwidth)tmpEnum;
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->ulBw = (CtfBandwidth)tmpEnum;
- CMCHKUNPK(SUnpkU8, ¶m->eUtraBand, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->eUtraBand, mBuf);
+ return ROK;
}
TRC3(cmPkCtfTxSchemeCfg)
- CMCHKPK(SPkU32, param->cycPfx, mBuf);
- CMCHKPK(SPkU32, param->scSpacing, mBuf);
- CMCHKPK(SPkU32, param->duplexMode, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf);
/* ctf_c_001.main_4: Removed packing of param->pres */
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmUnpkCtfTxSchemeCfg)
/* ctf_c_001.main_4: Removed UnPacking of param->pres */
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->duplexMode = (CtfDuplexMode)tmpEnum;
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->scSpacing = (CtfSCSpacing)tmpEnum;
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->cycPfx = (CtfCPCfg)tmpEnum;
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmPkCtfAntennaCfgInfo)
- CMCHKPK(SPkU32, param->antPortsCnt, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf);
+ return ROK;
}
U32 tmpEnum;
TRC3(cmUnpkCtfAntennaCfgInfo)
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum;
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU8, param->prachFreqOffset, mBuf);
- CMCHKPK(SPkU8, param->highSpeedFlag, mBuf);
- CMCHKPK(SPkU8, param->zeroCorrelationZoneCfg, mBuf);
- CMCHKPK(SPkU8, param->prachCfgIndex, mBuf);
- CMCHKPK(SPkU16, param->rootSequenceIndex, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->prachFreqOffset, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->highSpeedFlag, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->zeroCorrelationZoneCfg, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->prachCfgIndex, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->rootSequenceIndex, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfPrachCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU16, ¶m->rootSequenceIndex, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->prachCfgIndex, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->zeroCorrelationZoneCfg, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->highSpeedFlag, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->prachFreqOffset, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->rootSequenceIndex, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->prachCfgIndex, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->zeroCorrelationZoneCfg, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->highSpeedFlag, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->prachFreqOffset, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU8, param->p_b, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->p_b, mBuf);
CMCHKPK(SPkS16, param->refSigPwr, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfPdschCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
CMCHKUNPK(SUnpkS16, ¶m->refSigPwr, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->p_b, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->p_b, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmPkCtfPuschCfgBasic)
- CMCHKPK(SPkU8, param->enable64QAM, mBuf);
- CMCHKPK(SPkU8, param->hoppingOffset, mBuf);
- CMCHKPK(SPkU32, param->hoppingMode, mBuf);
- CMCHKPK(SPkU8, param->noOfsubBands, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->noOfsubBands, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfPuschCfgBasic)
- CMCHKUNPK(SUnpkU8, ¶m->noOfsubBands, mBuf);
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->noOfsubBands, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->hoppingMode = (CtfPuschHoppingMode)tmpEnum;
- CMCHKUNPK(SUnpkU8, ¶m->hoppingOffset, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->enable64QAM, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->hoppingOffset, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->enable64QAM, mBuf);
+ return ROK;
}
TRC3(cmPkCtfPuschUlRS)
- CMCHKPK(SPkU8, param->cycShift, mBuf);
- CMCHKPK(SPkU8, param->grpNum, mBuf);
- CMCHKPK(SPkU8, param->seqHopEnabled, mBuf);
- CMCHKPK(SPkU8, param->grpHopEnabled, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->grpHopEnabled, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfPuschUlRS)
- CMCHKUNPK(SUnpkU8, ¶m->grpHopEnabled, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->seqHopEnabled, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->grpNum, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cycShift, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->grpHopEnabled, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->seqHopEnabled, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->grpNum, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cycShift, mBuf);
+ return ROK;
}
CMCHKPK(cmPkCtfPuschUlRS, ¶m->puschUlRS, mBuf);
CMCHKPK(cmPkCtfPuschCfgBasic, ¶m->puschBasicCfg, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfPuschCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
CMCHKUNPK(cmUnpkCtfPuschCfgBasic, ¶m->puschBasicCfg, mBuf);
CMCHKUNPK(cmUnpkCtfPuschUlRS, ¶m->puschUlRS, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU32, param->resource, mBuf);
- CMCHKPK(SPkU32, param->duration, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->resource, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->duration, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfPhichCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->duration = (CtfPhichDuration)tmpEnum;
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->resource = (CtfPhichResource)tmpEnum;
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU32, param->deltaShift, mBuf);
- CMCHKPK(SPkU16, param->n1PUCCH, mBuf);
- CMCHKPK(SPkU8, param->nCS, mBuf);
- CMCHKPK(SPkU8, param->nRB, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->deltaShift, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->n1PUCCH, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->nCS, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->nRB, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfPucchCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU8, ¶m->nRB, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->nCS, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->n1PUCCH, mBuf);
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nRB, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->nCS, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->n1PUCCH, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->deltaShift = (CtfPucchDeltaShift)tmpEnum;
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU8, param->srsSetup.srsMaxUpPts, mBuf);
- CMCHKPK(SPkU8, param->srsSetup.srsANSimultTx, mBuf);
- CMCHKPK(SPkU8, param->srsSetup.sfCfg, mBuf);
- CMCHKPK(SPkU8, param->srsSetup.srsBw, mBuf);
- CMCHKPK(SPkU8, param->srsCfgType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->srsSetup.srsMaxUpPts, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->srsSetup.srsANSimultTx, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->srsSetup.sfCfg, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->srsSetup.srsBw, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->srsCfgType, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfSrsUlCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU8, ¶m->srsCfgType, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsBw, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->srsSetup.sfCfg, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsANSimultTx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsMaxUpPts, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->srsCfgType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsBw, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.sfCfg, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsANSimultTx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsMaxUpPts, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU8, param->spclSfPatterns, mBuf);
- CMCHKPK(SPkU8, param->sfAssignment, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->spclSfPatterns, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->sfAssignment, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
/* ctf_c_001.main_4: Added support for vendor specific parameters */
if( param->buffLen != 0) {
SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf);
}
- CMCHKPK(SPkU16,param->buffLen,mBuf);
+ CMCHKPK(oduUnpackUInt16,param->buffLen,mBuf);
- RETVALUE(ROK);
+ return ROK;
}
\f
/***********************************************************
TRC3(cmUnpkCtfVendorSpecParams)
- CMCHKUNPK(SUnpkU16, ¶m->buffLen, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->buffLen, mBuf);
if(param->buffLen != 0) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)¶m->paramBuffer, param->buffLen)) != ROK) {
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF060, (ErrVal)0, (Txt*)&"Unpacking failed");
#endif
- RETVALUE(RFAILED) ;
+ return RFAILED ;
}
SRemPreMsgMult(param->paramBuffer, param->buffLen,mBuf) ;
}
param->paramBuffer = NULLP ;
}
- RETVALUE(ROK);
+ return ROK;
}
#endif
\f
TRC3(cmUnpkCtfTddSfCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU8, ¶m->sfAssignment, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->spclSfPatterns, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->sfAssignment, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->spclSfPatterns, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
*
TRC3(cmPkCtfUnLicnsdCellParam)
CMCHKPK(SPkS32, param->txPowerLimit, mBuf);
- CMCHKPK(SPkU8, param->coExistMethod, mBuf);
- CMCHKPK(SPkU8, param->lteOnPeriod, mBuf);
- CMCHKPK(SPkU8, param->ccaMethod, mBuf);
- CMCHKPK(SPkU8, param->adaptiveTx, mBuf);
- CMCHKPK(SPkU16, param->transPeriod, mBuf);
- CMCHKPK(SPkU16, param->listenPrd, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->lteOnPeriod, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->ccaMethod, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->adaptiveTx, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->transPeriod, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->listenPrd, mBuf);
CMCHKPK(SPkS16, param->energyTh, mBuf);
- CMCHKPK(SPkU16, param->scanTimePrd, mBuf);
- CMCHKPK(SPkU16, param->activityTh, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->scanTimePrd, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->activityTh, mBuf);
for(idx = 0; idx < param->numFreq; idx++)
{
- CMCHKPK(SPkU32, param->earfcn[idx], mBuf);
+ CMCHKPK(oduUnpackUInt32, param->earfcn[idx], mBuf);
}
- CMCHKPK(SPkU8, param->numFreq, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->numFreq, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
\f
/***********************************************************
#ifdef EMTC_ENABLE
for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) {
- CMCHKPK(SPkU8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
- CMCHKPK(SPkU8, param->ceLevelInfo[i].lastPreamble, mBuf);
- CMCHKPK(SPkU8, param->ceLevelInfo[i].firstPreamble, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].lastPreamble, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].firstPreamble, mBuf);
}
- CMCHKPK(SPkU8, param->mPdcchStart, mBuf);
- CMCHKPK(SPkU8, param->catMenabled, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->mPdcchStart, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->catMenabled, mBuf);
#endif
if(param->unLicnsdCfgPres)
{
printf("pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres);
CMCHKPK(cmPkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf);
}
- CMCHKPK(SPkU8, param->unLicnsdCfgPres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->unLicnsdCfgPres, mBuf);
/*Added for rgu dynamic delta*/
- CMCHKPK(SPkU8, param->numDlUePerTti, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->numDlUePerTti, mBuf);
CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
- CMCHKPK(SPkU16, param->ulEarfcn, mBuf);
- CMCHKPK(SPkU16, param->dlEarfcn, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->ulEarfcn, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dlEarfcn, mBuf);
CMCHKPK(SPkS16, param->priSigPwr, mBuf);
CMCHKPK(SPkS16, param->secSigPwr, mBuf);
/* Packing PHY configuration parameters */
- CMCHKPK(SPkU32, param->period, mBuf);
- CMCHKPK(SPkU32, param->counter, mBuf);
- CMCHKPK(SPkU16, param->opMode, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->period, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->counter, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->opMode, mBuf);
/* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/
- CMCHKPK(SPkU8, param->rachSrRepModePres, mBuf);
- CMCHKPK(SPkU16, param->rachSrRepMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf);
- CMCHKPK(SPkU8, param->dataRepModePres, mBuf);
- CMCHKPK(SPkU16, param->dataRepMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf);
- CMCHKPK(SPkU8, param->phySyncModePres, mBuf);
- CMCHKPK(SPkU16, param->phySyncMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf);
- CMCHKPK(SPkU8, param->rxAntennaPortsPres, mBuf);
- CMCHKPK(SPkU16, param->rxAntennaPorts, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf);
- CMCHKPK(SPkU8, param->txAntennaPortsPres, mBuf);
- CMCHKPK(SPkU16, param->txAntennaPorts, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf);
- CMCHKPK(SPkU8, param->pucchProbDtxAckPres, mBuf);
- CMCHKPK(SPkU16, param->pucchProbDtxAck, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf);
- CMCHKPK(SPkU8, param->puschProbDtxAckPres, mBuf);
- CMCHKPK(SPkU16, param->puschProbDtxAck, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf);
- CMCHKPK(SPkU8, param->srsDopEstFactorPres, mBuf);
- CMCHKPK(SPkU16, param->srsDopEstFactor, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf);
- CMCHKPK(SPkU8, param->prachPkRatio0Pres, mBuf);
- CMCHKPK(SPkU16, param->prachPkRatio0, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf);
- CMCHKPK(SPkU8, param->prachPkRatio4Pres, mBuf);
- CMCHKPK(SPkU16, param->prachPkRatio4, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf);
- CMCHKPK(SPkU8, param->pucchNoiseGammaPres, mBuf);
- CMCHKPK(SPkU16, param->pucchNoiseGamma, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf);
- CMCHKPK(SPkU8, param->extWinMarginPres, mBuf);
- CMCHKPK(SPkU16, param->extWinMargin, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf);
- CMCHKPK(SPkU8, param->dciPowOsPres, mBuf);
- CMCHKPK(SPkU16, param->dciPowOs, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf);
- CMCHKPK(SPkU8, param->cfiPowOsPres, mBuf);
- CMCHKPK(SPkU16, param->cfiPowOs, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf);
- CMCHKPK(SPkU8, param->syncSigPowOsPres, mBuf);
- CMCHKPK(SPkU16, param->syncSigPowOs, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf);
CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf);
CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf);
CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf);
CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf);
CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf);
- CMCHKPK(SPkU8, param->physCellId, mBuf);
- CMCHKPK(SPkU8, param->physCellIdPres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf);
CMCHKPK(SPkS16, param->macSapId, mBuf);
CMCHKPK(SPkS16, param->schSapId, mBuf);
- CMCHKPK(SPkU8, param->cellIdGrpId, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
*
TRC3(cmPkCtfUnLicnsdCellParam)
- CMCHKUNPK(SUnpkU8, ¶m->numFreq, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->numFreq, mBuf);
for(idx = 0; idx < param->numFreq; idx++)
{
- CMCHKUNPK(SUnpkU32, ¶m->earfcn[idx], mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->earfcn[idx], mBuf);
}
- CMCHKUNPK(SUnpkU16, ¶m->activityTh, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->scanTimePrd, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->activityTh, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->scanTimePrd, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->energyTh, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->listenPrd, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->transPeriod, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->adaptiveTx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->ccaMethod, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->lteOnPeriod, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->coExistMethod, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->listenPrd, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->transPeriod, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->adaptiveTx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->ccaMethod, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->lteOnPeriod, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->coExistMethod, mBuf);
CMCHKUNPK(SUnpkS32, ¶m->txPowerLimit, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
\f
/* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cellIdGrpId, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cellIdGrpId, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->schSapId, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->macSapId, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->physCellIdPres, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->physCellId, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf);
CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf);
CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf);
CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf);
CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf);
CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->syncSigPowOs, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->syncSigPowOsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->cfiPowOs, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cfiPowOsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->dciPowOs, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dciPowOsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->extWinMargin, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->extWinMarginPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->pucchNoiseGamma, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->pucchNoiseGammaPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio4, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio4Pres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio0, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio0Pres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->srsDopEstFactor, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->srsDopEstFactorPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->puschProbDtxAck, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->puschProbDtxAckPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->pucchProbDtxAck, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->pucchProbDtxAckPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->txAntennaPorts, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->txAntennaPortsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->rxAntennaPorts, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->rxAntennaPortsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->phySyncMode, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->phySyncModePres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->dataRepMode, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dataRepModePres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->rachSrRepMode, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->rachSrRepModePres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf);
/* UnPacking PHY configuration parameters */
- CMCHKUNPK(SUnpkU16, ¶m->opMode, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->counter, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->period, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->opMode, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->counter, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->period, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->dlEarfcn, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->ulEarfcn, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dlEarfcn, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->ulEarfcn, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf);
/* Added for rgu dynamic delta change*/
- CMCHKUNPK(SUnpkU8, ¶m->numDlUePerTti, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->unLicnsdCfgPres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->numDlUePerTti, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->unLicnsdCfgPres, mBuf);
if(param->unLicnsdCfgPres)
{
CMCHKUNPK(cmUnpkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf);
}
#ifdef EMTC_ENABLE
- CMCHKUNPK(SUnpkU8, ¶m->catMenabled, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->mPdcchStart, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->catMenabled, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->mPdcchStart, mBuf);
for (i = 0; i < CTF_MAX_CE_LEVEL; i++) {
- CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].firstPreamble, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].lastPreamble, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].firstPreamble, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].lastPreamble, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
}
#endif
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmPkCtfCellRecfgInfo)
#ifdef ENABLE_API_LOG
- CMCHKPK(SPkU8, param->enableAPILog, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf);
#endif /* ENABLE_API_LOG */
/* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/
CMCHKPK(SPkS16, param->secSigPwr, mBuf);
CMCHKPK(SPkS16, param->priSigPwr, mBuf);
CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
- CMCHKPK(SPkU8, param->rachSrRepModePres, mBuf);
- CMCHKPK(SPkU16, param->rachSrRepMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf);
- CMCHKPK(SPkU8, param->dataRepModePres, mBuf);
- CMCHKPK(SPkU16, param->dataRepMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf);
- CMCHKPK(SPkU8, param->phySyncModePres, mBuf);
- CMCHKPK(SPkU16, param->phySyncMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf);
- CMCHKPK(SPkU8, param->rxAntennaPortsPres, mBuf);
- CMCHKPK(SPkU16, param->rxAntennaPorts, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf);
- CMCHKPK(SPkU8, param->txAntennaPortsPres, mBuf);
- CMCHKPK(SPkU16, param->txAntennaPorts, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf);
- CMCHKPK(SPkU8, param->pucchProbDtxAckPres, mBuf);
- CMCHKPK(SPkU16, param->pucchProbDtxAck, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf);
- CMCHKPK(SPkU8, param->puschProbDtxAckPres, mBuf);
- CMCHKPK(SPkU16, param->puschProbDtxAck, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf);
- CMCHKPK(SPkU8, param->srsDopEstFactorPres, mBuf);
- CMCHKPK(SPkU16, param->srsDopEstFactor, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf);
- CMCHKPK(SPkU8, param->prachPkRatio0Pres, mBuf);
- CMCHKPK(SPkU16, param->prachPkRatio0, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf);
- CMCHKPK(SPkU8, param->prachPkRatio4Pres, mBuf);
- CMCHKPK(SPkU16, param->prachPkRatio4, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf);
- CMCHKPK(SPkU8, param->pucchNoiseGammaPres, mBuf);
- CMCHKPK(SPkU16, param->pucchNoiseGamma, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf);
- CMCHKPK(SPkU8, param->extWinMarginPres, mBuf);
- CMCHKPK(SPkU16, param->extWinMargin, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf);
- CMCHKPK(SPkU8, param->dciPowOsPres, mBuf);
- CMCHKPK(SPkU16, param->dciPowOs, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf);
- CMCHKPK(SPkU8, param->cfiPowOsPres, mBuf);
- CMCHKPK(SPkU16, param->cfiPowOs, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf);
- CMCHKPK(SPkU8, param->syncSigPowOsPres, mBuf);
- CMCHKPK(SPkU16, param->syncSigPowOs, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf);
CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf);
CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf);
CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf);
CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf);
CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf);
- CMCHKPK(SPkU8, param->physCellId, mBuf);
- CMCHKPK(SPkU8, param->physCellIdPres, mBuf);
- CMCHKPK(SPkU8, param->cellIdGrpId, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- CMCHKPK(SPkU32, param->ctfReCfgType, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt32, param->ctfReCfgType, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfCellRecfgInfo)
/* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->ctfReCfgType = (CtfReCfgType)tmpEnum;
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cellIdGrpId, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->physCellIdPres, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->physCellId, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cellIdGrpId, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf);
CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf);
CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf);
CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf);
CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf);
CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->syncSigPowOs, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->syncSigPowOsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->cfiPowOs, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cfiPowOsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->dciPowOs, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dciPowOsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->extWinMargin, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->extWinMarginPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->pucchNoiseGamma, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->pucchNoiseGammaPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio4, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio4Pres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio0, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio0Pres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->srsDopEstFactor, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->srsDopEstFactorPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->puschProbDtxAck, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->puschProbDtxAckPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->pucchProbDtxAck, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->pucchProbDtxAckPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->txAntennaPorts, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->txAntennaPortsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->rxAntennaPorts, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->rxAntennaPortsPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->phySyncMode, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->phySyncModePres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->dataRepMode, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dataRepModePres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->rachSrRepMode, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->rachSrRepModePres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf);
printf("param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr);
#ifdef ENABLE_API_LOG
- CMCHKUNPK(SUnpkU8, ¶m->enableAPILog, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->enableAPILog, mBuf);
#endif /* ENABLE_API_LOG */
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
- CMCHKPK(SPkU32, param->pA, mBuf);
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt32, param->pA, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
U32 tmpEnum;
TRC3(cmUnpkCtfDedPdschCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->pA = (CtfPdschPaParam)tmpEnum;
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_4:115549: packing tddAckNackFBMode and tddAckNackCfgPres */
if (param->tddAckNackCfgPres != FALSE)
{
- CMCHKPK(SPkU32, param->tddAckNackFBMode, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->tddAckNackFBMode, mBuf);
}
- CMCHKPK(SPkU8, param->tddAckNackCfgPres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->tddAckNackCfgPres, mBuf);
#endif /* CTF_VER3 */
- CMCHKPK(SPkU16, param->pucchSetup.n1PUCCHRep, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->pucchSetup.n1PUCCHRep, mBuf);
#ifdef CTF_VER3
/*ctf_c_001.main_4:115549: packing pucchSetup.repFactPres */
if (param->pucchSetup.repFactPres)
{
- CMCHKPK(SPkU32, param->pucchSetup.repFact, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf);
}
- CMCHKPK(SPkU8, param->pucchSetup.repFactPres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pucchSetup.repFactPres, mBuf);
#else
- CMCHKPK(SPkU32, param->pucchSetup.repFact, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf);
#endif /* CTF_VER3 */
- CMCHKPK(SPkU8, param->dedPucchCfgType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedPucchCfgType, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfDedPucchCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU8, ¶m->dedPucchCfgType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedPucchCfgType, mBuf);
#ifdef CTF_VER3
/* ctf_c_001.main_4:115549: unpacking pucchSetup.repFactPres */
- CMCHKUNPK(SUnpkU8, ¶m->pucchSetup.repFactPres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pucchSetup.repFactPres, mBuf);
if (param->pucchSetup.repFactPres)
{
- CMCHKUNPK(SUnpkU32, (U32 *)¶m->pucchSetup.repFact, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf);
}
#else
- CMCHKUNPK(SUnpkU32, (U32 *)¶m->pucchSetup.repFact, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf);
#endif /*CTF_VER3 */
- CMCHKUNPK(SUnpkU16, ¶m->pucchSetup.n1PUCCHRep, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->pucchSetup.n1PUCCHRep, mBuf);
#ifdef CTF_VER3
/*ctf_c_001.main_4:115549: unpacking tddAckNackCfgPres and tddAckNackFBMode */
- CMCHKUNPK(SUnpkU8, ¶m->tddAckNackCfgPres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->tddAckNackCfgPres, mBuf);
if (param->tddAckNackCfgPres != FALSE)
{
- CMCHKUNPK(SUnpkU32, (U32 *)¶m->tddAckNackFBMode, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tddAckNackFBMode, mBuf);
}
#endif /* CTF_VER3 */
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU8, param->betaOffsetCqiIdx, mBuf);
- CMCHKPK(SPkU8, param->betaOffsetRiIdx, mBuf);
- CMCHKPK(SPkU8, param->betaOffsetAckIdx, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->betaOffsetCqiIdx, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->betaOffsetRiIdx, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->betaOffsetAckIdx, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfDedPuschCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU8, ¶m->betaOffsetAckIdx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->betaOffsetRiIdx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->betaOffsetCqiIdx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetAckIdx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetRiIdx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetCqiIdx, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmPkCtfCqiRptModePeriodic)
/* ctf_c_001.main_2: added packning for cqiMask*/
#ifdef CTF_VER1
- CMCHKPK(SPkU32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
- CMCHKPK(SPkU8, param->cqiSetup.cqiMask.pres, mBuf);
+ CMCHKPK(oduUnpackUInt32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cqiSetup.cqiMask.pres, mBuf);
#endif /* CTF_VER1 */
- CMCHKPK(SPkU8, param->cqiSetup.simultaneousAckNack, mBuf);
- CMCHKPK(SPkU16, param->cqiSetup.riCfgIndx, mBuf);
- CMCHKPK(SPkU8, param->cqiSetup.riCfgPres, mBuf);
- CMCHKPK(SPkU8, param->cqiSetup.subbandCqi.k, mBuf);
- CMCHKPK(SPkU8, param->cqiSetup.formatIndicator, mBuf);
- CMCHKPK(SPkU16, param->cqiSetup.cqiPmiCfgIndx, mBuf);
- CMCHKPK(SPkU16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
- CMCHKPK(SPkU8, param->cqiPeriodicCfgType, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->cqiSetup.simultaneousAckNack, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->cqiSetup.riCfgIndx, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cqiSetup.riCfgPres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cqiSetup.subbandCqi.k, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cqiSetup.formatIndicator, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPmiCfgIndx, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->cqiPeriodicCfgType, mBuf);
+ return ROK;
}
#endif
TRC3(cmUnpkCtfCqiRptModePeriodic)
- CMCHKUNPK(SUnpkU8, ¶m->cqiPeriodicCfgType, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.cqiPmiCfgIndx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.formatIndicator, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.subbandCqi.k, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.riCfgPres, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.riCfgIndx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.simultaneousAckNack, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cqiPeriodicCfgType, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.cqiPmiCfgIndx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.formatIndicator, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.subbandCqi.k, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.riCfgPres, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.riCfgIndx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.simultaneousAckNack, mBuf);
/* ctf_c_001.main_2: added Unpackning for cqiMask*/
#ifdef CTF_VER1
- CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.cqiMask.pres, mBuf);
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.cqiMask.pres, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->cqiSetup.cqiMask.cqiMaskSetup = tmpEnum;
#endif /* CTF_VER1 */
- RETVALUE(ROK);
+ return ROK;
}
*/
if(param->reportMode.aPeriodicRpt.pres != FALSE)
{
- CMCHKPK(SPkU32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf);
}
- CMCHKPK(SPkU8, param->reportMode.aPeriodicRpt.pres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->reportMode.aPeriodicRpt.pres, mBuf);
if(param->reportMode.periodicRpt.pres != FALSE)
{
CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf);
}
- CMCHKPK(SPkU8, param->reportMode.periodicRpt.pres, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->reportMode.periodicRpt.pres, mBuf);
#else /* CTF_VER2 */
CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf);
break;
case CTF_CQI_RPTMODE_APRDIOC:
- CMCHKPK(SPkU32, param->reportMode.aPeriodicRpt, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, param->reportingMode, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->reportingMode, mBuf);
#endif /* CTF_VER2 */
/* ctf_c_001.main_2: added packning for pmiRiRpt*/
#ifdef CTF_VER1
- CMCHKPK(SPkU32, param->pmiRiRpt.pmiRiRptSetup, mBuf);
- CMCHKPK(SPkU8, param->pmiRiRpt.pres, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->pmiRiRpt.pmiRiRptSetup, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pmiRiRpt.pres, mBuf);
#endif /* CTF_VER1 */
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
#endif
TRC3(cmUnpkCtfCqiReportCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
/* ctf_c_001.main_2: added Unpackning for cqiMask*/
#ifdef CTF_VER1
- CMCHKUNPK(SUnpkU8, ¶m->pmiRiRpt.pres, mBuf);
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pmiRiRpt.pres, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->pmiRiRpt.pmiRiRptSetup = tmpEnum;
#endif /* CTF_VER1 */
*ctf_c_001.main_2: Added provision to send Periodic and aPeriodic CQI
*report configuration in the same message
*/
- CMCHKUNPK(SUnpkU8, ¶m->reportMode.periodicRpt.pres, mBuf)
+ CMCHKUNPK(oduPackUInt8, ¶m->reportMode.periodicRpt.pres, mBuf)
if(param->reportMode.periodicRpt.pres != FALSE)
{
CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf);
}
- CMCHKUNPK(SUnpkU8, ¶m->reportMode.aPeriodicRpt.pres, mBuf)
+ CMCHKUNPK(oduPackUInt8, ¶m->reportMode.aPeriodicRpt.pres, mBuf)
if(param->reportMode.aPeriodicRpt.pres != FALSE)
{
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->reportMode.aPeriodicRpt.aPeriodicRptMode =
(CtfCqiRptModeAperiodic)tmpEnum;
}
#else /* CTF_VER2 */
- CMCHKUNPK(SUnpkU8, ¶m->reportingMode, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->reportingMode, mBuf);
switch(param->reportingMode) {
case CTF_CQI_RPTMODE_APRDIOC:
- CMCHKUNPK(SUnpkU32, (U32 *)¶m->reportMode.aPeriodicRpt, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)¶m->reportMode.aPeriodicRpt, mBuf);
break;
case CTF_CQI_RPTMODE_PRDIOC:
CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif /* CTF_VER2 */
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU8, param->dedSrsSetup.cyclicShift, mBuf);
- CMCHKPK(SPkU8, param->dedSrsSetup.txComb, mBuf);
- CMCHKPK(SPkU16, param->dedSrsSetup.srsCfgIdx, mBuf);
- CMCHKPK(SPkU8, param->dedSrsSetup.duration, mBuf);
- CMCHKPK(SPkU8, param->dedSrsSetup.freqDmnPos, mBuf);
- CMCHKPK(SPkU8, param->dedSrsSetup.srsHopngBw, mBuf);
- CMCHKPK(SPkU8, param->dedSrsSetup.srsBw, mBuf);
- CMCHKPK(SPkU8, param->dedSrsUlCfgType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.cyclicShift, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.txComb, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dedSrsSetup.srsCfgIdx, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.duration, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.freqDmnPos, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsHopngBw, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsBw, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrsUlCfgType, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfDedSrsUlCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU8, ¶m->dedSrsUlCfgType, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.srsBw, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.srsHopngBw, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.freqDmnPos, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.duration, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->dedSrsSetup.srsCfgIdx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.txComb, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.cyclicShift, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrsUlCfgType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.srsBw, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.srsHopngBw, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.freqDmnPos, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.duration, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dedSrsSetup.srsCfgIdx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.txComb, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.cyclicShift, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU8, param->dedSrSetup.srCfgIdx, mBuf);
- CMCHKPK(SPkU16, param->dedSrSetup.srPUCCHRi, mBuf);
- CMCHKPK(SPkU8, param->dedSRCfgType, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSrSetup.srCfgIdx, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->dedSrSetup.srPUCCHRi, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dedSRCfgType, mBuf);
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfDedSRCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKUNPK(SUnpkU8, ¶m->dedSRCfgType, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->dedSrSetup.srPUCCHRi, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dedSrSetup.srCfgIdx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSRCfgType, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->dedSrSetup.srPUCCHRi, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dedSrSetup.srCfgIdx, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
#endif /* TFU_UPGRADE */
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
- CMCHKPK(SPkU32, param->ueTxAntSelection.txAntSelect, mBuf);
- CMCHKPK(SPkU8, param->ueTxAntSelection.cfgType, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->ueTxAntSelection.txAntSelect, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->ueTxAntSelection.cfgType, mBuf);
/* ctf_c_001.main_3 txMode is of type enum and is 32bit length */
- CMCHKPK(SPkU32, (U32)param->txMode, mBuf);
+ CMCHKPK(oduUnpackUInt32, (U32)param->txMode, mBuf);
#ifdef CTF_VER2
/*
*ctf_c_001.main_2: Added Packing of CodeBookSubsetRestriction parameter
switch(param->codeBookSubsetRes.ctfCdBkRestType)
{
case N2TX_ANT_TM3:
- CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm3, mBuf);
break;
case N4TX_ANT_TM3:
- CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm3, mBuf);
break;
case N2TX_ANT_TM4:
- CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm4, mBuf);
break;
case N4TX_ANT_TM4:
for(idx = 0; idx < 8; idx++)
- CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm4[idx], mBuf);
break;
case N2TX_ANT_TM5:
- CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm5, mBuf);
break;
case N4TX_ANT_TM5:
- CMCHKPK(SPkU16, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm5, mBuf);
break;
case N2TX_ANT_TM6:
- CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm6, mBuf);
break;
case N4TX_ANT_TM6:
- CMCHKPK(SPkU16, param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm6, mBuf);
break;
default :
break;
}
- CMCHKPK(SPkU32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf);
#endif /* CTF_VER2 */
}
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfDedAntCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
{
/*
* Added Unpacking for CodeBookSubsetRestriction parameter
*/
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->codeBookSubsetRes.ctfCdBkRestType = (CtfCdBkSubsetRestnType)tmpEnum;
switch(param->codeBookSubsetRes.ctfCdBkRestType)
{
case N2TX_ANT_TM3:
- CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm3, mBuf);
break;
case N4TX_ANT_TM3:
- CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm3, mBuf);
break;
case N2TX_ANT_TM4:
- CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm4, mBuf);
break;
case N4TX_ANT_TM4:
for(idx = 7; idx >= 0; idx--)
{
- CMCHKUNPK(SUnpkU8, &(param->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt8, &(param->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm4[idx]), mBuf);
}
break;
case N2TX_ANT_TM5:
- CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm5, mBuf);
break;
case N4TX_ANT_TM5:
- CMCHKUNPK(SUnpkU16, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm5, mBuf);
break;
case N2TX_ANT_TM6:
- CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
n2TxAntTm6, mBuf);
break;
case N4TX_ANT_TM6:
- CMCHKUNPK(SUnpkU16, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
+ CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn.
n4TxAntTm6, mBuf);
break;
default :
}
#endif /* CTF_VER2 */
/* ctf_c_001.main_3 Enum is 32bit length */
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->txMode = (CtfUeTxAntMode)tmpEnum;
- CMCHKUNPK(SUnpkU8, ¶m->ueTxAntSelection.cfgType, mBuf);
- CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->ueTxAntSelection.cfgType, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf);
param->ueTxAntSelection.txAntSelect = (CtfUeTxAntSelectType)tmpEnum;
}
- RETVALUE(ROK);
+ return ROK;
}
\f
Buffer *mBuf;
#endif
{
- CMCHKPK(SPkU16, param->sCellId, mBuf);
- CMCHKPK(SPkU8, param->sCellIdx, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
*
{
CMCHKPK(cmPkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[(U8)idx], mBuf);
}
- CMCHKPK(SPkU32, param->sCellAction, mBuf);
- CMCHKPK(SPkU8, param->numSCells, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->sCellAction, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
Buffer *mBuf;
#endif
{
- CMCHKUNPK(SUnpkU8, ¶m->sCellIdx, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->sCellId, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
\f
/***********************************************************
{
U8 idx;
- CMCHKUNPK(SUnpkU8, ¶m->numSCells, mBuf);
- CMCHKUNPK(SUnpkU32, (U32*)¶m->sCellAction, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32*)¶m->sCellAction, mBuf);
for(idx = 0 ; idx < param->numSCells; idx++)
{
CMCHKUNPK(cmUnpkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[idx], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
\f
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
- CMCHKPK(SPkU32, param->ueCategory, mBuf);
- CMCHKPK(SPkU8, param->pres, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt32, param->ueCategory, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfUeCatCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf);
/*ctf_c_001.main_1*/
if(param->pres != FALSE)
- CMCHKUNPK(SUnpkU32, (U32 *)¶m->ueCategory, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ueCategory, mBuf);
+ return ROK;
}
TRC3(cmPkCtfDedCfgInfo)
#ifdef EMTC_ENABLE
- CMCHKPK(SPkU8, param->isEmtcUe, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf);
#endif
CMCHKPK(cmPkCtfDedAntCfgInfo, ¶m->antInfo, mBuf);
#ifndef TFU_UPGRADE
CMCHKPK(cmPkCtfUeCatCfgInfo, ¶m->ueCatCfg, mBuf);
CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
#endif /* TFU_UPGRADE */
CMCHKUNPK(cmUnpkCtfDedAntCfgInfo, ¶m->antInfo, mBuf);
#ifdef EMTC_ENABLE
- CMCHKUNPK(SUnpkU8, ¶m->isEmtcUe, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->isEmtcUe, mBuf);
#endif
- RETVALUE(ROK);
+ return ROK;
}
#endif
CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf);
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmPkCtfCellReleaseInfo)
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmUnpkCtfCellReleaseInfo)
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf);
CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf);
CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf);
CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf);
- RETVALUE(ROK);
+ return ROK;
}
CMCHKPK(cmPkCtfCellCfgInfo, ¶m->u.cellCfg, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, param->cfgElem, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf);
switch(param->cfgElem) {
case CTF_CELL_CFG:
CMCHKUNPK(cmUnpkCtfCellCfgInfo, ¶m->u.cellCfg, mBuf);
CMCHKUNPK(cmUnpkCtfDedCfgInfo, ¶m->u.dedCfg, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, param->cfgElem, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfReCfgInfo)
- CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf);
switch(param->cfgElem) {
case CTF_CELL_CFG:
CMCHKUNPK(cmUnpkCtfCellRecfgInfo, ¶m->u.cellRecfg, mBuf);
CMCHKUNPK(cmUnpkCtfCellStop, ¶m->u.cellRecfg, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
CMCHKPK(cmPkCtfCellReleaseInfo, ¶m->u.cellRel, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, param->cfgElem, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfReleaseInfo)
- CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf);
switch(param->cfgElem) {
case CTF_CELL_CFG:
CMCHKUNPK(cmUnpkCtfCellReleaseInfo, ¶m->u.cellRel, mBuf);
CMCHKUNPK(cmUnpkCtfDedReleaseInfo, ¶m->u.dedRel, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
CMCHKPK(cmPkCtfCfgInfo, ¶m->u.cfg, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, param->cfgType, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf);
+ return ROK;
}
TRC3(cmUnpkCtfCfgReqInfo)
- CMCHKUNPK(SUnpkU8, ¶m->cfgType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf);
switch(param->cfgType) {
case CTF_CONFIG:
CMCHKUNPK(cmUnpkCtfCfgInfo, ¶m->u.cfg, mBuf);
CMCHKUNPK(cmUnpkCtfReleaseInfo, ¶m->u.release, mBuf);
break;
default :
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef CTF_VER3
if((retVal = cmUnpkCtfVendorSpecParams(pst, ¶m->vendorParams, mBuf)) != ROK)
- RETVALUE(retVal);
+ return (retVal);
#endif
- RETVALUE(ROK);
+ return ROK;
}
/* Starts - Fix for CR ccpu00123185 */
TRC3(cmPkCtfCellPwrcfgInfo)
/* Added the pack for newly added reference signal Power*/
- CMCHKPK(SPkU32, (U32)param->ctfCellStatus, mBuf);
+ CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf);
CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
CMCHKPK(SPkS16, param->priSigPwr, mBuf);
CMCHKPK(SPkS16, param->secSigPwr, mBuf);
CMCHKPK(SPkS16, param->pdschCfg.refSigPwr, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf);
- CMCHKUNPK(SUnpkU32, (U32 *)¶m->ctfCellStatus, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
TRC3(cmPkCtfCellStop)
/* Added the pack for newly added reference signal Power*/
- CMCHKPK(SPkU32, (U32)param->ctfCellStatus, mBuf);
+ CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf);
CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
CMCHKPK(SPkS16, param->priSigPwr, mBuf);
CMCHKPK(SPkS16, param->secSigPwr, mBuf);
CMCHKPK(SPkS16, param->pdschCfg.refSigPwr, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/***********************************************************
CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf);
CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf);
- CMCHKUNPK(SUnpkU32, (U32 *)¶m->ctfCellStatus, mBuf);
+ CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/* Periodic REM Scan for TPM */
{
TRC3(cmPkPerRemScanCellInfo)
- CMCHKPK(SPkU16,param->pci, mBuf);
- CMCHKPK(SPkU8, param->rsrp, mBuf);
- CMCHKPK(SPkU8, param->dlBw, mBuf);
- CMCHKPK(SPkU8, param->numTx, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt16,param->pci, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->dlBw, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->numTx, mBuf);
+ return ROK;
}
{
CMCHKPK(cmPkPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf);
}
- CMCHKPK(SPkU8, param->numCells, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->numCells, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
/**
#endif
SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
sizeof(CtfPeriodicRemCellSearchRsp));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector == ODU_SELECTOR_LC) {
if (cmPkCtfPeriodicCellSearchRsp(CellCfgRsp, mBuf) != ROK) {
SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
sizeof(CtfPeriodicRemCellSearchRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmPkPtr((PTR)CellCfgRsp, mBuf) != ROK) {
+ if (oduPackPointer((PTR)CellCfgRsp, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
/* ctf_c_001.main_3 Compilation warning fix with g++ */
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
sizeof(CtfPeriodicRemCellSearchRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
sizeof(CtfPeriodicRemCellSearchRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (SPkS16(spId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
sizeof(CtfPeriodicRemCellSearchRsp));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
sizeof(CtfPeriodicRemCellSearchRsp));
}
pst->event = (Event)EVTCTFPREMCELLSRCHRSP;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef ANSI
{
TRC3(cmUnpkCtfPerRemScanCellInfo);
- CMCHKUNPK(SUnpkU8, ¶m->numTx, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->dlBw, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->rsrp, mBuf);
- CMCHKUNPK(SUnpkU16, ¶m->pci, mBuf);
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt8, ¶m->numTx, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->dlBw, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf);
+ return ROK;
}
#ifdef ANSI
S16 idx;
TRC3(cmUnpkCtfPerRemCellSrch);
- CMCHKUNPK(SUnpkU8, ¶m->numCells, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->numCells, mBuf);
for(idx = 0; idx < (param->numCells); idx++)
{
CMCHKUNPK(cmUnpkCtfPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
/**
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) {
SPutMsg(mBuf);
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (pst->selector != ODU_SELECTOR_LWLC) {
if ((SGetSBuf(pst->region, pst->pool, (Data **)&CellSrchRsp,
(ErrVal)ECTF024, (ErrVal)0, (Txt*)&"Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
if (pst->selector == ODU_SELECTOR_LWLC) {
- if (cmUnpkPtr((PTR *)&CellSrchRsp, mBuf) != ROK) {
+ if (oduUnpackPointer((PTR *)&CellSrchRsp, mBuf) != ROK) {
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else if (pst->selector == ODU_SELECTOR_LC)
(Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, suId, &transId, CellSrchRsp));
+ return ((*func)(pst, suId, &transId, CellSrchRsp));
}
/* Periodic REM Scan for TPM End */
Code Review / o-du / l2.git / blobdiff