"SGetMsg failed ...!\n");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
ret1 = cmPkKwMngmt(cfg, LKW_EVT_CFG_REQ, mBuf);
"cmPkKwMngmt failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_CFG_REQ; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of packRlcConfigReq */
"cmUnpkKwMngmt failure ......!");
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
(Void) (*func)(pst, &cfg);
- RETVALUE(ROK);
+ return ROK;
} /* end of unpackRlcConfigReq */
"SGetMsg failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
ret1 = cmPkKwMngmt(cntrl, LKW_EVT_CNTRL_REQ, mBuf);
"cmPkKwMngmt failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
pst->event = (Event) LKW_EVT_CNTRL_REQ; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwCntrlReq */
"cmUnpkKwMngmt failure ......!");
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &cfm));
+ return ((*func)(pst, &cfm));
} /* end of cmUnpkLkwCntrlReq */
"SGetMsg failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
ret1 = cmPkKwMngmt(cfm, LKW_EVT_CNTRL_CFM, mBuf);
"Packing failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_CNTRL_CFM; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwCntrlCfm */
"cmUnpkKwMngmt failure ......!");
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &cfm));
+ return ((*func)(pst, &cfm));
} /* end of cmUnpkLkwCntrlCfm */
"SPutMsg failure ......!");
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, 0, &cfm));
+ return ((*func)(pst, 0, &cfm));
} /* end of cmUnpkLkwStsCfm */
"SGetMsg failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
ret1 = cmPkKwMngmt(cfm, LKW_EVT_CFG_CFM, mBuf);
"SPutMsg failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_CFG_CFM; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of packRlcConfigCfm */
"SPutMsg failure ......!");
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &cfm));
+ return ((*func)(pst, &cfm));
} /* end of unpackRlcConfigCfm */
"SGetMsg() failed");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
ret1 = cmPkKwMngmt(usta, LKW_EVT_STA_IND, mBuf);
"cmPkKwMngmt failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret1);
+ return (ret1);
}
pst->event = (Event) LKW_EVT_STA_IND; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwStaInd */
"cmUnpkKwMngmt failure ......!");
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &usta));
+ return ((*func)(pst, &usta));
} /* end of cmUnpkLsnStaInd */
/**
"SGetMsg failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret1 = cmPkKwMngmt(sta, LKW_EVT_STA_REQ, mBuf);
"SGetMsg() failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_STA_REQ; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwStaReq */
"Unpacking failure ......!");
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &cfm));
+ return ((*func)(pst, &cfm));
} /* end of function cmUnpkLkwStaCfm */
"Unpacking failure ......!");
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, action, &sts));
+ return ((*func)(pst, action, &sts));
} /* end of function cmUnpkLkwStsReq */
"Unpacking failure ......!");
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &sta));
+ return ((*func)(pst, &sta));
} /* end of function cmUnpkLkwStaReq */
"Unpacking failure ......!");
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
- RETVALUE(RFAILED);
+ return RFAILED;
}
(Void) (*func)(pst, &trc, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkLkwTrcInd */
CMCHKPK(cmPkState, rcSap->state, mBuf);
CMCHKPK(SPkS16, rcSap->spId, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCkwSapSta */
CMCHKUNPK(SUnpkS16, &rcSap->spId, mBuf);
CMCHKUNPK(cmUnpkState, &rcSap->state, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of function cmUnpkCkwSapSta */
/**
CMCHKPK(cmPkState, rlSap->state, mBuf);
CMCHKPK(SPkS16, rlSap->spId, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkKwuSapSta */
CMCHKUNPK(SUnpkS16, &rlSap->spId, mBuf);
CMCHKUNPK(cmUnpkState, &rlSap->state, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of function cmUnpkKwuSapSta */
CMCHKPK(cmPkState, mkSap->state, mBuf);
CMCHKPK(cmPkSuId, mkSap->suId, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkRguSapSta */
CMCHKUNPK(cmUnpkSuId, &mkSap->suId, mBuf);
CMCHKUNPK(cmUnpkState, &mkSap->state, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of function cmUnpkRguSapSta */
"SGetMsg() failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret1 = cmPkKwMngmt(cfm, LKW_EVT_STA_CFM, mBuf);
"packing failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_STA_CFM; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwStaCfm */
"SGetMsg() failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (trcBuf)
"SGetMsg() failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(trcBuf);
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
/* log error */
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_TRC_IND; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwTrcInd */
"SGetMsg() failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret1 = cmPkKwMngmt(sts, LKW_EVT_STS_REQ, mBuf);
"Packing failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
CMCHKPK(SPkS16, action, mBuf);
pst->event = (Event) LKW_EVT_STS_REQ; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwStsReq */
"SGetMsg() failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret1 = cmPkKwMngmt(cfm, LKW_EVT_STS_CFM, mBuf);
"Packing failure ......!");
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_STS_CFM; /* event */
SPstTsk(pst, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkLkwStsCfm */
ret1 = cmPkRlcCfg(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
ret1 = cmPkKwCntrl(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
ret1 = cmPkKwUsta(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
ret1 = cmPkKwSsta(param, param->hdr.elmId.elmnt , eventType, mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
ret1 = cmPkKwSts(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
case LKW_EVT_TRC_IND:
ret1 = cmPkKwTrc(param, mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
case LKW_EVT_CNTRL_CFM:
CMCHKPK(cmPkCmStatus, ¶m->cfm, mBuf);
CMCHKPK(cmPkHeader, ¶m->hdr, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of function cmPkKwMngmt */
{
case STGEN:
{
- CMCHKPK(SPkU16, cfg->t.cfg.s.gen.maxRguSaps, mBuf);
- CMCHKPK(SPkU8, cfg->t.cfg.s.gen.rlcMode, mBuf);
- CMCHKPK(SPkU32, cfg->t.cfg.s.gen.timeRes, mBuf);
- CMCHKPK(SPkU16, cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
- CMCHKPK(SPkU16, cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
- CMCHKPK(SPkU32, cfg->t.cfg.s.gen.maxUe, mBuf);
+ CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.gen.maxRguSaps, mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.gen.rlcMode, mBuf);
+ CMCHKPK(oduUnpackUInt32, cfg->t.cfg.s.gen.timeRes, mBuf);
+ CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
+ CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
+ CMCHKPK(oduUnpackUInt32, cfg->t.cfg.s.gen.maxUe, mBuf);
CMCHKPK(cmPkPst, &cfg->t.cfg.s.gen.lmPst,mBuf);
break;
case STUDXSAP:
case STRGUSAP:
{
- CMCHKPK(SPkU8, cfg->t.cfg.s.sap.route,mBuf);
- CMCHKPK(SPkU8, cfg->t.cfg.s.sap.priority,mBuf);
- CMCHKPK(SPkU16, cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.route,mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.priority,mBuf);
+ CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
CMCHKPK(SPkS16, cfg->t.cfg.s.sap.sapId, mBuf);
- CMCHKPK(SPkU8, cfg->t.cfg.s.sap.inst, mBuf);
- CMCHKPK(SPkU8, cfg->t.cfg.s.sap.ent, mBuf);
- CMCHKPK(SPkU16, cfg->t.cfg.s.sap.procId, mBuf);
- CMCHKPK(SPkU8, cfg->t.cfg.s.sap.mem.pool, mBuf);
- CMCHKPK(SPkU8, cfg->t.cfg.s.sap.mem.region, mBuf);
- CMCHKPK(SPkU8, cfg->t.cfg.s.sap.selector, mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.inst, mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.ent, mBuf);
+ CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.sap.procId, mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.mem.pool, mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.mem.region, mBuf);
+ CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.selector, mBuf);
break;
}
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /*end of function cmPkRlcCfg*/
break;
case SADBG:
{
- CMCHKPK(SPkU32, cntrl->t.cntrl.s.dbgCntrl.dbgMask,
+ CMCHKPK(oduUnpackUInt32, cntrl->t.cntrl.s.dbgCntrl.dbgMask,
mBuf);
}
break;
{
CMCHKPK(SPkS16, cntrl->t.cntrl.s.trcCntrl.trcLen,
mBuf);
- CMCHKPK(SPkU8, cntrl->t.cntrl.s.trcCntrl.trcMask,
+ CMCHKPK(oduUnpackUInt8, cntrl->t.cntrl.s.trcCntrl.trcMask,
mBuf);
}
break;
#ifdef SS_DIAG
case SALOG:
{
- CMCHKPK(SPkU32, cntrl->t.cntrl.s.logMask, mBuf);
+ CMCHKPK(oduUnpackUInt32, cntrl->t.cntrl.s.logMask, mBuf);
}
break;
#endif
break;
}
- CMCHKPK(SPkU8, cntrl->t.cntrl.action, mBuf);
- CMCHKPK(SPkU8, cntrl->t.cntrl.subAction, mBuf);
+ CMCHKPK(oduUnpackUInt8, cntrl->t.cntrl.action, mBuf);
+ CMCHKPK(oduUnpackUInt8, cntrl->t.cntrl.subAction, mBuf);
CMCHKPK(cmPkDateTime, &cntrl->t.cntrl.dt, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /*end of function cmPkKwCntrl */
/**
UNUSED(elmnt);
/* lkw_c_001.main_2 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
- CMCHKPK(SPkU8, usta->t.usta.qci, mBuf);
+ CMCHKPK(oduUnpackUInt8, usta->t.usta.qci, mBuf);
#endif
- CMCHKPK(SPkU32, usta->t.usta.ueId, mBuf);
+ CMCHKPK(oduUnpackUInt32, usta->t.usta.ueId, mBuf);
CMCHKPK(SPkS16, usta->t.usta.suId, mBuf);
CMCHKPK(cmPkCmAlarm, &usta->t.usta.alarm,mBuf);
CMCHKPK(cmPkDateTime, &usta->t.usta.dt, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkKwUsta */
if(ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
CMCHKPK(cmPkDateTime, &ssta->t.ssta.dt, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkKwSsta */
{
TRC3(cmPkKwTrc)
- CMCHKPK(SPkU16, trc->t.trc.event, mBuf);
+ CMCHKPK(oduUnpackUInt16, trc->t.trc.event, mBuf);
CMCHKPK(cmPkDateTime, &trc->t.trc.dt, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkKwTrc */
if(ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
CMCHKPK(cmPkDateTime, &sts->t.sts.dt, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkKwSts */
{
TRC3(cmPkGenSts)
- CMCHKPK(SPkU32, gen->numSduDisc, mBuf);
- CMCHKPK(SPkU32, gen->numOfRb, mBuf);
- CMCHKPK(SPkU32, gen->protTimeOut, mBuf);
- CMCHKPK(SPkU32, gen->errorPdusRecv, mBuf);
- CMCHKPK(SPkU32, gen->unexpPdusRecv, mBuf);
- CMCHKPK(SPkU32, gen->bytesSent, mBuf);
- CMCHKPK(SPkU32, gen->bytesRecv, mBuf);
- CMCHKPK(SPkU32, gen->pdusRetx, mBuf);
- CMCHKPK(SPkU32, gen->pdusSent, mBuf);
- CMCHKPK(SPkU32, gen->pdusRecv, mBuf);
- CMCHKPK(SPkU32, gen->numUe, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->numSduDisc, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->numOfRb, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->protTimeOut, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->errorPdusRecv, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->unexpPdusRecv, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->bytesSent, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->bytesRecv, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->pdusRetx, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->pdusSent, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->pdusRecv, mBuf);
+ CMCHKPK(oduUnpackUInt32, gen->numUe, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkGenSts */
{
TRC3(cmPkCkwSapSts)
- CMCHKPK(SPkU32, rcSap->statMsgs, mBuf);
+ CMCHKPK(oduUnpackUInt32, rcSap->statMsgs, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCkwSapSts */
/**
{
TRC3(cmPkCkwSapSts)
- CMCHKPK(SPkU32, ruSap->sduTx, mBuf);
- CMCHKPK(SPkU32, ruSap->sduRx, mBuf);
+ CMCHKPK(oduUnpackUInt32, ruSap->sduTx, mBuf);
+ CMCHKPK(oduUnpackUInt32, ruSap->sduRx, mBuf);
/* lkw_c_001.main_2 changed from suId to spId */
CMCHKPK(cmPkSuId, ruSap->spId, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCkwSapSts */
/* lkw_c_001.main_2 removed support of RGU sap statistics as it is reflecting
ret1 = cmUnpkRlcCfg(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
case LKW_EVT_CNTRL_REQ:
ret1 = cmUnpkKwCntrl(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
ret1 = cmUnpkKwUsta(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
ret1 = cmUnpkKwSsta(param, param->hdr.elmId.elmnt, eventType,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
ret1 = cmUnpkKwSts(param, param->hdr.elmId.elmnt ,mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
case LKW_EVT_TRC_IND:
ret1 = cmUnpkKwTrc(param, mBuf);
if (ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
break;
default:
break;
}
- RETVALUE(ROK);
+ return ROK;
} /*end of function cmUnpkKwMngmt*/
/**
case STGEN:
{
CMCHKUNPK(cmUnpkPst, &cfg->t.cfg.s.gen.lmPst,mBuf);
- CMCHKUNPK(SUnpkU32, &cfg->t.cfg.s.gen.maxUe, mBuf);
- CMCHKUNPK(SUnpkU16, &cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
- CMCHKUNPK(SUnpkU16, &cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
- CMCHKUNPK(SUnpkU32, &cfg->t.cfg.s.gen.timeRes, mBuf);
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.gen.rlcMode, mBuf);
- CMCHKUNPK(SUnpkU16, &cfg->t.cfg.s.gen.maxRguSaps, mBuf);
+ CMCHKUNPK(oduPackUInt32, &cfg->t.cfg.s.gen.maxUe, mBuf);
+ CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
+ CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
+ CMCHKUNPK(oduPackUInt32, &cfg->t.cfg.s.gen.timeRes, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.gen.rlcMode, mBuf);
+ CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.gen.maxRguSaps, mBuf);
}
break;
case STRGUSAP:
case STUDXSAP:
{
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.sap.selector, mBuf);
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.sap.mem.region, mBuf);
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.sap.mem.pool, mBuf);
- CMCHKUNPK(SUnpkU16, &cfg->t.cfg.s.sap.procId, mBuf);
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.sap.ent, mBuf);
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.sap.inst, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.selector, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.mem.region, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.mem.pool, mBuf);
+ CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.sap.procId, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.ent, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.inst, mBuf);
CMCHKUNPK(SUnpkS16, &cfg->t.cfg.s.sap.sapId, mBuf);
- CMCHKUNPK(SUnpkU16, &cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.sap.priority,mBuf);
- CMCHKUNPK(SUnpkU8, &cfg->t.cfg.s.sap.route,mBuf);
+ CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.priority,mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.route,mBuf);
}
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
} /* end of switch */
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkRlcCfg */
/**
UNUSED(elmnt);
CMCHKUNPK(cmUnpkDateTime, &cfm->t.cntrl.dt, mBuf);
- CMCHKUNPK(SUnpkU8, &cfm->t.cntrl.subAction, mBuf);
- CMCHKUNPK(SUnpkU8, &cfm->t.cntrl.action, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfm->t.cntrl.subAction, mBuf);
+ CMCHKUNPK(oduPackUInt8, &cfm->t.cntrl.action, mBuf);
subAction = cfm->t.cntrl.subAction;
case SADBG:
{
dbgCntrl = &cfm->t.cntrl.s.dbgCntrl;
- CMCHKUNPK(SUnpkU32, &dbgCntrl->dbgMask, mBuf);
+ CMCHKUNPK(oduPackUInt32, &dbgCntrl->dbgMask, mBuf);
}
break;
case SATRC:
{
trcCntrl = &cfm->t.cntrl.s.trcCntrl;
- CMCHKUNPK(SUnpkU8, &trcCntrl->trcMask, mBuf);
+ CMCHKUNPK(oduPackUInt8, &trcCntrl->trcMask, mBuf);
CMCHKUNPK(SUnpkS16,&trcCntrl->trcLen, mBuf);
}
break;
#ifdef SS_DIAG
case SALOG:
{
- CMCHKUNPK(SUnpkU32, &cfm->t.cntrl.s.logMask, mBuf);
+ CMCHKUNPK(oduPackUInt32, &cfm->t.cntrl.s.logMask, mBuf);
}
break;
#endif
break;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkKwCntrl */
CMCHKUNPK(cmUnpkDateTime, &usta->t.usta.dt, mBuf);
CMCHKUNPK(cmUnpkCmAlarm, &usta->t.usta.alarm,mBuf);
CMCHKUNPK(SUnpkS16, &usta->t.usta.suId, mBuf);
- CMCHKUNPK(SUnpkU32, &usta->t.usta.ueId, mBuf);
+ CMCHKUNPK(oduPackUInt32, &usta->t.usta.ueId, mBuf);
/* lkw_c_001.main_2 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
- CMCHKUNPK(SUnpkU8, &usta->t.usta.qci, mBuf);
+ CMCHKUNPK(oduPackUInt8, &usta->t.usta.qci, mBuf);
#endif
- RETVALUE(ROK);
+ return ROK;
}
/**
if(ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
TRC3(cmUnpkKwTrc);
CMCHKUNPK(cmUnpkDateTime, &trc->t.trc.dt, mBuf);
- CMCHKUNPK(SUnpkU16, &trc->t.trc.event, mBuf);
+ CMCHKUNPK(oduPackUInt16, &trc->t.trc.event, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkKwTrc */
if(ret1 != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkKwSts */
{
TRC3(cmUnpkGenSts);
- CMCHKUNPK(SUnpkU32, &gen->numUe, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->pdusRecv, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->pdusSent, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->pdusRetx, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->bytesRecv, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->bytesSent, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->unexpPdusRecv, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->errorPdusRecv, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->protTimeOut, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->numOfRb, mBuf);
- CMCHKUNPK(SUnpkU32, &gen->numSduDisc, mBuf);
-
- RETVALUE(ROK);
+ CMCHKUNPK(oduPackUInt32, &gen->numUe, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->pdusRecv, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->pdusSent, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->pdusRetx, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->bytesRecv, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->bytesSent, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->unexpPdusRecv, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->errorPdusRecv, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->protTimeOut, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->numOfRb, mBuf);
+ CMCHKUNPK(oduPackUInt32, &gen->numSduDisc, mBuf);
+
+ return ROK;
} /* end of cmUnpkGenSts */
/**
TRC3(cmUnpkCkwSapSts);
- CMCHKUNPK(SUnpkU32, &rcSap->statMsgs, mBuf);
+ CMCHKUNPK(oduPackUInt32, &rcSap->statMsgs, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCkwSapSts */
/* lkw_c_001.main_2 changed from suId to spId */
CMCHKUNPK(cmUnpkSuId, &ruSap->spId, mBuf);
- CMCHKUNPK(SUnpkU32, &ruSap->sduRx, mBuf);
- CMCHKUNPK(SUnpkU32, &ruSap->sduTx, mBuf);
+ CMCHKUNPK(oduPackUInt32, &ruSap->sduRx, mBuf);
+ CMCHKUNPK(oduPackUInt32, &ruSap->sduTx, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkKwuSapSts */
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)measReqEvt, sizeof(KwL2MeasReqEvt));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmPkKwL2MeasReqInfo(&measReqEvt->measReq, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
#endif
SPutSBuf(pst->region, pst->pool, (Data *)measReqEvt, sizeof(KwL2MeasReqEvt));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SPkU16(measReqEvt->measPeriod, mBuf) != ROK) {
+ if (oduUnpackUInt16(measReqEvt->measPeriod, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)measReqEvt, sizeof(KwL2MeasReqEvt));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SPkU32(measReqEvt->transId, mBuf) != ROK) {
+ if (oduUnpackUInt32(measReqEvt->transId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
#endif
SPutSBuf(pst->region, pst->pool, (Data *)measReqEvt, sizeof(KwL2MeasReqEvt));
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_L2MEAS_REQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef ANSI
CMCHKPK(cmPkLteRnti, param->val.ipThMeas.ueInfoLst[idx1].ueId, mBuf);
for(idx = 0; idx < param->val.ipThMeas.ueInfoLst[idx1].numQci; idx++)
{
- CMCHKPK(SPkU8, param->val.ipThMeas.ueInfoLst[idx1].qci[idx], mBuf);
+ CMCHKPK(oduUnpackUInt8, param->val.ipThMeas.ueInfoLst[idx1].qci[idx], mBuf);
}
- CMCHKPK(SPkU8, param->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
}
- CMCHKPK(SPkU16, param->val.ipThMeas.numUes, mBuf);
- CMCHKPK(SPkU8, param->measType, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt16, param->val.ipThMeas.numUes, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->measType, mBuf);
+ return ROK;
}
else
{
for(idx = 0; idx < param->val.nonIpThMeas.numQci; idx++)
{
- CMCHKPK(SPkU8, param->val.nonIpThMeas.qci[idx], mBuf);
+ CMCHKPK(oduUnpackUInt8, param->val.nonIpThMeas.qci[idx], mBuf);
}
- CMCHKPK(SPkU8, param->val.nonIpThMeas.numQci, mBuf);
- CMCHKPK(SPkU16, param->val.nonIpThMeas.numSamples, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->val.nonIpThMeas.numQci, mBuf);
+ CMCHKPK(oduUnpackUInt16, param->val.nonIpThMeas.numSamples, mBuf);
}
- CMCHKPK(SPkU8, param->measType, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->measType, mBuf);
+ return ROK;
}
#ifdef ANSI
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, measType, mBuf);
+ CMCHKPK(oduUnpackUInt8, measType, mBuf);
pst->event = (Event) LKW_EVT_L2MEAS_STOP_REQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef ANSI
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, measType, mBuf);
+ CMCHKPK(oduUnpackUInt8, measType, mBuf);
pst->event = (Event) LKW_EVT_L2MEAS_SEND_REQ;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef TENB_SPLIT_ARCH
#ifdef ANSI
TRC3(cmUnpkLkwL2MeasReq)
- if (SUnpkU32(&measReqEvt.transId, mBuf) != ROK) {
+ if (oduPackUInt32(&measReqEvt.transId, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SUnpkU16(&measReqEvt.measPeriod, mBuf) != ROK) {
+ if (oduPackUInt16(&measReqEvt.measPeriod, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkKwL2MeasReqInfo(&measReqEvt.measReq, mBuf) != ROK)
{
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &measReqEvt));
+ return ((*func)(pst, &measReqEvt));
}
#else
#ifdef ANSI
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "SGetMsg() failed");
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- RETVALUE(ret);
+ return (ret);
}
- if (SUnpkU32(&measReqEvt->transId, mBuf) != ROK) {
+ if (oduPackUInt32(&measReqEvt->transId, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (SUnpkU16(&measReqEvt->measPeriod, mBuf) != ROK) {
+ if (oduPackUInt16(&measReqEvt->measPeriod, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (cmUnpkKwL2MeasReqInfo(&measReqEvt->measReq, mBuf) != ROK)
{
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, measReqEvt));
+ return ((*func)(pst, measReqEvt));
}
#endif
TRC3(cmUnpkKwL2MeasReqInfo)
- CMCHKUNPK(SUnpkU8, ¶m->measType, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->measType, mBuf);
if((param->measType & LKW_L2MEAS_DL_IP) ||
(param->measType & LKW_L2MEAS_UL_IP))
{
- CMCHKUNPK(SUnpkU16, ¶m->val.ipThMeas.numUes, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->val.ipThMeas.numUes, mBuf);
for(idx1 = 0;idx1 < param->val.ipThMeas.numUes;idx1++)
{
- CMCHKUNPK(SUnpkU8, ¶m->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
for(idx = param->val.ipThMeas.ueInfoLst[idx1].numQci; idx > 0; idx--)
{
- CMCHKUNPK(SUnpkU8, ¶m->val.ipThMeas.ueInfoLst[idx1].\
+ CMCHKUNPK(oduPackUInt8, ¶m->val.ipThMeas.ueInfoLst[idx1].\
qci[idx - 1], mBuf);
}
CMCHKUNPK(cmUnpkLteRnti, ¶m->val.ipThMeas.ueInfoLst[idx1].\
CMCHKUNPK(cmUnpkLteCellId, ¶m->val.ipThMeas.\
ueInfoLst[idx1].cellId, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
else
{
- CMCHKUNPK(SUnpkU16, ¶m->val.nonIpThMeas.numSamples, mBuf);
- CMCHKUNPK(SUnpkU8, ¶m->val.nonIpThMeas.numQci, mBuf);
+ CMCHKUNPK(oduPackUInt16, ¶m->val.nonIpThMeas.numSamples, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->val.nonIpThMeas.numQci, mBuf);
for(idx = param->val.nonIpThMeas.numQci; idx > 0; idx--)
{
- CMCHKUNPK(SUnpkU8, ¶m->val.nonIpThMeas.qci[idx - 1], mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->val.nonIpThMeas.qci[idx - 1], mBuf);
}
}
- RETVALUE(ROK);
+ return ROK;
}
#ifdef ANSI
U8 measType;
TRC3(cmUnpkLkwL2MeasReq)
- CMCHKUNPK(SUnpkU8, &measType, mBuf);
+ CMCHKUNPK(oduPackUInt8, &measType, mBuf);
SPutMsg(mBuf);
- RETVALUE((*func)(pst, measType));
+ return ((*func)(pst, measType));
}
#ifdef ANSI
TRC3(cmUnpkLkwL2MeasSendReq)
- CMCHKUNPK(SUnpkU8, &measType, mBuf);
+ CMCHKUNPK(oduPackUInt8, &measType, mBuf);
SPutMsg(mBuf);
- RETVALUE((*func)(pst, measType));
+ return ((*func)(pst, measType));
}
#ifdef ANSI
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
SPutSBuf(pst->region, pst->pool, (Data *)measCfmEvt, sizeof(KwL2MeasCfmEvt));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if((measCfmEvt->measType & LKW_L2MEAS_ACT_UE) || \
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
- if (SPkU16(measCfmEvt->val.nonIpThMeas.numCfm, mBuf) != ROK) {
+ if (oduUnpackUInt16(measCfmEvt->val.nonIpThMeas.numCfm, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
- if (SPkU16(measCfmEvt->val.ipThMeas.ueInfoLst[idx1].numCfm, mBuf) != ROK) {
+ if (oduUnpackUInt16(measCfmEvt->val.ipThMeas.ueInfoLst[idx1].numCfm, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
CMCHKPK(cmPkLteCellId, measCfmEvt->val.ipThMeas.ueInfoLst[idx1].cellId, mBuf);
CMCHKPK(cmPkLteRnti, measCfmEvt->val.ipThMeas.ueInfoLst[idx1].ueId, mBuf);
}
- SPkU16(measCfmEvt->val.ipThMeas.numUes, mBuf);
+ oduUnpackUInt16(measCfmEvt->val.ipThMeas.numUes, mBuf);
}
- CMCHKPK(SPkU8, measCfmEvt->measType, mBuf);
+ CMCHKPK(oduUnpackUInt8, measCfmEvt->measType, mBuf);
CMCHKPK(cmPkCmStatus, &measCfmEvt->status, mBuf);
- if (SPkU32(measCfmEvt->transId, mBuf) != ROK) {
+ if (oduUnpackUInt32(measCfmEvt->transId, mBuf) != ROK) {
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
SPutMsg(mBuf);
- RETVALUE(RFAILED);
+ return RFAILED;
}
pst->event = (Event) LKW_EVT_L2MEAS_CFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef ANSI
{
CMCHKPK(SPkF32, param->val.ipThrput.ulIpThPut, mBuf);
CMCHKPK(SPkF32, param->val.ipThrput.dlIpThPut, mBuf);
- CMCHKPK(SPkU8, param->qci, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
+ return ROK;
}
else
{
- CMCHKPK(SPkU32, param->val.nonIpThrput.dlDiscRate, mBuf);
- CMCHKPK(SPkU32, param->val.nonIpThrput.uuLoss, mBuf);
- CMCHKPK(SPkU32, param->val.nonIpThrput.numActUe, mBuf);
- CMCHKPK(SPkU32, param->val.nonIpThrput.dlSduDelay, mBuf);
- CMCHKPK(SPkU8, param->qci, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.dlDiscRate, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.uuLoss, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.numActUe, mBuf);
+ CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.dlSduDelay, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
#ifdef ANSI
cmMemset((U8 *)&measCfmEvt, 0 , sizeof(KwL2MeasCfmEvt));
- if (SUnpkU32(&measCfmEvt.transId, mBuf) != ROK) {
+ if (oduPackUInt32(&measCfmEvt.transId, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
CMCHKUNPK(cmUnpkCmStatus, &measCfmEvt.status, mBuf);
- CMCHKUNPK(SUnpkU8, &measCfmEvt.measType, mBuf);
+ CMCHKUNPK(oduPackUInt8, &measCfmEvt.measType, mBuf);
if(measCfmEvt.measType & LKW_L2MEAS_DL_IP || measCfmEvt.measType & LKW_L2MEAS_UL_IP)
{
- CMCHKUNPK(SUnpkU16, &measCfmEvt.val.ipThMeas.numUes, mBuf);
+ CMCHKUNPK(oduPackUInt16, &measCfmEvt.val.ipThMeas.numUes, mBuf);
for(idx1 = 0;idx1<measCfmEvt.val.ipThMeas.numUes;idx1++)
{
CMCHKUNPK(cmUnpkLteRnti, &measCfmEvt.val.ipThMeas.\
ueInfoLst[idx1].ueId, mBuf);
CMCHKUNPK(cmUnpkLteCellId, &measCfmEvt.val.ipThMeas.\
ueInfoLst[idx1].cellId, mBuf);
- if (SUnpkU16(&measCfmEvt.val.ipThMeas.ueInfoLst[idx1].\
+ if (oduPackUInt16(&measCfmEvt.val.ipThMeas.ueInfoLst[idx1].\
numCfm, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(idx = measCfmEvt.val.ipThMeas.ueInfoLst[idx1].numCfm; idx > 0; idx--)
{
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
}
}
else
{
- if (SUnpkU16(&measCfmEvt.val.nonIpThMeas.numCfm, mBuf) != ROK) {
+ if (oduPackUInt16(&measCfmEvt.val.nonIpThMeas.numCfm, mBuf) != ROK) {
SPutMsg(mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(idx = measCfmEvt.val.nonIpThMeas.numCfm; idx > 0; idx--)
{
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
}
SPutMsg(mBuf);
- RETVALUE((*func)(pst, &measCfmEvt));
+ return ((*func)(pst, &measCfmEvt));
}
#ifdef ANSI
if((measType & LKW_L2MEAS_DL_IP) ||
(measType & LKW_L2MEAS_UL_IP))
{
- CMCHKUNPK(SUnpkU8, ¶m->qci, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf);
CMCHKUNPK(SUnpkF32, ¶m->val.ipThrput.dlIpThPut, mBuf);
CMCHKUNPK(SUnpkF32, ¶m->val.ipThrput.ulIpThPut, mBuf);
}
else
{
- CMCHKUNPK(SUnpkU8, ¶m->qci, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->val.nonIpThrput.dlSduDelay, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->val.nonIpThrput.numActUe, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->val.nonIpThrput.uuLoss, mBuf);
- CMCHKUNPK(SUnpkU32, ¶m->val.nonIpThrput.dlDiscRate, mBuf);
+ CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->val.nonIpThrput.dlSduDelay, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->val.nonIpThrput.numActUe, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->val.nonIpThrput.uuLoss, mBuf);
+ CMCHKUNPK(oduPackUInt32, ¶m->val.nonIpThrput.dlDiscRate, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
}
__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
(ErrVal)ERRLKW, (ErrVal)0, "Packing failed");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, status, mBuf);
- CMCHKPK(SPkU8, measType, mBuf);
+ CMCHKPK(oduUnpackUInt8, status, mBuf);
+ CMCHKPK(oduUnpackUInt8, measType, mBuf);
pst->event = (Event) LKW_EVT_L2MEAS_STOP_CFM;
- RETVALUE(SPstTsk(pst,mBuf));
+ return (SPstTsk(pst,mBuf));
}
#ifdef ANSI
U8 measType;
U8 status;
TRC3(cmUnpkLkwL2MeasCfm)
- CMCHKUNPK(SUnpkU8, &measType, mBuf);
- CMCHKUNPK(SUnpkU8, &status, mBuf);
+ CMCHKUNPK(oduPackUInt8, &measType, mBuf);
+ CMCHKUNPK(oduPackUInt8, &status, mBuf);
SPutMsg(mBuf);
- RETVALUE((*func)(pst, measType,status));
+ return ((*func)(pst, measType,status));
}
#endif /* LTE_L2_MEAS */
#endif /* LCLKW */