From 4d45b914f9e94203603d3b9fdbcb1aad361301dd Mon Sep 17 00:00:00 2001 From: Balaji Shankaran Date: Wed, 2 Sep 2020 10:15:41 +0530 Subject: [PATCH] Replaced old SSI function with new macros jira id - ODUHIGH-212 Change-Id: I6d5924664b69564b7ca0b7f046dc60fd11165f48 Signed-off-by: Balaji Shankaran --- src/5gnrmac/lwr_mac_phy.h | 2 +- src/5gnrmac/lwr_mac_upr_inf.c | 8 +- src/5gnrmac/mac_cfg_hdl.c | 10 +- src/5gnrmac/mac_slot_ind.c | 4 +- src/5gnrmac/rg.h | 4 +- src/5gnrmac/rg_cfg.c | 184 +- src/5gnrmac/rg_com.c | 46 +- src/5gnrmac/rg_dbm.c | 70 +- src/5gnrmac/rg_dhm.c | 58 +- src/5gnrmac/rg_dux.c | 76 +- src/5gnrmac/rg_ex_ms.c | 4 +- src/5gnrmac/rg_l2m.c | 32 +- src/5gnrmac/rg_lim.c | 30 +- src/5gnrmac/rg_lmm.c | 56 +- src/5gnrmac/rg_mux.c | 80 +- src/5gnrmac/rg_pom_scell.c | 72 +- src/5gnrmac/rg_prg.c | 60 +- src/5gnrmac/rg_prg_pt.c | 12 +- src/5gnrmac/rg_ptli.c | 32 +- src/5gnrmac/rg_ptmi.c | 44 +- src/5gnrmac/rg_ptui.c | 92 +- src/5gnrmac/rg_ram.c | 12 +- src/5gnrmac/rg_rom.c | 60 +- src/5gnrmac/rg_tom.c | 122 +- src/5gnrmac/rg_uim.c | 90 +- src/5gnrmac/rg_utl.c | 74 +- src/5gnrrlc/kw_amm_dl.c | 12 +- src/5gnrrlc/kw_amm_ul.c | 40 +- src/5gnrrlc/kw_cfg_dl.c | 110 +- src/5gnrrlc/kw_cfg_ul.c | 96 +- src/5gnrrlc/kw_dbm_dl.c | 30 +- src/5gnrrlc/kw_dbm_ul.c | 32 +- src/5gnrrlc/kw_dl_ex_ms.c | 30 +- src/5gnrrlc/kw_err.h | 6 +- src/5gnrrlc/kw_id.c | 2 +- src/5gnrrlc/kw_lim.c | 54 +- src/5gnrrlc/kw_lmm.c | 186 +- src/5gnrrlc/kw_ptli.c | 20 +- src/5gnrrlc/kw_ptmi.c | 32 +- src/5gnrrlc/kw_ptui.c | 30 +- src/5gnrrlc/kw_tenb_stats.c | 4 +- src/5gnrrlc/kw_tmr.c | 2 +- src/5gnrrlc/kw_udx.c | 166 +- src/5gnrrlc/kw_udx_dl.c | 32 +- src/5gnrrlc/kw_udx_ptdl.c | 18 +- src/5gnrrlc/kw_udx_ptul.c | 36 +- src/5gnrrlc/kw_udx_ul.c | 38 +- src/5gnrrlc/kw_uim.c | 48 +- src/5gnrrlc/kw_ul_ex_ms.c | 32 +- src/5gnrrlc/kw_umm_ul.c | 20 +- src/5gnrrlc/kw_utl_dl.c | 40 +- src/5gnrrlc/kw_utl_ul.c | 44 +- src/5gnrrlc/mac_stub.c | 14 +- src/5gnrrlc/mac_stub.h | 4 +- src/5gnrsch/rg_sch.c | 206 +-- src/5gnrsch/rg_sch_cfg.c | 730 ++++---- src/5gnrsch/rg_sch_cmn.c | 732 ++++---- src/5gnrsch/rg_sch_dbm.c | 108 +- src/5gnrsch/rg_sch_dhm.c | 86 +- src/5gnrsch/rg_sch_drx.c | 62 +- src/5gnrsch/rg_sch_ex_ms.c | 4 +- src/5gnrsch/rg_sch_gom.c | 122 +- src/5gnrsch/rg_sch_hdfdd.c | 26 +- src/5gnrsch/rg_sch_inf.c | 216 +-- src/5gnrsch/rg_sch_l2m.c | 20 +- src/5gnrsch/rg_sch_lmm.c | 20 +- src/5gnrsch/rg_sch_mga.c | 28 +- src/5gnrsch/rg_sch_pt.c | 38 +- src/5gnrsch/rg_sch_pwr.c | 104 +- src/5gnrsch/rg_sch_ram.c | 52 +- src/5gnrsch/rg_sch_sc1.c | 64 +- src/5gnrsch/rg_sch_scell.c | 36 +- src/5gnrsch/rg_sch_tom.c | 2 +- src/5gnrsch/rg_sch_uhm.c | 22 +- src/5gnrsch/rg_sch_utl.c | 448 ++--- src/5gnrsch/rg_sch_utl_clist.c | 12 +- src/5gnrsch/sch.c | 26 +- src/5gnrsch/sch_slot_ind.c | 6 +- src/5gnrsch/sch_utils.h | 2 +- src/cm/ckw.c | 214 +-- src/cm/cm_gen.c | 494 +++--- src/cm/cm_gen.h | 180 +- src/cm/cm_hash.c | 118 +- src/cm/cm_inet.c | 646 +++---- src/cm/cm_inet.h | 4 +- src/cm/cm_lib.c | 28 +- src/cm/cm_llist.c | 10 +- src/cm/cm_lte.c | 42 +- src/cm/cm_lte.x | 28 +- src/cm/cm_math.c | 10 +- src/cm/cm_mblk.c | 24 +- src/cm/cm_mblk.h | 4 +- src/cm/cm_mem.c | 298 ++-- src/cm/cm_mem_wl.c | 348 ++-- src/cm/cm_tenb_stats.c | 384 ++-- src/cm/cm_tkns.c | 124 +- src/cm/cm_tkns.h | 12 +- src/cm/cm_tpt.c | 302 ++-- src/cm/cm_tpt.h | 4 +- src/cm/common_def.h | 19 + src/cm/crg.c | 284 +-- src/cm/ctf.c | 1690 +++++++++--------- src/cm/du_app_mac_inf.c | 142 +- src/cm/du_app_mac_inf.h | 46 +- src/cm/du_app_rlc_inf.c | 36 +- src/cm/gen.h | 210 +-- src/cm/gen.x | 4 +- src/cm/kwu.c | 262 +-- src/cm/legtp.c | 182 +- src/cm/legtp.h | 66 +- src/cm/lkw.c | 528 +++--- src/cm/lphy_stub.h | 4 +- src/cm/lrg.c | 634 +++---- src/cm/lrg.x | 6 +- src/cm/lsctp.c | 32 +- src/cm/lsctp.h | 6 +- src/cm/mac_sch_interface.c | 8 +- src/cm/mac_sch_interface.h | 4 +- src/cm/rgm.c | 226 +-- src/cm/rgr.c | 2404 ++++++++++++------------- src/cm/rgu.c | 442 ++--- src/cm/ssi.h | 12 +- src/cm/ssi.x | 14 +- src/cm/tfu.c | 2712 ++++++++++++++--------------- src/codec_utils/common/odu_common_codec.c | 24 +- src/codec_utils/common/odu_common_codec.h | 6 +- src/cu_stub/cu_f1ap_msg_hdl.c | 101 +- src/cu_stub/cu_stub.c | 4 +- src/cu_stub/cu_stub_egtp.c | 141 +- src/cu_stub/cu_stub_sctp.c | 32 +- src/du_app/du_cell_mgr.c | 33 +- src/du_app/du_cell_mgr.h | 4 +- src/du_app/du_cfg.c | 40 +- src/du_app/du_cfg.h | 12 +- src/du_app/du_e2ap_msg_hdl.c | 39 +- src/du_app/du_e2ap_msg_hdl.h | 22 +- src/du_app/du_egtp.c | 194 +-- src/du_app/du_egtp.h | 50 +- src/du_app/du_f1ap_msg_hdl.c | 43 +- src/du_app/du_mgr.h | 80 +- src/du_app/du_mgr_ex_ms.c | 34 +- src/du_app/du_mgr_main.c | 54 +- src/du_app/du_mgr_main.h | 14 +- src/du_app/du_msg_hdl.c | 168 +- src/du_app/du_sctp.c | 110 +- src/du_app/du_sctp.h | 48 +- src/du_app/du_sys_info_hdl.c | 12 +- src/du_app/du_ue_mgr.c | 2 +- src/du_app/du_utils.h | 4 +- src/mt/mt_ss.c | 448 ++--- src/mt/ss_drvr.c | 28 +- src/mt/ss_gen.c | 124 +- src/mt/ss_gen.h | 2 +- src/mt/ss_mem.c | 58 +- src/mt/ss_msg.c | 804 ++++----- src/mt/ss_pack.c | 114 +- src/mt/ss_queue.c | 152 +- src/mt/ss_rbuf.c | 44 +- src/mt/ss_strm.c | 82 +- src/mt/ss_task.c | 468 ++--- src/mt/ss_timer.c | 88 +- src/ric_stub/ric_e2ap_msg_hdl.c | 29 +- src/ric_stub/ric_stub.c | 2 +- src/ric_stub/ric_stub_sctp.c | 10 +- 164 files changed, 11341 insertions(+), 11314 deletions(-) diff --git a/src/5gnrmac/lwr_mac_phy.h b/src/5gnrmac/lwr_mac_phy.h index f841bc948..cf6d51fba 100644 --- a/src/5gnrmac/lwr_mac_phy.h +++ b/src/5gnrmac/lwr_mac_phy.h @@ -42,7 +42,7 @@ typedef enum int16_t _ret; \ _ret = SGetSBufWls(0, 0, (Data **)&_datPtr, _size); \ if(_ret == ROK) \ - cmMemset((U8*)_datPtr, 0, _size); \ + memset((U8*)_datPtr, 0, _size); \ else \ _datPtr = NULLP; \ } diff --git a/src/5gnrmac/lwr_mac_upr_inf.c b/src/5gnrmac/lwr_mac_upr_inf.c index c6a1c5e96..13b41a07b 100644 --- a/src/5gnrmac/lwr_mac_upr_inf.c +++ b/src/5gnrmac/lwr_mac_upr_inf.c @@ -117,16 +117,16 @@ uint8_t packRachInd(Pst *pst, RachInd *rachInd) uint8_t packLcSlotInd (Pst *pst, SlotIndInfo *slotInd) { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } /* pack SFN and slot value */ - CMCHKPK(SPkU16,slotInd->sfn, mBuf); - CMCHKPK(SPkU16,slotInd->slot, mBuf); + CMCHKPK(oduUnpackUInt16,slotInd->sfn, mBuf); + CMCHKPK(oduUnpackUInt16,slotInd->slot, mBuf); - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* diff --git a/src/5gnrmac/mac_cfg_hdl.c b/src/5gnrmac/mac_cfg_hdl.c index e8c76ebfe..08de5389d 100644 --- a/src/5gnrmac/mac_cfg_hdl.c +++ b/src/5gnrmac/mac_cfg_hdl.c @@ -63,7 +63,7 @@ SchCellCfgFunc SchCellCfgOpts[] = * @return * -# ROK **/ -PUBLIC int MacSchGenCfgReq(Pst *pst, RgMngmt *cfg) +PUBLIC uint8_t MacSchGenCfgReq(Pst *pst, RgMngmt *cfg) { printf("\nReceived Scheduler gen config at MAC"); pst->dstInst = DEFAULT_CELLS + 1; @@ -122,7 +122,7 @@ uint8_t MacProcCellCfgReq(Pst *pst, MacCellCfg *macCellCfg) uint16_t ret = ROK; MacCellCb *macCellCb; - cmMemset((uint8_t *)&cfmPst, 0, sizeof(Pst)); + memset((uint8_t *)&cfmPst, 0, sizeof(Pst)); MAC_ALLOC(macCellCb, sizeof(MacCellCb)); if(macCellCb == NULLP) @@ -194,9 +194,9 @@ uint8_t MacSchCellCfgReq(Pst *pst, MacCellCfg *macCellCfg) { SchCellCfg schCellCfg; Pst cfgPst; - int ret; + uint8_t ret; - cmMemset((uint8_t *)&cfgPst, 0, sizeof(Pst)); + memset((uint8_t *)&cfgPst, 0, sizeof(Pst)); schCellCfg.cellId = macCellCfg->cellId; schCellCfg.phyCellId = macCellCfg->phyCellId; schCellCfg.bandwidth = macCellCfg->dlCarrCfg.bw; @@ -312,7 +312,7 @@ void MacSendCellCfgCfm(uint16_t cellId, uint8_t response) uint16_t cellIdx; MacCellCfgCfm macCellCfgCfm; - cmMemset((uint8_t *)&pst, 0, sizeof(Pst)); + memset((uint8_t *)&pst, 0, sizeof(Pst)); GET_CELL_IDX(cellId, cellIdx); macCellCfgCfm.cellId = macCb.macCell[cellIdx]->macCellCfg.cellId; diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c index 11dd47eb6..6b70ebbf3 100644 --- a/src/5gnrmac/mac_slot_ind.c +++ b/src/5gnrmac/mac_slot_ind.c @@ -340,7 +340,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd) DU_LOG("\nMAC : Slot Indication received"); /*starting Task*/ - SStartTask(&startTime, PID_MAC_TTI_IND); + ODU_START_TASK(&startTime, PID_MAC_TTI_IND); /* send slot indication to scheduler */ ret = sendSlotIndMacToSch(slotInd); @@ -366,7 +366,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd) } /*stoping Task*/ - SStopTask(startTime, PID_MAC_TTI_IND); + ODU_STOP_TASK(startTime, PID_MAC_TTI_IND); return ret; } /* fapiMacSlotInd */ diff --git a/src/5gnrmac/rg.h b/src/5gnrmac/rg.h index 49f13e529..1aeeaae3d 100755 --- a/src/5gnrmac/rg.h +++ b/src/5gnrmac/rg.h @@ -288,7 +288,7 @@ U32 macHeader[2]; if (_padBuf == NULLP) \ { \ RLOG0(L_ERROR, "RGERR_MUX_BLD_CEHDR_FAIL");\ - RETVALUE(RFAILED);\ + return RFAILED;\ } \ if (mInfo->endptr == NULLP) { \ sduEnd = _sduBuf; \ @@ -644,7 +644,7 @@ toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME {\ if(_inst >= RG_MAX_INST)\ {\ - RETVALUE(RFAILED);\ + return RFAILED;\ }\ } diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c index bdfa54f95..15cea81b2 100755 --- a/src/5gnrmac/rg_cfg.c +++ b/src/5gnrmac/rg_cfg.c @@ -133,7 +133,7 @@ RgErrInfo *errInfo; || rgCb[inst].inactiveCell != NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Cell already exists"); - RETVALUE(RFAILED); + return RFAILED; } if ((cellCfg->bwCfg.dlTotalBw < RG_MIN_DL_BW || cellCfg->bwCfg.dlTotalBw > RG_MAX_DL_BW) @@ -143,13 +143,13 @@ RgErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid Bandwidth configuration: ul %d dl %d", cellCfg->bwCfg.ulTotalBw, cellCfg->bwCfg.dlTotalBw); - RETVALUE(RFAILED); + return RFAILED; } if (cellCfg->rachCfg.maxMsg3Tx < RG_MIN_HQ_TX) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid RACH configuration: maxMsg3Tx %d",cellCfg->rachCfg.maxMsg3Tx); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TENB_MULT_CELL_SUPPRT if((cellCfg->rguDlSapId > rgCb[inst].numRguSaps) || @@ -159,11 +159,11 @@ RgErrInfo *errInfo; cellCfg->rguDlSapId, cellCfg->rguUlSapId, cellCfg->cellId)); - RETVALUE(RFAILED); + return RFAILED; } #endif errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgCellCfg */ @@ -214,7 +214,7 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Transmission Mode=%d not supported", ueCfg->txMode.tm); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Active cell */ @@ -223,20 +223,20 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Active Cell does not exist for cellId%d", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Check if Ue already configured */ if (rgDBMGetUeCb(*cell, ueCfg->crnti) != NULLP) { RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Ue already exists"); - RETVALUE(RFAILED); + return RFAILED; } if (ueCfg->ueUlHqCfg.maxUlHqTx < RG_MIN_HQ_TX) { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti, "Invalid Uplink HARQ config %d ", ueCfg->ueUlHqCfg.maxUlHqTx); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TENB_MULT_CELL_SUPPRT if((ueCfg->rguDlSapId > rgCb[inst].numRguSaps) || @@ -246,12 +246,12 @@ RgErrInfo *errInfo; ueCfg->rguDlSapId, ueCfg->rguUlSapId, ueCfg->crnti)); - RETVALUE(RFAILED); + return RFAILED; } #endif errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgUeCfg */ @@ -307,7 +307,7 @@ RgErrInfo *errInfo; if ((rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Validation for dedicated LC failed"); - RETVALUE(RFAILED); + return RFAILED; } } else if (lcCfg->lcType == CM_LTE_LCH_BCCH @@ -317,14 +317,14 @@ RgErrInfo *errInfo; if ((rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Validation for common logical channels failed"); - RETVALUE(RFAILED); + return RFAILED; } } else { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid logical channel type %d", lcCfg->lcType); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS if ( lcCfg->qci < RG_QCI_MIN || @@ -332,13 +332,13 @@ RgErrInfo *errInfo; ) { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid qci %x",lcCfg->qci); - RETVALUE(RFAILED); + return RFAILED; } /*validate qci */ #endif /*LTE_L2_MEAS */ errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgLcCfg */ @@ -392,22 +392,22 @@ RgErrInfo *errInfo; && ((*cell = rgCb[inst].inactiveCell) == NULLP)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Cell does not exist"); - RETVALUE(RFAILED); + return RFAILED; } if((*cell)->cellId != cellRecfg->cellId) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId, "Cell does not exist %d\n",cellRecfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } if (cellRecfg->rachRecfg.maxMsg3Tx < RG_MIN_HQ_TX) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId, "Invalid RACH configuration: maxMsg3Tx %d",cellRecfg->rachRecfg.maxMsg3Tx); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgCellRecfg */ @@ -465,7 +465,7 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Transmission Mode=%d not supported", ueRecfg->txMode.tm); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Active cell */ @@ -473,7 +473,7 @@ RgErrInfo *errInfo; || ((*cell)->cellId != ueRecfg->cellId)) { RLOG_ARG0(L_ERROR,DBG_CELLID,ueRecfg->cellId, "Active Cell does not exist\n"); - RETVALUE(RFAILED); + return RFAILED; } /* Fix : syed UE ID change at MAC will now be controlled @@ -481,16 +481,16 @@ RgErrInfo *errInfo; if ((*ue = rgDBMGetUeCb(*cell, ueRecfg->oldCrnti)) == NULLP) { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"[%d]Old Ue does not exist", ueRecfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } if (ueRecfg->ueUlHqRecfg.maxUlHqTx < RG_MIN_HQ_TX) { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid Uplink HARQ config for UE %d", ueRecfg->ueUlHqRecfg.maxUlHqTx); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgUeRecfg */ @@ -553,30 +553,30 @@ RgErrInfo *errInfo; || ((*cell)->cellId != lcRecfg->cellId)) { RLOG_ARG2(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Active Cell %u does not exist for UE %u", lcRecfg->cellId, lcRecfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue for dedicated channels */ if ((*ue = rgDBMGetUeCb(*cell, lcRecfg->crnti)) == NULLP) { RLOG_ARG0(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Ue does not exist for dedicated logical channel"); - RETVALUE(RFAILED); + return RFAILED; } if ((*ulLc = rgDBMGetUlDedLcCb((*ue), lcRecfg->lcId)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CRNTI,lcRecfg->crnti,"Dedicated UL LC does not exist %d",lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } if (lcRecfg->ulRecfg.lcgId > (RG_MAX_LCG_PER_UE - 1)) { RLOG_ARG2(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Invalid lcgId for uplink logical channel lcg %d lc %d", lcRecfg->ulRecfg.lcgId, lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgLcRecfg */ /* Start: LTEMAC_2.1_DEV_CFG */ @@ -632,18 +632,18 @@ RgErrInfo *errInfo; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",reset->crnti, reset->cellId)); RLOG_ARG1(L_ERROR,DBG_CRNTI,reset->crnti,"Active Cell does not exist %d",reset->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ if ((*ue = rgDBMGetUeCb(*cell, reset->crnti)) == NULLP) { RLOG_ARG0(L_ERROR,DBG_CRNTI,reset->crnti,"UE does not exist"); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgUeReset*/ /* End: LTEMAC_2.1_DEV_CFG */ @@ -701,12 +701,12 @@ RgErrInfo *errInfo; if((ret = rgAllocSBuf(inst,(Data**)&cell, sizeof(RgCellCb))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } if (cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize the cell */ @@ -730,14 +730,14 @@ RgErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"DBM initialization for cell failed"); rgCFGFreeInactvCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV if (RFAILED == RgLaaCellCbInit(cell)) { rgCFGFreeInactvCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -780,7 +780,7 @@ RgErrInfo *errInfo; /* Allocate a buffer for flowCntrlInd.*/ SGetSBuf(pst->region, pst->pool, (Data **)&cell->flowCntrlInd, sizeof(RguFlowCntrlInd)); - RETVALUE(ROK); + return ROK; } /* rgCFGCrgCellCfg */ #ifdef LTE_ADV @@ -845,7 +845,7 @@ RgCellCb *cell; "[%d]Ue already exist in scell %d during scell addition\n", ueSCellCb->ueId, cell->cellId)); - RETVALUE(RFAILED); + return RFAILED; } /* Create UeCb */ @@ -854,7 +854,7 @@ RgCellCb *cell; { RGDBGERRNEW(dstMacInst, (rgPBuf(dstMacInst), "[%d]UeCb creation failed\n", ueSCellCb->ueId)); - RETVALUE(RFAILED); + return RFAILED; } if(rgDHMHqEntInit(dstMacInst, &ueCb->dl.hqEnt, @@ -862,7 +862,7 @@ RgCellCb *cell; { RGDBGERRNEW(dstMacInst,(rgPBuf(dstMacInst), "[%d]UeCb Harq Entity Initialization failed\n", ueSCellCb->ueId)); - RETVALUE(RFAILED); + return RFAILED; } rgDBMInsUeCb(cell, ueCb); @@ -894,7 +894,7 @@ RgCellCb *cell; ueCb->ul.lcgArr[idx].lcCount = ueSCellCb->lcgInfo[idx].lcCount; ueCb->ul.lcgArr[idx].isGbr = ueSCellCb->lcgInfo[idx].isGbr; } - RETVALUE(ROK); + return ROK; }/* rgCfgAddUeSCellCfg */ /** @@ -953,7 +953,7 @@ Bool *isCfmRqrd; RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n", ueRecfg->oldCrnti, ueRecfg->cellId)); - RETVALUE(RFAILED); + return RFAILED; } RGDBGPRM(inst,(rgPBuf(inst), @@ -964,7 +964,7 @@ Bool *isCfmRqrd; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist\n", ueRecfg->oldCrnti)); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize cfgCfmInfo in the ueCb. This is used while processing SCellAdd @@ -1004,7 +1004,7 @@ Bool *isCfmRqrd; } /*end of for loop */ *isCfmRqrd = FALSE; - RETVALUE(ROK); + return ROK; } /* rgFillAndAddSCellCfg */ #endif /* LTE_ADV */ @@ -1065,12 +1065,12 @@ RgErrInfo *errInfo; if((ue=rgRAMCreateUeCb(cell, ueCfg->crnti, FALSE, errInfo)) == NULLP) { RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"UeCb creation failed"); - RETVALUE(RFAILED); + return RFAILED; } if(rgDHMHqEntInit(inst,&ue->dl.hqEnt, cell->maxDlHqProcPerUe) != ROK) { RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"UeCb Harq Entity Initialization failed"); - RETVALUE(RFAILED); + return RFAILED; } handover = TRUE; } @@ -1105,7 +1105,7 @@ RgErrInfo *errInfo; /* Update satistics */ rgUpdtUeCnt(inst,RG_CFG_ADD); errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGCrgUeCfg */ @@ -1171,7 +1171,7 @@ CrgCfgTransId transId; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti, "Dedicated logical channel configuration failed %d",lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV /*ERAB Multl Cell fix*/ @@ -1186,13 +1186,13 @@ CrgCfgTransId transId; { RLOG_ARG1(L_ERROR, DBG_CRNTI, lcCfg->crnti, "Common logical channel configuration" "failed %d\n", lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } } errInfo->errCause = RGERR_NONE; RLOG_ARG1(L_INFO, DBG_CRNTI,lcCfg->crnti, "CRG LC config done for UE: lcId %d\n", lcCfg->lcId); - RETVALUE(ROK); + return ROK; } /* rgCFGCrgLcCfg */ @@ -1239,7 +1239,7 @@ RgErrInfo *errInfo; cell->rachCfg = cellRecfg->rachRecfg; errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGCrgCellRecfg */ @@ -1299,7 +1299,7 @@ RgErrInfo *errInfo; rgUHMCrgUeRecfg(cell, ue, ueRecfg); errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGCrgUeRecfg */ @@ -1361,7 +1361,7 @@ Bool *isCfmRqrd; } errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGCrgLcRecfg */ /* Start: LTEMAC_2.1_DEV_CFG */ @@ -1406,7 +1406,7 @@ RgErrInfo *errInfo; errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGCrgUeReset */ /* End: LTEMAC_2.1_DEV_CFG */ @@ -1459,7 +1459,7 @@ RgErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellDelInfo->u.cellDel.cellId,"Cell does not exist"); - RETVALUE(RFAILED); + return RFAILED; } /* Delete cell from inactive list */ @@ -1469,7 +1469,7 @@ RgErrInfo *errInfo; rgCFGFreeInactvCellCb(cell); errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* Delete from the cell list */ @@ -1486,7 +1486,7 @@ RgErrInfo *errInfo; errInfo->errCause = RGERR_NONE; RGDBGINFO(inst,(rgPBuf(inst), "Cell %d deleted\n", cellDelInfo->u.cellDel.cellId)); - RETVALUE(ROK); + return ROK; } /* rgCFGCrgCellDel */ @@ -1535,12 +1535,12 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueDelInfo->u.ueDel.crnti,"Cell does not exist %d", ueDelInfo->u.ueDel.cellId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGERR_NONE; /* Fix: syed Context Deletion is relied upon SCH indication */ - RETVALUE(ROK); + return ROK; } /* rgCFGCrgUeDel */ @@ -1597,7 +1597,7 @@ CrgCfgTransId transId; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"Cell does not exist %d", lcDelInfo->u.lchDel.cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -1605,7 +1605,7 @@ CrgCfgTransId transId; { RLOG_ARG0(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti, "UE does not exist for dedicated logical channel"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate downlink info */ @@ -1616,7 +1616,7 @@ CrgCfgTransId transId; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"DL LC %d does not exist", lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } rgDBMDelDlDedLcCb(ue, dlLc); dirVld = TRUE; @@ -1630,7 +1630,7 @@ CrgCfgTransId transId; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"UL LC %d does not exist", lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } rgDBMDelUlDedLcCb(ue, ulLc); dirVld = TRUE; @@ -1640,7 +1640,7 @@ CrgCfgTransId transId; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"Invalid direction %d for LC Delete", lcDelInfo->u.lchDel.dir); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV /*ERAB - multicell fix*/ @@ -1649,7 +1649,7 @@ CrgCfgTransId transId; rgPomSndUeSCellLchDelToSmac(inst, lcDelInfo, isCfmRqrd); #endif errInfo->errCause = RGERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgCFGCrgLcDel */ /*********************************************************** @@ -1697,7 +1697,7 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Active Cell does not exist: Cell %d", lcCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -1705,7 +1705,7 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE does not exist for dedicated logical channel %d", lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate logical channel Id */ @@ -1714,7 +1714,7 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid logical channel Id %d", lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate downlink info */ @@ -1724,7 +1724,7 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Dedicated DL LC %d already configured", lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } dirVld = TRUE; } @@ -1736,13 +1736,13 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Invalid lcgId for uplink logical channel %d", lcCfg->ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if (rgDBMGetUlDedLcCb((*ue), lcCfg->lcId) != NULLP) { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Dedicated UL LC %d already configured", lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } dirVld = TRUE; } @@ -1751,10 +1751,10 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid Direction %d", lcCfg->dir); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgDedLcCfg */ @@ -1801,7 +1801,7 @@ RgErrInfo *errInfo; && ((*cell)->cellId != lcCfg->cellId)) { RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"Active Cell exists for common channels"); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the inactive cell for common logical channels */ @@ -1810,7 +1810,7 @@ RgErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"Inactive Cell does not exist for common channels"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate downlink info */ if (lcCfg->dir & CRG_DIR_TX) @@ -1822,7 +1822,7 @@ RgErrInfo *errInfo; if (rgDBMGetBcchOnDlsch(*cell,lcCfg->lcId) != NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"BCCH on DLSCH already configured for cell"); - RETVALUE(RFAILED); + return RFAILED; } } else if (lcCfg->dlInfo.dlTrchType == CM_LTE_TRCH_BCH) @@ -1830,14 +1830,14 @@ RgErrInfo *errInfo; if (rgDBMGetBcchOnBch(*cell) != NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"BCCH on BCH already configured for cell %d"); - RETVALUE(RFAILED); + return RFAILED; } } else { RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid transport channel %d for cell", lcCfg->dlInfo.dlTrchType); - RETVALUE(RFAILED); + return RFAILED; } } else if (lcCfg->lcType == CM_LTE_LCH_PCCH) @@ -1845,13 +1845,13 @@ RgErrInfo *errInfo; if (rgDBMGetPcch(*cell) != NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"PCCH already configured for cell"); - RETVALUE(RFAILED); + return RFAILED; } } else if (RG_DLCCCH_ISCFGD(*cell)) { RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"DL CCCH already configured for cell %d"); - RETVALUE(RFAILED); + return RFAILED; } dirVld = TRUE; } @@ -1864,12 +1864,12 @@ RgErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid UL common lcType %d for cell ", lcCfg->lcType); - RETVALUE(RFAILED); + return RFAILED; } if (RG_ULCCCH_ISCFGD(*cell)) { RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"UL CCCH already configured for cell "); - RETVALUE(RFAILED); + return RFAILED; } dirVld = TRUE; } @@ -1878,10 +1878,10 @@ RgErrInfo *errInfo; if (!dirVld) { RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid Direction %d", lcCfg->dir); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgCFGVldtCrgCmnLcCfg */ /*********************************************************** @@ -1942,7 +1942,7 @@ RgErrInfo *errInfo; { rgDBMInsDlDedLcCb(ue, lcCfg->lcId); } - RETVALUE(ROK); + return ROK; } /* rgCFGCrgDedLcCfg */ @@ -2039,7 +2039,7 @@ RgErrInfo *errInfo; config\n", lcCfg->lcId); } - RETVALUE(ROK); + return ROK; } /* rgCFGCrgCmnLcCfg */ #ifdef LTE_L2_MEAS /*********************************************************** @@ -2417,23 +2417,23 @@ RgInfCellReg* regReq; if(NULLP == regReq) { - RETVALUE(RFAILED); + return RFAILED; } if((cell == NULLP) || (cell->cellId != regReq->cellId)) { - RETVALUE(RFAILED); + return RFAILED; } if(regReq->maxDlHqProcPerUe > RG_MAX_DL_HARQ_NUM) { - RETVALUE(RFAILED); + return RFAILED; } /* Initialize */ cell->schInstMap.cellSapId = regReq->cellSapId; cell->schInstMap.schInst = pst->srcInst; cell->maxDlHqProcPerUe = regReq->maxDlHqProcPerUe; - RETVALUE(ROK); + return ROK; } /* end of RgSchMacCellRegReq */ @@ -2471,7 +2471,7 @@ PUBLIC S16 rgAddToL2MeasPerQci(RgCellCb *cell,U8 qci) - RETVALUE(ret); + return (ret); } diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c index 17947b6b0..170f69e45 100755 --- a/src/5gnrmac/rg_com.c +++ b/src/5gnrmac/rg_com.c @@ -170,7 +170,7 @@ if(TRUE == isCfmRqrd) } #endif RGDBGINFO(inst,(rgPBuf(inst), "CRG Configuration request processed\n")); - RETVALUE(ret); + return (ret); } /* rgCOMCfgReq */ /** * @brief Handler for processing Cell/Ue/Logical channel configuration request @@ -232,7 +232,7 @@ CrgCfgTransId transId; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cfg->u.cellCfg.cellId, "Cell configuration validation FAILED\n"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgCFGCrgCellCfg(inst,&cfg->u.cellCfg, errInfo); break; @@ -244,7 +244,7 @@ CrgCfgTransId transId; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CRNTI,cfg->u.ueCfg.crnti, "Ue configuration validation FAILED\n"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgCFGCrgUeCfg(inst,cell, &cfg->u.ueCfg, errInfo); } @@ -259,7 +259,7 @@ CrgCfgTransId transId; RLOG_ARG1(L_ERROR,DBG_CELLID,cfg->u.cellCfg.cellId, "LC configuration validation FAILED: LC %d\n", cfg->u.lchCfg.lcId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgCFGCrgLcCfg(inst,cell, ue, &cfg->u.lchCfg, errInfo,isCfmRqrd,transId); break; @@ -267,11 +267,11 @@ CrgCfgTransId transId; default: { RLOG1(L_ERROR, "Should never come here: cfgType %d",cfg->cfgType); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ret); + return (ret); } /* rgCOMHndlCfgReq */ @@ -337,7 +337,7 @@ Bool *isCfmRqrd; { RLOG_ARG0(L_ERROR,DBG_CELLID,recfg->u.cellRecfg.cellId, "Cell Recfg Validation FAILED"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgCFGCrgCellRecfg(inst,cell, &recfg->u.cellRecfg, errInfo); break; @@ -362,7 +362,7 @@ Bool *isCfmRqrd; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue SCell configuration FAILED for inst [%d]\n", recfg->u.ueRecfg.oldCrnti, inst)); - RETVALUE(RFAILED); + return RFAILED; } } @@ -375,7 +375,7 @@ Bool *isCfmRqrd; RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.ueRecfg.cellId, "Ue Re-configuration validation FAILED OLD CRNTI:%d", recfg->u.ueRecfg.oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } ret = rgCFGCrgUeRecfg(inst,cell, ue, &recfg->u.ueRecfg, errInfo); } @@ -393,7 +393,7 @@ Bool *isCfmRqrd; RLOG_ARG2(L_ERROR,DBG_CELLID,recfg->u.lchRecfg.cellId, "LC Re-configuration validation FAILED LCID:%d CRNTI:%d", recfg->u.lchRecfg.lcId,recfg->u.lchRecfg.crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV @@ -410,11 +410,11 @@ Bool *isCfmRqrd; { RLOG1(L_ERROR, "Should never come here: recfgType %d", recfg->recfgType); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ret); + return (ret); } /* rgCOMHndlRecfgReq */ /*Start: LTEMAC_2.1_DEV_CFG */ @@ -459,7 +459,7 @@ RgErrInfo *errInfo; errInfo->errCause = RGERR_NONE; RGDBGINFO(inst,(rgPBuf(inst), "CRG UE Reset processed \n")); - RETVALUE(ROK); + return ROK; } /* rgCOMHndlResetReq */ /*End: LTEMAC_2.1_DEV_CFG */ @@ -542,11 +542,11 @@ CrgCfgTransId transId; { RLOG1(L_ERROR, "Should never come here: delType %d", del->delType); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ret); + return (ret); } /* rgCOMHndlDelReq */ #ifdef LTE_ADV @@ -625,7 +625,7 @@ RgPrgUeSCellCfgInfo *ueSCellCb; /* Send positive confirmation to primary cell*/ RgPrgSMacPMacCfg(&cfmPst, &cfgCfm); - RETVALUE(ROK); + return ROK; } /* RgPrgPMacSMacUeSCellCfgReq */ /** @@ -682,7 +682,7 @@ RgPrgCfgCfmInfo *cfgCfm; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist\n", cfgCfm->ueId)); - RETVALUE(RFAILED); + return RFAILED; } switch(cfgCfm->event) { @@ -730,11 +730,11 @@ RgPrgCfgCfmInfo *cfgCfm; RGDBGERRNEW(inst,(rgPBuf(inst), "Invalid configuration confirm event %d\n", cfgCfm->event)); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* RgPrgSMacPMacCfgCfm */ /** @@ -774,14 +774,14 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo; * cell is already deleted for this cell*/ if(sCell == NULLP) { - RETVALUE(ROK); + return ROK; } /* Retrive the UeCb from sec cell*/ if ((sCellUe = rgDBMGetUeCb(sCell, ueSCellDelInfo->ueId)) == NULLP) { RGDBGERRNEW(inst, (rgPBuf(inst), "[%d]UE:does not exist in sCell(%d)\n", ueSCellDelInfo->ueId, sCell->cellId)); - RETVALUE(RFAILED); + return RFAILED; } /*PMAC_Reest: ueId and newRnti is different that means its a UeId change @@ -794,7 +794,7 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo; { RGDBGERRNEW(inst, (rgPBuf(inst), "[%d]UE:UE context already exist in\ sCell(%d)",ueSCellDelInfo->newRnti, sCell->cellId)); - RETVALUE(RFAILED); + return RFAILED; } rgDBMDelUeCb(sCell, sCellUe); @@ -812,7 +812,7 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo; rgCFGFreeUeCb(sCell, sCellUe); } - RETVALUE(ROK); + return ROK; } /* RgPrgPMacSMacUeSCellDelReq */ #endif /*LTE_ADV */ /********************************************************************** diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c index 82a25f1e4..505f9da1c 100755 --- a/src/5gnrmac/rg_dbm.c +++ b/src/5gnrmac/rg_dbm.c @@ -101,12 +101,12 @@ RgCellCb *cellCb; /* Initialize ue list */ if ((ret = rgDBMInitUeCbLst(cellCb, RG_MAX_UE_BIN_PER_CELL)) != ROK) - RETVALUE(ret); + return (ret); #ifdef LTEMAC_SPS /* Initialize SPS Ue list */ if ((ret = rgDBMInitSpsUeCbLst(cellCb, RG_MAX_UE_BIN_PER_CELL)) != ROK) - RETVALUE(ret); + return (ret); #endif /* LTEMAC_SPS */ /* Initialize BCCH/PCCH logical channels */ @@ -116,7 +116,7 @@ RgCellCb *cellCb; /* Initialize rach ue list */ rgDBMInitRachLst(cellCb); - RETVALUE(ret); + return (ret); } /* rgDBMInitCell */ @@ -150,7 +150,7 @@ U16 numBins; RgUeCb ue; TRC2(rgDBMInitUeCbLst) - RETVALUE(cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, + return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ue.ueLstEnt) - (PTR)&ue), FALSE, CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool)); } /* rgDBMInitUeCbLst */ @@ -180,7 +180,7 @@ RgCellCb *cellCb; { TRC2(rgDBMDeInitUeCbLst) - RETVALUE(cmHashListDeinit(&cellCb->ueLst)); + return (cmHashListDeinit(&cellCb->ueLst)); } /* rgDBMDeInitUeCbLst */ @@ -215,7 +215,7 @@ U16 numBins; RgUeCb ue; TRC2(rgDBMInitSpsUeCbLst) - RETVALUE(cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, + return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, CM_HASH_KEYTYPE_CONID, rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool)); } /* rgDBMInitSpsUeCbLst */ @@ -245,7 +245,7 @@ RgCellCb *cellCb; { TRC2(rgDBMDeInitSpsUeCbLst) - RETVALUE(cmHashListDeinit(&cellCb->spsUeLst)); + return (cmHashListDeinit(&cellCb->spsUeLst)); } /* rgDBMDeInitSpsUeCbLst */ @@ -279,7 +279,7 @@ RgUeCb *ueCb; { TRC2(rgDBMInsUeCb) - RETVALUE(cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, + return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCb, (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId))); } /* rgDBMInsUeCb */ @@ -313,7 +313,7 @@ RgUeCb *ueCb; { TRC2(rgDBMInsSpsUeCb) - RETVALUE(cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, + return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti))); } /* end of rgDBMInsSpsUeCb */ @@ -351,7 +351,7 @@ CmLteRnti ueId; cmHashListFind(&cellCb->ueLst, (U8 *)&ueId, sizeof(ueId), 0, (PTR *)&ueCb); - RETVALUE(ueCb); + return (ueCb); } /* rgDBMGetUeCb */ #ifdef LTEMAC_SPS @@ -386,7 +386,7 @@ CmLteRnti spsRnti; cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti, sizeof(spsRnti), 0, (PTR *)&ueCb); - RETVALUE(ueCb); + return (ueCb); } /* rgDBMGetSpsUeCb */ #endif /* LTEMAC_SPS */ @@ -421,7 +421,7 @@ RgUeCb *ueCb; TRC2(rgDBMGetNextUeCb) cmHashListGetNext(&cellCb->ueLst, (PTR) ueCb, (PTR *)&nextUeCb); - RETVALUE(nextUeCb); + return (nextUeCb); } /* rgDBMGetNextUeCb */ #ifdef LTEMAC_SPS @@ -455,7 +455,7 @@ RgUeCb *ueCb; TRC2(rgDBMGetNextSpsUeCb) cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb); - RETVALUE(nextUeCb); + return (nextUeCb); } /* end of rgDBMGetNextSpsUeCb */ #endif /* LTEMAC_SPS */ @@ -490,7 +490,7 @@ RgUeCb *ueCb; { TRC2(rgDBMDelUeCb) - RETVALUE(cmHashListDelete(&cellCb->ueLst, (PTR)ueCb)); + return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCb)); } /* rgDBMDelUeCb */ #ifdef LTEMAC_SPS @@ -523,7 +523,7 @@ RgUeCb *ueCb; { TRC2(rgDBMDelSpsUeCb) - RETVALUE(cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb)); + return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb)); } /* end of rgDBMDelSpsUeCb */ #endif /* LTEMAC_SPS */ @@ -797,14 +797,14 @@ CmLteLcId idx; if (idx > RG_DEDLC_MAX_LCID || idx <= 0) { - RETVALUE(NULLP); + return (NULLP); } if(ueCb->dl.lcCb[idx-1].lcId == RG_INVALID_LC_ID) { - RETVALUE(NULLP); + return (NULLP); } - RETVALUE(&ueCb->dl.lcCb[idx-1]); + return (&ueCb->dl.lcCb[idx-1]); } /* rgDBMGetDlDedLcCb */ @@ -989,14 +989,14 @@ CmLteLcId idx; if (idx > RG_DEDLC_MAX_LCID || idx < RG_DEDLC_MIN_LCID) { - RETVALUE(NULLP); + return (NULLP); } if(ueCb->ul.lcCb[idx-1].lcId == RG_INVALID_LC_ID) { - RETVALUE(NULLP); + return (NULLP); } - RETVALUE(&ueCb->ul.lcCb[idx-1]); + return (&ueCb->ul.lcCb[idx-1]); } /* rgDBMGetDlDedLcCb */ /** @@ -1032,21 +1032,21 @@ CmLteLcId lcId; if(cellCb->bcchBchInfo.lcId == lcId) { - RETVALUE(ROK); + return ROK; } if(cellCb->pcchInfo.lcId == lcId) { - RETVALUE(ROK); + return ROK; } for (idx = 0; idx < cellCb->numBcchDlschInfo; idx++) { if(cellCb->bcchDlschInfo[idx].lcId == lcId) { - RETVALUE(ROK); + return ROK; } } - RETVALUE(RFAILED); + return RFAILED; } /* rgDBMChkCmnLcCb */ /** @@ -1075,9 +1075,9 @@ RgCellCb *cellCb; if(cellCb->bcchBchInfo.lcId != RG_INVALID_LC_ID) { - RETVALUE(&(cellCb->bcchBchInfo)); + return (&(cellCb->bcchBchInfo)); } - RETVALUE(NULLP); + return (NULLP); } /* rgDBMGetBcchOnBch */ /** @@ -1113,10 +1113,10 @@ CmLteLcId lcId; { if(cellCb->bcchDlschInfo[idx].lcId == lcId) { - RETVALUE(&(cellCb->bcchDlschInfo[idx])); + return (&(cellCb->bcchDlschInfo[idx])); } } - RETVALUE(NULLP); + return (NULLP); } /* rgDBMGetBcchOnDlsch */ /** @@ -1144,9 +1144,9 @@ RgCellCb *cellCb; if(cellCb->pcchInfo.lcId != RG_INVALID_LC_ID) { - RETVALUE(&(cellCb->pcchInfo)); + return (&(cellCb->pcchInfo)); } - RETVALUE(NULLP); + return (NULLP); } /* rgDBMGetPcch */ /** @@ -1337,11 +1337,11 @@ CmLteRnti key; { if(((RgUeCb *)tmpNode->node)->ueId == key) { - RETVALUE((RgUeCb *)(tmpNode->node)); + return ((RgUeCb *)(tmpNode->node)); } CM_LLIST_NEXT_NODE(&cellCb->raInfo.ueRachLst,tmpNode); } - RETVALUE(NULLP); + return (NULLP); } /* rgDBMGetUeCbFromRachLst */ /** @@ -1372,10 +1372,10 @@ RgUeCb *ueCb; if(!ueCb) { - RETVALUE( cellCb->raInfo.ueRachLst.first ? + return ( cellCb->raInfo.ueRachLst.first ? (RgUeCb *)(cellCb->raInfo.ueRachLst.first->node) : NULLP ); } - RETVALUE( ueCb->rachLstEnt.next ? + return ( ueCb->rachLstEnt.next ? (RgUeCb *)(ueCb->rachLstEnt.next->node) : NULLP ); } /* rgDBMGetNextUeCbFromRachLst */ diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c index e23ec5a28..211e7f84d 100755 --- a/src/5gnrmac/rg_dhm.c +++ b/src/5gnrmac/rg_dhm.c @@ -144,7 +144,7 @@ U8 maxHqProcs; rgFreeSBuf(inst,(Data **)&(hqE->procs[idx1]), sizeof(RgDlHqProcCb)); } RLOG0(L_ERROR, "Memory Alloc Failure for RgDlHqProcCb"); - RETVALUE(RFAILED); + return RFAILED; } hqE->procs[idx1]->procId = idx1; @@ -180,7 +180,7 @@ U8 maxHqProcs; } - RETVALUE(ROK); + return ROK; } /* rgDHMHqEntInit */ /** @@ -392,7 +392,7 @@ U8 tbIndex; if((tbIndex > RG_MAX_TB_PER_UE) || (tbIndex == 0)) { - RETVALUE(RFAILED); + return RFAILED; } hqP->tbInfo[tbIndex-1].numSchLch = 0; @@ -438,7 +438,7 @@ U8 tbIndex; hqP->tbInfo[tbIndex-1].contResCe = NOTPRSNT; hqP->tbInfo[tbIndex-1].contResId = NULLP; - RETVALUE(ROK); + return ROK; } /* rgDHMRlsHqProc */ /** @@ -477,7 +477,7 @@ RgDlHqProcCb **hqP; /* Pick the proc based on the index provided */ *hqP = (ue->dl.hqEnt.procs[idx]); - RETVALUE(ROK); + return ROK; } /* rgDHMGetHqProcFrmId */ /*PRIVATE U32 dataAvl; */ @@ -580,7 +580,7 @@ RgErrInfo *err; hqP->tbInfo[i].timingInfo.slot, hqP->procId, hqP->tbInfo[i].pdcch.rnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -605,7 +605,7 @@ RgErrInfo *err; hqP->tbInfo[i].timingInfo.slot, hqP->procId, hqP->tbInfo[i].pdcch.rnti); - RETVALUE(RFAILED); + return RFAILED; } #else /*Padding is not done so data for this UE will not be @@ -635,13 +635,13 @@ RgErrInfo *err; rgDHMRlsHqProcTB(cellCb, hqP, 2); } - RETVALUE(ROK); + return ROK; } if (rgGetEventMem(inst,(Ptr *)&datReq, sizeof(TfuDatReqPduInfo), &(datInfo->memCp)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Fill the TFU Dat Req with information from Harq Proc */ @@ -662,7 +662,7 @@ RgErrInfo *err; cmLListAdd2Tail(&datInfo->pdus, &(datReq->lnk)); datReq->lnk.node = (PTR)datReq; - RETVALUE(ROK); + return ROK; } /* rgDHMSndDatReq */ /** @@ -730,7 +730,7 @@ RgErrInfo *err; } rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (U8)(j+1)); } - RETVALUE(RFAILED); + return RFAILED; } for(i=0;inmbOfTbs;i++) @@ -754,7 +754,7 @@ RgErrInfo *err; rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (U8)(j+1)); printf("\nrgDHMHndlDedDatReq:: hqP %p \n", (Void *)hqProc); } - RETVALUE(RFAILED); + return RFAILED; } #ifndef L2_OPTMZ @@ -802,13 +802,13 @@ RgErrInfo *err; } rgDHMRlsHqProcTB(rgCb[inst].cell, hqProc, (U8)(j+1)); } - RETVALUE(RFAILED); + return RFAILED; } /* SFndLenMsg(hqProc->tbInfo[i].tb, &len); */ } - RETVALUE(ROK); + return ROK; } /* rgDHMHndlDedDatReq */ /** @@ -863,7 +863,7 @@ RgErrInfo *err; rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_HARQ); rgLMMStaInd(inst,LCM_CATEGORY_PROTOCOL, LCM_EVENT_UI_INV_EVT, LRG_CAUSE_HQ_PROC_BUSY, &dgn); - RETVALUE(RFAILED); + return RFAILED; } bldPdu.datReq = datReq; @@ -885,10 +885,10 @@ RgErrInfo *err; hqProc->tbInfo[0].pdcch.rnti); RG_FREE_MSG(datReq->pdu); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgDHMHndlCmnDatReq */ /** @@ -1123,7 +1123,7 @@ RgErrInfo *err; { err->errType = RGERR_DHM_SND_STA_IND; err->errCause = RG_DHM_MEM_ALLOC_FAIL; - RETVALUE(RFAILED); + return RFAILED; } } @@ -1172,7 +1172,7 @@ RgErrInfo *err; err->errType = RGERR_DHM_SND_STA_IND; err->errCause = RG_DHM_MEM_ALLOC_FAIL; /* Need to return as memory allocation will fail for other UEs also*/ - RETVALUE(RFAILED); + return RFAILED; } dStaInd[rguDlSpId]->nmbOfUeGrantPerTti = 0; rguDlSap[rguDlSpId] = ue->rguDlSap; @@ -1261,7 +1261,7 @@ RgErrInfo *err; } } - RETVALUE(ROK); + return ROK; } /* rgDHMSndConsolidatedStaInd */ @@ -1471,7 +1471,7 @@ U8 tbIndex; if((tbIndex > RG_MAX_TB_PER_UE) || (tbIndex == 0)) { - RETVALUE(RFAILED); + return RFAILED; } tb = &(hqP->tbInfo[tbIndex-1].tb); @@ -1489,7 +1489,7 @@ U8 tbIndex; } hqP->tbInfo[tbIndex-1].sfLnkInfo[idx].sf = NULLP; } - RETVALUE(ROK); + return ROK; } #endif @@ -1591,19 +1591,19 @@ RgInfResetHqEnt* hqEntInfo; { RGDBGERRNEW(inst,(rgPBuf(inst), "For user [%d]Cell does not exist %d\n", hqEntInfo->crnti,hqEntInfo->cellId)); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, hqEntInfo->crnti)) == NULLP) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE does not exist for this hqEntInfo\n", hqEntInfo->crnti)); - RETVALUE(RFAILED); + return RFAILED; } rgDHMUeReset(cell, &ue->dl.hqEnt); - RETVALUE(ROK); + return ROK; } U32 gSaveVal; @@ -1660,7 +1660,7 @@ RgInfRlsHqInfo *rlshqUeInfo; if(NULLP == rlshqUeInfo) { - RETVALUE(RFAILED); + return RFAILED; } if((cell == NULLP) @@ -1669,12 +1669,12 @@ RgInfRlsHqInfo *rlshqUeInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,rlshqUeInfo->cellId, "No cellCb found with cellId"); - RETVALUE(RFAILED); + return RFAILED; } if(NULLP == rlshqUeInfo->ueHqInfo) { - RETVALUE(RFAILED); + return RFAILED; } for(idx1 = 0; idx1 < rlshqUeInfo->numUes; idx1++) @@ -1783,7 +1783,7 @@ RgInfRlsHqInfo *rlshqUeInfo; /*starting Task*/ SStopTask(startTime,PID_MAC_AM_HARQ_RLS); - RETVALUE(ROK); + return ROK; } /* end of RgSchMacRlsHqReq */ diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c index 4ae5f15a5..25378a033 100755 --- a/src/5gnrmac/rg_dux.c +++ b/src/5gnrmac/rg_dux.c @@ -94,15 +94,15 @@ static int RLOG_MODULE_ID=4096; } #define RG_UNPACK_SHORT_BSR(_bsr, _mBuf, _ret) {\ - _ret = SUnpkU8((_bsr), (_mBuf)); \ + _ret = oduPackUInt8((_bsr), (_mBuf)); \ } #define RG_UNPACK_TRUNC_BSR(_bsr, _mBuf, _ret) {\ - _ret = SUnpkU8((_bsr), (_mBuf)); \ + _ret = oduPackUInt8((_bsr), (_mBuf)); \ } #define RG_UNPACK_PHR(_phr, _mBuf, _ret) {\ - _ret = SUnpkU8((_phr), (_mBuf)); \ + _ret = oduPackUInt8((_phr), (_mBuf)); \ } #define RG_UNPACK_CRNTI(_rnti, _mBuf, _ret) {\ @@ -118,11 +118,11 @@ static int RLOG_MODULE_ID=4096; /* For EXT PHR DEMUX */ #define RG_UNPACK_EXT_PHR_CI(_ci, _mBuf, _ret) {\ - _ret = SUnpkU8((_ci), (_mBuf)); \ + _ret = oduPackUInt8((_ci), (_mBuf)); \ } #define RG_UNPACK_EXT_PHR(_extPhr, _mBuf, _ret) {\ - _ret = SUnpkU8((_extPhr), (_mBuf)); \ + _ret = oduPackUInt8((_extPhr), (_mBuf)); \ } @@ -178,12 +178,12 @@ RgErrInfo *err; { RLOG1(L_ERROR, "Allocation of RgSubHdr failed for LCID:%d",lcId); err->errCause = RGERR_DUX_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } *sdu = sduAloc; RG_INIT_SDU(sduAloc, lcId, sduLen); cmLListAdd2Tail(&pdu->sduLst, &sduAloc->sduLstEnt); - RETVALUE(ROK); + return ROK; } /** @@ -235,11 +235,11 @@ RgErrInfo *err; TRC2(rgDUXExtSubHdr) *len = 0; - if(SUnpkU8(&byte,mBuf) != ROK) + if(oduPackUInt8(&byte,mBuf) != ROK) { - RLOG0(L_ERROR, "SUnpkU8 failed"); + RLOG0(L_ERROR, "oduPackUInt8 failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } /* Extract the lcid */ RG_EXT_LCID(*lcId, byte); @@ -248,25 +248,25 @@ RgErrInfo *err; if(*lcId <= RG_DEDLC_MAX_LCID) { /* variable size MAC Sub PDU */ RG_EXT_FORMT_BIT(fmt,byte); - if(SUnpkU8(&byte, mBuf) != ROK) + if(oduPackUInt8(&byte, mBuf) != ROK) { - RLOG0(L_ERROR, "SUnpkU8 failed"); + RLOG0(L_ERROR, "oduPackUInt8 failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } *len = byte; if(fmt) { - if(SUnpkU8(&byte,mBuf) != ROK) + if(oduPackUInt8(&byte,mBuf) != ROK) { - RLOG0(L_ERROR, "SUnpkU8 failed"); + RLOG0(L_ERROR, "oduPackUInt8 failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } *len = (*len << 8) | byte; } } - RETVALUE(ROK); + return ROK; } /* rgDUXExtSubHdr */ /** @@ -333,7 +333,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of EXT PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } /* Not handling Type 2 PHR report as simultaneous PUSCH/PUCCH @@ -354,7 +354,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of EXT PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } /* extPhrOctet: Bits : 7 6 5 4 3 2 1 0 @@ -378,7 +378,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of EXT PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } extPhr->servCellPhr[extPhr->numServCells].pCmax = (extPhrPCmax & 0x3F); } @@ -398,7 +398,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_PHR_CE_PRSNT; } @@ -410,7 +410,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of Trunc BSR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_TRUNC_BSR_CE_PRSNT; } @@ -422,7 +422,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of Short BSR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_SHORT_BSR_CE_PRSNT; } @@ -435,7 +435,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of Long BSR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } RG_EXT_BS(longBsr, ceInfo->ces.bsr.longBsr.bs1, @@ -452,7 +452,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of C-RNTI failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_CRNTI_CE_PRSNT; } @@ -460,9 +460,9 @@ RgErrInfo *err; default: RLOG1(L_ERROR, "Invalid LCID:%u received",lcId); err->errCause = RGERR_DUX_INV_LCID_RX; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgDUXExtCe */ @@ -526,7 +526,7 @@ RgErrInfo *err; if(rgDUXInsSdu(inst,pdu, &sdu,lcId, subPduLen, err) != ROK) { RG_FREE_MSG(*mBuf); - RETVALUE(RFAILED); + return RFAILED; } tmpBuf1 = *mBuf; @@ -537,12 +537,12 @@ RgErrInfo *err; RG_FREE_MSG(tmpBuf1); RLOG0(L_ERROR,"SSegMsg failed"); err->errCause = RGERR_DUX_RLC_PDU_CREAT_FAIL; - RETVALUE(RFAILED); + return RFAILED; } sdu->mBuf = tmpBuf1; *mBuf = tmpBuf2; } - RETVALUE(ROK); + return ROK; } /* rgDUXExtSdu */ /** @@ -598,7 +598,7 @@ RgErrInfo *err; if(*mBuf == NULLP) { RLOG0(L_ERROR, "Null Buffer Recevived"); - RETVALUE(RFAILED); + return RFAILED; } do { @@ -610,12 +610,12 @@ RgErrInfo *err; { RG_FREE_MSG(*mBuf); RLOG0(L_ERROR, "Failed to extract pad sub headers"); - RETVALUE(RFAILED); + return RFAILED; } if(lcId == RG_PAD_LCID) { /*at end of MAC PDU, Padding started */ RG_FREE_MSG(*mBuf); - RETVALUE(ROK); + return ROK; } if(lcId <= RG_DEDLC_MAX_LCID) { @@ -626,11 +626,11 @@ RgErrInfo *err; * will be responsible for freeing mBuf */ *mBuf = NULLP; RLOG0(L_ERROR, "failed to Extract the sdus"); - RETVALUE(RFAILED); + return RFAILED; } if(*mBuf == NULLP) /* if message read completes then return */ { - RETVALUE(ROK); + return ROK; } } else @@ -640,7 +640,7 @@ RgErrInfo *err; { RG_FREE_MSG(*mBuf); RLOG0(L_ERROR, " failed to Extract the ces"); - RETVALUE(RFAILED); + return RFAILED; } } if(SFndLenMsg(*mBuf,&len) != ROK) @@ -648,12 +648,12 @@ RgErrInfo *err; RG_FREE_MSG(*mBuf); RLOG0(L_ERROR,"mBuf length check failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } }while(len); RG_FREE_MSG(*mBuf); - RETVALUE(ROK); + return ROK; } /* rgDUXDemuxData */ /********************************************************************** diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index 79d69e56b..f36c857dc 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -467,8 +467,8 @@ Buffer *mBuf; /* message buffer */ RG_FREE_MSG(mBuf); break; } - SExitTsk(); - RETVALUE(ROK); + ODU_EXIT_TASK(); + return ROK; }/* end of rgActvTsk */ diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c index 2a618a476..1f37aa178 100755 --- a/src/5gnrmac/rg_l2m.c +++ b/src/5gnrmac/rg_l2m.c @@ -122,7 +122,7 @@ RgErrInfo *err; if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed"); - RETVALUE(RFAILED); + return RFAILED; } //Memcpy is already done in rgL2mAllocMeasCb /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\ @@ -144,7 +144,7 @@ RgErrInfo *err; } cell->qciArray[measInfo->t.prbReq.qci[idx]].mask = TRUE; } - RETVALUE(ROK); + return ROK; } /* rgL2mCreateMeasCb */ @@ -188,9 +188,9 @@ RgErrInfo *err; LRG_L2MEAS_AVG_PRB_PER_QCI_UL, err)) != ROK) { /* Clear Downlink MeasCb created Above If exists*/ - RETVALUE(ret); + return (ret); } - RETVALUE(ROK); + return ROK; } /* rgL2mMeasReq */ /** @brief This function sends the measurement confirm * from mac to scheduler @@ -301,7 +301,7 @@ RgInfL2MeasReq *measInfo; /* Meas Req Info */ (cellCb->cellId != measInfo->cellId)) { RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,"unable to get the cellCb"); - RETVALUE(RFAILED); + return RFAILED; } /* Call L2M Function to store Meas req */ ret = rgL2mMeasReq(cellCb, measInfo, &err); @@ -317,9 +317,9 @@ RgInfL2MeasReq *measInfo; /* Meas Req Info */ RLOG_ARG2(L_ERROR,DBG_CELLID,measInfo->cellId, "Meas req Failed errType(%d) errCause(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* -- RgSchMacL2MeasReq-- */ /** @@ -371,7 +371,7 @@ RgInfL2MeasStopReq *measInfo; /* Meas Req Info */ RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, "Unable to get the cellCb"); - RETVALUE(RFAILED); + return RFAILED; } node = cellCb->l2mList.first; while(node != NULLP) @@ -393,7 +393,7 @@ RgInfL2MeasStopReq *measInfo; /* Meas Req Info */ measCfm.measType = measInfo->measType; measCfm.cfm.status = LCM_PRIM_OK; rgSndL2MeasStopCfm(cellCb, &measCfm); - RETVALUE(ret); + return (ret); } /* -- RgSchMacL2MeasStopReq-- */ /** @@ -439,12 +439,12 @@ RgInfL2MeasSndReq *measInfo; /* Meas Req Info */ RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, "Unable to get the cellCb"); - RETVALUE(RFAILED); + return RFAILED; } /*set sndL2Meas as applicatoin sent l2 meas info request*/ cellCb->sndL2Meas = TRUE; - RETVALUE(ret); + return (ret); }/*RgSchMacL2MeasSendReq*/ /** @brief This function inserts the MeasCb in to data base @@ -504,7 +504,7 @@ RgInfL2MeasReq *measInfo; { cell->l2mList.crnt = lnk; cmLListInsCrnt(&(cell->l2mList), node); - RETVALUE(ROK); + return ROK; } else { @@ -513,7 +513,7 @@ RgInfL2MeasReq *measInfo; } /* End of While */ cmLListAdd2Tail(&(cell->l2mList), node); - RETVALUE(ROK); + return ROK; } /* rgL2mInsertMeasCb */ /** @brief This function allocates memory from the heap @@ -553,12 +553,12 @@ RgErrInfo *err; "Allocation of RgL2MeasCb failed"); err->errType = RGERR_L2M_MEASREQ; err->errCause = RGERR_RAM_MEM_EXHAUST; - RETVALUE(NULLP); + return (NULLP); } cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(RgInfL2MeasReq)); RGCPYTIMEINFO(cell->crntTime, measCb->startTime); - RETVALUE(measCb); + return (measCb); } /* rgL2mAllocMeasCb */ @@ -652,7 +652,7 @@ RgCellCb *cell; continue; } } - RETVALUE(ROK); + return ROK; } /* rgL2MEas */ #endif /* LTE_L2_MEAS */ diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c index ca124358d..06b1cd838 100755 --- a/src/5gnrmac/rg_lim.c +++ b/src/5gnrmac/rg_lim.c @@ -111,7 +111,7 @@ SpId spId; { RLOG0(L_ERROR,"Call to RgLiTfuBndReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuBndReq */ @@ -160,7 +160,7 @@ Reason reason; { RLOG0(L_ERROR,"Call to RgLiTfuUbndReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuUbndReq */ @@ -213,10 +213,10 @@ U8 status; { RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgLMMBndCfm (pst, suId, status); - RETVALUE(ret); + return (ret); } /* RgLiTfuBndCfm */ /** @brief This function Validates the SAP information received along with the @@ -253,15 +253,15 @@ PRIVATE S16 rgLIMValidateSap(inst,suId) { RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } if (tfuSap->sapSta.sapState != LRG_BND) { RLOG1(L_ERROR,"Lower SAP not enabled SuId (%d)", tfuSap->sapCfg.suId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgLIMValidateSap */ #endif /** @brief This function frees up the TfuDatIndInfo structure @@ -361,7 +361,7 @@ TfuDatIndInfo *datInd; { RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"SAP Validation failed"); rgLIMUtlFreeDatIndEvnt(datInd, TRUE); - RETVALUE(ret); + return (ret); } #endif /* Now call the TOM (Tfu ownership module) primitive to process further */ @@ -382,7 +382,7 @@ TfuDatIndInfo *datInd; /*stoping Task*/ SStopTask(startTime, PID_MAC_TFU_DATIND); - RETVALUE(ret); + return (ret); } /* RgLiTfuDatInd*/ #ifdef RG_UNUSED @@ -495,7 +495,7 @@ TfuDatReqInfo *datReq; /* This case will never be hit if sap is not bound then we dont get TTI */ rgLIMUtlFreeDatReqEvnt(datReq, TRUE); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -507,7 +507,7 @@ TfuDatReqInfo *datReq; { RLOG_ARG0(L_ERROR,DBG_CELLID,datReq->cellId,"Call to RgLiTfuDatReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuDatReq*/ #ifdef L2_OPTMZ @@ -553,7 +553,7 @@ TfuDelDatReqInfo *delDatReq; { RLOG_ARG1(L_ERROR,DBG_CELLID,delDatReq->cellId,"Lower SAP not bound (%d)", tfuSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -562,7 +562,7 @@ TfuDelDatReqInfo *delDatReq; { RLOG_ARG0(L_ERROR,DBG_CELLID,delDatReq->cellId,"Call to RgLiTfuDelDatReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgLIMTfuDatReq*/ #endif /*L2_OPTMZ */ @@ -600,11 +600,11 @@ SuId suId; if (rgLIMValidateSap (pst->dstInst - RG_INST_START, suId) != ROK) { RGDBGERRNEW(pst->dstInst - RG_INST_START, (rgPBuf(pst->dstInst - RG_INST_START),"RgLiTfuNonRtInd() SAP Validation failed.\n")); - RETVALUE(RFAILED); + return RFAILED; } #endif rgDHMFreeTbBufs(pst->dstInst - RG_INST_START); - RETVALUE(ROK); + return ROK; } /* RgLiTfuNonRtInd */ #endif diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index 0b230e7aa..3065bfbaf 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -212,7 +212,7 @@ Reason reason; /* reason */ /* Initialize lower mac */ lwrMacInit(); - RETVALUE(ROK); + return ROK; } /* rgActvInit */ @@ -301,7 +301,7 @@ RgMngmt *cfg; /* config structure */ RgMiLrgCfgCfm(&cfmPst, &cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgCfgReq --*/ @@ -366,7 +366,7 @@ RgMngmt *sts; /* statistics structure */ cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE; RgMiLrgStsCfm(&cfmPst,&cfm); RLOG0(L_ERROR, "Gen Cfg not done"); - RETVALUE(ROK); + return ROK; } switch(sts->hdr.elmId.elmnt) @@ -477,7 +477,7 @@ RgMngmt *sts; /* statistics structure */ break; } RgMiLrgStsCfm(&cfmPst,&cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgStsReq --*/ @@ -545,7 +545,7 @@ RgMngmt *sta; /* status structure */ != ROK) { RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); - RETVALUE(ROK); + return ROK; } cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); rgGetSId(&cfm.t.ssta.s.sysId); @@ -554,7 +554,7 @@ RgMngmt *sta; /* status structure */ cfm.hdr.elmId.elmnt = sta->hdr.elmId.elmnt; RgMiLrgStaCfm(&cfmPst, &cfm); RLOG0(L_ERROR, "Gen Cfg not done"); - RETVALUE(ROK); + return ROK; } switch(sta->hdr.elmId.elmnt) @@ -566,7 +566,7 @@ RgMngmt *sta; /* status structure */ != ROK) { RLOG0(L_ERROR, "Memory Unavailable for Confirmation"); - RETVALUE(ROK); + return ROK; } cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE); rgGetSId(&cfm.t.ssta.s.sysId); @@ -606,7 +606,7 @@ RgMngmt *sta; /* status structure */ RLOG1(L_ERROR, "Invalid elmnt=%d",sta->hdr.elmId.elmnt); break; } - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgStaReq --*/ @@ -672,7 +672,7 @@ RgMngmt *cntrl; /* control structure */ cfm.hdr.elmId.elmnt = cntrl->hdr.elmId.elmnt; RgMiLrgCntrlCfm(&cfmPst, &cfm); RLOG0(L_ERROR, "Gen Cfg not done"); - RETVALUE(ROK); + return ROK; } /* General Config done, process the Control request */ @@ -693,7 +693,7 @@ RgMngmt *cntrl; /* control structure */ RLOG1(L_ERROR, "invalid elmnt=%d",cntrl->hdr.elmId.elmnt); break; } - RETVALUE(ret); + return (ret); }/*-- RgMiLrgCntrlReq --*/ @@ -739,7 +739,7 @@ Elmnt sapType; /* Sap Type */ /* Check if Gen Config has been done */ if(rgCb[inst].rgInit.cfgDone != TRUE) - RETVALUE(LCM_REASON_GENCFG_NOT_DONE); + return (LCM_REASON_GENCFG_NOT_DONE); switch(sapType) { @@ -841,7 +841,7 @@ Elmnt sapType; /* Sap Type */ /* would never reach here */ break; } - RETVALUE(ret); + return (ret); } @@ -883,13 +883,13 @@ RgCfg *cfg; /* Configuaration information */ /* Check if General Configuration is done already */ if (rgCb[inst].rgInit.cfgDone == TRUE) { - RETVALUE(LCM_REASON_INVALID_MSGTYPE); + return (LCM_REASON_INVALID_MSGTYPE); } if ((cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_TC) && (cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC)) { RLOG0(L_ERROR, "unsupported Selector value for RGU"); - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } /* Update the Pst structure for LM interface */ cmMemcpy((U8 *)&rgCb[inst].rgInit.lmPst, (U8 *)&cfg->s.genCfg.lmPst, @@ -913,7 +913,7 @@ RgCfg *cfg; /* Configuaration information */ if(cfg->s.genCfg.numRguSaps == 0) { RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Invalid numRguSap.\n")); - RETVALUE(RFAILED); + return RFAILED; } /* allocate RGR saps */ @@ -923,7 +923,7 @@ RgCfg *cfg; /* Configuaration information */ (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK) { RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Failed to allocate mem for RGU SAP's.\n")); - RETVALUE(RFAILED); + return RFAILED; } rgCb[inst].numRguSaps = cfg->s.genCfg.numRguSaps; @@ -953,13 +953,13 @@ RgCfg *cfg; /* Configuaration information */ (Data *)rgCb[inst].rguSap, (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* Set Config done in TskInit */ rgCb[inst].rgInit.cfgDone = TRUE; - RETVALUE(ret); + return (ret); } @@ -1435,7 +1435,7 @@ PTR cb; /* Entry for which Timer Expired */ arg.wait = tmrVal; cmPlcCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -1506,7 +1506,7 @@ PTR cb; /* Entry for which Timer Expired */ } - RETVALUE(ret); + return (ret); } @@ -1573,7 +1573,7 @@ S16 tmrEvnt; /* Timer Event */ ret = RFAILED; break; } - RETVALUE(ret); + return (ret); } @@ -1620,7 +1620,7 @@ RgUstaDgn *dgn; if(rgCb[inst].rgInit.usta == FALSE) { - RETVALUE(ROK); + return ROK; } cmMemset((U8 *)&usta, 0, sizeof(RgMngmt)); @@ -1641,7 +1641,7 @@ RgUstaDgn *dgn; rgCb[inst].rgInit.lmPst.pool = rgCb[inst].genCfg.ustaResp.response.mem.pool; usta.hdr.transId = rgCb[inst].genCfg.ustaResp.transId; - RETVALUE(RgMiLrgStaInd(&rgCb[inst].rgInit.lmPst, &usta)); + return (RgMiLrgStaInd(&rgCb[inst].rgInit.lmPst, &usta)); } @@ -1840,7 +1840,7 @@ U8 status; /* Status */ if(rgCb[inst].tfuSap.sapCfg.suId != suId) { RLOG0(L_ERROR, "Invalid SuId"); - RETVALUE(RFAILED); + return RFAILED; } /* check the Sap State */ @@ -1850,9 +1850,9 @@ U8 status; /* Status */ break; case LRG_BND: /* SAP is already bound */ - RETVALUE(ROK); + return ROK; default: - RETVALUE(RFAILED); + return RFAILED; } cfmPst = rgCb[inst].rgInit.lmPst; @@ -1896,7 +1896,7 @@ U8 status; /* Status */ ret = RgMiLrgCntrlCfm(&cfmPst, &cntrlCfm); - RETVALUE(ret); + return (ret); } @@ -1931,7 +1931,7 @@ Inst inst; /* Check if any MAC timer has expired */ cmPrcTmr(&rgCb[macInst].tmrTqCp, rgCb[macInst].tmrTq, (PFV) rgLMMTmrExpiry); - RETVALUE(ROK); + return ROK; } /* end of rgActvTmr */ diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c index 40ce1c754..2e1acbb2b 100755 --- a/src/5gnrmac/rg_mux.c +++ b/src/5gnrmac/rg_mux.c @@ -186,7 +186,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_CEHDR_FAIL; RLOG0(L_ERROR, "Muxing of Contention Resolution CE sub-header is failed"); - RETVALUE(RFAILED); + return RFAILED; } RG_PACK_CE(pdu->contResId->resId[0], RG_CRES_LEN, ceBuf, ret); @@ -195,7 +195,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_CE_FAIL; RLOG0(L_ERROR, "Muxing of Contention Resolution CE is failed") - RETVALUE(RFAILED); + return RFAILED; } pdu->schdTbSz -= RG_CRES_ELM_LEN; } @@ -211,7 +211,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_CEHDR_FAIL; RLOG0(L_ERROR, "Muxing of TA CE sub-hdr is failed") - RETVALUE(RFAILED); + return RFAILED; } taVal = pdu->ta.val; @@ -221,7 +221,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_CE_FAIL; RLOG0(L_ERROR, "Muxing of TA CE is failed") - RETVALUE(RFAILED); + return RFAILED; } pdu->schdTbSz -= RG_TA_ELM_LEN; RLOG1(L_DEBUG,"TA muxed by MAC: %u", pdu->ta.val); @@ -239,7 +239,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_CEHDR_FAIL; RLOG0(L_ERROR, "Muxing of SCELL Activation CE sub-hdr is failed") - RETVALUE(RFAILED); + return RFAILED; } /* Adding the ACT CE */ @@ -249,7 +249,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_CE_FAIL; RLOG0(L_ERROR, "Muxing of SCELL Activation CE is failed") - RETVALUE(RFAILED); + return RFAILED; } pdu->schdTbSz -= RG_SCELL_CE_ELM_LEN; @@ -260,7 +260,7 @@ RgErrInfo *err; /*LcId is not yet decided in 5G-NR spec for MAC CEs Hence, not writing code * new MAC CEs. */ - RETVALUE(ROK); + return ROK; } /* rgMUXAddCes */ /** @@ -322,7 +322,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_SDUHDR_FAIL; RLOG1(L_ERROR, "RGERR_MUX_BLD_SDUHDR_FAIL for LCID:%d",lcId); - RETVALUE(RFAILED); + return RFAILED; } #ifndef L2_OPTMZ /* no need to pack as passing not muxing all LCs PDUs to 1*/ @@ -337,7 +337,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_SDU_FAIL; RLOG1(L_ERROR, "RGERR_MUX_BLD_SDU_FAIL for LCID:%d",lcId); - RETVALUE(RFAILED); + return RFAILED; } *schdTbSz -= elmTotLen; @@ -349,9 +349,9 @@ RgErrInfo *err; lcId, ((S16)elmTotLen), lenBytes,lcId); RLOG3(L_ERROR, "msglen %d schdTbSz %d LCID:%d", ((S16)msgLen), ((S16)*schdTbSz),lcId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -413,7 +413,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_PADHDR_FAIL; RLOG0(L_ERROR, "RGERR_MUX_BLD_PADHDR_FAIL"); - RETVALUE(RFAILED); + return RFAILED; } *schdTbSz -= 1; @@ -437,7 +437,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_PAD_FAIL; RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL"); - RETVALUE(RFAILED); + return RFAILED; } *schdTbSz = 0; } @@ -462,7 +462,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_PAD_FAIL; RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL"); - RETVALUE(RFAILED); + return RFAILED; } *schdTbSz -= RG_MAX_PAD_ARR_SZ; @@ -484,7 +484,7 @@ RgErrInfo *err; { err->errCause = RGERR_MUX_BLD_PAD_FAIL; RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL"); - RETVALUE(RFAILED); + return RFAILED; } *schdTbSz = 0; @@ -494,7 +494,7 @@ RgErrInfo *err; } } - RETVALUE(ROK); + return ROK; } /* rgMUXAddPadd */ #ifndef L2_OPTMZ @@ -544,7 +544,7 @@ RgErrInfo *err; if(rgMUXInsSdu(inst,&pdu->schdTbSz, RG_CCCH_LCID, cDatReq->pdu, sduBuf, err) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } RG_FREE_MSG(cDatReq->pdu); } @@ -575,7 +575,7 @@ RgErrInfo *err; sduBuf, err) != ROK) { RLOG1(L_ERROR, "FAILED for LCID:%d",datReqTb->lchData[idx1].lcId); - RETVALUE(RFAILED); + return RFAILED; } } RG_FREE_MSG(datReqTb->lchData[idx1].pdu.mBuf[idx2]); @@ -601,7 +601,7 @@ RgErrInfo *err; { RLOG2(L_ERROR, "FAILED TB Size %d LCID:%d", ((S16)pdu->schdTbSz),datReqTb->lchData[idx1].lcId); - RETVALUE(RFAILED); + return RFAILED; } } RG_FREE_MSG(datReqTb->lchData[idx1].pdu.mBuf[idx2]); @@ -617,9 +617,9 @@ RgErrInfo *err; if(rgMUXAddPadd(inst,&pdu->schdTbSz, sduBuf, FALSE, err) != ROK) { RLOG1(L_ERROR, "FAILED for TB Size:%d",(S16)pdu->schdTbSz); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -676,7 +676,7 @@ RgErrInfo *err; err->errCause = RGERR_MUX_MEM_ALLOC_FAIL; err->errType = RGERR_MUX_BLD_PDU; RLOG1(L_FATAL, "Memory allocation failed during MUXing of MAC TB: MacInst %d", inst); - RETVALUE(RFAILED); + return RFAILED; } if(rgMUXAddCes(inst, pdu, mBuf, err) != ROK) @@ -684,7 +684,7 @@ RgErrInfo *err; RG_FREE_MSG(mBuf); err->errType = RGERR_MUX_BLD_PDU; RLOG1(L_ERROR, "Failed to Multiplex MAC CEs: MacInst %d", inst); - RETVALUE(RFAILED); + return RFAILED; } if(rgMUXAddSdus(inst, pdu, mBuf, err) != ROK) @@ -692,12 +692,12 @@ RgErrInfo *err; RG_FREE_MSG(mBuf); err->errType = RGERR_MUX_BLD_PDU; RLOG1(L_ERROR, "FAILED to Multiplex MAC SDU: MacInst %d", inst); - RETVALUE(RFAILED); + return RFAILED; } *txPdu = mBuf; - RETVALUE(ROK); + return ROK; } /* rgMUXBldPdu */ @@ -752,7 +752,7 @@ RgErrInfo *err; RG_CCCH_LCID, cDatReq->pdu, sHdrBuf, NULLP, err) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* L2 Optimization for mUe/Tti: RLC pdu mbuf pointer will be passed * to CL it is stored in DlHqProc->TbInfo and it will be used in @@ -795,7 +795,7 @@ RgErrInfo *err; sHdrBuf, NULLP, err) != ROK) { RGDBGERRNEW(inst,(rgPBuf(inst), "FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } /* L2 Optimization for mUe/Tti:Increment numPdu by 1 @@ -862,7 +862,7 @@ RgErrInfo *err; { RGDBGERRNEW(inst,(rgPBuf(inst), "FAILED TB Size %d\n", ((S16)pdu->schdTbSz))); - RETVALUE(RFAILED); + return RFAILED; } /* L2 Optimization for mUe/Tti:Increment numPdu by 1 * Store pdu buffer in tb to send it to CL/PHY. Increment @@ -918,11 +918,11 @@ RgErrInfo *err; if(rgMUXAddPadd(inst, &pdu->schdTbSz, sduBuf, NULLP, FALSE, err) != ROK) { //RGDBGERRNEW((rgPBuf, "FAILED")); - RETVALUE(RFAILED); + return RFAILED; } tb->padSize = padSize; - RETVALUE(ROK); + return ROK; } /** @@ -995,7 +995,7 @@ RgErrInfo *err; RG_FREE_TB(tb); err->errType = RGERR_MUX_BLD_PDU; //RGDBGERRNEW((rgPBuf, "FAILED")); - RETVALUE(RFAILED); + return RFAILED; } if(rgMUXAddSdus(inst, pdu, mBuf1, tb, err) != ROK) { @@ -1006,14 +1006,14 @@ RgErrInfo *err; err->errType = RGERR_MUX_BLD_PDU; //RGDBGERRNEW((rgPBuf, "FAILED")); - RETVALUE(RFAILED); + return RFAILED; } // UDAY // SPrntMsg(tb->macHdr, 0, 0); // prc_trace_format_string(0x40,3,": padSize=%ld", tb->padSize); tb->tbPres = TRUE; - RETVALUE(ROK); + return ROK; } /* rgMUXBldPdu */ @@ -1085,7 +1085,7 @@ RgErrInfo *err; /* Buffer couldnt get allocated. Return a failure */ err->errCause = RGERR_MUX_MEM_ALLOC_FAIL; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "FAILED to getMsg"); - RETVALUE(RFAILED); + return RFAILED; } if (TRUE == alloc->backOffInd.pres) @@ -1102,7 +1102,7 @@ RgErrInfo *err; err->errCause = RGERR_MUX_BLD_BI_FAIL; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_BI_FAIL"); RG_FREE_MSG(datBuf); - RETVALUE(RFAILED); + return RFAILED; } schdTbSz--; } @@ -1122,7 +1122,7 @@ RgErrInfo *err; err->errCause = RGERR_MUX_BLD_RAPIDHDR_FAIL; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_RAPIDHDR_FAIL"); RG_FREE_MSG(datBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Prepare the data */ @@ -1147,7 +1147,7 @@ RgErrInfo *err; err->errCause = RGERR_MUX_BLD_RAPID_FAIL; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_RAPID_FAIL"); RG_FREE_MSG(datBuf); - RETVALUE(RFAILED); + return RFAILED; } schdTbSz -= RG_RAR_ELEM_LEN+RG_RAR_SHDR_LEN; } @@ -1156,12 +1156,12 @@ RgErrInfo *err; { RG_FREE_MSG(datBuf); RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"FAILED to mux add padding"); - RETVALUE(RFAILED); + return RFAILED; } *txPdu = datBuf; - RETVALUE(ROK); + return ROK; } /* rgMUXBldRarPdu */ /*********************************************************** @@ -1252,7 +1252,7 @@ U8 numRb; { riv = bw * (bw - numRbMinus1) + (bw - rbStart - 1); } - RETVALUE(riv); + return (riv); } /* rgMUXCalcRiv */ diff --git a/src/5gnrmac/rg_pom_scell.c b/src/5gnrmac/rg_pom_scell.c index df1563439..27fcd0ced 100755 --- a/src/5gnrmac/rg_pom_scell.c +++ b/src/5gnrmac/rg_pom_scell.c @@ -141,7 +141,7 @@ RgPrgUeSCellLchModInfo *lchCfgCb; /* Send positive confirmation to primary cell*/ RgPrgSMacPMacCfg(&cfmPst, &cfgCfm); - RETVALUE(ROK); + return ROK; } /* RgPrgPMacSMacUeSCellLchModReq */ @@ -201,7 +201,7 @@ Bool *isCfmRqrd; RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n", lcDel->u.lchDel.crnti, lcDel->u.lchDel.cellId)); - RETVALUE(RFAILED); + return RFAILED; } RGDBGPRM(inst,(rgPBuf(inst), @@ -212,7 +212,7 @@ Bool *isCfmRqrd; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist\n", lcDel->u.lchDel.crnti)); - RETVALUE(RFAILED); + return RFAILED; } for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++) { @@ -231,7 +231,7 @@ Bool *isCfmRqrd; *isCfmRqrd = FALSE; } } - RETVALUE(ROK); + return ROK; } @@ -305,7 +305,7 @@ Bool *isCfmRqrd; *isCfmRqrd = FALSE; } } - RETVALUE(ROK); + return ROK; } /** @@ -381,7 +381,7 @@ Bool *isCfmRqrd; *isCfmRqrd = FALSE; } } - RETVALUE(ROK); + return ROK; } /* rgPomSndUeSCellLchAddToSmac */ /** @@ -460,7 +460,7 @@ RgPrgUeSCellLchDelInfo *delLcCb; /* Send positive confirmation to primary cell*/ RgPrgSMacPMacCfg(&cfmPst, &cfgCfm); - RETVALUE(ROK); + return ROK; } /* RgPrgPMacSMacUeSCellLchDelReq */ @@ -539,7 +539,7 @@ RgPrgUeSCellLchAddInfo *lchCfgCb; /* Send positive confirmation to primary cell*/ RgPrgSMacPMacCfg(&cfmPst, &cfgCfm); - RETVALUE(ROK); + return ROK; } /* RgPrgPMacSMacUeSCellLchAddReq */ /** * @brief Validates the logical channel configuration request from PMAC to SMAC. @@ -593,14 +593,14 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Validation for dedicated LC failed\n", lcCfg->crnti)); - RETVALUE(RFAILED); + return RFAILED; } } else { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Invalid logical channel type %d\n",\ lcCfg->crnti, lcCfg->lcType)); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS if ( lcCfg->qci < RG_QCI_MIN || @@ -609,14 +609,14 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UEID Invalid qci %x\n", lcCfg->crnti, lcCfg->qci)); - RETVALUE(RFAILED); + return RFAILED; } /*validate qci */ #endif /*LTE_L2_MEAS */ RGDBGINFONEW(inst,(rgPBuf(inst),"[%d]UEID CRG LCconfig validation done:cellId:%d lcId:%d\n", lcCfg->crnti, lcCfg->cellId, lcCfg->lcId)); - RETVALUE(ROK); + return ROK; } /** * @brief Handler for the logical channel configuration request from @@ -665,12 +665,12 @@ RgPrgUeSCellLchAddInfo *lcCfg; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated logical channel configuration" "failed in SCell%d\n", lcCfg->crnti, lcCfg->lcId)); - RETVALUE(RFAILED); + return RFAILED; } RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]SCell LC config done: cellId %d lcId %d\n", lcCfg->crnti, lcCfg->cellId, lcCfg->lcId)); - RETVALUE(ROK); + return ROK; } /* rgPomUeSCellLcAdd */ /*********************************************************** @@ -720,7 +720,7 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist: Cell %d\n", lcCfg->crnti, lcCfg->cellId)); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -728,7 +728,7 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE does not exist for dedicated logical" "channel %d\n", lcCfg->crnti, lcCfg->lcId)); - RETVALUE(RFAILED); + return RFAILED; } /* Validate logical channel Id */ @@ -737,7 +737,7 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid logical channel Id %d\n", lcCfg->crnti, lcCfg->lcId)); - RETVALUE(RFAILED); + return RFAILED; }*/ /* Validate downlink info */ if (lcCfg->dir & PRG_DIR_TX) @@ -746,7 +746,7 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Dedicated DL LC %d already configured\n", lcCfg->crnti, lcCfg->lcId)); - RETVALUE(RFAILED); + return RFAILED; } /* dirVld = TRUE;*/ } @@ -758,13 +758,13 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Invalid lcgId for uplink logical" "channel %d\n", lcCfg->crnti, lcCfg->ulInfo.lcgId)); - RETVALUE(RFAILED); + return RFAILED; } if (rgDBMGetUlDedLcCb((*ue), lcCfg->lcId) != NULLP) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]UE: Dedicated UL LC %d already configured\n", lcCfg->crnti, lcCfg->lcId)); - RETVALUE(RFAILED); + return RFAILED; } /* dirVld = TRUE;*/ } @@ -773,12 +773,12 @@ RgUeCb **ue; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid Direction %d \n", lcCfg->crnti, lcCfg->dir)); - RETVALUE(RFAILED); + return RFAILED; } */ RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]Dedicated logical channel %d validated" "for cell %d\n", lcCfg->crnti, lcCfg->lcId, lcCfg->cellId)); - RETVALUE(ROK); + return ROK; } /* rgPomVldtSCellDedLchCfg */ /*********************************************************** * @@ -839,7 +839,7 @@ RgPrgUeSCellLchAddInfo *lcCfg; rgDBMInsDlDedLcCb(ue, lcCfg->lcId); } RGDBGINFO(inst,(rgPBuf(inst), "Dedicated LC config done\n")); - RETVALUE(ROK); + return ROK; } /* rgPomUeSCellDedLcCfg */ /** @@ -887,28 +887,28 @@ PUBLIC S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc) || ((*cell)->cellId != lchCfgCb->cellId)) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",lchCfgCb->crnti, lchCfgCb->cellId)); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue for dedicated channels */ if ((*ue = rgDBMGetUeCb(*cell, lchCfgCb->crnti)) == NULLP) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist for dedicated logical channel\n", lchCfgCb->crnti)); - RETVALUE(RFAILED); + return RFAILED; } if ((*ulLc = rgDBMGetUlDedLcCb((*ue), lchCfgCb->lcId)) == NULLP) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated UL LC does not exist %d\n", lchCfgCb->crnti, lchCfgCb->lcId)); - RETVALUE(RFAILED); + return RFAILED; } /* if (lchCfgCb->ulLchRecfg.lcgId > (RG_MAX_LCG_PER_UE - 1)) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid lcgId for uplink logical channel: lcg %d" "lc %d\n",lchCfgCb->crnti, lchCfgCb->ulLchRecfg.lcgId, lchCfgCb->lcId)); - RETVALUE(RFAILED); + return RFAILED; }*/ - RETVALUE(ROK); + return ROK; } /*rgPomVltdModLch*/ /** * @brief Handler for the logical channel re-configuration request from @@ -959,7 +959,7 @@ RgPrgUeSCellLchModInfo *lchCfgCb; RGDBGINFO(inst,(rgPBuf(inst), "LC %d of Ue %d of cell %d Reconfigured\n", lchCfgCb->lcId, ue->ueId, cell->cellId)); - RETVALUE(ROK); + return ROK; } /* rgPomUeSCellLcMod */ /** * @brief Function to validate SCellLchDel. @@ -1008,28 +1008,28 @@ PUBLIC S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc) || ((*cell)->cellId != delLcCb->cellId)) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",delLcCb->crnti, delLcCb->cellId)); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue for dedicated channels */ if ((*ue = rgDBMGetUeCb(*cell, delLcCb->crnti)) == NULLP) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Ue does not exist for dedicated logical channel\n", delLcCb->crnti)); - RETVALUE(RFAILED); + return RFAILED; } if ((*ulLc = rgDBMGetUlDedLcCb((*ue), delLcCb->lcId)) == NULLP) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Dedicated UL LC does not exist %d\n", delLcCb->crnti, delLcCb->lcId)); - RETVALUE(RFAILED); + return RFAILED; } if ((*dlLc = rgDBMGetDlDedLcCb((*ue), delLcCb->lcId)) == NULLP) { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]DL LC %d does not exist\n", delLcCb->crnti, delLcCb->lcId)); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*rgPomVltdDelLch*/ /** * @brief Handler for the logical channel delete request from @@ -1096,12 +1096,12 @@ RgDlLcCb *dlLc; { RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Invalid direction %d for LC Delete\n", delLcCb->crnti, delLcCb->dir)); - RETVALUE(RFAILED); + return RFAILED; }*/ RGDBGINFONEW(inst,(rgPBuf(inst), "[%d]UE's Logical channel %d deleted from cell %d\n", delLcCb->crnti, delLcCb->lcId, delLcCb->cellId)); - RETVALUE(ROK); + return ROK; } /* rgPomUeSCellLcDel */ #endif /*LTE_ADV */ /********************************************************************** diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c index 59e9f2189..852772866 100755 --- a/src/5gnrmac/rg_prg.c +++ b/src/5gnrmac/rg_prg.c @@ -83,18 +83,18 @@ RgPrgUeSCellCfgInfo *ueSCellCfgInfo; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo),\ mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTPRGUESCELLCFGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -131,11 +131,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&ueSCellCfgInfo, sizeof(RgPrgUeSCellCfgInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGPRG_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &ueSCellCfgInfo)); + return ((*func)(pst, &ueSCellCfgInfo)); } /** @@ -169,13 +169,13 @@ RgPrgCfgCfmInfo *cfgCfm; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } switch(cfgCfm->event) { @@ -200,7 +200,7 @@ RgPrgCfgCfmInfo *cfgCfm; } break; } - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -238,11 +238,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&cfgCfm, sizeof(RgPrgCfgCfmInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGPRG_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &cfgCfm)); + return ((*func)(pst, &cfgCfm)); } /** @@ -276,18 +276,18 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)ueSCellDelInfo, sizeof(RgPrgUeSCellDelInfo), mBuf)\ != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTPRGUESCELLDELREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -326,11 +326,11 @@ Buffer *mBuf; mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGPRG_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &ueSCellDelInfo)); + return ((*func)(pst, &ueSCellDelInfo)); } /** @@ -364,18 +364,18 @@ RgPrgUeSCellLchAddInfo *lchCfgInfo; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo),\ mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTPRGUESCELLLCHADDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -413,11 +413,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchAddInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGPRG_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &lchCfgInfo)); + return ((*func)(pst, &lchCfgInfo)); } /** @@ -451,18 +451,18 @@ RgPrgUeSCellLchDelInfo *delLcCb; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)delLcCb, sizeof(RgPrgUeSCellLchDelInfo),\ mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTPRGUESCELLLCHDELREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -497,18 +497,18 @@ RgPrgUeSCellLchModInfo *lchCfgInfo; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo),\ mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTPRGUESCELLLCHMODREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -547,11 +547,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchModInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGPRG_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &lchCfgInfo)); + return ((*func)(pst, &lchCfgInfo)); } @@ -590,11 +590,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&lchCfgInfo, sizeof(RgPrgUeSCellLchDelInfo), mBuf) != ROK) { RGPRG_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGPRG_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &lchCfgInfo)); + return ((*func)(pst, &lchCfgInfo)); } #endif /*LCPRG*/ diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c index d6d496699..0e2bb0af7 100755 --- a/src/5gnrmac/rg_prg_pt.c +++ b/src/5gnrmac/rg_prg_pt.c @@ -90,7 +90,7 @@ PUBLIC S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo) TRC3(RgPrgPMacSMacUeSCellCfg); - RETVALUE((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo)); + return ((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo)); } /* Matrix for config confirm from SMac to Pmac*/ @@ -130,7 +130,7 @@ PUBLIC S16 RgPrgSMacPMacCfg(pst, cfgCfm) TRC3(RgPrgSMacPMacCfg); - RETVALUE((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm)); + return ((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm)); } /* Matrix for Ue SCell delete req/Ue Id change req from PMac to SMac */ @@ -170,7 +170,7 @@ PUBLIC S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo) TRC3(RgPrgPMacSMacUeSCellDel); - RETVALUE((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo)); + return ((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo)); } @@ -213,7 +213,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo) TRC3(RgPrgPMacSMacUeScellLchMod); - RETVALUE((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo)); + return ((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo)); } @@ -255,7 +255,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb) TRC3(RgPrgPMacSMacUeScellLchDel); - RETVALUE((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb)); + return ((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb)); } @@ -297,7 +297,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo) TRC3(RgPrgPMacSMacUeScellLchAdd); - RETVALUE((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo)); + return ((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo)); } #endif /* LTE_ADV */ diff --git a/src/5gnrmac/rg_ptli.c b/src/5gnrmac/rg_ptli.c index 6456cf95e..24b366574 100755 --- a/src/5gnrmac/rg_ptli.c +++ b/src/5gnrmac/rg_ptli.c @@ -418,7 +418,7 @@ SpId spId; TRC3(RgLiTfuBndReq) - RETVALUE((*RgLiTfuBndReqMt[pst->selector])(pst, suId, spId)); + return ((*RgLiTfuBndReqMt[pst->selector])(pst, suId, spId)); } @@ -460,7 +460,7 @@ SpId spId; TRC3(RgLiTfuSchBndReq) - RETVALUE((*RgLiTfuSchBndReqMt[pst->selector])(pst, suId, spId)); + return ((*RgLiTfuSchBndReqMt[pst->selector])(pst, suId, spId)); } @@ -502,7 +502,7 @@ Reason reason; TRC3(RgLiTfuUbndReq) - RETVALUE((*RgLiTfuUbndReqMt[pst->selector])(pst, spId, reason)); + return ((*RgLiTfuUbndReqMt[pst->selector])(pst, spId, reason)); } @@ -544,7 +544,7 @@ Reason reason; TRC3(RgLiTfuSchUbndReq) - RETVALUE((*RgLiTfuSchUbndReqMt[pst->selector])(pst, spId, reason)); + return ((*RgLiTfuSchUbndReqMt[pst->selector])(pst, spId, reason)); } @@ -600,7 +600,7 @@ TfuRecpReqInfo * recpReq; TRC3(RgLiTfuRecpReq) - RETVALUE((*RgLiTfuRecpReqMt[pst->selector])(pst, spId, recpReq)); + return ((*RgLiTfuRecpReqMt[pst->selector])(pst, spId, recpReq)); } @@ -649,7 +649,7 @@ TfuCntrlReqInfo * cntrlReq; TRC3(RgLiTfuCntrlReq) - RETVALUE((*RgLiTfuCntrlReqMt[pst->selector])(pst, spId, cntrlReq)); + return ((*RgLiTfuCntrlReqMt[pst->selector])(pst, spId, cntrlReq)); } @@ -697,7 +697,7 @@ TfuDatReqInfo * datReq; TRC3(RgLiTfuDatReq) - RETVALUE((*RgLiTfuDatReqMt[pst->selector])(pst, spId, datReq)); + return ((*RgLiTfuDatReqMt[pst->selector])(pst, spId, datReq)); } @@ -743,7 +743,7 @@ TfuDelDatReqInfo * delDatReq; TRC3(RgLiTfuDelDatReq) - RETVALUE((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq)); + return ((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq)); } #endif /* L2_OPTMZ*/ @@ -794,7 +794,7 @@ SpId spId; UNUSED(suId); UNUSED(spId); - RETVALUE(ROK); + return ROK; } @@ -840,7 +840,7 @@ SpId spId; UNUSED(suId); UNUSED(spId); - RETVALUE(ROK); + return ROK; } @@ -886,7 +886,7 @@ Reason reason; UNUSED(spId); UNUSED(reason); - RETVALUE(ROK); + return ROK; } @@ -932,7 +932,7 @@ Reason reason; UNUSED(spId); UNUSED(reason); - RETVALUE(ROK); + return ROK; } @@ -992,7 +992,7 @@ TfuRecpReqInfo * recpReq; UNUSED(spId); UNUSED(recpReq); - RETVALUE(ROK); + return ROK; } @@ -1045,7 +1045,7 @@ TfuCntrlReqInfo * cntrlReq; UNUSED(spId); UNUSED(cntrlReq); - RETVALUE(ROK); + return ROK; } @@ -1097,7 +1097,7 @@ TfuDatReqInfo * datReq; UNUSED(spId); UNUSED(datReq); - RETVALUE(ROK); + return ROK; } @@ -1148,7 +1148,7 @@ TfuDelDatReqInfo * DelDatReq; UNUSED(spId); UNUSED(delDatReq); - RETVALUE(ROK); + return ROK; } #endif /*L2_OPTMZ*/ diff --git a/src/5gnrmac/rg_ptmi.c b/src/5gnrmac/rg_ptmi.c index 7dc1a10e8..fca771f43 100755 --- a/src/5gnrmac/rg_ptmi.c +++ b/src/5gnrmac/rg_ptmi.c @@ -296,7 +296,7 @@ RgMngmt *cfm; /* config confirm structure */ (*RgMiLrgCfgCfmMt[pst->selector])(pst, cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgCfgCfm --*/ @@ -334,7 +334,7 @@ RgMngmt *cfm; /* config confirm structure */ (*RgMiLrgSchCfgCfmMt[pst->selector])(pst, cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgSchCfgCfm --*/ @@ -374,7 +374,7 @@ RgMngmt *cfm; /* statistics confirm structure */ (*RgMiLrgStsCfmMt[pst->selector])(pst, cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgStsCfm --*/ @@ -413,7 +413,7 @@ RgMngmt *cfm; /* status confirm structure */ (*RgMiLrgStaCfmMt[pst->selector])(pst,cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgStaCfm --*/ @@ -452,7 +452,7 @@ RgMngmt *cfm; /* control confirm structure */ (*RgMiLrgCntrlCfmMt[pst->selector])(pst,cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgCntrlCfm --*/ @@ -490,7 +490,7 @@ RgMngmt *cfm; /* control confirm structure */ (*RgMiLrgSchCntrlCfmMt[pst->selector])(pst,cfm); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgSchCntrlCfm --*/ @@ -529,7 +529,7 @@ RgMngmt *usta; /* status indication structure */ (*RgMiLrgStaIndMt[pst->selector])(pst,usta); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgStaInd --*/ @@ -567,7 +567,7 @@ RgMngmt *usta; /* status indication structure */ (*RgMiLrgSchStaIndMt[pst->selector])(pst,usta); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgSchStaInd --*/ @@ -609,7 +609,7 @@ Buffer *mBuf; /* Trace message */ (*RgMiLrgTrcIndMt[pst->selector])(pst,trc,mBuf); - RETVALUE(ROK); + return ROK; }/*-- RgMiLrgTrcInd --*/ @@ -632,7 +632,7 @@ LrgSchMeasCfmInfo *cfm; /* Meas Cfm Info */ (*RgMiLrgSchL2mMeasCfmMt[pst->selector])(pst,cfm); - RETVALUE(ROK); + return ROK; } /* RgMiLrgSchL2MeasCfm */ @@ -669,7 +669,7 @@ LrgSchMeasCfmInfo *cfm; /* Meas Cfm Info */ (*RgMiLrgSchL2mMeasStopCfmMt[pst->selector])(pst,cfm); - RETVALUE(ROK); + return ROK; } /* RgMiLrgSchL2MeasStopCfm */ @@ -712,7 +712,7 @@ RgMngmt *cfm; /* Config Confirm */ { TRC3(PtMiLrgCfgCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgCfgCfm */ /** @@ -748,7 +748,7 @@ RgMngmt *cfm; /* Config Confirm */ { TRC3(PtMiLrgSchCfgCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgSchCfgCfm */ @@ -786,7 +786,7 @@ RgMngmt *cfm; /* Statistics Confirm */ { TRC3(PtMiLrgStsCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgStsCfm */ @@ -823,7 +823,7 @@ RgMngmt *cfm; /* Status Confirm */ #endif { TRC3(PtMiLrgStaCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgStaCfm */ @@ -860,7 +860,7 @@ RgMngmt *usta; /* Status indication */ #endif { TRC3(PtMiLrgStaInd) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgStaInd */ /** @@ -895,7 +895,7 @@ RgMngmt *usta; /* Status indication */ #endif { TRC3(PtMiLrgSchStaInd) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgSchStaInd */ @@ -931,7 +931,7 @@ RgMngmt *cfm; /* Control Confirm */ #endif { TRC3(PtMiLrgCntrlCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgCntrlCfm */ /** @@ -966,7 +966,7 @@ RgMngmt *cfm; /* Control Confirm */ #endif { TRC3(PtMiLrgSchCntrlCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgSchCntrlCfm */ @@ -1004,7 +1004,7 @@ Buffer *mBuf; /* Trace message */ #endif { TRC3(PtMiLrgTrcInd) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgTrcInd */ #ifdef LTE_L2_MEAS /** @@ -1035,7 +1035,7 @@ LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */ { TRC3(PtMiLrgSchL2MeasCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgSchL2MeasCfm */ /** @@ -1066,7 +1066,7 @@ LrgSchMeasCfmInfo *cfm; /* Measurement Confirm */ { TRC3(PtMiLrgSchL2MeasStopCfm) - RETVALUE(ROK); + return ROK; }/* end of PtMiLrgSchL2MeasStopCfm */ #endif #endif /*--PTRGMILRG--*/ diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c index 75857d03b..d47637f2c 100755 --- a/src/5gnrmac/rg_ptui.c +++ b/src/5gnrmac/rg_ptui.c @@ -565,7 +565,7 @@ U8 status; TRC3(RgUiRgrBndCfm); - RETVALUE((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRgrBndCfmMt[pst->selector])(pst, suId, status)); } /** @@ -599,7 +599,7 @@ U8 status; TRC3(RgUiRgmBndCfm); - RETVALUE((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRgmBndCfmMt[pst->selector])(pst, suId, status)); } @@ -637,7 +637,7 @@ RgrTtiIndInfo *ttiInd; TRC3(RgUiRgrTtiInd); - RETVALUE((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd)); + return ((*RgUiRgrTtiIndMt[pst->selector])(pst, suId, ttiInd)); } @@ -674,7 +674,7 @@ U8 status; TRC3(RgUiRgrCfgCfm); - RETVALUE((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status)); + return ((*RgUiRgrCfgCfmMt[pst->selector])(pst, transId, status)); } @@ -710,7 +710,7 @@ U8 status; TRC3(RgUiCrgBndCfm); - RETVALUE((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiCrgBndCfmMt[pst->selector])(pst, suId, status)); } @@ -749,7 +749,7 @@ U8 status; TRC3(RgUiCrgCfgCfm); - RETVALUE((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status)); + return ((*RgUiCrgCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -785,7 +785,7 @@ U8 status; TRC3(RgUiRguBndCfm); - RETVALUE((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status)); + return ((*RgUiRguBndCfmMt[pst->selector])(pst, suId, status)); } @@ -825,7 +825,7 @@ RguCDatIndInfo * datInd; TRC3(RgUiRguCDatInd); - RETVALUE((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd)); + return ((*RgUiRguCDatIndMt[pst->selector])(pst, suId, datInd)); } @@ -863,9 +863,9 @@ RguDDatIndInfo * datInd; TRC3(RgUiRguDDatInd); #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF) - RETVALUE(RgUiRguDDatIndRbuf(datInd)); + return (RgUiRguDDatIndRbuf(datInd)); #else - RETVALUE((*RgUiRguDDatIndMt[pst->selector])(pst, suId, datInd)); + return ((*RgUiRguDDatIndMt[pst->selector])(pst, suId, datInd)); #endif } @@ -904,7 +904,7 @@ RguCStaIndInfo * staInd; TRC3(RgUiRguCStaInd); - RETVALUE((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd)); + return ((*RgUiRguCStaIndMt[pst->selector])(pst, suId, staInd)); } @@ -943,7 +943,7 @@ RguDStaIndInfo * staInd; TRC3(RgUiRguDStaInd); - RETVALUE((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd)); + return ((*RgUiRguDStaIndMt[pst->selector])(pst, suId, staInd)); } #ifdef LTE_L2_MEAS @@ -967,9 +967,9 @@ RguHarqStatusInd *harqStatusInd; #if defined(SPLIT_RLC_DL_TASK) && defined(MAC_RLC_HARQ_STA_RBUF) S16 ret=ROK; ret = RgUiRguHqStaIndRbuf(pst,suId,harqStatusInd); - RETVALUE(ret); + return (ret); #else - RETVALUE((*RgUiRguHqStaIndMt[pst->selector])(pst, suId, harqStatusInd)); + return ((*RgUiRguHqStaIndMt[pst->selector])(pst, suId, harqStatusInd)); #endif } /* RgUiRguHqStaInd */ @@ -989,7 +989,7 @@ SuId suId; RguFlowCntrlInd *flowCntrlInd; #endif { - RETVALUE((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd)); + return ((*RgUiRguFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlInd)); } /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH @@ -1026,7 +1026,7 @@ U8 status; TRC3(RgUiRgrSiCfgCfm); - RETVALUE((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status)); + return ((*RgUiRgrSiCfgCfmMt[pst->selector])(pst, suId, transId, status)); } @@ -1065,7 +1065,7 @@ U8 status; { TRC3(RgUiRgrWarningSiCfgCfm); - RETVALUE((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) + return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) (pst, suId, transId, siId, status)); } @@ -1105,7 +1105,7 @@ RgrStaIndInfo *staInd; TRC3(RgUiRgrStaInd); - RETVALUE((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd)); + return ((*RgUiRgrStaIndMt[pst->selector])(pst, suId, staInd)); } #endif /* End of RGR_CQI_REPT */ @@ -1141,7 +1141,7 @@ PUBLIC S16 RgUiRgrLoadInfInd(pst, suId, loadInfInd) TRC3(RgUiRgrLoadInfInd); - RETVALUE((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd)); + return ((*RgUiRgrLoadInfIndMt[pst->selector])(pst, suId, loadInfInd)); } /* LTE_ADV_FLAG_REMOVED_END */ @@ -1176,7 +1176,7 @@ RgrUeStaIndInfo *ueStaInd; TRC3(RgUiRgrUeStaInd); - RETVALUE((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd)); + return ((*RgUiRgrUeStaIndMt[pst->selector])(pst, suId, ueStaInd)); } #endif /*--ifdef RG--*/ @@ -1218,7 +1218,7 @@ U8 status; UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1262,7 +1262,7 @@ U8 status; UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } #endif /*--ifdef PTRGUICRG--*/ @@ -1304,7 +1304,7 @@ U8 status; UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1345,7 +1345,7 @@ RguCDatIndInfo * datInd; UNUSED(suId); UNUSED(datInd); - RETVALUE(ROK); + return ROK; } @@ -1386,7 +1386,7 @@ RguDDatIndInfo * datInd; UNUSED(suId); UNUSED(datInd); - RETVALUE(ROK); + return ROK; } @@ -1429,7 +1429,7 @@ RguCStaIndInfo * staInd; UNUSED(suId); UNUSED(staInd); - RETVALUE(ROK); + return ROK; } @@ -1472,7 +1472,7 @@ RguDStaIndInfo * staInd; UNUSED(suId); UNUSED(staInd); - RETVALUE(ROK); + return ROK; } #ifdef LTE_L2_MEAS @@ -1498,7 +1498,7 @@ RguHarqStatusInd *harqStatusInd; UNUSED(suId); UNUSED(harqStatusInd); - RETVALUE(ROK); + return ROK; } #endif /* LTE_L2_MEAS */ @@ -1524,7 +1524,7 @@ RguHarqStatusInd *flowCntrlInd; UNUSED(suId); UNUSED(flowCntrlInd); - RETVALUE(ROK); + return ROK; } @@ -1567,7 +1567,7 @@ U8 status; UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1607,7 +1607,7 @@ RgrTtiIndInfo *ttiInd; UNUSED(suId); UNUSED(ttiInd); - RETVALUE(ROK); + return ROK; } @@ -1651,7 +1651,7 @@ U8 status; UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1695,7 +1695,7 @@ U8 status; UNUSED(transId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1740,7 +1740,7 @@ U8 status; UNUSED(siId); UNUSED(status); - RETVALUE(ROK); + return ROK; } #endif/* RGR_SI_SCH */ @@ -1782,7 +1782,7 @@ RgrStaIndInfo *staInd; UNUSED(suId); UNUSED(staInd); - RETVALUE(ROK); + return ROK; } #endif /* End of RGR_CQI_REPT */ @@ -1821,7 +1821,7 @@ PUBLIC S16 PtUiRgrLoadInfInd(pst, suId, loadInfInd) UNUSED(suId); UNUSED(loadInfInd); - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_END */ @@ -1860,7 +1860,7 @@ RgrUeStaIndInfo *ueStaInd; UNUSED(suId); UNUSED(ueStaInd); - RETVALUE(ROK); + return ROK; } #endif /*--ifdef PTRGUIRGR--*/ @@ -1902,7 +1902,7 @@ U8 status; UNUSED(suId); UNUSED(status); - RETVALUE(ROK); + return ROK; } @@ -1940,7 +1940,7 @@ RgmPrbRprtInd *prbRprtInd; UNUSED(suId); UNUSED(prbRprtInd); - RETVALUE(ROK); + return ROK; } @@ -1978,7 +1978,7 @@ RgmTransModeInd *transModeInd; UNUSED(suId); UNUSED(transModeInd); - RETVALUE(ROK); + return ROK; } #endif @@ -2012,7 +2012,7 @@ RgmPrbRprtInd *prbRprtInd; { TRC2(RgUiRgmSendPrbRprtInd); - RETVALUE((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd)); + return ((*RgUiRgmSendPrbRprtIndMt[pst->selector])(pst, suId, prbRprtInd)); } /** @@ -2044,7 +2044,7 @@ RgmTransModeInd *transModeInd; { TRC2(RgUiRgmChangeTransModeInd); - RETVALUE((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd)); + return ((*RgUiRgmChangeTransModeIndMt[pst->selector])(pst, suId, transModeInd)); } #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF) @@ -2078,7 +2078,7 @@ PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo *datInd) SRngIncrWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC); SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktRate++; } - RETVALUE(ret); + return (ret); } #endif #ifdef RLC_MAC_DAT_REQ_RBUF @@ -2147,7 +2147,7 @@ Void; break; } - RETVALUE(ROK); + return ROK; } #endif @@ -2219,7 +2219,7 @@ Void; break; } - RETVALUE(ROK); + return ROK; } #endif #ifdef LTE_L2_MEAS @@ -2255,7 +2255,7 @@ RguHarqStatusInd *harqStatusInd; SRngIncrWIndx(SS_RNG_BUF_MAC_HARQ); SsRngInfoTbl[SS_RNG_BUF_MAC_HARQ].pktRate++; } - RETVALUE(ret); + return (ret); } #endif #endif diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c index f82bb8bda..b8a9a4fbf 100755 --- a/src/5gnrmac/rg_ram.c +++ b/src/5gnrmac/rg_ram.c @@ -151,7 +151,7 @@ RgErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for CRNTI:%d",tmpCrnti); err->errCause = RGERR_RAM_MEM_EXHAUST; - RETVALUE(NULLP); + return (NULLP); } /* Inititialize Ue control block */ @@ -178,7 +178,7 @@ RgErrInfo *err; rgDBMInsUeCbInRachLst(cell, ueCb); } - RETVALUE(ueCb); + return (ueCb); } /* rgRAMCreateUeCb */ /** @@ -218,7 +218,7 @@ RgCellCb *cell; rgRAMFreeUeCb(inst,ueCb); } - RETVALUE(ROK); + return ROK; } /* rgRAMFreeCell */ /** * @brief Function for handling RA response scheduled for a subframe. @@ -268,7 +268,7 @@ RgErrInfo *err; if(NULLP == rarInfo->raRntiInfo) { - RETVALUE(RFAILED); + return RFAILED; } idx = (timingInfo.slot % RG_NUM_SUB_FRAMES); @@ -289,7 +289,7 @@ RgErrInfo *err; rarInfo->raRntiInfo[idx1].crntiInfo[idx2].tmpCrnti, TRUE, err) == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } } } @@ -314,7 +314,7 @@ RgErrInfo *err; continue; } } /* end of raRntis loop */ - RETVALUE(ROK); + return ROK; } /* end of rgHndlRaResp */ /********************************************************************** diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c index 0de1281b0..48e31f281 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -155,7 +155,7 @@ RgRguDedDatReq *datReq; /* Update stats */ rgUpdtRguDedSts(inst,cell->rguDlSap,RG_RGU_SDU_DROP, datReq); } - RETVALUE(RFAILED); + return RFAILED; } /* Add loop here to scan for all UEs in the consolidated DDatReq*/ @@ -190,7 +190,7 @@ RgRguDedDatReq *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]); #endif continue; - // RETVALUE(RFAILED); + // return RFAILED; } if ((ue = rgDBMGetUeCb(cell, datReq->datReq[idx].rnti)) == NULLP) @@ -216,7 +216,7 @@ RgRguDedDatReq *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]); #endif /* Return from here as above functions found more datReq than expected*/ - /* RETVALUE(ret); */ + /* return (ret); */ } #endif /* Conitnue for next UE */ @@ -249,7 +249,7 @@ RgRguDedDatReq *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]); #endif /* Return from here as above functions found more datReq than expected*/ - //RETVALUE(ret); + //return (ret); } #endif continue; @@ -302,14 +302,14 @@ RgRguDedDatReq *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]); #endif /* Return from here as above functions found more datReq than expected*/ - // RETVALUE(ret); + // return (ret); } #endif } /* for loop for num of Ue per TTI*/ #endif /* Data send successfully to PHY. lets retuns ROK*/ - RETVALUE(ROK); + return ROK; } /* rgROMDedDatReq */ @@ -369,7 +369,7 @@ RgRguCmnDatReq *datReq; { rgUpdtRguCmnSts(inst,cell->rguDlSap,RG_RGU_SDU_DROP); } - RETVALUE(RFAILED); + return RFAILED; } if (datReq->lcId == cell->dlCcchId) @@ -415,7 +415,7 @@ RgRguCmnDatReq *datReq; /*Added check for RFAILED as above function can return RFAILED*/ #endif - RETVALUE(ret); + return (ret); } /* rgROMCmnDatReq */ /** @@ -475,7 +475,7 @@ RgErrInfo *err; "rgROMHndlCcchDatReq(): Invalid ue Id"); #endif err->errCause = RGERR_ROM_INV_UE_ID; - RETVALUE(RFAILED); + return RFAILED; } } @@ -494,7 +494,7 @@ RgErrInfo *err; LRG_CAUSE_DELAYED_DATREQ, &dgn); #endif err->errCause = RGERR_ROM_DELAYED_DATREQ; - RETVALUE(RFAILED); + return RFAILED; } hqPId = (U8)(datReq->transId); @@ -513,10 +513,10 @@ RgErrInfo *err; /* Release First TB */ rgDHMRlsHqProcTB(cell, hqProc, 1); /* err shall be filled in appropriately by DHM */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgROMHndlCcchDatReq */ @@ -582,7 +582,7 @@ RgErrInfo *err; LRG_CAUSE_DELAYED_DATREQ, &dgn); #endif err->errCause = RGERR_ROM_DELAYED_DATREQ; - RETVALUE(RFAILED); + return RFAILED; } #ifndef RGR_SI_SCH @@ -595,7 +595,7 @@ RgErrInfo *err; SCpyMsgMsg(datReq->pdu, RG_GET_MEM_REGION(rgCb[inst]), RG_GET_MEM_POOL(rgCb[inst]), &bcch->tb); - RETVALUE(ROK); + return ROK; } bch = rgDBMGetBcchOnBch(cell); @@ -603,7 +603,7 @@ RgErrInfo *err; { /* Store BCH data received in Scheduled slot */ sf->bch.tb = datReq->pdu; - RETVALUE(ROK); + return ROK; } #endif/*RGR_SI_SCH*/ @@ -612,7 +612,7 @@ RgErrInfo *err; { /* Store PCCH-DLSCH data received in Scheduled slot */ sf->pcch.tb = datReq->pdu; - RETVALUE(ROK); + return ROK; } /* Handle lcCb fetch failure */ @@ -620,7 +620,7 @@ RgErrInfo *err; "rgROMHndlBcchPcchDatReq(): Invalid Lc Id"); err->errCause = RGERR_ROM_INV_LC_ID; - RETVALUE(RFAILED); + return RFAILED; } /* rgROMHndlBcchPcchDatReq */ /** @@ -680,12 +680,12 @@ RgRguDedStaRsp *staRsp; rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst); schPst.event = 0; //TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt); - RETVALUE(ROK); + return ROK; } RLOG_ARG2(L_ERROR,DBG_CELLID,staRsp->cellId,"Invalid cell for CRNTI:%d LCID:%d ", staRsp->rnti,staRsp->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* rgROMDedStaRsp */ S16 RgMacSchBrdcmDedBoUpdtReq( @@ -715,7 +715,7 @@ S32 bo schPst.event = 0; //TODO: commented for compilation without SCH RgMacSchDedBoUpdtReq (&schPst,&boRpt); } - RETVALUE(ROK); + return ROK; } /** * @brief Handler for StaRsp received on RGU for a common logical channel. @@ -761,7 +761,7 @@ RgRguCmnStaRsp *staRsp; "Invalid cell for CRNTI:%d LCID:%d",staRsp->u.rnti,staRsp->lcId); err.errType = RGERR_ROM_CMNSTARSP; err.errCause = RGERR_ROM_INV_CELL_ID; - RETVALUE(RFAILED); + return RFAILED; } /* handle status response on CCCH */ @@ -774,7 +774,7 @@ RgRguCmnStaRsp *staRsp; rgROMHndlBcchPcchStaRsp(cell, staRsp, &err); } - RETVALUE(ROK); + return ROK; } /* rgROMCmnStaRsp */ #ifdef LTE_L2_MEAS @@ -835,12 +835,12 @@ RgRguL2MUlThrpMeasReq *measReq; } } } - RETVALUE(ROK); + return ROK; } } RLOG_ARG1(L_ERROR,DBG_CELLID,measReq->cellId,"Invalid cell CRNTI:%d", measReq->rnti); - RETVALUE(RFAILED); + return RFAILED; } /* rgROML2MUlThrpMeasReq */ #endif @@ -894,7 +894,7 @@ RgErrInfo *err; rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst); //TODO: commented for compilation without SCH RgMacSchCmnBoUpdt(&schPst, &boRpt); - RETVALUE(ROK); + return ROK; } /* rgROMHndlCcchStaRsp */ @@ -941,7 +941,7 @@ RgErrInfo *err; /* Handle lcCb fetch failure */ RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid LCID:%d",staRsp->lcId); err->errCause = RGERR_ROM_INV_LC_ID; - RETVALUE(RFAILED); + return RFAILED; } /* MS_WORKAROUND : This is to ensure that the queue for BCH is not filled with old BO requests : This assumes that BO is not received more than 4 frames in advance from the enodeb application */ @@ -953,7 +953,7 @@ RgErrInfo *err; if ((staRsp->u.timeToTx.sfn != nextBchSfn) || ((staRsp->u.timeToTx.sfn == cell->crntTime.sfn) && (cell->crntTime.slot >= 7))) { - RETVALUE(ROK); + return ROK; } } /* @@ -976,7 +976,7 @@ RgErrInfo *err; rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst); //TODO: commented for compilation without SCH RgMacSchCmnBoUpdt(&schPst, &boRpt); - RETVALUE(ROK); + return ROK; } /* rgROMHndlBcchPcchStaRsp */ /* ADD Changes for Downlink UE Timing Optimization */ @@ -1020,7 +1020,7 @@ RgDlSf *dlSf; * request than the allocation. Do nothing for this. */ RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId, "RX new data while remDatReqCnt is 0 for cell"); - RETVALUE(RFAILED); + return RFAILED; } /*Decrement the remaining data request to be received countter @@ -1046,7 +1046,7 @@ RgDlSf *dlSf; dlSf->txDone = TRUE; } - RETVALUE(ROK); + return ROK; } /* rgROMUpdDlSfRemDataCnt*/ #endif diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index 13cb7224e..046fe8a12 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -214,7 +214,7 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) { err->errCause = RGERR_TOM_MEM_EXHAUST; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Memory Exhaustion "); - RETVALUE(ret); + return (ret); } #ifdef TFU_ALLOC_EVENT_NO_INIT #ifndef L2_OPTMZ @@ -260,7 +260,7 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) { err->errCause = RGERR_TOM_MEM_EXHAUST; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Memory Exhaustion CRNTI:%d",datReq->rnti); - RETVALUE(ret); + return (ret); } #ifdef TFU_ALLOC_EVENT_NO_INIT #ifndef L2_OPTMZ @@ -300,7 +300,7 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) err->errCause = RGERR_TOM_MEM_EXHAUST; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Memory Exhaustion CRNTI:%d", datReq->rnti); - RETVALUE(ret); + return (ret); } #ifdef TFU_ALLOC_EVENT_NO_INIT #ifndef L2_OPTMZ @@ -351,7 +351,7 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) } /* end of while */ } - RETVALUE(ROK); + return ROK; } /* end of rgTOMUtlFillDatReqPdus*/ /** @brief This function does all the processing related to a single downlink @@ -412,7 +412,7 @@ PUBLIC S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) sizeof(TfuDatReqInfo))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to Allocate TfuDatReqInfo"); - RETVALUE(ret); + return (ret); } else { @@ -443,7 +443,7 @@ PUBLIC S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) if ((ret = rgTOMEmtcUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)) != ROK) { RG_FREE_MEM(datInfo); - RETVALUE(ret); + return (ret); } #endif /* Fill the DLSCH PDUs of BCCH, PCCH and Dedicated Channels */ @@ -451,7 +451,7 @@ PUBLIC S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to send data for cell"); RG_FREE_MEM(datInfo); - RETVALUE(ret); + return (ret); } if((datInfo->pdus.count) || (datInfo->bchDat.pres == TRUE)) { @@ -467,7 +467,7 @@ PUBLIC S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) RG_FREE_MEM(datInfo); } } - RETVALUE(ROK); + return ROK; } /* end of */ U32 rgMacGT; @@ -522,13 +522,13 @@ Inst inst; rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_DMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); RLOG0(L_ERROR,"Allocation of DUX event failed"); - RETVALUE(RFAILED); + return RFAILED; } /*stoping Task*/ SStopTask(startTime, PID_TOMUTL_CMALLCEVT); - RETVALUE(ROK); + return ROK; } /* end of */ /** @brief This function frees up the RgMacPdu structure that has been @@ -630,13 +630,13 @@ RgInfSfDatInd **sfInfo; rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_DMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); RLOG0(L_ERROR,"Allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } /*stoping Task*/ SStopTask(startTime, PID_TOMINF_CMALLCEVT); - RETVALUE(ROK); + return ROK; } /* end of */ /** @brief This function frees up the RgMacPdu structure that has been @@ -721,7 +721,7 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) } } - RETVALUE(ROK); + return ROK; } #endif @@ -860,7 +860,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) /* code for common channel dat indications */ if ((ret = rgAllocShrablSBuf (inst,(Data**)&cDatInd, sizeof(RgRguCmnDatInd))) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cDatInd->cellId = cellCb->cellId; cDatInd->rnti = ueCb->ueId; @@ -882,19 +882,19 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) #endif sdu->mBuf = NULLP; rgUIMSndCmnDatInd(inst,cellCb->rguUlSap,cDatInd); - RETVALUE(ROK); + return ROK; } /* end of common channel processing */ #ifndef SS_RBUF if ((ret = rgAllocShrablSBuf (inst,(Data**)&dDatInd, sizeof(RgRguDedDatInd))) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #else glblueCb5 = ueCb; elem = SRngGetWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC); if (NULLP == elem) { - RETVALUE(RFAILED); + return RFAILED; } dDatInd = (RgRguDedDatInd *)elem; cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd)); @@ -960,18 +960,18 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Failed to send datIndication to RGU CRNTI:%d",ueCb->ueId); - RETVALUE(ret); + return (ret); } #ifndef SS_RBUF if ((ret = rgAllocShrablSBuf (inst,(Data**)&dDatInd, sizeof(RgRguDedDatInd))) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #else elem = SRngGetWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC); if (NULLP == elem) { - RETVALUE(RFAILED); + return RFAILED; } dDatInd = (RgRguDedDatInd *)elem; cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd)); @@ -1105,7 +1105,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Failed to send datIndication to RGU CRNTI:%d",ueCb->ueId); - RETVALUE(ret); + return (ret); } } #ifndef SS_RBUF @@ -1116,7 +1116,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) rgFreeSharableSBuf(inst,(Data **)&dDatInd,sizeof(RgRguDedDatInd)); } #endif - RETVALUE(ROK); + return ROK; } /* end of */ /** @brief This function frees up the RgMacPdu structure that has been @@ -1187,7 +1187,7 @@ U32 *lcgBytes; if(ROK != ret) { - RETVALUE(RFAILED); + return RFAILED; } ueInfo->rnti = rnti; @@ -1205,7 +1205,7 @@ U32 *lcgBytes; } } cmLListAdd2Tail(&sfInfo->ueLst, &ueInfo->ueLstEnt); - RETVALUE(ROK); + return ROK; } /* end of rgTOMUtlInsSchInfo */ #include @@ -1312,7 +1312,7 @@ Inst inst; { RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"Unable to get the cellCb for cell"); - RETVALUE(RFAILED); + return RFAILED; } /* Avoiding memset as all the fields are getting initialized further */ @@ -1321,7 +1321,7 @@ Inst inst; err.errType = RGERR_TOM_DATIND; RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"Unable to Allocate PDU for DUX cell"); node = datInd->datIndLst.first; - RETVALUE(RFAILED); + return RFAILED; } cmLListInit(&sfInfo->ueLst); sfInfo->cellId = datInd->cellId; @@ -1359,7 +1359,7 @@ Inst inst; err.errType = RGERR_TOM_DATIND; RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"Unable to Allocate PDU for DUX cell"); rgTOMInfFreePduEvnt (sfInfo); - RETVALUE(RFAILED); + return RFAILED; } if ((ret = rgDUXDemuxData (inst,pdu, &ceInfo, @@ -1483,7 +1483,7 @@ Inst inst; { rgTOMInfFreePduEvnt (sfInfo); rgTOMUtlFreePduEvnt (pdu, FALSE); - RETVALUE(RFAILED); + return RFAILED; } /* free up the PDU memory */ rgTOMUtlFreePduEvnt (pdu, FALSE); @@ -1512,7 +1512,7 @@ Inst inst; rgGetPstToInst(&schPst, inst,cellCb->schInstMap.schInst); sfInfo->cellSapId = cellCb->schInstMap.cellSapId; //TODO: commented for compilation without SCH RgMacSchSfRecp(&schPst, sfInfo); - RETVALUE(ROK); + return ROK; } /* rgTOMDatInd */ /** @@ -1581,18 +1581,18 @@ RgErrInfo *err; #if (ERRCLASS & ERRCLS_DEBUG) if(NULLP == (bch = rgDBMGetBcchOnBch(cell))) { - RETVALUE(RFAILED); + return RFAILED; } if(cmnLcInfo->bchInfo.lcId != bch->lcId) { - RETVALUE(RFAILED); + return RFAILED; } #endif if (rgAllocShrablSBuf (inst,(Data**)&staInd, sizeof(RguCStaIndInfo)) != ROK) { err->errCause = RGERR_TOM_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } staInd->cellId = cell->cellId; staInd->rnti = RG_INVALID_RNTI; @@ -1604,7 +1604,7 @@ RgErrInfo *err; #endif if (rgUIMSndCmnStaInd (inst,cell->rguDlSap,staInd) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #else /*Store the received BCH Data in the scheduled subframe*/ @@ -1617,11 +1617,11 @@ RgErrInfo *err; #if (ERRCLASS & ERRCLS_DEBUG) if(NULLP == (pcch = rgDBMGetPcch(cell))) { - RETVALUE(RFAILED); + return RFAILED; } if(cmnLcInfo->pcchInfo.lcId != pcch->lcId) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1636,7 +1636,7 @@ RgErrInfo *err; if (rgAllocShrablSBuf (inst,(Data**)&staInd, sizeof(RguCStaIndInfo)) != ROK) { err->errCause = RGERR_TOM_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } staInd->cellId = cell->cellId; staInd->rnti = RG_INVALID_RNTI; @@ -1651,7 +1651,7 @@ RgErrInfo *err; */ if (rgUIMSndCmnStaInd (inst,cell->rguDlSap,staInd) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -1669,7 +1669,7 @@ RgErrInfo *err; if(NULLP == (bcch=rgDBMGetBcchOnDlsch(cell,cmnLcInfo->bcchInfo.lcId))) { - RETVALUE(RFAILED); + return RFAILED; } if(TRUE == cmnLcInfo->bcchInfo.sndStatInd) { @@ -1678,7 +1678,7 @@ RgErrInfo *err; sizeof(RguCStaIndInfo)) != ROK) { err->errCause = RGERR_TOM_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } staInd->cellId = cell->cellId; staInd->rnti = RG_INVALID_RNTI; @@ -1690,7 +1690,7 @@ RgErrInfo *err; #endif if (rgUIMSndCmnStaInd (inst,cell->rguDlSap,staInd) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1704,7 +1704,7 @@ RgErrInfo *err; #endif/*RGR_SI_SCH*/ } - RETVALUE(ROK); + return ROK; } /* end of rgHndlCmnChnl */ /** @@ -1755,12 +1755,12 @@ RgErrInfo *err; if(NULLP == ueInfo->allocInfo) { - RETVALUE(RFAILED); + return RFAILED; } rgDHMSndConsolidatedStaInd(cell, ueInfo, timingInfo, err); - RETVALUE(ROK); + return ROK; } /* end of rgHndlSchdUe */ #ifdef LTE_L2_MEAS @@ -1822,7 +1822,7 @@ RgInfUlUeInfo *ueInfo; if((ret = rgAllocSBuf(inst,(Data**)&(cell->ulSf[(timingInfo.slot % RGSCH_NUM_SUB_FRAMES)]. ueUlAllocInfo), ueInfo->numUes * sizeof(RgUeUlAlloc))) != ROK) { - RETVALUE(ret); + return (ret); } } #ifdef XEON_SPECIFIC_CHANGES @@ -1838,7 +1838,7 @@ RgInfUlUeInfo *ueInfo; } } RGCPYTIMEINFO(timingInfo, ulSf->schdTime); - RETVALUE(ROK); + return ROK; } /* end of rgHndlUlUeInfo */ #endif /** @@ -2000,7 +2000,7 @@ RgInfSfAlloc *sfInfo; } } RgUiRguFlowCntrlInd(pst, cell->rguDlSap->sapCfg.spId,flowCntrlInd); /* TODO: Rishi confirm if the suId and pst pointer is correct */ - RETVALUE(ROK); + return ROK; } /** * @brief Function is called by the scheduler once it has completed the @@ -2055,13 +2055,13 @@ RgInfSfAlloc *sfInfo; if(NULLP == sfInfo) { - RETVALUE(RFAILED); + return RFAILED; } if((cell = rgCb[inst].cell) == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,sfInfo->cellId, "No cellCb found with cell"); - RETVALUE(RFAILED); + return RFAILED; } dlSf = &cell->subFrms[(sfInfo->timingInfo.slot % RG_NUM_SUB_FRAMES)]; @@ -2103,7 +2103,7 @@ RgInfSfAlloc *sfInfo; if(rgHndlUlUeInfo(cell, sfInfo->ulUeInfo.timingInfo, &sfInfo->ulUeInfo) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef XEON_SPECIFIC_CHANGES @@ -2144,7 +2144,7 @@ RgInfSfAlloc *sfInfo; } /*stoping Task*/ SStopTask(startTime, PID_MAC_SF_ALLOC_REQ); - RETVALUE(ROK); + return ROK; } /* end of RgSchMacSfAllocReq */ /** * @brief Handler for processing data indication recieved from PHY for UEs. @@ -2216,7 +2216,7 @@ U16 slot; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "RNTI:%d Received MSG3 with CRNTI,unable to find ueCb", ceInfo->ces.cRnti); - RETVALUE(RFAILED); + return RFAILED; } prevUeCb = rgDBMGetUeCb (cellCb, ceInfo->ces.cRnti); @@ -2224,7 +2224,7 @@ U16 slot; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "RNTI:%d Received MSG3 with CRNTI,unable to find ueCb", ceInfo->ces.cRnti); - RETVALUE(RFAILED); + return RFAILED; } RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId, "CRNTI CE(%d) received through tmpCrnti(%d)", @@ -2240,9 +2240,9 @@ U16 slot; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "RNTI:%d Processing for MSG3 failed",datInfo->rnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** * @brief Handler for processing data indication recieved from PHY for UEs. @@ -2316,7 +2316,7 @@ U16 slot; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "CRNTI:%d Received MSG3 with CCCH",ceInfo->ces.cRnti); - RETVALUE(RFAILED); + return RFAILED; } ueCb = rgDBMGetUeCbFromRachLst (cellCb, datInfo->rnti); @@ -2325,7 +2325,7 @@ U16 slot; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "RNTI:%d Processing for MSG3 failed", datInfo->rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fix: syed Drop any duplicate Msg3(CCCH Sdu) */ if (ueCb->dl.hqEnt.numHqProcs) @@ -2333,7 +2333,7 @@ U16 slot; /* HqE is already initialized by a previuos Msg3 */ RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI:%d Processing for MSG3 failed. Duplicate " "MSG3 received. Dropping", datInfo->rnti); - RETVALUE(RFAILED); + return RFAILED; } if(rgDHMHqEntInit(inst,&ueCb->dl.hqEnt, @@ -2341,7 +2341,7 @@ U16 slot; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI:%d Harq Initialization failed ", datInfo->rnti); - RETVALUE(RFAILED); + return RFAILED; } RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, "CCCH SDU received through tmpCrnti(%d)",datInfo->rnti); @@ -2353,9 +2353,9 @@ U16 slot; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI:%d Processing for MSG3 failed", datInfo->rnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #ifdef LTE_L2_MEAS @@ -2412,7 +2412,7 @@ PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) ueCb->ul.lcgArr[2].lcgBsInfo.outStndngBs = rgLwrBsrTbl[ceInfo->ces.bsr.longBsr.bs3]; ueCb->ul.lcgArr[3].lcgBsInfo.outStndngBs = rgLwrBsrTbl[ceInfo->ces.bsr.longBsr.bs4]; } - RETVALUE(ROK); + return ROK; } /* end of rgTOMUtlL2MStoreBufSz*/ /** @brief : Compiles list of LCs received in UL data for DTCH RBs diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index 47d09826b..e99696c60 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -182,7 +182,7 @@ SpId spId; /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRguBndReq */ @@ -248,9 +248,9 @@ Reason reason; RGLOGERROR(inst,ERRCLS_INT_PAR, ERG011, (ErrVal)rgCb[inst].rguSap[spId].sapCfg.spId, "Invalid SAP Id:RgUiRguUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRguUbndReq */ /** * @brief API for sending bind confirm from MAC to RLC @@ -295,9 +295,9 @@ U8 status; { RLOG0(L_ERROR,"RgUiRguBndCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMRguBndCfm*/ @@ -349,7 +349,7 @@ RguDDatReqInfo *datReq; if (datReq == NULLP) { RLOG0(L_ERROR,"Input Message Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if(rgCb[inst].rguSap[spId].sapCfg.spId == spId) @@ -370,7 +370,7 @@ RguDDatReqInfo *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]); } #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -385,7 +385,7 @@ RguDDatReqInfo *datReq; RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]); } #endif - RETVALUE(RFAILED); + return RFAILED; } /* Update RGU SAP statistics for received sdu count */ @@ -419,7 +419,7 @@ RguDDatReqInfo *datReq; ret = rgROMDedDatReq(inst,datReq); SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,sizeof(RguDDatReqInfo), SS_SHARABLE_MEMORY); datReq = NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguDDatReq */ @@ -465,7 +465,7 @@ RguCDatReqInfo *datReq; if (datReq == NULLP) { RLOG0(L_ERROR,"Input Message Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if(rgCb[inst].rguSap[spId].sapCfg.spId == spId) @@ -480,7 +480,7 @@ RguCDatReqInfo *datReq; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCDatReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -488,7 +488,7 @@ RguCDatReqInfo *datReq; #if (ERRCLASS & ERRCLS_ADD_RES) RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCDatReq failed ",spId); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -510,7 +510,7 @@ RguCDatReqInfo *datReq; } ret = SPutStaticBuffer(pst->region, pst->pool,(Data *)datReq,sizeof(RguCDatReqInfo) , SS_SHARABLE_MEMORY); datReq = NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguCDatReq */ @@ -566,7 +566,7 @@ RguDStaRspInfo *staRsp; /*stoping Task*/ SStopTask(startTime, PID_MAC_STA_RSP); - RETVALUE(ret); + return (ret); } /* RgUiRguDStaRsp */ @@ -614,7 +614,7 @@ RguCStaRspInfo *staRsp; if (staRsp == NULLP) { RLOG0(L_ERROR,"Input Response Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if (spId == rgCb[inst].rguSap[spId].sapCfg.spId) @@ -629,7 +629,7 @@ RguCStaRspInfo *staRsp; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCStaRsp failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -637,7 +637,7 @@ RguCStaRspInfo *staRsp; #if (ERRCLASS & ERRCLS_ADD_RES) RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCStaRsp failed",spId); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -645,12 +645,12 @@ RguCStaRspInfo *staRsp; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,staRsp->cellId,"Processing Of Status Response Failed"); - RETVALUE(ret); + return (ret); } ret = SPutStaticBuffer(pst->region, pst->pool, (Data *)staRsp,sizeof(RguCStaRspInfo) , SS_SHARABLE_MEMORY); staRsp = NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguCStaRsp */ #ifdef LTE_L2_MEAS @@ -698,7 +698,7 @@ RguL2MUlThrpMeasReqInfo *measReq; if (measReq == NULLP) { RLOG0(L_ERROR,"Input Response Buffer is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if (spId == rgCb[inst].rguSap[spId].sapCfg.spId) @@ -713,7 +713,7 @@ RguL2MUlThrpMeasReqInfo *measReq; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguL2MUlThrpMeasReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -721,7 +721,7 @@ RguL2MUlThrpMeasReqInfo *measReq; #if (ERRCLASS & ERRCLS_ADD_RES) RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguL2MUlThrpMeasReq failed",spId); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -733,7 +733,7 @@ RguL2MUlThrpMeasReqInfo *measReq; SPutStaticBuffer(pst->region, pst->pool, (Data *)measReq,sizeof(RguL2MUlThrpMeasReqInfo) , SS_SHARABLE_MEMORY); measReq= NULLP; - RETVALUE(ret); + return (ret); } /* RgUiRguL2MUlThrpMeasReq */ #endif @@ -780,9 +780,9 @@ RgRguDedStaInd *staInd; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguDStaInd Failed"); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMSndDedStaInd */ @@ -829,9 +829,9 @@ RgRguCmnStaInd *staInd; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguCStaInd Failed"); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMSndCmnStaInd */ @@ -880,13 +880,13 @@ RgRguDedDatInd *datInd; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguDdatInd Failed"); - RETVALUE(ret); + return (ret); } #else SRngIncrWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC); SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktRate++; #endif - RETVALUE(ret); + return (ret); } /* rgUIMSndDedDatInd */ @@ -938,9 +938,9 @@ RgRguCmnDatInd *datInd; { RGDBGERRNEW(inst,(rgPBuf(inst),"RgUiRguCDatInd Failed\n")); RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguCDatInd Failed"); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMSndCmnDatInd */ /** @@ -1048,7 +1048,7 @@ SpId spId; #endif ret = rgUIMCrgBndCfm(inst,suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiCrgBndReq */ @@ -1106,7 +1106,7 @@ Reason reason; RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapSta.sapState); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1115,9 +1115,9 @@ Reason reason; RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapCfg.spId); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiCrgUbndReq */ /** @@ -1158,10 +1158,10 @@ U8 status; if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK) { RLOG0(L_ERROR,"RgUiCrgBndCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgUIMCrgBndCfm*/ /** @@ -1219,7 +1219,7 @@ CrgCfgReqInfo *cfgReqInfo; { RLOG0(L_ERROR,"Input Param crgReqInfo is NULL "); rgUIMCrgCfgCfm(inst,transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Upper SAP Id and State validation */ @@ -1240,7 +1240,7 @@ CrgCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgUIMCrgCfgCfm(inst,transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1253,7 +1253,7 @@ CrgCfgReqInfo *cfgReqInfo; sizeof(CrgCfgReqInfo)); cfgReqInfo = NULLP; rgUIMCrgCfgCfm(inst,transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } ret = rgCOMCfgReq(inst,transId, cfgReqInfo); SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo, @@ -1262,10 +1262,10 @@ CrgCfgReqInfo *cfgReqInfo; if (ret != ROK) { RLOG0(L_ERROR,"Configuration Request Handling Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiCrgCfgReq */ /** @@ -1313,10 +1313,10 @@ U8 status; if (ret != ROK) { RLOG0(L_ERROR,"RgUiCrgCfgCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgUIMCrgCfgCfm */ #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) @@ -1368,7 +1368,7 @@ Void; if((elmIndx = (U32)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP) break; } - RETVALUE(ROK); + return ROK; } #endif diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c index db2417de7..9af90e4e6 100755 --- a/src/5gnrmac/rg_utl.c +++ b/src/5gnrmac/rg_utl.c @@ -135,7 +135,7 @@ Size size; /* size */ if (size == 0) { - RETVALUE(RFAILED); + return RFAILED; } /* allocate buffer */ @@ -148,7 +148,7 @@ Size size; /* size */ rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_SMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); RGLOGERROR(inst,ERRCLS_DEBUG, ERG028, 0, "Unable to Allocate Buffer"); - RETVALUE(RFAILED); + return RFAILED; } #ifndef ALIGN_64BIT @@ -162,7 +162,7 @@ Size size; /* size */ /* zero out the allocated memory */ cmMemset((U8 *)*pData, 0x00, size); - RETVALUE(ROK); + return ROK; } /* end of rgAllocSBuf */ @@ -207,7 +207,7 @@ Size size; /* size */ if (size == 0) { - RETVALUE(RFAILED); + return RFAILED; } /* allocate buffer */ @@ -223,13 +223,13 @@ Size size; /* size */ rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_SMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); RGLOGERROR(inst,ERRCLS_DEBUG, ERG028, 0, "Unable to Allocate Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* zero out the allocated memory */ cmMemset((U8 *)*pData, 0x00, size); - RETVALUE(ROK); + return ROK; } /* end of rgAllocSBuf */ @@ -397,10 +397,10 @@ Buffer **mBuf; /* Message Buffer pointer be returned */ rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_DMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); RGLOGERROR(inst,ERRCLS_DEBUG, ERG030, 0, "Unable to Allocate Buffer"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgGetMsg */ @@ -712,7 +712,7 @@ Size memSize; { RGLOGERROR(inst,ERRCLS_INT_PAR, ERG031, memSize, "rgAllocEventMem(): memSize invalid\n"); - RETVALUE (RFAILED); + return (RFAILED); } #endif /* ERRCLASS & ERRCLS_DEBUG */ @@ -730,13 +730,13 @@ Size memSize; #endif /* */ { RLOG0(L_ERROR,"cmAllocEvnt Failed"); - RETVALUE(RFAILED); + return RFAILED; } /*stoping Task*/ SStopTask(startTime, PID_MACUTL_CMALLCEVT); - RETVALUE(ROK); + return ROK; } /* end of rgAllocEventMem*/ /* @@ -777,7 +777,7 @@ Ptr memCp; #else ret = cmGetMem(memCp, len, (Ptr *)ptr); #endif /* */ - RETVALUE(ret); + return (ret); } /* end of rgGetEventMem*/ /*********************************************************** @@ -878,18 +878,18 @@ RgInfLcgRegReq *lcgRegReq; { RLOG_ARG0(L_ERROR,DBG_CELLID,lcgRegReq->cellId,"Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, lcgRegReq->crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", lcgRegReq->crnti); - RETVALUE(RFAILED); + return RFAILED; } ue->ul.lcgArr[lcgRegReq->lcgId].isGbr = lcgRegReq->isGbr; - RETVALUE(ROK); + return ROK; } /* end of RgSchMacLcgRegReq */ #ifdef LTEMAC_SPS @@ -937,20 +937,20 @@ RgInfUlSpsReset *ulSpsResetInfo; { RLOG_ARG0(L_ERROR, DBG_CELLID,ulSpsResetInfo->cellId,"Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, ulSpsResetInfo->crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", ulSpsResetInfo->crnti); - RETVALUE(RFAILED); + return RFAILED; } ue->ul.implRelCntr = 0; ue->ul.explRelCntr = 0; - RETVALUE(ROK); + return ROK; } /* end of RgSchMacUlSpsResetReq */ @@ -1008,14 +1008,14 @@ RgInfSpsLcInfo *lcInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,lcInfo->cellId, "Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, lcInfo->crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", lcInfo->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* Store the sps-rnti and SPS LC information in the UE */ @@ -1033,10 +1033,10 @@ RgInfSpsLcInfo *lcInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Ue insertion into SPS list failed SPS CRNTI:%d", ue->spsRnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of RgSchMacSpsLcRegReq */ @@ -1092,13 +1092,13 @@ CmLteRnti crnti; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellId, "Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cellId,"CRNTI:%d Ue does not exist", crnti); - RETVALUE(RFAILED); + return RFAILED; } /* No need to reset the SPS LC Ids as they will not be looked at*/ @@ -1106,7 +1106,7 @@ CmLteRnti crnti; /* Delete UE from the SPS UE List */ rgDBMDelSpsUeCb(cell, ue); - RETVALUE(ROK); + return ROK; } /* end of RgSchMacSpsLcDeregReq */ #endif /* LTEMAC_SPS */ @@ -1159,7 +1159,7 @@ CmLteRnti newRnti; RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId, "RNTI:%d Failed to get UECB[%lu:%lu] or NEW RNTI:%d", rnti, ((PTR)ue), ((PTR)newUe), newRnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef XEON_SPECIFIC_CHANGES CM_LOG_DEBUG(CM_LOG_ID_MAC, "MAC:UE[%d] id changed to %d\n", rnti, newRnti); @@ -1180,7 +1180,7 @@ CmLteRnti newRnti; rgDBMDelUeCbFromRachLst(cell, newUe); rgFreeSBuf(inst,(Data **)&newUe, sizeof(*newUe)); - RETVALUE(ROK); + return ROK; } /* end of rgUtlHndlCrntiChng */ #ifdef LTE_ADV @@ -1239,7 +1239,7 @@ RgUeCb *ue; } /* loop of if */ } /* loop of for */ - RETVALUE(ROK); + return ROK; } /* rgDelUeFrmAllSCell */ /** @@ -1294,7 +1294,7 @@ PUBLIC S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst) ret = RFAILED; } #endif - RETVALUE(ret); + return (ret); } /* rgUtlVltdAddSCellCfg */ /** @@ -1347,7 +1347,7 @@ TfuDelDatReqInfo delDatReq; { RGDBGERRNEW(inst,(rgPBuf(inst),"[%d]RNTI:Failed to get ueCb \ newRnti=%d\n", rnti, newRnti)); - RETVALUE(RFAILED); + return RFAILED; } /* For all added SCells, prepare and send ueIdChngReq */ for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++) @@ -1379,7 +1379,7 @@ TfuDelDatReqInfo delDatReq; } /* loop of if */ } /* loop of for */ - RETVALUE(ROK); + return ROK; } /* rgUtlSndCrntiChngReq2AllSMacs */ #endif /* LTE_ADV */ @@ -1517,7 +1517,7 @@ TfuDelDatReqInfo delDatReq; if(NULLP == rlsRnti) { - RETVALUE(RFAILED); + return RFAILED; } if((cell == NULLP) || @@ -1527,7 +1527,7 @@ TfuDelDatReqInfo delDatReq; RLOG_ARG1(L_ERROR,DBG_CELLID,rlsRnti->cellId, "No cellCb found with cellId for RNTI:%d", rlsRnti->rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fix : syed Clearing UE context when SCH indicates to do so * UE DEL from CRG interface is now dummy. */ @@ -1541,7 +1541,7 @@ TfuDelDatReqInfo delDatReq; RLOG_ARG2(L_ERROR,DBG_CELLID,rlsRnti->cellId, "CRNTI change failed for RNTI:%d new RNTI:%d", rlsRnti->rnti,rlsRnti->newRnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV @@ -1551,7 +1551,7 @@ TfuDelDatReqInfo delDatReq; if(rgUtlSndCrntiChngReq2AllSMacs(cell, rlsRnti->rnti, rlsRnti->newRnti) != ROK) { /* TODO: do we need to send DelInd to SCH in failure case*/ - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef L2_OPTMZ @@ -1582,7 +1582,7 @@ TfuDelDatReqInfo delDatReq; #endif } - RETVALUE(ROK); + return ROK; } /* end of RgSchMacRlsRntiReq */ #ifdef L2_OPTMZ @@ -1598,7 +1598,7 @@ PUBLIC Bool RgUtlIsTbMuxed() { MsgLen len = 0; SFndLenMsg(tb->macHdr, &len); - RETVALUE(len?TRUE : FALSE); + return (len?TRUE : FALSE); } #endif diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index d43535704..54b4b6d80 100755 --- a/src/5gnrrlc/kw_amm_dl.c +++ b/src/5gnrrlc/kw_amm_dl.c @@ -2378,7 +2378,7 @@ MsgLen bufSz; kwStartTmr(gCb,(PTR)rbCb, KW_EVT_AMDL_POLL_RETX_TMR); } - RETVALUE(pollBit); + return (pollBit); } /** @@ -3009,7 +3009,7 @@ U32 sduId; #endif { TRC2(kwAmmDiscSdu); - RETVALUE(RFAILED); + return RFAILED; } /** @@ -4121,7 +4121,7 @@ PUBLIC S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId, if( ROK != kwDbmFetchDlUeCb(gCb,rnti,cellId,&(ueCb))) { printf("\n RLC UECb Not found...\n"); - RETVALUE(RFAILED); + return RFAILED; } @@ -4130,14 +4130,14 @@ PUBLIC S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId, /* Skip if mode is not AM */ if((rbCb == NULLP) || (rbCb->mode != CM_LTE_MODE_AM)) { - RETVALUE(RFAILED); + return RFAILED; } if(ROK != SExamMsg((Data *)(&fByte), rlcSdu, 0)) { printf("\n Failure in Rlc Hdr SExamMsg\n"); - RETVALUE(RFAILED); + return RFAILED; } if(KW_CNTRL_PDU == ((fByte & KW_DC_POS) >> KW_DC_SHT)) @@ -4148,7 +4148,7 @@ PUBLIC S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId, retVal = ROK; } - RETVALUE(retVal); + return (retVal); } diff --git a/src/5gnrrlc/kw_amm_ul.c b/src/5gnrrlc/kw_amm_ul.c index ba995aeb8..f3550acac 100755 --- a/src/5gnrrlc/kw_amm_ul.c +++ b/src/5gnrrlc/kw_amm_ul.c @@ -280,7 +280,7 @@ KwSn *prevNackSn; } *prevNackSn = sn; - RETVALUE(sizeToBeEncd); + return (sizeToBeEncd); } /** @@ -905,7 +905,7 @@ U8 *fByte; if (KW_CNTRL_PDU == amHdr->dc) { //printf ("++++++++++++ 5GNRLOG HDR extracted CTRL : \n"); - RETVALUE(ROK); + return ROK; } amHdr->p = (*fByte & KW_POLL_POS) >> KW_POLL_SHT; @@ -938,7 +938,7 @@ U8 *fByte; } //printf ("++++++++++++ 5GNRLOG HDR extracted DATA : sn %d \n", sn); - RETVALUE(ROK); + return ROK; } #ifdef OLD @@ -997,7 +997,7 @@ U8 *fByte; amHdr->dc = (*fByte & KW_DC_POS) >> KW_DC_SHT; if (KW_CNTRL_PDU == amHdr->dc) { - RETVALUE(ROK); + return ROK; } /* kw002.201 : Changed the extraction of hdr elements to avoid */ /* function calls */ @@ -1039,7 +1039,7 @@ U8 *fByte; if (! hdrInfo.val) { RLOG0(L_ERROR, "Received LI as 0"); - RETVALUE(RFAILED); + return RFAILED; } /* store the extracted LI value */ @@ -1052,7 +1052,7 @@ U8 *fByte; { RLOG2(L_ERROR,"LI Count [%u] exceeds Max LI Count[%u]", amHdr->numLi, KW_MAX_UL_LI); - RETVALUE(RFAILED); + return RFAILED; } /* first 2 bytes + Add one for Odd LI*/ @@ -1062,10 +1062,10 @@ U8 *fByte; { RLOG3(L_ERROR,"SN [%d]:Corrupted PDU as TotSz[%lu] PduSz[%lu] ", amHdr->sn, totalSz, pduSz); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif @@ -1381,7 +1381,7 @@ U16 pduSz; rbCb->rlcId.cellId); RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } #endif /* ERRCLASS & ERRCLS_RES */ kwUtlStoreRecBuf(AMUL.recBufLst, recBuf, amHdr->sn); @@ -1391,7 +1391,7 @@ U16 pduSz; if (recBuf->allRcvd == TRUE) { RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } } @@ -1411,7 +1411,7 @@ U16 pduSz; /* This is a duplicate segment */ gRlcStats.amRlcStats.numRlcAmCellDupPduRx++; RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } if ((seg) && (seg->amHdr.so <= soEnd)) @@ -1419,7 +1419,7 @@ U16 pduSz; /* This is a duplicate segment */ gRlcStats.amRlcStats.numRlcAmCellDupPduRx++; RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } /* If we have come this far, we have to add this segment to the */ @@ -1434,7 +1434,7 @@ U16 pduSz; rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } #endif /* ERRCLASS & ERRCLS_RES */ @@ -1456,7 +1456,7 @@ U16 pduSz; tseg->lstEnt.node = (PTR)tseg; kwAmmUpdExpByteSeg(gCb,&AMUL,tseg); - RETVALUE(TRUE); + return (TRUE); } /** @@ -1517,7 +1517,7 @@ KwAmHdr *amHdr; gCb->genSts.unexpPdusRecv++; RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } if (amHdr->si == 0) @@ -1538,7 +1538,7 @@ KwAmHdr *amHdr; rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } #endif /* ERRCLASS & ERRCLS_RES */ kwUtlStoreRecBuf(AMUL.recBufLst, recBuf, sn); @@ -1552,7 +1552,7 @@ KwAmHdr *amHdr; gRlcStats.amRlcStats.numRlcAmCellDupPduRx++; gCb->genSts.unexpPdusRecv++; RLC_FREE_BUF(pdu); - RETVALUE(FALSE); + return (FALSE); } recBuf->isDelvUpperLayer = FALSE; recBuf->pdu = pdu; @@ -1560,13 +1560,13 @@ KwAmHdr *amHdr; recBuf->allRcvd = TRUE; gRlcStats.amRlcStats.numRlcAmCellSduRx++; KW_MEM_CPY(&recBuf->amHdr, amHdr, sizeof(KwAmHdr)); - RETVALUE(TRUE); + return (TRUE); } else { /* We received a segment. We need to add that to the existing */ /* segments, if any. */ - RETVALUE(kwAmmAddRcvdSeg(gCb,rbCb, amHdr, pdu, pduSz)); + return (kwAmmAddRcvdSeg(gCb,rbCb, amHdr, pdu, pduSz)); } } @@ -1789,7 +1789,7 @@ KwAmRecBuf *recBuf; AMUL.expSo = 0; } - RETVALUE(ROK); + return ROK; } /** diff --git a/src/5gnrrlc/kw_cfg_dl.c b/src/5gnrrlc/kw_cfg_dl.c index ad61cd8b3..ab4b6321f 100755 --- a/src/5gnrrlc/kw_cfg_dl.c +++ b/src/5gnrrlc/kw_cfg_dl.c @@ -108,7 +108,7 @@ PRIVATE S16 kwHdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) } } } - RETVALUE(ROK); + return ROK; } /** @@ -156,7 +156,7 @@ PRIVATE S16 kwDelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) } } - RETVALUE(ROK); + return ROK; } @@ -251,7 +251,7 @@ PRIVATE S16 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kwRbCb,U8 cellId,U8 ueId) { if (gCb->genCfg.maxUe == measCb->val.ipThMeas.numUes) { - RETVALUE(RFAILED); + return RFAILED; } if (gCb->genCfg.maxUe == freeIdx) { @@ -298,7 +298,7 @@ PRIVATE S16 kwAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *kwRbCb,U8 cellId,U8 ueId) } kwRbCb->rbL2Cb.measOn |= measCb->measType; } - RETVALUE(ROK); + return ROK; }/*kwAddToDlL2Meas*/ #endif /*LTE_L2_MEAS*/ @@ -410,13 +410,13 @@ RlcEntCfgInfo *entCfg; "Invalid RB Mode ueId(%d),cellId(%d)", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } } rbCb->mode = entCfg->entMode; rbCb->discTmrInt = entCfg->discardTmr; - RETVALUE(ROK); + return ROK; } @@ -458,7 +458,7 @@ RlcEntCfgInfo *entCfg; entCfg->entMode, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(CKW_CFG_REAS_RB_MODE_MIS); + return (CKW_CFG_REAS_RB_MODE_MIS); } switch (rbCb->mode) @@ -481,7 +481,7 @@ RlcEntCfgInfo *entCfg; if (entCfg->lCh[0].type == CM_LTE_LCH_DCCH) { - RETVALUE(CKW_CFG_REAS_LCHTYPE_MIS); + return (CKW_CFG_REAS_LCHTYPE_MIS); } ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = NULLP; ueCb->lCh[entCfg->lCh[0].lChId - 1].dlRbCb = rbCb; @@ -514,7 +514,7 @@ RlcEntCfgInfo *entCfg; /* AGHOSH */ rbCb->discTmrInt = entCfg->discardTmr; /* AGHOSH */ - RETVALUE(CKW_CFG_REAS_NONE); + return (CKW_CFG_REAS_NONE); } @@ -587,13 +587,13 @@ RlcEntCfgCfmInfo *entCfm; RLOG_ARG1(L_ERROR,DBG_RBID,entCfg->rbId, "Add DLRb,CellId is 0 for UEID:%d", ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((entCfg->rguSapId >= gCb->genCfg.maxRguSaps) || (entCfg->rguSapId < 0)) { KWDBGP_ERROR(gCb, "rlcCfgAddDlRb(ueId(%u), cellId(%u), Invalid rguSapId (%d)\n", ueId, cellId, entCfg->rguSapId); - RETVALUE(RFAILED); + return RFAILED; } @@ -611,7 +611,7 @@ RlcEntCfgCfmInfo *entCfm; KW_MAX_RB_PER_CELL, cellId, ueId); - RETVALUE(RFAILED); + return RFAILED; } if (((entCfg->lCh[0].type == CM_LTE_LCH_BCCH) || @@ -634,7 +634,7 @@ RlcEntCfgCfmInfo *entCfm; "RbId [%d] already exists UEID:%d", entCfg->rbId, ueId); - RETVALUE(RFAILED); + return RFAILED; } } else /* Cell CB UNKNOWN */ @@ -650,7 +650,7 @@ RlcEntCfgCfmInfo *entCfm; "cellCb Creation failed RBID:%d UEID:%d", entCfg->rbId, ueId); - RETVALUE(RFAILED); + return RFAILED; } } @@ -665,7 +665,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID); - RETVALUE(RFAILED); + return RFAILED; } /* Create RB CB */ @@ -679,7 +679,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_CREAT_FAIL); - RETVALUE(RFAILED); + return RFAILED; } kwRbCb->rlcId.rbId = entCfg->rbId; cellCb->rbCb[entCfg->rbId] = kwRbCb; @@ -693,7 +693,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, reason); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -707,7 +707,7 @@ RlcEntCfgCfmInfo *entCfm; "Invalid RbId for RbType[%d] UEID:%d", entCfg->rbType, ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((((entCfg->lCh[0].type == CM_LTE_LCH_DCCH) && (entCfg->entMode != CM_LTE_MODE_UM) && @@ -731,7 +731,7 @@ RlcEntCfgCfmInfo *entCfm; "CellId[%u]:rbId [%d] already exists", cellId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } } else /* UE CB UNKNOWN */ @@ -746,7 +746,7 @@ RlcEntCfgCfmInfo *entCfm; "UeId [%u]:ueCb Creation Failed RBID:%d", ueId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } } @@ -758,7 +758,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_LCHID); - RETVALUE(RFAILED); + return RFAILED; } /* Create RB CB */ @@ -772,7 +772,7 @@ RlcEntCfgCfmInfo *entCfm; "Memory allocation failed RBID:%d CELLID:%d", entCfg->rbId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* copy the RB Cb into UECb */ @@ -798,7 +798,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK, reason); - RETVALUE(RFAILED); + return RFAILED; } } @@ -825,7 +825,7 @@ RlcEntCfgCfmInfo *entCfm; "Filling of RbCb failed UEID:%d CELLID:%d", ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } kwRbCb->qci = entCfg->qci; #ifdef LTE_L2_MEAS @@ -840,7 +840,7 @@ RlcEntCfgCfmInfo *entCfm; /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -919,7 +919,7 @@ RlcEntCfgCfmInfo *entCfm; KW_MAX_RB_PER_CELL, ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get cellCb */ kwDbmFetchDlCellCb(gCb,cellId, &cellCb); @@ -933,7 +933,7 @@ RlcEntCfgCfmInfo *entCfm; ueId, entCfg->rbId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get rbCb */ @@ -948,7 +948,7 @@ RlcEntCfgCfmInfo *entCfm; "CELLID:%d RBID:%d not found", cellId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } /* Take backup of rbCb before updating. @@ -973,7 +973,7 @@ RlcEntCfgCfmInfo *entCfm; entCfg->rbId); cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); - RETVALUE(ret); + return (ret); } } else @@ -988,7 +988,7 @@ RlcEntCfgCfmInfo *entCfm; cellId, entCfg->rbId, entCfg->rbType); - RETVALUE(RFAILED); + return RFAILED; } /* Get ueCb */ ret = kwDbmFetchDlUeCb(gCb,ueId, cellId, &ueCb); @@ -1001,7 +1001,7 @@ RlcEntCfgCfmInfo *entCfm; "UEID:%d UeCb not found RBID:%d", ueId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Get rbCb */ @@ -1016,7 +1016,7 @@ RlcEntCfgCfmInfo *entCfm; "CELLID:%d RBID:%d not found", cellId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Take backup of rbCb before updating. @@ -1037,14 +1037,14 @@ RlcEntCfgCfmInfo *entCfm; entCfg->rbId); cmMemcpy((U8*)rbCb, (U8 *)&tRbCb, sizeof(RlcDlRbCb)); - RETVALUE(ret); + return (ret); } } /* Fill entCfm structure */ KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -1124,7 +1124,7 @@ RlcEntCfgCfmInfo *entCfm; KW_MAX_RB_PER_CELL, ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get cellCb */ kwDbmFetchDlCellCb(gCb,cellId, &cellCb); @@ -1137,7 +1137,7 @@ RlcEntCfgCfmInfo *entCfm; "CellCb not found UEID:%d RBID:%d", ueId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Get rbCb */ @@ -1152,7 +1152,7 @@ RlcEntCfgCfmInfo *entCfm; "CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Assign NULLP to rbCb in rbCbLst */ @@ -1176,7 +1176,7 @@ RlcEntCfgCfmInfo *entCfm; entCfg->rbType, ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Get ueCb */ @@ -1190,7 +1190,7 @@ RlcEntCfgCfmInfo *entCfm; "UeId [%d]: UeCb not found RBID:%d", ueId, entCfg->rbId); - RETVALUE(ret); + return (ret); } /* Get rbCb */ @@ -1205,7 +1205,7 @@ RlcEntCfgCfmInfo *entCfm; "CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); - RETVALUE(ret); + return (ret); } ueCb->lCh[kwRbCb->lch.lChId - 1].dlRbCb = NULLP; @@ -1242,7 +1242,7 @@ RlcEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ret); + return (ret); } @@ -1321,7 +1321,7 @@ RlcEntCfgCfmInfo *entCfm; "CellId[%u]:RbId[%d] not found", cellId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } rbCb->rlcId.ueId = ueId; @@ -1351,7 +1351,7 @@ RlcEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -1418,7 +1418,7 @@ RlcEntCfgCfmInfo *entCfm; "ueId(%d), cellId(%d)", ueId, cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch Ue Cb */ @@ -1432,7 +1432,7 @@ RlcEntCfgCfmInfo *entCfm; "UEID:%d UeCb not found RBID:%d", ueId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS @@ -1446,7 +1446,7 @@ RlcEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } @@ -1508,7 +1508,7 @@ RlcEntCfgCfmInfo *entCfm; RLOG_ARG1(L_DEBUG,DBG_RBID,entCfg->rbId, "cellId is 0 (%d) ", cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch Ue Cb */ @@ -1521,7 +1521,7 @@ RlcEntCfgCfmInfo *entCfm; RLOG_ARG1(L_ERROR, DBG_CELLID,cellId, "CellCb not found for RBID:%d", entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } /* Delete Ue Cb */ @@ -1532,7 +1532,7 @@ RlcEntCfgCfmInfo *entCfm; KW_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_OK, CKW_CFG_REAS_NONE); - RETVALUE(ROK); + return ROK; } /** @@ -1585,7 +1585,7 @@ CmStatus *status; "Old UeId[%d] same as new UeId[%d]", ueInfo->ueId, newUeInfo->ueId); - RETVALUE(RFAILED); + return RFAILED; } if(ROK == kwDbmFetchDlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb)) @@ -1595,7 +1595,7 @@ CmStatus *status; newUeInfo->ueId); status->reason = CKW_CFG_REAS_UE_EXISTS; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } if(ROK != kwDbmFetchDlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, &ueCb)) @@ -1606,7 +1606,7 @@ CmStatus *status; ueInfo->ueId); status->reason = CKW_CFG_REAS_UE_UNKWN; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS @@ -1619,7 +1619,7 @@ CmStatus *status; ueInfo->ueId); status->reason = CKW_CFG_REAS_UE_CREAT_FAIL; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } /* update the hash key with new values */ @@ -1636,10 +1636,10 @@ CmStatus *status; newUeInfo->ueId); status->reason = CKW_CFG_REAS_UE_CREAT_FAIL; status->status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /********************************************************************30** diff --git a/src/5gnrrlc/kw_cfg_ul.c b/src/5gnrrlc/kw_cfg_ul.c index 639771699..9616579cd 100755 --- a/src/5gnrrlc/kw_cfg_ul.c +++ b/src/5gnrrlc/kw_cfg_ul.c @@ -102,7 +102,7 @@ PRIVATE S16 kwHdlMeasUlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId) } } } - RETVALUE(ROK); + return ROK; } /** @@ -161,7 +161,7 @@ PRIVATE S16 kwDelFrmUlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId) } } - RETVALUE(ROK); + return ROK; } @@ -252,7 +252,7 @@ PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) { if (gCb->genCfg.maxUe == measCb->val.ipThMeas.numUes) { - RETVALUE(RFAILED); + return RFAILED; } if (gCb->genCfg.maxUe == freeIdx) { @@ -289,7 +289,7 @@ PRIVATE S16 kwAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *kwRbCb,U8 cellId,U8 ueId) } kwRbCb->rbL2Cb.measOn |= measCb->measType; } - RETVALUE(ROK); + return ROK; }/*kwAddToDlL2Meas*/ #endif /*LTE_L2_MEAS*/ @@ -395,12 +395,12 @@ RlcEntCfgInfo *entCfg; "INVALID RB Mode cellId(%d), rbId(%d)", rbCb->rlcId.cellId, entCfg->rbId); - RETVALUE(RFAILED); + return RFAILED; } } rbCb->mode = entCfg->entMode; - RETVALUE(ROK); + return ROK; } @@ -467,7 +467,7 @@ RlcEntCfgInfo *entCfg; break; } } - RETVALUE(CKW_CFG_REAS_NONE); + return (CKW_CFG_REAS_NONE); } @@ -507,14 +507,14 @@ CmStatus *status; if (cellId == 0) { status->reason = CKW_CFG_REAS_CELL_UNKWN; - RETVALUE (RFAILED); + return (RFAILED); } if ((cfgToValidate->rguSapId >= gCb->genCfg.maxRguSaps) || (cfgToValidate->rguSapId < 0)) { KWDBGP_ERROR(gCb, "kwValidateRbCfgParams ueId (%u) cellId (%u) Invalid rguSapId (%d))\n", ueId, cellId, cfgToValidate->rguSapId); status->reason = CKW_CFG_REAS_INVALID_RGUSAP; - RETVALUE(RFAILED); + return RFAILED; } if((CKW_CFG_ADD == cfgToValidate->cfgType) || @@ -526,7 +526,7 @@ CmStatus *status; (cfgToValidate->lCh[1].lChId <= 0))) { status->reason = CKW_CFG_REAS_INVALID_LCHID; - RETVALUE(RFAILED); + return RFAILED; } if((cfgToValidate->entMode == CM_LTE_MODE_UM) && (cfgToValidate->m.umInfo.ul.snLen != KW_UM_CFG_5BIT_SN_LEN) && @@ -537,7 +537,7 @@ CmStatus *status; cfgToValidate->rbId, cfgToValidate->m.umInfo.ul.snLen); status->reason = CKW_CFG_REAS_INVALID_SNLEN; - RETVALUE(RFAILED); + return RFAILED; } /* Process Adding new RB */ if (ueId == 0) @@ -545,7 +545,7 @@ CmStatus *status; if(cfgToValidate->rbId >= KW_MAX_RB_PER_CELL) { status->reason = CKW_CFG_REAS_RB_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } if ((cfgToValidate->lCh[0].type != CM_LTE_LCH_CCCH) && @@ -553,7 +553,7 @@ CmStatus *status; { status->reason= (cfgToValidate->entMode != CM_LTE_MODE_TM)? CKW_CFG_REAS_RB_MODE_MIS: CKW_CFG_REAS_LCHTYPE_MIS; - RETVALUE(RFAILED); + return RFAILED; } } else @@ -561,20 +561,20 @@ CmStatus *status; if (!(KW_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId))) { status->reason = CKW_CFG_REAS_RB_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } if(cfgToValidate->entMode == CM_LTE_MODE_TM) { status->reason = CKW_CFG_REAS_LCHTYPE_MIS; - RETVALUE(RFAILED); + return RFAILED; } if (!(((cfgToValidate->lCh[0].type == CM_LTE_LCH_DCCH) && (cfgToValidate->entMode != CM_LTE_MODE_UM))|| (cfgToValidate->lCh[0].type == CM_LTE_LCH_DTCH)) ) { status->reason = CKW_CFG_REAS_RB_MODE_MIS; - RETVALUE(RFAILED); + return RFAILED; } } } @@ -585,7 +585,7 @@ CmStatus *status; if(cfgToValidate->rbId >= KW_MAX_RB_PER_CELL) { status->reason = CKW_CFG_REAS_RB_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } } @@ -594,11 +594,11 @@ CmStatus *status; if (!(KW_VALIDATE_UE_RBID(cfgToValidate->rbType, cfgToValidate->rbId))) { status->reason = CKW_CFG_REAS_RB_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } @@ -645,7 +645,7 @@ RlcUlCfgTmpData *cfgTmpData; cfgToValidate, &cfgEntData->entUlCfgCfm.status)) { - RETVALUE(RFAILED); + return RFAILED; } cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_NONE; @@ -668,7 +668,7 @@ RlcUlCfgTmpData *cfgTmpData; "Memory allocation failure CELLID:%d", cfgTmpData->cellId); cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_CREAT_FAIL; - RETVALUE(RFAILED); + return RFAILED; } kwDbmAddUlCellCb(gCb, cfgTmpData->cellId, cfgTmpData->cellCb); } @@ -677,7 +677,7 @@ RlcUlCfgTmpData *cfgTmpData; if (( cfgTmpData->cellCb->rbCb[cfgToValidate->rbId] != NULLP)) { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;; - RETVALUE(RFAILED); + return RFAILED; } } @@ -685,7 +685,7 @@ RlcUlCfgTmpData *cfgTmpData; if (!cfgEntData->rbCb) { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_CREAT_FAIL; - RETVALUE(RFAILED); + return RFAILED; } } else @@ -702,7 +702,7 @@ RlcUlCfgTmpData *cfgTmpData; "Memory allocation failure CELLID:%d", cfgTmpData->cellId); cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_CREAT_FAIL; - RETVALUE(RFAILED); + return RFAILED; } kwDbmAddUlUeCb(gCb, cfgTmpData->ueId, cfgTmpData->cellId, cfgTmpData->ueCb); } @@ -715,14 +715,14 @@ RlcUlCfgTmpData *cfgTmpData; if(cfgEntData->rbCb != NULLP) { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_PRSNT;; - RETVALUE(RFAILED); + return RFAILED; } } RLC_ALLOC(gCb,cfgEntData->rbCb, sizeof (RlcUlRbCb)); if (!cfgEntData->rbCb) { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_CREAT_FAIL; - RETVALUE(RFAILED); + return RFAILED; } } /*Allocating the memory for receive buffer */ @@ -767,7 +767,7 @@ RlcUlCfgTmpData *cfgTmpData; cfgTmpData->ueId); /*how can a modify request come for a cell which does not exist*/ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } cfgEntData->rbCb = cfgTmpData->cellCb->rbCb[cfgToValidate->rbId]; @@ -775,9 +775,9 @@ RlcUlCfgTmpData *cfgTmpData; { /* something is wrong the rbId for this cell does not exist */ cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } else { @@ -788,7 +788,7 @@ RlcUlCfgTmpData *cfgTmpData; "UeId [%d]: UeCb not found", cfgTmpData->ueId); cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } /* Get rbCb */ @@ -799,9 +799,9 @@ RlcUlCfgTmpData *cfgTmpData; if ( cfgEntData->rbCb == NULLP) { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } break; } @@ -812,16 +812,16 @@ RlcUlCfgTmpData *cfgTmpData; if(cfgToValidate->entMode != cfgEntData->rbCb->mode) { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_MODE_MIS; - RETVALUE(RFAILED); + return RFAILED; } if(cfgToValidate->m.umInfo.ul.snLen != cfgEntData->rbCb->m.umUl.snLen) { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_SNLEN_MIS; - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -875,7 +875,7 @@ RlcUlEntTmpData *cfgEntData; RLC_FREE(gCb,cfgEntData->rbCb, sizeof(RlcUlRbCb)); } - RETVALUE(ROK); + return ROK; } @@ -1065,7 +1065,7 @@ RlcUlCfgTmpData *cfgTmpData; RLOG_ARG1(L_ERROR,DBG_UEID,cfgTmpData->ueId, "UeId is 0 for CELLID;%d", cfgTmpData->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch Ue Cb */ @@ -1075,9 +1075,9 @@ RlcUlCfgTmpData *cfgTmpData; "UeId [%d]: UeCb not found", cfgTmpData->ueId); cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_UE_UNKWN;; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -1160,7 +1160,7 @@ RlcUlCfgTmpData *cfgTmpData; { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;; RLOG_ARG0(L_ERROR,DBG_CELLID,cellId , "CellId is 0"); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch Cell Cb */ @@ -1169,9 +1169,9 @@ RlcUlCfgTmpData *cfgTmpData; { cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_CELL_UNKWN;; RLOG_ARG0(L_ERROR, DBG_CELLID,cellId, "CellCb not found"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -1259,10 +1259,10 @@ RlcUlEntTmpData *cfgEntData; cellId, cfgToValidate->rbId); cfgEntData->entUlCfgCfm.status.reason = CKW_CFG_REAS_RB_UNKWN; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -1369,7 +1369,7 @@ RlcUlCfgTmpData *cfgTmpData; { CFM_STATUS.reason = CKW_CFG_REAS_SAME_UEID; CFM_STATUS.status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } if(ROK == kwDbmFetchUlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb)) @@ -1379,7 +1379,7 @@ RlcUlCfgTmpData *cfgTmpData; newUeInfo->ueId); CFM_STATUS.reason = CKW_CFG_REAS_UE_EXISTS; CFM_STATUS.status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } if(ROK != kwDbmFetchUlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, @@ -1390,10 +1390,10 @@ RlcUlCfgTmpData *cfgTmpData; ueInfo->ueId); CFM_STATUS.reason = CKW_CFG_REAS_UE_UNKWN; CFM_STATUS.status = CKW_CFG_CFM_NOK; - RETVALUE(RFAILED); + return RFAILED; } #undef CFM_STATUS - RETVALUE(ROK); + return ROK; } diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c index 152212c9f..305c32f01 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -116,7 +116,7 @@ RlcCb *gCb; KW_GET_MEM_POOL(gCb))) { RLOG0(L_ERROR, "UeLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize cellCb Hash List */ @@ -130,7 +130,7 @@ RlcCb *gCb; { cmHashListDeinit(&gCb->u.dlCb->ueLstCp); RLOG0(L_ERROR, "CellLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* kw005.201 added support for L2 Measurement */ @@ -147,7 +147,7 @@ RlcCb *gCb; cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for rlcCb.qciHlCp"); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize tbHlCp Hash List */ @@ -163,11 +163,11 @@ RlcCb *gCb; cmHashListDeinit(&gCb->u.dlCb->cellLstCp); cmHashListDeinit(&gCb->u.dlCb->ueLstCp); RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for rlcCb.tbHlCp"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTE_L2_MEAS */ - RETVALUE(ROK); + return ROK; } /* kwDbmDlInit */ @@ -475,7 +475,7 @@ RlcDlUeCb **ueCb; RLOG_ARG1(L_FATAL,DBG_UEID,ueId, "Memory allocation failed cellID:%d", cellId); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -491,13 +491,13 @@ RlcDlUeCb **ueCb; RLOG_ARG1(L_ERROR,DBG_CELLID,cellId, "UeId[%u] HashList Insertion Failed", ueId); - RETVALUE(RFAILED); + return RFAILED; } /* kw005.201 ccpu00117318, updating the statistics */ gCb->genSts.numUe++; - RETVALUE(ROK); + return ROK; } /* kwDbmCreateUeCb */ @@ -537,7 +537,7 @@ RlcDlUeCb **ueCb; TRC3(kwDbmFetchDlUeCb) - RETVALUE(cmHashListFind(&(gCb->u.dlCb->ueLstCp), + return (cmHashListFind(&(gCb->u.dlCb->ueLstCp), (U8 *)&(ueId), sizeof(CmLteRnti), KW_DEF_SEQ_NUM, @@ -715,7 +715,7 @@ RlcDlCellCb **cellCb; if (*cellCb == NULLP) { RLOG_ARG0(L_FATAL, DBG_CELLID,cellId,"Memory allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -728,10 +728,10 @@ RlcDlCellCb **cellCb; (U16) sizeof(CmLteCellId))) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellId,"HashList Insertion Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* kwDbmCreateDlCellCb */ @@ -777,10 +777,10 @@ RlcDlCellCb **cellCb; (PTR*) cellCb)) { RLOG_ARG0(L_ERROR,DBG_CELLID, cellId,"CellCb not found"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* kwDbmFetchCellCb */ @@ -896,7 +896,7 @@ RlcCb *gCb; kwDbmDlDeInit(gCb); - RETVALUE(ROK); + return ROK; } /* kwDbmShutdown */ diff --git a/src/5gnrrlc/kw_dbm_ul.c b/src/5gnrrlc/kw_dbm_ul.c index 2d6050ebe..a3d1b1056 100755 --- a/src/5gnrrlc/kw_dbm_ul.c +++ b/src/5gnrrlc/kw_dbm_ul.c @@ -95,7 +95,7 @@ RlcCb *gCb; KW_GET_MEM_POOL(gCb))) { RLOG0(L_ERROR, "UeLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize cellCb Hash List */ @@ -109,7 +109,7 @@ RlcCb *gCb; { cmHashListDeinit(&gCb->u.ulCb->ueLstCp); RLOG0(L_ERROR, "CellLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } if(ROK != cmHashListInit(&(gCb->u.ulCb->transIdLstCp), @@ -123,7 +123,7 @@ RlcCb *gCb; cmHashListDeinit(&gCb->u.ulCb->ueLstCp); cmHashListDeinit(&gCb->u.ulCb->cellLstCp); RLOG0(L_ERROR, "transIdLstCp Initialization Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* kw005.201 added support for L2 Measurement */ @@ -131,7 +131,7 @@ RlcCb *gCb; /* Initialize qcI Hash List */ #endif /* LTE_L2_MEAS */ - RETVALUE(ROK); + return ROK; } /* kwDbmUlInit */ @@ -430,13 +430,13 @@ RlcUlUeCb *ueCb; RLOG_ARG1(L_ERROR,DBG_CELLID,cellId, "UeId[%u] HashList Insertion Failed", ueId); - RETVALUE(RFAILED); + return RFAILED; } /* kw005.201 ccpu00117318, updating the statistics */ gCb->genSts.numUe++; - RETVALUE(ROK); + return ROK; } @@ -474,7 +474,7 @@ RlcUlCfgTmpData *cfg; RLOG1(L_DEBUG, "(transId(%d))", cfg->transId); #endif - RETVALUE(cmHashListInsert(&(gCb->u.ulCb->transIdLstCp), + return (cmHashListInsert(&(gCb->u.ulCb->transIdLstCp), (PTR)cfg, (U8 *)&(cfg->transId), (U16) sizeof(cfg->transId))); @@ -519,9 +519,9 @@ RlcUlCfgTmpData **cfg; KW_DEF_SEQ_NUM,(PTR *) cfg)) { RLOG1(L_ERROR,"TransId [%ld] not found",transId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -559,10 +559,10 @@ RlcUlCfgTmpData *cfg; if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK) { RLOG0(L_ERROR,"HashList Deletion failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -600,13 +600,13 @@ RlcCb *gCb; { if(kwDbmDelUlTransaction(gCb, cfg) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cfg = NULLP; } - RETVALUE(ROK); + return ROK; } @@ -645,7 +645,7 @@ RlcUlUeCb **ueCb; TRC3(kwDbmFetchUlUeCb) - RETVALUE(cmHashListFind(&(gCb->u.ulCb->ueLstCp), + return (cmHashListFind(&(gCb->u.ulCb->ueLstCp), (U8 *)&(ueId), sizeof(CmLteRnti), KW_DEF_SEQ_NUM, (PTR *) ueCb)); @@ -797,10 +797,10 @@ RlcUlCellCb *cellCb; { RLOG_ARG0(L_ERROR,DBG_CELLID,tCellCb->cellId, "HashList Insertion Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } diff --git a/src/5gnrrlc/kw_dl_ex_ms.c b/src/5gnrrlc/kw_dl_ex_ms.c index 00351a929..ea121858a 100755 --- a/src/5gnrrlc/kw_dl_ex_ms.c +++ b/src/5gnrrlc/kw_dl_ex_ms.c @@ -101,7 +101,7 @@ PUBLIC S16 rlcDlInitExt() { TRC2(rlcDlInitExt); - RETVALUE(ROK); + return ROK; } /* kwInitExt */ @@ -155,18 +155,18 @@ Reason reason; /* reason */ if (inst >= MAX_RLC_INSTANCES) { /* intance greater than MAX instances */ - RETVALUE(RFAILED); + return RFAILED; } if (rlcCb[inst] != NULLP) { - RETVALUE (RFAILED); + return (RFAILED); } if (SGetSBuf(region, 0, (Data **)&tRlcCb, (Size)sizeof (RlcCb)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Initialize rlcCb */ RLC_MEM_SET(tRlcCb, 0, sizeof(RlcCb)); @@ -204,7 +204,7 @@ Reason reason; /* reason */ - RETVALUE(ROK); + return ROK; } /* kwActvInit */ @@ -288,7 +288,7 @@ Buffer *mBuf; /* message buffer */ } #endif /* LCKWU */ default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from SM", @@ -370,7 +370,7 @@ Buffer *mBuf; /* message buffer */ } default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RLC UL", @@ -420,7 +420,7 @@ Buffer *mBuf; /* message buffer */ #endif /* LCKWU */ default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RRC", @@ -470,7 +470,7 @@ Buffer *mBuf; /* message buffer */ } default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from PDCP", @@ -521,7 +521,7 @@ Buffer *mBuf; /* message buffer */ #endif default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from MAC", @@ -543,7 +543,7 @@ Buffer *mBuf; /* message buffer */ break; } } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } #endif @@ -571,7 +571,7 @@ Buffer *mBuf; /* message buffer */ kwUtlFreeDlMem(); #endif - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } } @@ -587,14 +587,14 @@ Buffer *mBuf; /* message buffer */ RLOG1(L_ERROR, "Received Invalid Source Entity[%d]", pst->event); } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; break; } } - SExitTsk(); + ODU_EXIT_TASK(); - RETVALUE(ret); + return (ret); } /* kwActvTsk */ diff --git a/src/5gnrrlc/kw_err.h b/src/5gnrrlc/kw_err.h index ec5608b57..949ff1a3f 100755 --- a/src/5gnrrlc/kw_err.h +++ b/src/5gnrrlc/kw_err.h @@ -57,7 +57,7 @@ KWLOGERROR(ERRCLS_INT_PAR, EKWxxx, (ErrVal) spId, \ "KwUiKwuBndReq: KWU SAP State is Invalid during Bind Req"); \ KW_SEND_SAPID_ALARM(spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_SAP);\ - RETVALUE(RFAILED); \ + return RFAILED; \ } \ } #else @@ -81,7 +81,7 @@ KWLOGERROR(_cb,ERRCLS_INT_PAR, EKWxxx, (ErrVal) spId,\ "KwUiCkwBndReq: CKW SAP State is Invalid during Bind Req");\ KW_SEND_SAPID_ALARM(_cb,spId, LKW_EVENT_CKW_BND_REQ, LCM_CAUSE_INV_STATE);\ - RETVALUE(RFAILED); \ + return RFAILED; \ } \ } #endif @@ -99,7 +99,7 @@ KWLOGERROR(_cb,ERRCLS_INT_PAR, EKWxxx, (ErrVal) spId,\ "KwUiCkwBndReq: UDX SAP State is Invalid during Bind Req");\ KW_SEND_SAPID_ALARM(_cb,spId, LKW_EVENT_UDX_BND_REQ, LCM_CAUSE_INV_STATE);\ - RETVALUE(RFAILED); \ + return RFAILED; \ } \ } #endif diff --git a/src/5gnrrlc/kw_id.c b/src/5gnrrlc/kw_id.c index 8722d5a1b..5cdad9b32 100755 --- a/src/5gnrrlc/kw_id.c +++ b/src/5gnrrlc/kw_id.c @@ -125,7 +125,7 @@ SystemId *s; /* system id */ s->bRev = sId.bRev; s->ptNmb = sId.ptNmb; - RETVALUE(TRUE); + return (TRUE); } /* end of kwGetSId */ diff --git a/src/5gnrrlc/kw_lim.c b/src/5gnrrlc/kw_lim.c index 5a094ddb3..765e5e6e0 100755 --- a/src/5gnrrlc/kw_lim.c +++ b/src/5gnrrlc/kw_lim.c @@ -122,7 +122,7 @@ U8 status; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE (RFAILED); + return (RFAILED); } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -136,7 +136,7 @@ U8 status; KW_SEND_SAPID_ALARM(tRlcCb,suId,LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_STATE); - RETVALUE(RFAILED); + return RFAILED; } if ((suId >= tRlcCb->genCfg.maxRguSaps) || (suId < 0)) @@ -145,7 +145,7 @@ U8 status; KW_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_SUID); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -186,7 +186,7 @@ U8 status; /* Send an alarm with proper event and cause */ KW_SEND_SAPID_ALARM(tRlcCb, suId, event, cause); - RETVALUE(ROK); + return ROK; } /* KwLiRguBndCfm */ /** @@ -287,7 +287,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcMacData *ulData) RLC_FREE_SHRABL_BUF(pst->region, pst->pool, ulData, sizeof(RlcMacData)); - RETVALUE(ROK); + return ROK; }/* End of RlcProcUlData */ @@ -333,7 +333,7 @@ RguCDatIndInfo *datInd; if (pst->dstInst >= MAX_RLC_INSTANCES) { RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); - RETVALUE (RFAILED); + return (RFAILED); } #endif @@ -344,7 +344,7 @@ RguCDatIndInfo *datInd; if (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -355,7 +355,7 @@ RguCDatIndInfo *datInd; RLOG_ARG1(L_ERROR,DBG_LCID,datInd->lcId, "Invalid LcId, Max is [%d]", KW_MAX_LCH_PER_CELL); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -366,7 +366,7 @@ RguCDatIndInfo *datInd; RLOG_ARG1(L_ERROR, DBG_CELLID,datInd->cellId, "LcId [%d] not found", datInd->lcId); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } /* Dispatch to TM Module */ @@ -378,7 +378,7 @@ RguCDatIndInfo *datInd; RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); - RETVALUE(ROK); + return ROK; } /* KwLiRguCDatInd */ /** @@ -420,7 +420,7 @@ RguDDatIndInfo *datInd; if (pst->dstInst >= MAX_RLC_INSTANCES) { RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguDDatIndInfo)); - RETVALUE (RFAILED); + return (RFAILED); } #endif @@ -429,7 +429,7 @@ RguDDatIndInfo *datInd; { RLOG1(L_DEBUG,"KwLiRguDDatInd(pst, suId(%d))recieved in DL Inst",suId); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguDDatIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif kwUtlRcvFrmLi(RLC_GET_RLCCB(pst->dstInst),datInd); @@ -441,7 +441,7 @@ RguDDatIndInfo *datInd; #endif #endif - RETVALUE(ROK); + return ROK; } /* KwLiRguDDatInd */ @@ -522,7 +522,7 @@ PUBLIC uint16_t RlcMacProcSchedRep(Pst *pst, SuId suId, RlcMacSchedRepInfo *schR RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, schRep, sizeof(RlcMacSchedRepInfo)); - RETVALUE(ROK); + return ROK; } /** @@ -566,7 +566,7 @@ RguCStaIndInfo *staInd; if (pst->dstInst >= MAX_RLC_INSTANCES) { RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); - RETVALUE (RFAILED); + return (RFAILED); } #endif @@ -581,7 +581,7 @@ RguCStaIndInfo *staInd; EKW040, (ErrVal) suId, "KwLiRguCStaInd: Invalid RGU suId\n"); - RETVALUE(RFAILED); + return RFAILED; } if (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_UL) { @@ -589,7 +589,7 @@ RguCStaIndInfo *staInd; "Received in RLC UL CELLID:%d", staInd->cellId); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -604,7 +604,7 @@ RguCStaIndInfo *staInd; KW_MAX_LCH_PER_CELL, staInd->cellId); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ /* Fertch RbCb from lcId */ @@ -615,7 +615,7 @@ RguCStaIndInfo *staInd; "LcId [%d] not found CELLID:%d", staInd->lcId); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } /* Dispatch to TM Module */ @@ -637,7 +637,7 @@ RguCStaIndInfo *staInd; #else RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); #endif - RETVALUE(ROK); + return ROK; } /* KwLiRguCStaInd */ /** @@ -680,7 +680,7 @@ RguDStaIndInfo *staInd; if (pst->dstInst >= MAX_RLC_INSTANCES) { RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguDStaIndInfo)); - RETVALUE (RFAILED); + return (RFAILED); } #endif @@ -691,7 +691,7 @@ RguDStaIndInfo *staInd; { RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"Received in RLC UL "); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguDStaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } if ((suId >= gCb->genCfg.maxRguSaps) || (suId < 0)) { @@ -700,14 +700,14 @@ RguDStaIndInfo *staInd; EKW040, (ErrVal) suId, "KwLiRguDStaInd: Invalid RGU suId\n"); - RETVALUE(RFAILED); + return RFAILED; } #endif kwUtlSndToLi(gCb, suId, staInd); /* kw002.201 :Freeing from proper region */ RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguDStaIndInfo)); - RETVALUE(ROK); + return ROK; } /* KwLiRguDStaInd */ /** @@ -783,7 +783,7 @@ RguFlowCntrlInd *flowCntrlInd; } } } - RETVALUE(ROK); + return ROK; } /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS @@ -840,7 +840,7 @@ RguHarqStatusInd *staInd; ret = kwDbmFetchDlUeCb(tRlcCb, ueKey.ueId, ueKey.cellId, &ueCb); if (ret != ROK ) { - RETVALUE(RFAILED); + return RFAILED; } /*Call kwUtlProcHarqInd as many times as number of Tbs present*/ @@ -849,7 +849,7 @@ RguHarqStatusInd *staInd; kwUtlProcHarqInd(tRlcCb, staInd, ueCb, tbIdx); } - RETVALUE(ROK); + return ROK; } /* KwLiRguHqStaInd */ #endif /* LTE_L2_MEAS */ diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c index 1b28cb001..d023c56a6 100755 --- a/src/5gnrrlc/kw_lmm.c +++ b/src/5gnrrlc/kw_lmm.c @@ -149,7 +149,7 @@ KwGenCfg *cfg; KW_MAX_UE, cfg->maxUe); #endif /* ERRCLASS & ERRCLS_INT_PAR */ - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } if(cfg->maxKwuSaps > KW_MAX_KWUSAPS) @@ -159,7 +159,7 @@ KwGenCfg *cfg; KW_MAX_KWUSAPS, cfg->maxKwuSaps); #endif /* ERRCLASS & ERRCLS_INT_PAR */ - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } if(cfg->maxUdxSaps > KW_MAX_UDXSAPS) @@ -169,19 +169,19 @@ KwGenCfg *cfg; KW_MAX_UDXSAPS, cfg->maxUdxSaps); #endif /* ERRCLASS & ERRCLS_INT_PAR */ - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } if((cfg->maxRguSaps == 0) || (cfg->maxRguSaps > KW_MAX_RGUSAPS)) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } if(gCb->init.cfgDone == TRUE) { /* reconfiguration not supported */ - RETVALUE(LCM_REASON_RECONFIG_FAIL); + return (LCM_REASON_RECONFIG_FAIL); } gCb->genCfg = *cfg; @@ -197,7 +197,7 @@ KwGenCfg *cfg; if (gCb->u.dlCb == NULLP) { RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } /* allocate memory to the KWU sap's */ @@ -211,7 +211,7 @@ KwGenCfg *cfg; { RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -227,7 +227,7 @@ KwGenCfg *cfg; RLC_FREE(gCb,gCb->u.dlCb->kwuDlSap, kwSapSize); RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -243,7 +243,7 @@ KwGenCfg *cfg; KWLOGERROR(gCb,ERRCLS_INT_PAR, EKW043, (ErrVal) cfg->maxUe, "kwLmmGenCfg: SgetSBuf Failed for rguSap...!"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -257,7 +257,7 @@ KwGenCfg *cfg; RLC_FREE(gCb,gCb->u.dlCb->rguDlSap, rguSapSize); RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); RLOG0(L_FATAL,"RLC DL Initialization failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #if 0 /* Register the timer */ @@ -270,7 +270,7 @@ KwGenCfg *cfg; RLC_FREE(gCb,gCb->u.dlCb->rguDlSap, rguSapSize); RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); - RETVALUE(LCM_REASON_REGTMR_FAIL); + return (LCM_REASON_REGTMR_FAIL); } #endif /* initializations for background processing of freeing memory */ @@ -286,7 +286,7 @@ KwGenCfg *cfg; RLC_FREE(gCb,gCb->u.dlCb->rguDlSap, rguSapSize); RLC_FREE(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #ifdef LTE_L2_MEAS @@ -299,7 +299,7 @@ KwGenCfg *cfg; if (gCb->u.ulCb == NULLP) { RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } /* allocate memory to the KWU sap's */ @@ -313,7 +313,7 @@ KwGenCfg *cfg; { RLC_FREE(gCb,gCb->u.ulCb, sizeof (RlcUlCb)); RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -331,7 +331,7 @@ KwGenCfg *cfg; RLC_FREE(gCb,gCb->u.ulCb->kwuUlSap, kwSapSize); RLC_FREE(gCb,gCb->u.ulCb, sizeof (RlcUlCb)); RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -347,7 +347,7 @@ KwGenCfg *cfg; KWLOGERROR(gCb,ERRCLS_INT_PAR, EKW043, (ErrVal) cfg->maxUe, "kwLmmGenCfg: SgetSBuf Failed for rguSap...!"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -372,7 +372,7 @@ KwGenCfg *cfg; RLC_FREE(gCb,gCb->u.ulCb->rguUlSap, kwSapSize); RLC_FREE(gCb,gCb->u.ulCb, sizeof (RlcUlCb)); - RETVALUE(LCM_REASON_REGTMR_FAIL); + return (LCM_REASON_REGTMR_FAIL); } #endif #ifdef LTE_L2_MEAS @@ -385,7 +385,7 @@ KwGenCfg *cfg; RLOG0(L_ERROR, "Received Invalid RLC Mode"); #endif /* ERRCLASS & ERRCLS_INT_PAR */ - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } /* Timer Initialization */ gCb->kwTqCp.tmrLen = KW_TMR_LEN; @@ -408,7 +408,7 @@ KwGenCfg *cfg; gCb->init.cfgDone = TRUE; - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -589,7 +589,7 @@ KwMngmt *cfg; cfg->cfm.status = LCM_PRIM_NOK; cfg->cfm.reason = LCM_REASON_INVALID_INSTANCE; kwLmmSendCfm(tRlcCb,pst, cfg, TCFG, &cfg->hdr); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -600,7 +600,7 @@ KwMngmt *cfg; cfg->cfm.status = LCM_PRIM_NOK; cfg->cfm.reason = LCM_REASON_GENCFG_NOT_DONE; kwLmmSendCfm(tRlcCb,pst, cfg, TCFG, &cfg->hdr); - RETVALUE(RFAILED); + return RFAILED; } /* check configuration is done or not */ if ((tRlcCb->init.cfgDone != TRUE) && @@ -614,7 +614,7 @@ KwMngmt *cfg; cfg->cfm.status = LCM_PRIM_NOK; cfg->cfm.reason = LCM_REASON_GENCFG_NOT_DONE; kwLmmSendCfm(tRlcCb,pst, cfg, TCFG, &cfg->hdr); - RETVALUE(RFAILED); + return RFAILED; } RLOG1(L_DEBUG, "KwMiRlcConfigReq elmId(%d)", cfg->hdr.elmId.elmnt); @@ -658,14 +658,14 @@ KwMngmt *cfg; cfg->cfm.status = LCM_PRIM_OK; cfg->cfm.reason = LCM_REASON_NOT_APPL; kwLmmSendCfm(tRlcCb,pst, cfg, TCFG, &cfg->hdr); - RETVALUE(ROK); + return ROK; } else { cfg->cfm.status = LCM_PRIM_NOK; cfg->cfm.reason = reason; kwLmmSendCfm(tRlcCb,pst, cfg, TCFG, &cfg->hdr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -746,7 +746,7 @@ KwMngmt *cntrl; cntrl->cfm.reason = LCM_REASON_INVALID_INSTANCE; kwLmmSendCfm(tRlcCb,pst, cntrl, TCNTRL, &cntrl->hdr); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -757,7 +757,7 @@ KwMngmt *cntrl; cntrl->cfm.status = LCM_PRIM_NOK; cntrl->cfm.reason = LCM_REASON_GENCFG_NOT_DONE; kwLmmSendCfm(tRlcCb,pst, cntrl, TCNTRL, &cntrl->hdr); - RETVALUE(RFAILED); + return RFAILED; } if (!(tRlcCb->init.cfgDone)) @@ -765,7 +765,7 @@ KwMngmt *cntrl; cntrl->cfm.status = LCM_PRIM_NOK; cntrl->cfm.reason = LCM_REASON_GENCFG_NOT_DONE; kwLmmSendCfm(tRlcCb,pst, cntrl, TCNTRL, &cntrl->hdr); - RETVALUE(RFAILED); + return RFAILED; } RLOG1(L_DEBUG, "KwMiLkwCntrlReq(elmId(%d))", cntrl->hdr.elmId.elmnt); @@ -814,7 +814,7 @@ KwMngmt *cntrl; kwLmmSendCfm(tRlcCb,pst, cntrl, TCNTRL, &cntrl->hdr); - RETVALUE(ROK); + return ROK; } /** @@ -855,7 +855,7 @@ KwMngmt *sta; sta->cfm.reason = LCM_REASON_INVALID_INSTANCE; kwLmmSendCfm(tRlcCb,pst, sta, TSSTA, &sta->hdr); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -866,7 +866,7 @@ KwMngmt *sta; sta->cfm.reason = LCM_REASON_GENCFG_NOT_DONE; kwLmmSendCfm(tRlcCb,pst, sta, TSSTA, &sta->hdr); - RETVALUE(RFAILED); + return RFAILED; } RLOG1(L_DEBUG, "Status request for elmId(%d))", sta->hdr.elmId.elmnt); @@ -928,7 +928,7 @@ KwMngmt *sta; } kwLmmSendCfm(tRlcCb,pst, &rSta, TSSTA, &sta->hdr); - RETVALUE(ROK); + return ROK; } /** @@ -991,7 +991,7 @@ KwMngmt *sts; rSts.cfm.reason = LCM_REASON_INVALID_INSTANCE; kwLmmSendCfm(tRlcCb,pst, &rSts, TCNTRL, &sts->hdr); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1002,7 +1002,7 @@ KwMngmt *sts; rSts.cfm.reason = LCM_REASON_GENCFG_NOT_DONE; kwLmmSendCfm(tRlcCb,pst, &rSts, TCNTRL, &sts->hdr); - RETVALUE(RFAILED); + return RFAILED; } RLOG2(L_DEBUG, "KwMiLkwStsReq(elmId(%d),action(%d))", @@ -1048,7 +1048,7 @@ KwMngmt *sts; } kwLmmSendCfm(tRlcCb,pst, &rSts, TSTS, &sts->hdr); - RETVALUE(ROK); + return ROK; } /* kw005.201 added support for L2 Measurement */ @@ -1123,7 +1123,7 @@ KwL2MeasReqEvt *measReqEvt; #endif /* ERRCLASS & ERRCLS_ADD_RES */ kwUtlSndUlL2MeasNCfm(tRlcCb, measReqEvt, &measCfmEvt); RLC_FREE(tRlcCb, measReqEvt, sizeof(KwL2MeasReqEvt)) - RETVALUE(RFAILED); + return RFAILED; } } @@ -1142,7 +1142,7 @@ KwL2MeasReqEvt *measReqEvt; measCfmEvt.status.reason = LKW_CAUSE_INVALID_MEASTYPE; kwUtlSndDlL2MeasNCfm(tRlcCb, measReqEvt, &measCfmEvt); RLC_FREE(tRlcCb, measReqEvt, sizeof(KwL2MeasReqEvt)) - RETVALUE(ROK); + return ROK; } /* for UL IP throughput meas enable for all QCIs */ @@ -1172,7 +1172,7 @@ KwL2MeasReqEvt *measReqEvt; if(measEvt == NULLP) { RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif cmMemcpy((Void*)measEvt, (Void*)measReqEvt, sizeof(KwL2MeasReqEvt)); @@ -1196,7 +1196,7 @@ KwL2MeasReqEvt *measReqEvt; } /*RLC_FREE(tRlcCb, measReqEvt, sizeof(KwL2MeasReqEvt));*/ - RETVALUE(ret); + return (ret); } /* KwMiLkwL2MeasReq */ /** @@ -1258,14 +1258,14 @@ U8 measType; { /*Redirect the request to DL task */ rlcUlUdxL2MeasStopReq(&(KW_GET_UDX_SAP(tRlcCb)->pst),measType); - /*RETVALUE(ROK);*/ + /*return ROK;*/ } /*cmMemset((U8*)&measCfmEvt, 0, sizeof(KwL2MeasCfmEvt)); */ status = LCM_PRIM_OK; KwMiLkwL2MeasStopCfm(&tRlcCb->genCfg.lmPst, measType,status); - RETVALUE(ret); + return (ret); } /** @brief @@ -1307,7 +1307,7 @@ U8 measType; /*Redirect the request to DL task */ rlcUlUdxL2MeasSendReq(&(KW_GET_UDX_SAP(tRlcCb)->pst),measType); /* L2 MEAS AGHOSH */ - /*RETVALUE(ROK);*/ + /*return ROK;*/ } for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++) @@ -1320,7 +1320,7 @@ U8 measType; } } - RETVALUE(ROK); + return ROK; } #endif /* LTE_L2_MEAS */ @@ -1356,7 +1356,7 @@ KwSapCfg *cfg; /* Validate the protocol parameters */ if((cfg->sapId >= (S16)gCb->genCfg.maxKwuSaps) || (cfg->sapId < 0)) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1371,14 +1371,14 @@ KwSapCfg *cfg; RLOG2(L_ERROR,"RLC Mode [%d] : Invalid kwuSap State [%d]", gCb->genCfg.rlcMode, kwuSapCb->state); /* reconfiguration not allowed */ - RETVALUE(LCM_REASON_RECONFIG_FAIL); + return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ /* Fill the parameters */ KW_FILL_SAP_HELPER(kwuSapCb, cfg, gCb); - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -1414,13 +1414,13 @@ KwSapCfg *cfg; /* Validate config parameters */ if ((cfg->sapId >= KW_MAX_CKWSAPS) || (cfg->sapId < 0) ) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { /* Get Sap control block */ - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif @@ -1431,14 +1431,14 @@ KwSapCfg *cfg; if(ckwSap->state != KW_SAP_NOT_CFG) { RLOG1(L_ERROR,"Invalid kwuSap State [%d]",ckwSap->state); - RETVALUE(LCM_REASON_RECONFIG_FAIL); + return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ /* Fill the parameters */ KW_FILL_SAP_HELPER(ckwSap, cfg, gCb); - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -1475,7 +1475,7 @@ KwSapCfg *cfg; /* Validate the protocol parameters */ if((cfg->sapId >= KW_MAX_UDXSAPS) || (cfg->sapId < 0)) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif /* Get Sap control block */ @@ -1487,7 +1487,7 @@ KwSapCfg *cfg; if(udxDlSap->state != KW_SAP_NOT_CFG) { RLOG1(L_ERROR,"Invalid udxDlSap State [%d]",udxDlSap->state); - RETVALUE(LCM_REASON_RECONFIG_FAIL); + return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1503,7 +1503,7 @@ KwSapCfg *cfg; if(udxUlSap->state != KW_SAP_NOT_CFG) { RLOG1(L_ERROR,"Invalid udxUlSap State [%d]", udxUlSap->state); - RETVALUE(LCM_REASON_RECONFIG_FAIL); + return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1515,7 +1515,7 @@ KwSapCfg *cfg; cmInitTimers(&(udxUlSap->bndTmr), 1); } - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -1553,7 +1553,7 @@ KwSapCfg *cfg; { KWLOGERROR(gCb,ERRCLS_INT_PAR, EKW047, (ErrVal)cfg->sapId, "kwLmmCfgRguSap: Invalid RGU sapId\n"); - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif @@ -1566,7 +1566,7 @@ KwSapCfg *cfg; { RLOG2(L_ERROR,"RLC Mode [%d]: Invalid rguSap State [%d]", gCb->genCfg.rlcMode, rguSap->state); - RETVALUE(LCM_REASON_RECONFIG_FAIL); + return (LCM_REASON_RECONFIG_FAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1579,7 +1579,7 @@ KwSapCfg *cfg; cmInitTimers(&(rguSap->bndTmr), 1); - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -1629,7 +1629,7 @@ KwMngmt *cntrl; break; } - RETVALUE(reason); + return (reason); } /** @@ -1800,7 +1800,7 @@ RlcCb *gCb; RLC_MEM_SET (&(gCb->genSts), 0, sizeof (KwGenSts)); - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -1840,7 +1840,7 @@ KwMngmt *cntrl; if (reason != LCM_REASON_NOT_APPL) { - RETVALUE(reason); + return (reason); } switch(cntrl->t.cntrl.action) @@ -1906,7 +1906,7 @@ KwMngmt *cntrl; break; } } - RETVALUE(reason); + return (reason); } /** @@ -1939,13 +1939,13 @@ KwMngmt *cntrl; #if (ERRCLASS & ERRCLS_INT_PAR) if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { - RETVALUE(LCM_REASON_INVALID_SAP); + return (LCM_REASON_INVALID_SAP); } /* validate SuId */ if((cntrl->t.cntrl.s.sapCntrl.suId < 0) || (cntrl->t.cntrl.s.sapCntrl.suId >= KW_MAX_UDXSAPS)) { - RETVALUE(LCM_REASON_INVALID_SAP); + return (LCM_REASON_INVALID_SAP); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1955,7 +1955,7 @@ KwMngmt *cntrl; if(UDX_SAP.state == KW_SAP_NOT_CFG) { RLOG0(L_ERROR,"udxUlSap not configured yet"); - RETVALUE(LCM_REASON_INVALID_STATE); + return (LCM_REASON_INVALID_STATE); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1973,7 +1973,7 @@ KwMngmt *cntrl; else { /* control request received for an already bound SAP */ - RETVALUE(LCM_REASON_INVALID_STATE); + return (LCM_REASON_INVALID_STATE); } } break; @@ -1985,11 +1985,11 @@ KwMngmt *cntrl; } break; default: - RETVALUE(LCM_REASON_INVALID_ACTION); + return (LCM_REASON_INVALID_ACTION); break; } /* end of switch */ #undef UDX_SAP - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -2027,7 +2027,7 @@ KwMngmt *cntrl; { KWLOGERROR(gCb,ERRCLS_INT_PAR, EKW047, (ErrVal)cntrl->t.cntrl.s.sapCntrl.suId, "kwLmmLSapCntrl: Invalid RGU suId\n"); - RETVALUE(LCM_REASON_INVALID_SAP); + return (LCM_REASON_INVALID_SAP); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ rguSap = (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) ? @@ -2039,7 +2039,7 @@ KwMngmt *cntrl; if(rguSap->state == KW_SAP_NOT_CFG) { RLOG1(L_ERROR,"RLC Mode [%d]:rguSap not configured yet", gCb->genCfg.rlcMode); - RETVALUE(LCM_REASON_INVALID_STATE); + return (LCM_REASON_INVALID_STATE); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2059,7 +2059,7 @@ KwMngmt *cntrl; else { /* control request received for an already bound SAP */ - RETVALUE(LCM_REASON_INVALID_STATE); + return (LCM_REASON_INVALID_STATE); } } break; @@ -2071,11 +2071,11 @@ KwMngmt *cntrl; } break; default: - RETVALUE(LCM_REASON_INVALID_ACTION); + return (LCM_REASON_INVALID_ACTION); break; } /* end of switch */ - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -2110,7 +2110,7 @@ KwKwuSapSta *sta; if ((sta->spId >= (S16)gCb->genCfg.maxKwuSaps)|| (sta->spId < 0)) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif @@ -2121,7 +2121,7 @@ KwKwuSapSta *sta; sta->state = kwSapCb->state; - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -2152,7 +2152,7 @@ KwRguSapSta *sta; /* Validate the protocol parameters */ if((sta->suId >= KW_MAX_RGUSAPS) || (sta->suId < 0)) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif @@ -2160,7 +2160,7 @@ KwRguSapSta *sta; gCb->u.dlCb->rguDlSap[sta->suId].state : gCb->u.ulCb->rguUlSap[sta->suId].state ; - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -2193,12 +2193,12 @@ KwCkwCntSapSta *sta; (sta->spId < 0 ) || (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL)) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif sta->state = gCb->u.ulCb->ckwSap.state; - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } @@ -2233,7 +2233,7 @@ Action action; /* Validate protocol parameters */ if ((action != LKW_ZEROSTS) && (action != LKW_NOZEROSTS)) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } #endif @@ -2244,7 +2244,7 @@ Action action; RLC_MEM_SET (&(gCb->genSts), 0, sizeof (KwGenSts)); } - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -2281,7 +2281,7 @@ Action action; /* Validate protocol parameters */ if (action != LKW_ZEROSTS && action != LKW_NOZEROSTS) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } switch(elmnt) { @@ -2313,7 +2313,7 @@ Action action; ckwSap = &sts->t.sts.s.ckwSap; if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } ckwSap->statMsgs = gCb->u.ulCb->ckwSap.sts.statMsgs; @@ -2325,12 +2325,12 @@ Action action; break; } default: - RETVALUE(LCM_REASON_INVALID_ELMNT); + return (LCM_REASON_INVALID_ELMNT); } SGetDateTime(&sts->t.sts.dt); - RETVALUE(LCM_REASON_NOT_APPL); + return (LCM_REASON_NOT_APPL); } /** @@ -2486,7 +2486,7 @@ Buffer *mBuf; { /* rg005.201 removed SPutSBuf on error */ RLOG0(L_ERROR,"SCpyMsgMsg Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Send Trace Indication to Layer manager */ KwMiLkwTrcInd(&pst, &trc, dstMbuf); @@ -2498,7 +2498,7 @@ Buffer *mBuf; if (SFndLenMsg(mBuf, &bufLen) != ROK) { RLOG0(L_ERROR,"SFndLenMsg Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Check if the recvd buffer size is less than request trace len */ if(bufLen < gCb->trcLen) @@ -2509,7 +2509,7 @@ Buffer *mBuf; != ROK) { RLOG0(L_ERROR,"SCpyMsgMsg Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Send Trace Indication to Layer manager */ @@ -2527,7 +2527,7 @@ Buffer *mBuf; (Void) SPutSMem(KW_GET_MEM_REGION(gCb), KW_GET_MEM_POOL(gCb)); RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2535,19 +2535,19 @@ Buffer *mBuf; if (SCpyMsgFix(mBuf,0,gCb->trcLen,tempBuf,&tempCnt) != ROK) { RLOG0(L_ERROR,"SCpyMsgFix Failed"); - RETVALUE(RFAILED); + return RFAILED; } if (SGetMsg(pst.region, pst.pool, &dstMbuf) != ROK) { RLOG0(L_FATAL,"Memory Allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Copy the tempBuf data to dst mBuf */ if (SCpyFixMsg(tempBuf,dstMbuf,0,gCb->trcLen,&tempCnt) != ROK) { RLOG0(L_ERROR,"SCpyMsgFix Failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Free the memory allocated for tempBuf */ @@ -2562,7 +2562,7 @@ Buffer *mBuf; KwMiLkwTrcInd(&pst, &trc, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -2599,11 +2599,11 @@ Inst inst; if (inst >= MAX_RLC_INSTANCES) { - RETVALUE (RFAILED); + return (RFAILED); } gCb = RLC_GET_RLCCB(inst); cmPrcTmr(&(gCb->kwTqCp), gCb->kwTq, (PFV) kwTmrExpiry); - RETVALUE(ROK); + return ROK; } /* end of kwActvTmr */ diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c index c16865a02..343e20d8c 100755 --- a/src/5gnrrlc/kw_ptli.c +++ b/src/5gnrrlc/kw_ptli.c @@ -229,7 +229,7 @@ SpId spId; /* Service Provider Id */ /* jump to specific primitive depending on configured selector */ (*kwLiRguBndReqMt[post->selector])(post, suId, spId); - RETVALUE(ROK); + return ROK; } /* end of KwLiRguBndReq */ @@ -272,7 +272,7 @@ Reason reason; /* jump to specific primitive depending on configured selector */ (*kwLiRguUbndReqMt[post->selector])(post, spId, reason); - RETVALUE(ROK); + return ROK; } /* end of KwLiRguUbndReq */ @@ -320,13 +320,13 @@ RlcMacData *dlData; SPutStaticBuffer(post->region, post->pool, (Data *) datReq, sizeof(RguDDatReqInfo), 0); - RETVALUE(RFAILED); + return RFAILED; } #else /* jump to specific primitive depending on configured selector */ (*rlcMacSendDlDataOpts[post->selector])(post, spId, dlData); #endif - RETVALUE(ROK); + return ROK; } /* end of KwLiRguDDatReq */ @@ -372,13 +372,13 @@ RlcMacBOStatus *boSta; post->event= EVTRGUDSTARSP; if((kwLiRguStaRspRbuf(post, spId, staRsp)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* jump to specific primitive depending on configured selector */ (*rlcMacSendBOStatusOpts[post->selector])(post, spId, boSta); - RETVALUE(ROK); + return ROK; } /* end of RlcMacSendBOStatus */ @@ -427,7 +427,7 @@ RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq; /* jump to specific primitive depending on configured selector */ (*kwLiRguL2MUlThrpMeasReqMt[post->selector])(post, spId, l2mUlThrpMeasReq); - RETVALUE(ROK); + return ROK; } /* end of KwLiRguL2MUlThrpMeasReq */ @@ -501,7 +501,7 @@ Void; break; } #endif - RETVALUE(ROK); + return ROK; } @@ -583,7 +583,7 @@ Void *staRsp; SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].pktDrop++; ret1 = RFAILED; } - RETVALUE(ret1); + return (ret1); } /* cmPkKwuDatReq */ #endif @@ -622,7 +622,7 @@ Void *datReq; SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].pktDrop++; ret1 = RFAILED; } - RETVALUE(ret1); + return (ret1); } /* cmPkKwuDatReq */ #endif diff --git a/src/5gnrrlc/kw_ptmi.c b/src/5gnrrlc/kw_ptmi.c index 86e380c62..1216fe365 100755 --- a/src/5gnrrlc/kw_ptmi.c +++ b/src/5gnrrlc/kw_ptmi.c @@ -253,7 +253,7 @@ KwMngmt *cfm; /* Layer Management structure */ /* jump to specific primitive depending on configured selector */ (*kwMiRlcConfigCfmMt[pst->selector])(pst, cfm); - RETVALUE(ROK); + return ROK; } @@ -287,7 +287,7 @@ KwMngmt *cfm; /* confirm */ /* jump to specific primitive depending on configured selector */ (*kwMiLkwCntrlCfmMt[pst->selector])(pst, cfm); - RETVALUE(ROK); + return ROK; } /* end of KwMiLkwCntrlCfm */ @@ -326,7 +326,7 @@ KwMngmt *usta; /* unsolicited status */ /* jump to specific primitive depending on configured selector */ (*kwMiLkwStaIndMt[pst->selector])(pst, usta); - RETVALUE(ROK); + return ROK; } /* end of KwMiLkwStaInd */ @@ -364,7 +364,7 @@ KwMngmt *cfm; /* solicited status confirmation */ /* jump to specific primitive depending on configured selector */ (*kwMiLkwStaCfmMt[pst->selector])(pst, cfm); - RETVALUE(ROK); + return ROK; } /* end of KwMiLkwStaCfm */ @@ -405,7 +405,7 @@ KwMngmt *cfm; /* statistics confirmation */ /* jump to specific primitive depending on configured selector */ (*kwMiLkwStsCfmMt[pst->selector])(pst, action, cfm); - RETVALUE(ROK); + return ROK; } /* end of KwMiLkwStsCfm */ @@ -445,7 +445,7 @@ Buffer *mBuf; /* message buffer */ /* jump to specific primitive depending on configured selector */ (*kwMiLkwTrcIndMt[pst->selector])(pst, trc, mBuf); - RETVALUE(ROK); + return ROK; } /* end of KwMiLkwTrcInd */ @@ -469,7 +469,7 @@ KwL2MeasCfmEvt *measEvt; (*KwMiLkwL2MeasCfmMt[pst->selector])(pst, measEvt); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -491,7 +491,7 @@ U8 status; (*KwMiLkwL2MeasStopCfmMt[pst->selector])(pst, measType,status); - RETVALUE(ROK); + return ROK; } #endif /* LTE_L2_MEAS */ @@ -535,7 +535,7 @@ KwMngmt *cfm; /* Layer Management structure */ TRC2(PtMiRlcConfigCfm() : function is not implemented) - RETVALUE(ROK); + return ROK; } /* end of PtMiRlcConfigCfm */ /* @@ -573,7 +573,7 @@ KwMngmt *cfm; /* Layer Management structure */ TRC2(PtMiLkwCntrlCfm() : function is not implemented) - RETVALUE(ROK); + return ROK; } /* end of PtMiLkwCntrlCfm */ @@ -610,7 +610,7 @@ KwMngmt *usta; /* unsolicited status */ TRC2(PtMiLkwStaInd() : function is not implemented) - RETVALUE(ROK); + return ROK; } /* end of PtMiLkwStaInd */ @@ -645,7 +645,7 @@ KwMngmt *cfm; /* solicited status confirmation */ UNUSED(pst); UNUSED(cfm); - RETVALUE(ROK); + return ROK; } /* end of PtMiLkwStaCfm */ @@ -683,7 +683,7 @@ KwMngmt *cfm; /* statistics confirmation */ UNUSED(action); UNUSED(cfm); - RETVALUE(ROK); + return ROK; } /* end of PtMiLkwStsCfm */ @@ -721,7 +721,7 @@ Buffer *mBuf; /* message buffer */ UNUSED(trc); UNUSED(mBuf); - RETVALUE(ROK); + return ROK; } /* end of PtMiLkwTrcInd */ /* kw005.201 added support for L2 Measurement */ @@ -744,7 +744,7 @@ KwL2MeasCfmEvt * measEvt; UNUSED(pst); UNUSED(measEvt); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -768,7 +768,7 @@ U8 status; UNUSED(measType); UNUSED(status); - RETVALUE(ROK); + return ROK; } #endif /* LTE_L2_MEAS */ diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c index 3ccb28591..1d5896854 100755 --- a/src/5gnrrlc/kw_ptui.c +++ b/src/5gnrrlc/kw_ptui.c @@ -291,7 +291,7 @@ U8 status; /* Status */ /* jump to specific primitive depending on configured selector */ (*kwUiKwuBndCfmMt[pst->selector])(pst, suId, status); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuBndCfm */ @@ -335,7 +335,7 @@ Buffer *mBuf; /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatIndMt[pst->selector])(pst, datInd, mBuf); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuDatInd */ @@ -381,7 +381,7 @@ KwuDatCfmInfo *datCfm; /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatCfmMt[pst->selector])(pst, suId, datCfm); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuDatCfm */ @@ -425,7 +425,7 @@ KwuStaIndInfo *staInd; /* jump to specific primitive depending on configured selector */ (*kwUiKwuStaIndMt[pst->selector])(pst, suId, staInd); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuStaInd */ @@ -470,7 +470,7 @@ CmLteRlcId rlcId; /* jump to specific primitive depending on configured selector */ (*kwUiKwuReEstCmpIndMt[pst->selector])(pst, suId, rlcId); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuReEstCmpInd */ /* kw005.201 added support for L2 Measurement */ @@ -512,7 +512,7 @@ KwuDiscSduInfo *discCfm; /* jump to specific primitive depending on configured selector */ (*kwUiKwuDiscSduCfmMt[pst->selector])(pst, suId, discCfm); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuDiscSduCfm */ @@ -554,7 +554,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; /* jump to specific primitive depending on configured selector */ (*kwUiKwuFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlIndInfo); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuFlowCntrlInd */ #ifdef LTE_L2_MEAS @@ -596,7 +596,7 @@ KwuDatAckInfo *datAckInd; /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatAckIndMt[pst->selector])(pst, suId, datAckInd); - RETVALUE(ROK); + return ROK; } /* end of KwUiKwuDatAckInd */ #endif /* LTE_L2_MEAS */ @@ -685,7 +685,7 @@ U8 status; /* Status */ /* jump to specific primitive depending on configured selector */ (*kwUiCkwBndCfmMt[pst->selector])(pst, suId, status); - RETVALUE(ROK); + return ROK; } /* end of KwUiCkwBndCfm */ @@ -729,7 +729,7 @@ RlcCfgCfmInfo *cfmInfo; /* Configuration Confirm */ /* jump to specific primitive depending on configured selector */ (*kwUiRlcCfgCfmMt[pst->selector])(pst, suId, cfmInfo); - RETVALUE(ROK); + return ROK; } /* end of KwUiRlcCfgCfm */ @@ -777,7 +777,7 @@ CmStatus status; /* jump to specific primitive depending on configured selector */ (*kwUiCkwUeIdChgCfmMt[pst->selector])(pst, suId, transId, ueInfo, status); - RETVALUE(ROK); + return ROK; } /* end of KwUiRlcCfgCfm */ @@ -867,7 +867,7 @@ Void; } } - RETVALUE(ROK); + return ROK; } #endif @@ -938,7 +938,7 @@ Void; elmIndx = (Void *)SRngGetRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC); } - RETVALUE(ROK); + return ROK; } @@ -959,7 +959,7 @@ Void; #endif kwUtlFreeDlMem(); #endif - RETVALUE(ROK); + return ROK; } @@ -989,7 +989,7 @@ Void; if((elmIndx = SRngGetRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC)) == NULLP) break; } - RETVALUE(ROK); + return ROK; } diff --git a/src/5gnrrlc/kw_tenb_stats.c b/src/5gnrrlc/kw_tenb_stats.c index ec472a31f..03d759e1b 100755 --- a/src/5gnrrlc/kw_tenb_stats.c +++ b/src/5gnrrlc/kw_tenb_stats.c @@ -159,7 +159,7 @@ PUBLIC TSL2UeStatsCb* TSL2AllocUeStatsBlk(rnti) statsCb->stats.rnti = (U32)rnti; statsCb->inUse = TRUE; - RETVALUE(statsCb); + return (statsCb); } /* @@ -225,7 +225,7 @@ PUBLIC TSL2CellStatsCb* TSL2AllocCellStatsBlk(cellId) printf("\n STATS Unexpected CellID = %d\n", (int)cellId); } - RETVALUE(l2CellStats[cellId-1]); + return (l2CellStats[cellId-1]); } /* diff --git a/src/5gnrrlc/kw_tmr.c b/src/5gnrrlc/kw_tmr.c index 6a7467235..3e189d7e7 100755 --- a/src/5gnrrlc/kw_tmr.c +++ b/src/5gnrrlc/kw_tmr.c @@ -447,7 +447,7 @@ S16 tmrEvnt; } } - RETVALUE(FALSE); + return (FALSE); } /** diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c index f8b9eab1c..a793ed9f6 100755 --- a/src/5gnrrlc/kw_udx.c +++ b/src/5gnrrlc/kw_udx.c @@ -72,7 +72,7 @@ MsgLen size; MsgLen tmpLen; TRC3(cmUnpkUdxStruct) - RETVALUE(SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen)); + return (SCpyMsgFix(srcMBuf,offset,size,dstBuf,&tmpLen)); } /*end of function cmPkUdxBndReq*/ @@ -105,7 +105,7 @@ Buffer *dstMBuf; { TRC3(cmPkUdxStruct) - RETVALUE(SAddPstMsgMult(srcBuf,size,dstMBuf)); + return (SAddPstMsgMult(srcBuf,size,dstMBuf)); } /*end of function cmPkUdxBndReq*/ /* @@ -150,13 +150,13 @@ SpId spId; (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst); CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_BND_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*end of function cmPkUdxBndReq*/ /* @@ -201,13 +201,13 @@ Reason reason; (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPKLOG(SPkS16, reason, mBuf, EUDXXXX, pst); CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_UBND_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*end of function cmPkUdxUbndReq*/ /* @@ -253,13 +253,13 @@ U8 status; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } - CMCHKPKLOG(SPkU8, status, mBuf, EUDXXXX, pst); + CMCHKPKLOG(oduUnpackUInt8, status, mBuf, EUDXXXX, pst); CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_BND_CFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*end of function cmPkUdxBndCfm*/ @@ -305,7 +305,7 @@ RlcCfgInfo *cfgInfo; (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch(pst->selector) @@ -320,7 +320,7 @@ RlcCfgInfo *cfgInfo; } case UDX_SEL_LWLC: { - CMCHKPKLOG(cmPkPtr,(PTR)cfgInfo,mBuf,EUDXXXX,pst); + CMCHKPKLOG(oduPackPointer,(PTR)cfgInfo,mBuf,EUDXXXX,pst); break; } #endif /* LCUDX */ @@ -329,7 +329,7 @@ RlcCfgInfo *cfgInfo; CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_CFG_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkUdxCfgReq */ @@ -375,7 +375,7 @@ RlcCfgCfmInfo *cfgCfmInfo; (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch(pst->selector) @@ -392,7 +392,7 @@ RlcCfgCfmInfo *cfgCfmInfo; } case UDX_SEL_LWLC: { - CMCHKPKLOG(cmPkPtr,(PTR)cfgCfmInfo,mBuf,EUDXXXX,pst); + CMCHKPKLOG(oduPackPointer,(PTR)cfgCfmInfo,mBuf,EUDXXXX,pst); break; } #endif /* LCUDX */ @@ -401,7 +401,7 @@ RlcCfgCfmInfo *cfgCfmInfo; CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_CFG_CFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkUdxCfgCfm */ @@ -452,7 +452,7 @@ CkwUeInfo *newUeInfo; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch(pst->selector) @@ -467,8 +467,8 @@ CkwUeInfo *newUeInfo; } case UDX_SEL_LWLC: { - CMCHKPKLOG(cmPkPtr,(PTR)newUeInfo,mBuf,EUDXXXX,pst); - CMCHKPKLOG(cmPkPtr,(PTR)ueInfo,mBuf,EUDXXXX,pst); + CMCHKPKLOG(oduPackPointer,(PTR)newUeInfo,mBuf,EUDXXXX,pst); + CMCHKPKLOG(oduPackPointer,(PTR)ueInfo,mBuf,EUDXXXX,pst); break; } default: @@ -478,11 +478,11 @@ CkwUeInfo *newUeInfo; } #endif } - CMCHKPKLOG(SPkU32, transId, mBuf, EUDXXXX, pst); + CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst); CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_UEIDCHG_REQ; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkUdxUeIdChgReq */ @@ -530,15 +530,15 @@ CmStatus status; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPK(cmPkCmStatus, &status, mBuf); - CMCHKPKLOG(SPkU32, transId, mBuf, EUDXXXX, pst); + CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst); CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_UEIDCHG_CFM; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkUdxUeIdChgCfm */ @@ -587,7 +587,7 @@ KwUdxBufLst *pStaPdu; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch (pst->selector) @@ -600,15 +600,15 @@ KwUdxBufLst *pStaPdu; } case UDX_SEL_LWLC: { - CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf); - CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); + CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf); + CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); break; } } CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_STA_UPD_CFM; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkUdxStaUpdCfm */ @@ -655,7 +655,7 @@ CmLteRlcId *rlcId; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch (pst->selector) @@ -667,14 +667,14 @@ CmLteRlcId *rlcId; } case UDX_SEL_LWLC: { - CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); + CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); break; } } CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_STA_PHBT_TMR_START; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkUdxStaProhTmrStart */ @@ -723,7 +723,7 @@ KwUdxStaPdu *pStaPdu; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch (pst->selector) @@ -739,15 +739,15 @@ KwUdxStaPdu *pStaPdu; } case UDX_SEL_LWLC: { - CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf); - CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); + CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf); + CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); break; } } CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_STA_UPD_REQ; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkUdxStaUpdReq */ @@ -796,7 +796,7 @@ KwUdxDlStaPdu *pStaPdu; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch (pst->selector) @@ -812,15 +812,15 @@ KwUdxDlStaPdu *pStaPdu; } case UDX_SEL_LWLC: { - CMCHKPK(cmPkPtr,(PTR) pStaPdu, mBuf); - CMCHKPK(cmPkPtr,(PTR) rlcId, mBuf); + CMCHKPK(oduPackPointer,(PTR) pStaPdu, mBuf); + CMCHKPK(oduPackPointer,(PTR) rlcId, mBuf); break; } } CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst); pst->event = (Event) UDX_EVT_STA_PDU_REQ; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkUdxStaUpdReq */ @@ -863,7 +863,7 @@ KwL2MeasReqEvt *measReqEvt; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch (pst->selector) @@ -875,13 +875,13 @@ KwL2MeasReqEvt *measReqEvt; } case UDX_SEL_LWLC: { - CMCHKPK(cmPkPtr,(PTR) measReqEvt, mBuf); + CMCHKPK(oduPackPointer,(PTR) measReqEvt, mBuf); break; } } pst->event = (Event) UDX_EVT_L2MEAS_REQ; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkUdxStaUpdReq */ @@ -923,7 +923,7 @@ U8 measType } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch (pst->selector) @@ -931,13 +931,13 @@ U8 measType case UDX_SEL_LC: case UDX_SEL_LWLC: { - CMCHKPKLOG(SPkU8, measType, mBuf, EUDXXXX, pst); + CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst); break; } } pst->event = (Event) UDX_EVT_L2MEAS_SEND_REQ; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } @@ -979,7 +979,7 @@ U8 measType } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch (pst->selector) @@ -987,13 +987,13 @@ U8 measType case UDX_SEL_LC: case UDX_SEL_LWLC: { - CMCHKPKLOG(SPkU8, measType, mBuf, EUDXXXX, pst); + CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst); break; } } pst->event = (Event) UDX_EVT_L2MEAS_STOP_REQ; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } #endif @@ -1037,7 +1037,7 @@ Buffer *mBuf; CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } /*end of function cmUnpkUdxBndReq*/ /* @@ -1075,7 +1075,7 @@ Buffer *mBuf; CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EUDXXXX, pst); CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EUDXXXX, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } /*end of function cmUnpkUdxUbndReq*/ /* @@ -1111,10 +1111,10 @@ Buffer *mBuf; TRC3(cmUnpkUdxBndCfm) CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst); - CMCHKUNPKLOG(SUnpkU8, &status, mBuf, EUDXXXX, pst); + CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } /*end of function cmUnpkUdxBndCfm*/ @@ -1168,7 +1168,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EUDXXXX, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmUnpkUdxStruct(mBuf,0,(U8 *)&tmpCfgInfo,sizeof(RlcCfgInfo)); @@ -1178,14 +1178,14 @@ Buffer *mBuf; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgInfo, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &cfgInfo, mBuf); break; } #endif /* LCUDX */ } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, cfgInfo)); + return ((*func)(pst, spId, cfgInfo)); } /* cmUnpkUdxCfgReq */ @@ -1240,7 +1240,7 @@ Buffer *mBuf; (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)cfgCfmInfo, sizeof(RlcCfgCfmInfo)); @@ -1251,21 +1251,21 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EUDXXXX, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ break; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgCfmInfo, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &cfgCfmInfo, mBuf); break; } #endif /* LCUDX */ } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, cfgCfmInfo)); + return ((*func)(pst, suId, cfgCfmInfo)); } /* cmUnpkUdxCfgCfm */ /* @@ -1306,7 +1306,7 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, &(spId), mBuf); - CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, EUDXXXX, pst); + CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst); switch(pst->selector) { @@ -1322,8 +1322,8 @@ Buffer *mBuf; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &ueInfo, mBuf); - CMCHKUNPK(cmUnpkPtr,(PTR *) &newUeInfo, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &ueInfo, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &newUeInfo, mBuf); break; } default: @@ -1336,7 +1336,7 @@ Buffer *mBuf; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo)); + return ((*func)(pst, spId, transId, ueInfo, newUeInfo)); } /* cmUnpkUdxUeIdChgReq */ @@ -1376,13 +1376,13 @@ Buffer *mBuf; cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus)); CMCHKUNPK(SUnpkS16, &suId, mBuf); - CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, EUDXXXX, pst); + CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst); CMCHKUNPK(cmUnpkCmStatus, &status, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, status)); + return ((*func)(pst, suId, transId, status)); } /* cmUnpkUdxUeIdChgCfm */ @@ -1428,15 +1428,15 @@ Buffer *mBuf; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf); - CMCHKUNPK(cmUnpkPtr, (PTR *)&pBufLst,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&pBufLst,mBuf); break; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, rlcId, pBufLst)); + return ((*func)(pst, suId, rlcId, pBufLst)); } /* cmUnpkUdxUeIdChgCfm */ @@ -1491,7 +1491,7 @@ Buffer *mBuf; (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmUnpkUdxStruct(mBuf,0,(U8 *)pStaPdu, sizeof(KwUdxStaPdu)); ret1 = cmUnpkUdxStruct(mBuf,sizeof(KwUdxStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId)); @@ -1500,15 +1500,15 @@ Buffer *mBuf; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf); - CMCHKUNPK(cmUnpkPtr, (PTR *)&pStaPdu,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&pStaPdu,mBuf); break; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, rlcId, pStaPdu)); + return ((*func)(pst, spId, rlcId, pStaPdu)); } /* cmUnpkUdxUeIdChgCfm */ @@ -1563,7 +1563,7 @@ Buffer *mBuf; (ErrVal)EUDXXXX, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmUnpkUdxStruct(mBuf,0, (U8 *)pStaPdu, sizeof(KwUdxDlStaPdu)); ret1 = cmUnpkUdxStruct(mBuf,sizeof(KwUdxDlStaPdu),(U8 *)&tmpRlcId,sizeof(CmLteRlcId)); @@ -1572,14 +1572,14 @@ Buffer *mBuf; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf); - CMCHKUNPK(cmUnpkPtr, (PTR *)&pStaPdu,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&pStaPdu,mBuf); break; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, rlcId, pStaPdu)); + return ((*func)(pst, spId, rlcId, pStaPdu)); } /* cmUnpkUdxUeIdChgCfm */ @@ -1627,14 +1627,14 @@ Buffer *mBuf; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr, (PTR *)&rlcId,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&rlcId,mBuf); break; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, rlcId)); + return ((*func)(pst, spId, rlcId)); } /* cmUnpkUdxStaProhTmrStart */ @@ -1679,14 +1679,14 @@ Buffer *mBuf; } case UDX_SEL_LWLC: { - CMCHKUNPK(cmUnpkPtr, (PTR *)&measReqEvt,mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&measReqEvt,mBuf); break; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, measReqEvt)); + return ((*func)(pst, measReqEvt)); } /* cmUnpkUdxL2MeasReq */ /* @@ -1722,14 +1722,14 @@ Buffer *mBuf; case UDX_SEL_LC: case UDX_SEL_LWLC: { - CMCHKUNPK(SUnpkU8, &measType, mBuf); + CMCHKUNPK(oduPackUInt8, &measType, mBuf); break; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, measType)); + return ((*func)(pst, measType)); } /* cmUnpkUdxL2MeasReq */ /* @@ -1765,14 +1765,14 @@ Buffer *mBuf; case UDX_SEL_LC: case UDX_SEL_LWLC: { - CMCHKUNPK(SUnpkU8, &measType, mBuf); + CMCHKUNPK(oduPackUInt8, &measType, mBuf); break; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, measType)); + return ((*func)(pst, measType)); } /* cmUnpkUdxL2MeasStopReq */ #endif #endif /* LCUDX */ diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c index cf29078e1..f2f1ac38e 100755 --- a/src/5gnrrlc/kw_udx_dl.c +++ b/src/5gnrrlc/kw_udx_dl.c @@ -104,7 +104,7 @@ SpId spId; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE(RFAILED); + return RFAILED; } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -166,7 +166,7 @@ SpId spId; } } rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_OK); - RETVALUE(ROK); + return ROK; } @@ -203,7 +203,7 @@ Reason reason; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -219,7 +219,7 @@ Reason reason; KW_GET_AND_VALIDATE_UDXSAP(tRlcCb,udxSap, EKW208, "KwUiDlUdxndReq"); #endif /* ERRCLASS & ERRCLS_INT_PAR */ udxSap->state = KW_SAP_CFG; - RETVALUE(ROK); + return ROK; } @@ -268,7 +268,7 @@ RlcCfgInfo *cfg; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -288,7 +288,7 @@ RlcCfgInfo *cfg; RLOG0(L_FATAL,"Memory Allocation Failed."); /* kw002.201 Freeing from proper region */ /* RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -414,7 +414,7 @@ RlcCfgInfo *cfg; tRlcCb->u.dlCb->udxDlSap[spId].suId, cfgCfm); - RETVALUE(ROK); + return ROK; } /** @@ -459,7 +459,7 @@ CkwUeInfo *newUeInfo; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -485,7 +485,7 @@ CkwUeInfo *newUeInfo; transId, status); - RETVALUE(ROK); + return ROK; } /** @@ -531,7 +531,7 @@ KwUdxDlStaPdu *pStaPdu; pst->pool, pStaPdu, sizeof(KwUdxDlStaPdu)); - RETVALUE(RFAILED); + return RFAILED; } AMDL.cntrlBo = pStaPdu->controlBo; @@ -548,7 +548,7 @@ KwUdxDlStaPdu *pStaPdu; AMDL.pStaPdu = pStaPdu; kwAmmSendDStaRsp(tRlcCb, rbCb, &AMDL); - RETVALUE (ROK); + return (ROK); } /** @@ -590,7 +590,7 @@ KwUdxStaPdu *pStaPdu; { RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found", rlcId->cellId,rlcId->rbId); - RETVALUE(RFAILED); + return RFAILED; } kwAmmDlHndlStatusPdu(tRlcCb, rbCb, pStaPdu); @@ -600,7 +600,7 @@ KwUdxStaPdu *pStaPdu; pStaPdu, sizeof(KwUdxStaPdu)); - RETVALUE(ROK); + return ROK; } #ifdef LTE_L2_MEAS @@ -667,7 +667,7 @@ KwL2MeasReqEvt *measReqEvt; /*stopping Task*/ SStopTask(startTime, PID_RLC_MEAS_START); - RETVALUE(ROK); + return ROK; } /* rlcDlUdxMeasReq */ /** @@ -730,7 +730,7 @@ U8 measType; /*stopping Task*/ SStopTask(startTime, PID_RLC_MEAS_STOP); - RETVALUE(ROK); + return ROK; } /** @brief @@ -778,7 +778,7 @@ U8 measType; } } - RETVALUE(ROK); + return ROK; } #endif /* LTE_L2_MEAS */ diff --git a/src/5gnrrlc/kw_udx_ptdl.c b/src/5gnrrlc/kw_udx_ptdl.c index b4323ac53..ea1cbe298 100755 --- a/src/5gnrrlc/kw_udx_ptdl.c +++ b/src/5gnrrlc/kw_udx_ptdl.c @@ -103,7 +103,7 @@ U8 status; /* Status */ { TRC3(PtDlUdxBndCfm) - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndCfm */ @@ -145,7 +145,7 @@ RlcCfgCfmInfo *cfmInfo; /* Status */ { TRC3(PtDlUdxCfgCfm) - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndCfm */ @@ -187,7 +187,7 @@ CmStatus status; { TRC3(PtDlUdxUeIdChgCfm) - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndCfm */ @@ -202,7 +202,7 @@ KwUdxBufLst *pBufLst ) { TRC3(PtDlUdxStaUpdCfm); - RETVALUE(ROK); + return ROK; } PRIVATE S16 PtDlUdxStaProhTmrStart @@ -213,7 +213,7 @@ CmLteRlcId *rlcId ) { TRC3(PtDlUdxStaProhTmrStart); - RETVALUE(ROK); + return ROK; } #endif @@ -333,7 +333,7 @@ U8 status; /* Status */ /* jump to specific primitive depending on configured selector */ (*rlcDlUdxBndCfmMt[pst->selector])(pst, suId, status); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndCfm */ @@ -378,7 +378,7 @@ RlcCfgCfmInfo *cfmInfo; /* Status */ /* jump to specific primitive depending on configured selector */ (*rlcDlUdxCfgCfmMt[pst->selector])(pst, suId, cfmInfo); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndCfm */ @@ -423,7 +423,7 @@ CmStatus status; /* jump to specific primitive depending on configured selector */ (*rlcDlUdxUeIdChgCfmMt[pst->selector])(pst, suId,transId,status); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndCfm */ @@ -448,7 +448,7 @@ CmLteRlcId *rlcId; /* jump to specific primitive depending on configured selector */ (*rlcDlUdxStaProhTmrStartMt[pst->selector])(pst, suId, rlcId); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndCfm */ diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c index a4154c2d4..0d9d1128e 100755 --- a/src/5gnrrlc/kw_udx_ptul.c +++ b/src/5gnrrlc/kw_udx_ptul.c @@ -81,7 +81,7 @@ SpId spId; /* Status */ { TRC3(PtUlUdxBndReq) - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndReq */ @@ -121,7 +121,7 @@ Reason Reason; /* Status */ { TRC3(PtUlUdxUbndReq) - RETVALUE(ROK); + return ROK; } /* end of PtDlUdxBndReq */ @@ -141,7 +141,7 @@ RlcCfgInfo *cfmInfo; /* Config Info */ { TRC3(PtUlUdxCfgReq) - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxCfgReq */ @@ -166,7 +166,7 @@ CkwUeInfo *newUeInfo; /* Config Info */ TRC3(PtUlUdxUeIdChgReq) - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxCfgReq */ @@ -181,7 +181,7 @@ KwUdxDlStaPdu *pStaPdu { TRC3(PtUlUdxStaPduReq); - RETVALUE(ROK); + return ROK; } /** @@ -215,7 +215,7 @@ KwUdxDlStaPdu *pStaPdu; TRC3(PtUlUdxStaUpdReq); - RETVALUE(ROK); + return ROK; } /* end of RlcUlmDlmStaUpd*/ #ifdef LTE_L2_MEAS @@ -246,7 +246,7 @@ KwL2MeasReqEvt *measReqEvt; TRC3(PtUlUdxL2MeasReq); - RETVALUE(ROK); + return ROK; } /** @@ -276,7 +276,7 @@ U8 status TRC3(PtUlUdxL2MeasSendReq); - RETVALUE(ROK); + return ROK; } /** @@ -306,7 +306,7 @@ U8 status TRC3(PtUlUdxL2MeasStopReq); - RETVALUE(ROK); + return ROK; } #endif #endif @@ -523,7 +523,7 @@ SpId spId; /* Status */ /* jump to specific primitive depending on configured selector */ (*rlcUlUdxBndReqMt[pst->selector])(pst, suId, spId); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndReq */ @@ -566,7 +566,7 @@ Reason Reason; /* Status */ /* jump to specific primitive depending on configured selector */ (*rlcUlUdxUbndReqMt[pst->selector])(pst, spId,reason ); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxBndReq */ @@ -589,7 +589,7 @@ RlcCfgInfo *cfmInfo; /* Config Info */ /* jump to specific primitive depending on configured selector */ (*rlcUlUdxCfgReqMt[pst->selector])(pst, spId, cfmInfo); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxCfgReq */ @@ -616,7 +616,7 @@ CkwUeInfo *newUeInfo; /* Config Info */ /* jump to specific primitive depending on configured selector */ (*rlcUlUdxUeIdChgReqMt[pst->selector])(pst, spId,transId,ueInfo,newUeInfo); - RETVALUE(ROK); + return ROK; } /* end of rlcDlUdxCfgReq */ @@ -632,7 +632,7 @@ KwUdxDlStaPdu *pStaPdu { TRC3(rlcUlUdxStaPduReq); - RETVALUE((*rlcUlUdxStaPduReqMt[pst->selector])(pst,spId, rlcId, pStaPdu)); + return ((*rlcUlUdxStaPduReqMt[pst->selector])(pst,spId, rlcId, pStaPdu)); } /** @@ -666,7 +666,7 @@ KwUdxStaPdu *pStaPdu; TRC3(rlcUlUdxStaUpdReq); - RETVALUE((*rlcUlUdxStaUpdReqMt[pst->selector])(pst,spId, rlcId, pStaPdu)); + return ((*rlcUlUdxStaUpdReqMt[pst->selector])(pst,spId, rlcId, pStaPdu)); } /* end of RlcUlmDlmStaUpd*/ #ifdef LTE_L2_MEAS @@ -697,7 +697,7 @@ KwL2MeasReqEvt *measReqEvt; TRC3(rlcUlUdxStaUpdReq); - RETVALUE((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt)); + return ((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt)); } /* end of rlcUlUdxL2MeasReq*/ /** @@ -727,7 +727,7 @@ U8 measType; TRC3(rlcUlUdxStaUpdReq); - RETVALUE((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType)); + return ((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType)); } /* end of rlcUlUdxMesReq*/ /** @@ -757,7 +757,7 @@ U8 measType; TRC3(rlcUlUdxStaUpdReq); - RETVALUE((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType)); + return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType)); } /* end of rlcUlUdxMesReq*/ #endif /********************************************************************** diff --git a/src/5gnrrlc/kw_udx_ul.c b/src/5gnrrlc/kw_udx_ul.c index b83bfe7c4..3113df8c3 100755 --- a/src/5gnrrlc/kw_udx_ul.c +++ b/src/5gnrrlc/kw_udx_ul.c @@ -120,7 +120,7 @@ U8 status; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE (RFAILED); + return (RFAILED); } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -135,7 +135,7 @@ U8 status; KW_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_STATE); - RETVALUE(RFAILED); + return RFAILED; } if (suId < 0) @@ -144,7 +144,7 @@ U8 status; KW_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_SUID); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -187,7 +187,7 @@ U8 status; /* Send an alarm with proper event and cause */ KW_SEND_SAPID_ALARM(tRlcCb,suId, event, cause); - RETVALUE(ROK); + return ROK; } /** @@ -234,7 +234,7 @@ RlcCfgCfmInfo *cfmInfo; pst->pool, cfmInfo, sizeof(RlcCfgCfmInfo)); - RETVALUE (RFAILED); + return (RFAILED); } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -250,7 +250,7 @@ RlcCfgCfmInfo *cfmInfo; pst->pool, cfmInfo, sizeof(RlcCfgCfmInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -261,7 +261,7 @@ RlcCfgCfmInfo *cfmInfo; pst->pool, cfmInfo, sizeof(RlcCfgCfmInfo)); - RETVALUE (RFAILED); + return (RFAILED); } if(ROK != kwDbmDelUlTransaction(tRlcCb, cfgTmpData)) @@ -270,7 +270,7 @@ RlcCfgCfmInfo *cfmInfo; pst->pool, cfmInfo, sizeof(RlcCfgCfmInfo)); - RETVALUE(RFAILED); + return RFAILED; } /* Allocate memory and memset to 0 for cfmInfo */ RLC_ALLOC(tRlcCb,cfgCfm, sizeof(RlcCfgCfmInfo)); @@ -282,7 +282,7 @@ RlcCfgCfmInfo *cfmInfo; pst->pool, cfmInfo, sizeof(RlcCfgCfmInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ kwHdlCrlcUlCfgReq(tRlcCb,cfgTmpData, cfmInfo, cfgCfm); @@ -299,7 +299,7 @@ RlcCfgCfmInfo *cfmInfo; RLC_PST_FREE(pst->region, pst->pool, cfgTmpData->cfgInfo, sizeof(RlcCfgInfo)); RLC_FREE(tRlcCb,cfgTmpData,sizeof(RlcUlCfgTmpData)); - RETVALUE(ROK); + return ROK; } /** @@ -342,7 +342,7 @@ CmStatus status; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE (RFAILED); + return (RFAILED); } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -353,19 +353,19 @@ CmStatus status; if (suId < 0) { RLOG0(L_ERROR, "Invalid suId"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ if(ROK != kwDbmFindUlTransaction(tRlcCb, transId, &cfgTmpData)) { RLOG0(L_ERROR, "Invalid transId"); - RETVALUE (RFAILED); + return (RFAILED); } if(ROK != kwDbmDelUlTransaction(tRlcCb, cfgTmpData)) { - RETVALUE(RFAILED); + return RFAILED; } if(status.status == CKW_CFG_CFM_OK) @@ -382,7 +382,7 @@ CmStatus status; interface or by he receipient in case of tight coupling */ RLC_PST_FREE(pst->region, pst->pool, cfgTmpData->newUeInfo, sizeof(CkwUeInfo)); RLC_FREE_WC(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData)); - RETVALUE(ROK); + return ROK; } /** @@ -409,7 +409,7 @@ CmLteRlcId *rlcId #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE (RFAILED); + return (RFAILED); } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -419,13 +419,13 @@ CmLteRlcId *rlcId { RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found", rlcId->cellId,rlcId->rbId); - RETVALUE(RFAILED); + return RFAILED; } /* Start staProhTmr */ kwStartTmr(tRlcCb,(PTR)rbCb, KW_EVT_AMUL_STA_PROH_TMR); - RETVALUE (ROK); + return (ROK); } /** @@ -593,7 +593,7 @@ RlcCfgCfmInfo *cfgCfm; cfgCfm->cellId = cfg->cellId; cfgCfm->numEnt = cfg->numEnt; - RETVALUE(ROK); + return ROK; } #ifdef __cplusplus } diff --git a/src/5gnrrlc/kw_uim.c b/src/5gnrrlc/kw_uim.c index adf01c37f..549ed1d56 100755 --- a/src/5gnrrlc/kw_uim.c +++ b/src/5gnrrlc/kw_uim.c @@ -119,7 +119,7 @@ SpId spId; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -162,7 +162,7 @@ SpId spId; RLOG0(L_ERROR, "CKW SAP already Bound"); KwUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_NOK); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -176,13 +176,13 @@ SpId spId; LCM_CAUSE_INV_STATE); #endif /* ERRCLASS & ERRCLS_INT_PAR */ KwUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_NOK); - RETVALUE(RFAILED); + return RFAILED; break; } } KwUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_OK); - RETVALUE(ROK); + return ROK; } @@ -225,7 +225,7 @@ Reason reason; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -245,7 +245,7 @@ Reason reason; /* disable upper sap (CKW) */ tRlcCb->u.ulCb->ckwSap.state = KW_SAP_CFG; - RETVALUE(ROK); + return ROK; } /** @@ -288,7 +288,7 @@ RlcCfgInfo *cfg; if (pst->dstInst >= MAX_RLC_INSTANCES) { RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); - RETVALUE(RFAILED); + return RFAILED; } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -298,7 +298,7 @@ RlcCfgInfo *cfg; if (cfgTmpData == NULLP) { RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); - RETVALUE(RFAILED); + return RFAILED; } cfgTmpData->uprLyrTransId = cfg->transId; /*Save User TransId*/ @@ -312,13 +312,13 @@ RlcCfgInfo *cfg; RLOG0(L_ERROR, "Addition to UL transId Lst Failed"); RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); - RETVALUE(RFAILED); + return RFAILED; } rlcUlHdlCfgReq(tRlcCb, cfgTmpData, cfg); rlcUlUdxCfgReq(&(KW_GET_UDX_SAP(tRlcCb)->pst),KW_GET_UDX_SAP(tRlcCb)->spId,cfg); - RETVALUE(ROK); + return ROK; } /** @@ -419,7 +419,7 @@ CkwUeInfo *newUeInfo; { RLC_FREE(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData)); } - RETVALUE(RFAILED); + return RFAILED; } if(ROK != rlcCfgValidateUeIdChng(tRlcCb,ueInfo,newUeInfo,cfgTmpData)) @@ -434,7 +434,7 @@ CkwUeInfo *newUeInfo; ueInfo, newUeInfo); - RETVALUE(ROK); + return ROK; } @@ -628,7 +628,7 @@ SpId spId; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RETVALUE(RFAILED); + return RFAILED; } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); @@ -640,7 +640,7 @@ SpId spId; { RLOG0(L_ERROR,"Invalid spId"); KW_SEND_SAPID_ALARM(tRlcCb,spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_SAP); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -683,7 +683,7 @@ SpId spId; RLOG1(L_ERROR,"RLC Mode [%d] : KWU SAP already Bound", tRlcCb->genCfg.rlcMode); KwUiKwuBndCfm(&(kwuSap->pst), kwuSap->suId, CM_BND_NOK); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -699,11 +699,11 @@ SpId spId; LCM_CAUSE_INV_STATE); #endif /* ERRCLASS & ERRCLS_INT_PAR */ KwUiKwuBndCfm(&(kwuSap->pst), kwuSap->suId, CM_BND_NOK); - RETVALUE(RFAILED); + return RFAILED; } } KwUiKwuBndCfm(&(kwuSap->pst), kwuSap->suId, CM_BND_OK); - RETVALUE(ROK); + return ROK; } @@ -749,7 +749,7 @@ Reason reason; (spId >= (S16) rlcCb[pst->dstInst]->genCfg.maxKwuSaps) || (spId < 0)) { - RETVALUE (RFAILED); + return (RFAILED); } #endif @@ -766,7 +766,7 @@ Reason reason; kwuSap->state = KW_SAP_CFG; - RETVALUE(ROK); + return ROK; } /** @@ -811,7 +811,7 @@ Buffer *mBuf; if(pst->dstInst >= MAX_RLC_INSTANCES) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -825,7 +825,7 @@ Buffer *mBuf; datReq->rlcId.cellId,datReq->rlcId.rbId); RLC_FREE_BUF(mBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Dispatch according to mode of the rbCb */ @@ -841,7 +841,7 @@ Buffer *mBuf; sizeof(KwuDatReqInfo)); RLC_FREE_BUF(mBuf); - RETVALUE(RFAILED); + return RFAILED; } kwTmmQSdu(tRlcCb,rbCb, datReq, mBuf); @@ -864,7 +864,7 @@ Buffer *mBuf; break; } } - RETVALUE(ret); + return (ret); } @@ -901,7 +901,7 @@ KwuDiscSduInfo *discSdu; #endif { RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, discSdu, sizeof(KwuDiscSduInfo)); - RETVALUE(ROK); + return ROK; } /********************************************************************30** diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c index 5fdd20a0d..72b6301bd 100755 --- a/src/5gnrrlc/kw_ul_ex_ms.c +++ b/src/5gnrrlc/kw_ul_ex_ms.c @@ -90,7 +90,7 @@ PUBLIC S16 rlcUlInitExt() { TRC2(rlcUlInitExt); - RETVALUE(ROK); + return ROK; } /* kwInitExt */ @@ -144,18 +144,18 @@ Reason reason; /* reason */ if (inst >= MAX_RLC_INSTANCES) { /* intance greater than MAX instances */ - RETVALUE(RFAILED); + return RFAILED; } if (rlcCb[inst] != NULLP) { - RETVALUE (RFAILED); + return (RFAILED); } if (SGetSBuf(region, 0, (Data **)&tRlcCb, (Size)sizeof (RlcCb)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Initialize rlcCb */ @@ -183,7 +183,7 @@ Reason reason; /* reason */ TSL2AllocStatsMem(tRlcCb->init.region, tRlcCb->init.pool); #endif - RETVALUE(ROK); + return ROK; } /* rlcUlActvInit */ @@ -278,7 +278,7 @@ Buffer *mBuf; /* message buffer */ #endif #endif /* LCLKW */ default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_FATAL,"Received Invalid Event[%d] from SM", @@ -323,7 +323,7 @@ Buffer *mBuf; /* message buffer */ #endif /* LCCKW */ default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RLC UL", @@ -375,7 +375,7 @@ Buffer *mBuf; /* message buffer */ } #endif /* LCKWU */ default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RRC", @@ -406,7 +406,7 @@ Buffer *mBuf; /* message buffer */ } default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from PDCP", @@ -439,7 +439,7 @@ Buffer *mBuf; /* message buffer */ #endif /* LCRGU */ default: - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from MAC", @@ -458,7 +458,7 @@ Buffer *mBuf; /* message buffer */ case KWU_EVT_TTI_IND: { rlcUlBatchProc(); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } } @@ -478,14 +478,14 @@ Buffer *mBuf; /* message buffer */ tRlcCb = RLC_GET_RLCCB(pst->dstInst); TSL2SendStatsToApp(&(tRlcCb->genCfg.lmPst), 0); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } default: { printf("\n ERROR Invalid Event[%d] from CL to PDCPUL\n", pst->event); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } } @@ -499,14 +499,14 @@ Buffer *mBuf; /* message buffer */ { RLOG1(L_ERROR, "Received Invalid Source Entity[%d]",pst->event); } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; break; } } - SExitTsk(); + ODU_EXIT_TASK(); - RETVALUE(ret); + return (ret); } /* kwActvTsk */ diff --git a/src/5gnrrlc/kw_umm_ul.c b/src/5gnrrlc/kw_umm_ul.c index 3761777a7..ab849f4d8 100755 --- a/src/5gnrrlc/kw_umm_ul.c +++ b/src/5gnrrlc/kw_umm_ul.c @@ -690,7 +690,7 @@ KwUmHdr *umHdr; rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } #else SRemPreMsg(dst,pdu); @@ -711,7 +711,7 @@ KwUmHdr *umHdr; "SRemPreMsgMult Failed for 10 bits SN UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } #else SRemPreMsgMult(dst,2,pdu); @@ -741,7 +741,7 @@ KwUmHdr *umHdr; "SRemPreMsgMult Failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } #else SRemPreMsgMult(dst,2,pdu); @@ -754,7 +754,7 @@ KwUmHdr *umHdr; "Received LI as 0 UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } totalSz += umHdr->li[umHdr->numLi]; if ( pduSz <= totalSz ) @@ -770,7 +770,7 @@ KwUmHdr *umHdr; pduSz, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); /* the situation where in the PDU size + return RFAILED; /* the situation where in the PDU size is something that does not match with the size in LIs*/ } @@ -793,7 +793,7 @@ KwUmHdr *umHdr; "SRemPreMsg Failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } #else SRemPreMsg(dst,pdu); @@ -807,7 +807,7 @@ KwUmHdr *umHdr; "Received LI as 0 UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RETVALUE(RFAILED); + return RFAILED; } totalSz += umHdr->li[umHdr->numLi]; pduSz--; @@ -815,7 +815,7 @@ KwUmHdr *umHdr; if (pduSz < totalSz) { - RETVALUE(RFAILED); /* the situation where in the PDU size is + return RFAILED; /* the situation where in the PDU size is something that does not match with the size in LIs*/ } @@ -826,9 +826,9 @@ KwUmHdr *umHdr; if (e) { /* PDU was constructed with LIs that exceeded KW_MAX_LI */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** diff --git a/src/5gnrrlc/kw_utl_dl.c b/src/5gnrrlc/kw_utl_dl.c index f8cd11730..09d0bbeac 100755 --- a/src/5gnrrlc/kw_utl_dl.c +++ b/src/5gnrrlc/kw_utl_dl.c @@ -248,7 +248,7 @@ RguDDatReqInfo *datReqInfo; if ( datReqInfo == NULLP ) { RLOG0(L_FATAL,"Memory allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -287,7 +287,7 @@ RguDDatReqInfo *datReqInfo; post->pool, datReqInfo, sizeof(RguDDatReqInfo)); - RETVALUE(ROK); + return ROK; }/* End of KwLiRguDDatReq */ /** @@ -359,7 +359,7 @@ KwDStaIndInfo *staIndInfo; { RLOG_ARG0(L_FATAL,DBG_CELLID,staIndInfo->cellId, "Memory allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ for(idx = 0; idx < staIndInfo->nmbOfUeGrantPerTti; idx++) @@ -549,7 +549,7 @@ KwDStaIndInfo *staIndInfo; rguSap = &(gCb->u.dlCb->rguDlSap[suId]); //Debug KwLiRguDDatReq(&rguSap->pst,rguSap->spId,datReqInfo); - RETVALUE(ROK); + return ROK; } /** @@ -600,7 +600,7 @@ U32 staPduBo; && (!staPduPrsnt) && ((CM_LTE_MODE_AM == rbCb->mode ) && (AMDL.nxtRetx == NULLP))) { rbCb->boUnRprtdCnt++; - RETVALUE(ROK); + return ROK; } #endif @@ -625,7 +625,7 @@ U32 staPduBo; RlcMacSendBOStatus(&rguSap->pst,rguSap->spId,&boStatus); - RETVALUE(ROK); + return ROK; } /** @@ -831,7 +831,7 @@ RlcDlRbCb *rbCb; { TRC2(rlcDlUtlSetReestInProgressForRB) - RETVALUE(rbCb->reestInProgress); + return (rbCb->reestInProgress); } /** @@ -1198,7 +1198,7 @@ U32 *toBeFreed } if(*toBeFreed == 0) { - RETVALUE(TRUE); + return (TRUE); } #ifndef LTE_TDD @@ -1238,14 +1238,14 @@ U32 *toBeFreed if(*toBeFreed == 0) { - RETVALUE(TRUE); + return (TRUE); } if(gCb->u.dlCb->shutdownReceived) { (*toBeFreed)--; } - RETVALUE(FALSE);; + return (FALSE);; } /** @@ -1409,7 +1409,7 @@ S16 kwUtlL2MeasDlInit(RlcCb *gCb) gCb->u.dlCb->kwL2Cb.kwL2EvtCb[KW_L2MEAS_UU_LOSS].measCb.measType= LKW_L2MEAS_UU_LOSS; gCb->u.dlCb->kwL2Cb.kwL2EvtCb[KW_L2MEAS_ACT_UE].measCb.measType= LKW_L2MEAS_ACT_UE; - RETVALUE(ROK); + return ROK; } /** * @@ -1617,7 +1617,7 @@ RlcDlRbCb *rbCb; (Data **)&curL2MeasTb, (Size)sizeof(KwL2MeasTb)) != ROK) { - RETVALUE(NULLP); + return (NULLP); } rbCb->ueCb->l2MeasTbCb[rbCb->ueCb->tbIdx] = curL2MeasTb; /* Initialize the Meas Tb details */ @@ -1633,7 +1633,7 @@ RlcDlRbCb *rbCb; curL2MeasTb->lchInfo[idx].numSdus = 0; } } - RETVALUE(curL2MeasTb); + return (curL2MeasTb); } @@ -1696,14 +1696,14 @@ U8 tbIdx; ret = ROK; if(hqStaInd->tbId[tbIdx] >= KW_INVALID_TBID) { - RETVALUE(ROK); + return ROK; } /* Find the L2 measurement tbCb to process DL Ip thruput*/ l2MeasTb = ueCb->l2MeasTbCb[hqStaInd->tbId[tbIdx]]; if(l2MeasTb == NULLP) { - RETVALUE(ROK); + return ROK; } /* For each logical channel in the tbCb, process * and get the DL IP thruput */ @@ -1847,7 +1847,7 @@ U8 tbIdx; /*stopping Task*/ SStopTask(startTime, PID_RLC_DLIP_TPT_PRCHARQIND); - RETVALUE(ret); + return (ret); }/* end of kwUtlProcHarqInd */ /** @@ -2008,7 +2008,7 @@ KwL2MeasEvtCb *measEvtCb; } /* Fix Klock warning */ KwMiLkwL2MeasCfm(&gCb->genCfg.lmPst, &measCfmEvt); - RETVALUE(ROK); + return ROK; } /* kwUtlSndL2MeasCfm */ /** * @@ -2043,7 +2043,7 @@ KwL2MeasCfmEvt *measCfmEvt; TRC3(kwUtlSndDlL2MeasNCfm) KwMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt); - RETVALUE(ROK); + return ROK; } /* kwUtlSndL2MeasNCfm */ /** * @@ -2428,11 +2428,11 @@ KwSn sn; txBuf = (KwTx *) node->node; if(txBuf->sn == sn) { - RETVALUE(txBuf); + return (txBuf); } CM_LLIST_NEXT_NODE(txBufLstCp, node); } - RETVALUE(NULLP); + return (NULLP); } /* kwUtlStoreTxBuf */ /** * diff --git a/src/5gnrrlc/kw_utl_ul.c b/src/5gnrrlc/kw_utl_ul.c index b4742a422..50ece8017 100755 --- a/src/5gnrrlc/kw_utl_ul.c +++ b/src/5gnrrlc/kw_utl_ul.c @@ -138,7 +138,7 @@ KwDatIndInfo *datIndInfo; } } - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS @@ -196,7 +196,7 @@ KwDatIndInfo *datIndInfo; #endif } } - RETVALUE(ROK); + return ROK; } /** @@ -249,7 +249,7 @@ Buffer *sdu; rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_FREE_BUF(sdu); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -269,7 +269,7 @@ Buffer *sdu; KwUiKwuDatInd(&gCb->genCfg.lmPst, datIndInfo, sdu); #endif - RETVALUE(ROK); + return ROK; } /* kwUtlSndDatInd */ @@ -386,7 +386,7 @@ S16 kwUtlL2MeasUlInit(RlcCb *gCb) cmMemset((U8 *)&(gCb->u.ulCb->kwL2Cb.kwL2EvtCb[cntr]), 0, sizeof(KwL2MeasEvtCb)); } gCb->u.ulCb->kwL2Cb.kwL2EvtCb[KW_L2MEAS_UL_IP].measCb.measType = LKW_L2MEAS_UL_IP; - RETVALUE(ROK); + return ROK; } /** * @@ -571,13 +571,13 @@ KwL2MeasEvtCb *measEvtCb; } measEvtCb->val.nonIpThMeas.measCb.numSamples--; kwStartTmr(gCb, (PTR)measEvtCb, KW_EVT_L2_TMR); - RETVALUE(ROK); + return ROK; } #endif kwUtlSndUlL2MeasCfm(gCb, measEvtCb); - RETVALUE(ROK); + return ROK; } /* kwUtlHdlL2TmrExp */ /** * @@ -683,7 +683,7 @@ KwL2MeasEvtCb *measEvtCb; measCfmEvt.val.ipThMeas.numUes = cfmIdx; } KwMiLkwL2MeasCfm(&gCb->genCfg.lmPst, &measCfmEvt); - RETVALUE(ROK); + return ROK; } /* kwUtlSndUlL2MeasCfm */ /** * @@ -720,7 +720,7 @@ KwL2MeasCfmEvt *measCfmEvt; TRC3(kwUtlSndUlL2MeasNCfm) KwMiLkwL2MeasCfm(&gCb->genCfg.lmPst, measCfmEvt); - RETVALUE(ROK); + return ROK; } /* kwUtlSndL2MeasNCfm */ #ifdef LTE_L2_MEAS_RLC @@ -786,7 +786,7 @@ U8 *numLCh; measCfmEvt->measType = measType; measCfmEvt->status.status = LCM_PRIM_NOK; measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE; - RETVALUE(RFAILED); + return RFAILED; } /*User can either request for Active UE,* *Dl delay, Dl discard, Uu Loss OR Dl ip throughput, Ul ip throughput. */ @@ -799,7 +799,7 @@ U8 *numLCh; measCfmEvt->measType = measType; measCfmEvt->status.status = LCM_PRIM_NOK; measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE; - RETVALUE(RFAILED); + return RFAILED; } /* Check for total maximum number of Measurement Control Block */ @@ -809,7 +809,7 @@ U8 *numLCh; measCfmEvt->measType = measType; measCfmEvt->status.status = LCM_PRIM_NOK; measCfmEvt->status.reason = LKW_CAUSE_EXCEED_NUMMEAS; - RETVALUE(RFAILED); + return RFAILED; } /* Check that number of samples should be a non-zero value */ @@ -820,7 +820,7 @@ U8 *numLCh; measCfmEvt->measType = measType; measCfmEvt->status.status = LCM_PRIM_NOK; measCfmEvt->status.reason = LKW_CAUSE_ZERO_NUMSAM; - RETVALUE(RFAILED); + return RFAILED; } /* Check that measurement period should be completely divisible * * number of sample. */ @@ -832,7 +832,7 @@ U8 *numLCh; measCfmEvt->measType = measType; measCfmEvt->status.status = LCM_PRIM_NOK; measCfmEvt->status.reason = LKW_CAUSE_INVALID_NUMSAM; - RETVALUE(RFAILED); + return RFAILED; } { numQci = measReqEvt->measReq.val.nonIpThMeas.numQci; @@ -857,7 +857,7 @@ U8 *numLCh; measCfmEvt->status.reason = LKW_CAUSE_INVALID_QCI; measCfmEvt->measType = measType; measCfmEvt->transId = measReqEvt->transId; - RETVALUE(RFAILED); + return RFAILED; } { for(qciIdx = 0; qciIdx < numQci; qciIdx++) @@ -876,10 +876,10 @@ U8 *numLCh; if(measCfmEvt->val.nonIpThMeas.numCfm > 0) { measCfmEvt->transId = measReqEvt->transId; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* kwUtlValidateL2Meas */ #endif @@ -911,7 +911,7 @@ KwL2MeasCfmEvt *measCfmEvt; measCfmEvt->measType = measType; measCfmEvt->status.status = LCM_PRIM_NOK; measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE; - RETVALUE(RFAILED); + return RFAILED; } /*User can either request for Active UE,* *Dl delay, Dl discard, Uu Loss OR Dl ip throughput, Ul ip throughput. */ @@ -924,9 +924,9 @@ KwL2MeasCfmEvt *measCfmEvt; measCfmEvt->measType = measType; measCfmEvt->status.status = LCM_PRIM_NOK; measCfmEvt->status.reason = LKW_CAUSE_INVALID_MEASTYPE; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* kwUtlValidateL2Meas */ /** @@ -1144,11 +1144,11 @@ KwSn sn; recBuf = (KwAmRecBuf *) node->node; if(recBuf->amHdr.sn == sn) { - RETVALUE(recBuf); + return (recBuf); } CM_LLIST_NEXT_NODE(recBufLstCp, node); } - RETVALUE(NULLP); + return (NULLP); } /* kwUtlStoreRecBuf */ /** * diff --git a/src/5gnrrlc/mac_stub.c b/src/5gnrrlc/mac_stub.c index 9b2fb092b..da96e98ae 100644 --- a/src/5gnrrlc/mac_stub.c +++ b/src/5gnrrlc/mac_stub.c @@ -23,7 +23,7 @@ uint8_t rlcDatSn = 0; uint64_t ulDatNum = 0; -PUBLIC S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta) +PUBLIC uint8_t macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta) { Pst rspPst; RlcMacSchedRepInfo *schRep; @@ -59,7 +59,7 @@ PUBLIC S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta) } -PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) +PUBLIC uint8_t macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) { U32 availmem; @@ -69,7 +69,7 @@ PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) DU_LOG("\nMAC_STUB : Received DL data from RLC to be sent to PHY"); - SPutMsg(dlData->pduInfo[0].pduBuf); + ODU_PUT_MSG(dlData->pduInfo[0].pduBuf); dlData->pduInfo[0].pduBuf = NULL; #if 0 @@ -84,7 +84,7 @@ PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) #endif ulData = dlData; - SGetMsg(pst->region, pst->pool, &mBuf); + ODU_GET_MSG(pst->region, pst->pool, &mBuf); macStubBuildUlData(mBuf); ulData->pduInfo[0].pduBuf = mBuf; @@ -110,7 +110,7 @@ void macStubBuildUlData(Buffer *mBuf) int datSize = 30; U32 availmem; - SAddPstMsgMult((Data *)data, datSize, mBuf); + ODU_ADD_POST_MSG_MULT((Data *)data, datSize, mBuf); /* filling IPv4 header */ CmIpv4Hdr ipv4Hdr; @@ -183,9 +183,9 @@ void macStubBuildUlData(Buffer *mBuf) revPkArray[idx] = pkArray[CM_IPV4_HDRLEN - idx -1]; /* this function automatically reverses revPkArray */ - ret = SAddPreMsgMult(revPkArray, (MsgLen)cnt, mBuf); + ret = ODU_ADD_PRE_MSG_MULT(revPkArray, (MsgLen)cnt, mBuf); - SAddPreMsgMult((Data *)&rlcDatSn, sizeof(uint8_t), mBuf); + ODU_ADD_PRE_MSG_MULT((Data *)&rlcDatSn, sizeof(uint8_t), mBuf); #if 0 SRegInfoShow(0, &availmem); SRegInfoShow(1, &availmem); diff --git a/src/5gnrrlc/mac_stub.h b/src/5gnrrlc/mac_stub.h index b729196d7..9b0da1d32 100644 --- a/src/5gnrrlc/mac_stub.h +++ b/src/5gnrrlc/mac_stub.h @@ -31,8 +31,8 @@ #define DU_IP_V4_ADDR "192.168.130.81" #define CU_IP_V4_ADDR "192.168.130.82" -S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta); -S16 macStubSendDlData(Pst *post, SpId spId, RlcMacData *dlData); +uint8_t macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta); +uint8_t macStubSendDlData(Pst *post, SpId spId, RlcMacData *dlData); void macStubBuildUlData(Buffer *mBuf); #endif /* __MAC_STUB_H__ */ diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c index d1f9fa73b..cee0dd6b2 100755 --- a/src/5gnrsch/rg_sch.c +++ b/src/5gnrsch/rg_sch.c @@ -129,7 +129,7 @@ RgMngmt *cntrl; /* control structure */ { RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Memory Unavailable for Confirmation"); SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); - RETVALUE(ROK); + return ROK; } */ cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); @@ -151,7 +151,7 @@ RgMngmt *cntrl; /* control structure */ RgMiLrgSchCntrlCfm(&cfmPst, &cfm); RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Gen Cfg not done."); /* SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); */ - RETVALUE(ROK); + return ROK; } /* General Config done, process the Control request */ @@ -173,7 +173,7 @@ RgMngmt *cntrl; /* control structure */ break; } /* SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); */ - RETVALUE(ret); + return (ret); }/*-- RgMiLrgSchCntrlReq --*/ #ifdef LTE_L2_MEAS @@ -245,7 +245,7 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_INSTID,inst, "Meas req Failed.Invalid Cell Id errType(%d) errCause(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } /* Validate for Meas Types */ if ( (ret = rgSCHUtlValidateMeasReq(cell, measInfo, &err)) != ROK) @@ -256,7 +256,7 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Meas req Failed.Invalid Measurement Type" "errCasue(%d) errType(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } /* Iterate through all meas requests in l2mList in cellCb */ #if (ERRCLASS & ERRCLS_ADD_RES) @@ -274,7 +274,7 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Meas req Failed.Dublicate TransId" "errType(%d) errCause(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -288,9 +288,9 @@ PUBLIC S16 RgMiLrgSchL2MeasReq(pst, measInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Meas req Failed.errType(%d) errCause(%d)", err.errType, err.errCause); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* -- RRgMiLrgSchL2MeasReq-- */ /** @@ -345,7 +345,7 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) { RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, "Stop req Failed.Invalid Cell Id "); - RETVALUE(RFAILED); + return RFAILED; } cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); node = cell->l2mList.first; @@ -376,7 +376,7 @@ PUBLIC S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) RgMiLrgSchL2MeasStopCfm(&(rgSchCb[cell->instIdx].rgSchInit.lmPst), &measCfm); } - RETVALUE(ret); + return (ret); }/*RgMiLrgSchL2MeasStopReq*/ /** * @brief Layer Manager L2 Measurement request handler. @@ -428,7 +428,7 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) { RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, "Send req Failed.Invalid Cell Id"); - RETVALUE(RFAILED); + return RFAILED; } if(measInfo->measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL) @@ -448,7 +448,7 @@ PUBLIC S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) cell->sndL2Meas = TRUE; } - RETVALUE(ret); + return (ret); }/*RgMiLrgSchL2MeasSendReq*/ #endif /* LTE_L2_MEAS */ @@ -552,7 +552,7 @@ PUBLIC S16 RgUiRgrBndReq(pst, suId, spId) #endif ret = RgUiRgrBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgrBndReq */ /** @@ -608,7 +608,7 @@ PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason) (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgrUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -618,9 +618,9 @@ PUBLIC S16 RgUiRgrUbndReq(pst, spId, reason) (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP Id:RgUiRgrUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgrUbndReq */ #ifdef RGR_SI_SCH @@ -677,7 +677,7 @@ RgrSiCfgReqInfo *cfgReqInfo; RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " "is NULL"); rgSCHUtlRgrSiCfgCfm(instId, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } if (spId < rgSchCb[instId].numSaps) @@ -692,7 +692,7 @@ RgrSiCfgReqInfo *cfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); rgSCHUtlRgrSiCfgCfm(instId, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -705,7 +705,7 @@ RgrSiCfgReqInfo *cfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); rgSCHUtlRgrSiCfgCfm(instId, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -731,10 +731,10 @@ else { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"RgUiRgrSiCfgReq:" "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgrSiCfgReq */ @@ -792,7 +792,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " "is NULL"); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, 0, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } if (spId < rgSchCb[instId].numSaps) @@ -810,7 +810,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -826,7 +826,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; sizeof(RgrWarningSiCfgReqInfo)); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, warningSiCfgReqInfo->siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -849,10 +849,10 @@ else { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -907,7 +907,7 @@ U8 siId; (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgrWarningSiStopReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -917,13 +917,13 @@ U8 siId; (ErrVal)rgSchCb[instId].rgrSap[spId].sapCfg.spId, "Invalid SAP Id:RgUiRgrWarningSiStopReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } rgSCHGomHndlWarningSiStopReq(pst->region, pst->pool, &rgSchCb[instId], siId, transId, spId); - RETVALUE(ROK); + return ROK; } #endif /*RGR_SI_SCH */ @@ -980,7 +980,7 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " "is NULL"); - RETVALUE(RFAILED); + return RFAILED; } if (spId < rgSchCb[instId].numSaps) @@ -994,7 +994,7 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -1006,7 +1006,7 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(RFAILED); + return RFAILED; } /* Handle configuration */ @@ -1017,10 +1017,10 @@ PUBLIC S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Configuration Request Handling Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgrLoadInfReq */ /* LTE_ADV_FLAG_REMOVED_END */ @@ -1078,7 +1078,7 @@ RgInfDedBoRpt *boRpt; /* Handle Cell fetch failure */ RGSCHLOGERROR(inst, ERRCLS_INT_PAR,ERG009,(ErrVal)boRpt->cellId, "rgMacSchDedBoUpdtReq(): Invalid cell Id"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1090,7 +1090,7 @@ RgInfDedBoRpt *boRpt; #ifdef LTE_ADV if (cell != ue->cell) { - RETVALUE(RFAILED); + return RFAILED; } #endif if ((dlLc = rgSCHDbmGetDlDedLcCb(ue, boRpt->lcId)) != NULLP) @@ -1156,10 +1156,10 @@ RgInfDedBoRpt *boRpt; dlLc->setMaxDlPrio = boRpt->setMaxDlPrio; /* Update the scheduler */ rgSCHUtlDlDedBoUpd(cell, ue, dlLc); - RETVALUE(ROK); + return ROK; } } - RETVALUE(RFAILED); + return RFAILED; } /* end of rgMacSchDedBoUpdtReq */ @@ -1205,7 +1205,7 @@ RgInfCmnBoRpt *boRpt; { RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,"RgMacSchCmnBoUpdtReq():" "Invalid boRpt cell Id:%d",boRpt->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* handle status response on CCCH */ @@ -1220,7 +1220,7 @@ RgInfCmnBoRpt *boRpt; rgSCHUtlHndlBcchPcchBoUpdt(cell, boRpt); } - RETVALUE(ROK); + return ROK; } /* end of RgMacSchCmnBoUpdtReq */ /*Fix: start: Inform UE delete to scheduler*/ /** @@ -1261,7 +1261,7 @@ RgInfUeDelInd *ueDelInd; if (rgSchCb[inst].rgrSap == NULLP || rgSchCb[inst].rgrSap[cellSapId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,ueDelInd->cellId,"rgrSap or cell is not configured"); - RETVALUE(ROK); + return ROK; } cell = rgSchCb[inst].rgrSap[cellSapId].cell; #ifndef NO_ERRCLS @@ -1271,7 +1271,7 @@ RgInfUeDelInd *ueDelInd; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgMacSchUeDelInd(): Invalid ueDelInd cell Id:%d", ueDelInd->cellId); - RETVALUE(ROK); + return ROK; } #endif @@ -1305,7 +1305,7 @@ RgInfUeDelInd *ueDelInd; "Guard Pool:%ld", ueDelInd->rnti, cell->rntiDb.rntiGuardPool.count); } - RETVALUE(ROK); + return ROK; } /* rgMacSchUeDelInd */ /*Fix: end: Inform UE delete to scheduler*/ /** @@ -1409,7 +1409,7 @@ RgInfSfDatInd *subfrmInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Received MSG3 with CRNTI:%d and also CCCH ", datInd->ceInfo.ces.cRnti); - RETVALUE(RFAILED); + return RFAILED; } ue = rgSCHDbmGetUeCb (cell, datInd->ceInfo.ces.cRnti); if (ue == NULLP) @@ -1422,7 +1422,7 @@ RgInfSfDatInd *subfrmInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Received MSG3 " "with CRNTI:%d unable to find ueCb", datInd->ceInfo.ces.cRnti); - RETVALUE(RFAILED); + return RFAILED; } if ((ret = rgSCHUtlProcMsg3 (subfrmInfo, cell, ue, @@ -1432,7 +1432,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Processing for MSG3 failed for CRNTI:%d", datInd->rnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -1479,7 +1479,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Processing for MSG3 failed for CRNTI:%d", datInd->rnti); - RETVALUE(RFAILED); + return RFAILED; } /* fix */ CM_LLIST_NEXT_NODE(lnkLst, tmp); @@ -1499,7 +1499,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the UE CB for CRNTI:%d", datInd->rnti); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -1563,7 +1563,7 @@ RgInfSfDatInd *subfrmInfo; err.errType = RGSCHERR_TOM_DATIND; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to handle Data" " Indication for UEID:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } CM_LLIST_NEXT_NODE(lnkLst, tmp); @@ -1578,7 +1578,7 @@ RgInfSfDatInd *subfrmInfo; /* chk if Sch needs to dealloc datInd after unpk */ RGSCH_FREE_MEM(subfrmInfo); - RETVALUE(ret); + return (ret); } /* rgMacSchSfRecpInd */ #ifdef LTEMAC_SPS @@ -1628,16 +1628,16 @@ RgInfSpsRelInfo *relInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "No Ue exists with CRNTI:%d",relInfo->cRnti); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHUtlSpsRelInd(cell, ue, relInfo->isExplRel)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "RelInd processing for CRNTI:%d failed",relInfo->cRnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of RgMacSchSpsRelInd */ #endif /* LTEMAC_SPS */ @@ -1703,7 +1703,7 @@ RgInfL2MeasCfm *measCfm; { RLOG_ARG0(L_ERROR,DBG_CELLID,measCfm->cellId, "Meas Cfm Failed.Invalid Cell Id"); - RETVALUE(RFAILED); + return RFAILED; } @@ -1721,7 +1721,7 @@ RgInfL2MeasCfm *measCfm; } if ( measCb == NULLP ) { - RETVALUE( RFAILED ); + return ( RFAILED ); } @@ -1744,7 +1744,7 @@ RgInfL2MeasCfm *measCfm; schMeasCfm.hdr.transId = measCfm->transId; schMeasCfm.cellId = measCfm->cellId; RgMiLrgSchL2MeasCfm(&(instCb->rgSchInit.lmPst), &schMeasCfm); - RETVALUE(ROK); + return ROK; } for(idx = 0; idx < measCfm->u.prbCfm.numQci; idx++) { @@ -1767,7 +1767,7 @@ RgInfL2MeasCfm *measCfm; measCb->avgPrbQciUl.numQci = measCfm->u.prbCfm.numQci; measCb->cfmRcvd = TRUE; cell->sndL2Meas = TRUE; - RETVALUE(ROK); + return ROK; } /* end of RgMacSchL2MeasCfm */ /** @@ -1814,7 +1814,7 @@ RgInfL2MeasCfm *measCfm; schMeasCfm.hdr.transId = measCfm->transId; schMeasCfm.cellId = measCfm->cellId; RgMiLrgSchL2MeasStopCfm(&(instCb->rgSchInit.lmPst), &schMeasCfm); - RETVALUE(ROK); + return ROK; } #endif @@ -1861,7 +1861,7 @@ U8 status; if(suId >= rgSchCb[instId].numSaps) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Incorrect SuId"); - RETVALUE(RFAILED); + return RFAILED; } /* Lets validate suId first */ tfuSap = &(rgSchCb[instId].tfuSap[suId]); @@ -1870,10 +1870,10 @@ U8 status; { RLOG_ARG2(L_ERROR,DBG_INSTID,instId, "Incorrect SuId. Configured (%d)" "Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHLmmBndCfm (pst, suId, status); - RETVALUE(ret); + return (ret); } /* RgLiTfuSchBndCfm */ /** @@ -1918,19 +1918,19 @@ TfuRaReqIndInfo *raReqInd; RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"SAP Validation failed SuId(%d)", suId); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(raReqInd); - RETVALUE(ret); + return (ret); } if(raReqInd == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"Invalid input pointer for raReqInd Failed"); - RETVALUE(RFAILED); + return RFAILED; } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,raReqInd->cellId,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomRaReqInd(rgSchCb[inst].tfuSap[suId].cell, raReqInd); @@ -1938,7 +1938,7 @@ TfuRaReqIndInfo *raReqInd; RGSCH_FREE_MEM(raReqInd); /*SPutSBuf (pst->region, pst->pool, (Data *)raReqInd, sizeof(TfuRaReqIndInfo)); */ - RETVALUE(ret); + return (ret); } /* RgLiTfuRaReqInd */ /** @@ -1982,7 +1982,7 @@ TfuUlCqiIndInfo *ulCqiInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) @@ -1990,12 +1990,12 @@ TfuUlCqiIndInfo *ulCqiInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomUlCqiInd (rgSchCb[inst].tfuSap[suId].cell, ulCqiInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuUlCqiInd */ /** @@ -2039,18 +2039,18 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(pucchDeltaPwr); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomPucchDeltaPwrInd (rgSchCb[inst].tfuSap[suId].cell, pucchDeltaPwr); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(pucchDeltaPwr); - RETVALUE(ret); + return (ret); } /* RgLiTfuPucchDeltaPwrInd */ @@ -2097,13 +2097,13 @@ TfuHqIndInfo *harqAckInd; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); RGSCH_FREE_MEM(harqAckInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2111,7 +2111,7 @@ TfuHqIndInfo *harqAckInd; ret = rgSCHTomHarqAckInd (rgSchCb[inst].tfuSap[suId].cell, harqAckInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(harqAckInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuHqInd */ @@ -2157,20 +2157,20 @@ TfuSrIndInfo *srInd; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"() SAP Validation failed"); RGSCH_FREE_MEM(srInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"RgLiTfuSrInd()No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* Now call the TOM (Tfu ownership module) primitive to process further */ ret = rgSCHTomSrInd (rgSchCb[inst].tfuSap[suId].cell, srInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(srInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuSrInd */ @@ -2216,18 +2216,18 @@ TfuDlCqiIndInfo *dlCqiInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(dlCqiInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomDlCqiInd (rgSchCb[inst].tfuSap[suId].cell, dlCqiInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(dlCqiInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuDlCqiInd */ #ifdef TFU_UPGRADE @@ -2274,19 +2274,19 @@ TfuRawCqiIndInfo *rawCqiInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(rawCqiInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst," No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif ret = rgSCHTomRawCqiInd (rgSchCb[inst].tfuSap[suId].cell, rawCqiInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(rawCqiInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuRawCqiInd */ /** @@ -2331,18 +2331,18 @@ TfuSrsIndInfo *srsInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(srsInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomSrsInd (rgSchCb[inst].tfuSap[suId].cell, srsInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(srsInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuSrsInd */ #endif @@ -2389,18 +2389,18 @@ TfuDoaIndInfo *doaInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(doaInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHTomDoaInd (rgSchCb[inst].tfuSap[suId].cell, doaInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(doaInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuDlCqiInd */ /** @@ -2446,13 +2446,13 @@ gettimeofday(&start6, NULL); { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); RGSCH_FREE_MEM(crcInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2463,7 +2463,7 @@ gettimeofday(&start6, NULL); #ifdef XEON_SPECIFIC_CHANGES gettimeofday(&end6, NULL); #endif - RETVALUE(ret); + return (ret); } /* RgLiTfuCrcInd */ /** @@ -2507,19 +2507,19 @@ TfuTimingAdvIndInfo *timingAdvInd; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(timingAdvInd); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } /* Now call the TOM (Tfu ownership module) primitive to process further */ ret = rgSCHTomTimingAdvInd(rgSchCb[inst].tfuSap[suId].cell, timingAdvInd); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(timingAdvInd); - RETVALUE(ret); + return (ret); } /* RgLiTfuTimingAdvInd */ /************* RGM Interface ****************/ @@ -2621,7 +2621,7 @@ SpId spId; #endif ret = RgUiRgmBndCfm(&tmpPst, suId, CM_BND_NOK); } - RETVALUE(ret); + return (ret); } /* RgUiRgmBndReq */ /** @@ -2677,7 +2677,7 @@ Reason reason; (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, "Invalid SAP State: RgUiRgmUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else @@ -2687,9 +2687,9 @@ Reason reason; (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, "Invalid SAP Id:RgUiRgmUbndReq failed\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* RgUiRgmUbndReq */ @@ -2749,7 +2749,7 @@ RgmPrbRprtCfg *prbRprtCfg; /* ccpu00134393 : mem leak fix */ SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); - RETVALUE(ROK); + return ROK; } /** * @brief ERROR INDICATION from PHY for the i failed unlicensed Scell transmission. @@ -2797,13 +2797,13 @@ TfuErrIndInfo *errInd; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); - RETVALUE(ret); + return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2811,7 +2811,7 @@ TfuErrIndInfo *errInd; /* Now call the TOM (Tfu ownership module) primitive to process further */ ret = rgSCHLaaErrInd(rgSchCb[inst].tfuSap[suId].cell, errInd); #endif - RETVALUE(ret); + return (ret); } /* RgLiTfuErrInd */ diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c index af66f6f80..41003e636 100755 --- a/src/5gnrsch/rg_sch_cfg.c +++ b/src/5gnrsch/rg_sch_cfg.c @@ -501,7 +501,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(inst, (rgSchPBuf(inst), "Validation for scheduler related " "config failed\n")); - RETVALUE(RFAILED); + return RFAILED; } RLOG1(L_INFO, "MIMO_DBG:: SCH:: numAntPorts=%d\n",schedEnbCfg->numTxAntPorts); @@ -511,7 +511,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(inst, (rgSchPBuf(inst),"Invalid number of transmit antenna" " ports %d\n", schedEnbCfg->numTxAntPorts)); - RETVALUE(RFAILED); + return RFAILED; } /* Validate csg access mode */ @@ -519,13 +519,13 @@ RgSchErrInfo *errInfo; (schedEnbCfg->accsMode > RGR_CELL_ACCS_HYBRID)) { RGSCHDBGERR(inst, (rgSchPBuf(inst), "Invalid CSG Access mode\n")); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; RGSCHDBGINFO(inst, (rgSchPBuf(inst), "RGR SCHED ENB config validation done:"\n)); - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrSchedEnbCfg */ /** @@ -577,28 +577,28 @@ RgSchErrInfo *errInfo; if ((U8 *)cell != NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Cell Id already exists"); - RETVALUE(RFAILED); + return RFAILED; } if(cellCfg->macInst >= SCH_INST_START) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid MAC Instance %d ", cellCfg->macInst); - RETVALUE(RFAILED); + return RFAILED; } if (cellCfg->macRnti.startRnti < RGSCH_MIN_MAC_RNTI ) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid start RNTI %d for cell ", cellCfg->macRnti.startRnti); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCellSchCfg(inst, cellCfg)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for scheduler related " "config failed"); - RETVALUE(RFAILED); + return RFAILED; } if ((cellCfg->dlHqCfg.maxDlHqTx < RGSCH_MIN_HQ_TX) || @@ -607,14 +607,14 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid Downlink HARQ configuration:" " maxDlHqTx %d maxMsg4HqTx %d", cellCfg->dlHqCfg.maxDlHqTx, cellCfg->dlHqCfg.maxMsg4HqTx); - RETVALUE(RFAILED); + return RFAILED; } if ((cellCfg->cfiCfg.cfi < RGSCH_MIN_CFI_VAL) || (cellCfg->cfiCfg.cfi > RGSCH_MAX_CFI_VAL)) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid CFI configuration %d", cellCfg->cfiCfg.cfi); - RETVALUE(RFAILED); + return RFAILED; } if (((cellCfg->puschSubBand.subbandStart) + ((cellCfg->puschSubBand.numSubbands -1) * cellCfg->puschSubBand.size)) @@ -625,7 +625,7 @@ RgSchErrInfo *errInfo; cellCfg->puschSubBand.subbandStart, cellCfg->puschSubBand.numSubbands, cellCfg->puschSubBand.size, cellCfg->bwCfg.ulTotalBw); - RETVALUE(RFAILED); + return RFAILED; } if (((cellCfg->bwCfg.dlTotalBw < RGSCH_MIN_DL_BW) || @@ -636,13 +636,13 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid Bandwidth configuration:" " ul %d dl %d",cellCfg->bwCfg.ulTotalBw, cellCfg->bwCfg.dlTotalBw); - RETVALUE(RFAILED); + return RFAILED; } if (cellCfg->phichCfg.ngEnum > RGR_NG_TWO) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid PHICH Ng configuration %d", (U8)cellCfg->phichCfg.ngEnum); - RETVALUE(RFAILED); + return RFAILED; } /* Validation for extended PHICH Duration */ if ((cellCfg->phichCfg.isDurExtend == TRUE) && @@ -651,7 +651,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid cfi value for" "Extended PHICH duration cfi:%d dlBw:%d", (U8)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); - RETVALUE(RFAILED); + return RFAILED; } if ((cellCfg->phichCfg.isDurExtend == TRUE) && (cellCfg->bwCfg.dlTotalBw > 10) && (cellCfg->cfiCfg.cfi < 3)) @@ -659,7 +659,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid cfi value for" "Extended PHICH duration cfi:%d dlBw:%d", (U8)cellCfg->cfiCfg.cfi, cellCfg->bwCfg.dlTotalBw); - RETVALUE(RFAILED); + return RFAILED; } RLOG4(L_INFO,"CA_DBG:: PUCCH configuration:" " N2_RB %d N1_PUCCH %d deltaShift %d cyclicShift %d", @@ -682,27 +682,27 @@ RgSchErrInfo *errInfo; cellCfg->pucchCfg.n1PucchAn, cellCfg->pucchCfg.deltaShift, cellCfg->pucchCfg.cyclicShift); - RETVALUE(RFAILED); + return RFAILED; } if (cellCfg->srsCfg.isSrsCfgSetup && cellCfg->srsCfg.srsBwEnum > RGR_SRS_BWCFG_7) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid SRS configuration: " " srsBw %d", (U8)cellCfg->srsCfg.srsBwEnum); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCellRACfg(inst, cellCfg)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for Random access related" "config failed"); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCellPwrCfg(inst, cellCfg, errInfo)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for cell power " "config failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate the common logical channel configuration */ @@ -711,13 +711,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid number(%d) of common logical" "channels in cell config", cellCfg->numCmnLcs); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCmnLcCfg(inst, cellCfg, errInfo)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for common logical" "channels failed"); - RETVALUE(RFAILED); + return RFAILED; } /* Added 0 as a valid value for number of TICKs RRM @@ -728,7 +728,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for SI" "configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif /*RGR_SI_SCH */ @@ -742,7 +742,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid" "Subframe configuration"); - RETVALUE(RFAILED); + return RFAILED; } #endif /*ccpu00116923 - ADD - Srs Present support - End*/ @@ -755,7 +755,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid txPower offset "); - RETVALUE(RFAILED); + return RFAILED; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -767,7 +767,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "DSFR is enbaled" "Without enabling SFR"); - RETVALUE(RFAILED); + return RFAILED; } if ((rgSCHCfgVldtRgrCellLteAdvCfg(inst, &(cellCfg->rgrLteAdvCfg), @@ -775,14 +775,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for LTE Adv" "configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV if ((rgSCHCfgVldtRgrCellLteLAACfg(inst, cellCfg)) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Validation for LTE LAA" "configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTE_ADV_FLAG_REMOVED_END */ @@ -790,7 +790,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid" "msg4pAVal %u", cellCfg->msg4pAVal); - RETVALUE(RFAILED); + return RFAILED; } /* Validate RgrCellCsgParamCfg */ @@ -801,7 +801,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(inst, (rgSchPBuf(inst), "Validation failed for \n" "Access CSG parameter failed\n")); - RETVALUE(RFAILED); + return RFAILED; } } #ifdef EMTC_ENABLE @@ -810,12 +810,12 @@ RgSchErrInfo *errInfo; if(ROK != rgSCHCfgVldtRgrEmtcCellCfg(cellCfg)) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid EMTC cell Configuration %d for cell" ,cellCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } } #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellCfg */ /** @@ -859,15 +859,15 @@ RgrSchedCfg *rgSchedCfg; { RGSCHDBGERR(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Invalid \ UL scheduler type %d \n", rgSchedCfg->ulSchdType)); - RETVALUE(RFAILED); + return RFAILED; } if (rgSchedCfg->dlSchdType > (RGSCH_NUM_SCHEDULERS - 1)) { RGSCHDBGERR(inst, (rgSchPBuf(inst), "rgSCHCfgVldtRgrSchCfg:Invalid \ DL scheduler type %d \n", rgSchedCfg->dlSchdType)); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** * @brief Validates the scheduler related configuration request from RRM to MAC. @@ -909,10 +909,10 @@ RgrCellCfg *cellCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid dlfs scheduler type %d for cell", cellCfg->dlfsSchdType); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /** * @brief Validates the RACH related configuration request from RRM to MAC. @@ -972,7 +972,7 @@ RgrCellCfg *cellCfg; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid numRaPreamble %d sizeRaPreambleGrpA %d", cellCfg->rachCfg.numRaPreamble, cellCfg->rachCfg.sizeRaPreambleGrpA); - RETVALUE(RFAILED); + return RFAILED; } /* RACHO */ /* verify that the ded Preambles cfgd for Pdcch Order @@ -991,7 +991,7 @@ RgrCellCfg *cellCfg; RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId,"Invalid RACH Preambleset conf:" "preambleSet Start %d preambleSet Size %d", cellCfg->macPreambleSet.start, cellCfg->macPreambleSet.size); - RETVALUE(RFAILED); + return RFAILED; } #ifdef RGR_V1 if(cellCfg->rachCfg.contResTmr) @@ -1027,11 +1027,11 @@ RgrCellCfg *cellCfg; Then return fail*/ RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Contention Resolution timer is configured as '0'"); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -1082,7 +1082,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Cell does not exist %d", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* RACHO: * Check configured preamble id not colliding with non dedicated or PDCCH @@ -1092,14 +1092,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Preamble Id configuration" "failed ",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Check if Ue already configured */ if (rgSCHDbmGetUeCb(*cell, ueCfg->crnti) != NULLP) { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d UEID already exists", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate Transmission UE modes */ if ((ueCfg->txMode.pres == TRUE) && ((ueCfg->txMode.txModeEnum < RGR_UE_TM_1) @@ -1107,7 +1107,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid transmission mode for" " UE is %d", ueCfg->cellId,(U8)ueCfg->txMode.txModeEnum); - RETVALUE(RFAILED); + return RFAILED; } /* Validate UE Category */ @@ -1115,7 +1115,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid category for UE %d", ueCfg->cellId,(U8)ueCfg->ueCatEnum); - RETVALUE(RFAILED); + return RFAILED; } /* Validate UE Access Stratum Release */ @@ -1123,7 +1123,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid Access Stratum Release %u for UE\n", ueCfg->accessStratumRls)); - RETVALUE(RFAILED); + return RFAILED; } RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "Configured Access Stratum Release %u\n", \ ueCfg->accessStratumRls)); @@ -1136,7 +1136,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid transmission mode for" " UE (%d) for the configured Cell Antenna Ports",ueCfg->cellId, (U8)ueCfg->txMode.txModeEnum); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1144,7 +1144,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti, "CELLID:%d Invalid CQI Mode configuration", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate Max Uplink HARQ transmission value */ @@ -1152,21 +1152,21 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid Uplink HARQ config for " "UE %d",ueCfg->cellId,ueCfg->ueUlHqCfg.maxUlHqTx); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUePwrCfg(*cell, &ueCfg->ueUlPwrCfg) != ROK) { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid PUSCH Group power" " configuration",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUeMeasGapAckNakRepCfg(*cell, ueCfg) != ROK) { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid MeasGap/AckNackRep" " configuration",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -1178,7 +1178,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid SPS RNTI " " in DL SPS Config",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } if (ueCfg->ueSpsCfg.dlSpsCfg.isDlSpsEnabled) @@ -1187,7 +1187,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid DL SPS configuration" " for the UE",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -1197,7 +1197,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid Periodic CQI/SR/SRS" "configuration",ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1206,7 +1206,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid DRX configuration", ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00117452 - MOD - Changed macro name from @@ -1216,7 +1216,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid numColltdCqiRept," "MAX supported %d",RGR_CQIRPTS_MAXN,ueCfg->cellId); - RETVALUE(RFAILED); + return RFAILED; } #endif /* End of RGR_CQI_REPT */ @@ -1228,12 +1228,12 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CRNTI,ueCfg->crnti,"CELLID:%d Invalid EMTC UE configurationfor crnti:%d", ueCfg->cellId, ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeCfg */ @@ -1289,7 +1289,7 @@ RgSchErrInfo *errInfo; ((*cell)->cellId != cellRecfg->cellId)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Cell control block does not exist"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate recieved values */ @@ -1300,7 +1300,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Downlink HARQ configuration:" " maxDlHqTx %d maxMsg4HqTx %d", cellRecfg->dlHqRecfg.maxDlHqTx, cellRecfg->dlHqRecfg.maxMsg4HqTx); - RETVALUE(RFAILED); + return RFAILED; } if ((cellRecfg->recfgTypes & RGR_CELL_CFI_RECFG) && ((cellRecfg->cfiRecfg.cfi < RGSCH_MIN_CFI_VAL) || @@ -1308,7 +1308,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid CFI configuration %d", cellRecfg->cfiRecfg.cfi); - RETVALUE(RFAILED); + return RFAILED; } if (cellRecfg->recfgTypes & RGR_CELL_PUCCH_RECFG) { @@ -1326,7 +1326,7 @@ RgSchErrInfo *errInfo; cellRecfg->pucchRecfg.n1PucchAn, cellRecfg->pucchRecfg.deltaShift, cellRecfg->pucchRecfg.cyclicShift); - RETVALUE(RFAILED); + return RFAILED; } } if (cellRecfg->recfgTypes & RGR_CELL_SRS_RECFG) @@ -1335,7 +1335,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid SRS configuration: " "srsBw %d", (U8)cellRecfg->srsRecfg.srsBwEnum); - RETVALUE(RFAILED); + return RFAILED; } /*ccpu00116923 - ADD - Srs Present support - Start*/ @@ -1347,7 +1347,7 @@ RgSchErrInfo *errInfo; #endif { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Subframe configuration "); - RETVALUE(RFAILED); + return RFAILED; } #endif /*ccpu00116923 - ADD - Srs Present support - End*/ @@ -1374,7 +1374,7 @@ RgSchErrInfo *errInfo; "numRaPreamble %d sizeRaPreambleGrpA %d", cellRecfg->rachRecfg.numRaPreamble, cellRecfg->rachRecfg.sizeRaPreambleGrpA); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1385,7 +1385,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Validation for SI" "Re-configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } } #endif /*RGR_SI_SCH */ @@ -1405,7 +1405,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"DSFR is enbaled" "Without enabling SFR"); - RETVALUE(RFAILED); + return RFAILED; } } if ((rgSCHCfgVldtRgrCellLteAdvCfg(inst, &(cellRecfg->rgrLteAdvCfg), @@ -1413,7 +1413,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Validation for Lte Adv" "Re-configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } } /* LTE_ADV_FLAG_REMOVED_END */ @@ -1425,17 +1425,17 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Configuration " "of minimum DL resources for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } if (cellRecfg->csgParamCfg.minUlResNonCsg > 100) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Invalid Configuration " "of minimum UL resources for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellRecfg */ #ifdef LTE_ADV @@ -1504,7 +1504,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]SCellIdx :Memomy allocation " "Failed while Adding SCell Information\n", idx)); - RETVALUE(RFAILED); + return RFAILED; } @@ -1561,7 +1561,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists")); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } if(TRUE == sCellInfoCfg->txMode.pres) @@ -1614,7 +1614,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]SCellIdx ACQI Cfg" "failed..n\n", idx)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } } /* Configuring PCQI */ @@ -1627,7 +1627,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]SCellIdx PCQI Cfg failed..n\n", idx)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1641,7 +1641,7 @@ RgSchErrInfo *err; if (ROK != rgSCHLaaInitDlRbAllocCb(secCellCb, &sCellInfo->dlAllocCb)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* Initialize Harq entity */ @@ -1652,7 +1652,7 @@ RgSchErrInfo *err; RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]UEID:Hq Entity Initialization " "failed in config\n", ue->ueId)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE rgSCHEmtcHqPAlloc(secCellCb, sCellInfo->hqEnt); @@ -1665,7 +1665,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Spec Sched DL UE CFG FAILED\n")); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD @@ -1675,7 +1675,7 @@ RgSchErrInfo *err; "Failed while UE related Ack Nack Information\n", ue->ueId)); rgSCHSCellFreeBuf (inst,ue,ueRecfg,idx); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTE_TDD */ @@ -1699,7 +1699,7 @@ RgSchErrInfo *err; ue->ul.ctrlOnServCellIdx[idx] = 0xFF; } /* Trigger SCell addition to primary MAC */ - RETVALUE(ROK); + return ROK; } /* rgSCHSCellCfgUeCfg */ /*f1b_Sprint */ @@ -1795,7 +1795,7 @@ RgSchErrInfo *err; RLOG1(L_ERROR,"Wrong PUCCH Format:%d configured for CA",ue->uciFrmtTyp); } - RETVALUE(ROK); + return ROK; } /* rgSCHSCellCfgUePucchReCfg */ /** @@ -1856,7 +1856,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid number of SCELL " " in SCELL Recfg\n")); - RETVALUE(RFAILED); + return RFAILED; } for(U8 idx = 0; idx < ueRecfg->ueSCellCfgInfo.numSCells; idx++) @@ -1865,14 +1865,14 @@ RgSchErrInfo *errInfo; if(ROK != rgSchUtlVldtCellId(inst, ueSCellDedCfg->sCellId)) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCellId is out of range")); - RETVALUE(RFAILED); + return RFAILED; } /* Validate existence of sec cell */ sCell = rgSchUtlGetCellCb(inst, ueSCellDedCfg->sCellId); if(NULLP == sCell ) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists")); - RETVALUE(RFAILED); + return RFAILED; } /* validate the range of serv cell index */ @@ -1881,7 +1881,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", ueSCellDedCfg->sCellIdx)); - RETVALUE(RFAILED); + return RFAILED; } /* Is this sec cell alredy confiured */ @@ -1889,7 +1889,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Secll with id %d already added\n", ueSCellDedCfg->sCellIdx)); - RETVALUE(RFAILED); + return RFAILED; } /* Validate CQI config params */ @@ -1897,7 +1897,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid CQI Mode " " configuration for Ue %d\n",ue->ueId)); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TFU_UPGRADE /* 1. Validate UE Aperiodic CQI related parameters */ @@ -1907,7 +1907,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(sCell->instIdx, (rgSchPBuf(sCell->instIdx), "rgSCHCfgVldtCqiSrSrsUeCfg: Invalid Aperiodic CQI configuration\n")); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_HDFDD @@ -1923,7 +1923,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(sCell->instIdx, (rgSchPBuf(sCell->instIdx), "rgSCHCfgVldtCqiSrSrsUeCfg: Invalid Periodic CQI configuration\n")); - RETVALUE(RFAILED); + return RFAILED; } if((ueSCellDedCfg->txMode.txModeEnum < RGR_UE_TM_1) || @@ -1931,7 +1931,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCELL Invalid transmission mode for" " UE %d\n", (U8)ueSCellDedCfg->txMode.txModeEnum)); - RETVALUE(RFAILED); + return RFAILED; } #endif } @@ -1939,7 +1939,7 @@ RgSchErrInfo *errInfo; errInfo->errCause = RGSCHERR_NONE; RGSCHDBGINFO(inst, (rgSchPBuf(inst), "RGR Ue SCell Reconfig validation done: " "cellId %d oldUeId %d\n", ueRecfg->cellId, ue->ueId)); - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeSCellRecfg */ /** @@ -2021,7 +2021,7 @@ RgrUeRecfg *ueRecfg; #endif } } - RETVALUE(ROK); + return ROK; } #endif /* LTE_ADV */ /** @@ -2079,7 +2079,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId, "Cell does not exist for OLD CRNTI:%d",ueRecfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Old Ue */ @@ -2087,7 +2087,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"OLD CRNTI:%d does not exist", ueRecfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV @@ -2097,10 +2097,10 @@ RgSchErrInfo *errInfo; if ( ret != ROK) { RGSCHDBGERR(inst,(rgSchPBuf(inst), "Ue SCell Recfg Validation FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } #endif @@ -2110,7 +2110,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"NEW CRNTI:%d already exists", ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2119,7 +2119,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UE ID [%d] invalid CSG Membership reconfig :%d ", ueRecfg->newCrnti, (U8)ueRecfg->csgMmbrSta); - RETVALUE(RFAILED); + return RFAILED; } /* Validate values */ if ((ueRecfg->ueRecfgTypes & RGR_UE_TXMODE_RECFG) && @@ -2129,7 +2129,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid transmission mode %d" "for NEW CRNTI:%d", (U8)ueRecfg->txMode.txModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifndef TFU_UPGRADE if ((ueRecfg->ueRecfgTypes & RGR_UE_PRD_DLCQI_RECFG) && @@ -2139,7 +2139,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid Periodic CQI INFO" "OLD CRNTI:%d NEW CRNTI:%d",(U8)ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif if ((ueRecfg->ueRecfgTypes & RGR_UE_ULHARQ_RECFG) && @@ -2147,7 +2147,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid Uplink HARQ config %d" "for NEW CRNTI:%d", ueRecfg->ueUlHqRecfg.maxUlHqTx,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifndef TFU_UPGRADE if ((ueRecfg->ueRecfgTypes & RGR_UE_PRD_DLCQI_RECFG) && @@ -2155,7 +2155,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid periodic mode config for" " DL CQI %d NEW CRNTI:%d", (U8)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #else if ((ueRecfg->ueRecfgTypes & RGR_UE_PCQI_RECFG) && @@ -2163,7 +2163,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid periodic mode config for " "DL CQI %d for NEW CRNTI:%d",(U8)ueRecfg->cqiCfg.cqiSetup.prdModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif /* TFU_UPGRADE */ /* Validate UE Category */ @@ -2171,7 +2171,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid category %d for NEW CRNTI:%d", (U8)ueRecfg->ueCatEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* Validate UE Access Stratum Release */ @@ -2180,7 +2180,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Invalid Access Stratum Release %u for UE\n", ueRecfg->accessStratumRls)); - RETVALUE(RFAILED); + return RFAILED; } RGSCHDBGINFONEW(inst, (rgSchPBuf(inst), "Configured Access Stratum Release %u\n", \ ueRecfg->accessStratumRls)); @@ -2192,14 +2192,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid aperiodic mode config for" " DL CQI %d for NEW CRNTI:%d", (U8)ueRecfg->aprdDlCqiRecfg.aprdModeEnum,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } if ((ueRecfg->ueRecfgTypes & RGR_UE_ULPWR_RECFG) && (rgSCHCfgVldtUePwrCfg(*cell, &ueRecfg->ueUlPwrRecfg) != ROK)) { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid PUSCH Group power" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } @@ -2208,14 +2208,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid MeasGap/AckNackRep" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS if(rgSCHCfgVldtSpsReCfg(*cell, *ue, ueRecfg)!= ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid SPS" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef TFU_UPGRADE @@ -2224,7 +2224,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid ACQI, PCQI/SR/SRS " "Re-configuration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif if ((ueRecfg->ueRecfgTypes & RGR_UE_DRX_RECFG) && @@ -2232,7 +2232,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid drxParams" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00117452 - MOD - Changed macro name from @@ -2243,11 +2243,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid DL Power Control" " Reconfiguration for NEW CRNTI:%d",ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #endif /* End of RGR_CQI_REPT */ errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeRecfg */ @@ -2309,7 +2309,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"Cell does not exist " "for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue for dedicated channels */ @@ -2317,18 +2317,18 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"UEID does not exist" "dedicated logical channel for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } if ((*dlLc = rgSCHDbmGetDlDedLcCb((*ue), lcRecfg->lcId)) == NULLP) { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"Dedicated DL LC does not " "exist for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLchRecfg */ /** @@ -2381,19 +2381,19 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"CELL does not exist for CRNTI:%d", reset->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ if ((*ue = rgSCHDbmGetUeCb(&(*cell), reset->crnti)) == NULLP) { RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"UE does not exist for CRNTI:%d", reset->crnti); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrUeReset */ @@ -2451,7 +2451,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"Cell does not exist for" "CRNTI:%d LCGID:%d",lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue for dedicated channels */ @@ -2460,24 +2460,24 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"UE does not exist for " "dedicated logical channel group CRNTI:%d LCGID:%d", lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if (lcgRecfg->ulRecfg.lcgId > (RGSCH_MAX_LCG_PER_UE - 1)) { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"Invalid lcgId for uplink logical" "channel CRNTI:%d LCGID:%d", lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if ((lcgRecfg->ulRecfg.gbr != 0) && (lcgRecfg->ulRecfg.mbr < lcgRecfg->ulRecfg.gbr)) { RGSCHDBGINFO(inst, (rgSchPBuf(inst), "Dedicated Logical Group %d validation failed" " for ue %d for cell %d\n", lcgCfg->ulInfo.lcgId, lcgCfg->crnti, lcgCfg->cellId)); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLcgRecfg */ /** @@ -2529,7 +2529,7 @@ RgrCellCfg *cellCfg; (cell->dynCfiCb.numFailSamples * sizeof(U16)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } /* Setting the Invalid value 0xFF to pdcchSfIdx, it will be assigned @@ -2598,7 +2598,7 @@ RgrCellCfg *cellCfg; RGSCH_CFI_TTI_MON_INTRVL)/100; #endif - RETVALUE(ROK); + return ROK; } /** @@ -2662,7 +2662,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; RGSCHDBGINFO(inst, (rgSchPBuf(inst), "RGR SCH ENBconfig done: \n")); - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrSchedEnbCfg */ #ifdef RG_5GTF @@ -2712,7 +2712,7 @@ RgrCellCfg *cellCfg; printf("\ncell cfg at schd,numUes:%u,uepergrp:%u,uegrppertti:%u,numCC:%u,bwPerc:%u cfi %u\n", cell->cell5gtfCb.numUes,cell->cell5gtfCb.uePerGrpPerTti,cell->cell5gtfCb.ueGrpPerTti, cell->cell5gtfCb.numCCs,cell->cell5gtfCb.bwPerCC, cell->cell5gtfCb.cfi); - RETVALUE(ROK); + return ROK; } #endif @@ -2778,7 +2778,7 @@ RgSchErrInfo *errInfo; != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE if(cellCfg->emtcEnable) @@ -2787,14 +2787,14 @@ RgSchErrInfo *errInfo; != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for emtc cell"); - RETVALUE(RFAILED); + return RFAILED; } } #endif if ((U8 *)cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell"); - RETVALUE(RFAILED); + return RFAILED; } /* Initialize the lists of the cell */ ret = rgSCHDbmInitCell(cell); @@ -2802,7 +2802,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"DBM initialization FAILED for cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* LTE_ADV_FLAG_REMOVED_START */ if(cellCfg->rgrLteAdvCfg.pres & RGR_ABS) @@ -2913,7 +2913,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr cell Config failed at " "Scheduler for cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Updating Auto TM Mode enable/diable flag */ cell->isAutoCfgModeEnb = cellCfg->isAutoCfgModeEnb; @@ -2952,7 +2952,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr cell Config failed at " "Scheduler for cell "); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DHM to update DHM specific information */ @@ -2967,7 +2967,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr Cell Config failed at" " RNTI DB init for cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Update the cell with recieved configuration */ @@ -2982,7 +2982,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for " "cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Update RACH Related information * XXX: Below function yet to be written in RAM @@ -2997,7 +2997,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for" "cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } /* Associate a pair of upper and lower sapCbs with this cell */ @@ -3031,7 +3031,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Drx Memory allocation FAILED for" " cell"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } cell->overLoadBackOffEnab = FALSE;/* Disabling RachOverload by default */ /* Updating CSG Parameters */ @@ -3069,7 +3069,7 @@ RgSchErrInfo *errInfo; RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Rgr Cell Config failed at" " Initializing the LAA Cell Control Cb"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } cell->isPucchFormat3Sptd = cellCfg->isPucchFormat3Sptd; RLOG_ARG0(L_INFO,DBG_CELLID,cellCfg->cellId,"Format 3 is Enabled"); @@ -3085,7 +3085,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"EMTC Config Failed" " cell"); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -3096,11 +3096,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR, DBG_CELLID,cellCfg->cellId,"5GTF Rgr Cell Config failed"); rgSCHCfgFreeCellCb(cell); - RETVALUE(RFAILED); + return RFAILED; } #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCellCfg */ /** @@ -3203,7 +3203,7 @@ RgSchErrInfo *errInfo; RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%u]SCellIdx :Memomy allocation " "Failed while Adding SCell Information\n", idx)); #endif - RETVALUE(RFAILED); + return RFAILED; } ue->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)] = RGSCH_PCELL_INDEX; @@ -3217,7 +3217,7 @@ RgSchErrInfo *errInfo; if (ROK != rgSCHLaaInitDlRbAllocCb(cell, &ue->cellInfo[RGSCH_PCELL_INDEX]->dlAllocCb)) { - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef TFU_UPGRADE @@ -3499,14 +3499,14 @@ RgSchErrInfo *errInfo; rgSCHUtlUpdUeDciSize(cell, ue, FALSE); } - RETVALUE(ROK); + return ROK; }while(0); if (ue) { rgSCHCfgFreeUeCb(cell, ue); } - RETVALUE(RFAILED); + return RFAILED; } /* rgSCHCfgRgrUeCfg */ /** @@ -3660,7 +3660,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId, "RGR Cell re-configuration failed " "at Scheduler "); - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DHM to update DHM specific information */ @@ -3733,7 +3733,7 @@ RgSchErrInfo *errInfo; RLOG_ARG1(L_ERROR,DBG_CELLID, cellRecfg->cellId, "Invalid CPU OvrLd Ins %d for cell", cellRecfg->cntrlCmdCfg.cmdDesc.cpuOvrLd.instruction); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -3758,7 +3758,7 @@ RgSchErrInfo *errInfo; /*initialise the pools of CC and CE*/ if(rgSchSFRTotalPoolInit(cell, cell->subFrms[i])) { - RETVALUE(RFAILED); + return RFAILED; } } } @@ -3797,7 +3797,7 @@ RgSchErrInfo *errInfo; /*initialise the pools of CC and CE*/ if(rgSchDSFRRntpInfoInit(&cell->subFrms[i]->rntpInfo,cell,cell->bwCfg.dlTotalBw)) { - RETVALUE(RFAILED); + return RFAILED; } } /*Calculating the length of RNTP array based on Dl Bandwidth */ @@ -3809,7 +3809,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId, "Memory allocation FAILED for RNTP Alloc"); - RETVALUE(RFAILED); + return RFAILED; } cell->rntpAggrInfo.pres = PRSNT_NODEF; cell->rntpAggrInfo.len = len; @@ -3876,7 +3876,7 @@ RgSchErrInfo *errInfo; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCellRecfg */ /** @@ -3937,7 +3937,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UEID:No RaCb exists while" "Reconfig for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* rntiLnk does not exist for a HandIn UE. Hence this check. */ @@ -3963,7 +3963,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"RAM Handling for UE Reconfig failed" "for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* Delete Ue from the ue list */ rgSCHDbmDelUeCb(cell, ue); @@ -4024,7 +4024,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UE DRX re-est failed" "for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif /* Acc Fix */ @@ -4089,7 +4089,7 @@ RgSchErrInfo *errInfo; rgSCHUtlIndRntiRls2Mac(cell, oldRnti, TRUE, ueRecfg->newCrnti); } } - RETVALUE(ROK); + return ROK; } /** * @brief Handler for the UE reconfiguration request from RRC to MAC. @@ -4167,7 +4167,7 @@ RgSchErrInfo *errInfo; /*FH: SCell config failed for a scell index hence revert all successful * Scell config and send negative confirmation to APP*/ rgSCHSCellCfgUeCfgRollBack(cell, ue, ueRecfg); - RETVALUE(RFAILED); + return RFAILED; } } if (dciChange == TRUE) @@ -4189,7 +4189,7 @@ RgSchErrInfo *errInfo; if( ret != ROK) { errInfo->errCause = RGSCHERR_CFG_INVALID_RGR_UE_SCELL_PUCCH_RECFG; - RETVALUE(RFAILED); + return RFAILED; } } #else @@ -4210,7 +4210,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, "Scheduler handling while reconfig failed" "for OLD CRNTI:%d NEW CRNTI:%d",ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } /* Update uplink HARQ related information for UE */ @@ -4232,7 +4232,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Measurement Gap and" "AckNack Rep Recfg failed for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } if (ueRecfg->ueRecfgTypes & RGR_UE_BSRTMR_RECFG) @@ -4252,7 +4252,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"RNTI change " "failed for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TFU_UPGRADE @@ -4287,7 +4287,7 @@ RgSchErrInfo *errInfo; if (ret != ROK) { errInfo->errCause = RGSCHERR_HDFDD_SPSCFGRD; - RETVALUE(ret); + return (ret); } } #endif /* LTEMAC_HDFDD */ @@ -4301,7 +4301,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"UE DRX reconfig failed" "failed for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -4315,7 +4315,7 @@ RgSchErrInfo *errInfo; if(ret != OK) { errInfo->errCause = RGSCHERR_CQIREPT; - RETVALUE(ret); + return (ret); } } #endif /* End of RGR_CQI_REPT */ @@ -4356,7 +4356,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrUeRecfg */ @@ -4413,11 +4413,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcRecfg->cellId,"Scheduler handling for LC Recfg" " failed for CRNTI:%d LCID:%d",lcRecfg->crnti,lcRecfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLchRecfg */ /** * @brief Handler for the logical channel reconfiguration request from @@ -4472,11 +4472,11 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgRecfg->cellId,"Scheduler handling for LCG Recfg" " failed for CRNTI:%d LCGID:%d",lcgRecfg->crnti,lcgRecfg->ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcgRecfg */ /** @@ -4588,7 +4588,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrUeReset */ /** @@ -4634,14 +4634,14 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellDelInfo->u.cellDel.cellId, "Cell does not exist"); - RETVALUE(RFAILED); + return RFAILED; } /* Free the active cell */ rgSCHCfgFreeCellCb(cell); errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCellDel */ @@ -4694,7 +4694,7 @@ RgSchErrInfo *errInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,ueDelInfo->u.ueDel.cellId, "Cell does not exist CRNTI:%d", ueDelInfo->u.ueDel.crnti); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgSCHDbmGetUeCb(cell, ueDelInfo->u.ueDel.crnti)) == NULLP) { @@ -4702,13 +4702,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,ueDelInfo->u.ueDel.cellId, "RaCb does not exist for CRNTI:%d",ueDelInfo->u.ueDel.crnti); - RETVALUE(RFAILED); + return RFAILED; } else { /* This happens in case of Msg4 rejection */ raCb->toDel = TRUE; - RETVALUE(ROK); + return ROK; } } else @@ -4784,7 +4784,7 @@ RgSchErrInfo *errInfo; errInfo->errCause = RGSCHERR_NONE; } - RETVALUE(ROK); + return ROK; } } /* rgSCHCfgRgrUeDel */ @@ -4839,7 +4839,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Cell does not exist %d", lcDelInfo->u.lchDel.cellId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -4848,7 +4848,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "UE does not exist for CRNTI:%d LCID:%d", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } if (lcDelInfo->u.lchDel.lcgId > 3) { @@ -4856,7 +4856,7 @@ RgSchErrInfo *errInfo; "[%d]UEID:For LC %d, LCGid %d is invalid", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId, lcDelInfo->u.lchDel.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if ((dlLc = rgSCHDbmGetDlDedLcCb(ue, lcDelInfo->u.lchDel.lcId)) == NULLP) @@ -4864,7 +4864,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "LC does not exist for CRNTI:%d LCID:%d", lcDelInfo->u.lchDel.crnti, lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } rgSCHUtlRgrLcDel(cell, ue, lcDelInfo->u.lchDel.lcId,lcDelInfo->u.lchDel.lcgId); @@ -4912,7 +4912,7 @@ RgSchErrInfo *errInfo; errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcDel */ @@ -4969,7 +4969,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "CELL does not exist for CRNTI:%d LCGID:%d", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -4978,7 +4978,7 @@ RgSchErrInfo *errInfo; RLOG_ARG2(L_ERROR,DBG_CELLID,lcDelInfo->u.lchDel.cellId, "UE does not exist for CRNTI:%d LCGID:%d", lcDelInfo->u.lchDel.crnti,lcDelInfo->u.lchDel.lcId); - RETVALUE(RFAILED); + return RFAILED; } /* set lcgId in UEs lcg cntrl blk to invalid */ @@ -5011,7 +5011,7 @@ RgSchErrInfo *errInfo; #endif errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcgDel */ @@ -5060,7 +5060,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Cell does not existi for " "CRNTI:%d LCID:%d",lcCfg->crnti, lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -5068,7 +5068,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"UE does not exist for dedicated" " logical channel CRNTI:%d LCID:%d", lcCfg->crnti, lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } /* Validate logical channel Id */ @@ -5077,17 +5077,17 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid logical channel Id:%d" "for CRNTI:%d",lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } if (lcCfg->lcType != CM_LTE_LCH_DTCH && lcCfg->lcType != CM_LTE_LCH_DCCH) { RLOG_ARG3(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid logical channel Type %d" "CRNTI:%d LCID:%d",lcCfg->lcType,lcCfg->crnti, lcCfg->lcId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLcCfg */ /*********************************************************** @@ -5134,7 +5134,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgCfg->cellId,"Cell does not exist for" "CRNTI:%d LCGID:%d",lcgCfg->crnti,lcgCfg->ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } /* Fetch the Ue */ @@ -5142,15 +5142,15 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcgCfg->cellId,"UE does not exist for " "dedicated logical channel CRNTI:%d LCGID:%d", lcgCfg->crnti, lcgCfg->ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } if ((lcgCfg->ulInfo.gbr != 0) && (lcgCfg->ulInfo.mbr < lcgCfg->ulInfo.gbr)) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLcgCfg */ @@ -5193,7 +5193,7 @@ RgSchErrInfo *errInfo; * subsequent power config validations that may be needed */ - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellPwrCfg */ @@ -5275,7 +5275,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Invalid si config for cell"); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -5287,7 +5287,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID, cellCfg->cellId, "Invalid transport channel %d for cell", lcCfg->dlTrchType); - RETVALUE(RFAILED); + return RFAILED; } } else if (lcCfg->lcType == CM_LTE_LCH_PCCH) @@ -5309,7 +5309,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID, cellCfg->cellId,"Invalid UL common lcType %d " "for cell", lcCfg->lcType); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -5323,17 +5323,17 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID, cellCfg->cellId,"Invalid Direction %d", lcCfg->dir); - RETVALUE(RFAILED); + return RFAILED; } } if (bitMask != RGSCH_CELL_ACTIVE_CFG) { RLOG_ARG0(L_ERROR,DBG_CELLID, cellCfg->cellId, "Invalid Common channel config for cell"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCmnLcCfg */ @@ -5374,7 +5374,7 @@ RgrUeDlCqiCfg *ueDlCqiCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid Periodic CQI Info"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* Validate UE Aperiodic CQI mode */ @@ -5385,7 +5385,7 @@ RgrUeDlCqiCfg *ueDlCqiCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid Aperiodic mode config for DL CQI", ueDlCqiCfg->aprdCqiCfg.aprdModeEnum); - RETVALUE(RFAILED); + return RFAILED; } #ifndef TFU_UPGRADE /* Validate UE Periodic CQI mode */ @@ -5394,7 +5394,7 @@ RgrUeDlCqiCfg *ueDlCqiCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid periodic mode config for DL CQI", ueDlCqiCfg->prdCqiCfg.prdModeEnum); - RETVALUE(RFAILED); + return RFAILED; } /* Validate K value in periodic CQI Config */ if(((ueDlCqiCfg->prdCqiCfg.prdModeEnum == RGR_PRD_CQI_MOD20) || @@ -5404,7 +5404,7 @@ RgrUeDlCqiCfg *ueDlCqiCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid K for Subband CQI reporting"); - RETVALUE(RFAILED); + return RFAILED; } #else if ((ueDlCqiCfg->prdCqiCfg.type == 1) && @@ -5413,12 +5413,12 @@ RgrUeDlCqiCfg *ueDlCqiCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid periodic mode config for DL CQI", ueDlCqiCfg->prdCqiCfg.cqiSetup.prdModeEnum); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5459,14 +5459,14 @@ RgrUeCfg *ueCfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"TDD ACK NACK Multiplexing Mode" "is not allowed when Ack/Nack is Enabled: %d CRNTI:%d", ueCfg->ueAckNackCfg.ackNackRepFactor,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTE_TDD */ /* Validate AckNackRep Factor */ if((ueCfg->ueAckNackCfg.isAckNackEnabled == FALSE) && (!ueCfg->ueMesGapCfg.isMesGapEnabled)) { - RETVALUE(ROK); + return ROK; } if(ueCfg->ueAckNackCfg.isAckNackEnabled) @@ -5476,7 +5476,7 @@ RgrUeCfg *ueCfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId, "Invalid ACK NACK REP Factor:%d CRNTI:%d", ueCfg->ueAckNackCfg.ackNackRepFactor,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } if(ueCfg->ueMesGapCfg.isMesGapEnabled) @@ -5488,7 +5488,7 @@ RgrUeCfg *ueCfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"Invalid GAP Offset:%d CRNTI:%d", ueCfg->ueMesGapCfg.gapOffst,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } break; case RG_MEAS_GAPPRD_80: @@ -5496,19 +5496,19 @@ RgrUeCfg *ueCfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"Invalid GAP Offset:%d CRNTI:%d", ueCfg->ueMesGapCfg.gapOffst,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } break; default: { RLOG_ARG2(L_ERROR,DBG_CELLID,ueCfg->cellId,"Invalid GAP Periodicity Settings:%d" "CRNTI:%d", ueCfg->ueMesGapCfg.gapPrd,ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUeMeasGapAckNakRepCfg*/ @@ -5545,7 +5545,7 @@ RgrUeRecfg *ueRecfg; if((ueRecfg->ueAckNackRecfg.isAckNackEnabled == FALSE) && (!ueRecfg->ueMeasGapRecfg.isMesGapEnabled)) { - RETVALUE(ROK); + return ROK; } if(ueRecfg->ueAckNackRecfg.isAckNackEnabled ) @@ -5556,7 +5556,7 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid ACK NACK REP Factor:%d" "NEW CRNTI:%d",ueRecfg->ueAckNackRecfg.ackNackRepFactor,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } if(ueRecfg->ueMeasGapRecfg.isMesGapEnabled) @@ -5568,7 +5568,7 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid GAP Offset:%d" "NEW CRNTI:%d",ueRecfg->ueMeasGapRecfg.gapOffst,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } break; case RG_MEAS_GAPPRD_80: @@ -5576,19 +5576,19 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid GAP Offset:%d" "NEW CRNTI:%d",ueRecfg->ueMeasGapRecfg.gapOffst,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } break; default: { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid GAP Periodicity Settings:%d" "NEW CRNTI:%d",ueRecfg->ueMeasGapRecfg.gapPrd,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUeMeasGapAckNakRepRecfg*/ #ifdef LTEMAC_SPS @@ -5631,7 +5631,7 @@ RgrUeSpsDlCfg *dlSpsCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid number of n1Pucch values" " in DL SPS Config"); - RETVALUE(RFAILED); + return RFAILED; } for (idx = 0; idx < dlSpsCfg->numPucchVal; ++idx) @@ -5645,7 +5645,7 @@ RgrUeSpsDlCfg *dlSpsCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid N1Pucch value" " in DL SPS Config %lu", dlSpsCfg->n1PucchVal[idx]); #endif - RETVALUE(RFAILED); + return RFAILED; } } /* SPS_TODO: check will change for TDD */ @@ -5654,10 +5654,10 @@ RgrUeSpsDlCfg *dlSpsCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid number of SPS HARQ procs" " in DL SPS Config"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtDlSpsCfg */ #endif /* LTEMAC_SPS */ @@ -5700,7 +5700,7 @@ RgrUeUlPwrCfg *pwrCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Accumulation configutation" " not in sync with group power configuration"); - RETVALUE(RFAILED); + return RFAILED; } } @@ -5708,16 +5708,16 @@ RgrUeUlPwrCfg *pwrCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid PUSCH Group power" " configuration"); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUeGrpPwrCfg(cell, &pwrCfg->uePucchPwr) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid PUSCH Group power" " configuration"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUePwrCfg */ /*********************************************************** @@ -5758,10 +5758,10 @@ RgrUeGrpPwrCfg *grpPwrCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid Uplink Group power " "configuration"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtUeGrpPwrCfg */ #ifdef LTEMAC_SPS @@ -5811,14 +5811,14 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid SPS RNTI " " in DL SPS Recfg OLD CRNTI:%d NEW CCRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHCfgVldtUeDlSpsCfg(cell, &ueRecfg->ueSpsRecfg.dlSpsCfg) != ROK) { RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid DL SPS configuration" " for the OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -5832,7 +5832,7 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, " DRX reconfig not supported DL SPS enabled for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -5845,7 +5845,7 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, "DL SPS is not supported for HDFDD enabled for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } if(ueRecfg->ueSpsRecfg.ulSpsCfg.isUlSpsEnabled) @@ -5855,12 +5855,12 @@ RgrUeRecfg *ueRecfg; RLOG_ARG2(L_ERROR,DBG_CELLID,ueRecfg->cellId, "UL SPS is not supported for HDFDD enabled for OLD CRNTI:%d NEW CRNTI:%d", ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ROK); + return ROK; } /*rgSCHCfgVldtSpsReCfg*/ #endif @@ -5902,10 +5902,10 @@ RgrUeRecfg *ueRecfg; RLOG_ARG3(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalide numColltdCqiRept," "MAX supported %d for OLD CRNTI:%d NEW CRNTI:%d",RGR_CQIRPTS_MAXN, ueRecfg->oldCrnti,ueRecfg->newCrnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*rgSCHCfgVldtCqiReptReCfg*/ #endif @@ -5959,13 +5959,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Memory allocation FAILED for " "Downlink LCId:%d CRNTI:%d", lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } if ((U8 *)dlLc == NULLP) { RLOG_ARG2(L_ERROR,DBG_CELLID,lcCfg->cellId,"Memory allocation FAILED for " "Downlink LCID:%d CRNTI:%d", lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } dlLc->lcId = lcCfg->lcId; #ifdef LTE_ADV @@ -5988,7 +5988,7 @@ RgSchErrInfo *errInfo; RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,"Dedicated logical channel " "configuration failed at SCH:UEID:%d LCID:%d CRNTI:%d", ue->ueId, lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS RGSCH_ARRAY_BOUND_CHECK(inst, ue->ul.lcCb, (lcCfg->lcId -1)); @@ -6006,7 +6006,7 @@ RgSchErrInfo *errInfo; "configuration failed at SCH: UL LC CB already existing" " UEID:%d LCID:%d CRNTI:%d", ue->ueId, lcCfg->lcId,lcCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* Create UL LC context to maintain LCG to LC mapping and @@ -6031,7 +6031,7 @@ RgSchErrInfo *errInfo; } #endif /* LTE_L2_MEAS */ - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLchCfg */ /*********************************************************** @@ -6089,7 +6089,7 @@ RgSchErrInfo *errInfo; /* Roll back lcgCfg */ ue->ul.lcgArr[lcgCfg->ulInfo.lcgId].lcgId = RGSCH_INVALID_LCG_ID; rgSCHUtlRgrLcgDel(cell, ue, lcgCfg->ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef RG_UNUSED //#ifdef LTE_L2_MEAS @@ -6101,12 +6101,12 @@ RgSchErrInfo *errInfo; sizeof(RgSchUlLcCb))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for "); - RETVALUE(RFAILED); + return RFAILED; } if ((U8 *)ulLc == NULLP) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for "); - RETVALUE(RFAILED); + return RFAILED; } /* Create UL LC context to maintain LCG to LC mapping and LC and QCI mapping, this is for L2 Counters :UL ACTIVE UE @@ -6123,7 +6123,7 @@ RgSchErrInfo *errInfo; ue->ul.lcgArr[lcgCfg->ulInfo.lcgId].numLch = lcgCfg->ulInfo.numLch; #endif /* LTE_L2_MEAS */ - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrLcgCfg */ @@ -6202,7 +6202,7 @@ RgSchErrInfo *errInfo; } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgRgrCmnLcCfg */ @@ -6802,7 +6802,7 @@ RgrSiCfg *siCfg; if(siCfg->retxCnt > siCfg->siWinSize) { RLOG0(L_ERROR,"retxCnt is greater than siWinSize, validation failed"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6810,7 +6810,7 @@ RgrSiCfg *siCfg; if(siCfg->numSi > RGR_MAX_NUM_SI) { RLOG0(L_ERROR,"Validation for numSi in SI CFG failed"); - RETVALUE(RFAILED); + return RFAILED; } /* MinPeriodicity will have the least configured periodicity @@ -6836,11 +6836,11 @@ RgrSiCfg *siCfg; default: RLOG0(L_ERROR,"Validation for SI Periodicity in SI-CFG failed"); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrCellSiCfg */ /* LTE_ADV_FLAG_REMOVED_START */ @@ -6885,20 +6885,20 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) if(lteAdvCfg->sfrCfg.cellEdgeRbRange.startRb > lteAdvCfg->sfrCfg.cellEdgeRbRange.endRb) { RLOG0(L_ERROR,"Invalid configuration of cell edge bandwidth for SFR feature"); - RETVALUE(RFAILED); + return RFAILED; } if(lteAdvCfg->sfrCfg.cellEdgeRbRange.endRb >= dlTotalBw) { RLOG0(L_ERROR,"Invalid configuration of cell edge end RB for SFR feature"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef TFU_UPGRADE if(lteAdvCfg->sfrCfg.pwrThreshold.pLow >= lteAdvCfg->sfrCfg.pwrThreshold.pHigh) { RLOG0(L_ERROR,"Invalid configuration of power threshold for SFR feature"); - RETVALUE(RFAILED); + return RFAILED; } #endif } @@ -6909,7 +6909,7 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) (RGR_ABS_TRANSMIT != lteAdvCfg->absCfg.absPatternType)) { RLOG0(L_ERROR,"Invalid configuration of ABS pattern type"); - RETVALUE(RFAILED); + return RFAILED; } cmMemcpy(temp, (U8 *) lteAdvCfg->absCfg.absPattern,RGR_ABS_PATTERN_LEN); @@ -6920,12 +6920,12 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) if((temp[idx] != 1) && (temp[idx] != 0)) { RLOG0(L_ERROR,"Invalid configuration of ABS pattern type"); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_END */ @@ -6966,15 +6966,15 @@ RgrCellCsgParamCfg *csgParam; { RLOG0(L_ERROR,"Invalid Configuration of minimum DL resources " "for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } if(csgParam->minUlResNonCsg > 100) { RLOG0(L_ERROR,"Invalid Configuration of minimum UL resources " "for NON-CSG"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -7036,10 +7036,10 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid SI Id value" " specified"); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; break; case RGR_SI_CFG_TYPE_MIB: /* SI CFG Type MIB */ case RGR_SI_CFG_TYPE_SIB1: /* SI CFG TYPE SIB1 */ @@ -7062,13 +7062,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid SI Id value" " specified"); - RETVALUE(RFAILED); + return RFAILED; } if(siCfg->siId > ((cell->siCfg.minPeriodicity * 10)/cell->siCfg.siWinSize)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "SiId can not be scheduled "); - RETVALUE(RFAILED); + return RFAILED; } break; @@ -7077,14 +7077,14 @@ RgSchErrInfo *errInfo; case RGR_SI_CFG_EMTC_TYPE_SI_PER: if(ROK != rgEmtcvalidateSiCfg(siCfg,cell)) { - RETVALUE(RFAILED); + return RFAILED; } break; #endif default: RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid cfgType " "parameter value"); - RETVALUE(RFAILED); + return RFAILED; } /*Validate the specified pdu */ @@ -7092,7 +7092,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid NULLP pdu " "specified"); - RETVALUE(RFAILED); + return RFAILED; } /*Check if PDU is of 0 length*/ @@ -7101,13 +7101,13 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid pdu " "specified"); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrSiCfg */ #endif /*RGR_SI_SCH*/ @@ -7162,7 +7162,7 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) (loadInfReq->rgrCcPHighStartRb <= cell->lteAdvCb.sfrCfg.cellEdgeRbRange.endRb)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid rgrCcPHighStartRb received specified"); - RETVALUE(RFAILED); + return RFAILED; } /* Validate if the CC endRb which we have received from DSFR lies in CE sub-band of the receiving eNB */ @@ -7170,13 +7170,13 @@ PUBLIC S16 rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, errInfo) (loadInfReq->rgrCcPHighEndRb <= cell->lteAdvCb.sfrCfg.cellEdgeRbRange.endRb)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Invalid rgrCcPHighEndRb received specified"); - RETVALUE(RFAILED); + return RFAILED; } errInfo->errCause = RGSCHERR_NONE; - RETVALUE(ROK); + return ROK; } /* rgSCHCfgVldtRgrLoadInf */ /* LTE_ADV_FLAG_REMOVED_END */ @@ -7236,7 +7236,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) puschMode == RGR_APRD_CQI_MOD22 || puschMode == RGR_APRD_CQI_MOD31) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -7245,7 +7245,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) if (puschMode == RGR_APRD_CQI_MOD20 || puschMode == RGR_APRD_CQI_MOD30) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -7253,7 +7253,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) { if (puschMode != RGR_APRD_CQI_MOD31) { - RETVALUE(RFAILED); + return RFAILED; } } #ifdef LTE_ADV @@ -7268,7 +7268,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePuschMode(cellCb, txMde, puschMode,errInfo) * 2-0,3-0 of pmi/ri reporitng isdisabled and csi-rs ports == 1*/ #endif - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtRgrTxmodePuschMode ends*/ /* @@ -7330,11 +7330,11 @@ PUBLIC S16 rgSCHCfgVldtRgrUeACqiCfg(cellCb, crnti, acqiCfg,txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Aperiodic CQI configuration CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* @@ -7383,7 +7383,7 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) { if (txMde ==RGR_UE_TM_4 || txMde ==RGR_UE_TM_5 || txMde ==RGR_UE_TM_6) { - RETVALUE(RFAILED); + return RFAILED; } } else if (pucchMode == RGR_PRD_CQI_MOD11 || pucchMode == RGR_PRD_CQI_MOD21) @@ -7391,11 +7391,11 @@ PUBLIC S16 rgSCHCfgVldtRgrTxmodePucchMode(cellCb, txMde, pucchMode,errInfo) if (txMde ==RGR_UE_TM_1 || txMde ==RGR_UE_TM_2 || txMde ==RGR_UE_TM_3 \ || txMde ==RGR_UE_TM_7) { - RETVALUE(RFAILED); + return RFAILED; } } /* TODO:: Tm8 and TM9 validation needs to be added */ - RETVALUE(ROK); + return ROK; } /* @@ -7482,7 +7482,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Tx Mode-PUCCH Mode combination CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -7493,7 +7493,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Reporting Type-PUCCH Mode combination CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } if((cqiCfg->cqiSetup.cqiRepType==2) && @@ -7502,7 +7502,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Reporting Type-PUCCH Mode combination CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } /*3. Validate CQI/PMI and RI Configuration related parameter values */ @@ -7512,7 +7512,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG3(L_ERROR,DBG_CELLID,cellCb->cellId, "Not Supported or Invalid CQI-PUCCH resourceIndex=%d Cfg Val=%d CRNTI:%d", RG_SCH_PUCCH_RES_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_HDFDD @@ -7526,7 +7526,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) "Not Supported or Invalid Cfg CQI Min Index Sup =%d" "Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ICQI_MIN_SUPP, RG_SCH_ICQI_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -7538,7 +7538,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) "Not Supported or Invalid Cfg CQI Min Index Sup =%d " "Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ICQI_MIN_SUPP, RG_SCH_ICQI_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } } #else @@ -7549,7 +7549,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) "Not Supported or Invalid Cfg CQI Min Index Sup =%d" "Max Index Sup=%d Cfg Val=%d CRNTI;%d", RG_SCH_ICQI_MIN_SUPP, RG_SCH_ICQI_MAX_SUPP, cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7559,7 +7559,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Cfg CQI Report" "ModeCfg Val=%d CRNTI:%d", cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } if((cqiCfg->cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP) && @@ -7568,7 +7568,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) { RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid CQI Cfg K Cfg Val=%d CRNTI:%d", cqiCfg->type,crnti); - RETVALUE(RFAILED); + return RFAILED; } if((cqiCfg->cqiSetup.cqiRepType == RGR_UE_PCQI_SB_REP) && @@ -7577,7 +7577,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Periodic CQI mode Cfg for dlTotalBw (%d) for CRNTI:%d", cellCb->bwCfg.dlTotalBw, crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifndef LTE_TDD @@ -7586,7 +7586,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Reserved value Cfg =%d CRNTI:%d", cqiCfg->cqiSetup.cqiPResIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7606,7 +7606,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Transmission Mode =%d CRNTI:%d", txMde,crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -7615,13 +7615,13 @@ PUBLIC S16 rgSCHCfgVldtRgrUePCqiCfg(cellCb, crnti, cqiCfg, txMode, errInfo) RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Index RI value Cfg =%d CRNTI:%d", cqiCfg->cqiSetup.riCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* @@ -7698,7 +7698,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Cell specific SRS is not configured CRNTI:%d",crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 1. Validate SRS Configuration related parameter values */ @@ -7714,7 +7714,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min Index Sup =%d Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ISRS_MIN_SUPP, RG_SCH_ISRS_MAX_SUPP, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -7726,7 +7726,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min Index Sup =%d Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ISRS_MIN_SUPP, RG_SCH_ISRS_MAX_SUPP, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -7738,7 +7738,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min Index Sup =%d Max Index Sup=%d Cfg Val=%d CRNTI:%d", RG_SCH_ISRS_MIN_SUPP, RG_SCH_ISRS_MAX_SUPP, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef LTE_TDD @@ -7761,7 +7761,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "UE specific SRS is not occuring in Cell specific SRS subframe" "srs Cfg Idx =%d CRNTI:%d", srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } @@ -7773,7 +7773,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "Max Freq Domain Position =%d Cfg Val=%d CRNTI:%d", RG_SCH_SRS_FREQDOM_POS_MIN, RG_SCH_SRS_FREQDOM_POS_MAX, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } if ( srsCfg->srsSetup.txComb > RG_SCH_SRS_TXCOMB_MAX ) @@ -7783,10 +7783,10 @@ PUBLIC S16 rgSCHCfgVldtRgrUeUlSrsCfg(cellCb, crnti, srsCfg, errInfo) "SRS Min TX Comb =%d Max TX Comb =%d Cfg Val=%d CRNTI:%d", RG_SCH_SRS_TXCOMB_MIN, RG_SCH_SRS_TXCOMB_MAX, srsCfg->srsSetup.srsCfgIdx,crnti); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* @@ -7868,7 +7868,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) "Max Supp=%d,Min Supp=%d CRNTI:%d", srCfg->srSetup.srCfgIdx, RG_SCH_ISR_MAX_SUPP, RG_SCH_ISR_MIN_SUPP,crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -7881,7 +7881,7 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) "Max Supp=%d,Min Supp=%d CRNTI:%d", srCfg->srSetup.srCfgIdx, RG_SCH_ISR_MAX_SUPP, RG_SCH_ISR_MIN_SUPP,crnti); - RETVALUE(RFAILED); + return RFAILED; } } #else @@ -7893,11 +7893,11 @@ PUBLIC S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) "Max Supp=%d,Min Supp=%d CRNTI:%d", srCfg->srSetup.srCfgIdx, RG_SCH_ISR_MAX_SUPP, RG_SCH_ISR_MIN_SUPP,crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif } - RETVALUE(ROK); + return ROK; } @@ -7948,7 +7948,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Aperiodic CQI configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 1. Validate UE Periodic CQI/PMI, SRS and SR related parameters */ @@ -7963,7 +7963,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Periodic CQI configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 2. Validate SRS Configuration related parameter values */ @@ -7977,7 +7977,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SRS configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* 3. Validate SR Configuration related parameter values */ @@ -7991,10 +7991,10 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SR configuration CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8068,7 +8068,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Aperiodic CQI configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8088,7 +8088,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid Periodic CQI configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8104,7 +8104,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SRS configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8121,11 +8121,11 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "Invalid SR configuration OLD CRNTI:%d",ueReCfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -8255,7 +8255,7 @@ CmLteUeCategory ueCat; rgSchCmnSetCqiReqField(RG_SCH_CMN_GET_SCELL_INFO(ue, cellCb),ue,&acqiCb->cqiReqField); #endif - RETVALUE(ROK); + return ROK; } /** @@ -8438,7 +8438,7 @@ PUBLIC S16 rgSCHCfgPCqiUeCfg(cellCb, ueCb, cqiCfg, ueCat) } ueCb->nPCqiCb = cqiCb; ueCb->nPRiCb = cqiCb; - RETVALUE(ROK); + return ROK; } /** @@ -8621,7 +8621,7 @@ PUBLIC S16 rgSCHCfgRiUeCfg(cellCb, ueCb, cqiCfg, ueCat) cqiCb->riDist = RG_SCH_INVALID_IDX; } - RETVALUE(ROK); + return ROK; } @@ -8772,7 +8772,7 @@ PUBLIC S16 rgSCHCfgSrsUeCfg(cellCb, ueCb, srsCfg) ueCb->srsCb.srsLstEnt.node =(PTR) NULLP; } - RETVALUE(ROK); + return ROK; } @@ -8884,7 +8884,7 @@ PUBLIC S16 rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg) ueCb->srCb.srLstEnt.node = (PTR)NULLP; } - RETVALUE(ROK); + return ROK; } @@ -9018,7 +9018,7 @@ PUBLIC S16 rgSCHCfgPCqiUeReCfg(cellCb, ueCb, cqiCfg, ueCat) /* ccpu00140578:: */ cqiCb->riRecpPrcsd = FALSE; - RETVALUE(ROK); + return ROK; } @@ -9116,7 +9116,7 @@ PUBLIC S16 rgSCHCfgSrsUeReCfg(cellCb, ueCb, srsCfg) /* ccpu00140578:: */ ueCb->srsCb.srsRecpPrcsd = FALSE; - RETVALUE(ROK); + return ROK; } /* @brief Handles SR Re-configuration for a UE. @@ -9211,7 +9211,7 @@ PUBLIC S16 rgSCHCfgSrUeReCfg(cellCb, ueCb, srCfg) rgSCHCfgSrUeCfg(cellCb, ueCb, srCfg); } - RETVALUE(ROK); + return ROK; } /* @brief Handles ACQI Re-configuration for a UE. @@ -9262,7 +9262,7 @@ PUBLIC S16 rgSCHCfgAcqiUeReCfg(cellCb, ueCb, acqiCfg, ueCat) { TRC3(rgSCHCfgAcqiUeReCfg); - RETVALUE(rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb)) + return (rgSCHCfgACqiUeCfg(cellCb,ueCb,(RG_SCH_CMN_GET_ACQICB(ueCb,cellCb)) ,ueCb->mimoInfo.txMode, acqiCfg, ueCat)); } @@ -9401,7 +9401,7 @@ PUBLIC S16 rgSCHCfgPCqiSrsSrUeDel(cellCb, ueCb) } #endif - RETVALUE(ROK); + return ROK; } @@ -9472,7 +9472,7 @@ PUBLIC S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) }while( min <= max ); - RETVALUE(ROK); + return ROK; } @@ -9669,7 +9669,7 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy } } - RETVALUE ( table ); + return ( table ); } /* #endif */ #endif /* TFU_UPGRADE */ @@ -9707,7 +9707,7 @@ RgrUeDrxCfg *ueDrxCfg; if (ueDrxCfg->isDrxEnabled == FALSE) { - RETVALUE(ROK); + return ROK; } #ifdef LTEMAC_R9 @@ -9722,7 +9722,7 @@ RgrUeDrxCfg *ueDrxCfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid cqiMask configuration(%ld)", ueDrxCfg->cqiMask.val); #endif - RETVALUE(RFAILED); + return RFAILED; } } #endif /*LTEMAC_R9*/ @@ -9735,7 +9735,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid onDurTimer configuration(%d)", ueDrxCfg->drxOnDurTmr); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9744,7 +9744,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid onDurTimer configuration(%d) for EMTC", ueDrxCfg->drxOnDurTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9756,7 +9756,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid onDurTimer configuration(%d) for EMTC", ueDrxCfg->drxOnDurTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9764,7 +9764,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid Inactivity configuration(%d)", ueDrxCfg->drxInactvTmr); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE if(ueDrxCfg->isEmtcUe) @@ -9775,7 +9775,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d) for EMTC", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9784,7 +9784,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d)", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9796,7 +9796,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d)", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } #ifdef EMTC_ENABLE @@ -9806,7 +9806,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid DrxReTX configuration(%d) for EMTC", ueDrxCfg->drxRetxTmr); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9815,14 +9815,14 @@ RgrUeDrxCfg *ueDrxCfg; if ( rgSCHCfgVldtDrxLngCycCfg(ueDrxCfg->drxLongCycleOffst) != ROK ) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid LongCycle configuration"); - RETVALUE(RFAILED); + return RFAILED; } if ( ueDrxCfg->drxLongCycleOffst.longDrxCycle < ueDrxCfg->drxOnDurTmr ) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of Long DRX Cycle " " and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD @@ -9831,7 +9831,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of Long DRX Cycle " " and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -9841,7 +9841,7 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of short DRX " "Cycle and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } if ( (ueDrxCfg->drxLongCycleOffst.longDrxCycle % @@ -9849,13 +9849,13 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId," Long DRX cycle is not multiple of " "short DRX cycle"); - RETVALUE(RFAILED); + return RFAILED; } if ( rgSCHCfgVldtDrxShrtCycCfg(ueDrxCfg->drxShortDrx) != ROK ) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid Short Cycle configuration"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD @@ -9866,12 +9866,12 @@ RgrUeDrxCfg *ueDrxCfg; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Invalid combination of Long DRX Cycle " " and onDuration timer values"); - RETVALUE(RFAILED); + return RFAILED; } #endif } - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxUeCfg*/ /*********************************************************** @@ -9925,11 +9925,11 @@ U8 onDurTmr; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(onDurTmr)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtOnDurCfg*/ /*********************************************************** @@ -9989,11 +9989,11 @@ U16 inActvTmr; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(InactvTmr)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxInActvCfg*/ /*********************************************************** @@ -10039,11 +10039,11 @@ U8 reTxTmr; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(drxRetxTmr)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxReTxCfg*/ /*********************************************************** @@ -10078,15 +10078,15 @@ RgrDrxLongCycleOffst lngCycleOffst; if ( rgSCHCfgVldtDrxLngCyclTmrs(lngCycleOffst.longDrxCycle) != ROK ) { - RETVALUE(RFAILED); + return RFAILED; } if ( lngCycleOffst.drxStartOffst >= lngCycleOffst.longDrxCycle ) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxLngCycCfg*/ /*********************************************************** @@ -10141,11 +10141,11 @@ U16 val; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(longDrxCycle)*/ - RETVALUE(ROK); + return ROK; }/*rgSCHCfgVldtDrxLngCyclTmrs*/ /*********************************************************** @@ -10199,7 +10199,7 @@ RgrDrxShortDrx shrtCycCfg; default: { - RETVALUE(RFAILED); + return RFAILED; } }/*switch(shortDrxCycle)*/ @@ -10208,10 +10208,10 @@ RgrDrxShortDrx shrtCycCfg; (shrtCycCfg.drxShortCycleTmr > RGR_DRX_SHRTCYCLE_MAX) ) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -10329,7 +10329,7 @@ RgrUeRecfg *ueRecfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not allocate memory for sending StaInd OLD CRNTI:%d",ueRecfg->oldCrnti); - RETVALUE(retVal); + return (retVal); } /* Fill StaInd for sending collated N CQI rpeort */ @@ -10344,7 +10344,7 @@ RgrUeRecfg *ueRecfg; ue->cqiReptCfgInfo.numColltdCqiRept = ueRecfg->ueCqiReptCfg.numColltdCqiRept; - RETVALUE(ROK); + return ROK; } /* End of rgSCHCfgUeCqiReptReCfg */ #endif /* End of RGR_CQI_REPT */ /*This function Added Ue in ongoing L2 Meas*/ @@ -10378,7 +10378,7 @@ PRIVATE S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) lnk = lnk->next; }/*End of while loop*/ - RETVALUE(ROK); + return ROK; } #endif #ifdef LTE_ADV diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c index 92bf8bc39..8504871bb 100755 --- a/src/5gnrsch/rg_sch_cmn.c +++ b/src/5gnrsch/rg_sch_cmn.c @@ -2931,14 +2931,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "bw<=bwAssigned for UEID:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHDhmGetCcchSduHqProc(ueCb, cellSch->dl.time, &(ueDl->proc)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetCcchSduHqProc failed UEID:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } rbAllocInfo = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ueCb, cell); @@ -2950,13 +2950,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHDhmRlsHqpTb(ueDl->proc, 0, FALSE); RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnCcchSduDedAlloc failed UEID:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } cmLListAdd2Tail(&allocInfo->ccchSduAlloc.ccchSduTxLst, &ueDl->proc->reqLnk); ueDl->proc->reqLnk.node = (PTR)ueDl->proc; allocInfo->ccchSduAlloc.ccchSduDlSf->schdCcchUe++; - RETVALUE(ROK); + return ROK; } /** * @brief This function scheduler for downlink CCCH messages. @@ -3527,7 +3527,7 @@ CmLteTimingInfo end; } } - RETVALUE(inWin); + return (inWin); } /* end of rgSCHCmnChkInWin*/ /* @@ -3565,7 +3565,7 @@ CmLteTimingInfo end; RGSCH_INCR_SUB_FRAME(end, 1); pastWin = rgSCHCmnChkInWin(frm, end, refFrm); - RETVALUE(pastWin); + return (pastWin); } /* end of rgSCHCmnChkPastWin*/ /** @@ -3758,7 +3758,7 @@ RgSchDlSf *subFrm; numCce = 16; break; default: - RETVALUE(NULLP); + return (NULLP); } if (rgSCHUtlPdcchAvail(cell, pdcchInfo, aggrLvl, &pdcch) == TRUE) @@ -3770,7 +3770,7 @@ RgSchDlSf *subFrm; subFrm->cceCnt += numCce; pdcch->pdcchSearchSpace = RG_SCH_CMN_SEARCH_SPACE; - RETVALUE(pdcch); + return (pdcch); } /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */ @@ -3779,7 +3779,7 @@ RgSchDlSf *subFrm; RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "PDCCH ERR: NO PDDCH AVAIL IN COMMON SEARCH SPACE aggr:%u", aggrLvl); - RETVALUE(NULLP); + return (NULLP); } @@ -3940,14 +3940,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId , "bw<=bwAssigned"); - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHDhmGetMsg4HqProc(raCb, cellSch->dl.time) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetMsg4HqProc failed"); - RETVALUE(RFAILED); + return RFAILED; } raCb->rbAllocInfo.dlSf = allocInfo->msg4Alloc.msg4DlSf; @@ -3958,13 +3958,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, FALSE); RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnMsg4DedAlloc failed."); - RETVALUE(RFAILED); + return RFAILED; } cmLListAdd2Tail(&allocInfo->msg4Alloc.msg4TxLst, &raCb->dlHqE->msg4Proc->reqLnk); raCb->dlHqE->msg4Proc->reqLnk.node = (PTR)raCb->dlHqE->msg4Proc; allocInfo->msg4Alloc.msg4DlSf->schdCcchUe++; - RETVALUE(ROK); + return ROK; } @@ -4033,7 +4033,7 @@ Bool isDtx; // prc_trace_format_string(PRC_TRACE_GROUP_PS, PRC_TRACE_INFO_LOW,"Forcing alloc in CMN search spc size %d fmt %d \n", // pdcch->dciNumOfBits, dciFrmt); } - RETVALUE(pdcch); + return (pdcch); } #endif @@ -4085,7 +4085,7 @@ Bool isDtx; "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", aggrLvl); - RETVALUE(NULLP); + return (NULLP); } if (rgSCHUtlPdcchAvail(cell, pdcchInfo, aggrLvl, &pdcch) == TRUE) @@ -4121,7 +4121,7 @@ Bool isDtx; /* MSG4 */ pdcch->dciNumOfBits = cell->dciSize.size[dciFrmt]; } - RETVALUE(pdcch); + return (pdcch); } /* PDCCH Allocation Failed, Mark cceFailure flag as TRUE */ @@ -4130,7 +4130,7 @@ Bool isDtx; RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "PDCCH ERR: NO PDDCH AVAIL IN UE SEARCH SPACE :aggr(%u)", aggrLvl); - RETVALUE(NULLP); + return (NULLP); } #ifdef RGR_V1 @@ -4219,7 +4219,7 @@ RgSchUeCb *ueCb; } else { - RETVALUE(RFAILED); + return RFAILED; } } @@ -4231,7 +4231,7 @@ RgSchUeCb *ueCb; rbAllocinfo->rnti = ueCb->ueId; rbAllocinfo->tbInfo[0].noLyr = 1; - RETVALUE(ROK); + return ROK; } #endif @@ -4317,7 +4317,7 @@ RgSchRaCb *raCb; } else { - RETVALUE(RFAILED); + return RFAILED; } } @@ -4329,7 +4329,7 @@ RgSchRaCb *raCb; rbAllocinfo->tbInfo[0].schdlngForTb = TRUE; rbAllocinfo->tbInfo[0].noLyr = 1; - RETVALUE(ROK); + return ROK; } #ifdef LTE_TDD @@ -4593,7 +4593,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "bw == bwAssigned RARNTI:%d",rarnti); - RETVALUE(RFAILED); + return RFAILED; } reqLst = &cell->raInfo.raReqLst[raIndex]; @@ -4601,7 +4601,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "reqLst Count=0 RARNTI:%d",rarnti); - RETVALUE(RFAILED); + return RFAILED; } remNumRapid = reqLst->count; @@ -4670,7 +4670,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; if (!isAlloc) { RLOG_ARG0(L_INFO,DBG_CELLID,cell->cellId,"BW alloc Failed"); - RETVALUE(RFAILED); + return RFAILED; } subFrm->bwAssigned = subFrm->bwAssigned + rb; @@ -4688,7 +4688,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; allocInfo->raRspAlloc[noRaRnti].tbInfo[0].noLyr = 1; allocInfo->raRspAlloc[noRaRnti].vrbgReq = RGSCH_CEIL(nPrb,MAX_5GTF_VRBG_SIZE); schdNumRapid += remNumRapid; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5573,10 +5573,10 @@ RgSchTddSubfrmInfo *subfrmInfo; if(splfrmIdx == curSubfrmIdx) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /** @@ -5770,7 +5770,7 @@ U8 *ulDai; *ulDai = anInfo->ulDai; } #endif - RETVALUE(anInfo->dlDai); + return (anInfo->dlDai); } #endif /* ifdef LTE_TDD */ @@ -7056,7 +7056,7 @@ RgSchCellCb *cell; if(dlsf->phichOffInfo.sfnOffset == RGSCH_INVALID_INFO) { - RETVALUE(RGSCH_INVALID_INFO); + return (RGSCH_INVALID_INFO); } subframe = dlsf->phichOffInfo.subframe; @@ -7069,7 +7069,7 @@ RgSchCellCb *cell; numUlSf = ((numUlSf * sfn) + rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][subframe]) - 1; idx = numUlSf % (cellUl->numUlSubfrms); - RETVALUE(idx); + return (idx); } /** @@ -7112,7 +7112,7 @@ RgSchCellCb *cell; rgSchTddNumUlSubfrmTbl[ulDlCfgIdx][timeInfo->subframe]) - 1; idx = numUlSf % (cellUl->numUlSubfrms); - RETVALUE(idx); + return (idx); } #endif @@ -7180,7 +7180,7 @@ RgSchCellCb *cell; procId = numUlSf % numUlHarq; #endif - RETVALUE(procId); + return (procId); } @@ -7353,7 +7353,7 @@ RgSchUeCb *ue; //pdcch = rgSCHCmnPdcchAlloc(cell, ue, sf, y, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_0, FALSE); pdcch = rgSCHCmnPdcchAlloc(cell, ue, sf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_A1, FALSE); } - RETVALUE(pdcch); + return (pdcch); } /*********************************************************** @@ -8072,23 +8072,23 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) bitMap1 = pmiBitMap[1]; if((bitMap1) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap1>>16) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else if((bitMap0) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_3); + return (RG_SCH_CMN_RANK_3); } else if((bitMap0>>16) & 0xFFFF) { - RETVALUE (RG_SCH_CMN_RANK_4); + return (RG_SCH_CMN_RANK_4); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8123,15 +8123,15 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) bitMap0 = pmiBitMap[0]; if((bitMap0>>26)& 0x0F) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap0>>30) & 3) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8165,23 +8165,23 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) bitMap0 = pmiBitMap[0]; if((bitMap0>>28)& 1) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap0>>29) &1) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else if((bitMap0>>30) &1) { - RETVALUE (RG_SCH_CMN_RANK_3); + return (RG_SCH_CMN_RANK_3); } else if((bitMap0>>31) &1) { - RETVALUE (RG_SCH_CMN_RANK_4); + return (RG_SCH_CMN_RANK_4); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8215,15 +8215,15 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) bitMap0 = pmiBitMap[0]; if((bitMap0>>30)& 1) { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } else if((bitMap0>>31) &1) { - RETVALUE (RG_SCH_CMN_RANK_2); + return (RG_SCH_CMN_RANK_2); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8262,23 +8262,23 @@ PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) if (numTxPorts ==2 && txMode == RGR_UE_TM_3) { - RETVALUE (rgSCHCmnComp2TxMode3(pmiBitMap)); + return (rgSCHCmnComp2TxMode3(pmiBitMap)); } else if (numTxPorts ==4 && txMode == RGR_UE_TM_3) { - RETVALUE (rgSCHCmnComp4TxMode3(pmiBitMap)); + return (rgSCHCmnComp4TxMode3(pmiBitMap)); } else if (numTxPorts ==2 && txMode == RGR_UE_TM_4) { - RETVALUE (rgSCHCmnComp2TxMode4(pmiBitMap)); + return (rgSCHCmnComp2TxMode4(pmiBitMap)); } else if (numTxPorts ==4 && txMode == RGR_UE_TM_4) { - RETVALUE (rgSCHCmnComp4TxMode4(pmiBitMap)); + return (rgSCHCmnComp4TxMode4(pmiBitMap)); } else { - RETVALUE (RG_SCH_CMN_RANK_1); + return (RG_SCH_CMN_RANK_1); } } @@ -8379,7 +8379,7 @@ RgSchDlHqEnt *hqEnt; if (rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(hqP->sch), (sizeof(RgSchCmnDlHqProc))) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } #ifdef EMTC_ENABLE @@ -8387,7 +8387,7 @@ RgSchDlHqEnt *hqEnt; { if(ROK != cellSchd->apisEmtcDl->rgSCHDlUeHqEntInit(cell, hqEnt)) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -8396,11 +8396,11 @@ RgSchDlHqEnt *hqEnt; { if(ROK != cellSchd->apisDl->rgSCHDlUeHqEntInit(cell, hqEnt)) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* rgSCHCmnDlInitHqEnt */ /** @@ -8445,7 +8445,7 @@ RgSchUeCb *ue; cell->refreshUeCnt[refOffst]++; ue->refreshOffset = refOffst; /* printf("UE[%d] refresh offset[%d]. Cell refresh ue count[%d].\n", ue->ueId, refOffst, cell->refreshUeCnt[refOffst]); */ - RETVALUE(refOffst); + return (refOffst); } } @@ -8454,7 +8454,7 @@ RgSchUeCb *ue; cell->refreshUeCnt[refOffst-1]++; ue->refreshOffset = refOffst-1; - RETVALUE(refOffst-1); + return (refOffst-1); } /** * @brief This function computes initial Refresh Wait Period. @@ -8570,7 +8570,7 @@ RgSchErrInfo *err; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Memory allocation FAILED\n")); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ueSchCmn = RG_SCH_CMN_GET_UE(ue,sCell); @@ -8631,7 +8631,7 @@ RgSchErrInfo *err; if ((cellSchd->apisDl->rgSCHRgrSCellDlUeCfg(sCell, ue, err)) != ROK) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "Spec Sched DL UE CFG FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } /* TODO: enhance for DLFS RB Allocation for SCELLs in future dev */ @@ -8642,7 +8642,7 @@ RgSchErrInfo *err; if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeCfg(sCell, ue, sCellInfoCfg, err)) != ROK) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS UE config FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8659,7 +8659,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL UHM HARQ Ent Init " "Failed for CRNTI:%d", ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } ueUlPcell = RG_SCH_CMN_GET_UL_UE(ue, ue->cell); @@ -8693,7 +8693,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId,"SCELL Memory allocation FAILED" "for CRNTI:%d",ue->ueId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } allRcd->allocTime = sCell->crntTime; cmLListAdd2Tail(&ueUl->ulAllocLst, &allRcd->lnk); @@ -8706,7 +8706,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Could not do " "power config for UE CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE @@ -8716,7 +8716,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -8726,14 +8726,14 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,sCell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } ue->ul.isUlCaEnabled = TRUE; } - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrSCellUeCfg */ @@ -8792,7 +8792,7 @@ RgSchUeCb *ue; if ((cellSchd->apisDlfs->rgSCHDlfsSCellUeDel(sCellInfo->cell, ue)) != ROK) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "DLFS Scell del FAILED\n")); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8800,7 +8800,7 @@ RgSchUeCb *ue; (Data**)(&(sCellInfo->sch)), (sizeof(RgSchCmnUe))); - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrSCellUeDel */ #endif @@ -8864,11 +8864,11 @@ RgrUeCfg *cfg; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "5GTF_ERROR Invalid beam id CRNTI:%d",cfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } ue5gtfGrp->beamBitMask |= (1 << ue->ue5gtfCb.BeamId); - RETVALUE(ROK); + return ROK; } #endif @@ -8932,7 +8932,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ueSchCmn = RG_SCH_CMN_GET_UE(ue,cell); ue->dl.ueDlCqiCfg = ueCfg->ueDlCqiCfg; @@ -9010,7 +9010,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"UL Ambr and DL Ambr are" "configured as 0 for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } /* DL ambr */ ue->dl.ambrCfgd = (ueCfg->ueQosCfg.dlAmbr * RG_SCH_CMN_REFRESH_TIME)/100; @@ -9027,7 +9027,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9038,7 +9038,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE CFG FAILED for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9068,7 +9068,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED" "for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } allRcd->allocTime = cell->crntTime; cmLListAdd2Tail(&ueUl->ulAllocLst, &allRcd->lnk); @@ -9084,7 +9084,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "SCH struct alloc failed for CRNTI:%d",ueCfg->crnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } } /* After initialising UL part, do power related init */ @@ -9093,7 +9093,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do " "power config for UE CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS ret = rgSCHCmnSpsUeCfg(cell, ue, ueCfg, err); @@ -9101,7 +9101,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not do " "SPS config for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } #endif /* LTEMAC_SPS */ @@ -9112,7 +9112,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9122,7 +9122,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE CFG FAILED" "for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9133,7 +9133,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DLFS UE config FAILED" "for CRNTI:%d",ueCfg->crnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9145,7 +9145,7 @@ RgSchErrInfo *err; rgSCHCmn5gtfUeCfg(cell, ue, ueCfg); #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrUeCfg */ /** @@ -9549,7 +9549,7 @@ RgSchErrInfo *err; "reporting mode %d for old CRNIT:%d", (int)ueRecfg->prdDlCqiRecfg.prdModeEnum,ueRecfg->oldCrnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->dl.ueDlCqiCfg.prdCqiCfg = ueRecfg->prdDlCqiRecfg; } @@ -9561,7 +9561,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Power Reconfiguration Failed for OLD CRNTI:%d",ueRecfg->oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9573,7 +9573,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Ul Ambr and DL Ambr " "configured as 0 for OLD CRNTI:%d",ueRecfg->oldCrnti); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->ul.cfgdAmbr = (ueRecfg->ueQosRecfg.ueBr * \ RG_SCH_CMN_REFRESH_TIME)/100; @@ -9595,13 +9595,13 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((cellSchCmn->apisEmtcDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9611,13 +9611,13 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched UL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } if ((cellSchCmn->apisDl->rgSCHRgrDlUeRecfg(cell, ue, ueRecfg, err)) != ROK) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Spec Sched DL UE ReCFG FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } /* DLFS UE Config */ @@ -9628,7 +9628,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DLFS UE re-config FAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } @@ -9638,11 +9638,11 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "DL SPS ReCFG FAILED for UE CRNTI:%d", ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrUeRecfg*/ /*********************************************************** @@ -10107,13 +10107,13 @@ RgrDlCmnCodeRateCfg *dlCmnCodeRate; } if (dlCmnCodeRate->ccchCqi == 0) { - RETVALUE(RFAILED); + return RFAILED; } else { cellDl->dl.ccchCqi = dlCmnCodeRate->ccchCqi; } - RETVALUE(ROK); + return ROK; } #ifdef LTE_TDD @@ -10190,7 +10190,7 @@ RgSchErrInfo *err; } if (cellSch->dl.maxUePerDlSf < cellSch->dl.maxUeNewTxPerTti) { - RETVALUE(RFAILED); + return RFAILED; } @@ -10304,7 +10304,7 @@ RgSchErrInfo *err; /* Intialize the RACH response scheduling related infromation */ if(rgSCHCmnDlRachInfoInit(cell) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Allocate PRACH preamble list */ @@ -10469,7 +10469,7 @@ RgSchErrInfo *err; "maxCcchPerDlSf %u > maxUePerDlSf %u", cfg->maxCcchPerDlSf, cfg->maxUePerDlSf ); - RETVALUE(RFAILED); + return RFAILED; } else if (!cfg->maxCcchPerDlSf) { @@ -10486,7 +10486,7 @@ RgSchErrInfo *err; } if (rgSCHCmnDlCnsdrCmnRt(cell, &cfg->dlCmnCodeRate) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /*ccpu00118273 - ADD - start */ @@ -10505,7 +10505,7 @@ RgSchErrInfo *err; ret = cellSch->apisDlfs->rgSCHDlfsCellCfg(cell, cfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } cellSch->dl.isDlFreqSel = cfg->dlfsCfg.isDlFreqSel; @@ -10515,7 +10515,7 @@ RgSchErrInfo *err; ret = rgSCHPwrCellCfg(cell, cfg); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cellSch->dl.bcchTxPwrOffset = cfg->bcchTxPwrOffset; @@ -10523,7 +10523,7 @@ RgSchErrInfo *err; cellSch->dl.rarTxPwrOffset = cfg->rarTxPwrOffset; cellSch->dl.phichTxPwrOffset = cfg->phichTxPwrOffset; cellSch->dl.msg4pAVal = cfg->msg4pAVal; - RETVALUE(ROK); + return ROK; } #else /* LTE_TDD */ /** @@ -10681,7 +10681,7 @@ RgSchErrInfo *err; "FAILED MaxUePerDlSf(%u) < MaxDlUeNewTxPerTti(%u)", cellSch->dl.maxUePerDlSf, cellSch->dl.maxUeNewTxPerTti); - RETVALUE(RFAILED); + return RFAILED; } /*[ccpu00138609]-ADD- Configure the Max CCCH Counter */ if (cfg->maxCcchPerDlSf > cfg->maxUePerDlSf) @@ -10690,7 +10690,7 @@ RgSchErrInfo *err; "maxCcchPerDlSf %u > maxUePerDlSf %u", cfg->maxCcchPerDlSf, cfg->maxUePerDlSf ); - RETVALUE(RFAILED); + return RFAILED; } else if (!cfg->maxCcchPerDlSf) { @@ -10709,7 +10709,7 @@ RgSchErrInfo *err; if (rgSCHCmnDlCnsdrCmnRt(cell, &cfg->dlCmnCodeRate) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cmLListInit(&cellSch->dl.msg4RetxLst); #ifdef RGR_V1 @@ -10726,7 +10726,7 @@ RgSchErrInfo *err; ret = cellSch->apisDlfs->rgSCHDlfsCellCfg(cell, cfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } cellSch->dl.isDlFreqSel = cfg->dlfsCfg.isDlFreqSel; @@ -10736,7 +10736,7 @@ RgSchErrInfo *err; ret = rgSCHPwrCellCfg(cell, cfg); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cellSch->dl.bcchTxPwrOffset = cfg->bcchTxPwrOffset; @@ -10744,7 +10744,7 @@ RgSchErrInfo *err; cellSch->dl.rarTxPwrOffset = cfg->rarTxPwrOffset; cellSch->dl.phichTxPwrOffset = cfg->phichTxPwrOffset; RG_SCH_RESET_HCSG_DL_PRB_CNTR(&cellSch->dl); - RETVALUE(ROK); + return ROK; } #endif /* LTE_TDD */ @@ -10781,7 +10781,7 @@ RgSchCmnUlCell *cellUl; { U32 numRe = RGSCH_CEIL((bytes * 8) * 1024, rgSchCmnUlCqiTbl[cqi].eff); TRC2(rgSCHCmnUlCalcReqRbCeil); - RETVALUE((U8)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl))); + return ((U8)RGSCH_CEIL(numRe, RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl))); } /*********************************************************** @@ -10859,7 +10859,7 @@ Bool isEcp; if (msgSzA < RGSCH_MIN_MSG3_GRNT_SZ) { - RETVALUE(RFAILED); + return RFAILED; } numSb = RGSCH_CEIL(rgSCHCmnUlCalcReqRbCeil(msgSzA, ccchCqi, cellUl), sbSize); @@ -10898,7 +10898,7 @@ Bool isEcp; * Refer- TG36.321- section- 5.1.2*/ cellUl->ra.prmblANumSb = numSb; cellUl->ra.prmblAIMcs = ccchMcs; - RETVALUE(ROK); + return ROK; } PUBLIC U32 gPrntPucchDet=0; @@ -11005,7 +11005,7 @@ U8 *bwAvailRef; if (puschRbStart * 2 >= ulBw) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH"); - RETVALUE(RFAILED); + return RFAILED; } *rbStartRef = puschRbStart; @@ -11017,7 +11017,7 @@ U8 *bwAvailRef; cell->dynCfiCb.maxCfi = RGSCH_MIN(cfi-1, cell->dynCfiCb.maxCfi); } - RETVALUE(ROK); + return ROK; } #else @@ -11124,7 +11124,7 @@ U8 *bwAvailRef; if (puschRbStart*2 >= ulBw) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"No bw available for PUSCH"); - RETVALUE(RFAILED); + return RFAILED; } *rbStartRef = puschRbStart; @@ -11136,7 +11136,7 @@ U8 *bwAvailRef; cell->dynCfiCb.maxCfi = RGSCH_MIN(cfi-1, cell->dynCfiCb.maxCfi); } - RETVALUE(ROK); + return ROK; } #endif @@ -11243,7 +11243,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) "FAILED: MaxUePerUlSf(%u) < MaxUlUeNewTxPerTti(%u)", cellUl->maxAllocPerUlSf, cellUl->maxUeNewTxPerTti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_L2_MEAS @@ -11259,7 +11259,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation failed "); - RETVALUE(ret); + return (ret); } } #endif @@ -11283,7 +11283,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if (sbSize != rgSchCmnMult235Tbl[sbSize].match) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid subband size %d", sbSize); - RETVALUE(RFAILED); + return RFAILED; } //Setting the subband size to 4 which is size of VRBG in 5GTF #ifdef RG_5GTF @@ -11295,7 +11295,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlCellInit(): " "maxUlBwPerUe/sbSize is zero"); - RETVALUE(RFAILED); + return RFAILED; } cellUl->maxSbPerUe = rgSchCmnMult235Tbl[maxSbPerUe].prvMatch; @@ -11305,7 +11305,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnUlCellInit(): " "Invalid cqi"); - RETVALUE(RFAILED); + return RFAILED; } cellUl->dfltUlCqi = cellCfg->ulCmnCodeRate.ccchCqi; @@ -11347,7 +11347,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cell->rachCfg.msgSizeGrpA, sbSize, cell->isCpUlExtend); if (ret != ROK) { - RETVALUE(ret); + return (ret); } #endif @@ -11356,7 +11356,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cell->rachCfg.msgSizeGrpA, sbSize, cell->isCpUlExtend); if (ret != ROK) { - RETVALUE(ret); + return (ret); } cellUl->sbSize = sbSize; @@ -11370,7 +11370,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) if (ret != ROK) { cellUl->numUlSubfrms = 0; - RETVALUE(ret); + return (ret); } /* store the DL subframe corresponding to the PUSCH offset @@ -11407,7 +11407,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) #endif if (ret != ROK) { - RETVALUE(ret); + return (ret); } if (cfi == 1) @@ -11428,7 +11428,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cellSch->cfiCfg.cfi, cell->dynCfiCb.maxCfi, cell->pucchCfg.maxPucchRb); - RETVALUE(RFAILED); + return RFAILED; } /* DMRS values */ @@ -11437,7 +11437,7 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) cellUl->dmrsArrSize * sizeof(*cellUl->dmrsArr)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } for (i = 0; i < cellUl->dmrsArrSize; ++i) { @@ -11465,11 +11465,11 @@ PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(cellUl->ulSfArr)), maxSubfrms * sizeof(RgSchUlSf)); #endif - RETVALUE(ret); + return (ret); } } RG_SCH_RESET_HCSG_UL_PRB_CNTR(cellUl); - RETVALUE(ROK); + return ROK; } /** @@ -11518,7 +11518,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } cellSch = (RgSchCmnCell *)(cell->sc.sch); cellSch->cfiCfg = cellCfg->cfiCfg; @@ -11547,13 +11547,13 @@ RgSchErrInfo *err; { /* There is no downlink deinit to be performed */ err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } ret = rgSCHCmnDlRgrCellCfg(cell, cellCfg, err); if (ret != ROK) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } /* DL scheduler has no initializations to make */ /* As of now DL scheduler always returns ROK */ @@ -11572,7 +11572,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } #endif @@ -11580,7 +11580,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } #ifdef EMTC_ENABLE if(TRUE == cellCfg->emtcEnable) @@ -11589,7 +11589,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcDl->rgSCHRgrDlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } #endif @@ -11599,17 +11599,17 @@ RgSchErrInfo *err; ret = rgSCHCmnSpsCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } #endif ret = cellSch->apisDl->rgSCHRgrDlCellCfg(cell, cellCfg, err); if (ret != ROK) { - RETVALUE(ret); + return (ret); } rgSCHCmnInitVars(cell); - RETVALUE(ROK); + return ROK; } /* rgSCHCmnRgrCellCfg*/ @@ -11655,7 +11655,7 @@ RgSchErrInfo *err; err->errCause = RGSCHERR_SCH_CFG; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnRgrCellRecfg(): " "Invalid cqi"); - RETVALUE(RFAILED); + return RFAILED; } cellUl->dfltUlCqi = recfg->ulCmnCodeRate.ccchCqi; ret = rgSCHCmnPrecompMsg3Vars(cellUl, recfg->ulCmnCodeRate.ccchCqi, @@ -11665,7 +11665,7 @@ RgSchErrInfo *err; cellUl->dfltUlCqi = oldCqi; rgSCHCmnPrecompMsg3Vars(cellUl, recfg->ulCmnCodeRate.ccchCqi, cell->rachCfg.msgSizeGrpA, cellUl->sbSize, cell->isCpUlExtend); - RETVALUE(ret); + return (ret); } } @@ -11674,7 +11674,7 @@ RgSchErrInfo *err; if (rgSCHCmnDlCnsdrCmnRt(cell, &recfg->dlCmnCodeRate) != ROK) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } } @@ -11685,14 +11685,14 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DL sched for cell Recfg */ ret = cellSch->apisEmtcDl->rgSCHRgrDlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -11702,14 +11702,14 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Invoke DL sched for cell Recfg */ ret = cellSch->apisDl->rgSCHRgrDlCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -11718,7 +11718,7 @@ RgSchErrInfo *err; ret = cellSch->apisDlfs->rgSCHDlfsCellRecfg(cell, recfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cellSch->dl.isDlFreqSel = recfg->dlfsRecfg.isDlFreqSel; } @@ -11728,11 +11728,11 @@ RgSchErrInfo *err; ret = rgSCHPwrCellRecfg(cell, recfg); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -11945,7 +11945,7 @@ RgrLchQosCfg *dlQos; if ( qci < RG_SCH_CMN_MIN_QCI || qci > RG_SCH_CMN_MAX_QCI ) { - RETVALUE(RFAILED); + return RFAILED; } if ((qci >= RG_SCH_CMN_GBR_QCI_START) && @@ -11953,10 +11953,10 @@ RgrLchQosCfg *dlQos; { if ((dlQos->mbr == 0) || (dlQos->mbr < dlQos->gbr)) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /** @@ -12010,7 +12010,7 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnRgrLchCfg(): " "SCH struct alloc failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } if(lcCfg->lcType != CM_LTE_LCH_DCCH) { @@ -12020,7 +12020,7 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSchCmnCrgLcCfg(): " "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } /* Perform DL service activation in the scheduler */ ((RgSchCmnDlSvc *)(dlLc->sch))->qci = lcCfg->dlInfo.dlQos.qci; @@ -12044,7 +12044,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcDl->rgSCHRgrDlLcCfg(cell, ue,dlLc ,lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12053,7 +12053,7 @@ RgSchErrInfo *err; ret = cellSch->apisDl->rgSCHRgrDlLcCfg(cell, ue, dlLc, lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -12063,7 +12063,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlLcCfg(cell, ue, lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12072,7 +12072,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlLcCfg(cell, ue, lcCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -12094,12 +12094,12 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSchCmnRgrLchCfg(): " "SPS configuration failed for DL LC for CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ROK); + return ROK; } /** @@ -12156,14 +12156,14 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "DlQos validation failed for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } if (((RgSchCmnDlSvc *)(dlLc->sch))->qci != lcRecfg->dlRecfg.dlQos.qci) { RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "Qci, hence lc Priority change " "not supported for CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(ret); + return (ret); } ((RgSchCmnDlSvc *)(dlLc->sch))->gbr = (lcRecfg->dlRecfg.dlQos.gbr * \ RG_SCH_CMN_REFRESH_TIME)/100; @@ -12182,12 +12182,12 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcDl->rgSCHRgrDlLcRecfg(cell, ue, dlLc, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } ret = cellSch->apisEmtcUl->rgSCHRgrUlLcRecfg(cell, ue, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12196,12 +12196,12 @@ RgSchErrInfo *err; ret = cellSch->apisDl->rgSCHRgrDlLcRecfg(cell, ue, dlLc, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } ret = cellSch->apisUl->rgSCHRgrUlLcRecfg(cell, ue, lcRecfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -12218,11 +12218,11 @@ RgSchErrInfo *err; "supported for dlLC Ignore this CRNTI:%d LCID:%d",ue->ueId,lcRecfg->lcId); } } - RETVALUE(ROK); + return ROK; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -12280,7 +12280,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlLcgCfg(cell, ue, lcg, lcgCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12289,7 +12289,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlLcgCfg(cell, ue, lcg, lcgCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } if (RGSCH_IS_GBR_BEARER(ulLcg->cfgdGbr)) @@ -12297,7 +12297,7 @@ RgSchErrInfo *err; /* Indicate MAC that this LCG is GBR LCG */ rgSCHUtlBuildNSendLcgReg(cell, ue->ueId, lcgCfg->ulInfo.lcgId, TRUE); } - RETVALUE(ROK); + return ROK; } /** @@ -12355,7 +12355,7 @@ RgSchErrInfo *err; ret = cellSch->apisEmtcUl->rgSCHRgrUlLcgRecfg(cell, ue, lcg, reCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -12364,7 +12364,7 @@ RgSchErrInfo *err; ret = cellSch->apisUl->rgSCHRgrUlLcgRecfg(cell, ue, lcg, reCfg, err); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } if (RGSCH_IS_GBR_BEARER(ulLcg->cfgdGbr)) @@ -12377,7 +12377,7 @@ RgSchErrInfo *err; /* In case of RAB modification */ rgSCHUtlBuildNSendLcgReg(cell, ue->ueId, reCfg->ulRecfg.lcgId, FALSE); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12421,7 +12421,7 @@ U8 lcgId; { cellSch->apisUl->rgSCHRgrUlLchDel(cell, ue, lcId, lcgId); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12992,7 +12992,7 @@ U32 ueCount; }while(idx < RG_SCH_CMN_NUM_BI_VAL-1); cell->biInfo.prevBiTime = rgSchCmnBiTbl[idx]; /* For 16 Entries in Table 7.2.1 36.321.880 - 3 reserved so total 13 Entries */ - RETVALUE(idx); /* Returning reserved value from table UE treats it has 960 ms */ + return (idx); /* Returning reserved value from table UE treats it has 960 ms */ } /* rgSCHCmnGetBiIndex */ @@ -13260,7 +13260,7 @@ U16 i; k = (frm.sfn/2) % 4; } rv = RGSCH_CEIL(3*k, 2) % 4; - RETVALUE(rv); + return (rv); } /** @@ -13849,7 +13849,7 @@ U32 effTgt; if ((nPrb >= maxRb) && (resiTbs <= 10)) { /* Could not accomodate ACQI */ - RETVALUE(RFAILED); + return RFAILED; } totREs = nPrb * RG_SCH_CMN_UL_NUM_RE_PER_RB(cellUl); tbSz = rgTbSzTbl[0][resiTbs][nPrb-1]; @@ -13894,7 +13894,7 @@ U32 effTgt; *numSb = resNumSb; *iTbs = resiTbs; - RETVALUE(ROK); + return ROK; } #endif #endif @@ -13958,7 +13958,7 @@ RgSchUlHole *hole; if (proc == NULLP) { //printf("UE [%d] HQ Proc unavailable\n", ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -13978,7 +13978,7 @@ RgSchUlHole *hole; { RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHCmnUlRbAllocForUe(): Could not get PDCCH for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } gUl5gtfPdcchSchd++; #if defined (TENB_STATS) && defined (RG_5GTF) @@ -14014,7 +14014,7 @@ RgSchUlHole *hole; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlRbAllocForUe(): Could not get UlAlloc %d CRNTI:%d",numVrbg,ue->ueId); rgSCHCmnPdcchRlsCrntSf(cell, pdcch); - RETVALUE(RFAILED); + return RFAILED; } gUl5gtfAllocAllocated++; #if defined (TENB_STATS) && defined (RG_5GTF) @@ -14075,7 +14075,7 @@ RgSchUlHole *hole; ueUl->alloc.alloc = alloc; /*rntiwari-Adding the debug for generating the graph.*/ /* No grant attr recorded now */ - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -14889,7 +14889,7 @@ RgSchUeCb *ue; cellSch->apisUl->rgSCHUlUeRefresh(cell, ue); cellSch->apisDl->rgSCHDlUeRefresh(cell, ue); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -14931,7 +14931,7 @@ S16 tmrEvnt; /* Timer Event */ { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnTmrExpiry(): Invalid " "timer event CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } #else UNUSED(tmrEvnt); @@ -14941,7 +14941,7 @@ S16 tmrEvnt; /* Timer Event */ rgSCHCmnAddUeToRefreshQ(cell, ue, RG_SCH_CMN_REFRESH_TIME); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -15001,7 +15001,7 @@ RgSchCellCb *cell; cmPrcTmr(&sched->tmrTqCp, sched->tmrTq, (PFV)rgSCHCmnTmrExpiry); } - RETVALUE(ROK); + return ROK; } @@ -15919,14 +15919,14 @@ U8 pmi; if (ue->txModeTransCmplt == FALSE) { - RETVALUE(RFAILED); + return RFAILED; } if (cell->numTxAntPorts == 2) { if (pmi > 3) { - RETVALUE(RFAILED); + return RFAILED; } if (ueDl->mimoInfo.ri == 2) { @@ -15934,7 +15934,7 @@ U8 pmi; /* PMI 2 and 3 are invalid incase of 2 TxAnt and 2 Layered SM */ if (pmi == 2 || pmi == 3) { - RETVALUE(RFAILED); + return RFAILED; } ueDl->mimoInfo.pmi = pmi+1; } @@ -15947,13 +15947,13 @@ U8 pmi; { if (pmi > 15) { - RETVALUE(RFAILED); + return RFAILED; } ueDl->mimoInfo.pmi = pmi; } /* Reset the No PMI Flag in forceTD */ RG_SCH_CMN_UNSET_FORCE_TD(ue, cell, RG_SCH_CMN_TD_NO_PMI); - RETVALUE(ROK); + return ROK; } /** @@ -17003,7 +17003,7 @@ PRIVATE U8 rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) { wideCqi=15; } - RETVALUE(wideCqi); + return (wideCqi); }/*rgSCHCmnCalcWcqiFrmSnr*/ @@ -17383,11 +17383,11 @@ RgSchUlHqProcCb *oldProc; #if (ERRCLASS & ERRCLS_DEBUG) if (curProc->alloc == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif curProc->alloc->hqProc = curProc; - RETVALUE(ROK); + return ROK; } /* rgSCHCmnUpdUlHqProc */ #endif @@ -17432,7 +17432,7 @@ RgSchUeCb *ueCb; if(ueCb->isEmtcUe) { cellSch->apisEmtcUl->rgSCHSrRcvd(ueCb->cell, ueCb); - RETVALUE(ROK); + return ROK; } } else @@ -17441,7 +17441,7 @@ RgSchUeCb *ueCb; cellSch->apisUl->rgSCHSrRcvd(ueCb->cell, ueCb); } - RETVALUE (ROK); + return (ROK); } /** @@ -17495,7 +17495,7 @@ RgSchErrInfo *err; if (!RGSCH_LCG_ISCFGD(ulLcg)) { err->errCause = RGSCHERR_SCH_LCG_NOT_CFGD; - RETVALUE(RFAILED); + return RFAILED; } for (lcgCnt=0; lcgCnt<4; lcgCnt++) { @@ -17596,7 +17596,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHUpdBsrShort(cell, ue, ulLcg, bsr); - RETVALUE(ROK); + return ROK; } } else @@ -17624,7 +17624,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -17676,7 +17676,7 @@ RgSchErrInfo *err; if (!RGSCH_LCG_ISCFGD(ulLcg)) { err->errCause = RGSCHERR_SCH_LCG_NOT_CFGD; - RETVALUE(RFAILED); + return RFAILED; } /* set all higher prio lcgs bs to 0 and update this lcgs bs and total bsr= sumofall lcgs bs */ @@ -17774,7 +17774,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHUpdBsrTrunc(cell, ue, ulLcg, bsr); - RETVALUE(ROK); + return ROK; } } else @@ -17801,7 +17801,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -17944,7 +17944,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHUpdBsrLong(cell, ue, bsArr); - RETVALUE(ROK); + return ROK; } } else @@ -17971,7 +17971,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /** @@ -18035,7 +18035,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnUpdExtPhr */ @@ -18102,7 +18102,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHCmnUpdPhr */ /** @@ -18145,7 +18145,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHContResUlGrant(cell, ue); - RETVALUE(ROK); + return ROK; } } else @@ -18153,7 +18153,7 @@ RgSchErrInfo *err; { cellSch->apisUl->rgSCHContResUlGrant(cell, ue); } - RETVALUE(ROK); + return ROK; } /** @@ -18218,7 +18218,7 @@ RgSchErrInfo *err; if(ue->isEmtcUe) { cellSch->apisEmtcUl->rgSCHSrRcvd(cell, ue); - RETVALUE(ROK); + return ROK; } } else @@ -18226,7 +18226,7 @@ RgSchErrInfo *err; { cellSch->apisUl->rgSCHSrRcvd(cell, ue); } - RETVALUE(ROK); + return ROK; } /** @@ -18273,7 +18273,7 @@ RgSchCellCb *cell; } } - RETVALUE(alloc); + return (alloc); } /** @@ -18326,7 +18326,7 @@ RgSchUlAlloc *alloc; alloc = NULLP; } - RETVALUE(alloc); + return (alloc); } /** * @brief Collates DRX enabled UE's scheduled in this SF @@ -18441,7 +18441,7 @@ U8 idx; } } - RETVALUE(alloc); + return (alloc); } /** @@ -18490,7 +18490,7 @@ U8 idx; { alloc = NULLP; } - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -18519,7 +18519,7 @@ U8 iMcs; { TRC2(rgSCHCmnUlGetITbsFrmIMcs); - RETVALUE(rgUlIMcsTbl[iMcs].iTbs); + return (rgUlIMcsTbl[iMcs].iTbs); } /*********************************************************** @@ -18584,7 +18584,7 @@ CmLteUeCategory ueCtg; } #endif - RETVALUE(iMcs); + return (iMcs); } /*********************************************************** @@ -18617,7 +18617,7 @@ U8 iTbs; RGSCH_ARRAY_BOUND_CHECK(0, rgTbSzTbl[0], iTbs); - RETVALUE(rgTbSzTbl[0][iTbs][cellUl->sbSize-1]); + return (rgTbSzTbl[0][iTbs][cellUl->sbSize-1]); } /*********************************************************** @@ -18683,7 +18683,7 @@ RgSchUlHole *hole; } alloc = rgSCHUtlUlAllocGetPartHole(sf, numSb, hole); } - RETVALUE(alloc); + return (alloc); } /** @@ -19120,7 +19120,7 @@ Bool isEcp; iTbs = 19; } #endif - RETVALUE(iTbs); + return (iTbs); #endif #else if ( (ueCtgy != CM_LTE_UE_CAT_5) && (ueUl->crntUlCqi[0] > ueUl->maxUlCqi )) @@ -19132,7 +19132,7 @@ Bool isEcp; cqi = ueUl->crntUlCqi[0]; } #endif - RETVALUE(rgSchCmnUlCqiToTbsTbl[(U8)isEcp][cqi]); + return (rgSchCmnUlCqiToTbsTbl[(U8)isEcp][cqi]); } /** @@ -19470,7 +19470,7 @@ RgSchCellCb *cell; cell->subFrms[sfNum]->dlFdbkInfo.sfnOffset; cell->subFrms[dlIdx]->dlFdbkInfo.m = cell->subFrms[sfNum]->dlFdbkInfo.m; } - RETVALUE(ROK); + return ROK; } /** @@ -19588,7 +19588,7 @@ RgSchCellCb *cell; cell->subFrms[dlIdx]->ulAscInfo.sfnOffset = cell->subFrms[sfNum]->ulAscInfo.sfnOffset; } - RETVALUE(ROK); + return ROK; } @@ -19631,7 +19631,7 @@ RgSchCellCb *cell; cell->rgSchTddNpValTbl[idx] = (U8) (np/36); } - RETVALUE(ROK); + return ROK; } /** @@ -19677,12 +19677,12 @@ RgSchCellCb *cell; (Data **)(&cell->raInfo.raReqLst), (Size)(lstSize * sizeof(CmLListCp))); if (ret != ROK) { - RETVALUE(ret); + return (ret); } cell->raInfo.lstSize = lstSize; - RETVALUE(ROK); + return ROK; } @@ -19846,10 +19846,10 @@ RgSchCellCb *cell; ret = rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz); if (ret != ROK) { - RETVALUE(ret); + return (ret); } - RETVALUE(ROK); + return ROK; } /** @@ -19964,7 +19964,7 @@ RgSchCellCb *cell; cell->subFrms[dlIdx]->phichOffInfo.sfnOffset = cell->subFrms[sfNum]->phichOffInfo.sfnOffset; } - RETVALUE(ROK); + return ROK; } @@ -20127,10 +20127,10 @@ U8 cce; { if(cce < cell->rgSchTddNpValTbl[i]) { - RETVALUE(i-1); + return (i-1); } } - RETVALUE(0); + return (0); } #endif @@ -20282,11 +20282,11 @@ RgSchUeCb *ue; if (sfDiff > (U32)RG_SCH_CMN_UE_IDLE_THRSLD(ue)) { - RETVALUE(ROK); + return ROK; } else { - RETVALUE(RFAILED); + return RFAILED; } } @@ -20573,12 +20573,12 @@ U8 *prachMskIdx; { if (cellSch->rachCfg.remDedPrm == 0) { - RETVALUE(RFAILED); + return RFAILED; } /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ if ((*pdcch = rgSCHCmnPdcchAlloc(cell, ue, dlSf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_1A, FALSE)) == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* The stored prachMskIdx is the index of PRACH Oppurtunities in * raOccasions.subframes[]. @@ -20601,13 +20601,13 @@ U8 *prachMskIdx; /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ if ((*pdcch = rgSCHCmnPdcchAlloc(cell, ue, dlSf, ueDl->mimoInfo.cwInfo[0].cqi, TFU_DCI_FORMAT_1A, FALSE)) == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } *prachMskIdx = 0; *rapId = 0; } - RETVALUE(ROK); + return ROK; } /** @@ -20967,10 +20967,10 @@ U16 rapId ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); if (ueDl->rachInfo.hoRapId == rapId) { - RETVALUE(ue); + return (ue); } } - RETVALUE(NULLP); + return (NULLP); } #ifdef ANSI @@ -21061,11 +21061,11 @@ CmLteTimingInfo timingInfo; ueDl->rachInfo.rapIdLnk.node = (PTR)NULLP; if (RGSCH_TIMEINFO_SAME(ueDl->rachInfo.asgnOppr, timingInfo)) { - RETVALUE(ue); + return (ue); } } - RETVALUE(NULLP); + return (NULLP); } @@ -21117,7 +21117,7 @@ CmLteUeCategory ueCtgy; cqi = ueUl->crntUlCqi[0]; } #endif - RETVALUE(cqi); + return (cqi); }/* End of rgSCHCmnUlGetCqi */ /*********************************************************** @@ -21173,7 +21173,7 @@ U8 maxRb; TRC2(rgSCHCmnUlRbAllocForPoHoUe); if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /*MS_WORKAROUND for HO ccpu00121116*/ cqi = rgSCHCmnUlGetCqi(cell, ue, ueCtg); @@ -21202,7 +21202,7 @@ U8 maxRb; #if (ERRCLASS & ERRCLS_DEBUG) if (!bits) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -21243,7 +21243,7 @@ U8 maxRb; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnUlRbAllocForPoHoUe(): Could not get UlAlloc"); - RETVALUE(RFAILED); + return RFAILED; } rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc); @@ -21271,7 +21271,7 @@ U8 maxRb; RG_SCH_UL_MCS_TO_MODODR(alloc->grnt.iMcsCrnt,alloc->grnt.modOdr); rgSCHUhmNewTx(proc, ueUl->hqEnt.maxHqRetx, alloc); /* No grant attr recorded now */ - RETVALUE(ROK); + return ROK; } /** @@ -21463,9 +21463,9 @@ RgSchUlAlloc *alloc2; ((alloc2->sbStart >= alloc1->sbStart) && (alloc2->sbStart <= alloc1->sbStart + alloc1->numSb-1))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /** * @brief Copy allocation Info from src to dst. @@ -22116,7 +22116,7 @@ RgSchUlHole *hole; pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf); if (pdcch == NULLP) { - RETVALUE(FALSE); + return (FALSE); } /* Fetch UL Alloc for msg3 */ @@ -22131,7 +22131,7 @@ RgSchUlHole *hole; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "UL Alloc fail for msg3 retx for rnti: %d\n", proc->reTxAlloc.rnti); - RETVALUE(FALSE); + return (FALSE); } rgSCHCmnUlAllocFillRbInfo(cell, sf, alloc); @@ -22234,9 +22234,9 @@ RgSchUlHole *hole; RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, "Num SB not suffiecient for adap retx for rnti: %d", proc->reTxAlloc.rnti); - RETVALUE(FALSE); + return (FALSE); } - RETVALUE(TRUE); + return (TRUE); } /* Fix: syed Adaptive Msg3 Retx crash. */ @@ -22661,7 +22661,7 @@ Bool isPartialAlloc; * same */ } - RETVALUE(numAllocRbgs); + return (numAllocRbgs); } #ifdef RGSCH_SPS_UNUSED @@ -22814,7 +22814,7 @@ Bool isPartialAlloc; *allocRbgSubset = bestSubsetIdx; } /* End of if (bestNumAvailRbs) */ - RETVALUE(numAllocRbs); + return (numAllocRbs); } #endif /** @@ -22910,7 +22910,7 @@ Bool isPartialAlloc; } } - RETVALUE(numAllocRbs); + return (numAllocRbs); } /** @@ -22946,7 +22946,7 @@ U8 rbgSize; rbg = rbIdx/rbgSize; rbgPosInRbgMask = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbg); - RETVALUE(rbgPosInRbgMask); + return (rbgPosInRbgMask); } #ifdef RGSCH_SPS_UNUSED @@ -22991,7 +22991,7 @@ U8 *type1Subset; rbPosInSubset = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbInSubset); *type1Subset = rbgSubset; - RETVALUE(rbPosInSubset); + return (rbPosInSubset); } #endif /* RGSCH_SPS_UNUSED */ /** @@ -23026,7 +23026,7 @@ U8 *maskIdx; *maskIdx = rbIdx / 32; rbPosInType2 = 1 << RG_SCH_CMN_DL_GET_POS_FRM_LSB(rbIdx % 32); - RETVALUE(rbPosInType2); + return (rbPosInType2); } /** @@ -23082,20 +23082,20 @@ Bool isPartialAlloc; if ((0 == rbAllocInfo->tbInfo[0].schdlngForTb) && (0 == rbAllocInfo->tbInfo[1].schdlngForTb)) { - RETVALUE(TRUE); + return (TRUE); } /* Check if the requirement can be accomodated in SPS BW */ if (dlSf->spsAllocdBw == spsRbgInfo->numRbs) { /* SPS Bandwidth has been exhausted: no further allocations possible */ - RETVALUE(FALSE); + return (FALSE); } if (!isPartialAlloc) { if((dlSf->spsAllocdBw + rbAllocInfo->rbsReq) > spsRbgInfo->numRbs) { - RETVALUE(TRUE); + return (TRUE); } } @@ -23133,7 +23133,7 @@ Bool isPartialAlloc; } if (!numAllocRbs) { - RETVALUE(TRUE); + return (TRUE); } if (!(rbAllocInfo->pdcch = @@ -23141,7 +23141,7 @@ Bool isPartialAlloc; rbAllocInfo->dciFormat, FALSE))) { /* Note: Returning TRUE since PDCCH might be available for another UE */ - RETVALUE(TRUE); + return (TRUE); } /* Update Tb info for each scheduled TB */ @@ -23204,7 +23204,7 @@ Bool isPartialAlloc; } dlSf->spsAllocdBw += numAllocRbs; - RETVALUE(TRUE); + return (TRUE); } /*********************************************************** @@ -23565,7 +23565,7 @@ RgSchDlRbAlloc *allocInfo; addtlRbsAvl = (dlSf->bw - dlSf->bwAlloced) - allocInfo->rbsReq; } - RETVALUE(addtlRbsAvl); + return (addtlRbsAvl); } /* Added this function to find num of ovrlapping PBCH rb*/ @@ -23895,7 +23895,7 @@ RgSchDlRbAlloc *allocInfo; if(dlSf->bwAlloced == dlSf->bw) #endif { - RETVALUE(RFAILED); + return RFAILED; } #ifndef LTE_TDD if (allocInfo->rbsReq > (dlSf->bw - dlSf->bwAlloced)) @@ -23928,7 +23928,7 @@ RgSchDlRbAlloc *allocInfo; if (!spsRbsAlloc) #endif /* LTEMAC_SPS */ { - RETVALUE(RFAILED); + return RFAILED; } } } @@ -23938,7 +23938,7 @@ RgSchDlRbAlloc *allocInfo; allocInfo->pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf); if (allocInfo->pdcch == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } allocInfo->dciFormat = TFU_DCI_FORMAT_1A; allocInfo->pdcch->dciNumOfBits = cell->dciSize.size[TFU_DCI_FORMAT_1A]; @@ -24058,7 +24058,7 @@ RgSchDlRbAlloc *allocInfo; } #endif - RETVALUE(ROK); + return ROK; } @@ -24096,7 +24096,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) if(dlSf->bwAlloced == dlSf->bw) { - RETVALUE(RFAILED); + return RFAILED; } allocInfo->tbInfo[0].noLyr = 1; @@ -24105,7 +24105,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) allocInfo->pdcch = rgSCHCmnCmnPdcchAlloc(cell, dlSf); if (allocInfo->pdcch == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } allocInfo->dciFormat = TFU_DCI_FORMAT_1A; allocInfo->pdcch->dciNumOfBits = cell->dciSize.size[TFU_DCI_FORMAT_1A]; @@ -24124,13 +24124,13 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) allocInfo->pdcch = rgSCHCmnPdcchAlloc(cell, NULLP, dlSf, 13, TFU_DCI_FORMAT_B1, FALSE); if (allocInfo->pdcch == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } RgSchSfBeamInfo *beamInfo = &(dlSf->sfBeamInfo[0]); if(beamInfo->totVrbgAllocated > MAX_5GTF_VRBG) { printf("5GTF_ERROR vrbg allocated > 25\n"); - RETVALUE(RFAILED); + return RFAILED; } allocInfo->tbInfo[0].cmnGrnt.vrbgStart = beamInfo->vrbgStart; @@ -24155,7 +24155,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) printf("\n[%s],allocInfo->tbInfo[0].bytesAlloc:%u,vrbgReq:%u\n", __func__,allocInfo->tbInfo[0].bytesAlloc,allocInfo->vrbgReq); - RETVALUE(ROK); + return ROK; } @@ -24279,7 +24279,7 @@ Bool isUeCellEdge; /* Check if type0 allocation can cater to this RETX requirement */ if ((allocInfo->rbsReq % cell->rbgSize) != (cell->rbgSize - dlSf->lstRbgDfct)) { - RETVALUE(FALSE); + return (FALSE); } else { @@ -24292,7 +24292,7 @@ Bool isUeCellEdge; else { /* cannot allocate same number of required RBs */ - RETVALUE(FALSE); + return (FALSE); } } } @@ -24302,7 +24302,7 @@ Bool isUeCellEdge; cell->rbgSize) - dlSf->lstRbgDfct)) { *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { @@ -24331,7 +24331,7 @@ Bool isUeCellEdge; noLyrs = allocInfo->tbInfo[0].noLyr; allocInfo->tbInfo[0].bytesReq = rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8; *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { @@ -24348,7 +24348,7 @@ Bool isUeCellEdge; continue; } - // RETVALUE(FALSE); + // return (FALSE); } } else if (allocInfo->raType == RG_SCH_CMN_RA_TYPE2) @@ -24385,7 +24385,7 @@ Bool isUeCellEdge; cell->rbgSize); sfrPool->adjCCPool->bw -= addtnlPRBs; *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } } } @@ -24403,12 +24403,12 @@ Bool isUeCellEdge; if(allocInfo->rbsReq <= (sfrCEPool->bw - sfrCEPool->bwAlloced)) { *sfrpoolInfo = sfrCEPool; - RETVALUE(TRUE); + return (TRUE); } else if(allocInfo->rbsReq <= (sfrPool->bw - sfrPool->bwAlloced)) { *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } /* Check if CE and CC boundary has unallocated prbs */ else if ((sfrPool->poolstartRB == sfrPool->type2Start) && @@ -24437,7 +24437,7 @@ Bool isUeCellEdge; sfrCEPool->type0End = ((sfrCEPool->poolendRB + 1 - addtnlPRBs) / cell->rbgSize) - 1; } *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else if ( bwAvlbl < ((sfrCEPool->bw - sfrCEPool->bwAlloced) + @@ -24459,11 +24459,11 @@ Bool isUeCellEdge; allocInfo->tbInfo[0].bytesReq = rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8; *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { - RETVALUE(FALSE); + return (FALSE); } } } @@ -24479,7 +24479,7 @@ Bool isUeCellEdge; if (allocInfo->rbsReq <= (sfrPool->bw - sfrPool->bwAlloced)) { *sfrpoolInfo = sfrPool; - RETVALUE(TRUE); + return (TRUE); } else { @@ -24517,7 +24517,7 @@ Bool isUeCellEdge; { dlSf->sfrTotalPoolInfo.ccBwFull = TRUE; } - RETVALUE(FALSE); + return (FALSE); } else { @@ -24529,7 +24529,7 @@ Bool isUeCellEdge; allocInfo->tbInfo[0].bytesReq = rgTbSzTbl[noLyrs-1][tbs][allocInfo->rbsReq - 1]/8; *sfrpoolInfo = poolWithMaxAvlblBw; - RETVALUE(TRUE); + return (TRUE); } } } @@ -24548,14 +24548,14 @@ Bool isUeCellEdge; if (n == NULLP) { - RETVALUE(FALSE); + return (FALSE); } } } } } - RETVALUE(FALSE); + return (FALSE); } #endif #endif /* end of ifndef LTE_TDD*/ @@ -24603,7 +24603,7 @@ RgSchDlRbAlloc *allocInfo; { RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, "(%d:%d)FAILED CRNTI:%d", dlSf->bw, dlSf->bwAlloced,allocInfo->rnti); - RETVALUE(FALSE); + return (FALSE); } if (allocInfo->raType == RG_SCH_CMN_RA_TYPE0) { @@ -24635,13 +24635,13 @@ RgSchDlRbAlloc *allocInfo; /* Check if type0 allocation can cater to this RETX requirement */ if ((allocInfo->rbsReq % cell->rbgSize) != (cell->rbgSize - dlSf->lstRbgDfct)) { - RETVALUE(FALSE); + return (FALSE); } } else { /* cannot allocate same number of required RBs */ - RETVALUE(FALSE); + return (FALSE); } } } @@ -24651,7 +24651,7 @@ RgSchDlRbAlloc *allocInfo; if(allocInfo->rbsReq <= (((dlSf->type0End - dlSf->type2End + 1)*\ cell->rbgSize) - dlSf->lstRbgDfct)) { - RETVALUE(TRUE); + return (TRUE); } /* ccpu00132358:MOD- Removing "ifndef LTE_TDD" for unblocking the RB * allocation in TDD when requested RBs are more than available RBs*/ @@ -24670,7 +24670,7 @@ RgSchDlRbAlloc *allocInfo; } - RETVALUE(FALSE); + return (FALSE); } /* Fix: Number of RBs in case of RETX should be same as * that of initial transmission. */ @@ -24710,16 +24710,16 @@ RgSchDlRbAlloc *allocInfo; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "FAILED for CRNTI:%d", allocInfo->rnti); printf ("RB Alloc failed for LAA TB type 0\n"); - RETVALUE(FALSE); + return (FALSE); } - RETVALUE(TRUE); + return (TRUE); } } else if (allocInfo->raType == RG_SCH_CMN_RA_TYPE2) { if (allocInfo->rbsReq <= (dlSf->bw - dlSf->bwAlloced)) { - RETVALUE(TRUE); + return (TRUE); } /* ccpu00132358:MOD- Removing "ifndef LTE_TDD" for unblocking the RB * allocation in TDD when requested RBs are more than available RBs*/ @@ -24752,15 +24752,15 @@ RgSchDlRbAlloc *allocInfo; { printf ("RB Alloc failed for LAA TB type 2\n"); RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti); - RETVALUE(FALSE); + return (FALSE); } /* Fix: Number of RBs in case of RETX should be same as * that of initial transmission. */ - RETVALUE(TRUE); + return (TRUE); } } RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"FAILED for CRNTI:%d",allocInfo->rnti); - RETVALUE(FALSE); + return (FALSE); } #endif /* LTE_ADV_FLAG_REMOVED_START */ @@ -24900,7 +24900,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "sfrCCPool1 is NULL for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } n = cmLListNext(l); if(n) @@ -24924,7 +24924,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -24941,7 +24941,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdDSFRTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -24952,7 +24952,7 @@ U8 numRb; /*MS_FIX for ccpu00123918*/ dlSf->type2Start += numRb; #endif - RETVALUE(ROK); + return ROK; } #endif @@ -25232,7 +25232,7 @@ U16 bw; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnBuildRntpInfo():" "rntpPtr can't be NULLP (Memory Allocation Failed)"); - RETVALUE(RFAILED); + return RFAILED; } while(rbPtrStartIdx <= rbPtrEndIdx) @@ -25263,7 +25263,7 @@ U16 bw; /* dsfr_pal_fixes ** 25-March-2013 ** SKS ** Adding Debug logs to print RNTP */ - RETVALUE(ROK); + return ROK; } /** @@ -25330,7 +25330,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -25342,7 +25342,7 @@ U8 numRb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc():" "rgSCHCmnBuildRntpInfo() function returned RFAILED for CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -25350,7 +25350,7 @@ U8 numRb; sfrPool->bwAlloced += numRb; #endif - RETVALUE(ROK); + return ROK; } /** @@ -25627,7 +25627,7 @@ U8 *isDlBwAvail; { *isDlBwAvail = FALSE; } - RETVALUE(RFAILED); + return RFAILED; } if (dlUe->proc->tbInfo[0].isAckNackDtx == TFU_HQFDB_DTX || dlUe->proc->tbInfo[1].isAckNackDtx) @@ -25642,7 +25642,7 @@ U8 *isDlBwAvail; if (!(allocInfo->pdcch)) { /* Returning ROK since PDCCH might be available for another UE and further allocations could be done */ - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -25683,7 +25683,7 @@ U8 *isDlBwAvail; dlSf->bwAlloced += allocInfo->rbsReq; #endif - RETVALUE(ROK); + return ROK; } #endif /* LTE_ADV_FLAG_REMOVED_END */ @@ -25745,7 +25745,7 @@ U8 *isDlBwAvail; "5GTF_ERROR : vrbg allocated > 25 :ue (%u)", ue->ueId); printf("5GTF_ERROR vrbg allocated > 25\n"); - RETVALUE(RFAILED); + return RFAILED; } if (dlUe->proc->tbInfo[0].isAckNackDtx == TFU_HQFDB_DTX @@ -25765,7 +25765,7 @@ U8 *isDlBwAvail; "5GTF_ERROR : PDCCH allocation failed :ue (%u)", ue->ueId); printf("5GTF_ERROR PDCCH allocation failed\n"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef RG_5GTF //maxPrb = RGSCH_MIN((allocInfo->vrbgReq * MAX_5GTF_VRBG_SIZE), ue5gtfCb->maxPrb); @@ -25789,7 +25789,7 @@ U8 *isDlBwAvail; allocInfo->tbInfo[0].bytesAlloc = allocInfo->tbInfo[0].bytesReq; #endif - RETVALUE(ROK); + return ROK; } #ifdef RGR_V1 @@ -25935,7 +25935,7 @@ RgSchDlSf *dlSf; (allocInfo->rbsReq > (dlSf->bw - dlSf->bwAlloced))) #endif { - RETVALUE(RFAILED); + return RFAILED; } /* Retrieve PDCCH */ /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ @@ -25952,7 +25952,7 @@ RgSchDlSf *dlSf; if (!(allocInfo->pdcch)) { /* Returning RFAILED since PDCCH not available for any CCCH allocations */ - RETVALUE(RFAILED); + return RFAILED; } /* Update allocation information */ @@ -25988,7 +25988,7 @@ RgSchDlSf *dlSf; /* ccpu00131941 - bwAlloced is updated from SPS bandwidth */ - RETVALUE(ROK); + return ROK; } #endif @@ -26038,7 +26038,7 @@ RgSchDlSf *dlSf; "5GTF_ERROR : vrbg allocated > 25 :ue (%u)", raCb->ue->ueId); printf("5GTF_ERROR vrbg allocated > 25\n"); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef LTEMAC_SPS @@ -26050,7 +26050,7 @@ RgSchDlSf *dlSf; #endif { - RETVALUE(RFAILED); + return RFAILED; } /* DTX Changes: One Variable is passed to check whether it is DTX or Not */ @@ -26065,7 +26065,7 @@ RgSchDlSf *dlSf; if (!(allocInfo->pdcch)) { /* Returning RFAILED since PDCCH not available for any CCCH allocations */ - RETVALUE(RFAILED); + return RFAILED; } #ifndef RG_5GTF @@ -26125,7 +26125,7 @@ RgSchDlSf *dlSf; #endif - RETVALUE(ROK); + return ROK; } /** @@ -26529,7 +26529,7 @@ U8 numRb; { riv = bw * (bw - numRbMinus1) + (bw - rbStart - 1); } - RETVALUE(riv); + return (riv); } /* rgSCHCmnCalcRiv */ #ifdef LTE_TDD @@ -26585,7 +26585,7 @@ U8 raArrSz; sizeof(RgSchTddRachRspLst)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } for(sfnIdx=raArrSz-1; sfnIdx>=0; sfnIdx--) @@ -26640,7 +26640,7 @@ U8 raArrSz; } } } - RETVALUE(ROK); + return ROK; } #endif /** @@ -26746,7 +26746,7 @@ U8 noLyr; ueDl->laCb[cwIdx].deltaiTbs = 0; } - RETVALUE(iTbs); + return (iTbs); } /** @@ -27305,12 +27305,12 @@ U8 *raType; if ((cellSch->dl.isDlFreqSel) && (ue->txModeTransCmplt)) { *raType = rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciRAType; - RETVALUE(rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciFrmt); + return (rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].spfcDciFrmt); } else { *raType = rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciRAType; - RETVALUE(rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciFrmt); + return (rgSchCmnDciFrmtOptns[ue->mimoInfo.txMode-1].prfrdDciFrmt); } } @@ -27663,7 +27663,7 @@ Bool bothCwEnbld; { TRC2(rgSCHCmnDlTM3PrecInf2); - RETVALUE(0); + return (0); } @@ -27752,7 +27752,7 @@ Bool bothCwEnbld; { precIdx = (ueDl->mimoInfo.pmi < 2)? 0:1; } - RETVALUE(precIdx); + return (precIdx); } @@ -27801,7 +27801,7 @@ Bool bothCwEnbld; { precIdx = 1; } - RETVALUE(precIdx); + return (precIdx); } @@ -27854,7 +27854,7 @@ Bool bothCwEnbld; precInfoBaseIdx += 1; precIdx = precInfoBaseIdx + (numTxLyrs-1)*17; } - RETVALUE(precIdx); + return (precIdx); } @@ -29370,7 +29370,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; } } - RETVALUE(ROK); + return ROK; } /* DwPTS Scheduling Changes Start */ @@ -29421,7 +29421,7 @@ RgSchDlHqProcCb *proc; /* Avoid re-transmission on Normal SF when the corresponding TB wss transmitted on SPCL SF */ if(txSfType <= RG_SCH_SPL_SF_DATA && curSf->sfType >= RG_SCH_DL_SF_0) { - RETVALUE(TRUE); + return (TRUE); } #endif #endif @@ -29437,7 +29437,7 @@ RgSchDlHqProcCb *proc; /* Avoid re-transmission on Normal SF when the corresponding TB wss tranmitted on SPCL SF */ if(txSfType <= RG_SCH_SPL_SF_DATA && curSf->sfType >= RG_SCH_DL_SF_0) { - RETVALUE(TRUE); + return (TRUE); } #endif #endif @@ -29446,11 +29446,11 @@ RgSchDlHqProcCb *proc; if (txSfType > curSf->sfType) { /* Avoid retx */ - RETVALUE(TRUE); + return (TRUE); } /* Allow Retx */ - RETVALUE(FALSE); + return (FALSE); } #else @@ -29508,10 +29508,10 @@ RgSchDlHqProcCb *proc; if ((subFrm->bwAssigned < cell->pbchRbEnd) && (((subFrm->bwAssigned + reqRbs) - cell->pbchRbStart) > 0)) { - RETVALUE(TRUE); + return (TRUE); } } - RETVALUE(FALSE); + return (FALSE); } #endif @@ -29574,7 +29574,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; /* Check for DL BW exhaustion */ if (subFrm->bw <= subFrm->bwAssigned) { - RETVALUE(RFAILED); + return RFAILED; } /* Call TM specific RB allocation routine */ (dlAllocRetxRbFunc[ue->mimoInfo.txMode - 1])(cell, subFrm, ue, bo, effBo, \ @@ -29596,7 +29596,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; RGSCHCPYTIMEINFO((cell->crntTime),(ue->dl.lstSchTime)) } - RETVALUE(ROK); + return ROK; } @@ -29698,7 +29698,7 @@ U32 *effBo; /* Update the subframe Allocated BW field */ subFrm->bwAssigned = subFrm->bwAssigned + tempNumRb - allocInfo->rbsReq; - RETVALUE(ROK); + return ROK; } @@ -29862,7 +29862,7 @@ U32 *effBo; { RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHCmnDlAllocRb(): UEs max allocation exceed"); - RETVALUE(RFAILED); + return RFAILED; } noLyr1 = ueDl->mimoInfo.cwInfo[0].noLyr; @@ -30020,7 +30020,7 @@ U32 *effBo; #ifdef LTE_ADV if (ROK != rgSCHLaaCmn2TBPrbCheck(allocInfo, tb1Sz, tb2Sz, boTmp, effBo, iTbs1, iTbs2, numRb, proc)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -30033,7 +30033,7 @@ U32 *effBo; *numRbRef = (U8)numRb; - RETVALUE(ROK); + return ROK; } @@ -30118,14 +30118,14 @@ U32 *effBo; if(*numRb <= 3) { RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb); - RETVALUE(RFAILED); + return RFAILED; } } #endif if ((S16)*numRb > availBw) { - RETVALUE(RFAILED); + return RFAILED; } /* Update the subframe Allocated BW field */ subFrm->bwAssigned += *numRb; @@ -30163,7 +30163,7 @@ U32 *effBo; *effBo = reTxTb->tbSz + tb2Sz; - RETVALUE(ROK); + return ROK; } @@ -30251,13 +30251,13 @@ U32 *effBo; if(*numRb <= 3) { RLOG1(L_ERROR," Number of RBs [%d] are less than or equal to 3",*numRb); - RETVALUE(RFAILED); + return RFAILED; } } #endif if ((S16)*numRb > (S16)(subFrm->bw - subFrm->bwAssigned)) { - RETVALUE(RFAILED); + return RFAILED; } /* Update the subframe Allocated BW field */ subFrm->bwAssigned += *numRb; @@ -30271,7 +30271,7 @@ U32 *effBo; - RETVALUE(ROK); + return ROK; } @@ -30335,7 +30335,7 @@ U32 *effBo; *numRb = tbInfo->dlGrnt.numRb; if ((S16)*numRb > (S16)(subFrm->bw - subFrm->bwAssigned)) { - RETVALUE(RFAILED); + return RFAILED; } /* Update the subframe Allocated BW field */ subFrm->bwAssigned += *numRb; @@ -30346,7 +30346,7 @@ U32 *effBo; 0, imcs, tbInfo, tbInfo->numLyrs); *effBo = tbInfo->tbSz; - RETVALUE(ROK); + return ROK; } #ifdef LTEMAC_SPS @@ -31443,7 +31443,7 @@ RgrUeCqiRept *ueCqiRpt; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Could not " "allocate memory for sending StaInd CRNTI:%d",ue->ueId); - RETVALUE(retVal); + return (retVal); } /* Step 4.1: Fill StaInd for sending collated N CQI rpeorts */ @@ -31457,11 +31457,11 @@ RgrUeCqiRept *ueCqiRpt; #endif retVal = rgSCHUtlFillSndStaInd(cell, ue, staInfo, ue->cqiReptCfgInfo.numColltdCqiRept); - RETVALUE(retVal); + return (retVal); } - RETVALUE(ROK); + return ROK; } /* End of rgSCHCmnUeDlPwrCtColltCqiRept */ #endif /* End of RGR_CQI_REPT */ @@ -31544,7 +31544,7 @@ U16 minPeriodicity; { /* 80 is the minimum SI periodicity in sf. Also * all other SI periodicities are multiples of 80 */ - RETVALUE (((sfn * RGSCH_NUM_SUB_FRAMES_5G) + sf) / (minPeriodicity * 10)); + return (((sfn * RGSCH_NUM_SUB_FRAMES_5G) + sf) / (minPeriodicity * 10)); } #ifdef LTE_TDD /** @@ -31614,7 +31614,7 @@ U8 cfi; } *rb = numDwPtsRb; - RETVALUE(tbSz/8); + return (tbSz/8); } /** @@ -32070,17 +32070,17 @@ RgSchCellCb *cell; /* Calculating the percentage resource allocated */ if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode) { - RETVALUE(FALSE); + return (FALSE); } else { if(((cmnDlCell->ncsgPrbCnt * 100) / cmnDlCell->totPrbCnt) < cell->minDlResNonCsg) { - RETVALUE(FALSE); + return (FALSE); } else { - RETVALUE(TRUE); + return (TRUE); } } } @@ -32118,17 +32118,17 @@ RgSchCellCb *cell; /* Calculating the percentage resource allocated */ if(RGR_CELL_ACCS_HYBRID != rgSchCb[cell->instIdx].rgrSchedEnbCfg.accsMode) { - RETVALUE(FALSE); + return (FALSE); } else { if (((cmnUlCell->ncsgPrbCnt * 100) /cmnUlCell->totPrbCnt) < cell->minUlResNonCsg) { - RETVALUE(FALSE); + return (FALSE); } else { - RETVALUE(TRUE); + return (TRUE); } } } @@ -32381,7 +32381,7 @@ PUBLIC U8 rgSCHCmnCalcPcqiBitSz(ueCb, numTxAnt) break; } - RETVALUE(pcqiSz); + return (pcqiSz); } /** @brief DL scheduler for SPS, and all other downlink data diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c index a709bf9f9..eebf74c34 100755 --- a/src/5gnrsch/rg_sch_dbm.c +++ b/src/5gnrsch/rg_sch_dbm.c @@ -116,17 +116,17 @@ RgSchCellCb *cellCb; /* Initialize ue list */ if ((ret = rgSCHDbmInitUeCbLst(cellCb, RGSCH_MAX_UE_BIN_PER_CELL)) != ROK) - RETVALUE(ret); + return (ret); #ifdef LTE_TDD if ((ret = rgSCHDbmInitUeTfuPendLst(cellCb, RGSCH_MAX_UE_BIN_PER_CELL)) != ROK) - RETVALUE(ret); + return (ret); #endif #ifdef LTEMAC_SPS /* Initialize SPS Ue list */ if ((ret = rgSCHDbmInitSpsUeCbLst(cellCb, RGSCH_MAX_UE_BIN_PER_CELL)) != ROK) - RETVALUE(ret); + return (ret); #endif /* LTEMAC_SPS */ /* Initialize BCCH/PCCH logical channels */ @@ -149,7 +149,7 @@ RgSchCellCb *cellCb; cmLListInit(&cellCb->l2mList); #endif /* LTE_L2_MEAS */ - RETVALUE(ret); + return (ret); } /* rgSCHDbmInitCell */ @@ -184,7 +184,7 @@ U16 numBins; /* Fix: syed It is better to compute offset dynamically * rather than hardcoding it as 0 */ - RETVALUE(cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, + return (cmHashListInit(&cellCb->ueLst, numBins, (U16)((PTR)&(ueCellInfo.ueLstEnt) - (PTR)&ueCellInfo), FALSE, CM_HASH_KEYTYPE_CONID, rgSchCb[cellCb->instIdx].rgSchInit.region, rgSchCb[cellCb->instIdx].rgSchInit.pool)); @@ -216,7 +216,7 @@ RgSchCellCb *cellCb; { TRC2(rgSCHDbmDeInitUeCbLst) - RETVALUE(cmHashListDeinit(&cellCb->ueLst)); + return (cmHashListDeinit(&cellCb->ueLst)); } /* rgSCHDbmDeInitUeCbLst */ @@ -250,7 +250,7 @@ U16 numBins; RgSchUeCb ue; TRC2(rgSCHDbmInitSpsUeCbLst) - RETVALUE(cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, + return (cmHashListInit(&cellCb->spsUeLst, numBins, (U16) ((PTR) &(ue.spsUeLstEnt) - (PTR) &ue), FALSE, CM_HASH_KEYTYPE_CONID, rgSchCb[cellCb->instIdx].rgSchInit.region, rgSchCb[cellCb->instIdx].rgSchInit.pool)); @@ -282,7 +282,7 @@ RgSchCellCb *cellCb; { TRC2(rgSCHDbmDeInitSpsUeCbLst) - RETVALUE(cmHashListDeinit(&cellCb->spsUeLst)); + return (cmHashListDeinit(&cellCb->spsUeLst)); } /* rgSCHDbmDeInitSpsUeCbLst */ @@ -319,7 +319,7 @@ RgSchUeCb *ueCb; ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]]; - RETVALUE(cmHashListInsert(&cellCb->ueLst, (PTR)ueCellInfo, + return (cmHashListInsert(&cellCb->ueLst, (PTR)ueCellInfo, (U8 *)&ueCb->ueId, (U16)sizeof(ueCb->ueId))); } /* rgSCHDbmInsUeCb */ @@ -353,7 +353,7 @@ RgSchUeCb *ueCb; { TRC2(rgSCHDbmInsSpsUeCb) - RETVALUE(cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, + return (cmHashListInsert(&cellCb->spsUeLst, (PTR)ueCb, (U8 *)&ueCb->spsRnti, (U16)sizeof(ueCb->spsRnti))); } /* end of rgSCHDbmInsSpsUeCb */ @@ -392,7 +392,7 @@ CmLteRnti ueId; cmHashListFind(&cellCb->ueLst, (U8 *)&ueId, sizeof(ueId), 0, (PTR *)&ueCellInfo); - RETVALUE(!ueCellInfo?NULLP:ueCellInfo->ue); + return (!ueCellInfo?NULLP:ueCellInfo->ue); } /* rgSCHDbmGetUeCb */ #ifdef LTEMAC_SPS @@ -427,7 +427,7 @@ CmLteRnti spsRnti; cmHashListFind(&cellCb->spsUeLst, (U8 *)&spsRnti, sizeof(spsRnti), 0, (PTR *)&ueCb); - RETVALUE(ueCb); + return (ueCb); } /* rgSCHDbmGetSpsUeCb */ #endif @@ -468,7 +468,7 @@ RgSchUeCb *ueCb; } cmHashListGetNext(&cellCb->ueLst, (PTR) ueCellInfo, (PTR *)&nextUeCellInfo); - RETVALUE(!nextUeCellInfo?NULLP:nextUeCellInfo->ue); + return (!nextUeCellInfo?NULLP:nextUeCellInfo->ue); } /* rgSCHDbmGetNextUeCb */ #ifdef LTEMAC_SPS @@ -502,7 +502,7 @@ RgSchUeCb *ueCb; TRC2(rgSCHDbmGetNextSpsUeCb) cmHashListGetNext(&cellCb->spsUeLst, (PTR) ueCb, (PTR *)&nextUeCb); - RETVALUE(nextUeCb); + return (nextUeCb); } /* end of rgSCHDbmGetNextSpsUeCb */ #endif /* LTEMAC_SPS */ @@ -566,7 +566,7 @@ RgSchUeCb *ueCb; } } - RETVALUE(ROK); + return ROK; } /* rgSCHDbmDelL2MUe */ #endif @@ -603,7 +603,7 @@ RgSchUeCb *ueCb; ueCellInfo = ueCb->cellInfo[ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cellCb)]]; - RETVALUE(cmHashListDelete(&cellCb->ueLst, (PTR)ueCellInfo)); + return (cmHashListDelete(&cellCb->ueLst, (PTR)ueCellInfo)); } /* rgSCHDbmDelUeCb */ #ifdef LTEMAC_SPS @@ -636,7 +636,7 @@ RgSchUeCb *ueCb; { TRC2(rgSCHDbmDelSpsUeCb) - RETVALUE(cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb)); + return (cmHashListDelete(&cellCb->spsUeLst, (PTR)ueCb)); } /* end of rgSCHDbmDelSpsUeCb */ #endif /* LTEMAC_SPS */ @@ -673,7 +673,7 @@ RgSchUeCb *ueCb; /* Initialize Dedicated logical channels */ rgSCHDbmInitDedLcLst(ueCb); - RETVALUE(ret); + return (ret); } /* rgSCHDbmInitUe */ /** @@ -860,9 +860,9 @@ CmLteLcId idx; if (idx < RGSCH_DEDLC_MIN_LCID || idx > RGSCH_DEDLC_MAX_LCID) { - RETVALUE(NULLP); + return (NULLP); } - RETVALUE(ueCb->dl.lcCb[idx-1]); + return (ueCb->dl.lcCb[idx-1]); } /* rgSCHDbmGetDlDedLcCb */ @@ -895,10 +895,10 @@ RgSchUeCb *ueCb; { if(ueCb->dl.lcCb[idx]) { - RETVALUE(ueCb->dl.lcCb[idx]); + return (ueCb->dl.lcCb[idx]); } } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetFirstDlDedLcCb */ /** * @brief Handler for accessing the existing next dl dedicated lcCb at idx @@ -930,17 +930,17 @@ RgSchDlLcCb *lcCb; if (!lcCb) { - RETVALUE(rgSCHDbmGetFirstDlDedLcCb(ueCb)); + return (rgSCHDbmGetFirstDlDedLcCb(ueCb)); } for(idx = lcCb->lcId; idx < RGSCH_DEDLC_MAX_LCID; idx++) { if(ueCb->dl.lcCb[idx]) { - RETVALUE(ueCb->dl.lcCb[idx]); + return (ueCb->dl.lcCb[idx]); } } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetNextDlDedLcCb */ /** @@ -976,10 +976,10 @@ CmLteLcId lcId; { if(cellCb->cmnLcCb[idx].lcId == lcId) { - RETVALUE(&(cellCb->cmnLcCb[idx])); + return (&(cellCb->cmnLcCb[idx])); } } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetCmnLcCb */ /** @@ -1008,9 +1008,9 @@ RgSchCellCb *cellCb; if(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX].lcId != RGSCH_INVALID_LC_ID) { - RETVALUE(&(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX])); + return (&(cellCb->cmnLcCb[RGSCH_BCCH_BCH_IDX])); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetBcchOnBch */ /** @@ -1039,9 +1039,9 @@ RgSchCellCb *cellCb; if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1].lcId != RGSCH_INVALID_LC_ID) { - RETVALUE(&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1])); + return (&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX1])); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetFirstBcchOnDlsch */ /** @@ -1070,9 +1070,9 @@ RgSchCellCb *cellCb; if(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2].lcId != RGSCH_INVALID_LC_ID) { - RETVALUE(&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2])); + return (&(cellCb->cmnLcCb[RGSCH_BCCH_DLSCH_IDX2])); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetSecondBcchOnDlsch */ /** @@ -1100,9 +1100,9 @@ RgSchCellCb *cellCb; if(cellCb->cmnLcCb[RGSCH_PCCH_IDX].lcId != RGSCH_INVALID_LC_ID) { - RETVALUE(&(cellCb->cmnLcCb[RGSCH_PCCH_IDX])); + return (&(cellCb->cmnLcCb[RGSCH_PCCH_IDX])); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetPcch */ /** @@ -1339,11 +1339,11 @@ CmLteRnti key; { if(((RgSchRaCb *)tmpNode->node)->tmpCrnti == key) { - RETVALUE((RgSchRaCb *)(tmpNode->node)); + return ((RgSchRaCb *)(tmpNode->node)); } CM_LLIST_NEXT_NODE(&cellCb->raInfo.raCbLst,tmpNode); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetRaCb */ #ifndef LTE_TDD @@ -1529,10 +1529,10 @@ RgSchCfgElem *cfgElem; if(!cfgElem) { - RETVALUE( cellCb->rgCfgInfo.crntRgrCfgLst.first ? + return ( cellCb->rgCfgInfo.crntRgrCfgLst.first ? (RgSchCfgElem *)(cellCb->rgCfgInfo.crntRgrCfgLst.first->node) : NULLP ); } - RETVALUE( cfgElem->cfgReqLstEnt.next ? + return ( cfgElem->cfgReqLstEnt.next ? (RgSchCfgElem *)(cfgElem->cfgReqLstEnt.next->node) : NULLP ); } /* rgSCHDbmGetNextCrntRgrCfgElem */ @@ -1564,10 +1564,10 @@ RgSchCfgElem *cfgElem; if(!cfgElem) { - RETVALUE( cellCb->rgCfgInfo.pndngRgrCfgLst.first ? + return ( cellCb->rgCfgInfo.pndngRgrCfgLst.first ? (RgSchCfgElem *)(cellCb->rgCfgInfo.pndngRgrCfgLst.first->node) : NULLP ); } - RETVALUE( cfgElem->cfgReqLstEnt.next ? + return ( cfgElem->cfgReqLstEnt.next ? (RgSchCfgElem *)(cfgElem->cfgReqLstEnt.next->node) : NULLP ); } /* rgSCHDbmGetNextPndngRgrCfgElem */ @@ -1605,11 +1605,11 @@ CmLteTimingInfo key; if((((RgSchCfgElem *)tmpNode->node)->actvTime.sfn == key.sfn) && (((RgSchCfgElem *)tmpNode->node)->actvTime.slot == key.slot)) { - RETVALUE((RgSchCfgElem *)(tmpNode->node)); + return ((RgSchCfgElem *)(tmpNode->node)); } CM_LLIST_NEXT_NODE(&cellCb->rgCfgInfo.pndngRgrCfgLst,tmpNode); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmGetPndngRgrCfgElemByKey */ /** @@ -1640,9 +1640,9 @@ RgSchCfgElem *cfgElem; if(cmLListDelFrm(&cellCb->rgCfgInfo.crntRgrCfgLst,&cfgElem->cfgReqLstEnt)) { - RETVALUE((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node)); + return ((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node)); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmDelCrntRgrCfgElem */ /** @@ -1673,9 +1673,9 @@ RgSchCfgElem *cfgElem; if(cmLListDelFrm(&cellCb->rgCfgInfo.pndngRgrCfgLst,&cfgElem->cfgReqLstEnt)) { - RETVALUE((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node)); + return ((RgSchCfgElem *)(cfgElem->cfgReqLstEnt.node)); } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHDbmDelPndngRgrCfgElem */ /** @@ -1716,7 +1716,7 @@ U16 maxRntis; if(rgSCHUtlAllocSBuf(cellCb->instIdx, (Data **)&cellCb->rntiDb.rntiPool,maxRntis*sizeof(RgSchRntiLnk)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cellCb->rntiDb.rntiStart = rntiStart; cellCb->rntiDb.maxRntis = maxRntis; @@ -1750,7 +1750,7 @@ U16 maxRntis; cellCb->rntiDb.lastRnti = &rntiPool[idx]; } cellCb->rntiDb.freeRnti = &rntiPool[0]; - RETVALUE(ROK); + return ROK; } /* rgSCHDbmRntiDbInit */ /** @@ -1819,7 +1819,7 @@ RgSchCellCb *cellCb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI exhausted count:%d", cellCb->rntiDb.count); - RETVALUE(NULLP); + return (NULLP); } rntiLnk = cellCb->rntiDb.freeRnti; @@ -1841,7 +1841,7 @@ RgSchCellCb *cellCb; cellCb->rntiDb.count--; printf("rgSCHDbmGetRnti::rntiLnk->rnti %u\n",rntiLnk->rnti); - RETVALUE(rntiLnk); + return (rntiLnk); } /* rgSCHDbmGetRnti */ /** @@ -1932,10 +1932,10 @@ U16 numBins; rgSchCb[cellCb->instIdx].rgSchInit.region, rgSchCb[cellCb->instIdx].rgSchInit.pool) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHDbmInitUeTfuPendLst */ @@ -1966,7 +1966,7 @@ RgSchCellCb *cellCb; cmHashListDeinit(&cellCb->ueTfuPendLst); - RETVALUE(ROK); + return ROK; } /* rgSCHDbmDeInitUeTfuPendLst */ #endif diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c index 6f64f98e9..671574f9d 100755 --- a/src/5gnrsch/rg_sch_dhm.c +++ b/src/5gnrsch/rg_sch_dhm.c @@ -364,7 +364,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHDhmHqEntInit hqE alloc fail"); - RETVALUE(NULLP); + return (NULLP); } #ifdef LTE_TDD /* Init the HARQ processes */ @@ -374,7 +374,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHDhmHqEntInit hqP alloc fail in hqE"); - RETVALUE(NULLP); + return (NULLP); } #else hqE->numHqPrcs = RGSCH_NUM_DL_HQ_PROC; @@ -394,7 +394,7 @@ RgSchCellCb *cell; hqE->cell = cell; /* CA Dev End*/ - RETVALUE(hqE); + return (hqE); } /* rgSCHDhmHqEntInit */ /** @@ -449,7 +449,7 @@ RgSchDlHqProcCb **hqP; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetAvlHqProc hqE NULL ue %d" , ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } @@ -461,7 +461,7 @@ RgSchDlHqProcCb **hqP; "rgSCHDhmGetAvlHqProc free %ld inUse %ld ue %d" , hqE->free.count, hqE->inUse.count, ue->ueId); /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } tmpHqProc = (RgSchDlHqProcCb *)(tmp->node); @@ -483,7 +483,7 @@ RgSchDlHqProcCb **hqP; if (!tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -519,7 +519,7 @@ RgSchDlHqProcCb **hqP; tmpHqProc->itbsAtEstimate[1] = 0; tmpHqProc->prbAtEstimate = 0; - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetAvlHqProc */ @@ -630,9 +630,9 @@ RgSchDlHqEnt *hqE; * until RACH procedure is completed */ if ((hqE == NULLP) || (hqE->inUse.last == NULLP)) { - RETVALUE(NULLP); + return (NULLP); } - RETVALUE((RgSchDlHqProcCb *)hqE->inUse.last->node); + return ((RgSchDlHqProcCb *)hqE->inUse.last->node); } /* rgSCHDhmLastSchedHqProc */ #ifdef RGR_V1 @@ -686,7 +686,7 @@ RgSchDlHqProcCb **hqP; if (NULLP == tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } /* Remove the element from the free Queue and */ @@ -706,7 +706,7 @@ RgSchDlHqProcCb **hqP; //cmLListAdd2Tail(&hqE->inUse, &tmpHqProc->lnk); rgSCHDhmHqPAdd2InUseLst(tmpHqProc); - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetCcchSduHqProc */ #endif @@ -758,7 +758,7 @@ CmLteTimingInfo timingInfo; if (NULLP == tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } /* Remove the element from the free Queue and */ @@ -769,7 +769,7 @@ CmLteTimingInfo timingInfo; tmpHqProc->tbInfo[0].timingInfo = timingInfo; hqE->msg4Proc = tmpHqProc; - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetMsg4HqProc */ /** @@ -1137,7 +1137,7 @@ RgSchDlHqProcCb **hqP; /* Pick the proc based on the index provided */ *hqP = &(hqE->procs[idx]); - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetHqProcFrmId */ /** @@ -1181,7 +1181,7 @@ CmLteTimingInfo timingInfo; if (NULLP == tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(NULLP); + return (NULLP); } idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.slot)/ @@ -1204,7 +1204,7 @@ CmLteTimingInfo timingInfo; if (!tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(NULLP); + return (NULLP); } hqProc->tbInfo[0].timingInfo = timingInfo; @@ -1222,7 +1222,7 @@ CmLteTimingInfo timingInfo; rgSCHLaaResetDlHqProcCb(hqProc); #endif - RETVALUE(hqProc); + return (hqProc); } /* rgSCHDhmSpsDlGetHqProc */ #endif /* LTEMAC_SPS */ @@ -1423,7 +1423,7 @@ RgSchCellCb *cell; tbStrtIdx[*cntHqPrcs] = 0; numTbs[*cntHqPrcs] = 1; (*cntHqPrcs)++; - RETVALUE(ROK); + return ROK; } } ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.slot]; @@ -1500,7 +1500,7 @@ RgSchCellCb *cell; } - RETVALUE(ROK); + return ROK; } #else /* LTE_TDD */ /** * @brief Handler for fetching Harq Proc given the timming information. @@ -1542,11 +1542,11 @@ RgSchDlSf *sf; if (RGSCH_TIMEINFO_SAME(hqE->msg4Proc->tbInfo[0].timingInfo, timeInfo)) { *isMsg4 = TRUE; - RETVALUE(hqE->msg4Proc); + return (hqE->msg4Proc); } } - RETVALUE(NULLP); + return (NULLP); } #endif @@ -2186,7 +2186,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_DHM_FDBK_IND; err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB; - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00147469 : This code is moved below as here this code always try to @@ -2265,7 +2265,7 @@ RgSchErrInfo *err; { RGSCHDBGINFO(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx), "Ack Rcvd. No Ack/Nack feedback available \n")); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2704,7 +2704,7 @@ RgSchErrInfo *err; ue->ueId,timeInfo.sfn, timeInfo.slot); err->errType = RGSCHERR_DHM_FDBK_IND; err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB; - RETVALUE(RFAILED); + return RFAILED; } */ }/*if(hqCnt==0)*/ @@ -2736,7 +2736,7 @@ RgSchErrInfo *err; #endif } - RETVALUE(ROK); + return ROK; } //#endif /* LTEMAC_SPS */ @@ -2905,7 +2905,7 @@ RgSchErrInfo *err; { if((rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,&isAck)) != ROK) { - RETVALUE(ret); + return (ret); } } else @@ -3022,7 +3022,7 @@ RgSchErrInfo *err; { rgSCHDhmFdbkIndHndlTa(hqP, tbCnt, isAck, maxHqRetxReached); } - RETVALUE(ret); + return (ret); } /* rgSCHDhmPrcFdbkForTb */ /** * @brief Function to decode the position of HarqFb for eachCell. * @@ -3323,7 +3323,7 @@ RgSchErrInfo *err; hqPCount--; } - RETVALUE(ret); + return (ret); } /* rgSCHDhm5gtfHqFdbkInd */ /** * @brief Handler for HARQ feedback received for DL transmission. @@ -3512,7 +3512,7 @@ RgSchErrInfo *err; "CRNTI:%d NO HARQ proc available for feedback: TimingInfo: " "sfn %d slot %d", ue->ueId, timingInfo.sfn, timingInfo.slot); - RETVALUE(RFAILED); + return RFAILED; } isAck[0] = fdbk->isAck[0]; @@ -3523,7 +3523,7 @@ RgSchErrInfo *err; /* Remove release PDCCH from the subframe */ rgSCHUtlPdcchPut(cell, &sf->pdcchInfo, sf->relPdcch); sf->relPdcch = NULLP; - RETVALUE(ROK); + return ROK; } } } @@ -3611,7 +3611,7 @@ RgSchErrInfo *err; node = node->next; } - RETVALUE(ret); + return (ret); } /* rgSCHDhmHqFdbkInd */ #endif /* LTE_FDD */ @@ -4041,14 +4041,14 @@ RgSchDlHqTbCb *tbInfo; if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC) { - RETVALUE(RFAILED); + return RFAILED; } tbInfo->lchSchdDataArr[tbInfo->numLch] = *lchData; tbInfo->numLch++; - RETVALUE(ROK); + return ROK; } /* rgSCHDhmAddLcData */ @@ -4102,7 +4102,7 @@ CmLteTimingInfo uciTimingInfo; RGSCHDECRFRMCRNTTIME(uciTimingInfo, dlSfTime, ascIdx.subfrmNum[i]); rgSCHUtlDlRlsSubFrm(cellCb, dlSfTime); } - RETVALUE(ROK); + return ROK; }/* rgSCHDhmTddRlsSubFrm */ #ifdef TFU_TDD @@ -4344,7 +4344,7 @@ CmLteTimingInfo uciTimingInfo; #endif if(anInfo == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } RGSCH_NULL_CHECK(cellCb->instIdx, nxtDlsf); RGSCH_UPD_HQAN_FDBKTIME(tbCb, nxtDlsf, nxtfrm); @@ -4393,7 +4393,7 @@ CmLteTimingInfo uciTimingInfo; } } } - RETVALUE(ROK); + return ROK; }/* rgSCHDhmRlsDlsfHqProc */ #else /* ifdef LTE_TDD */ /** @@ -4554,7 +4554,7 @@ CmLteTimingInfo timingInfo; } /*CA Dev End*/ - RETVALUE(ROK); + return ROK; } /* rgSCHDhmRlsDlsfHqProc */ #endif #ifdef LTEMAC_SPS @@ -4597,7 +4597,7 @@ U8 idx; /* Pick the proc based on the index provided */ rgSCHDhmGetHqProcFrmId(ue->cell, ue, idx, &hqP); - RETVALUE(ROK); + return ROK; } /* rgSCHDhmMarkSpsHqProc */ #endif /* RG_UNUSED */ #endif /* LTEMAC_SPS */ @@ -4646,7 +4646,7 @@ U8 *isAck; /* Update timingInfo for this hqP so that next subframe its picked up */ RG_SCH_ADD_TO_CRNT_TIME(hqP->tbInfo[tbCnt].timingInfo, \ hqP->tbInfo[tbCnt].timingInfo, 1); - RETVALUE(RFAILED); + return RFAILED; } /* Take decision here based on the number @@ -4671,7 +4671,7 @@ U8 *isAck; hqP->tbInfo[tbCnt].isAckNackDtx = *isAck; - RETVALUE(ROK); + return ROK; } #endif /* ifndef LTE_TDD */ @@ -4807,7 +4807,7 @@ RgSchDlHqProcCb *hqP; RgSchMacRlsHq(&pst, rlsHqInfo); } - RETVALUE(ROK); + return ROK; } #ifdef DL_LA @@ -4853,7 +4853,7 @@ U8 tbCnt; */ rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -4913,7 +4913,7 @@ U8 tbCnt; (*(RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[1][cfi]))\ [ueDl->mimoInfo.cwInfo[tbCnt].iTbs[1]]; - RETVALUE(ROK); + return ROK; } #endif diff --git a/src/5gnrsch/rg_sch_drx.c b/src/5gnrsch/rg_sch_drx.c index 2e7107c3a..c4b84a873 100755 --- a/src/5gnrsch/rg_sch_drx.c +++ b/src/5gnrsch/rg_sch_drx.c @@ -405,7 +405,7 @@ U16 ulIndex; #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP ) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -413,7 +413,7 @@ U16 ulIndex; rgSCHDrxTtiHdlOnDurUl(cell, ulIndex); - RETVALUE(ROK); + return ROK; }/*rgSCHDrxTtiHdlOnDur*/ @@ -473,7 +473,7 @@ U16 ulIndex; #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -661,7 +661,7 @@ U16 ulIndex; cellSch = RG_SCH_CMN_GET_CELL(cell); cellSch->apisDl->rgSCHDlInactvtUes(cell,&dlInactvLst); - RETVALUE(ROK); + return ROK; }/*rgSCHDrxTtiHdlInActv*/ /** @brief This function handles the per TTI processing for DRX short cycle @@ -709,7 +709,7 @@ U16 ulIndex; #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP ) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -745,7 +745,7 @@ U16 ulIndex; rgSCHDrxMvToNxtOnDurOcc(cell,ue,RG_SCH_DRX_DL_DELTA,TRUE); }/*while(node)...*/ - RETVALUE(ROK); + return ROK; }/*rgSCHDrxTtiHdlShortCycle*/ @@ -795,7 +795,7 @@ U16 ulIndex; #if ( ERRCLASS & ERRCLS_INT_PAR) if ( cell == (RgSchCellCb *)NULLP ) { - RETVALUE(RFAILED); + return RFAILED; } #endif /*ERRCLASS & ERRCLS_INT_PAR*/ @@ -806,7 +806,7 @@ U16 ulIndex; rgSCHDrxTtiHdlUlHarqRTT(cell, ulIndex); - RETVALUE(ROK); + return ROK; } /** @brief This function is called by the common scheduler as part of @@ -1185,7 +1185,7 @@ PUBLIC S16 rgSCHDrxUeCfg (cell, ue, ueCfg) #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP) { - RETVALUE(RFAILED); + return RFAILED; } if ((ue == (RgSchUeCb* )NULLP) @@ -1194,7 +1194,7 @@ PUBLIC S16 rgSCHDrxUeCfg (cell, ue, ueCfg) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDrxUeCfg():" "Invalid params.cell or ue or ueCfg is NULL "); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1207,7 +1207,7 @@ PUBLIC S16 rgSCHDrxUeCfg (cell, ue, ueCfg) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED for DRX UECB CRBTI:%d",ue->ueId); - RETVALUE(ret); + return (ret); } ueDrxCb = ue->drxCb; @@ -1290,7 +1290,7 @@ PUBLIC S16 rgSCHDrxUeCfg (cell, ue, ueCfg) ueDrxCb->shortCycleEnt.node = (PTR)ue; } - RETVALUE(ret); + return (ret); } /* end of rgSCHDrxUeCfg */ /** @brief This function gets the next occurance of onDurationTimer from the @@ -1346,7 +1346,7 @@ PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta) #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP ) { - RETVALUE(RFAILED); + return RFAILED; } if( (drxCb == (RgSchDrxUeCb* )NULLP) @@ -1357,7 +1357,7 @@ PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDrxGetNxOnDur():Invalid params." "cell/drxCb/nxtOnDur is NULL"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1415,7 +1415,7 @@ PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta) nxtOnDur->sfn = (U16)nxtDist / RGSCH_NUM_SUB_FRAMES_5G; nxtOnDur->slot = (U16)nxtDist % RGSCH_NUM_SUB_FRAMES_5G; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHDrxGetNxtOnDur */ /** @brief This function is a utility function to copy the UE configuration from @@ -1453,7 +1453,7 @@ PRIVATE S16 rgSCHDrxCpyUeCfg (ueCb, drxCfg) (drxCfg == (RgrUeDrxCfg* )NULLP) ) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1471,7 +1471,7 @@ PRIVATE S16 rgSCHDrxCpyUeCfg (ueCb, drxCfg) ueCb->shortDrxCycle = drxCfg->drxShortDrx.shortDrxCycle; ueCb->shortCycleTmrLen = drxCfg->drxShortDrx.drxShortCycleTmr; - RETVALUE(ROK); + return ROK; } /* end of rgSCHDrxCpyUeCfg */ #ifdef RGR_V2 @@ -1547,7 +1547,7 @@ PUBLIC S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHdrxUeReCfg():""Memory allocation FAILED for DRX UE Cb CRNTI:%d", ue->ueId); - RETVALUE(ret); + return (ret); } ue->isDrxEnabled = TRUE; /* sachin */ @@ -1578,7 +1578,7 @@ PUBLIC S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg) } if( ue->drxCb == NULLP ) { - RETVALUE(RFAILED); + return RFAILED; } ueDrxCb = ue->drxCb; @@ -1730,7 +1730,7 @@ PUBLIC S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg) } } - RETVALUE(ROK); + return ROK; } /* end of rgSCHDrxUeReCfg */ #endif @@ -1900,7 +1900,7 @@ PUBLIC S16 rgSCHDrxUeDel (cell, ue) ueDrxCb->drxDlInactvMask = DRX_UE_INACTIVE; ueDrxCb->drxUlInactvMask = DRX_UE_INACTIVE; - RETVALUE(ROK); + return ROK; }/*rgSCHDrxUeDel*/ /** @brief This function is called at the time of RGR cell configuration. @@ -1943,7 +1943,7 @@ PUBLIC S16 rgSCHDrxCellCfg (cell, cellCfg) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDrxCellCfg():Invalid Params. cell/cellCfg is NULL"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1955,7 +1955,7 @@ PUBLIC S16 rgSCHDrxCellCfg (cell, cellCfg) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHDrxCellCfg():" "Memory allocation FAILED for DRX cell Cb"); - RETVALUE(ret); + return (ret); } /* delInUlScan determines which index scans the queue last. @@ -1975,7 +1975,7 @@ PUBLIC S16 rgSCHDrxCellCfg (cell, cellCfg) cell->drxCb->delInUlScan = TRUE; } - RETVALUE(ret); + return (ret); } /* end of rgSchDrxCellCfg */ @@ -2066,14 +2066,14 @@ PUBLIC S16 rgSCHDrxSrInd (cell, ue) #if ( ERRCLASS & ERRCLS_INT_PAR ) if ( cell == (RgSchCellCb* )NULLP) { - RETVALUE(ROK); + return ROK; } if( (ue == (RgSchUeCb* )NULLP)) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDrxSrInd():Invalid Params. cell/ue is NULL"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* KWork fix - shifted this down */ @@ -2087,7 +2087,7 @@ PUBLIC S16 rgSCHDrxSrInd (cell, ue) /* Update UE's inactive mask and if required move UE to ACTIVE state */ RG_SCH_CMN_UL_UPDT_INACTV_MASK( cell, ue, RG_DRX_INACTIVE); - RETVALUE(ROK); + return ROK; } /* rgSCHDrxSrInd */ @@ -2313,7 +2313,7 @@ PRIVATE S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx) (tmrExpryIdx == (CmLteTimingInfo* )NULLP) ) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2411,7 +2411,7 @@ PRIVATE S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx) tmrExpryIdx->sfn = tmrExpryIdx->sfn - (RG_SCH_CMN_MAX_SFN_NUM + 1); } - RETVALUE(ROK); + return ROK; }/*rgSCHDrxGetNxtTmrExpry*/ /** @brief This function calculates the next onDuration Occurence @@ -2550,7 +2550,7 @@ U16 offSet; if(((RGSCH_MAX_SUBFRM_5G + endTimeInSf- startTime) % RGSCH_MAX_SUBFRM_5G) >= drxCycle) { - RETVALUE(RFAILED); + return RFAILED; } startTime = (startTime + drxCycle); @@ -2562,7 +2562,7 @@ U16 offSet; }while((drxCycle % RGSCH_NUM_SUB_FRAMES) && (startTime < (drxCycle * RGSCH_NUM_SUB_FRAMES/2))); - RETVALUE(ROK); + return ROK; } #endif /*LTE_TDD */ diff --git a/src/5gnrsch/rg_sch_ex_ms.c b/src/5gnrsch/rg_sch_ex_ms.c index 7fe891e69..38e882538 100755 --- a/src/5gnrsch/rg_sch_ex_ms.c +++ b/src/5gnrsch/rg_sch_ex_ms.c @@ -270,8 +270,8 @@ Buffer *mBuf; /* message buffer */ RGSCH_FREE_MSG(mBuf); break; } - SExitTsk(); - RETVALUE(ROK); + ODU_EXIT_TASK(); + return ROK; }/* end of schActvTsk */ diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c index ce66f67b8..2c6a19e24 100755 --- a/src/5gnrsch/rg_sch_gom.c +++ b/src/5gnrsch/rg_sch_gom.c @@ -166,7 +166,7 @@ RgrCfgReqInfo *cfgReqInfo; { ret = rgSCHGomCfgReq (pst->region, pst->pool, instCb, transId, cfgReqInfo); - RETVALUE(ret); + return (ret); } /* Fetch the cell Id for the recieved request */ @@ -178,7 +178,7 @@ RgrCfgReqInfo *cfgReqInfo; (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Extract the cell and Enquee Config Request */ if(NULLP != instCb->rgrSap[spId].cell) @@ -192,7 +192,7 @@ RgrCfgReqInfo *cfgReqInfo; (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } cell = instCb->rgrSap[spId].cell; @@ -207,16 +207,16 @@ RgrCfgReqInfo *cfgReqInfo; (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; schSendCfgCfm(pst->region, pst->pool, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; }/* rgSCHGomHndlCfg */ @@ -338,7 +338,7 @@ printf("\n AT MAC sending RGR cfg cfm \n"); printf("\n AT MAC RGR cfg cfm sent\n"); #endif - RETVALUE(ret); + return (ret); } /* rgSCHGomCfgReq */ @@ -400,7 +400,7 @@ RgrCfgReqInfo *rgrCfgReq; ret = rgSCHUtlAllocSBuf(inst, (Data **)&rgrCfgElem, sizeof(RgSchCfgElem)); if ((ret != ROK) || ((U8 *)rgrCfgElem == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Initialize the configuration element */ @@ -433,7 +433,7 @@ RgrCfgReqInfo *rgrCfgReq; /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem)); - RETVALUE(RFAILED); + return RFAILED; } sfDiff = RGSCH_CALC_SF_DIFF(actvTime, cell->crntTime); @@ -447,7 +447,7 @@ RgrCfgReqInfo *rgrCfgReq; /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem)); - RETVALUE(RFAILED); + return RFAILED; } if (sfDiff) @@ -456,14 +456,14 @@ RgrCfgReqInfo *rgrCfgReq; rgrCfgElem->actvTime = actvTime; rgSCHDbmInsPndngRgrCfgElem(cell, rgrCfgElem); /* Cfm to be sent only after applying request */ - RETVALUE(ROK); + return ROK; } } /* Add to current cfgReq list */ rgSCHDbmInsCrntRgrCfgElem(cell, rgrCfgElem); /* Cfm to be sent only after applying request */ - RETVALUE(ROK); + return ROK; } /* rgSCHGomEnqCfgReq */ @@ -529,7 +529,7 @@ SpId spId; rgSCHUtlFreeSBuf(inst, (Data **)&cfgElem, sizeof(*cfgElem)); } - RETVALUE(ROK); + return ROK; } @@ -591,7 +591,7 @@ RgSchErrInfo *errInfo; { RLOG1(L_ERROR,"Rgr Cell configuration " "validation FAILED: Cell %d", cfg->u.cellCfg.cellId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrCellCfg(instCb, spId, &cfg->u.cellCfg, errInfo); break; @@ -604,7 +604,7 @@ RgSchErrInfo *errInfo; { RLOG1(L_ERROR,"Ue configuration validation" " FAILED: CRNTI:%d", cfg->u.ueCfg.crnti); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrUeCfg(cell, &cfg->u.ueCfg, errInfo); break; @@ -616,7 +616,7 @@ RgSchErrInfo *errInfo; { RLOG1(L_ERROR,"LC configuration validation " "FAILED: LCID:%d", cfg->u.lchCfg.lcId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrLchCfg(cell, ue, &cfg->u.lchCfg, errInfo); break; @@ -628,7 +628,7 @@ RgSchErrInfo *errInfo; { RLOG1(L_ERROR,"LCG configuration validation " "FAILED: LCGID:%d", cfg->u.lcgCfg.ulInfo.lcgId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrLcgCfg(cell, ue, &cfg->u.lcgCfg, errInfo); break; @@ -640,7 +640,7 @@ RgSchErrInfo *errInfo; { RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCH ENB configuration validation " "FAILED: \n" )); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrSchedEnbCfg(inst, spId, &cfg->u.schedEnbCfg, errInfo); break; @@ -651,11 +651,11 @@ RgSchErrInfo *errInfo; RLOG1(L_ERROR,"Should never come here: " "cfgType %d", cfg->cfgType); #endif - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ret); + return (ret); } /* rgSCHGomHndlCfgReq */ #ifdef LTE_ADV @@ -717,7 +717,7 @@ U8 action; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]UE: does not exist\n", sCellActDeactEvnt->crnti)); - RETVALUE(RFAILED); + return RFAILED; } for(idx = 0; idx < sCellActDeactEvnt->numOfSCells; idx++) @@ -729,13 +729,13 @@ U8 action; RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCell Actication failed" "for UE [%d] with SCellIdx [%d]\n", sCellActDeactEvnt->crnti, idx)); - RETVALUE(RFAILED); + return RFAILED; } } RGSCHDBGINFO(inst,(rgSchPBuf(inst), "RGR Reconfiguration processed\n")); - RETVALUE(ROK); + return ROK; } /* rgSCHGomHndlSCellActDeactReq */ #endif /* LTE_ADV */ @@ -799,7 +799,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,recfg->u.cellRecfg.cellId,"Rgr Cell Recfg Validation " "FAILED"); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrCellRecfg(cell, &recfg->u.cellRecfg, errInfo); break; @@ -812,7 +812,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.ueRecfg.cellId,"Ue Recfg Validation FAILED" "OLD CRNTI:%d",recfg->u.ueRecfg.oldCrnti); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrUeRecfg(cell, ue, &recfg->u.ueRecfg, errInfo); break; @@ -825,7 +825,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lchRecfg.cellId,"Lc Recfg Validation FAILED" "LCID:%d",recfg->u.lchRecfg.lcId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrLchRecfg(cell, ue, dlLc, &recfg->u.lchRecfg, errInfo); break; @@ -838,7 +838,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lcgRecfg.cellId, "Lcg Recfg Validation FAILED" "LCGID:%d",recfg->u.lcgRecfg.ulRecfg.lcgId); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrLcgRecfg(cell, ue, &recfg->u.lcgRecfg, errInfo); break; @@ -848,11 +848,11 @@ RgSchErrInfo *errInfo; #if(ERRCLASS & ERRCLS_INT_PAR) RLOG1(L_ERROR,"Should never come here: recfgType %d", recfg->recfgType); #endif - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ret); + return (ret); } /* rgSCHGomHndlRecfgReq */ /** @@ -908,7 +908,7 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset Validation FAILED" "CRNTI:%d",reset->crnti); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHCfgRgrUeReset(cell, ue, reset, errInfo); @@ -916,10 +916,10 @@ RgSchErrInfo *errInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset FAILED" "CRNTI:%d",reset->crnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* rgSCHGomHndlResetReq */ @@ -975,7 +975,7 @@ RgSchErrInfo *errInfo; if(instCb->rgrSap[spId].cell == NULLP) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"Cell doesnt exist"); - RETVALUE(RFAILED); + return RFAILED; } /* Process the delete request */ @@ -1024,11 +1024,11 @@ RgSchErrInfo *errInfo; #if(ERRCLASS & ERRCLS_INT_PAR) RLOG1(L_ERROR,"Should never come here: delType %d", del->delType); #endif - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ret); + return (ret); } /* rgSCHGomHndlDelReq */ @@ -1095,17 +1095,17 @@ CmLteCellId *cellId; } else { - RETVALUE(RFAILED); + return RFAILED; } break; } default: { - RETVALUE(RFAILED); + return RFAILED; } } /* End of Switch */ - RETVALUE(ROK); + return ROK; } /* rgSCHGomGetCellIdFrmCfgReq */ #ifdef RGR_SI_SCH @@ -1176,7 +1176,7 @@ RgrSiCfgReqInfo *cfgReqInfo; SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /*Validate the received SI configuration */ @@ -1189,7 +1189,7 @@ RgrSiCfgReqInfo *cfgReqInfo; SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /*ccpu00140789: Stopping SI scheduling*/ if(RGR_SI_STOP == cfgReqInfo->cfgType) @@ -1209,14 +1209,14 @@ RgrSiCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; cfmStatus = RGR_CFG_CFM_OK; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(ROK); + return ROK; } else { SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1249,7 +1249,7 @@ RgrSiCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } cmMemset((U8*)padding,(U8)0,nmPadBytes); @@ -1267,7 +1267,7 @@ RgrSiCfgReqInfo *cfgReqInfo; padding = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } SPutSBuf(reg, pool, (Data* )padding,(Size)nmPadBytes); padding = NULLP; @@ -1297,7 +1297,7 @@ RgrSiCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } RGSCHCHKNUPDSIPDU(cell->siCb.crntSiInfo.sib1Info.sib1, @@ -1319,7 +1319,7 @@ RgrSiCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } RGSCHCHKNUPDSIPDU(cell->siCb.crntSiInfo.sib1Info.sib1, cell->siCb.newSiInfo.sib1Info.sib1, @@ -1340,7 +1340,7 @@ RgrSiCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Si recfg, where numSi changes */ if (cell->siCb.siBitMask & RGSCH_SI_SICFG_UPD) @@ -1388,7 +1388,7 @@ RgrSiCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* No need to wait for Modification period boundary */ cell->siCb.siArray[cfgReqInfo->siId-1].si = cfgReqInfo->pdu; @@ -1405,7 +1405,7 @@ RgrSiCfgReqInfo *cfgReqInfo; cfgReqInfo = NULLP; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -1414,7 +1414,7 @@ RgrSiCfgReqInfo *cfgReqInfo; rgSCHUtlRgrSiCfgCfm(instCb->rgSchInit.inst, spId, transId, cfmStatus); - RETVALUE(ROK); + return ROK; } /* rgSCHGomHndlSiCfg */ @@ -1502,7 +1502,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; warningSiCfgReqInfo = NULLP; rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId, siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } /* Search for free index in WarningSi */ @@ -1556,7 +1556,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; warningSiCfgReqInfo = NULLP; rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId, siId, transId,cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1610,13 +1610,13 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; warningSiCfgReqInfo = NULLP; rgSCHUtlRgrWarningSiCfgCfm(instCb->rgSchInit.inst, spId, siId, transId, cfmStatus); - RETVALUE(RFAILED); + return RFAILED; } SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo, sizeof(RgrWarningSiCfgReqInfo)); warningSiCfgReqInfo = NULLP; - RETVALUE(ROK); + return ROK; } @@ -1743,14 +1743,14 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf) { sfrCCPool->pwrHiCCRange.endRb = loadInfReq->rgrCcPHighEndRb; sfrCCPool->pwrHiCCRange.startRb = loadInfReq->rgrCcPHighStartRb; - RETVALUE(ROK); + return ROK; } else { n = cmLListNext(l); } } - RETVALUE(ret); + return (ret); } /** * @brief Handler to handle LOAD INF request from RRM to MAC. @@ -1811,14 +1811,14 @@ PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) RLOG_ARG1(L_ERROR,DBG_CELLID,loadInfReq->cellId,"Cell Control block does not exist" "for load cellId:%d",loadInfReq->cellId); SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(RFAILED); + return RFAILED; } if (cell->lteAdvCb.dsfrCfg.status == RGR_DISABLE) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHGomHndlLoadInf(): DSFR Feature not enabled"); SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(RFAILED); + return RFAILED; } /* Validate the received LOAD INF Configuration */ ret = rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, &errInfo); @@ -1827,7 +1827,7 @@ PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Rgr LOAD INF Configuration " "validation FAILED"); SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(RFAILED); + return RFAILED; } /* Update the RNTP info rcvd in the respective cell centre pool so that Phigh can be sent for the UEs scheduled in that particular RB range*/ @@ -1835,14 +1835,14 @@ PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) { if((rgSchUpdtRNTPInfo(cell, cell->subFrms[i], loadInfReq) != ROK)) { - RETVALUE(RFAILED); + return RFAILED; } } SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); - RETVALUE(ROK); + return ROK; } /* rgSCHGomHndlLoadInf */ /* LTE_ADV_FLAG_REMOVED_END */ diff --git a/src/5gnrsch/rg_sch_hdfdd.c b/src/5gnrsch/rg_sch_hdfdd.c index 96cc4dbb7..e13fd9155 100755 --- a/src/5gnrsch/rg_sch_hdfdd.c +++ b/src/5gnrsch/rg_sch_hdfdd.c @@ -87,7 +87,7 @@ extern "C" { * @param[in] RgSchUeCb *ue * @param[in] Bool *hdFddEnbl * - * @RETVALUE S16 + * @return S16 * -# ROK * -# RFAILED */ @@ -128,7 +128,7 @@ Bool hdFddEnbl; "rgSCHHdFddUeCfg(): HD-FDD already enabled for this UE" "CRNTI:%d",ueCb->ueId); } - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -140,7 +140,7 @@ Bool hdFddEnbl; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "rgSCHHdFddUeCfg(): Could'nt do HDFDD cfg, SPS already configured" "CRNTI:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -164,10 +164,10 @@ Bool hdFddEnbl; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "rgSCHHdFddUeCfg(): Could not allocate memory for hd-fdd ueCb" "CRNTI:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; }/*rgSCHHdFddUeCfg*/ @@ -191,7 +191,7 @@ Bool hdFddEnbl; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * - * @RETVALUE( S16 + * @return ( S16 * -# ROK * */ @@ -223,7 +223,7 @@ RgSchUeCb *ueCb; ueCb->hdFddEnbld = FALSE; } - RETVALUE(ROK); + return ROK; } /* rgSCHHdFddUeDel */ @@ -239,7 +239,7 @@ RgSchUeCb *ueCb; * instance updates * for HD FDD UEs * @param[in] RgSchCellCb *cell - * @RETVALUE None + * @return None */ #ifdef ANSI @@ -372,7 +372,7 @@ RgSchCellCb *cellCb; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * - * @RETVALUE None + * @return None * */ #ifdef ANSI @@ -701,7 +701,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ * * @param[in] RgSchUeCb *ue * - * @RETVALUE None + * @return None * */ @@ -780,7 +780,7 @@ Bool *sndNACK; * @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowedi. * Valdity of this pointer is not done in this function. * - * @RETVALUE None + * @return None */ #ifdef ANSI PUBLIC Void rgSCHCmnHdFddUpdULMark @@ -862,7 +862,7 @@ RgSchUeCb *ueCb; * @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowed. * Valdity of this pointer is not done in this function * - * @RETVALUE None + * @return None */ #ifdef ANSI @@ -933,7 +933,7 @@ RgSchUeCb *ueCb; * @param[in] timeInfo timing information subframe of interest * @param[in] offsest Offest with w.r.t which SFN has to be determined * - * @RETVALUE None + * @return None */ #ifdef ANSI diff --git a/src/5gnrsch/rg_sch_inf.c b/src/5gnrsch/rg_sch_inf.c index daf973030..5e7aa8fa7 100755 --- a/src/5gnrsch/rg_sch_inf.c +++ b/src/5gnrsch/rg_sch_inf.c @@ -76,7 +76,7 @@ RgInfUeDelInd* ueDelInd; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #ifdef MS_MBUF_CORRUPTION @@ -85,11 +85,11 @@ RgInfUeDelInd* ueDelInd; if(SAddPstMsgMult((Data *)ueDelInd, sizeof(RgInfUeDelInd), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFUEDELIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -128,12 +128,12 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&ueDelInd, sizeof(RgInfUeDelInd), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &ueDelInd)); + return ((*func)(pst, &ueDelInd)); } /*Fix: end: Inform UE delete to scheduler*/ @@ -167,7 +167,7 @@ RgInfDedBoRpt* boRpt; TRC2(cmPkMacSchDedBoUpdtReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #ifdef MS_MBUF_CORRUPTION @@ -176,11 +176,11 @@ RgInfDedBoRpt* boRpt; if(SAddPstMsgMult((Data *)boRpt, sizeof(RgInfDedBoRpt), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFDEDBOUPDTREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -219,11 +219,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&boRpt, sizeof(RgInfDedBoRpt), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &boRpt)); + return ((*func)(pst, &boRpt)); } /** * @brief Request from RLC to MAC for forwarding SDUs on @@ -255,7 +255,7 @@ RgInfCmnBoRpt* boRpt; TRC2(cmPkMacSchCmnBoUpdtReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #ifdef MS_MBUF_CORRUPTION @@ -264,11 +264,11 @@ RgInfCmnBoRpt* boRpt; if(SAddPstMsgMult((Data *)boRpt, sizeof(RgInfCmnBoRpt), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFCMNBOUPDTREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -307,11 +307,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&boRpt, sizeof(RgInfCmnBoRpt), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &boRpt)); + return ((*func)(pst, &boRpt)); } /** * @brief Request from RLC to MAC for forwarding SDUs on @@ -343,17 +343,17 @@ RgInfSfDatInd* datInd; TRC2(cmPkMacSchSfRecpInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)datInd, mBuf) != ROK) + if(oduPackPointer((PTR)datInd, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFSFRECPIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -389,15 +389,15 @@ Buffer *mBuf; TRC2(cmUnpkMacSchCmnBoUpdtReq) - if(cmUnpkPtr((PTR *)&datInd, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&datInd, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); /* Call cmFreeMem(datInd) in scheduler */ - RETVALUE((*func)(pst, datInd)); + return ((*func)(pst, datInd)); } #ifdef LTEMAC_SPS @@ -430,17 +430,17 @@ RgInfSpsRelInfo* relInfo; TRC2(cmPkMacSchSpsRelInd) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)relInfo, mBuf) != ROK) + if(oduPackPointer((PTR)relInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFSPSRELIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkMacSchSpsRelInd */ /** @@ -474,14 +474,14 @@ Buffer *mBuf; TRC2(cmUnpkMacSchSpsRelInd) - if(cmUnpkPtr((PTR *)&relInfo, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&relInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, relInfo)); + return ((*func)(pst, relInfo)); } /* end of cmUnpkMacSchSpsRelInd */ #endif /* LTEMAC_SPS */ @@ -517,17 +517,17 @@ RgInfSfAlloc* resAllocReq; TRC2(cmPkSchMacSfAllocReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)resAllocReq, mBuf) != ROK) + if(oduPackPointer((PTR)resAllocReq, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFSFALLOCREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -563,14 +563,14 @@ Buffer *mBuf; TRC2(cmUnpkSchMacSfAllocReq) - if(cmUnpkPtr((PTR *)&resAllocReq, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&resAllocReq, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, resAllocReq)); + return ((*func)(pst, resAllocReq)); } /** * @brief Request from SCH To MAC for harq entity reset @@ -600,17 +600,17 @@ RgInfResetHqEnt* hqEntInfo TRC2(cmPkSchMacRstHqEntReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)hqEntInfo, mBuf) != ROK) + if(oduPackPointer((PTR)hqEntInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFHQENTRESET; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -643,14 +643,14 @@ Buffer *mBuf TRC2(cmUnpkSchMacRstHqEntReq) - if(cmUnpkPtr((PTR *)&hqEntRstInfo, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&hqEntRstInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, hqEntRstInfo)); + return ((*func)(pst, hqEntRstInfo)); } /** @@ -683,17 +683,17 @@ RgInfRlsHqInfo* sfHqInfo; TRC2(cmPkSchMacRlsHqReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)sfHqInfo, mBuf) != ROK) + if(oduPackPointer((PTR)sfHqInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFRLSHQREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -728,14 +728,14 @@ Buffer *mBuf; TRC2(cmUnpkSchMacRlsHqReq) - if(cmUnpkPtr((PTR *)&sfHqInfo, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&sfHqInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, sfHqInfo)); + return ((*func)(pst, sfHqInfo)); } /** * @brief Request from RLC to MAC for forwarding SDUs on @@ -767,7 +767,7 @@ RgInfRlsRnti* rlsRnti; TRC2(cmPkSchMacRlsRntiReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #ifdef MS_MBUF_CORRUPTION @@ -776,11 +776,11 @@ RgInfRlsRnti* rlsRnti; if(SAddPstMsgMult((Data *)rlsRnti, sizeof(RgInfRlsRnti), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFRLSRNTIREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -818,11 +818,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&rlsRnti, sizeof(RgInfRlsRnti), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &rlsRnti)); + return ((*func)(pst, &rlsRnti)); } /** @@ -855,7 +855,7 @@ RgInfCellReg* regReq; TRC2(cmPkSchMacCellRegReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #ifdef MS_MBUF_CORRUPTION @@ -864,11 +864,11 @@ RgInfCellReg* regReq; if(SAddPstMsgMult((Data *)regReq, sizeof(RgInfCellReg), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFCELLREGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -906,11 +906,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)®Req, sizeof(RgInfCellReg), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, ®Req)); + return ((*func)(pst, ®Req)); } /** @@ -942,17 +942,17 @@ RgInfLcgRegReq *lcgRegReq; TRC2(cmPkSchMacLcgRegReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)lcgRegReq, sizeof(RgInfLcgRegReq), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFLCGREG; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkSchMacLcgRegReq */ /** @@ -986,14 +986,14 @@ Buffer *mBuf; TRC2(cmUnpkSchMacLcgRegReq) - if(cmUnpkPtr((PTR *)&lcgRegReq, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&lcgRegReq, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, lcgRegReq)); + return ((*func)(pst, lcgRegReq)); } /* end of cmUnpkSchMacLcgRegReq */ #ifdef LTEMAC_SPS @@ -1027,17 +1027,17 @@ RgInfSpsLcInfo *lcInfo; TRC2(cmPkSchMacSpsLcRegReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)lcInfo, mBuf) != ROK) + if(oduPackPointer((PTR)lcInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFSPSLCREG; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkSchMacSpsLcRegReq */ /** @@ -1069,17 +1069,17 @@ RgInfUlSpsReset *ulSpsResetInfo; TRC2(cmPkSchMacUlSpsResetReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)ulSpsResetInfo, mBuf) != ROK) + if(oduPackPointer((PTR)ulSpsResetInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFSPSRESET; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkSchMacUlSpsResetReq */ /** @@ -1113,14 +1113,14 @@ Buffer *mBuf; TRC2(cmUnpkSchMacSpsLcRegReq) - if(cmUnpkPtr((PTR *)&lcInfo, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&lcInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, lcInfo)); + return ((*func)(pst, lcInfo)); } /* end of cmUnpkSchMacSpsLcRegReq */ @@ -1156,14 +1156,14 @@ Buffer *mBuf; TRC2(cmUnpkSchMacUlSpsResetReq) - if(cmUnpkPtr((PTR *)&ulSpsResetInfo, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&ulSpsResetInfo, mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, ulSpsResetInfo)); + return ((*func)(pst, ulSpsResetInfo)); } /* end of cmUnpkSchMacUlSpsResetReq */ @@ -1200,14 +1200,14 @@ CmLteRnti crnti; TRC2(cmPkSchMacSpsLcDeregReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteCellId, cellId, mBuf); CMCHKPK(cmPkLteRnti, crnti, mBuf); pst->event = (Event) EVTINFSPSLCDEREG; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkSchMacSpsLcDeregReq */ /** @@ -1246,7 +1246,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, &cellId, mBuf); RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, cellId, crnti)); + return ((*func)(pst, cellId, crnti)); } /* end of cmUnpkSchMacSpsLcDeregReq */ #endif /* LTEMAC_SPS */ @@ -1281,16 +1281,16 @@ RgInfL2MeasReq *measInfo; TRC2(cmPkSchMacL2MeasReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)measInfo, sizeof(RgInfL2MeasReq), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFL2MEASREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkSchMacL2MeasReq */ /** @@ -1322,16 +1322,16 @@ RgInfL2MeasStopReq *measInfo; TRC2(cmPkSchMacL2MeasStopReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)measInfo, sizeof(RgInfL2MeasStopReq), mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFL2MEASSTOPREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkSchMacL2MeasStopReq */ /** * @brief Primitive from SCH to MAC for L2 Measurement @@ -1361,17 +1361,17 @@ RgInfL2MeasSndReq *measInfo; TRC2(cmPkSchMacL2MeasSendReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)measInfo, sizeof(RgInfL2MeasSndReq), mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFL2MEASSENDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkSchMacL2MeasSendReq */ /** @@ -1408,11 +1408,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&measInfo, sizeof(RgInfL2MeasReq), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); } /* end of cmUnpkSchMacL2MeasReq */ /** @@ -1448,11 +1448,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&measInfo, sizeof(RgInfL2MeasStopReq), mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); } /* end of cmUnpkSchMacL2MeasReq */ /** * @brief Primitive from SCH to MAC for L2 Measurement request @@ -1487,11 +1487,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&measInfo, sizeof(RgInfL2MeasSndReq), mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); } /* end of cmUnpkSchMacL2MeasSendReq*/ /** @@ -1523,17 +1523,17 @@ RgInfL2MeasCfm *measCfm; TRC2(cmPkMacSchL2MeasCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)measCfm, sizeof(RgInfL2MeasCfm), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFL2MEASCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* end of cmPkMacSchL2MeasCfm */ @@ -1565,17 +1565,17 @@ RgInfL2MeasCfm *measCfm; TRC2(cmPkMacSchL2MeasStopCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if(SAddPstMsgMult((Data *)measCfm, sizeof(RgInfL2MeasCfm), mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTINFL2MEASSTOPCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkMacSchL2MeasStopCfm*/ /** * @brief Primitive from MAC to SCH for L2 Measurement Cfm @@ -1611,11 +1611,11 @@ Buffer *mBuf; if(SRemPreMsgMult((Data *)&measCfm, sizeof(RgInfL2MeasCfm), mBuf) != ROK) { RGSCHINF_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } RGSCHINF_FREE_MSG(mBuf); - RETVALUE((*func)(pst, &measCfm)); + return ((*func)(pst, &measCfm)); } /* end of cmUnpkMacSchL2MeasCfm */ /** @@ -1652,11 +1652,11 @@ RgInfL2MeasCfm measCfm; if(SRemPreMsgMult((Data *)&measCfm, sizeof(RgInfL2MeasCfm), mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &measCfm)); + return ((*func)(pst, &measCfm)); } /* end of cmUnpkMacSchL2MeasStopCfm */ #endif/* LTE_L2_MEAS */ diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c index 49292d7e9..eaaa884c9 100755 --- a/src/5gnrsch/rg_sch_l2m.c +++ b/src/5gnrsch/rg_sch_l2m.c @@ -304,7 +304,7 @@ U32 measTime; measCb->dlTotalBw = 0; measCb->ulTotalBw = 0; - RETVALUE(ROK); + return ROK; } /* rgSchFillL2MeasCfm */ /** @brief This function sends the L2 measurement confirm to LM @@ -349,9 +349,9 @@ Bool isErr; cfm.cfm.status = LCM_PRIM_NOK; cfm.cfm.reason = LCM_REASON_INVALID_PAR_VAL; RgMiLrgSchL2MeasCfm(pst, &cfm); - RETVALUE(ROK); + return ROK; } - RETVALUE(ROK); + return ROK; } /* rgSchL2mSndCfm */ /** @brief This function fills the LM confirmation pst structure @@ -455,7 +455,7 @@ LrgSchMeasReqInfo *measInfo; { cell->l2mList.crnt = lnk; cmLListInsCrnt(&(cell->l2mList), node); - RETVALUE(ROK); + return ROK; } else { @@ -463,7 +463,7 @@ LrgSchMeasReqInfo *measInfo; } } /* End of While */ cmLListAdd2Tail(&(cell->l2mList), node); - RETVALUE(ROK); + return ROK; } /* rgSchL2mInsertMeasCb */ /** @brief This function calculates the Down link prb count @@ -585,7 +585,7 @@ RgSchErrInfo err; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSchL2mAllocMeasCb():" "Allocation of RgSchL2MeasCb failed"); - RETVALUE(NULLP); + return (NULLP); } cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(LrgSchMeasReqInfo)); RGSCHCPYTIMEINFO(cell->crntTime, measCb->startTime); @@ -593,7 +593,7 @@ RgSchErrInfo err; measCb->dlTotalBw = 0; measCb->ulTotalBw = 0; - RETVALUE(measCb); + return (measCb); } /* rgSchL2mAllocMeasCb */ /** @@ -642,7 +642,7 @@ RgSchErrInfo err; RGSCHERR_SCH_ALLOC_FAILED); RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSchL2mMeasReq():" "Allocation of RgSchL2MeasCb failed"); - RETVALUE(RFAILED); + return RFAILED; } /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\ sizeof(LrgSchMeasReqInfo));*/ @@ -695,7 +695,7 @@ RgSchErrInfo err; rgSCHUtlGetPstToLyr(&pst, &rgSchCb[cell->instIdx], cell->macInst); RgSchMacL2Meas(&pst, &measReq); } - RETVALUE(ROK); + return ROK; } /* rgSchL2mMeasReq */ /** @@ -908,7 +908,7 @@ U8 isCalrCrcInd } } }/* end of while */ - RETVALUE(ROK); + return ROK; } /* rgSCHL2MEas */ #endif /* LTE_L2_MEAS */ /********************************************************************** diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c index c5539f958..d5dc9ade1 100755 --- a/src/5gnrsch/rg_sch_lmm.c +++ b/src/5gnrsch/rg_sch_lmm.c @@ -257,7 +257,7 @@ Elmnt sapType; /* SAP Type */ /* would never reach here */ break; } - RETVALUE(ret); + return (ret); } #endif @@ -849,7 +849,7 @@ PTR cb; /* Entry for which Timer Expired */ arg.wait = tmrVal; cmPlcCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -918,7 +918,7 @@ PTR cb; /* Entry for which Timer Expired */ } - RETVALUE(ret); + return (ret); } @@ -989,7 +989,7 @@ S16 tmrEvnt; /* Timer Event */ ret = RFAILED; break; } - RETVALUE(ret); + return (ret); } @@ -1042,9 +1042,9 @@ U8 status; /* Status */ break; case LRG_BND: /* SAP is already bound */ - RETVALUE(ROK); + return ROK; default: - RETVALUE(RFAILED); + return RFAILED; } cfmPst = rgSchCb[inst].rgSchInit.lmPst; @@ -1092,7 +1092,7 @@ U8 status; /* Status */ ret = RgMiLrgSchCntrlCfm(&cfmPst, &cntrlCfm); - RETVALUE(ret); + return (ret); } /** @@ -1136,7 +1136,7 @@ RgUstaDgn *dgn; if(rgSchCb[inst].rgSchInit.usta == FALSE) { - RETVALUE(ROK); + return ROK; } cmMemset((U8 *)&usta, 0, sizeof(RgMngmt)); @@ -1162,7 +1162,7 @@ RgUstaDgn *dgn; rgSchCb[inst].genCfg.ustaResp.response.mem.pool; usta.hdr.transId = rgSchCb[inst].genCfg.ustaResp.transId; - RETVALUE(RgMiLrgSchStaInd(&rgSchCb[inst].rgSchInit.lmPst, &usta)); + return (RgMiLrgSchStaInd(&rgSchCb[inst].rgSchInit.lmPst, &usta)); } @@ -1201,7 +1201,7 @@ Inst inst; cmPrcTmr(&rgSchCb[schInst].tmrTqCp, rgSchCb[schInst].tmrTq, (PFV) rgSCHLmmTmrExpiry); - RETVALUE(ROK); + return ROK; } /* end of schActvTmr */ diff --git a/src/5gnrsch/rg_sch_mga.c b/src/5gnrsch/rg_sch_mga.c index 3830189af..abcffc25b 100755 --- a/src/5gnrsch/rg_sch_mga.c +++ b/src/5gnrsch/rg_sch_mga.c @@ -165,7 +165,7 @@ RgrUeCfg *ueCfg; cmInitTimers (&ue->ackNakRepCb.ackNakRepDlInactvTmr, 1); cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1); } - RETVALUE(ROK); + return ROK; } /** @@ -289,7 +289,7 @@ RgrUeRecfg *ueRecfg; ackNakRepCb->isAckNackEnabled = FALSE; } /* repetition disabled in re configuration */ - RETVALUE(ROK); + return ROK; } /** @brief This function is a utility to add the UE to the correct Measurement @@ -341,9 +341,9 @@ RgrUeMeasGapCfg *cfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHMeasGapANRepUeRecfg() Incorrect GAP Period" "CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHMeasGapANRepUtlAddUe */ @@ -391,7 +391,7 @@ RgSchUeCb *ue; ue->measGapCb.measQLnk.node = NULLP; break; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHMeasGapANRepUtlRmvUe */ /** @@ -547,7 +547,7 @@ PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue) } } - RETVALUE(ROK); + return ROK; } /* end of */ @@ -679,7 +679,7 @@ RgSchCellCb *cell; queue = &(dlSf->ueLst); rgSchAckNackRepUtlHdlTti (cell, queue); - RETVALUE(ROK); + return ROK; } /** @brief This function Marks the UE as ackNakRep so that Reception request @@ -858,7 +858,7 @@ CmLListCp *dlInactvUeLst; if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][ackNakTime.subframe] != RG_SCH_TDD_DL_SUBFRAME) { - RETVALUE(ROK); + return ROK; } dlSf = rgSCHUtlSubFrmGet (cell, ackNakTime); @@ -921,7 +921,7 @@ CmLListCp *dlInactvUeLst; #ifdef LTE_TDD if(cell->ulDlCfgIdx == 5) { - RETVALUE(ROK); + return ROK; } rgSCHUtlGetPrevDlSfInfo(cell, ackNakTime, &ackNakTime, &repCntr); dlSf = rgSCHUtlSubFrmGet (cell, ackNakTime); @@ -980,7 +980,7 @@ CmLListCp *dlInactvUeLst; } } } - RETVALUE(ROK); + return ROK; } /** @@ -1126,13 +1126,13 @@ CmLListCp *ulInactvUeLst; #ifdef LTE_TDD if(cell->ulDlCfgIdx == 5) { - RETVALUE(ROK); + return ROK; } RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, ackNakTime, TFU_DELTA); if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][ackNakTime.subframe] != RG_SCH_TDD_DL_SUBFRAME) { - RETVALUE(ROK); + return ROK; } #else /* Introduced timing delta for DL control in FDD */ @@ -1177,7 +1177,7 @@ CmLListCp *ulInactvUeLst; } } } - RETVALUE(ROK); + return ROK; } /** @@ -1522,7 +1522,7 @@ U8 repCnt; } noSubfrms += rem; - RETVALUE(noSubfrms); + return (noSubfrms); } /** diff --git a/src/5gnrsch/rg_sch_pt.c b/src/5gnrsch/rg_sch_pt.c index 9fdc5d9e6..adf0d389f 100755 --- a/src/5gnrsch/rg_sch_pt.c +++ b/src/5gnrsch/rg_sch_pt.c @@ -265,7 +265,7 @@ RgInfCellReg* regReq; TRC3(RgSchMacCellReg); - RETVALUE((*RgSchMacCellRegReqMt[0])(pst, regReq)); + return ((*RgSchMacCellRegReqMt[0])(pst, regReq)); } /** @@ -297,7 +297,7 @@ RgInfDedBoRpt* boRpt; TRC3(RgMacSchDedBoUpdt); - RETVALUE((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt)); + return ((*RgMacSchDedBoUpdtReqMt[0])(pst, boRpt)); } /** @@ -329,7 +329,7 @@ RgInfCmnBoRpt* boRpt; TRC3(RgMacSchCmnBoUpdt); - RETVALUE((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt)); + return ((*RgMacSchCmnBoUpdtReqMt[0])(pst, boRpt)); } /*Fix: start: Inform UE delete to scheduler*/ @@ -361,7 +361,7 @@ RgInfUeDelInd* ueDelInd; TRC3(RgMacSchUeDel); - RETVALUE((*RgMacSchUeDelIndMt[0])(pst, ueDelInd)); + return ((*RgMacSchUeDelIndMt[0])(pst, ueDelInd)); } /*Fix: end: Inform UE delete to scheduler*/ /** @@ -393,7 +393,7 @@ RgInfSfDatInd* datInd; TRC3(RgMacSchSfRecp); - RETVALUE((*RgMacSchSfRecpIndMt[0])(pst, datInd)); + return ((*RgMacSchSfRecpIndMt[0])(pst, datInd)); } /** @@ -425,7 +425,7 @@ RgInfSfAlloc* resAllocReq; TRC3(RgSchMacSfAlloc); - RETVALUE((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq)); + return ((*RgSchMacSfAllocReqMt[0])(pst, resAllocReq)); } /** @@ -455,7 +455,7 @@ RgInfResetHqEnt* hqEntInfo; TRC3(RgSchMacRstHqEnt) - RETVALUE((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo)); + return ((*RgSchMacRstHqEntReqMt[0])(pst, hqEntInfo)); } /** @@ -487,7 +487,7 @@ RgInfRlsHqInfo* sfHqInfo; TRC3(RgSchMacRlsHq); - RETVALUE((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo)); + return ((*RgSchMacRlsHqReqMt[0])(pst, sfHqInfo)); } /** @@ -519,7 +519,7 @@ RgInfRlsRnti* rlsRnti; TRC3(RgSchMacRlsRnti); - RETVALUE((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti)); + return ((*RgSchMacRlsRntiReqMt[0])(pst, rlsRnti)); } /** @@ -549,7 +549,7 @@ RgInfLcgRegReq *lcgRegReq; TRC3(RgSchMacLcgReg); - RETVALUE((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq)); + return ((*RgSchMacLcgRegReqMt[0])(pst, lcgRegReq)); } /* end of RgSchMacLcgReg */ #ifdef LTEMAC_SPS @@ -581,7 +581,7 @@ RgInfSpsRelInfo* relInfo; TRC3(RgMacSchS); - RETVALUE((*RgMacSchSpsRelIndMt[0])(pst, relInfo)); + return ((*RgMacSchSpsRelIndMt[0])(pst, relInfo)); } /* end of RgMacSchSpsRel */ /** @@ -611,7 +611,7 @@ RgInfSpsLcInfo *lcInfo; TRC3(RgSchMacSpsLcReg); - RETVALUE((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo)); + return ((*RgSchMacSpsLcRegReqMt[0])(pst, lcInfo)); } /* end of RgSchMacSpsLcReg */ @@ -643,7 +643,7 @@ RgInfUlSpsReset *ulSpsResetInfo; TRC3(RgSchMacUlSpsReset); - RETVALUE((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo)); + return ((*RgSchMacUlSpsResetMt[0])(pst, ulSpsResetInfo)); } /* end of RgSchMacUlSpsReset */ @@ -677,7 +677,7 @@ CmLteRnti crnti; TRC3(RgSchMacSpsLcDereg); - RETVALUE((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti)); + return ((*RgSchMacSpsLcDeregReqMt[0])(pst, cellId, crnti)); } /* end of RgSchMacSpsLcDereg */ #endif /* LTEMAC_SPS */ @@ -709,7 +709,7 @@ RgInfL2MeasReq *measInfo; TRC3(RgSchMacL2Meas); - RETVALUE((*RgSchMacL2MeasReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** @@ -739,7 +739,7 @@ RgInfL2MeasStopReq *measInfo; TRC3(RgSchMacL2MeasStop); - RETVALUE((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasStopReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** @@ -769,7 +769,7 @@ RgInfL2MeasSndReq *measInfo; TRC3(RgSchMacL2MeasSend); - RETVALUE((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo)); + return ((*RgSchMacL2MeasSendReqMt[0])(pst, measInfo)); } /* end of RgSchMacL2MeasSend */ /** @@ -799,7 +799,7 @@ RgInfL2MeasCfm *measInfo; TRC3(RgMacSchL2Meas); - RETVALUE((*RgMacSchL2MeasCfmMt[0])(pst, measInfo)); + return ((*RgMacSchL2MeasCfmMt[0])(pst, measInfo)); } /* end of RgSchMacL2Meas */ /** * @brief Request from MAC to SCH for L2 Measurement @@ -828,7 +828,7 @@ RgInfL2MeasCfm *measInfo; TRC3(RgMacSchL2MeasStop); - RETVALUE((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo)); + return ((*RgMacSchL2MeasStopCfmMt[0])(pst, measInfo)); } /* end of RgSchMacL2MeasStop*/ #endif/*LTE_L2_MEAS*/ /********************************************************************** diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c index 41faf57fb..5be370e5e 100755 --- a/src/5gnrsch/rg_sch_pwr.c +++ b/src/5gnrsch/rg_sch_pwr.c @@ -414,7 +414,7 @@ U8 cqi; { TRC2(rgSCHPwrGetCqiPwr); - RETVALUE(rgSchPwrCqiToPwrTbl[cqi]); + return (rgSchPwrCqiToPwrTbl[cqi]); } /* rgSCHPwrGetCqiPwr */ /*********************************************************** @@ -450,9 +450,9 @@ U8 cqi; if (!uePwr->deltaMcsEnbld) { - RETVALUE(0); + return (0); } - RETVALUE(rgSCHPwrGetCqiPwr(cqi)); + return (rgSCHPwrGetCqiPwr(cqi)); } /* rgSCHPwrGetCqiPwrForUe */ /*********************************************************** @@ -484,8 +484,8 @@ U32 eff; TRC2(rgSCHPwrCalcEfficncyPwr); if (tmp <= 0) - RETVALUE(0); - RETVALUE((S8)(10 * cmLog10(tmp))); + return (0); + return ((S8)(10 * cmLog10(tmp))); } /* rgSCHPwrCalcEfficncyPwr */ @@ -529,7 +529,7 @@ RgSchUeCb *ue; TRC2(rgSCHPwrPuschTpcForUe); rgSCHPwrOnSchedPuschTpc(cell, ue); - RETVALUE(uePwr->puschTpc); + return (uePwr->puschTpc); } /** @@ -571,7 +571,7 @@ RgSchUeCb *ue; rgSCHPwrPuschCntrl(cell, ue); /* This stores tpc, delta and maxRb * in uePwr */ - RETVALUE(uePwr->maxUlRbs); + return (uePwr->maxUlRbs); } /** @@ -721,7 +721,7 @@ RgSchUeCb *ue; TRC2(rgSCHPwrPucchTpcForUe); rgSCHPwrPucchCntrl(cell, ue); - RETVALUE(uePwr->pucchTpc); + return (uePwr->pucchTpc); } /*********************************************************** @@ -772,9 +772,9 @@ RgSchCellCb *cell; if (uePwr->maxPwrDeltaByPhr < 0 && (trgCqi - crntCqi) * RG_SCH_UL_CQI_DB_STEP_2 > 0) { - RETVALUE(0); + return (0); } - RETVALUE(RGSCH_MIN(uePwr->maxPwrDeltaByPhr, + return (RGSCH_MIN(uePwr->maxPwrDeltaByPhr, (trgCqi - crntCqi) * RG_SCH_UL_CQI_DB_STEP_2)); } /* rgSCHPwrGetDelta2FrmCqi */ @@ -865,13 +865,13 @@ S8 pwr; /* Give 4 RBS so that UE can report changed power status*/ /* [ccpu00119916] Mod -return 0th index of rgSchPwrToRbTbl when pwr <=0 * Change the Macros from RGSCH_MAX_DL_BW to RGSCH_MAX_UL_BW*/ - RETVALUE(rgSchPwrToRbTbl[0]); + return (rgSchPwrToRbTbl[0]); } if (pwr > rgSchPwrRbToPwrTbl[cellUl->maxUlBwPerUe]) { - RETVALUE(cellUl->maxUlBwPerUe); + return (cellUl->maxUlBwPerUe); } - RETVALUE(RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(U8)pwr])); + return (RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(U8)pwr])); } /* rgSCHPwrGetMaxRb */ /*********************************************************** @@ -910,7 +910,7 @@ U8 numRb; numRb = cellUl->maxUlBwPerUe; } #endif - RETVALUE(rgSchPwrRbToPwrTbl[numRb]); + return (rgSchPwrRbToPwrTbl[numRb]); } /* rgSCHPwrRbToPwr */ @@ -1848,7 +1848,7 @@ RgSchDlSf *sf; if (proc == NULLP) { - RETVALUE(FALSE); + return (FALSE); } /* @@ -1873,11 +1873,11 @@ RgSchDlSf *sf; * Checking for PDCCH would have to be in common proc * the way things are now. */ - RETVALUE(TRUE); + return (TRUE); } else { - RETVALUE(FALSE); + return (FALSE); } } /* rgSCHPwrIsDlUeSched */ @@ -1918,17 +1918,17 @@ RgSchUlSf *sf; #if (ERRCLASS & ERRCLS_DEBUG) if( proc == NULLP ) { - RETVALUE (FALSE); + return (FALSE); } #endif if (proc->alloc) { - RETVALUE(TRUE); + return (TRUE); } else { - RETVALUE(FALSE); + return (FALSE); } } /* rgSCHPwrIsUlUeSched */ @@ -2483,7 +2483,7 @@ RgrCellCfg *cfg; || (cfg->pwrCfg.puschPwrFmt3.size + cfg->pwrCfg.puschPwrFmt3a.size > RG_SCH_CMN_MAX_NUM_TPC_PUSCH_RNTI)) { - RETVALUE(RFAILED); + return RFAILED; } /* Now initialise TPC RNTIs */ @@ -2524,7 +2524,7 @@ RgrCellCfg *cfg; rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a); } - RETVALUE(ROK); + return ROK; } /** @@ -2560,7 +2560,7 @@ RgrCellRecfg *recfg; /* Not doing anything for power reconfig, so such structure * in RGR */ - RETVALUE(ROK); + return ROK; } /** @@ -2658,7 +2658,7 @@ RgrUeSecCellCfg *sCellInfoCfg; } uePwr->p0UePusch = sCellInfoCfg->ueSCellUlDedPwrCfg.p0UePusch; - RETVALUE(ROK); + return ROK; } #endif @@ -2733,7 +2733,7 @@ RgrUeCfg *cfg; * config happens in the function below */ ret = rgSCHPwrApplyUePwrCfg(cell, ue, &cfg->ueUlPwrCfg); - RETVALUE(ret); + return (ret); } /** @@ -2791,7 +2791,7 @@ RgrUeRecfg *recfg; } ret = rgSCHPwrApplyUePwrCfg(cell, ue, &recfg->ueUlPwrRecfg); - RETVALUE(ret); + return (ret); } /*********************************************************** @@ -2838,13 +2838,13 @@ RgrUeUlPwrCfg *pwrCfg; rgSCHPwrGetPucchRntiCb(cell, pwrCfg->uePucchPwr.tpcRnti); if (pucchRntiCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } pucchIdx = pwrCfg->uePucchPwr.idx; ret = rgSCHPwrChkPucchTpcRntiIdx(pucchRntiCb, pucchIdx); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } @@ -2855,13 +2855,13 @@ RgrUeUlPwrCfg *pwrCfg; rgSCHPwrGetPuschRntiCb(cell, pwrCfg->uePuschPwr.tpcRnti); if (puschRntiCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } puschIdx = pwrCfg->uePuschPwr.idx; ret = rgSCHPwrChkPuschTpcRntiIdx(puschRntiCb, puschIdx); if (ret != ROK) { - RETVALUE(ret); + return (ret); } } @@ -2941,7 +2941,7 @@ RgrUeUlPwrCfg *pwrCfg; uePwr->p0UePusch = pwrCfg->p0UePusch; uePwr->p0UePucch = pwrCfg->p0UePucch; - RETVALUE(ROK); + return ROK; } @@ -3326,16 +3326,16 @@ CmLteRnti tpcRnti; if (!cellPwr->tpcPucchRntiCnt) { - RETVALUE(NULLP); + return (NULLP); } for (idx = 0; idx < cellPwr->tpcPucchRntiCnt; ++idx) { if (cellPwr->tpcPucchRntiLst[idx].tpcRnti == tpcRnti) { - RETVALUE(&cellPwr->tpcPucchRntiLst[idx]); + return (&cellPwr->tpcPucchRntiLst[idx]); } } - RETVALUE(NULLP); + return (NULLP); } /*********************************************************** @@ -3371,16 +3371,16 @@ CmLteRnti tpcRnti; if (!cellPwr->tpcPuschRntiCnt) { - RETVALUE(NULLP); + return (NULLP); } for (idx = 0; idx < cellPwr->tpcPuschRntiCnt; ++idx) { if (cellPwr->tpcPuschRntiLst[idx].tpcRnti == tpcRnti) { - RETVALUE(&cellPwr->tpcPuschRntiLst[idx]); + return (&cellPwr->tpcPuschRntiLst[idx]); } } - RETVALUE(NULLP); + return (NULLP); } @@ -3968,13 +3968,13 @@ U8 idx; if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4008,13 +4008,13 @@ U8 idx; if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4051,10 +4051,10 @@ U8 idx; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); if (uePwr->pucchIdx == idx) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4091,10 +4091,10 @@ U8 idx; RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell); if (uePwr->puschIdx == idx) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4128,17 +4128,17 @@ U8 idx; { if (idx >= TFU_MAX_1BIT_TPC) { - RETVALUE(RFAILED); + return RFAILED; } } else { if (idx >= TFU_MAX_2BIT_TPC) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* Warning Fix: Commenting out as not used */ @@ -4168,7 +4168,7 @@ U8 pCMax; #endif { TRC2(rgSCHPwrGetPCMaxValFromPCMax); - RETVALUE((pCMax & 63) - 30); + return ((pCMax & 63) - 30); } @@ -4199,7 +4199,7 @@ U8 phr; #endif { TRC2(rgSCHPwrGetPhValFromPhr); - RETVALUE((phr & 63) - 23); + return ((phr & 63) - 23); } diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c index 61f492bcb..a92fdc3d9 100755 --- a/src/5gnrsch/rg_sch_ram.c +++ b/src/5gnrsch/rg_sch_ram.c @@ -158,10 +158,10 @@ RgrUeCfg *ueCfg; #endif ) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /** @@ -244,7 +244,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed errType(%d) ", raReqInd->raRnti); - RETVALUE(RFAILED); + return RFAILED; } /* SR_RACH_STATS : DED PREAMB*/ @@ -275,7 +275,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamProcRaReq(): Allocation" " of RaReq failed RARNTI:%d",raRnti); err->errCause = RGSCHERR_RAM_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } /* Insert the given raReqInfo */ @@ -302,7 +302,7 @@ RgSchErrInfo *err; cmLListAdd2Tail(&cell->raInfo.raReqLst[raIndex], &raReqInfo->raReqLstEnt); } - RETVALUE(ROK); + return ROK; } /* rgSCHRamProcRaReq */ /** @@ -346,7 +346,7 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Allocation of " "RaCb failed"); err->errCause = RGSCHERR_RAM_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } rntiLnk = rgSCHDbmGetRnti(cell); @@ -368,7 +368,7 @@ RgSchErrInfo *err; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(inst, (Data **)(raCb), sizeof(RgSchRaCb)); err->errCause = RGSCHERR_RAM_RNTI_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } /* Allocate and initialize the DL HARQ portion of the RACB */ @@ -382,7 +382,7 @@ RgSchErrInfo *err; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(inst, (Data **)(raCb), sizeof(RgSchRaCb)); err->errCause = RGSCHERR_RAM_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE (*raCb)->isEmtcRaCb = FALSE; @@ -399,7 +399,7 @@ RgSchErrInfo *err; (*raCb)->raCbLnk.node = (PTR)(*raCb); cmLListAdd2Tail(&cell->raInfo.raCbLst, &(*raCb)->raCbLnk); - RETVALUE(ROK); + return ROK; } /* rgSCHRamCreateRaCb */ /** @@ -474,10 +474,10 @@ RgSchErrInfo *err; err->errCause = RGSCHERR_RAM_NO_MSG3_RCVD; *hqEnt = NULLP; raCb->dlHqE->ue = NULLP; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHRamRgrUeCfg */ @@ -546,7 +546,7 @@ RgSchErrInfo *err; /* No need of raCb any more */ rgSCHRamDelRaCb(cell, raCb, TRUE); - RETVALUE(ROK); + return ROK; } /* rgSCHRamContResCrnti */ @@ -589,7 +589,7 @@ RgSchRaCb *raCb; "RNTI:%d RaCb in wrong State %d Drop Msg 3", raCb->rntiLnk->rnti, raCb->raState); - RETVALUE(ROK); + return ROK; } raCb->raState = RGSCH_RA_MSG4_PENDING; @@ -611,7 +611,7 @@ RgSchRaCb *raCb; raCb->contResTmrLnk.node = (PTR)(raCb); cmLListAdd2Tail(&(cell->contResGrdTmrLst), &(raCb->contResTmrLnk)); #endif - RETVALUE(ROK); + return ROK; } /* rgSCHRamContResCcchsdu */ @@ -679,7 +679,7 @@ RgSchErrInfo *err; } } - RETVALUE(ROK); + return ROK; } /* rgSCHRamProcMsg3 */ @@ -724,7 +724,7 @@ RgInfCmnBoRpt *staRsp; rgSCHRamAddToRaInfoSchdLst(cell, raCb); /* MSG4 Fix End */ - RETVALUE(ROK); + return ROK; } /* rgSCHRamUpdtBo */ /** @@ -759,7 +759,7 @@ RgSchRaCb *raCb; /*ccpu00128820 - MOD - Msg3 alloc double delete issue*/ rgSCHUhmProcMsg3DatInd(&(raCb->msg3HqProc)); - RETVALUE(ROK); + return ROK; } /* rgSCHRamMsg3DatInd */ /** @@ -792,7 +792,7 @@ RgSchRaCb *raCb; /*ccpu00128820 - MOD - Msg3 alloc double delete issue*/ rgSCHUhmProcMsg3Failure(&(raCb->msg3HqProc)); - RETVALUE(ROK); + return ROK; } /* rgSCHRamMsg3FailureInd */ /** @@ -822,7 +822,7 @@ RgSchRaCb *raCb; { TRC2(rgSCHRamMsg4FdbkInd) - RETVALUE(ROK); + return ROK; } /* rgSCHRamMsg4FdbkInd */ @@ -916,7 +916,7 @@ RgSchRaCb *raCb; rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, TRUE); } - RETVALUE(ROK); + return ROK; } /* rgSCHRamMsg4Done */ @@ -1042,7 +1042,7 @@ Bool rlsRnti; #endif rgSCHUtlFreeSBuf(inst, (Data **)&raCb, sizeof(RgSchRaCb)); - RETVALUE(ROK); + return ROK; } /* rgSCHRamDelRaCb */ @@ -1176,7 +1176,7 @@ RgSchCellCb *cell; } } - RETVALUE(ROK); + return ROK; } /* rgSCHRamTtiHndlr */ @@ -1282,7 +1282,7 @@ RgSchCellCb *cell; rgSCHRamDelRaCb(cell, raCb, TRUE); } - RETVALUE(ROK); + return ROK; } /* rgSCHRamFreeCell */ #ifdef RGR_V1 #ifdef ANSI @@ -1534,7 +1534,7 @@ U8 raIdx; } } - RETVALUE(ROK); + return ROK; } #endif @@ -1564,7 +1564,7 @@ RgSchRaCb *raCb; cmLListAdd2Tail(&(cell->raInfo.toBeSchdLst), &(raCb->schdLnk)); raCb->contResTmrLnk.node = (PTR)(raCb); cmLListAdd2Tail(&(cell->contResTmrLst), &(raCb->contResTmrLnk)); - RETVALUE(ROK); + return ROK; } /* rgSCHRamAddToRaInfoSchdLst */ @@ -1587,7 +1587,7 @@ RgSchRaCb *raCb; raCb->schdLnk.node = NULLP; cmLListDelFrm(&(cell->contResTmrLst), &(raCb->contResTmrLnk)); raCb->contResTmrLnk.node = NULLP; - RETVALUE(ROK); + return ROK; } /* rgSCHRamRmvFrmRaInfoSchdLst */ /*MSG4 Fix End*/ diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c index 4a2a5bb9a..cb2f59426 100755 --- a/src/5gnrsch/rg_sch_sc1.c +++ b/src/5gnrsch/rg_sch_sc1.c @@ -779,7 +779,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHCmnHdFddChkDlAllow ( cell, ue, &dlAllowed); if (dlAllowed == FALSE) { - RETVALUE(ROK); + return ROK; } } #endif @@ -793,7 +793,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; RGSCH_INCR_SUB_FRAME(schdTime, RG_SCH_CMN_DL_DELTA); if (RG_SCH_CMN_IS_UE_SPS_SCHDLD(ue, cell, schdTime)) { - RETVALUE(ROK); + return ROK; } #endif if (RG_SCH_CMN_IS_UE_SCHDLD(ue, cell)) @@ -805,7 +805,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"CRNTI:%d rgSCHSc1DlDedSvcAlloc():" "Ue retransmitting",ue->ueId); - RETVALUE(ROK); + return ROK; } /* UE is scheduled for either other services or TA */ sc1HqDl = RG_GET_SC1_HQP_DL(proc); @@ -821,7 +821,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "CRNTI:%d rgSCHSc1DlDedSvcAlloc():" " No HARQ Proc available", ue->ueId); - RETVALUE(ROK); + return ROK; } sc1HqDl = RG_GET_SC1_HQP_DL(proc); cmnHqDl = RG_SCH_CMN_GET_DL_HQP(proc); @@ -854,7 +854,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* ccpu00126519: proc should be set to NULLP in UE's DL scratch pad info as well. */ ueDl->proc = NULLP; } - RETVALUE(ret); + return (ret); } svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); svcSc1->hdrEstimate = rlcHdrEstmt; @@ -865,7 +865,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc); /* 3.1 MIMO moving this call to cmn scheduler */ /*rgSCHCmnDlRbInfoAddUeTx(allocInfo, ue); */ - RETVALUE(ROK); + return ROK; } /** @@ -2060,13 +2060,13 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"); err->errCause = RGSCHERR_SCH_SC1_DL_CFG; - RETVALUE(ret); + return (ret); } cellDl = RG_GET_SC1_CELL_DL(cell); /* Now perform downlink Queues related initializations */ rgSCHSc1DlInitQueues(cellDl); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrDlCellCfg */ /*********************************************************** @@ -2191,7 +2191,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED" "CRNTI:%d",ue->ueId); err->errCause = RGSCHERR_SCH_SC1_DL_CFG; - RETVALUE(RFAILED); + return RFAILED; } ueDl = (RgSchSc1DlUe *)ueSchCmn->dl.schSpfc; if (ue->dl.ambrCfgd) @@ -2207,7 +2207,7 @@ RgSchErrInfo *err; cmLListInit(&ueDl->ambrLst); cmLListInit(&ueDl->schdSvcs); cmLListInit(&ueDl->retxHqProcs); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrDlUeCfg */ @@ -2251,7 +2251,7 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED CRNTI:%d",hqEnt->ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } hqSpcSch = (RgSchSc1DlHqProc *)(hqEnt->sch); for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++) @@ -2260,7 +2260,7 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) ((RgSchCmnDlHqProc *)((hqP)->sch))->schSpfc = \ hqSpcSch++; } - RETVALUE(ROK); + return ROK; } /** @@ -2299,9 +2299,9 @@ RgSchDlHqEnt *hqE; } else { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** * @brief UE reconfiguration for scheduler @@ -2398,7 +2398,7 @@ RgSchErrInfo *err; RgSchMacRlsHq (&pst, rlsHqBufs); } } - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrDlUeRecfg */ /** @@ -2647,7 +2647,7 @@ RgInfSfAlloc *sfAlloc; #endif { TRC2(rgSCHSc1DlFillFlowCntrlInfo); - RETVALUE(ROK); + return ROK; } /** * @brief UE deletion for scheduler @@ -2755,11 +2755,11 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHSc1CrgLcCfg():" "SCH struct alloc failed CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_SC1_DL_CFG; - RETVALUE(ret); + return (ret); } rgSCHSc1DlSvcAdd(cell, ue, dlLc, &lcCfg->dlInfo); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcCfg */ @@ -2809,7 +2809,7 @@ RgSchErrInfo *err; rgSCHSc1DlSvcMod(cell,ue,dlLc, lcRecfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcRecfg */ @@ -2842,7 +2842,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHSc1DlUeReset); - RETVALUE(ROK); + return ROK; } @@ -4002,7 +4002,7 @@ RgrLchCfg *cfg, RgSchErrInfo *err ) { - RETVALUE(ROK); + return ROK; } /** * @brief UE Lc Reconfig for RR @@ -4028,7 +4028,7 @@ RgrLchRecfg *recfg, RgSchErrInfo *err ) { - RETVALUE(ROK); + return ROK; } /** * @brief LC deletion for PFS @@ -4061,7 +4061,7 @@ CmLteLcId lcId; U8 lcgId; #endif { - RETVALUE (ROK); + return (ROK); } /** @@ -4165,10 +4165,10 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED CRNTI:%d",ue->ueId); err->errCause = RGSCHERR_SCH_SC1_UL_CFG; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrUlUeCfg */ /** @@ -4206,7 +4206,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHSc1RgrUlUeRecfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrUeRecfg */ /** @@ -4351,14 +4351,14 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"); err->errCause = RGSCHERR_SCH_SC1_UL_CFG; - RETVALUE(RFAILED); + return RFAILED; } cellUl = RG_GET_SC1_CELL_UL(cell); cmLListInit(&cellUl->contResLst); cmLListInit(&cellUl->ueTxLst[0]); cmLListInit(&cellUl->ueTxLst[1]); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrUlCellCfg */ @@ -4391,7 +4391,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHSc1RgrUlCellRecfg); - RETVALUE(ROK); + return ROK; } /** @@ -4472,7 +4472,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHSc1RgrLcgCfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcgCfg */ /** @@ -4516,7 +4516,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHSc1RgrLcgRecfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcgRecfg */ /*********************************************************** @@ -5296,7 +5296,7 @@ RgInfUeDatInd *datInd; TRC2(rgSCHSc1UlLcgUpd); - RETVALUE(ROK); + return ROK; } diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c index 366fc9224..38c6ad9b4 100755 --- a/src/5gnrsch/rg_sch_scell.c +++ b/src/5gnrsch/rg_sch_scell.c @@ -592,7 +592,7 @@ PRIVATE S16 rgSCHSCellDeActivation(sCellInfo) RgSchUeCellInfo *sCellInfo #endif { - RETVALUE(ROK); + return ROK; RgSchCmnCell *cellSch; Inst inst = sCellInfo->cell->instIdx; @@ -643,7 +643,7 @@ RgSchUeCellInfo *sCellInfo printf("SCELL DEATIVATED sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId); //MSPD_DBG("SCELL DEATIVATED sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId); #endif - RETVALUE(ROK); + return ROK; } @@ -687,7 +687,7 @@ U16 rnti; if((secCellCb = (RgSchCellCb *)rgSchUtlGetCellCb(inst, secCellId)) == NULLP) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists")); - RETVALUE(RFAILED); + return RFAILED; } hqEntRstInfo.cellId = secCellId; @@ -697,7 +697,7 @@ U16 rnti; RgSchMacRstHqEnt(&pst, &hqEntRstInfo); - RETVALUE(ROK); + return ROK; } /*removed endif*/ @@ -915,14 +915,14 @@ U8 action; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", \ sCellIdx)); - RETVALUE(RFAILED); + return RFAILED; } if(ueCb->cellInfo[sCellIdx] == NULLP) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d ueId %d\n", \ sCellIdx,ueCb->ueId)); - RETVALUE(RFAILED); + return RFAILED; } switch (action) @@ -994,7 +994,7 @@ U8 action; break; } } - RETVALUE(ret); + return (ret); } @@ -1035,10 +1035,10 @@ U8 *sCellIdx; if((ueCb->cellInfo[(*sCellIdx)] != NULLP) && (ueCb->cellInfo[(*sCellIdx)]->sCellState == RG_SCH_SCELL_READY)) { - RETVALUE(ROK); + return ROK; } } - RETVALUE(RFAILED); + return RFAILED; } /** @@ -1224,7 +1224,7 @@ RgSchUeCb *ueCb; rgSCHSCellDelUeSCell(cellCb,ueCb,idx); } - RETVALUE(ROK); + return ROK; } #ifdef TFU_UPGRADE @@ -1298,7 +1298,7 @@ U8 sCellIdx; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", sCellIdx)); - RETVALUE(RFAILED); + return RFAILED; } sCellInfo = ueCb->cellInfo[sCellIdx]; @@ -1403,7 +1403,7 @@ U8 sCellIdx; cqiCb->riDist = RG_SCH_INVALID_IDX; cqiCb->nCqiTrIdx = RG_SCH_INVALID_IDX; - RETVALUE(ROK); + return ROK; } #endif @@ -1650,7 +1650,7 @@ RgSchUePCqiCb *cqiCb2; } } - RETVALUE(retCqiCb->servCellInfo->sCellIdx); + return (retCqiCb->servCellInfo->sCellIdx); } /** @@ -1760,7 +1760,7 @@ RgSchUePCqiCb *cqiCb; idx = ((nPCqiServCellIdx)& (CM_LTE_MAX_CELLS -1)); ueCb->nPCqiCb = &ueCb->cellInfo[idx]->cqiCb; - RETVALUE(ROK); + return ROK; } @@ -1878,7 +1878,7 @@ RgSchUePCqiCb *cqiCb; /* Set the next expected Cqi into nPCqiCb */ ueCb->nPRiCb = &ueCb->cellInfo[nPRiServCellIdx]->cqiCb; - RETVALUE(ROK); + return ROK; } #endif/*TFU_UPGRADE*/ @@ -1923,7 +1923,7 @@ RgSchUeCb *ue; break; } } - RETVALUE(retVal); + return (retVal); } /** @@ -1958,9 +1958,9 @@ RgSchUeCb *ue * outstanding BO */ if(ue->remBoCnt == RG_SCH_ACTIVATION_COUNT) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } #endif/*LTE_ADV*/ diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c index e0c2e2bdc..d80ed4750 100755 --- a/src/5gnrsch/rg_sch_tom.c +++ b/src/5gnrsch/rg_sch_tom.c @@ -8266,7 +8266,7 @@ RgSchCellCb *cell; * Function: rgSCHDynTDDMrkCrntSfIdx * Purpose: update the dyn tdd sunframe index * @param[in] Inst schInst - * @RETVALUE None + * @return None */ #ifdef UNUSED_FUNC #ifdef ANSI diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c index ab4039684..91141d9cc 100755 --- a/src/5gnrsch/rg_sch_uhm.c +++ b/src/5gnrsch/rg_sch_uhm.c @@ -406,10 +406,10 @@ U8 idx; #if (ERRCLASS & ERRCLS_DEBUG) if(idx >= ueUl->hqEnt.numHqPrcs) { - RETVALUE(NULLP); + return (NULLP); } #endif - RETVALUE(&(ueUl->hqEnt.hqProcCb[idx])); + return (&(ueUl->hqEnt.hqProcCb[idx])); } /* rgSCHUhmGetUlHqProc */ /** @@ -785,7 +785,7 @@ U8 idx; TRC2(rgSCHUhmAppendPhich) #ifdef RG_5GTF - RETVALUE(ROK); + return ROK; #endif if(cellUl->hqFdbkIdx[idx] != RGSCH_INVALID_INFO) { @@ -812,7 +812,7 @@ U8 idx; if (rgSCHUtlGetPhichInfo (ulAlloc->hqProc, &rbStart, &nDmrs) != ROK) #endif { - RETVALUE (RFAILED); + return (RFAILED); } if(nDmrs != RGSCH_INVALID_NDMRS) { @@ -865,7 +865,7 @@ U8 idx; ulAlloc = rgSCHUtlNextHqFdbkAlloc (cellCb, ulAlloc, idx); } } - RETVALUE(ROK); + return ROK; } /* rgSCHUhmAppendPhich */ /** @@ -915,11 +915,11 @@ RgSchUeCb *ueCb; ueUl->hqEnt.numHqPrcs * \ sizeof(RgSchUlHqProcCb)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } /* rgSCHUhmHqEntInit */ #ifdef RG_5GTF @@ -982,7 +982,7 @@ RgSchUlHqProcCb **hqP; //printf("5GTF_ERROR rgSCHUhmGetAvlHqProc cellId %d %ld inUse %ld ue %d" //, cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId); /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } tmpHqProc = (RgSchUlHqProcCb *)(tmp->node); @@ -1000,7 +1000,7 @@ RgSchUlHqProcCb **hqP; *hqP = tmpHqProc; - RETVALUE(ROK); + return ROK; } /* rgSCHUhmGetAvlHqProc */ /** @@ -1050,11 +1050,11 @@ CmLteTimingInfo frm; if (RGSCH_TIMEINFO_SAME(proc->schdTime, frm)) { // printf("Harq timing Matched rgSCHUhmGetUlProcByTime time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.slot, proc->procId); - RETVALUE(proc); + return (proc); } } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHUhmGetUlProcByTime */ #endif diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c index 709f81cc5..3245e367e 100755 --- a/src/5gnrsch/rg_sch_utl.c +++ b/src/5gnrsch/rg_sch_utl.c @@ -327,15 +327,15 @@ F64 n; { if( n==0 ) { - RETVALUE( 1 ); + return ( 1 ); } else if ( n>0 ) { - RETVALUE( x * rgSCHUtlPower( x, n-1 ) ); + return ( x * rgSCHUtlPower( x, n-1 ) ); } else { - RETVALUE( (1/x) * rgSCHUtlPower( x, n+1 ) ); + return ( (1/x) * rgSCHUtlPower( x, n+1 ) ); } } /* end of rgSCHUtlPower*/ @@ -383,7 +383,7 @@ U8 buffSize; } pointToEnd++; } - RETVALUE((U32)result); + return ((U32)result); } /* end of rgSCHUtlParse*/ /* @@ -421,7 +421,7 @@ U16 tempIdx; crntTime += RG_SCH_PCQI_SRS_SR_TRINS_SIZE; dist+=1; } - RETVALUE(dist-1); + return (dist-1); } /* end of rgSCHUtlFindDist*/ #endif @@ -525,7 +525,7 @@ RgSchPdcch **pdcch; if ((offset >= ((pdcchInfo->nCce + 7) >> 3)) || ((aggrLvl == CM_LTE_AGGR_LVL16) && (offset > 0))) { - RETVALUE(FALSE); + return (FALSE); } byte = &pdcchInfo->map[offset]; @@ -540,7 +540,7 @@ RgSchPdcch **pdcch; ret = rgSCHUtlAllocSBuf(inst, (Data **)pdcch, sizeof(RgSchPdcch)); if(ROK != ret) { - RETVALUE(FALSE); + return (FALSE); } } @@ -558,7 +558,7 @@ RgSchPdcch **pdcch; (*pdcch)->nCce = aggrLvl; (*pdcch)->ue = NULLP; } - RETVALUE(TRUE); + return (TRUE); } @@ -838,7 +838,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CE Pool memory allocation FAILED for cell"); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo, cell); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); @@ -847,7 +847,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CE Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } l = &sf->sfrTotalPoolInfo.cePool; @@ -881,7 +881,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); @@ -890,7 +890,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } l = &sf->sfrTotalPoolInfo.ccPool; @@ -943,7 +943,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&temp->node, sizeof(RgSchSFRPoolInfo)); @@ -952,7 +952,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "CC Pool memory allocation FAILED for cell "); rgSchSFRTotalPoolFree(&sf->sfrTotalPoolInfo,cell); - RETVALUE(RFAILED); + return RFAILED; } cmLListAdd2Tail(l, temp); @@ -981,7 +981,7 @@ PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) sf->sfrTotalPoolInfo.ccBwFull = FALSE; sf->sfrTotalPoolInfo.ceBwFull = FALSE; sf->sfrTotalPoolInfo.isUeCellEdge = FALSE; - RETVALUE(ROK); + return ROK; } /** * @brief This function resets temporary variables in RNTP Prepration @@ -1026,10 +1026,10 @@ PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) (len * sizeof(U8)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for RNTP Alloc"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -1073,7 +1073,7 @@ PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) rntpPtr->len = 0; } - RETVALUE(ROK); + return ROK; } /** @@ -1259,7 +1259,7 @@ Bool isForMsg3; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, " rgSCHUtlAddPhich(): " "Allocation of RgSchPhich failed"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_TDD RGSCH_INITPHICH(phich, hqFeedBack, nDmrs, rbStart, iPhich); @@ -1267,7 +1267,7 @@ Bool isForMsg3; RGSCH_INITPHICH(phich, hqFeedBack, nDmrs, rbStart, isForMsg3); /*SR_RACH_STATS */ #endif cmLListAdd2Tail(&dlSf->phichInfo.phichs, &phich->lnk); - RETVALUE(ROK); + return ROK; } /* rgSCHUtlAddPhich */ /** @@ -1364,7 +1364,7 @@ CmLteTimingInfo frm; /* CA dev Start */ sf->dlIdx = dlIdx; /* CA dev End */ - RETVALUE(sf); + return (sf); } @@ -1532,7 +1532,7 @@ U32 n; ret |= s[i]; } } - RETVALUE(ret); + return (ret); } #ifdef LTEMAC_SPS @@ -1711,7 +1711,7 @@ Bool isEcp; default: /* case 1 */ regs += bw * RGSCH_NUM_REGS_1ST_SYM; } - RETVALUE(regs); + return (regs); } /*********************************************************** @@ -1741,7 +1741,7 @@ U8 ng6; { TRC2(rgSCHUtlCalcPhichRegs); /* ccpu00115330: Corrected the calculation for number of PHICH groups*/ - RETVALUE(RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP); + return (RGSCH_CEIL((bw * ng6) ,(8 * 6)) * RGSCH_NUM_REG_PER_PHICH_GRP); } #ifdef LTE_TDD @@ -1816,7 +1816,7 @@ Bool isEcp; phichRegs = rgSCHUtlCalcPhichRegs(bw, ng6); cceRegs = totalRegs - mPhich*phichRegs - RGSCH_NUM_PCFICH_REG; - RETVALUE((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); + return ((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); } #else @@ -1887,7 +1887,7 @@ Bool isEcp; phichRegs = rgSCHUtlCalcPhichRegs(bw, ng6); cceRegs = totalRegs - phichRegs - RGSCH_NUM_PCFICH_REG; - RETVALUE((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); + return ((U8)(cceRegs/RGSCH_NUM_REG_PER_CCE)); } #endif @@ -1953,7 +1953,7 @@ U8 *nDmrsRef; #endif ret = ROK; } - RETVALUE(ret); + return (ret); } #ifndef TFU_UPGRADE /** @@ -2024,7 +2024,7 @@ U8 *hqPId; #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2035,7 +2035,7 @@ U8 *hqPId; RLOG_ARG2(L_ERROR,DBG_CELLID,alloc->ue->cell->cellId, "Failed: ue->sch is null RNTI:%d,isRetx=%d", alloc->rnti, alloc->grnt.isRtx); - RETVALUE(RFAILED); + return RFAILED; } ueCtgy = (RG_SCH_CMN_GET_UE_CTGY(alloc->ue)); } @@ -2055,7 +2055,7 @@ U8 *hqPId; *ndi = alloc->hqProc->ndi; *hqPId = alloc->hqProc->procId; - RETVALUE(ROK); + return ROK; } #else /** @@ -2100,7 +2100,7 @@ TfuUeUlSchRecpInfo *recpReq; #if (ERRCLASS & ERRCLS_DEBUG) if ((alloc == NULLP) || (alloc->hqProc == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif recpReq->size = alloc->grnt.datSz; @@ -2173,7 +2173,7 @@ TfuUeUlSchRecpInfo *recpReq; } #endif /* ccpu00117050 - DEL - nSrs setting at rgSCHUtlAllocRcptInfo */ - RETVALUE(ROK); + return ROK; } #endif @@ -2405,7 +2405,7 @@ RgSchErrInfo *errInfo; (Data **)&cell->subFrms, sizeof(RgSchDlSf *) * maxslots); if (cell->subFrms == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* Create memory for each frame. */ @@ -2467,7 +2467,7 @@ RgSchErrInfo *errInfo; rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(cell->subFrms)), sizeof(RgSchDlSf *) * maxslots); - RETVALUE(RFAILED); + return RFAILED; } if (cell->sc.apis == NULLP) @@ -2481,7 +2481,7 @@ RgSchErrInfo *errInfo; /* ccpu00132286- Removed deletion of sf nodes as the deletion will be * happening during CellDelete. Added return handling to provide negative * confirm*/ - RETVALUE(ret); + return (ret); } /* Release the slots and thereby perform the initialization */ @@ -2496,7 +2496,7 @@ RgSchErrInfo *errInfo; rgSCHUtlDlRlsSubFrm(cell, frm); } - RETVALUE(ret); + return (ret); } #else @@ -2597,7 +2597,7 @@ RgSchErrInfo *errInfo; /*initialize the RNTP Buffer*/ if(rgSchDSFRRntpInfoInit(&sf->rntpInfo, cell, sf->bw)) { - RETVALUE(RFAILED); + return RFAILED; } } @@ -2606,7 +2606,7 @@ RgSchErrInfo *errInfo; /*initialise the pools of CC and CE*/ if(rgSchSFRTotalPoolInit(cell, sf)) { - RETVALUE(RFAILED); + return RFAILED; } } /* LTE_ADV_FLAG_REMOVED_END */ @@ -2620,7 +2620,7 @@ RgSchErrInfo *errInfo; (len * sizeof(U8)))) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for RNTP Alloc"); - RETVALUE(RFAILED); + return RFAILED; } cell->rntpAggrInfo.pres = PRSNT_NODEF; cell->rntpAggrInfo.len = len; @@ -2641,7 +2641,7 @@ RgSchErrInfo *errInfo; rgSCHLaaDeInitDlSfCb(cell, sf); #endif } - RETVALUE(RFAILED); + return RFAILED; } if (cell->sc.apis == NULLP) @@ -2667,7 +2667,7 @@ RgSchErrInfo *errInfo; if (ret != ROK) { errInfo->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } #ifdef EMTC_ENABLE if(cell->emtcEnable) @@ -2680,12 +2680,12 @@ RgSchErrInfo *errInfo; RGSCH_IOT_PUCCH_POOLSZ, RGSCH_IOT_PUCCH_DELTA, RGSCH_IOT_PUCCH_MAXFREQSZ) != ROK) { errInfo->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ret); + return (ret); } #endif @@ -2722,7 +2722,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHUtlRgrCellRecfg); - RETVALUE(cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err)); + return (cell->sc.apis->rgSCHRgrCellRecfg(cell, recfg, err)); } @@ -2870,7 +2870,7 @@ RgSchCellCb *cell; rgSchDSFRRntpInfoFree(&cell->rntpAggrInfo, cell, cell->bwCfg.dlTotalBw); /* LTE_ADV_FLAG_REMOVED_END */ - RETVALUE(ROK); + return ROK; } @@ -2921,7 +2921,7 @@ RgSchErrInfo *err; if (cfg->txMode.txModeEnum == RGR_UE_TM_5) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->mimoInfo.txMode = cfg->txMode.txModeEnum; } @@ -2934,7 +2934,7 @@ RgSchErrInfo *err; (cfg->puschDedCfg.bRIIdx > 15)) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } ue->ul.betaHqOffst = cfg->puschDedCfg.bACKIdx; ue->ul.betaCqiOffst = cfg->puschDedCfg.bCQIIdx; @@ -2945,7 +2945,7 @@ RgSchErrInfo *err; cmMemset((U8 *)&ue->pfsStats, 0, sizeof(RgSchPfsStats)); #endif /* Call the handler of the scheduler based on cell configuration */ - RETVALUE(cell->sc.apis->rgSCHRgrUeCfg(cell, ue, cfg, err)); + return (cell->sc.apis->rgSCHRgrUeCfg(cell, ue, cfg, err)); } /* Start : LTEMAC_2.1_DEV_CFG */ @@ -2988,7 +2988,7 @@ RgSchErrInfo *errInfo; #endif { TRC2(rgSCHUtlRgrLcCfg); - RETVALUE(cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo)); + return (cell->sc.apis->rgSCHRgrLchCfg(cell, ue, dlLc, cfg, errInfo)); } @@ -3031,7 +3031,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHUtlRgrLcRecfg); - RETVALUE(cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err)); + return (cell->sc.apis->rgSCHRgrLchRecfg(cell, ue, dlLc, recfg, err)); } /** @@ -3070,7 +3070,7 @@ U8 lcgId; TRC2(rgSCHUtlRgrLcDel); cell->sc.apis->rgSCHRgrLchDel(cell, ue, lcId, lcgId); - RETVALUE (ROK); + return (ROK); } /* rgSCHUtlRgrLcDel */ /** @@ -3109,7 +3109,7 @@ RgSchErrInfo *errInfo; #endif { TRC2(rgSCHUtlRgrLcgCfg); - RETVALUE(cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo)); + return (cell->sc.apis->rgSCHRgrLcgCfg(cell, ue, &(ue->ul.lcgArr[cfg->ulInfo.lcgId]), cfg, errInfo)); } @@ -3149,7 +3149,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHUtlRgrLcgRecfg); - RETVALUE(cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err)); + return (cell->sc.apis->rgSCHRgrLcgRecfg(cell, ue, &(ue->ul.lcgArr[recfg->ulRecfg.lcgId]), recfg, err)); } /* rgSCHUtlRgrLcRecfg */ /** @@ -3818,7 +3818,7 @@ PUBLIC RgSchCellCb* rgSchUtlGetCellCb(inst, cellId) strtCellId = rgSchCb[inst].genCfg.startCellId; cellCb = rgSchCb[inst].cells[cellId - strtCellId]; - RETVALUE(cellCb); + return (cellCb); } /* rgSchUtlGetCellCb */ @@ -3857,7 +3857,7 @@ PUBLIC U8 rgSchUtlGetServCellIdx(inst,cellId,ue) servCellIdx = ue->cellIdToCellIdxMap[cellId - strtCellId]; - RETVALUE(servCellIdx); + return (servCellIdx); } /* rgSchUtlGetCellCb */ @@ -3892,9 +3892,9 @@ PUBLIC S16 rgSchUtlVldtCellId(inst, cellId) strtCellId = rgSchCb[inst].genCfg.startCellId; if((cellId >= strtCellId) && ((cellId - strtCellId) < CM_LTE_MAX_CELLS)) { - RETVALUE(ROK); + return ROK; } - RETVALUE(RFAILED); + return RFAILED; } /* rgSchUtlVldtCellId */ #endif /* LTE_ADV*/ @@ -3955,7 +3955,7 @@ RgSchErrInfo *err; if (ueRecfg->txMode.txModeEnum == RGR_UE_TM_5) { err->errCause = RGSCHERR_SCH_CFG; - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV if(ue->mimoInfo.txMode != ueRecfg->txMode.txModeEnum) @@ -3995,7 +3995,7 @@ RgSchErrInfo *err; /* Commenting here to assign garbage value when it is not set in APP. */ //ue->accessStratumRls = ueRecfg->accessStratumRls; - RETVALUE(cell->sc.apis->rgSCHRgrUeRecfg(cell, ue, ueRecfg, err)); + return (cell->sc.apis->rgSCHRgrUeRecfg(cell, ue, ueRecfg, err)); } /* rgSCHUtlRgrUeRecfg */ /** @@ -4176,7 +4176,7 @@ RgSchUlHqProcCb *oldProc; #endif { TRC2(rgSCHUtlUpdUlHqProc); - RETVALUE(cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc)); + return (cell->sc.apis->rgSCHUpdUlHqProc(cell, curProc, oldProc)); } /* rgSCHUtlUpdUlHqProc */ #endif /** @@ -4215,7 +4215,7 @@ RgSchErrInfo *err; ue->isMsg4PdcchWithCrnti = TRUE; - RETVALUE(cell->sc.apis->rgSCHContResUlGrant(cell, ue, err)); + return (cell->sc.apis->rgSCHContResUlGrant(cell, ue, err)); } /* rgSCHUtlContResUlGrant */ /** @@ -4251,7 +4251,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHUtlSrRcvd); - RETVALUE(cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err)); + return (cell->sc.apis->rgSCHSrRcvd(cell, ue, frm, err)); } /* rgSCHUtlSrRcvd */ /** @@ -4429,7 +4429,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHUtlUpdExtPhr); - RETVALUE(cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err)); + return (cell->sc.apis->rgSCHUpdExtPhr(cell, ue, extPhr, err)); } /* rgSCHUtlUpdExtPhr */ @@ -4468,7 +4468,7 @@ RgSchErrInfo *err; #endif { TRC2(rgSCHUtlUpdPhr); - RETVALUE(cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err)); + return (cell->sc.apis->rgSCHUpdPhr(cell, ue, phr, err)); } /* rgSCHUtlUpdPhr */ @@ -4643,7 +4643,7 @@ RgSchCellCb *cell; #endif { TRC2(rgSCHUtlFirstRcptnReq); - RETVALUE(cell->sc.apis->rgSCHFirstRcptnReq(cell)); + return (cell->sc.apis->rgSCHFirstRcptnReq(cell)); } /** @@ -4676,7 +4676,7 @@ RgSchUlAlloc *alloc; #endif { TRC2(rgSCHUtlNextRcptnReq); - RETVALUE(cell->sc.apis->rgSCHNextRcptnReq(cell, alloc)); + return (cell->sc.apis->rgSCHNextRcptnReq(cell, alloc)); } /** @@ -4710,7 +4710,7 @@ U8 idx; #endif { TRC2(rgSCHUtlFirstHqFdbkAlloc); - RETVALUE(cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx)); + return (cell->sc.apis->rgSCHFirstHqFdbkAlloc(cell, idx)); } @@ -4744,7 +4744,7 @@ U8 idx; #endif { TRC2(rgSCHUtlNextHqFdbkAlloc); - RETVALUE(cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx)); + return (cell->sc.apis->rgSCHNextHqFdbkAlloc(cell, alloc, idx)); } /*********************************** @@ -4794,7 +4794,7 @@ SpId spId; RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlTfuBndReq() Call to RgLiTfuBndReq()" " failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuBndReq */ /** @@ -4838,7 +4838,7 @@ Reason reason; RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuUBndReq() Call to" " RgLiTfuUbndReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuUBndReq */ @@ -4886,7 +4886,7 @@ Bool restAlloc; { sfAlloc->cmnLcInfo.bitMask = 0; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4930,11 +4930,11 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "UE Alloc"); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -4981,7 +4981,7 @@ RgSchCellCb *cell; } } - RETVALUE(ROK); + return ROK; } @@ -5034,7 +5034,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "UE Alloc"); - RETVALUE(RFAILED); + return RFAILED; } /* Allocate memory for "scheduled RAR" Info */ @@ -5044,7 +5044,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "RARNTI"); - RETVALUE(RFAILED); + return RFAILED; } for(indx = 0; indx < RGSCH_MAX_RARNTI_PER_DL_SF; indx++) { @@ -5054,7 +5054,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Memory allocation FAILED for " "RNTI"); - RETVALUE(RFAILED); + return RFAILED; } } @@ -5064,7 +5064,7 @@ RgSchCellCb *cell; rgSCHEmtcUtlGetSfAlloc(cell); #endif - RETVALUE(ROK); + return ROK; } @@ -5139,7 +5139,7 @@ RgSchCellCb *cell; #ifdef EMTC_ENABLE rgSCHEmtcUtlPutSfAlloc(cell); #endif - RETVALUE(ROK); + return ROK; } @@ -5185,7 +5185,7 @@ Size size; /* size */ #ifndef NO_ERRCLS if (size == 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5205,14 +5205,14 @@ Size size; /* size */ LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); RGSCHLOGERROR(inst, ERRCLS_DEBUG, ERG015, 0, "Unable to Allocate Buffer"); RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Unable to Allocate the Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* zero out the allocated memory */ cmMemset((U8 *)*pData, 0x00, size); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlAllocSBuf */ @@ -5418,11 +5418,11 @@ RgSchCellCb *cell; { warningSiPdu = (RgSchWarningSiPdu *)node->node; pdu = warningSiPdu->pdu; - RETVALUE(pdu); + return (pdu); } else { - RETVALUE(NULLP); + return (NULLP); } } /* rgSCHUtlGetWarningSiPdu */ @@ -5475,17 +5475,17 @@ MsgLen *msgLen; CM_LLIST_FIRST_NODE(&warningSi->warningSiMsg.segLstCp, node); if (node == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } warningSiPdu = (RgSchWarningSiPdu *)node->node; *mcs = warningSiPdu->mcs; *nPrb = warningSiPdu->nPrb; *msgLen = warningSiPdu->msgLen; - RETVALUE(ROK); + return ROK; } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlGetMcsAndNPrb */ /* @@ -5526,7 +5526,7 @@ U8 siId; { RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "msgLen does " "not match any valid TB Size"); - RETVALUE(RFAILED); + return RFAILED; } @@ -5572,7 +5572,7 @@ U8 siId; cell->siCb.crntSiInfo.siInfo[siId-1].msgLen = msgLen; } - RETVALUE(ROK); + return ROK; } #endif @@ -5732,7 +5732,7 @@ Bool sendInd; sfAlloc->cmnLcInfo.pcchInfo.lcId = lcId; sfAlloc->cmnLcInfo.bitMask |= RGINF_PCCH_INFO; } - RETVALUE(ROK); + return ROK; } /** @brief This function fills in the RAR information to be sent to MAC @@ -5869,7 +5869,7 @@ RgSchCellCb *cell; TODO-Need to add a check for max tx power per symbol */ sfAlloc->rarInfo.txPwrOffset = cellDl->rarTxPwrOffset; - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlFillRgInfRarInfo */ /** @brief This function fills in the pdsch data related allocation Info @@ -5946,13 +5946,13 @@ TfuDciInfo *pdcchDci; ret = rgSCHEmtcUtlFillPdschDciInfo(pdsch, pdcchDci); if(RFAILED == ret) { - RETVALUE(RFAILED); + return RFAILED; } #else - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -6574,7 +6574,7 @@ RgSchErrInfo *err; /* PHR present */ RGSCHCPYTIMEINFO(subfrmInfo->timingInfo, ueCb->macCeRptTime); if ((ret = rgSCHUtlUpdPhr(cellCb, ueCb, pdu->ceInfo.ces.phr, err)) != ROK) - RETVALUE(ret); + return (ret); } /* Note: Order of indication to Sch now is * 1st Indicate the DataInd info for each LCG's @@ -6628,7 +6628,7 @@ RgSchErrInfo *err; } #endif - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlUpdSch */ #ifdef RGR_V1 /** @@ -6670,13 +6670,13 @@ RgSchUeCb *ueCb; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unexpected CCCH SDU BO", ueCb->ueId); - RETVALUE(ROK); + return ROK; } ueCb->ccchSduLnk.node = (PTR)(ueCb); cmLListAdd2Tail(&(cell->ccchSduUeLst), &(ueCb->ccchSduLnk)); - RETVALUE(ROK); + return ROK; } /** * @@ -6711,7 +6711,7 @@ RgInfCmnBoRpt *staRsp; { /* Handle Ue fetch failure */ RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid UEID:%d",staRsp->u.rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Update Bo in ueCb */ ueCb->dlCcchInfo.bo = (U32)(staRsp->bo); @@ -6726,7 +6726,7 @@ RgInfCmnBoRpt *staRsp; rgSCHUtlAddUeToCcchSduLst(cell, ueCb); } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlUpdtBo */ #endif @@ -6767,12 +6767,12 @@ RgInfCmnBoRpt *boRpt; #ifdef RGR_V1 /* CR timer implementation changes*/ /*If no raCb, schedule ueCb, ueCb is extracted in rgSCHUtlUpdtBo*/ - RETVALUE(rgSCHUtlUpdtBo(cell, boRpt)); + return (rgSCHUtlUpdtBo(cell, boRpt)); #else /* Handle RaCb fetch failure */ RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Invalid RNTI:%d to fetch raCb",boRpt->u.rnti); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -6807,7 +6807,7 @@ RgInfCmnBoRpt *boRpt; { /* Handle Ue fetch failure */ RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Invalid RNTI:%d",boRpt->u.rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Update Bo in ueCb */ ueCb->dlCcchInfo.bo = (U32)(boRpt->bo); @@ -6817,7 +6817,7 @@ RgInfCmnBoRpt *boRpt; rgSCHRamUpdtBo(cell, raCb, boRpt); #endif - RETVALUE(ROK); + return ROK; } /* rgSCHUtlHndlCcchBoUpdt */ /** @@ -6866,7 +6866,7 @@ U8 *mcs; { *nPrb = rgSchUtlBcchPcchTbSzTbl[cn].rbIndex; *mcs = rgSchUtlBcchPcchTbSzTbl[cn].mcs; - RETVALUE(rgSchUtlBcchPcchTbSzTbl[cn].tbSz); + return (rgSchUtlBcchPcchTbSzTbl[cn].tbSz); } else if (rgSchUtlBcchPcchTbSzTbl[cn].tbSz < bo) lt = cn + 1; @@ -6875,11 +6875,11 @@ U8 *mcs; } if (lt == 44) { - RETVALUE(RFAILED); + return RFAILED; } *nPrb = rgSchUtlBcchPcchTbSzTbl[lt].rbIndex; *mcs = rgSchUtlBcchPcchTbSzTbl[lt].mcs; - RETVALUE(rgSchUtlBcchPcchTbSzTbl[lt].tbSz); + return (rgSchUtlBcchPcchTbSzTbl[lt].tbSz); } /** @@ -6923,7 +6923,7 @@ RgInfCmnBoRpt *boUpdt; { RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "No Logical Channel dlLc is NULLP for RNTI:%d LCID:%d",boUpdt->u.rnti,boUpdt->lcId); - RETVALUE(RFAILED); + return RFAILED; } if (boUpdt->lcId != dlLc->lcId) { @@ -6936,12 +6936,12 @@ RgInfCmnBoRpt *boUpdt; { RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,"[%ld]BO: does not match any " "valid TB Size RNTI:%d LCID:%d", boUpdt->bo,boUpdt->u.rnti,boUpdt->lcId); - RETVALUE(RFAILED); + return RFAILED; } }/*end of rgSCHChkBoUpdate*/ else { - RETVALUE(ROK); + return ROK; } } if ((dlLc = rgSCHDbmGetCmnLcCb(cell, boUpdt->lcId)) == NULLP) @@ -6956,7 +6956,7 @@ RgInfCmnBoRpt *boUpdt; { RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, "Allocation of common bo %dreport " "failed RNTI:%d LCID:%d", boUpdt->bo,boUpdt->u.rnti,boUpdt->lcId); - RETVALUE(RFAILED); + return RFAILED; } boRpt->bo = boUpdt->bo; @@ -6982,7 +6982,7 @@ RgInfCmnBoRpt *boUpdt; } rgSCHDbmInsCmnLcBoRpt(dlLc, boRpt); - RETVALUE(ROK); + return ROK; } /* rgSCHUtlHndlBcchPcchBoUpdt */ /** @@ -7025,9 +7025,9 @@ U8 status; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrBndCfm: RgUiRgrBndCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrBndCfm*/ /** @@ -7070,9 +7070,9 @@ U8 status; if (ret != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgmBndCfm: RgUiRgrBndCfm Failed "); - RETVALUE(ret); + return (ret); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgmBndCfm*/ @@ -7130,9 +7130,9 @@ U8 status; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"schSendCfgCfm: RgUiRgrCfgCfm Failed"); printf("\nschSendCfgCfm: RgUiRgrCfgCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* schSendCfgCfm*/ #ifdef RGR_RRM_TICK /** @@ -7179,7 +7179,7 @@ RgrTtiIndInfo *rgrTti; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrTtiInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrTtiInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrTti); @@ -7189,7 +7189,7 @@ RgrTtiIndInfo *rgrTti; mtTmrHdlrPublic(); } #endif - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrTtiInd*/ #endif /** @brief This function is called by rgMacSchSfRecpInd. This function invokes the @@ -7248,7 +7248,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "RNTI:%d Received MSG3, unable to " "find raCb",rnti); - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00130982: Processing CRNTI MAC CE before Short BSR, if any, such that @@ -7258,7 +7258,7 @@ RgSchErrInfo *err; { RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Processing failed in the RAM " "RNTI:%d ",rnti); - RETVALUE(ret); + return (ret); } /* if ueCb is present */ if (ueCb != NULLP) @@ -7266,7 +7266,7 @@ RgSchErrInfo *err; rgSCHUtlUpdSch (subfrmInfo, cellCb, ueCb, pdu, err); } - RETVALUE(ROK); + return ROK; } #ifdef LTEMAC_SPS /** @brief This function is called by RgMacSchSpsRelInd. This function invokes the @@ -7303,7 +7303,7 @@ Bool isExplRel; { TRC2(rgSCHUtlSpsRelInd); cellCb->sc.apis->rgSCHUlSpsRelInd(cellCb, ueCb, isExplRel); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlSpsRelInd */ @@ -7341,7 +7341,7 @@ U16 spsSduSize; { TRC2(rgSCHUtlSpsActInd); cellCb->sc.apis->rgSCHUlSpsActInd(cellCb, ueCb, spsSduSize); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlSpsActInd */ @@ -7390,7 +7390,7 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; { RLOG_ARG1(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, "rgSCHUtlTfuGrpPwrCntrlReq() Lower SAP not bound (%d) ",tfuSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst)); if((ret = RgLiTfuGrpPwrCntrlReq (&pst, tfuSap->sapCfg.spId, grpPwrCntrlReq)) != ROK) @@ -7398,7 +7398,7 @@ TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq; RLOG_ARG0(L_ERROR,DBG_CELLID,grpPwrCntrlReq->cellId, "rgSCHUtlTfuGrpPwrCntrlReq() Call to RgLiTfuGrpPwrCntrlReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuGrpPwrCntrlReq */ #endif @@ -7446,7 +7446,7 @@ TfuCntrlReqInfo *cntrlReq; RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuCntrlReq() Lower SAP not bound (%d) ", tfuSap->sapSta.sapState); RGSCH_FREE_MEM(cntrlReq); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7456,7 +7456,7 @@ TfuCntrlReqInfo *cntrlReq; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuCntrlReq() Call to RgLiTfuCntrlReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuCntrlReq*/ @@ -7493,7 +7493,7 @@ RgSchUeCb *ue; { TRC2(rgSCHUtlDlActvtUe); cell->sc.apis->rgSCHActvtDlUe(cell, ue); - RETVALUE(ROK); + return ROK; } /** @@ -7527,7 +7527,7 @@ RgSchUeCb *ue; { TRC2(rgSCHUtlUlActvtUe); cell->sc.apis->rgSCHActvtUlUe(cell, ue); - RETVALUE(ROK); + return ROK; } /** @@ -7574,7 +7574,7 @@ TfuRecpReqInfo *recpReq; RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuRecpReq() Lower SAP not bound (%d) ", tfuSap->sapSta.sapState); RGSCH_FREE_MEM(recpReq); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7584,7 +7584,7 @@ TfuRecpReqInfo *recpReq; { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"rgSCHUtlTfuRecpReq() Call to RgLiTfuRecpReq() failed"); } - RETVALUE(ret); + return (ret); } /* rgSCHUtlTfuRecpReq */ /** @brief This function Validates the SAP information received along with the @@ -7617,7 +7617,7 @@ SuId suId; if(suId >= rgSchCb[inst].numSaps) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Incorrect SuId"); - RETVALUE(RFAILED); + return RFAILED; } tfuSap = &(rgSchCb[inst].tfuSap[suId]); @@ -7626,15 +7626,15 @@ SuId suId; { RLOG_ARG2(L_ERROR,DBG_INSTID,inst,"Incorrect SuId. Configured (%d) Recieved (%d)", tfuSap->sapCfg.suId, suId); - RETVALUE(RFAILED); + return RFAILED; } if (tfuSap->sapSta.sapState != LRG_BND) { RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"Lower SAP not enabled SuId (%d)", tfuSap->sapCfg.suId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlValidateTfuSap */ /* @@ -7678,7 +7678,7 @@ Size memSize; { RGSCHLOGERROR(inst, ERRCLS_INT_PAR, ERG022, memSize, "rgAllocEventMem(): memSize invalid\n"); - RETVALUE (RFAILED); + return (RFAILED); } #endif /* ERRCLASS & ERRCLS_DEBUG */ /*starting Task*/ @@ -7694,11 +7694,11 @@ Size memSize; #endif /* */ { RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"cmAllocEvnt Failed."); - RETVALUE(RFAILED); + return RFAILED; } /*stoping Task*/ SStopTask(startTime, PID_SCHUTL_CMALLCEVT); - RETVALUE(ROK); + return ROK; } /* end of rgSCHUtlAllocEventMem*/ /* @@ -7737,7 +7737,7 @@ Ptr memCp; #else ret = cmGetMem(memCp, len, (Ptr *)ptr); #endif - RETVALUE(ret); + return (ret); } /* end of rgSCHUtlGetEventMem*/ #ifdef LTE_TDD @@ -7775,7 +7775,7 @@ U8 servCellIdx; (Data **) &(ue->cellInfo[servCellIdx]->anInfo), sizeof(RgSchTddANInfo) * \ ue->cell->ackNackFdbkArrSize) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for(idx=0; idx < ue->cell->ackNackFdbkArrSize; idx++) @@ -7785,7 +7785,7 @@ U8 servCellIdx; /* Set it to the first index */ ue->cellInfo[servCellIdx]->nextFreeANIdx = 0; - RETVALUE(ROK); + return ROK; } /* rgSCHUtlAllocUeANFdbkInfo */ /** @@ -7853,7 +7853,7 @@ RgSchTddANInfo *anFdInfo; anFdInfo->dlDai = RG_SCH_INVALID_DAI_VAL; anFdInfo->latestMIdx = RG_SCH_INVALID_M_VAL; - RETVALUE(ROK); + return ROK; } /* rgSCHUtlInitUeANFdbkInfo */ /** @@ -7893,11 +7893,11 @@ U8 servCellIdx; if( (timeInfo->sfn == ueCb->cellInfo[servCellIdx]->anInfo[idx].sfn) && (timeInfo->slot == ueCb->cellInfo[servCellIdx]->anInfo[idx].slot)) { - RETVALUE(&ueCb->cellInfo[servCellIdx]->anInfo[idx]); + return (&ueCb->cellInfo[servCellIdx]->anInfo[idx]); } } - RETVALUE(NULLP); + return (NULLP); } /* rgSCHUtlGetUeANFdbkInfo */ /** @@ -7934,7 +7934,7 @@ CmLteTimingInfo *timeInfo; rgSchTddNumDlSubfrmTbl[cell->ulDlCfgIdx][timeInfo->slot]) - 1; idx = idx % cell->numDlSubfrms; - RETVALUE((U8)idx); + return ((U8)idx); } /** @@ -8094,7 +8094,7 @@ U8 maxUePerSf; sizeof(RgSchUlAllocDb)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } ret = rgSCHUtlUlAllocDbInit(cell, sf->allocDb, maxUePerSf); if (ret != ROK) @@ -8103,7 +8103,7 @@ U8 maxUePerSf; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->allocDb)), sizeof(RgSchUlAllocDb)); - RETVALUE(ret); + return (ret); } ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data **)&sf->holeDb, sizeof(RgSchUlHoleDb)); @@ -8114,7 +8114,7 @@ U8 maxUePerSf; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->allocDb)), sizeof(RgSchUlAllocDb)); - RETVALUE(ret); + return (ret); } /* Initialize the hole with CFI 1 Pusch Bw Info */ ret = rgSCHUtlUlHoleDbInit(cell, sf->holeDb, (U8)(maxUePerSf + 2), \ @@ -8129,7 +8129,7 @@ U8 maxUePerSf; sizeof(RgSchUlAllocDb)); rgSCHUtlFreeSBuf(cell->instIdx, (Data **)(&(sf->holeDb)), sizeof(RgSchUlHoleDb)); - RETVALUE(ret); + return (ret); } cmLListInit(&sf->reTxLst); @@ -8149,7 +8149,7 @@ U8 maxUePerSf; } #endif - RETVALUE(ret); + return (ret); } @@ -8231,11 +8231,11 @@ U8 maxAllocs; TRC2(rgSCHUtlUlAllocDbInit); if (ret != ROK) { - RETVALUE(ret); + return (ret); } allocDb->count = 0; allocDb->first = NULLP; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -8309,14 +8309,14 @@ U8 num; ret = rgSCHUtlUlHoleMemInit(cell, &holeDb->mem, maxHoles, &hole); if (ret != ROK) { - RETVALUE(ret); + return (ret); } holeDb->count = 1; holeDb->first = hole; hole->start = start; hole->num = num; hole->prv = hole->nxt = NULLP; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -8382,11 +8382,11 @@ RgSchUlHole *hole; TRC2(rgSCHUtlUlAllocGetHole); if (numSb < hole->num) { - RETVALUE(rgSCHUtlUlAllocGetPartHole(sf, numSb, hole)); + return (rgSCHUtlUlAllocGetPartHole(sf, numSb, hole)); } else { - RETVALUE(rgSCHUtlUlAllocGetCompHole(sf, hole)); + return (rgSCHUtlUlAllocGetCompHole(sf, hole)); } } @@ -8454,7 +8454,7 @@ RgSchUlHole *hole; /* UL_ALLOC_CHANGES*/ alloc->allocDbRef = (void*)sf->allocDb; alloc->holeDbRef = (void*)sf->holeDb; - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -8522,7 +8522,7 @@ RgSchUlHole *hole; alloc->allocDbRef = (void*)sf->allocDb; alloc->holeDbRef = (void*)sf->holeDb; - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -8549,7 +8549,7 @@ RgSchUlSf *sf; #endif { TRC2(rgSCHUtlUlAllocFirst); - RETVALUE(sf->allocDb->first); + return (sf->allocDb->first); } /*********************************************************** @@ -8579,7 +8579,7 @@ RgSchUlAlloc *alloc; { TRC2(rgSCHUtlUlAllocNxt); UNUSED(sf); - RETVALUE(alloc->nxt); + return (alloc->nxt); } /*********************************************************** @@ -8620,7 +8620,7 @@ RgSchUlAlloc *prv; #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) { - RETVALUE ( NULLP ); + return ( NULLP ); } #endif alloc->prv = prv; @@ -8633,7 +8633,7 @@ RgSchUlAlloc *prv; ++db->count; - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -8671,7 +8671,7 @@ RgSchUlAllocDb *db; #if (ERRCLASS & ERRCLS_DEBUG) if ( alloc == NULLP ) { - RETVALUE ( NULLP ); + return ( NULLP ); } #endif @@ -8685,7 +8685,7 @@ RgSchUlAllocDb *db; ++db->count; - RETVALUE(alloc); + return (alloc); } /* UL_ALLOC_ENHANCEMENT */ @@ -8892,7 +8892,7 @@ RgSchUlSf *sf; #endif { TRC2(rgSCHUtlUlHoleFirst); - RETVALUE(sf->holeDb->first); + return (sf->holeDb->first); } /*********************************************************** @@ -8922,7 +8922,7 @@ RgSchUlHole *hole; { TRC2(rgSCHUtlUlHoleNxt); UNUSED(sf); - RETVALUE(hole->nxt); + return (hole->nxt); } /*********************************************************** @@ -9477,7 +9477,7 @@ U8 maxAllocs; maxAllocs * sizeof(*allocs)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } mem->allocs = allocs; mem->maxAllocs = maxAllocs; @@ -9500,7 +9500,7 @@ U8 maxAllocs; allocs[i].nxt = NULLP; } mem->firstFree = &allocs[0]; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -9576,7 +9576,7 @@ RgSchUlHole **holeRef; maxHoles * sizeof(*holes)); if (ret != ROK) { - RETVALUE(ret); + return (ret); } mem->holes = holes; @@ -9607,7 +9607,7 @@ RgSchUlHole **holeRef; } mem->firstFree = &holes[1]; - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -9674,7 +9674,7 @@ RgSchUlAllocMem *mem; #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) { - RETVALUE(NULLP); + return (NULLP); } #endif @@ -9683,7 +9683,7 @@ RgSchUlAllocMem *mem; alloc->nxt = NULLP; /* probably not needed */ /* alloc->prv might already be NULLP, in case was needed to set it to NULLP */ - RETVALUE(alloc); + return (alloc); } /*********************************************************** @@ -9752,7 +9752,7 @@ RgSchUlHoleMem *mem; #if (ERRCLASS & ERRCLS_DEBUG) if (mem->firstFree == NULLP) { - RETVALUE(NULLP); + return (NULLP); } #endif @@ -9762,7 +9762,7 @@ RgSchUlHoleMem *mem; hole->nxt = NULLP; /* probably not needed */ /* hole->prv is might already be NULLP, in case was needed to set it to NULLP */ - RETVALUE(hole); + return (hole); } /*********************************************************** @@ -9841,7 +9841,7 @@ U8 numSb; if ((hole = rgSCHUtlUlHoleFirst(sf)) == NULLP) { - RETVALUE(NULLP); + return (NULLP); } do { @@ -9858,7 +9858,7 @@ U8 numSb; #if (ERRCLASS & ERRCLS_DEBUG) if ( newHole == NULLP ) { - RETVALUE( NULLP ); + return ( NULLP ); } #endif newHole->start = hole->start; @@ -9898,7 +9898,7 @@ U8 numSb; break; } } while ((hole = nxtHole) != NULLP); - RETVALUE(alloc); + return (alloc); } #ifdef LTE_L2_MEAS /** @@ -9939,15 +9939,15 @@ U8 *qci; qciVal = qci[qciIdx]; if(qciVal == 0 || qciVal > 9) { - RETVALUE(RFAILED); + return RFAILED; } if(qciVal != cellCb->qciArray[qciVal].qci) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; }/* rgSCHUtlValidateQci */ /** * @brief Validates the measurement request parameters. @@ -9987,7 +9987,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_MEAS_TYPE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((schL2MeasInfo->timePrd !=0) && (measType & LRG_L2MEAS_AVG_PRB_PER_QCI_DL) && @@ -9996,7 +9996,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((schL2MeasInfo->timePrd !=0) && (measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL) && @@ -10004,7 +10004,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL) && ((schL2MeasInfo->nmbActvUeQciDl.numQci > LRG_MAX_QCI_PER_REQ) || @@ -10015,7 +10015,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_UL) && ((schL2MeasInfo->nmbActvUeQciUl.numQci > LRG_MAX_QCI_PER_REQ) || @@ -10026,7 +10026,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_PARAM_RANGE; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } if((schL2MeasInfo->timePrd !=0) && (measType & LRG_L2MEAS_AVG_PRB_PER_QCI_DL)) @@ -10039,10 +10039,10 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_SCH_INVALID_QCI_VAL; err->errCause = RGSCHERR_SCH_L2MEAS; - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; }/* rgSCHUtlValidateMeasReq */ #endif /* LTE_L2_MEAS */ /******* : END *****/ @@ -10095,10 +10095,10 @@ U8 status; { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrSiCfgCfm: " "RgUiRgrSiCfgCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlRgrSiCfgCfm */ @@ -10152,10 +10152,10 @@ U8 status; { RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"rgSCHUtlRgrSiCfgCfm: " "RgUiRgrSiCfgCfm Failed "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHUtlRgrWarningSiCfgCfm */ /*********************************************************** @@ -10363,7 +10363,7 @@ CmLListCp *ulInActvLst; } }/*if(isNewTx == TRUE) */ - RETVALUE(ROK); + return ROK; }/* rgSCHUtlGetSchdUes*/ /* ccpu00117452 - MOD - Changed macro name from @@ -10427,10 +10427,10 @@ U8 numCqiRept; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Could not send " "CQI reports for RNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* End of rgSCHUtlFillSndStaInd */ @@ -10477,11 +10477,11 @@ RgrStaIndInfo *rgrSta; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrStaInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrStaInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrSta); - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrStaInd*/ #endif /* End of RGR_CQI_REPT */ @@ -10585,11 +10585,11 @@ PUBLIC S16 rgSCHUtlRgrLoadInfInd(cell, rgrLoadInf) RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrLoadInfInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrLoadInfInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrLoadInf); - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrLoadInfInd*/ /* LTE_ADV_FLAG_REMOVED_END */ @@ -10690,10 +10690,10 @@ RgrUeStaIndInfo *ueStaInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Could not send " "UE Sta reports CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* End of rgSCHUtlFillSndStaInd */ @@ -10740,11 +10740,11 @@ RgrUeStaIndInfo *rgrUeSta; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHUtlRgrUeStaInd() Upper SAP not bound (%d) ", rgrSap->sapSta.sapState); - RETVALUE(RFAILED); + return RFAILED; } RgUiRgrUeStaInd(&(cell->rgrSap->sapCfg.sapPst), cell->rgrSap->sapCfg.suId, rgrUeSta); - RETVALUE(ret); + return (ret); } /* rgSCHUtlRgrStaInd*/ /* RRM_RBC_X */ @@ -10816,7 +10816,7 @@ RgSchCellCb *cell; cell->rgmSap->sapCfg.sapPst.pool, (Data**)&prbRprtInd, sizeof(RgmPrbRprtInd)) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } cmMemset((U8 *) &prbRprtInd->stQciPrbRpts[0], @@ -10872,7 +10872,7 @@ RgSchCellCb *cell; cell->rgmSap->sapCfg.suId, prbRprtInd); - RETVALUE(ret); + return (ret); } /* RRM_RBC_Y */ @@ -10971,9 +10971,9 @@ RgInfCmnBoRpt *boUpdt; if (distance > RGSCH_PCCHBCCH_WIN) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/*rgSCHChkBoUpdate*/ @@ -11046,7 +11046,7 @@ U8 hqFdbkIdx; /* Fetch the corresponding UL slot Idx in UL sf array */ reTxIdx = rgSCHCmnGetUlSfIdx(&phichTime, cell); } - RETVALUE(reTxIdx); + return (reTxIdx); } #endif @@ -11380,7 +11380,7 @@ U8 numTxAnt; break; } - RETVALUE(pcqiSz); + return (pcqiSz); } #endif #endif @@ -11418,7 +11418,7 @@ U32 *numSbs; //Currently hardcoding MAX prb for each UE nPrb = ue->ue5gtfCb.maxPrb; (*numSbs) = RGSCH_CEIL(nPrb, MAX_5GTF_VRBG_SIZE); - RETVALUE(ROK); + return ROK; } /** @@ -11506,7 +11506,7 @@ U8 vrbgRequired; } } - RETVALUE(ROK); + return ROK; } /** @@ -11560,7 +11560,7 @@ Bool isGbr; /* code Coverage portion of the test case */ RgSchMacLcgReg(&pst, &lcgRegReq); - RETVALUE(ROK); + return ROK; } #ifdef TFU_UPGRADE @@ -11617,7 +11617,7 @@ RgrSchFrmt1b3TypEnum fdbkType; } break; } - RETVALUE(mode); + return (mode); } #endif /* TFU_TDD */ #endif /* LTE_ADV */ @@ -11725,7 +11725,7 @@ RgrTxMode txMode break; } - RETVALUE(maxTbCount); + return (maxTbCount); } /** @@ -12497,7 +12497,7 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) schCmnCell->ul.maxUeNewTxPerTti; } - RETVALUE(ROK); + return ROK; } /* Check and Update numUEPer TTI based CPU overload instruction before * going for TP based CPU OL @@ -12507,7 +12507,7 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns); /* If need to have both TP and numUePerTti instrcution together in * one command then dont return from here */ - RETVALUE(ROK); + return ROK; } crntDlCpuOL = (crntCpuOvrLdIns & RGR_CPU_OVRLD_DL_TPT_UP) +\ @@ -12516,7 +12516,7 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) (crntDlCpuOL != RGR_CPU_OVRLD_DL_TPT_DOWN)) { /* Cfg validation failed. Invalid Command. Either UP/DOWN is allowed */ - RETVALUE(RFAILED); + return RFAILED; } crntUlCpuOL = (crntCpuOvrLdIns & RGR_CPU_OVRLD_UL_TPT_UP) +\ (crntCpuOvrLdIns & RGR_CPU_OVRLD_UL_TPT_DOWN); @@ -12524,12 +12524,12 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) (crntUlCpuOL != RGR_CPU_OVRLD_UL_TPT_DOWN)) { /* Cfg validation failed. Invalid Command. Either UP/DOWN is allowed */ - RETVALUE(RFAILED); + return RFAILED; } if ((crntDlCpuOL == 0) && (crntUlCpuOL == 0)) { /* Cfg validation failed. Invalid Command. Either UP/DOWN is allowed */ - RETVALUE(RFAILED); + return RFAILED; } cell->cpuOvrLdCntrl.cpuOvrLdIns = crntCpuOvrLdIns; @@ -12575,7 +12575,7 @@ PUBLIC S16 rgSCHUtlResetCpuOvrLdState(cell, crntCpuOvrLdIns) #endif } rgSCHUtlCpuOvrLdAdjItbsCap(cell); - RETVALUE(ROK); + return ROK; } #ifdef EMTC_ENABLE PUBLIC S16 rgSCHUtlAddToResLst @@ -12586,7 +12586,7 @@ PUBLIC S16 rgSCHUtlAddToResLst { cmLListAdd2Tail(cp, &iotRes->resLnk); iotRes->resLnk.node = (PTR)iotRes; - RETVALUE(ROK); + return ROK; } PUBLIC S16 rgSCHUtlDelFrmResLst ( @@ -12612,12 +12612,12 @@ RgSchIotRes *iotRes if(cp->count == 0) { RLOG0(L_INFO,"****error count*****\n"); - RETVALUE(ROK); + return ROK; } } cmLListDelFrm(cp, &iotRes->resLnk); iotRes->resLnk.node = NULLP; - RETVALUE(ROK); + return ROK; } #endif /********************************************************************** diff --git a/src/5gnrsch/rg_sch_utl_clist.c b/src/5gnrsch/rg_sch_utl_clist.c index ff1931491..1d664386b 100755 --- a/src/5gnrsch/rg_sch_utl_clist.c +++ b/src/5gnrsch/rg_sch_utl_clist.c @@ -206,12 +206,12 @@ RgSchRrCList *node; /* node to be removed */ #ifdef ERRCHK if (lCp == (RgSchRrCListCp *)NULLP) - RETVALUE(NULLP); + return (NULLP); #endif if(lCp->count == 0) { - RETVALUE(NULLP); + return (NULLP); } if (lCp->count == 1) { @@ -220,9 +220,9 @@ RgSchRrCList *node; /* node to be removed */ lCp->first = lCp->crnt = (RgSchRrCList *)NULLP; lCp->count = 0; node->next = node->prev = (RgSchRrCList *)NULLP; - RETVALUE(node); + return (node); } - RETVALUE(NULLP); + return (NULLP); } if (lCp->first == node) @@ -238,7 +238,7 @@ RgSchRrCList *node; /* node to be removed */ /* Adding this check and guarding the decrement of counter when node is deleted with reshuffling */ lCp->count--; - RETVALUE(node); + return (node); } if(node->prev && node->next) @@ -252,7 +252,7 @@ RgSchRrCList *node; /* node to be removed */ lCp->crnt = node->next; } node->next = node->prev = (RgSchRrCList *)NULLP; - RETVALUE(node); + return (node); } /* end of rgSCHRrCListDelFrm */ /* diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index a16f30753..2b9215621 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -83,7 +83,7 @@ uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason) Inst inst = (instId - SCH_INST_START); /* Initialize the MAC TskInit structure to zero */ - cmMemset ((uint8_t *)&schCb[inst], 0, sizeof(schCb)); + memset ((uint8_t *)&schCb[inst], 0, sizeof(schCb)); /* Initialize the MAC TskInit with received values */ schCb[inst].schInit.ent = entity; @@ -117,7 +117,7 @@ uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason) * -# LCM_REASON_INVALID_MSGTYPE * -# LCM_REASON_MEM_NOAVAIL **/ -PUBLIC U16 SchInstCfg(RgCfg *cfg, Inst dInst) +PUBLIC uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) { uint16_t ret = LCM_REASON_NOT_APPL; Inst inst = (dInst - SCH_INST_START); @@ -129,8 +129,8 @@ PUBLIC U16 SchInstCfg(RgCfg *cfg, Inst dInst) return LCM_REASON_INVALID_MSGTYPE; } /* Update the Pst structure for LM interface */ - cmMemcpy((U8 *)&schCb[inst].schInit.lmPst, - (U8 *)&cfg->s.schInstCfg.genCfg.lmPst, + memcpy((uint8_t *)&schCb[inst].schInit.lmPst, + (uint8_t *)&cfg->s.schInstCfg.genCfg.lmPst, sizeof(Pst)); schCb[inst].schInit.inst = inst; @@ -150,19 +150,19 @@ PUBLIC U16 SchInstCfg(RgCfg *cfg, Inst dInst) schCb[inst].genCfg.startCellId = cfg->s.schInstCfg.genCfg.startCellId; #if 0 /* Initialzie the timer queue */ - cmMemset((U8 *)&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE); + memset((uint8_t *)&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE); /* Initialize the timer control point */ - cmMemset((U8 *)&schCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); + memset((uint8_t *)&schCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); schCb[inst].tmrTqCp.tmrLen = RGSCH_TQ_SIZE; /* SS_MT_TMR needs to be enabled as schActvTmr needs instance information */ /* Timer Registration request to SSI */ - if (SRegTmrMt(schCb[inst].schInit.ent, dInst, - (S16)schCb[inst].genCfg.tmrRes, schActvTmr) != ROK) + if (ODU_REG_TMR_MT(schCb[inst].schInit.ent, dInst, + (int)schCb[inst].genCfg.tmrRes, schActvTmr) != ROK) { RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "SchInstCfg(): Failed to " "register timer."); - RETVALUE(LCM_REASON_MEM_NOAVAIL); + return (LCM_REASON_MEM_NOAVAIL); } #endif /* Set Config done in TskInit */ @@ -190,9 +190,9 @@ PUBLIC U16 SchInstCfg(RgCfg *cfg, Inst dInst) * @return S16 * -# ROK **/ -int SchProcGenCfgReq(Pst *pst, RgMngmt *cfg) +uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg) { - uint16_t ret = LCM_PRIM_OK; + uint8_t ret = LCM_PRIM_OK; uint16_t reason = LCM_REASON_NOT_APPL; RgMngmt cfm; Pst cfmPst; @@ -209,7 +209,7 @@ int SchProcGenCfgReq(Pst *pst, RgMngmt *cfg) memset(&cfmPst, 0 , sizeof(Pst)); SchFillCfmPst(pst, &cfmPst, cfg); - cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt)); + memset((uint8_t *)&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = @@ -343,7 +343,7 @@ uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd) * -# ROK * -# RFAILED **/ -int schInitCellCb(Inst inst, SchCellCfg *schCellCfg) +uint8_t schInitCellCb(Inst inst, SchCellCfg *schCellCfg) { SchCellCb *cell; SCH_ALLOC(cell, sizeof(SchCellCb)); diff --git a/src/5gnrsch/sch_slot_ind.c b/src/5gnrsch/sch_slot_ind.c index 29869154a..06826958c 100644 --- a/src/5gnrsch/sch_slot_ind.c +++ b/src/5gnrsch/sch_slot_ind.c @@ -69,7 +69,7 @@ extern int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t * RFAILED - failure * * ****************************************************************/ -int sendDlAllocToMac(DlSchedInfo *dlSchedInfo, Inst inst) +uint8_t sendDlAllocToMac(DlSchedInfo *dlSchedInfo, Inst inst) { Pst pst; @@ -200,7 +200,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst) if(ret != ROK) { DU_LOG("\nschBroadcastAlloc failed"); - RETVALUE(ret); + return (ret); } } @@ -305,7 +305,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst) if(ret != ROK) { DU_LOG("\nSending DL Broadcast allocation from SCH to MAC failed"); - RETVALUE(ret); + return (ret); } schInitDlSlot(cell->schDlSlotInfo[slot]); diff --git a/src/5gnrsch/sch_utils.h b/src/5gnrsch/sch_utils.h index 329c70e32..71b2f4867 100644 --- a/src/5gnrsch/sch_utils.h +++ b/src/5gnrsch/sch_utils.h @@ -52,7 +52,7 @@ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ { \ - cmMemset((U8*)_datPtr, 0, _size); \ + memset((U8*)_datPtr, 0, _size); \ } \ else \ { \ diff --git a/src/cm/ckw.c b/src/cm/ckw.c index caad5b417..e3aaffa92 100755 --- a/src/cm/ckw.c +++ b/src/cm/ckw.c @@ -83,13 +83,13 @@ SpId spId; (ErrVal)ECKW001, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPKLOG(SPkS16, spId, mBuf, ECKW002, pst); CMCHKPKLOG(SPkS16, suId, mBuf, ECKW003, pst); pst->event = (Event) CKW_EVT_BND_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*end of function cmPkCkwBndReq*/ /* @@ -134,13 +134,13 @@ Reason reason; (ErrVal)ECKW004, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPKLOG(SPkS16, reason, mBuf, ECKW005, pst); CMCHKPKLOG(SPkS16, spId, mBuf, ECKW006, pst); pst->event = (Event) CKW_EVT_UBND_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*end of function cmPkCkwUbndReq*/ /* @@ -186,13 +186,13 @@ U8 status; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } - CMCHKPKLOG(SPkU8, status, mBuf, ECKW008, pst); + CMCHKPKLOG(oduUnpackUInt8, status, mBuf, ECKW008, pst); CMCHKPKLOG(SPkS16, suId, mBuf, ECKW009, pst); pst->event = (Event) CKW_EVT_BND_CFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*end of function cmPkCkwBndCfm*/ @@ -223,9 +223,9 @@ Buffer *mBuf; { TRC3(cmPkRlcTmInfo) - CMCHKPK(SPkU32, param->dl.buffSize, mBuf); + CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRlcTmInfo */ @@ -260,26 +260,26 @@ Buffer *mBuf; { case CKW_CFG_DIR_DL: { - CMCHKPK(SPkU8, param->m.umInfo.dl.snLen, mBuf); + CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf); break; } case CKW_CFG_DIR_UL: { - CMCHKPK(SPkU8, param->m.umInfo.ul.reOrdTmr, mBuf); - CMCHKPK(SPkU8, param->m.umInfo.ul.snLen, mBuf); + CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reOrdTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf); break; } /* Patch ckw_c_001.main_3 */ case CKW_CFG_DIR_BOTH: { - CMCHKPK(SPkU8, param->m.umInfo.dl.snLen, mBuf); - CMCHKPK(SPkU8, param->m.umInfo.ul.reOrdTmr, mBuf); - CMCHKPK(SPkU8, param->m.umInfo.ul.snLen, mBuf); + CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf); + CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reOrdTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf); break; } } - RETVALUE(ROK); + return ROK; } /* cmPkRlcUmInfo */ @@ -311,18 +311,18 @@ Buffer *mBuf; TRC3(cmPkRlcAmInfo) /* UP LINK */ - CMCHKPK(SPkU8, param->ul.reOrdTmr, mBuf); - CMCHKPK(SPkU16, param->ul.staProhTmr, mBuf); - CMCHKPK(SPkU8, param->ul.snLen, mBuf); + CMCHKPK(oduUnpackUInt8, param->ul.reOrdTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->ul.staProhTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->ul.snLen, mBuf); /* DOWN LINK */ - CMCHKPK(SPkU8, param->dl.maxRetx, mBuf); + CMCHKPK(oduUnpackUInt8, param->dl.maxRetx, mBuf); CMCHKPK(SPkS32, param->dl.pollByte, mBuf); CMCHKPK(SPkS16, param->dl.pollPdu, mBuf); - CMCHKPK(SPkU16, param->dl.pollRetxTmr, mBuf); - CMCHKPK(SPkU8, param->dl.snLen, mBuf); + CMCHKPK(oduUnpackUInt16, param->dl.pollRetxTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->dl.snLen, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRlcAmInfo */ @@ -353,10 +353,10 @@ Buffer *mBuf; { TRC3(cmPkCkwLChInfo) - CMCHKPK(SPkU8, param->type, mBuf); - CMCHKPK(SPkU8, param->lChId, mBuf); + CMCHKPK(oduUnpackUInt8, param->type, mBuf); + CMCHKPK(oduUnpackUInt8, param->lChId, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCkwLChInfo */ @@ -428,14 +428,14 @@ Buffer *mBuf; CMCHKPK(SPkS16, param->rguSapId, mBuf); #endif CMCHKPK(SPkS16, param->discardTmr, mBuf); - CMCHKPK(SPkU8, param->dir, mBuf); + CMCHKPK(oduUnpackUInt8, param->dir, mBuf); CMCHKPK(cmPkLteRlcMode, param->entMode, mBuf); - CMCHKPK(SPkU8, param->qci, mBuf); - CMCHKPK(SPkU8, param->rbType, mBuf); - CMCHKPK(SPkU8, param->rbId, mBuf); - CMCHKPK(SPkU8, param->cfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbType, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbId, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRlcEntCfgInfo */ @@ -475,12 +475,12 @@ Buffer *mBuf; CMCHKPK(cmPkRlcEntCfgInfo, &(param->entCfg[idx]), mBuf); } - CMCHKPK(SPkU8, param->numEnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); - CMCHKPKLOG(SPkU32, param->transId, mBuf, ECKW010, pst); + CMCHKPKLOG(oduUnpackUInt32, param->transId, mBuf, ECKW010, pst); - RETVALUE(ROK); + return ROK; } /* cmPkRlcCfgInfo */ @@ -512,10 +512,10 @@ Buffer *mBuf; TRC3(cmPkRlcEntCfgCfmInfo) CMCHKPK(cmPkCmStatus, &(param->status), mBuf); - CMCHKPK(SPkU8, param->rbType, mBuf); - CMCHKPK(SPkU8, param->rbId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbType, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbId, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRlcEntCfgCfmInfo */ @@ -555,12 +555,12 @@ Buffer *mBuf; CMCHKPK(cmPkRlcEntCfgCfmInfo, &(param->entCfgCfm[(U8)idx]), mBuf); } - CMCHKPK(SPkU8, param->numEnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); - CMCHKPKLOG(SPkU32, param->transId, mBuf, ECKW014, pst); + CMCHKPKLOG(oduUnpackUInt32, param->transId, mBuf, ECKW014, pst); - RETVALUE(ROK); + return ROK; } /* cmPkRlcCfgCfmInfo */ @@ -606,7 +606,7 @@ RlcCfgCfmInfo *cfgCfmInfo; (ErrVal)ECKW015, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } switch(pst->selector) @@ -622,14 +622,14 @@ RlcCfgCfmInfo *cfgCfmInfo; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECKW016, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ if (SPutSBuf(pst->region, pst->pool, (Data *)cfgCfmInfo, sizeof(RlcCfgCfmInfo)) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } break; @@ -640,7 +640,7 @@ RlcCfgCfmInfo *cfgCfmInfo; CMCHKPKLOG(SPkS16, suId, mBuf, ECKW017, pst); pst->event = (Event) CKW_EVT_CFG_CFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkRlcCfgCfm */ /* @@ -673,7 +673,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); - RETVALUE(ROK); + return ROK; } /* @@ -723,7 +723,7 @@ CkwUeInfo *newUeInfo; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPK(cmPkCkwUeInfo, newUeInfo, mBuf); @@ -731,20 +731,20 @@ CkwUeInfo *newUeInfo; sizeof(CkwUeInfo)) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf); if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CkwUeInfo)) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPKLOG(SPkU32, transId, mBuf, ECKW019, pst); + CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, ECKW019, pst); CMCHKPKLOG(SPkS16, spId, mBuf, ECKW020, pst); pst->event = (Event) CKW_EVT_UEIDCHG_REQ; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkCkwUeIdChgReq */ @@ -795,7 +795,7 @@ CmStatus status; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPK(cmPkCmStatus, &status, mBuf); @@ -804,13 +804,13 @@ CmStatus status; sizeof(CkwUeInfo)) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPKLOG(SPkU32, transId, mBuf, ECKW022, pst); + CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, ECKW022, pst); CMCHKPKLOG(SPkS16, suId, mBuf, ECKW023, pst); pst->event = (Event) CKW_EVT_UEIDCHG_CFM; - RETVALUE(SPstTsk(pst, mBuf)); + return (SPstTsk(pst, mBuf)); } /* cmPkCkwUeIdChgCfm */ @@ -855,7 +855,7 @@ Buffer *mBuf; CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW025, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } /*end of function cmUnpkCkwBndReq*/ /* @@ -893,7 +893,7 @@ Buffer *mBuf; CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW026, pst); CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, ECKW027, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } /*end of function cmUnpkCkwUbndReq*/ /* @@ -929,10 +929,10 @@ Buffer *mBuf; TRC3(cmUnpkCkwBndCfm) CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst); - CMCHKUNPKLOG(SUnpkU8, &status, mBuf, ECKW029, pst); + CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, ECKW029, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } /*end of function cmUnpkCkwBndCfm*/ @@ -963,9 +963,9 @@ Buffer *mBuf; { TRC3(cmUnpkRlcTmInfo) - CMCHKUNPK(SUnpkU32, &(param->dl.buffSize), mBuf); + CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkRlcTmInfo */ @@ -1000,26 +1000,26 @@ Buffer *mBuf; { case CKW_CFG_DIR_DL: { - CMCHKUNPK(SUnpkU8, &(param->m.umInfo.dl.snLen), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf); break; } case CKW_CFG_DIR_UL: { - CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.snLen), mBuf); - CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.reOrdTmr), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reOrdTmr), mBuf); break; } /* Patch ckw_c_001.main_3 */ case CKW_CFG_DIR_BOTH: { - CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.snLen), mBuf); - CMCHKUNPK(SUnpkU8, &(param->m.umInfo.ul.reOrdTmr), mBuf); - CMCHKUNPK(SUnpkU8, &(param->m.umInfo.dl.snLen), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reOrdTmr), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf); break; } } - RETVALUE(ROK); + return ROK; } /* cmUnpkRlcUmInfo */ @@ -1051,18 +1051,18 @@ Buffer *mBuf; TRC3(cmUnpkRlcAmInfo) /* DOWN LINK */ - CMCHKUNPK(SUnpkU8, &(param->dl.snLen), mBuf); - CMCHKUNPK(SUnpkU16, &(param->dl.pollRetxTmr), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->dl.snLen), mBuf); + CMCHKUNPK(oduPackUInt16, &(param->dl.pollRetxTmr), mBuf); CMCHKUNPK(SUnpkS16, &(param->dl.pollPdu), mBuf); CMCHKUNPK(SUnpkS32, &(param->dl.pollByte), mBuf); - CMCHKUNPK(SUnpkU8, &(param->dl.maxRetx), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->dl.maxRetx), mBuf); /* UP LINK */ - CMCHKUNPK(SUnpkU8, &(param->ul.snLen), mBuf); - CMCHKUNPK(SUnpkU16, &(param->ul.staProhTmr), mBuf); - CMCHKUNPK(SUnpkU8, &(param->ul.reOrdTmr), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->ul.snLen), mBuf); + CMCHKUNPK(oduPackUInt16, &(param->ul.staProhTmr), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->ul.reOrdTmr), mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkRlcAmInfo */ @@ -1093,10 +1093,10 @@ Buffer *mBuf; { TRC3(cmUnpkCkwLChInfo) - CMCHKUNPK(SUnpkU8, &(param->lChId), mBuf); - CMCHKUNPK(SUnpkU8, &(param->type), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->type), mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkCkwLChInfo */ @@ -1127,11 +1127,11 @@ Buffer *mBuf; { TRC3(cmUnpkRlcEntCfgCfmInfo) - CMCHKUNPK(SUnpkU8, &(param->rbId), mBuf); - CMCHKUNPK(SUnpkU8, &(param->rbType), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf); CMCHKUNPK(cmUnpkCmStatus, &(param->status), mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkRlcEntCfgCfmInfo */ @@ -1166,17 +1166,17 @@ Buffer *mBuf; TRC3(cmUnpkRlcCfgCfmInfo) - CMCHKUNPKLOG(SUnpkU32, &(param->transId), mBuf, ECKW030, pst); + CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst); CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf); - CMCHKUNPK(SUnpkU8, &(param->numEnt), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->numEnt), mBuf); for (idx = 0; idx < param->numEnt; idx++) { CMCHKUNPK(cmUnpkRlcEntCfgCfmInfo, &(param->entCfgCfm[idx]), mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkRlcCfgCfmInfo */ @@ -1207,12 +1207,12 @@ Buffer *mBuf; { TRC3(cmUnpkRlcEntCfgInfo) - CMCHKUNPK(SUnpkU8, &(param->cfgType), mBuf); - CMCHKUNPK(SUnpkU8, &(param->rbId), mBuf); - CMCHKUNPK(SUnpkU8, &(param->rbType), mBuf); - CMCHKUNPK(SUnpkU8, &(param->qci), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->qci), mBuf); CMCHKUNPK(cmUnpkLteRlcMode, &(param->entMode), mBuf); - CMCHKUNPK(SUnpkU8, &(param->dir), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->dir), mBuf); CMCHKUNPK(SUnpkS16, &(param->discardTmr), mBuf); #ifdef TENB_MULT_CELL_SUPPRT CMCHKUNPK(SUnpkS16, &(param->rguSapId), mBuf); @@ -1256,7 +1256,7 @@ Buffer *mBuf; } } - RETVALUE(ROK); + return ROK; } /* cmUnpkRlcEntCfgInfo */ @@ -1291,17 +1291,17 @@ Buffer *mBuf; TRC3(cmUnpkRlcCfgInfo) - CMCHKUNPKLOG(SUnpkU32, &(param->transId), mBuf, ECKW031, pst); + CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst); CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf); - CMCHKUNPK(SUnpkU8, &(param->numEnt), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->numEnt), mBuf); for (idx = 0; idx < param->numEnt; idx++) { CMCHKUNPKLOG(cmUnpkRlcEntCfgInfo,&(param->entCfg[idx]), mBuf, ECKW032, pst); } - RETVALUE(ROK); + return ROK; } /* cmUnpkRlcCfgInfo */ @@ -1349,7 +1349,7 @@ Buffer *mBuf; (ErrVal)ECKW035, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)cfgCfmInfo, 0, sizeof(RlcCfgCfmInfo)); @@ -1369,7 +1369,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)ECKW036, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ break; @@ -1378,7 +1378,7 @@ Buffer *mBuf; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, cfgCfmInfo)); + return ((*func)(pst, suId, cfgCfmInfo)); } /* cmUnpkRlcCfgCfm */ /* @@ -1411,7 +1411,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf); - RETVALUE(ROK); + return ROK; } /* @@ -1451,7 +1451,7 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, &(spId), mBuf); - CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, ECKW037, pst); + CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW037, pst); if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo,\ sizeof(CkwUeInfo))) != ROK) @@ -1463,7 +1463,7 @@ Buffer *mBuf; (ErrVal)ECKW038, (ErrVal)0, "SGetMsg() failed"); #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)ueInfo, 0, sizeof(CkwUeInfo)); @@ -1476,7 +1476,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)ECKW039, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ @@ -1490,7 +1490,7 @@ Buffer *mBuf; (ErrVal)ECKW040, (ErrVal)0, "SGetMsg() failed"); #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)newUeInfo, 0, sizeof(CkwUeInfo)); @@ -1503,13 +1503,13 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)ECKW041, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo)); + return ((*func)(pst, spId, transId, ueInfo, newUeInfo)); } /* cmUnpkCkwUeIdChgReq */ @@ -1551,7 +1551,7 @@ Buffer *mBuf; cmMemset((U8 *)&status, (U8)0, (PTR)sizeof(CmStatus)); CMCHKUNPK(SUnpkS16, &suId, mBuf); - CMCHKUNPKLOG(SUnpkU32, &transId, mBuf, ECKW042, pst); + CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst); if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo,\ sizeof(CkwUeInfo))) != ROK) @@ -1564,7 +1564,7 @@ Buffer *mBuf; (ErrVal)ECKW043, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)ueInfo, 0, sizeof(CkwUeInfo)); @@ -1577,7 +1577,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)ECKW044, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ @@ -1585,7 +1585,7 @@ Buffer *mBuf; SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, ueInfo, status)); + return ((*func)(pst, suId, transId, ueInfo, status)); } /* cmUnpkCkwUeIdChgCfm */ diff --git a/src/cm/cm_gen.c b/src/cm/cm_gen.c index 709bb3050..b94ccb6ed 100644 --- a/src/cm/cm_gen.c +++ b/src/cm/cm_gen.c @@ -113,17 +113,17 @@ Buffer *mBuf; /* message buffer */ /*-- cm_gen_c_001.main_36 - added for micro seconds --*/ #ifdef SS_DATETIME_USEC - CMCHKPK(SPkU32, dateTime->usec, mBuf); + CMCHKPK(oduUnpackUInt32, dateTime->usec, mBuf); #endif /*-- SS_DATETIME_USEC --*/ - CMCHKPK(SPkU8, dateTime->tenths, mBuf); - CMCHKPK(SPkU8, dateTime->sec, mBuf); - CMCHKPK(SPkU8, dateTime->min, mBuf); - CMCHKPK(SPkU8, dateTime->hour, mBuf); - CMCHKPK(SPkU8, dateTime->year, mBuf); - CMCHKPK(SPkU8, dateTime->day, mBuf); - CMCHKPK(SPkU8, dateTime->month, mBuf); - - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, dateTime->tenths, mBuf); + CMCHKPK(oduUnpackUInt8, dateTime->sec, mBuf); + CMCHKPK(oduUnpackUInt8, dateTime->min, mBuf); + CMCHKPK(oduUnpackUInt8, dateTime->hour, mBuf); + CMCHKPK(oduUnpackUInt8, dateTime->year, mBuf); + CMCHKPK(oduUnpackUInt8, dateTime->day, mBuf); + CMCHKPK(oduUnpackUInt8, dateTime->month, mBuf); + + return ROK; } /* end of cmPkDateTime */ @@ -155,18 +155,18 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmPkDuration) - CMCHKPK(SPkU8, duration->tenths, mBuf); - CMCHKPK(SPkU8, duration->secs, mBuf); - CMCHKPK(SPkU8, duration->mins, mBuf); - CMCHKPK(SPkU8, duration->hours, mBuf); - CMCHKPK(SPkU8, duration->days, mBuf); + CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf); + CMCHKPK(oduUnpackUInt8, duration->secs, mBuf); + CMCHKPK(oduUnpackUInt8, duration->mins, mBuf); + CMCHKPK(oduUnpackUInt8, duration->hours, mBuf); + CMCHKPK(oduUnpackUInt8, duration->days, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkDuration */ /* * -* Fun: cmPkPtr +* Fun: oduPackPointer * * Desc: This function packs the pointer * @@ -179,13 +179,13 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 cmPkPtr +PUBLIC S16 oduPackPointer ( PTR ptr, /* pointer */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 cmPkPtr(ptr, mBuf) +PUBLIC S16 oduPackPointer(ptr, mBuf) PTR ptr; /* pointer */ Buffer *mBuf; /* message buffer */ #endif @@ -198,7 +198,7 @@ Buffer *mBuf; /* message buffer */ U32 tmp32; #endif - TRC2(cmPkPtr) + TRC2(oduPackPointer) ret = ROK; switch (PTRSIZE) @@ -274,8 +274,8 @@ Buffer *mBuf; /* message buffer */ ret = RFAILED; } - RETVALUE(ret); -} /* end of cmPkPtr */ + return (ret); +} /* end of oduPackPointer */ /* @@ -309,7 +309,7 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkInst, entityId->inst, mBuf); CMCHKPK(cmPkEnt, entityId->ent, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkEntityId */ @@ -346,7 +346,7 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkElmntInst1, elmntId->elmntInst1, mBuf); CMCHKPK(cmPkElmnt, elmntId->elmnt, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkElmntId */ @@ -381,7 +381,7 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkPool, memoryId->pool, mBuf); CMCHKPK(cmPkRegion, memoryId->region, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkMemoryId */ @@ -428,7 +428,7 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(SPkS16, systemId->mRev, mBuf); CMCHKPK(SPkS16, systemId->mVer, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkSystemId */ @@ -465,18 +465,18 @@ Buffer *mBuf; /* buffer */ TRC3(cmPkProtAddr) #ifdef CM_ARI2 - CMCHKPK(SPkU32, pAddr->autoSysId, mBuf); - CMCHKPK(cmPkBool, pAddr->autoSysIdPres, mBuf); + CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf); + CMCHKPK(oduPackBool, pAddr->autoSysIdPres, mBuf); #endif /* CM_ARI2 */ for (j = pAddr->len; j; j--) - CMCHKPK(SPkU8, pAddr->address[j - 1], mBuf); + CMCHKPK(oduUnpackUInt8, pAddr->address[j - 1], mBuf); - CMCHKPK(SPkU8, pAddr->preLen, mBuf); - CMCHKPK(SPkU8, pAddr->len, mBuf); - CMCHKPK(SPkU16, pAddr->protType, mBuf); + CMCHKPK(oduUnpackUInt8, pAddr->preLen, mBuf); + CMCHKPK(oduUnpackUInt8, pAddr->len, mBuf); + CMCHKPK(oduUnpackUInt16, pAddr->protType, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkProtAddr */ @@ -516,28 +516,28 @@ Buffer *mBuf; /* buffer */ TRC3(cmPkProtAddrTbl) if (protAddr->count > MAX_PROT_ADDRS) - RETVALUE(RFAILED); + return RFAILED; for (i = protAddr->count; i; i--) { pAddr = &(protAddr->addr[i - 1]); #ifdef CM_ARI2 - CMCHKPK(SPkU32, pAddr->autoSysId, mBuf); - CMCHKPK(cmPkBool, pAddr->autoSysIdPres, mBuf); + CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf); + CMCHKPK(oduPackBool, pAddr->autoSysIdPres, mBuf); #endif /* CM_ARI2 */ for (j = pAddr->len; j; j--) - CMCHKPK(SPkU8, pAddr->address[j - 1], mBuf); + CMCHKPK(oduUnpackUInt8, pAddr->address[j - 1], mBuf); - CMCHKPK(SPkU8, pAddr->preLen, mBuf); - CMCHKPK(SPkU8, pAddr->len, mBuf); - CMCHKPK(SPkU16, pAddr->protType, mBuf); + CMCHKPK(oduUnpackUInt8, pAddr->preLen, mBuf); + CMCHKPK(oduUnpackUInt8, pAddr->len, mBuf); + CMCHKPK(oduUnpackUInt16, pAddr->protType, mBuf); } - CMCHKPK(SPkU8, protAddr->count, mBuf); + CMCHKPK(oduUnpackUInt8, protAddr->count, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkProtAddrTbl */ @@ -573,16 +573,16 @@ Buffer *mBuf; /* message buffer */ TRC2(cmPkAddrs) if (addrs->length > ADRLEN) - RETVALUE(RFAILED); + return RFAILED; for (i = addrs->length; i; i--) { - CMCHKPK(SPkU8, addrs->strg[i-1], mBuf); + CMCHKPK(oduUnpackUInt8, addrs->strg[i-1], mBuf); } - CMCHKPK(SPkU8, addrs->length, mBuf); + CMCHKPK(oduUnpackUInt8, addrs->length, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkAddrs */ @@ -618,16 +618,16 @@ Buffer *mBuf; /* message buffer */ TRC2(cmPkShrtAddrs) if (addrs->length > SHRTADRLEN) - RETVALUE(RFAILED); + return RFAILED; for (i = addrs->length; i; i--) { - CMCHKPK(SPkU8, addrs->strg[i-1], mBuf); + CMCHKPK(oduUnpackUInt8, addrs->strg[i-1], mBuf); } - CMCHKPK(SPkU8, addrs->length, mBuf); + CMCHKPK(oduUnpackUInt8, addrs->length, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkShrtAddrs */ @@ -664,10 +664,10 @@ Buffer *mBuf; /* message buffer */ /* pack address mask */ for (i = (ADRLEN - 1); i >= 0; i--) { - CMCHKPK(SPkU8, mask[i], mBuf); + CMCHKPK(oduUnpackUInt8, mask[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmPkAddrMask */ @@ -709,15 +709,15 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkRegion, bndCfg->region, mBuf); CMCHKPK(cmPkInst, bndCfg->inst, mBuf); CMCHKPK(cmPkEnt, bndCfg->ent, mBuf); - CMCHKPK(SPkU8, bndCfg->wdw, mBuf); - CMCHKPK(SPkU8, bndCfg->flcTyp, mBuf); - CMCHKPK(SPkU8, bndCfg->bufOwnshp, mBuf); + CMCHKPK(oduUnpackUInt8, bndCfg->wdw, mBuf); + CMCHKPK(oduUnpackUInt8, bndCfg->flcTyp, mBuf); + CMCHKPK(oduUnpackUInt8, bndCfg->bufOwnshp, mBuf); for (p = bndCfg->usrId; *p; p++); for (; p != bndCfg->usrId; p--); CMCHKPK(cmPkTxt, *p, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkBndCfg */ @@ -764,7 +764,7 @@ Buffer *mBuf; CMCHKPK(cmPkIntfVer, pst->intfVer, mBuf); #endif - RETVALUE(ROK); + return ROK; } /* end of cmPkPst */ /* @@ -796,21 +796,21 @@ Buffer *mBuf; /* message buffer */ TRC2(cmPkElmtHdr) #if (LCAMT || ATM_BISUP) - CMCHKPK(SPkU16, m->compInd, mBuf); + CMCHKPK(oduUnpackUInt16, m->compInd, mBuf); #endif /* LCAMT || ATM_BISUP */ #if (LCAMT || ATM_BISUP) /* Pack action indicator field */ if (m->pres) { - CMCHKPK(SPkU8, m->actnInd, mBuf); + CMCHKPK(oduUnpackUInt8, m->actnInd, mBuf); } #endif /* Present */ - CMCHKPK(cmPkBool, m->pres, mBuf); + CMCHKPK(oduPackBool, m->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkElmtHdr */ @@ -845,13 +845,13 @@ Buffer *mBuf; /* message buffer */ if (tknU8->pres) { /* Value */ - CMCHKPK(SPkU8, tknU8->val, mBuf); + CMCHKPK(oduUnpackUInt8, tknU8->val, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknU8->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknU8->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknU8 */ @@ -890,9 +890,9 @@ Buffer *mBuf; /* message buffer */ } /* Token Header */ - CMCHKPK(SPkU8, tknS8->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknS8->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknS8 */ @@ -927,13 +927,13 @@ Buffer *mBuf; /* message buffer */ if (tknU16->pres) { /* Value */ - CMCHKPK(SPkU16, tknU16->val, mBuf); + CMCHKPK(oduUnpackUInt16, tknU16->val, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknU16->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknU16->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknU16 */ @@ -968,13 +968,13 @@ Buffer *mBuf; /* message buffer */ if (tknU32->pres) { /* Value */ - CMCHKPK(SPkU32, tknU32->val, mBuf); + CMCHKPK(oduUnpackUInt32, tknU32->val, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknU32->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknU32->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknU32 */ @@ -1013,17 +1013,17 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(SPkU8, tknStr->val[i], mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(SPkU8, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr */ @@ -1062,17 +1062,17 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(SPkU8, tknStr->val[i], mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(SPkU8, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrM */ @@ -1111,17 +1111,17 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(SPkU8, tknStr->val[i], mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(SPkU8, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrS */ @@ -1160,17 +1160,17 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(SPkU8, tknStr->val[i], mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(SPkU8, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrE */ #ifndef CMFILE_REORG_1 @@ -1208,10 +1208,10 @@ Buffer *mBuf; /* message buffer */ for (i = PN_NODEID_LEN - 1; i >= 0; i--) { - CMCHKPK(SPkU8, src->id[i], mBuf); + CMCHKPK(oduUnpackUInt8, src->id[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmPkPnNodeId */ #endif /* CMFILE_REORG_1 */ @@ -1247,7 +1247,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr4 */ @@ -1283,7 +1283,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr12 */ @@ -1318,7 +1318,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr32 */ @@ -1353,7 +1353,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr64 */ @@ -1388,7 +1388,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr132 */ @@ -1423,7 +1423,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr256 */ @@ -1466,18 +1466,18 @@ Buffer *mBuf; /* message buffer */ /* cm_gen_c_001.main_33: changes for TknOid value from U16 to U32 * with compilation flag TKNOID_U16 */ #ifndef TKNOID_U16 - CMCHKPK(SPkU32, tknOid->val[i], mBuf); + CMCHKPK(oduUnpackUInt32, tknOid->val[i], mBuf); #else - CMCHKPK(SPkU16, tknOid->val[i], mBuf); + CMCHKPK(oduUnpackUInt16, tknOid->val[i], mBuf); #endif /* !TKNOID_U16 */ } /* Pack the length */ - CMCHKPK(SPkU8, tknOid->len, mBuf); + CMCHKPK(oduUnpackUInt8, tknOid->len, mBuf); } /* Pack the token header */ - CMCHKPK(SPkU8, tknOid->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknOid->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknOid */ @@ -1516,9 +1516,9 @@ Buffer *mBuf; /* message buffer */ } /* Token Header */ - CMCHKPK(SPkU8, tknS32->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknS32->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknS32 */ @@ -1559,12 +1559,12 @@ Buffer *mBuf; /* message buffer */ #endif /* LMINT3 */ CMCHKPK(cmPkElmntId, &header->elmId, mBuf); CMCHKPK(cmPkEntityId, &header->entId, mBuf); - CMCHKPK(SPkU16, header->seqNmb, mBuf); - CMCHKPK(SPkU8, header->version, mBuf); - CMCHKPK(SPkU8, header->msgType, mBuf); - CMCHKPK(SPkU16, header->msgLen, mBuf); + CMCHKPK(oduUnpackUInt16, header->seqNmb, mBuf); + CMCHKPK(oduUnpackUInt8, header->version, mBuf); + CMCHKPK(oduUnpackUInt8, header->msgType, mBuf); + CMCHKPK(oduUnpackUInt16, header->msgLen, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkHeader */ @@ -1596,10 +1596,10 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmPkCmStatus) - CMCHKPK(SPkU16, sta->reason, mBuf); - CMCHKPK(SPkU16, sta->status, mBuf); + CMCHKPK(oduUnpackUInt16, sta->reason, mBuf); + CMCHKPK(oduUnpackUInt16, sta->status, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmStatus */ @@ -1631,12 +1631,12 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmPkCmAlarm) - CMCHKPK(SPkU16, alarm->cause, mBuf); - CMCHKPK(SPkU16, alarm->event, mBuf); - CMCHKPK(SPkU16, alarm->category, mBuf); + CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf); + CMCHKPK(oduUnpackUInt16, alarm->event, mBuf); + CMCHKPK(oduUnpackUInt16, alarm->category, mBuf); CMCHKPK(cmPkDateTime, &alarm->dt, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmAlarm */ @@ -1676,7 +1676,7 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkInst, smCfg->inst, mBuf); CMCHKPK(cmPkEnt, smCfg->ent, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkSmCfg */ @@ -1708,10 +1708,10 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmPkTmrCfg) - CMCHKPK(SPkU16, tmrCfg->val, mBuf); - CMCHKPK(cmPkBool, tmrCfg->enb, mBuf); + CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf); + CMCHKPK(oduPackBool, tmrCfg->enb, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTmrCfg */ @@ -1750,16 +1750,16 @@ Buffer *mBuf; /* message buffer */ SFndLenMsg(tknBuf->val, &msgLen); if( SCatMsg(mBuf, tknBuf->val, M2M1) != ROK ) { - RETVALUE(RFAILED); + return RFAILED; } cmPkMsgLen(msgLen, mBuf); SPutMsg(tknBuf->val); } /* Token Header */ - CMCHKPK(SPkU8, tknBuf->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknBuf->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknBuf */ #ifdef TDS_ROLL_UPGRADE_SUPPORT @@ -1794,7 +1794,7 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkIntfId, intf->intfId, mBuf); CMCHKPK(cmPkIntfVer, intf->intfVer, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkIntf */ #endif /* TDS_ROLL_UPGRADE_SUPPORT */ @@ -1832,20 +1832,20 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmUnpDateTime) - CMCHKUNPK(SUnpkU8, &dateTime->month, mBuf); - CMCHKUNPK(SUnpkU8, &dateTime->day, mBuf); - CMCHKUNPK(SUnpkU8, &dateTime->year, mBuf); - CMCHKUNPK(SUnpkU8, &dateTime->hour, mBuf); - CMCHKUNPK(SUnpkU8, &dateTime->min, mBuf); - CMCHKUNPK(SUnpkU8, &dateTime->sec, mBuf); - CMCHKUNPK(SUnpkU8, &dateTime->tenths, mBuf); + CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); + CMCHKUNPK(oduPackUInt8, &dateTime->day, mBuf); + CMCHKUNPK(oduPackUInt8, &dateTime->year, mBuf); + CMCHKUNPK(oduPackUInt8, &dateTime->hour, mBuf); + CMCHKUNPK(oduPackUInt8, &dateTime->min, mBuf); + CMCHKUNPK(oduPackUInt8, &dateTime->sec, mBuf); + CMCHKUNPK(oduPackUInt8, &dateTime->tenths, mBuf); /*-- added for micro seconds --*/ #ifdef SS_DATETIME_USEC - CMCHKUNPK(SUnpkU32, &dateTime->usec, mBuf); + CMCHKUNPK(oduPackUInt32, &dateTime->usec, mBuf); #endif /*-- SS_DATETIME_USEC --*/ - RETVALUE(ROK); + return ROK; } /* end of cmUnpkDateTime */ @@ -1877,18 +1877,18 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmUnpDuration) - CMCHKUNPK(SUnpkU8, &duration->days, mBuf); - CMCHKUNPK(SUnpkU8, &duration->hours, mBuf); - CMCHKUNPK(SUnpkU8, &duration->mins, mBuf); - CMCHKUNPK(SUnpkU8, &duration->secs, mBuf); - CMCHKUNPK(SUnpkU8, &duration->tenths, mBuf); + CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); + CMCHKUNPK(oduPackUInt8, &duration->hours, mBuf); + CMCHKUNPK(oduPackUInt8, &duration->mins, mBuf); + CMCHKUNPK(oduPackUInt8, &duration->secs, mBuf); + CMCHKUNPK(oduPackUInt8, &duration->tenths, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkDuration */ /* * -* Fun: cmUnpkPtr +* Fun: oduUnpackPointer * * Desc: This function is used to Unpack Ptr type * @@ -1901,13 +1901,13 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 cmUnpkPtr +PUBLIC S16 oduUnpackPointer ( PTR *ptr, /* duration structure */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 cmUnpkPtr(ptr, mBuf) +PUBLIC S16 oduUnpackPointer(ptr, mBuf) PTR *ptr; /* duration structure */ Buffer *mBuf; /* message buffer */ #endif @@ -1921,14 +1921,14 @@ Buffer *mBuf; /* message buffer */ U64 tmp64; #endif - TRC2(cmUnpkPtr) + TRC2(oduUnpackPointer) switch (PTRSIZE) { case 2: ret = SRemPreMsgMult(unpkArray, (MsgLen) 2, mBuf); if (ret != ROK) - RETVALUE(ret); + return (ret); tmp16 = 0; #ifndef FCSPKINT /* backward compatibility, packing order */ @@ -1944,7 +1944,7 @@ Buffer *mBuf; /* message buffer */ case 4: ret = SRemPreMsgMult(unpkArray, (MsgLen) 4, mBuf); if (ret != ROK) - RETVALUE(ret); + return (ret); tmp16 = 0; tmp32 = 0; @@ -1970,7 +1970,7 @@ Buffer *mBuf; /* message buffer */ #if(defined(ALPHA) || defined(BIT_64)) ret = SRemPreMsgMult(unpkArray, (MsgLen) 8, mBuf); if (ret != ROK) - RETVALUE(ret); + return (ret); tmp16 = 0; tmp32 = 0; @@ -2014,8 +2014,8 @@ Buffer *mBuf; /* message buffer */ ret = RFAILED; } - RETVALUE(ret); -} /* end of cmUnpkPtr */ + return (ret); +} /* end of oduUnpackPointer */ /* @@ -2049,7 +2049,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkEnt, &entityId->ent, mBuf); CMCHKUNPK(cmUnpkInst, &entityId->inst, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkEntityId */ @@ -2086,7 +2086,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkElmntInst2, &elmntId->elmntInst2, mBuf); CMCHKUNPK(cmUnpkElmntInst3, &elmntId->elmntInst3, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkElmntId */ @@ -2121,7 +2121,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkRegion, &memoryId->region, mBuf); CMCHKUNPK(cmUnpkPool, &memoryId->pool, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkMemoryId */ @@ -2168,7 +2168,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkTxt, &systemId->ptNmb[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkSystemId */ @@ -2204,18 +2204,18 @@ Buffer *mBuf; /* buffer */ TRC3(cmUnpkProtAddr) - CMCHKUNPK(SUnpkU16, &(pAddr->protType), mBuf); - CMCHKUNPK(SUnpkU8, &(pAddr->len), mBuf); - CMCHKUNPK(SUnpkU8, &(pAddr->preLen), mBuf); + CMCHKUNPK(oduPackUInt16, &(pAddr->protType), mBuf); + CMCHKUNPK(oduPackUInt8, &(pAddr->len), mBuf); + CMCHKUNPK(oduPackUInt8, &(pAddr->preLen), mBuf); for (j =0; j < pAddr->len; j++) - CMCHKUNPK(SUnpkU8, &pAddr->address[j], mBuf); + CMCHKUNPK(oduPackUInt8, &pAddr->address[j], mBuf); #ifdef CM_ARI2 - CMCHKUNPK(cmUnpkBool, &(pAddr->autoSysIdPres), mBuf); - CMCHKUNPK(SUnpkU32, &(pAddr->autoSysId), mBuf); + CMCHKUNPK(oduUnpackBool, &(pAddr->autoSysIdPres), mBuf); + CMCHKUNPK(oduPackUInt32, &(pAddr->autoSysId), mBuf); #endif /* CM_ARI2 */ - RETVALUE(ROK); + return ROK; } /* end of cmUnpkProtAddr */ @@ -2253,25 +2253,25 @@ Buffer *mBuf; /* buffer */ TRC3(cmUnpkProtAddrTbl) - CMCHKUNPK(SUnpkU8, &protAddr->count, mBuf); + CMCHKUNPK(oduPackUInt8, &protAddr->count, mBuf); for (i = 0; i < protAddr->count; i++) { pAddr = &(protAddr->addr[i]); - CMCHKUNPK(SUnpkU16, &(pAddr->protType), mBuf); - CMCHKUNPK(SUnpkU8, &(pAddr->len), mBuf); - CMCHKUNPK(SUnpkU8, &(pAddr->preLen), mBuf); + CMCHKUNPK(oduPackUInt16, &(pAddr->protType), mBuf); + CMCHKUNPK(oduPackUInt8, &(pAddr->len), mBuf); + CMCHKUNPK(oduPackUInt8, &(pAddr->preLen), mBuf); for (j =0; j < pAddr->len; j++) - CMCHKUNPK(SUnpkU8, &pAddr->address[j], mBuf); + CMCHKUNPK(oduPackUInt8, &pAddr->address[j], mBuf); #ifdef CM_ARI2 - CMCHKUNPK(cmUnpkBool, &(pAddr->autoSysIdPres), mBuf); - CMCHKUNPK(SUnpkU32, &(pAddr->autoSysId), mBuf); + CMCHKUNPK(oduUnpackBool, &(pAddr->autoSysIdPres), mBuf); + CMCHKUNPK(oduPackUInt32, &(pAddr->autoSysId), mBuf); #endif /* CM_ARI2 */ } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkProtAddrTbl */ @@ -2305,17 +2305,17 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpAddrs) - CMCHKUNPK(SUnpkU8, &addrs->length, mBuf); + CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); if (addrs->length > ADRLEN) - RETVALUE(RFAILED); + return RFAILED; for(i = 0; i < addrs->length; i++) { - CMCHKUNPK(SUnpkU8, &addrs->strg[i], mBuf); + CMCHKUNPK(oduPackUInt8, &addrs->strg[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkAddrs */ /* @@ -2348,16 +2348,16 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpShrtAddrs) - CMCHKUNPK(SUnpkU8, &addrs->length, mBuf); + CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); if (addrs->length > SHRTADRLEN) - RETVALUE(RFAILED); + return RFAILED; for(i = 0; i < addrs->length; i++) { - CMCHKUNPK(SUnpkU8, &addrs->strg[i], mBuf); + CMCHKUNPK(oduPackUInt8, &addrs->strg[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkShrtAddrs */ @@ -2394,9 +2394,9 @@ Buffer *mBuf; /* message buffer */ /* unpack address mask */ for (i = 0; i< ADRLEN; i++) { - CMCHKUNPK(SUnpkU8, &mask[i], mBuf); + CMCHKUNPK(oduPackUInt8, &mask[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkAddrMask */ @@ -2433,9 +2433,9 @@ Buffer *mBuf; /* message buffer */ for (i = 0; bndCfg->usrId[i]; i++); CMCHKUNPK(cmUnpkTxt, bndCfg->usrId+i, mBuf); - CMCHKUNPK(SUnpkU8, &bndCfg->bufOwnshp, mBuf); - CMCHKUNPK(SUnpkU8, &bndCfg->flcTyp, mBuf); - CMCHKUNPK(SUnpkU8, &bndCfg->wdw, mBuf); + CMCHKUNPK(oduPackUInt8, &bndCfg->bufOwnshp, mBuf); + CMCHKUNPK(oduPackUInt8, &bndCfg->flcTyp, mBuf); + CMCHKUNPK(oduPackUInt8, &bndCfg->wdw, mBuf); CMCHKUNPK(cmUnpkEnt, &bndCfg->ent, mBuf); CMCHKUNPK(cmUnpkInst, &bndCfg->inst, mBuf); CMCHKUNPK(cmUnpkRegion, &bndCfg->region, mBuf); @@ -2445,7 +2445,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkAddrs, &bndCfg->sapAdr, mBuf); CMCHKUNPK(cmUnpkSelector, &bndCfg->selector, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkBndCfg */ @@ -2492,7 +2492,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkInst, &pst->srcInst, mBuf); CMCHKUNPK(cmUnpkEvent, &pst->event, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkPst */ /* @@ -2524,21 +2524,21 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpElmtHdr) /* Present */ - CMCHKUNPK(cmUnpkBool, &m->pres , mBuf); + CMCHKUNPK(oduUnpackBool, &m->pres , mBuf); #if (LCAMT || ATM_BISUP) /* Unpack action indicator field */ if (m->pres) { - CMCHKUNPK(SUnpkU8, &m->actnInd, mBuf); + CMCHKUNPK(oduPackUInt8, &m->actnInd, mBuf); } #endif #if (LCAMT || ATM_BISUP) - CMCHKUNPK(SUnpkU16, &m->compInd, mBuf); + CMCHKUNPK(oduPackUInt16, &m->compInd, mBuf); #endif /* LCAMT || ATM_BISUP */ - RETVALUE(ROK); + return ROK; } /* end of cmUnpkElmtHdr */ @@ -2571,15 +2571,15 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknU8) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknU8->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknU8->pres, mBuf); if (tknU8->pres) { /* Value */ - CMCHKUNPK(SUnpkU8, &tknU8->val, mBuf); + CMCHKUNPK(oduPackUInt8, &tknU8->val, mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknU8 */ @@ -2612,7 +2612,7 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknS8) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknS8->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknS8->pres, mBuf); if (tknS8->pres) { @@ -2620,7 +2620,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(SUnpkS8, &tknS8->val, mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknS8 */ @@ -2653,15 +2653,15 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknU16) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknU16->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknU16->pres, mBuf); if (tknU16->pres) { /* Value */ - CMCHKUNPK(SUnpkU16, &tknU16->val, mBuf); + CMCHKUNPK(oduPackUInt16, &tknU16->val, mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknU16 */ @@ -2694,15 +2694,15 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknU32) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknU32->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknU32->pres, mBuf); if (tknU32->pres) { /* Value */ - CMCHKUNPK(SUnpkU32, &tknU32->val, mBuf); + CMCHKUNPK(oduPackUInt32, &tknU32->val, mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknU32 */ /* @@ -2736,23 +2736,23 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknStr) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(SUnpkU8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); } } else tknStr->len = 0; - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr */ /* @@ -2786,23 +2786,23 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknStrM) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(SUnpkU8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); } } else tknStr->len = 0; - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrM */ @@ -2837,23 +2837,23 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknStrS) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(SUnpkU8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); } } else tknStr->len = 0; - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrS */ @@ -2888,23 +2888,23 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknStrE) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(SUnpkU8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); } } else tknStr->len = 0; - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrE */ #ifndef CMFILE_REORG_1 @@ -2942,10 +2942,10 @@ Buffer *mBuf; /* message buffer */ for (i = 0; i < PN_NODEID_LEN; i++) { - CMCHKUNPK(SUnpkU8, &dst->id[i], mBuf); + CMCHKUNPK(oduPackUInt8, &dst->id[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkPnNodeId */ #endif /* CMFILE_REORG_1 */ @@ -2981,7 +2981,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr4 */ @@ -3017,7 +3017,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr12 */ @@ -3052,7 +3052,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr32 */ @@ -3087,7 +3087,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr64 */ @@ -3122,7 +3122,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr132 */ @@ -3157,7 +3157,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr256 */ @@ -3193,12 +3193,12 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpkTknOid) /* Unpack the token header */ - CMCHKUNPK(SUnpkU8, &tknOid->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknOid->pres, mBuf); if (tknOid->pres == TRUE) { /* Unpack the length */ - CMCHKUNPK(SUnpkU8, &tknOid->len, mBuf); + CMCHKUNPK(oduPackUInt8, &tknOid->len, mBuf); /* Pack the value */ for (i = 1; i <= (U16)tknOid->len; i++) @@ -3206,14 +3206,14 @@ Buffer *mBuf; /* message buffer */ /* cm_gen_c_001.main_33: changes for TknOid value from U16 to U32 * with compilation flag TKNOID_U16 */ #ifndef TKNOID_U16 - CMCHKUNPK(SUnpkU32, &tknOid->val[tknOid->len - i], mBuf); + CMCHKUNPK(oduPackUInt32, &tknOid->val[tknOid->len - i], mBuf); #else - CMCHKUNPK(SUnpkU16, &tknOid->val[tknOid->len - i], mBuf); + CMCHKUNPK(oduPackUInt16, &tknOid->val[tknOid->len - i], mBuf); #endif /* !TKNOID_U16 */ } } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknOid */ @@ -3246,7 +3246,7 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpTknS32) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknS32->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknS32->pres, mBuf); if (tknS32->pres) { @@ -3254,7 +3254,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(SUnpkS32, &tknS32->val, mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknS32 */ @@ -3286,10 +3286,10 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmUnpHeader) - CMCHKUNPK(SUnpkU16, &header->msgLen, mBuf); - CMCHKUNPK(SUnpkU8, &header->msgType, mBuf); - CMCHKUNPK(SUnpkU8, &header->version, mBuf); - CMCHKUNPK(SUnpkU16, &header->seqNmb, mBuf); + CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); + CMCHKUNPK(oduPackUInt8, &header->msgType, mBuf); + CMCHKUNPK(oduPackUInt8, &header->version, mBuf); + CMCHKUNPK(oduPackUInt16, &header->seqNmb, mBuf); CMCHKUNPK(cmUnpkEntityId, &header->entId, mBuf); CMCHKUNPK(cmUnpkElmntId, &header->elmId, mBuf); #ifdef LMINT3 @@ -3300,7 +3300,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkMemoryId, &header->response.mem, mBuf); #endif /* LMINT3 */ - RETVALUE(ROK); + return ROK; } /* end of cmUnpkHeader */ @@ -3332,10 +3332,10 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmUnpkCmStatus) - CMCHKUNPK(SUnpkU16, &sta->status, mBuf); - CMCHKUNPK(SUnpkU16, &sta->reason, mBuf); + CMCHKUNPK(oduPackUInt16, &sta->status, mBuf); + CMCHKUNPK(oduPackUInt16, &sta->reason, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmStatus */ @@ -3368,11 +3368,11 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpkCmAlarm) CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf); - CMCHKUNPK(SUnpkU16, &alarm->category, mBuf); - CMCHKUNPK(SUnpkU16, &alarm->event, mBuf); - CMCHKUNPK(SUnpkU16, &alarm->cause, mBuf); + CMCHKUNPK(oduPackUInt16, &alarm->category, mBuf); + CMCHKUNPK(oduPackUInt16, &alarm->event, mBuf); + CMCHKUNPK(oduPackUInt16, &alarm->cause, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmAlarm */ @@ -3412,7 +3412,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkRoute, &smCfg->route, mBuf); CMCHKUNPK(cmUnpkSelector, &smCfg->selector, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkSmCfg */ @@ -3444,10 +3444,10 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmUnpTmrCfg) - CMCHKUNPK(cmUnpkBool, &tmrCfg->enb, mBuf); - CMCHKUNPK(SUnpkU16, &tmrCfg->val, mBuf); + CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); + CMCHKUNPK(oduPackUInt16, &tmrCfg->val, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTmrCfg */ /* @@ -3484,7 +3484,7 @@ Buffer **tBuf; /* message buffer */ mBuf = *tBuf; /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknBuf->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknBuf->pres, mBuf); if(tknBuf->pres) { @@ -3498,7 +3498,7 @@ Buffer **tBuf; /* message buffer */ { if( SSegMsg(mBuf, msgLen, &tknBuf->val) != ROK ) { - RETVALUE(RFAILED); + return RFAILED; } } else @@ -3515,7 +3515,7 @@ Buffer **tBuf; /* message buffer */ *tBuf = mBuf; - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknBuf */ #ifdef TDS_ROLL_UPGRADE_SUPPORT @@ -3550,7 +3550,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkIntfVer, &intf->intfVer, mBuf); CMCHKUNPK(cmUnpkIntfId, &intf->intfId, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkIntf */ #endif /* TDS_ROLL_UPGRADE_SUPPORT */ diff --git a/src/cm/cm_gen.h b/src/cm/cm_gen.h index 9c7bfad0c..2d21ff0fd 100644 --- a/src/cm/cm_gen.h +++ b/src/cm/cm_gen.h @@ -47,71 +47,71 @@ /* system services typedefs */ -#define cmPkBool(x, mBuf) SPkU8(x, mBuf) /* pack Bool */ +#define oduPackBool(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Bool */ #define cmPkStatus(x, mBuf) SPkS16(x, mBuf) /* pack Status */ -#define cmPkTicks(x, mBuf) SPkU32(x, mBuf) /* pack Ticks */ +#define cmPkTicks(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Ticks */ #define cmPkQLen(x, mBuf) SPkS16(x, mBuf) /* pack QLen */ #define cmPkOrder(x, mBuf) SPkS16(x, mBuf) /* pack Order */ -#define cmPkData(x, mBuf) SPkU8(x, mBuf) /* pack Data */ -#define cmPkRandom(x, mBuf) SPkU16(x, mBuf) /* pack Random */ +#define cmPkData(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Data */ +#define cmPkRandom(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Random */ #define cmPkSeq(x, mBuf) SPkS16(x, mBuf) /* pack Seq */ #define cmPkReason(x, mBuf) SPkS16(x, mBuf) /* pack Reason */ -#define cmPkProcId(x, mBuf) SPkU16(x, mBuf) /* pack ProcId */ +#define cmPkProcId(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack ProcId */ #define cmPkVectNmb(x, mBuf) SPkS16(x, mBuf) /* pack VectNmb */ -#define cmPkPrior(x, mBuf) SPkU8(x, mBuf) /* pack Prior*/ +#define cmPkPrior(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Prior*/ #define cmPkPriority(x, mBuf) cmPkPrior(x, mBuf) /* pack Priority */ -#define cmPkRoute(x, mBuf) SPkU8(x, mBuf) /* pack Route */ +#define cmPkRoute(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Route */ #define cmPkTtype(x, mBuf) SPkS16(x, mBuf) /* pack Ttype */ #define cmPkSema(x, mBuf) SPkS8(x, mBuf) /* pack Sema */ #define cmPkTxt(x, mBuf) SPkS8(x, mBuf) /* pack Txt */ -#define cmPkEnt(x, mBuf) SPkU8(x, mBuf) /* pack Ent */ -#define cmPkInst(x, mBuf) SPkU8(x, mBuf) /* pack Inst */ +#define cmPkEnt(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ent */ +#define cmPkInst(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Inst */ #define cmPkElmnt(x, mBuf) SPkS16(x, mBuf) /* pack Elmnt */ #define cmPkElmntInst1(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst1 */ #define cmPkElmntInst2(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst2 */ #define cmPkElmntInst3(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst3 */ -#define cmPkRegion(x, mBuf) SPkU8(x, mBuf) /* pack Region */ -#define cmPkPool(x, mBuf) SPkU8(x, mBuf) /* pack Pool */ +#define cmPkRegion(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Region */ +#define cmPkPool(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Pool */ #ifdef LONG_MSG #define cmPkMsgLen(x, mBuf) SPkS32(x, mBuf) /* pack MsgLen */ #else #define cmPkMsgLen(x, mBuf) SPkS16(x, mBuf) /* pack MsgLen */ #endif #ifdef DOS -#define cmPkSize(x, mBuf) SPkU16(x, mBuf) /* pack Size */ +#define cmPkSize(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Size */ #else -#define cmPkSize(x, mBuf) SPkU32(x, mBuf) /* pack Size */ +#define cmPkSize(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Size */ #endif /* DOS */ /* general typedefs */ -#define cmPkSelector(x, mBuf) SPkU8(x, mBuf) /* pack Selector */ -#define cmPkEvent(x, mBuf) SPkU8(x, mBuf) /* pack Event */ +#define cmPkSelector(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Selector */ +#define cmPkEvent(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Event */ #define cmPkCntr(x, mBuf) SPkS32(x, mBuf) /* pack Cntr */ -#define cmPkStsCntr(x, mBuf) SPkU32(x, mBuf) /* pack StsCntr */ +#define cmPkStsCntr(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack StsCntr */ #define cmPkLnkNmb(x, mBuf) SPkS16(x, mBuf) /* pack LnkNmb */ #define cmPkSuId(x, mBuf) SPkS16(x, mBuf) /* pack SuId */ #define cmPkSpId(x, mBuf) SPkS16(x, mBuf) /* pack SpId */ #define cmPkSuInstId(x, mBuf) SPkS16(x, mBuf) /* pack SuInstId */ #define cmPkSpInstInd(x, mBuf) SPkS16(x, mBuf) /* pack SpInstInd */ -#define cmPkSapi(x, mBuf) SPkU8(x, mBuf) /* pack Sapi */ -#define cmPkTei(x, mBuf) SPkU8(x, mBuf) /* pack Tei */ -#define cmPkCes(x, mBuf) SPkU8(x, mBuf) /* pack Ces */ -#define cmPkDlci(x, mBuf) SPkU32(x, mBuf) /* pack Dlci */ -#define cmPkCalRef(x, mBuf) SPkU16(x, mBuf) /* pack CalRef */ +#define cmPkSapi(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Sapi */ +#define cmPkTei(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Tei */ +#define cmPkCes(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ces */ +#define cmPkDlci(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Dlci */ +#define cmPkCalRef(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack CalRef */ #define cmPkOrigin(x, mBuf) SPkS16(x, mBuf) /* pack Origin */ #define cmPkSwtch(x, mBuf) SPkS16(x, mBuf) /* pack Swtch */ -#define cmPkCause(x, mBuf) SPkU8(x, mBuf) /* pack Cause */ -#define cmPkDgn(x, mBuf) SPkU8(x, mBuf) /* pack Dgn */ +#define cmPkCause(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Cause */ +#define cmPkDgn(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Dgn */ #define cmPkAction(x, mBuf) SPkS16(x, mBuf) /* pack Action */ #define cmPkSeqS16(x, mBuf) SPkS16(x, mBuf) /* pack SeqS16 */ -#define cmPkSeqU16(x, mBuf) SPkU16(x, mBuf) /* pack SeqU16 */ +#define cmPkSeqU16(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack SeqU16 */ #define cmPkSeqS24(x, mBuf) SPkS32(x, mBuf) /* pack SeqS24 */ -#define cmPkSeqU24(x, mBuf) SPkU32(x, mBuf) /* pack SeqU24 */ -#define cmPkSetUpArb(x, mBuf) SPkU8(x, mBuf) /* pack SetUpArb */ -#define cmPkEvntType(x, mBuf) SPkU8(x, mBuf) /* pack EvntType */ -#define cmPkState(x, mBuf) SPkU8(x, mBuf) /* pack State */ -#define cmPkMode(x, mBuf) SPkU8(x, mBuf) /* pack Mode */ +#define cmPkSeqU24(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack SeqU24 */ +#define cmPkSetUpArb(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack SetUpArb */ +#define cmPkEvntType(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack EvntType */ +#define cmPkState(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack State */ +#define cmPkMode(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Mode */ #define cmPkConnId(x, mBuf) SPkS32(x, mBuf) /* pack ConnId */ /* scc specific typedefs */ @@ -125,97 +125,97 @@ /* tcp/ip specific typedefs */ -#define cmPkIpAddr(x, mBuf) SPkU32(x, mBuf) /* pack IpAddr */ -#define cmPkPort(x, mBuf) SPkU16(x, mBuf) /* pack Port */ -#define cmPkCmd(x, mBuf) SPkU8(x, mBuf) /* pack Cmd */ -#define cmPkFlags(x, mBuf) SPkU8(x, mBuf) /* pack Flags */ -#define cmPkTtl(x, mBuf) SPkU8(x, mBuf) /* pack Ttl */ -#define cmPkPrec(x, mBuf) SPkU8(x, mBuf) /* pack Prec */ -#define cmPkWindow(x, mBuf) SPkU32(x, mBuf) /* pack Window */ +#define cmPkIpAddr(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack IpAddr */ +#define cmPkPort(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Port */ +#define cmPkCmd(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Cmd */ +#define cmPkFlags(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Flags */ +#define cmPkTtl(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ttl */ +#define cmPkPrec(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Prec */ +#define cmPkWindow(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Window */ /* ISUP specific typedefs */ -#define cmPkCirId(x, mBuf) SPkU16(x, mBuf) /* pack CirId */ -#define cmPkCic(x, mBuf) SPkU16(x, mBuf) /* pack Cic */ -#define cmPkSiInstId(x, mBuf) SPkU32(x, mBuf) /* pack SiInstId */ +#define cmPkCirId(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack CirId */ +#define cmPkCic(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Cic */ +#define cmPkSiInstId(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack SiInstId */ /* TUP specific typedefs */ -#define cmPkTpInstId(x, mBuf) SPkU32(x, mBuf) /* pack TpInstId */ +#define cmPkTpInstId(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack TpInstId */ /* PNNI specific typedefs */ -#define cmPkPnPortId(x, mBuf) SPkU32(x, mBuf) +#define cmPkPnPortId(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpacking macros */ /* system services typedefs */ -#define cmUnpkBool(x, mBuf) SUnpkU8(x, mBuf) /* unpack Bool */ +#define oduUnpackBool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Bool */ #define cmUnpkStatus(x, mBuf) SUnpkS16(x, mBuf) /* unpack Status */ -#define cmUnpkTicks(x, mBuf) SUnpkU32(x, mBuf) /* unpack Ticks */ +#define cmUnpkTicks(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Ticks */ #define cmUnpkQLen(x, mBuf) SUnpkS16(x, mBuf) /* unpack QLen */ #define cmUnpkOrder(x, mBuf) SUnpkS16(x, mBuf) /* unpack Order */ -#define cmUnpkData(x, mBuf) SUnpkU8(x, mBuf) /* unpack Data */ -#define cmUnpkRandom(x, mBuf) SUnpkU16(x, mBuf) /* unpack Random */ +#define cmUnpkData(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Data */ +#define cmUnpkRandom(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Random */ #define cmUnpkSeq(x, mBuf) SUnpkS16(x, mBuf) /* unpack Seq */ #define cmUnpkReason(x, mBuf) SUnpkS16(x, mBuf) /* unpack Reason */ -#define cmUnpkProcId(x, mBuf) SUnpkU16(x, mBuf) /* unpack ProcId */ +#define cmUnpkProcId(x, mBuf) oduPackUInt16(x, mBuf) /* unpack ProcId */ #define cmUnpkVectNmb(x, mBuf) SUnpkS16(x, mBuf) /* unpack VectNmb */ -#define cmUnpkPrior(x, mBuf) SUnpkU8(x, mBuf) /* unpack Prior */ +#define cmUnpkPrior(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Prior */ #define cmUnpkPriority(x, mBuf) cmUnpkPrior(x, mBuf) /* unpack Priority */ -#define cmUnpkRoute(x, mBuf) SUnpkU8(x, mBuf) /* unpack Route */ +#define cmUnpkRoute(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Route */ #define cmUnpkTtype(x, mBuf) SUnpkS16(x, mBuf) /* unpack Ttype */ #define cmUnpkSema(x, mBuf) SUnpkS8(x, mBuf) /* unpack Sema */ #define cmUnpkTxt(x, mBuf) SUnpkS8(x, mBuf) /* unpack Txt */ -#define cmUnpkEnt(x, mBuf) SUnpkU8(x, mBuf) /* unpack Ent */ -#define cmUnpkInst(x, mBuf) SUnpkU8(x, mBuf) /* unpack Inst */ +#define cmUnpkEnt(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ent */ +#define cmUnpkInst(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Inst */ #define cmUnpkElmnt(x, mBuf) SUnpkS16(x, mBuf) /* unpack Elmnt */ #define cmUnpkElmntInst1(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst1 */ #define cmUnpkElmntInst2(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst2 */ #define cmUnpkElmntInst3(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst3 */ -#define cmUnpkRegion(x, mBuf) SUnpkU8(x, mBuf) /* unpack Region */ -#define cmUnpkPool(x, mBuf) SUnpkU8(x, mBuf) /* unpack Pool */ +#define cmUnpkRegion(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Region */ +#define cmUnpkPool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Pool */ #ifdef LONG_MSG #define cmUnpkMsgLen(x, mBuf) SUnpkS32(x, mBuf) /* unpack MsgLen */ #else #define cmUnpkMsgLen(x, mBuf) SUnpkS16(x, mBuf) /* unpack MsgLen */ #endif #ifdef DOS -#define cmUnpkSize(x, mBuf) SUnpkU16(x, mBuf) /* unpack Size */ +#define cmUnpkSize(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Size */ #else -#define cmUnpkSize(x, mBuf) SUnpkU32(x, mBuf) /* unpack Size */ +#define cmUnpkSize(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Size */ #endif /* DOS */ /* general typedefs */ -#define cmUnpkSelector(x, mBuf) SUnpkU8(x, mBuf) /* unpack Selector */ -#define cmUnpkEvent(x, mBuf) SUnpkU8(x, mBuf) /* unpack Event */ +#define cmUnpkSelector(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Selector */ +#define cmUnpkEvent(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Event */ #define cmUnpkCntr(x, mBuf) SUnpkS32(x, mBuf) /* unpack Cntr */ -#define cmUnpkStsCntr(x, mBuf) SUnpkU32(x, mBuf) /* unpack StsCntr */ +#define cmUnpkStsCntr(x, mBuf) oduPackUInt32(x, mBuf) /* unpack StsCntr */ #define cmUnpkLnkNmb(x, mBuf) SUnpkS16(x, mBuf) /* unpack LnkNmb */ #define cmUnpkSuId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SuId */ #define cmUnpkSpId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SpId */ #define cmUnpkSuInstId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SuInstId */ #define cmUnpkSpInstInd(x, mBuf) SUnpkS16(x, mBuf) /* unpack SpInstInd */ -#define cmUnpkSapi(x, mBuf) SUnpkU8(x, mBuf) /* unpack Sapi */ -#define cmUnpkTei(x, mBuf) SUnpkU8(x, mBuf) /* unpack Tei */ -#define cmUnpkCes(x, mBuf) SUnpkU8(x, mBuf) /* unpack Ces */ -#define cmUnpkDlci(x, mBuf) SUnpkU32(x, mBuf) /* unpack Dlci */ -#define cmUnpkCalRef(x, mBuf) SUnpkU16(x, mBuf) /* unpack CalRef */ +#define cmUnpkSapi(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Sapi */ +#define cmUnpkTei(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Tei */ +#define cmUnpkCes(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ces */ +#define cmUnpkDlci(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Dlci */ +#define cmUnpkCalRef(x, mBuf) oduPackUInt16(x, mBuf) /* unpack CalRef */ #define cmUnpkOrigin(x, mBuf) SUnpkS16(x, mBuf) /* unpack Origin */ #define cmUnpkSwtch(x, mBuf) SUnpkS16(x, mBuf) /* unpack Swtch */ -#define cmUnpkCause(x, mBuf) SUnpkU8(x, mBuf) /* unpack Cause */ -#define cmUnpkDgn(x, mBuf) SUnpkU8(x, mBuf) /* unpack Dgn */ +#define cmUnpkCause(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Cause */ +#define cmUnpkDgn(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Dgn */ #define cmUnpkAction(x, mBuf) SUnpkS16(x, mBuf) /* unpack Action */ #define cmUnpkSeqS16(x, mBuf) SUnpkS16(x, mBuf) /* unpack SeqS16 */ -#define cmUnpkSeqU16(x, mBuf) SUnpkU16(x, mBuf) /* unpack SeqU16 */ +#define cmUnpkSeqU16(x, mBuf) oduPackUInt16(x, mBuf) /* unpack SeqU16 */ #define cmUnpkSeqS24(x, mBuf) SUnpkS32(x, mBuf) /* unpack SeqS24 */ -#define cmUnpkSeqU24(x, mBuf) SUnpkU32(x, mBuf) /* unpack SeqU24 */ -#define cmUnpkSetUpArb(x, mBuf) SUnpkU8(x, mBuf) /* unpack SetUpArb */ -#define cmUnpkEvntType(x, mBuf) SUnpkU8(x, mBuf) /* unpack EvntType */ -#define cmUnpkState(x, mBuf) SUnpkU8(x, mBuf) /* unpack State */ -#define cmUnpkMode(x, mBuf) SUnpkU8(x, mBuf) /* unpack Mode */ +#define cmUnpkSeqU24(x, mBuf) oduPackUInt32(x, mBuf) /* unpack SeqU24 */ +#define cmUnpkSetUpArb(x, mBuf) oduPackUInt8(x, mBuf) /* unpack SetUpArb */ +#define cmUnpkEvntType(x, mBuf) oduPackUInt8(x, mBuf) /* unpack EvntType */ +#define cmUnpkState(x, mBuf) oduPackUInt8(x, mBuf) /* unpack State */ +#define cmUnpkMode(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Mode */ #define cmUnpkConnId(x, mBuf) SUnpkS32(x, mBuf) /* unpack ConnId */ /* scc specific typedefs */ @@ -229,34 +229,34 @@ /* tcp/ip specific typedefs */ -#define cmUnpkIpAddr(x, mBuf) SUnpkU32(x, mBuf) /* unpack IpAddr */ -#define cmUnpkPort(x, mBuf) SUnpkU16(x, mBuf) /* unpack Port */ -#define cmUnpkCmd(x, mBuf) SUnpkU8(x, mBuf) /* unpack Cmd */ -#define cmUnpkFlags(x, mBuf) SUnpkU8(x, mBuf) /* unpack Flags */ -#define cmUnpkTtl(x, mBuf) SUnpkU8(x, mBuf) /* unpack Ttl */ -#define cmUnpkPrec(x, mBuf) SUnpkU8(x, mBuf) /* unpack Prec */ -#define cmUnpkWindow(x, mBuf) SUnpkU32(x, mBuf) /* unpack Window */ +#define cmUnpkIpAddr(x, mBuf) oduPackUInt32(x, mBuf) /* unpack IpAddr */ +#define cmUnpkPort(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Port */ +#define cmUnpkCmd(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Cmd */ +#define cmUnpkFlags(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Flags */ +#define cmUnpkTtl(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ttl */ +#define cmUnpkPrec(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Prec */ +#define cmUnpkWindow(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Window */ /* ISUP specific typedefs */ -#define cmUnpkCirId(x, mBuf) SUnpkU16(x, mBuf) /* unpack CirId */ -#define cmUnpkCic(x, mBuf) SUnpkU16(x, mBuf) /* unpack Cic */ -#define cmUnpkSiInstId(x, mBuf) SUnpkU32(x, mBuf) /* unpack SiInstId */ +#define cmUnpkCirId(x, mBuf) oduPackUInt16(x, mBuf) /* unpack CirId */ +#define cmUnpkCic(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Cic */ +#define cmUnpkSiInstId(x, mBuf) oduPackUInt32(x, mBuf) /* unpack SiInstId */ /* TUP specific typedefs */ -#define cmUnpkTpInstId(x, mBuf) SUnpkU32(x, mBuf) /* unpack TpInstId */ +#define cmUnpkTpInstId(x, mBuf) oduPackUInt32(x, mBuf) /* unpack TpInstId */ /* PNNI specific typedefs */ -#define cmUnpkPnPortId(x, mBuf) SUnpkU32(x, mBuf) +#define cmUnpkPnPortId(x, mBuf) oduPackUInt32(x, mBuf) #define cmCmpPnNodeId(nodeId1, nodeId2) \ cmCmpStr(&(nodeId1)->id[0], PN_NODEID_LEN, \ &(nodeId2)->id[0], PN_NODEID_LEN) /* PLOA - HCC profileId */ -#define cmPkProfileId(x, mBuf) SPkU8(x, mBuf) /* pack ProfileId */ +#define cmPkProfileId(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack ProfileId */ -#define cmUnpkProfileId(x, mBuf) SUnpkU8(x, mBuf) /* unpack ProfileId */ +#define cmUnpkProfileId(x, mBuf) oduPackUInt8(x, mBuf) /* unpack ProfileId */ /* packing and unpacking for token strings */ @@ -269,15 +269,15 @@ /* Value */ \ for (i = 0; i < (S16) tknStr->len; i++) \ { \ - CMCHKPK(SPkU8, tknStr->val[i], mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); \ } \ \ /* Length */ \ - CMCHKPK(SPkU8, tknStr->len, mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); \ } \ \ /* Token Header */ \ - CMCHKPK(SPkU8, tknStr->pres, mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); \ } #define CMUNPKTKNSTR(tknStr, mBuf) \ @@ -285,17 +285,17 @@ Cntr i; \ \ /* Token Header */ \ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); \ \ if(tknStr->pres) \ { \ /* Length */ \ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); \ \ /* Value */ \ for (i = 1; i <= (S16) tknStr->len; i++) \ { \ - CMCHKUNPK(SUnpkU8, &tknStr->val[tknStr->len - i], mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - i], mBuf); \ } \ } \ \ diff --git a/src/cm/cm_hash.c b/src/cm/cm_hash.c index cd0427979..10dccff8b 100644 --- a/src/cm/cm_hash.c +++ b/src/cm/cm_hash.c @@ -237,7 +237,7 @@ U16 *idx; /* idx to return */ else *idx = (U16) (c % hashListCp->nmbBins); - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncAnyKey */ @@ -290,7 +290,7 @@ U16 *idx; /* idx to return */ else *idx = (U16) (sum % hashListCp->nmbBins); - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncU32Mod () */ @@ -371,7 +371,7 @@ U16 *idx; /* idx to return */ else *idx = (U16) (sum % hashListCp->nmbBins); - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncBCD8 () */ /* @@ -428,7 +428,7 @@ U16 *idx; /* idx to return */ else *idx = (U16) (sum % hashListCp->nmbBins); - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncString () */ @@ -485,7 +485,7 @@ U16 *idx; /* index to return */ else *idx = (U16) (sum % hashListCp->nmbBins); - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncDefault */ @@ -547,7 +547,7 @@ U16 *idx; /* index to return */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if (hashListCp->binBitMask == CM_HASH_NOBITMASK) - RETVALUE(RFAILED); + return RFAILED; #endif prod = CM_HASH_MULT24_CONST * *((U32 *)key); @@ -555,7 +555,7 @@ U16 *idx; /* index to return */ shift = CM_HASH_MULT24_BITPOS - hashListCp->nmbBinBits; *idx = ((U16) (prod & (hashListCp->binBitMask << shift))) >> shift; - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncMult24 */ @@ -628,9 +628,9 @@ U16 *idx; /* index to return */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncConId */ @@ -676,7 +676,7 @@ U16 *idx; /* index to return */ *idx = *((U16 *) key); - RETVALUE(ROK); + return ROK; } /* end of cmHashFuncDirIdx */ @@ -715,10 +715,10 @@ U16 keyLen2; /* length of second key string */ /* compare key lengths */ if (keyLen1 != keyLen2) - RETVALUE(RFAILED); + return RFAILED; /* compare key strings */ - RETVALUE(cmMemcmp(key1, key2, (PTR) keyLen1)); + return (cmMemcmp(key1, key2, (PTR) keyLen1)); } /* end of cmHashMatchKey */ @@ -755,7 +755,7 @@ CmListEnt *newEntry; /* new entry to add */ oldEntry->next = newEntry; (newEntry->next)->prev = newEntry; - RETVALUE(ROK); + return ROK; } /* end of cmListInsert */ @@ -786,7 +786,7 @@ CmListEnt *entry; /* entry to delete */ TRC2(cmListDelete); if (entry == NULLP) - RETVALUE(RFAILED); + return RFAILED; if (entry->prev != NULLP) (entry->prev)->next = entry->next; @@ -794,7 +794,7 @@ CmListEnt *entry; /* entry to delete */ if (entry->next != NULLP) (entry->next)->prev = entry->prev; - RETVALUE(ROK); + return ROK; } /* end of cmListDelete */ @@ -869,7 +869,7 @@ Pool pool; /* memory pool to allocate bins */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if (hashListCp == NULLP) - RETVALUE(RFAILED); + return RFAILED; #endif /* initialize control point fields */ @@ -893,7 +893,7 @@ Pool pool; /* memory pool to allocate bins */ case CM_HASH_KEYTYPE_MULT24: /* return failure if number of bins is not a power of 2 */ if (((nmbBins) & (nmbBins - 1)) != 0) - RETVALUE (RFAILED); + return (RFAILED); hashListCp->hashFunc = cmHashFuncMult24; break; @@ -934,11 +934,11 @@ Pool pool; /* memory pool to allocate bins */ #ifndef CM_MT_HASH_BIN if (SGetSBuf(region, pool, (Data **) &hashListCp->hl, (Size) (nmbBins * sizeof(CmListEnt))) != ROK) - RETVALUE(RFAILED); + return RFAILED; #else if (SGetSBuf(region, pool, (Data **) &hashListCp->hl, (Size) (nmbBins * sizeof(CmListBinEnt))) != ROK) - RETVALUE(RFAILED); + return RFAILED; #endif /* initialize bin pointers */ @@ -974,7 +974,7 @@ Pool pool; /* memory pool to allocate bins */ } } - RETVALUE(ROK); + return ROK; } /* end of cmHashListInit */ @@ -1009,7 +1009,7 @@ CmHashListCp *hashListCp; /* hash list to deinitialize */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if (hashListCp == NULLP) - RETVALUE(RFAILED); + return RFAILED; #endif /* deallocate memory for bins */ @@ -1038,7 +1038,7 @@ CmHashListCp *hashListCp; /* hash list to deinitialize */ hashListCp->keyType = CM_HASH_KEYTYPE_DEF; hashListCp->hashFunc = NULLP; - RETVALUE(ROK); + return ROK; } /* end of cmHashListDeinit */ @@ -1089,7 +1089,7 @@ U16 keyLen; /* length of key */ /* error check on parameters */ if ((hashListCp == NULLP) || (entry == NULLP) || (key == NULLP) || (keyLen == 0)) - RETVALUE(RFAILED); + return RFAILED; #endif /* check for duplicates */ @@ -1097,7 +1097,7 @@ U16 keyLen; /* length of key */ { /* no duplicates allowed, check if key already exists */ if (cmHashListFind(hashListCp, key, keyLen, 0, &dupEntry) == ROK) - RETVALUE(ROKDUP); + return (ROKDUP); } /* get pointer to hash list entry header */ @@ -1111,7 +1111,7 @@ U16 keyLen; /* length of key */ /* compute index for insertion */ if ((*hashListCp->hashFunc)(hashListCp, key, keyLen, &idx) != ROK) - RETVALUE(RFAILED); + return RFAILED; hashListEnt->hashVal = idx; @@ -1125,7 +1125,7 @@ U16 keyLen; /* length of key */ hashListCp->hl[idx].nmbEnt++; #endif /* #ifndef CM_MT_HASH_BIN */ - RETVALUE(ROK); + return ROK; } /* end of cmHashListInsert */ @@ -1169,7 +1169,7 @@ PTR entry; /* entry to delete */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if ((hashListCp == NULLP) || (entry == NULLP)) - RETVALUE(RFAILED); + return RFAILED; #endif /* get pointer to hash list entry header */ @@ -1178,13 +1178,13 @@ PTR entry; /* entry to delete */ /* check if entry is already deleted if yes then return OK */ if((hashListEnt->list.next == NULLP) || (hashListEnt->list.prev == NULLP)) - RETVALUE(ROK); + return ROK; #ifdef CM_MT_HASH_BIN /* compute index for insertion */ if ((*hashListCp->hashFunc)(hashListCp, hashListEnt->key, hashListEnt->keyLen, &idx) != ROK) - RETVALUE(RFAILED); + return RFAILED; #endif /* #ifdef CM_MT_HASH_BIN */ /* delete entry from list */ @@ -1205,7 +1205,7 @@ PTR entry; /* entry to delete */ hashListCp->hl[idx].nmbEnt--; #endif /* #ifndef CM_MT_HASH_BIN */ - RETVALUE(ROK); + return ROK; } /* end of cmHashListDelete */ @@ -1265,12 +1265,12 @@ PTR *entry; /* entry to be returned */ /* error check on parameters */ if ((hashListCp == NULLP) || (key == NULLP) || (keyLen == 0) || (entry == NULLP)) - RETVALUE(RFAILED); + return RFAILED; #endif /* compute hash table index */ if ((*hashListCp->hashFunc)(hashListCp, key, keyLen, &idx) != ROK) - RETVALUE(RFAILED); + return RFAILED; /* search this bin for exact key match */ hashListBin = &hashListCp->hl[idx]; @@ -1293,11 +1293,11 @@ PTR *entry; /* entry to be returned */ /* check for duplicates */ if (!hashListCp->dupFlg) - RETVALUE(ROK); + return ROK; /* for duplicate key, check sequence number */ if (i++ == seqNmb) - RETVALUE(ROK); + return ROK; } /* go to next entry */ @@ -1305,7 +1305,7 @@ PTR *entry; /* entry to be returned */ } /* no matching key found */ - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHashListFind */ @@ -1365,7 +1365,7 @@ PTR *entry; /* entry to be returned */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if ((hashListCp == NULLP) || (entry == NULLP)) - RETVALUE(RFAILED); + return RFAILED; #endif /* check if need to get first entry */ @@ -1386,11 +1386,11 @@ PTR *entry; /* entry to be returned */ /* requested entry is in nxtEnt */ *entry = (PTR) (((U8 *) hashListEnt) - hashListCp->offset); - RETVALUE(ROK); + return ROK; } /* no more entries */ - RETVALUE(ROKDNA); + return (ROKDNA); } /* use previous entry to find next entry */ @@ -1412,7 +1412,7 @@ PTR *entry; /* entry to be returned */ /* found next entry */ *entry = (PTR) (((U8 *) prevListEnt) - hashListCp->offset); - RETVALUE(ROK); + return ROK; } /* no more entries in this bin, go to next bin, check if more bins */ @@ -1426,7 +1426,7 @@ PTR *entry; /* entry to be returned */ } /* no more entries */ - RETVALUE(ROKDNA); + return (ROKDNA); } /* end of cmHashListGetNext */ #ifdef CM_MT_HASH_BIN @@ -1480,7 +1480,7 @@ PTR *entry; /* entry to be returned */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if ((hashListCp == NULLP) || (entry == NULLP)) - RETVALUE(RFAILED); + return RFAILED; #endif /* check if need to get first entry */ @@ -1496,11 +1496,11 @@ PTR *entry; /* entry to be returned */ /* requested entry is in nxtEnt */ *entry = (PTR) (((U8 *) hashListEnt) - hashListCp->offset); - RETVALUE(ROK); + return ROK; } /* no more entries */ - RETVALUE(ROKDNA); + return (ROKDNA); } /* use previous entry to find next entry */ @@ -1518,11 +1518,11 @@ PTR *entry; /* entry to be returned */ /* found next entry */ *entry = (PTR) (((U8 *) prevListEnt) - hashListCp->offset); - RETVALUE(ROK); + return ROK; } /* no more entries */ - RETVALUE(ROKDNA); + return (ROKDNA); } /* end of cmHashListBinGetNextEntry */ #endif @@ -1571,7 +1571,7 @@ U16 *result; /* result of query */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if (result == NULLP) - RETVALUE(RFAILED); + return RFAILED; #endif /* respond depending on query type */ @@ -1583,7 +1583,7 @@ U16 *result; /* result of query */ #else *result = (U16) sizeof(CmListBinEnt); #endif - RETVALUE(ROK); + return ROK; } /* deal with queries that do need hashListCp */ @@ -1591,7 +1591,7 @@ U16 *result; /* result of query */ #if (ERRCLASS & ERRCLS_DEBUG) /* error check on parameters */ if (hashListCp == NULLP) - RETVALUE(RFAILED); + return RFAILED; #endif /* respond depending on query type */ @@ -1607,30 +1607,30 @@ U16 *result; /* result of query */ *result += hashListCp->hl[i].nmbEnt; } #endif - RETVALUE(ROK); + return ROK; case CM_HASH_QUERYTYPE_BINS: /* number of bins */ *result = (U16) hashListCp->nmbBins; - RETVALUE(ROK); + return ROK; case CM_HASH_QUERYTYPE_OFFSET: /* offset of CmHashListEnt in entries */ *result = (U16) hashListCp->offset; - RETVALUE(ROK); + return ROK; case CM_HASH_QUERYTYPE_DUPFLG: /* allow duplicate keys */ *result = (U16) hashListCp->dupFlg; - RETVALUE(ROK); + return ROK; case CM_HASH_QUERYTYPE_KEYTYPE: /* key type for selecting hash functions */ *result = (U16) hashListCp->keyType; - RETVALUE(ROK); + return ROK; default: /* process other query types */ break; } /* illegal query type */ - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHashListQuery */ #ifdef HASH_OPEN_ADDRESSING @@ -1692,7 +1692,7 @@ U16 keyLen; /* length of key */ /* error check on parameters */ if ((hashListCp == NULLP) || (entry == NULLP) || (key == NULLP) || (keyLen == 0)) - RETVALUE(RFAILED); + return RFAILED; #endif #ifndef CM_MT_HASH_BIN @@ -1706,7 +1706,7 @@ U16 keyLen; /* length of key */ #endif /* check if table is full */ if (hashListCp->nmbBins == nmbEnt) - RETVALUE(ROUTRES); + return (ROUTRES); /* get pointer to hash list entry header */ hashListEnt = (CmHashListEnt *) (((U8 *) entry) + hashListCp->offset); @@ -1719,7 +1719,7 @@ U16 keyLen; /* length of key */ /* compute index for insertion */ if ((*hashListCp->hashFunc)(hashListCp, key, keyLen, &idx) != ROK) - RETVALUE(RFAILED); + return RFAILED; /* * find an empty bin @@ -1741,7 +1741,7 @@ U16 keyLen; /* length of key */ /* insert into list */ if (cmListInsert(hashBin->prev, &hashListEnt->list) != ROK) - RETVALUE(RFAILED); + return RFAILED; hashListEnt->hashVal = idx; @@ -1752,7 +1752,7 @@ U16 keyLen; /* length of key */ hashBin->nmbEnt++; #endif - RETVALUE(ROK); + return ROK; } /* end of cmHashListOAInsert */ diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c index cd12a0a72..02a4d8670 100644 --- a/src/cm/cm_inet.c +++ b/src/cm/cm_inet.c @@ -353,7 +353,7 @@ U32 timeout; /* timeout value for Poll */ #endif CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -365,21 +365,21 @@ U32 timeout; /* timeout value for Poll */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPoll() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ ret = poll(pollFdArr,numFds,timeout); if (ret == 0) { - RETVALUE(RTIMEOUT); + return (RTIMEOUT); } if (ret == INET_ERR) { switch(INET_ERR_CODE) { case ERR_EINTR: - RETVALUE(ROKDNA); + return (ROKDNA); default: #ifdef CMINETDBG @@ -388,14 +388,14 @@ U32 timeout; /* timeout value for Poll */ error(%d)\n", __FILE__, __LINE__, INET_ERR_CODE); SPrint(prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } /* end of switch */ } *numRdyFds = (S16)ret; - RETVALUE(ROK); + return ROK; } @@ -441,7 +441,7 @@ U16 eventMask; /* Event Mask to be set */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -453,7 +453,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollSetFd() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -491,7 +491,7 @@ U16 eventMask; /* Event Mask to be set */ #endif /*ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(ROK); + return ROK; } @@ -535,7 +535,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollFdIsSet() : Invalid Index (%d) \n",idx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -547,13 +547,13 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollFdIsSet() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ ret = (pollFdArr[idx].revents & eventMask); - RETVALUE(ret); + return (ret); } /* @@ -596,7 +596,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdREvent() : Invalid Index (%d) \n",idx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -608,7 +608,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdREvent() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -643,7 +643,7 @@ U16 eventMask; /* Event Mask to be set */ #endif /*ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(ROK); + return ROK; } @@ -688,7 +688,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdEvent() : Invalid Index (%d) \n",idx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -700,7 +700,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdEvent() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -735,7 +735,7 @@ U16 eventMask; /* Event Mask to be set */ #endif /*ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(ROK); + return ROK; } @@ -786,7 +786,7 @@ S16 lastIdx; /* Last index of poll Fd Array */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollDelFd() : Invalid Index \n Current Index (%d) Delete Index (%d) \n",lastIdx,delIdx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } @@ -798,7 +798,7 @@ S16 lastIdx; /* Last index of poll Fd Array */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollDelFd() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -824,7 +824,7 @@ S16 lastIdx; /* Last index of poll Fd Array */ pollFdArr[lastIdx].events = 0; pollFdArr[lastIdx].revents = 0; - RETVALUE(ROK); + return ROK; } @@ -872,7 +872,7 @@ CmInetPollFd *pollFdArr; /* poll FD Array */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollInitFdArr() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -882,7 +882,7 @@ CmInetPollFd *pollFdArr; /* poll FD Array */ pollFdArr[idx].events = 0; pollFdArr[idx].revents = 0; } - RETVALUE(ROK); + return ROK; } #if (!(defined(WIN32)) && !(defined(CMINETFLATBUF))) @@ -962,7 +962,7 @@ PRIVATE S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg) ret = SGetDBuf(info->region, info->pool, &dBuf[numBuf]); #endif if (ret != ROK) - RETVALUE(ret); + return (ret); /* Get the data part */ ret = SGetDataRx(dBuf[numBuf], 0, &dPtr, &dLen); @@ -1037,7 +1037,7 @@ PRIVATE S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg) msg->msg_iov = rxArr; msg->msg_iovlen = numBuf; - RETVALUE(ret); + return (ret); cleanup: /* cleanup */ @@ -1046,7 +1046,7 @@ cleanup: msg->msg_iovlen = 0; - RETVALUE(ret); + return (ret); } /* end of buildRecvBuf */ /* @@ -1141,7 +1141,7 @@ cleanup: i++; } - RETVALUE(ret); + return (ret); } /* end of buildRecvMsg */ @@ -1207,7 +1207,7 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in ret = SInitNxtDBuf(mBuf); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } iovIdx = 0; @@ -1222,7 +1222,7 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in { ret = SGetNxtDBuf(mBuf, &dBuf); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; dBufsToSkip --; } } @@ -1273,7 +1273,7 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in /* cm_inet_c_001.main_50 - Assign the value of dbufs packed in IO-vector */ *ioLen = allocLen; - RETVALUE(ret); + return (ret); } /* end of buildSendIovec */ #endif /* (defined(WIN32)) && !(defined(CMINETFLATBUF)) */ @@ -1388,7 +1388,7 @@ CmInetFd *sockFd; /* socket file descriptor */ #endif /* CMINETDBG */ /* Set sockFd->fd to invalid socket */ sockFd->fd = CM_INET_INV_SOCKFD; - RETVALUE(RFAILED); + return RFAILED; } /* set socket type */ @@ -1410,7 +1410,7 @@ CmInetFd *sockFd; /* socket file descriptor */ if (ret != ROK) { ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_LINUX @@ -1420,7 +1420,7 @@ CmInetFd *sockFd; /* socket file descriptor */ if (ret != ROK) { ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } #endif /* CMINET_BSDCOMPAT */ #endif /* SS_LINUX */ @@ -1448,7 +1448,7 @@ CmInetFd *sockFd; /* socket file descriptor */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } } #endif /* WIN2K && WIN32 */ @@ -1467,12 +1467,12 @@ CmInetFd *sockFd; /* socket file descriptor */ if (ret != ROK) { ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } } #endif /* CM_LKSCTP_NONBLOCK ends */ #endif - RETVALUE(ROK); + return ROK; } /* end of cmInetSocket */ @@ -1522,7 +1522,7 @@ CmInetAddr *myAddr; /* locale Internet address/port */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (myAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1594,10 +1594,10 @@ CmInetAddr *myAddr; /* locale Internet address/port */ #endif /*ALIGN_64BIT*/ #endif /* IPV6_SUPPORTED */ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetBind */ /*cm_inet_c_001.main_38 Updated for TUCL 2.1 Release (Kernel SCTP Support) */ @@ -1665,7 +1665,7 @@ U16 port; /* port number */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (addrLst == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } if(addrLst->count > CM_INET_NUM_NET_ADDR) @@ -1686,7 +1686,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET005, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1718,7 +1718,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET057, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -1748,7 +1748,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET058, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -1819,7 +1819,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET006, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } if (addrLst->count > 1) @@ -1850,7 +1850,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET059, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } ret = sctp_bindx(sockFd->fd, (Void*)tempAddrPtr, addrLst->count - 1, SCTP_BINDX_ADD_ADDR); @@ -1877,10 +1877,10 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET007, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -1956,12 +1956,12 @@ U16 port; /* port number */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (primAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_58 : Added check for addrLst to fix klockwork issue */ if (addrLst == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_46: Included check for no of address aginst max */ if( addrLst->count > CM_INET_NUM_NET_ADDR ) @@ -1982,7 +1982,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET060, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2013,7 +2013,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET008, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -2042,7 +2042,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET061, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; addrs6[idx6].sin6_port = CM_INET_HTON_U16(port); @@ -2119,7 +2119,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET009, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -2149,7 +2149,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET062, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; addrs6[idx6].sin6_port = CM_INET_HTON_U16(port); @@ -2194,7 +2194,7 @@ U16 port; /* port number */ } else { - RETVALUE(RFAILED); + return RFAILED; } #ifdef IPV6_SUPPORTED @@ -2205,7 +2205,7 @@ U16 port; /* port number */ } else { - RETVALUE(RFAILED); + return RFAILED; } #endif /* IPV6_SUPPORTED */ @@ -2306,7 +2306,7 @@ U16 port; /* port number */ { /* non-blocking: connection is in progress */ case ERR_INPROGRESS: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* @@ -2314,37 +2314,37 @@ U16 port; /* port number */ * blocking : connection is already established */ case ERR_ISCONN: - RETVALUE(RISCONN); + return (RISCONN); break; /* resource temporarily unavailable */ case ERR_WOULDBLOCK: - RETVALUE(ROKDNA); + return (ROKDNA); break; /* non-blocking: connection is in progress */ case ERR_ALREADY: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; case ERR_INVAL: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* Check for connection refused and timeout errors */ case ERR_CONNREFUSED: case ERR_TIMEDOUT: - RETVALUE(RCLOSED); + return (RCLOSED); break; /* it is a real error */ default: - RETVALUE(RFAILED); + return RFAILED; break; } } - RETVALUE(ROK); + return ROK; } /* @@ -2381,7 +2381,7 @@ CmInetFdType *assocFd; /* association fd */ /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (assocFd == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2405,12 +2405,12 @@ CmInetFdType *assocFd; /* association fd */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } *assocFd = ret; - RETVALUE(ROK); + return ROK; } /* @@ -2483,7 +2483,7 @@ U32 context; /* value to be passed back, if error occurs */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (mBuf == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2497,24 +2497,24 @@ U32 context; /* value to be passed back, if error occurs */ ret = SFndLenMsg(mBuf, &bufLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* max message length is limited to control the memory usage */ /* casting bufLen to avoid warnings */ if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN)) { - RETVALUE(RFAILED); + return RFAILED; } ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen); if ((ret != ROK) || (msgLen != bufLen)) { SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RFAILED); + return RFAILED; } if ( dstAddr != NULLP) @@ -2539,7 +2539,7 @@ U32 context; /* value to be passed back, if error occurs */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET012, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addr6.sin6_family = AF_INET6; @@ -2568,7 +2568,7 @@ U32 context; /* value to be passed back, if error occurs */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET064, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addr6.sin6_family = AF_INET6; addr6.sin6_port = CM_INET_HTON_U16(port); @@ -2653,11 +2653,11 @@ U32 context; /* value to be passed back, if error occurs */ #endif /* CMINETDBG */ if ((INET_ERR_CODE == ERR_AGAIN) || (INET_ERR_CODE == ERR_WOULDBLOCK)) - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); else if (INET_ERR_CODE == ERR_PIPE) - RETVALUE(RCLOSED); + return (RCLOSED); else - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_58 : Fix for klockwork issue */ @@ -2666,7 +2666,7 @@ U32 context; /* value to be passed back, if error occurs */ /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(ROK); + return ROK; } /* @@ -2733,7 +2733,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ (srcAddr == NULLP) || (port == NULLP) || (meminfo == NULLP) || (mBuf == NULLP) || (len == NULLP) || (sinfo == NULLP) || (flag == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2754,7 +2754,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failed to allocate memory\n"); CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET065, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrlen = sizeof(struct sockaddr_storage); @@ -2782,7 +2782,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } /* save the length of the received message */ @@ -3021,7 +3021,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ if (ret != ROK) { SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen); - RETVALUE(RFAILED); + return RFAILED; } ret = SAddPstMsgMult(recvbuf, *len, *mBuf); @@ -3029,14 +3029,14 @@ CmInetSctpNotification *ntfy; /* notification parameters */ { SPutMsg(*mBuf); SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen); - RETVALUE(RFAILED); + return RFAILED; } } /* cleanup */ SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen); - RETVALUE(ROK); + return ROK; } /* @@ -3101,7 +3101,7 @@ CmInetNetAddrLst *addrlst; /* peer address list */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } byteAddress = (U8*)peerAddrList; @@ -3127,7 +3127,7 @@ CmInetNetAddrLst *addrlst; /* peer address list */ #endif /* CMINETDBG */ sctp_freepaddrs(peerAddrList); - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)byteAddress; @@ -3156,7 +3156,7 @@ CmInetNetAddrLst *addrlst; /* peer address list */ sctp_freepaddrs(peerAddrList); - RETVALUE(ROK); + return ROK; } /* @@ -3217,7 +3217,7 @@ Ptr value; /* option value */ /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -3332,7 +3332,7 @@ Ptr value; /* option value */ default: { - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -3399,7 +3399,7 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET017, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(addrInfo.spinfo_address); @@ -3464,7 +3464,7 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET066, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(addrParams.spp_address); @@ -3584,7 +3584,7 @@ Ptr value; /* option value */ break; default: - RETVALUE(RFAILED); + return RFAILED; } if (ret == INET_ERR) @@ -3603,10 +3603,10 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET067, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* cm_inet_c_001.main_54: Added new function cmInetShutDownSctp()*/ @@ -3668,10 +3668,10 @@ PUBLIC S16 cmInetShutDownSctp(sockFd) #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* cm_inet_c_001.main_61: Added new function cmInetAbortSctpAssoc()*/ @@ -3736,10 +3736,10 @@ PUBLIC S16 cmInetAbortSctpAssoc(sockFd, assocId) #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif @@ -3794,7 +3794,7 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (servAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -3834,7 +3834,7 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) { /* non-blocking: connection is in progress */ case ERR_INPROGRESS: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* @@ -3842,27 +3842,27 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) * blocking : connection is already established */ case ERR_ISCONN: - RETVALUE(RISCONN); + return (RISCONN); break; /* resource temporarily unavailable */ case ERR_WOULDBLOCK: - RETVALUE(ROKDNA); + return (ROKDNA); break; /* non-blocking: connection is in progress */ case ERR_ALREADY: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; case ERR_INVAL: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* Check for connection refused and timeout errors */ case ERR_CONNREFUSED: case ERR_TIMEDOUT: - RETVALUE(RCLOSED); + return (RCLOSED); break; /* it is a real error */ @@ -3903,12 +3903,12 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) #endif /*ALIGN_64BIT*/ #endif /* IPV6_SUPPORTED */ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; break; } } - RETVALUE(ROK); + return ROK; } /* end of cmInetConnect */ @@ -3949,7 +3949,7 @@ S16 backLog; /* max. number of outstandig connections 0..5 */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (backLog < MIN_BACK_LOG) || (backLog > MAX_BACK_LOG)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -3970,10 +3970,10 @@ S16 backLog; /* max. number of outstandig connections 0..5 */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET021, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetListen */ @@ -4029,7 +4029,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -4052,7 +4052,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ if (INET_ERR_CODE == ERR_WOULDBLOCK) { /* no connection present to accept */ - RETVALUE(ROKDNA); + return (ROKDNA); } else { @@ -4070,7 +4070,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET022, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } @@ -4095,7 +4095,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET071, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* IPV6_SUPPORTED */ @@ -4108,7 +4108,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ if ( ret != ROK) { ret = cmInetClose(newSockFd); - RETVALUE(RFAILED); + return RFAILED; } #ifdef IPV6_SUPPORTED @@ -4134,7 +4134,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ fromAddr->port = CM_INET_NTOH_U16(peerAddr->sin_port); fromAddr->address = CM_INET_NTOH_U32(peerAddr->sin_addr.s_addr); #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; } /* end of cmInetAccept */ @@ -4193,7 +4193,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; }/* end of cmInet4FillTos */ /* @@ -4304,7 +4304,7 @@ S16 flags; /* additional control flags, unused */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -4359,25 +4359,25 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &bufLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* max message length is limited to control the memory usage */ /* casting bufLen to avoid warnings */ if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN)) { - RETVALUE(RFAILED); + return RFAILED; } ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen); if ((ret != ROK) || (msgLen != bufLen)) { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RFAILED); + return RFAILED; } if (dstAddr == NULLP) @@ -4414,14 +4414,14 @@ S16 flags; /* additional control flags, unused */ if(INET_ERR_CODE == ERR_AGAIN) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* Check for ERR_WOULDBLOCK */ if(INET_ERR_CODE == ERR_WOULDBLOCK) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG @@ -4443,7 +4443,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble*/ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } @@ -4453,10 +4453,10 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } *len = ret; @@ -4467,7 +4467,7 @@ S16 flags; /* additional control flags, unused */ { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* cleanup */ @@ -4477,7 +4477,7 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &msgLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* added */ @@ -4602,7 +4602,7 @@ S16 flags; /* additional control flags, unused */ /* Compress the message into a single dBuf */ ret = SCompressMsg(mBuf); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; strtEndDBufNum = 0; /* Rebuild the send vector */ @@ -4611,13 +4611,13 @@ S16 flags; /* additional control flags, unused */ ret = buildSendIovec(mBuf, unSentLen, txArr, numDBufs, &i, &strtEndDBufNum, &ioLen); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; retVal = ROK; } } else - RETVALUE(RFAILED); + return RFAILED; } msg.msg_iov = txArr; msg.msg_iovlen = i; @@ -4642,7 +4642,7 @@ S16 flags; /* additional control flags, unused */ { /* cm_inet_c_001.main_50 - Return without making length 0, if in case the partial message was sent earlier */ - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG #ifndef ALIGN_64BIT @@ -4663,7 +4663,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble or not */ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } /* Check if connection was closed by the peer */ @@ -4672,9 +4672,9 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNABORTED)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_50 - Update the length only in successful cases */ @@ -4684,14 +4684,14 @@ S16 flags; /* additional control flags, unused */ * to be sent, then return WOULDBLOCK */ if (ret < ioLen) - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); unSentLen -= ret; } while (*len < msgLen); #endif /* WIN32 | CMINETFLATBUF */ - RETVALUE(ROK); + return ROK; } /* end of cmInetSendDscpMsg */ @@ -4816,7 +4816,7 @@ S16 flags; /* additional control flags, unused */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -4873,25 +4873,25 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &bufLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* max message length is limited to control the memory usage */ /* casting bufLen to avoid warnings */ if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN)) { - RETVALUE(RFAILED); + return RFAILED; } ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen); if ((ret != ROK) || (msgLen != bufLen)) { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RFAILED); + return RFAILED; } if (dstAddr == NULLP) @@ -4928,14 +4928,14 @@ S16 flags; /* additional control flags, unused */ if(INET_ERR_CODE == ERR_AGAIN) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* Check for ERR_WOULDBLOCK */ if(INET_ERR_CODE == ERR_WOULDBLOCK) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG @@ -4957,7 +4957,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble*/ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } @@ -4967,10 +4967,10 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } *len = ret; @@ -4981,7 +4981,7 @@ S16 flags; /* additional control flags, unused */ { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* cleanup */ @@ -4991,7 +4991,7 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &msgLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* added */ @@ -5108,7 +5108,7 @@ S16 flags; /* additional control flags, unused */ /* Compress the message into a single dBuf */ ret = SCompressMsg(mBuf); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; strtEndDBufNum = 0; /* Rebuild the send vector */ @@ -5117,13 +5117,13 @@ S16 flags; /* additional control flags, unused */ ret = buildSendIovec(mBuf, unSentLen, txArr, numDBufs, &i, &strtEndDBufNum, &ioLen); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; retVal = ROK; } } else - RETVALUE(RFAILED); + return RFAILED; } msg.msg_iov = txArr; msg.msg_iovlen = i; @@ -5148,7 +5148,7 @@ S16 flags; /* additional control flags, unused */ { /* cm_inet_c_001.main_50 - Return without making length 0, if in case the partial message was sent earlier */ - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG #ifndef ALIGN_64BIT @@ -5169,7 +5169,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble or not */ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } /* Check if connection was closed by the peer */ @@ -5178,9 +5178,9 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNABORTED)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_50 - Update the length only in successful cases */ @@ -5190,14 +5190,14 @@ S16 flags; /* additional control flags, unused */ * to be sent, then return WOULDBLOCK */ if (ret < ioLen) - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); unSentLen -= ret; } while (*len < msgLen); #endif /* WIN32 | CMINETFLATBUF */ - RETVALUE(ROK); + return ROK; } /* end of cmInetSendMsg */ @@ -5317,7 +5317,7 @@ U8 protType; /* whether IPv4/IPv6 socket */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; }/* end of cmInet6BuildSendPktinfo */ #endif /* LOCAL_INTF */ @@ -5382,7 +5382,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; } /* end of cmInetBuildSendHoplimit */ #endif /* SS_LINUX */ @@ -5511,7 +5511,7 @@ U8 hdrId; /* 0: HBH hdr, 1:Dest Hdr */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildSendHBHOpts */ @@ -5607,7 +5607,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where to start building RT hd */ } *curMsgIdx += len; - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildSendRouteOpts */ @@ -5713,7 +5713,7 @@ CmInetMemInfo *info; /* Memory information */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failure 1 in cmInet6BuildRecvHopOptsArr\n"); CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET028, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(ROUTRES); + return (ROUTRES); } curDataIdx = 0; @@ -5812,7 +5812,7 @@ CmInetMemInfo *info; /* Memory information */ (Data *)hbhOptsArr->hbhOpts, numOpts * sizeof(CmInetIpv6HBHHdr)); hbhOptsArr->numHBHOpts = 0; hbhOptsArr->hbhOpts = NULLP; - RETVALUE(ROUTRES); + return (ROUTRES); } /* copy the value bytes */ cmMemcpy((U8 *)hbhOptsArr->hbhOpts[optsIdx].value, @@ -5824,7 +5824,7 @@ CmInetMemInfo *info; /* Memory information */ /* get next option */ optsIdx++; } - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildRecvHopOptsArr() */ @@ -5912,7 +5912,7 @@ CmInetMemInfo *info; /* Memory information */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failure 1 in cmInet6BuildRecvRtHdr\n"); CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET032, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(ROUTRES); + return (ROUTRES); } /* copy all the ipv6 addresses */ @@ -5923,7 +5923,7 @@ CmInetMemInfo *info; /* Memory information */ curDataIdx += 16; } - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildRecvRtHdr() */ @@ -5976,7 +5976,7 @@ CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */ hopLimitValue = (U32 *)(cmsgData); ipv6HdrParam->ttl.val = (U8)(*hopLimitValue); - RETVALUE(ROK); + return ROK; } #endif /* IPV6_OPTS_SUPPORTED */ @@ -6155,7 +6155,7 @@ S32 flags; /* additional control flags */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (mPtr == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -6201,7 +6201,7 @@ S32 flags; /* additional control flags */ if (ret != ROK) { /* ret may be RFAILED or ROUTRES */ - RETVALUE(ret); + return (ret); } } else @@ -6237,7 +6237,7 @@ S32 flags; /* additional control flags */ ret = cmInetPeekNew(sockFd, NULLP, info, 0, 1, readBuf); if (ret == RCLOSED) { - RETVALUE(ret); + return (ret); } /* cm_inet_c_001.main_56: * Returning ROKDNA even cmInetPeekNew returns ROK. Because currently @@ -6246,7 +6246,7 @@ S32 flags; /* additional control flags */ * cmInetGetNumRead at this point because of latency between the ioctl * call and recvfrom call issues on some machines ioctl call may * return ZERO even their a data to read. */ - RETVALUE(ROKDNA); + return (ROKDNA); } } /* cm_inet_c_001.main_52: Support for partial reception */ @@ -6313,7 +6313,7 @@ S32 flags; /* additional control flags */ ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } curLen = bufLen; bufPtr = recvBuf; @@ -6365,7 +6365,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { *len = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -6376,7 +6376,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } #ifdef CMINETDBG @@ -6394,7 +6394,7 @@ S32 flags; /* additional control flags */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } curLen -= recvLen; bufPtr += recvLen; @@ -6430,7 +6430,7 @@ S32 flags; /* additional control flags */ #endif { SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_48 : If Received @@ -6462,7 +6462,7 @@ S32 flags; /* additional control flags */ #endif /*ALIGN_64BIT*/ #endif SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_48 : copy data to a message structure */ @@ -6471,7 +6471,7 @@ S32 flags; /* additional control flags */ { /* cleanup */ SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ret); + return (ret); } #ifdef CM_INET2 @@ -6500,7 +6500,7 @@ S32 flags; /* additional control flags */ { SPutSBuf(info->region, info->pool, recvBuf, bufLen); SPutMsg(mBuf); - RETVALUE(ret); + return (ret); } *mPtr = mBuf; @@ -6552,7 +6552,7 @@ S32 flags; /* additional control flags */ numDBufs*sizeof(Buffer*)); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } /* Allocate dBufs for gather read */ @@ -6590,7 +6590,7 @@ S32 flags; /* additional control flags */ /* allocate flat receive buffer */ ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen); if (ret != ROK) - RETVALUE(ROUTRES); + return (ROUTRES); allocFlatBuf = TRUE; @@ -6610,7 +6610,7 @@ S32 flags; /* additional control flags */ { SPutSBuf(info->region, info->pool, (Data*)dBufs, numDBufs*sizeof(Buffer*)); - RETVALUE(ret); + return (ret); } } @@ -6682,9 +6682,9 @@ S32 flags; /* additional control flags */ * against unexpected WOULDBLOCKS observed in solaris */ if (*mPtr != NULLP) - RETVALUE(ROK); + return ROK; - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_50 - Free the buffer only when valid, it might be that @@ -6714,9 +6714,9 @@ S32 flags; /* additional control flags */ if (INET_ERR_CODE == ERR_CONNABORTED) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } bufLen -= recvLen; @@ -6764,7 +6764,7 @@ S32 flags; /* additional control flags */ &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.hbhOptsArr, 0, info); if (ret != ROK) - RETVALUE(ret); + return (ret); ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.hbhHdrPrsnt = TRUE; } @@ -6781,7 +6781,7 @@ S32 flags; /* additional control flags */ &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.destOptsArr, 1, info); if (ret != ROK) - RETVALUE(ret); + return (ret); ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.destOptsPrsnt = TRUE; } @@ -6793,7 +6793,7 @@ S32 flags; /* additional control flags */ &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.rtOptsArr, info); if (ret != ROK) - RETVALUE(ret); + return (ret); ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.rtOptsPrsnt = TRUE; } @@ -6803,7 +6803,7 @@ S32 flags; /* additional control flags */ ret = cmInet6GetHopLimitValue((U8 *)CMSG_DATA(cmsgptr), cmsgptr->cmsg_len, &ipHdrParams->u.ipv6HdrParm); if (ret != ROK) - RETVALUE(ret); + return (ret); } } } /* for */ @@ -6894,7 +6894,7 @@ S32 flags; /* additional control flags */ { /* cleanup */ SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ret); + return (ret); } /* cm_inet_c_001.main_48 : A 0 len UDP packet could be received */ @@ -6905,7 +6905,7 @@ S32 flags; /* additional control flags */ { SPutSBuf(info->region, info->pool, recvBuf, bufLen); SPutMsg(tempMsg); - RETVALUE(ret); + return (ret); } } @@ -6932,7 +6932,7 @@ S32 flags; /* additional control flags */ SPutMsg(*mPtr); SPutSBuf(info->region, info->pool, (Data*)dBufs, numDBufs*sizeof(Buffer*)); - RETVALUE(ret); + return (ret); } } @@ -6952,7 +6952,7 @@ S32 flags; /* additional control flags */ SPutMsg(tempMsg); SPutSBuf(info->region, info->pool, (Data*)dBufs, numDBufs*sizeof(Buffer*)); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(tempMsg); } @@ -6998,7 +6998,7 @@ S32 flags; /* additional control flags */ { SPutMsg(*mPtr); } - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -7036,7 +7036,7 @@ S32 flags; /* additional control flags */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET069, 0, prntBuf); #endif #endif - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -7045,10 +7045,10 @@ S32 flags; /* additional control flags */ else { /* not enough data pending yet */ - RETVALUE(ROKDNA); + return (ROKDNA); } - RETVALUE(ROK); + return ROK; } /* end of cmInetRecvMsg */ @@ -7127,7 +7127,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) (info == NULLP) || (data == NULLP) || (dataPos < 0) || (dataLen < 0)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7177,7 +7177,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) (INET_ERR_CODE == ERR_WOULDBLOCK)) { recvLen = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_61: added host unreachable check */ if ((INET_ERR_CODE == ERR_CONNABORTED) || @@ -7186,7 +7186,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) (INET_ERR_CODE == ERR_CONNREFUSED)) { recvLen = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } #ifdef CMINETDBG #ifndef ALIGN_64BIT @@ -7203,17 +7203,17 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) #endif #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else if (recvLen == 0) { - RETVALUE(RCLOSED); + return (RCLOSED); } /* cm_inet_c_001.main_57 - Fix for validation */ if (recvLen < (S32)dataLen) /* maybe happen */ { - RETVALUE(ROKDNA); + return (ROKDNA); } /* setup return destination Internet address */ @@ -7246,7 +7246,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) #endif /* IPV6_SUPPORTED */ } - RETVALUE(ROK); + return ROK; } /* end of cmInetPeeknew */ @@ -7321,7 +7321,7 @@ Data *data; /* read data */ (info == NULLP) || (data == NULLP) || (dataPos < 0) || (dataLen < 0)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7354,9 +7354,9 @@ Data *data; /* read data */ * errors just return RFAILED. */ if (ret == RCLOSED) - RETVALUE(RCLOSED); + return (RCLOSED); - RETVALUE(RFAILED); + return RFAILED; } /* check if connection got closed */ @@ -7370,7 +7370,7 @@ Data *data; /* read data */ * considered as connection closed. So return ROKDNA instead of * RCLOSED even for TCP sockets */ - RETVALUE(ROKDNA); + return (ROKDNA); } /* added check for TCP/UDP socket. Pending data len in the socket recv buffer is determined by ioctl call in cmInetGetNumRead. @@ -7412,7 +7412,7 @@ Data *data; /* read data */ ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } /* added different recvfrom calls with @@ -7457,7 +7457,7 @@ Data *data; /* read data */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { recvLen = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } /* moved up the cleanup */ @@ -7481,16 +7481,16 @@ Data *data; /* read data */ (INET_ERR_CODE == ERR_CONNRESET)) { recvLen = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } if (recvLen < (S32)bufLen) /* maybe happen */ { /* cleanup */ SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ROKDNA); + return (ROKDNA); } /* copy data */ @@ -7533,16 +7533,16 @@ Data *data; /* read data */ else { /* not enough data pending yet */ - RETVALUE(ROKDNA); + return (ROKDNA); } } else { /* no data pending */ - RETVALUE(ROKDNA); + return (ROKDNA); } - RETVALUE(ROK); + return ROK; } /* end of cmInetPeek */ @@ -7579,7 +7579,7 @@ CmInetFd *sockFd; /* socket file descriptor */ /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7604,10 +7604,10 @@ CmInetFd *sockFd; /* socket file descriptor */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET037, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetClose */ @@ -7655,7 +7655,7 @@ S32 howTo; /* operation flag */ /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7665,7 +7665,7 @@ S32 howTo; /* operation flag */ if (INET_ERR_CODE == ERR_NOTCONN) { /* socket is not connected */ - RETVALUE(ROK); + return ROK; } else { @@ -7684,11 +7684,11 @@ S32 howTo; /* operation flag */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET038, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* end of cmInetShutdown */ @@ -7738,7 +7738,7 @@ S16 *numFdS; /* number of ready descriptors */ /* error check on parameters */ if (numFdS == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7767,13 +7767,13 @@ S16 *numFdS; /* number of ready descriptors */ /* cm_inet_c_001.main_53 - Return ROKDNA in case select was interrupted */ if ((ret == INET_ERR) && (INET_ERR_CODE == ERR_EINTR)) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* timeout occured */ if (ret == 0) { - RETVALUE(RTIMEOUT); + return (RTIMEOUT); } if (ret == INET_ERR) @@ -7785,7 +7785,7 @@ S16 *numFdS; /* number of ready descriptors */ switch(errCode = INET_ERR_CODE) { case ERR_INVAL: - RETVALUE(ROK); + return ROK; default: #ifdef CMINETDBG @@ -7795,7 +7795,7 @@ S16 *numFdS; /* number of ready descriptors */ INET_ERR_CODE); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET039, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } /* end of switch */ } @@ -7804,7 +7804,7 @@ S16 *numFdS; /* number of ready descriptors */ /* cm_inet_c_001.main_54: Fix for Klockworks issue */ *numFdS = (S16)ret; - RETVALUE(ROK); + return ROK; } /* end of cmInetSelect */ @@ -8065,14 +8065,14 @@ Ptr value; /* option value */ /* cm_inet_c_001.main_58 : Added NULL check for value field */ if(value == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -8122,7 +8122,7 @@ Ptr value; /* option value */ default: /* wrong value */ - RETVALUE(RFAILED); + return RFAILED; break; } break; @@ -8312,7 +8312,7 @@ Ptr value; /* option value */ if (*optVal == CM_INET_OPT_ENABLE) { #ifdef WIN32 - RETVALUE(RNA); + return (RNA); #else ret = setsockopt(sockFd->fd, level, IP_HDRINCL, (char*)&enable, sizeof(enable)); @@ -8321,7 +8321,7 @@ Ptr value; /* option value */ else if (*optVal == CM_INET_OPT_DISABLE) { #ifdef WIN32 - RETVALUE(RNA); + return (RNA); #else ret = setsockopt(sockFd->fd, level, IP_HDRINCL, (char*)&disable, sizeof(disable)); @@ -8343,14 +8343,14 @@ Ptr value; /* option value */ ret = setsockopt(sockFd->fd, level, IP_ROUTER_ALERT, (char*)&enable, sizeof(enable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } else if (*optVal == CM_INET_OPT_DISABLE) { ret = setsockopt(sockFd->fd, level, IP_ROUTER_ALERT, (char*)&disable, sizeof(disable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } break; #endif /* SS_LINUX */ @@ -8358,7 +8358,7 @@ Ptr value; /* option value */ /* set Router Alert socket option */ case CM_INET_OPT_IP_OPTIONS: #if (defined (SS_VW) || defined(SS_LINUX)) - RETVALUE(RNA); + return (RNA); #else tempTknStr64=(TknStr64 *)value; if (tempTknStr64->pres == TRUE) @@ -8379,7 +8379,7 @@ Ptr value; /* option value */ (char *)tempTknStr64->val, tempTknStr64->len); } else - RETVALUE(RFAILED); /* Trying to set IPv4 Hdr option + return RFAILED; /* Trying to set IPv4 Hdr option * without giving option values*/ #endif /* SS_VW || SS_LINUX */ break; @@ -8397,7 +8397,7 @@ Ptr value; /* option value */ (char*)&enable, sizeof(enable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } else if (*optVal == CM_INET_OPT_DISABLE) { @@ -8406,7 +8406,7 @@ Ptr value; /* option value */ (char*)&disable, sizeof(disable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } break; #endif /* LOCAL_INTF */ @@ -8712,7 +8712,7 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET040, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(setPrim.ssp_addr); @@ -8767,7 +8767,7 @@ Ptr value; /* option value */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(addrParams.spp_address); @@ -8900,7 +8900,7 @@ Ptr value; /* option value */ default: /* wrong socket option type */ - RETVALUE(RFAILED); + return RFAILED; break; } @@ -8920,9 +8920,9 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET042, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetSetOpt */ @@ -8967,7 +8967,7 @@ U32 *dataLen; /* number of pending octets */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (dataLen == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -9015,7 +9015,7 @@ U32 *dataLen; /* number of pending octets */ * select says is ready to read. This should not be considered as * connection closed. */ - RETVALUE(RCLOSED); + return (RCLOSED); } /* removed error check ERR_WOULDBLOCK */ @@ -9024,13 +9024,13 @@ U32 *dataLen; /* number of pending octets */ (INET_ERR_CODE == ERR_CONNRESET)) { *dataLen = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } #ifdef SS_LINUX /* cm_inet_c_001.main_45: Change 2048 to CM_INET_MAX_UDPRAW_MSGSIZE */ *dataLen = CM_INET_MAX_UDPRAW_MSGSIZE; - RETVALUE(ROK); + return ROK; #endif /* SS_LINUX */ /* removed error debug printing added for recvfrom call. */ @@ -9049,10 +9049,10 @@ U32 *dataLen; /* number of pending octets */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET043, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetGetNumRead */ @@ -9105,7 +9105,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ /* error check on parameters */ if ((hostName == NULLP) || (addrTbl == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9127,7 +9127,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ " hostName(%p)\n", INET_ERR_CODE, hostName); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET044, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } if (hostid->h_addrtype != AF_INET) { @@ -9139,7 +9139,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ INET_ERR_CODE, hostName, hostid->h_addrtype); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET045, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else { @@ -9167,7 +9167,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ " hostName(%p)\n", INET_ERR_CODE, hostName); CMINETLOGERROR(ERRCLS_DEBUG, ECMINET046, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } CM_COPY_VWIPADDR(vwIpAddr, &(addrTbl->netAddr[addrTbl->count])); addrTbl->count++; @@ -9186,7 +9186,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ INET_ERR_CODE, hostName, hostid.h_addrtype); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET047, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else { @@ -9202,7 +9202,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ #endif /* WIN32 || SS_LINUX || HPOS */ - RETVALUE(ROK); + return ROK; } /* end of cmInetGetHostByName */ @@ -9264,7 +9264,7 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ /* error check on parameters */ if ((hostName == NULLP) || (addrArr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9288,7 +9288,7 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ err, hostName, addrArr->type); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET048, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #ifdef IPV6_SUPPORTED @@ -9316,7 +9316,7 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ err, hostName, addrArr->type, hostid->h_addrtype); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET049, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9343,16 +9343,16 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ err, hostName, hostid->h_addrtype, addrArr->type); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET050, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } #endif /* SS_LINUX */ #endif /* SUNOS */ - RETVALUE(ROK); + return ROK; #else ret = cmInetGetHostByName(hostName, &addrArr->u.ipv4AddrArr); - RETVALUE(ret); + return (ret); #endif /* IPV6_SUPPORTED */ } /* end of cmInetGetIpNodeByName */ @@ -9392,7 +9392,7 @@ CmInetIpAddr *address; /* 4 byte interent address */ /* error check on parameters */ if (asciiAddr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9400,10 +9400,10 @@ CmInetIpAddr *address; /* 4 byte interent address */ if (*address == (U32)ERR_INADDRNONE) { /* asciiAddr does not contain a valid internet address */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9445,7 +9445,7 @@ S8 **asciiAddr; /* ascii address representation */ /* error check on parameters */ if (asciiAddr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9454,10 +9454,10 @@ S8 **asciiAddr; /* ascii address representation */ *asciiAddr = inet_ntoa(inetAddr); if (*asciiAddr == NULL) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* * @@ -9500,7 +9500,7 @@ U32 len; /* error check on parameters */ if (asciiAddr == NULLP || address == NULLP || len == 0 ) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9515,10 +9515,10 @@ U32 len; } if(inet_ntop(domain,address,asciiAddr,len) == NULL) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9563,17 +9563,17 @@ S8 *asciiAddr; /* ascii address representation */ /* error check on parameters */ if ((asciiAddr == NULLP) || (address == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ ret = inet_pton(AF_INET, asciiAddr, (void *)address); if (ret != 1) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetPton */ #endif /* SUNOS */ #endif /* IPV6_SUPPORTED */ @@ -9618,7 +9618,7 @@ S8 *asciiAddr; /* ascii address representation */ /* error check on parameters */ if ((asciiAddr == NULLP) || (address6 == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9626,7 +9626,7 @@ S8 *asciiAddr; /* ascii address representation */ ret = inet_pton(AF_INET6, asciiAddr, (void *)address6); if (ret != 1) { - RETVALUE(RFAILED); + return RFAILED; } #else /* cm_inet_c_001.main_44 : In windows inet_pton is not implemented. so we are using the below function @@ -9635,7 +9635,7 @@ S8 *asciiAddr; /* ascii address representation */ cmMemcpy((U8*)address6, (U8*)&(((struct sockaddr_in6 *)&ss)->sin6_addr), sizeof(CmInetIpAddr6)); #endif /* WIN32 */ - RETVALUE(ROK); + return ROK; } /* end of cmInetPton6 */ #endif /* IPV6_SUPPORTED */ #endif /* SS_PS */ @@ -9673,7 +9673,7 @@ S32 *size; /* max used memory size */ *size = CM_INET_MAX_MSG_LEN; #endif - RETVALUE(ROK); + return ROK; } @@ -9709,11 +9709,11 @@ PUBLIC S16 cmInetInit(Void) err = WSAStartup(version, &data); if (err != 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } @@ -9748,11 +9748,11 @@ PUBLIC S16 cmInetDeInit(Void) err = WSACleanup(); if (err != 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; }/* end of cmInetDeInit() */ @@ -9810,7 +9810,7 @@ CmInetAddr *locAddr; if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (locAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9836,7 +9836,7 @@ CmInetAddr *locAddr; #else locAddr->port = CM_INET_NTOH_U16(sockAddr->sin_port); #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; default: #ifdef CMINETDBG @@ -9853,7 +9853,7 @@ CmInetAddr *locAddr; CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET051, 0, prntBuf); #endif /* ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; }/* end of switch */ }/* end if */ @@ -9882,7 +9882,7 @@ CmInetAddr *locAddr; locAddr->port = CM_INET_NTOH_U16(sockAddr->sin_port); locAddr->address = CM_INET_NTOH_U32(sockAddr->sin_addr.s_addr); #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; }/* end of cmInetGetSockName() */ /* New functions to peek into the file descriptor @@ -9926,11 +9926,11 @@ CmInetFdSetInfo *fdSetInfo; #if (ERRCLASS & ERRCLS_INT_PAR) if (fdSetInfo == NULLP) - RETVALUE(RFAILED); + return RFAILED; #endif /* ERRCLASS & ERRCLS_INT_PAR */ if (fdSetInfo->initDone == TRUE) - RETVALUE(ROK); + return ROK; #ifdef WIN32 fdSetInfo->numFds = 0; @@ -9977,7 +9977,7 @@ CmInetFdSetInfo *fdSetInfo; #endif /* SUNOS || SS_LINUX || SS_VW || HPOS */ fdSetInfo->initDone = TRUE; - RETVALUE(ROK); + return ROK; }/* end of cmInetFdSetInfoInit() */ @@ -10028,25 +10028,25 @@ CmInetFdType *sockFd; #if (ERRCLASS & ERRCLS_INT_PAR) if ((fdSetInfo == NULLP) || (fdSet == NULLP) || (sockFd == NULLP)) - RETVALUE(RFAILED); + return RFAILED; if (fdSetInfo->initDone != TRUE) - RETVALUE(RNA); + return (RNA); #endif /* ERRCLASS & ERRCLS_INT_PAR */ #ifdef WIN32 #if (ERRCLASS & ERRCLS_DEBUG) if (fdSetInfo->numFds > FD_SETSIZE) - RETVALUE(RFAILED); + return RFAILED; #endif /* ERRCLASS & ERRCLS_DEBUG */ /* cm_inet_c_001.main_32 : Corrected check for number of fd set in a fdset for WIN32*/ if (fdSetInfo->numFds >= fdSet->fd_count) - RETVALUE(ROKDNA); + return (ROKDNA); *sockFd = fdSet->fd_array[fdSetInfo->numFds]; fdSetInfo->numFds += 1; - RETVALUE(ROK); + return ROK; #endif /* WIN32 */ /* cm_inet_c_001.main_59: Protected under if not defined WIN32 */ @@ -10094,7 +10094,7 @@ CmInetFdType *sockFd; *sockFd += (curIdx * (sizOfFdSetArElem << 3)); /* Clear the file descriptor */ *tempByte &= ~(1 << bitPos); - RETVALUE(ROK); + return ROK; } if (fdSetInfo->bigEndian) tempByte -= 1; @@ -10106,9 +10106,9 @@ CmInetFdType *sockFd; } if (!found) - RETVALUE(ROKDNA); + return (ROKDNA); - RETVALUE(ROK); + return ROK; #endif /* SUNOS || SS_LINUX || SS_VW || HPOS */ } /* end of cmInetGetFd */ @@ -10194,7 +10194,7 @@ CmInetNetAddr *address; /* IP Address */ ((val[idx] < 'A') || (val[idx] > 'F'))) { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10213,7 +10213,7 @@ CmInetNetAddr *address; /* IP Address */ if ((val[idx] != '.') && (val[idx] != ':')) { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } /* if, couldn't determine IPV4 or IPV6 */ #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10240,7 +10240,7 @@ CmInetNetAddr *address; /* IP Address */ if (compressed == TRUE) { /* can't have 2 :: */ - RETVALUE(RFAILED); + return RFAILED; } /* if, 2 :: */ #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10272,7 +10272,7 @@ CmInetNetAddr *address; /* IP Address */ an IPV6 address */ if (retVal != ROK) { - RETVALUE(retVal); + return (retVal); } embedIPV4 = TRUE; break; @@ -10284,7 +10284,7 @@ CmInetNetAddr *address; /* IP Address */ ((val[idx] < 'A') || (val[idx] > 'F'))) { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10336,7 +10336,7 @@ CmInetNetAddr *address; /* IP Address */ } /* else, IPV6 */ #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; } /* cmInetConvertStrToIpAddr */ @@ -10392,7 +10392,7 @@ U8 *val; /* Domain Name String */ if (val[idx] < '0' || val[idx] > '9') { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10405,7 +10405,7 @@ U8 *val; /* Domain Name String */ idx++; } - RETVALUE(ROK); + return ROK; } /* cmInetAsciiToIpv4 */ /* cm_inet_c_001.main_34:Added wrapper function for getaddrinfo and freeaddrinfo */ @@ -10450,7 +10450,7 @@ CmInetAddrInfo **res; /* Link list of addrInfo structure */ /* error check on parameters */ if ((node == NULLP) || (hints == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -10473,7 +10473,7 @@ CmInetAddrInfo **res; /* Link list of addrInfo structure */ #endif /* ALIGN_64BIT */ #endif /* CMINETDBG */ } - RETVALUE(ret); + return (ret); } /* end of cmInetGetAddrInfo */ @@ -10599,7 +10599,7 @@ S32 flags; /* additional control flags */ /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -10616,7 +10616,7 @@ S32 flags; /* additional control flags */ if (ret != ROK) { /* ret may be RFAILED or ROUTRES */ - RETVALUE(ret); + return (ret); } /* check if connection got closed */ @@ -10632,7 +10632,7 @@ S32 flags; /* additional control flags */ * considered as connection closed. So return ROKDNA instead of * RCLOSED */ - RETVALUE(ROKDNA); + return (ROKDNA); } else /* clear error if there is any, because if there is internal error @@ -10670,7 +10670,7 @@ S32 flags; /* additional control flags */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET054, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else { @@ -10690,7 +10690,7 @@ S32 flags; /* additional control flags */ #endif /* defined(SUNOS) || defined(SS_LINUX) */ #endif /* defined(SS_VW) || defined(HPOS) || defined(SS_PS) */ - RETVALUE(ROKDNA); + return (ROKDNA); } } }/* if (pendLen == 0)*/ @@ -10744,7 +10744,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { *len = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -10755,7 +10755,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } #ifdef CMINETDBG @@ -10773,7 +10773,7 @@ S32 flags; /* additional control flags */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } if(recvLen < curLen) @@ -10829,7 +10829,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { *len = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } #ifdef CMINETDBG @@ -10852,9 +10852,9 @@ S32 flags; /* additional control flags */ if (INET_ERR_CODE == ERR_CONNABORTED) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; }/* if ((recvLen == INET_ERR) || (recvLen > CM_INET_MAX_MSG_LEN))*/ if(recvLen < curLen) @@ -10870,7 +10870,7 @@ S32 flags; /* additional control flags */ #endif /* WIN32 | CMINETFLATBUF */ - RETVALUE(ROK); + return ROK; } /* end of cmInetFlushRecvBuf */ #endif /* CM_INET_FLUSH_RECV_BUF*/ diff --git a/src/cm/cm_inet.h b/src/cm/cm_inet.h index babd7a9ce..e90d00109 100644 --- a/src/cm/cm_inet.h +++ b/src/cm/cm_inet.h @@ -485,8 +485,8 @@ #endif /* SUNOS || HPOS */ #endif /* IPV6_SUPPORTED */ -#define cmPkCmInetIpAddr(x, mBuf) SPkU32(x, mBuf) /* pack IP Address */ -#define cmUnpkCmInetIpAddr(x, mBuf) SUnpkU32(x, mBuf) /* unpacks IP Address */ +#define cmPkCmInetIpAddr(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack IP Address */ +#define cmUnpkCmInetIpAddr(x, mBuf) oduPackUInt32(x, mBuf) /* unpacks IP Address */ #ifdef SS_VW #define CM_COPY_VWIPADDR(vwIpAddr, addr) \ diff --git a/src/cm/cm_lib.c b/src/cm/cm_lib.c index f846c60ba..412186ddf 100644 --- a/src/cm/cm_lib.c +++ b/src/cm/cm_lib.c @@ -234,12 +234,12 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize))) } #endif #if (MEMCPY_AVAIL) /* memcpy is available */ - RETVALUE((U8 *) memcpy((Void *)tgt, (CONSTANT Void *)src, (size_t)len)); + return ((U8 *) memcpy((Void *)tgt, (CONSTANT Void *)src, (size_t)len)); #else while (len--) *tgt++ = *src++; - RETVALUE(tgt); + return (tgt); #endif /* MEMCPY_AVAIL */ } /* end of cmMemcpy */ @@ -279,16 +279,16 @@ PTR len; /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ TRC2(cmMemcmp) #if MEMCMP_AVAIL /* memcmp is available */ - RETVALUE((S16) memcmp((CONSTANT Void *)s1, (CONSTANT Void *)s2, (size_t)len)); + return ((S16) memcmp((CONSTANT Void *)s1, (CONSTANT Void *)s2, (size_t)len)); #else /* MEMCMP_AVAIL: memcmp is not available */ while (len--) { if (*s1 ^ *s2) - RETVALUE((S16) (*s1 - *s2)); + return ((S16) (*s1 - *s2)); s1++; s2++; } - RETVALUE(0); + return (0); #endif /* MEMCMP_AVAIL */ } /* end of cmMemcmp */ @@ -352,7 +352,7 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize))) *str++ = val; #endif /* MEMSET_AVAIL */ - RETVALUE(str); + return (str); } /* end of cmMemset */ @@ -405,17 +405,17 @@ CONSTANT U8 *s2; /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ TRC2(cmStrcmp) #if (STRCMP_AVAIL) - RETVALUE(strcmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2)); + return (strcmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2)); #else /* STRCMP_AVAIL */ while (*s1 && *s2) { if (*s1 ^ *s2) - RETVALUE(*s1 - *s2); + return (*s1 - *s2); s1++; s2++; } - RETVALUE(0); + return (0); #endif /* strcmp is not available */ } /* end of cmStrcmp */ @@ -472,17 +472,17 @@ MsgLen len; /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ TRC2(cmStrncmp) #if (STRNCMP_AVAIL) - RETVALUE(strncmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2, (size_t) len)); + return (strncmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2, (size_t) len)); #else /* STRNCMP_AVAIL */ while (*s1 && *s2 && len--) { if (*s1 ^ *s2) - RETVALUE(*s1 - *s2); + return (*s1 - *s2); s1++; s2++; } - RETVALUE(0); + return (0); #endif /* strncmp is not available */ } /* end of cmStrncmp */ @@ -524,7 +524,7 @@ CONSTANT U8 *s; #if (STRLEN_AVAIL) /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/ TRC2(cmStrlen) - RETVALUE((MsgLen)strlen((CONSTANT S8 *)s)); + return ((MsgLen)strlen((CONSTANT S8 *)s)); #else /* STRLEN_AVAIL */ MsgLen i; @@ -532,7 +532,7 @@ CONSTANT U8 *s; TRC2(cmStrlen) for (i = 0; *s; i++, s++); - RETVALUE(i); + return (i); #endif /* strlen is not available */ } /* end of cmStrlen */ diff --git a/src/cm/cm_llist.c b/src/cm/cm_llist.c index e9ae20ff2..a41af9693 100644 --- a/src/cm/cm_llist.c +++ b/src/cm/cm_llist.c @@ -324,7 +324,7 @@ CmLList *node; /* node to be removed */ /* cm_llist_c_001.main_8 : added null check for node */ if (lCp == (CmLListCp *)NULLP || lCp->count == 0 || !node) { - RETVALUE(NULLP); + return (NULLP); } #endif @@ -332,7 +332,7 @@ CmLList *node; /* node to be removed */ { lCp->first = lCp->crnt = lCp->last = (CmLList *)NULLP; lCp->count = 0; - RETVALUE(node); + return (node); } lCp->count--; @@ -343,7 +343,7 @@ CmLList *node; /* node to be removed */ node->next->prev = (CmLList *)NULLP; lCp->first = node->next; node->next = node->prev = (CmLList *)NULLP; - RETVALUE(node); + return (node); } if (lCp->last == node) @@ -352,13 +352,13 @@ CmLList *node; /* node to be removed */ node->prev->next = (CmLList *)NULLP; lCp->last = node->prev; node->next = node->prev = (CmLList *)NULLP; - RETVALUE(node); + return (node); } node->prev->next = node->next; node->next->prev = node->prev; node->next = node->prev = (CmLList *)NULLP; - RETVALUE(node); + return (node); } /* end of cmLListDelFrm */ diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c index 58257ee48..b5df3db5f 100755 --- a/src/cm/cm_lte.c +++ b/src/cm/cm_lte.c @@ -105,9 +105,9 @@ Buffer *mBuf; CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); - CMCHKPK(SPkU8, param->rbType, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbType, mBuf); CMCHKPK(cmPkLteRbId, param->rbId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -143,10 +143,10 @@ Buffer *mBuf; TRC3(cmUnpkLteRlcId); CMCHKUNPK(cmUnpkLteRbId, ¶m->rbId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbType, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -181,10 +181,10 @@ Buffer *mBuf; TRC3(cmPkLteTimingInfo); - CMCHKPK(SPkU16, param->slot, mBuf); - CMCHKPK(SPkU16, param->sfn, mBuf); - //CMCHKPK(SPkU16, param->hSfn, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->slot, mBuf); + CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); + //CMCHKPK(oduUnpackUInt16, param->hSfn, mBuf); + return ROK; } @@ -219,10 +219,10 @@ Buffer *mBuf; TRC3(cmUnpkLteTimingInfo); - //CMCHKUNPK(SUnpkU16, ¶m->hSfn, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sfn, mBuf); - CMCHKUNPK(SUnpkU16,¶m->slot, mBuf); - RETVALUE(ROK); + //CMCHKUNPK(oduPackUInt16, ¶m->hSfn, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); + CMCHKUNPK(oduPackUInt16,¶m->slot, mBuf); + return ROK; } @@ -257,11 +257,11 @@ Buffer *mBuf; TRC3(cmPkLtePdcpId); - CMCHKPK(SPkU8, param->rbType, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbType, mBuf); CMCHKPK(cmPkLteRbId, param->rbId, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -299,8 +299,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkLteRbId, ¶m->rbId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->rbType, mBuf); + return ROK; } #ifdef LTE_L2_MEAS #ifdef ANSI @@ -352,7 +352,7 @@ CmLteMemInfo *mInfo; mInfo->regInfo[idxReg].isGenMemInfoUpdated = TRUE; } } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -387,7 +387,7 @@ CmLteMemInfo *memInfo; memoryInfo->regInfo[idxReg].poolInfo[idxPool].maxUsed = memInfo->regInfo[idxReg].poolInfo[idxPool].maxUsed; } } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -419,7 +419,7 @@ CmLteMemInfo *memInfo; memInfo->regInfo[idxReg].poolInfo[idxPool].maxUsed = 0; } } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -440,7 +440,7 @@ CmCpuStatsInfo *cpuInfo cpuInfo->cpuUtil[idx].numSamples = 0; } cpuInfo->numCores = 0; - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -462,7 +462,7 @@ CmCpuStatsInfo *cpuInfo; cpuMeasInfo->cpuUtil[idx].avgCpuUtil = cpuInfo->cpuUtil[idx].totCpuUtil/cpuInfo->cpuUtil[idx].numSamples; cpuMeasInfo->cpuUtil[idx].maxCpuUtil = cpuInfo->cpuUtil[idx].maxCpuUtil; } - RETVALUE(ROK); + return ROK; } #endif diff --git a/src/cm/cm_lte.x b/src/cm/cm_lte.x index 386da427a..b2470afa4 100755 --- a/src/cm/cm_lte.x +++ b/src/cm/cm_lte.x @@ -37,22 +37,22 @@ #include /* Packing Defines */ -#define cmPkLteRbId SPkU8 -#define cmPkLteRnti SPkU16 -#define cmPkLteCellId SPkU16 -#define cmPkLteRlcMode SPkU8 -#define cmPkLteLcId SPkU8 -#define cmPkLteLcType SPkU8 -#define cmPkLteAggrLvl SPkU32 +#define cmPkLteRbId oduUnpackUInt8 +#define cmPkLteRnti oduUnpackUInt16 +#define cmPkLteCellId oduUnpackUInt16 +#define cmPkLteRlcMode oduUnpackUInt8 +#define cmPkLteLcId oduUnpackUInt8 +#define cmPkLteLcType oduUnpackUInt8 +#define cmPkLteAggrLvl oduUnpackUInt32 /* Unpacking Defines */ -#define cmUnpkLteRbId SUnpkU8 -#define cmUnpkLteRnti SUnpkU16 -#define cmUnpkLteCellId SUnpkU16 -#define cmUnpkLteRlcMode SUnpkU8 -#define cmUnpkLteLcId SUnpkU8 -#define cmUnpkLteLcType SUnpkU8 -#define cmUnpkLteAggrLvl SUnpkU32 +#define cmUnpkLteRbId oduPackUInt8 +#define cmUnpkLteRnti oduPackUInt16 +#define cmUnpkLteCellId oduPackUInt16 +#define cmUnpkLteRlcMode oduPackUInt8 +#define cmUnpkLteLcId oduPackUInt8 +#define cmUnpkLteLcType oduPackUInt8 +#define cmUnpkLteAggrLvl oduPackUInt32 #define MAX_POOL_SIZE 6 /*!< Maximum pool size */ #define MAX_REGION_SIZE 5 /*!< Maximum Region size */ diff --git a/src/cm/cm_math.c b/src/cm/cm_math.c index 0b1044cb0..5a2b8a90c 100755 --- a/src/cm/cm_math.c +++ b/src/cm/cm_math.c @@ -72,7 +72,7 @@ F64 val; #endif { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) - RETVALUE((U32) abs((int) val));/* G++ */ + return ((U32) abs((int) val));/* G++ */ #endif } /* end of cmAbs */ #endif /* SS_FLOAT */ @@ -105,7 +105,7 @@ F64 y; #endif { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) - RETVALUE((F64) pow((F64)x, (F64)y)); + return ((F64) pow((F64)x, (F64)y)); #endif } /* end of cmPow */ #endif /* SS_FLOAT */ @@ -136,7 +136,7 @@ F64 x; #endif { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) - RETVALUE((F64) floor((F64)x)); + return ((F64) floor((F64)x)); #endif } /* end of cmFloor */ @@ -167,7 +167,7 @@ F64 x; #endif { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) - RETVALUE((F64) log((F64)x)); + return ((F64) log((F64)x)); #endif } /* end of cmLog */ @@ -198,7 +198,7 @@ F64 x; #endif { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) - RETVALUE((F64) log10((F64)x)); + return ((F64) log10((F64)x)); #endif } /* end of cmLog10 */ #endif /* SS_FLOAT */ diff --git a/src/cm/cm_mblk.c b/src/cm/cm_mblk.c index 3413ca8f7..97a291328 100644 --- a/src/cm/cm_mblk.c +++ b/src/cm/cm_mblk.c @@ -119,7 +119,7 @@ Ptr *ptr; /* Location to place allocated event ptr */ printf("eventSize [%ld] greater than maxBlkSize [%ld]\n", evntSize, maxBlkSize); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -134,7 +134,7 @@ Ptr *ptr; /* Location to place allocated event ptr */ (Size)(maxBlkSize + sizeof(CmMemList))) != ROK) #endif /* SS_LOCKLESS_MEMORY */ - RETVALUE(RFAILED); + return RFAILED; /* Reset the contents */ cmMemset((U8 *)allocPtr, (U8 )0, @@ -180,7 +180,7 @@ Ptr *ptr; /* Location to place allocated event ptr */ *ptr = (Ptr) ((PTR)allocPtr + sizeof(CmMemList)); cb->runPtr = ((PTR)(*ptr) + evntSize); - RETVALUE(ROK); + return ROK; } /* End of cmAllocEvnt */ @@ -289,7 +289,7 @@ Ptr *allocPtr; /* location to place pointer */ *allocPtr = (Ptr) cb->runPtr; cb->memAllocated += size; cb->runPtr += size; - RETVALUE(ROK); + return ROK; } } @@ -305,7 +305,7 @@ Ptr *allocPtr; /* location to place pointer */ (Data **)&(cb->initPtr), (Size)(blkSize + sizeof(CmMemList)) ) != ROK) #endif /* SS_LOCKLESS_MEMORY */ - RETVALUE(RFAILED); + return RFAILED; /* Reset the contents */ /* Initialise above allocated structure */ @@ -335,7 +335,7 @@ Ptr *allocPtr; /* location to place pointer */ *allocPtr = (Ptr) ((PTR)cb->initPtr + sizeof(CmMemList)); cb->runPtr = ((PTR)(*allocPtr) + size); - RETVALUE(ROK); + return ROK; } /* End of cmGetMem */ @@ -385,7 +385,7 @@ Ptr *ptr; /* Location to place allocated event ptr */ /* Validation check */ if( evntSize > maxBlkSize) - RETVALUE(RFAILED); + return RFAILED; /* Allocate memory for the first Memory Chunk */ /* Allocated memory should be maxBlkSize + sizeof(CmMemList) */ @@ -398,7 +398,7 @@ Ptr *ptr; /* Location to place allocated event ptr */ (Size)(maxBlkSize + sizeof(CmMemList))) != ROK) #endif /* SS_LOCKLESS_MEMORY */ - RETVALUE(RFAILED); + return RFAILED; /* Reset the contents */ cmMemset((U8 *)allocPtr, (U8 )0, @@ -444,7 +444,7 @@ Ptr *ptr; /* Location to place allocated event ptr */ *ptr = (Ptr) ((PTR)allocPtr + sizeof(CmMemList)); cb->runPtr = ((PTR)(*ptr) + evntSize); - RETVALUE(ROK); + return ROK; } /* End of cmAllocEvntNoInit */ @@ -514,7 +514,7 @@ Ptr *allocPtr; /* location to place pointer */ // (PTR)(size) ); cb->memAllocated += size; cb->runPtr += size; - RETVALUE(ROK); + return ROK; } } @@ -530,7 +530,7 @@ Ptr *allocPtr; /* location to place pointer */ (Data **)&(cb->initPtr), (Size)(blkSize + sizeof(CmMemList)) ) != ROK) #endif /* SS_LOCKLESS_MEMORY */ - RETVALUE(RFAILED); + return RFAILED; /* Reset the contents */ /* Initialise above allocated structure */ @@ -559,7 +559,7 @@ Ptr *allocPtr; /* location to place pointer */ *allocPtr = (Ptr) ((PTR)cb->initPtr + sizeof(CmMemList)); cb->runPtr = ((PTR)(*allocPtr) + size); - RETVALUE(ROK); + return ROK; } /* End of cmGetMemNoInit */ diff --git a/src/cm/cm_mblk.h b/src/cm/cm_mblk.h index b9e8a0a3c..5996a1c19 100755 --- a/src/cm/cm_mblk.h +++ b/src/cm/cm_mblk.h @@ -80,7 +80,7 @@ { \ S16 ret; \ if ((ret = func(val, ptr, mBuf)) != ROK) \ - RETVALUE(ret); \ + return (ret); \ } #define CMGETMBLK(ptr, size, pptr) \ @@ -89,7 +89,7 @@ ret = cmGetMem( ptr, size, pptr); \ if (ret != ROK) \ { \ - RETVALUE(RFAILED); \ + return RFAILED; \ } \ } diff --git a/src/cm/cm_mem.c b/src/cm/cm_mem.c index cfb865c49..7568e6a39 100755 --- a/src/cm/cm_mem.c +++ b/src/cm/cm_mem.c @@ -332,7 +332,7 @@ void RemoveFromT2kMemLeakInfo(U64 address, char *file, U32 line,Region region) /* if(!startMemLeak) { - RETVALUE(ROK); + return ROK; }*/ U32 index1 = getT2kMemLeakIndex(address, region); @@ -496,14 +496,14 @@ CmMmRegCfg *cfg; /* error check on parameters */ if ((regCb == NULLP) || (cfg == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Error check on the configuration fields */ if ((!cfg->size) || (cfg->vAddr == NULLP) || (cfg->numBkts > CMM_MAX_BKT_ENT)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the quantum size is power of 2 */ if ((cfg->numBkts) && @@ -512,7 +512,7 @@ CmMmRegCfg *cfg; /* cm_mem_c_001.main_20 Addition */ sprintf(errMsg,"\n cmMmRegInit() failed, check if BktQuantum size might not be power of 2 \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } /* @@ -538,7 +538,7 @@ CmMmRegCfg *cfg; \n",bktIdx,cfg->bktCfg[bktIdx].size,cfg->bktQnSize); #endif SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } if ((bktBlkSize = cfg->bktCfg[bktIdx].size) < lstQnSize) @@ -549,7 +549,7 @@ CmMmRegCfg *cfg; /* cm_mem_c_001.main_20 Addition */ sprintf(errMsg,"\n cmMmRegInit() failed, Two consecutive buckets are not separated by quantum size \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } /* cm_mem_c_001.main_20 Addition */ if (((cfg->bktCfg[bktIdx].size) /\ @@ -565,7 +565,7 @@ CmMmRegCfg *cfg; \n should be less than CMM_MAX_MAP_ENT:%d \n",cfg->bktQnSize,CMM_MAX_MAP_ENT); #endif SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } @@ -578,7 +578,7 @@ CmMmRegCfg *cfg; sprintf(errMsg,"\n cmMmRegInit() failed, Size of the memory region is less than the required size \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } lstQnSize = ((bktBlkSize / cfg->bktQnSize) + 1) * cfg->bktQnSize; @@ -680,7 +680,7 @@ CmMmRegCfg *cfg; #endif } - RETVALUE(RFAILED); + return RFAILED; } cmMmBktInit( &memAddr, regCb, cfg, bktIdx, &lstMapIdx); @@ -736,7 +736,7 @@ CmMmRegCfg *cfg; } } - RETVALUE(RFAILED); + return RFAILED; } regCb->heapFlag = TRUE; @@ -746,7 +746,7 @@ CmMmRegCfg *cfg; /* Call SRegRegion to register the memory region with SSI */ if (SRegRegion(region, ®Cb->regInfo) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_mem_c_001.main_12 - addition for initializing the hash table */ @@ -754,7 +754,7 @@ CmMmRegCfg *cfg; /* Initialize the region level hash table for debug info storage */ if (cmMmHashListInit(®Cb->hashListCp, CMM_STAT_HASH_TBL_LEN, region, 0) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SSI_DEBUG_LEVEL1 */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 @@ -764,11 +764,11 @@ CmMmRegCfg *cfg; if(cmHashListInit(®Cb->brdcmSsiLstCp, 1000, offset, FALSE, CM_HASH_KEYTYPE_U32MOD, region, 0) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ROK); + return ROK; } /* end of cmMmRegInit*/ @@ -817,7 +817,7 @@ CmMmRegCb *regCb; /* error check on parameters */ if (regCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -827,14 +827,14 @@ CmMmRegCb *regCb; /* Deinitialize the hash table used for debug info storage at region level */ if (cmMmHashListDeinit(®Cb->hashListCp, regCb->region, 0) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SSI_DEBUG_LEVEL1 */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 /* Deinitialize the hash table used for broadcom ssi instrumentation */ if (cmHashListDeinit(®Cb->brdcmSsiLstCp) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -878,7 +878,7 @@ CmMmRegCb *regCb; #endif } - RETVALUE(ROK); + return ROK; } /* end of cmMmRegDeInit */ @@ -1127,7 +1127,7 @@ Data **prevptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1136,7 +1136,7 @@ Data **prevptr; #if (ERRCLASS & ERRCLS_INT_PAR) if ((memType != CMM_STATIC_MEM_FLAG) && (memType != CMM_DYNAMIC_MEM_FLAG)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -1180,7 +1180,7 @@ Data **prevptr; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1265,7 +1265,7 @@ Data **prevptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else #endif @@ -1278,7 +1278,7 @@ Data **prevptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* return RFAILED */ - RETVALUE(RFAILED); + return RFAILED; } } } @@ -1488,7 +1488,7 @@ Data **prevptr; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else if (flags) { @@ -1555,22 +1555,22 @@ Data **prevptr; #ifdef SS_HISTOGRAM_SUPPORT /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #endif /* SSI_DEBUG_LEVEL1 */ #else /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); #endif /* SSI_DEBUG_LEVEL1 */ #endif /* SS_HISTOGRAM_SUPPORT */ } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE @@ -1580,9 +1580,9 @@ Data **prevptr; *ptr = (Data*) malloc(*size); #endif if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; avail_size -= *size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAlloc */ @@ -1714,7 +1714,7 @@ Size size; if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1722,7 +1722,7 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -1730,13 +1730,13 @@ Size size; if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1763,7 +1763,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1863,7 +1863,7 @@ Size size; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else #endif @@ -1880,7 +1880,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 printf("Memory signature is invalid\n"); @@ -1924,7 +1924,7 @@ Size size; abort(); #endif /* handle RDBLFREE in SFree/SPutSBuf */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } if (CMM_IS_STATIC(ptrHdr->memFlags)) { @@ -1965,7 +1965,7 @@ Size size; #else (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else #endif @@ -1982,7 +1982,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -2190,15 +2190,15 @@ Size size; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ TRC2(cmFree); @@ -2209,7 +2209,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -2430,7 +2430,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2439,7 +2439,7 @@ Data **ptr; #if (ERRCLASS & ERRCLS_INT_PAR) if ((memType != CMM_STATIC_MEM_FLAG) && (memType != CMM_DYNAMIC_MEM_FLAG)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -2484,7 +2484,7 @@ Data **ptr; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2554,12 +2554,12 @@ Data **ptr; if (cmMmBktSanityChk(bkt) == RTRAMPLINGNOK) { /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { /* return RFAILED */ - RETVALUE(RFAILED); + return RFAILED; } #endif } @@ -2697,7 +2697,7 @@ Data **ptr; /* cm_mem_c_008.104 - Addition for memory calculator tool */ - RETVALUE(ROK); + return ROK; } else if (flags) { @@ -2759,24 +2759,24 @@ Data **ptr; #ifdef SS_HISTOGRAM_SUPPORT /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #endif /* SSI_DEBUG_LEVEL1 */ #else /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); #endif /* SSI_DEBUG_LEVEL1 */ #endif /* SS_HISTOGRAM_SUPPORT */ } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE @@ -2786,9 +2786,9 @@ Data **ptr; *ptr = (Data*) malloc(*size); #endif if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; avail_size -= *size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAllocNL */ @@ -2907,7 +2907,7 @@ Size size; if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif #if (ERRCLASS & ERRCLS_INT_PAR) @@ -2915,20 +2915,20 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Check if the memory block is from the memory region */ if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2948,7 +2948,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3025,12 +3025,12 @@ Size size; { bkt->numAlloc--; - RETVALUE(ROK); + return ROK; } else { /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -3070,7 +3070,7 @@ Size size; #endif /* handle RDBLFREE in SFree/SPutSBuf */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } if (CMM_IS_STATIC(ptrHdr->memFlags)) { @@ -3104,12 +3104,12 @@ Size size; { /* do not add to the free list */ bkt->numAlloc--; - RETVALUE(ROK); + return ROK; } else { /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } #endif } @@ -3186,15 +3186,15 @@ Size size; cmRlsAllocBlk((PTR)ptr); #endif /* SS_MEM_LEAK_STS */ - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ TRC2(cmFreeNL); @@ -3205,7 +3205,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmFreeNL */ @@ -3259,7 +3259,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3300,7 +3300,7 @@ Data **ptr; /* Update the size parameter */ *size = bkt->size; - RETVALUE(ROK); + return ROK; } } } @@ -3314,11 +3314,11 @@ Data **ptr; * heap pool. */ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE @@ -3328,9 +3328,9 @@ Data **ptr; *ptr = (Data*) malloc(*size); #endif if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; avail_size -= *size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAllocWL */ @@ -3380,14 +3380,14 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the memory block is from the memory region */ if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3407,7 +3407,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3436,11 +3436,11 @@ Size size; */ bkt->numAlloc--; - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #else /* use pure is on */ TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ @@ -3450,7 +3450,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -3506,7 +3506,7 @@ SMemCtl *memCtl; /* error check on parameters */ if ((regCb == NULLP) || (memCtl == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3521,7 +3521,7 @@ SMemCtl *memCtl; if ((memCtl->u.vtop.vaddr == NULLP) || (memCtl->u.vtop.paddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3531,7 +3531,7 @@ SMemCtl *memCtl; offset = memCtl->u.vtop.vaddr - regCb->regInfo.start; *(memCtl->u.vtop.paddr) = regCb->pAddr + offset; - RETVALUE(ROK); + return ROK; } break; } @@ -3543,7 +3543,7 @@ SMemCtl *memCtl; if (!(memCtl->u.chkres.size) || (memCtl->u.chkres.status == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif #ifndef USE_PURE @@ -3578,11 +3578,11 @@ SMemCtl *memCtl; (regCb->heapSize/10)); } - RETVALUE(ROK); + return ROK; #else /* use pure is on */ *(memCtl->u.chkres.status) = ((avail_size) / (regCb->regInfo.size/10)); - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } @@ -3590,12 +3590,12 @@ SMemCtl *memCtl; default: { /* No other event is supported currently */ - RETVALUE(RFAILED); + return RFAILED; } } /* shouldn't reach here */ - RETVALUE(RFAILED); + return RFAILED; } /* end of cmCtl */ @@ -4103,7 +4103,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } @@ -4199,7 +4199,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -4211,7 +4211,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } } } @@ -4282,7 +4282,7 @@ Size *size; #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -4300,7 +4300,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } /* end of cmHeapAlloc */ @@ -4447,7 +4447,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -4461,7 +4461,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROK); + return ROK; } } @@ -4486,7 +4486,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RDBLFREE); + return (RDBLFREE); } #endif /* SSI_DEBUG_LEVEL1 */ @@ -4544,7 +4544,7 @@ Size size; #endif /* This block is already freed in the heap */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } /* update the flags as it is a new node */ if (CMM_IS_STATIC(p->memFlags)) @@ -4605,7 +4605,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } else if (p < curHBlk) @@ -4676,7 +4676,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -4725,7 +4725,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } /* Release the lock */ @@ -4736,7 +4736,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHeapFree */ #endif/*USE_PURE*/ #ifdef SS_LIGHT_MEM_LEAK_STS @@ -4753,13 +4753,13 @@ PUBLIC U32 cmGetFreeIndx(Void) if(gmemLkCb.head == gmemLkCb.tail) { allocQueueEmptyCnt++; - RETVALUE(CM_MAX_ALLOC_ENTERIES); + return (CM_MAX_ALLOC_ENTERIES); } else { U32 allocQIndx = gmemLkCb.queue[gmemLkCb.head]; gmemLkCb.head = (gmemLkCb.head +1) % CM_MAX_ALLOC_ENTERIES; - RETVALUE(allocQIndx); + return (allocQIndx); } } @@ -4778,13 +4778,13 @@ U32 allocQIndx; if(tmpTail == gmemLkCb.head) { allocQueueFullCnt++; - RETVALUE(RFAILED); + return RFAILED; } else { gmemLkCb.queue[gmemLkCb.tail] = allocQIndx; gmemLkCb.tail = tmpTail; - RETVALUE(ROK); + return ROK; } } /* @@ -4903,7 +4903,7 @@ Void *addr; } (Void) SUnlock(&(gmemLkCb.memLock)); - RETVALUE(allocQIndx); + return (allocQIndx); } /* cmStorAllocBlk */ @@ -5338,7 +5338,7 @@ U16 bktIdx; /* check if hashListCp is initialised yet */ if ( regCb->brdcmSsiLstCp.nmbBins == 0) { - RETVALUE(ROK); + return ROK; } ptrHdr->reqSz = reqSz; ptrHdr->allocSz = allocSz; @@ -5782,7 +5782,7 @@ S32 traceSize; funNm); if(memReqIdx >= 0) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } @@ -5793,13 +5793,13 @@ S32 traceSize; (const S8 *)memUsrMdlStr[mdlFunStrIdx].fPStr); if(retVal == NULLD) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } } - RETVALUE(0); + return (0); } /* cmMemGetModuleId */ /* @@ -5870,9 +5870,9 @@ S8 **strLst; if(!found) { - RETVALUE(-1); + return (-1); } - RETVALUE(strtIdx); + return (strtIdx); } /* cmMemGetStrMtchIdx */ #ifdef SS_MEM_LEAK_SOL @@ -5913,20 +5913,20 @@ S32 size; if (dladdr1(pc, &info, (Void **)&sym, RTLD_DL_SYMENT) == 0) { - RETVALUE(snprintf(buffer, size, "[0x%p]", pc)); + return (snprintf(buffer, size, "[0x%p]", pc)); } if ((info.dli_fname != NULLP && info.dli_sname != NULLP) && ((uintptr_t)pc - (uintptr_t)info.dli_saddr < sym->st_size)) { - RETVALUE(snprintf(buffer, size, "%s(%s+0x%x) [0x%p]", + return (snprintf(buffer, size, "%s(%s+0x%x) [0x%p]", info.dli_fname, info.dli_sname, (unsigned long)pc - (unsigned long)info.dli_saddr, pc)); } else { - RETVALUE(snprintf(buffer, size, "%s(0x%p [0x%p]", + return (snprintf(buffer, size, "%s(0x%p [0x%p]", info.dli_fname, (unsigned long)pc - (unsigned long)info.dli_fbase, pc)); } @@ -5967,7 +5967,7 @@ Void *arg; Backtrace_t *bt = (Backtrace_t *)arg; if (bt->bt_actcount >= bt->bt_maxcount) - RETVALUE(-1); + return (-1); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE buffer = (S8 *)MxHeapAlloc(SsiHeap, 510); @@ -5979,7 +5979,7 @@ Void *arg; (void) cmAddrToSymStr((void *)pc, buffer, 505); bt->bt_buffer[bt->bt_actcount++] = (S8 *)buffer; - RETVALUE(0); + return (0); } /* cmLeakCallBack */ #endif /* SS_MEM_LEAK_SOL */ @@ -6037,7 +6037,7 @@ CmMmBlkHdr *blkPtr; { if (blkPtr->trSignature[sigCnt] != 0xAB) { - RETVALUE(RFAILED); + return RFAILED; } } #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -6046,11 +6046,11 @@ CmMmBlkHdr *blkPtr; { if (tailPtr->trSignature[sigCnt] != 0xFE) { - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ROK); + return ROK; } #endif #ifdef SSI_DEBUG_LEVEL1 @@ -6101,7 +6101,7 @@ CmMmBkt *bkt; if (bkt->trampleCount > CMM_TRAMPLING_THRESHOLD) { /* Take action to invalidate the entire bucket */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } /* reach next memory block in this bucket manually */ @@ -6114,7 +6114,7 @@ CmMmBkt *bkt; SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* @@ -6154,10 +6154,10 @@ CmMmHeapCb *heapCb; if (heapCb->trampleCount > CMM_TRAMPLING_THRESHOLD) { - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* * @@ -6193,7 +6193,7 @@ U16 *idx; /* idx to return */ *idx = (U16)(key % hashListCp->numOfbins); - RETVALUE(ROK); + return ROK; } /* end of cmMmHashFunc () */ @@ -6249,7 +6249,7 @@ Pool pool; /* memory pool to allocate bins */ { if (SGetSBuf(region, pool, (Data **) &hashListCp->hashList, (Size)(nmbBins * sizeof(CmMmHashListEnt))) != ROK) - RETVALUE(RFAILED); + return RFAILED; /* initialize bin pointers */ hl = hashListCp->hashList; @@ -6262,7 +6262,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = nmbBins; } - RETVALUE(ROK); + return ROK; } /* @@ -6311,7 +6311,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = 0; hashListCp->numOfEntries = 0; - RETVALUE(ROK); + return ROK; } /* end of cmMmHashListDeinit */ /* @@ -6351,11 +6351,11 @@ U32 key; /* pointer to key */ /* check if hashListCp is initialised yet */ if ( hashListCp->numOfbins == 0) - RETVALUE(ROK); + return ROK; /* compute index for insertion */ if (cmMmHashFunc(hashListCp, key, &idx) != ROK) - RETVALUE(RFAILED); + return RFAILED; hashListEnt = hashListCp->hashList; @@ -6391,11 +6391,11 @@ U32 key; /* pointer to key */ if (i == CMM_STAT_HASH_TBL_LEN) { /* there is no free slot for this key */ - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* end of cmMmHashListInsert */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -6439,7 +6439,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6480,7 +6480,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6539,14 +6539,14 @@ U8 entId; /* Tapa task which frees the memory */ { entry->freedBytes += blkSz; entry->bucketFreeReq++; - RETVALUE(ROK); + return ROK; } /* End of if */ /* If hash list is full then print the error tna continue */ if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN)) { printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN \n"); - RETVALUE(RFAILED); + return RFAILED; } /* End of if */ /* Take the address of next free entry in the hash bin */ @@ -6564,7 +6564,7 @@ U8 entId; /* Tapa task which frees the memory */ /* Increase the total number of entries in the hash list */ hashListCp->totalNumEntries++; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFreeInsert */ @@ -6625,13 +6625,13 @@ U8 entId; entry->allocBytes += blkSz; entry->bucketAllocReq++; entry->wastedBytes += (blkSz - *reqSz); - RETVALUE(ROK); + return ROK; } /* End of if */ if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN)) { printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN\n"); - RETVALUE(RFAILED); + return RFAILED; } /* End of if */ /* Take the address of next free entry in the hash bin */ @@ -6652,7 +6652,7 @@ U8 entId; /* Increase the total number of entries in the hash list */ hashListCp->totalNumEntries++; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmAllocInsert */ @@ -6700,7 +6700,7 @@ U32 *key; }/* End of for */ *key += line; *binIdx = ( *key % CMM_HIST_MAX_MEM_BIN); - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6752,7 +6752,7 @@ U8 entId; entry->fileName[idx] = fileName[idx]; } entry->fileName[idx] = '\0'; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6807,7 +6807,7 @@ CmMemEntries **entry; if(tmpBin->entries[numEnt].key == key) { *entry = &(tmpBin->entries[numEnt]); - RETVALUE(ROK); + return ROK; }/* End of if (tmpBin->entries[numEnt].key) */ }/* end of for (numEnt = 0) */ @@ -6830,12 +6830,12 @@ CmMemEntries **entry; else { printf ("Unable to find the entry in hash list\n"); - RETVALUE(RFAILED); + return RFAILED; }/* End of else (numEnt) */ }/* end of for (numBin = 0) */ printf("Unable to find the entry in the hash list\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHstGrmFindEntry */ #endif /* SS_HISTOGRAM_SUPPORT */ diff --git a/src/cm/cm_mem_wl.c b/src/cm/cm_mem_wl.c index e15e5223c..c569224a4 100755 --- a/src/cm/cm_mem_wl.c +++ b/src/cm/cm_mem_wl.c @@ -585,14 +585,14 @@ CmMmRegCfg *cfg; /* error check on parameters */ if ((regCb == NULLP) || (cfg == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Error check on the configuration fields */ if ((!cfg->size) || (cfg->vAddr == NULLP) || (cfg->numBkts > CMM_MAX_BKT_ENT)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the quantum size is power of 2 */ if ((cfg->numBkts) && @@ -601,7 +601,7 @@ CmMmRegCfg *cfg; /* cm_mem_c_001.main_20 Addition */ sprintf(errMsg,"\n cmMmRegInit() failed, check if BktQuantum size might not be power of 2 \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } /* @@ -627,7 +627,7 @@ CmMmRegCfg *cfg; \n",bktIdx,cfg->bktCfg[bktIdx].size,cfg->bktQnSize); #endif SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } if ((bktBlkSize = cfg->bktCfg[bktIdx].size) < lstQnSize) @@ -638,7 +638,7 @@ CmMmRegCfg *cfg; /* cm_mem_c_001.main_20 Addition */ sprintf(errMsg,"\n cmMmRegInit() failed, Two consecutive buckets are not separated by quantum size \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } /* cm_mem_c_001.main_20 Addition */ if (((cfg->bktCfg[bktIdx].size) /\ @@ -654,7 +654,7 @@ CmMmRegCfg *cfg; \n should be less than CMM_MAX_MAP_ENT:%d \n",cfg->bktQnSize,CMM_MAX_MAP_ENT); #endif SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } @@ -667,7 +667,7 @@ CmMmRegCfg *cfg; sprintf(errMsg,"\n cmMmRegInit() failed, Size of the memory region is less than the required size \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } lstQnSize = ((bktBlkSize / cfg->bktQnSize) + 1) * cfg->bktQnSize; @@ -785,10 +785,10 @@ CmMmRegCfg *cfg; /* Call SRegRegion to register the memory region with SSI */ if (SRegRegion(region, ®Cb->regInfo) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmMmRegInit*/ @@ -839,7 +839,7 @@ CmMmGlobRegCb *regCb; #ifdef SS_MEM_WL_DEBUG if (cmInitBtInfo() == RFAILED) { - RETVALUE(RFAILED); + return RFAILED; } #endif for ( bktIdx = 0; bktIdx < regCb->numBkts; bktIdx++) @@ -878,7 +878,7 @@ CmMmGlobRegCb *regCb; *next = NULLP; } - RETVALUE(ROK); + return ROK; } /* end of cmMmGlobRegInit*/ #ifdef SS_USE_ICC_MEMORY @@ -941,7 +941,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SLock(&iccAllocFreeLock)) != ROK) { printf("cmIccAllocWithLock: Failed to get the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } memPtr = (Data *)TL_Alloc(regCb->iccHdl, *size); @@ -949,7 +949,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SUnlock(&iccAllocFreeLock)) != ROK) { printf("cmIccAllocWithLock: Failed to unlock the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } if ((memPtr) == NULLP) @@ -971,7 +971,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ #endif *ptr = memPtr; - RETVALUE(ROK); + return ROK; } /* end of cmIccAllocWithLock */ @@ -1030,7 +1030,7 @@ Size size; /* Size of the block */ if((SLock(&iccAllocFreeLock)) != ROK) { printf("cmIccFreeWithLock: Failed to get the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef T2K_MEM_LEAK_DBG @@ -1042,10 +1042,10 @@ Size size; /* Size of the block */ if((SUnlock(&iccAllocFreeLock)) != ROK) { printf("cmIccFreeWithLock: Failed to unlock the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmIccFree */ /* @@ -1126,7 +1126,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ *ptr = memPtr; /*TL_VA2TRUEVA(regCb->iccHdl, memPtr); */ #endif - RETVALUE(ROK); + return ROK; } /* end of cmIccAlloc */ @@ -1193,7 +1193,7 @@ Size size; /* Size of the block */ /*TL_Free(regCb->iccHdl, ptr);*/ - RETVALUE(ROK); + return ROK; } /* end of cmIccFree */ /* @@ -1298,10 +1298,10 @@ CmMmDynRegCb *regCb; if (SRegDynRegion(regCb->region, ®Info) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmMmDynRegInit*/ #else /* SS_USE_ICC_MEMORY */ @@ -1429,10 +1429,10 @@ CmMmDynRegCb *regCb; if (SRegDynRegion(region, ®Info) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmMmDynRegInit*/ #endif /* SS_USE_ICC_MEMORY */ @@ -1482,7 +1482,7 @@ CmMmRegCb *regCb; /* error check on parameters */ if (regCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1492,7 +1492,7 @@ CmMmRegCb *regCb; /* Deinitialize the hash table used for debug info storage at region level */ if (cmMmHashListDeinit(®Cb->hashListCp, regCb->region, 0) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SSI_DEBUG_LEVEL1 */ @@ -1536,7 +1536,7 @@ CmMmRegCb *regCb; #endif } - RETVALUE(ROK); + return ROK; } /* end of cmMmRegDeInit */ @@ -1591,13 +1591,13 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* Check if the element exits or not */ if((memSetNode == NULLP) || (memSetNode->node == NULLP)) { - RETVALUE(NULLP); + return (NULLP); } bkt->crntMemBlkSetElem = (CmMmBlkSetElement *)memSetNode->node; /* Get the new block set from the gloabl region and return the same */ ssGetDynMemBlkSet(bucketIndex, bkt->crntMemBlkSetElem, 0); - RETVALUE(bkt->crntMemBlkSetElem); + return (bkt->crntMemBlkSetElem); } /* If this is not the first time, take the bucket list CB from the * current index */ @@ -1619,7 +1619,7 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* if next node also empty, return failure */ if(memBlkSetElem->numFreeBlks == 0) { - RETVALUE(NULLP); + return (NULLP); } /* store the new index in the current node which will be * used in the next time. */ @@ -1662,7 +1662,7 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ } /* On successful, return the bucket node to calling function */ - RETVALUE(memBlkSetElem); + return (memBlkSetElem); } /* cmGetMemBlkSetForAlloc */ @@ -1714,10 +1714,10 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* Check if the element exits or not */ if((memSetNode == NULLP) || (memSetNode->node == NULLP)) { - RETVALUE(NULLP); + return (NULLP); } bkt->crntMemBlkSetElem = (CmMmBlkSetElement *)memSetNode->node; - RETVALUE(bkt->crntMemBlkSetElem); + return (bkt->crntMemBlkSetElem); } /* If this is not the first time, take the bucket list CB from the * current index */ @@ -1739,7 +1739,7 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* if next node also empty, return failure */ if(memBlkSetElem->numFreeBlks >= bkt->bucketSetSize) { - RETVALUE(NULLP); + return (NULLP); } /* store the new index in the current node which will be * used in the next time. */ @@ -1780,7 +1780,7 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ } /* On successful, return the bucket node to calling function */ - RETVALUE(memBlkSetElem); + return (memBlkSetElem); } #endif /* SS_USE_ICC_MEMORY */ #endif /* USE_PURE */ @@ -1838,18 +1838,18 @@ PTR ptr; printf("Analysis from Array storing BT for freeing and allocation\n"); cmAnalyseBtInfo(ptr, regionCb->region); SUnlock(&memDoubleFreeLock); - RETVALUE(RFAILED); + return RFAILED; } if((cmHashListDelete(&(memDoubleFree), (PTR)memNode)) != ROK) { SUnlock(&memDoubleFreeLock); - RETVALUE(RFAILED); + return RFAILED; } SUnlock(&memDoubleFreeLock); SPutSBuf(regionCb->region, 0, (Data *)memNode, sizeof(CmMemDoubleFree)); - RETVALUE(ROK); + return ROK; } /* @@ -1887,7 +1887,7 @@ PTR ptr; SGetSBuf(regionCb->region, 0, (Data **)&memNode, sizeof(CmMemDoubleFree)); if(memNode == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } memNode->memBlkPtr = ptr; @@ -1896,11 +1896,11 @@ PTR ptr; sizeof(PTR))) != ROK) { SUnlock(&memDoubleFreeLock); - RETVALUE(RFAILED); + return RFAILED; } SUnlock(&memDoubleFreeLock); - RETVALUE(ROK); + return ROK; } #endif @@ -1946,7 +1946,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SLock(&dynAllocFreeLock)) != ROK) { printf("cmDynAllocWithLock: Failed to get the dyn lock\n"); - RETVALUE(RFAILED); + return RFAILED; } ret = cmDynAlloc (regionCb, size,flags,ptr); @@ -1954,10 +1954,10 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SUnlock(&dynAllocFreeLock)) != ROK) { printf("cmDynAllocWithLock: Failed to unlock the Dyn lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* end of cmDynAlloc */ /* @@ -2011,7 +2011,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2045,12 +2045,12 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ { printf("Failed to get the buffer of size %d\n", *size); /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif if (idx > 512) { - RETVALUE(RFAILED); + return RFAILED; } /* Dequeue the memory block and return it to the user */ bktIdx = regCb->mapTbl[idx].bktIdx; @@ -2075,7 +2075,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ #else printf("Failed to get the buffer of size %d\n", *size); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MEM_WL_DEBUG @@ -2089,7 +2089,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ *ptr = dynMemElem->nextBktPtr; if (*ptr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } dynMemElem->nextBktPtr = *((CmMmEntry **)(*ptr)); dynMemElem->numFreeBlks--; @@ -2125,7 +2125,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ } #endif - RETVALUE(ROK); + return ROK; } /* If the size is not matching, return failure to caller */ @@ -2134,7 +2134,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ #else printf("Failed to get the buffer of size %d\n", *size); #endif - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ @@ -2147,9 +2147,9 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ *ptr = (Data *)malloc(*size); if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; /* avail_size -= *size; */ - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmDynAlloc */ @@ -2342,7 +2342,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2351,7 +2351,7 @@ Data **ptr; #if (ERRCLASS & ERRCLS_INT_PAR) if ((memType != CMM_STATIC_MEM_FLAG) && (memType != CMM_DYNAMIC_MEM_FLAG)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -2395,7 +2395,7 @@ Data **ptr; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2472,7 +2472,7 @@ Data **ptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -2484,7 +2484,7 @@ Data **ptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* return RFAILED */ - RETVALUE(RFAILED); + return RFAILED; } } } @@ -2598,7 +2598,7 @@ Data **ptr; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else if (flags) { @@ -2665,22 +2665,22 @@ Data **ptr; #ifdef SS_HISTOGRAM_SUPPORT /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #endif /* SSI_DEBUG_LEVEL1 */ #else /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); #endif /* SSI_DEBUG_LEVEL1 */ #endif /* SS_HISTOGRAM_SUPPORT */ } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE @@ -2690,9 +2690,9 @@ Data **ptr; *ptr = (Data*) malloc(*size); #endif if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; avail_size -= *size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAlloc */ @@ -2732,11 +2732,11 @@ PUBLIC S16 cmInitDoubleFreeList() if((cmHashListInit(&(memDoubleFree), 1000, offset, 0, CM_HASH_KEYTYPE_U32MOD, 0, 0)) != ROK); { - RETVALUE(RFAILED); + return RFAILED; } SInitLock(&memDoubleFreeLock, SS_LOCK_MUTEX); - RETVALUE(ROK); + return ROK; } #ifdef SS_MEM_WL_DEBUG @@ -2767,15 +2767,15 @@ PRIVATE S16 cmInitBtInfo (Void) regBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo)); if (regBtInfo == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } allocBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo)); if(allocBtInfo == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* SS_MEM_WL_DEBUG */ /* @@ -2884,7 +2884,7 @@ Size size; /* Size of the block */ if((SLock(&dynAllocFreeLock)) != ROK) { printf("dynAllocWithLock: Failed to get the DYN lock\n"); - RETVALUE(RFAILED); + return RFAILED; } ret = cmDynFree(regionCb, ptr,size); @@ -2892,10 +2892,10 @@ Size size; /* Size of the block */ if((SUnlock(&dynAllocFreeLock)) != ROK) { printf("dynAllocWithLock: Failed to unlock the dyn lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* end of cmDynFree */ @@ -2956,19 +2956,19 @@ Size size; /* Size of the block */ /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the memory block is from the memory region */ if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2986,7 +2986,7 @@ Size size; /* Size of the block */ if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3022,7 +3022,7 @@ Size size; /* Size of the block */ /* Check if the bucket index, if its not valid, return failure */ if(dynMemElem == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MEM_WL_DEBUG @@ -3070,7 +3070,7 @@ Size size; /* Size of the block */ dynMemElem->nextBktPtr = ptr; dynMemElem->numFreeBlks++; - RETVALUE(ROK); + return ROK; #else /* use pure is on */ TRC2(cmDynFree); @@ -3083,7 +3083,7 @@ Size size; /* Size of the block */ /* avail_size += size; */ free(ptr); - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -3194,19 +3194,19 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the memory block is from the memory region */ if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3231,7 +3231,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3298,7 +3298,7 @@ Size size; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else { @@ -3314,7 +3314,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } @@ -3346,7 +3346,7 @@ Size size; #endif /* handle RDBLFREE in SFree/SPutSBuf */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } if (CMM_IS_STATIC(ptrHdr->memFlags)) { @@ -3386,7 +3386,7 @@ Size size; #else (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else { @@ -3402,7 +3402,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } @@ -3457,15 +3457,15 @@ Size size; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ TRC2(cmFree); @@ -3476,7 +3476,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -3552,7 +3552,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3609,7 +3609,7 @@ Data **ptr; /* Update the size parameter */ *size = bkt->size; - RETVALUE(ROK); + return ROK; } } } @@ -3623,11 +3623,11 @@ Data **ptr; * heap pool. */ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE @@ -3639,9 +3639,9 @@ Data **ptr; *ptr = (Data *)malloc(*size); if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; /* avail_size -= *size; */ - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAllocWL */ @@ -3711,14 +3711,14 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the memory block is from the memory region */ if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3741,7 +3741,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3778,11 +3778,11 @@ Size size; */ bkt->numAlloc--; - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #else /* use pure is on */ TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ @@ -3794,7 +3794,7 @@ Size size; /* avail_size += size; */ free(ptr); - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -3849,7 +3849,7 @@ SMemCtl *memCtl; /* error check on parameters */ if ((regCb == NULLP) || (memCtl == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3864,7 +3864,7 @@ SMemCtl *memCtl; if ((memCtl->u.vtop.vaddr == NULLP) || (memCtl->u.vtop.paddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3874,7 +3874,7 @@ SMemCtl *memCtl; offset = memCtl->u.vtop.vaddr - regCb->regInfo.start; *(memCtl->u.vtop.paddr) = regCb->pAddr + offset; - RETVALUE(ROK); + return ROK; } break; } @@ -3886,7 +3886,7 @@ SMemCtl *memCtl; if (!(memCtl->u.chkres.size) || (memCtl->u.chkres.status == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif #ifndef USE_PURE @@ -3921,11 +3921,11 @@ SMemCtl *memCtl; (regCb->heapSize/10)); } - RETVALUE(ROK); + return ROK; #else /* use pure is on */ *(memCtl->u.chkres.status) = ((avail_size) / (regCb->regInfo.size/10)); - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } @@ -3933,12 +3933,12 @@ SMemCtl *memCtl; default: { /* No other event is supported currently */ - RETVALUE(RFAILED); + return RFAILED; } } /* shouldn't reach here */ - RETVALUE(RFAILED); + return RFAILED; } /* end of cmCtl */ @@ -4178,7 +4178,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } @@ -4272,7 +4272,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -4284,7 +4284,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } } } @@ -4355,7 +4355,7 @@ Size *size; #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -4373,7 +4373,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } /* end of cmHeapAlloc */ @@ -4520,7 +4520,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -4534,7 +4534,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROK); + return ROK; } } @@ -4559,7 +4559,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RDBLFREE); + return (RDBLFREE); } #endif /* SSI_DEBUG_LEVEL1 */ @@ -4617,7 +4617,7 @@ Size size; #endif /* This block is already freed in the heap */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } /* update the flags as it is a new node */ if (CMM_IS_STATIC(p->memFlags)) @@ -4678,7 +4678,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } else if (p < curHBlk) @@ -4749,7 +4749,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -4798,7 +4798,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } /* Release the lock */ @@ -4809,7 +4809,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHeapFree */ /* cm_mem_c_001.main_15 : Additions */ #endif @@ -5256,7 +5256,7 @@ S32 traceSize; funNm); if(memReqIdx >= 0) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } @@ -5267,13 +5267,13 @@ S32 traceSize; (const S8 *)memUsrMdlStr[mdlFunStrIdx].fPStr); if(retVal == NULLD) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } } - RETVALUE(0); + return (0); } /* cmMemGetModuleId */ /* @@ -5344,9 +5344,9 @@ S8 **strLst; if(!found) { - RETVALUE(-1); + return (-1); } - RETVALUE(strtIdx); + return (strtIdx); } /* cmMemGetStrMtchIdx */ @@ -5527,20 +5527,20 @@ S32 size; if (dladdr1(pc, &info, (Void **)&sym, RTLD_DL_SYMENT) == 0) { - RETVALUE(snprintf(buffer, size, "[0x%p]", pc)); + return (snprintf(buffer, size, "[0x%p]", pc)); } if ((info.dli_fname != NULLP && info.dli_sname != NULLP) && ((uintptr_t)pc - (uintptr_t)info.dli_saddr < sym->st_size)) { - RETVALUE(snprintf(buffer, size, "%s(%s+0x%x) [0x%p]", + return (snprintf(buffer, size, "%s(%s+0x%x) [0x%p]", info.dli_fname, info.dli_sname, (unsigned long)pc - (unsigned long)info.dli_saddr, pc)); } else { - RETVALUE(snprintf(buffer, size, "%s(0x%p [0x%p]", + return (snprintf(buffer, size, "%s(0x%p [0x%p]", info.dli_fname, (unsigned long)pc - (unsigned long)info.dli_fbase, pc)); } @@ -5581,7 +5581,7 @@ Void *arg; Backtrace_t *bt = (Backtrace_t *)arg; if (bt->bt_actcount >= bt->bt_maxcount) - RETVALUE(-1); + return (-1); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE buffer = (S8 *)MxHeapAlloc(SsiHeap, 510); @@ -5593,7 +5593,7 @@ Void *arg; (void) cmAddrToSymStr((void *)pc, buffer, 505); bt->bt_buffer[bt->bt_actcount++] = (S8 *)buffer; - RETVALUE(0); + return (0); } /* cmLeakCallBack */ /* @@ -5633,9 +5633,9 @@ S32 count; bt.bt_actcount = 0; if (getcontext(&u) < 0) - RETVALUE(0); + return (0); (Void) walkcontext(&u, cmLeakCallBack, &bt); - RETVALUE(bt.bt_actcount); + return (bt.bt_actcount); } /* backtrace */ @@ -5694,7 +5694,7 @@ CmMmBkt *bkt; if (bkt->trampleCount > CMM_TRAMPLING_THRESHOLD) { /* Take action to invalidate the entire bucket */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } /* reach next memory block in this bucket manually */ @@ -5707,7 +5707,7 @@ CmMmBkt *bkt; SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* @@ -5747,10 +5747,10 @@ CmMmHeapCb *heapCb; if (heapCb->trampleCount > CMM_TRAMPLING_THRESHOLD) { - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* @@ -5785,11 +5785,11 @@ CmMmBlkHdr *blkPtr; { if (blkPtr->trSignature[sigCnt] != 0xAB) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* @@ -5826,7 +5826,7 @@ U16 *idx; /* idx to return */ *idx = (U16)(key % hashListCp->numOfbins); - RETVALUE(ROK); + return ROK; } /* end of cmMmHashFunc () */ @@ -5882,7 +5882,7 @@ Pool pool; /* memory pool to allocate bins */ { if (SGetSBuf(region, pool, (Data **) &hashListCp->hashList, (Size)(nmbBins * sizeof(CmMmHashListEnt))) != ROK) - RETVALUE(RFAILED); + return RFAILED; /* initialize bin pointers */ hl = hashListCp->hashList; @@ -5895,7 +5895,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = nmbBins; } - RETVALUE(ROK); + return ROK; } /* @@ -5944,7 +5944,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = 0; hashListCp->numOfEntries = 0; - RETVALUE(ROK); + return ROK; } /* end of cmMmHashListDeinit */ /* @@ -5984,11 +5984,11 @@ U32 key; /* pointer to key */ /* check if hashListCp is initialised yet */ if ( hashListCp->numOfbins == 0) - RETVALUE(ROK); + return ROK; /* compute index for insertion */ if (cmMmHashFunc(hashListCp, key, &idx) != ROK) - RETVALUE(RFAILED); + return RFAILED; hashListEnt = hashListCp->hashList; @@ -6024,11 +6024,11 @@ U32 key; /* pointer to key */ if (i == CMM_STAT_HASH_TBL_LEN) { /* there is no free slot for this key */ - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* end of cmMmHashListInsert */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -6072,7 +6072,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6113,7 +6113,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6172,14 +6172,14 @@ U8 entId; /* Tapa task which frees the memory */ { entry->freedBytes += blkSz; entry->bucketFreeReq++; - RETVALUE(ROK); + return ROK; } /* End of if */ /* If hash list is full then print the error tna continue */ if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN)) { printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN \n"); - RETVALUE(RFAILED); + return RFAILED; } /* End of if */ /* Take the address of next free entry in the hash bin */ @@ -6197,7 +6197,7 @@ U8 entId; /* Tapa task which frees the memory */ /* Increase the total number of entries in the hash list */ hashListCp->totalNumEntries++; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFreeInsert */ @@ -6258,13 +6258,13 @@ U8 entId; entry->allocBytes += blkSz; entry->bucketAllocReq++; entry->wastedBytes += (blkSz - *reqSz); - RETVALUE(ROK); + return ROK; } /* End of if */ if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN)) { printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN\n"); - RETVALUE(RFAILED); + return RFAILED; } /* End of if */ /* Take the address of next free entry in the hash bin */ @@ -6285,7 +6285,7 @@ U8 entId; /* Increase the total number of entries in the hash list */ hashListCp->totalNumEntries++; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmAllocInsert */ @@ -6333,7 +6333,7 @@ U32 *key; }/* End of for */ *key += line; *binIdx = ( *key % CMM_HIST_MAX_MEM_BIN); - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6385,7 +6385,7 @@ U8 entId; entry->fileName[idx] = fileName[idx]; } entry->fileName[idx] = '\0'; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6440,7 +6440,7 @@ CmMemEntries **entry; if(tmpBin->entries[numEnt].key == key) { *entry = &(tmpBin->entries[numEnt]); - RETVALUE(ROK); + return ROK; }/* End of if (tmpBin->entries[numEnt].key) */ }/* end of for (numEnt = 0) */ @@ -6463,12 +6463,12 @@ CmMemEntries **entry; else { printf ("Unable to find the entry in hash list\n"); - RETVALUE(RFAILED); + return RFAILED; }/* End of else (numEnt) */ }/* end of for (numBin = 0) */ printf("Unable to find the entry in the hash list\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHstGrmFindEntry */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -6668,7 +6668,7 @@ CmLteMemInfo *mInfo; } } - RETVALUE(ROK); + return ROK; } /* @@ -6708,10 +6708,10 @@ Region region; ((poolOneFreeCnt * 100) > (ICC_MEM_LOWER_THRESHOLD * ICC_POOL_ONE_TOTAL_BLKS))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } @@ -6758,10 +6758,10 @@ Region region; ((poolThreeFreeCnt * 100) > (ICC_MEM_LOWER_THRESHOLD * ICC_POOL_THREE_TOTAL_BLKS))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /* @@ -6807,10 +6807,10 @@ Region region; ((poolThreeFreeCnt * 100) < (ICC_MEM_UPPER_THRESHOLD * ICC_POOL_THREE_TOTAL_BLKS))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /* ccpu00142274- Function to check if we have reached the @@ -6856,7 +6856,7 @@ Region reg; if(gMemoryAlarm) { gMemoryAlarm = !(isMemUsageBelowLowerThreshold(reg)); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -6866,7 +6866,7 @@ Region reg; memoryCheckCounter = 0; } } - RETVALUE(ROK); + return ROK; } #endif #endif /* SS_LOCKLESS_MEMORY */ diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c index 906d23339..dba907f2e 100755 --- a/src/cm/cm_tenb_stats.c +++ b/src/cm/cm_tenb_stats.c @@ -181,7 +181,7 @@ PRIVATE Buffer* TSInfUtlAllocMsg(pst) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { printf("\n MBuf Allocation failed\n"); } - RETVALUE(mBuf); + return (mBuf); } #ifdef ANSI @@ -201,68 +201,68 @@ PRIVATE Void TSInfUtlPackUeInfo(mBuf, stats) TRC2(TSInfUtlPackUeInfo) - CMCHKPK(SPkU32, stats->persistent.numDeactivation, mBuf); - CMCHKPK(SPkU32, stats->persistent.numActivation, mBuf); - CMCHKPK(SPkU32, stats->persistent.activatedSCells, mBuf); + CMCHKPK(oduUnpackUInt32, stats->persistent.numDeactivation, mBuf); + CMCHKPK(oduUnpackUInt32, stats->persistent.numActivation, mBuf); + CMCHKPK(oduUnpackUInt32, stats->persistent.activatedSCells, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); for (k = 0; k < L2_STATS_MAX_CELLS; k++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulTpt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulNumiTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulSumiTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulNumCqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulSumCqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulDtxCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulNackCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulAckNackCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulPrbUsg, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulRetxOccns, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].ulTxOccns, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlTpt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlBo, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulTpt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulSumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulSumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulDtxCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNackCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulAckNackCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulPrbUsg, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulRetxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulTxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlTpt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlBo, mBuf); for (i=0; i<4; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].riCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].riCnt[i], mBuf); } for (i=0; i<5; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlPdbLvl[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlPdbLvl[i], mBuf); } - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].cqiDropCnt, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNumCw0Cqi, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlSumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].cqiDropCnt, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw0Cqi, mBuf); for (i=0; i<2; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlDtxCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlDtxCnt[i], mBuf); } for (i=0; i<2; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlAckNackCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlAckNackCnt[i], mBuf); } for (i=0; i<2; i++) { - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlNackCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNackCnt[i], mBuf); } - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlPrbUsg, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlRetxOccns, mBuf); - CMCHKPK(SPkU32, stats->nonPersistent.sch[k].dlTxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlPrbUsg, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlRetxOccns, mBuf); + CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlTxOccns, mBuf); } - CMCHKPK(SPkU32, stats->rnti, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rnti, mBuf); RETVOID; } @@ -282,103 +282,103 @@ PRIVATE Void TSInfUtlPackCellInfo(mBuf, stats) TRC2(TSInfUtlPackCellInfo) - CMCHKPK(SPkU32, stats->rlc.reOdrTmrExp, mBuf); - CMCHKPK(SPkU32, stats->rlc.maxRlcDrbRetxFail, mBuf); - CMCHKPK(SPkU32, stats->rlc.maxRlcSrbRetxFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rlc.reOdrTmrExp, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rlc.maxRlcDrbRetxFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->rlc.maxRlcSrbRetxFail, mBuf); - CMCHKPK(SPkU32, stats->sch.ulNumiTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.ulSumiTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.ulNumCqi, mBuf); - CMCHKPK(SPkU32, stats->sch.ulSumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulNumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulSumiTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulNumCqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulSumCqi, mBuf); #ifdef RG_5GTF - CMCHKPK(SPkU32, stats->sch.ul5gtfRbAllocFail, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfPdcchSend, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeFnlzReAdd, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeRbAllocDone, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfAllocAllocated, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfPdcchSchd, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfUeSchPick, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfBsrRecv, mBuf); - CMCHKPK(SPkU32, stats->sch.ul5gtfSrRecv, mBuf); - - CMCHKPK(SPkU32, stats->sch.dl5gtfPdschCons, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfPdcchSend, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfBoUpd, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfFnlzFail, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfFnlzPass, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfRbAllocFail, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfRbAllocPass, mBuf); - CMCHKPK(SPkU32, stats->sch.dl5gtfUePick, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfRbAllocFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfPdcchSend, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeFnlzReAdd, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeRbAllocDone, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfAllocAllocated, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfPdcchSchd, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeSchPick, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfBsrRecv, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfSrRecv, mBuf); + + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfPdschCons, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfPdcchSend, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfBoUpd, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfFnlzFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfFnlzPass, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfRbAllocFail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfRbAllocPass, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfUePick, mBuf); #endif - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime500, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime600, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime700, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime800, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime900, mBuf); - CMCHKPK(SPkU32, stats->sch.cntTtiProcTime1000, mBuf); - CMCHKPK(SPkU32, stats->sch.avgTtiProcTime, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime500, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime600, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime700, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime800, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime900, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime1000, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.avgTtiProcTime, mBuf); for (i=9; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.dlPdbRatio[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlPdbRatio[i], mBuf); } for (i=9; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulPrbUsage[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulPrbUsage[i], mBuf); } for (i=9; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.dlPrbUsage[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlPrbUsage[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulDtx[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulDtx[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulAckNack[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulAckNack[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.ulNack[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.ulNack[i], mBuf); } for (i=1; i>=0; i--) { for (j=3; j>=0; j--) { - CMCHKPK(SPkU32, stats->sch.dlDtx[i][j], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlDtx[i][j], mBuf); } } for (i=1; i>=0; i--) { for (j=3; j>=0; j--) { - CMCHKPK(SPkU32, stats->sch.dlAckNack[i][j], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlAckNack[i][j], mBuf); } } for (i=1; i>=0; i--) { for (j=3; j>=0; j--) { - CMCHKPK(SPkU32, stats->sch.dlNack[i][j], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNack[i][j], mBuf); } } for (i=3; i>=0; i--) { - CMCHKPK(SPkU32, stats->sch.riCnt[i], mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.riCnt[i], mBuf); } - CMCHKPK(SPkU32, stats->sch.dlNumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw1iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlNumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw0iTbs, mBuf); - CMCHKPK(SPkU32, stats->sch.dlNumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw1Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.dlNumCw0Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.dlSumCw0Cqi, mBuf); - CMCHKPK(SPkU32, stats->sch.msg3Fail, mBuf); - CMCHKPK(SPkU32, stats->sch.msg4Fail, mBuf); - - CMCHKPK(SPkU32, stats->cellId, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw1iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw0iTbs, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw1Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw0Cqi, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.msg3Fail, mBuf); + CMCHKPK(oduUnpackUInt32, stats->sch.msg4Fail, mBuf); + + CMCHKPK(oduUnpackUInt32, stats->cellId, mBuf); RETVOID; } @@ -400,68 +400,68 @@ PRIVATE Void TSInfUtlUnpkUeInfo(mBuf, stats) TRC2(TSInfUtlUnpkUeInfo) - CMCHKUNPK(SUnpkU32, &stats->rnti, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->rnti, mBuf); for (k = L2_STATS_MAX_CELLS; k > 0; k--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlTxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlRetxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlPrbUsg, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlTxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlRetxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlPrbUsg, mBuf); for (i=1; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNackCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNackCnt[i], mBuf); } for (i=1; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlAckNackCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlAckNackCnt[i], mBuf); } for (i=1; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlDtxCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlDtxCnt[i], mBuf); } - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlSumCw1iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlNumCw1iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].cqiDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].cqiDropCnt, mBuf); for (i=4; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlPdbLvl[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlPdbLvl[i], mBuf); } for (i=3; i>=0; i--) { - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].riCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].riCnt[i], mBuf); } - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlBo, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].dlTpt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulTxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulRetxOccns, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulPrbUsg, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulAckNackCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulNackCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulDtxCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulSumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulNumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulSumiTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulNumiTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.sch[k-1].ulTpt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlBo, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlTpt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulTxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulRetxOccns, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulPrbUsg, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulAckNackCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNackCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulDtxCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulSumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulSumiTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNumiTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulTpt, mBuf); } - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); - CMCHKUNPK(SUnpkU32, &stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.dlMaxWindowSz, mBuf); - CMCHKUNPK(SUnpkU32, &stats->persistent.activatedSCells, mBuf); - CMCHKUNPK(SUnpkU32, &stats->persistent.numActivation, mBuf); - CMCHKUNPK(SUnpkU32, &stats->persistent.numDeactivation, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->persistent.activatedSCells, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->persistent.numActivation, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->persistent.numDeactivation, mBuf); RETVOID; } @@ -482,103 +482,103 @@ PRIVATE Void TSInfUtlUnpkCellInfo(mBuf, stats) TRC2(TSInfUtlUnpkCellInfo) - CMCHKUNPK(SUnpkU32, &stats->cellId, mBuf); - - CMCHKUNPK(SUnpkU32, &stats->sch.msg4Fail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.msg3Fail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw0Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw1Cqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw0iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlSumCw1iTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dlNumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->cellId, mBuf); + + CMCHKUNPK(oduPackUInt32, &stats->sch.msg4Fail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.msg3Fail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw0Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw1Cqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw0iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw1iTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw1iTbs, mBuf); for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.riCnt[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.riCnt[i], mBuf); } for (i=0; i<2; i++) { for (j=0; j<4; j++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlNack[i][j], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlNack[i][j], mBuf); } } for (i=0; i<2; i++) { for (j=0; j<4; j++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlAckNack[i][j], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlAckNack[i][j], mBuf); } } for (i=0; i<2; i++) { for (j=0; j<4; j++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlDtx[i][j], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlDtx[i][j], mBuf); } } for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulNack[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulNack[i], mBuf); } for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulAckNack[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulAckNack[i], mBuf); } for (i=0; i<4; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulDtx[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulDtx[i], mBuf); } for (i=0; i<10; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlPrbUsage[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlPrbUsage[i], mBuf); } for (i=0; i<10; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.ulPrbUsage[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulPrbUsage[i], mBuf); } for (i=0; i<10; i++) { - CMCHKUNPK(SUnpkU32, &stats->sch.dlPdbRatio[i], mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dlPdbRatio[i], mBuf); } - CMCHKUNPK(SUnpkU32, &stats->sch.avgTtiProcTime, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime1000, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime900, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime800, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime700, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime600, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.cntTtiProcTime500, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.avgTtiProcTime, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime1000, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime900, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime800, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime700, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime600, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime500, mBuf); #ifdef RG_5GTF - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfUePick, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfRbAllocPass, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfRbAllocFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfFnlzPass, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfFnlzFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfBoUpd, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfPdcchSend, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.dl5gtfPdschCons, mBuf); - - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfSrRecv, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfBsrRecv, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeSchPick, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfPdcchSchd, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfAllocAllocated, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeRbAllocDone, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfUeFnlzReAdd, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfPdcchSend, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ul5gtfRbAllocFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfUePick, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfRbAllocPass, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfRbAllocFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfFnlzPass, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfFnlzFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfBoUpd, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfPdcchSend, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfPdschCons, mBuf); + + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfSrRecv, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfBsrRecv, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeSchPick, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfPdcchSchd, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfAllocAllocated, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeRbAllocDone, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeFnlzReAdd, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfPdcchSend, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfRbAllocFail, mBuf); #endif - CMCHKUNPK(SUnpkU32, &stats->sch.ulSumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ulNumCqi, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ulSumiTbs, mBuf); - CMCHKUNPK(SUnpkU32, &stats->sch.ulNumiTbs, mBuf); - - CMCHKUNPK(SUnpkU32, &stats->rlc.maxRlcSrbRetxFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->rlc.maxRlcDrbRetxFail, mBuf); - CMCHKUNPK(SUnpkU32, &stats->rlc.reOdrTmrExp, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulSumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulNumCqi, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulSumiTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->sch.ulNumiTbs, mBuf); + + CMCHKUNPK(oduPackUInt32, &stats->rlc.maxRlcSrbRetxFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->rlc.maxRlcDrbRetxFail, mBuf); + CMCHKUNPK(oduPackUInt32, &stats->rlc.reOdrTmrExp, mBuf); RETVOID; } diff --git a/src/cm/cm_tkns.c b/src/cm/cm_tkns.c index da3b002e0..1543860e5 100644 --- a/src/cm/cm_tkns.c +++ b/src/cm/cm_tkns.c @@ -87,9 +87,9 @@ Buffer *mBuf; /* message buffer */ } /* Token Header */ - CMCHKPK(SPkU8, tknS16->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknS16->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknS16 */ @@ -123,7 +123,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNBSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknBStr32 */ @@ -157,7 +157,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr8 */ @@ -192,7 +192,7 @@ Buffer *mBuf; /* message buffer */ CMPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStr16 */ @@ -232,15 +232,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(SPkU8, tknStr->val[ndx], mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(SPkU16, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrOSXL */ @@ -287,15 +287,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 0; ndx < len; ndx++) { - CMCHKPK(SPkU8, tknStr->val[ndx], mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(SPkU16, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrBSXL */ @@ -335,17 +335,17 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(SPkU16, tknStr->val[ndx], mBuf); + CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(SPkU8, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrBMP4 */ @@ -384,15 +384,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(SPkU16, tknStr->val[ndx], mBuf); + CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(SPkU16, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrBMPXL */ @@ -431,17 +431,17 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(SPkU32, tknStr->val[ndx], mBuf); + CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(SPkU8, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrUNI4 */ @@ -480,15 +480,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (ndx = 0; ndx < tknStr->len; ndx++) { - CMCHKPK(SPkU32, tknStr->val[ndx], mBuf); + CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf); } /* Length */ - CMCHKPK(SPkU16, tknStr->len, mBuf); + CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(SPkU8, tknStr->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkTknStrUNIXL */ /* @@ -524,7 +524,7 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpkTknS16) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknS16->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknS16->pres, mBuf); if (tknS16->pres) { @@ -532,7 +532,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(SUnpkS16, &tknS16->val, mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknS16 */ @@ -566,7 +566,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNBSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknBStr32 */ @@ -601,7 +601,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr8 */ @@ -636,7 +636,7 @@ Buffer *mBuf; /* message buffer */ CMUNPKTKNSTR(tknStr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStr16 */ @@ -673,25 +673,25 @@ Ptr ptr; /* pointer to control memory block */ TRC2(cmUnpkTknStrOSXL) - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); if( cmGetMem(ptr, tknStr->len, (Ptr *)&tknStr->val) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(SUnpkU8, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - ndx], mBuf); } } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrOSXL */ @@ -730,12 +730,12 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpkTknStrBSXL) - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); if (tknStr->len % 8) len = (tknStr->len/8) + 1; @@ -744,16 +744,16 @@ Buffer *mBuf; /* message buffer */ if( cmGetMem(ptr, len, (Ptr *)&tknStr->val) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Value */ for (ndx = 1; ndx <= len; ndx++) { - CMCHKUNPK(SUnpkU8, &tknStr->val[len - ndx], mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->val[len - ndx], mBuf); } } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrBSXL */ @@ -789,21 +789,21 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpkTknStrBMP4) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(SUnpkU16, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf); } } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrBMP4 */ @@ -839,26 +839,26 @@ Ptr ptr; /* pointer to control memory block */ TRC2(cmUnpkTknStrBMPXL) - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); /* Each BMP Character is 2 octet long */ if( cmGetMem(ptr, 2*(tknStr->len), (Ptr *)&tknStr->val) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(SUnpkU16, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf); } } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrBMPXL */ @@ -894,21 +894,21 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpkTknStrUNI4) /* Token Header */ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(SUnpkU32, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf); } } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrUNI4 */ @@ -944,26 +944,26 @@ Ptr ptr; /* pointer to control memory block */ TRC2(cmUnpkTknStrUNIXL) - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); /* Each UNI Character is 4 octets long */ if( cmGetMem(ptr, 4*tknStr->len, (Ptr *)&tknStr->val) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(SUnpkU32, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf); } } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkTknStrUNIXL */ diff --git a/src/cm/cm_tkns.h b/src/cm/cm_tkns.h index 4bc2a0389..e10f17578 100755 --- a/src/cm/cm_tkns.h +++ b/src/cm/cm_tkns.h @@ -55,15 +55,15 @@ /* Value */ \ for (i = 0; i < (S16) len; i++) \ { \ - CMCHKPK(SPkU8, tknStr->val[i], mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); \ } \ \ /* Length */ \ - CMCHKPK(SPkU8, tknStr->len, mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); \ } \ \ /* Token Header */ \ - CMCHKPK(SPkU8, tknStr->pres, mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); \ } #define CMUNPKTKNBSTR(tknStr, mBuf) \ @@ -72,12 +72,12 @@ Cntr len; \ \ /* Token Header */ \ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); \ \ if(tknStr->pres) \ { \ /* Length */ \ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); \ \ if (tknStr->len % 8) \ len = (tknStr->len/8 ) + 1; \ @@ -87,7 +87,7 @@ /* Value */ \ for (i = 1; i <= (S16) len; i++) \ { \ - CMCHKUNPK(SUnpkU8, &tknStr->val[len - i], mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->val[len - i], mBuf); \ } \ } \ \ diff --git a/src/cm/cm_tpt.c b/src/cm/cm_tpt.c index 7bd9d87b5..4a127b2c0 100755 --- a/src/cm/cm_tpt.c +++ b/src/cm/cm_tpt.c @@ -129,9 +129,9 @@ Buffer *mBuf; /* message buffer */ TRC2(cmPkCmIpv4TptAddr) CMCHKPK(cmPkCmIpv4NetAddr, pkParam->address, mBuf); - CMCHKPK(SPkU16, pkParam->port, mBuf); + CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmIpv4TptAddr */ /* @@ -166,10 +166,10 @@ Buffer *mBuf; /* message buffer */ for(num = 0; num < CM_IPV6ADDR_SIZE; num++) { - CMCHKPK(SPkU8, *(ptr+num), mBuf); + CMCHKPK(oduUnpackUInt8, *(ptr+num), mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmPkCmIpv6NetAddr */ @@ -201,9 +201,9 @@ Buffer *mBuf; /* message buffer */ TRC3(cmPkCmIpv6TptAddr) CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6NetAddr, mBuf); - CMCHKPK(SPkU16, pkParam->port, mBuf); + CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmIpv6TptAddr */ @@ -238,7 +238,7 @@ Buffer *mBuf; /* message buffer */ TRC2(cmPkCmNetAddrTbl) if (pkParam->count > CM_MAX_NET_ADDR) - RETVALUE(RFAILED); + return RFAILED; /* Pack All the addresses */ for (idx = pkParam->count; idx; idx--) @@ -246,13 +246,13 @@ Buffer *mBuf; /* message buffer */ netAddr = &(pkParam->netAddr[idx - 1]); if ((cmPkCmNetAddr(netAddr, mBuf)) != ROK) - RETVALUE(RFAILED); + return RFAILED; } /* Pack the total number of addresses present in the table */ - CMCHKPK(SPkU16, pkParam->count, mBuf); + CMCHKPK(oduUnpackUInt16, pkParam->count, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmNetAddrTbl() */ @@ -297,11 +297,11 @@ Buffer *mBuf; /* message buffer */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, pkParam->type, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmNetAddr */ @@ -346,11 +346,11 @@ Buffer *mBuf; /* message buffer */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, pkParam->type, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmTptAddr */ /* added new packing functions */ @@ -388,11 +388,11 @@ Buffer *mBuf; /* message buffer */ /* pack the actual interface address */ CMCHKPK(cmPkCmNetAddr, &pkParam->localIfAddr, mBuf); /* pack the interface index value */ - CMCHKPK(SPkU32, pkParam->localIf, mBuf); + CMCHKPK(oduUnpackUInt32, pkParam->localIf, mBuf); } /* pack the boll which indicates if valid local intf is present or not */ - CMCHKPK(SPkU8, pkParam->intfPrsnt, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, pkParam->intfPrsnt, mBuf); + return ROK; } /* cmPkCmTptLocalInf */ #endif /* LOCAL_INTF */ @@ -426,9 +426,9 @@ Buffer *mBuf; /* message buffer */ TRC3(cmPkCmNetMCastInf6) CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->mCastAddr, mBuf); - CMCHKPK(SPkU32, pkParam->localInf, mBuf); + CMCHKPK(oduUnpackUInt32, pkParam->localInf, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmNetMCastInf6 */ #endif /* IPV6_SUPPORTED */ @@ -483,19 +483,19 @@ Buffer *mBuf; /* message buffer */ break; case CM_SOCKOPT_OPT_MCAST6_IF: - CMCHKPK(SPkU32, pkParam->optVal.infId, mBuf); + CMCHKPK(oduUnpackUInt32, pkParam->optVal.infId, mBuf); break; #endif /* IPV6_SUPPORTED */ default: - CMCHKPK(SPkU32, pkParam->optVal.value, mBuf); + CMCHKPK(oduUnpackUInt32, pkParam->optVal.value, mBuf); break; } - CMCHKPK(SPkU32, pkParam->option, mBuf); - CMCHKPK(SPkU32, pkParam->level, mBuf); + CMCHKPK(oduUnpackUInt32, pkParam->option, mBuf); + CMCHKPK(oduUnpackUInt32, pkParam->level, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmSockOpts */ @@ -530,16 +530,16 @@ Buffer *mBuf; /* message buffer */ if( pkParam->numOpts > CM_MAX_SOCK_OPTS) { - RETVALUE(RFAILED); + return RFAILED; } for(num = 0; num < pkParam->numOpts; num++) { CMCHKPK(cmPkCmSockOpts, &pkParam->sockOpts[num], mBuf); } - CMCHKPK(SPkU8, pkParam->numOpts, mBuf); - CMCHKPK(SPkU8, pkParam->listenQSize, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->numOpts, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->listenQSize, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmSockParam */ @@ -575,17 +575,17 @@ Buffer *mBuf; /* message buffer */ if( pkParam->numOpts > CM_MAX_SOCK_OPTS) { - RETVALUE(RFAILED); + return RFAILED; } for(num = 0; num < pkParam->numOpts; num++) { CMCHKPK(cmPkCmSockOpts, &pkParam->sockOpts[num], mBuf); } - CMCHKPK(SPkU8, pkParam->numOpts, mBuf); - CMCHKPK(SPkU8, pkParam->listenQSize, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->numOpts, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->listenQSize, mBuf); CMCHKPK(SPkS16, pkParam->ctxId, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkTlsTptParam */ #endif /* CM_TLS */ @@ -640,12 +640,12 @@ Buffer *mBuf; /* message buffer */ #endif default: - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, pkParam->type, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkCmTptParam */ @@ -682,10 +682,10 @@ Buffer *mBuf; /* message buffer */ { TRC2(cmUnpkCmIpv4TptAddr) - CMCHKUNPK(SUnpkU16, &unpkParam->port, mBuf); + CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf); CMCHKUNPK(cmUnpkCmIpv4NetAddr, &unpkParam->address, mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkCmIpv4TptAddr */ @@ -723,10 +723,10 @@ Buffer *mBuf; /* message buffer */ for(num = 0; num < CM_IPV6ADDR_SIZE; num++) { - CMCHKUNPK(SUnpkU8, (ptr-num), mBuf); + CMCHKUNPK(oduPackUInt8, (ptr-num), mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmIpv6NetAddr */ @@ -757,10 +757,10 @@ Buffer *mBuf; /* message buffer */ { TRC3(cmUnpkCmIpv6TptAddr) - CMCHKUNPK(SUnpkU16, &unpkParam->port, mBuf); + CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf); CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->ipv6NetAddr, mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkCmIpv6TptAddr */ @@ -795,7 +795,7 @@ Buffer *mBuf; /* message buffer */ TRC2(cmUnpkCmNetAddrTbl) /* Unpack the count */ - CMCHKUNPK(SUnpkU16, &(unpkParam->count), mBuf); + CMCHKUNPK(oduPackUInt16, &(unpkParam->count), mBuf); /* Unpack the addresses */ for (idx = 0; idx < unpkParam->count; idx++) @@ -803,10 +803,10 @@ Buffer *mBuf; /* message buffer */ netAddr = &(unpkParam->netAddr[idx]); if ((cmUnpkCmNetAddr(netAddr, mBuf)) != ROK) - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmNetAddrTbl() */ @@ -838,7 +838,7 @@ Buffer *mBuf; /* message buffer */ { TRC3(cmUnpkCmNetAddr) - CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); switch (unpkParam->type) { @@ -854,10 +854,10 @@ Buffer *mBuf; /* message buffer */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* cmUnpkCmNetAddr */ @@ -888,7 +888,7 @@ Buffer *mBuf; /* message buffer */ { TRC3(cmUnpkCmTptAddr) - CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); switch (unpkParam->type) { @@ -904,10 +904,10 @@ Buffer *mBuf; /* message buffer */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* cmUnpkCmTptAddr */ /* Moving IPv6 multicast information unpacking functions from cm_inet.c */ @@ -940,10 +940,10 @@ Buffer *mBuf; /* message buffer */ { TRC3(cmUnpkCmNetMCastInf6) - CMCHKUNPK(SUnpkU32, &unpkParam->localInf, mBuf); + CMCHKUNPK(oduPackUInt32, &unpkParam->localInf, mBuf); CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->mCastAddr, mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkCmNetMCastInf6 */ #endif /* IPV6_SUPPORTED */ @@ -975,8 +975,8 @@ Buffer *mBuf; /* message buffer */ { TRC3(cmUnpkCmSockOpts) - CMCHKUNPK(SUnpkU32, &unpkParam->level, mBuf); - CMCHKUNPK(SUnpkU32, &unpkParam->option, mBuf); + CMCHKUNPK(oduPackUInt32, &unpkParam->level, mBuf); + CMCHKUNPK(oduPackUInt32, &unpkParam->option, mBuf); switch (unpkParam->option) { @@ -1003,16 +1003,16 @@ Buffer *mBuf; /* message buffer */ break; case CM_SOCKOPT_OPT_MCAST6_IF: - CMCHKUNPK(SUnpkU32, &unpkParam->optVal.infId, mBuf); + CMCHKUNPK(oduPackUInt32, &unpkParam->optVal.infId, mBuf); break; #endif /* IPV6_SUPPORTED */ default: - CMCHKUNPK(SUnpkU32, &unpkParam->optVal.value, mBuf); + CMCHKUNPK(oduPackUInt32, &unpkParam->optVal.value, mBuf); break; } - RETVALUE(ROK); + return ROK; } /* cmUnpkCmSockOpts */ @@ -1045,12 +1045,12 @@ Buffer *mBuf; /* message buffer */ TRC3(cmUnpkCmSockParam) - CMCHKUNPK(SUnpkU8, &unpkParam->listenQSize, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->numOpts, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf); if( unpkParam->numOpts > CM_MAX_SOCK_OPTS) { - RETVALUE(RFAILED); + return RFAILED; } for(num = 0; num < unpkParam->numOpts; num++) @@ -1058,7 +1058,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkCmSockOpts, &unpkParam->sockOpts[num], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkCmSockParam */ @@ -1093,12 +1093,12 @@ Buffer *mBuf; /* message buffer */ TRC3(cmUnpkTlsTptParam) CMCHKUNPK(SUnpkS16, &unpkParam->ctxId, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->listenQSize, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->numOpts, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf); if( unpkParam->numOpts > CM_MAX_SOCK_OPTS) { - RETVALUE(RFAILED); + return RFAILED; } for(num = 0; num < unpkParam->numOpts; num++) @@ -1106,7 +1106,7 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(cmUnpkCmSockOpts, &unpkParam->sockOpts[num], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkTlsTptParam */ #endif /* CM_TLS */ @@ -1139,7 +1139,7 @@ Buffer *mBuf; /* message buffer */ { TRC3(cmUnpkCmTptParam) - CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); switch (unpkParam->type) { @@ -1163,10 +1163,10 @@ Buffer *mBuf; /* message buffer */ #endif default: - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* cmUnpkCmTptParam */ @@ -1233,11 +1233,11 @@ Buffer *mBuf; /* message buffer */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, pkParam->type, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf); - RETVALUE(ROK); + return ROK; } /* End of cmPkCmIpHdrParm */ @@ -1272,16 +1272,16 @@ Buffer *mBuf; /* message buffer */ TRC3(cmUnpkCmTptLocalInf) /* first unpack the bool intfPrsnt value which is always packed */ - CMCHKUNPK(cmUnpkBool, &unpkParam->intfPrsnt, mBuf); + CMCHKUNPK(oduUnpackBool, &unpkParam->intfPrsnt, mBuf); /* if the above unpacked bool is TRUE then we have to unpack further * to get the local intf index and intf address */ if (unpkParam->intfPrsnt == TRUE) { - CMCHKUNPK(SUnpkU32, &unpkParam->localIf, mBuf); + CMCHKUNPK(oduPackUInt32, &unpkParam->localIf, mBuf); CMCHKUNPK(cmUnpkCmNetAddr, &unpkParam->localIfAddr, mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkCmTptLocalInf */ #endif /* LOCAL_INTF */ @@ -1317,19 +1317,19 @@ Buffer *mBuf; /* message buffer */ /* pack first Route hdr */ if (pkParam->rtOptsPrsnt) CMCHKPK(cmPkCmIpv6RtHdr, &pkParam->rtOpts, mBuf); - CMCHKPK(cmPkBool, pkParam->rtOptsPrsnt, mBuf); + CMCHKPK(oduPackBool, pkParam->rtOptsPrsnt, mBuf); /* pack Dest Opt hdr */ if (pkParam->destOptsPrsnt) CMCHKPK(cmPkCmIpv6DestOptsArr, &pkParam->destOptsArr, mBuf); - CMCHKPK(cmPkBool, pkParam->destOptsPrsnt, mBuf); + CMCHKPK(oduPackBool, pkParam->destOptsPrsnt, mBuf); /* pack HBH hdr */ if (pkParam->hbhHdrPrsnt) CMCHKPK(cmPkCmIpv6HBHHdrArr, &pkParam->hbhOptsArr, mBuf); - CMCHKPK(cmPkBool, pkParam->hbhHdrPrsnt, mBuf); + CMCHKPK(oduPackBool, pkParam->hbhHdrPrsnt, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmIpv6ExtHdr */ @@ -1368,10 +1368,10 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6Addrs[idx], mBuf); } /* pack reserve byte & strict/loose bit map */ - CMCHKPK(SPkU32, pkParam->slMap, mBuf); - CMCHKPK(SPkU8, pkParam->numAddrs, mBuf); + CMCHKPK(oduUnpackUInt32, pkParam->slMap, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->numAddrs, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmIpv6RtHdr */ @@ -1408,10 +1408,10 @@ Mem *memInfo; /* meminfo to allocate for Route hdr */ TRC3(cmUnpkCmIpv6RtHdr); - CMCHKUNPK(SUnpkU8, &unpkParam->numAddrs, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->numAddrs, mBuf); /* unpack reserve byte & strict/loose bit map */ - CMCHKUNPK(SUnpkU32, &unpkParam->slMap, mBuf); + CMCHKUNPK(oduPackUInt32, &unpkParam->slMap, mBuf); retVal = SGetSBuf(memInfo->region, memInfo->pool, @@ -1420,7 +1420,7 @@ Mem *memInfo; /* meminfo to allocate for Route hdr */ if (retVal != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } /* unpack all IPV6 addrs in the route hdr */ @@ -1429,7 +1429,7 @@ Mem *memInfo; /* meminfo to allocate for Route hdr */ CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->ipv6Addrs[idx], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmIpv6RtHdr */ @@ -1463,21 +1463,21 @@ Mem *memInfo; /* meminfo to allocate for IPV6 ext hdr */ TRC3(cmUnpkCmIpv6ExtHdr) /* unpack HBH hdr first */ - CMCHKUNPK(cmUnpkBool, &unpkParam->hbhHdrPrsnt, mBuf); + CMCHKUNPK(oduUnpackBool, &unpkParam->hbhHdrPrsnt, mBuf); if (unpkParam->hbhHdrPrsnt) cmUnpkCmIpv6HBHHdrArr(&unpkParam->hbhOptsArr, mBuf, memInfo); /* unpack DEST opt hdr */ - CMCHKUNPK(cmUnpkBool, &unpkParam->destOptsPrsnt, mBuf); + CMCHKUNPK(oduUnpackBool, &unpkParam->destOptsPrsnt, mBuf); if (unpkParam->destOptsPrsnt) cmUnpkCmIpv6DestOptsArr(&unpkParam->destOptsArr, mBuf, memInfo); /* unpack Route hdr last */ - CMCHKUNPK(cmUnpkBool, &unpkParam->rtOptsPrsnt, mBuf); + CMCHKUNPK(oduUnpackBool, &unpkParam->rtOptsPrsnt, mBuf); if (unpkParam->rtOptsPrsnt) cmUnpkCmIpv6RtHdr(&unpkParam->rtOpts, mBuf, memInfo); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmIpv6ExtHdr */ @@ -1514,9 +1514,9 @@ Buffer *mBuf; /* message buffer */ /* pack all HBH options */ for(numOptions = 0; numOptionsnumDestOpts; numOptions++) CMCHKPK(cmPkCmIpv6DestOptsHdr, &pkParam->destOpts[numOptions], mBuf); - CMCHKPK(SPkU8, pkParam->numDestOpts, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->numDestOpts, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmIpv6DestOptsArr */ @@ -1551,12 +1551,12 @@ Buffer *mBuf; /* message buffer */ for(optLen = 0; optLen < pkParam->length; optLen++) { - CMCHKPK(SPkU8, pkParam->value[optLen], mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->value[optLen], mBuf); } - CMCHKPK(SPkU8, pkParam->length, mBuf); - CMCHKPK(SPkU8, pkParam->type, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->length, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmIpv6DestOptsHdr */ @@ -1593,8 +1593,8 @@ Mem *memInfo; /* meminfo to allocate mem for dest opt */ TRC3(cmUnpkCmIpv6DestOptsHdr); /* unpack type, length */ - CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->length, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf); /* allocate static memory to hold the unpacked values */ retVal = SGetSBuf(memInfo->region, @@ -1602,16 +1602,16 @@ Mem *memInfo; /* meminfo to allocate mem for dest opt */ (Data **)&unpkParam->value, (Size)unpkParam->length); if (retVal != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } /* unpack value fieldof this option */ for(optLen = 0; optLenlength; optLen++) { - CMCHKUNPK(SUnpkU8, &unpkParam->value[optLen], mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->value[optLen], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmIpv6DestOptsHdr */ @@ -1647,7 +1647,7 @@ Mem *memInfo; /* meminfo to allocate mem for dest opts */ TRC3(cmUnpkCmIpv6DestOptsArr); - CMCHKUNPK(SUnpkU8, &unpkParam->numDestOpts, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->numDestOpts, mBuf); if (unpkParam->numDestOpts) { /* allocate mem to hold all dest options */ @@ -1658,17 +1658,17 @@ Mem *memInfo; /* meminfo to allocate mem for dest opts */ if (retVal != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } /* unpack all dest options */ for(numOptions = 0; numOptionsnumDestOpts; numOptions++) if ((retVal = cmUnpkCmIpv6DestOptsHdr(&unpkParam->destOpts[numOptions], mBuf, memInfo)) != ROK) - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmIpv6DestOptsArr */ @@ -1704,9 +1704,9 @@ Buffer *mBuf; /* message buffer */ for(numOptions = 0; numOptionsnumHBHOpts; numOptions++) CMCHKPK(cmPkCmIpv6HBHHdr, &pkParam->hbhOpts[numOptions], mBuf); - CMCHKPK(SPkU8, pkParam->numHBHOpts, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->numHBHOpts, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmIpv6HBHHdrArr */ @@ -1742,14 +1742,14 @@ Buffer *mBuf; /* message buffer */ /* pack value field */ for(optLen = 0; optLenlength; optLen++) { - CMCHKPK(SPkU8, pkParam->value[optLen], mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->value[optLen], mBuf); } /* pack type, length fields */ - CMCHKPK(SPkU8, pkParam->length, mBuf); - CMCHKPK(SPkU8, pkParam->type, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->length, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCmIpv6HBHHdr */ @@ -1785,8 +1785,8 @@ Mem *memInfo; /* meminfo to allocate mem for HBH opt */ TRC3(cmUnpkCmIpv6HBHHdr) - CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->length, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf); /* allocate static memory to hold the unpacked values */ if (unpkParam->length) @@ -1796,14 +1796,14 @@ Mem *memInfo; /* meminfo to allocate mem for HBH opt */ (Data **)&unpkParam->value, (Size)unpkParam->length); if (retVal != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } for(optLen = 0; optLenlength; optLen++) - CMCHKUNPK(SUnpkU8, &unpkParam->value[optLen], mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->value[optLen], mBuf); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmIpv6HBHHdr */ @@ -1839,7 +1839,7 @@ Mem *memInfo; /* meminfo to allocate space for HBH opt */ TRC3(cmUnpkCmIpv6HBHHdrArr); - CMCHKUNPK(SUnpkU8, &unpkParam->numHBHOpts, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->numHBHOpts, mBuf); if (unpkParam->numHBHOpts) { /* allocate space for all HBH options */ @@ -1850,13 +1850,13 @@ Mem *memInfo; /* meminfo to allocate space for HBH opt */ if (retVal != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } for(numOptions = 0; numOptionsnumHBHOpts; numOptions++) cmUnpkCmIpv6HBHHdr(&unpkParam->hbhOpts[numOptions], mBuf, memInfo); } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCmIpv6HBHHdrArr */ #endif /* IPV6_OPTS_SUPPORTED */ @@ -1906,7 +1906,7 @@ Buffer *mBuf; /* message buffer */ { TRC3(cmUnpkCmIpHdrParm) - CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); switch (unpkParam->type) { @@ -1941,10 +1941,10 @@ Buffer *mBuf; /* message buffer */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* End of cmUnpkCmIpHdrParm */ @@ -1986,15 +1986,15 @@ Buffer *mBuf; /* message buffer */ case CM_ICMPVER4_FILTER: for(idx = (pkParam->u.icmpv4Filter.num-1); idx >= 0; idx--) { - CMCHKPK(SPkU32, pkParam->u.icmpv4Filter.icmpError[idx].errCodeMask, + CMCHKPK(oduUnpackUInt32, pkParam->u.icmpv4Filter.icmpError[idx].errCodeMask, mBuf); - CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.icmpError[idx].errType, + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpError[idx].errType, mBuf); } - CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.num, mBuf); - CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.protocol, mBuf); - CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.allMsg, mBuf); - CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.num, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.protocol, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf); break; case CM_ICMPVER6_FILTER: @@ -2003,23 +2003,23 @@ Buffer *mBuf; /* message buffer */ #ifdef IPV6_SUPPORTED for(idx = (pkParam->u.icmpv6Filter.num - 1); idx >= 0; idx--) { - CMCHKPK(SPkU32, pkParam->u.icmpv6Filter.icmpError[idx].errCodeMask, + CMCHKPK(oduUnpackUInt32, pkParam->u.icmpv6Filter.icmpError[idx].errCodeMask, mBuf); - CMCHKPK(SPkU8, pkParam->u.icmpv6Filter.icmpError[idx].errType, + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv6Filter.icmpError[idx].errType, mBuf); } - CMCHKPK(SPkU8, pkParam->u.icmpv6Filter.num, mBuf); - CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.allMsg, mBuf); - CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv6Filter.num, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf); #endif /* IPV6_SUPPORTED */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, pkParam->type, mBuf); + CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2053,7 +2053,7 @@ Buffer *mBuf; /* message buffer */ TRC3(cmUnpkCmIcmpFilter) - CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); switch (unpkParam->type) { @@ -2061,16 +2061,16 @@ Buffer *mBuf; /* message buffer */ break; case CM_ICMPVER4_FILTER: - CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.icmpMsgFlag, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.allMsg, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.protocol, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.num, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.icmpMsgFlag, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.allMsg, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.protocol, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.num, mBuf); for(idx = 0; idx < (unpkParam->u.icmpv4Filter.num); idx++) { - CMCHKUNPK(SUnpkU8, + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.icmpError[idx].errType, mBuf); - CMCHKUNPK(SUnpkU32, + CMCHKUNPK(oduPackUInt32, &unpkParam->u.icmpv4Filter.icmpError[idx].errCodeMask, mBuf); } @@ -2078,15 +2078,15 @@ Buffer *mBuf; /* message buffer */ case CM_ICMPVER6_FILTER: #ifdef IPV6_SUPPORTED - CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv6Filter.icmpMsgFlag, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv6Filter.allMsg, mBuf); - CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv6Filter.num, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.icmpMsgFlag, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.allMsg, mBuf); + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.num, mBuf); for(idx = 0; idx < (unpkParam->u.icmpv6Filter.num); idx++) { - CMCHKUNPK(SUnpkU8, + CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.icmpError[idx].errType, mBuf); - CMCHKUNPK(SUnpkU32, + CMCHKUNPK(oduPackUInt32, &unpkParam->u.icmpv6Filter.icmpError[idx].errCodeMask, mBuf); } @@ -2094,11 +2094,11 @@ Buffer *mBuf; /* message buffer */ break; default: - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* End of cmUnpkCmIcmpFilter */ #endif /* CM_INET2 */ diff --git a/src/cm/cm_tpt.h b/src/cm/cm_tpt.h index 9d9089350..97f3ca199 100755 --- a/src/cm/cm_tpt.h +++ b/src/cm/cm_tpt.h @@ -283,10 +283,10 @@ #endif /* __CMINETH__ */ /* packing/unpacking functions */ -#define cmPkCmIpv4NetAddr(x, mBuf) SPkU32(x, mBuf) +#define cmPkCmIpv4NetAddr(x, mBuf) oduUnpackUInt32(x, mBuf) /* Moved all packing functions to cm_tpt from * cm_inet.c files. Hence no #defines are required */ -#define cmUnpkCmIpv4NetAddr(x, mBuf) SUnpkU32(x, mBuf) +#define cmUnpkCmIpv4NetAddr(x, mBuf) oduPackUInt32(x, mBuf) /* added macro to free memory allocated for IPv6 * IPv6 extn hdrs*/ diff --git a/src/cm/common_def.h b/src/cm/common_def.h index f5591a482..63416d203 100644 --- a/src/cm/common_def.h +++ b/src/cm/common_def.h @@ -69,6 +69,24 @@ #define ODU_START_CRNTI 100 #define ODU_END_CRNTI 500 +/* Defining macros for common utility functions */ +#define ODU_GET_MSG SGetMsg +#define ODU_PUT_MSG SPutMsg +#define ODU_ADD_PRE_MSG_MULT SAddPreMsgMult +#define ODU_ADD_POST_MSG_MULT SAddPstMsgMult +#define ODU_START_TASK SStartTask +#define ODU_STOP_TASK SStopTask +#define ODU_ATTACH_TTSK SAttachTTsk +#define ODU_POST_TASK SPstTsk +#define ODU_COPY_MSG_TO_FIX_BUF SCpyMsgFix +#define ODU_REG_TTSK SRegTTsk +#define ODU_SET_PROC_ID SSetProcId +#define ODU_FIND_MSG_LEN SFndLenMsg +#define ODU_EXIT_TASK SExitTsk +#define ODU_PRINT_MSG SPrntMsg +#define ODU_REM_PRE_MSG SRemPreMsg +#define ODU_REG_TMR_MT SRegTmrMt + #define GET_UE_IDX( _crnti,_ueIdx) \ { \ _ueIdx = _crnti - ODU_START_CRNTI + 1; \ @@ -114,6 +132,7 @@ typedef struct PlmnIdentity void schAllocFreqDomRscType0(uint16_t startPrb, uint16_t prbSize, uint8_t *freqDomain); #endif + /********************************************************************** End of file ***********************************************************************/ diff --git a/src/cm/crg.c b/src/cm/crg.c index ba3244d57..ba6a7fe34 100755 --- a/src/cm/crg.c +++ b/src/cm/crg.c @@ -78,7 +78,7 @@ SpId spId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG001, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -87,7 +87,7 @@ SpId spId; (ErrVal)ECRG002, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -96,10 +96,10 @@ SpId spId; (ErrVal)ECRG003, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCRGBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -142,7 +142,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG004, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -151,10 +151,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG005, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -195,16 +195,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG006, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG007, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -213,10 +213,10 @@ U8 status; (ErrVal)ECRG008, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCRGBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -260,19 +260,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG009, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG010, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -312,7 +312,7 @@ Reason reason; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG011, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -321,7 +321,7 @@ Reason reason; (ErrVal)ECRG012, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -330,10 +330,10 @@ Reason reason; (ErrVal)ECRG013, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCRGUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -376,7 +376,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG014, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { SPutMsg(mBuf); @@ -385,10 +385,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG015, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -433,7 +433,7 @@ CrgCfgReqInfo * cfgReqInfo; (ErrVal)ECRG016, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCrgCfgReqInfo(cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -443,7 +443,7 @@ CrgCfgReqInfo * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } /* crg_c_001.main_5: MOD - Updating ERR code */ if (cmPkCrgCfgTransId(&transId, mBuf) != ROK) { @@ -454,7 +454,7 @@ CrgCfgReqInfo * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -464,7 +464,7 @@ CrgCfgReqInfo * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CrgCfgReqInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -473,10 +473,10 @@ CrgCfgReqInfo * cfgReqInfo; (ErrVal)ECRG020, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCRGCFGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -522,7 +522,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG021, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCrgCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -531,7 +531,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG022, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CrgCfgReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -540,7 +540,7 @@ Buffer *mBuf; (ErrVal)ECRG023, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCrgCfgReqInfo(cfgReqInfo, mBuf) != ROK) { @@ -551,10 +551,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG024, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, cfgReqInfo)); + return ((*func)(pst, spId, transId, cfgReqInfo)); } @@ -597,17 +597,17 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG025, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* crg_c_001.main_5 - ADD - Added the packing for status. */ - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG026, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCrgCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -616,7 +616,7 @@ U8 status; (ErrVal)ECRG027, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -625,10 +625,10 @@ U8 status; (ErrVal)ECRG028, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCRGCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -673,7 +673,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG029, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCrgCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -682,19 +682,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG030, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECRG031, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, status)); + return ((*func)(pst, suId, transId, status)); } @@ -730,9 +730,9 @@ Buffer *mBuf; TRC3(cmPkCrgCfgTransId) for (i=CRG_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->trans[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -769,9 +769,9 @@ Buffer *mBuf; TRC3(cmUnpkCrgCfgTransId) for (i=0; itrans[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -806,9 +806,9 @@ Buffer *mBuf; TRC3(cmPkCrgBwCfg) - CMCHKPK(SPkU8, param->ulTotalBw, mBuf); - CMCHKPK(SPkU8, param->dlTotalBw, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); + return ROK; } @@ -843,9 +843,9 @@ Buffer *mBuf; TRC3(cmUnpkCrgBwCfg) - CMCHKUNPK(SUnpkU8, ¶m->dlTotalBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulTotalBw, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulTotalBw, mBuf); + return ROK; } @@ -880,8 +880,8 @@ Buffer *mBuf; TRC3(cmPkCrgRachCfg) - CMCHKPK(SPkU8, param->maxMsg3Tx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf); + return ROK; } @@ -916,8 +916,8 @@ Buffer *mBuf; TRC3(cmUnpkCrgRachCfg) - CMCHKUNPK(SUnpkU8, ¶m->maxMsg3Tx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->maxMsg3Tx, mBuf); + return ROK; } @@ -953,7 +953,7 @@ Buffer *mBuf; TRC3(cmPkCrgCellCfg) #ifdef EMTC_ENABLE - CMCHKPK(SPkU8, param->emtcEnable, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); #endif #ifdef TENB_MULT_CELL_SUPPRT CMCHKPK(SPkS16, param->rguDlSapId, mBuf); @@ -962,7 +962,7 @@ Buffer *mBuf; CMCHKPK(cmPkCrgBwCfg, ¶m->bwCfg, mBuf); CMCHKPK(cmPkCrgRachCfg, ¶m->rachCfg, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1005,9 +1005,9 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->rguDlSapId, mBuf); #endif #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8, ¶m->emtcEnable, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcEnable, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -1042,8 +1042,8 @@ Buffer *mBuf; TRC3(cmPkCrgUeUlHqCfg) - CMCHKPK(SPkU8, param->maxUlHqTx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf); + return ROK; } #ifdef LTE_ADV @@ -1076,10 +1076,10 @@ Buffer *mBuf; { CMCHKPK(SPkS16, param->rguDlSapId, mBuf); CMCHKPK(SPkS16, param->rguUlSapId, mBuf); - CMCHKPK(SPkU8, param->macInst, mBuf); - CMCHKPK(SPkU16, param->sCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->macInst, mBuf); + CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -1108,11 +1108,11 @@ CrgUeSCellInfo *param; Buffer *mBuf; #endif { - CMCHKUNPK(SUnpkU16, ¶m->sCellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->macInst, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->macInst, mBuf); CMCHKUNPK(SUnpkS16, ¶m->rguUlSapId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->rguDlSapId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -1147,10 +1147,10 @@ Buffer *mBuf; CMCHKPK(cmPkCrgUeSCellCfg, ¶m->ueSCellCfg[(U8)idx], mBuf); } - CMCHKPK(SPkU8, param->numSCells, mBuf); - CMCHKPK(SPkU8, param->isSCellCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSCellCfgPres, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -1182,10 +1182,10 @@ Buffer *mBuf; { U8 idx; - CMCHKUNPK(SUnpkU8, ¶m->isSCellCfgPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSCellCfgPres, mBuf); if(TRUE == param->isSCellCfgPres) { - CMCHKUNPK(SUnpkU8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); for(idx = 0; idx < param->numSCells; idx++) { @@ -1193,7 +1193,7 @@ Buffer *mBuf; } } - RETVALUE(ROK); + return ROK; } #endif /* LTE_ADV */ @@ -1229,8 +1229,8 @@ Buffer *mBuf; TRC3(cmUnpkCrgUeUlHqCfg) - CMCHKUNPK(SUnpkU8, ¶m->maxUlHqTx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->maxUlHqTx, mBuf); + return ROK; } @@ -1268,12 +1268,12 @@ Buffer *mBuf; CMCHKPK(SPkS16, param->rguDlSapId, mBuf); CMCHKPK(SPkS16, param->rguUlSapId, mBuf); #endif - CMCHKPK(SPkU32, param->txMode.tm, mBuf); - CMCHKPK(SPkU8, param->txMode.pres, mBuf); + CMCHKPK(oduUnpackUInt32, param->txMode.tm, mBuf); + CMCHKPK(oduUnpackUInt8, param->txMode.pres, mBuf); CMCHKPK(cmPkCrgUeUlHqCfg, ¶m->ueUlHqCfg, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1312,14 +1312,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkCrgUeUlHqCfg, ¶m->ueUlHqCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txMode.pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txMode.pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->txMode.tm = (CrgTxMode) tmpEnum; #ifdef TENB_MULT_CELL_SUPPRT CMCHKUNPK(SUnpkS16, ¶m->rguUlSapId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->rguDlSapId, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -1354,8 +1354,8 @@ Buffer *mBuf; TRC3(cmPkCrgDlLchCfg) - CMCHKPK(SPkU8, param->dlTrchType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); + return ROK; } @@ -1390,8 +1390,8 @@ Buffer *mBuf; TRC3(cmUnpkCrgDlLchCfg) - CMCHKUNPK(SUnpkU8, ¶m->dlTrchType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); + return ROK; } @@ -1426,9 +1426,9 @@ Buffer *mBuf; TRC3(cmPkCrgUlLchCfg) - CMCHKPK(SPkU8, param->lcgId, mBuf); - CMCHKPK(SPkU8, param->ulTrchType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); + return ROK; } @@ -1463,9 +1463,9 @@ Buffer *mBuf; TRC3(cmUnpkCrgUlLchCfg) - CMCHKUNPK(SUnpkU8, ¶m->ulTrchType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->lcgId, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ulTrchType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + return ROK; } @@ -1501,16 +1501,16 @@ Buffer *mBuf; TRC3(cmPkCrgLchCfg) /* crg_c_001.main_5 - ADD - Added the packing for LTE_L2_MEAS. */ #ifdef LTE_L2_MEAS - CMCHKPK(SPkU8, param->qci, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); #endif CMCHKPK(cmPkCrgUlLchCfg, ¶m->ulInfo, mBuf); CMCHKPK(cmPkCrgDlLchCfg, ¶m->dlInfo, mBuf); - CMCHKPK(SPkU8, param->dir, mBuf); + CMCHKPK(oduUnpackUInt8, param->dir, mBuf); CMCHKPK(cmPkLteLcType, param->lcType, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1549,14 +1549,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dir, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dir, mBuf); CMCHKUNPK(cmUnpkCrgDlLchCfg, ¶m->dlInfo, mBuf); CMCHKUNPK(cmUnpkCrgUlLchCfg, ¶m->ulInfo, mBuf); /* crg_c_001.main_5 - ADD - Added the unpacking for LTE_L2_MEAS. */ #ifdef LTE_L2_MEAS - CMCHKUNPK(SUnpkU8, ¶m->qci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -1602,10 +1602,10 @@ Buffer *mBuf; CMCHKPK(cmPkCrgCellCfg, ¶m->u.cellCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); + return ROK; } @@ -1640,7 +1640,7 @@ Buffer *mBuf; TRC3(cmUnpkCrgCfg) - CMCHKUNPK(SUnpkU8, ¶m->cfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { case CRG_CELL_CFG: CMCHKUNPK(cmUnpkCrgCellCfg, ¶m->u.cellCfg, mBuf); @@ -1652,9 +1652,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCrgLchCfg, ¶m->u.lchCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -1691,7 +1691,7 @@ Buffer *mBuf; CMCHKPK(cmPkCrgRachCfg, ¶m->rachRecfg, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1728,7 +1728,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkCrgRachCfg, ¶m->rachRecfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1769,16 +1769,16 @@ Buffer *mBuf; } else { - CMCHKPK(SPkU8, param->crgSCellCfg.isSCellCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->crgSCellCfg.isSCellCfgPres, mBuf); } #endif /* LTE_ADV */ - CMCHKPK(SPkU32, param->txMode.tm, mBuf); - CMCHKPK(SPkU8, param->txMode.pres, mBuf); + CMCHKPK(oduUnpackUInt32, param->txMode.tm, mBuf); + CMCHKPK(oduUnpackUInt8, param->txMode.pres, mBuf); CMCHKPK(cmPkCrgUeUlHqCfg, ¶m->ueUlHqRecfg, mBuf); CMCHKPK(cmPkLteRnti, param->newCrnti, mBuf); CMCHKPK(cmPkLteRnti, param->oldCrnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1817,12 +1817,12 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->oldCrnti, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->newCrnti, mBuf); CMCHKUNPK(cmUnpkCrgUeUlHqCfg, ¶m->ueUlHqRecfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txMode.pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->txMode.tm, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txMode.pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->txMode.tm, mBuf); #ifdef LTE_ADV CMCHKUNPK(cmUnpkCrgUeSecCellInfo, ¶m->crgSCellCfg, mBuf); #endif /* LTE_ADV */ - RETVALUE(ROK); + return ROK; } @@ -1857,11 +1857,11 @@ Buffer *mBuf; TRC3(cmPkCrgLchRecfg) - CMCHKPK(SPkU8, param->ulRecfg.lcgId, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1899,8 +1899,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulRecfg.lcgId, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.lcgId, mBuf); + return ROK; } @@ -1946,10 +1946,10 @@ Buffer *mBuf; CMCHKPK(cmPkCrgCellRecfg, ¶m->u.cellRecfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->recfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->recfgType, mBuf); + return ROK; } @@ -1984,7 +1984,7 @@ Buffer *mBuf; TRC3(cmUnpkCrgRecfg) - CMCHKUNPK(SUnpkU8, ¶m->recfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); switch(param->recfgType) { case CRG_CELL_CFG: CMCHKUNPK(cmUnpkCrgCellRecfg, ¶m->u.cellRecfg, mBuf); @@ -1996,9 +1996,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCrgLchRecfg, ¶m->u.lchRecfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2035,7 +2035,7 @@ Buffer *mBuf; switch(param->delType) { case CRG_LCH_CFG: - CMCHKPK(SPkU8, param->u.lchDel.dir, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.lchDel.dir, mBuf); CMCHKPK(cmPkLteLcId, param->u.lchDel.lcId, mBuf); CMCHKPK(cmPkLteRnti, param->u.lchDel.crnti, mBuf); CMCHKPK(cmPkLteCellId, param->u.lchDel.cellId, mBuf); @@ -2048,10 +2048,10 @@ Buffer *mBuf; CMCHKPK(cmPkLteCellId, param->u.cellDel.cellId, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->delType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->delType, mBuf); + return ROK; } @@ -2086,7 +2086,7 @@ Buffer *mBuf; TRC3(cmUnpkCrgDel) - CMCHKUNPK(SUnpkU8, ¶m->delType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); switch(param->delType) { case CRG_CELL_CFG: CMCHKUNPK(cmUnpkLteCellId, ¶m->u.cellDel.cellId, mBuf); @@ -2099,12 +2099,12 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->u.lchDel.cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->u.lchDel.crnti, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->u.lchDel.lcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->u.lchDel.dir, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.lchDel.dir, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2141,7 +2141,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2178,7 +2178,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2227,10 +2227,10 @@ Buffer *mBuf; CMCHKPK(cmPkCrgCfg, ¶m->u.cfgInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->action, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->action, mBuf); + return ROK; } @@ -2265,7 +2265,7 @@ Buffer *mBuf; TRC3(cmUnpkCrgCfgReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->action, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); switch(param->action) { case CRG_CONFIG: CMCHKUNPK(cmUnpkCrgCfg, ¶m->u.cfgInfo, mBuf); @@ -2280,9 +2280,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCrgRst, ¶m->u.rstInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif diff --git a/src/cm/ctf.c b/src/cm/ctf.c index 8e2d2c13f..bb17d5f74 100755 --- a/src/cm/ctf.c +++ b/src/cm/ctf.c @@ -40,10 +40,10 @@ #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 @@ -87,7 +87,7 @@ SpId spId; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF001, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -97,7 +97,7 @@ SpId spId; (ErrVal)ECTF002, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -107,10 +107,10 @@ SpId spId; (ErrVal)ECTF003, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -154,7 +154,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF004, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -164,10 +164,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF005, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -209,9 +209,9 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF006, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -219,7 +219,7 @@ U8 status; (ErrVal)ECTF007, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -229,10 +229,10 @@ U8 status; (ErrVal)ECTF008, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -277,9 +277,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF009, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -287,10 +287,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF010, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -331,7 +331,7 @@ Reason reason; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF011, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -341,7 +341,7 @@ Reason reason; (ErrVal)ECTF012, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -351,10 +351,10 @@ Reason reason; (ErrVal)ECTF013, (ErrVal)0,(Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -398,7 +398,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF014, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { SPutMsg(mBuf); @@ -408,10 +408,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF015, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -450,7 +450,7 @@ CtfCfgReqInfo *param; } #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCfgReqInfo)); - RETVALUE(ROK); + return ROK; } #ifdef TENB_AS_SECURITY @@ -493,12 +493,12 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(SPkU16, param->physCellId, mBuf); - CMCHKPK(SPkU16, param->dlCarrFreq, mBuf); + CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -540,12 +540,12 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(SPkU16, param->physCellId, mBuf); - CMCHKPK(SPkU16, param->dlCarrFreq, mBuf); + CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf); - RETVALUE(ROK); + return ROK; } @@ -589,12 +589,12 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - CMCHKPK(SPkU8, param->ciphAlgoType, mBuf); - CMCHKPK(SPkU8, param->intgAlgoType, mBuf); + CMCHKPK(oduUnpackUInt8, param->ciphAlgoType, mBuf); + CMCHKPK(oduUnpackUInt8, param->intgAlgoType, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -644,11 +644,11 @@ Buffer *mBuf; CMCHKPK(cmPkCtfNhKeyInfo , ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->keyDerType, mBuf); + CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -695,7 +695,7 @@ CtfKdfReqInfo* kdfReqInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) { @@ -707,7 +707,7 @@ CtfKdfReqInfo* kdfReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == ODU_SELECTOR_LWLC) { @@ -721,7 +721,7 @@ CtfKdfReqInfo* kdfReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -732,7 +732,7 @@ CtfKdfReqInfo* kdfReqInfo; #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) { @@ -743,11 +743,11 @@ CtfKdfReqInfo* kdfReqInfo; (ErrVal)ECTF021, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTCTFKDFREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #endif @@ -771,11 +771,11 @@ Buffer *mBuf; { for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--) { - CMCHKPK(SPkU32,(U32)param->vendorSpecifcParam[i], mBuf); + CMCHKPK(oduUnpackUInt32,(U32)param->vendorSpecifcParam[i], mBuf); } } - CMCHKPK(SPkU16, param->numOfVendorSpecifcParam, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->numOfVendorSpecifcParam, mBuf); + return ROK; } #ifdef ANSI @@ -792,14 +792,14 @@ Buffer *mBuf; { TRC3(cmPkCtfCtfCnmCellSyncReq); - CMCHKPK(SPkU16, param->nbrEarfcn, mBuf); - CMCHKPK(SPkU16, param->nbrPCellId, mBuf); - CMCHKPK(SPkU8, param->nbrTxAntCount, mBuf); - CMCHKPK(SPkU8, param->nbrCellCp, mBuf); - CMCHKPK(SPkU8, param->nbrCellNRb, mBuf); - CMCHKPK(SPkU8, param->nbrSpecSfCfg, mBuf); + CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf); + CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrCellCp, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrCellNRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->nbrSpecSfCfg, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -818,10 +818,10 @@ Buffer *mBuf; S32 i; TRC3(cmPkCtfcfgReqInfo); - CMCHKPK(SPkU8, param->searchType, mBuf); - CMCHKPK(SPkU8, param->mibRequest, mBuf); - CMCHKPK(SPkU16, param->earfcn, mBuf); - CMCHKPK(SPkU8, param->measBandWidth, mBuf); + CMCHKPK(oduUnpackUInt8, param->searchType, mBuf); + CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf); + CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf); + CMCHKPK(oduUnpackUInt8, param->measBandWidth, mBuf); if(param->numOfPciList <= CTF_CNM_MAX_CELL_SEARCH) { for(i= param->numOfPciList-1; i >= 0; i--) @@ -829,8 +829,8 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf); } } - CMCHKPK(SPkU16, param->numOfPciList, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->numOfPciList, mBuf); + return ROK; } #ifdef ANSI @@ -848,12 +848,12 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkCtfCnmVendorSpecificInfo); - CMCHKUNPK(SUnpkU16, ¶m->numOfVendorSpecifcParam, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfVendorSpecifcParam, mBuf); for(i=0; (inumOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++) { - CMCHKUNPK(SUnpkU32, ¶m->vendorSpecifcParam[i], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->vendorSpecifcParam[i], mBuf); } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -872,13 +872,13 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrSpecSfCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrCellNRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrCellCp, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nbrTxAntCount, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->nbrPCellId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->nbrEarfcn, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->nbrSpecSfCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nbrCellNRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nbrCellCp, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nbrTxAntCount, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->nbrPCellId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->nbrEarfcn, mBuf); + return ROK; } @@ -897,17 +897,17 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkCtfsyncReqInfo); - CMCHKUNPK(SUnpkU16, ¶m->numOfPciList, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfPciList, mBuf); for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) { CMCHKUNPK(cmUnpkCtfCtfCnmCellSyncReq, ¶m->pciList[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->measBandWidth, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->earfcn, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mibRequest, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->searchType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->measBandWidth, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mibRequest, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->searchType, mBuf); + return ROK; } /** * @brief Configuration Request from App to CL for @@ -953,7 +953,7 @@ CtfCnmCellSyncReq * cfgReqInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfCtfCnmCellSyncReq(cfgReqInfo, mBuf) != ROK) { @@ -965,12 +965,12 @@ CtfCnmCellSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -979,7 +979,7 @@ CtfCnmCellSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -992,7 +992,7 @@ CtfCnmCellSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1003,13 +1003,13 @@ CtfCnmCellSyncReq * cfgReqInfo; #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)); } /** @@ -1054,7 +1054,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1064,7 +1064,7 @@ Buffer *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) { @@ -1075,13 +1075,13 @@ Buffer *mBuf; (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) @@ -1094,10 +1094,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, SyncReqMsg)); + return ((*func)(pst, spId, &transId, SyncReqMsg)); } /*-----------------------------------------------------*/ @@ -1146,7 +1146,7 @@ CtfCnmInitSyncReq * cfgReqInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfcfgReqInfo(cfgReqInfo, mBuf) != ROK) { @@ -1158,12 +1158,12 @@ CtfCnmInitSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -1172,7 +1172,7 @@ CtfCnmInitSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1185,7 +1185,7 @@ CtfCnmInitSyncReq * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1196,13 +1196,13 @@ CtfCnmInitSyncReq * cfgReqInfo; #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)); } /*-----------------------------------------------------------------*/ @@ -1249,7 +1249,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1259,7 +1259,7 @@ Buffer *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) { @@ -1270,13 +1270,13 @@ Buffer *mBuf; (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) @@ -1289,10 +1289,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncReqInfo)); + return ((*func)(pst, spId, &transId, syncReqInfo)); } /*-----------------------------------------------------------------------------*/ @@ -1310,12 +1310,12 @@ Buffer *mBuf; { TRC3(cmPkCtfctfCnmMibInfo) - CMCHKPK(SPkU16, param->sfn, mBuf); - CMCHKPK(SPkU8, param->numTxAntennas, mBuf); - CMCHKPK(SPkU8, param->phichDuration, mBuf); - CMCHKPK(SPkU8, param->phichResource, mBuf); - CMCHKPK(SPkU8, param->dlSystemBandWidht, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); + CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf); + CMCHKPK(oduUnpackUInt8, param->phichDuration, mBuf); + CMCHKPK(oduUnpackUInt8, param->phichResource, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlSystemBandWidht, mBuf); + return ROK; } @@ -1333,13 +1333,13 @@ Buffer *mBuf; { TRC3(cmPkCtfctfCnmInitSyncInfo) - CMCHKPK(SPkU16, param->pci, mBuf); - CMCHKPK(SPkU8, param->rsrp, mBuf); - CMCHKPK(SPkU8, param->mibValidFlag, mBuf); - CMCHKPK(SPkU16, param->localSfn, mBuf); + CMCHKPK(oduUnpackUInt16, param->pci, mBuf); + CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); + CMCHKPK(oduUnpackUInt8, param->mibValidFlag, mBuf); + CMCHKPK(oduUnpackUInt16, param->localSfn, mBuf); CMCHKPK(cmPkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1359,8 +1359,8 @@ Buffer *mBuf; TRC3(cmPkCtfcfgRspInfo) - CMCHKPK(SPkU8, param->status, mBuf); - CMCHKPK(SPkU16, param->earfcn, mBuf); + CMCHKPK(oduUnpackUInt8, param->status, mBuf); + CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf); if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH) { for(i= param->numOfNeighbourInfo-1; i >= 0; i--) @@ -1368,8 +1368,8 @@ Buffer *mBuf; CMCHKPK(cmPkCtfctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf); } } - CMCHKPK(SPkU8, param->numOfNeighbourInfo, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numOfNeighbourInfo, mBuf); + return ROK; } @@ -1415,7 +1415,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfcfgRspInfo(cfgRspInfo, mBuf) != ROK) { @@ -1427,12 +1427,12 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -1441,7 +1441,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1454,7 +1454,7 @@ CtfCnmInitSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1465,13 +1465,13 @@ CtfCnmInitSyncRsp * cfgRspInfo; #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)); } /*-----------------------------------------------------------------------------*/ @@ -1491,12 +1491,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfctfCnmMibInfo); - CMCHKUNPK(SUnpkU8, ¶m->dlSystemBandWidht, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phichResource, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phichDuration, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numTxAntennas, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sfn, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dlSystemBandWidht, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phichResource, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phichDuration, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numTxAntennas, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); + return ROK; } @@ -1516,11 +1516,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, ¶m->ctfCnmMibInfo, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->localSfn, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mibValidFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rsrp, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pci, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->localSfn, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mibValidFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); + return ROK; } @@ -1540,14 +1540,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfCnmInitSyncRspMsg); - CMCHKUNPK(SUnpkU8, ¶m->numOfNeighbourInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numOfNeighbourInfo, mBuf); for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) { CMCHKUNPK(cmUnpkctfCnmInitSyncInfo, ¶m->ctfCnmInitSyncInfo[i], mBuf); } - CMCHKUNPK(SUnpkU16, ¶m->earfcn, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->status, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->earfcn, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + return ROK; } /** @@ -1592,7 +1592,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1602,7 +1602,7 @@ Buffer *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) { @@ -1613,13 +1613,13 @@ Buffer *mBuf; (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) @@ -1632,10 +1632,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncRspInfo)); + return ((*func)(pst, spId, &transId, syncRspInfo)); } /*-----------------------------------------------------------------------*/ @@ -1655,8 +1655,8 @@ Buffer *mBuf; TRC3(cmPkCtfCellSyncRsp) - CMCHKPK(SPkU8, param->status, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->status, mBuf); + return ROK; } /** @@ -1702,7 +1702,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfCellSyncRsp(cfgRspInfo, mBuf) != ROK) { @@ -1714,12 +1714,12 @@ CtfCnmCellSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -1728,7 +1728,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1741,7 +1741,7 @@ CtfCnmCellSyncRsp * cfgRspInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1752,13 +1752,13 @@ CtfCnmCellSyncRsp * cfgRspInfo; #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)); } @@ -1779,8 +1779,8 @@ Buffer *mBuf; TRC3(cmUnpkCtfCnmSyncRspMsg); - CMCHKUNPK(SUnpkU8, ¶m->status, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + return ROK; } /** @@ -1825,7 +1825,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -1835,7 +1835,7 @@ Buffer *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) { @@ -1846,13 +1846,13 @@ Buffer *mBuf; (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) @@ -1865,10 +1865,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncRspMsg)); + return ((*func)(pst, spId, &transId, syncRspMsg)); } /*---------------------------------------------------------------*/ @@ -1888,9 +1888,9 @@ Buffer *mBuf; TRC3(cmPkCtfcfgIndInfo); - CMCHKPK(SPkU8, param->status, mBuf); + CMCHKPK(oduUnpackUInt8, param->status, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -1936,7 +1936,7 @@ CtfCnmCellSyncInd * cfgIndInfo; (ErrVal)ECTF016, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfcfgIndInfo(cfgIndInfo, mBuf) != ROK) { @@ -1948,12 +1948,12 @@ CtfCnmCellSyncInd * cfgIndInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -1962,7 +1962,7 @@ CtfCnmCellSyncInd * cfgIndInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1975,7 +1975,7 @@ CtfCnmCellSyncInd * cfgIndInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1986,13 +1986,13 @@ CtfCnmCellSyncInd * cfgIndInfo; #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)); } @@ -2014,8 +2014,8 @@ Buffer *mBuf; TRC3(cmUnpkCtfCnmSyncIndMsg); CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->status, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); + return ROK; } /** @@ -2060,7 +2060,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2070,7 +2070,7 @@ Buffer *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) { @@ -2081,13 +2081,13 @@ Buffer *mBuf; (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) @@ -2100,10 +2100,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, &transId, syncIndMsg)); + return ((*func)(pst, spId, &transId, syncIndMsg)); } @@ -2156,7 +2156,7 @@ CtfCfgReqInfo* cfgReqInfo; (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) { @@ -2168,11 +2168,11 @@ CtfCfgReqInfo* cfgReqInfo; #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, @@ -2181,7 +2181,7 @@ CtfCfgReqInfo* cfgReqInfo; #endif cmRelCtfCfgReq(pst, cfgReqInfo); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -2193,7 +2193,7 @@ CtfCfgReqInfo* cfgReqInfo; #endif cmRelCtfCfgReq(pst, cfgReqInfo); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2204,13 +2204,13 @@ CtfCfgReqInfo* cfgReqInfo; #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 @@ -2249,13 +2249,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfNhKeyInfo) - CMCHKUNPK(SUnpkU16, ¶m->dlCarrFreq, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2293,13 +2293,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfKenbStarInfo) - CMCHKUNPK(SUnpkU16, ¶m->dlCarrFreq, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } @@ -2338,13 +2338,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfAskeyInfo) - CMCHKUNPK(SUnpkU8, ¶m->intgAlgoType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ciphAlgoType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->intgAlgoType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ciphAlgoType, mBuf); for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2380,7 +2380,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfKdfReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->keyDerType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) { case CTF_KDF_TYPE1: @@ -2393,9 +2393,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfNhKeyInfo, ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -2441,7 +2441,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -2452,7 +2452,7 @@ Buffer *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) { @@ -2464,15 +2464,15 @@ Buffer *mBuf; (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) @@ -2485,10 +2485,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, kdfReqInfo)); + return ((*func)(pst, spId, transId, kdfReqInfo)); } #endif @@ -2537,7 +2537,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF022, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -2547,7 +2547,7 @@ Buffer *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) { @@ -2558,13 +2558,13 @@ Buffer *mBuf; (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) @@ -2577,10 +2577,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, cfgReqInfo)); + return ((*func)(pst, spId, transId, cfgReqInfo)); } #ifdef TENB_AS_SECURITY @@ -2621,9 +2621,9 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2663,9 +2663,9 @@ Buffer *mBuf; for(idx=31;idx>=0;idx--) { - CMCHKPK(SPkU8,param->secKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } @@ -2706,17 +2706,17 @@ Buffer *mBuf; for(idx=15;idx>=0;idx--) { - CMCHKPK(SPkU8,param->cpCiphKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf); } for(idx=15;idx>=0;idx--) { - CMCHKPK(SPkU8,param->upCiphKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->upCiphKey[idx],mBuf); } for(idx=15;idx>=0;idx--) { - CMCHKPK(SPkU8,param->intKey[idx],mBuf); + CMCHKPK(oduUnpackUInt8,param->intKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -2764,10 +2764,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfNhKeyCfmInfo, ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->keyDerType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf); + return ROK; } /** @@ -2812,10 +2812,10 @@ U8 status; (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2824,7 +2824,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfKdfCfmInfo(kdfCfmInfo, mBuf) != ROK) { @@ -2836,7 +2836,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -2848,7 +2848,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { @@ -2860,7 +2860,7 @@ U8 status; #endif SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)kdfCfmInfo, sizeof(CtfKdfCfmInfo)) != ROK) @@ -2872,11 +2872,11 @@ U8 status; (ErrVal)ECTF021, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFKDFCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #endif @@ -2920,9 +2920,9 @@ U8 status; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2930,7 +2930,7 @@ U8 status; (ErrVal)ECTF027, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2940,7 +2940,7 @@ U8 status; (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -2950,10 +2950,10 @@ U8 status; (ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -2993,7 +2993,7 @@ CtfCfgTransId transId; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF026, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3003,7 +3003,7 @@ CtfCfgTransId transId; (ErrVal)ECTF028, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3013,10 +3013,10 @@ CtfCfgTransId transId; (ErrVal)ECTF029, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTCTFENBSTOPIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #ifdef TENB_AS_SECURITY @@ -3057,9 +3057,9 @@ Buffer *mBuf; for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -3099,9 +3099,9 @@ Buffer *mBuf; for(idx=0;idx<32;idx++) { - CMCHKUNPK(SUnpkU8,¶m->secKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } @@ -3142,17 +3142,17 @@ Buffer *mBuf; for(idx=0;idx<16;idx++) { - CMCHKUNPK(SUnpkU8,¶m->intKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->intKey[idx],mBuf); } for(idx=0;idx<16;idx++) { - CMCHKUNPK(SUnpkU8,¶m->upCiphKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->upCiphKey[idx],mBuf); } for(idx=0;idx<16;idx++) { - CMCHKUNPK(SUnpkU8,¶m->cpCiphKey[idx],mBuf); + CMCHKUNPK(oduPackUInt8,¶m->cpCiphKey[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -3188,7 +3188,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfKdfCfmInfo) - CMCHKUNPK(SUnpkU8, ¶m->keyDerType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) { case CTF_KDF_TYPE1: @@ -3201,9 +3201,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfNhKeyCfmInfo, ¶m->u.nhKeyInf, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** @@ -3249,7 +3249,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3259,7 +3259,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfKdfCfmInfo(&kdfCfmInfo, mBuf) != ROK) { SPutMsg(mBuf); @@ -3269,10 +3269,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3280,10 +3280,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF032, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId,&kdfCfmInfo, status)); + return ((*func)(pst, suId, transId,&kdfCfmInfo, status)); } #endif @@ -3330,7 +3330,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3340,9 +3340,9 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -3350,10 +3350,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF032, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, status)); + return ((*func)(pst, suId, transId, status)); } /** @@ -3396,7 +3396,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3406,10 +3406,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF031, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId)); + return ((*func)(pst, suId, transId)); } @@ -3458,7 +3458,7 @@ CtfUeInfo * newUeInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkCtfUeInfo(newUeInfo, mBuf) != ROK) { @@ -3471,11 +3471,11 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -3485,7 +3485,7 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (pst->selector == ODU_SELECTOR_LC) { @@ -3499,11 +3499,11 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -3513,7 +3513,7 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -3526,7 +3526,7 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3538,7 +3538,7 @@ CtfUeInfo * newUeInfo; SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) { @@ -3549,7 +3549,7 @@ CtfUeInfo * newUeInfo; (ErrVal)ECTF040, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3559,11 +3559,11 @@ CtfUeInfo * newUeInfo; (ErrVal)ECTF041, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTCTFUEIDCHGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3611,7 +3611,7 @@ Buffer *mBuf; (Txt*)& __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF042, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3621,7 +3621,7 @@ Buffer *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) { @@ -3632,13 +3632,13 @@ Buffer *mBuf; (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) @@ -3651,7 +3651,7 @@ Buffer *mBuf; (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) { @@ -3663,13 +3663,13 @@ Buffer *mBuf; #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) @@ -3683,10 +3683,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF047, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, ueInfo, newUeInfo)); + return ((*func)(pst, spId, transId, ueInfo, newUeInfo)); } @@ -3734,7 +3734,7 @@ CmStatus status; (ErrVal)ECTF048, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkCmStatus(&status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3745,7 +3745,7 @@ CmStatus status; #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) { @@ -3757,11 +3757,11 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == 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, @@ -3770,7 +3770,7 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) { @@ -3782,7 +3782,7 @@ CmStatus status; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3793,7 +3793,7 @@ CmStatus status; #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) { @@ -3804,11 +3804,11 @@ CmStatus status; (ErrVal)ECTF054, (ErrVal)0, (Txt*)&"Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTCTFUEIDCHGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3856,7 +3856,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF055, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3866,7 +3866,7 @@ Buffer *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) { @@ -3877,13 +3877,13 @@ Buffer *mBuf; (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) @@ -3896,7 +3896,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF058, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCmStatus(&status, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)); @@ -3907,10 +3907,10 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF059, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, ueInfo, status)); + return ((*func)(pst, suId, transId, ueInfo, status)); } @@ -3946,9 +3946,9 @@ Buffer *mBuf; TRC3(cmPkCtfCfgTransId) for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->trans[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -3985,9 +3985,9 @@ Buffer *mBuf; TRC3(cmUnpkCtfCfgTransId) for (i=0; itrans[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4024,7 +4024,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4061,7 +4061,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4098,11 +4098,11 @@ Buffer *mBuf; TRC3(cmPkCtfBwCfgInfo) - CMCHKPK(SPkU8, param->eUtraBand, mBuf); - CMCHKPK(SPkU32, param->ulBw, mBuf); - CMCHKPK(SPkU32, param->dlBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf); + CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf); + CMCHKPK(oduUnpackUInt32, param->dlBw, mBuf); /* ctf_c_001.main_4: Removed packing of param->pres */ - RETVALUE(ROK); + return ROK; } @@ -4141,12 +4141,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfBwCfgInfo) /* ctf_c_001.main_4: Removed UnPacking of param->pres */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->dlBw = (CtfBandwidth)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ulBw = (CtfBandwidth)tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->eUtraBand, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->eUtraBand, mBuf); + return ROK; } @@ -4182,11 +4182,11 @@ Buffer *mBuf; TRC3(cmPkCtfTxSchemeCfg) - CMCHKPK(SPkU32, param->cycPfx, mBuf); - CMCHKPK(SPkU32, param->scSpacing, mBuf); - CMCHKPK(SPkU32, param->duplexMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf); + CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf); + CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf); /* ctf_c_001.main_4: Removed packing of param->pres */ - RETVALUE(ROK); + return ROK; } @@ -4224,13 +4224,13 @@ Buffer *mBuf; TRC3(cmUnpkCtfTxSchemeCfg) /* ctf_c_001.main_4: Removed UnPacking of param->pres */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->duplexMode = (CtfDuplexMode)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->scSpacing = (CtfSCSpacing)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->cycPfx = (CtfCPCfg)tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -4267,8 +4267,8 @@ Buffer *mBuf; TRC3(cmPkCtfAntennaCfgInfo) - CMCHKPK(SPkU32, param->antPortsCnt, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf); + return ROK; } @@ -4305,9 +4305,9 @@ Buffer *mBuf; U32 tmpEnum; TRC3(cmUnpkCtfAntennaCfgInfo) - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -4353,14 +4353,14 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->prachFreqOffset, mBuf); - CMCHKPK(SPkU8, param->highSpeedFlag, mBuf); - CMCHKPK(SPkU8, param->zeroCorrelationZoneCfg, mBuf); - CMCHKPK(SPkU8, param->prachCfgIndex, mBuf); - CMCHKPK(SPkU16, param->rootSequenceIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachFreqOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->highSpeedFlag, mBuf); + CMCHKPK(oduUnpackUInt8, param->zeroCorrelationZoneCfg, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachCfgIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->rootSequenceIndex, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4403,17 +4403,17 @@ Buffer *mBuf; TRC3(cmUnpkCtfPrachCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU16, ¶m->rootSequenceIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachCfgIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->zeroCorrelationZoneCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->highSpeedFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachFreqOffset, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rootSequenceIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachCfgIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->zeroCorrelationZoneCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->highSpeedFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachFreqOffset, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4452,11 +4452,11 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->p_b, mBuf); + CMCHKPK(oduUnpackUInt8, param->p_b, mBuf); CMCHKPK(SPkS16, param->refSigPwr, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4493,14 +4493,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfPdschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { CMCHKUNPK(SUnpkS16, ¶m->refSigPwr, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->p_b, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->p_b, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4537,11 +4537,11 @@ Buffer *mBuf; TRC3(cmPkCtfPuschCfgBasic) - CMCHKPK(SPkU8, param->enable64QAM, mBuf); - CMCHKPK(SPkU8, param->hoppingOffset, mBuf); - CMCHKPK(SPkU32, param->hoppingMode, mBuf); - CMCHKPK(SPkU8, param->noOfsubBands, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf); + CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->noOfsubBands, mBuf); + return ROK; } @@ -4579,12 +4579,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfPuschCfgBasic) - CMCHKUNPK(SUnpkU8, ¶m->noOfsubBands, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->noOfsubBands, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->hoppingMode = (CtfPuschHoppingMode)tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->hoppingOffset, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->enable64QAM, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingOffset, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->enable64QAM, mBuf); + return ROK; } @@ -4621,11 +4621,11 @@ Buffer *mBuf; TRC3(cmPkCtfPuschUlRS) - CMCHKPK(SPkU8, param->cycShift, mBuf); - CMCHKPK(SPkU8, param->grpNum, mBuf); - CMCHKPK(SPkU8, param->seqHopEnabled, mBuf); - CMCHKPK(SPkU8, param->grpHopEnabled, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf); + CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->grpHopEnabled, mBuf); + return ROK; } @@ -4662,11 +4662,11 @@ Buffer *mBuf; TRC3(cmUnpkCtfPuschUlRS) - CMCHKUNPK(SUnpkU8, ¶m->grpHopEnabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->seqHopEnabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->grpNum, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cycShift, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->grpHopEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->seqHopEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->grpNum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cycShift, mBuf); + return ROK; } @@ -4709,8 +4709,8 @@ Buffer *mBuf; CMCHKPK(cmPkCtfPuschUlRS, ¶m->puschUlRS, mBuf); CMCHKPK(cmPkCtfPuschCfgBasic, ¶m->puschBasicCfg, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4747,14 +4747,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfPuschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { CMCHKUNPK(cmUnpkCtfPuschCfgBasic, ¶m->puschBasicCfg, mBuf); CMCHKUNPK(cmUnpkCtfPuschUlRS, ¶m->puschUlRS, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -4794,11 +4794,11 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU32, param->resource, mBuf); - CMCHKPK(SPkU32, param->duration, mBuf); + CMCHKPK(oduUnpackUInt32, param->resource, mBuf); + CMCHKPK(oduUnpackUInt32, param->duration, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4836,16 +4836,16 @@ Buffer *mBuf; TRC3(cmUnpkCtfPhichCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->duration = (CtfPhichDuration)tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->resource = (CtfPhichResource)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -4885,13 +4885,13 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU32, param->deltaShift, mBuf); - CMCHKPK(SPkU16, param->n1PUCCH, mBuf); - CMCHKPK(SPkU8, param->nCS, mBuf); - CMCHKPK(SPkU8, param->nRB, mBuf); + CMCHKPK(oduUnpackUInt32, param->deltaShift, mBuf); + CMCHKPK(oduUnpackUInt16, param->n1PUCCH, mBuf); + CMCHKPK(oduUnpackUInt8, param->nCS, mBuf); + CMCHKPK(oduUnpackUInt8, param->nRB, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4929,17 +4929,17 @@ Buffer *mBuf; TRC3(cmUnpkCtfPucchCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->nRB, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nCS, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->n1PUCCH, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nRB, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nCS, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->n1PUCCH, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->deltaShift = (CtfPucchDeltaShift)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -4979,14 +4979,14 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->srsSetup.srsMaxUpPts, mBuf); - CMCHKPK(SPkU8, param->srsSetup.srsANSimultTx, mBuf); - CMCHKPK(SPkU8, param->srsSetup.sfCfg, mBuf); - CMCHKPK(SPkU8, param->srsSetup.srsBw, mBuf); - CMCHKPK(SPkU8, param->srsCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.srsMaxUpPts, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.srsANSimultTx, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.sfCfg, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsSetup.srsBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5023,17 +5023,17 @@ Buffer *mBuf; TRC3(cmUnpkCtfSrsUlCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->srsCfgType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.sfCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsANSimultTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsSetup.srsMaxUpPts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsCfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.sfCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsANSimultTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsSetup.srsMaxUpPts, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5073,11 +5073,11 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->spclSfPatterns, mBuf); - CMCHKPK(SPkU8, param->sfAssignment, mBuf); + CMCHKPK(oduUnpackUInt8, param->spclSfPatterns, mBuf); + CMCHKPK(oduUnpackUInt8, param->sfAssignment, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } /* ctf_c_001.main_4: Added support for vendor specific parameters */ @@ -5116,9 +5116,9 @@ Buffer *mBuf; if( param->buffLen != 0) { SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf); } - CMCHKPK(SPkU16,param->buffLen,mBuf); + CMCHKPK(oduUnpackUInt16,param->buffLen,mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5155,7 +5155,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfVendorSpecParams) - CMCHKUNPK(SUnpkU16, ¶m->buffLen, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->buffLen, mBuf); if(param->buffLen != 0) { if ((SGetSBuf(pst->region, pst->pool, (Data **)¶m->paramBuffer, param->buffLen)) != ROK) { @@ -5164,7 +5164,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF060, (ErrVal)0, (Txt*)&"Unpacking failed"); #endif - RETVALUE(RFAILED) ; + return RFAILED ; } SRemPreMsgMult(param->paramBuffer, param->buffLen,mBuf) ; } @@ -5172,7 +5172,7 @@ Buffer *mBuf; param->paramBuffer = NULLP ; } - RETVALUE(ROK); + return ROK; } #endif @@ -5208,14 +5208,14 @@ Buffer *mBuf; TRC3(cmUnpkCtfTddSfCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->sfAssignment, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->spclSfPatterns, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sfAssignment, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->spclSfPatterns, mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -5249,24 +5249,24 @@ Buffer *mBuf; TRC3(cmPkCtfUnLicnsdCellParam) CMCHKPK(SPkS32, param->txPowerLimit, mBuf); - CMCHKPK(SPkU8, param->coExistMethod, mBuf); - CMCHKPK(SPkU8, param->lteOnPeriod, mBuf); - CMCHKPK(SPkU8, param->ccaMethod, mBuf); - CMCHKPK(SPkU8, param->adaptiveTx, mBuf); - CMCHKPK(SPkU16, param->transPeriod, mBuf); - CMCHKPK(SPkU16, param->listenPrd, mBuf); + CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf); + CMCHKPK(oduUnpackUInt8, param->lteOnPeriod, mBuf); + CMCHKPK(oduUnpackUInt8, param->ccaMethod, mBuf); + CMCHKPK(oduUnpackUInt8, param->adaptiveTx, mBuf); + CMCHKPK(oduUnpackUInt16, param->transPeriod, mBuf); + CMCHKPK(oduUnpackUInt16, param->listenPrd, mBuf); CMCHKPK(SPkS16, param->energyTh, mBuf); - CMCHKPK(SPkU16, param->scanTimePrd, mBuf); - CMCHKPK(SPkU16, param->activityTh, mBuf); + CMCHKPK(oduUnpackUInt16, param->scanTimePrd, mBuf); + CMCHKPK(oduUnpackUInt16, param->activityTh, mBuf); for(idx = 0; idx < param->numFreq; idx++) { - CMCHKPK(SPkU32, param->earfcn[idx], mBuf); + CMCHKPK(oduUnpackUInt32, param->earfcn[idx], mBuf); } - CMCHKPK(SPkU8, param->numFreq, mBuf); + CMCHKPK(oduUnpackUInt8, param->numFreq, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5305,76 +5305,76 @@ Buffer *mBuf; #ifdef EMTC_ENABLE for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); - CMCHKPK(SPkU8, param->ceLevelInfo[i].lastPreamble, mBuf); - CMCHKPK(SPkU8, param->ceLevelInfo[i].firstPreamble, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].lastPreamble, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].firstPreamble, mBuf); } - CMCHKPK(SPkU8, param->mPdcchStart, mBuf); - CMCHKPK(SPkU8, param->catMenabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->mPdcchStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->catMenabled, mBuf); #endif if(param->unLicnsdCfgPres) { printf("pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres); CMCHKPK(cmPkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf); } - CMCHKPK(SPkU8, param->unLicnsdCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->unLicnsdCfgPres, mBuf); /*Added for rgu dynamic delta*/ - CMCHKPK(SPkU8, param->numDlUePerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->numDlUePerTti, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); - CMCHKPK(SPkU16, param->ulEarfcn, mBuf); - CMCHKPK(SPkU16, param->dlEarfcn, mBuf); + CMCHKPK(oduUnpackUInt16, param->ulEarfcn, mBuf); + CMCHKPK(oduUnpackUInt16, param->dlEarfcn, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); /* Packing PHY configuration parameters */ - CMCHKPK(SPkU32, param->period, mBuf); - CMCHKPK(SPkU32, param->counter, mBuf); - CMCHKPK(SPkU16, param->opMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->period, mBuf); + CMCHKPK(oduUnpackUInt32, param->counter, mBuf); + CMCHKPK(oduUnpackUInt16, param->opMode, mBuf); /* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/ - CMCHKPK(SPkU8, param->rachSrRepModePres, mBuf); - CMCHKPK(SPkU16, param->rachSrRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf); - CMCHKPK(SPkU8, param->dataRepModePres, mBuf); - CMCHKPK(SPkU16, param->dataRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf); - CMCHKPK(SPkU8, param->phySyncModePres, mBuf); - CMCHKPK(SPkU16, param->phySyncMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf); - CMCHKPK(SPkU8, param->rxAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->rxAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->txAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->txAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->pucchProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->pucchProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->puschProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->puschProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->srsDopEstFactorPres, mBuf); - CMCHKPK(SPkU16, param->srsDopEstFactor, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio0Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio0, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio4Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio4, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf); - CMCHKPK(SPkU8, param->pucchNoiseGammaPres, mBuf); - CMCHKPK(SPkU16, param->pucchNoiseGamma, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf); - CMCHKPK(SPkU8, param->extWinMarginPres, mBuf); - CMCHKPK(SPkU16, param->extWinMargin, mBuf); + CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf); - CMCHKPK(SPkU8, param->dciPowOsPres, mBuf); - CMCHKPK(SPkU16, param->dciPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf); - CMCHKPK(SPkU8, param->cfiPowOsPres, mBuf); - CMCHKPK(SPkU16, param->cfiPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf); - CMCHKPK(SPkU8, param->syncSigPowOsPres, mBuf); - CMCHKPK(SPkU16, param->syncSigPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf); CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); @@ -5386,15 +5386,15 @@ Buffer *mBuf; CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf); - CMCHKPK(SPkU8, param->physCellId, mBuf); - CMCHKPK(SPkU8, param->physCellIdPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf); CMCHKPK(SPkS16, param->macSapId, mBuf); CMCHKPK(SPkS16, param->schSapId, mBuf); - CMCHKPK(SPkU8, param->cellIdGrpId, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -5427,25 +5427,25 @@ Buffer *mBuf; TRC3(cmPkCtfUnLicnsdCellParam) - CMCHKUNPK(SUnpkU8, ¶m->numFreq, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numFreq, mBuf); for(idx = 0; idx < param->numFreq; idx++) { - CMCHKUNPK(SUnpkU32, ¶m->earfcn[idx], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->earfcn[idx], mBuf); } - CMCHKUNPK(SUnpkU16, ¶m->activityTh, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->scanTimePrd, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->activityTh, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->scanTimePrd, mBuf); CMCHKUNPK(SUnpkS16, ¶m->energyTh, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->listenPrd, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->transPeriod, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->adaptiveTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ccaMethod, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->lteOnPeriod, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->coExistMethod, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->listenPrd, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->transPeriod, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->adaptiveTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ccaMethod, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lteOnPeriod, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->coExistMethod, mBuf); CMCHKUNPK(SUnpkS32, ¶m->txPowerLimit, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5485,13 +5485,13 @@ Buffer *mBuf; /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cellIdGrpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdGrpId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->schSapId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->macSapId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellIdPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf); CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf); CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); @@ -5503,63 +5503,63 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->syncSigPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->syncSigPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cfiPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cfiPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dciPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->extWinMargin, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->extWinMarginPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchNoiseGamma, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchNoiseGammaPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio4, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio4Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio0, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio0Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->srsDopEstFactor, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsDopEstFactorPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->puschProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->puschProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->txAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rxAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rxAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->phySyncMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phySyncModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dataRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dataRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rachSrRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rachSrRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf); /* UnPacking PHY configuration parameters */ - CMCHKUNPK(SUnpkU16, ¶m->opMode, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->counter, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->period, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->opMode, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->counter, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->period, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dlEarfcn, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->ulEarfcn, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dlEarfcn, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->ulEarfcn, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); /* Added for rgu dynamic delta change*/ - CMCHKUNPK(SUnpkU8, ¶m->numDlUePerTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->unLicnsdCfgPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numDlUePerTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->unLicnsdCfgPres, mBuf); if(param->unLicnsdCfgPres) { @@ -5567,16 +5567,16 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfUnLicnsdCellParam, ¶m->lteUCfg, mBuf); } #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8, ¶m->catMenabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mPdcchStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->catMenabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mPdcchStart, mBuf); for (i = 0; i < CTF_MAX_CE_LEVEL; i++) { - CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].firstPreamble, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].lastPreamble, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].firstPreamble, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].lastPreamble, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf); } #endif - RETVALUE(ROK); + return ROK; } @@ -5616,57 +5616,57 @@ Buffer *mBuf; TRC3(cmPkCtfCellRecfgInfo) #ifdef ENABLE_API_LOG - CMCHKPK(SPkU8, param->enableAPILog, mBuf); + CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf); #endif /* ENABLE_API_LOG */ /* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/ CMCHKPK(SPkS16, param->secSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); - CMCHKPK(SPkU8, param->rachSrRepModePres, mBuf); - CMCHKPK(SPkU16, param->rachSrRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf); - CMCHKPK(SPkU8, param->dataRepModePres, mBuf); - CMCHKPK(SPkU16, param->dataRepMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf); - CMCHKPK(SPkU8, param->phySyncModePres, mBuf); - CMCHKPK(SPkU16, param->phySyncMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf); + CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf); - CMCHKPK(SPkU8, param->rxAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->rxAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->txAntennaPortsPres, mBuf); - CMCHKPK(SPkU16, param->txAntennaPorts, mBuf); + CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf); - CMCHKPK(SPkU8, param->pucchProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->pucchProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->puschProbDtxAckPres, mBuf); - CMCHKPK(SPkU16, param->puschProbDtxAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf); - CMCHKPK(SPkU8, param->srsDopEstFactorPres, mBuf); - CMCHKPK(SPkU16, param->srsDopEstFactor, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio0Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio0, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf); - CMCHKPK(SPkU8, param->prachPkRatio4Pres, mBuf); - CMCHKPK(SPkU16, param->prachPkRatio4, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf); - CMCHKPK(SPkU8, param->pucchNoiseGammaPres, mBuf); - CMCHKPK(SPkU16, param->pucchNoiseGamma, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf); - CMCHKPK(SPkU8, param->extWinMarginPres, mBuf); - CMCHKPK(SPkU16, param->extWinMargin, mBuf); + CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf); - CMCHKPK(SPkU8, param->dciPowOsPres, mBuf); - CMCHKPK(SPkU16, param->dciPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf); - CMCHKPK(SPkU8, param->cfiPowOsPres, mBuf); - CMCHKPK(SPkU16, param->cfiPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf); - CMCHKPK(SPkU8, param->syncSigPowOsPres, mBuf); - CMCHKPK(SPkU16, param->syncSigPowOs, mBuf); + CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf); + CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf); CMCHKPK(cmPkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); CMCHKPK(cmPkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); @@ -5680,12 +5680,12 @@ Buffer *mBuf; CMCHKPK(cmPkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); CMCHKPK(cmPkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKPK(cmPkCtfBwCfgInfo, ¶m->bwCfg, mBuf); - CMCHKPK(SPkU8, param->physCellId, mBuf); - CMCHKPK(SPkU8, param->physCellIdPres, mBuf); - CMCHKPK(SPkU8, param->cellIdGrpId, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkU32, param->ctfReCfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->ctfReCfgType, mBuf); + return ROK; } @@ -5724,12 +5724,12 @@ Buffer *mBuf; TRC3(cmUnpkCtfCellRecfgInfo) /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ctfReCfgType = (CtfReCfgType)tmpEnum; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cellIdGrpId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellIdPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->physCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdGrpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellIdPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->physCellId, mBuf); CMCHKUNPK(cmUnpkCtfBwCfgInfo, ¶m->bwCfg, mBuf); CMCHKUNPK(cmUnpkCtfTxSchemeCfg, ¶m->txCfg, mBuf); CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, ¶m->antennaCfg, mBuf); @@ -5743,59 +5743,59 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, ¶m->srsUlCfg, mBuf); CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, ¶m->tddSfCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->syncSigPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->syncSigPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->syncSigPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->syncSigPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cfiPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cfiPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cfiPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfiPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dciPowOs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciPowOsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dciPowOs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciPowOsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->extWinMargin, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->extWinMarginPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->extWinMargin, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->extWinMarginPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchNoiseGamma, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchNoiseGammaPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchNoiseGamma, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchNoiseGammaPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio4, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio4Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio4, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio4Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prachPkRatio0, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachPkRatio0Pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prachPkRatio0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachPkRatio0Pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->srsDopEstFactor, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srsDopEstFactorPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srsDopEstFactor, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsDopEstFactorPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->puschProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->puschProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->puschProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->puschProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchProbDtxAck, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchProbDtxAckPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchProbDtxAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchProbDtxAckPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->txAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rxAntennaPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rxAntennaPortsPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rxAntennaPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rxAntennaPortsPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->phySyncMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->phySyncModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->phySyncMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->phySyncModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dataRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dataRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dataRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dataRepModePres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rachSrRepMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rachSrRepModePres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rachSrRepMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rachSrRepModePres, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); printf("param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); #ifdef ENABLE_API_LOG - CMCHKUNPK(SUnpkU8, ¶m->enableAPILog, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->enableAPILog, mBuf); #endif /* ENABLE_API_LOG */ - RETVALUE(ROK); + return ROK; } @@ -5834,9 +5834,9 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKPK(SPkU32, param->pA, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->pA, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5873,14 +5873,14 @@ Buffer *mBuf; U32 tmpEnum; TRC3(cmUnpkCtfDedPdschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->pA = (CtfPdschPaParam)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -5924,27 +5924,27 @@ Buffer *mBuf; /*ctf_c_001.main_4:115549: packing tddAckNackFBMode and tddAckNackCfgPres */ if (param->tddAckNackCfgPres != FALSE) { - CMCHKPK(SPkU32, param->tddAckNackFBMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->tddAckNackFBMode, mBuf); } - CMCHKPK(SPkU8, param->tddAckNackCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->tddAckNackCfgPres, mBuf); #endif /* CTF_VER3 */ - CMCHKPK(SPkU16, param->pucchSetup.n1PUCCHRep, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchSetup.n1PUCCHRep, mBuf); #ifdef CTF_VER3 /*ctf_c_001.main_4:115549: packing pucchSetup.repFactPres */ if (param->pucchSetup.repFactPres) { - CMCHKPK(SPkU32, param->pucchSetup.repFact, mBuf); + CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf); } - CMCHKPK(SPkU8, param->pucchSetup.repFactPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchSetup.repFactPres, mBuf); #else - CMCHKPK(SPkU32, param->pucchSetup.repFact, mBuf); + CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf); #endif /* CTF_VER3 */ - CMCHKPK(SPkU8, param->dedPucchCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedPucchCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5981,34 +5981,34 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedPucchCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->dedPucchCfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedPucchCfgType, mBuf); #ifdef CTF_VER3 /* ctf_c_001.main_4:115549: unpacking pucchSetup.repFactPres */ - CMCHKUNPK(SUnpkU8, ¶m->pucchSetup.repFactPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchSetup.repFactPres, mBuf); if (param->pucchSetup.repFactPres) { - CMCHKUNPK(SUnpkU32, (U32 *)¶m->pucchSetup.repFact, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf); } #else - CMCHKUNPK(SUnpkU32, (U32 *)¶m->pucchSetup.repFact, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->pucchSetup.repFact, mBuf); #endif /*CTF_VER3 */ - CMCHKUNPK(SUnpkU16, ¶m->pucchSetup.n1PUCCHRep, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchSetup.n1PUCCHRep, mBuf); #ifdef CTF_VER3 /*ctf_c_001.main_4:115549: unpacking tddAckNackCfgPres and tddAckNackFBMode */ - CMCHKUNPK(SUnpkU8, ¶m->tddAckNackCfgPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tddAckNackCfgPres, mBuf); if (param->tddAckNackCfgPres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)¶m->tddAckNackFBMode, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tddAckNackFBMode, mBuf); } #endif /* CTF_VER3 */ } - RETVALUE(ROK); + return ROK; } @@ -6048,12 +6048,12 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->betaOffsetCqiIdx, mBuf); - CMCHKPK(SPkU8, param->betaOffsetRiIdx, mBuf); - CMCHKPK(SPkU8, param->betaOffsetAckIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->betaOffsetCqiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->betaOffsetRiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->betaOffsetAckIdx, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6090,15 +6090,15 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedPuschCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->betaOffsetAckIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->betaOffsetRiIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->betaOffsetCqiIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetAckIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetRiIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->betaOffsetCqiIdx, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -6137,18 +6137,18 @@ Buffer *mBuf; TRC3(cmPkCtfCqiRptModePeriodic) /* ctf_c_001.main_2: added packning for cqiMask*/ #ifdef CTF_VER1 - CMCHKPK(SPkU32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.cqiMask.pres, mBuf); + CMCHKPK(oduUnpackUInt32, (U32 )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.cqiMask.pres, mBuf); #endif /* CTF_VER1 */ - CMCHKPK(SPkU8, param->cqiSetup.simultaneousAckNack, mBuf); - CMCHKPK(SPkU16, param->cqiSetup.riCfgIndx, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.riCfgPres, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.subbandCqi.k, mBuf); - CMCHKPK(SPkU8, param->cqiSetup.formatIndicator, mBuf); - CMCHKPK(SPkU16, param->cqiSetup.cqiPmiCfgIndx, mBuf); - CMCHKPK(SPkU16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf); - CMCHKPK(SPkU8, param->cqiPeriodicCfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.simultaneousAckNack, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiSetup.riCfgIndx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.riCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.subbandCqi.k, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiSetup.formatIndicator, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPmiCfgIndx, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPeriodicCfgType, mBuf); + return ROK; } @@ -6187,21 +6187,21 @@ Buffer *mBuf; #endif TRC3(cmUnpkCtfCqiRptModePeriodic) - CMCHKUNPK(SUnpkU8, ¶m->cqiPeriodicCfgType, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.cqiPmiCfgIndx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.formatIndicator, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.subbandCqi.k, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.riCfgPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiSetup.riCfgIndx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.simultaneousAckNack, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPeriodicCfgType, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.cqiPUCCHRsrcIndx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.cqiPmiCfgIndx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.formatIndicator, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.subbandCqi.k, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.riCfgPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiSetup.riCfgIndx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.simultaneousAckNack, mBuf); /* ctf_c_001.main_2: added Unpackning for cqiMask*/ #ifdef CTF_VER1 - CMCHKUNPK(SUnpkU8, ¶m->cqiSetup.cqiMask.pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiSetup.cqiMask.pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->cqiSetup.cqiMask.cqiMaskSetup = tmpEnum; #endif /* CTF_VER1 */ - RETVALUE(ROK); + return ROK; } @@ -6248,15 +6248,15 @@ Buffer *mBuf; */ if(param->reportMode.aPeriodicRpt.pres != FALSE) { - CMCHKPK(SPkU32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf); } - CMCHKPK(SPkU8, param->reportMode.aPeriodicRpt.pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportMode.aPeriodicRpt.pres, mBuf); if(param->reportMode.periodicRpt.pres != FALSE) { CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); } - CMCHKPK(SPkU8, param->reportMode.periodicRpt.pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportMode.periodicRpt.pres, mBuf); #else /* CTF_VER2 */ @@ -6265,23 +6265,23 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); break; case CTF_CQI_RPTMODE_APRDIOC: - CMCHKPK(SPkU32, param->reportMode.aPeriodicRpt, mBuf); + CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->reportingMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportingMode, mBuf); #endif /* CTF_VER2 */ /* ctf_c_001.main_2: added packning for pmiRiRpt*/ #ifdef CTF_VER1 - CMCHKPK(SPkU32, param->pmiRiRpt.pmiRiRptSetup, mBuf); - CMCHKPK(SPkU8, param->pmiRiRpt.pres, mBuf); + CMCHKPK(oduUnpackUInt32, param->pmiRiRpt.pmiRiRptSetup, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmiRiRpt.pres, mBuf); #endif /* CTF_VER1 */ } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6320,14 +6320,14 @@ Buffer *mBuf; #endif TRC3(cmUnpkCtfCqiReportCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { /* ctf_c_001.main_2: added Unpackning for cqiMask*/ #ifdef CTF_VER1 - CMCHKUNPK(SUnpkU8, ¶m->pmiRiRpt.pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmiRiRpt.pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->pmiRiRpt.pmiRiRptSetup = tmpEnum; #endif /* CTF_VER1 */ @@ -6336,36 +6336,36 @@ Buffer *mBuf; *ctf_c_001.main_2: Added provision to send Periodic and aPeriodic CQI *report configuration in the same message */ - CMCHKUNPK(SUnpkU8, ¶m->reportMode.periodicRpt.pres, mBuf) + CMCHKUNPK(oduPackUInt8, ¶m->reportMode.periodicRpt.pres, mBuf) if(param->reportMode.periodicRpt.pres != FALSE) { CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->reportMode.aPeriodicRpt.pres, mBuf) + CMCHKUNPK(oduPackUInt8, ¶m->reportMode.aPeriodicRpt.pres, mBuf) if(param->reportMode.aPeriodicRpt.pres != FALSE) { - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->reportMode.aPeriodicRpt.aPeriodicRptMode = (CtfCqiRptModeAperiodic)tmpEnum; } #else /* CTF_VER2 */ - CMCHKUNPK(SUnpkU8, ¶m->reportingMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->reportingMode, mBuf); switch(param->reportingMode) { case CTF_CQI_RPTMODE_APRDIOC: - CMCHKUNPK(SUnpkU32, (U32 *)¶m->reportMode.aPeriodicRpt, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->reportMode.aPeriodicRpt, mBuf); break; case CTF_CQI_RPTMODE_PRDIOC: CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, ¶m->reportMode.periodicRpt, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } #endif /* CTF_VER2 */ } - RETVALUE(ROK); + return ROK; } @@ -6405,17 +6405,17 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->dedSrsSetup.cyclicShift, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.txComb, mBuf); - CMCHKPK(SPkU16, param->dedSrsSetup.srsCfgIdx, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.duration, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.freqDmnPos, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.srsHopngBw, mBuf); - CMCHKPK(SPkU8, param->dedSrsSetup.srsBw, mBuf); - CMCHKPK(SPkU8, param->dedSrsUlCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.cyclicShift, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.txComb, mBuf); + CMCHKPK(oduUnpackUInt16, param->dedSrsSetup.srsCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.duration, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.freqDmnPos, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsHopngBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrsUlCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6452,20 +6452,20 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedSrsUlCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->dedSrsUlCfgType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.srsBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.srsHopngBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.freqDmnPos, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.duration, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dedSrsSetup.srsCfgIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.txComb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrsSetup.cyclicShift, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsUlCfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.srsBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.srsHopngBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.freqDmnPos, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.duration, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dedSrsSetup.srsCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.txComb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrsSetup.cyclicShift, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -6505,12 +6505,12 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU8, param->dedSrSetup.srCfgIdx, mBuf); - CMCHKPK(SPkU16, param->dedSrSetup.srPUCCHRi, mBuf); - CMCHKPK(SPkU8, param->dedSRCfgType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSrSetup.srCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt16, param->dedSrSetup.srPUCCHRi, mBuf); + CMCHKPK(oduUnpackUInt8, param->dedSRCfgType, mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6547,15 +6547,15 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedSRCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKUNPK(SUnpkU8, ¶m->dedSRCfgType, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dedSrSetup.srPUCCHRi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dedSrSetup.srCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSRCfgType, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dedSrSetup.srPUCCHRi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dedSrSetup.srCfgIdx, mBuf); } - RETVALUE(ROK); + return ROK; } #endif /* TFU_UPGRADE */ @@ -6600,10 +6600,10 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) { - CMCHKPK(SPkU32, param->ueTxAntSelection.txAntSelect, mBuf); - CMCHKPK(SPkU8, param->ueTxAntSelection.cfgType, mBuf); + CMCHKPK(oduUnpackUInt32, param->ueTxAntSelection.txAntSelect, mBuf); + CMCHKPK(oduUnpackUInt8, param->ueTxAntSelection.cfgType, mBuf); /* ctf_c_001.main_3 txMode is of type enum and is 32bit length */ - CMCHKPK(SPkU32, (U32)param->txMode, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->txMode, mBuf); #ifdef CTF_VER2 /* *ctf_c_001.main_2: Added Packing of CodeBookSubsetRestriction parameter @@ -6611,54 +6611,54 @@ Buffer *mBuf; switch(param->codeBookSubsetRes.ctfCdBkRestType) { case N2TX_ANT_TM3: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm3, mBuf); break; case N4TX_ANT_TM3: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm3, mBuf); break; case N2TX_ANT_TM4: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm4, mBuf); break; case N4TX_ANT_TM4: for(idx = 0; idx < 8; idx++) - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm4[idx], mBuf); break; case N2TX_ANT_TM5: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm5, mBuf); break; case N4TX_ANT_TM5: - CMCHKPK(SPkU16, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm5, mBuf); break; case N2TX_ANT_TM6: - CMCHKPK(SPkU8, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm6, mBuf); break; case N4TX_ANT_TM6: - CMCHKPK(SPkU16, param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm6, mBuf); break; default : break; } - CMCHKPK(SPkU32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf); + CMCHKPK(oduUnpackUInt32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf); #endif /* CTF_VER2 */ } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6700,7 +6700,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfDedAntCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -6708,50 +6708,50 @@ Buffer *mBuf; /* * Added Unpacking for CodeBookSubsetRestriction parameter */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->codeBookSubsetRes.ctfCdBkRestType = (CtfCdBkSubsetRestnType)tmpEnum; switch(param->codeBookSubsetRes.ctfCdBkRestType) { case N2TX_ANT_TM3: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm3, mBuf); break; case N4TX_ANT_TM3: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm3, mBuf); break; case N2TX_ANT_TM4: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm4, mBuf); break; case N4TX_ANT_TM4: for(idx = 7; idx >= 0; idx--) { - CMCHKUNPK(SUnpkU8, &(param->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, &(param->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm4[idx]), mBuf); } break; case N2TX_ANT_TM5: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm5, mBuf); break; case N4TX_ANT_TM5: - CMCHKUNPK(SUnpkU16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm5, mBuf); break; case N2TX_ANT_TM6: - CMCHKUNPK(SUnpkU8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt8, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n2TxAntTm6, mBuf); break; case N4TX_ANT_TM6: - CMCHKUNPK(SUnpkU16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. + CMCHKUNPK(oduPackUInt16, ¶m->codeBookSubsetRes.codeBookSubsetRestn. n4TxAntTm6, mBuf); break; default : @@ -6759,13 +6759,13 @@ Buffer *mBuf; } #endif /* CTF_VER2 */ /* ctf_c_001.main_3 Enum is 32bit length */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->txMode = (CtfUeTxAntMode)tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->ueTxAntSelection.cfgType, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ueTxAntSelection.cfgType, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ueTxAntSelection.txAntSelect = (CtfUeTxAntSelectType)tmpEnum; } - RETVALUE(ROK); + return ROK; } @@ -6797,10 +6797,10 @@ CtfUeSecCellCfgInfo *param; Buffer *mBuf; #endif { - CMCHKPK(SPkU16, param->sCellId, mBuf); - CMCHKPK(SPkU8, param->sCellIdx, mBuf); + CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -6836,10 +6836,10 @@ Buffer *mBuf; { CMCHKPK(cmPkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[(U8)idx], mBuf); } - CMCHKPK(SPkU32, param->sCellAction, mBuf); - CMCHKPK(SPkU8, param->numSCells, mBuf); + CMCHKPK(oduUnpackUInt32, param->sCellAction, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -6870,10 +6870,10 @@ CtfUeSecCellCfgInfo *param; Buffer *mBuf; #endif { - CMCHKUNPK(SUnpkU8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -6907,14 +6907,14 @@ Buffer *mBuf; { U8 idx; - CMCHKUNPK(SUnpkU8, ¶m->numSCells, mBuf); - CMCHKUNPK(SUnpkU32, (U32*)¶m->sCellAction, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)¶m->sCellAction, mBuf); for(idx = 0 ; idx < param->numSCells; idx++) { CMCHKUNPK(cmUnpkCtfUeSecCellCfgInfo, ¶m->ueSCellDedCfg[idx], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -6952,9 +6952,9 @@ Buffer *mBuf; /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKPK(SPkU32, param->ueCategory, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->ueCategory, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6991,11 +6991,11 @@ Buffer *mBuf; TRC3(cmUnpkCtfUeCatCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->ueCategory, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ueCategory, mBuf); + return ROK; } @@ -7032,7 +7032,7 @@ Buffer *mBuf; TRC3(cmPkCtfDedCfgInfo) #ifdef EMTC_ENABLE - CMCHKPK(SPkU8, param->isEmtcUe, mBuf); + CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf); #endif CMCHKPK(cmPkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); #ifndef TFU_UPGRADE @@ -7046,7 +7046,7 @@ Buffer *mBuf; CMCHKPK(cmPkCtfUeCatCfgInfo, ¶m->ueCatCfg, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7096,9 +7096,9 @@ Buffer *mBuf; #endif /* TFU_UPGRADE */ CMCHKUNPK(cmUnpkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8, ¶m->isEmtcUe, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isEmtcUe, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -7155,7 +7155,7 @@ Buffer *mBuf; #endif CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7214,7 +7214,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); - RETVALUE(ROK); + return ROK; } @@ -7252,7 +7252,7 @@ Buffer *mBuf; TRC3(cmPkCtfCellReleaseInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7290,7 +7290,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfCellReleaseInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7329,7 +7329,7 @@ Buffer *mBuf; CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7369,7 +7369,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); - RETVALUE(ROK); + return ROK; } @@ -7414,10 +7414,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCellCfgInfo, ¶m->u.cellCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgElem, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + return ROK; } @@ -7454,7 +7454,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellCfgInfo, ¶m->u.cellCfg, mBuf); @@ -7463,9 +7463,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfDedCfgInfo, ¶m->u.dedCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7519,10 +7519,10 @@ Buffer *mBuf; break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgElem, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + return ROK; } @@ -7559,7 +7559,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfReCfgInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellRecfgInfo, ¶m->u.cellRecfg, mBuf); @@ -7576,9 +7576,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfCellStop, ¶m->u.cellRecfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7623,10 +7623,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCellReleaseInfo, ¶m->u.cellRel, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgElem, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf); + return ROK; } @@ -7663,7 +7663,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfReleaseInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgElem, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgElem, mBuf); switch(param->cfgElem) { case CTF_CELL_CFG: CMCHKUNPK(cmUnpkCtfCellReleaseInfo, ¶m->u.cellRel, mBuf); @@ -7672,9 +7672,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfDedReleaseInfo, ¶m->u.dedRel, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7729,10 +7729,10 @@ Buffer *mBuf; CMCHKPK(cmPkCtfCfgInfo, ¶m->u.cfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); + return ROK; } @@ -7780,7 +7780,7 @@ Buffer *mBuf; TRC3(cmUnpkCtfCfgReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->cfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { case CTF_CONFIG: CMCHKUNPK(cmUnpkCtfCfgInfo, ¶m->u.cfg, mBuf); @@ -7792,13 +7792,13 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCtfReleaseInfo, ¶m->u.release, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } #ifdef CTF_VER3 if((retVal = cmUnpkCtfVendorSpecParams(pst, ¶m->vendorParams, mBuf)) != ROK) - RETVALUE(retVal); + return (retVal); #endif - RETVALUE(ROK); + return ROK; } /* Starts - Fix for CR ccpu00123185 */ @@ -7835,14 +7835,14 @@ Buffer *mBuf; TRC3(cmPkCtfCellPwrcfgInfo) /* Added the pack for newly added reference signal Power*/ - CMCHKPK(SPkU32, (U32)param->ctfCellStatus, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); CMCHKPK(SPkS16, param->pdschCfg.refSigPwr, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7886,9 +7886,9 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->ctfCellStatus, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -7924,14 +7924,14 @@ Buffer *mBuf; TRC3(cmPkCtfCellStop) /* Added the pack for newly added reference signal Power*/ - CMCHKPK(SPkU32, (U32)param->ctfCellStatus, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); CMCHKPK(SPkS16, param->priSigPwr, mBuf); CMCHKPK(SPkS16, param->secSigPwr, mBuf); CMCHKPK(SPkS16, param->pdschCfg.refSigPwr, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -7972,9 +7972,9 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->secSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->priSigPwr, mBuf); CMCHKUNPK(SUnpkS16, ¶m->pilotSigPwr, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->ctfCellStatus, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->ctfCellStatus, mBuf); - RETVALUE(ROK); + return ROK; } /* Periodic REM Scan for TPM */ @@ -8008,11 +8008,11 @@ Buffer *mBuf; { TRC3(cmPkPerRemScanCellInfo) - CMCHKPK(SPkU16,param->pci, mBuf); - CMCHKPK(SPkU8, param->rsrp, mBuf); - CMCHKPK(SPkU8, param->dlBw, mBuf); - CMCHKPK(SPkU8, param->numTx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16,param->pci, mBuf); + CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->numTx, mBuf); + return ROK; } @@ -8051,9 +8051,9 @@ Buffer *mBuf; { CMCHKPK(cmPkPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf); } - CMCHKPK(SPkU8, param->numCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCells, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -8099,7 +8099,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; #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) { @@ -8112,12 +8112,12 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; 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, @@ -8127,7 +8127,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -8141,7 +8141,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp, sizeof(CtfPeriodicRemCellSearchRsp)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -8153,14 +8153,14 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; 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 @@ -8177,11 +8177,11 @@ Buffer *mBuf; { TRC3(cmUnpkCtfPerRemScanCellInfo); - CMCHKUNPK(SUnpkU8, ¶m->numTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dlBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rsrp, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pci, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->numTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rsrp, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); + return ROK; } #ifdef ANSI @@ -8199,13 +8199,13 @@ Buffer *mBuf; S16 idx; TRC3(cmUnpkCtfPerRemCellSrch); - CMCHKUNPK(SUnpkU8, ¶m->numCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCells, mBuf); for(idx = 0; idx < (param->numCells); idx++) { CMCHKUNPK(cmUnpkCtfPerRemScanCellInfo, ¶m->cellInfo[idx], mBuf); } - RETVALUE(ROK); + return ROK; } /** @@ -8248,7 +8248,7 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF030, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkCtfCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -8258,7 +8258,7 @@ Buffer *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, @@ -8270,13 +8270,13 @@ Buffer *mBuf; (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) @@ -8290,11 +8290,11 @@ Buffer *mBuf; (Txt*)&__FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ECTF025, (ErrVal)0, (Txt*)&"Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, &transId, CellSrchRsp)); + return ((*func)(pst, suId, &transId, CellSrchRsp)); } /* Periodic REM Scan for TPM End */ diff --git a/src/cm/du_app_mac_inf.c b/src/cm/du_app_mac_inf.c index 3fe519dd8..75ff5c1e1 100644 --- a/src/cm/du_app_mac_inf.c +++ b/src/cm/du_app_mac_inf.c @@ -47,16 +47,16 @@ uint8_t packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg) { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)macCellCfg, mBuf); + CMCHKPK(oduPackPointer,(PTR)macCellCfg, mBuf); DU_LOG("\nDU-APP : MAC CELL config sent"); - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } return ROK; } @@ -81,13 +81,13 @@ uint8_t packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg) ***************************************************************************/ uint8_t unpackDuMacCellCfg(DuMacCellCfgReq func, Pst *pst, Buffer *mBuf) { - U16 ret = ROK; + uint16_t ret = ROK; MacCellCfg *macCellCfg; if(pst->selector == ODU_SELECTOR_LWLC) { /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&macCellCfg, mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&macCellCfg, mBuf); ret = (*func)(pst, macCellCfg); } else @@ -121,16 +121,16 @@ uint8_t packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm) if(pst->selector == ODU_SELECTOR_LC) { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } /* pack the transaction ID in CNF structure */ - CMCHKPK(SPkU16, macCellCfgCfm->cellId, mBuf); - CMCHKPK(SPkU8, macCellCfgCfm->rsp, mBuf); + CMCHKPK(oduUnpackUInt16, macCellCfgCfm->cellId, mBuf); + CMCHKPK(oduUnpackUInt8, macCellCfgCfm->rsp, mBuf); - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } else if(pst->selector == ODU_SELECTOR_LWLC) { @@ -164,8 +164,8 @@ uint8_t unpackMacCellCfgCfm(DuMacCellCfgCfm func, Pst *pst, Buffer *mBuf) if(pst->selector == ODU_SELECTOR_LC) { /* unpack the transaction ID in CNF structure */ - CMCHKUNPK(SUnpkU8, &(macCellCfgCfm.rsp), mBuf); - CMCHKUNPK(SUnpkU16, &(macCellCfgCfm.cellId), mBuf); + CMCHKUNPK(oduPackUInt8, &(macCellCfgCfm.rsp), mBuf); + CMCHKUNPK(oduPackUInt16, &(macCellCfgCfm.cellId), mBuf); return (*func)(pst, &macCellCfgCfm); } else @@ -204,17 +204,17 @@ uint8_t packMacCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) else if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nDU APP : Memory allocation failed for cell start req pack"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)cellStartInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)cellStartInfo, mBuf); } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -242,14 +242,14 @@ uint8_t unpackMacCellStartReq(DuMacCellStartReq func, Pst *pst, Buffer *mBuf) if(pst->selector == ODU_SELECTOR_LWLC) { /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&cellStartInfo, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&cellStartInfo, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, cellStartInfo); } else { /* Nothing to do for loose coupling */ - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return ROK; } } @@ -282,16 +282,16 @@ uint8_t packMacCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nDU APP : Memory allocation failed for cell stop req pack"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)cellStopInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)cellStopInfo, mBuf); - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } return ROK; } @@ -321,14 +321,14 @@ uint8_t unpackMacCellStopReq(DuMacCellStopReq func, Pst *pst, Buffer *mBuf) if(pst->selector == ODU_SELECTOR_LWLC) { /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&cellStopInfo, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&cellStopInfo, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, cellStopInfo); } else { /* Nothing to do for loose coupling */ - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return ROK; } } @@ -354,7 +354,7 @@ uint8_t packMacSlotInd(Pst *pst, SlotIndInfo *slotInfo ) { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nDU APP : Memory allocation failed for cell start req pack"); return RFAILED; @@ -362,9 +362,9 @@ uint8_t packMacSlotInd(Pst *pst, SlotIndInfo *slotInfo ) if(pst->selector == ODU_SELECTOR_LC) { - CMCHKPK(SPkU16, slotInfo->cellId, mBuf); - CMCHKPK(SPkU16, slotInfo->sfn, mBuf); - CMCHKPK(SPkU16, slotInfo->slot, mBuf); + CMCHKPK(oduUnpackUInt16, slotInfo->cellId, mBuf); + CMCHKPK(oduUnpackUInt16, slotInfo->sfn, mBuf); + CMCHKPK(oduUnpackUInt16, slotInfo->slot, mBuf); CM_FREE_SHRABL_BUF(pst->region, pst->pool, slotInfo, sizeof(SlotIndInfo)); slotInfo = NULL; @@ -372,14 +372,14 @@ uint8_t packMacSlotInd(Pst *pst, SlotIndInfo *slotInfo ) else if(pst->selector == ODU_SELECTOR_LWLC) { /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)slotInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)slotInfo, mBuf); } else { - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -407,26 +407,26 @@ uint8_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf) SlotIndInfo *slotInfo; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&slotInfo, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&slotInfo, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, slotInfo); } else if(pst->selector == ODU_SELECTOR_LC) { SlotIndInfo slotInfo; - CMCHKUNPK(SUnpkU16, &(slotInfo.slot), mBuf); - CMCHKUNPK(SUnpkU16, &(slotInfo.sfn), mBuf); - CMCHKUNPK(SUnpkU16, &(slotInfo.cellId), mBuf); + CMCHKUNPK(oduPackUInt16, &(slotInfo.slot), mBuf); + CMCHKUNPK(oduPackUInt16, &(slotInfo.sfn), mBuf); + CMCHKUNPK(oduPackUInt16, &(slotInfo.cellId), mBuf); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, &slotInfo); } else { /* Nothing to do for loose coupling */ - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return ROK; } return ROK; @@ -452,7 +452,7 @@ uint8_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId) { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nDU APP : Memory allocation failed for stop Ind pack"); return RFAILED; @@ -462,21 +462,21 @@ uint8_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId) { /*pack the payload here*/ DU_LOG("\nDU APP : Packed CellId"); - CMCHKPK(SPkU16, cellStopId->cellId, mBuf); + CMCHKPK(oduUnpackUInt16, cellStopId->cellId, mBuf); CM_FREE_SHRABL_BUF(pst->region, pst->pool, cellStopId, sizeof(MacCellStopInfo)); cellStopId = NULL; } else if(pst->selector == ODU_SELECTOR_LWLC) { /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)cellStopId, mBuf); + CMCHKPK(oduPackPointer,(PTR)cellStopId, mBuf); } else { - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -503,23 +503,23 @@ uint8_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf) { MacCellStopInfo *cellStopId; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&cellStopId, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&cellStopId, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, cellStopId); } else if(pst->selector == ODU_SELECTOR_LC) { MacCellStopInfo cellStopId; - CMCHKUNPK(SUnpkU16, &(cellStopId.cellId), mBuf); + CMCHKUNPK(oduPackUInt16, &(cellStopId.cellId), mBuf); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, &cellStopId); } else { /* Nothing to do for loose coupling */ - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return ROK; } return ROK; @@ -548,13 +548,13 @@ uint8_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo) if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nMAC : Memory allocation failed at packMacUlCcchInd"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)ulCcchIndInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)ulCcchIndInfo, mBuf); } else { @@ -562,7 +562,7 @@ uint8_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo) return RFAILED; } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -590,15 +590,15 @@ uint8_t unpackMacUlCcchInd(DuMacUlCcchInd func, Pst *pst, Buffer *mBuf) UlCcchIndInfo *ulCcchIndInfo; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&ulCcchIndInfo, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&ulCcchIndInfo, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, ulCcchIndInfo); } else { /* Nothing to do for other selectors */ DU_LOG("\n Only LWLC supported for UL CCCH Ind "); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } return RFAILED; } @@ -627,13 +627,13 @@ uint8_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nMAC : Memory allocation failed at packMacDlCcchInd"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)dlCcchIndInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)dlCcchIndInfo, mBuf); } else { @@ -641,7 +641,7 @@ uint8_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) return RFAILED; } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -669,15 +669,15 @@ uint8_t unpackMacDlCcchInd(DuMacDlCcchInd func, Pst *pst, Buffer *mBuf) DlCcchIndInfo *dlCcchIndInfo; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&dlCcchIndInfo, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&dlCcchIndInfo, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, dlCcchIndInfo); } else { /* Nothing to do for other selectors */ DU_LOG("\n Only LWLC supported for DL CCCH Ind "); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } return RFAILED; @@ -707,13 +707,13 @@ uint8_t packDuMacUeCreateReq(Pst *pst, MacUeCfg *ueCfg) if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nMAC : Memory allocation failed at packDuMacUeCreateReq"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)ueCfg, mBuf); + CMCHKPK(oduPackPointer,(PTR)ueCfg, mBuf); } else { @@ -721,7 +721,7 @@ uint8_t packDuMacUeCreateReq(Pst *pst, MacUeCfg *ueCfg) return RFAILED; } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -749,15 +749,15 @@ uint8_t unpackMacUeCreateReq(DuMacUeCreateReq func, Pst *pst, Buffer *mBuf) MacUeCfg *ueCfg; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&ueCfg, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&ueCfg, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, ueCfg); } else { /* Nothing to do for other selectors */ DU_LOG("\n Only LWLC supported for UE Create Request "); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } return RFAILED; @@ -785,13 +785,13 @@ uint8_t packDuMacUeCreateRsp(Pst *pst, MacUeCfgRsp *cfgRsp) if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nMAC : Memory allocation failed at packDuMacUeCfgRsp"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)cfgRsp, mBuf); + CMCHKPK(oduPackPointer,(PTR)cfgRsp, mBuf); } else { @@ -799,7 +799,7 @@ uint8_t packDuMacUeCreateRsp(Pst *pst, MacUeCfgRsp *cfgRsp) return RFAILED; } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -824,12 +824,12 @@ uint8_t unpackDuMacUeCreateRsp(DuMacUeCreateRspFunc func, Pst *pst, Buffer *mBuf MacUeCfgRsp *cfgRsp; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&cfgRsp, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&cfgRsp, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, cfgRsp); } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return RFAILED; } diff --git a/src/cm/du_app_mac_inf.h b/src/cm/du_app_mac_inf.h index 7901f3b27..b772a73ed 100644 --- a/src/cm/du_app_mac_inf.h +++ b/src/cm/du_app_mac_inf.h @@ -432,12 +432,12 @@ typedef struct failureCause typedef struct carrierCfg { - Bool pres; - U16 bw; /* DL/UL bandwidth */ - U32 freq; /* Absolute frequency of DL/UL point A in KHz */ - U16 k0[NUM_NUMEROLOGY]; /* K0 for DL/UL */ - U16 gridSize[NUM_NUMEROLOGY]; /* DL/UL Grid size for each numerologies */ - U16 numAnt; /* Number of Tx/Rx antennas */ + bool pres; + uint16_t bw; /* DL/UL bandwidth */ + uint32_t freq; /* Absolute frequency of DL/UL point A in KHz */ + uint16_t k0[NUM_NUMEROLOGY]; /* K0 for DL/UL */ + uint16_t gridSize[NUM_NUMEROLOGY]; /* DL/UL Grid size for each numerologies */ + uint16_t numAnt; /* Number of Tx/Rx antennas */ }CarrierCfg; typedef struct ssbCfg @@ -452,23 +452,23 @@ typedef struct ssbCfg uint8_t mibPdu[3]; /* MIB payload */ uint32_t ssbMask[SSB_MASK_SIZE]; /* Bitmap for actually transmitted SSB. */ uint8_t beamId[NUM_SSB]; - Bool multCarrBand; /* Multiple carriers in a band */ - Bool multCellCarr; /* Multiple cells in single carrier */ + bool multCarrBand; /* Multiple carriers in a band */ + bool multCellCarr; /* Multiple cells in single carrier */ }SsbCfg; typedef struct fdmInfo { - U16 rootSeqIdx; /* Root sequence index */ - U8 numRootSeq; /* Number of root sequences required for FD */ - U16 k1; /* Frequency Offset for each FD */ - U8 zeroCorrZoneCfg; /* Zero correlation zone cofig */ - U8 numUnusedRootSeq; /* Number of unused root sequence */ - U8 *unsuedRootSeq; /* Unused root sequence per FD */ + uint16_t rootSeqIdx; /* Root sequence index */ + uint8_t numRootSeq; /* Number of root sequences required for FD */ + uint16_t k1; /* Frequency Offset for each FD */ + uint8_t zeroCorrZoneCfg; /* Zero correlation zone cofig */ + uint8_t numUnusedRootSeq; /* Number of unused root sequence */ + uint8_t *unsuedRootSeq; /* Unused root sequence per FD */ }PrachFdmInfo; typedef struct prachCfg { - Bool pres; + bool pres; uint8_t prachCfgIdx; /* PRACH Cfg Index */ PrachSeqLen prachSeqLen; /* RACH Sequence length: Long/short */ uint8_t prachSubcSpacing; /* Subcarrier spacing of RACH */ @@ -478,7 +478,7 @@ typedef struct prachCfg uint8_t rootSeqLen; /* Root sequence length */ PrachFdmInfo fdm[8]; /* FDM info */ uint8_t ssbPerRach; /* SSB per RACH occassion */ - Bool prachMultCarrBand; /* Multiple carriers in Band */ + bool prachMultCarrBand; /* Multiple carriers in Band */ uint8_t prachRestrictedSet; /* Support for PRACH restricted set */ uint8_t raContResTmr; /* RA Contention Resoultion Timer */ uint8_t rsrpThreshSsb; /* RSRP Threshold SSB */ @@ -487,7 +487,7 @@ typedef struct prachCfg typedef struct tddCfg { - Bool pres; + bool pres; DlUlTxPeriodicity tddPeriod; /* DL UL Transmission periodicity */ SlotConfig slotCfg[MAXIMUM_TDD_PERIODICITY][MAX_SYMB_PER_SLOT]; }TDDCfg; @@ -577,14 +577,14 @@ typedef struct bwpUlConfig typedef struct macCellCfg { - U16 cellId; /* Cell Id */ - U8 numTlv; /* Number of configuration TLVs */ - U8 carrierId; /* Carrired Index */ - U16 phyCellId; /* Physical cell id */ + uint16_t cellId; /* Cell Id */ + uint8_t numTlv; /* Number of configuration TLVs */ + uint8_t carrierId; /* Carrired Index */ + uint16_t phyCellId; /* Physical cell id */ DuplexMode dupType; /* Duplex type: TDD/FDD */ CarrierCfg dlCarrCfg; /* DL Carrier configuration */ CarrierCfg ulCarrCfg; /* UL Carrier configuration */ - Bool freqShft; /* Indicates presence of 7.5kHz frequency shift */ + bool freqShft; /* Indicates presence of 7.5kHz frequency shift */ SsbCfg ssbCfg; /* SSB configuration */ PrachCfg prachCfg; /* PRACH Configuration */ TDDCfg tddCfg; /* TDD periodicity and slot configuration */ @@ -597,7 +597,7 @@ typedef struct macCellCfg typedef struct macCellCfgCfm { - U16 cellId; + uint16_t cellId; uint8_t rsp; }MacCellCfgCfm; diff --git a/src/cm/du_app_rlc_inf.c b/src/cm/du_app_rlc_inf.c index 6fd9b9402..b2ebef662 100644 --- a/src/cm/du_app_rlc_inf.c +++ b/src/cm/du_app_rlc_inf.c @@ -43,13 +43,13 @@ uint8_t packDuRlcUlUeCreateReq(Pst *pst, RlcUeCfg *ueCfg) if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nRLC : Memory allocation failed at packDuRlcUeCreateReq"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)ueCfg, mBuf); + CMCHKPK(oduPackPointer,(PTR)ueCfg, mBuf); } else { @@ -57,7 +57,7 @@ uint8_t packDuRlcUlUeCreateReq(Pst *pst, RlcUeCfg *ueCfg) return RFAILED; } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -84,15 +84,15 @@ uint8_t unpackRlcUlUeCreateReq(DuRlcUlUeCreateReq func, Pst *pst, Buffer *mBuf) { RlcUeCfg *ueCfg; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&ueCfg, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&ueCfg, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, ueCfg); } else { /* Nothing to do for other selectors */ DU_LOG("\nRLC: Only LWLC supported for UE Create Request "); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } return RFAILED; @@ -122,13 +122,13 @@ uint8_t packRlcUlDuUeCreateRsp(Pst *pst, RlcUeCfgRsp *ueCfg) if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nRLC : Memory allocation failed at packRlcUlDuUeCreateRsp"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)ueCfg, mBuf); + CMCHKPK(oduPackPointer,(PTR)ueCfg, mBuf); } else { @@ -136,7 +136,7 @@ uint8_t packRlcUlDuUeCreateRsp(Pst *pst, RlcUeCfgRsp *ueCfg) return RFAILED; } - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /******************************************************************* @@ -163,15 +163,15 @@ uint8_t unpackRlcUlUeCreateRsp(RlcUlDuUeCreateRsp func, Pst *pst, Buffer *mBuf) { RlcUeCfgRsp *cfgRsp; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&cfgRsp, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&cfgRsp, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, cfgRsp); } else { /* Nothing to do for other selectors */ DU_LOG("\nRLC: Only LWLC supported for UE Create Response "); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } return RFAILED; @@ -200,14 +200,14 @@ uint8_t packRlcUlRrcMsgToDu(Pst *pst, RlcUlRrcMsgInfo *ulRrcMsgInfo) if(pst->selector == ODU_SELECTOR_LWLC) { - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { DU_LOG("\nRLC : Memory allocation failed at packRlcUlRrcMsgToDu"); return RFAILED; } /* pack the address of the structure */ - CMCHKPK(cmPkPtr,(PTR)ulRrcMsgInfo, mBuf); - return SPstTsk(pst,mBuf); + CMCHKPK(oduPackPointer,(PTR)ulRrcMsgInfo, mBuf); + return ODU_POST_TASK(pst,mBuf); } else { @@ -238,15 +238,15 @@ uint8_t unpackRlcUlRrcMsgToDu(RlcUlRrcMsgToDuFunc func, Pst *pst, Buffer *mBuf) { RlcUlRrcMsgInfo *ulRrcMsgInfo; /* unpack the address of the structure */ - CMCHKUNPK(cmUnpkPtr, (PTR *)&ulRrcMsgInfo, mBuf); - SPutMsg(mBuf); + CMCHKUNPK(oduUnpackPointer, (PTR *)&ulRrcMsgInfo, mBuf); + ODU_PUT_MSG(mBuf); return (*func)(pst, ulRrcMsgInfo); } else { /* Nothing to do for other selectors */ DU_LOG("\nRLC: Only LWLC supported for UL RRC Message transfer "); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } return RFAILED; diff --git a/src/cm/gen.h b/src/cm/gen.h index 15d341128..300382edf 100755 --- a/src/cm/gen.h +++ b/src/cm/gen.h @@ -2394,83 +2394,83 @@ /* system services typedefs */ -#define cmPkBool(x, mBuf) SPkU8(x, mBuf) /* pack Bool */ +#define oduPackBool(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Bool */ #define cmPkStatus(x, mBuf) SPkS16(x, mBuf) /* pack Status */ -#define cmPkTicks(x, mBuf) SPkU32(x, mBuf) /* pack Ticks */ +#define cmPkTicks(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Ticks */ #define cmPkQLen(x, mBuf) SPkS16(x, mBuf) /* pack QLen */ #define cmPkOrder(x, mBuf) SPkS16(x, mBuf) /* pack Order */ -#define cmPkData(x, mBuf) SPkU8(x, mBuf) /* pack Data */ -#define cmPkRandom(x, mBuf) SPkU16(x, mBuf) /* pack Random */ +#define cmPkData(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Data */ +#define cmPkRandom(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Random */ #define cmPkSeq(x, mBuf) SPkS16(x, mBuf) /* pack Seq */ #define cmPkReason(x, mBuf) SPkS16(x, mBuf) /* pack Reason */ -#define cmPkProcId(x, mBuf) SPkU16(x, mBuf) /* pack ProcId */ +#define cmPkProcId(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack ProcId */ #define cmPkVectNmb(x, mBuf) SPkS16(x, mBuf) /* pack VectNmb */ -#define cmPkPrior(x, mBuf) SPkU8(x, mBuf) /* pack Prior*/ +#define cmPkPrior(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Prior*/ #define cmPkPriority(x, mBuf) cmPkPrior(x, mBuf) /* pack Priority */ -#define cmPkRoute(x, mBuf) SPkU8(x, mBuf) /* pack Route */ +#define cmPkRoute(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Route */ #define cmPkTtype(x, mBuf) SPkS16(x, mBuf) /* pack Ttype */ #define cmPkSema(x, mBuf) SPkS8(x, mBuf) /* pack Sema */ #define cmPkTxt(x, mBuf) SPkS8(x, mBuf) /* pack Txt */ -#define cmPkEnt(x, mBuf) SPkU8(x, mBuf) /* pack Ent */ -#define cmPkInst(x, mBuf) SPkU8(x, mBuf) /* pack Inst */ +#define cmPkEnt(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ent */ +#define cmPkInst(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Inst */ #define cmPkElmnt(x, mBuf) SPkS16(x, mBuf) /* pack Elmnt */ #define cmPkElmntInst1(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst1 */ #define cmPkElmntInst2(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst2 */ #define cmPkElmntInst3(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst3 */ -#define cmPkRegion(x, mBuf) SPkU8(x, mBuf) /* pack Region */ -#define cmPkPool(x, mBuf) SPkU8(x, mBuf) /* pack Pool */ +#define cmPkRegion(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Region */ +#define cmPkPool(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Pool */ #ifdef LONG_MSG #define cmPkMsgLen(x, mBuf) SPkS32(x, mBuf) /* pack MsgLen */ #else #define cmPkMsgLen(x, mBuf) SPkS16(x, mBuf) /* pack MsgLen */ #endif #ifdef DOS -#define cmPkSize(x, mBuf) SPkU16(x, mBuf) /* pack Size */ +#define cmPkSize(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Size */ #else -#define cmPkSize(x, mBuf) SPkU32(x, mBuf) /* pack Size */ +#define cmPkSize(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Size */ #endif /* DOS */ /* general typedefs */ -#define cmPkSelector(x, mBuf) SPkU8(x, mBuf) /* pack Selector */ -#define cmPkEvent(x, mBuf) SPkU8(x, mBuf) /* pack Event */ +#define cmPkSelector(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Selector */ +#define cmPkEvent(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Event */ #define cmPkCntr(x, mBuf) SPkS32(x, mBuf) /* pack Cntr */ -#define cmPkStsCntr(x, mBuf) SPkU32(x, mBuf) /* pack StsCntr */ +#define cmPkStsCntr(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack StsCntr */ #define cmPkLnkNmb(x, mBuf) SPkS16(x, mBuf) /* pack LnkNmb */ #define cmPkSuId(x, mBuf) SPkS16(x, mBuf) /* pack SuId */ #define cmPkSpId(x, mBuf) SPkS16(x, mBuf) /* pack SpId */ #define cmPkSuInstId(x, mBuf) SPkS16(x, mBuf) /* pack SuInstId */ #define cmPkSpInstId(x, mBuf) SPkS16(x, mBuf) /* pack SpInstId */ -#define cmPkSapi(x, mBuf) SPkU8(x, mBuf) /* pack Sapi */ -#define cmPkTei(x, mBuf) SPkU8(x, mBuf) /* pack Tei */ -#define cmPkchNo(x, mBuf) SPkU8(x, mBuf) /* pack Channel Number */ -#define cmPkCes(x, mBuf) SPkU8(x, mBuf) /* pack Ces */ -#define cmPkDlci(x, mBuf) SPkU32(x, mBuf) /* pack Dlci */ -#define cmPkCalRef(x, mBuf) SPkU16(x, mBuf) /* pack CalRef */ +#define cmPkSapi(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Sapi */ +#define cmPkTei(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Tei */ +#define cmPkchNo(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Channel Number */ +#define cmPkCes(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ces */ +#define cmPkDlci(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Dlci */ +#define cmPkCalRef(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack CalRef */ #define cmPkOrigin(x, mBuf) SPkS16(x, mBuf) /* pack Origin */ -#define cmPkNwId(x, mBuf) SPkU16(x, mBuf) /* pack NwId */ +#define cmPkNwId(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack NwId */ #define cmPkSwtch(x, mBuf) SPkS16(x, mBuf) /* pack Swtch */ -#define cmPkCause(x, mBuf) SPkU8(x, mBuf) /* pack Cause */ -#define cmPkDgn(x, mBuf) SPkU8(x, mBuf) /* pack Dgn */ +#define cmPkCause(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Cause */ +#define cmPkDgn(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Dgn */ #define cmPkAction(x, mBuf) SPkS16(x, mBuf) /* pack Action */ #define cmPkSeqS16(x, mBuf) SPkS16(x, mBuf) /* pack SeqS16 */ -#define cmPkSeqU16(x, mBuf) SPkU16(x, mBuf) /* pack SeqU16 */ +#define cmPkSeqU16(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack SeqU16 */ #define cmPkSeqS24(x, mBuf) SPkS32(x, mBuf) /* pack SeqS24 */ -#define cmPkSeqU24(x, mBuf) SPkU32(x, mBuf) /* pack SeqU24 */ -#define cmPkSetUpArb(x, mBuf) SPkU8(x, mBuf) /* pack SetUpArb */ -#define cmPkEvntType(x, mBuf) SPkU8(x, mBuf) /* pack EvntType */ -#define cmPkState(x, mBuf) SPkU8(x, mBuf) /* pack State */ -#define cmPkMode(x, mBuf) SPkU8(x, mBuf) /* pack Mode */ +#define cmPkSeqU24(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack SeqU24 */ +#define cmPkSetUpArb(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack SetUpArb */ +#define cmPkEvntType(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack EvntType */ +#define cmPkState(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack State */ +#define cmPkMode(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Mode */ #define cmPkConnId(x, mBuf) SPkS32(x, mBuf) /* pack ConnId */ -#define cmPkUConnId(x, mBuf) SPkU32(x, mBuf) /* pack unsigned ConnId */ -#define cmPkMibOpCode(x, mBuf) SPkU16(x, mBuf) /* pack mib opCode*/ -#define cmPkMibStatus(x, mBuf) SPkU16(x, mBuf) /* Pack mib cfm status*/ -#define cmPkMibTblType(x, mBuf) SPkU16(x, mBuf) /* Pack mib table type */ +#define cmPkUConnId(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack unsigned ConnId */ +#define cmPkMibOpCode(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack mib opCode*/ +#define cmPkMibStatus(x, mBuf) oduUnpackUInt16(x, mBuf) /* Pack mib cfm status*/ +#define cmPkMibTblType(x, mBuf) oduUnpackUInt16(x, mBuf) /* Pack mib table type */ #define cmPkMibReqId(x, mBuf) SPkS32(x, mBuf) /* Pack mib request Id */ -#define cmPkProfileId(x, mBuf) SPkU8(x, mBuf) /* Pack HCC Profile Id */ -#define cmPkIntfId(x, mBuf) SPkU16(x, mBuf) /* Pack intf id */ -#define cmPkIntfVer(x, mBuf) SPkU16(x, mBuf) /* Pack intf ver */ -#define cmPkuaType(x, mBuf) SPkU8(x, mBuf) /* Pack uaType */ +#define cmPkProfileId(x, mBuf) oduUnpackUInt8(x, mBuf) /* Pack HCC Profile Id */ +#define cmPkIntfId(x, mBuf) oduUnpackUInt16(x, mBuf) /* Pack intf id */ +#define cmPkIntfVer(x, mBuf) oduUnpackUInt16(x, mBuf) /* Pack intf ver */ +#define cmPkuaType(x, mBuf) oduUnpackUInt8(x, mBuf) /* Pack uaType */ /* scc specific typedefs */ #define cmPkBaud(x, mBuf) SPkS16(x, mBuf) /* pack Baud */ @@ -2482,102 +2482,102 @@ /* tcp/ip specific typedefs */ -#define cmPkIpAddr(x, mBuf) SPkU32(x, mBuf) /* pack IpAddr */ -#define cmPkPort(x, mBuf) SPkU16(x, mBuf) /* pack Port */ -#define cmPkCmd(x, mBuf) SPkU8(x, mBuf) /* pack Cmd */ -#define cmPkFlags(x, mBuf) SPkU8(x, mBuf) /* pack Flags */ -#define cmPkTtl(x, mBuf) SPkU8(x, mBuf) /* pack Ttl */ -#define cmPkPrec(x, mBuf) SPkU8(x, mBuf) /* pack Prec */ -#define cmPkWindow(x, mBuf) SPkU32(x, mBuf) /* pack Window */ +#define cmPkIpAddr(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack IpAddr */ +#define cmPkPort(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Port */ +#define cmPkCmd(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Cmd */ +#define cmPkFlags(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Flags */ +#define cmPkTtl(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ttl */ +#define cmPkPrec(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Prec */ +#define cmPkWindow(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Window */ /* LLC/SNAP specific defines */ -#define cmPkOui(x, mBuf) SPkU32(x, mBuf) /* pack Oui */ -#define cmPkPid(x, mBuf) SPkU16(x, mBuf) /* pack Pid */ -#define cmPkLlcId(x, mBuf) SPkU32(x, mBuf) /* pack LLcId */ +#define cmPkOui(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Oui */ +#define cmPkPid(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Pid */ +#define cmPkLlcId(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack LLcId */ /* unpacking macros */ /* system services typedefs */ -#define cmUnpkBool(x, mBuf) SUnpkU8(x, mBuf) /* unpack Bool */ +#define oduUnpackBool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Bool */ #define cmUnpkStatus(x, mBuf) SUnpkS16(x, mBuf) /* unpack Status */ -#define cmUnpkTicks(x, mBuf) SUnpkU32(x, mBuf) /* unpack Ticks */ +#define cmUnpkTicks(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Ticks */ #define cmUnpkQLen(x, mBuf) SUnpkS16(x, mBuf) /* unpack QLen */ #define cmUnpkOrder(x, mBuf) SUnpkS16(x, mBuf) /* unpack Order */ -#define cmUnpkData(x, mBuf) SUnpkU8(x, mBuf) /* unpack Data */ -#define cmUnpkRandom(x, mBuf) SUnpkU16(x, mBuf) /* unpack Random */ +#define cmUnpkData(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Data */ +#define cmUnpkRandom(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Random */ #define cmUnpkSeq(x, mBuf) SUnpkS16(x, mBuf) /* unpack Seq */ #define cmUnpkReason(x, mBuf) SUnpkS16(x, mBuf) /* unpack Reason */ -#define cmUnpkProcId(x, mBuf) SUnpkU16(x, mBuf) /* unpack ProcId */ +#define cmUnpkProcId(x, mBuf) oduPackUInt16(x, mBuf) /* unpack ProcId */ #define cmUnpkVectNmb(x, mBuf) SUnpkS16(x, mBuf) /* unpack VectNmb */ -#define cmUnpkPrior(x, mBuf) SUnpkU8(x, mBuf) /* unpack Prior */ +#define cmUnpkPrior(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Prior */ #define cmUnpkPriority(x, mBuf) cmUnpkPrior(x, mBuf) /* unpack Priority */ -#define cmUnpkRoute(x, mBuf) SUnpkU8(x, mBuf) /* unpack Route */ +#define cmUnpkRoute(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Route */ #define cmUnpkTtype(x, mBuf) SUnpkS16(x, mBuf) /* unpack Ttype */ #define cmUnpkSema(x, mBuf) SUnpkS8(x, mBuf) /* unpack Sema */ #define cmUnpkTxt(x, mBuf) SUnpkS8(x, mBuf) /* unpack Txt */ -#define cmUnpkEnt(x, mBuf) SUnpkU8(x, mBuf) /* unpack Ent */ -#define cmUnpkInst(x, mBuf) SUnpkU8(x, mBuf) /* unpack Inst */ +#define cmUnpkEnt(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ent */ +#define cmUnpkInst(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Inst */ #define cmUnpkElmnt(x, mBuf) SUnpkS16(x, mBuf) /* unpack Elmnt */ #define cmUnpkElmntInst1(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst1 */ #define cmUnpkElmntInst2(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst2 */ #define cmUnpkElmntInst3(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst3 */ -#define cmUnpkRegion(x, mBuf) SUnpkU8(x, mBuf) /* unpack Region */ -#define cmUnpkPool(x, mBuf) SUnpkU8(x, mBuf) /* unpack Pool */ +#define cmUnpkRegion(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Region */ +#define cmUnpkPool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Pool */ #ifdef LONG_MSG #define cmUnpkMsgLen(x, mBuf) SUnpkS32(x, mBuf) /* unpack MsgLen */ #else #define cmUnpkMsgLen(x, mBuf) SUnpkS16(x, mBuf) /* unpack MsgLen */ #endif #ifdef DOS -#define cmUnpkSize(x, mBuf) SUnpkU16(x, mBuf) /* unpack Size */ +#define cmUnpkSize(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Size */ #else -#define cmUnpkSize(x, mBuf) SUnpkU32(x, mBuf) /* unpack Size */ +#define cmUnpkSize(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Size */ #endif /* DOS */ /* general typedefs */ -#define cmUnpkSelector(x, mBuf) SUnpkU8(x, mBuf) /* unpack Selector */ -#define cmUnpkEvent(x, mBuf) SUnpkU8(x, mBuf) /* unpack Event */ +#define cmUnpkSelector(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Selector */ +#define cmUnpkEvent(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Event */ #define cmUnpkCntr(x, mBuf) SUnpkS32(x, mBuf) /* unpack Cntr */ -#define cmUnpkStsCntr(x, mBuf) SUnpkU32(x, mBuf) /* unpack StsCntr */ +#define cmUnpkStsCntr(x, mBuf) oduPackUInt32(x, mBuf) /* unpack StsCntr */ #define cmUnpkLnkNmb(x, mBuf) SUnpkS16(x, mBuf) /* unpack LnkNmb */ #define cmUnpkSuId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SuId */ #define cmUnpkSpId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SpId */ #define cmUnpkSuInstId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SuInstId */ #define cmUnpkSpInstId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SpInstId */ -#define cmUnpkSapi(x, mBuf) SUnpkU8(x, mBuf) /* unpack Sapi */ -#define cmUnpkTei(x, mBuf) SUnpkU8(x, mBuf) /* unpack Tei */ +#define cmUnpkSapi(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Sapi */ +#define cmUnpkTei(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Tei */ #define cmUnpkchNo(x, mBuf) SUnpkS8(x, mBuf) /* unpack Channel Number */ -#define cmUnpkCes(x, mBuf) SUnpkU8(x, mBuf) /* unpack Ces */ -#define cmUnpkDlci(x, mBuf) SUnpkU32(x, mBuf) /* unpack Dlci */ -#define cmUnpkCalRef(x, mBuf) SUnpkU16(x, mBuf) /* unpack CalRef */ +#define cmUnpkCes(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ces */ +#define cmUnpkDlci(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Dlci */ +#define cmUnpkCalRef(x, mBuf) oduPackUInt16(x, mBuf) /* unpack CalRef */ #define cmUnpkOrigin(x, mBuf) SUnpkS16(x, mBuf) /* unpack Origin */ -#define cmUnpkNwId(x, mBuf) SUnpkU16(x, mBuf) /* unpack NwId */ +#define cmUnpkNwId(x, mBuf) oduPackUInt16(x, mBuf) /* unpack NwId */ #define cmUnpkSwtch(x, mBuf) SUnpkS16(x, mBuf) /* unpack Swtch */ -#define cmUnpkCause(x, mBuf) SUnpkU8(x, mBuf) /* unpack Cause */ -#define cmUnpkDgn(x, mBuf) SUnpkU8(x, mBuf) /* unpack Dgn */ +#define cmUnpkCause(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Cause */ +#define cmUnpkDgn(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Dgn */ #define cmUnpkAction(x, mBuf) SUnpkS16(x, mBuf) /* unpack Action */ #define cmUnpkSeqS16(x, mBuf) SUnpkS16(x, mBuf) /* unpack SeqS16 */ -#define cmUnpkSeqU16(x, mBuf) SUnpkU16(x, mBuf) /* unpack SeqU16 */ +#define cmUnpkSeqU16(x, mBuf) oduPackUInt16(x, mBuf) /* unpack SeqU16 */ #define cmUnpkSeqS24(x, mBuf) SUnpkS32(x, mBuf) /* unpack SeqS24 */ -#define cmUnpkSeqU24(x, mBuf) SUnpkU32(x, mBuf) /* unpack SeqU24 */ -#define cmUnpkSetUpArb(x, mBuf) SUnpkU8(x, mBuf) /* unpack SetUpArb */ -#define cmUnpkEvntType(x, mBuf) SUnpkU8(x, mBuf) /* unpack EvntType */ -#define cmUnpkState(x, mBuf) SUnpkU8(x, mBuf) /* unpack State */ -#define cmUnpkMode(x, mBuf) SUnpkU8(x, mBuf) /* unpack Mode */ +#define cmUnpkSeqU24(x, mBuf) oduPackUInt32(x, mBuf) /* unpack SeqU24 */ +#define cmUnpkSetUpArb(x, mBuf) oduPackUInt8(x, mBuf) /* unpack SetUpArb */ +#define cmUnpkEvntType(x, mBuf) oduPackUInt8(x, mBuf) /* unpack EvntType */ +#define cmUnpkState(x, mBuf) oduPackUInt8(x, mBuf) /* unpack State */ +#define cmUnpkMode(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Mode */ #define cmUnpkConnId(x, mBuf) SUnpkS32(x, mBuf) /* unpack ConnId */ -#define cmUnpkUConnId(x, mBuf) SUnpkU32(x, mBuf) /* unpack uns ConnId */ -#define cmUnpkMibOpCode(x, mBuf) SUnpkU16(x, mBuf) /* unpack mib opCode*/ -#define cmUnpkMibStatus(x, mBuf) SUnpkU16(x, mBuf) /* unpack mib cfm status*/ -#define cmUnpkMibTblType(x, mBuf) SUnpkU16(x, mBuf) /* Pack mib table type */ +#define cmUnpkUConnId(x, mBuf) oduPackUInt32(x, mBuf) /* unpack uns ConnId */ +#define cmUnpkMibOpCode(x, mBuf) oduPackUInt16(x, mBuf) /* unpack mib opCode*/ +#define cmUnpkMibStatus(x, mBuf) oduPackUInt16(x, mBuf) /* unpack mib cfm status*/ +#define cmUnpkMibTblType(x, mBuf) oduPackUInt16(x, mBuf) /* Pack mib table type */ #define cmUnpkMibReqId(x, mBuf) SUnpkS32(x, mBuf) /* Pack mib request Id */ -#define cmUnpkProfileId(x, mBuf) SUnpkU8(x, mBuf) /* Pack HCC Profile Id */ -#define cmUnpkIntfId(x, mBuf) SUnpkU16(x, mBuf) /* unpack intf id */ -#define cmUnpkIntfVer(x, mBuf) SUnpkU16(x, mBuf) /* unpack intf ver */ -#define cmUnpkuaType(x, mBuf) SUnpkU8(x, mBuf) /* Unpack uaType */ +#define cmUnpkProfileId(x, mBuf) oduPackUInt8(x, mBuf) /* Pack HCC Profile Id */ +#define cmUnpkIntfId(x, mBuf) oduPackUInt16(x, mBuf) /* unpack intf id */ +#define cmUnpkIntfVer(x, mBuf) oduPackUInt16(x, mBuf) /* unpack intf ver */ +#define cmUnpkuaType(x, mBuf) oduPackUInt8(x, mBuf) /* Unpack uaType */ /* scc specific typedefs */ #define cmUnpkBaud(x, mBuf) SUnpkS16(x, mBuf) /* unpack Baud */ @@ -2589,19 +2589,19 @@ /* tcp/ip specific typedefs */ -#define cmUnpkIpAddr(x, mBuf) SUnpkU32(x, mBuf) /* unpack IpAddr */ -#define cmUnpkPort(x, mBuf) SUnpkU16(x, mBuf) /* unpack Port */ -#define cmUnpkCmd(x, mBuf) SUnpkU8(x, mBuf) /* unpack Cmd */ -#define cmUnpkFlags(x, mBuf) SUnpkU8(x, mBuf) /* unpack Flags */ -#define cmUnpkTtl(x, mBuf) SUnpkU8(x, mBuf) /* unpack Ttl */ -#define cmUnpkPrec(x, mBuf) SUnpkU8(x, mBuf) /* unpack Prec */ -#define cmUnpkWindow(x, mBuf) SUnpkU32(x, mBuf) /* unpack Window */ +#define cmUnpkIpAddr(x, mBuf) oduPackUInt32(x, mBuf) /* unpack IpAddr */ +#define cmUnpkPort(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Port */ +#define cmUnpkCmd(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Cmd */ +#define cmUnpkFlags(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Flags */ +#define cmUnpkTtl(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ttl */ +#define cmUnpkPrec(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Prec */ +#define cmUnpkWindow(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Window */ /* LLC/SNAP specific defines */ -#define cmUnpkOui(x, mBuf) SUnpkU32(x, mBuf) /* unpack Oui */ -#define cmUnpkPid(x, mBuf) SUnpkU16(x, mBuf) /* unpack Pid */ -#define cmUnpkLlcId(x, mBuf) SUnpkU32(x, mBuf) /* unpack LLcId */ +#define cmUnpkOui(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Oui */ +#define cmUnpkPid(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Pid */ +#define cmUnpkLlcId(x, mBuf) oduPackUInt32(x, mBuf) /* unpack LLcId */ /* packing and unpacking for token strings */ @@ -2614,15 +2614,15 @@ /* Value */ \ for (i = 0; i < (S16) tknStr->len; i++) \ { \ - CMCHKPK(SPkU8, tknStr->val[i], mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); \ } \ \ /* Length */ \ - CMCHKPK(SPkU8, tknStr->len, mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); \ } \ \ /* Token Header */ \ - CMCHKPK(SPkU8, tknStr->pres, mBuf); \ + CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); \ } #define CMUNPKTKNSTR(tknStr, mBuf) \ @@ -2630,17 +2630,17 @@ Cntr i; \ \ /* Token Header */ \ - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); \ \ if(tknStr->pres) \ { \ /* Length */ \ - CMCHKUNPK(SUnpkU8, &tknStr->len, mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); \ \ /* Value */ \ for (i = 1; i <= (S16) tknStr->len; i++) \ { \ - CMCHKUNPK(SUnpkU8, &tknStr->val[tknStr->len - i], mBuf); \ + CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - i], mBuf); \ } \ } \ \ @@ -2648,8 +2648,8 @@ #endif /* CMFILE_REORG_1 */ -#define cmPkTranId(x, mBuf) SPkU32(x, mBuf) /* Pack transaction Id */ -#define cmUnpkTranId(x, mBuf) SUnpkU32(x, mBuf) /* unpack transaction Id */ +#define cmPkTranId(x, mBuf) oduUnpackUInt32(x, mBuf) /* Pack transaction Id */ +#define cmUnpkTranId(x, mBuf) oduPackUInt32(x, mBuf) /* unpack transaction Id */ #ifdef L2_L3_SPLIT typedef struct _debugInfo diff --git a/src/cm/gen.x b/src/cm/gen.x index 7d0252f1a..632b68b7f 100755 --- a/src/cm/gen.x +++ b/src/cm/gen.x @@ -1606,7 +1606,7 @@ typedef U8 CmIpAddr6[16]; /* 16 byte IPV6 address */ /* system services structures */ EXTERN S16 cmPkDateTime ARGS((DateTime *dateTime, Buffer *mBuf)); EXTERN S16 cmPkDuration ARGS((Duration *duration, Buffer *mBuf)); -EXTERN S16 cmPkPtr ARGS((PTR ptr, Buffer *mBuf)); +EXTERN S16 oduPackPointer ARGS((PTR ptr, Buffer *mBuf)); EXTERN S16 cmPkEntityId ARGS((EntityId *entityId, Buffer *mBuf)); EXTERN S16 cmPkElmntId ARGS((ElmntId *elmntId, Buffer *mBuf)); EXTERN S16 cmPkMemoryId ARGS((MemoryId *memoryId, Buffer *mBuf)); @@ -1658,7 +1658,7 @@ EXTERN S16 cmPkCmAlarm ARGS((CmAlarm *alrm, Buffer *mBuf)); /* system services structures */ EXTERN S16 cmUnpkDateTime ARGS((DateTime *dateTime, Buffer *mBuf)); EXTERN S16 cmUnpkDuration ARGS((Duration *duration, Buffer *mBuf)); -EXTERN S16 cmUnpkPtr ARGS((PTR *ptr, Buffer *mBuf)); +EXTERN S16 oduUnpackPointer ARGS((PTR *ptr, Buffer *mBuf)); EXTERN S16 cmUnpkEntityId ARGS((EntityId *entityId, Buffer *mBuf)); EXTERN S16 cmUnpkElmntId ARGS((ElmntId *elmntId, Buffer *mBuf)); EXTERN S16 cmUnpkMemoryId ARGS((MemoryId *memoryId, Buffer *mBuf)); diff --git a/src/cm/kwu.c b/src/cm/kwu.c index 487dc8417..88cdcc888 100755 --- a/src/cm/kwu.c +++ b/src/cm/kwu.c @@ -86,12 +86,12 @@ SpId spId; (ErrVal)EKWU001, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPKLOG(SPkS16, spId, mBuf, EKWU002, pst); CMCHKPKLOG(SPkS16, suId, mBuf, EKWU003, pst); pst->event = (Event) KWU_EVT_BND_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -126,13 +126,13 @@ U8 status; (ErrVal)EKWU004, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } - CMCHKPKLOG(SPkU8, status, mBuf, EKWU005, pst); + CMCHKPKLOG(oduUnpackUInt8, status, mBuf, EKWU005, pst); CMCHKPKLOG(SPkS16, suId, mBuf, EKWU006, pst); pst->event = (Event) KWU_EVT_BND_CFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -167,13 +167,13 @@ Reason reason; (ErrVal)EKWU007, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } CMCHKPKLOG(SPkS16, reason, mBuf, EKWU008, pst); CMCHKPKLOG(SPkS16, suId, mBuf, EKWU009, pst); pst->event = (Event) KWU_EVT_UBND_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuUbndReq */ #ifdef ANSI @@ -200,22 +200,22 @@ Buffer *mBuf; case CM_LTE_LCH_PCCH: CMCHKPK(cmPkLteTimingInfo, ¶m->tm.tmg, mBuf); #ifdef EMTC_ENABLE - CMCHKPK(SPkU8, param->emtcDiReason,mBuf); - CMCHKPK(SPkU8, param->pnb,mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcDiReason,mBuf); + CMCHKPK(oduUnpackUInt8, param->pnb,mBuf); #endif break; case CM_LTE_LCH_DTCH: case CM_LTE_LCH_DCCH: break; default : - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteLcType, param->lcType, mBuf); #endif - CMCHKPK(SPkU32, param->sduId, mBuf); + CMCHKPK(oduUnpackUInt32, param->sduId, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkKwuDatReqInfo */ @@ -264,14 +264,14 @@ Buffer * mBuf; (ErrVal)EKWU028, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemcpy((U8*)datReqInfo,(U8*)datReq,sizeof(KwuDatReqInfo)); - CMCHKPK(cmPkPtr,(PTR)datReqInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)datReqInfo, mBuf); } else { - CMCHKPK(cmPkPtr,(PTR)datReq, mBuf); + CMCHKPK(oduPackPointer,(PTR)datReq, mBuf); } } break; @@ -285,7 +285,7 @@ Buffer * mBuf; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)EKWU010, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmPkKwuDatReqInfo( (datReq), mBuf); @@ -296,7 +296,7 @@ Buffer * mBuf; sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -308,7 +308,7 @@ Buffer * mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } #ifdef L2_L3_SPLIT @@ -323,7 +323,7 @@ Buffer * mBuf; #else pst->event = (Event) KWU_EVT_DAT_REQ; #endif - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); #else if (pst->srcEnt == ENTPJ) { @@ -364,14 +364,14 @@ Buffer * mBuf; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)EKWU010, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ } break; case ODU_SELECTOR_LWLC: { - CMCHKPK(cmPkPtr,(PTR)datReq, mBuf); + CMCHKPK(oduPackPointer,(PTR)datReq, mBuf); } break; #endif /* LCKWU */ @@ -386,11 +386,11 @@ Buffer * mBuf; sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ret1); + return (ret1); #endif } /* cmPkKwuDatReq */ @@ -409,12 +409,12 @@ Buffer *mBuf; { TRC3(cmPkKwuDatIndInfo); - CMCHKPK(SPkU8, param->isOutOfSeq, mBuf); + CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf); #ifdef CCPU_OPT CMCHKPK(cmPkLteRnti, param->tCrnti, mBuf); #endif CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -471,11 +471,11 @@ Buffer * mBuf; (ErrVal)EKWU028, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemcpy((U8*)datIndInfo,(U8*)datInd,sizeof(KwuDatIndInfo)); - CMCHKPK(cmPkPtr,(PTR)datIndInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)datIndInfo, mBuf); } break; case ODU_SELECTOR_LC: @@ -488,7 +488,7 @@ Buffer * mBuf; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)EKWU012, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmPkKwuDatIndInfo( (datInd), mBuf); @@ -502,12 +502,12 @@ Buffer * mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) KWU_EVT_DAT_IND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuDatInd */ @@ -528,11 +528,11 @@ Buffer *mBuf; TRC3(cmPkKwuDatCfmInfo); for(iter = 0; iter < param->numSduIds; iter++) { - CMCHKPK(SPkU32, param->sduIds[iter], mBuf); + CMCHKPK(oduUnpackUInt32, param->sduIds[iter], mBuf); } - CMCHKPK(SPkU32, param->numSduIds, mBuf); + CMCHKPK(oduUnpackUInt32, param->numSduIds, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkKwuDatCfmInfo */ @@ -560,14 +560,14 @@ KwuDatCfmInfo* datCfm; mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } switch(pst->selector) { case ODU_SELECTOR_LWLC: { - CMCHKPK(cmPkPtr,(PTR)datCfm, mBuf); + CMCHKPK(oduPackPointer,(PTR)datCfm, mBuf); } break; case ODU_SELECTOR_LC: @@ -580,7 +580,7 @@ KwuDatCfmInfo* datCfm; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)EKWU014, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmPkKwuDatCfmInfo( (datCfm), mBuf); @@ -589,7 +589,7 @@ KwuDatCfmInfo* datCfm; sizeof(KwuDatCfmInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } break; @@ -600,13 +600,13 @@ KwuDatCfmInfo* datCfm; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } CMCHKPKLOG(SPkS16, suId, mBuf, EKWU015, pst); pst->event = (Event) KWU_EVT_DAT_CFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuDatCfm */ @@ -634,7 +634,7 @@ KwuDiscSduInfo* discSdu; mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } switch(pst->selector) @@ -656,11 +656,11 @@ KwuDiscSduInfo* discSdu; (ErrVal)EKWU028, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemcpy((U8*)discSduInfo,(U8*)discSdu,sizeof(KwuDiscSduInfo)); - CMCHKPK(cmPkPtr,(PTR)discSduInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR)discSduInfo, mBuf); } break; case ODU_SELECTOR_LC: @@ -673,7 +673,7 @@ KwuDiscSduInfo* discSdu; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)EKWU016, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmPkKwuDiscSduInfo( (discSdu), mBuf); @@ -685,7 +685,7 @@ KwuDiscSduInfo* discSdu; CMCHKPKLOG(SPkS16, spId, mBuf, EKWU017, pst); pst->event = (Event) KWU_EVT_DISC_SDU_REQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuDiscSduReq */ @@ -707,11 +707,11 @@ Buffer *mBuf; for (i = (param->numSdu - 1); i >= 0; i--) { - CMCHKPK(SPkU32, param->sduId[(U16)i], mBuf); + CMCHKPK(oduUnpackUInt32, param->sduId[(U16)i], mBuf); } - CMCHKPK(SPkU32, param->numSdu, mBuf); + CMCHKPK(oduUnpackUInt32, param->numSdu, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -728,10 +728,10 @@ Buffer *mBuf; { TRC3(cmPkKwuFlowCntrlIndInfo); - CMCHKPK(SPkU32, param->pktAdmitCnt, mBuf); + CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkKwuFlowCntrlIndInfo */ #ifdef ANSI @@ -749,9 +749,9 @@ Buffer *mBuf; TRC3(cmUnpkKwuFlowCntrlIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->pktAdmitCnt, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkKwuFlowCntrlIndInfo */ @@ -781,14 +781,14 @@ KwuStaIndInfo* staInd; mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } switch(pst->selector) { case ODU_SELECTOR_LWLC: { - CMCHKPK(cmPkPtr,(PTR) staInd, mBuf); + CMCHKPK(oduPackPointer,(PTR) staInd, mBuf); } break; case ODU_SELECTOR_LC: @@ -801,7 +801,7 @@ KwuStaIndInfo* staInd; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)EKWU018, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmPkKwuStaIndInfo( (staInd), mBuf); @@ -810,7 +810,7 @@ KwuStaIndInfo* staInd; sizeof(KwuStaIndInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } break; @@ -821,13 +821,13 @@ KwuStaIndInfo* staInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPKLOG(SPkS16, suId, mBuf, EKWU019, pst); pst->event = (Event) KWU_EVT_STA_IND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuStaInd */ @@ -857,7 +857,7 @@ CmLteRlcId rlcId; mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } switch(pst->selector) @@ -873,7 +873,7 @@ CmLteRlcId rlcId; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)EKWU018, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmPkLteRlcId( &rlcId, mBuf); @@ -886,7 +886,7 @@ CmLteRlcId rlcId; CMCHKPKLOG(SPkS16, suId, mBuf, EKWU019, pst); pst->event = (Event) KWU_EVT_REEST_CMP_IND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuReEstCmpInd */ /* kwu_c_001.main_3 added support for L2 Measurement */ @@ -914,14 +914,14 @@ KwuDiscSduInfo *discCfmSdu; mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } switch(pst->selector) { case ODU_SELECTOR_LWLC: { - CMCHKPK(cmPkPtr,(PTR)discCfmSdu, mBuf); + CMCHKPK(oduPackPointer,(PTR)discCfmSdu, mBuf); } break; case ODU_SELECTOR_LC: @@ -934,7 +934,7 @@ KwuDiscSduInfo *discCfmSdu; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmPkKwuDiscSduInfo((discCfmSdu), mBuf); @@ -943,7 +943,7 @@ KwuDiscSduInfo *discCfmSdu; sizeof(KwuDiscSduInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } break; @@ -954,13 +954,13 @@ KwuDiscSduInfo *discCfmSdu; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPKLOG(SPkS16, spId, mBuf, ERRKWU, pst); pst->event = (Event) KWU_EVT_DISC_SDU_CFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuDiscSduCfm */ #ifdef ANSI @@ -989,7 +989,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; pst->pool, (Data *)flowCntrlIndInfo, sizeof(KwuFlowCntrlIndInfo),0); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LCKWU switch(pst->selector) @@ -1004,14 +1004,14 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; sizeof(KwuFlowCntrlIndInfo),0) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } break; case ODU_SELECTOR_LWLC: { - CMCHKPK(cmPkPtr,(PTR) flowCntrlIndInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR) flowCntrlIndInfo, mBuf); } break; } @@ -1020,7 +1020,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; CMCHKPKLOG(SPkS16, suId, mBuf, ERRKWU, pst); pst->event = (Event) KWU_EVT_FLOW_CNTRL_IND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuFlowCntrlInd */ #ifdef LTE_L2_MEAS @@ -1039,8 +1039,8 @@ Buffer *mBuf; TRC3(cmPkKwuDatAckIndInfo); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); - CMCHKPK(SPkU32, param->sduId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->sduId, mBuf); + return ROK; } #ifdef ANSI @@ -1066,7 +1066,7 @@ KwuDatAckInfo* datInd; mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } ret1 = cmPkKwuDatAckInfo( (datInd), mBuf); @@ -1077,20 +1077,20 @@ KwuDatAckInfo* datInd; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "Packing failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, sizeof(KwuDatAckInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } CMCHKPKLOG(SPkS16, suId, mBuf, ERRKWU, pst); pst->event = (Event) KWU_EVT_DAT_ACK_IND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkKwuDatAckInd */ #endif /* LTE_L2_MEAS */ @@ -1118,7 +1118,7 @@ Buffer *mBuf; CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU021, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -1142,10 +1142,10 @@ Buffer *mBuf; TRC3(cmUnpkKwuBndCfm) CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst); - CMCHKUNPKLOG(SUnpkU8, &status, mBuf, EKWU023, pst); + CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EKWU023, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -1172,7 +1172,7 @@ Buffer *mBuf; CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EKWU025, pst); SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } /* cmUnpkKwuUbndReq */ @@ -1192,7 +1192,7 @@ Buffer *mBuf; TRC3(cmUnpkKwuDatReqInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->sduId, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); #ifdef CCPU_OPT CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); @@ -1200,8 +1200,8 @@ Buffer *mBuf; case CM_LTE_LCH_BCCH: case CM_LTE_LCH_PCCH: #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8,¶m->pnb , mBuf); - CMCHKUNPK(SUnpkU8,¶m->emtcDiReason , mBuf); + CMCHKUNPK(oduPackUInt8,¶m->pnb , mBuf); + CMCHKUNPK(oduPackUInt8,¶m->emtcDiReason , mBuf); #endif CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->tm.tmg, mBuf); @@ -1213,10 +1213,10 @@ Buffer *mBuf; case CM_LTE_LCH_DCCH: break; default : - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } @@ -1247,7 +1247,7 @@ Buffer *mBuf; { case ODU_SELECTOR_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &datReq, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &datReq, mBuf); } break; case ODU_SELECTOR_LC: @@ -1264,7 +1264,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EKWU027, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmUnpkKwuDatReqInfo( (datReq), mBuf); @@ -1278,7 +1278,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } retVal = (*func)(pst, datReq, mBuf); @@ -1289,7 +1289,7 @@ Buffer *mBuf; retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq, sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY); } - RETVALUE(retVal); + return (retVal); } /* cmUnpkKwuDatReq */ @@ -1312,8 +1312,8 @@ Buffer *mBuf; #ifdef CCPU_OPT CMCHKUNPK(cmUnpkLteRnti, ¶m->tCrnti, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->isOutOfSeq, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isOutOfSeq, mBuf); + return ROK; } @@ -1341,7 +1341,7 @@ Buffer *mBuf; { case ODU_SELECTOR_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &datInd, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &datInd, mBuf); } break; case ODU_SELECTOR_LC: @@ -1361,7 +1361,7 @@ Buffer *mBuf; (ErrVal)EKWU028, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } } else @@ -1377,7 +1377,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EKWU029, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ } @@ -1387,7 +1387,7 @@ Buffer *mBuf; SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); - RETVALUE(RFAILED); + return RFAILED; } retVal = (*func)(pst, datInd, mBuf); /* If LWLC is configured and the destination entity is PDCP, we need to @@ -1397,7 +1397,7 @@ Buffer *mBuf; retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, sizeof(KwuDatIndInfo),SS_SHARABLE_MEMORY); } - RETVALUE(retVal); + return (retVal); } /* cmUnpkKwuDatInd */ @@ -1417,7 +1417,7 @@ Buffer *mBuf; TRC3(cmUnpkKwuDatCfmInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numSduIds, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numSduIds, mBuf); #ifdef L2_L3_SPLIT /*Work Around */ if (param->numSduIds >= KWU_MAX_DAT_CFM) @@ -1425,9 +1425,9 @@ Buffer *mBuf; #endif for(iter = param->numSduIds -1; iter >= 0 ; iter--) { - CMCHKUNPK(SUnpkU32, ¶m->sduIds[iter], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->sduIds[iter], mBuf); } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -1456,7 +1456,7 @@ Buffer *mBuf; { case ODU_SELECTOR_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &datCfm, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &datCfm, mBuf); } break; case ODU_SELECTOR_LC: @@ -1472,7 +1472,7 @@ Buffer *mBuf; (ErrVal)EKWU030, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)datCfm, 0, sizeof(KwuDatCfmInfo)); @@ -1484,7 +1484,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EKWU031, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ } @@ -1496,12 +1496,12 @@ Buffer *mBuf; (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, datCfm)); + return ((*func)(pst, suId, datCfm)); } /* cmUnpkKwuDatCfm */ @@ -1529,7 +1529,7 @@ Buffer *mBuf; { case ODU_SELECTOR_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &discSdu, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &discSdu, mBuf); } break; case ODU_SELECTOR_LC: @@ -1544,7 +1544,7 @@ Buffer *mBuf; (ErrVal)EKWU032, (ErrVal)0, "SGetMsg() failed"); #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)discSdu, 0, sizeof(KwuDiscSduInfo)); @@ -1556,7 +1556,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EKWU033, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ break; @@ -1568,11 +1568,11 @@ Buffer *mBuf; (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, discSdu)); + return ((*func)(pst, spId, discSdu)); } /* cmUnpkKwuDiscSduReq */ @@ -1593,13 +1593,13 @@ Buffer *mBuf; TRC3(cmUnpkKwuStaIndInfo); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numSdu, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf); for (i = 0; i < param->numSdu; i++) { - CMCHKUNPK(SUnpkU32, ¶m->sduId[i], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->sduId[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkKwuStaIndInfo */ @@ -1629,7 +1629,7 @@ Buffer *mBuf; { case ODU_SELECTOR_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *)&staInd, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *)&staInd, mBuf); } break; case ODU_SELECTOR_LC: @@ -1645,7 +1645,7 @@ Buffer *mBuf; (ErrVal)EKWU034, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)staInd, 0, sizeof(KwuStaIndInfo)); @@ -1658,7 +1658,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EKWU035, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ } @@ -1670,11 +1670,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, staInd)); + return ((*func)(pst, suId, staInd)); } /* cmUnpkKwuStaInd */ @@ -1716,7 +1716,7 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)EKWU035, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #else cmUnpkLteRlcId( &rlcId, mBuf); @@ -1727,7 +1727,7 @@ Buffer *mBuf; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, rlcId)); + return ((*func)(pst, suId, rlcId)); } /* cmUnpkKwuReEstCmpInd */ /* kwu_c_001.main_3 added support for L2 Measurement */ @@ -1757,7 +1757,7 @@ Buffer *mBuf; { case ODU_SELECTOR_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &discSdu, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &discSdu, mBuf); } break; case ODU_SELECTOR_LC: @@ -1773,7 +1773,7 @@ Buffer *mBuf; (ErrVal)ERRKWU, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)discSdu, 0, sizeof(KwuDiscSduInfo)); @@ -1796,11 +1796,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, discSdu)); + return ((*func)(pst, spId, discSdu)); } /* cmUnpkKwuDiscSduCfm */ #ifdef ANSI PUBLIC S16 cmUnpkKwuFlowCntrlInd @@ -1833,7 +1833,7 @@ Buffer *mBuf; sizeof(KwuFlowCntrlIndInfo),0) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } cmUnpkKwuFlowCntrlIndInfo(flowCntrlInfo, mBuf); @@ -1842,7 +1842,7 @@ Buffer *mBuf; case ODU_SELECTOR_LWLC: { - CMCHKUNPK(cmUnpkPtr,(PTR *) &flowCntrlInfo, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &flowCntrlInfo, mBuf); } break; #endif @@ -1850,7 +1850,7 @@ Buffer *mBuf; SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, flowCntrlInfo)); + return ((*func)(pst, suId, flowCntrlInfo)); } /* cmUnpkKwuFlowCntrlInd */ #ifdef LTE_L2_MEAS @@ -1868,10 +1868,10 @@ Buffer *mBuf; { TRC3(cmUnpkKwuDatAckInfo); - CMCHKUNPK(SUnpkU32, ¶m->sduId, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1906,7 +1906,7 @@ Buffer *mBuf; (ErrVal)ERRKWU, (ErrVal)0, "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } cmMemset((U8 *)datInd, 0, sizeof(KwuDatAckInfo)); @@ -1920,11 +1920,11 @@ Buffer *mBuf; SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_DEBUG, (ErrVal)ERRKWU, (ErrVal)ret1, "Unpacking failure"); - RETVALUE( ret1 ); + return ( ret1 ); } #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE((*func)(pst, suId, datInd)); + return ((*func)(pst, suId, datInd)); } /* cmUnpkKwuDatAckInd */ #endif /* LTE_L2_MEAS */ #endif /* LCKWU */ diff --git a/src/cm/legtp.c b/src/cm/legtp.c index 8c60dfc97..5e676741a 100644 --- a/src/cm/legtp.c +++ b/src/cm/legtp.c @@ -37,12 +37,12 @@ * RFAILED - failure * ******************************************************************/ -S16 packEgtpCfmStatus(CmStatus cfm, Buffer *mBuf) +uint8_t packEgtpCfmStatus(CmStatus cfm, Buffer *mBuf) { - SPkU16(cfm.status, mBuf); - SPkU16(cfm.reason, mBuf); + oduUnpackUInt16(cfm.status, mBuf); + oduUnpackUInt16(cfm.reason, mBuf); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -63,12 +63,12 @@ S16 packEgtpCfmStatus(CmStatus cfm, Buffer *mBuf) * ******************************************************************/ -S16 unpackEgtpCfmStatus(CmStatus *cfm, Buffer *mBuf) +uint8_t unpackEgtpCfmStatus(CmStatus *cfm, Buffer *mBuf) { - SUnpkU16(&(cfm->reason), mBuf); - SUnpkU16(&(cfm->status), mBuf); + oduPackUInt16(&(cfm->reason), mBuf); + oduPackUInt16(&(cfm->status), mBuf); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -88,35 +88,35 @@ S16 unpackEgtpCfmStatus(CmStatus *cfm, Buffer *mBuf) * RFAILED - failure * ******************************************************************/ -S16 packEgtpCfgReq(Pst *pst, EgtpConfig egtpCfg) +uint8_t packEgtpCfgReq(Pst *pst, EgtpConfig egtpCfg) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK) { printf("\nDU_APP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } if(egtpCfg.localIp.ipV4Pres) { - SPkU32(egtpCfg.localIp.ipV4Addr, mBuf); + oduUnpackUInt32(egtpCfg.localIp.ipV4Addr, mBuf); } - cmPkBool(egtpCfg.localIp.ipV4Pres, mBuf); - SPkU16(egtpCfg.localPort, mBuf); + oduPackBool(egtpCfg.localIp.ipV4Pres, mBuf); + oduUnpackUInt16(egtpCfg.localPort, mBuf); if(egtpCfg.destIp.ipV4Pres) { - SPkU32(egtpCfg.destIp.ipV4Addr, mBuf); + oduUnpackUInt32(egtpCfg.destIp.ipV4Addr, mBuf); } - cmPkBool(egtpCfg.destIp.ipV4Pres, mBuf); - SPkU16(egtpCfg.destPort, mBuf); + oduPackBool(egtpCfg.destIp.ipV4Pres, mBuf); + oduUnpackUInt16(egtpCfg.destPort, mBuf); - SPkU32(egtpCfg.minTunnelId, mBuf); - SPkU32(egtpCfg.maxTunnelId, mBuf); + oduUnpackUInt32(egtpCfg.minTunnelId, mBuf); + oduUnpackUInt32(egtpCfg.maxTunnelId, mBuf); - SPstTsk(pst, mBuf); + ODU_POST_TASK(pst, mBuf); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -137,32 +137,32 @@ S16 packEgtpCfgReq(Pst *pst, EgtpConfig egtpCfg) * RFAILED - failure * * ****************************************************************/ -S16 unpackEgtpCfgReq(EgtpCfgReq func, Pst *pst, Buffer *mBuf) +uint8_t unpackEgtpCfgReq(EgtpCfgReq func, Pst *pst, Buffer *mBuf) { EgtpConfig egtpCfg; - cmMemset((U8 *)&egtpCfg, 0, sizeof(EgtpConfig)); + memset((uint8_t *)&egtpCfg, 0, sizeof(EgtpConfig)); - SUnpkU32(&(egtpCfg.maxTunnelId), mBuf); - SUnpkU32(&(egtpCfg.minTunnelId), mBuf); + oduPackUInt32(&(egtpCfg.maxTunnelId), mBuf); + oduPackUInt32(&(egtpCfg.minTunnelId), mBuf); - SUnpkU16(&(egtpCfg.destPort), mBuf); - cmUnpkBool(&(egtpCfg.destIp.ipV4Pres), mBuf); + oduPackUInt16(&(egtpCfg.destPort), mBuf); + oduUnpackBool(&(egtpCfg.destIp.ipV4Pres), mBuf); if(egtpCfg.destIp.ipV4Pres) { - SUnpkU32(&(egtpCfg.destIp.ipV4Addr), mBuf); + oduPackUInt32(&(egtpCfg.destIp.ipV4Addr), mBuf); } - SUnpkU16(&(egtpCfg.localPort), mBuf); - cmUnpkBool(&(egtpCfg.localIp.ipV4Pres), mBuf); + oduPackUInt16(&(egtpCfg.localPort), mBuf); + oduUnpackBool(&(egtpCfg.localIp.ipV4Pres), mBuf); if(egtpCfg.localIp.ipV4Pres) { - SUnpkU32(&(egtpCfg.localIp.ipV4Addr), mBuf); + oduPackUInt32(&(egtpCfg.localIp.ipV4Addr), mBuf); } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); - RETVALUE((*func)(pst, egtpCfg)); + return ((*func)(pst, egtpCfg)); } @@ -184,19 +184,19 @@ S16 unpackEgtpCfgReq(EgtpCfgReq func, Pst *pst, Buffer *mBuf) * ******************************************************************/ -S16 packEgtpCfgCfm(Pst *pst, CmStatus cfm) +uint8_t packEgtpCfgCfm(Pst *pst, CmStatus cfm) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK) { printf("\nEGTP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } packEgtpCfmStatus(cfm, mBuf); - SPstTsk(pst, mBuf); - RETVALUE(ROK); + ODU_POST_TASK(pst, mBuf); + return ROK; } /******************************************************************* @@ -217,14 +217,14 @@ S16 packEgtpCfgCfm(Pst *pst, CmStatus cfm) * ******************************************************************/ -S16 unpackEgtpCfgCfm(EgtpCfgCfm func, Buffer *mBuf) +uint8_t unpackEgtpCfgCfm(EgtpCfgCfm func, Buffer *mBuf) { CmStatus cfm; - cmMemset((U8 *)&cfm, 0, sizeof(CmStatus)); + memset((uint8_t *)&cfm, 0, sizeof(CmStatus)); unpackEgtpCfmStatus(&cfm, mBuf); - RETVALUE((*func)(cfm)); + return ((*func)(cfm)); } /******************************************************************* @@ -243,18 +243,18 @@ S16 unpackEgtpCfgCfm(EgtpCfgCfm func, Buffer *mBuf) * RFAILED - failure * *******************************************************************/ -S16 packEgtpSrvOpenReq(Pst *pst) +uint8_t packEgtpSrvOpenReq(Pst *pst) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK) { printf("\nDU_APP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } - SPstTsk(pst, mBuf); - RETVALUE(ROK); + ODU_POST_TASK(pst, mBuf); + return ROK; } /******************************************************************* @@ -274,9 +274,9 @@ S16 packEgtpSrvOpenReq(Pst *pst) * RFAILED - failure * ******************************************************************/ -S16 unpackEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf) +uint8_t unpackEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf) { - RETVALUE((*func)(pst)); + return ((*func)(pst)); } @@ -296,19 +296,19 @@ S16 unpackEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf) * RFAILED - failure * *******************************************************************/ -S16 packEgtpSrvOpenCfm(Pst *pst, CmStatus cfm) +uint8_t packEgtpSrvOpenCfm(Pst *pst, CmStatus cfm) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK) { printf("\nEGTP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } packEgtpCfmStatus(cfm, mBuf); - SPstTsk(pst, mBuf); - RETVALUE(ROK); + ODU_POST_TASK(pst, mBuf); + return ROK; } @@ -329,14 +329,14 @@ S16 packEgtpSrvOpenCfm(Pst *pst, CmStatus cfm) * RFAILED - failure * *******************************************************************/ -S16 unpackEgtpSrvOpenCfm(EgtpSrvOpenCfm func, Buffer *mBuf) +uint8_t unpackEgtpSrvOpenCfm(EgtpSrvOpenCfm func, Buffer *mBuf) { CmStatus cfm; - cmMemset((U8 *)&cfm, 0, sizeof(CmStatus)); + memset((uint8_t *)&cfm, 0, sizeof(CmStatus)); unpackEgtpCfmStatus(&cfm, mBuf); - RETVALUE((*func)(cfm)); + return ((*func)(cfm)); } /******************************************************************* @@ -358,22 +358,22 @@ S16 unpackEgtpSrvOpenCfm(EgtpSrvOpenCfm func, Buffer *mBuf) * RFAILED - failure * *******************************************************************/ -S16 packEgtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) +uint8_t packEgtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK) { printf("\nDU_APP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } - SPkU8(tnlEvt.action, mBuf); - SPkU32(tnlEvt.lclTeid, mBuf); - SPkU32(tnlEvt.remTeid, mBuf); + oduUnpackUInt8(tnlEvt.action, mBuf); + oduUnpackUInt32(tnlEvt.lclTeid, mBuf); + oduUnpackUInt32(tnlEvt.remTeid, mBuf); - SPstTsk(pst, mBuf); - RETVALUE(ROK); + ODU_POST_TASK(pst, mBuf); + return ROK; } @@ -395,17 +395,17 @@ S16 packEgtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) * RFAILED - failure * * *******************************************************************/ -S16 unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf) +uint8_t unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf) { EgtpTnlEvt tnlEvt; - cmMemset((U8 *)&tnlEvt, 0, sizeof(EgtpTnlEvt)); + memset((uint8_t *)&tnlEvt, 0, sizeof(EgtpTnlEvt)); - SUnpkU32(&(tnlEvt.remTeid), mBuf); - SUnpkU32(&(tnlEvt.lclTeid), mBuf); - SUnpkU8(&(tnlEvt.action), mBuf); + oduPackUInt32(&(tnlEvt.remTeid), mBuf); + oduPackUInt32(&(tnlEvt.lclTeid), mBuf); + oduPackUInt8(&(tnlEvt.action), mBuf); - RETVALUE((* func)(pst, tnlEvt)); + return ((* func)(pst, tnlEvt)); } @@ -428,24 +428,24 @@ S16 unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf) * ********************************************************************/ -S16 packEgtpTnlMgmtCfm(Pst *pst, EgtpTnlEvt tnlEvt) +uint8_t packEgtpTnlMgmtCfm(Pst *pst, EgtpTnlEvt tnlEvt) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK) { printf("\nEGTP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } - SPkU8(tnlEvt.action, mBuf); - SPkU32(tnlEvt.lclTeid, mBuf); - SPkU32(tnlEvt.remTeid, mBuf); + oduUnpackUInt8(tnlEvt.action, mBuf); + oduUnpackUInt32(tnlEvt.lclTeid, mBuf); + oduUnpackUInt32(tnlEvt.remTeid, mBuf); packEgtpCfmStatus(tnlEvt.cfmStatus, mBuf); - SPstTsk(pst, mBuf); - RETVALUE(ROK); + ODU_POST_TASK(pst, mBuf); + return ROK; } @@ -467,18 +467,18 @@ S16 packEgtpTnlMgmtCfm(Pst *pst, EgtpTnlEvt tnlEvt) * RFAILED - failure * * *******************************************************************/ -S16 unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf) +uint8_t unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf) { EgtpTnlEvt tnlEvt; - cmMemset((U8 *)&tnlEvt, 0, sizeof(EgtpTnlEvt)); + memset((uint8_t *)&tnlEvt, 0, sizeof(EgtpTnlEvt)); unpackEgtpCfmStatus(&(tnlEvt.cfmStatus), mBuf); - SUnpkU32(&(tnlEvt.remTeid), mBuf); - SUnpkU32(&(tnlEvt.lclTeid), mBuf); - SUnpkU8(&(tnlEvt.action), mBuf); + oduPackUInt32(&(tnlEvt.remTeid), mBuf); + oduPackUInt32(&(tnlEvt.lclTeid), mBuf); + oduPackUInt8(&(tnlEvt.action), mBuf); - RETVALUE((* func)(tnlEvt)); + return ((* func)(tnlEvt)); } @@ -498,18 +498,18 @@ S16 unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf) * RFAILED - failure * *******************************************************************/ -S16 packEgtpSlotInd(Pst *pst) +uint8_t packEgtpSlotInd(Pst *pst) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK) { printf("\nDU_APP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } - SPstTsk(pst, mBuf); - RETVALUE(ROK); + ODU_POST_TASK(pst, mBuf); + return ROK; } @@ -529,7 +529,7 @@ S16 packEgtpSlotInd(Pst *pst) * RFAILED - failure * ******************************************************************/ -S16 unpackEgtpSlotInd(EgtpSlotInd func, Pst *pst, Buffer *mBuf) +uint8_t unpackEgtpSlotInd(EgtpSlotInd func, Pst *pst, Buffer *mBuf) { - RETVALUE((*func)()); + return ((*func)()); } diff --git a/src/cm/legtp.h b/src/cm/legtp.h index dfbf4eedd..f5b8a2334 100644 --- a/src/cm/legtp.h +++ b/src/cm/legtp.h @@ -42,25 +42,25 @@ typedef enum egtpMsgType typedef struct egtpIpAddr { - Bool ipV4Pres; - U32 ipV4Addr; + Bool ipV4Pres; + uint32_t ipV4Addr; }EgtpIpAddr; typedef struct egtpConfig { EgtpIpAddr localIp; - U16 localPort; + uint16_t localPort; EgtpIpAddr destIp; - U16 destPort; - U32 minTunnelId; - U32 maxTunnelId; + uint16_t destPort; + uint32_t minTunnelId; + uint32_t maxTunnelId; }EgtpConfig; typedef struct egtpTnlEvt { - U8 action; - U32 lclTeid; - U32 remTeid; + uint8_t action; + uint32_t lclTeid; + uint32_t remTeid; CmStatus cfmStatus; }EgtpTnlEvt; @@ -77,8 +77,8 @@ typedef struct egtpMsgHdr TknU8 nPdu; /**< N-PDU Number */ TknU32 seqNum; /**< Sequence Number */ EgtpExtHdr extHdr; /**< Extension headers present flag */ - U32 teId; /**< Tunnel Endpoint Id */ - U8 msgType; /**< eGTP-U Message Type */ + uint32_t teId; /**< Tunnel Endpoint Id */ + uint8_t msgType; /**< eGTP-U Message Type */ }EgtpMsgHdr; typedef struct egtpMsg @@ -87,28 +87,28 @@ typedef struct egtpMsg Buffer *msg; }EgtpMsg; -typedef S16 (*EgtpCfgReq) ARGS((Pst *pst, EgtpConfig egtpCfg)); -typedef S16 (*EgtpCfgCfm) ARGS((CmStatus cfm)); -typedef S16 (*EgtpInitReq) ARGS((Buffer *mBuf)); -typedef S16 (*EgtpSrvOpenReq) ARGS(()); -typedef S16 (*EgtpSrvOpenCfm) ARGS((CmStatus cfm)); -typedef S16 (*EgtpTnlMgmtReq) ARGS((Pst *pst, EgtpTnlEvt tnlEvt)); -typedef S16 (*EgtpTnlMgmtCfm) ARGS((EgtpTnlEvt tnlEvt)); -typedef S16 (*EgtpSlotInd) ARGS(()); +typedef uint8_t (*EgtpCfgReq) ARGS((Pst *pst, EgtpConfig egtpCfg)); +typedef uint8_t (*EgtpCfgCfm) ARGS((CmStatus cfm)); +typedef uint8_t (*EgtpInitReq) ARGS((Buffer *mBuf)); +typedef uint8_t (*EgtpSrvOpenReq) ARGS(()); +typedef uint8_t (*EgtpSrvOpenCfm) ARGS((CmStatus cfm)); +typedef uint8_t (*EgtpTnlMgmtReq) ARGS((Pst *pst, EgtpTnlEvt tnlEvt)); +typedef uint8_t (*EgtpTnlMgmtCfm) ARGS((EgtpTnlEvt tnlEvt)); +typedef uint8_t (*EgtpSlotInd) ARGS(()); -S16 packEgtpCfgReq(Pst *pst, EgtpConfig egtpCfg); -S16 unpackEgtpCfgReq(EgtpCfgReq func , Pst *pst, Buffer *mBuf); -S16 packEgtpCfgCfm(Pst *pst, CmStatus cfm); -S16 unpackEgtpCfgCfm(EgtpCfgCfm func, Buffer *mBuf); -S16 packEgtpSrvOpenReq(Pst *pst); -S16 unpackkEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf); -S16 packEgtpSrvOpenCfm(Pst *pst, CmStatus cfm); -S16 unpackEgtpSrvOpenCfm(EgtpSrvOpenCfm func, Buffer *mBuf); -S16 packEgtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt); -S16 unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf); -S16 packEgtpTnlMgmtCfm(Pst *pst, EgtpTnlEvt tnlEvt); -S16 unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf); -S16 packEgtpSlotInd(Pst *pst); -S16 unpackEgtpSlotInd(EgtpSlotInd func, Pst *pst, Buffer *mBuf); +uint8_t packEgtpCfgReq(Pst *pst, EgtpConfig egtpCfg); +uint8_t unpackEgtpCfgReq(EgtpCfgReq func , Pst *pst, Buffer *mBuf); +uint8_t packEgtpCfgCfm(Pst *pst, CmStatus cfm); +uint8_t unpackEgtpCfgCfm(EgtpCfgCfm func, Buffer *mBuf); +uint8_t packEgtpSrvOpenReq(Pst *pst); +uint8_t unpackkEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf); +uint8_t packEgtpSrvOpenCfm(Pst *pst, CmStatus cfm); +uint8_t unpackEgtpSrvOpenCfm(EgtpSrvOpenCfm func, Buffer *mBuf); +uint8_t packEgtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt); +uint8_t unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf); +uint8_t packEgtpTnlMgmtCfm(Pst *pst, EgtpTnlEvt tnlEvt); +uint8_t unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf); +uint8_t packEgtpSlotInd(Pst *pst); +uint8_t unpackEgtpSlotInd(EgtpSlotInd func, Pst *pst, Buffer *mBuf); #endif diff --git a/src/cm/lkw.c b/src/cm/lkw.c index b048e8f89..5fa50df25 100755 --- a/src/cm/lkw.c +++ b/src/cm/lkw.c @@ -138,7 +138,7 @@ KwMngmt *cfg; /* RLC LM structure */ "SGetMsg failed ...!\n"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmPkKwMngmt(cfg, LKW_EVT_CFG_REQ, mBuf); @@ -153,13 +153,13 @@ KwMngmt *cfg; /* RLC LM structure */ "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 */ @@ -206,13 +206,13 @@ Buffer *mBuf; /* message buffer */ "cmUnpkKwMngmt failure ......!"); #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); (Void) (*func)(pst, &cfg); - RETVALUE(ROK); + return ROK; } /* end of unpackRlcConfigReq */ @@ -256,7 +256,7 @@ KwMngmt *cntrl; /* RLC LM structure */ "SGetMsg failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmPkKwMngmt(cntrl, LKW_EVT_CNTRL_REQ, mBuf); @@ -271,13 +271,13 @@ KwMngmt *cntrl; /* RLC LM structure */ "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 */ @@ -323,11 +323,11 @@ Buffer *mBuf; /* message buffer */ "cmUnpkKwMngmt failure ......!"); #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } /* end of cmUnpkLkwCntrlReq */ @@ -369,7 +369,7 @@ KwMngmt *cfm; /* RLC LM structure */ "SGetMsg failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmPkKwMngmt(cfm, LKW_EVT_CNTRL_CFM, mBuf); @@ -384,13 +384,13 @@ KwMngmt *cfm; /* RLC LM structure */ "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 */ @@ -438,12 +438,12 @@ Buffer *mBuf; /* message buffer */ "cmUnpkKwMngmt failure ......!"); } #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } /* end of cmUnpkLkwCntrlCfm */ @@ -489,12 +489,12 @@ Buffer *mBuf; /* message buffer */ "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 */ @@ -537,7 +537,7 @@ KwMngmt *cfm; /* RLC LM structure */ "SGetMsg failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmPkKwMngmt(cfm, LKW_EVT_CFG_CFM, mBuf); @@ -552,13 +552,13 @@ KwMngmt *cfm; /* RLC LM structure */ "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 */ @@ -605,11 +605,11 @@ Buffer *mBuf; /* message buffer */ "SPutMsg failure ......!"); } #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } /* end of unpackRlcConfigCfm */ @@ -653,7 +653,7 @@ KwMngmt *usta; /* RLC LM structure */ "SGetMsg() failed"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); + return (ret1); } ret1 = cmPkKwMngmt(usta, LKW_EVT_STA_IND, mBuf); @@ -668,13 +668,13 @@ KwMngmt *usta; /* RLC LM structure */ "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 */ @@ -722,12 +722,12 @@ Buffer *mBuf; /* message buffer */ "cmUnpkKwMngmt failure ......!"); } #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &usta)); + return ((*func)(pst, &usta)); } /* end of cmUnpkLsnStaInd */ /** @@ -768,7 +768,7 @@ KwMngmt *sta; /* status */ "SGetMsg failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } ret1 = cmPkKwMngmt(sta, LKW_EVT_STA_REQ, mBuf); @@ -783,13 +783,13 @@ KwMngmt *sta; /* status */ "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 */ @@ -835,12 +835,12 @@ Buffer *mBuf; /* message buffer */ "Unpacking failure ......!"); } #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } /* end of function cmUnpkLkwStaCfm */ @@ -888,12 +888,12 @@ Buffer *mBuf; /* message buffer */ "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 */ @@ -939,12 +939,12 @@ Buffer *mBuf; /* message buffer */ "Unpacking failure ......!"); #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &sta)); + return ((*func)(pst, &sta)); } /* end of function cmUnpkLkwStaReq */ @@ -992,12 +992,12 @@ Buffer *mBuf; /* message buffer */ "Unpacking failure ......!"); } #endif /* ERRCLASS & ERRCLS_DEBUG */ - RETVALUE(RFAILED); + return RFAILED; } (Void) (*func)(pst, &trc, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkLkwTrcInd */ @@ -1030,7 +1030,7 @@ Buffer *mBuf; /* Message buffer */ CMCHKPK(cmPkState, rcSap->state, mBuf); CMCHKPK(SPkS16, rcSap->spId, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCkwSapSta */ @@ -1061,7 +1061,7 @@ Buffer *mBuf; /* Message buffer */ CMCHKUNPK(SUnpkS16, &rcSap->spId, mBuf); CMCHKUNPK(cmUnpkState, &rcSap->state, mBuf); - RETVALUE(ROK); + return ROK; } /* end of function cmUnpkCkwSapSta */ /** @@ -1091,7 +1091,7 @@ Buffer *mBuf; /* Message buffer */ CMCHKPK(cmPkState, rlSap->state, mBuf); CMCHKPK(SPkS16, rlSap->spId, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkKwuSapSta */ @@ -1122,7 +1122,7 @@ Buffer *mBuf; /* Message buffer */ CMCHKUNPK(SUnpkS16, &rlSap->spId, mBuf); CMCHKUNPK(cmUnpkState, &rlSap->state, mBuf); - RETVALUE(ROK); + return ROK; } /* end of function cmUnpkKwuSapSta */ @@ -1153,7 +1153,7 @@ Buffer *mBuf; /* Message buffer */ CMCHKPK(cmPkState, mkSap->state, mBuf); CMCHKPK(cmPkSuId, mkSap->suId, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkRguSapSta */ @@ -1184,7 +1184,7 @@ Buffer *mBuf; /* Message buffer */ CMCHKUNPK(cmUnpkSuId, &mkSap->suId, mBuf); CMCHKUNPK(cmUnpkState, &mkSap->state, mBuf); - RETVALUE(ROK); + return ROK; } /* end of function cmUnpkRguSapSta */ @@ -1225,7 +1225,7 @@ KwMngmt *cfm; /* solicited status confirm */ "SGetMsg() failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } ret1 = cmPkKwMngmt(cfm, LKW_EVT_STA_CFM, mBuf); @@ -1240,13 +1240,13 @@ KwMngmt *cfm; /* solicited status confirm */ "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 */ @@ -1289,7 +1289,7 @@ Buffer *trcBuf; /* trace buffer */ "SGetMsg() failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } if (trcBuf) @@ -1306,7 +1306,7 @@ Buffer *trcBuf; /* trace buffer */ "SGetMsg() failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(trcBuf); @@ -1325,13 +1325,13 @@ Buffer *trcBuf; /* trace buffer */ } #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 */ @@ -1376,7 +1376,7 @@ KwMngmt *sts; /* statistics request */ "SGetMsg() failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } ret1 = cmPkKwMngmt(sts, LKW_EVT_STS_REQ, mBuf); @@ -1391,14 +1391,14 @@ KwMngmt *sts; /* statistics request */ "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 */ @@ -1443,7 +1443,7 @@ KwMngmt *cfm; /* statistics confirmation */ "SGetMsg() failure ......!"); } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(RFAILED); + return RFAILED; } ret1 = cmPkKwMngmt(cfm, LKW_EVT_STS_CFM, mBuf); @@ -1458,13 +1458,13 @@ KwMngmt *cfm; /* statistics confirmation */ "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 */ @@ -1503,7 +1503,7 @@ Buffer *mBuf; /* Message Buffer */ ret1 = cmPkRlcCfg(param, param->hdr.elmId.elmnt ,mBuf); if (ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } break; @@ -1511,7 +1511,7 @@ Buffer *mBuf; /* Message Buffer */ ret1 = cmPkKwCntrl(param, param->hdr.elmId.elmnt ,mBuf); if (ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } break; @@ -1519,7 +1519,7 @@ Buffer *mBuf; /* Message Buffer */ ret1 = cmPkKwUsta(param, param->hdr.elmId.elmnt ,mBuf); if (ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } break; @@ -1528,7 +1528,7 @@ Buffer *mBuf; /* Message Buffer */ ret1 = cmPkKwSsta(param, param->hdr.elmId.elmnt , eventType, mBuf); if (ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } break; @@ -1537,14 +1537,14 @@ Buffer *mBuf; /* Message Buffer */ 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: @@ -1555,7 +1555,7 @@ Buffer *mBuf; /* Message Buffer */ CMCHKPK(cmPkCmStatus, ¶m->cfm, mBuf); CMCHKPK(cmPkHeader, ¶m->hdr, mBuf); - RETVALUE(ROK); + return ROK; } /* end of function cmPkKwMngmt */ @@ -1589,12 +1589,12 @@ Buffer *mBuf; { 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; @@ -1604,22 +1604,22 @@ Buffer *mBuf; 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*/ @@ -1663,7 +1663,7 @@ Buffer *mBuf; break; case SADBG: { - CMCHKPK(SPkU32, cntrl->t.cntrl.s.dbgCntrl.dbgMask, + CMCHKPK(oduUnpackUInt32, cntrl->t.cntrl.s.dbgCntrl.dbgMask, mBuf); } break; @@ -1671,14 +1671,14 @@ Buffer *mBuf; { 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 @@ -1696,11 +1696,11 @@ Buffer *mBuf; 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 */ /** @@ -1734,14 +1734,14 @@ Buffer *mBuf; 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 */ @@ -1802,12 +1802,12 @@ Buffer *mBuf; if(ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkDateTime, &ssta->t.ssta.dt, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkKwSsta */ @@ -1835,10 +1835,10 @@ Buffer *mBuf; /* data buffer */ { 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 */ @@ -1892,12 +1892,12 @@ Buffer *mBuf; if(ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkDateTime, &sts->t.sts.dt, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkKwSts */ @@ -1926,19 +1926,19 @@ Buffer *mBuf; { 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 */ @@ -1966,9 +1966,9 @@ Buffer *mBuf; { TRC3(cmPkCkwSapSts) - CMCHKPK(SPkU32, rcSap->statMsgs, mBuf); + CMCHKPK(oduUnpackUInt32, rcSap->statMsgs, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmPkCkwSapSts */ /** @@ -1995,12 +1995,12 @@ Buffer *mBuf; { 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 @@ -2046,14 +2046,14 @@ Buffer *mBuf; 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; @@ -2061,7 +2061,7 @@ Buffer *mBuf; ret1 = cmUnpkKwUsta(param, param->hdr.elmId.elmnt ,mBuf); if (ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } break; @@ -2070,7 +2070,7 @@ Buffer *mBuf; ret1 = cmUnpkKwSsta(param, param->hdr.elmId.elmnt, eventType,mBuf); if (ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } break; @@ -2080,14 +2080,14 @@ Buffer *mBuf; 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; @@ -2098,7 +2098,7 @@ Buffer *mBuf; default: break; } - RETVALUE(ROK); + return ROK; } /*end of function cmUnpkKwMngmt*/ /** @@ -2133,12 +2133,12 @@ Buffer *mBuf; 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; @@ -2147,23 +2147,23 @@ Buffer *mBuf; 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 */ /** @@ -2201,8 +2201,8 @@ Buffer *mBuf; 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; @@ -2217,20 +2217,20 @@ Buffer *mBuf; 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 @@ -2248,7 +2248,7 @@ Buffer *mBuf; break; } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkKwCntrl */ @@ -2286,12 +2286,12 @@ Buffer *mBuf; 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; } /** @@ -2353,10 +2353,10 @@ Buffer *mBuf; if(ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2385,9 +2385,9 @@ Buffer *mBuf; 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 */ @@ -2442,10 +2442,10 @@ Buffer *mBuf; if(ret1 != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmUnpkKwSts */ @@ -2473,19 +2473,19 @@ Buffer *mBuf; { 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 */ /** @@ -2513,9 +2513,9 @@ Buffer *mBuf; TRC3(cmUnpkCkwSapSts); - CMCHKUNPK(SUnpkU32, &rcSap->statMsgs, mBuf); + CMCHKUNPK(oduPackUInt32, &rcSap->statMsgs, mBuf); - RETVALUE(ROK); + return ROK; } /* end of cmUnpkCkwSapSts */ @@ -2545,10 +2545,10 @@ Buffer *mBuf; /* 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 */ @@ -2576,7 +2576,7 @@ KwL2MeasReqEvt *measReqEvt; (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) @@ -2586,9 +2586,9 @@ KwL2MeasReqEvt *measReqEvt; #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, @@ -2596,9 +2596,9 @@ KwL2MeasReqEvt *measReqEvt; #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, @@ -2606,11 +2606,11 @@ KwL2MeasReqEvt *measReqEvt; #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 @@ -2640,25 +2640,25 @@ Buffer *mBuf; 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 @@ -2682,11 +2682,11 @@ U8 measType; __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 @@ -2710,11 +2710,11 @@ U8 measType; __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 @@ -2735,23 +2735,23 @@ Buffer *mBuf; 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) { @@ -2762,10 +2762,10 @@ Buffer *mBuf; __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 @@ -2796,26 +2796,26 @@ Buffer *mBuf; __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) { @@ -2826,10 +2826,10 @@ Buffer *mBuf; __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 @@ -2850,18 +2850,18 @@ Buffer *mBuf; 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].\ @@ -2869,18 +2869,18 @@ Buffer *mBuf; 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 @@ -2900,9 +2900,9 @@ Buffer *mBuf; U8 measType; TRC3(cmUnpkLkwL2MeasReq) - CMCHKUNPK(SUnpkU8, &measType, mBuf); + CMCHKUNPK(oduPackUInt8, &measType, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, measType)); + return ((*func)(pst, measType)); } #ifdef ANSI @@ -2923,9 +2923,9 @@ Buffer *mBuf; TRC3(cmUnpkLkwL2MeasSendReq) - CMCHKUNPK(SUnpkU8, &measType, mBuf); + CMCHKUNPK(oduPackUInt8, &measType, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, measType)); + return ((*func)(pst, measType)); } #ifdef ANSI @@ -2953,7 +2953,7 @@ KwL2MeasCfmEvt *measCfmEvt; (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) || \ @@ -2971,18 +2971,18 @@ KwL2MeasCfmEvt *measCfmEvt; (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 @@ -3000,39 +3000,39 @@ KwL2MeasCfmEvt *measCfmEvt; (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 @@ -3056,18 +3056,18 @@ U8 measType; { 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 @@ -3092,28 +3092,28 @@ Buffer *mBuf; 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 0; idx--) { @@ -3133,21 +3133,21 @@ Buffer *mBuf; __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--) { @@ -3159,12 +3159,12 @@ Buffer *mBuf; __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 @@ -3186,20 +3186,20 @@ U8 measType; 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; } @@ -3226,12 +3226,12 @@ U8 status __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 @@ -3251,10 +3251,10 @@ Buffer *mBuf; 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 */ diff --git a/src/cm/lphy_stub.h b/src/cm/lphy_stub.h index 9a4bed097..7b5156f0e 100644 --- a/src/cm/lphy_stub.h +++ b/src/cm/lphy_stub.h @@ -1,3 +1,3 @@ void l1HdlSlotIndicaion(bool); -S16 buildAndSendSlotIndication(); -S16 duSendEgtpSlotInd(); +uint8_t buildAndSendSlotIndication(); +uint8_t duSendEgtpSlotInd(); diff --git a/src/cm/lrg.c b/src/cm/lrg.c index 154b0e9d1..d00e15759 100755 --- a/src/cm/lrg.c +++ b/src/cm/lrg.c @@ -77,7 +77,7 @@ RgMngmt * cfg; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG001, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfg, EVTLRGCFGREQ, mBuf) != ROK) { @@ -87,11 +87,11 @@ RgMngmt * cfg; (ErrVal)ELRG002, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGCFGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -134,10 +134,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG003, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfg)); + return ((*func)(pst, &cfg)); } @@ -175,7 +175,7 @@ RgMngmt * cfg; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG004, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) { @@ -185,11 +185,11 @@ RgMngmt * cfg; (ErrVal)ELRG005, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -232,10 +232,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG006, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfg)); + return ((*func)(pst, &cfg)); } @@ -273,7 +273,7 @@ RgMngmt * cfm; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG007, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfm, EVTLRGCFGCFM, mBuf) != ROK) { @@ -283,12 +283,12 @@ RgMngmt * cfm; (ErrVal)ELRG008, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -330,10 +330,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG009, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } @@ -371,7 +371,7 @@ RgMngmt * cfg; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG010, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) { @@ -381,12 +381,12 @@ RgMngmt * cfg; (ErrVal)ELRG011, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTMACSCHGENCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -428,10 +428,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG012, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfg)); + return ((*func)(pst, &cfg)); } @@ -469,7 +469,7 @@ RgMngmt * sts; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG013, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, sts, EVTLRGSTSREQ, mBuf) != ROK) { @@ -479,12 +479,12 @@ RgMngmt * sts; (ErrVal)ELRG014, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSTSREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -526,10 +526,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG015, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &sts)); + return ((*func)(pst, &sts)); } @@ -567,7 +567,7 @@ RgMngmt * cfm; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG016, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfm, EVTLRGSTSCFM, mBuf) != ROK) { @@ -577,12 +577,12 @@ RgMngmt * cfm; (ErrVal)ELRG017, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSTSCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -624,10 +624,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG018, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } @@ -665,7 +665,7 @@ RgMngmt * sta; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG019, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgMngmt(pst, sta, EVTLRGSSTAREQ, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -674,11 +674,11 @@ RgMngmt * sta; (ErrVal)ELRG020, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTLRGSSTAREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -721,10 +721,10 @@ Buffer *mBuf; (ErrVal)ELRG021, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &sta)); + return ((*func)(pst, &sta)); } @@ -762,7 +762,7 @@ RgMngmt * cfm; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG022, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgMngmt(pst, cfm, EVTLRGSSTACFM, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -771,11 +771,11 @@ RgMngmt * cfm; (ErrVal)ELRG023, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTLRGSSTACFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -818,10 +818,10 @@ Buffer *mBuf; (ErrVal)ELRG024, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } @@ -859,7 +859,7 @@ RgMngmt * usta; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG025, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, usta, EVTLRGUSTAIND, mBuf) != ROK) { @@ -869,12 +869,12 @@ RgMngmt * usta; (ErrVal)ELRG026, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGUSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -916,10 +916,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG027, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &usta)); + return ((*func)(pst, &usta)); } @@ -957,7 +957,7 @@ RgMngmt * sta; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG028, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, sta, EVTLRGSCHSTAIND, mBuf) != ROK) { @@ -967,12 +967,12 @@ RgMngmt * sta; (ErrVal)ELRG029, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSCHSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1014,10 +1014,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG030, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &sta)); + return ((*func)(pst, &sta)); } @@ -1055,7 +1055,7 @@ RgMngmt * cntrl; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG031, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) { @@ -1065,12 +1065,12 @@ RgMngmt * cntrl; (ErrVal)ELRG032, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGCNTRLREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1112,10 +1112,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG033, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cntrl)); + return ((*func)(pst, &cntrl)); } @@ -1153,7 +1153,7 @@ RgMngmt * cntrl; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG034, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) { @@ -1163,12 +1163,12 @@ RgMngmt * cntrl; (ErrVal)ELRG035, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSCHCNTRLREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1210,10 +1210,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG036, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cntrl)); + return ((*func)(pst, &cntrl)); } @@ -1251,7 +1251,7 @@ RgMngmt * cfm; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG037, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cfm, EVTLRGCNTRLCFM, mBuf) != ROK) { @@ -1261,12 +1261,12 @@ RgMngmt * cfm; (ErrVal)ELRG038, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGCNTRLCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1308,10 +1308,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG039, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cfm)); + return ((*func)(pst, &cfm)); } @@ -1349,7 +1349,7 @@ RgMngmt * cntrl; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG040, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) { @@ -1359,12 +1359,12 @@ RgMngmt * cntrl; (ErrVal)ELRG041, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTLRGSCHCNTRLCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1406,10 +1406,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG042, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &cntrl)); + return ((*func)(pst, &cntrl)); } @@ -1451,7 +1451,7 @@ Buffer * trcBuf; (ErrVal)ELRG043, (ErrVal)0, "Packing failed"); #endif SPutMsg(trcBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { MsgLen msgLen; @@ -1462,7 +1462,7 @@ Buffer * trcBuf; (ErrVal)ELRG044, (ErrVal)0, "Packing failed"); #endif SPutMsg(trcBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SCatMsg(mBuf, trcBuf, M1M2) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1471,7 +1471,7 @@ Buffer * trcBuf; (ErrVal)ELRG045, (ErrVal)0, "Packing failed"); #endif SPutMsg(trcBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(trcBuf); CMCHKPK(cmPkMsgLen, msgLen, mBuf); @@ -1484,11 +1484,11 @@ Buffer * trcBuf; #endif SPutMsg(trcBuf); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTLRGTRCIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1533,18 +1533,18 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG047, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { MsgLen msgLen, totalMsgLen; CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SSegMsg(mBuf, totalMsgLen-msgLen, &trcBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, &trc, trcBuf)); + return ((*func)(pst, &trc, trcBuf)); } @@ -1579,15 +1579,15 @@ Buffer *mBuf; TRC3(cmPkRgGenCfg) #ifdef LTE_ADV - CMCHKPK(SPkU8, param->isSCellActDeactAlgoEnable, mBuf); - CMCHKPK(SPkU8, param->forceCntrlSrbBoOnPCel, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSCellActDeactAlgoEnable, mBuf); + CMCHKPK(oduUnpackUInt8, param->forceCntrlSrbBoOnPCel, mBuf); #endif - CMCHKPK(SPkU8, param->startCellId, mBuf); - CMCHKPK(SPkU8, param->numRguSaps, mBuf); - CMCHKPK(SPkU8, param->tmrRes, mBuf); + CMCHKPK(oduUnpackUInt8, param->startCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRguSaps, mBuf); + CMCHKPK(oduUnpackUInt8, param->tmrRes, mBuf); CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); CMCHKPK(cmPkPst, ¶m->lmPst, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1624,14 +1624,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkPst, ¶m->lmPst, mBuf); CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tmrRes, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRguSaps, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->startCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tmrRes, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRguSaps, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->startCellId, mBuf); #ifdef LTE_ADV - CMCHKUNPK(SUnpkU8, ¶m->forceCntrlSrbBoOnPCel, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isSCellActDeactAlgoEnable, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->forceCntrlSrbBoOnPCel, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSCellActDeactAlgoEnable, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -1668,14 +1668,14 @@ Buffer *mBuf; CMCHKPK(SPkS16, param->suId, mBuf); CMCHKPK(SPkS16, param->spId, mBuf); - CMCHKPK(SPkU8, param->route, mBuf); - CMCHKPK(SPkU8, param->inst, mBuf); - CMCHKPK(SPkU8, param->ent, mBuf); - CMCHKPK(SPkU16, param->procId, mBuf); - CMCHKPK(SPkU8, param->prior, mBuf); + CMCHKPK(oduUnpackUInt8, param->route, mBuf); + CMCHKPK(oduUnpackUInt8, param->inst, mBuf); + CMCHKPK(oduUnpackUInt8, param->ent, mBuf); + CMCHKPK(oduUnpackUInt16, param->procId, mBuf); + CMCHKPK(oduUnpackUInt8, param->prior, mBuf); CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); - CMCHKPK(SPkU8, param->selector, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->selector, mBuf); + return ROK; } @@ -1710,16 +1710,16 @@ Buffer *mBuf; TRC3(cmUnpkRgUpSapCfg) - CMCHKUNPK(SUnpkU8, ¶m->selector, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->selector, mBuf); CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prior, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->procId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ent, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->inst, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->route, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prior, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->procId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ent, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->inst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->route, mBuf); CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1757,14 +1757,14 @@ Buffer *mBuf; CMCHKPK(cmPkTmrCfg, ¶m->bndTmr, mBuf); CMCHKPK(SPkS16, param->suId, mBuf); CMCHKPK(SPkS16, param->spId, mBuf); - CMCHKPK(SPkU8, param->route, mBuf); - CMCHKPK(SPkU8, param->inst, mBuf); - CMCHKPK(SPkU8, param->ent, mBuf); - CMCHKPK(SPkU16, param->procId, mBuf); - CMCHKPK(SPkU8, param->prior, mBuf); + CMCHKPK(oduUnpackUInt8, param->route, mBuf); + CMCHKPK(oduUnpackUInt8, param->inst, mBuf); + CMCHKPK(oduUnpackUInt8, param->ent, mBuf); + CMCHKPK(oduUnpackUInt16, param->procId, mBuf); + CMCHKPK(oduUnpackUInt8, param->prior, mBuf); CMCHKPK(cmPkMemoryId, ¶m->mem, mBuf); - CMCHKPK(SPkU8, param->selector, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->selector, mBuf); + return ROK; } @@ -1799,17 +1799,17 @@ Buffer *mBuf; TRC3(cmUnpkRgLowSapCfg) - CMCHKUNPK(SUnpkU8, ¶m->selector, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->selector, mBuf); CMCHKUNPK(cmUnpkMemoryId, ¶m->mem, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prior, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->procId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ent, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->inst, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->route, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prior, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->procId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ent, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->inst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->route, mBuf); CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); CMCHKUNPK(cmUnpkTmrCfg, ¶m->bndTmr, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef MAC_SCH_STATS @@ -1845,11 +1845,11 @@ Buffer *mBuf; TRC3(cmPkRgAckNack) - CMCHKPK(SPkU16, param->numOfAcks, mBuf); - CMCHKPK(SPkU16, param->numOfNacks, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfAcks, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfNacks, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRgAckNack */ @@ -1892,7 +1892,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgAckNack, ¶m->dlCqiStat[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -1925,14 +1925,14 @@ Buffer *mBuf; { TRC3(cmPkRgHqNumRetx) - CMCHKPK(SPkU32, param->totalTx, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_4, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_3, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_2, mBuf); - CMCHKPK(SPkU16, param->numOfHQ_1, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt32, param->totalTx, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_4, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_3, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_2, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfHQ_1, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRgHqNumRetx */ @@ -1975,7 +1975,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgHqNumRetx, ¶m->dlCqiStat[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmPkRgSchHqRetxStats */ /* unpcaking functions */ @@ -2010,11 +2010,11 @@ Buffer *mBuf; TRC3(cmUnpkRgAckNack) - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfNacks, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfAcks, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfNacks, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfAcks, mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnkRgAckNack */ @@ -2056,7 +2056,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgAckNack, ¶m->ulCqiStat[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkRgSchNackAckStats */ @@ -2089,14 +2089,14 @@ Buffer *mBuf; { TRC3(cmUnpkRgHqNumRetx) - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_1, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_2, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_3, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfHQ_4, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->totalTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_1, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_2, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_3, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfHQ_4, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->totalTx, mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkRgHqNumRetx */ @@ -2138,7 +2138,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgHqNumRetx, ¶m->ulCqiStat[i], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkRgSchHqRetxStats */ #endif /* MAC_SCH_STATS */ @@ -2178,10 +2178,10 @@ Buffer *mBuf; CMCHKPK(cmPkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); CMCHKPK(cmPkRgSchNackAckStats, ¶m->nackAckStats, mBuf); #endif /* MAC_SCH_STATS */ - CMCHKPK(SPkU16, param->numCellCfg, mBuf); - CMCHKPK(SPkU32, param->numUeCfg, mBuf); - CMCHKPK(SPkU32, param->numHarqFail, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->numCellCfg, mBuf); + CMCHKPK(oduUnpackUInt32, param->numUeCfg, mBuf); + CMCHKPK(oduUnpackUInt32, param->numHarqFail, mBuf); + return ROK; } @@ -2216,14 +2216,14 @@ Buffer *mBuf; TRC3(cmUnpkRgGenSts) - CMCHKUNPK(SUnpkU32, ¶m->numHarqFail, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numUeCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numCellCfg, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numHarqFail, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numUeCfg, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numCellCfg, mBuf); #ifdef MAC_SCH_STATS CMCHKUNPK(cmUnpkRgSchNackAckStats, ¶m->nackAckStats, mBuf); CMCHKUNPK(cmUnpkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); #endif /* MAC_SCH_STATS */ - RETVALUE(ROK); + return ROK; } @@ -2258,10 +2258,10 @@ Buffer *mBuf; TRC3(cmPkRgSapSts) - CMCHKPK(SPkU32, param->numPduDrop, mBuf); - CMCHKPK(SPkU32, param->numPduTxmit, mBuf); - CMCHKPK(SPkU32, param->numPduRcvd, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf); + CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf); + CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf); + return ROK; } @@ -2296,10 +2296,10 @@ Buffer *mBuf; TRC3(cmUnpkRgSapSts) - CMCHKUNPK(SUnpkU32, ¶m->numPduRcvd, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numPduTxmit, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numPduDrop, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->numPduRcvd, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numPduTxmit, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numPduDrop, mBuf); + return ROK; } @@ -2344,10 +2344,10 @@ Buffer *mBuf; for (i=param->numSaps-1; i >= 0; i--) { CMCHKPK(cmPkRgUpSapCfg, ¶m->rgmSap[i], mBuf); } - CMCHKPK(SPkU8, param->numSaps, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSaps, mBuf); CMCHKPK(cmPkRgGenCfg, ¶m->genCfg, mBuf); - CMCHKPK(SPkU8, param->instId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->instId, mBuf); + return ROK; } @@ -2383,9 +2383,9 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkRgSchInstCfg) - CMCHKUNPK(SUnpkU8, ¶m->instId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->instId, mBuf); CMCHKUNPK(cmUnpkRgGenCfg, ¶m->genCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSaps, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSaps, mBuf); for (i=0; inumSaps; i++) { CMCHKUNPK(cmUnpkRgUpSapCfg, ¶m->rgmSap[i], mBuf); } @@ -2395,7 +2395,7 @@ Buffer *mBuf; for (i=0; inumSaps; i++) { CMCHKUNPK(cmUnpkRgLowSapCfg, ¶m->tfuSap[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -2449,9 +2449,9 @@ Buffer *mBuf; CMCHKPK(cmPkRgGenCfg, ¶m->s.genCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2505,9 +2505,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgSchInstCfg, ¶m->s.schInstCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2542,8 +2542,8 @@ Buffer *mBuf; TRC3(cmPkRgSapSta) - CMCHKPK(SPkU8, param->sapState, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->sapState, mBuf); + return ROK; } @@ -2578,8 +2578,8 @@ Buffer *mBuf; TRC3(cmUnpkRgSapSta) - CMCHKUNPK(SUnpkU8, ¶m->sapState, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->sapState, mBuf); + return ROK; } @@ -2636,9 +2636,9 @@ Buffer *mBuf; break; } CMCHKPK(cmPkAction, param->action, mBuf); - CMCHKPK(SPkU8, param->sapInst, mBuf); + CMCHKPK(oduUnpackUInt8, param->sapInst, mBuf); CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2676,7 +2676,7 @@ Buffer *mBuf; TRC3(cmUnpkRgSts) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sapInst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sapInst, mBuf); CMCHKUNPK(cmUnpkAction, ¶m->action, mBuf); switch(elmnt) { case STGEN: @@ -2697,7 +2697,7 @@ Buffer *mBuf; default : break; } - RETVALUE(ROK); + return ROK; } @@ -2780,9 +2780,9 @@ Buffer *mBuf; default : break; } - CMCHKPK(SPkU8, param->sapInst, mBuf); + CMCHKPK(oduUnpackUInt8, param->sapInst, mBuf); CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2822,7 +2822,7 @@ Buffer *mBuf; TRC3(cmUnpkRgSsta) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sapInst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sapInst, mBuf); switch(elmnt) { case STGEN: /*ccpu00118255 - ADD - Check for eventType before Unpack */ @@ -2837,7 +2837,7 @@ Buffer *mBuf; (ErrVal)ELRG048, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } /* KWORK_FIX: Moved the memset under the NULL check */ if (param->s.sysId.ptNmb != NULLP) @@ -2862,7 +2862,7 @@ Buffer *mBuf; default : break; } - RETVALUE(ROK); + return ROK; } @@ -2904,8 +2904,8 @@ Buffer *mBuf; default : break; } - CMCHKPK(SPkU8, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->type, mBuf); + return ROK; } @@ -2940,7 +2940,7 @@ Buffer *mBuf; TRC3(cmUnpkRgUstaDgn) - CMCHKUNPK(SUnpkU8, ¶m->type, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); switch(param->type) { case LRG_USTA_DGNVAL_MEM: CMCHKUNPK(cmUnpkMemoryId, ¶m->u.mem, mBuf); @@ -2948,7 +2948,7 @@ Buffer *mBuf; default : break; } - RETVALUE(ROK); + return ROK; } @@ -2985,7 +2985,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgUstaDgn, ¶m->dgn, mBuf); CMCHKPK(cmPkCmAlarm, ¶m->cmAlarm, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3022,7 +3022,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkCmAlarm, ¶m->cmAlarm, mBuf); CMCHKUNPK(cmUnpkRgUstaDgn, ¶m->dgn, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3057,9 +3057,9 @@ Buffer *mBuf; TRC3(cmPkRgTrc) - CMCHKPK(SPkU8, param->evnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->evnt, mBuf); CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3095,8 +3095,8 @@ Buffer *mBuf; TRC3(cmUnpkRgTrc) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->evnt, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->evnt, mBuf); + return ROK; } @@ -3131,8 +3131,8 @@ Buffer *mBuf; TRC3(cmPkRgDbgCntrl) - CMCHKPK(SPkU32, param->dbgMask, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->dbgMask, mBuf); + return ROK; } #ifdef PHY_ERROR_LOGING @@ -3165,14 +3165,14 @@ Buffer *mBuf; { TRC3(cmPkRgSchUlAllocCntrl) - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU16, param->numOfRb, mBuf); - CMCHKPK(SPkU16, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->testStart, mBuf); - CMCHKPK(SPkU8, param->enaLog, mBuf); - CMCHKPK(SPkU16, param->logTime, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt16, param->numOfRb, mBuf); + CMCHKPK(oduUnpackUInt16, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->testStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->enaLog, mBuf); + CMCHKPK(oduUnpackUInt16, param->logTime, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -3204,14 +3204,14 @@ Buffer *mBuf; { TRC3(cmUnpkRgSchUlAllocCntrl) - CMCHKUNPK(SUnpkU16, ¶m->logTime, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->enaLog, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->testStart, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->numOfRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->logTime, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->enaLog, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->testStart, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->numOfRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3247,8 +3247,8 @@ Buffer *mBuf; TRC3(cmUnpkRgDbgCntrl) - CMCHKUNPK(SUnpkU32, ¶m->dbgMask, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->dbgMask, mBuf); + return ROK; } @@ -3285,7 +3285,7 @@ Buffer *mBuf; CMCHKPK(SPkS16, param->spId, mBuf); CMCHKPK(SPkS16, param->suId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3322,7 +3322,7 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3382,7 +3382,7 @@ Buffer *mBuf; break; #ifdef SS_DIAG case SALOG: - CMCHKPK(SPkU32, param->s.logMask, mBuf); + CMCHKPK(oduUnpackUInt32, param->s.logMask, mBuf); break; #endif #ifdef PHY_ERROR_LOGING @@ -3397,10 +3397,10 @@ Buffer *mBuf; default : break; } - CMCHKPK(SPkU8, param->subAction, mBuf); - CMCHKPK(SPkU8, param->action, mBuf); + CMCHKPK(oduUnpackUInt8, param->subAction, mBuf); + CMCHKPK(oduUnpackUInt8, param->action, mBuf); CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3438,8 +3438,8 @@ Buffer *mBuf; TRC3(cmUnpkRgCntrl) CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->action, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->subAction, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->subAction, mBuf); switch(elmnt) { case STGEN: switch(param->subAction) { @@ -3453,7 +3453,7 @@ Buffer *mBuf; break; #ifdef SS_DIAG case SALOG: - CMCHKUNPK(SUnpkU32, ¶m->s.logMask, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->s.logMask, mBuf); break; #endif #ifdef PHY_ERROR_LOGING @@ -3478,7 +3478,7 @@ Buffer *mBuf; default : break; } - RETVALUE(ROK); + return ROK; } @@ -3523,7 +3523,7 @@ Buffer *mBuf; case EVTLRGSCHCNTRLREQ: case EVTLRGSCHCNTRLCFM: if(cmPkRgCntrl(¶m->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTLRGTRCIND: CMCHKPK(cmPkRgTrc, ¶m->t.trc, mBuf); @@ -3538,33 +3538,33 @@ Buffer *mBuf; #ifdef LRG_V1 if(cmPkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, eventType, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; #else /* LRG_V1 is not defined */ if(cmPkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; #endif /* end of LRG_V1*/ break; case EVTLRGSTSREQ: case EVTLRGSTSCFM: if(cmPkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf)!= ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTLRGCFGREQ: case EVTLRGCFGCFM: if(cmPkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTMACSCHGENCFGREQ: case EVTMACSCHGENCFGCFM: if(cmPkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; default : - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkCmStatus, ¶m->cfm, mBuf); CMCHKPK(cmPkHeader, ¶m->hdr, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3611,17 +3611,17 @@ Buffer *mBuf; case EVTMACSCHGENCFGREQ: case EVTMACSCHGENCFGCFM: if(cmUnpkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTLRGSTSREQ: case EVTLRGSTSCFM: if(cmUnpkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTLRGSSTAREQ: case EVTLRGSSTACFM: if(cmUnpkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; case EVTLRGUSTAIND: case EVTLRGSCHSTAIND: @@ -3635,12 +3635,12 @@ Buffer *mBuf; case EVTLRGSCHCNTRLREQ: case EVTLRGSCHCNTRLCFM: if(cmUnpkRgCntrl(¶m->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK) - RETVALUE(RFAILED); + return RFAILED; break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* lrg_c_001.main_3 - ADD - Added the functions pertaining to LTE_L2_MEAS */ @@ -3677,11 +3677,11 @@ Buffer *mBuf; for(idx = 0; idx < nmbActvUeQci->numQci; idx++) { - CMCHKPK(SPkU8, nmbActvUeQci->qci[idx], mBuf); + CMCHKPK(oduUnpackUInt8, nmbActvUeQci->qci[idx], mBuf); } - CMCHKPK(SPkU8, nmbActvUeQci->numQci, mBuf); - CMCHKPK(SPkU8, nmbActvUeQci->sampPrd, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, nmbActvUeQci->numQci, mBuf); + CMCHKPK(oduUnpackUInt8, nmbActvUeQci->sampPrd, mBuf); + return ROK; } /** @@ -3715,10 +3715,10 @@ Buffer *mBuf; for(idx = 0; idx < avgPrbQciReq->numQci; idx++) { - CMCHKPK(SPkU8, avgPrbQciReq->qci[idx], mBuf); + CMCHKPK(oduUnpackUInt8, avgPrbQciReq->qci[idx], mBuf); } - CMCHKPK(SPkU8, avgPrbQciReq->numQci, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, avgPrbQciReq->numQci, mBuf); + return ROK; } @@ -3756,7 +3756,7 @@ LrgSchMeasReqInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if(measInfo->measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL) { @@ -3776,11 +3776,11 @@ LrgSchMeasReqInfo *measInfo; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); - CMCHKPK(SPkU32, measInfo->timePrd, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** * @brief This API is used to stop a @@ -3816,14 +3816,14 @@ LrgSchMeasStopReqInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); - /*CMCHKPK(SPkU16, measInfo->timePrd, mBuf);*/ - CMCHKPK(SPkU16, measInfo->measType, mBuf); + /*CMCHKPK(oduUnpackUInt16, measInfo->timePrd, mBuf);*/ + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASSTOPREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkLrgSchL2MeasStopReq*/ /** @@ -3859,14 +3859,14 @@ LrgSchMeasSndReqInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG049, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); - CMCHKPK(SPkU32, measInfo->timePrd, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASSENDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkLrgSchL2MeasSendReq*/ /** @@ -3897,14 +3897,14 @@ Buffer *mBuf; TRC3(cmUnpkNmbActvUeQciReq) - CMCHKUNPK(SUnpkU8, ¶m->sampPrd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sampPrd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { - CMCHKUNPK(SUnpkU8, ¶m->qci[idx - 1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci[idx - 1], mBuf); } - RETVALUE(ROK); + return ROK; } /** @@ -3935,12 +3935,12 @@ Buffer *mBuf; TRC3(cmUnpkAvgPrbQciReq) - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { - CMCHKUNPK(SUnpkU8, ¶m->qci[idx - 1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci[idx - 1], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -3977,8 +3977,8 @@ Buffer *mBuf; TRC3(cmUnpkLrgSchL2MeasReq) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); - CMCHKUNPK(SUnpkU32, &measInfo.timePrd, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); if(measInfo.measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL) { @@ -3997,7 +3997,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkNmbActvUeQciReq, &measInfo.nmbActvUeQciDl, mBuf); } SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); } /** @@ -4033,11 +4033,11 @@ Buffer *mBuf; TRC3(cmUnpkLrgSchL2MeasStopReq) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); - /*CMCHKUNPK(SUnpkU16, &measInfo.timePrd, mBuf);*/ + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); + /*CMCHKUNPK(oduPackUInt16, &measInfo.timePrd, mBuf);*/ CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); }/*cmUnpkLrgSchL2MeasStopReq*/ /** @@ -4070,11 +4070,11 @@ Buffer *mBuf; { LrgSchMeasSndReqInfo measInfo; CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); - CMCHKUNPK(SUnpkU32, &measInfo.timePrd, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); }/*cmUnpkLrgSchL2MeasSendReq*/ /** @@ -4111,14 +4111,14 @@ LrgSchMeasCfmInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG050, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASSTOPCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkLrgSchL2MeasStopCfm*/ /** * @brief This API is used to Send a @@ -4152,12 +4152,12 @@ Buffer *mBuf; TRC3(cmUnpkLrgSchL2MeasCfm) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); }/*cmUnpkLrgSchL2MeasStopCfm*/ /** @@ -4191,12 +4191,12 @@ Buffer *mBuf; for(idx = 0; idx < param->numQci; idx++) { /*LRG : Review Tag*/ - CMCHKPK(SPkU8, param->numActvUeQci[idx].qciValue, mBuf); - CMCHKPK(SPkU8, param->numActvUeQci[idx].numActvUeQci, mBuf); + CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].qciValue, mBuf); + CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].numActvUeQci, mBuf); /*LRG : Review Tag*/ } - CMCHKPK(SPkU8, param->numQci, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numQci, mBuf); + return ROK; } /** @@ -4229,12 +4229,12 @@ Buffer *mBuf; for(idx = 0; idx < param->numQci; idx++) { /*LRG : Review Tag*/ - CMCHKPK(SPkU8, param->prbPercQci[idx].qciValue, mBuf); - CMCHKPK(SPkU8, param->prbPercQci[idx].prbPercQci, mBuf); + CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].qciValue, mBuf); + CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].prbPercQci, mBuf); /*LRG : Review Tag*/ } - CMCHKPK(SPkU8, param->numQci, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numQci, mBuf); + return ROK; } /** @@ -4263,10 +4263,10 @@ Buffer *mBuf; { TRC3(cmPkRaPrmbsCfm) - CMCHKPK(SPkU16, param->randSelPreHighRange, mBuf); - CMCHKPK(SPkU16, param->randSelPreLowRange, mBuf); - CMCHKPK(SPkU16, param->dedPreambles, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->randSelPreHighRange, mBuf); + CMCHKPK(oduUnpackUInt16, param->randSelPreLowRange, mBuf); + CMCHKPK(oduUnpackUInt16, param->dedPreambles, mBuf); + return ROK; } /** @@ -4295,8 +4295,8 @@ Buffer *mBuf; { TRC3(cmPkAvgPrbCfm) - CMCHKPK(SPkU8, param->prbPerc, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->prbPerc, mBuf); + return ROK; } /** @@ -4334,7 +4334,7 @@ LrgSchMeasCfmInfo *measInfo; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ELRG050, (ErrVal)0, "SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if(measInfo->measType & LRG_L2MEAS_NMB_ACTV_UE_PER_QCI_DL) { @@ -4366,26 +4366,26 @@ LrgSchMeasCfmInfo *measInfo; } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransDlTotalCnt, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlTotalCnt, mBuf); } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransDlFaulty, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlFaulty, mBuf); } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransUlTotalCnt, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlTotalCnt, mBuf); } if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT) { - CMCHKPK(SPkU32, measInfo->tbTransUlFaulty, mBuf); + CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlFaulty, mBuf); } CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf); CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf); - CMCHKPK(SPkU16, measInfo->measType, mBuf); + CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf); CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf); pst->event = (Event) EVTLRGSCHL2MEASCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -4415,15 +4415,15 @@ Buffer *mBuf; U8 idx; TRC3(cmUnpkNumUeQciCfm) - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { /*LRG : Review Tag*/ - CMCHKUNPK(SUnpkU8, ¶m->numActvUeQci[idx - 1].numActvUeQci, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numActvUeQci[idx - 1].qciValue, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numActvUeQci[idx - 1].numActvUeQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numActvUeQci[idx - 1].qciValue, mBuf); /*LRG : Review Tag*/ } - RETVALUE(ROK); + return ROK; } /** @@ -4454,15 +4454,15 @@ Buffer *mBuf; TRC3(cmUnpkAvgPrbQciCfm) - CMCHKUNPK(SUnpkU8, ¶m->numQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numQci, mBuf); for(idx = param->numQci; idx > 0; idx--) { /*LRG : Review Tag*/ - CMCHKUNPK(SUnpkU8, ¶m->prbPercQci[idx - 1].prbPercQci, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prbPercQci[idx - 1].qciValue, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prbPercQci[idx - 1].prbPercQci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prbPercQci[idx - 1].qciValue, mBuf); /*LRG : Review Tag*/ } - RETVALUE(ROK); + return ROK; } /** @@ -4492,10 +4492,10 @@ Buffer *mBuf; TRC3(cmUnpkRaPrmbsCfm) - CMCHKUNPK(SUnpkU16, ¶m->dedPreambles, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->randSelPreLowRange, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->randSelPreHighRange, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->dedPreambles, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->randSelPreLowRange, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->randSelPreHighRange, mBuf); + return ROK; } /** @@ -4525,8 +4525,8 @@ Buffer *mBuf; TRC3(cmUnpkAvgPrbCfm) - CMCHKUNPK(SUnpkU8, ¶m->prbPerc, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->prbPerc, mBuf); + return ROK; } /** @@ -4561,24 +4561,24 @@ Buffer *mBuf; TRC3(cmUnpkLrgSchL2MeasCfm) CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); - CMCHKUNPK(SUnpkU16, &measInfo.measType, mBuf); + CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf); CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf); CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf); if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransUlFaulty, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransUlFaulty, mBuf); } if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransUlTotalCnt, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransUlTotalCnt, mBuf); } if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransDlFaulty, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransDlFaulty, mBuf); } if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_COUNT) { - CMCHKPK(SUnpkU32, &measInfo.tbTransDlTotalCnt, mBuf); + CMCHKPK(oduPackUInt32, &measInfo.tbTransDlTotalCnt, mBuf); } if(measInfo.measType & LRG_L2MEAS_AVG_PRB_UL) { @@ -4609,7 +4609,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkNumUeQciCfm, &measInfo.numUeQciDlCfm, mBuf); } SPutMsg(mBuf); - RETVALUE((*func)(pst, &measInfo)); + return ((*func)(pst, &measInfo)); } #endif #endif diff --git a/src/cm/lrg.x b/src/cm/lrg.x index e14d4f25c..d028f8ac1 100755 --- a/src/cm/lrg.x +++ b/src/cm/lrg.x @@ -528,7 +528,7 @@ typedef S16 (*LrgCfgReq) ARGS(( RgMngmt *cfg /* Management Structure */ )); -typedef int (*LrgSchCfgReq) ARGS(( +typedef uint8_t (*LrgSchCfgReq) ARGS(( Pst *pst, /* Post Structure */ RgMngmt *cfg /* Management Structure */ )); @@ -653,7 +653,7 @@ EXTERN S16 RgMiLrgCfgReq ARGS((Pst *pst, RgMngmt *cfg)); * @param cfm pointer to RgMngmt * @return ROK/RFAILED */ -EXTERN int MacSchGenCfgReq ARGS((Pst *pst, RgMngmt *cfg)); +EXTERN uint8_t MacSchGenCfgReq ARGS((Pst *pst, RgMngmt *cfg)); /** @brief This primitive carries the Confirmation for a Configuration Request * sent from the layer manager to MAC. @@ -677,7 +677,7 @@ EXTERN S16 RgMiLrgCfgCfm ARGS((Pst *pst, RgMngmt *cfm)); * @param cfg pointer to RgMngmt * @return ROK/RFAILED */ -EXTERN int SchProcGenCfgReq ARGS((Pst *pst, RgMngmt *cfg)); +EXTERN uint8_t SchProcGenCfgReq ARGS((Pst *pst, RgMngmt *cfg)); /** @brief This primitive carries the Confirmation for a Configuration Request * sent from the layer manager to Scheduler. diff --git a/src/cm/lsctp.c b/src/cm/lsctp.c index 95f7bbdfa..c28cc1d84 100644 --- a/src/cm/lsctp.c +++ b/src/cm/lsctp.c @@ -37,30 +37,30 @@ * * ****************************************************************/ -S16 cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy) +uint8_t cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy) { Buffer *mBuf; - if(SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if(ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { printf("\nSCTP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } if(ntfy->header.nType == CM_INET_SCTP_ASSOC_CHANGE) { - SPkU16(ntfy->u.assocChange.state, mBuf); - SPkU32(ntfy->u.assocChange.assocId, mBuf); + oduUnpackUInt16(ntfy->u.assocChange.state, mBuf); + oduUnpackUInt32(ntfy->u.assocChange.assocId, mBuf); } - SPkU16(ntfy->header.nType, mBuf); + oduUnpackUInt16(ntfy->header.nType, mBuf); - if (SPstTsk(pst, mBuf) != ROK) + if (ODU_POST_TASK(pst, mBuf) != ROK) { - printf("\nSCTP : SPstTsk failed while sending SCTP notification"); - RETVALUE(RFAILED); + printf("\nSCTP : ODU_POST_TASK failed while sending SCTP notification"); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -80,19 +80,19 @@ S16 cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy) * * ****************************************************************/ -S16 cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf) +uint8_t cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf) { CmInetSctpNotification ntfy; - cmMemset((U8*)&ntfy, 0, sizeof(CmInetSctpNotification)); + memset((uint8_t*)&ntfy, 0, sizeof(CmInetSctpNotification)); - SUnpkU16(&(ntfy.header.nType), mBuf); + oduPackUInt16(&(ntfy.header.nType), mBuf); if(ntfy.header.nType == CM_INET_SCTP_ASSOC_CHANGE) { - SUnpkU32(&(ntfy.u.assocChange.assocId), mBuf); - SUnpkU16(&(ntfy.u.assocChange.state), mBuf); + oduPackUInt32(&(ntfy.u.assocChange.assocId), mBuf); + oduPackUInt16(&(ntfy.u.assocChange.state), mBuf); } - RETVALUE((*func)(mBuf, &ntfy)); + return ((*func)(mBuf, &ntfy)); } /********************************************************************** diff --git a/src/cm/lsctp.h b/src/cm/lsctp.h index 266039a90..eb40306f5 100644 --- a/src/cm/lsctp.h +++ b/src/cm/lsctp.h @@ -20,8 +20,8 @@ #ifndef __LSCTP_H___ #define __LSCTP_H___ -typedef S16 (*SctpNtfy) ARGS((Buffer *mBuf, CmInetSctpNotification *ntfy)); -extern S16 cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy); -extern S16 cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf); +typedef uint8_t (*SctpNtfy) ARGS((Buffer *mBuf, CmInetSctpNotification *ntfy)); +extern uint8_t cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy); +extern uint8_t cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf); #endif diff --git a/src/cm/mac_sch_interface.c b/src/cm/mac_sch_interface.c index b36b0fe4c..61792a33e 100644 --- a/src/cm/mac_sch_interface.c +++ b/src/cm/mac_sch_interface.c @@ -23,16 +23,16 @@ uint8_t packMacSchSlotInd(Pst *pst, SlotIndInfo *slotInd) { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if (ODU_GET_MSG(pst->region, pst->pool, &mBuf) != ROK) { return RFAILED; } /* pack SFN and slot value */ - CMCHKPK(SPkU16,slotInd->sfn, mBuf); - CMCHKPK(SPkU16,slotInd->slot, mBuf); + CMCHKPK(oduUnpackUInt16,slotInd->sfn, mBuf); + CMCHKPK(oduUnpackUInt16,slotInd->slot, mBuf); - return SPstTsk(pst,mBuf); + return ODU_POST_TASK(pst,mBuf); } /** diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h index bcb903bf8..26fe41a15 100644 --- a/src/cm/mac_sch_interface.h +++ b/src/cm/mac_sch_interface.h @@ -610,7 +610,7 @@ typedef struct schCellCfg typedef struct schCellCfgCfm { - U16 cellId; /* Cell Id */ + uint16_t cellId; /* Cell Id */ SchMacRsp rsp; }SchCellCfgCfm; @@ -650,7 +650,7 @@ typedef struct dlBrdcstAlloc * 0 : No tranamission * 1 : SIB1 Transmission * 2 : SIB1 Repetition */ - U8 sib1Trans; + uint8_t sib1Trans; Sib1AllocInfo sib1Alloc; }DlBrdcstAlloc; diff --git a/src/cm/rgm.c b/src/cm/rgm.c index 275468f46..d315a1842 100755 --- a/src/cm/rgm.c +++ b/src/cm/rgm.c @@ -76,23 +76,23 @@ SpId spId; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -132,20 +132,20 @@ Buffer *mBuf; if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } ret = ((*func)(pst, suId, spId)); SPutMsg(mBuf); - RETVALUE(ret); + return (ret); } /** @@ -180,21 +180,21 @@ Reason reason; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** @@ -230,23 +230,23 @@ U8 status; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) + if (oduUnpackUInt8(status, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -283,19 +283,19 @@ Buffer *mBuf; TRC3(cmUnpkLwLcRgmBndCfm) - if (SUnpkU8(&status, mBuf) != ROK) + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -333,25 +333,25 @@ RgmPrbRprtCfg * prbRprtCfg; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)prbRprtCfg, mBuf) != ROK) + if(oduPackPointer((PTR)prbRprtCfg, mBuf) != ROK) { SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data*)prbRprtCfg, len); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMCFGPRBRPRT; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -391,20 +391,20 @@ Buffer *mBuf; if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (cmUnpkPtr((PTR *)&prbRprtCfg, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&prbRprtCfg, mBuf) != ROK) { SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); - RETVALUE(RFAILED); + return RFAILED; } ret = ((*func)(pst, spId, prbRprtCfg)); SPutMsg(mBuf); - RETVALUE(ret); + return (ret); } @@ -441,25 +441,25 @@ RgmPrbRprtInd * prbRprtInd; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); - RETVALUE(RFAILED); + return RFAILED; } - if(cmPkPtr((PTR)prbRprtInd, mBuf) != ROK) + if(oduPackPointer((PTR)prbRprtInd, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMCFGPRBRPRT; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -499,14 +499,14 @@ Buffer *mBuf; if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (cmUnpkPtr((PTR *)&prbRprtInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&prbRprtInd, mBuf) != ROK) { SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); - RETVALUE(RFAILED); + return RFAILED; } @@ -514,7 +514,7 @@ Buffer *mBuf; SPutMsg(mBuf); - RETVALUE(ret); + return (ret); } #endif @@ -551,23 +551,23 @@ SpId spId; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -607,20 +607,20 @@ Buffer *mBuf; if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } ret = ((*func)(pst, suId, spId)); SPutMsg(mBuf); - RETVALUE(ret); + return (ret); } /** @@ -655,21 +655,21 @@ Reason reason; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #if 1 @@ -709,15 +709,15 @@ Buffer *mBuf; if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } #endif @@ -754,23 +754,23 @@ U8 status; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) + if (oduUnpackUInt8(status, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGMBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -807,19 +807,19 @@ Buffer *mBuf; TRC3(cmUnpkRgmBndCfm) - if (SUnpkU8(&status, mBuf) != ROK) + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -850,10 +850,10 @@ Buffer *mBuf; #endif { TRC3(cmPkCfgPrbRprt); - CMCHKPK(SPkU16, prbRprtCfg->usPrbAvgPeriodicty, mBuf); - CMCHKPK(SPkU8, prbRprtCfg->bConfigType, mBuf); - CMCHKPK(SPkU8, prbRprtCfg->bCellId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, prbRprtCfg->usPrbAvgPeriodicty, mBuf); + CMCHKPK(oduUnpackUInt8, prbRprtCfg->bConfigType, mBuf); + CMCHKPK(oduUnpackUInt8, prbRprtCfg->bCellId, mBuf); + return ROK; } /** * @brief Configure the PRB Report Preparation Start/Stop from RRM to MAC @@ -880,10 +880,10 @@ Buffer *mBuf; #endif { TRC3(cmUnPkCfgPrbRprt); - CMCHKUNPK(SUnpkU8, &prbRprtCfg->bCellId, mBuf); - CMCHKUNPK(SUnpkU8, &prbRprtCfg->bConfigType, mBuf); - CMCHKUNPK(SUnpkU16, &prbRprtCfg->usPrbAvgPeriodicty, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bCellId, mBuf); + CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bConfigType, mBuf); + CMCHKUNPK(oduPackUInt16, &prbRprtCfg->usPrbAvgPeriodicty, mBuf); + return ROK; } @@ -923,27 +923,27 @@ RgmPrbRprtCfg * prbRprtCfg; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); - RETVALUE(RFAILED); + return RFAILED; } if(cmPkCfgPrbRprt(prbRprtCfg, mBuf) != ROK) { SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data*)prbRprtCfg, len); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutSBuf(pst->region, pst->pool, (Data *)prbRprtCfg, sizeof(RgmPrbRprtCfg)); pst->event = (Event) EVTRGMCFGPRBRPRT; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -982,23 +982,23 @@ Buffer *mBuf; if ((SGetSBuf(pst->region, pst->pool, (Data **)&prbRprtCfg, sizeof(RgmPrbRprtCfg))) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnPkCfgPrbRprt(prbRprtCfg, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, prbRprtCfg)); + return ((*func)(pst, spId, prbRprtCfg)); } /* RRM_SP1_START */ @@ -1027,11 +1027,11 @@ RgmPrbRptPerQci *qciPrbRprt; Buffer *mBuf = NULLP; #endif { - CMCHKPK(SPkU8, qciPrbRprt->bQci, mBuf); - CMCHKPK(SPkU8, qciPrbRprt->bAvgPrbUlUsage, mBuf); - CMCHKPK(SPkU8, qciPrbRprt->bAvgPrbDlUsage, mBuf); + CMCHKPK(oduUnpackUInt8, qciPrbRprt->bQci, mBuf); + CMCHKPK(oduUnpackUInt8, qciPrbRprt->bAvgPrbUlUsage, mBuf); + CMCHKPK(oduUnpackUInt8, qciPrbRprt->bAvgPrbDlUsage, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -1058,11 +1058,11 @@ RgmPrbRptPerQci *qciPrbRprt; Buffer *mBuf = NULLP; #endif { - CMCHKUNPK(SUnpkU8, &qciPrbRprt->bAvgPrbDlUsage, mBuf); - CMCHKUNPK(SUnpkU8, &qciPrbRprt->bAvgPrbUlUsage, mBuf); - CMCHKUNPK(SUnpkU8, &qciPrbRprt->bQci, mBuf); + CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbDlUsage, mBuf); + CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbUlUsage, mBuf); + CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bQci, mBuf); - RETVALUE(ROK); + return ROK; } /* RRM_SP1_END */ @@ -1099,10 +1099,10 @@ PUBLIC S16 cmPkPrbRprtInd(prbRprtInd, mBuf) { CMCHKPK(cmPkRgmPrbQciRpt, &prbRprtInd->stQciPrbRpts[idx], mBuf); } - CMCHKPK(SPkU8, prbRprtInd->bPrbUsageMask, mBuf); - CMCHKPK(SPkU8, prbRprtInd->bCellId, mBuf); + CMCHKPK(oduUnpackUInt8, prbRprtInd->bPrbUsageMask, mBuf); + CMCHKPK(oduUnpackUInt8, prbRprtInd->bCellId, mBuf); /* RRM_SP1_END */ - RETVALUE(ROK); + return ROK; } /** @@ -1134,15 +1134,15 @@ PUBLIC S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf) TRC3(cmUnpkPrbRprtInd); /* RRM_SP1_START */ - CMCHKUNPK(SUnpkU8, &prbRprtInd->bCellId, mBuf); - CMCHKUNPK(SUnpkU8, &prbRprtInd->bPrbUsageMask, mBuf); + CMCHKUNPK(oduPackUInt8, &prbRprtInd->bCellId, mBuf); + CMCHKUNPK(oduPackUInt8, &prbRprtInd->bPrbUsageMask, mBuf); for(idx = 0; idx < RGM_MAX_QCI_REPORTS; idx++) { CMCHKUNPK(cmUnpkRgmPrbQciRpt, &prbRprtInd->stQciPrbRpts[idx], mBuf); } /* RRM_SP1_END */ - RETVALUE(ROK); + return ROK; } @@ -1180,27 +1180,27 @@ RgmPrbRprtInd * prbRprtInd; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); - RETVALUE(RFAILED); + return RFAILED; } if(cmPkPrbRprtInd(prbRprtInd, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutSBuf(pst->region, pst->pool, (Data *)prbRprtInd, sizeof(RgmPrbRprtInd)); pst->event = (Event) EVTRGMPRBRPRTIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** * @brief PRB Usage Report Indication from MAC to RRM @@ -1237,17 +1237,17 @@ Buffer *mBuf; if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkPrbRprtInd(&prbRprtInd, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, &prbRprtInd)); + return ((*func)(pst, suId, &prbRprtInd)); } /** @@ -1275,10 +1275,10 @@ PUBLIC S16 cmPkTransModeInd(transModeInd, mBuf) #endif { TRC3(cmPkTransModeInd); - CMCHKPK(SPkU32, transModeInd->eMode, mBuf); - CMCHKPK(SPkU16, transModeInd->usCrnti, mBuf); - CMCHKPK(SPkU8, transModeInd->bCellId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, transModeInd->eMode, mBuf); + CMCHKPK(oduUnpackUInt16, transModeInd->usCrnti, mBuf); + CMCHKPK(oduUnpackUInt8, transModeInd->bCellId, mBuf); + return ROK; } /** @@ -1307,11 +1307,11 @@ PUBLIC S16 cmUnpkTransModeInd(transModeInd, mBuf) { U32 tmpModeEnum; TRC3(cmUnpkTransModeInd); - CMCHKUNPK(SUnpkU8, &transModeInd->bCellId, mBuf); - CMCHKUNPK(SUnpkU16, &transModeInd->usCrnti, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpModeEnum, mBuf); + CMCHKUNPK(oduPackUInt8, &transModeInd->bCellId, mBuf); + CMCHKUNPK(oduPackUInt16, &transModeInd->usCrnti, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpModeEnum, mBuf); transModeInd->eMode = (RgmTxnMode)tmpModeEnum; - RETVALUE(ROK); + return ROK; } /** * @brief Transmission Mode Change Indication from MAC to RRM @@ -1346,27 +1346,27 @@ RgmTransModeInd *transModeInd; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd)); - RETVALUE(RFAILED); + return RFAILED; } if(cmPkTransModeInd(transModeInd, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutSBuf(pst->region, pst->pool, (Data *)transModeInd, sizeof(RgmTransModeInd)); pst->event = (Event) EVTRGMTRANSMODEIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /** * @brief Transmission Mode Change Indication from MAC to RRM @@ -1403,17 +1403,17 @@ Buffer *mBuf; if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkTransModeInd(&transModeInd, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, &transModeInd)); + return ((*func)(pst, suId, &transModeInd)); } /********************************************************************** diff --git a/src/cm/rgr.c b/src/cm/rgr.c index a5a386a8b..ff345fd84 100755 --- a/src/cm/rgr.c +++ b/src/cm/rgr.c @@ -80,7 +80,7 @@ SpId spId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR001, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -89,7 +89,7 @@ SpId spId; (ErrVal)ERGR002, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -98,10 +98,10 @@ SpId spId; (ErrVal)ERGR003, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -146,7 +146,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR004, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -155,10 +155,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR005, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -201,16 +201,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR006, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR007, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -219,10 +219,10 @@ U8 status; (ErrVal)ERGR008, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -268,19 +268,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR009, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR010, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -322,7 +322,7 @@ Reason reason; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR011, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -331,7 +331,7 @@ Reason reason; (ErrVal)ERGR012, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -340,10 +340,10 @@ Reason reason; (ErrVal)ERGR013, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -388,7 +388,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR014, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { SPutMsg(mBuf); @@ -397,10 +397,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR015, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -446,7 +446,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR021, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -457,7 +457,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR022, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo,sizeof(RgrCfgReqInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -466,7 +466,7 @@ Buffer *mBuf; (ErrVal)ERGR023, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrCfgReqInfo)); if (pst->selector == ODU_SELECTOR_LC) @@ -478,10 +478,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR024, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, transId, cfgReqInfo)); + return ((*func)(pst, transId, cfgReqInfo)); } /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ @@ -514,9 +514,9 @@ Buffer *mBuf; #endif { TRC3(cmPkRgrTtiInd) - CMCHKPK(SPkU16, param->sfn, mBuf); + CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -548,8 +548,8 @@ Buffer *mBuf; TRC3(cmUnpkRgrTtiIndInfo) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sfn, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->sfn, mBuf); + return ROK; } @@ -591,7 +591,7 @@ RgrTtiIndInfo *ttiInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR025, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -601,7 +601,7 @@ RgrTtiIndInfo *ttiInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -611,11 +611,11 @@ RgrTtiIndInfo *ttiInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(RgrTtiIndInfo)); pst->event = (Event) EVTRGRTTIIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -660,7 +660,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR028, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd, sizeof(RgrTtiIndInfo))) != ROK) { @@ -670,7 +670,7 @@ Buffer *mBuf; (ErrVal)ERGR029, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrTtiIndInfo(ttiInd, mBuf) != ROK) { @@ -684,10 +684,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR030, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, ttiInd)); + return ((*func)(pst, suId, ttiInd)); } @@ -729,16 +729,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR031, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR032, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -747,10 +747,10 @@ U8 status; (ErrVal)ERGR033, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTMACSCHCFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -795,19 +795,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR036, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR037, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, transId, status)); + return ((*func)(pst, transId, status)); } /* rgr_c_001.main_4: ADD-Added for SI Enhancement. */ @@ -853,16 +853,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR038, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR039, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -871,7 +871,7 @@ U8 status; (ErrVal)ERGR040, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -880,11 +880,11 @@ U8 status; (ErrVal)ERGR041, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRSICFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -930,7 +930,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR042, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -939,19 +939,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR043, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR044, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, status)); + return ((*func)(pst, suId, transId, status)); } #endif/*RGR_SI_SCH*/ @@ -988,9 +988,9 @@ Buffer *mBuf; TRC3(cmPkRgrCfgTransId) for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->trans[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -1027,9 +1027,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrCfgTransId) for (i=0; itrans[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trans[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -1064,9 +1064,9 @@ Buffer *mBuf; TRC3(cmPkRgrDlHqCfg) - CMCHKPK(SPkU8, param->maxMsg4HqTx, mBuf); - CMCHKPK(SPkU8, param->maxDlHqTx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf); + return ROK; } @@ -1101,9 +1101,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrDlHqCfg) - CMCHKUNPK(SUnpkU8, ¶m->maxDlHqTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxMsg4HqTx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->maxDlHqTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxMsg4HqTx, mBuf); + return ROK; } @@ -1138,9 +1138,9 @@ Buffer *mBuf; TRC3(cmPkRgrRntiCfg) - CMCHKPK(SPkU16, param->size, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->startRnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1176,8 +1176,8 @@ Buffer *mBuf; TRC3(cmUnpkRgrRntiCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->startRnti, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + return ROK; } #ifdef EMTC_ENABLE @@ -1211,12 +1211,12 @@ Buffer *mBuf; TRC3(cmPkRgrEmtcRntiCfg) - CMCHKPK(SPkU16, param->size, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf); CMCHKPK(cmPkLteRnti, param->rntiCeModeBStart, mBuf); CMCHKPK(cmPkLteRnti, param->rntiCeModeARange, mBuf); CMCHKPK(cmPkLteRnti, param->rntiCeModeAStart, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1255,9 +1255,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeARange, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBStart, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rntiCeModeBRange, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); - RETVALUE(ROK); + return ROK; } #endif @@ -1292,10 +1292,10 @@ Buffer *mBuf; TRC3(cmPkRgrDlCmnCodeRateCfg) - CMCHKPK(SPkU8, param->ccchCqi, mBuf); - CMCHKPK(SPkU16, param->pdcchCodeRate, mBuf); - CMCHKPK(SPkU16, param->bcchPchRaCodeRate, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); + CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf); + CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf); + return ROK; } @@ -1330,10 +1330,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrDlCmnCodeRateCfg) - CMCHKUNPK(SUnpkU16, ¶m->bcchPchRaCodeRate, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pdcchCodeRate, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ccchCqi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pdcchCodeRate, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); + return ROK; } @@ -1368,8 +1368,8 @@ Buffer *mBuf; TRC3(cmPkRgrCfiCfg) - CMCHKPK(SPkU8, param->cfi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); + return ROK; } @@ -1404,8 +1404,8 @@ Buffer *mBuf; TRC3(cmUnpkRgrCfiCfg) - CMCHKUNPK(SUnpkU8, ¶m->cfi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); + return ROK; } @@ -1442,12 +1442,12 @@ Buffer *mBuf; TRC3(cmPkRgrPuschSubBandCfg) for (i=param->numSubbands-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->dmrs[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf); } - CMCHKPK(SPkU8, param->size, mBuf); - CMCHKPK(SPkU8, param->numSubbands, mBuf); - CMCHKPK(SPkU8, param->subbandStart, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->size, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubbands, mBuf); + CMCHKPK(oduUnpackUInt8, param->subbandStart, mBuf); + return ROK; } @@ -1483,13 +1483,13 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkRgrPuschSubBandCfg) - CMCHKUNPK(SUnpkU8, ¶m->subbandStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubbands, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->subbandStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubbands, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->size, mBuf); for (i=0; inumSubbands; i++) { - CMCHKUNPK(SUnpkU8, ¶m->dmrs[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dmrs[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -1524,8 +1524,8 @@ Buffer *mBuf; TRC3(cmPkRgrUlCmnCodeRateCfg) - CMCHKPK(SPkU8, param->ccchCqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); + return ROK; } @@ -1560,8 +1560,8 @@ Buffer *mBuf; TRC3(cmUnpkRgrUlCmnCodeRateCfg) - CMCHKUNPK(SUnpkU8, ¶m->ccchCqi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); + return ROK; } @@ -1596,8 +1596,8 @@ Buffer *mBuf; TRC3(cmPkRgrUlTrgCqiCfg) - CMCHKPK(SPkU8, param->trgCqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); + return ROK; } @@ -1632,8 +1632,8 @@ Buffer *mBuf; TRC3(cmUnpkRgrUlTrgCqiCfg) - CMCHKUNPK(SUnpkU8, ¶m->trgCqi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); + return ROK; } @@ -1668,9 +1668,9 @@ Buffer *mBuf; TRC3(cmPkRgrBwCfg) - CMCHKPK(SPkU8, param->ulTotalBw, mBuf); - CMCHKPK(SPkU8, param->dlTotalBw, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); + return ROK; } @@ -1693,42 +1693,42 @@ Buffer *mBuf; S32 i; TRC3(cmPkRgrEmtcSiCfg) - CMCHKPK(SPkU8, param->siHoppingEnable, mBuf); - CMCHKPK(SPkU32, param->modPrd, mBuf); - CMCHKPK(SPkU8, param->siWinSizeBr, mBuf); - CMCHKPK(SPkU8, param->sib1Repetition, mBuf); - CMCHKPK(SPkU8, param->siRepetition, mBuf); + CMCHKPK(oduUnpackUInt8, param->siHoppingEnable, mBuf); + CMCHKPK(oduUnpackUInt32, param->modPrd, mBuf); + CMCHKPK(oduUnpackUInt8, param->siWinSizeBr, mBuf); + CMCHKPK(oduUnpackUInt8, param->sib1Repetition, mBuf); + CMCHKPK(oduUnpackUInt8, param->siRepetition, mBuf); - CMCHKPK(SPkU16, param->startSymbolLc, mBuf); - //CMCHKPK(SPkU8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); + CMCHKPK(oduUnpackUInt16, param->startSymbolLc, mBuf); + //CMCHKPK(oduUnpackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); /*Changes by SIMRAN*/ if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) { - CMCHKPK(SPkU16, param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); + CMCHKPK(oduUnpackUInt16, param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); } else { //CMCHKPK(SPkU64,param->fddDLOrTddSfBitmapLC.u.ptn40, mBuf); for (i=0; i<2; i++) { - CMCHKPK(SPkU32, param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); + CMCHKPK(oduUnpackUInt32, param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); } } - CMCHKPK(SPkU8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); - //CMCHKPK(SPkU16, param->fddDlOrTddSfBitmapBR, mBuf); + CMCHKPK(oduUnpackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); + //CMCHKPK(oduUnpackUInt16, param->fddDlOrTddSfBitmapBR, mBuf); for (i= (param->numSi-1); i >= 0; i--) { - CMCHKPK(SPkU8, param->schdInfo[i].emtcSiNarrowBand, mBuf); - CMCHKPK(SPkU16, param->schdInfo[i].emtcSiTbs, mBuf); + CMCHKPK(oduUnpackUInt8, param->schdInfo[i].emtcSiNarrowBand, mBuf); + CMCHKPK(oduUnpackUInt16, param->schdInfo[i].emtcSiTbs, mBuf); } for (i= (param->numSi-1); i >= 0; i--) { - CMCHKPK(SPkU32, param->siPeriodicity[i], mBuf); + CMCHKPK(oduUnpackUInt32, param->siPeriodicity[i], mBuf); } - CMCHKPK(SPkU8, param->numSi, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1750,18 +1750,18 @@ Buffer *mBuf; S32 i; TRC3(cmPkRgrEmtcRachCfg) - CMCHKPK(SPkU8, param->emtcCeLvlSupported, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcCeLvlSupported, mBuf); for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->ceLevelInfo[i].emtcRarHopping, mBuf); - CMCHKPK(SPkU16, param->ceLevelInfo[i].raEmtcWinSize, mBuf); - CMCHKPK(SPkU16, param->ceLevelInfo[i].raEmtcContResTmr, mBuf); - CMCHKPK(SPkU16, param->ceLevelInfo[i].emtcPreambleTransMax, mBuf); - CMCHKPK(SPkU8, param->ceLevelInfo[i].emtcPreambleMap.firstPreamble, mBuf); - CMCHKPK(SPkU8, param->ceLevelInfo[i].emtcPreambleMap.lastPreamble, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcRarHopping, mBuf); + CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcWinSize, mBuf); + CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcContResTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].emtcPreambleTransMax, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.firstPreamble, mBuf); + CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.lastPreamble, mBuf); } - RETVALUE(ROK); + return ROK; } @@ -1779,10 +1779,10 @@ Buffer *mBuf; { TRC3(cmPkRgrEmtcPdschCfg) - CMCHKPK(SPkU16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(SPkU16, param->emtcMaxRepCeModeB, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -1798,10 +1798,10 @@ Buffer *mBuf; #endif { TRC3(cmPkRgrEmtcPuschCfg) - CMCHKPK(SPkU16, param->emtcMaxRepCeModeA, mBuf); - CMCHKPK(SPkU16, param->emtcMaxRepCeModeB, mBuf); - CMCHKPK(SPkU8, param->emtcHoppingOffset, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcHoppingOffset, mBuf); + return ROK; } @@ -1823,15 +1823,15 @@ Buffer *mBuf; TRC3(cmPkRgrEmtcPucchCfg) for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { - CMCHKPK(SPkU16, param->emtcN1pucchAnInfoLst[i], mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf); } - CMCHKPK(SPkU8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf); - CMCHKPK(SPkU8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf); - CMCHKPK(SPkU8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf); - CMCHKPK(SPkU8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1848,17 +1848,17 @@ Buffer *mBuf; #endif { TRC3(cmPkRgrEmtcPrachCeParamCfg) - CMCHKPK(SPkU8, param->emtcPrachCfgIdx, mBuf); - CMCHKPK(SPkU8, param->emtcPrachFreqOffset, mBuf); - CMCHKPK(SPkU16, param->emtcPrachStartSubFrame, mBuf); - CMCHKPK(SPkU8, param->emtcMaxPremAttemptCE, mBuf); - CMCHKPK(SPkU8, param->emtcNumRepPerPreambleAtt, mBuf); - CMCHKPK(SPkU8, param->emtcNumMpdcchNBtoMonitor, mBuf); - CMCHKPK(SPkU8, param->emtcMpdcchNBtoMonitor[0], mBuf); - CMCHKPK(SPkU8, param->emtcMpdcchNBtoMonitor[1], mBuf); - CMCHKPK(SPkU16, param->emtcMpdcchNumRep, mBuf); - CMCHKPK(SPkU8, param->emtcPrachHoppingCfg, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcPrachStartSubFrame, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcMaxPremAttemptCE, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcNumRepPerPreambleAtt, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcNumMpdcchNBtoMonitor, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNBtoMonitor[0], mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNBtoMonitor[1], mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcMpdcchNumRep, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPrachHoppingCfg, mBuf); + return ROK; } @@ -1878,14 +1878,14 @@ Buffer *mBuf; S32 i; TRC3(cmPkRgrEmtcPrachCfg) - CMCHKPK(SPkU8, param->emtcMpdcchStartSFCssRaFdd, mBuf); - CMCHKPK(SPkU8, param->emtcPrachHopingOffset, mBuf); - CMCHKPK(SPkU8, param->emtcInitialCElevel, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPrachHopingOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcInitialCElevel, mBuf); for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { CMCHKPK(cmPkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -1904,9 +1904,9 @@ Buffer *mBuf; #endif { TRC3(cmPkRgrEmtcCfg) - CMCHKPK(SPkU16, param->pci, mBuf); - CMCHKPK(SPkU32, param->emtcT300Tmr, mBuf); - CMCHKPK(SPkU32, param->emtcT301Tmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->pci, mBuf); + CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf); + CMCHKPK(oduUnpackUInt32, param->emtcT301Tmr, mBuf); CMCHKPK(cmPkRgrEmtcSiCfg, ¶m->emtcSiCfg, mBuf); CMCHKPK(cmPkRgrEmtcRachCfg, ¶m->emtcRachCfg, mBuf); CMCHKPK(cmPkRgrEmtcPdschCfg, ¶m->emtcPdschCfg, mBuf); @@ -1914,11 +1914,11 @@ Buffer *mBuf; CMCHKPK(cmPkRgrEmtcPrachCfg, ¶m->emtcPrachCfg, mBuf); CMCHKPK(cmPkRgrEmtcPucchCfg, ¶m->emtcPucchCfg, mBuf); CMCHKPK(cmPkRgrEmtcRntiCfg, ¶m->emtcMacRnti, mBuf); - CMCHKPK(SPkU8, param->emtcPdschNbIdx, mBuf); - CMCHKPK(SPkU8, param->emtcMpdcchNbIdx, mBuf); - CMCHKPK(SPkU8, param->emtcPuschNbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPdschNbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcPuschNbIdx, mBuf); - RETVALUE(ROK); + return ROK; } /* EMTC related pack changes end*/ @@ -1941,40 +1941,40 @@ Buffer *mBuf; S32 i; U32 tmpEnum; TRC3(cmUnpkRgrEmtcSiCfg) - CMCHKUNPK(SUnpkU8, ¶m->numSi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); for (i=0; i < param->numSi ; i++) { - CMCHKUNPK(SUnpkU32,(U32*)&tmpEnum,mBuf); + CMCHKUNPK(oduPackUInt32,(U32*)&tmpEnum,mBuf); param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum; } for (i=0; i < param->numSi ; i++) { - CMCHKUNPK(SUnpkU16, ¶m->schdInfo[i].emtcSiTbs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->schdInfo[i].emtcSiNarrowBand, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->schdInfo[i].emtcSiTbs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->schdInfo[i].emtcSiNarrowBand, mBuf); } - //CMCHKUNPK(SUnpkU16, ¶m->fddDlOrTddSfBitmapBR, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); + //CMCHKUNPK(oduPackUInt16, ¶m->fddDlOrTddSfBitmapBR, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf); /*Changes by SIMRAN*/ if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice)) { - CMCHKUNPK(SUnpkU16, ¶m->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->fddDLOrTddSfBitmapLC.u.ptn10, mBuf); } else { for (i=1; i>=0; i--) { - CMCHKUNPK(SUnpkU32, ¶m->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf); } } - CMCHKUNPK(SUnpkU16, ¶m->startSymbolLc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->siRepetition, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sib1Repetition, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->siWinSizeBr, mBuf); - CMCHKUNPK(SUnpkU32, (U32*)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->startSymbolLc, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->siRepetition, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sib1Repetition, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->siWinSizeBr, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf); param->modPrd = (RgrModPeriodicity) tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->siHoppingEnable, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->siHoppingEnable, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1996,15 +1996,15 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkRgrEmtcRachCfg) for (i=0; i < RGR_MAX_CE_LEVEL; i++) { - CMCHKUNPK(SUnpkU8, &(param->ceLevelInfo[i].emtcPreambleMap.lastPreamble), mBuf); - CMCHKUNPK(SUnpkU8, &(param->ceLevelInfo[i].emtcPreambleMap.firstPreamble), mBuf); - CMCHKUNPK(SUnpkU16, &(param->ceLevelInfo[i].emtcPreambleTransMax), mBuf); - CMCHKUNPK(SUnpkU16, &(param->ceLevelInfo[i].raEmtcContResTmr), mBuf); - CMCHKUNPK(SUnpkU16, &(param->ceLevelInfo[i].raEmtcWinSize), mBuf); - CMCHKUNPK(SUnpkU8,&(param->ceLevelInfo[i].emtcRarHopping), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.lastPreamble), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.firstPreamble), mBuf); + CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].emtcPreambleTransMax), mBuf); + CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].raEmtcContResTmr), mBuf); + CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].raEmtcWinSize), mBuf); + CMCHKUNPK(oduPackUInt8,&(param->ceLevelInfo[i].emtcRarHopping), mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->emtcCeLvlSupported, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->emtcCeLvlSupported, mBuf); + return ROK; } @@ -2022,9 +2022,9 @@ Buffer *mBuf; { TRC3(cmUnpkRgrEmtcPdschCfg) - CMCHKUNPK(SUnpkU16, ¶m->emtcMaxRepCeModeB, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->emtcMaxRepCeModeA, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); + return ROK; } #ifdef ANSI @@ -2040,10 +2040,10 @@ Buffer *mBuf; #endif { TRC3(cmUnpkRgrEmtcPuschCfg) - CMCHKUNPK(SUnpkU8, ¶m->emtcHoppingOffset, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->emtcMaxRepCeModeB, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->emtcMaxRepCeModeA, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->emtcHoppingOffset, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeA, mBuf); + return ROK; } @@ -2065,15 +2065,15 @@ Buffer *mBuf; TRC3(cmUnpkRgrEmtcPucchCfg) - CMCHKUNPK(SUnpkU8, ¶m->emtcPucchNumRepCEMsg4Lvl3, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcPucchNumRepCEMsg4Lvl2, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcPucchNumRepCEMsg4Lvl1, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcPucchNumRepCEMsg4Lvl0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl3, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl2, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl1, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPucchNumRepCEMsg4Lvl0, mBuf); for (i=0; i < RGR_MAX_CE_LEVEL ; i++) { - CMCHKUNPK(SUnpkU16, ¶m->emtcN1pucchAnInfoLst[i], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->emtcN1pucchAnInfoLst[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -2090,17 +2090,17 @@ Buffer *mBuf; #endif { TRC3(cmUnpkRgrEmtcPrachCeParamCfg) - CMCHKUNPK(SUnpkU8, ¶m->emtcPrachHoppingCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->emtcMpdcchNumRep, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcMpdcchNBtoMonitor[1], mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcMpdcchNBtoMonitor[0], mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcNumMpdcchNBtoMonitor, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcNumRepPerPreambleAtt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcMaxPremAttemptCE, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->emtcPrachStartSubFrame, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcPrachFreqOffset, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcPrachCfgIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHoppingCfg, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->emtcMpdcchNumRep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNBtoMonitor[1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNBtoMonitor[0], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcNumMpdcchNBtoMonitor, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcNumRepPerPreambleAtt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcMaxPremAttemptCE, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->emtcPrachStartSubFrame, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachFreqOffset, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachCfgIdx, mBuf); + return ROK; } @@ -2123,11 +2123,11 @@ Buffer *mBuf; for (i=0; i < RGR_MAX_CE_LEVEL; i++) { CMCHKUNPK(cmUnpkRgrEmtcPrachCeParamCfg, ¶m->emtcPrachCEparmLst[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->emtcInitialCElevel, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcPrachHopingOffset, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcMpdcchStartSFCssRaFdd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcInitialCElevel, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHopingOffset, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchStartSFCssRaFdd, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -2144,9 +2144,9 @@ Buffer *mBuf; { TRC3(cmUnpkRgrEmtcCfg) - CMCHKUNPK(SUnpkU8, ¶m->emtcPuschNbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcMpdcchNbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcPdschNbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPuschNbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcMpdcchNbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcPdschNbIdx, mBuf); CMCHKUNPK(cmUnpkRgrEmtcRntiCfg, ¶m->emtcMacRnti, mBuf); CMCHKUNPK(cmUnpkRgrEmtcPucchCfg, ¶m->emtcPucchCfg, mBuf); CMCHKUNPK(cmUnpkRgrEmtcPrachCfg, ¶m->emtcPrachCfg, mBuf); @@ -2154,15 +2154,15 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrEmtcPdschCfg, ¶m->emtcPdschCfg, mBuf); CMCHKUNPK(cmUnpkRgrEmtcRachCfg, ¶m->emtcRachCfg, mBuf); CMCHKUNPK(cmUnpkRgrEmtcSiCfg, ¶m->emtcSiCfg, mBuf); - CMCHKUNPK(SUnpkU32,¶m->emtcT301Tmr, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->emtcT300Tmr, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pci, mBuf); + CMCHKUNPK(oduPackUInt32,¶m->emtcT301Tmr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->emtcT300Tmr, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pci, mBuf); - RETVALUE(ROK); + return ROK; } /* EMTC related unpack changes end*/ @@ -2201,9 +2201,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrBwCfg) - CMCHKUNPK(SUnpkU8, ¶m->dlTotalBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulTotalBw, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulTotalBw, mBuf); + return ROK; } @@ -2238,9 +2238,9 @@ Buffer *mBuf; TRC3(cmPkRgrPhichCfg) - CMCHKPK(SPkU8, param->isDurExtend, mBuf); - CMCHKPK(SPkU32, param->ngEnum, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf); + CMCHKPK(oduUnpackUInt32, param->ngEnum, mBuf); + return ROK; } @@ -2276,10 +2276,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrPhichCfg) - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ngEnum = (RgrPhichNg) tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->isDurExtend, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isDurExtend, mBuf); + return ROK; } @@ -2314,13 +2314,13 @@ Buffer *mBuf; TRC3(cmPkRgrPucchCfg) - CMCHKPK(SPkU8, param->maxPucchRb, mBuf); - CMCHKPK(SPkU8, param->cyclicShift, mBuf); - CMCHKPK(SPkU8, param->deltaShift, mBuf); - CMCHKPK(SPkU16, param->n1PucchAn, mBuf); - CMCHKPK(SPkU8, param->resourceSize, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->cyclicShift, mBuf); + CMCHKPK(oduUnpackUInt8, param->deltaShift, mBuf); + CMCHKPK(oduUnpackUInt16, param->n1PucchAn, mBuf); + CMCHKPK(oduUnpackUInt8, param->resourceSize, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2355,13 +2355,13 @@ Buffer *mBuf; TRC3(cmUnpkRgrPucchCfg) - CMCHKUNPK(SUnpkU8, ¶m->resourceSize, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->n1PucchAn, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->deltaShift, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cyclicShift, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxPucchRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resourceSize, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->n1PucchAn, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->deltaShift, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cyclicShift, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxPucchRb, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2396,11 +2396,11 @@ Buffer *mBuf; TRC3(cmPkRgrSrsCfg) - CMCHKPK(SPkU8, param->srsSubFrameCfg, mBuf); - CMCHKPK(SPkU32, param->srsBwEnum, mBuf); - CMCHKPK(SPkU32, param->srsCfgPrdEnum, mBuf); - CMCHKPK(SPkU8, param->isSrsCfgSetup, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->srsSubFrameCfg, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsBwEnum, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsCfgPrdEnum, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSrsCfgSetup, mBuf); + return ROK; } @@ -2436,13 +2436,13 @@ Buffer *mBuf; TRC3(cmUnpkRgrSrsCfg) - CMCHKUNPK(SUnpkU8, ¶m->isSrsCfgSetup, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSrsCfgSetup, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->srsBwEnum = (RgrSrsBwCfg) tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->srsSubFrameCfg, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->srsSubFrameCfg, mBuf); + return ROK; } @@ -2478,24 +2478,24 @@ Buffer *mBuf; S32 i; TRC3(cmPkRgrRachCfg) - CMCHKPK(SPkU8, param->prachResource, mBuf); - CMCHKPK(SPkU16, param->msgSizeGrpA, mBuf); - CMCHKPK(SPkU8, param->sizeRaPreambleGrpA, mBuf); - CMCHKPK(SPkU8, param->numRaPreamble, mBuf); - CMCHKPK(SPkU8, param->maxMsg3Tx, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachResource, mBuf); + CMCHKPK(oduUnpackUInt16, param->msgSizeGrpA, mBuf); + CMCHKPK(oduUnpackUInt8, param->sizeRaPreambleGrpA, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRaPreamble, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf); for (i=param->raOccasion.size-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->raOccasion.subFrameNum[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->raOccasion.subFrameNum[i], mBuf); } - CMCHKPK(SPkU32, param->raOccasion.sfnEnum, mBuf); - CMCHKPK(SPkU8, param->raOccasion.size, mBuf); - CMCHKPK(SPkU8, param->raWinSize, mBuf); - CMCHKPK(SPkU8, param->preambleFormat, mBuf); + CMCHKPK(oduUnpackUInt32, param->raOccasion.sfnEnum, mBuf); + CMCHKPK(oduUnpackUInt8, param->raOccasion.size, mBuf); + CMCHKPK(oduUnpackUInt8, param->raWinSize, mBuf); + CMCHKPK(oduUnpackUInt8, param->preambleFormat, mBuf); #ifdef RGR_V1 /* rgr_c_001.main_5: cccpu00112372: Added contention resolution * timer configuration */ - CMCHKPK(SPkU8, param->contResTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->contResTmr, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -2534,22 +2534,22 @@ Buffer *mBuf; #ifdef RGR_V1 /* rgr_c_001.main_5: cccpu00112372: Added contention resolution * timer configuration */ - CMCHKUNPK(SUnpkU8, ¶m->contResTmr, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->contResTmr, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->preambleFormat, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->raWinSize, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->raOccasion.size, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->preambleFormat, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->raWinSize, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->raOccasion.size, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->raOccasion.sfnEnum = (RgrRaSfn) tmpEnum; for (i=0; iraOccasion.size; i++) { - CMCHKUNPK(SUnpkU8, ¶m->raOccasion.subFrameNum[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->raOccasion.subFrameNum[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->maxMsg3Tx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRaPreamble, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sizeRaPreambleGrpA, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->msgSizeGrpA, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachResource, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->maxMsg3Tx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRaPreamble, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sizeRaPreambleGrpA, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->msgSizeGrpA, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachResource, mBuf); + return ROK; } @@ -2596,15 +2596,15 @@ Buffer *mBuf; for (idx=param->numSi-1; idx >= 0; idx--) { /* Enum to be packed/unpacked as U32 instead of S32 */ - CMCHKPK(SPkU32, param->siPeriodicity[idx], mBuf); + CMCHKPK(oduUnpackUInt32, param->siPeriodicity[idx], mBuf); } - CMCHKPK(SPkU8, param->numSi, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSi, mBuf); /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/ - CMCHKPK(SPkU32, (U32)param->modPrd, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->modPrd, mBuf); #endif/*RGR_SI_SCH*/ - CMCHKPK(SPkU8, param->retxCnt, mBuf); - CMCHKPK(SPkU8, param->siWinSize, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->retxCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->siWinSize, mBuf); + return ROK; } @@ -2644,13 +2644,13 @@ Buffer *mBuf; TRC3(cmUnpkRgrSiCfg) - CMCHKUNPK(SUnpkU8, ¶m->siWinSize, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->retxCnt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->siWinSize, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->retxCnt, mBuf); #ifdef RGR_SI_SCH /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->modPrd = (RgrModPeriodicity) tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->numSi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSi, mBuf); if(param->numSi > sizeof(param->siPeriodicity)/ sizeof(param->siPeriodicity[0])) @@ -2659,12 +2659,12 @@ Buffer *mBuf; /* Enum to be packed/unpacked as U32 instead of S32 */ for (idx=0; idx < param->numSi; idx++) { - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->siPeriodicity[idx] = (RgrSiPeriodicity) tmpEnum; } #endif/*RGR_SI_SCH*/ - RETVALUE(ROK); + return ROK; } @@ -2699,9 +2699,9 @@ Buffer *mBuf; TRC3(cmPkRgrTpcRntiCfg) - CMCHKPK(SPkU16, param->size, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->startTpcRnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2737,8 +2737,8 @@ Buffer *mBuf; TRC3(cmUnpkRgrTpcRntiCfg) CMCHKUNPK(cmUnpkLteRnti, ¶m->startTpcRnti, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + return ROK; } @@ -2779,9 +2779,9 @@ Buffer *mBuf; CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->pucchPwrFmt3, mBuf); CMCHKPK(SPkS8, param->deltaPreambleMsg3, mBuf); CMCHKPK(SPkS8, param->p0NominalPucch, mBuf); - CMCHKPK(SPkU32, param->alpha, mBuf); + CMCHKPK(oduUnpackUInt32, param->alpha, mBuf); CMCHKPK(SPkS8, param->p0NominalPusch, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2818,7 +2818,7 @@ Buffer *mBuf; TRC3(cmUnpkRgrUlPwrCfg) CMCHKUNPK(SUnpkS8, ¶m->p0NominalPusch, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->alpha = (RgrPwrAlpha) tmpEnum; CMCHKUNPK(SUnpkS8, ¶m->p0NominalPucch, mBuf); CMCHKUNPK(SUnpkS8, ¶m->deltaPreambleMsg3, mBuf); @@ -2826,7 +2826,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrTpcRntiCfg, ¶m->pucchPwrFmt3a, mBuf); CMCHKUNPK(cmUnpkRgrTpcRntiCfg, ¶m->puschPwrFmt3, mBuf); CMCHKUNPK(cmUnpkRgrTpcRntiCfg, ¶m->puschPwrFmt3a, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2861,10 +2861,10 @@ Buffer *mBuf; TRC3(cmPkRgrPuschCfg) - CMCHKPK(SPkU8, param->hopOffst, mBuf); - CMCHKPK(SPkU8, param->isIntraHop, mBuf); - CMCHKPK(SPkU8, param->numSubBands, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->hopOffst, mBuf); + CMCHKPK(oduUnpackUInt8, param->isIntraHop, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubBands, mBuf); + return ROK; } @@ -2899,10 +2899,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrPuschCfg) - CMCHKUNPK(SUnpkU8, ¶m->numSubBands, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isIntraHop, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hopOffst, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->numSubBands, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isIntraHop, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hopOffst, mBuf); + return ROK; } @@ -2939,10 +2939,10 @@ Buffer *mBuf; TRC3(cmPkRgrCodeBookRstCfg) for (i=1-1; i >= 0; i--) { - CMCHKPK(SPkU32, param->pmiBitMap[i], mBuf); + CMCHKPK(oduUnpackUInt32, param->pmiBitMap[i], mBuf); } - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -2978,11 +2978,11 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkRgrCodeBookRstCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); for (i=0; i<1; i++) { - CMCHKUNPK(SUnpkU32, ¶m->pmiBitMap[i], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->pmiBitMap[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -3017,10 +3017,10 @@ Buffer *mBuf; TRC3(cmPkRgrPreambleSetCfg) - CMCHKPK(SPkU8, param->size, mBuf); - CMCHKPK(SPkU8, param->start, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->size, mBuf); + CMCHKPK(oduUnpackUInt8, param->start, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -3055,10 +3055,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrPreambleSetCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->start, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->size, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->start, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->size, mBuf); + return ROK; } @@ -3093,12 +3093,12 @@ Buffer *mBuf; TRC3(cmPkRgrCmnLchCfg) - CMCHKPK(SPkU8, param->ulTrchType, mBuf); - CMCHKPK(SPkU8, param->dlTrchType, mBuf); - CMCHKPK(SPkU8, param->dir, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dir, mBuf); CMCHKPK(cmPkLteLcType, param->lcType, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3135,10 +3135,10 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dir, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dlTrchType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulTrchType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dir, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulTrchType, mBuf); + return ROK; } @@ -3173,9 +3173,9 @@ Buffer *mBuf; TRC3(cmPkRgrDlfsCfg) - CMCHKPK(SPkU8, param->thresholdCqi, mBuf); - CMCHKPK(SPkU8, param->isDlFreqSel, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->thresholdCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDlFreqSel, mBuf); + return ROK; } @@ -3210,9 +3210,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrDlfsCfg) - CMCHKUNPK(SUnpkU8, ¶m->isDlFreqSel, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->thresholdCqi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isDlFreqSel, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->thresholdCqi, mBuf); + return ROK; } @@ -3251,11 +3251,11 @@ Buffer *mBuf; TRC3(cmPkRgrTddPrachInfo) - CMCHKPK(SPkU8, param->ulStartSfIdx, mBuf); - CMCHKPK(SPkU8, param->halfFrm, mBuf); - CMCHKPK(SPkU32, param->sfn, mBuf); - CMCHKPK(SPkU8, param->freqIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->ulStartSfIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->halfFrm, mBuf); + CMCHKPK(oduUnpackUInt32, param->sfn, mBuf); + CMCHKPK(oduUnpackUInt8, param->freqIdx, mBuf); + return ROK; } @@ -3291,12 +3291,12 @@ Buffer *mBuf; TRC3(cmUnpkRgrTddPrachInfo) - CMCHKUNPK(SUnpkU8, ¶m->freqIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->freqIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->sfn = tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->halfFrm, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulStartSfIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->halfFrm, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulStartSfIdx, mBuf); + return ROK; } @@ -3335,8 +3335,8 @@ Buffer *mBuf; for (i=param->numRsc-1; i >= 0; i--) { CMCHKPK(cmPkRgrTddPrachInfo, ¶m->prachInfo[i], mBuf); } - CMCHKPK(SPkU8, param->numRsc, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numRsc, mBuf); + return ROK; } @@ -3372,11 +3372,11 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkRgrTddPrachRscInfo) - CMCHKUNPK(SUnpkU8, ¶m->numRsc, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRsc, mBuf); for (i=0; inumRsc; i++) { CMCHKUNPK(cmUnpkRgrTddPrachInfo, ¶m->prachInfo[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -3416,12 +3416,12 @@ Buffer *mBuf; TRC3(cmPkRgrEnbPfs) for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--) { - CMCHKPK(SPkU32, param->qciWgt[idx], mBuf); + CMCHKPK(oduUnpackUInt32, param->qciWgt[idx], mBuf); } - CMCHKPK(SPkU8, param->fairCoeffi, mBuf); - CMCHKPK(SPkU8, param->tptCoeffi, mBuf); + CMCHKPK(oduUnpackUInt8, param->fairCoeffi, mBuf); + CMCHKPK(oduUnpackUInt8, param->tptCoeffi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3456,13 +3456,13 @@ Buffer *mBuf; S32 idx; TRC3(cmUnpkRgrEnbPfs) - CMCHKUNPK(SUnpkU8, ¶m->tptCoeffi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->fairCoeffi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tptCoeffi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->fairCoeffi, mBuf); for(idx = 0; idx < RGR_MAX_NUM_QCI; idx++) { - CMCHKUNPK(SUnpkU32, ¶m->qciWgt[idx], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->qciWgt[idx], mBuf); } - RETVALUE(ROK); + return ROK; } /*rgr_c_001.main_7 - Added support for SPS*/ @@ -3497,11 +3497,11 @@ Buffer *mBuf; { TRC3(cmPkRgrSpsCellCfg) - CMCHKPK(SPkU16, param->maxSpsUePerUlSf, mBuf); - CMCHKPK(SPkU16, param->maxSpsUePerDlSf, mBuf); - CMCHKPK(SPkU8, param->maxSpsDlBw, mBuf); + CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf); + CMCHKPK(oduUnpackUInt16, param->maxSpsUePerDlSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxSpsDlBw, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3537,11 +3537,11 @@ Buffer *mBuf; TRC3(cmUnpkRgrSpsDlCellCfg) - CMCHKUNPK(SUnpkU8, ¶m->maxSpsDlBw, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->maxSpsUePerDlSf, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->maxSpsUePerUlSf, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxSpsDlBw, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->maxSpsUePerDlSf, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->maxSpsUePerUlSf, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef RG_5GTF @@ -3555,15 +3555,15 @@ Buffer *mBuf for (idx = MAX_5GTF_SUBFRAME_INFO - 1; idx >= 0 ;--idx) { - CMCHKPK(SPkU32, param->dynConfig[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt32, param->dynConfig[(U8)idx], mBuf); } - CMCHKPK(SPkU8, param->uePerGrp, mBuf); - CMCHKPK(SPkU8, param->ueGrpPerTti, mBuf); - CMCHKPK(SPkU8, param->numUes, mBuf); - CMCHKPK(SPkU8, param->numOfCC, mBuf); - CMCHKPK(SPkU8, param->bwPerCC, mBuf); - CMCHKPK(SPkU8, param->cfi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->uePerGrp, mBuf); + CMCHKPK(oduUnpackUInt8, param->ueGrpPerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->numUes, mBuf); + CMCHKPK(oduUnpackUInt8, param->numOfCC, mBuf); + CMCHKPK(oduUnpackUInt8, param->bwPerCC, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); + return ROK; } PUBLIC S16 cmUnPkRgr5gtfCellCfg @@ -3574,18 +3574,18 @@ Buffer *mBuf { S8 idx = 0; - CMCHKUNPK(SUnpkU8, ¶m->cfi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bwPerCC, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numOfCC, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numUes, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ueGrpPerTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->uePerGrp, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bwPerCC, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numOfCC, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numUes, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ueGrpPerTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->uePerGrp, mBuf); for (idx = 0; idx < MAX_5GTF_SUBFRAME_INFO ; ++idx) { - CMCHKUNPK(SUnpkU32, ¶m->dynConfig[(U8)idx], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->dynConfig[(U8)idx], mBuf); } - RETVALUE(ROK); + return ROK; } #endif @@ -3620,9 +3620,9 @@ Buffer *mBuf; { TRC3(cmPkRgrlteUCellCfg) - CMCHKPK(SPkU8, param->isLaaCell, mBuf); + CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -3655,9 +3655,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrLteUCellCfg) - CMCHKUNPK(SUnpkU8, ¶m->isLaaCell, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isLaaCell, mBuf); - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_START */ @@ -3690,10 +3690,10 @@ PUBLIC S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) { TRC3(cmPkRgrLteAdvancedUeConfig) - CMCHKPK(SPkU8, param->isUeCellEdge, mBuf); - CMCHKPK(SPkU8, param->isAbsUe, mBuf); - CMCHKPK(SPkU32, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAbsUe, mBuf); + CMCHKPK(oduUnpackUInt32, param->pres, mBuf); + return ROK; } /*********************************************************** @@ -3725,10 +3725,10 @@ PUBLIC S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) { TRC3(cmUnpkRgrLteAdvancedUeConfig) - CMCHKUNPK(SUnpkU32, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isAbsUe, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isUeCellEdge, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAbsUe, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isUeCellEdge, mBuf); + return ROK; } /*********************************************************** @@ -3761,16 +3761,16 @@ PUBLIC S16 cmPkRgrAbsConfig(param, mBuf) S8 indx = 0; TRC3(cmPkRgrAbsConfig) - CMCHKPK(SPkU32, (U32)param->status, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); for (indx = RGR_ABS_PATTERN_LEN-1; indx >= 0; indx--) { - CMCHKPK(SPkU8, param->absPattern[(U8)indx], mBuf); + CMCHKPK(oduUnpackUInt8, param->absPattern[(U8)indx], mBuf); } - CMCHKPK(SPkU32, param->absPatternType, mBuf); - CMCHKPK(SPkU32, param->absLoadPeriodicity, mBuf); + CMCHKPK(oduUnpackUInt32, param->absPatternType, mBuf); + CMCHKPK(oduUnpackUInt32, param->absLoadPeriodicity, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -3802,15 +3802,15 @@ PUBLIC S16 cmPkRgrSfrConfig(param, mBuf) { TRC3(cmPkRgrSfrConfig) - CMCHKPK(SPkU32, (U32)param->status, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); #ifdef TFU_UPGRADE - CMCHKPK(SPkU32, param->pwrThreshold.pHigh, mBuf); - CMCHKPK(SPkU32, param->pwrThreshold.pLow, mBuf); + CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pHigh, mBuf); + CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pLow, mBuf); #endif - CMCHKPK(SPkU8, param->cellEdgeRbRange.endRb, mBuf); - CMCHKPK(SPkU8, param->cellEdgeRbRange.startRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellEdgeRbRange.endRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellEdgeRbRange.startRb, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3844,9 +3844,9 @@ PUBLIC S16 cmPkRgrDsfrConfig(param, mBuf) { TRC3(cmPkRgrDsfrConfig) - CMCHKPK(SPkU32, (U32)param->status, mBuf); + CMCHKPK(oduUnpackUInt32, (U32)param->status, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3880,8 +3880,8 @@ PUBLIC S16 cmUnpkRgrDsfrConfig(param, mBuf) { TRC3(cmUnpkRgrDsfrConfig) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->status, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->status, mBuf); + return ROK; } @@ -3915,12 +3915,12 @@ PUBLIC S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) { TRC3(cmPkRgrCellLteAdvancedFeatureCfg) - CMCHKPK(SPkU32, param->pres, mBuf); + CMCHKPK(oduUnpackUInt32, param->pres, mBuf); CMCHKPK(cmPkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ CMCHKPK(cmPkRgrSfrConfig, ¶m->sfrCfg, mBuf); CMCHKPK(cmPkRgrAbsConfig, ¶m->absCfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3956,15 +3956,15 @@ PUBLIC S16 cmUnpkRgrAbsConfig(param, mBuf) S8 indx = 0; TRC3(cmUnpkRgrAbsConfig) - CMCHKUNPK(SUnpkU32, ¶m->absLoadPeriodicity, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->absPatternType, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->absLoadPeriodicity, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->absPatternType, mBuf); for (indx = 0; indx absPattern[(U8)indx], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->absPattern[(U8)indx], mBuf); } - CMCHKUNPK(SUnpkU32, (U32*)¶m->status, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)¶m->status, mBuf); - RETVALUE(ROK); + return ROK; } @@ -3998,15 +3998,15 @@ PUBLIC S16 cmUnpkRgrSfrConfig(param, mBuf) TRC3(cmUnpkRgrSfrConfig) - CMCHKUNPK(SUnpkU8, ¶m->cellEdgeRbRange.startRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cellEdgeRbRange.endRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.startRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellEdgeRbRange.endRb, mBuf); #ifdef TFU_UPGRADE - CMCHKUNPK(SUnpkU32, (U32*)¶m->pwrThreshold.pLow, mBuf); - CMCHKUNPK(SUnpkU32, (U32*)¶m->pwrThreshold.pHigh, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)¶m->pwrThreshold.pLow, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)¶m->pwrThreshold.pHigh, mBuf); #endif - CMCHKUNPK(SUnpkU32, (U32*)¶m->status, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)¶m->status, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -4041,9 +4041,9 @@ PUBLIC S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) CMCHKUNPK(cmUnpkRgrAbsConfig, ¶m->absCfg, mBuf); CMCHKUNPK(cmUnpkRgrSfrConfig, ¶m->sfrCfg, mBuf); CMCHKUNPK(cmUnpkRgrDsfrConfig, ¶m->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/ - CMCHKUNPK(SUnpkU32, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_END */ @@ -4075,13 +4075,13 @@ Buffer *mBuf; { TRC3(cmPkMacSchedGnbCfg) - CMCHKPK(SPkU8, param->maxDlUePerTti, mBuf); - CMCHKPK(SPkU8, param->maxUlUePerTti, mBuf); - CMCHKPK(SPkU8, param->numCells, mBuf); - CMCHKPK(SPkU8, param->dlSchdType, mBuf); - CMCHKPK(SPkU8, param->ulSchdType, mBuf); - CMCHKPK(SPkU8, param->numTxAntPorts, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxUlUePerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlSchdType, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulSchdType, mBuf); + CMCHKPK(oduUnpackUInt8, param->numTxAntPorts, mBuf); + return ROK; } /* cmPkRgrSchedEnbCfg */ /*********************************************************** @@ -4114,13 +4114,13 @@ Buffer *mBuf; TRC3(cmUnpkMacSchedGnbCfg) - CMCHKUNPK(SUnpkU8, ¶m->numTxAntPorts, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulSchdType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dlSchdType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numCells, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxUlUePerTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxDlUePerTti, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->numTxAntPorts, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulSchdType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlSchdType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxUlUePerTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxDlUePerTti, mBuf); + return ROK; } /* cmUnpkMacSchedGnbCfg */ @@ -4166,35 +4166,35 @@ Buffer *mBuf; CMCHKPK(cmPkRgr5gtfCellCfg, ¶m->Cell5gtfCfg, mBuf); #endif #ifdef LTE_ADV - CMCHKPK(SPkU8, param->isPucchFormat3Sptd, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPucchFormat3Sptd, mBuf); #endif /*LAA: Pack LAA params*/ CMCHKPK(cmPkRgrLteUCellCfg, ¶m->lteUCfg, mBuf); - CMCHKPK(SPkU32, param->msg4pAVal, mBuf); - CMCHKPK(SPkU8, param->isAutoCfgModeEnb, mBuf); - CMCHKPK(SPkU8, param->isDynCfiEnb, mBuf); - CMCHKPK(SPkU16, param->phichTxPwrOffset, mBuf); - CMCHKPK(SPkU16, param->rarTxPwrOffset, mBuf); - CMCHKPK(SPkU16, param->pcchTxPwrOffset, mBuf); - CMCHKPK(SPkU16, param->bcchTxPwrOffset, mBuf); - - CMCHKPK(SPkU16, param->t300TmrVal, mBuf); + CMCHKPK(oduUnpackUInt32, param->msg4pAVal, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); + CMCHKPK(oduUnpackUInt16, param->phichTxPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, param->rarTxPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, param->pcchTxPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, param->bcchTxPwrOffset, mBuf); + + CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf); /*rgr_c_001.main_7 - Added support for SPS*/ CMCHKPK(cmPkRgrSpsCellCfg, ¶m->spsCfg, mBuf); /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ - CMCHKPK(SPkU8, param->rrmTtiIndPrd, mBuf); + CMCHKPK(oduUnpackUInt8, param->rrmTtiIndPrd, mBuf); #ifdef LTE_TDD CMCHKPK(cmPkRgrTddPrachRscInfo, ¶m->prachRscInfo, mBuf); - CMCHKPK(SPkU8, param->spclSfCfgIdx, mBuf); - CMCHKPK(SPkU8, param->ulDlCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->spclSfCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulDlCfgIdx, mBuf); #endif CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); for (i=param->numCmnLcs-1; i >= 0; i--) { CMCHKPK(cmPkRgrCmnLchCfg, ¶m->cmnLcCfg[i], mBuf); } - CMCHKPK(SPkU8, param->numCmnLcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCmnLcs, mBuf); CMCHKPK(cmPkRgrPreambleSetCfg, ¶m->macPreambleSet, mBuf); CMCHKPK(cmPkRgrPuschCfg, ¶m->puschCfg, mBuf); CMCHKPK(cmPkRgrUlPwrCfg, ¶m->pwrCfg, mBuf); @@ -4215,36 +4215,36 @@ Buffer *mBuf; CMCHKPK(cmPkRgrCfiCfg, ¶m->cfiCfg, mBuf); CMCHKPK(cmPkRgrRntiCfg, ¶m->macRnti, mBuf); CMCHKPK(cmPkRgrDlHqCfg, ¶m->dlHqCfg, mBuf); - CMCHKPK(SPkU8, param->dlfsSchdType, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlfsSchdType, mBuf); CMCHKPK(SPkS8, param->pMax, mBuf); - CMCHKPK(SPkU8, param->cellModSchm, mBuf); - CMCHKPK(SPkU8, param->isCpDlExtend, mBuf); - CMCHKPK(SPkU8, param->isCpUlExtend, mBuf); - CMCHKPK(SPkU8, param->maxUlUeNewTxPerTti, mBuf); - CMCHKPK(SPkU8, param->maxDlUeNewTxPerTti, mBuf); - CMCHKPK(SPkU8, param->maxDlRetxBw, mBuf); - CMCHKPK(SPkU8, param->maxDlBwPerUe, mBuf); - CMCHKPK(SPkU8, param->maxUlBwPerUe, mBuf); - CMCHKPK(SPkU8, param->maxCcchPerDlSf, mBuf); - CMCHKPK(SPkU8, param->maxUePerDlSf, mBuf); - CMCHKPK(SPkU8, param->maxUePerUlSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellModSchm, mBuf); + CMCHKPK(oduUnpackUInt8, param->isCpDlExtend, mBuf); + CMCHKPK(oduUnpackUInt8, param->isCpUlExtend, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxUlUeNewTxPerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxDlUeNewTxPerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxDlRetxBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxDlBwPerUe, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxUlBwPerUe, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxCcchPerDlSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxUePerDlSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxUePerUlSf, mBuf); #ifdef RGR_V1 /* rgr_x_001.main_7: [ccpu00112789] Added configuration for maximum number of MSG3s */ - CMCHKPK(SPkU8, param->maxMsg3PerUlSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxMsg3PerUlSf, mBuf); #endif - CMCHKPK(SPkU8, param->macInst, mBuf); + CMCHKPK(oduUnpackUInt8, param->macInst, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); #ifdef EMTC_ENABLE /* EMTC related changes start*/ - CMCHKPK(SPkU8, param->emtcEnable, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); CMCHKPK(cmPkRgrEmtcCfg, ¶m->emtcCellCfg, mBuf); /* EMTC related changes ends*/ #endif - RETVALUE(ROK); + return ROK; } @@ -4283,30 +4283,30 @@ Buffer *mBuf; #ifdef EMTC_ENABLE /* EMTC related changes start*/ CMCHKUNPK(cmUnpkRgrEmtcCfg, ¶m->emtcCellCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->emtcEnable, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->emtcEnable, mBuf); /* EMTC related changes ends*/ #endif CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->macInst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->macInst, mBuf); #ifdef RGR_V1 /* rgr_x_001.main_7: [ccpu00112789] Added configuration for maximum number of MSG3s */ - CMCHKUNPK(SUnpkU8, ¶m->maxMsg3PerUlSf, mBuf); -#endif - CMCHKUNPK(SUnpkU8, ¶m->maxUePerUlSf, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxUePerDlSf, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxCcchPerDlSf, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxUlBwPerUe, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxDlBwPerUe, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxDlRetxBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxDlUeNewTxPerTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxUlUeNewTxPerTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isCpUlExtend, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isCpDlExtend, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cellModSchm, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxMsg3PerUlSf, mBuf); +#endif + CMCHKUNPK(oduPackUInt8, ¶m->maxUePerUlSf, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxUePerDlSf, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxCcchPerDlSf, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxUlBwPerUe, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxDlBwPerUe, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxDlRetxBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxDlUeNewTxPerTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxUlUeNewTxPerTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isCpUlExtend, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isCpDlExtend, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellModSchm, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pMax, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dlfsSchdType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlfsSchdType, mBuf); CMCHKUNPK(cmUnpkRgrDlHqCfg, ¶m->dlHqCfg, mBuf); CMCHKUNPK(cmUnpkRgrRntiCfg, ¶m->macRnti, mBuf); CMCHKUNPK(cmUnpkRgrCfiCfg, ¶m->cfiCfg, mBuf); @@ -4327,40 +4327,40 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrUlPwrCfg, ¶m->pwrCfg, mBuf); CMCHKUNPK(cmUnpkRgrPuschCfg, ¶m->puschCfg, mBuf); CMCHKUNPK(cmUnpkRgrPreambleSetCfg, ¶m->macPreambleSet, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numCmnLcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCmnLcs, mBuf); for (i=0; inumCmnLcs; i++) { CMCHKUNPK(cmUnpkRgrCmnLchCfg, ¶m->cmnLcCfg[i], mBuf); } CMCHKUNPK(cmUnpkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); #ifdef LTE_TDD - CMCHKUNPK(SUnpkU8, ¶m->ulDlCfgIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->spclSfCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulDlCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->spclSfCfgIdx, mBuf); CMCHKUNPK(cmUnpkRgrTddPrachRscInfo, ¶m->prachRscInfo, mBuf); #endif /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */ - CMCHKUNPK(SUnpkU8, ¶m->rrmTtiIndPrd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rrmTtiIndPrd, mBuf); /*rgr_c_001.main_7 - Added support for SPS*/ CMCHKUNPK(cmUnpkRgrSpsDlCellCfg, ¶m->spsCfg, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->t300TmrVal, mBuf); - CMCHKPK(SUnpkU16, ¶m->bcchTxPwrOffset, mBuf); - CMCHKPK(SUnpkU16, ¶m->pcchTxPwrOffset, mBuf); - CMCHKPK(SUnpkU16, ¶m->rarTxPwrOffset, mBuf); - CMCHKPK(SUnpkU16, ¶m->phichTxPwrOffset, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isDynCfiEnb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isAutoCfgModeEnb, mBuf); - CMCHKPK(SUnpkU32, (U32*)¶m->msg4pAVal, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t300TmrVal, mBuf); + CMCHKPK(oduPackUInt16, ¶m->bcchTxPwrOffset, mBuf); + CMCHKPK(oduPackUInt16, ¶m->pcchTxPwrOffset, mBuf); + CMCHKPK(oduPackUInt16, ¶m->rarTxPwrOffset, mBuf); + CMCHKPK(oduPackUInt16, ¶m->phichTxPwrOffset, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isDynCfiEnb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAutoCfgModeEnb, mBuf); + CMCHKPK(oduPackUInt32, (U32*)¶m->msg4pAVal, mBuf); /*LAA: Unpack LAA Cell params*/ CMCHKUNPK(cmUnpkRgrLteUCellCfg, ¶m->lteUCfg, mBuf); #ifdef LTE_ADV - CMCHKUNPK(SUnpkU8, ¶m->isPucchFormat3Sptd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPucchFormat3Sptd, mBuf); #endif #ifdef RG_5GTF CMCHKUNPK(cmUnPkRgr5gtfCellCfg, ¶m->Cell5gtfCfg, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -4396,13 +4396,13 @@ Buffer *mBuf; TRC3(cmPkRgrUeAprdDlCqiCfg) /*Pack Aperiodic Trigger List only for Pcell */ #ifdef LTE_ADV - CMCHKPK(SPkU8, param->triggerSet2, mBuf); - CMCHKPK(SPkU8, param->triggerSet1, mBuf); + CMCHKPK(oduUnpackUInt8, param->triggerSet2, mBuf); + CMCHKPK(oduUnpackUInt8, param->triggerSet1, mBuf); #endif - CMCHKPK(SPkU32, param->aprdModeEnum, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->aprdModeEnum, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4438,16 +4438,16 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeAprdDlCqiCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->aprdModeEnum = (RgrAprdCqiMode) tmpEnum; #ifdef LTE_ADV - CMCHKUNPK(SUnpkU8, ¶m->triggerSet1, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->triggerSet2, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->triggerSet1, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->triggerSet2, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -4485,14 +4485,14 @@ Buffer *mBuf; TRC3(cmPkRgrUePrdDlCqiCfg) - CMCHKPK(SPkU16, param->cqiPmiCfgIdx, mBuf); - CMCHKPK(SPkU8, param->k, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiPmiCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->k, mBuf); CMCHKPK(SPkS8, param->cqiOffst, mBuf); - CMCHKPK(SPkU8, param->subframeOffst, mBuf); - CMCHKPK(SPkU32, param->prdicityEnum, mBuf); - CMCHKPK(SPkU32, param->prdModeEnum, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->subframeOffst, mBuf); + CMCHKPK(oduUnpackUInt32, param->prdicityEnum, mBuf); + CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -4528,16 +4528,16 @@ Buffer *mBuf; TRC3(cmUnpkRgrUePrdDlCqiCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->prdModeEnum = tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->prdicityEnum = tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->subframeOffst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->subframeOffst, mBuf); CMCHKUNPK(SUnpkS8, ¶m->cqiOffst, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->k, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiPmiCfgIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->k, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiPmiCfgIdx, mBuf); + return ROK; } @@ -4575,16 +4575,16 @@ Buffer *mBuf; TRC3(cmPkRgrUeDlPCqiSetup) - CMCHKPK(SPkU32, param->prdModeEnum, mBuf); - CMCHKPK(SPkU8, param->sANCQI, mBuf); + CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf); + CMCHKPK(oduUnpackUInt8, param->sANCQI, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKPK(SPkU16, param->riCfgIdx, mBuf); - CMCHKPK(SPkU8, param->riEna, mBuf); - CMCHKPK(SPkU8, param->k, mBuf); - CMCHKPK(SPkU8, param->cqiRepType, mBuf); - CMCHKPK(SPkU16, param->cqiPCfgIdx, mBuf); - CMCHKPK(SPkU16, param->cqiPResIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->riCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->riEna, mBuf); + CMCHKPK(oduUnpackUInt8, param->k, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiRepType, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiPCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt16, param->cqiPResIdx, mBuf); + return ROK; } @@ -4620,17 +4620,17 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeDlPCqiSetup) - CMCHKUNPK(SUnpkU16, ¶m->cqiPResIdx, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->cqiPCfgIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiRepType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->k, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->riEna, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiPResIdx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->cqiPCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiRepType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->k, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->riEna, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKUNPK(SUnpkU16, ¶m->riCfgIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sANCQI, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->riCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sANCQI, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->prdModeEnum = (RgrPrdCqiMode) tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -4666,8 +4666,8 @@ Buffer *mBuf; TRC3(cmPkRgrUePrdDlCqiCfg) CMCHKPK(cmPkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); - CMCHKPK(SPkU8, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->type, mBuf); + return ROK; } @@ -4702,9 +4702,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrUePrdDlCqiCfg) - CMCHKUNPK(SUnpkU8, ¶m->type, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeDlPCqiSetup, ¶m->cqiSetup, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4740,16 +4740,16 @@ Buffer *mBuf; TRC3(cmPkRgrUeUlSrsSetupCfg) - CMCHKPK(SPkU8, param->fDomPosi, mBuf); - CMCHKPK(SPkU8, param->txComb, mBuf); - CMCHKPK(SPkU8, param->sANSrs, mBuf); - CMCHKPK(SPkU8, param->duration, mBuf); - CMCHKPK(SPkU32, param->cycShift, mBuf); - CMCHKPK(SPkU32, param->srsHopBw, mBuf); - CMCHKPK(SPkU32, param->srsBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->fDomPosi, mBuf); + CMCHKPK(oduUnpackUInt8, param->txComb, mBuf); + CMCHKPK(oduUnpackUInt8, param->sANSrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->duration, mBuf); + CMCHKPK(oduUnpackUInt32, param->cycShift, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsHopBw, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsBw, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKPK(SPkU16, param->srsCfgIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->srsCfgIdx, mBuf); + return ROK; } @@ -4787,18 +4787,18 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeUlSrsSetupCfg) /*rgr_c_001.main_9 DEL removed unwanted comments*/ - CMCHKUNPK(SUnpkU16, ¶m->srsCfgIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srsCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->srsBw = (RgrUlSrsBwInfo) tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->srsHopBw = (RgrUlSrsHoBwInfo) tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->cycShift = (RgrUlSrsCycShiftInfo) tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->duration, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sANSrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txComb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->fDomPosi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->duration, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sANSrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txComb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->fDomPosi, mBuf); + return ROK; } @@ -4835,9 +4835,9 @@ Buffer *mBuf; /* ccpu00131601:DEL - dTMax Packing removed since this param will not * be required by Scheduler*/ - CMCHKPK(SPkU8, param->srCfgIdx, mBuf); - CMCHKPK(SPkU16, param->srResIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->srCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt16, param->srResIdx, mBuf); + return ROK; } @@ -4871,11 +4871,11 @@ Buffer *mBuf; { TRC3(cmUnpkRgrUeSrSetupCfg) - CMCHKUNPK(SUnpkU16, ¶m->srResIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->srCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srResIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srCfgIdx, mBuf); /* ccpu00131601:DEL - dTMax UnPacking removed since this param will not * be required by Scheduler*/ - RETVALUE(ROK); + return ROK; } @@ -4911,8 +4911,8 @@ Buffer *mBuf; TRC3(cmPkRgrUeSrCfg) CMCHKPK(cmPkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); - CMCHKPK(SPkU8, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->type, mBuf); + return ROK; } @@ -4947,9 +4947,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeSrCfg) - CMCHKUNPK(SUnpkU8, ¶m->type, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); CMCHKUNPK(cmUnpkRgrUeSrSetupCfg, ¶m->srSetup, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4987,8 +4987,8 @@ Buffer *mBuf; /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKPK(cmPkRgrUeUlSrsSetupCfg, ¶m->srsSetup, mBuf); - CMCHKPK(SPkU8, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->type, mBuf); + return ROK; } @@ -5024,10 +5024,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeUlSrsCfg) - CMCHKUNPK(SUnpkU8, ¶m->type, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); /*rgr_c_001.main_9 DEL removed unwanted comments*/ CMCHKUNPK(cmUnpkRgrUeUlSrsSetupCfg, ¶m->srsSetup, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5075,7 +5075,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUePrdDlCqiCfg, ¶m->prdCqiCfg, mBuf); #endif CMCHKPK(cmPkRgrUeAprdDlCqiCfg, ¶m->aprdCqiCfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5112,7 +5112,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrUeAprdDlCqiCfg, ¶m->aprdCqiCfg, mBuf); CMCHKUNPK(cmUnpkRgrUePrdDlCqiCfg, ¶m->prdCqiCfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5147,10 +5147,10 @@ Buffer *mBuf; TRC3(cmPkRgrUeMeasGapCfg) - CMCHKPK(SPkU8, param->gapOffst, mBuf); - CMCHKPK(SPkU8, param->gapPrd, mBuf); - CMCHKPK(SPkU8, param->isMesGapEnabled, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->gapOffst, mBuf); + CMCHKPK(oduUnpackUInt8, param->gapPrd, mBuf); + CMCHKPK(oduUnpackUInt8, param->isMesGapEnabled, mBuf); + return ROK; } @@ -5185,10 +5185,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeMeasGapCfg) - CMCHKUNPK(SUnpkU8, ¶m->isMesGapEnabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->gapPrd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->gapOffst, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isMesGapEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->gapPrd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->gapOffst, mBuf); + return ROK; } /*rgr_c_001.main_9 ADD DRX functionality under flag*/ @@ -5223,9 +5223,9 @@ Buffer *mBuf; TRC3(cmPkRgrDrxLongCycleOffst) - CMCHKPK(SPkU16, param->drxStartOffst, mBuf); - CMCHKPK(SPkU16, param->longDrxCycle, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->drxStartOffst, mBuf); + CMCHKPK(oduUnpackUInt16, param->longDrxCycle, mBuf); + return ROK; } @@ -5260,9 +5260,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrDrxLongCycleOffst) - CMCHKUNPK(SUnpkU16, ¶m->longDrxCycle, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->drxStartOffst, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->longDrxCycle, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->drxStartOffst, mBuf); + return ROK; } @@ -5297,10 +5297,10 @@ Buffer *mBuf; TRC3(cmPkRgrDrxShortDrx) - CMCHKPK(SPkU8, param->drxShortCycleTmr, mBuf); - CMCHKPK(SPkU16, param->shortDrxCycle, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->drxShortCycleTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->shortDrxCycle, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5335,10 +5335,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrDrxShortDrx) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->shortDrxCycle, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->drxShortCycleTmr, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->shortDrxCycle, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->drxShortCycleTmr, mBuf); + return ROK; } /*********************************************************** @@ -5373,20 +5373,20 @@ Buffer *mBuf; CMCHKPK(cmPkRgrDrxShortDrx, ¶m->drxShortDrx, mBuf); CMCHKPK(cmPkRgrDrxLongCycleOffst, ¶m->drxLongCycleOffst, mBuf); - CMCHKPK(SPkU16, param->drxRetxTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->drxRetxTmr, mBuf); #ifdef EMTC_ENABLE - CMCHKPK(SPkU8, param->drxRetxTmrR13Pres, mBuf); - CMCHKPK(SPkU8, param->drxOnDurTmrR13Pres, mBuf); - CMCHKPK(SPkU16, param->emtcDrxUlRetxTmr, mBuf); - CMCHKPK(SPkU8, param->isEmtcUe, mBuf); + CMCHKPK(oduUnpackUInt8, param->drxRetxTmrR13Pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->drxOnDurTmrR13Pres, mBuf); + CMCHKPK(oduUnpackUInt16, param->emtcDrxUlRetxTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf); #endif - CMCHKPK(SPkU16, param->drxInactvTmr, mBuf); - CMCHKPK(SPkU16, param->drxOnDurTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->drxInactvTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->drxOnDurTmr, mBuf); /*rgr_c_001.main_9 ADD added changes for R9*/ #ifdef LTEMAC_R9 CMCHKPK(cmPkTknS32, ¶m->cqiMask, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -5425,18 +5425,18 @@ Buffer *mBuf; #ifdef LTEMAC_R9 CMCHKUNPK(cmUnpkTknS32, ¶m->cqiMask, mBuf); #endif - CMCHKUNPK(SUnpkU16, ¶m->drxOnDurTmr, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->drxInactvTmr, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->drxOnDurTmr, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->drxInactvTmr, mBuf); #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8, ¶m->isEmtcUe, mBuf); - CMCHKUNPK(SUnpkU16,¶m->emtcDrxUlRetxTmr, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->drxOnDurTmrR13Pres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->drxRetxTmrR13Pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isEmtcUe, mBuf); + CMCHKUNPK(oduPackUInt16,¶m->emtcDrxUlRetxTmr, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->drxOnDurTmrR13Pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->drxRetxTmrR13Pres, mBuf); #endif - CMCHKUNPK(SUnpkU16, ¶m->drxRetxTmr, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->drxRetxTmr, mBuf); CMCHKUNPK(cmUnpkRgrDrxLongCycleOffst, ¶m->drxLongCycleOffst, mBuf); CMCHKUNPK(cmUnpkRgrDrxShortDrx, ¶m->drxShortDrx, mBuf); - RETVALUE(ROK); + return ROK; } /*rgr_c_001.main_9 ADD added DRX changes under DRX*/ @@ -5471,12 +5471,12 @@ Buffer *mBuf; TRC3(cmPkRgrUeCapCfg) - CMCHKPK(SPkU8, param->txAntSel, mBuf); - CMCHKPK(SPkU8, param->simCqiAckNack, mBuf); - CMCHKPK(SPkU8, param->resAloocType1, mBuf); - CMCHKPK(SPkU8, param->intraSfFeqHop, mBuf); - CMCHKPK(SPkU8, param->pwrClass, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->txAntSel, mBuf); + CMCHKPK(oduUnpackUInt8, param->simCqiAckNack, mBuf); + CMCHKPK(oduUnpackUInt8, param->resAloocType1, mBuf); + CMCHKPK(oduUnpackUInt8, param->intraSfFeqHop, mBuf); + CMCHKPK(oduUnpackUInt8, param->pwrClass, mBuf); + return ROK; } @@ -5511,13 +5511,13 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeCapCfg) - CMCHKUNPK(SUnpkU8, ¶m->pwrClass, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->intraSfFeqHop, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->resAloocType1, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->simCqiAckNack, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txAntSel, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pwrClass, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->intraSfFeqHop, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resAloocType1, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->simCqiAckNack, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txAntSel, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5551,10 +5551,10 @@ Buffer *mBuf; TRC3(cmPkRgrUeAckNackRepCfg) - CMCHKPK(SPkU32, param->ackNackRepFactor, mBuf); - CMCHKPK(SPkU16, param->pucchAckNackRep, mBuf); - CMCHKPK(SPkU8, param->isAckNackEnabled, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->ackNackRepFactor, mBuf); + CMCHKPK(oduUnpackUInt16, param->pucchAckNackRep, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAckNackEnabled, mBuf); + return ROK; } @@ -5590,11 +5590,11 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeAckNackRepCfg) - CMCHKUNPK(SUnpkU8, ¶m->isAckNackEnabled, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->pucchAckNackRep, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAckNackEnabled, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->pucchAckNackRep, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ackNackRepFactor = (RgrAckNackRepFactor) tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -5629,11 +5629,11 @@ Buffer *mBuf; TRC3(cmPkRgrUeTxModeCfg) - CMCHKPK(SPkU32, param->txModeEnum, mBuf); - CMCHKPK(SPkU32, param->tmTrnstnState, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); + CMCHKPK(oduUnpackUInt32, param->txModeEnum, mBuf); + CMCHKPK(oduUnpackUInt32, param->tmTrnstnState, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5669,13 +5669,13 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeTxModeCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->tmTrnstnState = (RgrTxModeTrnstn) tmpEnum; - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->txModeEnum = (RgrTxMode) tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -5710,9 +5710,9 @@ Buffer *mBuf; TRC3(cmPkRgrUeUlHqCfg) - CMCHKPK(SPkU8, param->deltaHqOffst, mBuf); - CMCHKPK(SPkU8, param->maxUlHqTx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->deltaHqOffst, mBuf); + CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf); + return ROK; } @@ -5747,9 +5747,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeUlHqCfg) - CMCHKUNPK(SUnpkU8, ¶m->maxUlHqTx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->deltaHqOffst, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->maxUlHqTx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->deltaHqOffst, mBuf); + return ROK; } @@ -5784,10 +5784,10 @@ Buffer *mBuf; TRC3(cmPkRgrUeGrpPwrCfg) - CMCHKPK(SPkU8, param->idx, mBuf); + CMCHKPK(oduUnpackUInt8, param->idx, mBuf); CMCHKPK(cmPkLteRnti, param->tpcRnti, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -5822,10 +5822,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeGrpPwrCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->tpcRnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->idx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->idx, mBuf); + return ROK; } /*rgr_c_001.main_7 - Added support for SPS*/ @@ -5861,15 +5861,15 @@ Buffer *mBuf; S32 i; TRC3(cmPkRgrUeSpsDlCfg) - CMCHKPK(SPkU16, param->explicitRelCnt, mBuf); - CMCHKPK(SPkU32, param->dlSpsPrdctyEnum, mBuf); + CMCHKPK(oduUnpackUInt16, param->explicitRelCnt, mBuf); + CMCHKPK(oduUnpackUInt32, param->dlSpsPrdctyEnum, mBuf); for (i=param->numPucchVal-1; i >= 0; i--) { - CMCHKPK(SPkU32, param->n1PucchVal[i], mBuf); + CMCHKPK(oduUnpackUInt32, param->n1PucchVal[i], mBuf); } - CMCHKPK(SPkU8, param->numPucchVal, mBuf); - CMCHKPK(SPkU8, param->numSpsHqProc, mBuf); - CMCHKPK(SPkU8, param->isDlSpsEnabled, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numPucchVal, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSpsHqProc, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDlSpsEnabled, mBuf); + return ROK; } @@ -5906,16 +5906,16 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkRgrUeSpsDlCfg) - CMCHKUNPK(SUnpkU8, ¶m->isDlSpsEnabled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSpsHqProc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numPucchVal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isDlSpsEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSpsHqProc, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numPucchVal, mBuf); for (i=0; inumPucchVal; i++) { - CMCHKUNPK(SUnpkU32, ¶m->n1PucchVal[i], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->n1PucchVal[i], mBuf); } - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->dlSpsPrdctyEnum = tmpEnum; - CMCHKUNPK(SUnpkU16, ¶m->explicitRelCnt, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->explicitRelCnt, mBuf); + return ROK; } @@ -5951,26 +5951,26 @@ Buffer *mBuf; S32 i; TRC3(cmPkRgrUeSpsUlCfg) - CMCHKPK(SPkU8, param->isLcSRMaskEnab, mBuf); + CMCHKPK(oduUnpackUInt8, param->isLcSRMaskEnab, mBuf); for (i=param->lcCnt-1; i >= 0; i--) { /* SPS Changes starts */ - CMCHKPK(SPkU8, param->spsLcInfo[i].isSpsEnabled, mBuf); - CMCHKPK(SPkU8, param->spsLcInfo[i].lcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->spsLcInfo[i].isSpsEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->spsLcInfo[i].lcId, mBuf); /* SPS Changes ends */ } - CMCHKPK(SPkU8, param->lcCnt, mBuf); - CMCHKPK(SPkU32, param->ulSpsPrdctyEnum, mBuf); + CMCHKPK(oduUnpackUInt8, param->lcCnt, mBuf); + CMCHKPK(oduUnpackUInt32, param->ulSpsPrdctyEnum, mBuf); CMCHKPK(SPkS8, param->pwrCfg.p0UePuschVal, mBuf); CMCHKPK(SPkS8, param->pwrCfg.p0NominalPuschVal, mBuf); - CMCHKPK(SPkU8, param->pwrCfgPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->pwrCfgPres, mBuf); #ifdef LTE_TDD - CMCHKPK(SPkU8, param->twoIntervalCfg, mBuf); + CMCHKPK(oduUnpackUInt8, param->twoIntervalCfg, mBuf); #endif - CMCHKPK(SPkU32, param->implicitRelCnt, mBuf); - CMCHKPK(SPkU8, param->isUlSpsEnabled, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->implicitRelCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->isUlSpsEnabled, mBuf); + return ROK; } @@ -6007,26 +6007,26 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkRgrUeSpsUlCfg) - CMCHKUNPK(SUnpkU8, ¶m->isUlSpsEnabled, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isUlSpsEnabled, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->implicitRelCnt = tmpEnum; #ifdef LTE_TDD - CMCHKUNPK(SUnpkU8, ¶m->twoIntervalCfg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->twoIntervalCfg, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->pwrCfgPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pwrCfgPres, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pwrCfg.p0NominalPuschVal, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pwrCfg.p0UePuschVal, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ulSpsPrdctyEnum = tmpEnum; - CMCHKUNPK(SUnpkU8, ¶m->lcCnt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcCnt, mBuf); for (i=0; ilcCnt; i++) { - CMCHKUNPK(SUnpkU8, ¶m->spsLcInfo[i].lcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->spsLcInfo[i].isSpsEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->spsLcInfo[i].lcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->spsLcInfo[i].isSpsEnabled, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isLcSRMaskEnab, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isLcSRMaskEnab, mBuf); + return ROK; } @@ -6064,7 +6064,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeSpsUlCfg, ¶m->ulSpsCfg, mBuf); CMCHKPK(cmPkRgrUeSpsDlCfg, ¶m->dlSpsCfg, mBuf); CMCHKPK(cmPkLteRnti, param->spsRnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6102,7 +6102,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->spsRnti, mBuf); CMCHKUNPK(cmUnpkRgrUeSpsDlCfg, ¶m->dlSpsCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeSpsUlCfg, ¶m->ulSpsCfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6136,15 +6136,15 @@ Buffer *mBuf; TRC3(cmPkRgrUeUlPwrCfg) - CMCHKPK(SPkU8, param->trgCqi, mBuf); - CMCHKPK(SPkU8, param->pSRSOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePucch, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); - CMCHKPK(SPkU8, param->isDeltaMCSEnabled, mBuf); - CMCHKPK(SPkU8, param->isAccumulated, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf); CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); CMCHKPK(cmPkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6181,13 +6181,13 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePuschPwr, mBuf); CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, ¶m->uePucchPwr, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isAccumulated, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isDeltaMCSEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); CMCHKUNPK(SUnpkS8, ¶m->p0UePusch, mBuf); CMCHKUNPK(SUnpkS8, ¶m->p0UePucch, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pSRSOffset, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->trgCqi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->pSRSOffset, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); + return ROK; } @@ -6222,10 +6222,10 @@ Buffer *mBuf; TRC3(cmPkRgrUeQosCfg) - CMCHKPK(SPkU32, param->ueBr, mBuf); - CMCHKPK(SPkU32, param->dlAmbr, mBuf); - CMCHKPK(SPkU8, param->ambrPres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->ueBr, mBuf); + CMCHKPK(oduUnpackUInt32, param->dlAmbr, mBuf); + CMCHKPK(oduUnpackUInt8, param->ambrPres, mBuf); + return ROK; } @@ -6260,10 +6260,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeQosCfg) - CMCHKUNPK(SUnpkU8, ¶m->ambrPres, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->dlAmbr, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->ueBr, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ambrPres, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->dlAmbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->ueBr, mBuf); + return ROK; } /*********************************************************** @@ -6296,11 +6296,11 @@ Buffer *mBuf; TRC3(cmPkRgrUePuschDedCfg) - CMCHKPK(SPkU8, param->bCQIIdx, mBuf); - CMCHKPK(SPkU8, param->bRIIdx, mBuf); - CMCHKPK(SPkU8, param->bACKIdx, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->bCQIIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->bRIIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->bACKIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6335,11 +6335,11 @@ Buffer *mBuf; TRC3(cmUnpkRgrUePuschDedCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bACKIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bRIIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bCQIIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bACKIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bRIIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bCQIIdx, mBuf); + return ROK; } /*********************************************************** @@ -6372,9 +6372,9 @@ Buffer *mBuf; TRC3(cmPkRgrUeTxAntSelCfg) - CMCHKPK(SPkU32, param->selType, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->selType, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6410,10 +6410,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeTxAntSelCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->selType = (RgrUeTxAntSelType) tmpEnum; - RETVALUE(ROK); + return ROK; } @@ -6447,9 +6447,9 @@ Buffer *mBuf; TRC3(cmPkRgrUeTaTmrCfg) - CMCHKPK(SPkU16, param->taTmr, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->taTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -6484,9 +6484,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeTaTmrCfg) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->taTmr, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->taTmr, mBuf); + return ROK; } @@ -6509,45 +6509,45 @@ Buffer *mBuf; RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); RgrEpdcchAddModLst *epdcchAddModLst; - CMCHKUNPK(SUnpkU8,¶m->pdschReptLevModeA,mBuf); + CMCHKUNPK(oduPackUInt8,¶m->pdschReptLevModeA,mBuf); /*UnPacking PUCCH Rep */ - CMCHKUNPK(SUnpkU8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf); - CMCHKUNPK(SUnpkU8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf); - CMCHKUNPK(SUnpkU8,&(emtcPucchRepCfg->isPucchRepPres),mBuf); + CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf); + CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf); + CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->isPucchRepPres),mBuf); for(indx = 0; indx < RGR_MAX_EPDCCH_SET; indx++) { epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - CMCHKUNPK(SUnpkU32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf); - CMCHKUNPK(SUnpkU16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf); - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf); - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf); - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf); - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->extaddgrp2.pres),mBuf); + CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf); + CMCHKUNPK(oduPackUInt16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf); CMCHKUNPK(cmUnpkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); CMCHKUNPK(cmUnpkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); - CMCHKUNPK(SUnpkU32,&(epdcchAddModLst->pucchResStartoffset),mBuf); - CMCHKUNPK(SUnpkU32,&(epdcchAddModLst->dmrsScrambSeq),mBuf); + CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf); + CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf); for(idx = 0; idx < 5; idx++) { - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf); } - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf); - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->transmissionType),mBuf); - CMCHKUNPK(SUnpkU8,&(epdcchAddModLst->setConfigId),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->transmissionType),mBuf); + CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->setConfigId),mBuf); } CMCHKUNPK(cmUnpkTknU32,&(emtcEpdcchCfg->startSymbolr11),mBuf); for(indx = 0; indx < 5; indx++) { - CMCHKUNPK(SUnpkU8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf); + CMCHKUNPK(oduPackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf); } - CMCHKUNPK(SUnpkU8, &(emtcEpdcchCfg->sfPtn.pres), mBuf); - CMCHKUNPK(SUnpkU8, &(param->pres), mBuf); - CMCHKUNPK(SUnpkU8, &(param->isHdFddEnbld), mBuf); + CMCHKUNPK(oduPackUInt8, &(emtcEpdcchCfg->sfPtn.pres), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->pres), mBuf); + CMCHKUNPK(oduPackUInt8, &(param->isHdFddEnbld), mBuf); #ifdef EMTC_DEBUG_CONSOLE_PRINTS printf("\n EMTC RGR UE unpack\n"); @@ -6588,7 +6588,7 @@ Buffer *mBuf; #endif - RETVALUE(ROK); + return ROK; } @@ -6605,42 +6605,42 @@ PUBLIC S16 cmPkRgrEmtcUeCfg RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg); RgrEpdcchAddModLst *epdcchAddModLst; - CMCHKPK(SPkU8, param->isHdFddEnbld, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - CMCHKPK(SPkU8, emtcEpdcchCfg->sfPtn.pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + CMCHKPK(oduUnpackUInt8, emtcEpdcchCfg->sfPtn.pres, mBuf); for(indx = 4; indx >=0; indx--) { - CMCHKPK(SPkU8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf); + CMCHKPK(oduUnpackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf); } CMCHKPK(cmPkTknU32,&emtcEpdcchCfg->startSymbolr11,mBuf); for(indx = RGR_MAX_EPDCCH_SET-1 ; indx >= 0; indx--) { epdcchAddModLst = &(emtcEpdcchCfg->epdcchAddModLst[indx]); - CMCHKPK(SPkU8,epdcchAddModLst->setConfigId,mBuf); - CMCHKPK(SPkU8,epdcchAddModLst->transmissionType,mBuf); - CMCHKPK(SPkU8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->setConfigId,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->transmissionType,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf); for(idx = 4; idx >= 0; idx--) { - CMCHKPK(SPkU8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf); } - CMCHKPK(SPkU32,epdcchAddModLst->dmrsScrambSeq,mBuf); - CMCHKPK(SPkU32,epdcchAddModLst->pucchResStartoffset,mBuf); + CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf); + CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf); CMCHKPK(cmPkTknU32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf); CMCHKPK(cmPkTknU8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf); - CMCHKPK(SPkU8,epdcchAddModLst->extaddgrp2.pres,mBuf); - CMCHKPK(SPkU8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf); - CMCHKPK(SPkU8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf); - CMCHKPK(SPkU8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf); - CMCHKPK(SPkU16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf); - CMCHKPK(SPkU32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf); + CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf); + CMCHKPK(oduUnpackUInt16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf); + CMCHKPK(oduUnpackUInt32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf); } /*Packing PUCCH Rep */ - CMCHKPK(SPkU8,emtcPucchRepCfg->isPucchRepPres, mBuf); - CMCHKPK(SPkU8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf); - CMCHKPK(SPkU8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf); - CMCHKPK(SPkU8,param->pdschReptLevModeA,mBuf); + CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->isPucchRepPres, mBuf); + CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf); + CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf); + CMCHKPK(oduUnpackUInt8,param->pdschReptLevModeA,mBuf); #ifdef EMTC_DEBUG_CONSOLE_PRINTS printf("\n EMTC RGR UE pack\n"); @@ -6683,7 +6683,7 @@ PUBLIC S16 cmPkRgrEmtcUeCfg - RETVALUE(ROK); + return ROK; } #endif @@ -6694,12 +6694,12 @@ PUBLIC S16 cmUnpkRgr5gtfUeCfg Buffer *mBuf ) { - CMCHKUNPK(SUnpkU8, ¶m->grpId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->BeamId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numCC, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->maxPrb, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->grpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->BeamId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCC, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->maxPrb, mBuf); + return ROK; } PUBLIC S16 cmPkRgr5gtfUeCfg @@ -6708,12 +6708,12 @@ PUBLIC S16 cmPkRgr5gtfUeCfg Buffer *mBuf ) { - CMCHKPK(SPkU8, param->maxPrb, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->numCC, mBuf); - CMCHKPK(SPkU8, param->BeamId, mBuf); - CMCHKPK(SPkU8, param->grpId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->maxPrb, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCC, mBuf); + CMCHKPK(oduUnpackUInt8, param->BeamId, mBuf); + CMCHKPK(oduUnpackUInt8, param->grpId, mBuf); + return ROK; } #endif @@ -6753,9 +6753,9 @@ Buffer *mBuf; #ifdef EMTC_ENABLE CMCHKPK(cmPkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); #endif - CMCHKPK(SPkU8, param->csgMmbrSta, mBuf); + CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf); - CMCHKPK(SPkU32, param->accessStratumRls, mBuf); + CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ CMCHKPK(cmPkRgrLteAdvancedUeConfig, ¶m->ueLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ @@ -6775,7 +6775,7 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKPK(SPkU8, param->isHdFddEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); #endif #ifdef TFU_UPGRADE @@ -6788,7 +6788,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeSpsCfg, ¶m->ueSpsCfg, mBuf); #ifdef LTE_TDD - CMCHKPK(SPkU32, param->ackNackModeEnum, mBuf); + CMCHKPK(oduUnpackUInt32, param->ackNackModeEnum, mBuf); #endif CMCHKPK(cmPkTknU8, ¶m->dedPreambleId, mBuf); @@ -6796,7 +6796,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeCapCfg, ¶m->ueCapCfg, mBuf); CMCHKPK(cmPkRgrUeMeasGapCfg, ¶m->ueMesGapCfg, mBuf); CMCHKPK(cmPkRgrUeAckNackRepCfg, ¶m->ueAckNackCfg, mBuf); - CMCHKPK(SPkU8, param->isTtiBundlEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->isTtiBundlEnabled, mBuf); /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Pack only if DRX is enabled */ @@ -6804,9 +6804,9 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); } - CMCHKPK(SPkU8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if + CMCHKPK(oduUnpackUInt8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if DRX is disabled */ - CMCHKPK(SPkU32, param->ueCatEnum, mBuf); + CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf); #ifdef RGR_V1 /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and * retxBSR-timer */ @@ -6820,7 +6820,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeTxModeCfg, ¶m->txMode, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6869,17 +6869,17 @@ Buffer *mBuf; * retxBSR-timer */ CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, ¶m->ueBsrTmrCfg, mBuf); #endif - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ueCatEnum = (CmLteUeCategory) tmpEnum; /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Unpack only if DRX is enabled */ - CMCHKUNPK(SUnpkU8, ¶m->ueDrxCfg.isDrxEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ueDrxCfg.isDrxEnabled, mBuf); if(TRUE == param->ueDrxCfg.isDrxEnabled) { CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxCfg, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isTtiBundlEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isTtiBundlEnabled, mBuf); CMCHKUNPK(cmUnpkRgrUeAckNackRepCfg, ¶m->ueAckNackCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, ¶m->ueMesGapCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeCapCfg, ¶m->ueCapCfg, mBuf); @@ -6887,7 +6887,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTknU8, ¶m->dedPreambleId, mBuf); #ifdef LTE_TDD - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ackNackModeEnum = tmpEnum; #endif @@ -6901,7 +6901,7 @@ Buffer *mBuf; #endif /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKUNPK(SUnpkU8, ¶m->isHdFddEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isHdFddEnbld, mBuf); #endif CMCHKUNPK(cmUnpkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); @@ -6916,8 +6916,8 @@ Buffer *mBuf; /* LTE_ADV_FLAG_REMOVED_START */ CMCHKUNPK(cmUnpkRgrLteAdvancedUeConfig, ¶m->ueLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKUNPK(SUnpkU32, (U32 *)¶m->accessStratumRls, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->csgMmbrSta, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->accessStratumRls, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->csgMmbrSta, mBuf); #ifdef EMTC_ENABLE CMCHKUNPK(cmUnpkRgrEmtcUeCfg, ¶m->emtcUeCfg, mBuf); @@ -6927,7 +6927,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgr5gtfUeCfg, ¶m->ue5gtfCfg, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -6962,10 +6962,10 @@ Buffer *mBuf; TRC3(cmPkRgrLchQosCfg) - CMCHKPK(SPkU32, param->mbr, mBuf); - CMCHKPK(SPkU32, param->gbr, mBuf); - CMCHKPK(SPkU8, param->qci, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + return ROK; } @@ -7000,10 +7000,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrLchQosCfg) - CMCHKUNPK(SUnpkU8, ¶m->qci, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->gbr, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->mbr, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); + return ROK; } /*rgr_c_001.main_7 - Added support for SPS*/ @@ -7039,8 +7039,8 @@ Buffer *mBuf; TRC3(cmPkRgrLchSpsCfg) /* SPS_DEV */ - CMCHKPK(SPkU8, param->isSpsEnabled, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf); + return ROK; } @@ -7075,9 +7075,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrLchSpsCfg) - CMCHKUNPK(SUnpkU8, ¶m->isSpsEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSpsEnabled, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7112,11 +7112,11 @@ Buffer *mBuf; TRC3(cmPkRgrDlLchCfg) /*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(SPkU8, param->rlcReorderTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf); CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); CMCHKPK(cmPkRgrLchQosCfg, ¶m->dlQos, mBuf); - CMCHKPK(SPkU8, param->dlTrchType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); + return ROK; } @@ -7151,13 +7151,13 @@ Buffer *mBuf; TRC3(cmUnpkRgrDlLchCfg) - CMCHKUNPK(SUnpkU8, ¶m->dlTrchType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); CMCHKUNPK(cmUnpkRgrLchQosCfg, ¶m->dlQos, mBuf); /*rgr_c_001.main_7 - Added support for SPs*/ CMCHKUNPK(cmUnpkRgrLchSpsCfg, ¶m->dlSpsCfg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rlcReorderTmr, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rlcReorderTmr, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7195,9 +7195,9 @@ Buffer *mBuf; TRC3(cmPkRgrUlLchCfg) - CMCHKPK(SPkU8, param->qci, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7234,8 +7234,8 @@ Buffer *mBuf; TRC3(cmUnpkRgrUlLchCfg) CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->qci, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); + return ROK; } @@ -7274,8 +7274,8 @@ Buffer *mBuf; S32 i; #endif TRC3(cmPkRgrUlLcgCfg) - CMCHKPK(SPkU32, param->mbr, mBuf); - CMCHKPK(SPkU32, param->gbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->mbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->gbr, mBuf); /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ #ifdef LTE_L2_MEAS @@ -7283,10 +7283,10 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUlLchCfg, ¶m->lchUlCfg[i], mBuf); } - CMCHKPK(SPkU8, param->numLch, mBuf); + CMCHKPK(oduUnpackUInt8, param->numLch, mBuf); #endif - CMCHKPK(SPkU8, param->lcgId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + return ROK; } @@ -7325,19 +7325,19 @@ Buffer *mBuf; #endif TRC3(cmUnpkRgrUlLcgCfg) - CMCHKUNPK(SUnpkU8, ¶m->lcgId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ #ifdef LTE_L2_MEAS - CMCHKUNPK(SUnpkU8, ¶m->numLch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numLch, mBuf); for (i = 0; i< param->numLch; i++) { CMCHKUNPK(cmUnpkRgrUlLchCfg, ¶m->lchUlCfg[i], mBuf); } #endif - CMCHKUNPK(SUnpkU32, ¶m->gbr, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->mbr, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->gbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->mbr, mBuf); + return ROK; } #ifdef ANSI @@ -7352,10 +7352,10 @@ RgrUlLchQciCfg *param; Buffer *mBuf; #endif { - CMCHKPK(SPkU8, param->lcId, mBuf); - CMCHKPK(SPkU8, param->qci, mBuf); - CMCHKPK(SPkU8, param->lcgId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->lcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->qci, mBuf); + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); + return ROK; } #ifdef ANSI PUBLIC S16 cmUnpkRgrUlLchQciCfg @@ -7369,10 +7369,10 @@ RgrUlLchQciCfg *param; Buffer *mBuf; #endif { - CMCHKUNPK(SUnpkU8, ¶m->lcgId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->qci, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->lcId, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcId, mBuf); + return ROK; } @@ -7405,14 +7405,14 @@ Buffer *mBuf; { TRC3(cmPkRgrLchCfg) - CMCHKPK(SPkU8, param->lcgId, mBuf); + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); CMCHKPK(cmPkRgrDlLchCfg, ¶m->dlInfo, mBuf); CMCHKPK(cmPkLteLcType, param->lcType, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7453,8 +7453,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); CMCHKUNPK(cmUnpkRgrDlLchCfg, ¶m->dlInfo, mBuf); CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->lcgId, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + return ROK; } @@ -7476,7 +7476,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUlLcgCfg, ¶m->ulInfo, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7498,7 +7498,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkRgrUlLcgCfg, ¶m->ulInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7550,10 +7550,10 @@ Buffer *mBuf; CMCHKPK(cmPkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->cfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf); + return ROK; } @@ -7588,7 +7588,7 @@ Buffer *mBuf; TRC3(cmUnpkRgrCfg) - CMCHKUNPK(SUnpkU8, ¶m->cfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { case MAC_GNB_CFG: CMCHKUNPK(cmUnpkMacSchedGnbCfg, ¶m->u.schedGnbCfg, mBuf); @@ -7606,9 +7606,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrLcgCfg, ¶m->u.lcgCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7644,8 +7644,8 @@ Buffer *mBuf; TRC3(cmPkRgrActvTime) CMCHKPK(cmPkLteTimingInfo, ¶m->actvTime, mBuf); - CMCHKPK(SPkU8, param->pres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pres, mBuf); + return ROK; } @@ -7680,9 +7680,9 @@ Buffer *mBuf; TRC3(cmUnpkRgrActvTime) - CMCHKUNPK(SUnpkU8, ¶m->pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->actvTime, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7718,12 +7718,12 @@ Buffer *mBuf; TRC3(cmPkRgrCellRecfg) CMCHKPK(cmPkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); CMCHKPK(cmPkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); - CMCHKPK(SPkU8, param->isDynCfiEnb, mBuf); - CMCHKPK(SPkU8, param->isAutoCfgModeEnb, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ CMCHKPK(cmPkRgrCellLteAdvancedFeatureCfg, ¶m->rgrLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKPK(SPkU16, param->t300TmrVal, mBuf); + CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf); /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ #ifdef RGR_SI_SCH CMCHKPK(cmPkRgrSiCfg, ¶m->siReCfg, mBuf); @@ -7739,9 +7739,9 @@ Buffer *mBuf; CMCHKPK(cmPkRgrCfiCfg, ¶m->cfiRecfg, mBuf); CMCHKPK(cmPkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); CMCHKPK(cmPkRgrActvTime, ¶m->recfgActvTime, mBuf); - CMCHKPK(SPkU32, param->recfgTypes, mBuf); + CMCHKPK(oduUnpackUInt32, param->recfgTypes, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7777,7 +7777,7 @@ Buffer *mBuf; TRC3(cmUnpkRgrCellRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->recfgTypes, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->recfgTypes, mBuf); CMCHKUNPK(cmUnpkRgrActvTime, ¶m->recfgActvTime, mBuf); CMCHKUNPK(cmUnpkRgrDlHqCfg, ¶m->dlHqRecfg, mBuf); CMCHKUNPK(cmUnpkRgrCfiCfg, ¶m->cfiRecfg, mBuf); @@ -7793,16 +7793,16 @@ Buffer *mBuf; #ifdef RGR_SI_SCH CMCHKUNPK(cmUnpkRgrSiCfg, ¶m->siReCfg, mBuf); #endif /* RGR_SI_SCH */ - CMCHKUNPK(SUnpkU16, ¶m->t300TmrVal, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t300TmrVal, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ CMCHKUNPK(cmUnpkRgrCellLteAdvancedFeatureCfg, ¶m->rgrLteAdvCfg, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKUNPK(SUnpkU8, ¶m->isAutoCfgModeEnb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isDynCfiEnb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAutoCfgModeEnb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isDynCfiEnb, mBuf); CMCHKUNPK(cmUnpkRgrCellCsgParamCfg, ¶m->csgParamCfg, mBuf); CMCHKUNPK(cmUnpkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7839,20 +7839,20 @@ Buffer *mBuf; #ifdef EMTC_ENABLE /* Note: As we add more members to emtcUeRecfg, create a new function for pkUnpk */ - CMCHKPK(SPkU8, param->emtcUeRecfg.isHdFddEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcUeRecfg.isHdFddEnbld, mBuf); #endif - CMCHKPK(SPkU8, param->csgMmbrSta, mBuf); + CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf); - CMCHKPK(SPkU32, param->accessStratumRls, mBuf); + CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf); #ifdef LTE_ADV - CMCHKPK(SPkU8, param->simulAckNackCQIFormat3, mBuf); + CMCHKPK(oduUnpackUInt8, param->simulAckNackCQIFormat3, mBuf); CMCHKPK(cmPkRgrUeSCellAckPucchCfg, ¶m->sCellAckN1ResCfg,mBuf); CMCHKPK(cmPkRgrUeSecCellInfo, ¶m->ueSCellCfgInfo,mBuf); #endif /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(SPkU8, param->ueLteAdvCfg.isUeCellEdge, mBuf); - CMCHKPK(SPkU8, param->ueLteAdvCfg.isAbsUe, mBuf); - CMCHKPK(SPkU32, param->ueLteAdvCfg.pres, mBuf); + CMCHKPK(oduUnpackUInt8, param->ueLteAdvCfg.isUeCellEdge, mBuf); + CMCHKPK(oduUnpackUInt8, param->ueLteAdvCfg.isAbsUe, mBuf); + CMCHKPK(oduUnpackUInt32, param->ueLteAdvCfg.pres, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ /*ccpu00130497: Removed the duplicate packing*/ #ifdef TFU_UPGRADE @@ -7869,7 +7869,7 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKPK(SPkU8, param->isHdFddEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf); #endif #ifdef TFU_UPGRADE @@ -7883,13 +7883,13 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */ - CMCHKPK(SPkU32, param->ueCatEnum, mBuf); + CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf); CMCHKPK(cmPkRgrCodeBookRstCfg, ¶m->ueCodeBookRstRecfg, mBuf); CMCHKPK(cmPkRgrUeMeasGapCfg, ¶m->ueMeasGapRecfg, mBuf); CMCHKPK(cmPkRgrUeCapCfg, ¶m->ueCapRecfg, mBuf); CMCHKPK(cmPkRgrUeAckNackRepCfg, ¶m->ueAckNackRecfg, mBuf); - CMCHKPK(SPkU8, param->isTtiBundlEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->isTtiBundlEnabled, mBuf); /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Pack only if DRX is enabled */ @@ -7897,7 +7897,7 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); } - CMCHKPK(SPkU8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if + CMCHKPK(oduUnpackUInt8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if DRX is disabled */ CMCHKPK(cmPkRgrUeUlPwrCfg, ¶m->ueUlPwrRecfg, mBuf); #ifdef RGR_V1 @@ -7918,12 +7918,12 @@ Buffer *mBuf; /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */ /* LTE_ADV_FLAG_REMOVED_START */ /* KW fix for LTE_ADV */ - CMCHKPK(SPkU32, param->ueRecfgTypes, mBuf); + CMCHKPK(oduUnpackUInt32, param->ueRecfgTypes, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ CMCHKPK(cmPkLteRnti, param->newCrnti, mBuf); CMCHKPK(cmPkLteRnti, param->oldCrnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7965,7 +7965,7 @@ Buffer *mBuf; /* LTE_ADV_FLAG_REMOVED_START */ /*rgr_c_001.main_9: changing ueRecfgTypes to U32 */ /* KW fix for LTE_ADV */ - CMCHKUNPK(SUnpkU32, ¶m->ueRecfgTypes, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->ueRecfgTypes, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ CMCHKUNPK(cmUnpkRgrUeTxModeCfg, ¶m->txMode, mBuf); @@ -7987,18 +7987,18 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for DRX*/ /* Anshika - Unpack only if DRX is enabled */ - CMCHKUNPK(SUnpkU8, ¶m->ueDrxRecfg.isDrxEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ueDrxRecfg.isDrxEnabled, mBuf); if(TRUE == param->ueDrxRecfg.isDrxEnabled) { CMCHKUNPK(cmUnpkRgrUeDrxCfg, ¶m->ueDrxRecfg, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isTtiBundlEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isTtiBundlEnabled, mBuf); CMCHKUNPK(cmUnpkRgrUeAckNackRepCfg, ¶m->ueAckNackRecfg, mBuf); CMCHKUNPK(cmUnpkRgrUeCapCfg, ¶m->ueCapRecfg, mBuf); CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, ¶m->ueMeasGapRecfg, mBuf); CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, ¶m->ueCodeBookRstRecfg, mBuf); /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */ - CMCHKUNPK(SUnpkU32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); param->ueCatEnum = (CmLteUeCategory) tmpEnum; CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, ¶m->ulTxAntSel, mBuf); /*rgr_c_001.main_7 - Added support for SPS*/ @@ -8013,7 +8013,7 @@ Buffer *mBuf; /*rgr_c_001.main_9 ADD added changes for HDFDD*/ #ifdef LTEMAC_HDFDD - CMCHKUNPK(SUnpkU8, ¶m->isHdFddEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isHdFddEnbld, mBuf); #endif CMCHKUNPK(cmUnpkRgrUePuschDedCfg, ¶m->puschDedCfg, mBuf); @@ -8028,23 +8028,23 @@ Buffer *mBuf; #endif /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKUNPK(SUnpkU32, ¶m->ueLteAdvCfg.pres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ueLteAdvCfg.isAbsUe, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ueLteAdvCfg.isUeCellEdge, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->ueLteAdvCfg.pres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ueLteAdvCfg.isAbsUe, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ueLteAdvCfg.isUeCellEdge, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ #ifdef LTE_ADV CMCHKUNPK(cmUnpkRgrUeSecCellInfo, ¶m->ueSCellCfgInfo,mBuf); CMCHKUNPK(cmUnpkRgrUeSCellAckPucchCfg, ¶m->sCellAckN1ResCfg,mBuf); - CMCHKUNPK(SUnpkU8, ¶m->simulAckNackCQIFormat3, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->simulAckNackCQIFormat3, mBuf); #endif - CMCHKUNPK(SUnpkU32, (U32 *)¶m->accessStratumRls, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->accessStratumRls, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->csgMmbrSta, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->csgMmbrSta, mBuf); #ifdef EMTC_ENABLE - CMCHKPK(SUnpkU8, ¶m->emtcUeRecfg.isHdFddEnbld, mBuf); + CMCHKPK(oduPackUInt8, ¶m->emtcUeRecfg.isHdFddEnbld, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -8079,7 +8079,7 @@ Buffer *mBuf; TRC3(cmPkRgrLchRecfg) /*rgr_c_001.main_7 - Added support for SPS*/ - CMCHKPK(SPkU8, param->lcgId, mBuf); + CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); CMCHKPK(cmPkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); CMCHKPK(cmPkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); @@ -8088,7 +8088,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteLcId, param->lcId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8131,8 +8131,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrLchSpsCfg, ¶m->dlRecfg.dlSpsRecfg, mBuf); CMCHKUNPK(cmUnpkRgrUlLchQciCfg, ¶m->ulLchQciInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->lcgId, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); + return ROK; } @@ -8153,19 +8153,19 @@ Buffer *mBuf; #endif TRC3(cmPkRgrLcgRecfg) - CMCHKPK(SPkU32, param->ulRecfg.mbr, mBuf); - CMCHKPK(SPkU32, param->ulRecfg.gbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->ulRecfg.mbr, mBuf); + CMCHKPK(oduUnpackUInt32, param->ulRecfg.gbr, mBuf); #ifdef RG_UNUSED for (i = param->ulRecfg.numLch - 1; i >= 0; i--) { CMCHKPK(cmPkRgrUlLchCfg, ¶m->ulRecfg.lchUlCfg[i], mBuf); } - CMCHKPK(SPkU8, param->ulRecfg.numLch, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulRecfg.numLch, mBuf); #endif - CMCHKPK(SPkU8, param->ulRecfg.lcgId, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8188,19 +8188,19 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulRecfg.lcgId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.lcgId, mBuf); #ifdef RG_UNUSED - CMCHKUNPK(SUnpkU8, ¶m->ulRecfg.numLch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulRecfg.numLch, mBuf); for (i = 0; i < param->ulRecfg.numLch; i++) { CMCHKUNPK(cmUnpkRgrUlLchCfg, ¶m->ulRecfg.lchUlCfg[i], mBuf); } #endif - CMCHKUNPK(SUnpkU32, ¶m->ulRecfg.gbr, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->ulRecfg.mbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->ulRecfg.gbr, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->ulRecfg.mbr, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8249,10 +8249,10 @@ Buffer *mBuf; CMCHKPK(cmPkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->recfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->recfgType, mBuf); + return ROK; } @@ -8287,7 +8287,7 @@ Buffer *mBuf; TRC3(cmUnpkRgrRecfg) - CMCHKUNPK(SUnpkU8, ¶m->recfgType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); switch(param->recfgType) { case RGR_CELL_CFG: CMCHKUNPK(cmUnpkRgrCellRecfg, ¶m->u.cellRecfg, mBuf); @@ -8302,9 +8302,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrLcgRecfg, ¶m->u.lcgRecfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #ifdef LTE_ADV @@ -8335,9 +8335,9 @@ RgrUeDlSecCellRelInfo *param; Buffer *mBuf; #endif { - CMCHKPK(SPkU16, param->sCellId, mBuf); - CMCHKPK(SPkU8, param->sCellIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); + return ROK; } /*********************************************************** @@ -8372,9 +8372,9 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[(U8)idx],mBuf); } - CMCHKPK(SPkU8, param->numSCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); - RETVALUE(ROK); + return ROK; } #endif @@ -8411,12 +8411,12 @@ Buffer *mBuf; switch(param->delType) { case RGR_LCG_CFG: - CMCHKPK(SPkU8, param->u.lcgDel.lcgId, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.lcgDel.lcgId, mBuf); CMCHKPK(cmPkLteRnti, param->u.lcgDel.crnti, mBuf); CMCHKPK(cmPkLteCellId, param->u.lcgDel.cellId, mBuf); break; case RGR_LCH_CFG: - CMCHKPK(SPkU8, param->u.lchDel.lcgId, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.lchDel.lcgId, mBuf); CMCHKPK(cmPkLteLcId, param->u.lchDel.lcId, mBuf); CMCHKPK(cmPkLteRnti, param->u.lchDel.crnti, mBuf); CMCHKPK(cmPkLteCellId, param->u.lchDel.cellId, mBuf); @@ -8431,16 +8431,16 @@ Buffer *mBuf; #ifdef LTE_ADV case RGR_SCELL_UE_CFG: CMCHKPK(cmPkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); - CMCHKPK(SPkU32, param->u.ueScellRel.ueDelTypes, mBuf); + CMCHKPK(oduUnpackUInt32, param->u.ueScellRel.ueDelTypes, mBuf); CMCHKPK(cmPkLteRnti, param->u.ueScellRel.crnti, mBuf); CMCHKPK(cmPkLteCellId, param->u.ueScellRel.cellId, mBuf); break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->delType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->delType, mBuf); + return ROK; } @@ -8473,9 +8473,9 @@ RgrUeDlSecCellRelInfo *param; Buffer *mBuf; #endif { - CMCHKUNPK(SUnpkU8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sCellId, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); + return ROK; } @@ -8508,13 +8508,13 @@ Buffer *mBuf; { U8 idx; - CMCHKUNPK(SUnpkU8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); for(idx = 0; idx < param->numSCells;idx++) { CMCHKUNPK(cmUnpkRgrUeDlSecCellRelInfo, ¶m->ueSCellRelDedCfg[idx],mBuf); } - RETVALUE(ROK); + return ROK; } #endif @@ -8548,7 +8548,7 @@ Buffer *mBuf; TRC3(cmUnpkRgrDel) - CMCHKUNPK(SUnpkU8, ¶m->delType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); switch(param->delType) { case RGR_CELL_CFG: CMCHKUNPK(cmUnpkLteCellId, ¶m->u.cellDel.cellId, mBuf); @@ -8561,25 +8561,25 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->u.lchDel.cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->u.lchDel.crnti, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->u.lchDel.lcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->u.lchDel.lcgId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.lchDel.lcgId, mBuf); break; case RGR_LCG_CFG: CMCHKUNPK(cmUnpkLteCellId, ¶m->u.lcgDel.cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->u.lcgDel.crnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->u.lcgDel.lcgId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.lcgDel.lcgId, mBuf); break; #ifdef LTE_ADV case RGR_SCELL_UE_CFG: CMCHKUNPK(cmUnpkLteCellId, ¶m->u.ueScellRel.cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->u.ueScellRel.crnti, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->u.ueScellRel.ueDelTypes, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->u.ueScellRel.ueDelTypes, mBuf); CMCHKUNPK(cmUnpkRgrUeSecCellRelInfo, ¶m->u.ueScellRel.ueSCellRelCfgInfo, mBuf); break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -8612,7 +8612,7 @@ Buffer *mBuf; TRC3(cmPkRgrPrbCfg) for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --) { - CMCHKPK(SPkU32, param->paLevelPerPrb[count], mBuf); + CMCHKPK(oduUnpackUInt32, param->paLevelPerPrb[count], mBuf); } for(count = param->numCellCentreUEs - 1; count >= 0; count --) { @@ -8622,10 +8622,10 @@ Buffer *mBuf; { CMCHKPK(cmPkLteRnti, param->cellEdgeUe[count], mBuf); } - CMCHKPK(SPkU8, param->numCellCentreUEs, mBuf); - CMCHKPK(SPkU8, param->numCellEdgeUEs, mBuf); - CMCHKPK(SPkU8, param->isSonIcicEnable, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numCellCentreUEs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCellEdgeUEs, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSonIcicEnable, mBuf); + return ROK; } /*********************************************************** @@ -8657,9 +8657,9 @@ Buffer *mBuf; { S32 count; TRC3(cmUnpkRgrSonPrbCfg) - CMCHKUNPK(SUnpkU8, ¶m->isSonIcicEnable, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numCellEdgeUEs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numCellCentreUEs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCellEdgeUEs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCellCentreUEs, mBuf); for (count = 0; count < param->numCellEdgeUEs; count++) { CMCHKUNPK(cmUnpkLteRnti, ¶m->cellEdgeUe[count], mBuf); @@ -8670,9 +8670,9 @@ Buffer *mBuf; } for(count = 0; count < RGR_SCH_MAX_PA_PER_PRB; count ++) { - CMCHKUNPK(SUnpkU32,(U32 *) ¶m->paLevelPerPrb[count], mBuf); + CMCHKUNPK(oduPackUInt32,(U32 *) ¶m->paLevelPerPrb[count], mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -8709,10 +8709,10 @@ Buffer *mBuf; CMCHKPK(cmPkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->cfgType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf); + return ROK; } /*********************************************************** @@ -8744,7 +8744,7 @@ Buffer *mBuf; { TRC3(cmUnpkRgrSonCfg) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->cfgType, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->cfgType, mBuf); switch(param->cfgType) { case RGR_SON_PRB_CFG : @@ -8752,10 +8752,10 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrSonPrbCfg, ¶m->u.prbCfg, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -8791,7 +8791,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8828,7 +8828,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef LTE_ADV /*********************************************************** @@ -8860,8 +8860,8 @@ Buffer *mBuf; { TRC3(cmUnPkRgrSCellActDeactInfo) - CMCHKUNPK(SUnpkU8, ¶m->sCellIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + return ROK; } /*********************************************************** @@ -8896,14 +8896,14 @@ Buffer *mBuf; U8 idx; CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numOfSCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numOfSCells, mBuf); for(idx = 0; idx < param->numOfSCells;idx++) { CMCHKUNPK(cmUnPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[idx],mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8936,9 +8936,9 @@ Buffer *mBuf; { TRC3(cmPkRgrSCellActDeactInfo) - CMCHKPK(SPkU8, param->sCellIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -8977,10 +8977,10 @@ Buffer *mBuf; CMCHKPK(cmPkRgrSCellActDeactInfo, ¶m->sCellActDeactInfo[(U8)idx], mBuf); } - CMCHKPK(SPkU8, param->numOfSCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->numOfSCells, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9040,10 +9040,10 @@ Buffer *mBuf; break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->action, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->action, mBuf); + return ROK; } @@ -9078,7 +9078,7 @@ Buffer *mBuf; TRC3(cmUnpkRgrCfgReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->action, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); switch(param->action) { case SCH_CONFIG: CMCHKUNPK(cmUnpkRgrCfg, ¶m->u.cfgInfo, mBuf); @@ -9103,9 +9103,9 @@ Buffer *mBuf; break; #endif /* LTE_ADV */ default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #ifdef RGR_V1 /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and @@ -9140,10 +9140,10 @@ Buffer *mBuf; TRC3(cmPkRgrUeBsrTmrCfg) - CMCHKPK(SPkU16, param->prdBsrTmr, mBuf); - CMCHKPK(SPkU16, param->retxBsrTmr, mBuf); - CMCHKPK(SPkU8, param->isPrdBsrTmrPres, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf); + CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPrdBsrTmrPres, mBuf); + return ROK; } /*********************************************************** @@ -9176,10 +9176,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeBsrTmrCfg) - CMCHKUNPK(SUnpkU8, ¶m->isPrdBsrTmrPres, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->retxBsrTmr, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->prdBsrTmr, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isPrdBsrTmrPres, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->retxBsrTmr, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->prdBsrTmr, mBuf); + return ROK; } #endif /* RGR_V1 */ /* rgr_c_001.main_4-ADD-Added for SI Enhancement. */ @@ -9229,7 +9229,7 @@ RgrSiCfgReqInfo * cfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrSiCfgReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -9240,7 +9240,7 @@ RgrSiCfgReqInfo * cfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrSiCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -9251,7 +9251,7 @@ RgrSiCfgReqInfo * cfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrSiCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -9262,7 +9262,7 @@ RgrSiCfgReqInfo * cfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrSiCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrSiCfgReqInfo)) != ROK) { @@ -9272,11 +9272,11 @@ RgrSiCfgReqInfo * cfgReqInfo; (ErrVal)ERGR049, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRSICFGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*********************************************************** @@ -9322,7 +9322,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR050, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { SPutMsg(mBuf); @@ -9331,7 +9331,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR051, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(RgrSiCfgReqInfo))) != ROK) { @@ -9341,7 +9341,7 @@ Buffer *mBuf; (ErrVal)ERGR052, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo)); if (pst->selector == ODU_SELECTOR_LC) @@ -9354,11 +9354,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR053, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, cfgReqInfo)); + return ((*func)(pst, spId, transId, cfgReqInfo)); } /*********************************************************** @@ -9395,14 +9395,14 @@ Buffer *mBuf; CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(SPkS32, param->cfgType, mBuf); - CMCHKPK(SPkU8, param->siId, mBuf); + CMCHKPK(oduUnpackUInt8, param->siId, mBuf); if(NULLP != param->pdu) { if (SFndLenMsg(param->pdu, &msgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SCatMsg(mBuf, param->pdu, M1M2) != ROK) - RETVALUE(RFAILED); + return RFAILED; SPutMsg(param->pdu); CMCHKPK(cmPkMsgLen, msgLen, mBuf); } @@ -9412,7 +9412,7 @@ Buffer *mBuf; CMCHKPK(cmPkMsgLen, 0, mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -9456,9 +9456,9 @@ Buffer *mBuf; if(msgLen > 0) { if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->pdu) != ROK) - RETVALUE(RFAILED); + return RFAILED; } else { @@ -9466,14 +9466,14 @@ Buffer *mBuf; } } - CMCHKUNPK(SUnpkU8, ¶m->siId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->siId, mBuf); /*CMCHKUNPK(SUnpkS32, (S32 *)¶m->cfgType, mBuf);*/ /*Merge from Mohit Changes*/ CMCHKUNPK(SUnpkS32,(S32 *)&cfgType, mBuf); param->cfgType = (RgrSiCfgType) cfgType; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9523,7 +9523,7 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; #endif SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, sizeof(RgrWarningSiCfgReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) @@ -9536,7 +9536,7 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, sizeof(RgrWarningSiCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) @@ -9549,7 +9549,7 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, sizeof(RgrWarningSiCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) @@ -9562,7 +9562,7 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; SPutSBuf(pst->region, pst->pool, (Data *)warningSiCfgReqInfo, sizeof(RgrWarningSiCfgReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } /* if the application wants to retain this structure, the below @@ -9576,11 +9576,11 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; (ErrVal)ERGR065, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRWARNINGSICFGREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkRgrWarningSiCfgReq*/ @@ -9628,7 +9628,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR066, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) @@ -9639,7 +9639,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR067, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&warningSiCfgReqInfo, @@ -9651,7 +9651,7 @@ Buffer *mBuf; (ErrVal)ERGR068, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } @@ -9667,12 +9667,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR069, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, warningSiCfgReqInfo)); + return ((*func)(pst, spId, transId, warningSiCfgReqInfo)); } /* cmUnpkRgrWarningSiCfgReq */ @@ -9713,10 +9713,10 @@ Buffer *mBuf; TRC3(cmPkRgrWarningSiCfgReqInfo) - CMCHKPK(SPkU8, param->emtcEnable, mBuf); + CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkU8, param->siId, mBuf); + CMCHKPK(oduUnpackUInt8, param->siId, mBuf); count = param->siPduLst.count; node = param->siPduLst.last; @@ -9727,9 +9727,9 @@ Buffer *mBuf; if(NULLP != pdu) { if (SFndLenMsg(pdu->pdu, &msgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SCatMsg(mBuf, pdu->pdu, M1M2) != ROK) - RETVALUE(RFAILED); + return RFAILED; /* The PDU is not Released. This has to be done by * the caller of the packing function */ CMCHKPK(cmPkMsgLen, msgLen, mBuf); @@ -9739,8 +9739,8 @@ Buffer *mBuf; SPutSBuf(pst->region, pst->pool, (Data *)node, sizeof(RgrSegmentInfo)); node= prevNode; } - CMCHKPK(SPkU32, count, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, count, mBuf); + return ROK; } @@ -9781,12 +9781,12 @@ Buffer *mBuf; TRC3(cmUnpkRgrWarningSiCfgReqInfo) cmLListInit(¶m->siPduLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCnt 0) @@ -9794,29 +9794,29 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } if (SSegMsg(mBuf, totalMsgLen-msgLen, &pdu) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } } else { - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&node, sizeof(CmLList))) != ROK) - RETVALUE(RFAILED); + return RFAILED; node->node = (PTR)pdu; cmLListAdd2Tail(¶m->siPduLst, node); } - CMCHKUNPK(SUnpkU8, ¶m->siId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->siId, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKPK(SUnpkU8, ¶m->emtcEnable, mBuf); + CMCHKPK(oduPackUInt8, ¶m->emtcEnable, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9859,10 +9859,10 @@ U8 siId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR070, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, siId, mBuf); + CMCHKPK(oduUnpackUInt8, siId, mBuf); if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) @@ -9873,7 +9873,7 @@ U8 siId; (ErrVal)ERGR082, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } @@ -9885,11 +9885,11 @@ U8 siId; (ErrVal)ERGR071, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRWARNINGSISTOPREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); }/*cmPkRgrWarningSiStopReq */ @@ -9933,7 +9933,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR072, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) @@ -9944,14 +9944,14 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR083, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - CMCHKUNPK(SUnpkU8, &siId, mBuf); + CMCHKUNPK(oduPackUInt8, &siId, mBuf); SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, siId)); + return ((*func)(pst, spId, transId, siId)); } /*cmUnpkRgrWarningSiStopReq */ @@ -9999,10 +9999,10 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR073, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -10010,10 +10010,10 @@ U8 status; (ErrVal)ERGR074, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(siId, mBuf) != ROK) + if (oduUnpackUInt8(siId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -10021,7 +10021,7 @@ U8 status; (ErrVal)ERGR075, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) @@ -10032,7 +10032,7 @@ U8 status; (ErrVal)ERGR076, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) @@ -10043,11 +10043,11 @@ U8 status; (ErrVal)ERGR077, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRWARNINGSICFGCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /* cmPkRgrWarningSiCfgCfm */ @@ -10095,7 +10095,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR078, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) @@ -10106,10 +10106,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR079, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&siId, mBuf) != ROK) + if (oduPackUInt8(&siId, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10117,10 +10117,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR080, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) + if (oduPackUInt8(&status, mBuf) != ROK) { SPutMsg(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10128,10 +10128,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR081, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, transId, siId, status)); + return ((*func)(pst, suId, transId, siId, status)); }/* cmUnpkRgrwarningSiCfgCfm */ #endif/*RGR_SI_SCH*/ @@ -10181,7 +10181,7 @@ RgrLoadInfReqInfo * loadInfReq; #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, sizeof(RgrLoadInfReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10192,7 +10192,7 @@ RgrLoadInfReqInfo * loadInfReq; SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, sizeof(RgrLoadInfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrCfgTransId(&transId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10203,7 +10203,7 @@ RgrLoadInfReqInfo * loadInfReq; SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, sizeof(RgrLoadInfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -10214,7 +10214,7 @@ RgrLoadInfReqInfo * loadInfReq; SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, sizeof(RgrLoadInfReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, sizeof(RgrLoadInfReqInfo)) != ROK) { @@ -10224,11 +10224,11 @@ RgrLoadInfReqInfo * loadInfReq; (ErrVal)ERGR049, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRLOADINFREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*********************************************************** @@ -10274,7 +10274,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR050, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrCfgTransId(&transId, mBuf) != ROK) { @@ -10284,7 +10284,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR051, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&loadInfReq, @@ -10295,7 +10295,7 @@ Buffer *mBuf; (ErrVal)ERGR052, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } cmMemset((U8 *)loadInfReq, 0, sizeof(RgrLoadInfReqInfo)); @@ -10310,11 +10310,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR053, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, transId, loadInfReq)); + return ((*func)(pst, spId, transId, loadInfReq)); } /*********************************************************** @@ -10347,10 +10347,10 @@ Buffer *mBuf; TRC3(cmPkRgrLoadInfReqInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkU8, param->rgrCcPHighStartRb, mBuf); - CMCHKPK(SPkU8, param->rgrCcPHighEndRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rgrCcPHighStartRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rgrCcPHighEndRb, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -10382,11 +10382,11 @@ Buffer *mBuf; { TRC3(cmUnpkRgrLoadInfReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->rgrCcPHighEndRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rgrCcPHighStartRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighEndRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighStartRb, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_END */ @@ -10423,9 +10423,9 @@ Buffer *mBuf; { TRC3(cmPkRgrUeCqiReptCfg) - CMCHKPK(SPkU8, param->numColltdCqiRept, mBuf); + CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10459,9 +10459,9 @@ Buffer *mBuf; { TRC3(cmUnpkRgrUeCqiReptCfg) - CMCHKUNPK(SUnpkU8, ¶m->numColltdCqiRept, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numColltdCqiRept, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10507,7 +10507,7 @@ RgrStaIndInfo* staInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrStaIndInfo(staInd, mBuf) != ROK) @@ -10519,7 +10519,7 @@ RgrStaIndInfo* staInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) @@ -10532,7 +10532,7 @@ RgrStaIndInfo* staInd; SPutSBuf(pst->region, pst->pool, (Data *)staInd, sizeof(RgrStaIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)staInd, @@ -10544,11 +10544,11 @@ RgrStaIndInfo* staInd; (ErrVal)ERGR057, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*rgr_c_001.main_9 ADD added changes for CQI management*/ @@ -10593,7 +10593,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR058, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&staInd, @@ -10605,7 +10605,7 @@ Buffer *mBuf; (ErrVal)ERGR059, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrStaIndInfo(staInd, mBuf) != ROK) @@ -10618,11 +10618,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR060, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, staInd)); + return ((*func)(pst, suId, staInd)); } /*rgr_c_001.main_9 ADD added changes for CQI management*/ @@ -10659,7 +10659,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkRgrUeCqiInfo, ¶m->ueCqiInfo, mBuf); - RETVALUE(ROK); + return ROK; } /*rgr_c_001.main_9 ADD added changes for CQI management*/ /*********************************************************** @@ -10695,7 +10695,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*rgr_c_001.main_9 ADD added changes for CQI management*/ /*********************************************************** @@ -10732,9 +10732,9 @@ Buffer *mBuf; { CMCHKPK(cmPkRgrUeCqiRept, ¶m->cqiRept[idx], mBuf); } - CMCHKPK(SPkU8, param->numCqiRept, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCqiRept, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRgrUeCqiInfo */ /*rgr_c_001.main_9 ADD added changes for CQI management*/ @@ -10768,13 +10768,13 @@ Buffer *mBuf; U8 idx; TRC3(cmUnpkRgrUeCqiInfo) - CMCHKUNPK(SUnpkU8, ¶m->numCqiRept, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCqiRept, mBuf); for (idx = 0; idx < param->numCqiRept; idx++) { CMCHKUNPK(cmUnpkRgrUeCqiRept, ¶m->cqiRept[idx], mBuf); } - RETVALUE(ROK); + return ROK; } /* cmUnpkRgrUeCqiInfo */ /*********************************************************** @@ -10806,11 +10806,11 @@ Buffer *mBuf; TRC3(cmPkRgrSubBandCqiInfo) - CMCHKPK(SPkU8, param->cqi[0], mBuf); - CMCHKPK(SPkU8, param->cqi[1], mBuf); - CMCHKPK(SPkU8, param->subBandIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); + CMCHKPK(oduUnpackUInt8, param->subBandIdx, mBuf); - RETVALUE(ROK); + return ROK; } /* cmPkRgrSubBandCqiInfo */ /*rgr_c_001.main_9 ADD added changes for CQI management*/ @@ -10845,16 +10845,16 @@ Buffer *mBuf; TRC3(cmPkRgrUeCqiRept) - CMCHKPK(SPkU8, param->cqi[0], mBuf); - CMCHKPK(SPkU8, param->cqi[1], mBuf); - CMCHKPK(SPkU8, param->cqiMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiMode, mBuf); for (idx = param->numSubBand - 1; idx >= 0; idx--) { count = idx; CMCHKPK(cmPkRgrSubBandCqiInfo, ¶m->sbCqiInfo[count], mBuf); } - CMCHKPK(SPkU8, param->numSubBand, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numSubBand, mBuf); + return ROK; } /* cmPkRgrUeCqiRept */ /*********************************************************** @@ -10886,11 +10886,11 @@ Buffer *mBuf; TRC3(cmUnpkRgrSubBandCqiInfo) - CMCHKUNPK(SUnpkU8, ¶m->subBandIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqi[1], mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqi[0], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->subBandIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[0], mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkRgrSubBandCqiInfo*/ /*rgr_c_001.main_9 ADD added changes for CQI management*/ @@ -10923,16 +10923,16 @@ Buffer *mBuf; U8 idx; TRC3(cmUnpkRgrUeCqiRept) - CMCHKUNPK(SUnpkU8, ¶m->numSubBand, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubBand, mBuf); for (idx = 0; idx < param->numSubBand; idx++) { CMCHKUNPK(cmUnpkRgrSubBandCqiInfo, ¶m->sbCqiInfo[idx], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->cqiMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqi[1], mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqi[0], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[0], mBuf); - RETVALUE(ROK); + return ROK; } /* cmUnpkRgrUeCqiRept */ #endif /* End of ifdef RGR_CQI_REPT */ @@ -10978,7 +10978,7 @@ RgrLoadInfIndInfo* loadInfInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, sizeof(RgrLoadInfIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrLoadInfIndInfo(loadInfInd, mBuf) != ROK) @@ -10992,7 +10992,7 @@ RgrLoadInfIndInfo* loadInfInd; sizeof(RgrLoadInfIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) @@ -11005,7 +11005,7 @@ RgrLoadInfIndInfo* loadInfInd; SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, sizeof(RgrLoadInfIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)loadInfInd, @@ -11017,11 +11017,11 @@ RgrLoadInfIndInfo* loadInfInd; (ErrVal)ERGR057, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRLOADINFIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*********************************************************** @@ -11065,7 +11065,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR058, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&loadInfInd, @@ -11077,7 +11077,7 @@ Buffer *mBuf; (ErrVal)ERGR059, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } /* dsfr_pal_fixes ** 22-March-2013 ** SKS */ @@ -11091,11 +11091,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR060, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, loadInfInd)); + return ((*func)(pst, suId, loadInfInd)); } @@ -11129,12 +11129,12 @@ Buffer *mBuf; TRC3(cmPkRgrLoadInfIndInfo) CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(SPkU16, param->bw, mBuf); + CMCHKPK(oduUnpackUInt16, param->bw, mBuf); if(RGR_ABS == param->type) { for(idx = 0; idx < RGR_ABS_PATTERN_LEN; idx++) { - CMCHKPK(SPkU32, param->u.absLoadInfo[idx], mBuf); + CMCHKPK(oduUnpackUInt32, param->u.absLoadInfo[idx], mBuf); } } else @@ -11142,9 +11142,9 @@ Buffer *mBuf; CMCHKPK(cmPkTknStrOSXL, ¶m->u.rntpInfo, mBuf); } - CMCHKPK(SPkU32, param->type, mBuf); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -11183,12 +11183,12 @@ Buffer *mBuf; TRC3(cmUnpkRgrLoadInfIndInfo) - CMCHKUNPK(SUnpkU32, ¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->type, mBuf); if(RGR_ABS == param->type) { for(idx = RGR_ABS_PATTERN_LEN -1 ; idx >= 0; idx--) { - CMCHKUNPK(SUnpkU32, ¶m->u.absLoadInfo[(U8)idx], mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->u.absLoadInfo[(U8)idx], mBuf); } } else @@ -11197,12 +11197,12 @@ Buffer *mBuf; /* dsfr_pal_fixes ** 21-March-2013 ** SKS ** Start */ tknStr = ¶m->u.rntpInfo; - CMCHKUNPK(SUnpkU8, &tknStr->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); if(tknStr->pres) { /* Length */ - CMCHKUNPK(SUnpkU16, &tknStr->len, mBuf); + CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf); if ((SGetSBuf(pst->region, pst->pool, (Data **)&tknStr->val,tknStr->len)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -11211,24 +11211,24 @@ Buffer *mBuf; (ErrVal)ERGR052, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Value */ for (ndx = 1; ndx <= tknStr->len; ndx++) { - CMCHKUNPK(SUnpkU8, &tknStr->val[tknStr->len - ndx], mBuf); + CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - ndx], mBuf); } } } /* dsfr_pal_fixes ** 21-March-2013 ** SKS ** End */ /* dsfr_pal_fixes ** 22-March-2013 ** SKS */ - CMCHKUNPK(SUnpkU16, ¶m->bw, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->bw, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /* LTE_ADV_FLAG_REMOVED_END */ @@ -11265,11 +11265,11 @@ Buffer *mBuf; if(param->pAPrsnt) { - CMCHKPK(SPkU32, param->pA, mBuf); + CMCHKPK(oduUnpackUInt32, param->pA, mBuf); } - CMCHKPK(SPkU8, param->pAPrsnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->pAPrsnt, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11304,14 +11304,14 @@ Buffer *mBuf; U32 tmpEnum; TRC3(cmUnpkRgrUepACfg) - CMCHKUNPK(SUnpkU8, (U8 *)¶m->pAPrsnt, mBuf); + CMCHKUNPK(oduPackUInt8, (U8 *)¶m->pAPrsnt, mBuf); if (param->pAPrsnt) { - CMCHKUNPK(SUnpkU32, (U32*)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)&tmpEnum, mBuf); param->pA = (RgrUeDlPwrCntrlPaCfg) tmpEnum; } - RETVALUE(ROK); + return ROK; } /*rgr_c_001.main_9 ADD PDSCH ded cfg*/ @@ -11346,7 +11346,7 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUepACfg, ¶m->uepACfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11382,7 +11382,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkRgrUepACfg, ¶m->uepACfg, mBuf); - RETVALUE(ROK); + return ROK; } #endif @@ -11417,12 +11417,12 @@ Buffer *mBuf; #endif { TRC3(cmPkRgrUeUlPwrDedSCellCfg) - CMCHKPK(SPkU8, param->pSRSOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); - CMCHKPK(SPkU8, param->isDeltaMCSEnabled, mBuf); - CMCHKPK(SPkU8, param->isAccumulated, mBuf); + CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -11455,11 +11455,11 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeUlPwrDedSCellCfg) - CMCHKUNPK(SUnpkU8, ¶m->isAccumulated, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isDeltaMCSEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAccumulated, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isDeltaMCSEnabled, mBuf); CMCHKUNPK(SUnpkS8, ¶m->p0UePusch, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pSRSOffset, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->pSRSOffset, mBuf); + return ROK; } @@ -11493,7 +11493,7 @@ Buffer *mBuf; #endif { CMCHKPK(cmPkRgrUeUlPwrDedSCellCfg,¶m->ueSCellUlDedPwrCfg, mBuf); - CMCHKPK(SPkU8, param->isUlCaEnabled, mBuf); + CMCHKPK(oduUnpackUInt8, param->isUlCaEnabled, mBuf); CMCHKPK(cmPkRgrUeTxModeCfg, ¶m->txMode, mBuf); #ifdef TFU_UPGRADE /*rgr_c_001.main_9 ADD PDSCH ded cfg*/ @@ -11501,10 +11501,10 @@ Buffer *mBuf; #endif CMCHKPK(cmPkRgrUeDlCqiCfg,¶m->ueSCellDlCqiCfg, mBuf); CMCHKPK(cmPkTknU32, ¶m->sCellDeActTmr, mBuf); - CMCHKPK(SPkU16, param->sCellId, mBuf); - CMCHKPK(SPkU8, param->sCellIdx, mBuf); + CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11542,11 +11542,11 @@ Buffer *mBuf; CMCHKPK(cmPkRgrUeSecCellCfg, ¶m->ueSCellDedCfg[(U8)idx],mBuf); } - CMCHKPK(SPkU8, param->numSCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); - CMCHKPK(SPkU8, param->useExtBSRSizes, mBuf); + CMCHKPK(oduUnpackUInt8, param->useExtBSRSizes, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11577,18 +11577,18 @@ RgrUeSecCellCfg *param; Buffer *mBuf; #endif { - CMCHKUNPK(SUnpkU8, ¶m->sCellIdx, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->sCellId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); CMCHKUNPK(cmUnpkTknU32, ¶m->sCellDeActTmr, mBuf); CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, ¶m->ueSCellDlCqiCfg, mBuf); #ifdef TFU_UPGRADE CMCHKUNPK(cmUnpkRgrUePdschDedCfg, ¶m->uePdschDedCfg, mBuf); #endif CMCHKUNPK(cmUnpkRgrUeTxModeCfg, ¶m->txMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isUlCaEnabled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isUlCaEnabled, mBuf); CMCHKUNPK(cmUnpkRgrUeUlPwrDedSCellCfg, ¶m->ueSCellUlDedPwrCfg, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11623,15 +11623,15 @@ Buffer *mBuf; { U8 idx; - CMCHKUNPK(SUnpkU8, ¶m->useExtBSRSizes, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->useExtBSRSizes, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSCells, mBuf); for(idx = 0; idx < param->numSCells;idx++) { CMCHKUNPK(cmUnpkRgrUeSecCellCfg, ¶m->ueSCellDedCfg[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /* Sprint 3 */ /*********************************************************** @@ -11668,37 +11668,37 @@ Buffer *mBuf; { for(idx = param->u.format1Bcs.sCellAckN1ResTb2Count - 1; idx >=0 ;idx--) { - CMCHKPK(SPkU16, param->u.format1Bcs.sCellAckN1ResTb2[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(U8)idx], mBuf); } - CMCHKPK(SPkU8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); for(idx = param->u.format1Bcs.sCellAckN1ResTb1Count - 1; idx >=0 ;idx--) { - CMCHKPK(SPkU16, param->u.format1Bcs.sCellAckN1ResTb1[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(U8)idx], mBuf); } - CMCHKPK(SPkU8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); } else { for(idx = param->u.format3.sCellAckN3ResAntP1Count - 1; idx >=0 ;idx--) { - CMCHKPK(SPkU16, param->u.format3.sCellAckN3ResAntP1[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(U8)idx], mBuf); } - CMCHKPK(SPkU8, param->u.format3.sCellAckN3ResAntP1Count, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP1Count, mBuf); for(idx = param->u.format3.sCellAckN3ResAntP0Count- 1; idx >=0 ;idx--) { - CMCHKPK(SPkU16, param->u.format3.sCellAckN3ResAntP0[(U8)idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(U8)idx], mBuf); } - CMCHKPK(SPkU8, param->u.format3.sCellAckN3ResAntP0Count, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf); } - CMCHKPK(SPkU32, param->pucchFormatType, mBuf); + CMCHKPK(oduUnpackUInt32, param->pucchFormatType, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -11732,42 +11732,42 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeSCellAckPucchCfg); - CMCHKUNPK(SUnpkU32, (U32*)¶m->pucchFormatType, mBuf); + CMCHKUNPK(oduPackUInt32, (U32*)¶m->pucchFormatType, mBuf); //if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS) if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS || param->pucchFormatType == RG_SCH_UCI_FORMAT1A_1B) { - CMCHKUNPK(SUnpkU8, ¶m->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.format1Bcs.sCellAckN1ResTb1Count, mBuf); for(idx = 0; idx < param->u.format1Bcs.sCellAckN1ResTb1Count; idx++) { - CMCHKUNPK(SUnpkU16, ¶m->u.format1Bcs.sCellAckN1ResTb1[idx], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->u.format1Bcs.sCellAckN1ResTb1[idx], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.format1Bcs.sCellAckN1ResTb2Count, mBuf); for(idx = 0; idx < param->u.format1Bcs.sCellAckN1ResTb2Count; idx++) { - CMCHKUNPK(SUnpkU16, ¶m->u.format1Bcs.sCellAckN1ResTb2[idx], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->u.format1Bcs.sCellAckN1ResTb2[idx], mBuf); } } else { - CMCHKUNPK(SUnpkU8, ¶m->u.format3.sCellAckN3ResAntP0Count, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.format3.sCellAckN3ResAntP0Count, mBuf); for(idx = 0; idx < param->u.format3.sCellAckN3ResAntP0Count; idx++) { - CMCHKUNPK(SUnpkU16, ¶m->u.format3.sCellAckN3ResAntP0[idx], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->u.format3.sCellAckN3ResAntP0[idx], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->u.format3.sCellAckN3ResAntP1Count, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.format3.sCellAckN3ResAntP1Count, mBuf); for(idx = 0; idx < param->u.format3.sCellAckN3ResAntP1Count; idx++) { - CMCHKUNPK(SUnpkU16, ¶m->u.format3.sCellAckN3ResAntP1[idx], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->u.format3.sCellAckN3ResAntP1[idx], mBuf); } } - RETVALUE(ROK); + return ROK; } @@ -11816,7 +11816,7 @@ RgrUeStaIndInfo* ueStaInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (cmPkRgrUeStaIndInfo(ueStaInd, mBuf) != ROK) @@ -11829,7 +11829,7 @@ RgrUeStaIndInfo* ueStaInd; SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) @@ -11842,7 +11842,7 @@ RgrUeStaIndInfo* ueStaInd; SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, sizeof(RgrUeStaIndInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)ueStaInd, @@ -11854,11 +11854,11 @@ RgrUeStaIndInfo* ueStaInd; (ErrVal)ERGR057, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGRUESTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*rgr_c_001.main_9 ADD added changes for CQI management*/ @@ -11903,7 +11903,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR058, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueStaInd, @@ -11915,7 +11915,7 @@ Buffer *mBuf; (ErrVal)ERGR059, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRgrUeStaIndInfo(ueStaInd, mBuf) != ROK) @@ -11928,11 +11928,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGR060, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, ueStaInd)); + return ((*func)(pst, suId, ueStaInd)); } /*********************************************************** @@ -11966,9 +11966,9 @@ Buffer *mBuf; CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(SPkU8, param->status, mBuf); + CMCHKPK(oduUnpackUInt8, param->status, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -11999,11 +11999,11 @@ Buffer *mBuf; TRC3(cmUnpkRgrUeStaIndInfo) - CMCHKUNPK(SUnpkU8, ¶m->status, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12037,10 +12037,10 @@ Buffer *mBuf; TRC3(cmPkRgrCellCsgParamCfg) - CMCHKPK(SPkU8, param->minUlResNonCsg, mBuf); - CMCHKPK(SPkU8, param->minDlResNonCsg, mBuf); + CMCHKPK(oduUnpackUInt8, param->minUlResNonCsg, mBuf); + CMCHKPK(oduUnpackUInt8, param->minDlResNonCsg, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12072,10 +12072,10 @@ Buffer *mBuf; TRC3(cmUnpkRgrCellCsgParamCfg) - CMCHKUNPK(SUnpkU8, ¶m->minDlResNonCsg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->minUlResNonCsg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->minDlResNonCsg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->minUlResNonCsg, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12109,18 +12109,18 @@ Buffer *mBuf; switch(param->cmdType) { case RGR_CNTRL_CMD_RACH_OVRLD: - CMCHKUNPK(SPkU8, param->cmdDesc.rachOvrLd.backOffVal, mBuf); - CMCHKUNPK(SPkU8, param->cmdDesc.rachOvrLd.backOffEnb, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.rachOvrLd.backOffVal, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.rachOvrLd.backOffEnb, mBuf); break; case RGR_CNTRL_CMD_CPU_OVRLD: - CMCHKUNPK(SPkU8, param->cmdDesc.cpuOvrLd.instruction, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.cpuOvrLd.instruction, mBuf); break; default: break; } - CMCHKUNPK(SPkU32, param->cmdType, mBuf); + CMCHKUNPK(oduUnpackUInt32, param->cmdType, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -12152,22 +12152,22 @@ Buffer *mBuf; TRC3(cmUnpkRgrCellCntrlCmdCfg) - CMCHKUNPK(SUnpkU32, &tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, &tmpEnum, mBuf); param->cmdType = (RgrCellCntrlCmdType) tmpEnum; switch(param->cmdType) { case RGR_CNTRL_CMD_RACH_OVRLD: - CMCHKUNPK(SUnpkU8, ¶m->cmdDesc.rachOvrLd.backOffEnb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cmdDesc.rachOvrLd.backOffVal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cmdDesc.rachOvrLd.backOffEnb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cmdDesc.rachOvrLd.backOffVal, mBuf); break; case RGR_CNTRL_CMD_CPU_OVRLD: - CMCHKUNPK(SUnpkU8, ¶m->cmdDesc.cpuOvrLd.instruction, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cmdDesc.cpuOvrLd.instruction, mBuf); break; default: break; } - RETVALUE(ROK); + return ROK; } #endif /* End of if defined(LCRGR) */ diff --git a/src/cm/rgu.c b/src/cm/rgu.c index c4a796d1d..87c188a95 100755 --- a/src/cm/rgu.c +++ b/src/cm/rgu.c @@ -85,7 +85,7 @@ SpId spId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU001, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -94,7 +94,7 @@ SpId spId; (ErrVal)ERGU002, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -103,10 +103,10 @@ SpId spId; (ErrVal)ERGU003, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -149,7 +149,7 @@ Buffer *mBuf; (ErrVal)ERGU004, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -158,10 +158,10 @@ Buffer *mBuf; (ErrVal)ERGU005, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -201,7 +201,7 @@ Reason reason; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU006, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -210,7 +210,7 @@ Reason reason; (ErrVal)ERGU007, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -219,10 +219,10 @@ Reason reason; (ErrVal)ERGU008, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGUUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -265,7 +265,7 @@ Buffer *mBuf; (ErrVal)ERGU009, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -274,10 +274,10 @@ Buffer *mBuf; (ErrVal)ERGU010, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -318,16 +318,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU011, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU012, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -336,10 +336,10 @@ U8 status; (ErrVal)ERGU013, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGUBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -383,19 +383,19 @@ Buffer *mBuf; (ErrVal)ERGU014, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU015, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -430,12 +430,12 @@ RlcMacData *dlData (ErrVal)ERGU022, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)dlData, sizeof(RlcMacData)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR) dlData, mBuf); + CMCHKPK(oduPackPointer,(PTR) dlData, mBuf); } else { @@ -454,7 +454,7 @@ RlcMacData *dlData SPutSBuf(pst->region, pst->pool, (Data *)dlData, sizeof(RlcMacData)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, @@ -465,7 +465,7 @@ RlcMacData *dlData (ErrVal)ERGU025, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } dlData = NULLP; } @@ -481,10 +481,10 @@ RlcMacData *dlData (Data *)dlData, sizeof(RlcMacData)); } SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRLCDLDAT; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -516,12 +516,12 @@ Buffer *mBuf if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKUNPK(cmUnpkPtr,(PTR *) &dlData, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &dlData, mBuf); } else { @@ -533,7 +533,7 @@ Buffer *mBuf (ErrVal)ERGU026, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } cmMemset((U8*)dlData, (U8)0, sizeof(RlcMacData)); /*rgu_c_001.main_5 - ADD - L2M Support */ @@ -551,15 +551,15 @@ Buffer *mBuf SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)dlData, sizeof(RlcMacData)); - RETVALUE(RFAILED); + return RFAILED; } } SPutMsg(mBuf); /* TODO : change function call to send RlcMacData as below: */ - RETVALUE((*func)(pst, spId, dlData)); + return ((*func)(pst, spId, dlData)); - //RETVALUE((*func)(pst, spId, datReq)); + //return ((*func)(pst, spId, datReq)); } @@ -588,12 +588,12 @@ uint8_t packRlcUlData(Pst* pst, RlcMacData *ulData) (ErrVal)ERGU035, (ErrVal)0, "Packing failed"); #endif SPutStaticBuffer(pst->region, pst->pool, (Data *)ulData, sizeof(RlcMacData),0); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR)ulData, mBuf); + CMCHKPK(oduPackPointer,(PTR)ulData, mBuf); } else { @@ -605,7 +605,7 @@ uint8_t packRlcUlData(Pst* pst, RlcMacData *ulData) #endif SPutStaticBuffer(pst->region, pst->pool, (Data *)ulData, sizeof(RlcMacData),0); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutStaticBuffer(pst->region, pst->pool, @@ -616,12 +616,12 @@ uint8_t packRlcUlData(Pst* pst, RlcMacData *ulData) (ErrVal)ERGU038, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } ulData = NULLP; } pst->event = (Event) EVTRLCULDAT; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -647,7 +647,7 @@ uint8_t unpackRcvdUlData(RlcMacUlDataFunc func, Pst *pst, Buffer *mBuf) if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKUNPK(cmUnpkPtr,(PTR *) &ulData, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &ulData, mBuf); } else { @@ -659,7 +659,7 @@ uint8_t unpackRcvdUlData(RlcMacUlDataFunc func, Pst *pst, Buffer *mBuf) (ErrVal)ERGU040, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (unpackRlcMacDataInfo(ulData, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -670,11 +670,11 @@ uint8_t unpackRcvdUlData(RlcMacUlDataFunc func, Pst *pst, Buffer *mBuf) SPutMsg(mBuf); SPutStaticBuffer(pst->region, pst->pool, (Data *)ulData, sizeof(RlcMacData),0); - RETVALUE(RFAILED); + return RFAILED; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, ulData)); + return ((*func)(pst, ulData)); } @@ -712,15 +712,15 @@ Buffer *mBuf; S32 loop; TRC3(cmPkRguL2MUlThrpMeasReqInfo); - CMCHKPK(SPkU8, param->enbMeas, mBuf); + CMCHKPK(oduUnpackUInt8, param->enbMeas, mBuf); for (loop=param->numLcId-1; loop >= 0; loop--) { - CMCHKPK(SPkU8, param->lcId[loop], mBuf); + CMCHKPK(oduUnpackUInt8, param->lcId[loop], mBuf); } CMCHKPK(cmPkLteLcId, param->numLcId, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -761,10 +761,10 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->numLcId, mBuf); for (loop=0; loopnumLcId; loop++) { - CMCHKUNPK(SUnpkU8, ¶m->lcId[loop], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->lcId[loop], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->enbMeas, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->enbMeas, mBuf); + return ROK; } /** @@ -806,11 +806,11 @@ RguL2MUlThrpMeasReqInfo* measReq; (ErrVal)ERGU049, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR) measReq, mBuf); + CMCHKPK(oduPackPointer,(PTR) measReq, mBuf); } else { @@ -823,7 +823,7 @@ RguL2MUlThrpMeasReqInfo* measReq; SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo)) != ROK) { @@ -833,7 +833,7 @@ RguL2MUlThrpMeasReqInfo* measReq; (ErrVal)ERGU052, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } measReq = NULLP; } @@ -850,11 +850,11 @@ RguL2MUlThrpMeasReqInfo* measReq; sizeof(RguL2MUlThrpMeasReqInfo)); } SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGUL2MULTHRPMEASREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -899,11 +899,11 @@ Buffer *mBuf; (ErrVal)ERGU053, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKUNPK(cmUnpkPtr,(PTR *) &measReq, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &measReq, mBuf); } else { @@ -915,7 +915,7 @@ Buffer *mBuf; (ErrVal)ERGU054, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRguL2MUlThrpMeasReqInfo(measReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -926,11 +926,11 @@ Buffer *mBuf; SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo)); - RETVALUE(RFAILED); + return RFAILED; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, spId, measReq)); + return ((*func)(pst, spId, measReq)); } #endif @@ -969,13 +969,13 @@ RlcMacBOStatus *boStatus __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU056, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef ERRCLS_KW /* boStaInfo cant be NULL here */ if (boStaInfo == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif cmMemcpy((U8 *)boStaInfo, (U8 *)boStatus, sizeof(RlcMacBOStatus)); @@ -987,11 +987,11 @@ RlcMacBOStatus *boStatus #endif SPutSBuf(pst->region, pst->pool, (Data *)boStaInfo, sizeof(RlcMacBOStatus)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR) boStaInfo, mBuf); + CMCHKPK(oduPackPointer,(PTR) boStaInfo, mBuf); } else { @@ -1002,7 +1002,7 @@ RlcMacBOStatus *boStatus (ErrVal)ERGU057, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (SPkS16(spId, mBuf) != ROK) { @@ -1016,11 +1016,11 @@ RlcMacBOStatus *boStatus SPutSBuf(pst->region, pst->pool, (Data *)boStaInfo, sizeof(RlcMacBOStatus)); } SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event)EVTRLCBOSTA; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); SPutMsg(mBuf); } @@ -1058,12 +1058,12 @@ Buffer *mBuf (ErrVal)ERGU060, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKUNPK(cmUnpkPtr,(PTR *) &boSta, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &boSta, mBuf); } else { @@ -1075,7 +1075,7 @@ Buffer *mBuf (ErrVal)ERGU061, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (unpackBOStatusInfo(boSta, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1085,13 +1085,13 @@ Buffer *mBuf #endif SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)boSta, sizeof(RlcMacBOStatus)); - RETVALUE(RFAILED); + return RFAILED; } } SPutMsg(mBuf); // (*func)(pst, spId, boSta); SPutSBuf(pst->region, pst->pool, (Data *)boSta, sizeof(RlcMacBOStatus)); - RETVALUE(ROK); + return ROK; } @@ -1143,7 +1143,7 @@ RguHarqStatusInd *harqStatusInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU070, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } cmMemcpy((U8 *)harqStaInd, (U8 *)harqStatusInd, sizeof(RguHarqStatusInd)); @@ -1159,24 +1159,24 @@ RguHarqStatusInd *harqStatusInd; #else SPutStaticBuffer(pst->region, pst->pool, (Data *)harqStaInd, sizeof(RguHarqStatusInd), 0); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR) harqStaInd, mBuf); + CMCHKPK(oduPackPointer,(PTR) harqStaInd, mBuf); } else { for(idx = 0; idx < harqStaInd->numTbs; idx++) { - CMCHKPK(SPkU16, harqStaInd->status[idx], mBuf); + CMCHKPK(oduUnpackUInt16, harqStaInd->status[idx], mBuf); } for(idx = 0; idx < harqStaInd->numTbs; idx++) { - CMCHKPK(SPkU32, harqStaInd->tbId[idx], mBuf); + CMCHKPK(oduUnpackUInt32, harqStaInd->tbId[idx], mBuf); } - CMCHKPK(SPkU8, harqStaInd->numTbs, mBuf); + CMCHKPK(oduUnpackUInt8, harqStaInd->numTbs, mBuf); CMCHKPK(cmPkLteRnti, harqStaInd->ueId, mBuf); CMCHKPK(cmPkLteCellId, harqStaInd->cellId, mBuf); } @@ -1193,7 +1193,7 @@ RguHarqStatusInd *harqStatusInd; SPutStaticBuffer(pst->region, pst->pool, (Data *)harqStaInd, sizeof(RguHarqStatusInd), 0); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } #ifdef XEON_SPECIFIC_CHANGES if (SPutSBuf(pst->region, pst->pool, (Data *)harqStaInd, @@ -1211,14 +1211,14 @@ RguHarqStatusInd *harqStatusInd; (ErrVal)ERGU072, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } #ifndef XEON_SPECIFIC_CHANGES } #endif pst->event = (Event) EVTRGUHQSTAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1262,7 +1262,7 @@ Buffer *mBuf; (ErrVal)ERGU073, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } #ifdef XEON_SPECIFIC_CHANGES if ((SGetSBuf(pst->region, pst->pool, (Data **)&hqStaInd, @@ -1270,7 +1270,7 @@ Buffer *mBuf; #else if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKUNPK(cmUnpkPtr,(PTR *) &hqStaInd, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &hqStaInd, mBuf); } else { @@ -1284,18 +1284,18 @@ Buffer *mBuf; (ErrVal)ERGU074, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } CMCHKUNPK(cmUnpkLteCellId, &hqStaInd->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, &hqStaInd->ueId, mBuf); - CMCHKUNPK(SUnpkU8, &hqStaInd->numTbs, mBuf); + CMCHKUNPK(oduPackUInt8, &hqStaInd->numTbs, mBuf); for(idx = hqStaInd->numTbs; idx > 0; idx--) { - CMCHKUNPK(SUnpkU32, &hqStaInd->tbId[idx - 1], mBuf); + CMCHKUNPK(oduPackUInt32, &hqStaInd->tbId[idx - 1], mBuf); } for(idx = hqStaInd->numTbs; idx > 0; idx--) { - CMCHKUNPK(SUnpkU16, &hqStaInd->status[idx - 1], mBuf); + CMCHKUNPK(oduPackUInt16, &hqStaInd->status[idx - 1], mBuf); } #ifndef XEON_SPECIFIC_CHANGES } @@ -1307,7 +1307,7 @@ Buffer *mBuf; #else SPutStaticBuffer(pst->region, pst->pool, (Data *)hqStaInd, sizeof(RguHarqStatusInd), 0); #endif - RETVALUE(ROK); + return ROK; } #endif /* LTE_L2_MEAS */ @@ -1345,11 +1345,11 @@ RlcMacSchedRepInfo * schRep (ErrVal)ERGU076, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR) schRep, mBuf); + CMCHKPK(oduPackPointer,(PTR) schRep, mBuf); } else { @@ -1362,7 +1362,7 @@ RlcMacSchedRepInfo * schRep SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo)); SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo)) != ROK) { @@ -1372,7 +1372,7 @@ RlcMacSchedRepInfo * schRep (ErrVal)ERGU079, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } schRep= NULLP; } @@ -1387,11 +1387,11 @@ RlcMacSchedRepInfo * schRep SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo)); } SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTSCHREP; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1430,11 +1430,11 @@ Buffer *mBuf (ErrVal)ERGU080, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKUNPK(cmUnpkPtr,(PTR *) &schRep, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &schRep, mBuf); } else { @@ -1445,7 +1445,7 @@ Buffer *mBuf (ErrVal)ERGU081, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (unpackSchedRepInfo(schRep, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1455,11 +1455,11 @@ Buffer *mBuf #endif SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo)); - RETVALUE(RFAILED); + return RFAILED; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, schRep)); + return ((*func)(pst, suId, schRep)); } #ifdef ANSI @@ -1475,11 +1475,11 @@ Buffer *mBuf; #endif { TRC3(cmPkRguLcFlowCntrlInfo); - CMCHKPK(SPkU32, param->maxBo4FlowCtrl, mBuf); - CMCHKPK(SPkU32, param->pktAdmitCnt, mBuf); + CMCHKPK(oduUnpackUInt32, param->maxBo4FlowCtrl, mBuf); + CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -1502,9 +1502,9 @@ Buffer *mBuf; { cmPkRguLcFlowCntrlInfo(¶m->lcInfo[idx],mBuf); } - CMCHKPK(SPkU32, param->numLcs, mBuf); + CMCHKPK(oduUnpackUInt32, param->numLcs, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -1527,9 +1527,9 @@ Buffer *mBuf; { cmPkRguUeFlowCntrlInfo(¶m->ueFlowCntrlInfo[idx],mBuf); } - CMCHKPK(SPkU32, param->numUes, mBuf); + CMCHKPK(oduUnpackUInt32, param->numUes, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /** @@ -1570,11 +1570,11 @@ RguFlowCntrlInd *flowCntrlInd; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU076, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKPK(cmPkPtr,(PTR) flowCntrlInd, mBuf); + CMCHKPK(oduPackPointer,(PTR) flowCntrlInd, mBuf); } else { @@ -1585,7 +1585,7 @@ RguFlowCntrlInd *flowCntrlInd; (ErrVal)ERGU077, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } if (SPkS16(suId, mBuf) != ROK) { @@ -1595,11 +1595,11 @@ RguFlowCntrlInd *flowCntrlInd; (ErrVal)ERGU078, (ErrVal)0, "Packing failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTRGUFLOWCNTRLIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #ifdef ANSI @@ -1617,10 +1617,10 @@ Buffer *mBuf; TRC3(cmUnpkRguLcFlowCntrlInfo); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->pktAdmitCnt, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->maxBo4FlowCtrl, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->maxBo4FlowCtrl, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI PUBLIC S16 cmUnpkRguUeFlowCntrlInfo @@ -1637,12 +1637,12 @@ Buffer *mBuf; U32 idx; TRC3(cmUnpkRguUeFlowCntrlInfo); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numLcs, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numLcs, mBuf); for(idx=0; idx < param->numLcs; idx++) { cmUnpkRguLcFlowCntrlInfo(¶m->lcInfo[idx],mBuf); } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -1662,12 +1662,12 @@ Buffer *mBuf; TRC3(cmUnpkRguFlowCntrlInfo); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->numUes, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->numUes, mBuf); for (idx=0; idx < param->numUes; idx++) { cmUnpkRguUeFlowCntrlInfo(¶m->ueFlowCntrlInfo[idx],mBuf); } - RETVALUE(ROK); + return ROK; } /** @@ -1711,11 +1711,11 @@ Buffer *mBuf; (ErrVal)ERGU080, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) { - CMCHKUNPK(cmUnpkPtr,(PTR *) &flowCntrlInd, mBuf); + CMCHKUNPK(oduUnpackPointer,(PTR *) &flowCntrlInd, mBuf); } else { @@ -1726,7 +1726,7 @@ Buffer *mBuf; (ErrVal)ERGU081, (ErrVal)0, "UnPacking failed"); #endif SPutMsg(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (cmUnpkRguFlowCntrlInfo(flowCntrlInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1736,11 +1736,11 @@ Buffer *mBuf; #endif SPutMsg(mBuf); SPutSBuf(pst->region, pst->pool, (Data *)flowCntrlInd, sizeof(RguFlowCntrlInd)); - RETVALUE(RFAILED); + return RFAILED; } } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, flowCntrlInd)); + return ((*func)(pst, suId, flowCntrlInd)); } /*********************************************************** @@ -1779,14 +1779,14 @@ Buffer *mBuf; /* rgu_c_001.main_3: ccpu00111328: S16 is renamed as MsgLen */ MsgLen msgLen = 0; if (SFndLenMsg(param->mBuf[i], &msgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SCatMsg(mBuf, param->mBuf[i], M1M2) != ROK) - RETVALUE(RFAILED); + return RFAILED; SPutMsg(param->mBuf[i]); CMCHKPK(cmPkMsgLen, msgLen, mBuf); } - CMCHKPK(SPkU8, param->numPdu, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numPdu, mBuf); + return ROK; } @@ -1823,16 +1823,16 @@ Buffer *mBuf; TRC3(cmUnpkRguPduInfo); - CMCHKUNPK(SUnpkU8, ¶m->numPdu, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numPdu, mBuf); for (i=0; inumPdu; i++) { MsgLen msgLen, totalMsgLen; CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->mBuf[i]) != ROK) - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -1868,14 +1868,14 @@ Buffer *mBuf; TRC3(cmPkRguDBoReport); - CMCHKPK(SPkU32, param->oldestSduArrTime, mBuf); - CMCHKPK(SPkU32, param->staPduBo, mBuf); + CMCHKPK(oduUnpackUInt32, param->oldestSduArrTime, mBuf); + CMCHKPK(oduUnpackUInt32, param->staPduBo, mBuf); #ifdef CCPU_OPT - CMCHKPK(SPkU8, param->staPduPrsnt, mBuf); - CMCHKPK(SPkU16, param->estRlcHdrSz, mBuf); + CMCHKPK(oduUnpackUInt8, param->staPduPrsnt, mBuf); + CMCHKPK(oduUnpackUInt16, param->estRlcHdrSz, mBuf); #endif CMCHKPK(SPkS32, param->bo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -1913,13 +1913,13 @@ Buffer *mBuf; CMCHKUNPK(SUnpkS32, ¶m->bo, mBuf); #ifdef CCPU_OPT - CMCHKUNPK(SUnpkU16, ¶m->estRlcHdrSz, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->staPduPrsnt, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->estRlcHdrSz, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->staPduPrsnt, mBuf); #endif - CMCHKUNPK(SUnpkU32, ¶m->staPduBo, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->oldestSduArrTime, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->staPduBo, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->oldestSduArrTime, mBuf); + return ROK; } @@ -1958,9 +1958,9 @@ Buffer *mBuf; if (param->pdu != NULLP) { if (SFndLenMsg(param->pdu, &msgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SCatMsg(mBuf, param->pdu, M1M2) != ROK) - RETVALUE(RFAILED); + return RFAILED; SPutMsg(param->pdu); CMCHKPK(cmPkMsgLen, msgLen, mBuf); } @@ -1972,17 +1972,17 @@ Buffer *mBuf; case CM_LTE_LCH_PCCH: CMCHKPK(cmPkLteTimingInfo, ¶m->u.timeToTx, mBuf); #ifdef EMTC_ENABLE - CMCHKPK(SPkU8,param->pnb,mBuf); + CMCHKPK(oduUnpackUInt8,param->pnb,mBuf); #endif break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->transId, mBuf); + CMCHKPK(oduUnpackUInt32, param->transId, mBuf); CMCHKPK(cmPkLteLcType, param->lcType, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2022,12 +2022,12 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkLteLcType, ¶m->lcType, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->transId, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->transId, mBuf); switch(param->lcType) { case CM_LTE_LCH_BCCH: case CM_LTE_LCH_PCCH: #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8,¶m->pnb, mBuf); + CMCHKUNPK(oduPackUInt8,¶m->pnb, mBuf); #endif CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->u.timeToTx, mBuf); break; @@ -2035,18 +2035,18 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->u.rnti, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } SFndLenMsg(mBuf, &msgLen); if (msgLen > 0) { CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->pdu) != ROK) - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2083,13 +2083,13 @@ Buffer *mBuf; TRC3(cmPkRguLchDatReq); #ifdef L2_OPTMZ - CMCHKPK(SPkU8, param->freeBuff, mBuf); + CMCHKPK(oduUnpackUInt8, param->freeBuff, mBuf); #endif - CMCHKPK(SPkU8, param->setMaxUlPrio, mBuf); + CMCHKPK(oduUnpackUInt8, param->setMaxUlPrio, mBuf); CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf); CMCHKPK(cmPkRguDBoReport, ¶m->boReport, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2128,11 +2128,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkRguDBoReport, ¶m->boReport, mBuf); CMCHKUNPK(cmUnpkRguPduInfo, ¶m->pdu, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->setMaxUlPrio, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->setMaxUlPrio, mBuf); #ifdef L2_OPTMZ - CMCHKUNPK(SUnpkU8, ¶m->freeBuff, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->freeBuff, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -2169,13 +2169,13 @@ Buffer *mBuf; TRC3(cmPkRguDatReqTb); /*rgu_c_001.main_5 - ADD - L2M Support */ #ifdef LTE_L2_MEAS - CMCHKPK(SPkU32, param->tbId, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbId, mBuf); #endif for (i=param->nmbLch-1; i >= 0; i--) { CMCHKPK(cmPkRguLchDatReq, ¶m->lchData[i], mBuf); } - CMCHKPK(SPkU8, param->nmbLch, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->nmbLch, mBuf); + return ROK; } @@ -2228,15 +2228,15 @@ Buffer *mBuf; TRC3(cmUnpkRguDatReqTb); - CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf); for (i=0; inmbLch; i++) { CMCHKUNPK(cmUnpkRguLchDatReq, ¶m->lchData[i], mBuf); } /*rgu_c_001.main_5 - ADD - L2M Support */ #ifdef LTE_L2_MEAS - CMCHKUNPK(SUnpkU32, ¶m->tbId, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->tbId, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -2297,13 +2297,13 @@ Buffer *mBuf; { CMCHKPK(cmPkRguDatReqTb, &datReq->datReqTb[i], mBuf); } - CMCHKPK(SPkU8, datReq->nmbOfTbs, mBuf); - CMCHKPK(SPkU32, datReq->transId, mBuf); + CMCHKPK(oduUnpackUInt8, datReq->nmbOfTbs, mBuf); + CMCHKPK(oduUnpackUInt32, datReq->transId, mBuf); CMCHKPK(cmPkLteRnti, datReq->rnti, mBuf); } - CMCHKPK(SPkU8, param->nmbOfUeGrantPerTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->nmbOfUeGrantPerTti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2368,13 +2368,13 @@ Buffer *mBuf; retVal = ROK; #endif CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbOfUeGrantPerTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbOfUeGrantPerTti, mBuf); for(idx = 0; idx < param->nmbOfUeGrantPerTti; idx++) { RguDDatReqPerUe *datReq = ¶m->datReq[idx]; CMCHKUNPK(cmUnpkLteRnti, &datReq->rnti, mBuf); - CMCHKUNPK(SUnpkU32, &datReq->transId, mBuf); - CMCHKUNPK(SUnpkU8, &datReq->nmbOfTbs, mBuf); + CMCHKUNPK(oduPackUInt32, &datReq->transId, mBuf); + CMCHKUNPK(oduPackUInt8, &datReq->nmbOfTbs, mBuf); /* rgu_c_001.main_4 - Changes for MIMO feature addition */ for (i=0; idatReqTb[i], mBuf); if(retVal != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #else CMCHKUNPK(cmUnpkRguDatReqTb, &datReq->datReqTb[i], mBuf); #endif } } - RETVALUE(ROK); + return ROK; } @@ -2429,15 +2429,15 @@ Buffer *mBuf; TRC3(cmPkRguCDatIndInfo); if (SFndLenMsg(param->pdu, &msgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SCatMsg(mBuf, param->pdu, M1M2) != ROK) - RETVALUE(RFAILED); + return RFAILED; SPutMsg(param->pdu); CMCHKPK(cmPkMsgLen, msgLen, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2479,10 +2479,10 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SSegMsg(mBuf, totalMsgLen-msgLen, ¶m->pdu) != ROK) - RETVALUE(RFAILED); - RETVALUE(ROK); + return RFAILED; + return ROK; } @@ -2519,7 +2519,7 @@ Buffer *mBuf; CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2556,7 +2556,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkRguPduInfo, ¶m->pdu, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2598,18 +2598,18 @@ Buffer *mBuf; { msgLen = 0; //if (SFndLenMsg(param->pduInfo[i].pduBuf, &msgLen) != ROK) - // RETVALUE(RFAILED); + // return RFAILED; //if (SCatMsg(mBuf, param->pduInfo[i].pduBuf, M1M2) != ROK) - // RETVALUE(RFAILED); + // return RFAILED; CMCHKPK(cmPkMsgLen, msgLen, mBuf); CMCHKPK(cmPkLteLcId, param->pduInfo[i].lcId, mBuf); - CMCHKPK(cmPkBool, param->pduInfo[i].commCh, mBuf); + CMCHKPK(oduPackBool, param->pduInfo[i].commCh, mBuf); } - CMCHKPK(SPkU8, param->numPdu, mBuf); + CMCHKPK(oduUnpackUInt8, param->numPdu, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); //CMCHKPK(cmPkLteTimingInfo, ¶m->timeToTx, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2649,20 +2649,20 @@ Buffer *mBuf; //CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timeToTx, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numPdu, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numPdu, mBuf); for (i=0; inumPdu; i++) { MsgLen totalMsgLen; - CMCHKUNPK(cmUnpkBool, ¶m->pduInfo[i].commCh, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->pduInfo[i].commCh, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->pduInfo[i].lcId, mBuf); CMCHKUNPK(cmUnpkMsgLen, ¶m->pduInfo[i].pduLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; //if (SSegMsg(mBuf, totalMsgLen-param->pduInfo[i].pduLen, ¶m->pduInfo[i].pduBuf) != ROK) - // RETVALUE(RFAILED); + // return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2705,18 +2705,18 @@ Buffer *mBuf; case CM_LTE_LCH_PCCH: CMCHKPK(cmPkLteTimingInfo, ¶m->u.timeToTx, mBuf); #ifdef EMTC_ENABLE - CMCHKPK(SPkU8,param->pnb,mBuf); - CMCHKPK(SPkU8,param->emtcDiReason,mBuf); + CMCHKPK(oduUnpackUInt8,param->pnb,mBuf); + CMCHKPK(oduUnpackUInt8,param->emtcDiReason,mBuf); #endif break; default : - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(SPkS32, param->bo, mBuf); CMCHKPK(cmPkLteLcType, param->lcType, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2760,8 +2760,8 @@ Buffer *mBuf; case CM_LTE_LCH_BCCH: case CM_LTE_LCH_PCCH: #ifdef EMTC_ENABLE - CMCHKUNPK(SUnpkU8,¶m->emtcDiReason , mBuf); - CMCHKUNPK(SUnpkU8,¶m->pnb , mBuf); + CMCHKUNPK(oduPackUInt8,¶m->emtcDiReason , mBuf); + CMCHKUNPK(oduPackUInt8,¶m->pnb , mBuf); #endif CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->u.timeToTx, mBuf); break; @@ -2769,9 +2769,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->u.rnti, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -2809,10 +2809,10 @@ Buffer *mBuf; CMCHKPK(SPkS32, param->bo, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - CMCHKPK(cmPkBool, param->commCh, mBuf); + CMCHKPK(oduPackBool, param->commCh, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /* End of packBOStatusInfo */ @@ -2850,10 +2850,10 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(cmUnpkBool, ¶m->commCh, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->commCh, mBuf); CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(SUnpkS32, ¶m->bo, mBuf); - RETVALUE(ROK); + return ROK; } /* End of unpackBOStatusInfo */ @@ -2890,7 +2890,7 @@ Buffer *mBuf; CMCHKPK(SPkS16, param->totBufSize, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2928,7 +2928,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->totBufSize, mBuf); - RETVALUE(ROK); + return ROK; } @@ -2965,14 +2965,14 @@ Buffer *mBuf; TRC3(cmPkRguStaIndTb); #ifdef LTE_L2_MEAS - CMCHKPK(SPkU16, param->status, mBuf); - CMCHKPK(SPkU32, param->tbId, mBuf); + CMCHKPK(oduUnpackUInt16, param->status, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbId, mBuf); #endif for (i=param->nmbLch-1; i >= 0; i--) { CMCHKPK(cmPkRguLchStaInd, ¶m->lchStaInd[i], mBuf); } - CMCHKPK(SPkU8, param->nmbLch, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->nmbLch, mBuf); + return ROK; } @@ -3009,15 +3009,15 @@ Buffer *mBuf; TRC3(cmUnpkRguStaIndTb); - CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf); for (i=0; inmbLch; i++) { CMCHKUNPK(cmUnpkRguLchStaInd, ¶m->lchStaInd[i], mBuf); } #ifdef LTE_L2_MEAS - CMCHKUNPK(SUnpkU32, ¶m->tbId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->status, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->tbId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->status, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -3050,14 +3050,14 @@ Buffer *mBuf for(idx = (param->nmbLch-1); idx >= 0; idx--) { CMCHKPK(cmPkRguLchStaInd, ¶m->lchSta[idx].lchStaInd, mBuf); - CMCHKPK(cmPkBool, param->lchSta[idx].commCh, mBuf); + CMCHKPK(oduPackBool, param->lchSta[idx].commCh, mBuf); } - CMCHKPK(SPkU8, param->nmbLch, mBuf); + CMCHKPK(oduUnpackUInt8, param->nmbLch, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timeToTx, mBuf); - RETVALUE(ROK); + return ROK; } /* End of packSchedRepInfo */ @@ -3091,14 +3091,14 @@ Buffer *mBuf CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timeToTx, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbLch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbLch, mBuf); for(idx = 0; idx < param->nmbLch; idx++) { - CMCHKUNPK(cmUnpkBool, ¶m->lchSta[idx].commCh, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->lchSta[idx].commCh, mBuf); CMCHKUNPK(cmUnpkRguLchStaInd, ¶m->lchSta[idx].lchStaInd, mBuf); } - RETVALUE(ROK); + return ROK; } /* End of unpackSchedRepInfo */ #endif diff --git a/src/cm/ssi.h b/src/cm/ssi.h index 06255d4c6..eb463feb3 100755 --- a/src/cm/ssi.h +++ b/src/cm/ssi.h @@ -844,7 +844,7 @@ { \ S16 ret; \ if ((ret = func(val, mBuf)) != ROK) \ - RETVALUE(ret); \ + return (ret); \ } #define CMCHKPKLOG(func, val, mBuf, errCode, pst) \ @@ -856,7 +856,7 @@ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, errCode, (ErrVal)ret, \ "Packing failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } @@ -869,7 +869,7 @@ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, errCode, (ErrVal)ret, \ "Packing failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } @@ -896,7 +896,7 @@ { \ S16 ret; \ if ((ret = func(val, mBuf)) != ROK) \ - RETVALUE(ret); \ + return (ret); \ } #define CMCHKUNPKLOG(func, val, mBuf, errCode, pst) \ @@ -908,7 +908,7 @@ SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, (ErrVal)errCode, (ErrVal)ret, \ "Unpacking failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } @@ -921,7 +921,7 @@ SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, (ErrVal)errCode, (ErrVal)ret, \ "Unpacking failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } diff --git a/src/cm/ssi.x b/src/cm/ssi.x index 422a2d919..5506d7e3c 100755 --- a/src/cm/ssi.x +++ b/src/cm/ssi.x @@ -932,26 +932,26 @@ EXTERN S16 SChekMemUtilization ARGS((Region region,Bool *memAlarm)); EXTERN Void prntMem ARGS((Data *strtAdr,S16 len)); EXTERN Void prntMsg ARGS((Buffer *mBuf)); EXTERN Void prntMsg1 ARGS((Buffer *mBuf,S16 src,S16 dst)); -EXTERN S16 tst ARGS((void )); +EXTERN uint8_t tst ARGS((void )); EXTERN S16 rdConQ ARGS((Data data)); EXTERN S16 SPkS8 ARGS((S8 val,Buffer *mBuf)); -EXTERN S16 SPkU8 ARGS((U8 val,Buffer *mBuf)); +EXTERN S16 oduUnpackUInt8 ARGS((U8 val,Buffer *mBuf)); EXTERN S16 SPkS16 ARGS((S16 val,Buffer *mBuf)); -EXTERN S16 SPkU16 ARGS((U16 val,Buffer *mBuf)); +EXTERN S16 oduUnpackUInt16 ARGS((U16 val,Buffer *mBuf)); EXTERN S16 SPkS32 ARGS((S32 val,Buffer *mBuf)); -EXTERN S16 SPkU32 ARGS((U32 val,Buffer *mBuf)); +EXTERN S16 oduUnpackUInt32 ARGS((U32 val,Buffer *mBuf)); /* ssi_x_001.main_49 : added packing of F32 and F64*/ #ifdef SS_FLOAT EXTERN S16 SPkF32 ARGS((F32 val,Buffer *mBuf)); EXTERN S16 SPkF64 ARGS((F64 val,Buffer *mBuf)); #endif /* SS_FLOAT */ EXTERN S16 SUnpkS8 ARGS((S8 *val,Buffer *mBuf)); -EXTERN S16 SUnpkU8 ARGS((U8 *val,Buffer *mBuf)); +EXTERN S16 oduPackUInt8 ARGS((U8 *val,Buffer *mBuf)); EXTERN S16 SUnpkS16 ARGS((S16 *val,Buffer *mBuf)); -EXTERN S16 SUnpkU16 ARGS((U16 *val,Buffer *mBuf)); +EXTERN S16 oduPackUInt16 ARGS((U16 *val,Buffer *mBuf)); EXTERN S16 SUnpkS32 ARGS((S32 *val,Buffer *mBuf)); -EXTERN S16 SUnpkU32 ARGS((U32 *val,Buffer *mBuf)); +EXTERN S16 oduPackUInt32 ARGS((U32 *val,Buffer *mBuf)); /* ssi_x_001.main_49 : added unpacking of F32 and F64*/ #ifdef SS_FLOAT EXTERN S16 SUnpkF32 ARGS((F32 *val,Buffer *mBuf)); diff --git a/src/cm/tfu.c b/src/cm/tfu.c index e22aacd20..99c4792ef 100755 --- a/src/cm/tfu.c +++ b/src/cm/tfu.c @@ -89,7 +89,7 @@ SpId spId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU001, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -98,7 +98,7 @@ SpId spId; (ErrVal)ETFU002, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -107,10 +107,10 @@ SpId spId; (ErrVal)ETFU003, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -159,7 +159,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU004, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -168,10 +168,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU005, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -217,16 +217,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU006, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU007, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -235,10 +235,10 @@ U8 status; (ErrVal)ETFU008, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -287,19 +287,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU009, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { TFU_FREE_MSG(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU010, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -345,7 +345,7 @@ Reason reason; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU011, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -354,7 +354,7 @@ Reason reason; (ErrVal)ETFU012, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -363,10 +363,10 @@ Reason reason; (ErrVal)ETFU013, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -415,7 +415,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU014, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -424,10 +424,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU015, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -473,7 +473,7 @@ SpId spId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU016, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -482,7 +482,7 @@ SpId spId; (ErrVal)ETFU017, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -491,10 +491,10 @@ SpId spId; (ErrVal)ETFU018, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUSCHBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -543,7 +543,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU019, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -552,10 +552,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU020, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -601,16 +601,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU021, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU022, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -619,10 +619,10 @@ U8 status; (ErrVal)ETFU023, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUSCHBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -671,19 +671,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU024, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { TFU_FREE_MSG(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU025, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -729,7 +729,7 @@ Reason reason; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU026, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -738,7 +738,7 @@ Reason reason; (ErrVal)ETFU027, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -747,10 +747,10 @@ Reason reason; (ErrVal)ETFU028, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUSCHUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -799,7 +799,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU029, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -808,10 +808,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU030, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -862,7 +862,7 @@ TfuRaReqIndInfo * raReqInd; (ErrVal)ETFU031, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(raReqInd); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuRaReqIndInfo(raReqInd, mBuf) != ROK) { @@ -873,12 +873,12 @@ TfuRaReqIndInfo * raReqInd; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)raReqInd, mBuf) != ROK) + if (oduPackPointer((PTR)raReqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -887,7 +887,7 @@ TfuRaReqIndInfo * raReqInd; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -899,14 +899,14 @@ TfuRaReqIndInfo * raReqInd; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(raReqInd); } pst->event = (Event) EVTTFURAREQIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -959,7 +959,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU034, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -972,7 +972,7 @@ Buffer *mBuf; (ErrVal)ETFU035, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -987,12 +987,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU036, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&raReqInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&raReqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1001,11 +1001,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, raReqInd)); + return ((*func)(pst, suId, raReqInd)); } @@ -1066,7 +1066,7 @@ TfuRecpReqInfo * recpReq; (ErrVal)ETFU037, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(recpReq); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuRecpReqInfo(recpReq, mBuf) != ROK) { @@ -1077,12 +1077,12 @@ TfuRecpReqInfo * recpReq; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)recpReq, mBuf) != ROK) + if (oduPackPointer((PTR)recpReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1091,7 +1091,7 @@ TfuRecpReqInfo * recpReq; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1104,14 +1104,14 @@ TfuRecpReqInfo * recpReq; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(recpReq); } pst->event = (Event) EVTTFURECPREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1174,7 +1174,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU040, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -1187,12 +1187,12 @@ Buffer *mBuf; (ErrVal)ETFU041, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&recpReq, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&recpReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1201,7 +1201,7 @@ Buffer *mBuf; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1215,12 +1215,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU042, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR*)&recpReq, mBuf) != ROK) + if (oduUnpackPointer((PTR*)&recpReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1229,12 +1229,12 @@ Buffer *mBuf; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, recpReq)); + return ((*func)(pst, spId, recpReq)); } @@ -1286,7 +1286,7 @@ TfuUlCqiIndInfo * ulCqiInd; (ErrVal)ETFU043, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(ulCqiInd); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuUlCqiIndInfo(ulCqiInd, mBuf) != ROK) { @@ -1297,12 +1297,12 @@ TfuUlCqiIndInfo * ulCqiInd; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)ulCqiInd, mBuf) != ROK) + if (oduPackPointer((PTR)ulCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1311,7 +1311,7 @@ TfuUlCqiIndInfo * ulCqiInd; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1323,14 +1323,14 @@ TfuUlCqiIndInfo * ulCqiInd; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(ulCqiInd); } pst->event = (Event) EVTTFUULCQIIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1384,7 +1384,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU046, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -1397,7 +1397,7 @@ Buffer *mBuf; (ErrVal)ETFU047, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1412,12 +1412,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU048, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&ulCqiInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&ulCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1426,11 +1426,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, ulCqiInd)); + return ((*func)(pst, suId, ulCqiInd)); } @@ -1481,7 +1481,7 @@ TfuHqIndInfo * hqInd; (ErrVal)ETFU049, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(hqInd); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuHqIndInfo(hqInd, mBuf) != ROK) { @@ -1492,12 +1492,12 @@ TfuHqIndInfo * hqInd; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)hqInd, mBuf) != ROK) + if (oduPackPointer((PTR)hqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1506,7 +1506,7 @@ TfuHqIndInfo * hqInd; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1518,14 +1518,14 @@ TfuHqIndInfo * hqInd; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(hqInd); } pst->event = (Event) EVTTFUHQIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1578,7 +1578,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU052, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -1591,7 +1591,7 @@ Buffer *mBuf; (ErrVal)ETFU053, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1606,12 +1606,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU054, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&hqInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&hqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1620,11 +1620,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, hqInd)); + return ((*func)(pst, spId, hqInd)); } @@ -1674,7 +1674,7 @@ TfuSrIndInfo * srInd; (ErrVal)ETFU055, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(srInd); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuSrIndInfo(srInd, mBuf) != ROK) { @@ -1685,12 +1685,12 @@ TfuSrIndInfo * srInd; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)srInd, mBuf) != ROK) + if (oduPackPointer((PTR)srInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1699,7 +1699,7 @@ TfuSrIndInfo * srInd; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1711,14 +1711,14 @@ TfuSrIndInfo * srInd; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(srInd); } pst->event = (Event) EVTTFUSRIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1770,7 +1770,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU058, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -1783,7 +1783,7 @@ Buffer *mBuf; (ErrVal)ETFU059, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1798,12 +1798,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU060, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&srInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&srInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1812,11 +1812,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, srInd)); + return ((*func)(pst, spId, srInd)); } @@ -1864,7 +1864,7 @@ TfuDlCqiIndInfo * dlCqiInd; (ErrVal)ETFU061, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(dlCqiInd); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuDlCqiIndInfo(dlCqiInd, mBuf) != ROK) { @@ -1875,12 +1875,12 @@ TfuDlCqiIndInfo * dlCqiInd; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)dlCqiInd, mBuf) != ROK) + if (oduPackPointer((PTR)dlCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1889,7 +1889,7 @@ TfuDlCqiIndInfo * dlCqiInd; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1901,13 +1901,13 @@ TfuDlCqiIndInfo * dlCqiInd; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(dlCqiInd); } pst->event = (Event) EVTTFUDLCQIIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1957,7 +1957,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU064, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -1970,7 +1970,7 @@ Buffer *mBuf; (ErrVal)ETFU065, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1985,12 +1985,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU066, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&dlCqiInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&dlCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1999,11 +1999,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, dlCqiInd)); + return ((*func)(pst, suId, dlCqiInd)); } @@ -2058,7 +2058,7 @@ TfuRawCqiIndInfo * rawCqiInd; (ErrVal)ETFU067, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(rawCqiInd); - RETVALUE(RFAILED); + return RFAILED; } cmPkTfuRawCqiIndInfo(rawCqiInd, mBuf); if (SPkS16(suId, mBuf) != ROK) { @@ -2069,11 +2069,11 @@ TfuRawCqiIndInfo * rawCqiInd; #endif TFU_FREE_MEM(rawCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MEM(rawCqiInd); pst->event = (Event) EVTTFURAWCQIIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2127,7 +2127,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU069, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } { Mem sMem; @@ -2140,12 +2140,12 @@ Buffer *mBuf; (ErrVal)ETFU070, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } cmUnpkTfuRawCqiIndInfo(rawCqiInd, (Ptr)&rawCqiInd->memCp, mBuf); TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, rawCqiInd)); + return ((*func)(pst, suId, rawCqiInd)); } @@ -2196,7 +2196,7 @@ TfuSrsIndInfo * srsInd; (ErrVal)ETFU071, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(srsInd); - RETVALUE(RFAILED); + return RFAILED; } cmPkTfuSrsIndInfo(srsInd, mBuf); if (SPkS16(suId, mBuf) != ROK) { @@ -2207,11 +2207,11 @@ TfuSrsIndInfo * srsInd; #endif TFU_FREE_MEM(srsInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MEM(srsInd); pst->event = (Event) EVTTFUSRSIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2264,7 +2264,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU073, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } { Mem sMem; @@ -2277,12 +2277,12 @@ Buffer *mBuf; (ErrVal)ETFU074, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } cmUnpkTfuSrsIndInfo(srsInd, (Ptr)&srsInd->memCp, mBuf); TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, srsInd)); + return ((*func)(pst, suId, srsInd)); } #endif @@ -2334,7 +2334,7 @@ TfuDatIndInfo * datInd; (ErrVal)ETFU075, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(datInd); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuDatIndInfo(datInd, mBuf) != ROK) { @@ -2345,12 +2345,12 @@ TfuDatIndInfo * datInd; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if(cmPkPtr((PTR)datInd, mBuf) != ROK) + if(oduPackPointer((PTR)datInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2359,7 +2359,7 @@ TfuDatIndInfo * datInd; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2371,14 +2371,14 @@ TfuDatIndInfo * datInd; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(datInd); } pst->event = (Event) EVTTFUDATIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2430,7 +2430,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU078, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -2443,7 +2443,7 @@ Buffer *mBuf; (ErrVal)ETFU079, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2458,12 +2458,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU080, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if(cmUnpkPtr((PTR *)&datInd, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&datInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2472,11 +2472,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, datInd)); + return ((*func)(pst, spId, datInd)); } @@ -2530,7 +2530,7 @@ TfuCrcIndInfo * crcIndInfo; (ErrVal)ETFU081, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(crcIndInfo); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuCrcIndInfo(crcIndInfo, mBuf) != ROK) { @@ -2541,12 +2541,12 @@ TfuCrcIndInfo * crcIndInfo; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)crcIndInfo, mBuf) != ROK) + if (oduPackPointer((PTR)crcIndInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2555,7 +2555,7 @@ TfuCrcIndInfo * crcIndInfo; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2568,14 +2568,14 @@ TfuCrcIndInfo * crcIndInfo; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(crcIndInfo); } pst->event = (Event) EVTTFUCRCIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2631,7 +2631,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU084, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -2644,7 +2644,7 @@ Buffer *mBuf; (ErrVal)ETFU085, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2659,12 +2659,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU086, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&crcIndInfo, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&crcIndInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2673,11 +2673,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, crcIndInfo)); + return ((*func)(pst, suId, crcIndInfo)); } @@ -2728,7 +2728,7 @@ TfuTimingAdvIndInfo * timingAdvInd; (ErrVal)ETFU087, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(timingAdvInd); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuTimingAdvIndInfo(timingAdvInd, mBuf) != ROK) { @@ -2739,12 +2739,12 @@ TfuTimingAdvIndInfo * timingAdvInd; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)timingAdvInd, mBuf) != ROK) + if (oduPackPointer((PTR)timingAdvInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2753,7 +2753,7 @@ TfuTimingAdvIndInfo * timingAdvInd; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2765,14 +2765,14 @@ TfuTimingAdvIndInfo * timingAdvInd; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(timingAdvInd); } pst->event = (Event) EVTTFUTIMINGADVIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2825,7 +2825,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU090, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -2838,7 +2838,7 @@ Buffer *mBuf; (ErrVal)ETFU091, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2853,12 +2853,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU092, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&timingAdvInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&timingAdvInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2867,11 +2867,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, timingAdvInd)); + return ((*func)(pst, suId, timingAdvInd)); } @@ -2924,7 +2924,7 @@ TfuDatReqInfo * datReq; (ErrVal)ETFU093, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(datReq); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuDatReqInfo(datReq, mBuf) != ROK) { @@ -2935,12 +2935,12 @@ TfuDatReqInfo * datReq; #endif TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if(cmPkPtr((PTR)datReq, mBuf) != ROK) + if(oduPackPointer((PTR)datReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2949,7 +2949,7 @@ TfuDatReqInfo * datReq; #endif TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2961,14 +2961,14 @@ TfuDatReqInfo * datReq; #endif TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(datReq); } pst->event = (Event) EVTTFUDATREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3023,7 +3023,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU096, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -3036,7 +3036,7 @@ Buffer *mBuf; (ErrVal)ETFU097, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3051,12 +3051,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU098, (ErrVal)0, "Unpacking failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if (pst->selector == ODU_SELECTOR_LWLC) { - if(cmUnpkPtr((PTR *)&datReq, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&datReq, mBuf) != ROK) { TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); @@ -3065,11 +3065,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFUXXX, (ErrVal)0, "LWLC Un-Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, datReq)); + return ((*func)(pst, spId, datReq)); } @@ -3123,7 +3123,7 @@ TfuCntrlReqInfo * cntrlReq; (ErrVal)ETFU099, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(cntrlReq); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuCntrlReqInfo(cntrlReq, mBuf) != ROK) { @@ -3134,12 +3134,12 @@ TfuCntrlReqInfo * cntrlReq; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)cntrlReq, mBuf) != ROK) + if (oduPackPointer((PTR)cntrlReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3148,7 +3148,7 @@ TfuCntrlReqInfo * cntrlReq; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3161,14 +3161,14 @@ TfuCntrlReqInfo * cntrlReq; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(cntrlReq); } pst->event = (Event) EVTTFUCNTRLREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3224,7 +3224,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU102, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -3237,7 +3237,7 @@ Buffer *mBuf; (ErrVal)ETFU103, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3252,12 +3252,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU104, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&cntrlReq, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&cntrlReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3266,11 +3266,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, cntrlReq)); + return ((*func)(pst, spId, cntrlReq)); } @@ -3320,7 +3320,7 @@ TfuTtiIndInfo * ttiInd; (ErrVal)ETFU105, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuTtiIndInfo(ttiInd, mBuf) != ROK) { @@ -3331,12 +3331,12 @@ TfuTtiIndInfo * ttiInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)ttiInd, mBuf) != ROK) + if (oduPackPointer((PTR)ttiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3347,7 +3347,7 @@ TfuTtiIndInfo * ttiInd; /*MS_FIX:71858:Changed to SPutSBuf as being allocated with SGetSBuf*/ SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3359,7 +3359,7 @@ TfuTtiIndInfo * ttiInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)) != ROK) { @@ -3369,12 +3369,12 @@ TfuTtiIndInfo * ttiInd; (ErrVal)ETFU108, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } //pst->event = (Event) EVENT_SLOT_IND_TO_MAC; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD) @@ -3417,7 +3417,7 @@ SuId suId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU105, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3426,10 +3426,10 @@ SuId suId; (ErrVal)ETFU107, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUNONRTIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*********************************************************** @@ -3474,10 +3474,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU109, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId)); + return ((*func)(pst, suId)); } #endif @@ -3528,7 +3528,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; (ErrVal)ETFU119, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)pucchDeltaPwr, sizeof(TfuPucchDeltaPwrIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuPucchDeltaPwrIndInfo(pucchDeltaPwr, mBuf) != ROK) { @@ -3539,12 +3539,12 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)pucchDeltaPwr, mBuf) != ROK) + if (oduPackPointer((PTR)pucchDeltaPwr, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3553,7 +3553,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3565,13 +3565,13 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(pucchDeltaPwr); } pst->event = (Event) EVTTFUPUCCHDELPWR; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3622,7 +3622,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU122, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; @@ -3635,7 +3635,7 @@ Buffer *mBuf; (ErrVal)ETFU123, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3649,12 +3649,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU124, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&pucchDeltaPwr, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&pucchDeltaPwr, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3663,11 +3663,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, pucchDeltaPwr)); + return ((*func)(pst, suId, pucchDeltaPwr)); } #ifdef TFU_5GTF @@ -3702,13 +3702,13 @@ Buffer *mBuf; TRC3(cmPkTfuRbAssignA1Val324) - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->hqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); #ifdef UL_ADPT_DBG printf("cmPkTfuRbAssignA1Val324 param->ndi %d mcs %d param->hqProcId %d \n",param->ndi,param->mcs,param->hqProcId); #endif - RETVALUE(ROK); + return ROK; } @@ -3742,12 +3742,12 @@ Buffer *mBuf; TRC3(cmPkTfuRbAssignB1Val324) - CMCHKPK(SPkU8, param->bmiHqAckNack, mBuf); - CMCHKPK(SPkU8, param->RV, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->hqProcId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->bmiHqAckNack, mBuf); + CMCHKPK(oduUnpackUInt8, param->RV, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); + return ROK; } @@ -3781,10 +3781,10 @@ Buffer *mBuf; TRC3(cmPkTfuRbAssignVal326) - CMCHKPK(SPkU8, param->CyclicShiftInd, mBuf); - CMCHKPK(SPkU8, param->OCCInd, mBuf); - CMCHKPK(SPkU8, param->FreqBandIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->CyclicShiftInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->OCCInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->FreqBandIdx, mBuf); + return ROK; } @@ -3818,10 +3818,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuRbAssignA1Val324) - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + return ROK; } @@ -3855,12 +3855,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuRbAssignB1Val324) - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->RV, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bmiHqAckNack, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->RV, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bmiHqAckNack, mBuf); + return ROK; } @@ -3894,10 +3894,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuRbAssignVal326) - CMCHKUNPK(SUnpkU8, ¶m->FreqBandIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->OCCInd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CyclicShiftInd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->FreqBandIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->OCCInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CyclicShiftInd, mBuf); + return ROK; } @@ -3933,23 +3933,23 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormatA1A2Info) //printf("5GTF_DBG: cmPkTfuDciFormatA1Info() called by eNB\n"); - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->UL_PCRS, mBuf); - CMCHKPK(SPkU8, param->PMI, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); - - CMCHKPK(SPkU8, param->REMapIdx_DMRS_PCRS_numLayers, mBuf); - CMCHKPK(SPkU8, param->SRS_Symbol, mBuf); - CMCHKPK(SPkU8, param->SRS_Config, mBuf); - CMCHKPK(SPkU8, param->beamSwitch, mBuf); - CMCHKPK(SPkU8, param->uciOnxPUSCH, mBuf); - - CMCHKPK(SPkU8, param->numBSI_Reports, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_ProcInd, mBuf); - CMCHKPK(SPkU8, param->CSI_BRRS_Indicator, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_TxTiming, mBuf); - CMCHKPK(SPkU8, param->CSI_BSI_BRI_Req, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->UL_PCRS, mBuf); + CMCHKPK(oduUnpackUInt8, param->PMI, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + + CMCHKPK(oduUnpackUInt8, param->REMapIdx_DMRS_PCRS_numLayers, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Symbol, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Config, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamSwitch, mBuf); + CMCHKPK(oduUnpackUInt8, param->uciOnxPUSCH, mBuf); + + CMCHKPK(oduUnpackUInt8, param->numBSI_Reports, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_ProcInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BRRS_Indicator, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BSI_BRI_Req, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -3960,14 +3960,14 @@ Buffer *mBuf; CMCHKPK(cmPkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->symbIdx, mBuf); - CMCHKPK(SPkU8, param->beamIndex, mBuf); - CMCHKPK(SPkU16, param->RBAssign, mBuf); - CMCHKPK(SPkU8, param->xPUSCH_TxTiming, mBuf); - CMCHKPK(SPkU8, param->xPUSCHRange, mBuf); - CMCHKPK(SPkU8, param->formatType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->symbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->RBAssign, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUSCH_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUSCHRange, mBuf); + CMCHKPK(oduUnpackUInt8, param->formatType, mBuf); + return ROK; } @@ -4001,24 +4001,24 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormatB1B2Info) - CMCHKPK(SPkU8, param->DL_PCRS, mBuf); - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->DL_PCRS, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->AntPorts_numLayers, mBuf); - CMCHKPK(SPkU8, param->SRS_Symbol, mBuf); - CMCHKPK(SPkU8, param->SRS_Config, mBuf); - CMCHKPK(SPkU8, param->beamSwitch, mBuf); - CMCHKPK(SPkU8, param->freqResIdx_xPUCCH, mBuf); + CMCHKPK(oduUnpackUInt8, param->AntPorts_numLayers, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Symbol, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Config, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamSwitch, mBuf); + CMCHKPK(oduUnpackUInt8, param->freqResIdx_xPUCCH, mBuf); - CMCHKPK(SPkU8, param->xPUCCH_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUCCH_TxTiming, mBuf); - CMCHKPK(SPkU8, param->numBSI_Reports, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_ProcInd, mBuf); - CMCHKPK(SPkU8, param->CSI_BRRS_Indicator, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_TxTiming, mBuf); - CMCHKPK(SPkU8, param->CSI_BSI_BRI_Req, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBSI_Reports, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_ProcInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BRRS_Indicator, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BSI_BRI_Req, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -4029,12 +4029,12 @@ Buffer *mBuf; CMCHKPK(cmPkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKPK(SPkU8, param->symbIdx, mBuf); - CMCHKPK(SPkU8, param->beamIndex, mBuf); - CMCHKPK(SPkU16, param->RBAssign, mBuf); - CMCHKPK(SPkU8, param->xPDSCHRange, mBuf); - CMCHKPK(SPkU8, param->formatType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->symbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->RBAssign, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPDSCHRange, mBuf); + CMCHKPK(oduUnpackUInt8, param->formatType, mBuf); + return ROK; } @@ -4069,13 +4069,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormatA1A2Info) - CMCHKUNPK(SUnpkU8, ¶m->formatType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUSCHRange, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUSCH_TxTiming, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->RBAssign, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->symbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->formatType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUSCHRange, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUSCH_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->RBAssign, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->symbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -4086,25 +4086,25 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->CSI_BSI_BRI_Req, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_TxTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSI_BRRS_Indicator, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_ProcInd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBSI_Reports, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BSI_BRI_Req, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BRRS_Indicator, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_ProcInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBSI_Reports, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->uciOnxPUSCH, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamSwitch, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Config, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Symbol, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->REMapIdx_DMRS_PCRS_numLayers, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->uciOnxPUSCH, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamSwitch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Config, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Symbol, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->REMapIdx_DMRS_PCRS_numLayers, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->PMI, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->UL_PCRS, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->PMI, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->UL_PCRS, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4138,11 +4138,11 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormatB1B2Info) - CMCHKUNPK(SUnpkU8, ¶m->formatType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPDSCHRange, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->RBAssign, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->symbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->formatType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPDSCHRange, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->RBAssign, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->symbIdx, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -4153,24 +4153,24 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->CSI_BSI_BRI_Req, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_TxTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSI_BRRS_Indicator, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_ProcInd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBSI_Reports, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BSI_BRI_Req, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BRRS_Indicator, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_ProcInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBSI_Reports, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUCCH_TxTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->freqResIdx_xPUCCH, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamSwitch, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Config, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Symbol, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->AntPorts_numLayers, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->DL_PCRS, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUCCH_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->freqResIdx_xPUCCH, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamSwitch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Config, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Symbol, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->AntPorts_numLayers, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->DL_PCRS, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4208,29 +4208,29 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat0Info) /* tfu_c_001.main_3: Adding pack for hqProcId */ - CMCHKPK(SPkU8, param->hqProcId, mBuf); - CMCHKPK(SPkU8, param->txAntenna, mBuf); - CMCHKPK(SPkU8, param->numCqiBit, mBuf); - CMCHKPK(SPkU8, param->cqiReq, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->txAntenna, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCqiBit, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiReq, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); - CMCHKPK(SPkU8, param->ulIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulIdx, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->hoppingBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingBits, mBuf); /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU32, param->riv, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); #endif - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } @@ -4265,30 +4265,30 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat0Info) - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); #ifdef TFU_UPGRADE - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); #endif /* TFU_UPGRADE */ - CMCHKUNPK(SUnpkU8, ¶m->hoppingBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->ulIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiReq, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numCqiBit, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txAntenna, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiReq, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCqiBit, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txAntenna, mBuf); /* tfu_c_001.main_3: Adding unpack for hqProcId */ - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4338,19 +4338,19 @@ Buffer *mBuf; #ifndef TFU_RESMAP_CHANGE case TFU_ALLOC_TYPE_MAP: for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->u.resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->u.resAllocMap[i], mBuf); } break; #endif case TFU_ALLOC_TYPE_RIV: - CMCHKPK(SPkU32, param->u.riv, mBuf); + CMCHKPK(oduUnpackUInt32, param->u.riv, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -4387,17 +4387,17 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuAllocMapOrRiv) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_ALLOC_TYPE_RIV: - CMCHKUNPK(SUnpkU32, ¶m->u.riv, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->u.riv, mBuf); break; /*tfu_c_001.main_7 - ADD - TFU_RESMAP_CHANGE support */ #ifndef TFU_RESMAP_CHANGE case TFU_ALLOC_TYPE_MAP: for (i=0; iu.resAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.resAllocMap[i], mBuf); } break; @@ -4411,9 +4411,9 @@ Buffer *mBuf; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -4454,15 +4454,15 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat1AllocInfo) - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->resAllocMap[i], mBuf); } - CMCHKPK(SPkU8, param->isAllocType0, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isAllocType0, mBuf); + return ROK; } @@ -4503,15 +4503,15 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuDciFormat1AllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isAllocType0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAllocType0, mBuf); for (i=0; iresAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resAllocMap[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + return ROK; } @@ -4549,14 +4549,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1Info) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat1AllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4598,11 +4598,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormat1AllocInfo, ¶m->allocInfo, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } @@ -4643,21 +4643,21 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat2AAllocInfo) - CMCHKPK(SPkU8, param->transSwap, mBuf); - CMCHKPK(SPkU8, param->precoding, mBuf); + CMCHKPK(oduUnpackUInt8, param->transSwap, mBuf); + CMCHKPK(oduUnpackUInt8, param->precoding, mBuf); for (i=1; i >= 0; i--) { CMCHKPK(cmPkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->resAllocMap[i], mBuf); } - CMCHKPK(SPkU8, param->isAllocType0, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAllocType0, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4701,15 +4701,15 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->isAllocType0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAllocType0, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ for (i=0; iresAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resAllocMap[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ @@ -4720,9 +4720,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->precoding, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->transSwap, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->precoding, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->transSwap, mBuf); + return ROK; } #ifdef EMTC_ENABLE @@ -4761,13 +4761,13 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat6AAllocInfo) - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU32, param->riv, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4807,13 +4807,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat6AAllocInfo) - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); printf("In cmUnpkTfuDciFormat6AAllocInfo :: Passed \n"); - RETVALUE(ROK); + return ROK; } #endif @@ -4850,14 +4850,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat2AInfo) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat2AAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4896,11 +4896,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormat2AAllocInfo, ¶m->allocInfo, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } @@ -4947,20 +4947,20 @@ Buffer *mBuf; for (i=1; i >= 0; i--) { CMCHKPK(cmPkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->precoding, mBuf); - CMCHKPK(SPkU8, param->transSwap, mBuf); + CMCHKPK(oduUnpackUInt8, param->precoding, mBuf); + CMCHKPK(oduUnpackUInt8, param->transSwap, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->resAllocMap[i], mBuf); } /* tfu_c_001.main_4 - Changes for MIMO feature addition */ @@ -4968,9 +4968,9 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKPK(SPkU8, param->isAllocType0, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAllocType0, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5014,33 +5014,33 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->isAllocType0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAllocType0, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ for (i=0; iresAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resAllocMap[i], mBuf); } #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->transSwap, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->precoding, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->transSwap, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->precoding, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); for (i=0; i<=1; i++) { CMCHKUNPK(cmUnpkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5084,16 +5084,16 @@ Buffer *mBuf; /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ CMCHKPK(cmPkTfuDciFormat2AllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5136,17 +5136,17 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -5182,11 +5182,11 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat3Info) - CMCHKPK(SPkU8, param->isPucch, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPucch, mBuf); for (i=TFU_MAX_2BIT_TPC-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->tpcCmd[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5223,10 +5223,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat3Info) for (i=0; itpcCmd[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isPucch, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isPucch, mBuf); + return ROK; } @@ -5261,11 +5261,11 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat3AInfo) - CMCHKPK(SPkU8, param->isPucch, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPucch, mBuf); for (i=TFU_MAX_2BIT_TPC-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->tpcCmd[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5302,10 +5302,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat3AInfo) for (i=0; itpcCmd[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isPucch, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isPucch, mBuf); + return ROK; } #ifdef EMTC_ENABLE @@ -5343,22 +5343,22 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat60aInfo) - CMCHKPK(SPkU8, param->dciRep, mBuf); - CMCHKPK(SPkU8, param->isSrs, mBuf); - CMCHKPK(SPkU8, param->cqiReq, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciRep, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiReq, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); - CMCHKPK(SPkU8, param->ulIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulIdx, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->hqProcId, mBuf); - CMCHKPK(SPkU8, param->rep, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU32, param->riv, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rep, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } /*********************************************************** * @@ -5391,11 +5391,11 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchOrderInfoEmtc) - CMCHKPK(SPkU8, param->ceLevel, mBuf); - CMCHKPK(SPkU8, param->prachMaskIdx, mBuf); - CMCHKPK(SPkU8, param->preambleIdx, mBuf); - CMCHKPK(SPkU32, param->riv, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->ceLevel, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachMaskIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->preambleIdx, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); + return ROK; } /*********************************************************** @@ -5429,22 +5429,22 @@ Buffer *mBuf; TRC3(cmPkTfudciformat61aPdsch) - CMCHKPK(SPkU8, param->isTBMsg4, mBuf); - CMCHKPK(SPkU8, param->dciRep, mBuf); - CMCHKPK(SPkU8, param->harqAckOffst, mBuf); - CMCHKPK(SPkU8, param->pmiCfm, mBuf); - CMCHKPK(SPkU8, param->tPmi, mBuf); - CMCHKPK(SPkU8, param->isSrs, mBuf); - CMCHKPK(SPkU8, param->antPortAndScrId, mBuf); + CMCHKPK(oduUnpackUInt8, param->isTBMsg4, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciRep, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqAckOffst, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmiCfm, mBuf); + CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->antPortAndScrId, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->rep, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->rep, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); CMCHKPK(cmPkTfuDciFormat6AAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5489,11 +5489,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuPdcchOrderInfoEmtc, ¶m->t.pdcchOrder, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isPdcchOrder, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPdcchOrder, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5529,23 +5529,23 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat60aInfo) printf("In cmUnpkTfuDciFormat60aInfo :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rep, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->ulIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->cqiReq, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isSrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciRep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiReq, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciRep, mBuf); printf("In cmUnpkTfuDciFormat60aInfo :: Exit \n"); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -5579,12 +5579,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdcchOrderInfoEmtc) printf("In cmUnpkTfuPdcchOrderInfoEmtc :: Entry \n"); - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->preambleIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachMaskIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ceLevel, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->preambleIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachMaskIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevel, mBuf); printf("In cmUnpkTfuPdcchOrderInfoEmtc :: Passed \n"); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5617,7 +5617,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat61aInfo) - CMCHKUNPK(SUnpkU8, ¶m->isPdcchOrder, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPdcchOrder, mBuf); printf("1. cmUnpkTfuDciFormat61aInfo :: isPdcchOrder %d \n", param->isPdcchOrder); switch(param->isPdcchOrder) { case TRUE: @@ -5627,9 +5627,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfudciformat61aPdsch, ¶m->t.pdschInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif @@ -5668,13 +5668,13 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1dAllocInfo) - CMCHKPK(SPkU8, param->tPmi, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - CMCHKPK(SPkU8, param->isLocal, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isLocal, mBuf); + return ROK; } @@ -5714,13 +5714,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1dAllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isLocal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tPmi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tPmi, mBuf); + return ROK; } @@ -5759,17 +5759,17 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1dInfo) - CMCHKPK(SPkU8, param->dlPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlPwrOffset, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); CMCHKPK(cmPkTfuDciFormat1dAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5809,16 +5809,16 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1dInfo) CMCHKUNPK(cmUnpkTfuDciFormat1dAllocInfo, ¶m->allocInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->dlPwrOffset, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dlPwrOffset, mBuf); + return ROK; } @@ -5858,10 +5858,10 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1cInfo) - CMCHKPK(SPkU8, param->iTbs, mBuf); + CMCHKPK(oduUnpackUInt8, param->iTbs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5903,8 +5903,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->iTbs, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->iTbs, mBuf); + return ROK; } @@ -5944,16 +5944,16 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1bAllocInfo) - CMCHKPK(SPkU8, param->pmiCfm, mBuf); - CMCHKPK(SPkU8, param->tPmi, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmiCfm, mBuf); + CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - CMCHKPK(SPkU8, param->isLocal, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isLocal, mBuf); + return ROK; } @@ -5993,16 +5993,16 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1bAllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isLocal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tPmi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pmiCfm, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tPmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmiCfm, mBuf); + return ROK; } @@ -6038,9 +6038,9 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchOrderInfo) - CMCHKPK(SPkU8, param->prachMaskIdx, mBuf); - CMCHKPK(SPkU8, param->preambleIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->prachMaskIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->preambleIdx, mBuf); + return ROK; } @@ -6076,9 +6076,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdcchOrderInfo) - CMCHKUNPK(SUnpkU8, ¶m->preambleIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachMaskIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->preambleIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachMaskIdx, mBuf); + return ROK; } @@ -6118,14 +6118,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1aAllocInfo) - CMCHKPK(SPkU8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); CMCHKPK(cmPkTknU8, ¶m->harqProcId, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - CMCHKPK(SPkU8, param->isLocal, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isLocal, mBuf); + return ROK; } @@ -6165,14 +6165,14 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1aAllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isLocal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + return ROK; } @@ -6208,14 +6208,14 @@ Buffer *mBuf; TRC3(cmPkTfudciformat1aPdsch) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD CMCHKPK(cmPkTknU8, ¶m->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat1aAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6257,8 +6257,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTknU8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } #ifdef EMTC_ENABLE @@ -6298,31 +6298,31 @@ Buffer *mBuf; printf("1. cmUnpkTfudciformat61aPdsch :: Entry \n"); CMCHKUNPK(cmUnpkTfuDciFormat6AAllocInfo, ¶m->allocInfo, mBuf); printf("2. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); printf("3. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->rep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rep, mBuf); printf("4. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); printf("5. cmUnpkTfudciformat61aPdsch :: Entry \n"); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); printf("6. cmUnpkTfudciformat61aPdsch :: Entry \n"); #endif - CMCHKUNPK(SUnpkU8, ¶m->antPortAndScrId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->antPortAndScrId, mBuf); printf("7. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->isSrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSrs, mBuf); printf("8. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->tPmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tPmi, mBuf); printf("9. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->pmiCfm, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmiCfm, mBuf); printf("10. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->harqAckOffst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqAckOffst, mBuf); printf("11. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->dciRep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciRep, mBuf); printf("12. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->isTBMsg4, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isTBMsg4, mBuf); printf("1. cmUnpkTfudciformat61aPdsch :: Passed \n"); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -6354,11 +6354,11 @@ PRIVATE S16 cmUnpkTfuDirectIndication(param, mBuf) { TRC3(cmUnpkTfuDirectIndication) - CMCHKUNPK(SUnpkU8, ¶m->directInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->directInd, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -6393,11 +6393,11 @@ PUBLIC S16 cmUnpkTfuDciFormat62AllocInfo(param, mBuf) #endif { TRC3(cmUnpkTfuDciFormat62AllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -6433,9 +6433,9 @@ PRIVATE S16 cmUnpkTfudciformat62Pdsch(param, mBuf) CMCHKUNPK(cmUnpkTfuDciFormat62AllocInfo, ¶m->format62AllocInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->repNum, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciSubRepNum, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->repNum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciSubRepNum, mBuf); + return ROK; } @@ -6471,7 +6471,7 @@ PUBLIC S16 cmUnpkTfuDciFormat62Info(param, mBuf) { TRC3(cmUnpkTfuDciFormat62Info) - CMCHKUNPK(SUnpkU8, ¶m->isPaging, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPaging, mBuf); switch(param->isPaging) { case FALSE: CMCHKUNPK(cmUnpkTfuDirectIndication, ¶m->t.directIndication, mBuf); @@ -6480,11 +6480,11 @@ PUBLIC S16 cmUnpkTfuDciFormat62Info(param, mBuf) CMCHKUNPK(cmUnpkTfudciformat62Pdsch, ¶m->t.pdschInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -6528,10 +6528,10 @@ PRIVATE S16 cmPkTfuDirectIndication(param, mBuf) { TRC3(cmPkTfuDirectIndication) - CMCHKPK(SPkU8, param->directInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->directInd, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6571,11 +6571,11 @@ PUBLIC S16 cmPkTfuDciFormat62AllocInfo(param, mBuf) TRC3(cmPkTfuDciFormat6AAllocInfo) - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->riv, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->riv, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6610,10 +6610,10 @@ PRIVATE S16 cmPkTfudciformat62Pdsch(param, mBuf) { TRC3(cmPkTfudciformat62Pdsch) - CMCHKPK(SPkU8, param->dciSubRepNum, mBuf); - CMCHKPK(SPkU8, param->repNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciSubRepNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->repNum, mBuf); CMCHKPK(cmPkTfuDciFormat62AllocInfo, ¶m->format62AllocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6660,11 +6660,11 @@ PUBLIC S16 cmPkTfuDciFormat62Info(param, mBuf) CMCHKPK(cmPkTfuDirectIndication, ¶m->t.directIndication, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isPaging, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPaging, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6716,11 +6716,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuPdcchOrderInfo, ¶m->t.pdcchOrder, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isPdcchOrder, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPdcchOrder, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6758,7 +6758,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1aInfo) - CMCHKUNPK(SUnpkU8, ¶m->isPdcchOrder, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPdcchOrder, mBuf); switch(param->isPdcchOrder) { case TRUE: CMCHKUNPK(cmUnpkTfuPdcchOrderInfo, ¶m->t.pdcchOrder, mBuf); @@ -6767,9 +6767,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfudciformat1aPdsch, ¶m->t.pdschInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -6808,14 +6808,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1bInfo) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat1bAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6857,11 +6857,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormat1bAllocInfo, ¶m->allocInfo, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } @@ -6967,10 +6967,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuDciFormat0Info, ¶m->u.format0Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->dciFormat, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->dciFormat, mBuf); + return ROK; } @@ -7020,7 +7020,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->dciFormat, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->dciFormat, mBuf); switch(param->dciFormat) { case TFU_DCI_FORMAT_0: CMCHKUNPK(cmUnpkTfuDciFormat0Info, ¶m->u.format0Info, mBuf); @@ -7081,9 +7081,9 @@ Buffer *mBuf; break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7119,9 +7119,9 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandInfo) - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + return ROK; } @@ -7157,9 +7157,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandInfo) - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + return ROK; } @@ -7195,9 +7195,9 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandCqiInfo) - CMCHKPK(SPkU8, param->cqiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); CMCHKPK(cmPkTfuSubbandInfo, ¶m->subband, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7233,8 +7233,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandCqiInfo) CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subband, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); + return ROK; } @@ -7270,8 +7270,8 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchCceInfo) CMCHKPK(cmPkLteAggrLvl, param->aggrLvl, mBuf); - CMCHKPK(SPkU8, param->cceIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cceIdx, mBuf); + return ROK; } @@ -7306,9 +7306,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdcchCceInfo) - CMCHKUNPK(SUnpkU8, ¶m->cceIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cceIdx, mBuf); CMCHKUNPK(cmUnpkLteAggrLvl,(U32 *)¶m->aggrLvl, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7346,16 +7346,16 @@ Buffer *mBuf; switch(param->type) { case TFU_RPT_CQI: - CMCHKPK(SPkU8, param->u.cqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -7391,18 +7391,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode10) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: - CMCHKUNPK(SUnpkU8, ¶m->u.cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7439,9 +7439,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode11Cqi) CMCHKPK(cmPkTknU8, ¶m->wideDiffCqi, mBuf); - CMCHKPK(SPkU8, param->pmi, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -7477,10 +7477,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode11Cqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->wideDiffCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7521,13 +7521,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode11Cqi, ¶m->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -7563,18 +7563,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode11) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: CMCHKUNPK(cmUnpkTfuCqiMode11Cqi, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7609,9 +7609,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode20SubCqi) - CMCHKPK(SPkU8, param->l, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->l, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -7646,9 +7646,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode20SubCqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->l, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->l, mBuf); + return ROK; } @@ -7689,13 +7689,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode20SubCqi, ¶m->u.subCqi, mBuf); break; case TRUE: - CMCHKPK(SPkU8, param->u.wideCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.wideCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isWideband, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isWideband, mBuf); + return ROK; } @@ -7731,18 +7731,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode20Cqi) - CMCHKUNPK(SUnpkU8, ¶m->isWideband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isWideband, mBuf); switch(param->isWideband) { case TRUE: - CMCHKUNPK(SUnpkU8, ¶m->u.wideCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.wideCqi, mBuf); break; case FALSE: CMCHKUNPK(cmUnpkTfuCqiMode20SubCqi, ¶m->u.subCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7783,13 +7783,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode20Cqi, ¶m->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -7825,18 +7825,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode20) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: CMCHKUNPK(cmUnpkTfuCqiMode20Cqi, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7873,9 +7873,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode21SubCqi) CMCHKPK(cmPkTknU8, ¶m->diffCqi, mBuf); - CMCHKPK(SPkU8, param->l, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->l, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -7911,10 +7911,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode21SubCqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->l, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->l, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->diffCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7951,9 +7951,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode21WideCqi) CMCHKPK(cmPkTknU8, ¶m->diffCqi, mBuf); - CMCHKPK(SPkU8, param->pmi, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -7989,10 +7989,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode21WideCqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->diffCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8036,10 +8036,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode21WideCqi, ¶m->u.wideCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isWideband, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isWideband, mBuf); + return ROK; } @@ -8075,7 +8075,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode21Cqi) - CMCHKUNPK(SUnpkU8, ¶m->isWideband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isWideband, mBuf); switch(param->isWideband) { case TRUE: CMCHKUNPK(cmUnpkTfuCqiMode21WideCqi, ¶m->u.wideCqi, mBuf); @@ -8084,9 +8084,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiMode21SubCqi, ¶m->u.subCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8127,13 +8127,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode21Cqi, ¶m->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -8169,18 +8169,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode21) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: CMCHKUNPK(cmUnpkTfuCqiMode21Cqi, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8229,11 +8229,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiPucchMode10, ¶m->u.mode10Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->mode, mBuf); - CMCHKPK(SPkU8, param->cellIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellIdx, mBuf); + return ROK; } @@ -8268,8 +8268,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiPucch) - CMCHKUNPK(SUnpkU8, ¶m->cellIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); switch(param->mode) { case TFU_PUCCH_CQI_MODE10: CMCHKUNPK(cmUnpkTfuCqiPucchMode10, ¶m->u.mode10Info, mBuf); @@ -8284,9 +8284,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiPucchMode21, ¶m->u.mode21Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8323,8 +8323,8 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandMode12) CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); - CMCHKPK(SPkU8, param->pmi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + return ROK; } @@ -8360,9 +8360,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandMode12) - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8403,10 +8403,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandMode12, ¶m->subbandArr[i], mBuf); } for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqiIdx[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + return ROK; } @@ -8443,14 +8443,14 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode12) - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; icqiIdx[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx[i], mBuf); } for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8490,10 +8490,10 @@ Buffer *mBuf; for (i=TFU_MAX_DL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuSubbandInfo, ¶m->subbandArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideBandCqi, mBuf); - CMCHKPK(SPkU8, param->cqiIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); + return ROK; } @@ -8530,13 +8530,13 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode20) - CMCHKUNPK(SUnpkU8, ¶m->cqiIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->wideBandCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8577,16 +8577,16 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandInfo, ¶m->subbandArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideBandPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandPmi, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->wideBandCqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi[i], mBuf); } - CMCHKPK(SPkU8, param->pmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8624,20 +8624,20 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPuschMode22) for (i=0; icqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); for (i=0; iwideBandCqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->wideBandPmi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandPmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8657,8 +8657,8 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandMode30) CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -8677,9 +8677,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandMode30) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8719,9 +8719,9 @@ Buffer *mBuf; for (i=TFU_MAX_DL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuSubbandMode30, ¶m->subbandArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideBandCqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi, mBuf); + return ROK; } @@ -8758,12 +8758,12 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode30) - CMCHKUNPK(SUnpkU8, ¶m->wideBandCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8785,9 +8785,9 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8808,10 +8808,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandMode31) for (i=0; icqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[i], mBuf); } CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8858,12 +8858,12 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandDlCqiInfo, ¶m->subbandCqiArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->wideBandCqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi[i], mBuf); } - CMCHKPK(SPkU8, param->pmi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + return ROK; } @@ -8900,11 +8900,11 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode31) - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); for (i=0; iwideBandCqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ @@ -8916,7 +8916,7 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - RETVALUE(ROK); + return ROK; } @@ -8969,14 +8969,14 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiPuschMode12, ¶m->u.mode12Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkTknU8, ¶m->ri, mBuf); - CMCHKPK(SPkU32, param->mode, mBuf); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); - CMCHKPK(SPkU8, param->cellIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cellIdx, mBuf); + return ROK; } @@ -9012,8 +9012,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiPusch) - CMCHKUNPK(SUnpkU8, ¶m->cellIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->ri, mBuf); switch(param->mode) { case TFU_PUSCH_CQI_MODE_12: @@ -9032,9 +9032,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiPuschMode31, ¶m->u.mode31Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9077,15 +9077,15 @@ Buffer *mBuf; { CMCHKPK(cmPkTfuDlCqiPusch, ¶m->pusch.puschCqi[idx], mBuf); } - CMCHKPK(SPkU8, param->pusch.numOfCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->pusch.numOfCells, mBuf); break; case TRUE: CMCHKPK(cmPkTfuDlCqiPucch, ¶m->pucchCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9128,16 +9128,16 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDlCqiPucch, ¶m->pucchCqi, mBuf); break; case FALSE: - CMCHKUNPK(SUnpkU8, ¶m->pusch.numOfCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pusch.numOfCells, mBuf); for (idx = param->pusch.numOfCells; idx > 0; idx--) { CMCHKUNPK(cmUnpkTfuDlCqiPusch, ¶m->pusch.puschCqi[idx-1], mBuf); } break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9185,7 +9185,7 @@ Buffer *mBuf; /*ccpu00116923 - ADD - SRS present support*/ /*tfu_c_001.main_7 - ADD - SRS present field inclusion */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU8, param->srsPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsPres, mBuf); #endif count = param->ueRecpReqLst.count; node = param->ueRecpReqLst.last; @@ -9196,10 +9196,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->ueRecpReqLst, &tfuUeRecpReqInfo->lnk); tfuUeRecpReqInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9249,7 +9249,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->ueRecpReqLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntsrsPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsPres, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -9297,20 +9297,20 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->grpId, mBuf); - CMCHKPK(SPkU8, param->sccIdx, mBuf); - CMCHKPK(SPkU8, param->sectorId, mBuf); + CMCHKPK(oduUnpackUInt8, param->grpId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->sectorId, mBuf); #endif /* TFU_5GTF */ CMCHKPK(cmPkTfuDciInfo, ¶m->dci, mBuf); - CMCHKPK(SPkU8, param->dciNumOfBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciNumOfBits, mBuf); CMCHKPK(cmPkLteAggrLvl, param->aggrLvl, mBuf); - CMCHKPK(SPkU16, param->nCce, mBuf); + CMCHKPK(oduUnpackUInt16, param->nCce, mBuf); #ifdef LTEMAC_SPS CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(SPkU8, param->isSpsRnti, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSpsRnti, mBuf); #endif CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9348,19 +9348,19 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); #ifdef LTEMAC_SPS - CMCHKUNPK(SUnpkU8, ¶m->isSpsRnti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSpsRnti, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); #endif - CMCHKUNPK(SUnpkU16, ¶m->nCce, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->nCce, mBuf); CMCHKUNPK(cmUnpkLteAggrLvl, (U32*)¶m->aggrLvl, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciNumOfBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciNumOfBits, mBuf); CMCHKUNPK(cmUnpkTfuDciInfo, ¶m->dci, mBuf); #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->sectorId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sccIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->grpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sectorId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sccIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->grpId, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -9400,15 +9400,15 @@ Buffer *mBuf; TRC3(cmPkTfuPhichInfo) /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU16, param->txPower, mBuf); + CMCHKPK(oduUnpackUInt16, param->txPower, mBuf); #endif #ifdef TFU_TDD - CMCHKPK(SPkU8, param->iPhich, mBuf); + CMCHKPK(oduUnpackUInt8, param->iPhich, mBuf); #endif - CMCHKPK(SPkU8, param->isAck, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + return ROK; } @@ -9447,17 +9447,17 @@ Buffer *mBuf; TRC3(cmUnpkTfuPhichInfo) - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAck, mBuf); /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->iPhich, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->iPhich, mBuf); #endif #ifdef TFU_UPGRADE - CMCHKUNPK(SUnpkU16, ¶m->txPower, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txPower, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -9510,7 +9510,7 @@ Buffer *mBuf; cmLListDelFrm(¶m->dlMpdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); count = param->ulMpdcchLst.count; node = param->ulMpdcchLst.last; while (node) { @@ -9520,10 +9520,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->ulMpdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); #endif #ifdef LTEMAC_SPS /* SPS_NEW_CHGS */ - CMCHKPK(cmPkBool, param->isSPSOcc, mBuf); + CMCHKPK(oduPackBool, param->isSPSOcc, mBuf); #endif count = param->phichLst.count; node = param->phichLst.last; @@ -9534,7 +9534,7 @@ Buffer *mBuf; cmLListDelFrm(¶m->phichLst, &tfuPhichInfo->lnk); tfuPhichInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); count = param->dlPdcchLst.count; node = param->dlPdcchLst.last; while (node) { @@ -9544,7 +9544,7 @@ Buffer *mBuf; cmLListDelFrm(¶m->dlPdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); count = param->ulPdcchLst.count; node = param->ulPdcchLst.last; while (node) { @@ -9557,12 +9557,12 @@ Buffer *mBuf; cmLListDelFrm(¶m->ulPdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); - CMCHKPK(SPkU8, param->cfi, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->dlTiming, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->ulTiming, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9610,9 +9610,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->ulTiming, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->dlTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cfi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); cmLListInit(¶m->ulPdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuPdcchInfo; } cmLListInit(¶m->dlPdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuPdcchInfo; } cmLListInit(¶m->phichLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntisSPSOcc, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->isSPSOcc, mBuf); #endif #ifdef EMTC_ENABLE cmLListInit(¶m->ulMpdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuPdcchInfo; } cmLListInit(¶m->dlMpdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); printf("4. cmUnpkTfuCntrlReqInfo :: count %ld \n", count); for (loopCnt=0; loopCntu.format1AllocInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->format, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->format, mBuf); + return ROK; } @@ -9795,7 +9795,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdschDciInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->format, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->format, mBuf); switch(param->format) { case TFU_DCI_FORMAT_1: CMCHKUNPK(cmUnpkTfuDciFormat1AllocInfo, ¶m->u.format1AllocInfo, mBuf); @@ -9841,9 +9841,9 @@ Buffer *mBuf; break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE @@ -9880,11 +9880,11 @@ Buffer *mBuf; for(idx=TFU_MAX_DL_SUBBAND-1;idx>=0; idx--) { for (idx2=param->numPhyAnt -1; idx2 >= 0; idx2--) { - CMCHKPK(SPkU16, param->bfValue[idx2], mBuf);} - CMCHKPK(SPkU8, param->numPhyAnt, mBuf); - CMCHKPK(SPkU8, param->sbIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->bfValue[idx2], mBuf);} + CMCHKPK(oduUnpackUInt8, param->numPhyAnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->sbIndex, mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -9919,13 +9919,13 @@ PUBLIC S16 cmUnpkTfuBfVectorInfo(param, mBuf) TRC3(cmUnpkTfuBfVectorInfo) for(idx=0;idxsbIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numPhyAnt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sbIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numPhyAnt, mBuf); for (idx2=0; idx2 numPhyAnt; idx2++) { - CMCHKUNPK(SUnpkU16, ¶m->bfValue[idx2], mBuf);} + CMCHKUNPK(oduPackUInt16, ¶m->bfValue[idx2], mBuf);} } - RETVALUE(ROK); + return ROK; } #endif @@ -9966,29 +9966,29 @@ Buffer *mBuf; TRC3(cmPkTfuDatReqPduInfo) /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(SPkU8, param->isEnbSFR, mBuf); + CMCHKPK(oduUnpackUInt8, param->isEnbSFR, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU16, param->txPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, param->txPwrOffset, mBuf); if(param->transMode == TFU_UE_TM_7) { CMCHKPK(cmPkTfuBfVectorInfo, param->bfVector, mBuf); - CMCHKPK(SPkU8, param->numBfVectors, mBuf); - CMCHKPK(SPkU8, param->numBfPrbPerSb, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBfVectors, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBfPrbPerSb, mBuf); } - CMCHKPK(SPkU8, param->deltaPowOffIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->deltaPowOffIdx, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(SPkU8, param->pa, mBuf); + CMCHKPK(oduUnpackUInt8, param->pa, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKPK(SPkU8, param->numLayers, mBuf); + CMCHKPK(oduUnpackUInt8, param->numLayers, mBuf); #endif - CMCHKPK(cmPkBool, param->isTApres, mBuf); + CMCHKPK(oduPackBool, param->isTApres, mBuf); CMCHKPK(cmPkTknU32, ¶m->doa, mBuf); - CMCHKPK(SPkU32, param->transMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->transMode, mBuf); CMCHKPK(cmPkTfuDlCqiPuschInfo, ¶m->puschPmiInfo, mBuf); - CMCHKPK(SPkU8, param->puschRptUsd, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschRptUsd, mBuf); for (i = 0; i < TFU_MAX_TB; i++) { #ifndef L2_OPTMZ @@ -10028,21 +10028,21 @@ Buffer *mBuf; mBuf); } - CMCHKPK(SPkU32, param->tbInfo[i].lchInfo[lchIdx].numPdu, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbInfo[i].lchInfo[lchIdx].numPdu, mBuf); } - CMCHKPK(SPkU32, param->tbInfo[i].numLch, mBuf); - CMCHKPK(SPkU32, param->tbInfo[i].padSize, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbInfo[i].numLch, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbInfo[i].padSize, mBuf); CMCHKPK(cmPkBuffer, ¶m->tbInfo[i].macCes, mBuf); CMCHKPK(cmPkBuffer, ¶m->tbInfo[i].macHdr, mBuf); CMCHKPK(cmPkMsgLen, param->tbInfo[i].tbSize, mBuf); - CMCHKPK(cmPkBool, param->tbInfo[i].tbPres, mBuf); + CMCHKPK(oduPackBool, param->tbInfo[i].tbPres, mBuf); #endif } - CMCHKPK(SPkU8, tbMask, mBuf); - CMCHKPK(SPkU8, param->nmbOfTBs, mBuf); + CMCHKPK(oduUnpackUInt8, tbMask, mBuf); + CMCHKPK(oduUnpackUInt8, param->nmbOfTBs, mBuf); CMCHKPK(cmPkTfuPdschDciInfo, ¶m->dciInfo, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10084,9 +10084,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(cmUnpkTfuPdschDciInfo, ¶m->dciInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbOfTBs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbOfTBs, mBuf); - CMCHKUNPK(SUnpkU8, &tbMask, mBuf); + CMCHKUNPK(oduPackUInt8, &tbMask, mBuf); for (i=0; imBuf[i] = NULLP; } #else /* L2_OPTMZ*/ - CMCHKUNPK(cmUnpkBool, ¶m->tbInfo[i].tbPres, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->tbInfo[i].tbPres, mBuf); CMCHKUNPK(cmUnpkMsgLen, ¶m->tbInfo[i].tbSize, mBuf); CMCHKUNPK(cmUnpkBuffer, ¶m->tbInfo[i].macHdr, mBuf); CMCHKUNPK(cmUnpkBuffer, ¶m->tbInfo[i].macCes, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->tbInfo[i].padSize, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->tbInfo[i].numLch, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->tbInfo[i].padSize, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tbInfo[i].numLch, mBuf); for(lchIdx = 0; lchIdx < param->tbInfo[i].numLch; lchIdx++) { - CMCHKUNPK(SUnpkU32, (U32 *)¶m->tbInfo[i].lchInfo[lchIdx].numPdu, + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tbInfo[i].lchInfo[lchIdx].numPdu, mBuf); for(pduIdx = 0; pduIdx < param->tbInfo[i].lchInfo[lchIdx].numPdu; pduIdx++) @@ -10126,32 +10126,32 @@ Buffer *mBuf; #endif /* L2_OPTMZ*/ } - CMCHKUNPK(SUnpkU8, ¶m->puschRptUsd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->puschRptUsd, mBuf); CMCHKUNPK(cmUnpkTfuDlCqiPuschInfo, ¶m->puschPmiInfo, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->transMode, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->transMode, mBuf); CMCHKUNPK(cmUnpkTknU32, ¶m->doa, mBuf); - CMCHKUNPK(cmUnpkBool, ¶m->isTApres, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->isTApres, mBuf); /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKUNPK(SUnpkU8, ¶m->numLayers, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numLayers, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKUNPK(SUnpkU8, ¶m->pa, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pa, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKUNPK(SUnpkU8, ¶m->deltaPowOffIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->deltaPowOffIdx, mBuf); if(param->transMode == TFU_UE_TM_7) { - CMCHKUNPK(SUnpkU8, ¶m->numBfPrbPerSb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBfVectors, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBfPrbPerSb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBfVectors, mBuf); CMCHKUNPK(cmUnpkTfuBfVectorInfo, param->bfVector, mBuf); } - CMCHKUNPK(SUnpkU16, ¶m->txPwrOffset, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txPwrOffset, mBuf); #endif /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKUNPK(SUnpkU8, ¶m->isEnbSFR, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isEnbSFR, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - RETVALUE(ROK); + return ROK; } @@ -10202,11 +10202,11 @@ Buffer *mBuf; cmLListDelFrm(¶m->pdus, &tfuDatReqPduInfo->lnk); tfuDatReqPduInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkTknBuf, ¶m->bchDat, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10253,14 +10253,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKUNPK(cmUnpkTknBuf, ¶m->bchDat, &mBuf); cmLListInit(¶m->pdus); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntpdus, &tfuDatReqPduInfo->lnk); tfuDatReqPduInfo->lnk.node = (PTR)tfuDatReqPduInfo; } - RETVALUE(ROK); + return ROK; } @@ -10297,7 +10297,7 @@ Buffer *mBuf; CMCHKPK(cmPkBuffer, ¶m->mBuf, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10334,7 +10334,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(cmUnpkBuffer, ¶m->mBuf, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10376,8 +10376,8 @@ Buffer *mBuf; TRC3(cmPkTfuDatIndInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->sccIdx, mBuf); - CMCHKPK(SPkU8, param->sectorId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->sectorId, mBuf); #endif /* TFU_5GTF */ count = param->datIndLst.count; node = param->datIndLst.last; @@ -10388,10 +10388,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->datIndLst, &tfuDatInfo->lnk); tfuDatInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10436,7 +10436,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->datIndLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuDatInfo; } #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->sectorId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sccIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sectorId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sccIdx, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -10486,7 +10486,7 @@ Buffer *mBuf; TRC3(cmPkTfuSrInfo) CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10525,7 +10525,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuSrInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10574,10 +10574,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->srLst, &tfuSrInfo->lnk); tfuSrInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10621,14 +10621,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->srLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntsrLst, &tfuSrInfo->lnk); tfuSrInfo->lnk.node = (PTR)tfuSrInfo; } - RETVALUE(ROK); + return ROK; } /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ @@ -10666,18 +10666,18 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuHqInfo) - CMCHKPK(SPkU8, param->isPusch, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPusch, mBuf); for (i=TFU_MAX_HARQ_FDBKS-1; i >= 0; i--) { - CMCHKPK(SPkU32, param->isAck[i], mBuf); + CMCHKPK(oduUnpackUInt32, param->isAck[i], mBuf); } #ifdef TFU_TDD - CMCHKPK(SPkU8, param->M, mBuf); + CMCHKPK(oduUnpackUInt8, param->M, mBuf); #endif/*TFU_TDD*/ - CMCHKPK(SPkU8, param->noOfTbs, mBuf); + CMCHKPK(oduUnpackUInt8, param->noOfTbs, mBuf); /* ACC-TDD ccpu00130520 */ - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ @@ -10716,16 +10716,16 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); /* ACC-TDD ccpu00130520 */ - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->noOfTbs, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->noOfTbs, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->M, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->M, mBuf); #endif for (i=0; iisAck[i], mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->isAck[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isPusch, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isPusch, mBuf); + return ROK; } @@ -10777,10 +10777,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->hqIndLst, &tfuHqInfo->lnk); tfuHqInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10825,14 +10825,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->hqIndLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCnthqIndLst, &tfuHqInfo->lnk); tfuHqInfo->lnk.node = (PTR)tfuHqInfo; } - RETVALUE(ROK); + return ROK; } @@ -10868,7 +10868,7 @@ Buffer *mBuf; TRC3(cmPkTfuUlCqiInfo) CMCHKPK(cmPkTfuSubbandCqiInfo, ¶m->subbandCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10904,7 +10904,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuUlCqiInfo) CMCHKUNPK(cmUnpkTfuSubbandCqiInfo, ¶m->subbandCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10944,11 +10944,11 @@ Buffer *mBuf; for (i=TFU_MAX_UL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuUlCqiInfo, ¶m->ulCqiInfoArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideCqi, mBuf); - CMCHKPK(SPkU8, param->isTxPort0, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->isTxPort0, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10986,13 +10986,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuUlCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isTxPort0, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->wideCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isTxPort0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; iulCqiInfoArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -11044,10 +11044,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->ulCqiRpt, &tfuUlCqiRpt->lnk); tfuUlCqiRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11094,14 +11094,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->ulCqiRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntulCqiRpt, &tfuUlCqiRpt->lnk); tfuUlCqiRpt->lnk.node = (PTR)tfuUlCqiRpt; } - RETVALUE(ROK); + return ROK; } @@ -11140,10 +11140,10 @@ Buffer *mBuf; TRC3(cmPkTfuDlCqiRpt) if (cmPkTfuDlCqiInfo(param->isPucchInfo, ¶m->dlCqiInfo, mBuf) != ROK) - RETVALUE(RFAILED); - CMCHKPK(SPkU8, param->isPucchInfo, mBuf); + return RFAILED; + CMCHKPK(oduUnpackUInt8, param->isPucchInfo, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11181,10 +11181,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isPucchInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPucchInfo, mBuf); if (cmUnpkTfuDlCqiInfo (param->isPucchInfo, ¶m->dlCqiInfo, mBuf) != ROK) - RETVALUE(RFAILED); - RETVALUE(ROK); + return RFAILED; + return ROK; } @@ -11234,10 +11234,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->dlCqiRptsLst, &tfuDlCqiRpt->lnk); tfuDlCqiRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11282,14 +11282,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->dlCqiRptsLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntdlCqiRptsLst, &tfuDlCqiRpt->lnk); tfuDlCqiRpt->lnk.node = (PTR)tfuDlCqiRpt; } - RETVALUE(ROK); + return ROK; } @@ -11326,9 +11326,9 @@ Buffer *mBuf; TRC3(cmPkTfuCrcInfo) CMCHKPK(cmPkTknU8, ¶m->rv, mBuf); - CMCHKPK(SPkU8, param->isFailure, mBuf); + CMCHKPK(oduUnpackUInt8, param->isFailure, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11365,9 +11365,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuCrcInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isFailure, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isFailure, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->rv, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11410,8 +11410,8 @@ Buffer *mBuf; TRC3(cmPkTfuCrcIndInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->sccIdx, mBuf); - CMCHKPK(SPkU8, param->sectorId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->sectorId, mBuf); #endif /* TFU_5GTF */ count = param->crcLst.count; node = param->crcLst.last; @@ -11422,10 +11422,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->crcLst, &tfuCrcIndInfo->lnk); tfuCrcIndInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11471,7 +11471,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->crcLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuCrcIndInfo; } #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->sectorId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sccIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sectorId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sccIdx, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -11518,9 +11518,9 @@ Buffer *mBuf; TRC3(cmPkTfuTimingAdvInfo) - CMCHKPK(SPkU8, param->timingAdv, mBuf); + CMCHKPK(oduUnpackUInt8, param->timingAdv, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11557,8 +11557,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuTimingAdvInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->timingAdv, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->timingAdv, mBuf); + return ROK; } @@ -11608,10 +11608,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->timingAdvLst, &tfuTimingAdvInfo->lnk); tfuTimingAdvInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11656,14 +11656,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->timingAdvLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCnttimingAdvLst, &tfuTimingAdvInfo->lnk); tfuTimingAdvInfo->lnk.node = (PTR)tfuTimingAdvInfo; } - RETVALUE(ROK); + return ROK; } /*CA dev Start*/ @@ -11699,13 +11699,13 @@ Buffer *mBuf; TRC3(cmPkTfuTtiCellInfo) - CMCHKPK(SPkU8, param->ulBlankSf, mBuf); - CMCHKPK(SPkU8, param->dlBlankSf, mBuf); - CMCHKPK(SPkU8, param->schTickDelta, mBuf); - CMCHKPK(cmPkBool, param->isDummyTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulBlankSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlBlankSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->schTickDelta, mBuf); + CMCHKPK(oduPackBool, param->isDummyTti, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*CA dev End*/ @@ -11745,9 +11745,9 @@ Buffer *mBuf; for (i=(param->numCells-1); i >= 0; i--) { CMCHKPK(cmPkTfuTtiCellInfo, ¶m->cells[i], mBuf); } - CMCHKPK(SPkU8, param->numCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCells, mBuf); /*CA dev End*/ - RETVALUE(ROK); + return ROK; } /* CA dev Start */ @@ -11785,11 +11785,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); - CMCHKUNPK(cmUnpkBool, ¶m->isDummyTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->schTickDelta, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dlBlankSf, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulBlankSf, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduUnpackBool, ¶m->isDummyTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->schTickDelta, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlBlankSf, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulBlankSf, mBuf); + return ROK; } /* CA dev End */ @@ -11830,12 +11830,12 @@ Buffer *mBuf; TRC3(cmPkTfuRaReqInfo) - CMCHKPK(SPkU8, param->cqiIdx, mBuf); - CMCHKPK(SPkU8, param->cqiPres, mBuf); - CMCHKPK(SPkU8, param->tpc, mBuf); - CMCHKPK(SPkU16, param->ta, mBuf); - CMCHKPK(SPkU8, param->rapId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpc, mBuf); + CMCHKPK(oduUnpackUInt16, param->ta, mBuf); + CMCHKPK(oduUnpackUInt8, param->rapId, mBuf); + return ROK; } @@ -11876,12 +11876,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuRaReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->rapId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->ta, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->rapId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->ta, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpc, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); + return ROK; } @@ -11924,17 +11924,17 @@ Buffer *mBuf; CMCHKPK(cmPkTfuRaReqInfo, &(param->raReqInfoArr[i]), mBuf); } #ifdef PRACH_5GTF - CMCHKPK(SPkU16, param->nPwrFactor, mBuf); - CMCHKPK(SPkU8, param->nPRACHSymbIndex, mBuf); - CMCHKPK(SPkU8, param->nf1Value, mBuf); - CMCHKPK(SPkU8, param->nCyclicShift, mBuf); - CMCHKPK(SPkU8, param->nRootSeq, mBuf); - CMCHKPK(SPkU8, param->nPRACHConfiguration, mBuf); - CMCHKPK(SPkU8, param->nPreambleFormat, mBuf); -#endif - CMCHKPK(SPkU8, param->numRaReqInfo, mBuf); + CMCHKPK(oduUnpackUInt16, param->nPwrFactor, mBuf); + CMCHKPK(oduUnpackUInt8, param->nPRACHSymbIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->nf1Value, mBuf); + CMCHKPK(oduUnpackUInt8, param->nCyclicShift, mBuf); + CMCHKPK(oduUnpackUInt8, param->nRootSeq, mBuf); + CMCHKPK(oduUnpackUInt8, param->nPRACHConfiguration, mBuf); + CMCHKPK(oduUnpackUInt8, param->nPreambleFormat, mBuf); +#endif + CMCHKPK(oduUnpackUInt8, param->numRaReqInfo, mBuf); CMCHKPK(cmPkLteRnti, param->raRnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11974,25 +11974,25 @@ Buffer *mBuf; TRC3(cmUnpkTfuRachInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->raRnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRaReqInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRaReqInfo, mBuf); #ifdef PRACH_5GTF - CMCHKUNPK(SPkU8, param->nPreambleFormat, mBuf); - CMCHKUNPK(SPkU8, param->nPRACHConfiguration, mBuf); - CMCHKUNPK(SPkU8, param->nRootSeq, mBuf); - CMCHKUNPK(SPkU8, param->nCyclicShift, mBuf); - CMCHKUNPK(SPkU8, param->nf1Value, mBuf); - CMCHKUNPK(SPkU8, param->nPRACHSymbIndex, mBuf); - CMCHKUNPK(SPkU16, param->nPwrFactor, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nPreambleFormat, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nPRACHConfiguration, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nRootSeq, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nCyclicShift, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nf1Value, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nPRACHSymbIndex, mBuf); + CMCHKUNPK(oduUnpackUInt16, param->nPwrFactor, mBuf); #endif if (cmGetMem (&(memCp), (sizeof(TfuRaReqInfo) * param->numRaReqInfo), (Ptr *)¶m->raReqInfoArr) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i=0; inumRaReqInfo; i++) { CMCHKUNPK(cmUnpkTfuRaReqInfo, ¶m->raReqInfoArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -12047,13 +12047,13 @@ Buffer *mBuf; if (ROK != cmPkTfuRachInfo(param->memCp, &(param->rachInfoArr[i]), mBuf)) { - RETVALUE(RFAILED); + return RFAILED; } } - CMCHKPK(SPkU8, param->nmbOfRaRnti, mBuf); + CMCHKPK(oduUnpackUInt8, param->nmbOfRaRnti, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12105,20 +12105,20 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbOfRaRnti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbOfRaRnti, mBuf); if (cmGetMem (&(param->memCp), (sizeof(TfuRachInfo) * param->nmbOfRaRnti), (Ptr *)¶m->rachInfoArr) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i=0; inmbOfRaRnti; i++) { if (ROK != cmUnpkTfuRachInfo(param->memCp, ¶m->rachInfoArr[i], mBuf)) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -12155,7 +12155,7 @@ Buffer *mBuf; CMCHKPK(SPkS8, param->pucchDeltaPwr, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12192,7 +12192,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pucchDeltaPwr, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12243,10 +12243,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->pucchDeltaPwrLst, &tfuPucchDeltaPwr->lnk); tfuPucchDeltaPwr->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12292,14 +12292,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->pucchDeltaPwrLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntpucchDeltaPwrLst, &tfuPucchDeltaPwr->lnk); tfuPucchDeltaPwr->lnk.node = (PTR)tfuPucchDeltaPwr; } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -12317,13 +12317,13 @@ Buffer *mBuf; MsgLen msgLen=0; TRC3(cmPkBuffer) if (SFndLenMsg(*param, &msgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SCatMsg(mBuf, *param, M1M2) != ROK) - RETVALUE(RFAILED); + return RFAILED; TFU_FREE_MSG(*param); *param = NULLP; CMCHKPK(cmPkMsgLen, msgLen, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI PUBLIC S16 cmUnpkBuffer @@ -12341,10 +12341,10 @@ Buffer *mBuf; TRC3(cmUnpkBuffer) CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SSegMsg(mBuf, totalMsgLen-msgLen, param) != ROK) - RETVALUE(RFAILED); - RETVALUE(ROK); + return RFAILED; + return ROK; } @@ -12393,7 +12393,7 @@ TfuDoaIndInfo * doaInd; (ErrVal)ETFU125, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)doaInd, sizeof(TfuDoaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } cmPkTfuDoaIndInfo(doaInd, mBuf); if (SPkS16(suId, mBuf) != ROK) { @@ -12404,11 +12404,11 @@ TfuDoaIndInfo * doaInd; #endif TFU_FREE_MEM(doaInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MEM(doaInd); pst->event = (Event) EVTTFUDOAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -12459,7 +12459,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU127, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } { Mem sMem; @@ -12472,13 +12472,13 @@ Buffer *mBuf; (ErrVal)ETFU128, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } cmUnpkTfuDoaIndInfo(doaInd, (Ptr)&doaInd->memCp, mBuf); TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, doaInd)); + return ((*func)(pst, suId, doaInd)); } @@ -12514,10 +12514,10 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormatTbInfo) - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + return ROK; } @@ -12553,10 +12553,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormatTbInfo) - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + return ROK; } @@ -12593,10 +12593,10 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandDlCqiInfo) for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqiIdx[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx[i], mBuf); } CMCHKPK(cmPkTfuSubbandInfo, ¶m->subband, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12634,9 +12634,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subband, mBuf); for (i=0; icqiIdx[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx[i], mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12681,10 +12681,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiPuschMode12, ¶m->u.mode12Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->mode, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); + return ROK; } @@ -12720,7 +12720,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiPuschInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); switch(param->mode) { case TFU_PUSCH_CQI_MODE_12: CMCHKUNPK(cmUnpkTfuCqiPuschMode12, ¶m->u.mode12Info, mBuf); @@ -12732,9 +12732,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiPuschMode31, ¶m->u.mode31Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -12768,9 +12768,9 @@ Buffer *mBuf; TRC3(cmPkTfuDoaRpt) - CMCHKPK(SPkU32, param->doa, mBuf); + CMCHKPK(oduUnpackUInt32, param->doa, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12807,8 +12807,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuDoaRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->doa, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->doa, mBuf); + return ROK; } @@ -12859,9 +12859,9 @@ Buffer *mBuf; cmLListDelFrm(¶m->doaRpt, &tfuDoaRpt->lnk); tfuDoaRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12906,14 +12906,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); cmLListInit(¶m->doaRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntdoaRpt, &tfuDoaRpt->lnk); tfuDoaRpt->lnk.node = (PTR)tfuDoaRpt; } - RETVALUE(ROK); + return ROK; } @@ -12954,17 +12954,17 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuSrsRpt) - CMCHKPK(SPkU8, param->wideCqi, mBuf); - CMCHKPK(SPkU8, param->wideCqiPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideCqiPres, mBuf); for (i=TFU_MAX_UL_RB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->snr[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->snr[i], mBuf); } - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->numRbs, mBuf); - CMCHKPK(SPkU16, param->ta, mBuf); - CMCHKPK(SPkU16, param->dopEst, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRbs, mBuf); + CMCHKPK(oduUnpackUInt16, param->ta, mBuf); + CMCHKPK(oduUnpackUInt16, param->dopEst, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13003,16 +13003,16 @@ Buffer *mBuf; TRC3(cmUnpkTfuSrsRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dopEst, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->ta, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRbs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dopEst, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->ta, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRbs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); for (i=0; isnr[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->snr[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->wideCqiPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->wideCqi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->wideCqiPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideCqi, mBuf); + return ROK; } @@ -13064,10 +13064,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->srsRpt, &tfuSrsRpt->lnk); tfuSrsRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13114,14 +13114,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->srsRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntsrsRpt, &tfuSrsRpt->lnk); tfuSrsRpt->lnk.node = (PTR)tfuSrsRpt; } - RETVALUE(ROK); + return ROK; } @@ -13162,19 +13162,19 @@ Buffer *mBuf; TRC3(cmPkTfuRawCqiRpt) #ifdef TFU_5GTF - CMCHKPK(SPkU32, param->uciPayload, mBuf); + CMCHKPK(oduUnpackUInt32, param->uciPayload, mBuf); #else S32 i; for (i=CM_LTE_MAX_CELLS-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->ri[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->ri[i], mBuf); } for (i=TFU_MAX_CQI_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqiBits[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiBits[i], mBuf); } #endif - CMCHKPK(SPkU8, param->numBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBits, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13216,19 +13216,19 @@ Buffer *mBuf; TRC3(cmUnpkTfuRawCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBits, mBuf); #ifndef TFU_5GTF S32 i; for (i=0; icqiBits[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiBits[i], mBuf); } for (i=0; iri[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ri[i], mBuf); } #else - CMCHKUNPK(SUnpkU32, ¶m->uciPayload, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->uciPayload, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -13279,10 +13279,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->rawCqiRpt, &tfuRawCqiRpt->lnk); tfuRawCqiRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13328,14 +13328,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->rawCqiRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntrawCqiRpt, &tfuRawCqiRpt->lnk); tfuRawCqiRpt->lnk.node = (PTR)tfuRawCqiRpt; } - RETVALUE(ROK); + return ROK; } @@ -13376,14 +13376,14 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuUePucchHqRecpInfo) - CMCHKPK(SPkU8, param->a, mBuf); + CMCHKPK(oduUnpackUInt8, param->a, mBuf); for (i=TFU_MAX_HQ_RES-1; i >= 0; i--) { - CMCHKPK(SPkU16, param->hqRes[i], mBuf); + CMCHKPK(oduUnpackUInt16, param->hqRes[i], mBuf); } - CMCHKPK(SPkU8, param->pucchResCnt, mBuf); - CMCHKPK(SPkU8, param->hqSz, mBuf); - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pucchResCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqSz, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); + return ROK; } @@ -13420,14 +13420,14 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuUePucchHqRecpInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqSz, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchResCnt, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchResCnt, mBuf); for (i=0; ihqRes[i], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->hqRes[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->a, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->a, mBuf); + return ROK; } @@ -13473,16 +13473,16 @@ Buffer *mBuf; #ifdef LTE_ADV S32 idx; for (idx=(TFU_MAX_HQ_RES-1); idx >= 0; idx--) { - CMCHKPK(SPkU16, param->hqRes[idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->hqRes[idx], mBuf); } #else - CMCHKPK(SPkU16, param->hqRes[0], mBuf); + CMCHKPK(oduUnpackUInt16, param->hqRes[0], mBuf); #endif - CMCHKPK(SPkU8, param->pucchResCnt, mBuf); - CMCHKPK(SPkU8, param->hqSz, mBuf); - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchResCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqSz, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13517,19 +13517,19 @@ Buffer *mBuf; { TRC3(cmUnpkTfuUePucchHqRecpInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqSz, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchResCnt, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchResCnt, mBuf); #ifdef LTE_ADV S32 idx; for (idx=0; idxhqRes[idx], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->hqRes[idx], mBuf); } #else - CMCHKUNPK(SUnpkU16, ¶m->hqRes[0], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->hqRes[0], mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -13569,8 +13569,8 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchSrRecpInfo) - CMCHKPK(SPkU16, param->n1PucchIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->n1PucchIdx, mBuf); + return ROK; } @@ -13606,8 +13606,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchSrRecpInfo) - CMCHKUNPK(SUnpkU16, ¶m->n1PucchIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->n1PucchIdx, mBuf); + return ROK; } @@ -13643,9 +13643,9 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchCqiRecpInfo) - CMCHKPK(SPkU8, param->cqiPmiSz, mBuf); - CMCHKPK(SPkU16, param->n2PucchIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqiPmiSz, mBuf); + CMCHKPK(oduUnpackUInt16, param->n2PucchIdx, mBuf); + return ROK; } @@ -13681,9 +13681,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchCqiRecpInfo) - CMCHKUNPK(SUnpkU16, ¶m->n2PucchIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiPmiSz, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->n2PucchIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPmiSz, mBuf); + return ROK; } @@ -13719,13 +13719,13 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchSrsRecpInfo) - CMCHKPK(SPkU32, param->srsCyclicShft, mBuf); - CMCHKPK(SPkU16, param->srsCfgIdx, mBuf); - CMCHKPK(SPkU8, param->transComb, mBuf); - CMCHKPK(SPkU32, param->srsHopBw, mBuf); - CMCHKPK(SPkU8, param->nRrc, mBuf); - CMCHKPK(SPkU32, param->srsBw, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->srsCyclicShft, mBuf); + CMCHKPK(oduUnpackUInt16, param->srsCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->transComb, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsHopBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->nRrc, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsBw, mBuf); + return ROK; } #ifdef TFU_5GTF @@ -13744,10 +13744,10 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchUciRecpInfo) - CMCHKPK(SPkU8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->pucchIndex, mBuf); - CMCHKPK(SPkU8, param->numBits, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBits, mBuf); + return ROK; } #endif @@ -13783,13 +13783,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchSrsRecpInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->srsBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nRrc, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->srsHopBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->transComb, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->srsCfgIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->srsCyclicShft, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->srsBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nRrc, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->srsHopBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->transComb, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srsCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->srsCyclicShft, mBuf); + return ROK; } #ifdef TFU_5GTF @@ -13824,12 +13824,12 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchBsiBriRecpInfo) - CMCHKPK(SPkU8, param->briRpt, mBuf); - CMCHKPK(SPkU8, param->bsiRpt, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->pucchIndex, mBuf); - CMCHKPK(SPkU8, param->puschFlag, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->briRpt, mBuf); + CMCHKPK(oduUnpackUInt8, param->bsiRpt, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschFlag, mBuf); + return ROK; } /*********************************************************** @@ -13863,12 +13863,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchBsiBriRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->puschFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bsiRpt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->briRpt, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->puschFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bsiRpt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->briRpt, mBuf); + return ROK; } #endif @@ -13888,11 +13888,11 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchUciRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->numBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); - RETVALUE(ROK); + return ROK; } #endif @@ -13947,8 +13947,8 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePucchHqRecpInfo, ¶m->hqInfo, mBuf); CMCHKPK(cmPkTfuUePucchSrRecpInfo, ¶m->srInfo, mBuf); CMCHKPK(cmPkTfuUePucchCqiRecpInfo, ¶m->cqiInfo, mBuf); - CMCHKPK(SPkU32, param->uciInfo, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->uciInfo, mBuf); + return ROK; } @@ -13995,7 +13995,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchRecpReq) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->uciInfo, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->uciInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchCqiRecpInfo, ¶m->cqiInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchSrRecpInfo, ¶m->srInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchHqRecpInfo, ¶m->hqInfo, mBuf); @@ -14004,7 +14004,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuUePucchUciRecpInfo, ¶m->uciPduInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchBsiBriRecpInfo, ¶m->bsiBriInfo, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -14040,32 +14040,32 @@ Buffer *mBuf; TRC3(cmPkTfuUeUlSchRecpInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->beamIndex, mBuf); - CMCHKPK(SPkU8, param->uciWoTBFlag, mBuf); - CMCHKPK(SPkU8, param->PMI, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->nAntPortLayer, mBuf); - CMCHKPK(SPkU8, param->xPUSCHRange, mBuf); - CMCHKPK(SPkU8, param->numRbg, mBuf); - CMCHKPK(SPkU8, param->rbgStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->uciWoTBFlag, mBuf); + CMCHKPK(oduUnpackUInt8, param->PMI, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->nAntPortLayer, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUSCHRange, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRbg, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbgStart, mBuf); #endif - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->nSrs, mBuf); - CMCHKPK(SPkU8, param->crntTxNb, mBuf); - CMCHKPK(SPkU8, param->txMode, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->isRtx, mBuf); - CMCHKPK(SPkU8, param->hoppingBits, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU32, param->modType, mBuf); - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU16, param->size, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->nSrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->crntTxNb, mBuf); + CMCHKPK(oduUnpackUInt8, param->txMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->isRtx, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt32, param->modType, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); - RETVALUE(ROK); + return ROK; } @@ -14101,32 +14101,32 @@ Buffer *mBuf; TRC3(cmUnpkTfuUeUlSchRecpInfo) - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->modType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hoppingBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isRtx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->crntTxNb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nSrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->modType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isRtx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->crntTxNb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nSrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->rbgStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRbg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUSCHRange, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nAntPortLayer, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->PMI, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->uciWoTBFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbgStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRbg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUSCHRange, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nAntPortLayer, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->PMI, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->uciWoTBFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamIndex, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -14163,17 +14163,17 @@ Buffer *mBuf; U32 idx = 0; TRC3(cmPkTfuUePuschCqiRecpInfo) - CMCHKPK(SPkU8, param->riBetaOff, mBuf); - CMCHKPK(SPkU8, param->cqiBetaOff, mBuf); + CMCHKPK(oduUnpackUInt8, param->riBetaOff, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiBetaOff, mBuf); for (idx = 0; idx < param->cCNum; idx++) { CMCHKPK(cmPkTknU8, ¶m->riSz[idx], mBuf); - CMCHKPK(SPkU8, param->cqiPmiSzRn1[idx], mBuf); - CMCHKPK(SPkU8, param->cqiPmiSzR1[idx], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPmiSzRn1[idx], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPmiSzR1[idx], mBuf); } - CMCHKPK(SPkU8, param->cCNum, mBuf); - CMCHKPK(SPkU8, param->reportType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cCNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportType, mBuf); + return ROK; } @@ -14210,17 +14210,17 @@ Buffer *mBuf; U32 idx; TRC3(cmUnpkTfuUePuschCqiRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->reportType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cCNum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->reportType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cCNum, mBuf); for (idx = param->cCNum; idx > 0; idx--) { - CMCHKUNPK(SUnpkU8, ¶m->cqiPmiSzR1[idx-1], mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiPmiSzRn1[idx-1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPmiSzR1[idx-1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPmiSzRn1[idx-1], mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->riSz[idx-1], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->cqiBetaOff, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->riBetaOff, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->cqiBetaOff, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->riBetaOff, mBuf); + return ROK; } @@ -14258,13 +14258,13 @@ Buffer *mBuf; #ifdef TFU_TDD - CMCHKPK(SPkU8, param->ulDai, mBuf); - CMCHKPK(SPkU8, param->nBundled, mBuf); - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulDai, mBuf); + CMCHKPK(oduUnpackUInt8, param->nBundled, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); #endif - CMCHKPK(SPkU8, param->hqBetaOff, mBuf); - CMCHKPK(SPkU8, param->hqSz, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->hqBetaOff, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqSz, mBuf); + return ROK; } @@ -14300,15 +14300,15 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePuschHqRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->hqSz, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqBetaOff, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqBetaOff, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nBundled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulDai, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nBundled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulDai, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -14358,8 +14358,8 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePuschHqRecpInfo, ¶m->hqInfo, mBuf); CMCHKPK(cmPkTfuUePuschCqiRecpInfo, ¶m->cqiRiInfo, mBuf); CMCHKPK(cmPkTfuUeUlSchRecpInfo, ¶m->ulSchInfo, mBuf); - CMCHKPK(SPkU32, param->rcpInfo, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->rcpInfo, mBuf); + return ROK; } @@ -14403,14 +14403,14 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePuschRecpReq) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->rcpInfo, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->rcpInfo, mBuf); CMCHKUNPK(cmUnpkTfuUeUlSchRecpInfo, ¶m->ulSchInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePuschCqiRecpInfo, ¶m->cqiRiInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePuschHqRecpInfo, ¶m->hqInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchSrsRecpInfo, ¶m->srsInfo, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->initialNSrs, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->initialNumRbs, mBuf); - RETVALUE(ROK); + return ROK; } @@ -14455,14 +14455,14 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->groupId, mBuf); + CMCHKPK(oduUnpackUInt8, param->groupId, mBuf); #endif /* TFU_5GTF */ CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -14501,9 +14501,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->groupId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->groupId, mBuf); #endif /* TFU_5GTF */ - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RECP_REQ_PUCCH: CMCHKUNPK(cmUnpkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); @@ -14512,9 +14512,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuUePuschRecpReq, ¶m->t.puschRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* TFU_UPGRADE */ #ifndef TFU_UPGRADE /* TFU_UPGRADE */ @@ -14560,25 +14560,25 @@ Buffer *mBuf; #ifdef TFU_TDD for (i=TFU_MAX_M-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->p[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->p[i], mBuf); } for (i=TFU_MAX_M-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->m[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->m[i], mBuf); } - CMCHKPK(SPkU8, param->M, mBuf); - CMCHKPK(SPkU8, param->multCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->M, mBuf); + CMCHKPK(oduUnpackUInt8, param->multCnt, mBuf); #endif - CMCHKPK(SPkU32, param->type, mBuf); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); switch(param->hqType) { case TFU_HQ_RECP_REQ_N1PUCCH: - CMCHKPK(SPkU16, param->t.n1Pucch, mBuf); + CMCHKPK(oduUnpackUInt16, param->t.n1Pucch, mBuf); break; #ifdef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: for (i=TFU_MAX_M-1; i >= 0; i--) { - CMCHKPK(SPkU16, param->t.nCce[i], mBuf); + CMCHKPK(oduUnpackUInt16, param->t.nCce[i], mBuf); } break; @@ -14586,15 +14586,15 @@ Buffer *mBuf; #ifndef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: - CMCHKPK(SPkU16, param->t.nCce, mBuf); + CMCHKPK(oduUnpackUInt16, param->t.nCce, mBuf); break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->hqType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->hqType, mBuf); + return ROK; } @@ -14638,12 +14638,12 @@ Buffer *mBuf; #endif TRC3(cmUnpkTfuUePucchRecpReq) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqType, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqType, mBuf); switch(param->hqType) { #ifndef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: - CMCHKUNPK(SUnpkU16, ¶m->t.nCce, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t.nCce, mBuf); break; #endif @@ -14651,31 +14651,31 @@ Buffer *mBuf; #ifdef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: for (i=0; it.nCce[i], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t.nCce[i], mBuf); } break; #endif case TFU_HQ_RECP_REQ_N1PUCCH: - CMCHKUNPK(SUnpkU16, ¶m->t.n1Pucch, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t.n1Pucch, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->multCnt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->M, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->multCnt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->M, mBuf); for (i=0; im[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->m[i], mBuf); } for (i=0; ip[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->p[i], mBuf); } #endif - RETVALUE(ROK); + return ROK; } @@ -14711,21 +14711,21 @@ Buffer *mBuf; TRC3(cmPkTfuUeMsg3RecpReq) - CMCHKPK(SPkU32, param->modType, mBuf); - CMCHKPK(SPkU16, param->size, mBuf); + CMCHKPK(oduUnpackUInt32, param->modType, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); /*ccpu00128993 - ADD - fix for msg3 softcombining bug*/ - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->isRtx, mBuf); - CMCHKPK(SPkU8, param->ulDelay, mBuf); - CMCHKPK(SPkU8, param->expCqi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->isRtx, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulDelay, mBuf); + CMCHKPK(oduUnpackUInt8, param->expCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } @@ -14761,21 +14761,21 @@ Buffer *mBuf; TRC3(cmUnpkTfuUeMsg3RecpReq) - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->expCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulDelay, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isRtx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->expCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulDelay, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isRtx, mBuf); /*ccpu00128993 - ADD - fix for msg3 softcombining bug*/ - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->modType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->modType, mBuf); + return ROK; } @@ -14814,22 +14814,22 @@ Buffer *mBuf; TRC3(cmPkTfuUePuschRecpReq) - CMCHKPK(SPkU32, param->modType, mBuf); - CMCHKPK(SPkU16, param->size, mBuf); - CMCHKPK(SPkU32, param->mode, mBuf); - CMCHKPK(SPkU8, param->expHarq, mBuf); - CMCHKPK(SPkU8, param->expCqi, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->isRtx, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->hoppingBits, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->modType, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); + CMCHKPK(oduUnpackUInt8, param->expHarq, mBuf); + CMCHKPK(oduUnpackUInt8, param->expCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->isRtx, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } @@ -14868,22 +14868,22 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePuschRecpReq) - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hoppingBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isRtx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->expCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->expHarq, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->modType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isRtx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->expCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->expHarq, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->modType, mBuf); + return ROK; } @@ -14931,11 +14931,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -14973,7 +14973,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuUeRecpReqInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RECP_REQ_PUCCH: CMCHKUNPK(cmUnpkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); @@ -14985,9 +14985,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuUePuschRecpReq, ¶m->t.puschRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -15027,7 +15027,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -15062,7 +15062,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -15115,7 +15115,7 @@ TfuErrIndInfo * errInd; (ErrVal)ETFU105, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuErrIndInfo(errInd, mBuf) != ROK) { @@ -15126,12 +15126,12 @@ TfuErrIndInfo * errInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)errInd, mBuf) != ROK) + if (oduPackPointer((PTR)errInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -15142,7 +15142,7 @@ TfuErrIndInfo * errInd; /*MS_FIX:71858:Changed to SPutSBuf as being allocated with SGetSBuf*/ SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -15154,7 +15154,7 @@ TfuErrIndInfo * errInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)) != ROK) { @@ -15164,12 +15164,12 @@ TfuErrIndInfo * errInd; (ErrVal)ETFU108, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTTFUERRIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -15222,7 +15222,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU109, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&errInd, sizeof(TfuErrIndInfo))) != ROK) { @@ -15232,7 +15232,7 @@ Buffer *mBuf; (ErrVal)ETFU110, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -15246,12 +15246,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU111, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&errInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&errInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -15260,14 +15260,14 @@ Buffer *mBuf; #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); /* [ccpu00141698]-MOD- MAC/SCH does not free the TTI ind anymore */ (*func)(pst, suId, errInd); SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); - RETVALUE(ROK); + return ROK; } #endif /* if defined(LCTFU) */ diff --git a/src/codec_utils/common/odu_common_codec.c b/src/codec_utils/common/odu_common_codec.c index 7ca79231b..9e7693c36 100644 --- a/src/codec_utils/common/odu_common_codec.c +++ b/src/codec_utils/common/odu_common_codec.c @@ -44,9 +44,9 @@ int PrepFinalEncBuf(const void *buffer, size_t size, void *encodedBuf) * RFAILED - failure * * ****************************************************************/ -S16 buildPlmnId(Plmn plmn, OCTET_STRING_t *octe) +uint8_t buildPlmnId(Plmn plmn, OCTET_STRING_t *octe) { - U8 mncCnt; + uint8_t mncCnt; mncCnt = 2; octe->buf[0] = ((plmn.mcc[1] << 4) | (plmn.mcc[0])); if(mncCnt == 2) @@ -59,7 +59,7 @@ S16 buildPlmnId(Plmn plmn, OCTET_STRING_t *octe) octe->buf[1] = ((plmn.mnc[0] << 4) | (plmn.mcc[2])); octe->buf[2] = ((plmn.mnc[2] << 4) | (plmn.mnc[1])); } - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -73,21 +73,21 @@ S16 buildPlmnId(Plmn plmn, OCTET_STRING_t *octe) * Functionality: Fills the RicId * * @params[in] BIT_STRING_t *nbid, - * U8 unusedBits - * U8 byteSize - * U8 val + * uint8_t unusedBits + * uint8_t byteSize + * uint8_t val * * @return ROK - success * RFAILED - failure * * ****************************************************************/ -S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val) +uint8_t fillBitString(BIT_STRING_t *id, uint8_t unusedBits, uint8_t byteSize, uint8_t val) { - U8 tmp; + uint8_t tmp; if(id->buf == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } for (tmp = 0 ; tmp < (byteSize-1); tmp++) @@ -96,7 +96,7 @@ S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val) } id->buf[byteSize-1] = val; id->bits_unused = unusedBits; - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -115,9 +115,9 @@ S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val) * RFAILED - failure * * ****************************************************************/ -S16 bitStringToInt(BIT_STRING_t *bitString, U16 *val) +uint8_t bitStringToInt(BIT_STRING_t *bitString, uint16_t *val) { - U16 idx; + uint16_t idx; if(bitString->buf == NULL || bitString->size <= 0) { DU_LOG("\nDU_APP : Bit string is empty"); diff --git a/src/codec_utils/common/odu_common_codec.h b/src/codec_utils/common/odu_common_codec.h index f75bf5877..a502e52dd 100644 --- a/src/codec_utils/common/odu_common_codec.h +++ b/src/codec_utils/common/odu_common_codec.h @@ -26,9 +26,9 @@ char encBuf[ENC_BUF_MAX_LEN]; int encBufSize; int PrepFinalEncBuf(const void *buffer, size_t size, void *encodedBuf); -S16 buildPlmnId(Plmn plmn, OCTET_STRING_t *octe); -S16 fillBitString(BIT_STRING_t *id, U8 unusedBits, U8 byteSize, U8 val); -S16 bitStringToInt(BIT_STRING_t *bitString, U16 *val); +uint8_t buildPlmnId(Plmn plmn, OCTET_STRING_t *octe); +uint8_t fillBitString(BIT_STRING_t *id, uint8_t unusedBits, uint8_t byteSize, uint8_t val); +uint8_t bitStringToInt(BIT_STRING_t *bitString, uint16_t *val); #endif diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c index a9ddffb78..b574bcbb5 100644 --- a/src/cu_stub/cu_f1ap_msg_hdl.c +++ b/src/cu_stub/cu_f1ap_msg_hdl.c @@ -44,34 +44,34 @@ S16 SendF1APMsg(Region region, Pool pool) { Buffer *mBuf = NULLP; - if(SGetMsg(region, pool, &mBuf) == ROK) + if(ODU_GET_MSG(region, pool, &mBuf) == ROK) { - if(SAddPstMsgMult((Data *)encBuf, encBufSize, mBuf) == ROK) + if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK) { - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); if(sctpSend(mBuf) != ROK) { DU_LOG("\nF1AP : SCTP Send failed"); - SPutMsg(mBuf); - RETVALUE(RFAILED); + ODU_PUT_MSG(mBuf); + return RFAILED; } } else { - DU_LOG("\nF1AP : SAddPstMsgMult failed"); - SPutMsg(mBuf); - RETVALUE(RFAILED); + DU_LOG("\nF1AP : ODU_ADD_POST_MSG_MULT failed"); + ODU_PUT_MSG(mBuf); + return RFAILED; } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } else { DU_LOG("\nF1AP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* SendF1APMsg */ /******************************************************************* @@ -100,7 +100,7 @@ S16 BuildNrCellId(BIT_STRING_t *nrcell) nrcell->buf[4] = 16; nrcell->bits_unused = 4; nrcell->size = 5 * sizeof(uint8_t); - RETVALUE(ROK); + return ROK; } /******************************************************************** @@ -138,7 +138,7 @@ S16 BuildAndSendF1SetupRsp() if(f1apMsg == NULLP) { DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed"); - RETVALUE(RFAILED); + return RFAILED; } f1apMsg->present = F1AP_PDU_PR_successfulOutcome; @@ -147,7 +147,7 @@ S16 BuildAndSendF1SetupRsp() { DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed"); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_F1Setup; @@ -167,7 +167,7 @@ S16 BuildAndSendF1SetupRsp() DU_LOG("\nF1AP : Memory allocation for F1ResponseIEs failed"); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } for(idx=0; idxchoice.successfulOutcome, \ sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } } @@ -216,7 +216,7 @@ S16 BuildAndSendF1SetupRsp() CU_FREE(f1apMsg->choice.successfulOutcome,\ sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } strcpy((char*)cuName->buf, (char*)cuCfgParams.cuName); @@ -247,7 +247,7 @@ S16 BuildAndSendF1SetupRsp() elementCnt * sizeof(F1SetupResponseIEs_t *)); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } for(idy=0; idychoice.successfulOutcome, \ sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } } cellToActivate->list.array[0]->id = \ @@ -304,7 +304,7 @@ S16 BuildAndSendF1SetupRsp() CU_FREE(f1apMsg->choice.successfulOutcome, \ sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } buildPlmnId(cuCfgParams.plmn , &cellToActivate->list.array[0]->value.choice.\ Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity); @@ -338,7 +338,7 @@ S16 BuildAndSendF1SetupRsp() CU_FREE(f1apMsg->choice.successfulOutcome, \ sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } BuildNrCellId(&(cellToActivate->list.array[0]->value.choice.Cells_to_be_Activated_List_Item.nRCGI.nRCellIdentity)); /* RRC Version */ @@ -364,7 +364,7 @@ S16 BuildAndSendF1SetupRsp() elementCnt * sizeof(F1SetupResponseIEs_t *)); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } /* Need to check RRC Version */ @@ -384,7 +384,7 @@ S16 BuildAndSendF1SetupRsp() elementCnt * sizeof(F1SetupResponseIEs_t *)); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } rrcVer->iE_Extensions->list.count = 1; rrcVer->iE_Extensions->list.size = sizeof(struct RRC_Version_ExtIEs *); @@ -405,7 +405,7 @@ S16 BuildAndSendF1SetupRsp() elementCnt * sizeof(F1SetupResponseIEs_t *)); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } CU_ALLOC(rrcVer->iE_Extensions->list.array[0],\ sizeof(struct RRC_Version_ExtIEs)); @@ -426,7 +426,7 @@ S16 BuildAndSendF1SetupRsp() elementCnt * sizeof(F1SetupResponseIEs_t *)); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } rrcVer->iE_Extensions->list.array[0]->id = \ ProtocolIE_ID_id_latest_RRC_Version_Enhanced; @@ -458,7 +458,7 @@ S16 BuildAndSendF1SetupRsp() elementCnt * sizeof(F1SetupResponseIEs_t *)); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } rrcVer->iE_Extensions->list.array[0]->extensionValue.choice.\ Latest_RRC_Version_Enhanced.buf[0] = 0; @@ -490,7 +490,7 @@ S16 BuildAndSendF1SetupRsp() { DU_LOG("\nF1AP : Could not encode F1SetupResponse structure (at %s)\n",\ encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -505,10 +505,10 @@ S16 BuildAndSendF1SetupRsp() if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) { DU_LOG("\nF1AP : Sending F1 Setup Response failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* End of BuildAndSendF1SetupRsp */ /******************************************************************* @@ -545,7 +545,7 @@ S16 BuildAndSendDUUpdateAck() if(f1apMsg == NULLP) { DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed"); - RETVALUE(RFAILED); + return RFAILED; } f1apMsg->present = F1AP_PDU_PR_successfulOutcome; @@ -555,7 +555,7 @@ S16 BuildAndSendDUUpdateAck() { DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed"); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_gNBDUConfigurationUpdate; @@ -574,7 +574,7 @@ S16 BuildAndSendDUUpdateAck() DU_LOG("\nF1AP : Memory allocation for DuUpdateAcknowledgeIEs failed"); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg,(Size)sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } for(idx=0; idxprotocolIEs.list.array, elementCnt * sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t *)); CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } } @@ -616,7 +616,7 @@ S16 BuildAndSendDUUpdateAck() if(enRetVal.encoded == ENCODE_FAIL) { DU_LOG("\nF1AP : Could not encode DUConfigUpdateAcknowledge structure (at %s)",enRetVal.failed_type ? enRetVal.failed_type->name : "unknown"); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -631,10 +631,10 @@ S16 BuildAndSendDUUpdateAck() if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) { DU_LOG("\nF1AP : Sending GNB-DU Config Update Ack failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* End of BuildAndSendDUUpdateAck*/ @@ -1015,7 +1015,7 @@ S16 BuildAndSendDLRRCMessageTransfer() { DU_LOG( "\n F1AP : Could not encode DL RRC Message Transfer structure (at %s)\n",\ encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -1073,7 +1073,7 @@ S16 BuildAndSendUESetRsp() if(f1apMsg == NULLP) { DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed"); - RETVALUE(RFAILED); + return RFAILED; } f1apMsg->present = F1AP_PDU_PR_successfulOutcome; @@ -1083,7 +1083,7 @@ S16 BuildAndSendUESetRsp() { DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed"); CU_FREE(f1apMsg,sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } f1apMsg->choice.successfulOutcome->procedureCode = \ @@ -1107,7 +1107,7 @@ S16 BuildAndSendUESetRsp() CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg,(Size)sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } for(idx=0; idxchoice.successfulOutcome,\ sizeof(SuccessfulOutcome_t)); CU_FREE(f1apMsg,sizeof(F1AP_PDU_t)); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1162,7 +1162,7 @@ S16 BuildAndSendUESetRsp() { DU_LOG( "\n F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\ encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -1177,10 +1177,10 @@ S16 BuildAndSendUESetRsp() if(SendF1APMsg(CU_APP_MEM_REG,CU_POOL) != ROK) { DU_LOG("\n F1AP : Sending UE Context Setup Request Failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; }/* End of BuildAndSendUESetRsp */ @@ -1267,16 +1267,18 @@ void F1APMsgHdlr(Buffer *mBuf) F1AP_PDU_t f1apasnmsg ; DU_LOG("\nF1AP : Received F1AP message buffer"); - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); /* Copy mBuf into char array to decode it */ - SFndLenMsg(mBuf, &recvBufLen); - if(SGetSBuf(DFLT_REGION, DFLT_POOL, (Data **)&recvBuf, (Size)recvBufLen) != ROK) + ODU_FIND_MSG_LEN(mBuf, &recvBufLen); + CU_ALLOC(recvBuf, (Size)recvBufLen); + + if(recvBuf == NULLP) { DU_LOG("\nF1AP : Memory allocation failed"); return; } - if(SCpyMsgFix(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) + if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) { DU_LOG("\nF1AP : Failed while copying %d", copyCnt); return; @@ -1293,7 +1295,8 @@ void F1APMsgHdlr(Buffer *mBuf) memset(f1apMsg, 0, sizeof(F1AP_PDU_t)); rval = aper_decode(0, &asn_DEF_F1AP_PDU, (void **)&f1apMsg, recvBuf, recvBufLen, 0, 0); - SPutSBuf(DFLT_REGION, DFLT_POOL, (Data *)recvBuf, (Size)recvBufLen); + CU_FREE(recvBuf, (Size)recvBufLen); + if(rval.code == RC_FAIL || rval.code == RC_WMORE) { DU_LOG("\nF1AP : ASN decode failed"); diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c index b5ac4c471..c9a8daa89 100644 --- a/src/cu_stub/cu_stub.c +++ b/src/cu_stub/cu_stub.c @@ -85,7 +85,7 @@ void init_log() * * ****************************************************************/ -S16 tst() +uint8_t tst() { init_log(); DU_LOG("\nStarting CU_STUB"); @@ -103,7 +103,7 @@ S16 tst() sctpCfgReq(); sctpStartReq(); - RETVALUE(ROK); + return ROK; } /******************************************************************* diff --git a/src/cu_stub/cu_stub_egtp.c b/src/cu_stub/cu_stub_egtp.c index 15461a3ce..b8616c067 100644 --- a/src/cu_stub/cu_stub_egtp.c +++ b/src/cu_stub/cu_stub_egtp.c @@ -50,7 +50,7 @@ S16 egtpActvInit() DU_LOG("\n\nEGTP : Initializing"); cmMemset ((U8 *)&egtpCb, 0, sizeof(EgtpGlobalCb)); protType = CM_INET_PROTO_UDP; - RETVALUE(ROK); + return ROK; } @@ -82,14 +82,14 @@ S16 egtpInitReq() if(ret != ROK) { DU_LOG("\nEGTP : Configuration failed"); - RETVALUE(ret); + return (ret); } ret = cuEgtpSrvOpenReq(); if(ret != ROK) { DU_LOG("\nEGTP : Transport server open request failed"); - RETVALUE(ret); + return (ret); } tnlEvt.action = EGTP_TNL_MGMT_ADD; @@ -99,10 +99,10 @@ S16 egtpInitReq() if(ret != ROK) { DU_LOG("\n EGTP : Tunnel management request failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* egtpInitReq */ @@ -140,14 +140,14 @@ S16 cuEgtpCfgReq() if(ret != ROK) { DU_LOG("\nEGTP : TeId hash list initialization failed"); - RETVALUE(RFAILED); + return RFAILED; } else { DU_LOG("\nEGTP : Configuration successful"); } - RETVALUE(ROK); + return ROK; } /* cuEgtpCfgReq */ /************************************************************************** @@ -178,33 +178,33 @@ S16 cuEgtpSrvOpenReq(Pst *pst) if(ret = (cmInetSocket(sockType, &(egtpCb.recvTptSrvr.sockFd), protType)) != ROK) { DU_LOG("\nEGTP : Failed to open UDP socket"); - RETVALUE(RFAILED); + return RFAILED; } ret = cmInetBind(&(egtpCb.recvTptSrvr.sockFd), &(egtpCb.recvTptSrvr.addr)); if(ret != ROK) { DU_LOG("\nEGTP : Failed to bind socket"); - RETVALUE(RFAILED); + return RFAILED; } if(ret = (cmInetSocket(sockType, &(egtpCb.dstCb.sendTptSrvr.sockFd), protType)) != ROK) { DU_LOG("\nEGTP : Failed to open UDP socket"); - RETVALUE(RFAILED); + return RFAILED; } ret = cmInetBind(&(egtpCb.dstCb.sendTptSrvr.sockFd), &(egtpCb.dstCb.sendTptSrvr.addr)); if(ret != ROK) { DU_LOG("\nEGTP : Failed to bind socket"); - RETVALUE(RFAILED); + return RFAILED; } /* TODO: set socket options */ DU_LOG("\nEGTP : Receiver socket[%d] and Sender socket[%d] open", egtpCb.recvTptSrvr.sockFd.fd, egtpCb.dstCb.sendTptSrvr.sockFd.fd); - RETVALUE(ROK); + return ROK; } /* cuEgtpSrvOpenReq */ @@ -254,7 +254,7 @@ S16 cuEgtpTnlMgmtReq(EgtpTnlEvt tnlEvt) } } - RETVALUE(ret); + return (ret); } /************************************************************************** @@ -281,11 +281,12 @@ S16 cuEgtpTnlAdd(EgtpTnlEvt tnlEvt) DU_LOG("\nEGTP : Tunnel addition : LocalTeid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid); - ret = SGetSBuf(CU_APP_MEM_REG, CU_POOL, (Data **)&teidCb, (Size)sizeof(EgtpTeIdCb)); - if(ret != ROK) + CU_ALLOC(teidCb, (Size)sizeof(EgtpTeIdCb)); + + if(teidCb == NULLP) { DU_LOG("\nEGTP : Memory allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } @@ -297,8 +298,8 @@ S16 cuEgtpTnlAdd(EgtpTnlEvt tnlEvt) if(ret != ROK) { DU_LOG("\nEGTP : Failed to insert in hash list"); - SPutSBuf(CU_APP_MEM_REG, CU_POOL, (Data *)teidCb, (Size)sizeof(EgtpTeIdCb)); - RETVALUE(RFAILED); + CU_FREE(teidCb, (Size)sizeof(EgtpTeIdCb)); + return RFAILED; } egtpCb.dstCb.numTunn++; @@ -314,7 +315,7 @@ S16 cuEgtpTnlAdd(EgtpTnlEvt tnlEvt) /* SPutSBuf(CU_APP_MEM_REG, CU_POOL, (Data *)teidCb, (Size)sizeof(EgtpTeIdCb));*/ - RETVALUE(ROK); + return ROK; } /* cuEgtpTnlAdd */ /************************************************************************** @@ -344,13 +345,13 @@ S16 cuEgtpTnlMod(EgtpTnlEvt tnlEvt) if(teidCb == NULLP) { printf("\nTunnel id not found"); - RETVALUE(RFAILED); + return RFAILED; } teidCb->teId = tnlEvt.lclTeid; teidCb->remTeId = tnlEvt.remTeid; #endif - RETVALUE(ROK); + return ROK; } /************************************************************************** @@ -378,14 +379,14 @@ S16 cuEgtpTnlDel(EgtpTnlEvt tnlEvt) if(teidCb == NULLP) { DU_LOG("\nEGTP : Tunnel id[%d] not configured", tnlEvt.lclTeid); - RETVALUE(RFAILED); + return RFAILED; } cmHashListDelete(&(egtpCb.dstCb.teIdLst), (PTR)teidCb); - SPutSBuf(CU_APP_MEM_REG, CU_POOL, (Data *)teidCb, (Size)sizeof(EgtpTeIdCb)); + CU_FREE(teidCb, (Size)sizeof(EgtpTeIdCb)); egtpCb.dstCb.numTunn--; - RETVALUE(ROK); + return ROK; } /* cuEgtpTnlDel */ /******************************************************************* @@ -495,7 +496,7 @@ S16 cuEgtpEncodeHdr(U8 *preEncodedHdr, EgtpMsgHdr *preDefHdr, U8 *hdrIdx) } *hdrIdx = cnt; - RETVALUE(ROK); + return ROK; } /* egtpEncodeHdr */ @@ -505,7 +506,7 @@ S16 cuEgtpHdlRecvMsg(Buffer *mBuf) cuEgtpDecodeHdr(mBuf); /* Start Pumping data from CU to DU */ - RETVALUE(cuEgtpDatReq()); + return (cuEgtpDatReq()); } @@ -521,25 +522,25 @@ S16 cuEgtpDecodeHdr(Buffer *mBuf) U8 extHdrLen = 0; /* Extension hdr length */ Bool extPres = FALSE; /* Flag for indication of S, E or P presense flag */ - SFndLenMsg(mBuf, &bufLen); + ODU_FIND_MSG_LEN(mBuf, &bufLen); /* Decode version */ - SRemPreMsg(&tmpByte[0], mBuf); + ODU_REM_PRE_MSG(&tmpByte[0], mBuf); version = tmpByte[0] >> 5; /* Decode message type */ - SRemPreMsg((Data*)&(egtpMsg.msgHdr.msgType), mBuf); + ODU_REM_PRE_MSG((Data*)&(egtpMsg.msgHdr.msgType), mBuf); /* Decode message length */ - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); msgLen = (tmpByte[1] << 8) | tmpByte[2]; /* Decode tunnel id */ - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); - SRemPreMsg(&tmpByte[3], mBuf); - SRemPreMsg(&tmpByte[4], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[3], mBuf); + ODU_REM_PRE_MSG(&tmpByte[4], mBuf); egtpMsg.msgHdr.teId = (tmpByte[1] << 24) | (tmpByte[2] << 16) | (tmpByte[3] << 8) | tmpByte[4]; if((tmpByte[0] & EGTP_MASK_BIT1) || (tmpByte[0] & EGTP_MASK_BIT2)||(tmpByte[0] & EGTP_MASK_BIT3)) @@ -551,15 +552,15 @@ S16 cuEgtpDecodeHdr(Buffer *mBuf) if ( tmpByte[0] & EGTP_MASK_BIT2 ) { egtpMsg.msgHdr.seqNum.pres = TRUE; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg.msgHdr.seqNum.val = (tmpByte[1] << 8) | tmpByte[2]; } else if(extPres) { egtpMsg.msgHdr.seqNum.pres = 0; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg.msgHdr.seqNum.val = (tmpByte[1] << 8) | tmpByte[2]; } @@ -567,29 +568,29 @@ S16 cuEgtpDecodeHdr(Buffer *mBuf) if ( tmpByte[0] & EGTP_MASK_BIT1 ) { egtpMsg.msgHdr.nPdu.pres = TRUE; - SRemPreMsg(&(egtpMsg.msgHdr.nPdu.val), mBuf); + ODU_REM_PRE_MSG(&(egtpMsg.msgHdr.nPdu.val), mBuf); } else if(extPres) { egtpMsg.msgHdr.nPdu.pres = TRUE; - SRemPreMsg(&(egtpMsg.msgHdr.nPdu.val), mBuf); + ODU_REM_PRE_MSG(&(egtpMsg.msgHdr.nPdu.val), mBuf); } if(extPres & EGTP_MASK_BIT1) { - SRemPreMsg(&extHdrType, mBuf); + ODU_REM_PRE_MSG(&extHdrType, mBuf); while( 0 != extHdrType) { switch (extHdrType) { case EGTP_EXT_HDR_UDP_TYPE: { - SRemPreMsg(&extHdrLen, mBuf); + ODU_REM_PRE_MSG(&extHdrLen, mBuf); if(extHdrLen == 0x01) { egtpMsg.msgHdr.extHdr.udpPort.pres = TRUE; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg.msgHdr.extHdr.udpPort.val = (tmpByte[1] << 8) | tmpByte[2]; } break; @@ -597,31 +598,31 @@ S16 cuEgtpDecodeHdr(Buffer *mBuf) case EGTP_EXT_HDR_PDCP_TYPE: { - SRemPreMsg(&extHdrLen, mBuf); + ODU_REM_PRE_MSG(&extHdrLen, mBuf); if(extHdrLen == 0x01) { egtpMsg.msgHdr.extHdr.pdcpNmb.pres = TRUE; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg.msgHdr.extHdr.pdcpNmb.val = (tmpByte[1] << 8) | tmpByte[2]; } break; } } /* End of switch */ - SRemPreMsg(&extHdrType, mBuf); + ODU_REM_PRE_MSG(&extHdrType, mBuf); } /* End of while */ } /* End of if(extPres & EGTP_MASK_BIT1) */ else if(extPres) { - SRemPreMsg(&extHdrType, mBuf); + ODU_REM_PRE_MSG(&extHdrType, mBuf); } DU_LOG("\nEGTP : Message Buffer after decoding header "); - SPrntMsg(mBuf, 0, 0); + ODU_PRINT_MSG(mBuf, 0, 0); - RETVALUE(ROK); + return ROK; } /* End of cuEgtpDecodeHdr */ @@ -644,9 +645,9 @@ S16 cuEgtpDatReq() cnt++; } - SPutMsg(egtpMsg.msg); + ODU_PUT_MSG(egtpMsg.msg); - RETVALUE(ROK); + return ROK; } @@ -657,19 +658,19 @@ S16 BuildAppMsg(EgtpMsg *egtpMsg) Buffer *mBuf; - if(SGetMsg(CU_APP_MEM_REG, CU_POOL, &mBuf) == ROK) + if(ODU_GET_MSG(CU_APP_MEM_REG, CU_POOL, &mBuf) == ROK) { - if(SAddPstMsgMult((Data *)data, datSize, mBuf) != ROK) + if(ODU_ADD_POST_MSG_MULT((Data *)data, datSize, mBuf) != ROK) { - DU_LOG("\nEGTP : SAddPstMsgMult failed"); - SPutMsg(mBuf); - RETVALUE(RFAILED); + DU_LOG("\nEGTP : ODU_ADD_POST_MSG_MULT failed"); + ODU_PUT_MSG(mBuf); + return RFAILED; } } else { DU_LOG("\nEGTP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } /* filling IPv4 header */ @@ -677,7 +678,7 @@ S16 BuildAppMsg(EgtpMsg *egtpMsg) MsgLen mLen; mLen = 0; - SFndLenMsg(mBuf, &mLen); + ODU_FIND_MSG_LEN(mBuf, &mLen); cmMemset((U8 *)&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); ipv4Hdr.length = CM_IPV4_HDRLEN + mLen; @@ -739,7 +740,7 @@ S16 BuildAppMsg(EgtpMsg *egtpMsg) revPkArray[idx] = pkArray[CM_IPV4_HDRLEN - idx -1]; /* this function automatically reverses revPkArray */ - ret = SAddPreMsgMult(revPkArray, (MsgLen)cnt, mBuf); + ret = ODU_ADD_PRE_MSG_MULT(revPkArray, (MsgLen)cnt, mBuf); egtpMsg->msgHdr.msgType = EGTPU_MSG_GPDU; egtpMsg->msgHdr.nPdu.pres = FALSE; @@ -749,7 +750,7 @@ S16 BuildAppMsg(EgtpMsg *egtpMsg) egtpMsg->msgHdr.teId = 10; egtpMsg->msg = mBuf; - RETVALUE(ROK); + return ROK; } @@ -765,7 +766,7 @@ S16 BuildEgtpMsg(EgtpMsg *egtpMsg) if(teidCb == NULLP) { DU_LOG("\nEGTP : Tunnel id[%d] not configured", egtpMsg->msgHdr.teId); - RETVALUE(LCM_REASON_INVALID_PAR_VAL); + return (LCM_REASON_INVALID_PAR_VAL); } msgHdr = &(egtpMsg->msgHdr); @@ -786,7 +787,7 @@ S16 BuildEgtpMsg(EgtpMsg *egtpMsg) teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 1] &= ~(EGTP_MASK_BIT3); } - SFndLenMsg(egtpMsg->msg, &tPduSize); + ODU_FIND_MSG_LEN(egtpMsg->msg, &tPduSize); /*Adjust the header to fill the correct length*/ msgLen = tPduSize + (EGTP_MAX_HDR_LEN - hdrLen) - 0x08; @@ -809,12 +810,12 @@ S16 BuildEgtpMsg(EgtpMsg *egtpMsg) teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 1] &= ~(EGTP_MASK_BIT2); } - SAddPreMsgMult(&teidCb->preEncodedHdr.hdr[hdrLen], (EGTP_MAX_HDR_LEN - hdrLen), egtpMsg->msg); + ODU_ADD_PRE_MSG_MULT(&teidCb->preEncodedHdr.hdr[hdrLen], (EGTP_MAX_HDR_LEN - hdrLen), egtpMsg->msg); DU_LOG("\nEGTP : Sending message buffer"); - SPrntMsg(egtpMsg->msg, 0, 0); + ODU_PRINT_MSG(egtpMsg->msg, 0, 0); - RETVALUE(ROK); + return ROK; } S16 cuEgtpSendMsg(Buffer *mBuf) @@ -834,10 +835,10 @@ S16 cuEgtpSendMsg(Buffer *mBuf) if(ret != ROK && ret != RWOULDBLOCK) { DU_LOG("\nEGTP : Message send failure"); - RETVALUE(RFAILED); + return RFAILED; } DU_LOG("\nEGTP : Message Sent"); - RETVALUE(ROK); + return ROK; } diff --git a/src/cu_stub/cu_stub_sctp.c b/src/cu_stub/cu_stub_sctp.c index 627abddf1..ab262d54a 100644 --- a/src/cu_stub/cu_stub_sctp.c +++ b/src/cu_stub/cu_stub_sctp.c @@ -108,7 +108,7 @@ S16 sctpCfgReq() memset(&f1Params.lstnSockFd, -1, sizeof(CmInetFd)); fillDestNetAddr(&f1Params.destIpNetAddr, &sctpCfg.duIpAddr); - RETVALUE(ROK); + return ROK; } @@ -136,7 +136,7 @@ S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, SctpIpAddr *ipAddr) addrLstPtr->addrs[(addrLstPtr->count - 1)].type = CM_INET_IPV4ADDR_TYPE; addrLstPtr->addrs[(addrLstPtr->count - 1)].u.ipv4NetAddr = CM_INET_NTOH_U32(ipAddr->ipV4Addr); - RETVALUE(ROK); + return ROK; } /****************************************************************************** @@ -161,7 +161,7 @@ S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, SctpIpAddr *dstIpPtr) /* Filling destination address */ destAddrPtr->type = CM_INET_IPV4ADDR_TYPE; destAddrPtr->u.ipv4NetAddr = CM_INET_NTOH_U32(dstIpPtr->ipV4Addr); - RETVALUE(ROK); + return ROK; } /****************************************************************************** @@ -203,7 +203,7 @@ S16 sctpStartReq() { DU_LOG("\nSCTP: Polling failed to start at CU"); } - RETVALUE(ret); + return (ret); } /******************************************************************* * @@ -240,7 +240,7 @@ S16 sctpSetSockOpts(CmInetFd *sock_Fd) ret = RFAILED; } - RETVALUE(ret); + return (ret); } /******************************************************************* @@ -269,7 +269,7 @@ S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd) { DU_LOG("\nSCTP : Listening on socket failed"); cmInetClose(lstnSock_Fd); - RETVALUE(RFAILED); + return RFAILED; } DU_LOG("\nSCTP : Connecting"); @@ -284,7 +284,7 @@ S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd) else if(ret != ROK) { DU_LOG("\nSCTP : Failed to accept connection"); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -295,7 +295,7 @@ S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd) } DU_LOG("\nSCTP : Connection established"); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -375,7 +375,7 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy) } sctpNtfyInd(ntfy); - RETVALUE(ROK); + return ROK; }/* End of sctpNtfyHdlr */ /******************************************************************* @@ -439,12 +439,12 @@ S16 sctpSockPoll() if(ret == ROK && egtpBuf != NULLP) { DU_LOG("\nEGTP : Received message \n"); - SPrntMsg(egtpBuf, 0 ,0); + ODU_PRINT_MSG(egtpBuf, 0 ,0); cuEgtpHdlRecvMsg(egtpBuf); } }; - RETVALUE(ret); + return (ret); }/* End of sctpSockPoll() */ /******************************************************************* @@ -496,15 +496,15 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou else if(connUp & (pollParams->port == f1Params.destPort)) { F1APMsgHdlr(pollParams->mBuf); - SPutMsg(pollParams->mBuf); + ODU_PUT_MSG(pollParams->mBuf); } else { - SPutMsg(pollParams->mBuf); + ODU_PUT_MSG(pollParams->mBuf); } } } - RETVALUE(ROK); + return ROK; }/* End of sctpSockPoll() */ /******************************************************************* @@ -537,10 +537,10 @@ S16 sctpSend(Buffer *mBuf) if(ret != ROK && ret != RWOULDBLOCK) { DU_LOG("\nSCTP : Send message failed"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* End of sctpSend */ /********************************************************************** diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index 0a719af7e..65dce4b30 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -37,7 +37,7 @@ #include "du_f1ap_msg_hdl.h" extern DuCfgParams duCfgParam; -extern S16 duBuildAndSendMacCellCfg(); +extern uint8_t duBuildAndSendMacCellCfg(); /******************************************************************* * @@ -55,15 +55,15 @@ extern S16 duBuildAndSendMacCellCfg(); * RFAILED - failure * * ****************************************************************/ -S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) +uint8_t procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) { - U16 idx = 0; - S16 ret = ROK; + uint16_t idx = 0; + uint8_t ret = ROK; for(idx=0; idx\ @@ -129,7 +129,7 @@ uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg) F1SetupRsp f1SetRspDb; GNB_CU_Name_t *cuName; RRC_Version_t *rrc_Ver; - U16 idx; + uint16_t idx; DU_LOG("\nDU_APP : F1 Setup Response received"); printf("\nDU_APP : F1 Setup Response received"); @@ -177,11 +177,9 @@ uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg) /* TODO :Check the deallocation */ #if 0 - SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&(f1SetupRsp->protocolIEs.list.array),\ - (Size)elementCnt * sizeof(F1SetupResponseIEs_t *)); - SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&(f1apMsg->choice.successfulOutcome),\ - (Size)sizeof(SuccessfulOutcome_t)); - SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&f1apMsg,(Size)sizeof(F1AP_PDU_t)); + DU_FREE(f1SetupRsp->protocolIEs.list.array,(Size)elementCnt * sizeof(F1SetupResponseIEs_t *)); + DU_FREE(f1apMsg->choice.successfulOutcome,(Size)sizeof(SuccessfulOutcome_t)); + DU_FREE(f1apMsg,(Size)sizeof(F1AP_PDU_t)); #endif return ret; @@ -202,17 +200,14 @@ uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg) * RFAILED - failure * * ****************************************************************/ -S16 procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg) +uint8_t procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg) { DU_LOG("\nF1AP : GNB-DU config update acknowledgment received"); /* TODO :Check the deallocation */ #if 0 - SPutSBuf(DU_APP_MEM_REGION,DU_POOL,(Data*)&(gNBDuCfgAck->protocolIEs.list.array),\ - (Size)elementCnt * sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t -)); - SPutSBuf(DU_APP_MEM_REGION,DU_POOL,(Data*)&(f1apMsg->choice.successfulOutcome),\ - (Size)sizeof(SuccessfulOutcome_t)); - SPutSBuf(DU_APP_MEM_REGION,DU_POOL,(Data*)&f1apMsg,(Size)sizeof(F1AP_PDU_t)); + DU_FREE(gNBDuCfgAck->protocolIEs.list.array,(Size)elementCnt * sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t)); + DU_FREE(f1apMsg->choice.successfulOutcome,(Size)sizeof(SuccessfulOutcome_t)); + DU_FREE(f1apMsg,(Size)sizeof(F1AP_PDU_t)); #endif return ROK; } diff --git a/src/du_app/du_cell_mgr.h b/src/du_app/du_cell_mgr.h index 1f063d58a..991af6fe4 100644 --- a/src/du_app/du_cell_mgr.h +++ b/src/du_app/du_cell_mgr.h @@ -20,8 +20,8 @@ #ifndef __DU_CELL_MGR_H__ #define __DU_CELL_MGR_H__ -S16 duSendSchGnbCfg(); -S16 duSendSchGnbCfgToMac(RgrCfgReqInfo *cfgReq, U32 trans_id); +uint8_t duSendSchGnbCfg(); +uint8_t duSendSchGnbCfgToMac(RgrCfgReqInfo *cfgReq, uint32_t trans_id); #endif /********************************************************************** End of file diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index f90f85122..6f8f88020 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -82,8 +82,8 @@ extern char encBuf[ENC_BUF_MAX_LEN]; * ****************************************************************/ void FillSlotConfig() { - U8 slot; - U8 symbol; + uint8_t slot; + uint8_t symbol; for(slot = 0; slot <= 3; slot++) { @@ -121,7 +121,7 @@ void FillSlotConfig() /* This function is used to fill up the cell configuration for CL */ -S16 readMacCfg() +uint8_t readMacCfg() { duCfgParam.macCellCfg.carrierId = CARRIER_IDX; @@ -210,7 +210,7 @@ S16 readMacCfg() if(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq == NULLP) { DU_LOG("\nDU_APP : Memory allocation failed"); - RETVALUE(RFAILED); + return RFAILED; } *(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq) = UNUSED_ROOT_SEQ; } @@ -295,7 +295,7 @@ S16 readMacCfg() (number of mandatory parameters) + (number of otional parameters being filled) */ duCfgParam.macCellCfg.numTlv = 40; - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -314,12 +314,12 @@ S16 readMacCfg() * RFAILED - failure * * ****************************************************************/ -S16 fillDuPort(U16 *duPort) +uint8_t fillDuPort(uint16_t *duPort) { duPort[F1_INTERFACE] = DU_PORT; /* DU Port idx 0 38472 */ duPort[E2_INTERFACE] = RIC_PORT; /* RIC Port idx 1 38482 */ - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -370,7 +370,7 @@ uint16_t calcSliv(uint8_t startSymbol, uint8_t lengthSymbol) * RFAILED - failure * ** ****************************************************************/ -S16 fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) +uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) { PdcchCfgCommon pdcchCfg; PdschCfgCommon pdschCfg; @@ -511,10 +511,10 @@ S16 fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) * * ****************************************************************/ -S16 readCfg() +uint8_t readCfg() { - U8 i,j,k; - U32 ipv4_du, ipv4_cu, ipv4_ric; + uint8_t i,j,k; + uint32_t ipv4_du, ipv4_cu, ipv4_ric; MibParams mib; Sib1Params sib1; @@ -741,10 +741,10 @@ S16 readCfg() if(readMacCfg() != ROK) { DU_LOG("\nDU_APP : Failed while reading MAC config"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -764,21 +764,21 @@ S16 readCfg() * RFAILED - failure * * ****************************************************************/ -S16 duReadCfg() +uint8_t duReadCfg() { Pst pst; Buffer *mBuf; - cmMemset((U8 *)&duCfgParam, 0, sizeof(DuCfgParams)); + memset((uint8_t *)&duCfgParam, 0, sizeof(DuCfgParams)); //Read configs into duCfgParams if(readCfg() != ROK) { DU_LOG("\nDU_APP : Reading configuration failed"); - RETVALUE(RFAILED); + return RFAILED; } //Fill pst structure - cmMemset((U8 *)&(pst), 0, sizeof(Pst)); + memset((uint8_t *)&(pst), 0, sizeof(Pst)); pst.srcEnt = (Ent)ENTDUAPP; pst.srcInst = (Inst)DU_INST; pst.srcProcId = DU_PROC; @@ -790,15 +790,15 @@ S16 duReadCfg() pst.pool= DU_POOL; - if(SGetMsg(DFLT_REGION, DU_POOL, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, DU_POOL, &mBuf) != ROK) { DU_LOG("\nDU_APP : Memory allocation failed in duReadCfg"); return RFAILED; } - if (SPstTsk(&pst, mBuf) != ROK) + if (ODU_POST_TASK(&pst, mBuf) != ROK) { - DU_LOG("\nDU_APP : SPstTsk failed in duReadCfg"); + DU_LOG("\nDU_APP : ODU_POST_TASK failed in duReadCfg"); return RFAILED; } diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index db3af6d18..8e116847a 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -976,11 +976,11 @@ typedef struct f1Ipaddr typedef struct sctpParams { F1IpAddr duIpAddr; - U16 duPort[MAX_DU_PORT]; + uint16_t duPort[MAX_DU_PORT]; F1IpAddr cuIpAddr; - U16 cuPort; + uint16_t cuPort; F1IpAddr ricIpAddr; - U16 ricPort; + uint16_t ricPort; }SctpParams; typedef struct f1EgtpParams @@ -1190,9 +1190,9 @@ typedef struct duCfgParams /*function declarations */ void FillSlotConfig(); -S16 readClCfg(); -S16 readCfg(); -S16 duReadCfg(); +uint8_t readClCfg(); +uint8_t readCfg(); +uint8_t duReadCfg(); uint16_t calcSliv(uint8_t startSymbol, uint8_t lengthSymbol); #endif /* __DU_CONFIG_H__ */ diff --git a/src/du_app/du_e2ap_msg_hdl.c b/src/du_app/du_e2ap_msg_hdl.c index efee4d829..a179f18e9 100644 --- a/src/du_app/du_e2ap_msg_hdl.c +++ b/src/du_app/du_e2ap_msg_hdl.c @@ -236,7 +236,7 @@ uint8_t BuildAndSendE2SetupReq() /* Prints the Msg formed */ xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg); - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\ encBuf); @@ -260,7 +260,7 @@ uint8_t BuildAndSendE2SetupReq() } break; - }while(1); + }while(true); deAllocateE2SetupReqMsg(e2apMsg, e2SetupReq, idx); return ret; @@ -644,7 +644,7 @@ uint8_t BuildAndSendRicSubscriptionRsp() uint8_t ret = RFAILED; uint8_t FillRicricSubscriptionRspret; - while(1) + while(true) { DU_LOG("\nE2AP : Building RIC Subscription Response\n"); @@ -678,7 +678,7 @@ uint8_t BuildAndSendRicSubscriptionRsp() /* Prints the Msg formed */ xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apRicMsg); - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apRicMsg, PrepFinalEncBuf,\ encBuf); @@ -1080,7 +1080,7 @@ uint8_t BuildAndSendRicIndication() uint8_t ret = RFAILED; uint8_t FillRicIndicationret = ROK; - while(1) + while(true) { DU_LOG("\nE2AP : Building Ric Indication Message\n"); @@ -1111,7 +1111,7 @@ uint8_t BuildAndSendRicIndication() } /* Prints the Msg formed */ xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg); - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\ encBuf); @@ -1163,26 +1163,26 @@ uint8_t SendE2APMsg(Region region, Pool pool) { Buffer *mBuf=NULLP; - if(SGetMsg(region, pool, &mBuf) == ROK) + if(ODU_GET_MSG(region, pool, &mBuf) == ROK) { - if(SAddPstMsgMult((Data *)encBuf, encBufSize, mBuf) == ROK) + if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK) { - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); if(sctpSend(mBuf, E2_INTERFACE) != ROK) { DU_LOG("\nE2AP : SCTP Send for E2 failed"); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return RFAILED; } } else { - DU_LOG("\nE2AP : SAddPstMsgMult failed"); - SPutMsg(mBuf); + DU_LOG("\nE2AP : ODU_ADD_POST_MSG_MULT failed"); + ODU_PUT_MSG(mBuf); return RFAILED; } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } else { @@ -1221,16 +1221,18 @@ void E2APMsgHdlr(Buffer *mBuf) E2AP_PDU_t e2apasnmsg ; DU_LOG("\nE2AP : Received E2AP message buffer"); - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); /* Copy mBuf into char array to decode it */ - SFndLenMsg(mBuf, &recvBufLen); - if(SGetSBuf(DFLT_REGION, DFLT_POOL, (Data **)&recvBuf, (Size)recvBufLen) != ROK) + ODU_FIND_MSG_LEN(mBuf, &recvBufLen); + DU_ALLOC(recvBuf, (Size)recvBufLen); + + if(recvBuf == NULLP) { DU_LOG("\nE2AP : Memory allocation failed"); return; } - if(SCpyMsgFix(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) + if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) { DU_LOG("\nE2AP : Failed while copying %d", copyCnt); return; @@ -1247,7 +1249,8 @@ void E2APMsgHdlr(Buffer *mBuf) memset(e2apMsg, 0, sizeof(E2AP_PDU_t)); rval = aper_decode(0, &asn_DEF_E2AP_PDU, (void **)&e2apMsg, recvBuf, recvBufLen, 0, 0); - SPutSBuf(DFLT_REGION, DFLT_POOL, (Data *)recvBuf, (Size)recvBufLen); + DU_FREE(recvBuf, (Size)recvBufLen); + if(rval.code == RC_FAIL || rval.code == RC_WMORE) { DU_LOG("\nE2AP : ASN decode failed"); diff --git a/src/du_app/du_e2ap_msg_hdl.h b/src/du_app/du_e2ap_msg_hdl.h index 28dc83101..a2521e39f 100644 --- a/src/du_app/du_e2ap_msg_hdl.h +++ b/src/du_app/du_e2ap_msg_hdl.h @@ -20,18 +20,18 @@ #define ENCODE_FAIL -1 -S16 sctpSend(Buffer *mBuf, U8 itfType); +uint8_t sctpSend(Buffer *mBuf, uint8_t itfType); typedef struct e2apDb { - U16 ricId; - uint8_t *plmn; - U32 ricReqId; - U32 ricInstanceId; - U32 ranFuncId; - uint8_t *ricEventTrigger; - U32 ricActionId; - U32 ricActionType; + uint16_t ricId; + uint8_t *plmn; + uint32_t ricReqId; + uint32_t ricInstanceId; + uint32_t ranFuncId; + uint8_t *ricEventTrigger; + uint32_t ricActionId; + uint32_t ricActionType; }E2apMsgDb; E2apMsgDb e2apMsgDb; @@ -40,5 +40,5 @@ uint8_t SendE2APMsg(Region , Pool ); void E2APMsgHdlr(Buffer *mBuf); uint8_t deAllocateE2SetupReqMsg(E2AP_PDU_t *e2apMsg, E2setupRequest_t *e2SetupReq, uint8_t idx); /********************************************************************** - End of file -**********************************************************************/ + End of file + **********************************************************************/ diff --git a/src/du_app/du_egtp.c b/src/du_app/du_egtp.c index 62eb911e4..36d3978b1 100644 --- a/src/du_app/du_egtp.c +++ b/src/du_app/du_egtp.c @@ -52,11 +52,11 @@ EgtpGlobalCb egtpCb; * @return ROK - success * RFAILED - failure ***************************************************************************/ -S16 egtpActvInit(Ent entity, Inst inst, Region region, Reason reason) +uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason) { DU_LOG("\n\nEGTP : Initializing"); - cmMemset ((U8 *)&egtpCb, 0, sizeof(EgtpGlobalCb)); + memset ((uint8_t *)&egtpCb, 0, sizeof(EgtpGlobalCb)); protType = CM_INET_PROTO_UDP; return ROK; @@ -82,9 +82,9 @@ S16 egtpActvInit(Ent entity, Inst inst, Region region, Reason reason) * RFAILED - failure * ***************************************************************************/ -S16 egtpActvTsk(Pst *pst, Buffer *mBuf) +uint8_t egtpActvTsk(Pst *pst, Buffer *mBuf) { - S16 ret = ROK; + uint8_t ret = ROK; switch(pst->srcEnt) { @@ -110,13 +110,13 @@ S16 egtpActvTsk(Pst *pst, Buffer *mBuf) case EVTSLOTIND: { ret = unpackEgtpSlotInd(egtpSlotInd, pst, mBuf); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } default: { DU_LOG("\nEGTP : Invalid event %d", pst->event); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; } } @@ -145,7 +145,7 @@ S16 egtpActvTsk(Pst *pst, Buffer *mBuf) ret = RFAILED; } } - SExitTsk(); + ODU_EXIT_TASK(); return ret; } @@ -163,13 +163,13 @@ S16 egtpActvTsk(Pst *pst, Buffer *mBuf) * RFAILED - failure * * ***********************************************************************/ -S16 egtpCfgReq(Pst *pst, EgtpConfig egtpCfg) +uint8_t egtpCfgReq(Pst *pst, EgtpConfig egtpCfg) { - U8 ret; /* Return value */ + uint8_t ret; /* Return value */ Pst rspPst; /* Response Pst structure */ CmStatus cfgCfm; /* Configuration Confirm */ - cmMemcpy((U8 *)&egtpCb.egtpCfg, (U8 *)&egtpCfg, (PTR)sizeof(EgtpConfig)); + memcpy((uint8_t *)&egtpCb.egtpCfg, (uint8_t *)&egtpCfg, (PTR)sizeof(EgtpConfig)); egtpCb.recvTptSrvr.addr.address = CM_INET_NTOH_U32(egtpCb.egtpCfg.localIp.ipV4Addr); egtpCb.recvTptSrvr.addr.port = EGTP_DFLT_PORT; @@ -219,10 +219,10 @@ S16 egtpCfgReq(Pst *pst, EgtpConfig egtpCfg) * * * ***********************************************************************/ -S16 egtpFillRspPst(Pst *pst, Pst *rspPst) +uint8_t egtpFillRspPst(Pst *pst, Pst *rspPst) { - cmMemset((U8 *)rspPst, 0, sizeof(Pst)); + memset((uint8_t *)rspPst, 0, sizeof(Pst)); rspPst->srcEnt = pst->dstEnt; rspPst->srcInst = pst->dstInst; rspPst->srcProcId = pst->dstProcId; @@ -252,13 +252,13 @@ S16 egtpFillRspPst(Pst *pst, Pst *rspPst) * ***************************************************************************/ -S16 egtpSrvOpenReq(Pst *pst) +uint8_t egtpSrvOpenReq(Pst *pst) { - U8 ret; /* Return value */ + uint8_t ret; /* Return value */ Pst rspPst; /* Response Pst structure */ CmStatus cfm; /* Confirmation status */ - U8 sockType; /* Socket type */ + uint8_t sockType; /* Socket type */ DU_LOG("\nEGTP : Received EGTP open server request"); @@ -308,7 +308,7 @@ S16 egtpSrvOpenReq(Pst *pst) * * ****************************************************************/ -S16 egtpSrvOpenPrc(U8 sockType, EgtpTptSrvr *server) +uint8_t egtpSrvOpenPrc(uint8_t sockType, EgtpTptSrvr *server) { S8 ret=ROK; ret = cmInetSocket(sockType, &(server->sockFd), protType); @@ -344,7 +344,7 @@ S16 egtpSrvOpenPrc(U8 sockType, EgtpTptSrvr *server) * * ***************************************************************************/ -S16 egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) +uint8_t egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) { S8 ret; Pst rspPst; @@ -408,9 +408,9 @@ S16 egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) * RFAILED - failure * * ***************************************************************************/ -S16 egtpTnlAdd(EgtpTnlEvt tnlEvt) +uint8_t egtpTnlAdd(EgtpTnlEvt tnlEvt) { - S16 ret; + uint8_t ret; EgtpTeIdCb *teidCb; /* Tunnel endpoint control block */ EgtpMsgHdr preDefHdr; /* pre-define header for this tunnel */ @@ -423,11 +423,11 @@ S16 egtpTnlAdd(EgtpTnlEvt tnlEvt) return LCM_REASON_MEM_NOAVAIL; } - cmMemset((U8 *)teidCb, 0, sizeof(EgtpTeIdCb)); + memset((uint8_t *)teidCb, 0, sizeof(EgtpTeIdCb)); teidCb->teId = tnlEvt.lclTeid; teidCb->remTeId = tnlEvt.remTeid; - ret = cmHashListInsert(&(egtpCb.dstCb.teIdLst), (PTR)teidCb, (U8 *)&(teidCb->teId), sizeof(U32)); + ret = cmHashListInsert(&(egtpCb.dstCb.teIdLst), (PTR)teidCb, (uint8_t *)&(teidCb->teId), sizeof(uint32_t)); if(ret != ROK) { DU_LOG("\nEGTP : Failed to insert in hash list"); @@ -437,14 +437,14 @@ S16 egtpTnlAdd(EgtpTnlEvt tnlEvt) egtpCb.dstCb.numTunn++; /* Encoding pre-defined header */ - cmMemset((U8*)&preDefHdr, 0, sizeof(EgtpMsgHdr)); + memset((uint8_t*)&preDefHdr, 0, sizeof(EgtpMsgHdr)); preDefHdr.msgType = EGTPU_MSG_GPDU; preDefHdr.teId = teidCb->remTeId; preDefHdr.extHdr.pdcpNmb.pres = FALSE; preDefHdr.extHdr.udpPort.pres = FALSE; preDefHdr.nPdu.pres = FALSE; - egtpEncodeHdr((U8 *)teidCb->preEncodedHdr.hdr, &preDefHdr, &(teidCb->preEncodedHdr.cnt)); + egtpEncodeHdr((uint8_t *)teidCb->preEncodedHdr.hdr, &preDefHdr, &(teidCb->preEncodedHdr.cnt)); return ROK; } /* egtpTnlAdd */ @@ -464,19 +464,19 @@ S16 egtpTnlAdd(EgtpTnlEvt tnlEvt) * RFAILED - failure * * ***************************************************************************/ -S16 egtpTnlMod(EgtpTnlEvt tnlEvt) +uint8_t egtpTnlMod(EgtpTnlEvt tnlEvt) { #if 0 - S16 ret; + uint8_t ret; EgtpTeIdCb *teidCb = NULLP; printf("\nTunnel modification : LocalTeid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid); - cmHashListFind(&(egtpCb.dstCb.teIdLst), (U8 *)&(tnlEvt.teId), sizeof(U32), 0, (PTR *)&teidCb); + cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(tnlEvt.teId), sizeof(uint32_t), 0, (PTR *)&teidCb); if(teidCb == NULLP) { printf("\nTunnel id not found"); - RETVALUE(RFAILED); + return RFAILED; } teidCb->teId = tnlEvt.lclTeid; @@ -500,13 +500,13 @@ S16 egtpTnlMod(EgtpTnlEvt tnlEvt) * RFAILED - failure * * ***************************************************************************/ -S16 egtpTnlDel(EgtpTnlEvt tnlEvt) +uint8_t egtpTnlDel(EgtpTnlEvt tnlEvt) { EgtpTeIdCb *teidCb = NULLP; DU_LOG("\nEGTP : Tunnel deletion : Local Teid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid); - cmHashListFind(&(egtpCb.dstCb.teIdLst), (U8 *)&(tnlEvt.lclTeid), sizeof(U32), 0, (PTR *)&teidCb); + cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(tnlEvt.lclTeid), sizeof(uint32_t), 0, (PTR *)&teidCb); if(teidCb == NULLP) { DU_LOG("\nEGTP : Tunnel id[%d] not configured", tnlEvt.lclTeid); @@ -537,17 +537,17 @@ S16 egtpTnlDel(EgtpTnlEvt tnlEvt) * RFAILED - failure * * ****************************************************************/ -S16 egtpHdlDatInd(EgtpMsg egtpMsg) +uint8_t egtpHdlDatInd(EgtpMsg egtpMsg) { EgtpTeIdCb *teidCb = NULLP; - MsgLen tPduSize; - U8 hdrLen; - U32 msgLen; + uint16_t tPduSize; + uint8_t hdrLen; + uint32_t msgLen; EgtpMsgHdr *msgHdr; DU_LOG("\nEGTP : Received Data Indication"); - cmHashListFind(&(egtpCb.dstCb.teIdLst), (U8 *)&(egtpMsg.msgHdr.teId), sizeof(U32), 0, (PTR *)&teidCb); + cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(egtpMsg.msgHdr.teId), sizeof(uint32_t), 0, (PTR *)&teidCb); if(teidCb == NULLP) { DU_LOG("\nEGTP : Tunnel id[%d] not configured", egtpMsg.msgHdr.teId); @@ -572,7 +572,7 @@ S16 egtpHdlDatInd(EgtpMsg egtpMsg) teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 1] &= ~(EGTP_MASK_BIT3); } - SFndLenMsg(egtpMsg.msg, &tPduSize); + ODU_FIND_MSG_LEN(egtpMsg.msg, &tPduSize); /*Adjust the header to fill the correct length*/ msgLen = tPduSize + (EGTP_MAX_HDR_LEN - hdrLen) - 0x08; @@ -580,15 +580,15 @@ S16 egtpHdlDatInd(EgtpMsg egtpMsg) /*********************************************** * Fill the length field of the message header * ***********************************************/ - teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 3] = (U8)GetHiByte(msgLen); - teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 4] = (U8)GetLoByte(msgLen); + teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 3] = (uint8_t)GetHiByte(msgLen); + teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 4] = (uint8_t)GetLoByte(msgLen); /*Update the sequence number*/ if(egtpMsg.msgHdr.seqNum.pres) { teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 1] |= (EGTP_MASK_BIT2); - teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 9] = (U8)GetHiByte(egtpMsg.msgHdr.seqNum.val); - teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 10] = (U8)GetLoByte(egtpMsg.msgHdr.seqNum.val); + teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 9] = (uint8_t)GetHiByte(egtpMsg.msgHdr.seqNum.val); + teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 10] = (uint8_t)GetLoByte(egtpMsg.msgHdr.seqNum.val); } else { @@ -596,17 +596,17 @@ S16 egtpHdlDatInd(EgtpMsg egtpMsg) } DU_LOG("\nEGTP : UL Data buffer before encoding header"); - SPrntMsg(egtpMsg.msg, 0, 0); + ODU_PRINT_MSG(egtpMsg.msg, 0, 0); - SAddPreMsgMult(&teidCb->preEncodedHdr.hdr[hdrLen], (EGTP_MAX_HDR_LEN - hdrLen), egtpMsg.msg); + ODU_ADD_PRE_MSG_MULT(&teidCb->preEncodedHdr.hdr[hdrLen], (EGTP_MAX_HDR_LEN - hdrLen), egtpMsg.msg); DU_LOG("\nEGTP : UL Data buffer after encoding header"); - SPrntMsg(egtpMsg.msg, 0, 0); + ODU_PRINT_MSG(egtpMsg.msg, 0, 0); /* Send over UDP */ egtpSendMsg(egtpMsg.msg); - SPutMsg(egtpMsg.msg); + ODU_PUT_MSG(egtpMsg.msg); return ROK; }/* EgtpHdlDatInd */ @@ -628,12 +628,12 @@ S16 egtpHdlDatInd(EgtpMsg egtpMsg) * RFAILED - failure * * ****************************************************************/ -S16 egtpEncodeHdr(U8 *preEncodedHdr, EgtpMsgHdr *preDefHdr, U8 *hdrIdx) +uint8_t egtpEncodeHdr(uint8_t *preEncodedHdr, EgtpMsgHdr *preDefHdr, uint8_t *hdrIdx) { - U8 tmpByte = 0; /* Stores one byte of data for enc */ - U8 cnt = EGTP_MAX_HDR_LEN; /* Stores the position */ - Bool extPres = FALSE; /* Flag for indication of S, E or P presense flag */ - U16 nwWord = 0; + uint8_t tmpByte = 0; /* Stores one byte of data for enc */ + uint8_t cnt = EGTP_MAX_HDR_LEN; /* Stores the position */ + bool extPres = FALSE; /* Flag for indication of S, E or P presense flag */ + uint16_t nwWord = 0; /* Encoding header */ tmpByte |= EGTP_MASK_BIT6; /* Setting 6th LSB of 1st byte as version */ @@ -665,12 +665,12 @@ S16 egtpEncodeHdr(U8 *preEncodedHdr, EgtpMsgHdr *preDefHdr, U8 *hdrIdx) /* Encode Tunnel endpoint */ preEncodedHdr[--cnt] = 0; preEncodedHdr[--cnt] = 0; - nwWord = (U16)(GetHiWord(preDefHdr->teId)); - preEncodedHdr[--cnt] = (U8)(GetHiByte(nwWord)); - preEncodedHdr[--cnt] = (U8)(GetLoByte(nwWord)); - nwWord = (U16)(GetLoWord(preDefHdr->teId)); - preEncodedHdr[--cnt] = (U8)(GetHiByte(nwWord)); - preEncodedHdr[--cnt] = (U8)(GetLoByte(nwWord)); + nwWord = (uint16_t)(GetHiWord(preDefHdr->teId)); + preEncodedHdr[--cnt] = (uint8_t)(GetHiByte(nwWord)); + preEncodedHdr[--cnt] = (uint8_t)(GetLoByte(nwWord)); + nwWord = (uint16_t)(GetLoWord(preDefHdr->teId)); + preEncodedHdr[--cnt] = (uint8_t)(GetHiByte(nwWord)); + preEncodedHdr[--cnt] = (uint8_t)(GetLoByte(nwWord)); /* Encode sequence number */ if(preDefHdr->seqNum.pres) @@ -739,10 +739,10 @@ S16 egtpEncodeHdr(U8 *preEncodedHdr, EgtpMsgHdr *preDefHdr, U8 *hdrIdx) * RFAILED - failure * * ****************************************************************/ -S16 egtpSendMsg(Buffer *mBuf) +uint8_t egtpSendMsg(Buffer *mBuf) { - S16 ret; - MsgLen txLen; + uint8_t ret; + uint16_t txLen; CmInetMemInfo info; CmInetAddr dstAddr; @@ -780,7 +780,7 @@ S16 egtpSendMsg(Buffer *mBuf) * RFAILED - failure * * ****************************************************************/ -S16 egtpSlotInd() +uint8_t egtpSlotInd() { egtpRecvMsg(); return ROK; @@ -803,11 +803,11 @@ S16 egtpSlotInd() * * ****************************************************************/ -S16 egtpRecvMsg() +uint8_t egtpRecvMsg() { - U8 ret; /* Return value */ - U8 nMsg; /* Number of messages to read from UDP socked */ - MsgLen bufLen; /* Length of received buffer */ + uint8_t ret; /* Return value */ + uint8_t nMsg; /* Number of messages to read from UDP socked */ + uint16_t bufLen; /* Length of received buffer */ Buffer *recvBuf; /* Received buffer */ CmInetAddr fromAddr; /* Egtp data sender address */ CmInetMemInfo memInfo; /* Buffer allocation info */ @@ -829,7 +829,7 @@ S16 egtpRecvMsg() if(ret == ROK && recvBuf != NULLP) { DU_LOG("\nEGTP : Received DL Message[%d]\n", nMsg+1); - SPrntMsg(recvBuf, 0 ,0); + ODU_PRINT_MSG(recvBuf, 0 ,0); egtpHdlRecvData(recvBuf); } nMsg++; @@ -838,7 +838,7 @@ S16 egtpRecvMsg() return ROK; } -S16 egtpHdlRecvData(Buffer *mBuf) +uint8_t egtpHdlRecvData(Buffer *mBuf) { EgtpMsg egtpMsg; @@ -851,20 +851,20 @@ S16 egtpHdlRecvData(Buffer *mBuf) return ROK; } -S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) +uint8_t egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) { - U8 tmpByte[5]; /* Holds 5 byte of data after Decoding */ - U8 version = 0; /* Holds the version type, decoded */ - MsgLen msgLen = 0; /* Holds the msgLen from the Hdr */ - MsgLen bufLen = 0; /* Holds the total buffer length */ - U8 extHdrType = 0; /* Holds the Extension hdr type */ - U8 extHdrLen = 0; /* Extension hdr length */ - Bool extPres = FALSE; /* Flag for indication of S, E or P presense flag */ + uint8_t tmpByte[5]; /* Holds 5 byte of data after Decoding */ + uint8_t version = 0; /* Holds the version type, decoded */ + uint16_t msgLen = 0; /* Holds the msgLen from the Hdr */ + uint16_t bufLen = 0; /* Holds the total buffer length */ + uint8_t extHdrType = 0; /* Holds the Extension hdr type */ + uint8_t extHdrLen = 0; /* Extension hdr length */ + bool extPres = FALSE; /* Flag for indication of S, E or P presense flag */ - SFndLenMsg(mBuf, &bufLen); + ODU_FIND_MSG_LEN(mBuf, &bufLen); /* Decode first byte and storing in temporary variable */ - SRemPreMsg(&tmpByte[0], mBuf); + ODU_REM_PRE_MSG(&tmpByte[0], mBuf); /* Extracting version fro 1st byte */ version = tmpByte[0] >> 5; @@ -872,15 +872,15 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) DU_LOG("\nEGTP : Version %d", version); /* Decode message type */ - SRemPreMsg((Data*)&(egtpMsg->msgHdr.msgType), mBuf); + ODU_REM_PRE_MSG((Data*)&(egtpMsg->msgHdr.msgType), mBuf); DU_LOG("\nEGTP : msgType %d", egtpMsg->msgHdr.msgType); /**************************************************************************** * Message length param is 2 bytes. So decode next 2 bytes from msg hdr and * performing OR operation on these two bytes to calculate message length ***************************************************************************/ - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); msgLen = (tmpByte[1] << 8) | tmpByte[2]; DU_LOG("\nEGTP : msgLen %d", msgLen); @@ -889,10 +889,10 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) * Tunnel id param is 4 bytes. So decode next 4 bytes from msg hdr and * perform OR operation on these 4 bytes to calculate tunnel id ***************************************************************************/ - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); - SRemPreMsg(&tmpByte[3], mBuf); - SRemPreMsg(&tmpByte[4], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[3], mBuf); + ODU_REM_PRE_MSG(&tmpByte[4], mBuf); egtpMsg->msgHdr.teId = (tmpByte[1] << 24) | (tmpByte[2] << 16) | (tmpByte[3] << 8) | tmpByte[4]; DU_LOG("\nEGTP : teId %d",egtpMsg->msgHdr.teId); @@ -911,8 +911,8 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) * perform OR operation on them ************************************************************************/ egtpMsg->msgHdr.seqNum.pres = TRUE; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg->msgHdr.seqNum.val = (tmpByte[1] << 8) | tmpByte[2]; } /**************************************************************************** @@ -926,8 +926,8 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) * perform OR operation on them ************************************************************************/ egtpMsg->msgHdr.seqNum.pres = 0; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg->msgHdr.seqNum.val = (tmpByte[1] << 8) | tmpByte[2]; } @@ -935,7 +935,7 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) if (tmpByte[0] & EGTP_MASK_BIT1) { egtpMsg->msgHdr.nPdu.pres = TRUE; - SRemPreMsg(&(egtpMsg->msgHdr.nPdu.val), mBuf); + ODU_REM_PRE_MSG(&(egtpMsg->msgHdr.nPdu.val), mBuf); } /**************************************************************************** * If extPres is true, but PN bit is not set, implies, either of S or E bit @@ -944,20 +944,20 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) else if(extPres) { egtpMsg->msgHdr.nPdu.pres = TRUE; - SRemPreMsg(&(egtpMsg->msgHdr.nPdu.val), mBuf); + ODU_REM_PRE_MSG(&(egtpMsg->msgHdr.nPdu.val), mBuf); } /* If E flag is set in first byte, decode extension header */ if(tmpByte[0] & EGTP_MASK_BIT3) { - SRemPreMsg(&extHdrType, mBuf); + ODU_REM_PRE_MSG(&extHdrType, mBuf); while( 0 != extHdrType) { switch (extHdrType) { case EGTP_EXT_HDR_UDP_TYPE: { - SRemPreMsg(&extHdrLen, mBuf); + ODU_REM_PRE_MSG(&extHdrLen, mBuf); if(extHdrLen == 0x01) { /************************************************************ @@ -965,8 +965,8 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) * and perform OR operation on them *************************************************************/ egtpMsg->msgHdr.extHdr.udpPort.pres = TRUE; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg->msgHdr.extHdr.udpPort.val = (tmpByte[1] << 8) | tmpByte[2]; } break; @@ -974,7 +974,7 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) case EGTP_EXT_HDR_PDCP_TYPE: { - SRemPreMsg(&extHdrLen, mBuf); + ODU_REM_PRE_MSG(&extHdrLen, mBuf); if(extHdrLen == 0x01) { /************************************************************* @@ -982,15 +982,15 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) * and perform OR operation on them ************************************************************/ egtpMsg->msgHdr.extHdr.pdcpNmb.pres = TRUE; - SRemPreMsg(&tmpByte[1], mBuf); - SRemPreMsg(&tmpByte[2], mBuf); + ODU_REM_PRE_MSG(&tmpByte[1], mBuf); + ODU_REM_PRE_MSG(&tmpByte[2], mBuf); egtpMsg->msgHdr.extHdr.pdcpNmb.val = (tmpByte[1] << 8) | tmpByte[2]; } break; } } /* End of switch */ - SRemPreMsg(&extHdrType, mBuf); + ODU_REM_PRE_MSG(&extHdrType, mBuf); } /* End of while */ } @@ -1001,13 +1001,13 @@ S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) ***************************************************************************/ else if(extPres) { - SRemPreMsg(&extHdrType, mBuf); + ODU_REM_PRE_MSG(&extHdrType, mBuf); } egtpMsg->msg = mBuf; DU_LOG("\nEGTP : DL Data Buffer after decoding header "); - SPrntMsg(mBuf, 0, 0); + ODU_PRINT_MSG(mBuf, 0, 0); /* Forward the data to duApp/RLC */ diff --git a/src/du_app/du_egtp.h b/src/du_app/du_egtp.h index 7b29717f8..3bcdbec13 100644 --- a/src/du_app/du_egtp.h +++ b/src/du_app/du_egtp.h @@ -37,8 +37,8 @@ #define EGTP_MASK_BIT7 0x40 #define EGTP_MASK_BIT8 0x80 -S16 unpackEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf); -U8 protType; +uint8_t unpackEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf); +uint8_t protType; typedef struct egtpTptSrvr { @@ -48,21 +48,21 @@ typedef struct egtpTptSrvr typedef struct EgtpTeIdCb { - U32 teId; /* Local tunnel id */ - U32 remTeId; /* Remote tunnel id */ + uint32_t teId; /* Local tunnel id */ + uint32_t remTeId; /* Remote tunnel id */ struct { - U8 hdr[EGTP_MAX_HDR_LEN]; - U8 cnt; + uint8_t hdr[EGTP_MAX_HDR_LEN]; + uint8_t cnt; }preEncodedHdr; /* Pre-encoded header for PDUs on this tunnel */ }EgtpTeIdCb; typedef struct egtpDstCb { CmInetIpAddr dstIp; /* destination IP */ - U16 dstPort; /* destination port that sends data */ + uint16_t dstPort; /* destination port that sends data */ EgtpTptSrvr sendTptSrvr; /* Transport server for sending UDP msg to */ - U32 numTunn; /* Number of tunnels */ + uint32_t numTunn; /* Number of tunnels */ CmHashListCp teIdLst; /* Tunnel Id list for this destination */ }EgtpDstCb; @@ -75,22 +75,22 @@ typedef struct egtpGlobalCb extern EgtpGlobalCb egtpCb; /* EGTP global control block */ uint8_t duHdlEgtpDlData(EgtpMsg *egtpMsg); -S16 egtpActvInit(Ent entity, Inst inst, Region region, Reason reason); -S16 egtpActvTsk(Pst *pst, Buffer *mBuf); -S16 egtpFillRspPst(Pst *pst, Pst *rspPst); -S16 egtpCfgReq(Pst *pst, EgtpConfig egtpCfg); -S16 egtpSrvOpenReq(Pst *pst); -S16 egtpSrvOpenPrc(U8 sockType, EgtpTptSrvr *server); -S16 egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt); -S16 egtpTnlAdd(EgtpTnlEvt tnlEvt); -S16 egtpTnlMod(EgtpTnlEvt tnlEvt); -S16 egtpTnlDel(EgtpTnlEvt tnlEvt); -S16 egtpHdlDatInd(EgtpMsg msg); -S16 egtpEncodeHdr(U8 *preEncodedHdr, EgtpMsgHdr *preDefHdr, U8 *hdrIdx); -S16 egtpSendMsg(Buffer *mBuf); -S16 egtpSlotInd(); -S16 egtpRecvMsg(); -S16 egtpHdlRecvData(Buffer *mBuf); -S16 egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg); +uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason); +uint8_t egtpActvTsk(Pst *pst, Buffer *mBuf); +uint8_t egtpFillRspPst(Pst *pst, Pst *rspPst); +uint8_t egtpCfgReq(Pst *pst, EgtpConfig egtpCfg); +uint8_t egtpSrvOpenReq(Pst *pst); +uint8_t egtpSrvOpenPrc(uint8_t sockType, EgtpTptSrvr *server); +uint8_t egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt); +uint8_t egtpTnlAdd(EgtpTnlEvt tnlEvt); +uint8_t egtpTnlMod(EgtpTnlEvt tnlEvt); +uint8_t egtpTnlDel(EgtpTnlEvt tnlEvt); +uint8_t egtpHdlDatInd(EgtpMsg msg); +uint8_t egtpEncodeHdr(uint8_t *preEncodedHdr, EgtpMsgHdr *preDefHdr, uint8_t *hdrIdx); +uint8_t egtpSendMsg(Buffer *mBuf); +uint8_t egtpSlotInd(); +uint8_t egtpRecvMsg(); +uint8_t egtpHdlRecvData(Buffer *mBuf); +uint8_t egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg); #endif diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c index 054e39020..d63c8ad99 100644 --- a/src/du_app/du_f1ap_msg_hdl.c +++ b/src/du_app/du_f1ap_msg_hdl.c @@ -73,14 +73,14 @@ #include "du_mgr.h" #include "du_f1ap_msg_hdl.h" -S16 procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg); +uint8_t procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg); uint8_t procDlRrcMsgTrans(F1AP_PDU_t *f1apMsg); void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg); extern char encBuf[ENC_BUF_MAX_LEN]; extern DuCfgParams duCfgParam; uint8_t BuildULTnlInforet=RFAILED; uint8_t ServedCellListreturn=RFAILED; -S16 sctpSend(Buffer *mBuf, U8 itfType); +uint8_t sctpSend(Buffer *mBuf, U8 itfType); uint8_t Nrcgiret=RFAILED; uint8_t SplCellListret=RFAILED; uint8_t SRBSetupret=RFAILED; @@ -686,26 +686,26 @@ uint8_t SendF1APMsg(Region region, Pool pool) { Buffer *mBuf; - if(SGetMsg(region, pool, &mBuf) == ROK) + if(ODU_GET_MSG(region, pool, &mBuf) == ROK) { - if(SAddPstMsgMult((Data *)encBuf, encBufSize, mBuf) == ROK) + if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK) { - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); if(sctpSend(mBuf, F1_INTERFACE) != ROK) { DU_LOG("\nF1AP : SCTP Send failed"); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return RFAILED; } } else { - DU_LOG("\nF1AP : SAddPstMsgMult failed"); - SPutMsg(mBuf); + DU_LOG("\nF1AP : ODU_ADD_POST_MSG_MULT failed"); + ODU_PUT_MSG(mBuf); return RFAILED; } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } else { @@ -1148,7 +1148,7 @@ uint8_t BuildAndSendF1SetupReq() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -1624,7 +1624,7 @@ uint8_t BuildAndSendDUConfigUpdate() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apDuCfg); /* Encode the DU Config Update type as APER */ - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apDuCfg, PrepFinalEncBuf, encBuf); @@ -2068,7 +2068,7 @@ uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb ueCb, uint8_t lcId, \ xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -4966,7 +4966,7 @@ uint8_t BuildDuToCuRrcContainer(DUtoCURRCContainer_t *duToCuRrcContainer) /* encode cellGrpCfg into duToCuRrcContainer */ xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg); - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_CellGroupConfigRrc, 0, &cellGrpCfg, PrepFinalEncBuf, encBuf); /* Encode results */ @@ -5145,7 +5145,7 @@ uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); /* Encode results */ @@ -6221,7 +6221,7 @@ uint8_t BuildAndSendUESetReq() xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); /* Encode the F1SetupRequest type as APER */ - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ encBuf); @@ -6283,16 +6283,18 @@ void F1APMsgHdlr(Buffer *mBuf) F1AP_PDU_t f1apasnmsg ; DU_LOG("\nF1AP : Received F1AP message buffer"); - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); /* Copy mBuf into char array to decode it */ - SFndLenMsg(mBuf, &recvBufLen); - if(SGetSBuf(DFLT_REGION, DFLT_POOL, (Data **)&recvBuf, (Size)recvBufLen) != ROK) + ODU_FIND_MSG_LEN(mBuf, &recvBufLen); + DU_ALLOC(recvBuf, (Size)recvBufLen); + + if(recvBuf == NULLP) { DU_LOG("\nF1AP : Memory allocation failed"); return; } - if(SCpyMsgFix(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) + if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) { DU_LOG("\nF1AP : Failed while copying %d", copyCnt); return; @@ -6309,7 +6311,8 @@ void F1APMsgHdlr(Buffer *mBuf) memset(f1apMsg, 0, sizeof(F1AP_PDU_t)); rval = aper_decode(0, &asn_DEF_F1AP_PDU, (void **)&f1apMsg, recvBuf, recvBufLen, 0, 0); - SPutSBuf(DFLT_REGION, DFLT_POOL, (Data *)recvBuf, (Size)recvBufLen); + DU_FREE(recvBuf, (Size)recvBufLen); + if(rval.code == RC_FAIL || rval.code == RC_WMORE) { DU_LOG("\nF1AP : ASN decode failed"); diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h index 468a9e84a..4d876f372 100644 --- a/src/du_app/du_mgr.h +++ b/src/du_app/du_mgr.h @@ -55,7 +55,7 @@ #define MAC_CONFIGURED (MAC_GEN_CFG | MAC_SAP_CFG) #define DU_SET_ZERO(_buf, _size) \ - cmMemset((U8 *)(_buf), 0, _size); + memset((uint8_t *)(_buf), 0, _size); typedef enum { @@ -74,10 +74,10 @@ typedef enum typedef struct cellCfgParams { NrEcgi nrEcgi; /* ECGI */ - U16 nrPci; /* PCI */ - U16 fiveGsTac; /* 5gSTac */ + uint16_t nrPci; /* PCI */ + uint16_t fiveGsTac; /* 5gSTac */ Plmn plmn[MAX_PLMN]; /* List of serving PLMN IDs */ - U32 maxUe; /* max UE per slot */ + uint32_t maxUe; /* max UE per slot */ }CellCfgParams; typedef struct duUeCb @@ -93,7 +93,7 @@ typedef struct duCellCb { uint16_t cellId; /* Internal cell Id */ CellCfgParams cellInfo; /* Cell info */ - Bool firstSlotIndRcvd; + bool firstSlotIndRcvd; CellStatus cellStatus; /* Cell status */ uint32_t numActvUes; /* Total Active UEs */ DuUeCb ueCb[MAX_NUM_UE]; /* UE CONTEXT */ @@ -107,8 +107,8 @@ typedef struct duLSapCb State sapState; Mem mem; CmTimer timer; - U8 bndRetryCnt; - U8 maxBndRetry; + uint8_t bndRetryCnt; + uint8_t maxBndRetry; TmrCfg bndTmr; }DuLSapCb; @@ -126,8 +126,8 @@ typedef struct duCb Mem mem; /* Memory configs */ TskInit init; /* DU Init */ //DuLSapCb **macSap; /* MAC SAP */ - Bool f1Status; /* Status of F1 connection */ - Bool e2Status; /* Status of E2 connection */ + bool f1Status; /* Status of F1 connection */ + bool e2Status; /* Status of E2 connection */ uint8_t numCfgCells; DuCellCb* cfgCellLst[MAX_NUM_CELL]; /* List of cells at DU APP of type DuCellCb */ uint8_t numActvCells; @@ -152,7 +152,7 @@ typedef struct duLSapCfg Route dstRoute; Selector dstSel; Mem mem; - U8 maxBndRetry; + uint8_t maxBndRetry; TmrCfg bndTmr; TmrCfg connTmr; }DuLSapCfg; @@ -162,36 +162,36 @@ DuCb duCb; //DuCfgParams duCfgParam; /* DU Cell Functions */ -S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason); -S16 duActvTsk(Pst *pst, Buffer *mBuf); -S16 duSendRlcUlCfg(); -S16 duSendRlcDlCfg(); -S16 duBuildRlcCfg(Inst inst); -S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst); -S16 duBuildRlcUsapCfg(U8 elemId, Ent ent, Inst inst); -S16 DuHdlRlcCfgComplete(Pst *pst, KwMngmt *cfm); -S16 duHdlRlcCntrlCfgComplete(Pst *pst, KwMngmt *cfm); -S16 duProcRlcUlCfgComplete(Pst *pst, KwMngmt *cfm); -S16 duProcRlcDlCfgComplete(Pst *pst, KwMngmt *cfm); -S16 duSendMacCfg(); -S16 duBuildMacGenCfg(); -S16 duBuildMacUsapCfg(SpId sapId); -S16 duHdlMacCfgComplete(Pst *pst, RgMngmt *cfm); -S16 duBindUnbindRlcToMacSap(U8 inst, U8 action); -S16 duProcCfgComplete(); -S16 duSendSchCfg(); -S16 duSctpStartReq(); -S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy); - -S16 duBuildEgtpCfgReq(); -S16 duHdlEgtpCfgComplete(CmStatus cfm); -S16 duSendEgtpSrvOpenReq(); -S16 duHdlEgtpSrvOpenComplete(CmStatus cfm); -S16 duSendEgtpTnlMgmtReq(U8 action, U32 lclTeid, U32 remTeid); -S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm); -S16 duSendEgtpTestData(); -S16 duSendEgtpDatInd(Buffer *mBuf); -S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm); +uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason); +uint8_t duActvTsk(Pst *pst, Buffer *mBuf); +uint8_t duSendRlcUlCfg(); +uint8_t duSendRlcDlCfg(); +uint8_t duBuildRlcCfg(Inst inst); +uint8_t duBuildRlcLsapCfg(Ent ent, Inst inst, uint8_t lsapInst); +uint8_t duBuildRlcUsapCfg(uint8_t elemId, Ent ent, Inst inst); +uint8_t DuHdlRlcCfgComplete(Pst *pst, KwMngmt *cfm); +uint8_t duHdlRlcCntrlCfgComplete(Pst *pst, KwMngmt *cfm); +uint8_t duProcRlcUlCfgComplete(Pst *pst, KwMngmt *cfm); +uint8_t duProcRlcDlCfgComplete(Pst *pst, KwMngmt *cfm); +uint8_t duSendMacCfg(); +uint8_t duBuildMacGenCfg(); +uint8_t duBuildMacUsapCfg(SpId sapId); +uint8_t duHdlMacCfgComplete(Pst *pst, RgMngmt *cfm); +uint8_t duBindUnbindRlcToMacSap(uint8_t inst, uint8_t action); +uint8_t duProcCfgComplete(); +uint8_t duSendSchCfg(); +uint8_t duSctpStartReq(); +uint8_t duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy); + +uint8_t duBuildEgtpCfgReq(); +uint8_t duHdlEgtpCfgComplete(CmStatus cfm); +uint8_t duSendEgtpSrvOpenReq(); +uint8_t duHdlEgtpSrvOpenComplete(CmStatus cfm); +uint8_t duSendEgtpTnlMgmtReq(uint8_t action, uint32_t lclTeid, uint32_t remTeid); +uint8_t duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm); +uint8_t duSendEgtpTestData(); +uint8_t duSendEgtpDatInd(Buffer *mBuf); +uint8_t duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm); uint8_t duBuildAndSendMacCellStartReq(); uint8_t duBuildAndSendMacCellStopReq(); #endif diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c index 881bd7e06..2392d6afb 100644 --- a/src/du_app/du_mgr_ex_ms.c +++ b/src/du_app/du_mgr_ex_ms.c @@ -40,11 +40,11 @@ #include "du_ue_mgr.h" #include "du_utils.h" -extern S16 unpackRlcConfigCfm(RlcConfigCfm func,Pst *pst, Buffer *mBuf); -extern S16 cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf); -extern S16 cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf); +extern uint8_t unpackRlcConfigCfm(RlcConfigCfm func,Pst *pst, Buffer *mBuf); +extern uint8_t cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf); +extern uint8_t cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf); extern uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst, Buffer *mBuf); -extern S16 cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf); +extern uint8_t cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf); /************************************************************************** * @brief Task Initiation callback function. * @@ -65,7 +65,7 @@ extern S16 cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf); * @return ROK - success * RFAILED - failure ***************************************************************************/ -S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason) +uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason) { uint8_t id; @@ -97,7 +97,7 @@ S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason) duCb.numCfgCells = 0; duCb.numActvCells = 0; - SSetProcId(DU_PROC); + ODU_SET_PROC_ID(DU_PROC); return ROK; @@ -123,9 +123,9 @@ S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason) * RFAILED - failure * ***************************************************************************/ -S16 duActvTsk(Pst *pst, Buffer *mBuf) +uint8_t duActvTsk(Pst *pst, Buffer *mBuf) { - S16 ret = ROK; + uint8_t ret = ROK; switch(pst->srcEnt) { @@ -137,13 +137,13 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf) { DU_LOG("\n****** Received initial configs at DU APP ******\n"); duProcCfgComplete(); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } default: { DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTDUAPP"); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; } } @@ -187,7 +187,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf) { DU_LOG("\nDU_APP : Invalid event %d received at duActvTsk from ENTKW", \ pst->event); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; } } @@ -200,7 +200,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf) //Config complete case EVTCFG: { - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } case EVTLRGCFGCFM: @@ -246,7 +246,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf) default: { DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTRG"); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; } } @@ -279,7 +279,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf) } } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } case ENTEGTP: @@ -307,18 +307,18 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf) ret = RFAILED; } } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } default: { DU_LOG("\nDU_APP : DU APP can not process message from Entity %d", pst->srcEnt); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; } } - SExitTsk(); + ODU_EXIT_TASK(); return ret; } diff --git a/src/du_app/du_mgr_main.c b/src/du_app/du_mgr_main.c index 9a8c9617a..f4791d29e 100644 --- a/src/du_app/du_mgr_main.c +++ b/src/du_app/du_mgr_main.c @@ -30,12 +30,12 @@ #include "du_sctp.h" #include "du_egtp.h" -extern S16 rlcUlActvTsk (Pst *, Buffer *); -extern S16 rlcUlActvInit (Ent, Inst, Region, Reason); -extern S16 rlcDlActvTsk (Pst *, Buffer *); -extern S16 rlcDlActvInit (Ent, Inst, Region, Reason); -extern S16 rgActvTsk (Pst *, Buffer *); -extern S16 rgActvInit (Ent, Inst, Region, Reason); +extern uint8_t rlcUlActvTsk (Pst *, Buffer *); +extern uint8_t rlcUlActvInit (Ent, Inst, Region, Reason); +extern uint8_t rlcDlActvTsk (Pst *, Buffer *); +extern uint8_t rlcDlActvInit (Ent, Inst, Region, Reason); +extern uint8_t rgActvTsk (Pst *, Buffer *); +extern uint8_t rgActvInit (Ent, Inst, Region, Reason); /* Global variable */ DuCfgParams duCfgParam; @@ -57,16 +57,16 @@ DuCfgParams duCfgParam; * RFAILED - failure * * ****************************************************************/ -S16 duAppInit(SSTskId sysTskId) +uint8_t duAppInit(SSTskId sysTskId) { /* Register DU APP TAPA Task for DU */ - if(SRegTTsk((Ent)ENTDUAPP, (Inst)DU_INST, (Ttype)TTNORM, (Prior)PRIOR0, + if(ODU_REG_TTSK((Ent)ENTDUAPP, (Inst)DU_INST, (Ttype)TTNORM, (Prior)PRIOR0, duActvInit, (ActvTsk)duActvTsk) != ROK) { return RFAILED; } /* Attach DU APP TAPA Task for DU */ - if (SAttachTTsk((Ent)ENTDUAPP, (Inst)0, sysTskId)!= ROK) + if (ODU_ATTACH_TTSK((Ent)ENTDUAPP, (Inst)0, sysTskId)!= ROK) { return RFAILED; } @@ -93,16 +93,16 @@ S16 duAppInit(SSTskId sysTskId) * RFAILED - failure * * ****************************************************************/ -S16 egtpInit(SSTskId sysTskId) +uint8_t egtpInit(SSTskId sysTskId) { /* Register DU APP TAPA Task for DU */ - if(SRegTTsk((Ent)ENTEGTP, (Inst)EGTP_INST, (Ttype)TTNORM, (Prior)PRIOR0, + if(ODU_REG_TTSK((Ent)ENTEGTP, (Inst)EGTP_INST, (Ttype)TTNORM, (Prior)PRIOR0, egtpActvInit, (ActvTsk)egtpActvTsk) != ROK) { return RFAILED; } /* Attach DU APP TAPA Task for DU */ - if (SAttachTTsk((Ent)ENTEGTP, (Inst)0, sysTskId)!= ROK) + if (ODU_ATTACH_TTSK((Ent)ENTEGTP, (Inst)0, sysTskId)!= ROK) { return RFAILED; } @@ -129,16 +129,16 @@ S16 egtpInit(SSTskId sysTskId) * RFAILED - failure * * ****************************************************************/ -S16 sctpInit(SSTskId sysTskId) +uint8_t sctpInit(SSTskId sysTskId) { /* Register SCTP TAPA Task */ - if(SRegTTsk((Ent)ENTSCTP, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, + if(ODU_REG_TTSK((Ent)ENTSCTP, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, sctpActvInit, (ActvTsk)sctpActvTsk) != ROK) { return RFAILED; } /* Attach SCTP TAPA Task */ - if (SAttachTTsk((Ent)ENTSCTP, (Inst)SCTP_INST, sysTskId)!= ROK) + if (ODU_ATTACH_TTSK((Ent)ENTSCTP, (Inst)SCTP_INST, sysTskId)!= ROK) { return RFAILED; } @@ -163,28 +163,28 @@ S16 sctpInit(SSTskId sysTskId) * RFAILED - failure * * ****************************************************************/ -S16 rlcDlInit(SSTskId sysTskId) +uint8_t rlcDlInit(SSTskId sysTskId) { /* Register RLC DL TAPA Task */ - if(SRegTTsk((Ent)ENTKW, (Inst)1, (Ttype)TTNORM, (Prior)PRIOR0, + if(ODU_REG_TTSK((Ent)ENTKW, (Inst)1, (Ttype)TTNORM, (Prior)PRIOR0, rlcDlActvInit, (ActvTsk)rlcDlActvTsk) != ROK) { return RFAILED; } /* Attach RLC DL Task */ - if (SAttachTTsk((Ent)ENTKW, (Inst)1, sysTskId)!= ROK) + if (ODU_ATTACH_TTSK((Ent)ENTKW, (Inst)1, sysTskId)!= ROK) { return RFAILED; } /* Register MAC TAPA Task */ - if(SRegTTsk((Ent)ENTRG, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, + if(ODU_REG_TTSK((Ent)ENTRG, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, rgActvInit, (ActvTsk)rgActvTsk) != ROK) { return RFAILED; } /* Attach MAC Task */ - if (SAttachTTsk((Ent)ENTRG, (Inst)0, sysTskId)!= ROK) + if (ODU_ATTACH_TTSK((Ent)ENTRG, (Inst)0, sysTskId)!= ROK) { return RFAILED; } @@ -210,16 +210,16 @@ S16 rlcDlInit(SSTskId sysTskId) * RFAILED - failure * * ****************************************************************/ -S16 rlcUlInit(SSTskId sysTskId) +uint8_t rlcUlInit(SSTskId sysTskId) { /* Register RLC UL TAPA Task */ - if(SRegTTsk((Ent)ENTKW, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, + if(ODU_REG_TTSK((Ent)ENTKW, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, rlcUlActvInit, (ActvTsk)rlcUlActvTsk) != ROK) { return RFAILED; } /* Attach RLC DL Task */ - if (SAttachTTsk((Ent)ENTKW, (Inst)0, sysTskId)!= ROK) + if (ODU_ATTACH_TTSK((Ent)ENTKW, (Inst)0, sysTskId)!= ROK) { return RFAILED; } @@ -244,14 +244,14 @@ S16 rlcUlInit(SSTskId sysTskId) * RFAILED - failure * * ****************************************************************/ -S16 commonInit() +uint8_t commonInit() { /* Declare system task Ids */ SSTskId du_app_stsk, sctp_stsk, rlc_ul_stsk, rlc_mac_cl_stsk; pthread_attr_t attr; - SSetProcId(DU_PROC); + ODU_SET_PROC_ID(DU_PROC); /* system task for DU APP */ SCreateSTsk(PRIOR0, &du_app_stsk); @@ -317,7 +317,7 @@ S16 commonInit() * RFAILED - failure * * ****************************************************************/ -S16 duInit() +uint8_t duInit() { int ret = ROK; if(commonInit() != ROK) @@ -349,7 +349,7 @@ void init_log() * RFAILED - failure * * ****************************************************************/ -S16 tst(void) +uint8_t tst(void) { init_log(); diff --git a/src/du_app/du_mgr_main.h b/src/du_app/du_mgr_main.h index a13b51902..5587f59ff 100644 --- a/src/du_app/du_mgr_main.h +++ b/src/du_app/du_mgr_main.h @@ -20,13 +20,13 @@ #define __DU_MGR_MAIN_H__ /* Function declarations */ -S16 duAppInit(SSTskId sysTskId); -S16 sctpInit(SSTskId sysTskId); -S16 rlcDlInit(SSTskId sysTskId); -S16 rlcUlInit(SSTskId sysTskId); -S16 commonInit(); -S16 duInit(); -S16 tst(void); +uint8_t duAppInit(SSTskId sysTskId); +uint8_t sctpInit(SSTskId sysTskId); +uint8_t rlcDlInit(SSTskId sysTskId); +uint8_t rlcUlInit(SSTskId sysTskId); +uint8_t commonInit(); +uint8_t duInit(); +uint8_t tst(void); #endif diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c index 38c7ea4d3..21782c5f7 100644 --- a/src/du_app/du_msg_hdl.c +++ b/src/du_app/du_msg_hdl.c @@ -39,22 +39,22 @@ #include "lphy_stub.h" #include "du_utils.h" -U8 rlcDlCfg = 0; -U8 numRlcDlSaps = 0; -U8 rlcUlCfg = 0; -U8 numRlcMacSaps = 0; -U8 macCfg = 0; -U8 macCfgInst = 0; +uint8_t rlcDlCfg = 0; +uint8_t numRlcDlSaps = 0; +uint8_t rlcUlCfg = 0; +uint8_t numRlcMacSaps = 0; +uint8_t macCfg = 0; +uint8_t macCfgInst = 0; extern DuCfgParams duCfgParam; -extern S16 packRlcConfigReq(Pst *pst, KwMngmt *cfg); -extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg); -extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg); -extern S16 BuildAndSendE2SetupReq(); -extern S16 egtpHdlDatInd(EgtpMsg egtpMsg); +extern uint8_t packRlcConfigReq(Pst *pst, KwMngmt *cfg); +extern uint8_t cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg); +extern uint8_t cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg); +extern uint8_t BuildAndSendE2SetupReq(); +extern uint8_t egtpHdlDatInd(EgtpMsg egtpMsg); extern uint8_t BuildAndSendDUConfigUpdate(); -extern U16 getTransId(); -extern S16 cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg); +extern uint16_t getTransId(); +extern uint8_t cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg); packMacCellCfgReq packMacCellCfgOpts[] = { @@ -92,7 +92,7 @@ DuMacCellStopReq packMacCellStopReqOpts[] = * RFAILED - failure * ***************************************************************************/ -S16 duBuildRlcCfg(Inst inst) +uint8_t duBuildRlcCfg(Inst inst) { KwMngmt kwMngmt; KwGenCfg *genCfg = NULLP; @@ -175,7 +175,7 @@ S16 duBuildRlcCfg(Inst inst) * RFAILED - failure * ***************************************************************************/ -S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst) +uint8_t duBuildRlcLsapCfg(Ent ent, Inst inst, uint8_t lsapInst) { KwMngmt kwMngmt; @@ -252,7 +252,7 @@ S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst) * RFAILED - failure * ***************************************************************************/ -S16 duBuildRlcUsapCfg(U8 elemId, Ent ent, Inst inst) +uint8_t duBuildRlcUsapCfg(uint8_t elemId, Ent ent, Inst inst) { KwMngmt kwMngmt; KwSapCfg *uSap = NULLP; @@ -319,11 +319,11 @@ S16 duBuildRlcUsapCfg(U8 elemId, Ent ent, Inst inst) * RFAILED - failure * ***************************************************************************/ -S16 duProcCfgComplete() +uint8_t duProcCfgComplete() { - S16 ret = ROK; - static U16 cellId = 0; - U16 idx; + uint8_t ret = ROK; + static uint16_t cellId = 0; + uint16_t idx; for(idx=0; idx< DEFAULT_CELLS; idx++) { DuCellCb *cell = NULLP; @@ -335,8 +335,8 @@ S16 duProcCfgComplete() } else { - U32 nci; - U8 idx1; + uint32_t nci; + uint8_t idx1; memset(cell, 0, sizeof(DuCellCb)); cell->cellId = ++cellId; cell->cellInfo.nrEcgi.plmn.mcc[0] = PLMN_MCC0; @@ -359,7 +359,7 @@ S16 duProcCfgComplete() } cell->cellInfo.maxUe = duCfgParam.maxUe; cell->cellStatus = CELL_OUT_OF_SERVICE; - nci = (U16)cell->cellInfo.nrEcgi.cellId; + nci = (uint16_t)cell->cellInfo.nrEcgi.cellId; duCb.cfgCellLst[nci-1] = cell; duCb.numCfgCells++; @@ -387,9 +387,9 @@ S16 duProcCfgComplete() * RFAILED - failure * ***************************************************************************/ -S16 duSendRlcUlCfg() +uint8_t duSendRlcUlCfg() { - U8 cellIdx; + uint8_t cellIdx; duBuildRlcCfg((Inst)RLC_UL_INST); for(cellIdx = 0; cellIdx < DEFAULT_CELLS; cellIdx++) @@ -416,9 +416,9 @@ S16 duSendRlcUlCfg() * RFAILED - failure * ***************************************************************************/ -S16 duSendRlcDlCfg() +uint8_t duSendRlcDlCfg() { - U8 cellIdx; + uint8_t cellIdx; duBuildRlcCfg((Inst)RLC_DL_INST); duBuildRlcUsapCfg(STUDXSAP, ENTKW, (Inst)RLC_DL_INST); @@ -445,9 +445,9 @@ S16 duSendRlcDlCfg() * RFAILED - failure * ***************************************************************************/ -S16 DuHdlRlcCfgComplete(Pst *pst, KwMngmt *cfm) +uint8_t DuHdlRlcCfgComplete(Pst *pst, KwMngmt *cfm) { - S16 ret = ROK; + uint8_t ret = ROK; if (pst->srcInst == RLC_UL_INST) { ret = duProcRlcUlCfgComplete(pst, cfm); @@ -475,9 +475,9 @@ S16 DuHdlRlcCfgComplete(Pst *pst, KwMngmt *cfm) * RFAILED - failure * ***************************************************************************/ -S16 duHdlRlcCntrlCfgComplete(Pst *pst, KwMngmt *cntrl) +uint8_t duHdlRlcCntrlCfgComplete(Pst *pst, KwMngmt *cntrl) { - S16 ret = ROK; + uint8_t ret = ROK; if (cntrl->cfm.status == LCM_PRIM_OK) { @@ -535,9 +535,9 @@ S16 duHdlRlcCntrlCfgComplete(Pst *pst, KwMngmt *cntrl) * RFAILED - failure * ***************************************************************************/ -S16 duProcRlcUlCfgComplete(Pst *pst, KwMngmt *cfm) +uint8_t duProcRlcUlCfgComplete(Pst *pst, KwMngmt *cfm) { - S16 ret; + uint8_t ret; DU_LOG("\nDU_APP : RLC UL Cfg Status %d", cfm->cfm.status); if (cfm->cfm.status == LCM_PRIM_OK) @@ -602,7 +602,7 @@ S16 duProcRlcUlCfgComplete(Pst *pst, KwMngmt *cfm) * RFAILED - failure * ***************************************************************************/ -S16 duProcRlcDlCfgComplete(Pst *pst, KwMngmt *cfm) +uint8_t duProcRlcDlCfgComplete(Pst *pst, KwMngmt *cfm) { DU_LOG("\nDU_APP : RLC DL Cfg Status %d", cfm->cfm.status); if (cfm->cfm.status == LCM_PRIM_OK) @@ -665,7 +665,7 @@ S16 duProcRlcDlCfgComplete(Pst *pst, KwMngmt *cfm) * RFAILED - failure * ***************************************************************************/ -S16 duSendMacCfg() +uint8_t duSendMacCfg() { duBuildMacGenCfg(); duBuildMacUsapCfg(RLC_UL_INST); @@ -689,7 +689,7 @@ S16 duSendMacCfg() * RFAILED - failure * ***************************************************************************/ -S16 duBuildMacGenCfg() +uint8_t duBuildMacGenCfg() { RgMngmt rgMngmt; RgGenCfg *genCfg=NULLP; @@ -766,7 +766,7 @@ S16 duBuildMacGenCfg() * RFAILED - failure * ***************************************************************************/ -S16 duBuildMacUsapCfg(SpId sapId) +uint8_t duBuildMacUsapCfg(SpId sapId) { RgMngmt rgMngmt; RgUpSapCfg *uSap = NULLP; @@ -829,9 +829,9 @@ S16 duBuildMacUsapCfg(SpId sapId) * RFAILED - failure * ***************************************************************************/ -S16 duHdlMacCfgComplete(Pst *pst, RgMngmt *cfm) +uint8_t duHdlMacCfgComplete(Pst *pst, RgMngmt *cfm) { - S16 ret = ROK; + uint8_t ret = ROK; if (cfm->cfm.status == LCM_PRIM_OK) { @@ -885,7 +885,7 @@ S16 duHdlMacCfgComplete(Pst *pst, RgMngmt *cfm) * RFAILED - failure * ***************************************************************************/ -S16 duBindUnbindRlcToMacSap(U8 inst, U8 action) +uint8_t duBindUnbindRlcToMacSap(uint8_t inst, uint8_t action) { KwCntrl *cntrl = NULLP; KwMngmt kwMngmt; @@ -952,7 +952,7 @@ S16 duBindUnbindRlcToMacSap(U8 inst, U8 action) * * ****************************************************************/ -S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy) +uint8_t duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy) { if(f1Params.assocId == ntfy->u.assocChange.assocId) { @@ -992,9 +992,9 @@ S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy) * RFAILED - failure * * ****************************************************************/ -S16 duFillEgtpPst(Pst *pst, Event event) +uint8_t duFillEgtpPst(Pst *pst, Event event) { - cmMemset((U8 *)pst, 0, sizeof(Pst)); + memset((uint8_t *)pst, 0, sizeof(Pst)); pst->srcEnt = (Ent)ENTDUAPP; pst->srcInst = (Inst)DU_INST; pst->srcProcId = DU_PROC; @@ -1005,7 +1005,7 @@ S16 duFillEgtpPst(Pst *pst, Event event) pst->selector = ODU_SELECTOR_LC; pst->pool= DU_POOL; - RETVALUE(ROK); + return ROK; } @@ -1026,20 +1026,20 @@ S16 duFillEgtpPst(Pst *pst, Event event) * * ****************************************************************/ -S16 duBuildEgtpCfgReq() +uint8_t duBuildEgtpCfgReq() { Pst pst; EgtpConfig egtpCfg; DU_LOG("\nDU_APP : Sending EGTP config request"); - cmMemset((U8 *)&egtpCfg, 0, sizeof(EgtpConfig)); - cmMemcpy((U8 *)&egtpCfg, (U8 *)&duCfgParam.egtpParams, (PTR)sizeof(EgtpConfig)); + memset((uint8_t *)&egtpCfg, 0, sizeof(EgtpConfig)); + memcpy((uint8_t *)&egtpCfg, (uint8_t *)&duCfgParam.egtpParams, (PTR)sizeof(EgtpConfig)); duFillEgtpPst(&pst, EVTCFGREQ); packEgtpCfgReq(&pst, egtpCfg); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -1058,9 +1058,9 @@ S16 duBuildEgtpCfgReq() * RFAILED - failure * * ****************************************************************/ -S16 duHdlEgtpCfgComplete(CmStatus cfm) +uint8_t duHdlEgtpCfgComplete(CmStatus cfm) { - S16 ret = ROK; + uint8_t ret = ROK; if(cfm.status == LCM_PRIM_OK) { @@ -1075,7 +1075,7 @@ S16 duHdlEgtpCfgComplete(CmStatus cfm) ret = RFAILED; } - RETVALUE(ret); + return (ret); } /******************************************************************* @@ -1095,7 +1095,7 @@ S16 duHdlEgtpCfgComplete(CmStatus cfm) * * ****************************************************************/ -S16 duSendEgtpSrvOpenReq() +uint8_t duSendEgtpSrvOpenReq() { Pst pst; @@ -1104,7 +1104,7 @@ S16 duSendEgtpSrvOpenReq() duFillEgtpPst(&pst, EVTSRVOPENREQ); packEgtpSrvOpenReq(&pst); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -1124,9 +1124,9 @@ S16 duSendEgtpSrvOpenReq() * *****************************************************************/ -S16 duHdlEgtpSrvOpenComplete(CmStatus cfm) +uint8_t duHdlEgtpSrvOpenComplete(CmStatus cfm) { - S16 ret = ROK; + uint8_t ret = ROK; if(cfm.status == LCM_PRIM_OK) { @@ -1141,7 +1141,7 @@ S16 duHdlEgtpSrvOpenComplete(CmStatus cfm) ret = RFAILED; } - RETVALUE(ret); + return (ret); } /******************************************************************* @@ -1163,7 +1163,7 @@ S16 duHdlEgtpSrvOpenComplete(CmStatus cfm) * * ****************************************************************/ -S16 duSendEgtpTnlMgmtReq(U8 action, U32 lclTeid, U32 remTeid) +uint8_t duSendEgtpTnlMgmtReq(uint8_t action, uint32_t lclTeid, uint32_t remTeid) { Pst pst; EgtpTnlEvt tnlEvt; @@ -1177,7 +1177,7 @@ S16 duSendEgtpTnlMgmtReq(U8 action, U32 lclTeid, U32 remTeid) duFillEgtpPst(&pst, EVTTNLMGMTREQ); packEgtpTnlMgmtReq(&pst, tnlEvt); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -1196,9 +1196,9 @@ S16 duSendEgtpTnlMgmtReq(U8 action, U32 lclTeid, U32 remTeid) * RFAILED - failure * * ****************************************************************/ -S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm) +uint8_t duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm) { - S16 ret = ROK; + uint8_t ret = ROK; if(tnlEvtCfm.cfmStatus.status == LCM_PRIM_OK) { @@ -1216,10 +1216,10 @@ S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm) ret = RFAILED; } - RETVALUE(ret); + return (ret); } -S16 duSendEgtpDatInd(Buffer *mBuf) +uint8_t duSendEgtpDatInd(Buffer *mBuf) { EgtpMsg egtpMsg; @@ -1255,26 +1255,26 @@ S16 duSendEgtpDatInd(Buffer *mBuf) * RFAILED - failure * * ****************************************************************/ -S16 duSendEgtpTestData() +uint8_t duSendEgtpTestData() { char data[30] = "This is EGTP data from DU"; int datSize = 30; Buffer *mBuf; - if(SGetMsg(DU_APP_MEM_REGION, DU_POOL, &mBuf) == ROK) + if(ODU_GET_MSG(DU_APP_MEM_REGION, DU_POOL, &mBuf) == ROK) { - if(SAddPstMsgMult((Data *)data, datSize, mBuf) != ROK) + if(ODU_ADD_POST_MSG_MULT((Data *)data, datSize, mBuf) != ROK) { - DU_LOG("\nDU_APP : SAddPstMsgMult failed"); - SPutMsg(mBuf); - RETVALUE(RFAILED); + DU_LOG("\nDU_APP : ODU_ADD_POST_MSG_MULT failed"); + ODU_PUT_MSG(mBuf); + return RFAILED; } } else { DU_LOG("\nDU_APP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } /* filling IPv4 header */ @@ -1282,9 +1282,9 @@ S16 duSendEgtpTestData() MsgLen mLen; mLen = 0; - SFndLenMsg(mBuf, &mLen); + ODU_FIND_MSG_LEN(mBuf, &mLen); - cmMemset((U8 *)&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); + memset((uint8_t *)&ipv4Hdr, 0, sizeof(CmIpv4Hdr)); ipv4Hdr.length = CM_IPV4_HDRLEN + mLen; ipv4Hdr.hdrVer = 0x45; ipv4Hdr.proto = 1; @@ -1292,14 +1292,14 @@ S16 duSendEgtpTestData() ipv4Hdr.destAddr = CM_INET_NTOH_U32(duCfgParam.egtpParams.destIp.ipV4Addr); /* Packing IPv4 header into buffer */ - S16 ret, cnt, idx; + uint8_t ret, cnt, idx; Data revPkArray[CM_IPV4_HDRLEN]; Data pkArray[CM_IPV4_HDRLEN]; /* initialize locals */ cnt = 0; - cmMemset(revPkArray, 0, CM_IPV4_HDRLEN); - cmMemset(pkArray, 0, CM_IPV4_HDRLEN); + memset(revPkArray, 0, CM_IPV4_HDRLEN); + memset(pkArray, 0, CM_IPV4_HDRLEN); /* Pack Header Version */ pkArray[cnt++] = ipv4Hdr.hdrVer; @@ -1344,11 +1344,11 @@ S16 duSendEgtpTestData() revPkArray[idx] = pkArray[CM_IPV4_HDRLEN - idx -1]; /* this function automatically reverses revPkArray */ - ret = SAddPreMsgMult(revPkArray, (MsgLen)cnt, mBuf); + ret = ODU_ADD_PRE_MSG_MULT(revPkArray, (MsgLen)cnt, mBuf); duSendEgtpDatInd(mBuf); - RETVALUE(ROK); + return ROK; } #endif /* EGTP_TEST */ @@ -1368,7 +1368,7 @@ S16 duSendEgtpTestData() * RFAILED - failure * ***************************************************************************/ -S16 duSendSchCfg() +uint8_t duSendSchCfg() { RgMngmt rgMngmt; RgSchInstCfg *cfg = NULLP; @@ -1448,9 +1448,9 @@ S16 duSendSchCfg() * RFAILED - failure * ***************************************************************************/ -S16 duLayerConfigComplete() +uint8_t duLayerConfigComplete() { - S16 ret = ROK; + uint8_t ret = ROK; DU_LOG("\nDU_APP : Configuring all Layer is complete"); @@ -1470,7 +1470,7 @@ S16 duLayerConfigComplete() ret = RFAILED; } - RETVALUE(ret); + return (ret); } /************************************************************************** @@ -1489,7 +1489,7 @@ S16 duLayerConfigComplete() * RFAILED - failure * ***************************************************************************/ -S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm) +uint8_t duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm) { if (cfm->cfm.status == LCM_PRIM_OK) { @@ -1525,14 +1525,14 @@ S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm) * RFAILED - failure * * ****************************************************************/ -S16 duSendEgtpSlotInd() +uint8_t duSendEgtpSlotInd() { Pst pst; duFillEgtpPst(&pst, EVTSLOTIND); packEgtpSlotInd(&pst); - RETVALUE(ROK); + return ROK; } @@ -1551,7 +1551,7 @@ S16 duSendEgtpSlotInd() * RFAILED - failure * ***************************************************************************/ -S16 duBuildAndSendMacCellCfg() +uint8_t duBuildAndSendMacCellCfg() { Pst pst; DU_SET_ZERO(&pst, sizeof(Pst)); diff --git a/src/du_app/du_sctp.c b/src/du_app/du_sctp.c index 30e7bb752..dbc74ba4e 100644 --- a/src/du_app/du_sctp.c +++ b/src/du_app/du_sctp.c @@ -50,10 +50,10 @@ * @return ROK - success * RFAILED - failure ***************************************************************************/ -S16 sctpActvInit(Ent entity, Inst inst, Region region, Reason reason) +uint8_t sctpActvInit(Ent entity, Inst inst, Region region, Reason reason) { DU_LOG("\n\nSCTP : Initializing"); - SSetProcId(DU_PROC); + ODU_SET_PROC_ID(DU_PROC); connUp = FALSE; f1Params.assocId = -1; ricParams.assocId = -1; @@ -81,7 +81,7 @@ S16 sctpActvInit(Ent entity, Inst inst, Region region, Reason reason) * RFAILED - failure * ***************************************************************************/ -S16 sctpActvTsk(Pst *pst, Buffer *mBuf) +uint8_t sctpActvTsk(Pst *pst, Buffer *mBuf) { switch(pst->srcEnt) { @@ -98,7 +98,7 @@ S16 sctpActvTsk(Pst *pst, Buffer *mBuf) break; } } - SExitTsk(); + ODU_EXIT_TASK(); return ROK; } /******************************************************************* @@ -117,15 +117,15 @@ S16 sctpActvTsk(Pst *pst, Buffer *mBuf) * RFAILED - failure * ******************************************************************/ -S16 duCheckReqStatus(CmStatus *cfm) +uint8_t duCheckReqStatus(CmStatus *cfm) { - S16 ret = ROK; + uint8_t ret = ROK; if(cfm->status != LCM_PRIM_OK) { DU_LOG("\nDU_APP : Failed to process the request successfully"); ret = RFAILED; } - RETVALUE(ret); + return (ret); } /************************************************************************** @@ -147,9 +147,9 @@ S16 duCheckReqStatus(CmStatus *cfm) * ***************************************************************************/ -S16 duSctpCfgReq(SctpParams sctpCfg) +uint8_t duSctpCfgReq(SctpParams sctpCfg) { - S16 ret = ROK; + uint8_t ret = ROK; CmStatus cfm; /* Fill F1 Params */ @@ -159,7 +159,7 @@ S16 duSctpCfgReq(SctpParams sctpCfg) f1Params.itfState = DU_SCTP_DOWN; f1Params.srcPort = sctpCfg.duPort[F1_INTERFACE]; f1Params.recvMsgSet = ROK; - cmMemset ((U8 *)&f1Params.sockFd, -1, sizeof(CmInetFd)); + memset ((uint8_t *)&f1Params.sockFd, -1, sizeof(CmInetFd)); fillDestNetAddr(&f1Params.destIpNetAddr, &f1Params.destIpAddr); fillAddrLst(&f1Params.destAddrLst, &f1Params.destIpAddr); @@ -170,7 +170,7 @@ S16 duSctpCfgReq(SctpParams sctpCfg) ricParams.itfState = DU_SCTP_DOWN; ricParams.srcPort = sctpCfg.duPort[E2_INTERFACE]; ricParams.recvMsgSet = ROK; - cmMemset ((U8 *)&ricParams.sockFd, -1, sizeof(CmInetFd)); + memset ((uint8_t *)&ricParams.sockFd, -1, sizeof(CmInetFd)); fillDestNetAddr(&ricParams.destIpNetAddr, &ricParams.destIpAddr); fillAddrLst(&ricParams.destAddrLst, &ricParams.destIpAddr); @@ -186,7 +186,7 @@ S16 duSctpCfgReq(SctpParams sctpCfg) ret = duCheckReqStatus(&cfm); - RETVALUE(ret); + return (ret); } /******************************************************************* @@ -208,13 +208,13 @@ S16 duSctpCfgReq(SctpParams sctpCfg) * ******************************************************************/ -S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, F1IpAddr *ipAddr) +uint8_t fillAddrLst(CmInetNetAddrLst *addrLstPtr, F1IpAddr *ipAddr) { addrLstPtr->count++; addrLstPtr->addrs[(addrLstPtr->count - 1)].type = CM_INET_IPV4ADDR_TYPE; addrLstPtr->addrs[(addrLstPtr->count - 1)].u.ipv4NetAddr = CM_INET_NTOH_U32(ipAddr->ipV4Addr); - RETVALUE(ROK); + return ROK; } /****************************************************************************** @@ -235,12 +235,12 @@ S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, F1IpAddr *ipAddr) * RFAILED - failure * *******************************************************************************/ -S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, F1IpAddr *dstIpPtr) +uint8_t fillDestNetAddr(CmInetNetAddr *destAddrPtr, F1IpAddr *dstIpPtr) { /* Filling destination address */ destAddrPtr->type = CM_INET_IPV4ADDR_TYPE; destAddrPtr->u.ipv4NetAddr = CM_INET_NTOH_U32(dstIpPtr->ipV4Addr); - RETVALUE(ROK); + return ROK; } /****************************************************************************** @@ -261,10 +261,10 @@ S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, F1IpAddr *dstIpPtr) * *******************************************************************************/ -S16 establishReq(DuSctpDestCb *paramPtr) +uint8_t establishReq(DuSctpDestCb *paramPtr) { Pst pst; - S16 ret = ROK; + uint8_t ret = ROK; socket_type = CM_INET_STREAM; if((ret = cmInetSocket(socket_type, ¶mPtr->sockFd, IPPROTO_SCTP)) != ROK) @@ -308,7 +308,7 @@ S16 establishReq(DuSctpDestCb *paramPtr) duFillSctpPst(&pst, EVTSTARTPOLL); } - RETVALUE(ret); + return (ret); } /****************************************************************************** @@ -330,9 +330,9 @@ S16 establishReq(DuSctpDestCb *paramPtr) * *******************************************************************************/ -S16 duSctpAssocReq(U8 itfType) +uint8_t duSctpAssocReq(uint8_t itfType) { - S16 ret = ROK; + uint8_t ret = ROK; CmStatus cfm; DuSctpDestCb *paramPtr = NULLP; @@ -340,7 +340,7 @@ S16 duSctpAssocReq(U8 itfType) if(paramPtr == NULLP) { printf("\nDU_APP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } switch(itfType) { @@ -375,7 +375,7 @@ S16 duSctpAssocReq(U8 itfType) } ret = duCheckReqStatus(&cfm); - RETVALUE(ret); + return (ret); } /******************************************************************* * @@ -393,15 +393,15 @@ S16 duSctpAssocReq(U8 itfType) * RFAILED - failure * * ****************************************************************/ -S16 duFillSctpPst(Pst *pst, Event event) +uint8_t duFillSctpPst(Pst *pst, Event event) { Buffer *mBuf; - if(SGetMsg(DFLT_REGION, DU_POOL, &mBuf) != ROK) + if(ODU_GET_MSG(DFLT_REGION, DU_POOL, &mBuf) != ROK) { printf("\nDU_APP : Failed to allocate memory"); - RETVALUE(RFAILED); + return RFAILED; } - cmMemset((U8 *)pst, 0, sizeof(Pst)); + memset((uint8_t *)pst, 0, sizeof(Pst)); pst->srcEnt = (Ent)ENTDUAPP; pst->srcInst = (Inst)DU_INST; pst->srcProcId = DU_PROC; @@ -411,9 +411,9 @@ S16 duFillSctpPst(Pst *pst, Event event) pst->event = event; pst->selector = ODU_SELECTOR_LC; pst->pool= DU_POOL; - SPstTsk(pst, mBuf); + ODU_POST_TASK(pst, mBuf); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -432,9 +432,9 @@ S16 duFillSctpPst(Pst *pst, Event event) * RFAILED - failure * * ****************************************************************/ -S16 sctpSetSockOpts(CmInetFd *sock_Fd) +uint8_t sctpSetSockOpts(CmInetFd *sock_Fd) { - S16 ret = ROK; + uint8_t ret = ROK; CmSctpEvent sctpEvent; sctpEvent.dataIoEvent = TRUE; @@ -451,7 +451,7 @@ S16 sctpSetSockOpts(CmInetFd *sock_Fd) ret = RFAILED; } - RETVALUE(ret); + return (ret); } /******************************************************************* @@ -476,10 +476,10 @@ void sendToDuApp(Buffer *mBuf, Event event) { Pst pst; DU_LOG("\nSCTP : Forwarding received message to duApp"); - SPrntMsg(mBuf, 0, 0); + ODU_PRINT_MSG(mBuf, 0, 0); - cmMemset((U8 *)&(pst), 0, sizeof(Pst)); + memset((uint8_t *)&(pst), 0, sizeof(Pst)); pst.srcEnt = (Ent)ENTSCTP; pst.srcInst = (Inst)SCTP_INST; pst.srcProcId = DU_PROC; @@ -491,9 +491,9 @@ void sendToDuApp(Buffer *mBuf, Event event) pst.pool= DU_POOL; pst.region = DFLT_REGION; - if (SPstTsk(&pst, mBuf) != ROK) + if (ODU_POST_TASK(&pst, mBuf) != ROK) { - DU_LOG("\nSCTP : SPstTsk failed in duReadCfg"); + DU_LOG("\nSCTP : ODU_POST_TASK failed in duReadCfg"); } } @@ -513,7 +513,7 @@ void sendToDuApp(Buffer *mBuf, Event event) * RFAILED - failure * * ****************************************************************/ -S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy, U8 *itfState) +uint8_t sctpNtfyHdlr(CmInetSctpNotification *ntfy, uint8_t *itfState) { Pst pst; @@ -577,7 +577,7 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy, U8 *itfState) /* Pack notification and send to APP */ DU_LOG("\nSCTP : Forwarding received message to duApp"); - cmMemset((U8 *)&(pst), 0, sizeof(Pst)); + memset((uint8_t *)&(pst), 0, sizeof(Pst)); pst.srcEnt = (Ent)ENTSCTP; pst.srcInst = (Inst)SCTP_INST; pst.srcProcId = DU_PROC; @@ -592,9 +592,9 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy, U8 *itfState) if(cmPkSctpNtfy(&pst, ntfy) != ROK) { DU_LOG("\nSCTP : Failed to pack SCTP notification"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -620,9 +620,9 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy, U8 *itfState) * * ****************************************************************/ -S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeoutPtr, CmInetMemInfo *memInfo, Bool recvMsgSet) +uint8_t processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, uint32_t *timeoutPtr, CmInetMemInfo *memInfo, bool recvMsgSet) { - U16 ret = ROK; + uint8_t ret = ROK; CM_INET_FD_SET(sockFd, &pollParams->readFd); ret = cmInetSelect(&pollParams->readFd, NULLP, timeoutPtr, &pollParams->numFd); if(CM_INET_FD_ISSET(sockFd, &pollParams->readFd)) @@ -654,7 +654,7 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou else { DU_LOG("\nSCTP : Failed to fill AssocId\n"); - RETVALUE(RFAILED); + return RFAILED; } if(ret != ROK) { @@ -672,11 +672,11 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou else { - SPutMsg(pollParams->mBuf); + ODU_PUT_MSG(pollParams->mBuf); } } } - RETVALUE(ROK); + return ROK; } /******************************************************************* * @@ -694,11 +694,11 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou * RFAILED - failure * * ****************************************************************/ -S16 sctpSockPoll() +uint8_t sctpSockPoll() { - U16 ret = ROK; - U32 timeout; - U32 *timeout_Ptr; + uint8_t ret = ROK; + uint32_t timeout; + uint32_t *timeout_Ptr; CmInetMemInfo memInfo; sctpSockPollParams f1PollParams, e2PollParams; @@ -723,7 +723,7 @@ S16 sctpSockPoll() CM_INET_FD_ZERO(&e2PollParams.readFd); DU_LOG("\nSCTP : Polling started at DU\n"); - while(1) + while(true) { if(f1Params.itfState) { @@ -740,7 +740,7 @@ S16 sctpSockPoll() } } }; - RETVALUE(ret); + return (ret); }/* End of sctpSockPoll() */ /******************************************************************* @@ -759,9 +759,9 @@ S16 sctpSockPoll() * RFAILED - failure * * ****************************************************************/ -S16 sctpSend(Buffer *mBuf, U8 itfType) +uint8_t sctpSend(Buffer *mBuf, uint8_t itfType) { - U8 ret; + uint8_t ret; MsgLen len; /* number of actually sent octets */ CmInetMemInfo memInfo; @@ -783,10 +783,10 @@ S16 sctpSend(Buffer *mBuf, U8 itfType) if(ret != ROK && ret != RWOULDBLOCK) { DU_LOG("\nSCTP : Failed sending the message"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* End of sctpSend */ /********************************************************************** diff --git a/src/du_app/du_sctp.h b/src/du_app/du_sctp.h index 7fa7055d5..0bc82a9b6 100644 --- a/src/du_app/du_sctp.h +++ b/src/du_app/du_sctp.h @@ -27,18 +27,18 @@ #define MAX_RETRY 5 /* Global variable declaration */ -U8 socket_type; /* Socket type */ -Bool nonblocking; /* Blocking/Non-blocking socket */ -Bool connUp; /* Is connection up */ -Bool pollingState; +uint8_t socket_type; /* Socket type */ +bool nonblocking; /* Blocking/Non-blocking socket */ +bool connUp; /* Is connection up */ +bool pollingState; CmInetNetAddrLst localAddrLst; CmInetNetAddrLst remoteAddrLst; typedef struct { - S16 numFd; /* Total count number of receivers socket Fd */ - U16 port; /* Filled by the InetSctpRecvMsg during polling */ - U32 flag; /* Refers to the notifyHandler Flag during successful InetSctpRecvMsg*/ + uint8_t numFd; /* Total count number of receivers socket Fd */ + uint16_t port; /* Filled by the InetSctpRecvMsg during polling */ + uint32_t flag; /* Refers to the notifyHandler Flag during successful InetSctpRecvMsg*/ Buffer *mBuf; /* Buffer filled during Socket polling*/ MsgLen bufLen; /* Determines the length of the Buffer filled during socket polling */ CmInetNetAddr addr; /* Determines the destination port filled during socket polling */ @@ -49,11 +49,11 @@ typedef struct typedef struct { - U8 itfState; /* determines the interface State*/ - U16 destPort; /* Refers to the destination port of F1/E2 */ - U16 srcPort; /* Refers to respective src port of DU */ - U32 assocId; - Bool recvMsgSet; + uint8_t itfState; /* determines the interface State*/ + uint16_t destPort; /* Refers to the destination port of F1/E2 */ + uint16_t srcPort; /* Refers to respective src port of DU */ + uint32_t assocId; + bool recvMsgSet; F1IpAddr destIpAddr; /* Refers to te destination Ip Address */ CmInetFd sockFd; /* Socket file descriptor */ CmInetNetAddrLst destAddrLst; /* Refers to the destinaiton Addr Lst in CmInetNetAddrLst format */ @@ -65,20 +65,20 @@ DuSctpDestCb f1Params; /* SCTP configurations at DU */ DuSctpDestCb ricParams; /* SCTP configurations at DU */ -S16 sctpActvInit(Ent entity, Inst inst, Region region, Reason reason); -S16 sctpActvTsk(Pst *pst, Buffer *mBuf); +uint8_t sctpActvInit(Ent entity, Inst inst, Region region, Reason reason); +uint8_t sctpActvTsk(Pst *pst, Buffer *mBuf); void sctpAssocReq(); void sendToDuApp(Buffer *mBuf, Event event); -S16 sctpSend(Buffer *mBuf, U8 itfType); -S16 duSctpCfgReq(SctpParams sctpCfg); -S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, F1IpAddr *ipAddr); -S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, F1IpAddr *dstIpPtr); -S16 establishReq(DuSctpDestCb *paramPtr); -S16 duSctpAssocReq(U8 itfType); -S16 duFillSctpPst(Pst *pst, Event event); -S16 sctpSetSockOpts(CmInetFd *sock_Fd); -S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeoutPtr, CmInetMemInfo *memInfo, Bool recvMsgSet); -S16 sctpSockPoll(); +uint8_t sctpSend(Buffer *mBuf, uint8_t itfType); +uint8_t duSctpCfgReq(SctpParams sctpCfg); +uint8_t fillAddrLst(CmInetNetAddrLst *addrLstPtr, F1IpAddr *ipAddr); +uint8_t fillDestNetAddr(CmInetNetAddr *destAddrPtr, F1IpAddr *dstIpPtr); +uint8_t establishReq(DuSctpDestCb *paramPtr); +uint8_t duSctpAssocReq(uint8_t itfType); +uint8_t duFillSctpPst(Pst *pst, Event event); +uint8_t sctpSetSockOpts(CmInetFd *sock_Fd); +uint8_t processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, uint32_t *timeoutPtr, CmInetMemInfo *memInfo, bool recvMsgSet); +uint8_t sctpSockPoll(); #endif diff --git a/src/du_app/du_sys_info_hdl.c b/src/du_app/du_sys_info_hdl.c index 5106fdc44..0fb3fe48c 100644 --- a/src/du_app/du_sys_info_hdl.c +++ b/src/du_app/du_sys_info_hdl.c @@ -174,7 +174,7 @@ uint8_t BuildMibPdu() uint8_t ret = RFAILED; BCCH_BCH_Message_t *bcchMsg; asn_enc_rval_t encRetVal; /* Encoder return value */ - while(1) + while(true) { DU_ALLOC(bcchMsg, sizeof(BCCH_BCH_Message_t)); if(!bcchMsg) @@ -196,7 +196,7 @@ uint8_t BuildMibPdu() break; } xer_fprint(stdout, &asn_DEF_BCCH_BCH_Message, bcchMsg); - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_BCCH_BCH_Message, 0, bcchMsg, PrepFinalEncBuf, encBuf); @@ -278,7 +278,7 @@ uint8_t BuildMibMsg() asn_enc_rval_t encRetVal; /* Encoder return value */ uint8_t ret = RFAILED; uint8_t BuildMibret; - while(1) + while(true) { DU_ALLOC(mibMsg, sizeof(MIB_t)); if(!mibMsg) @@ -292,7 +292,7 @@ uint8_t BuildMibMsg() break; } xer_fprint(stdout, &asn_DEF_MIB, mibMsg); - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_MIB, 0, mibMsg, PrepFinalEncBuf, encBuf); @@ -2342,7 +2342,7 @@ uint8_t BuildSib1Msg() xer_fprint(stdout, &asn_DEF_SIB1, sib1Msg); /* Encode the F1SetupRequest type as APER */ - cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); + memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_SIB1, 0, sib1Msg, PrepFinalEncBuf,\ encBuf); @@ -2363,7 +2363,7 @@ uint8_t BuildSib1Msg() ret = ROK; break; - }while(1); + }while(true); FreeSib1Msg(sib1Msg); diff --git a/src/du_app/du_ue_mgr.c b/src/du_app/du_ue_mgr.c index d094005cf..aed5cc026 100644 --- a/src/du_app/du_ue_mgr.c +++ b/src/du_app/du_ue_mgr.c @@ -132,7 +132,7 @@ uint8_t duHdlRlcUlData(Pst *pst, KwuDatIndInfo* datInd, Buffer *mBuf) /* Send UL data to CU via EGTP */ duSendEgtpDatInd(mBuf); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return ROK; } diff --git a/src/du_app/du_utils.h b/src/du_app/du_utils.h index a70d1fbae..dcb2ba04f 100644 --- a/src/du_app/du_utils.h +++ b/src/du_app/du_utils.h @@ -48,7 +48,7 @@ _ret = SGetSBuf(DU_APP_MEM_REGION, DU_POOL, \ (Data **)&_datPtr, _size); \ if(_ret == ROK) \ - cmMemset((U8*)_datPtr, 0, _size); \ + memset((uint8_t*)_datPtr, 0, _size); \ else \ _datPtr = NULLP; \ } @@ -66,7 +66,7 @@ if(SGetStaticBuffer(DU_APP_MEM_REGION, DU_POOL, \ (Data **)&_buf, (Size) _size, 0) == ROK) \ { \ - cmMemset((U8 *)(_buf), 0, _size); \ + memset((uint8_t *)(_buf), 0, _size); \ } \ else \ { \ diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 427c89dc1..ea4ec29e1 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -757,7 +757,7 @@ unsigned int mtGetNtlHdl() void * mtGetWlsHdl() { - RETVALUE(osCp.wls.intf); + return (osCp.wls.intf); } #ifdef XEON_MULTIPLE_CELL_CHANGES @@ -785,10 +785,10 @@ PRIVATE int SOpenWlsIntf() if(!osCp.wls.intf) { printf("Could not open WLS Interface \n"); - RETVALUE(0); + return (0); } - RETVALUE(1); + return (1); } #endif @@ -830,13 +830,13 @@ char **argv; /* argument vector */ if(smWrReadWlsConfigParams() != ROK) { fprintf(stderr, "Failed to read WLS params from file wr_cfg.txt"); - RETVALUE(RFAILED); + return RFAILED; } /* end of if statement */ #endif #ifdef INTEL_WLS if(!SOpenWlsIntf()) - RETVALUE(0); + return (0); #endif /* INTEL_WLS */ msArgc = argc; @@ -847,11 +847,11 @@ char **argv; /* argument vector */ printf("\n SInit failed, SSI could not start \n"); /* pthread_exit(NULLP);*/ /* Commented to Come out of Main thread*/ - RETVALUE(0); + return (0); } /*mt010.301 cleanup part exposed to user*/ SFini(); - RETVALUE(0); + return (0); } #else @@ -893,7 +893,7 @@ char **argv; /* argument vector */ SInit(); - RETVALUE(0); + return (0); } #endif @@ -952,7 +952,7 @@ PUBLIC S16 ssdInitGen() if(fileBasedMemCfg == TRUE && memConfigured == FALSE) { printf("\n File Based Memory configuration failed \n"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -968,7 +968,7 @@ PUBLIC S16 ssdInitGen() /* initialize the started semaphore */ if (sem_init(&osCp.dep.ssStarted, 0, 0) != 0) { - RETVALUE(RFAILED); + return RFAILED; } /* mt028.201 added compile time flag to allow not to mask signals */ @@ -1012,27 +1012,27 @@ PUBLIC S16 ssdInitGen() if(sigaction(SIGILL, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGILL\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGSEGV, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGSEGV\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGABRT, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGABRT\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGTERM, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGTERM\n"); - RETVALUE(RFAILED); + return RFAILED; } if(sigaction(SIGHUP, &sa, NULL) != 0) { printf("Failed to process sigaction for the SIGHUP\n"); - RETVALUE(RFAILED); + return RFAILED; } #endif #else @@ -1051,14 +1051,14 @@ PUBLIC S16 ssdInitGen() act.sa_flags = 0; if (sigaction(SIGINT, &act, NULLP) != 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* mt040.201 initialise random seed */ osCp.dep.randSeed = time(NULLP); - RETVALUE(ROK); + return ROK; } @@ -1133,7 +1133,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1149,7 +1149,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be dynMemSetElem->nextBktPtr = NULLP; dynMemSetElem->numFreeBlks = 0; - RETVALUE(ROK); + return ROK; } /* @@ -1193,7 +1193,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1209,7 +1209,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated dynMemSetElem->numFreeBlks = bktCb->bucketSetSize; - RETVALUE(ROK); + return ROK; } /* ssGetDynMemBlkSet */ @@ -1258,7 +1258,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1280,7 +1280,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock if(lstNode == NULLP) { SUnlock(&(bktCb->bucketLock)); - RETVALUE(RFAILED); + return RFAILED; } cmLListDelFrm(&(bktCb->listFreeBktSet), lstNode); @@ -1298,7 +1298,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock SUnlock(&(bktCb->bucketLock)); } - RETVALUE(ROK); + return ROK; } /* @@ -1346,7 +1346,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1367,7 +1367,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock if(lstNode == NULLP) { SUnlock(&(bktCb->bucketLock)); - RETVALUE(RFAILED); + return RFAILED; } /* Delete the node from the valid linked list and copy the values of the @@ -1383,7 +1383,7 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock SUnlock(&(bktCb->bucketLock)); } - RETVALUE(ROK); + return ROK; } /* ssGetDynMemBlkSet */ @@ -1410,7 +1410,7 @@ Region reg; #if (ERRCLASS & ERRCLS_INT_PAR) if(bktIdx >= globReg->numBkts) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -1426,7 +1426,7 @@ Region reg; // printf ("recoverd bktCb->listValidBktSet.count %d bktIdx %d\n",bktCb->listValidBktSet.count ,bktIdx); } SUnlock(&(bktCb->bucketLock)); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -1441,7 +1441,7 @@ Region reg; SUnlock(&(bktCb->bucketLock)); } } - RETVALUE(ROK); + return ROK; } #endif /* USE_MALLOC */ @@ -1478,12 +1478,12 @@ Region region; /* Klock work fix ccpu00148484 */ if(!(region < SS_MAX_REGS)) { - RETVALUE(NULLP); + return (NULLP); } dynRegCb = (CmMmDynRegCb *)osCp.dynRegionTbl[region].regCb; - RETVALUE(dynRegCb->iccHdl); + return (dynRegCb->iccHdl); } #endif /* SS_USE_ICC_MEMORY */ @@ -1526,7 +1526,7 @@ PUBLIC S16 SPartitionWlsMemory() } //Store last region addr for validation mtRegMemSz[i].startAddr = regMemStrtAddr; - RETVALUE(ROK); + return ROK; } #ifdef SS_MEM_WL_DEBUG @@ -1575,7 +1575,7 @@ PUBLIC S16 SPartitionStaticMemory(U8 *startAddr) } #endif /* T2K_MEM_LEAK_DBG */ } - RETVALUE(ROK); + return ROK; } PUBLIC S16 SAllocateWlsMem() { @@ -1609,7 +1609,7 @@ PUBLIC S16 SAllocateWlsMem() printf("\n ************* \n WLS memory: %lx, %d\n ****** \n", (PTR)osCp.wls.allocAddr, reqdMemSz); #endif SPartitionWlsMemory(); - RETVALUE(ROK); + return ROK; } PUBLIC S16 SAllocateStaticMem() { @@ -1644,7 +1644,7 @@ PUBLIC S16 SAllocateStaticMem() printf("\n ************* \n Static memory: %lx, %d\n ****** \n", (PTR)startAddr, reqdMemSz); #endif SPartitionStaticMemory(startAddr); - RETVALUE(ROK); + return ROK; } #endif /* INTEL_WLS */ @@ -1703,7 +1703,7 @@ PUBLIC S16 ssdInitMem() dynRegCb = (CmMmDynRegCb *)calloc(1, sizeof(CmMmDynRegCb)); if(dynRegCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } for(k = 0; k < mtDynMemoCfg.region[i].numBkts; k++) { @@ -1722,7 +1722,7 @@ PUBLIC S16 ssdInitMem() if(osCp.globRegCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } globReg = (CmMmGlobRegCb *)osCp.globRegCb; @@ -1737,7 +1737,7 @@ PUBLIC S16 ssdInitMem() #endif if(globReg->bktTbl[i].startAddr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } globReg->bktTbl[i].poolId = i; globReg->bktTbl[i].size = mtGlobMemoCfg.bkt[i].blkSize; @@ -1755,7 +1755,7 @@ PUBLIC S16 ssdInitMem() dynRegCb = (CmMmDynRegCb *)calloc(1, sizeof(CmMmDynRegCb)); if(dynRegCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } for(k = 0; k < mtDynMemoCfg.region[i].numBkts; k++) { @@ -1767,7 +1767,7 @@ PUBLIC S16 ssdInitMem() #ifdef XEON_SPECIFIC_CHANGES free(dynRegCb); #endif - RETVALUE(RFAILED); + return RFAILED; } dynRegCb->bktTbl[k].size = mtGlobMemoCfg.bkt[k].blkSize; dynRegCb->bktTbl[k].blkSetRelThreshold = mtDynMemoCfg.region[i].bkt[k].blkSetRelThreshold; @@ -1801,7 +1801,7 @@ PUBLIC S16 ssdInitMem() if (pthread_mutex_init(&(regMemLeakInfo.memLock[reg]), NULL) != 0) { printf("\n mutex init failed\n"); - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -1830,7 +1830,7 @@ PUBLIC S16 ssdInitMem() free(mtCMMRegCb[k]); free(mtCMMRegCfg[k]); } - RETVALUE(RFAILED); + return RFAILED; } mtCMMRegCfg[i] = (CmMmRegCfg *)calloc(1, sizeof(CmMmRegCfg)); @@ -1847,7 +1847,7 @@ PUBLIC S16 ssdInitMem() free(mtCMMRegCfg[k]); } free(mtCMMRegCb[i]); - RETVALUE(RFAILED); + return RFAILED; } @@ -1892,7 +1892,7 @@ PUBLIC S16 ssdInitMem() } free(mtCMMRegCb[i]); free(mtCMMRegCfg[i]); - RETVALUE(RFAILED); + return RFAILED; } @@ -1925,7 +1925,7 @@ PUBLIC S16 ssdInitMem() free(mtCMMRegCfg[i]->vAddr); free(mtCMMRegCb[i]); free(mtCMMRegCfg[i]); - RETVALUE(RFAILED); + return RFAILED; } @@ -1946,7 +1946,7 @@ PUBLIC S16 ssdInitMem() free(mtCMMRegCfg[i]->vAddr); free(mtCMMRegCb[i]); free(mtCMMRegCfg[i]); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -1956,7 +1956,7 @@ PUBLIC S16 ssdInitMem() #endif /* SS_MEM_LEAK_STS */ - RETVALUE(ROK); + return ROK; } @@ -2043,7 +2043,7 @@ PUBLIC S16 ssdInitTsk() osCp.sTskTbl[tskInd].dep.lwpId = 0; } #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ - RETVALUE(ROK); + return ROK; } @@ -2120,7 +2120,7 @@ PUBLIC S16 ssdInitDrvr() */ if (pipe(osCp.dep.isFildes) != 0) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef L2_L3_SPLIT @@ -2135,7 +2135,7 @@ PUBLIC S16 ssdInitDrvr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2152,7 +2152,7 @@ PUBLIC S16 ssdInitDrvr() pthread_attr_destroy(&attr); #endif - RETVALUE(ROK); + return ROK; } @@ -2245,7 +2245,7 @@ PUBLIC S16 ssdInitTmr() sTsk = ssdAddTmrSTsk(); if(!sTsk) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTICORE_SUPPORT */ /* create the timer handler thread */ @@ -2274,7 +2274,7 @@ PUBLIC S16 ssdInitTmr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP @@ -2290,7 +2290,7 @@ PUBLIC S16 ssdInitTmr() pthread_attr_destroy(&attr); - RETVALUE(ROK); + return ROK; } @@ -2412,7 +2412,7 @@ PUBLIC S16 ssdInitLog() if ((tcgetattr(fd, &tio)) != 0) { printf("Error: disable canonical input processing\n"); - RETVALUE(RFAILED); + return RFAILED; } tio.c_lflag &= ~ICANON; @@ -2421,7 +2421,7 @@ PUBLIC S16 ssdInitLog() if ((tcsetattr(fd, TCSANOW, &tio)) != 0) { printf("Error: while tcsetattr() processing\n"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* CONSTDIO */ @@ -2434,7 +2434,7 @@ PUBLIC S16 ssdInitLog() if (fcntl(fd, F_SETFL, flags) == -1) { printf("Error: while fcntl processing\n"); - RETVALUE(RFAILED); + return RFAILED; } @@ -2452,7 +2452,7 @@ PUBLIC S16 ssdInitLog() pthread_attr_destroy(&attr); printf("Error: Logging Thread creation failed \n"); - RETVALUE(RFAILED); + return RFAILED; } /* mt020.201 - Addition for destroying thread attribute object attr */ @@ -2462,7 +2462,7 @@ PUBLIC S16 ssdInitLog() #endif /* CONAVL */ - RETVALUE(ROK); + return ROK; } @@ -2528,7 +2528,7 @@ U16 port; ProcId procId = SS_WD_WDPROC; if (SAddProcIdLst(1, &procId) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -2613,7 +2613,7 @@ U16 port; if (SGetMsg(SS_DFLT_REGION, SS_DFLT_POOL, &mBuf) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef SS_MULTIPLE_PROCS pst.srcProcId = SFndProcId(); @@ -2626,7 +2626,7 @@ U16 port; ssdInitWatchDgPst(&pst); SPstTsk(&pst, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -2654,7 +2654,7 @@ Pst *pst; pst->srcEnt = ENTDW; /* source entity */ pst->srcInst = 0; - RETVALUE(ROK); + return ROK; } #ifdef SS_MULTIPLE_PROCS @@ -2683,7 +2683,7 @@ PUBLIC S16 ssdWatchDgActvTmr() cmPrcTmr(&osCp.wdCp.watchDgTqCp, osCp.wdCp.watchDgTs, (PFV)ssdWatchDgTmrEvt); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -2927,7 +2927,7 @@ U32 type; } SUnlock(&osCp.wdCp.wdLock); - RETVALUE(ret); + return (ret); } #endif /* SS_WATCHDOG */ @@ -3363,7 +3363,7 @@ char *opts; /* options */ UNUSED(argv); UNUSED(opts); - RETVALUE(EOF); + return (EOF); #else sp = 1; @@ -3372,19 +3372,19 @@ char *opts; /* options */ /*mt013.301 : Changes as per coding standards*/ if (msOptInd >= (S16) argc || argv[msOptInd][0] == '\0') { - RETVALUE(EOF); + return (EOF); } else { if (!strcmp(argv[msOptInd], "--")) { msOptInd++; - RETVALUE(EOF); + return (EOF); } else if (argv[msOptInd][0] != '-') { msOptInd++; - RETVALUE('?'); + return ('?'); } } } @@ -3398,7 +3398,7 @@ char *opts; /* options */ sp = 1; } - RETVALUE('?'); + return ('?'); } if (*++cp == ':') @@ -3409,7 +3409,7 @@ char *opts; /* options */ if (++msOptInd >= (S16) argc) { sp = 1; - RETVALUE('?'); + return ('?'); } else msOptArg = argv[msOptInd++]; @@ -3428,7 +3428,7 @@ char *opts; /* options */ } - RETVALUE(c); + return (c); #endif /* NOCMDLINE */ } @@ -3523,7 +3523,7 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT001, ret, "SGetMsg() failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } mInfo = (SsMsgInfo *)mBuf->b_rptr; @@ -3560,12 +3560,12 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ MTLOGERROR(ERRCLS_DEBUG, EMT002, ret, "Could not write to demand queue"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -3595,7 +3595,7 @@ SsTTskEntry *tTsk; /* pointer to TAPA task entry */ TRC0(ssdDetachTTsk); - RETVALUE(ROK); + return ROK; } @@ -3649,7 +3649,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ #endif /* SS_MULTICORE_SUPPORT */ #endif /* SS_WATCHDOG */ { - RETVALUE(ROK); + return ROK; } #endif @@ -3689,7 +3689,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ MTLOGERROR(ERRCLS_DEBUG, EMT004, ERRZERO, "Could not create thread"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP threadCreated = ssCheckAndAddMemoryRegionMap(sTsk->dep.tId, @@ -3720,7 +3720,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ MTLOGERROR(ERRCLS_DEBUG, EMT004, ERRZERO, "Could not create thread"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP threadCreated = ssCheckAndAddMemoryRegionMap(sTsk->dep.tId, @@ -3741,7 +3741,7 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(ROK); + return ROK; } @@ -3770,7 +3770,7 @@ void* arg; /* Klock work fix ccpu00148484 */ if(threadArg == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } threadArg->argument = arg; threadArg->start_routine = start_routine; @@ -3793,7 +3793,7 @@ void* arg; if (((retVal = pthread_create(tid, attr, pthreadCreateHdlr, threadArg))) != 0) { - RETVALUE(retVal); + return (retVal); } #ifdef SS_THR_REG_MAP threadCreated = ssCheckAndAddMemoryRegionMap(*tid, SS_MAX_REGS - 1); @@ -3801,7 +3801,7 @@ void* arg; #endif } - RETVALUE(retVal); + return (retVal); } @@ -3875,7 +3875,7 @@ pthread_attr_t *attr #endif pthread_attr_setschedparam(attr, ¶m); - RETVALUE (ROK); + return (ROK); } /* ssdSetPthreadAttr */ @@ -3940,7 +3940,7 @@ U32 *coreId; /* the core/processor id to which the affinity i if (tskInd == SS_MAX_STSKS) { MTLOGERROR(ERRCLS_DEBUG, EMT036, ERRZERO, "Invalid system task Id\n"); - RETVALUE(RFAILED); + return RFAILED; } @@ -3953,7 +3953,7 @@ U32 *coreId; /* the core/processor id to which the affinity i #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT037, ERRZERO, "Could not get thread affinity\n"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* end if pthread_setaffinity fails */ for (cpuInd = 0; cpuInd b_rptr; @@ -4169,11 +4169,11 @@ SsSTskEntry *sTsk; /* pointer to system task entry */ "Could not write to demand queue"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* mt023.201 - Added SThreadYield function to yield CPU @@ -4213,11 +4213,11 @@ PUBLIC S16 SThreadYield() tw.tv_sec=0; tw.tv_usec=0; - RETVALUE(select(0,0,0,0,&tw) == 0 ? ROK : RFAILED); + return (select(0,0,0,0,&tw) == 0 ? ROK : RFAILED); } #else /* other UNICes */ - RETVALUE(sleep(0) == 0 ? ROK : RFAILED); + return (sleep(0) == 0 ? ROK : RFAILED); #endif /* SS_LINUX */ @@ -4276,7 +4276,7 @@ SsTmrEntry *tmr; /* pointer to timer entry */ cmPlcCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -4322,7 +4322,7 @@ SsTmrEntry *tmr; /* pointer to timer entry */ cmRmvCbTq(&arg); - RETVALUE(ROK); + return ROK; } @@ -4385,7 +4385,7 @@ Reason reason; /* reset reason */ /* won't reach here */ - RETVALUE(ROK); + return ROK; } @@ -4549,7 +4549,7 @@ SsDrvrTskEntry *drvrTsk; /* driver task entry */ TRC0(ssdRegDrvrTsk); - RETVALUE(ROK); + return ROK; } /* mt001.30 : Additions */ /* @@ -4579,7 +4579,7 @@ SsDrvrTskEntry *drvrTsk; /* driver task entry */ TRC0(ssdDeregDrvrTsk); - RETVALUE(ROK); + return ROK; } #endif @@ -4639,7 +4639,7 @@ SsIdx idx; if (ret != ROK) { MTLOGERROR(ERRCLS_DEBUG, EMTXXX, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret); if (ret != ROK) @@ -4651,11 +4651,11 @@ SsIdx idx; { #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMTXXX, ERRZERO, "Could not Unlock system task table"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MULTIPLE_PROCS @@ -4735,9 +4735,9 @@ SsIdx idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMTXXX, ERRZERO, "Could not Unlock system task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } //#ifndef SPLIT_RLC_DL_TASK @@ -4777,7 +4777,7 @@ Ptr tskPtr; /* pointer to task entry */ * (processes L1 msgs) */ } - RETVALUE(NULLP); + return (NULLP); } #else EXTERN Void ysMtTskHdlr(Void); @@ -4837,7 +4837,7 @@ Ptr tskPtr; /* pointer to task entry */ #endif } - RETVALUE(NULLP); + return (NULLP); } #endif /* TENB_T2K3K_SPECIFIC_CHANGES */ #endif @@ -4859,7 +4859,7 @@ void *arg; continue; pthreadCreateArg->start_routine(pthreadCreateArg->argument); - RETVALUE(ROK); + return ROK; } /* @@ -4929,7 +4929,7 @@ Ptr tskPtr; /* pointer to task entry */ } } - RETVALUE(NULLP); + return (NULLP); } @@ -4993,7 +4993,7 @@ SsSTskEntry *sTsk if (ret != ROK) { /* nothing to receive */ - RETVALUE(ROK); + return ROK; } /* if we can't lock this system task entry, return the message */ @@ -5006,7 +5006,7 @@ SsSTskEntry *sTsk "Could not lock system task entry"); #endif SPutMsg(mBuf); - RETVALUE(ROK); + return ROK; } /* mt034.201 */ @@ -5058,7 +5058,7 @@ SsSTskEntry *sTsk "Could not lock system task table"); #endif /* what to do here? */ - RETVALUE(ROK); + return ROK; } /* clean up the system task entry */ @@ -5087,7 +5087,7 @@ SsSTskEntry *sTsk /* unlock the system task table */ SUnlock(&osCp.sTskTblLock); - RETVALUE(RFAILED); + return RFAILED; /* this is a data message or a permanent task keep-alive message */ @@ -5351,7 +5351,7 @@ SsSTskEntry *sTsk SThreadYield(); #endif - RETVALUE(ROK); + return ROK; } Bool g_usettitmr; @@ -5539,7 +5539,7 @@ void *parm; /* unused */ } /* mt009.21: addition */ - RETVALUE( (Void *) NULLP); + return ( (Void *) NULLP); /* will not reach here */ } @@ -5820,7 +5820,7 @@ Ptr parm; /* unused */ if (osCp.dep.conInFp == NULLP) { /* die */ - RETVALUE(NULLP); + return (NULLP); } fd = fileno(osCp.dep.conInFp); @@ -5950,7 +5950,7 @@ Ptr tskPtr; /* pointer to task entry */ } } /* mt009.21: addition */ - RETVALUE( (Void *) NULLP); + return ( (Void *) NULLP); /* not reached */ } @@ -6093,14 +6093,14 @@ Txt *buf; /* buffer */ if (buf == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT022, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifndef XEON_SPECIFIC_CHANGES #ifdef TENB_T2K3K_SPECIFIC_CHANGES ssMemlog(buf, strlen(buf)); - RETVALUE(ROK); + return ROK; #endif #endif @@ -6128,7 +6128,7 @@ Txt *buf; /* buffer */ #endif #endif - RETVALUE(ROK); + return ROK; } /*mt010.301 */ @@ -6173,7 +6173,7 @@ PUBLIC S16 SFini() #endif pthread_exit(NULLP); - RETVALUE(0); + return (0); } /* @@ -6206,7 +6206,7 @@ REG1 DateTime *dt; /* date and time */ UNUSED(dt); - RETVALUE(ROK); + return ROK; } @@ -6254,7 +6254,7 @@ REG1 DateTime *dt; /* date and time */ if (dt == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT023, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6287,7 +6287,7 @@ REG1 DateTime *dt; /* date and time */ #endif #endif /*-- SS_DATETIME_USEC --*/ - RETVALUE(ROK); + return ROK; } /* @@ -6333,7 +6333,7 @@ PRIVATE U64 now; #if (ERRCLASS & ERRCLS_INT_PAR) if (et == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6356,7 +6356,7 @@ PRIVATE U64 now; *et = now; - RETVALUE(ROK); + return ROK; } @@ -6391,7 +6391,7 @@ Ticks *sysTime; /* system time */ if (sysTime == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT024, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6399,7 +6399,7 @@ Ticks *sysTime; /* system time */ *sysTime = osCp.dep.sysTicks; - RETVALUE(ROK); + return ROK; } /* mt021.201 - Addition of SGetRefTime function */ @@ -6455,13 +6455,13 @@ U32 *usec; if (sec == NULLP || usec == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT025, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* mt022.201 - Modification to fix compile warning */ if (refTime > (U32)(ptime.tv_sec)) { MTLOGERROR(ERRCLS_INT_PAR, EMT026, ERRZERO, "Reference time exceeds present time"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6472,7 +6472,7 @@ U32 *usec; *usec = ptime.tv_usec; #endif - RETVALUE(ROK); + return ROK; } @@ -6510,7 +6510,7 @@ Random *value; /* random number */ { /* mt011.21: addition */ MTLOGERROR(ERRCLS_INT_PAR, EMT028, (ErrVal)0 , "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6518,7 +6518,7 @@ Random *value; /* random number */ *value = (Random) rand_r(&osCp.dep.randSeed); - RETVALUE(ROK); + return ROK; } @@ -6547,7 +6547,7 @@ PUBLIC S16 SExitTsk() TRC1(SExitTsk); - RETVALUE(ROK); + return ROK; } @@ -6576,7 +6576,7 @@ PUBLIC S16 SExitInt() TRC1(SExitInt); - RETVALUE(ROK); + return ROK; } @@ -6609,7 +6609,7 @@ PUBLIC S16 SHoldInt() TRC1(SHoldInt); - RETVALUE(ROK); + return ROK; } @@ -6638,7 +6638,7 @@ PUBLIC S16 SRelInt() TRC1(SRelInt); - RETVALUE(ROK); + return ROK; } @@ -6668,7 +6668,7 @@ PUBLIC INLINE S16 SEnbInt() TRC1(SEnbInt); - RETVALUE(ROK); + return ROK; } @@ -6698,7 +6698,7 @@ PUBLIC INLINE S16 SDisInt() TRC1(SDisInt); - RETVALUE(ROK); + return ROK; } @@ -6735,7 +6735,7 @@ PIF *vectFnct; /* vector function */ UNUSED(vectFnct); - RETVALUE(ROK); + return ROK; } @@ -6772,7 +6772,7 @@ PIF vectFnct; /* vector function */ UNUSED(vectFnct); - RETVALUE(ROK); + return ROK; } /* mt028.201: modification: multiple procs support related changes */ @@ -6819,7 +6819,7 @@ Inst *inst; /* instance */ if (ent == NULLP || inst == NULLP) { MTLOGERROR(ERRCLS_INT_PAR, EMT029, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6833,7 +6833,7 @@ Inst *inst; /* instance */ ret = SLock(&osCp.sTskTblLock); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i = 0; i < SS_MAX_STSKS; i++) { @@ -6851,7 +6851,7 @@ Inst *inst; /* instance */ SUnlock(&osCp.sTskTblLock); - RETVALUE(ret == ROK ? ROK : RFAILED); + return (ret == ROK ? ROK : RFAILED); } @@ -6894,7 +6894,7 @@ Inst inst; /* instance */ if (ent >= ENTNC || inst >= INSTNC) { MTLOGERROR(ERRCLS_INT_PAR, EMT030, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6908,7 +6908,7 @@ Inst inst; /* instance */ ret = SLock(&osCp.sTskTblLock); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i = 0; i < SS_MAX_STSKS; i++) { @@ -6926,7 +6926,7 @@ Inst inst; /* instance */ SUnlock(&osCp.sTskTblLock); - RETVALUE(ret == ROK ? ROK : RFAILED); + return (ret == ROK ? ROK : RFAILED); } #endif /* SS_MULTIPLE_PROCS */ @@ -6969,7 +6969,7 @@ Bool flag; /* flag */ if (id >= SS_MAX_DRVRTSKS || osCp.drvrTskTbl[id].used == FALSE) { MTLOGERROR(ERRCLS_INT_PAR, EMT031, id, "Invalid instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6979,11 +6979,11 @@ Bool flag; /* flag */ if (write(osCp.dep.isFildes[1], &isFlag, sizeof(isFlag)) != sizeof(isFlag)) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* SS_DRVR_SUPPORT */ @@ -7051,7 +7051,7 @@ PUBLIC S16 SGlobMemInfoShow() sprintf(prntBuf, "--------------------------------------------------------------\n"); SDisplay(0, prntBuf); - RETVALUE(ROK); + return ROK; } #endif /* SS_LOCKLESS_MEMORY */ @@ -7066,9 +7066,9 @@ Bool IsMemoryThresholdHit(Region reg, Pool pool) pool, mtCMMRegCb[reg]->bktTbl[pool].numAlloc, mtCMMRegCb[reg]->bktTbl[pool].numBlks); - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } */ @@ -7126,7 +7126,7 @@ U32 *availmem; if (region > (SS_MAX_REGS-1) ) { MTLOGERROR(ERRCLS_INT_PAR, EMT032, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7206,7 +7206,7 @@ U32 *availmem; SDisplay(0, prntBuf); #endif - RETVALUE(ROK); + return ROK; } #ifdef XEON_SPECIFIC_CHANGES #define SSI_MAX_BKT_THRESHOLD 6 @@ -7274,7 +7274,7 @@ U8 maxBkt; memStatus = 2; } } - RETVALUE(memStatus); + return (memStatus); } #endif /* mt033.201 - addition of API to return the memory statistical data */ @@ -7314,7 +7314,7 @@ SsMemDbgInfo *dbgInfo; if (region >= mtMemoCfg.numRegions ) { MTLOGERROR(ERRCLS_INT_PAR, EMT033, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7349,7 +7349,7 @@ SsMemDbgInfo *dbgInfo; dbgInfo->numFragBlk = mtCMMRegCb[region]->heapCb.numFragBlk; #endif - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -7369,7 +7369,7 @@ U8 *numPool; /* Send number of Pools available */ *numPool = cfgRegInfo[0].numPools; - RETVALUE(ROK); + return ROK; } /* mt033.201 - addition of APIs to print the memory statistical data @@ -7418,7 +7418,7 @@ U8 typeFlag; if (region >= mtMemoCfg.numRegions ) { MTLOGERROR(ERRCLS_INT_PAR, EMT034, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7483,7 +7483,7 @@ U8 typeFlag; else if (typeFlag == SS_MEM_BLK_SIZE_PROFILE) { /* Bucket Memory allocation Statistics */ - RETVALUE(SPrintRegMemStats(region)); + return (SPrintRegMemStats(region)); } else { @@ -7492,7 +7492,7 @@ U8 typeFlag; SDisplay(0, prntBuf); } - RETVALUE(ROK); + return ROK; } /* @@ -7599,7 +7599,7 @@ Region region; sprintf(prntBuf, "\n"); SDisplay(0, prntBuf); - RETVALUE(ROK); + return ROK; } /* @@ -7692,7 +7692,7 @@ Region region; if (region >= mtMemoCfg.numRegions ) { MTLOGERROR(ERRCLS_INT_PAR, EMT035, ERRZERO, "Invalid Region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7830,7 +7830,7 @@ Region region; * we cannot rely on this size. So it is better to stop here unless there * exists any other mechanism(?) to know the offset to next block. */ - RETVALUE(ROK); + return ROK; } /*mt009.301 Fixed 64BIT compilation warnings*/ @@ -7881,7 +7881,7 @@ Region region; } - RETVALUE(ROK); + return ROK; } #endif /* SSI_DEBUG_LEVEL1 */ @@ -7954,7 +7954,7 @@ S8 *ts; sprintf(ts, "%s.%03ld", time_string, microseconds); #endif - RETVALUE(ROK); + return ROK; } /*-- mt037.201 : Added new API for SGetSystemTsk --*/ @@ -7982,7 +7982,7 @@ PUBLIC U32 SGetSystemTsk() { TRC1(SGetSystemTskS); - RETVALUE(pthread_self()); + return (pthread_self()); } /* end of SGetSystemTsk */ @@ -8022,7 +8022,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() "Could not lock system task table"); #endif - RETVALUE(sTsk); + return (sTsk); } /* check count of system tasks */ @@ -8034,7 +8034,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT040, ERRZERO, "Could not give the Semaphore"); - RETVALUE(sTsk); + return (sTsk); #endif } @@ -8042,7 +8042,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() MTLOGERROR(ERRCLS_ADD_RES, EMT041, ERRZERO, "Too many system tasks"); #endif - RETVALUE(sTsk); + return (sTsk); } @@ -8061,7 +8061,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT042, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -8070,7 +8070,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() "Could not initialize demand queue"); #endif - RETVALUE(NULLP); + return (NULLP); } /* initialize the system task entry lock */ @@ -8083,7 +8083,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT044, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -8092,7 +8092,7 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() "Could not initialize system task entry lock"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -8110,11 +8110,11 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT046, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } - RETVALUE(sTsk); + return (sTsk); } #endif /* SS_MULTICORE_SUPPORT */ /* mt003.301 Readwrite lock and recursive mutex additions */ @@ -8162,7 +8162,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdInitLockNew(): Initialization of read write lock failed,Error# retVal %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8176,7 +8176,7 @@ U8 lockType; { sprintf(prntBuf,"\n ssdInitLockNew(): mutexattr init failed,Error# %d \n",retVal); SPrint(prntBuf); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_LINUX retVal = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); @@ -8188,7 +8188,7 @@ U8 lockType; sprintf(prntBuf,"\n ssdInitLockNew(): mutexattr settype failed,Error# %d \n",retVal); pthread_mutexattr_destroy(&attr); SPrint(prntBuf); - RETVALUE(RFAILED); + return RFAILED; } retVal = pthread_mutex_init((pthread_mutex_t *)&(lockId->l.recurLock), &attr); if(retVal != 0) @@ -8196,7 +8196,7 @@ U8 lockType; sprintf(prntBuf,"\n ssdInitLockNew(): mutex init failed,Error# %d \n",retVal); pthread_mutexattr_destroy(&attr); SPrint(prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8205,10 +8205,10 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdInitLockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* * @@ -8250,7 +8250,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the read lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8260,7 +8260,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the write lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8270,7 +8270,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the read lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8280,7 +8280,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the read lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8292,7 +8292,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Failed to aquire the recursive mutex,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8301,11 +8301,11 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdLockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -8349,7 +8349,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdUnLockNew(): Failed to unlock the lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8361,7 +8361,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdUnLockNew(): Failed to aquire the recursive mutex,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8370,10 +8370,10 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdUnlockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* @@ -8415,7 +8415,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdDestroyLockNew(): Failed to destroy the lock,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8427,7 +8427,7 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdDestroyLockNew(): Failed to destroy the mutex,Error# %d\n", retVal); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -8436,10 +8436,10 @@ U8 lockType; { sprintf(prntBuf, "\n\n ssdDestroyLockNew(): Invalid lock type %d\n", lockType); SDisplay(0, prntBuf); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } #endif /* SS_LOCK_SUPPORT */ @@ -8488,12 +8488,12 @@ PUBLIC S16 ssInitRcvWork() { pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } pthread_attr_destroy(&attr); - RETVALUE(ROK); + return ROK; }/* ssInitRcvWork */ @@ -8711,7 +8711,7 @@ Region region /* Region associated with thread */ exit(1); } createdThreadIds[createdThreads++] = threadId; - RETVALUE(FALSE); + return (FALSE); } /* If we found free mapping table entry, place the region and send pthread_cancel * for all the thread Ids which are created before this @@ -8731,7 +8731,7 @@ Region region /* Region associated with thread */ } createdThreads = 0; - RETVALUE(TRUE); + return (TRUE); } /* ssCheckAndAddMemoryRegionMap */ @@ -8780,14 +8780,14 @@ pthread_t threadId /* Thread Id of system task */ #else printf("Invalid Thread ID (%d)\n", (U32)threadId); #endif - RETVALUE(RFAILED); + return RFAILED; } /* If we found free mapping table entry, place the region and send pthread_cancel * for all the thread Ids which are created before this */ osCp.threadMemoryRegionMap[((threadId >> SS_MEM_THREAD_ID_SHIFT) % SS_MAX_THREAD_REGION_MAP)] = SS_INVALID_THREAD_REG_MAP; - RETVALUE(ROK); + return ROK; } /* ssCheckAndAddMemoryRegionMap */ @@ -8822,7 +8822,7 @@ U32 taskId; #ifdef MSPD_MLOG_NEW *startTime = GetTIMETICK(); #endif - RETVALUE(ROK); + return ROK; } /* @@ -8886,7 +8886,7 @@ U32 taskId; #endif break; } - RETVALUE(ROK); + return ROK; } #else #ifdef ANSI @@ -8902,7 +8902,7 @@ U32 taskId; #endif { *startTime = 0; - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -8917,7 +8917,7 @@ VOLATILE U32 startTime; U32 taskId; #endif { - RETVALUE(ROK); + return ROK; } #endif /*#ifdef SS_TSKLOG_ENABLE */ @@ -9045,7 +9045,7 @@ U8 idx; "Could not lock system task table"); #endif - RETVALUE(sTsk); + return (sTsk); } /* initialize the system task entry with the information we have */ @@ -9070,7 +9070,7 @@ U8 idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT042, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -9079,7 +9079,7 @@ U8 idx; "Could not initialize demand queue"); #endif - RETVALUE(NULLP); + return (NULLP); } /* initialize the system task entry lock */ @@ -9092,7 +9092,7 @@ U8 idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT044, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } @@ -9101,7 +9101,7 @@ U8 idx; "Could not initialize system task entry lock"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -9117,11 +9117,11 @@ U8 idx; #if (ERRCLASS & ERRCLS_DEBUG) MTLOGERROR(ERRCLS_DEBUG, EMT046, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } - RETVALUE(sTsk); + return (sTsk); } #endif /* SS_MULTICORE_SUPPORT */ @@ -9171,7 +9171,7 @@ PUBLIC S16 ssdReInitTmr() MTLOGERROR(ERRCLS_DEBUG, EMT046, ERRZERO, "Could not give the Semaphore"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -9182,7 +9182,7 @@ PUBLIC S16 ssdReInitTmr() sTsk = ssdReAddTmrSTsk(0); if(!sTsk) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTICORE_SUPPORT */ /* create the timer handler thread */ @@ -9212,7 +9212,7 @@ PUBLIC S16 ssdReInitTmr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_THR_REG_MAP @@ -9227,7 +9227,7 @@ PUBLIC S16 ssdReInitTmr() /* mt020.201 - Addition for destroying thread attribute object attr */ pthread_attr_destroy(&attr); sem_post(&osCp.dep.ssStarted); - RETVALUE(ROK); + return ROK; } /********************************************************************** diff --git a/src/mt/ss_drvr.c b/src/mt/ss_drvr.c index 3bc15db06..337e0d7ee 100644 --- a/src/mt/ss_drvr.c +++ b/src/mt/ss_drvr.c @@ -137,7 +137,7 @@ ISTsk isTsk; /* interrupt service function */ if (SGetProcIdLst(&count, procIdLst) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESS001, ERRZERO, "Null procId list"); - RETVALUE(RFAILED); + return RFAILED; } for (i = 0; i < count; i++) @@ -145,7 +145,7 @@ ISTsk isTsk; /* interrupt service function */ if (procIdLst[i] >= low && procIdLst[i] <= high) { SSLOGERROR(ERRCLS_INT_PAR, ESS002, ERRZERO, "Invalid procId range"); - RETVALUE(RFAILED); + return RFAILED; } } #else /* SS_MULTIPLE_PROCS */ @@ -153,21 +153,21 @@ ISTsk isTsk; /* interrupt service function */ if (thisProcId >= low && thisProcId <= high) { SSLOGERROR(ERRCLS_INT_PAR, ESS003, ERRZERO, "Invalid procId range"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ if (channel >= SS_MAX_DRVRTSKS) { SSLOGERROR(ERRCLS_INT_PAR, ESS004, channel, "Invalid channel"); - RETVALUE(RFAILED); + return RFAILED; } /* check activation functions */ if (actvTsk == NULLP || isTsk == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS005, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* check if already registered */ @@ -175,7 +175,7 @@ ISTsk isTsk; /* interrupt service function */ { SSLOGERROR(ERRCLS_INT_PAR, ESS006, ERRZERO, "Driver task already registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -185,7 +185,7 @@ ISTsk isTsk; /* interrupt service function */ if (osCp.numDrvrTsks == SS_MAX_DRVRTSKS) { SSLOGERROR(ERRCLS_DEBUG, ESS007, ERRZERO, "Too many tasks"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif @@ -197,7 +197,7 @@ ISTsk isTsk; /* interrupt service function */ SSLOGERROR(ERRCLS_DEBUG, ESS008, ERRZERO, "Could not initialize lock"); #endif - RETVALUE(RFAILED); + return RFAILED; } osCp.drvrTskTbl[channel].channel = channel; @@ -223,7 +223,7 @@ ISTsk isTsk; /* interrupt service function */ } - RETVALUE(ret); + return (ret); } /* ss001.301: Additions */ @@ -259,7 +259,7 @@ Inst channel; if (channel >= SS_MAX_DRVRTSKS) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, channel, "Invalid channel"); - RETVALUE(RFAILED); + return RFAILED; } /* check if already registered */ @@ -267,7 +267,7 @@ Inst channel; { SSLOGERROR(ERRCLS_INT_PAR, ESS477, ERRZERO, "Driver task is not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -278,7 +278,7 @@ Inst channel; SSLOGERROR(ERRCLS_DEBUG, ESS477, ERRZERO, "Could not lock driver task lock"); #endif - RETVALUE(RFAILED); + return RFAILED; } ssdDeregDrvrTsk(&osCp.drvrTskTbl[channel]); @@ -296,11 +296,11 @@ Inst channel; SSLOGERROR(ERRCLS_DEBUG, ESS477, ERRZERO, "Could not unlock driver task lock"); #endif - RETVALUE(RFAILED); + return RFAILED; } SDestroyLock(&osCp.drvrTskTbl[channel].lock); /* ss002.301 Modifications */ - RETVALUE(ROK); + return ROK; } #endif /* SS_DRVR_SUPPORT */ /********************************************************************** diff --git a/src/mt/ss_gen.c b/src/mt/ss_gen.c index 1870b44aa..e7f308d02 100644 --- a/src/mt/ss_gen.c +++ b/src/mt/ss_gen.c @@ -276,7 +276,7 @@ PUBLIC S16 SInit() sprintf(prntBufLoc,"\n SInit(): ssdInitGen failed to initialize\ implementation specific general information \n"); SDisplay(1,prntBufLoc); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SSI_STATIC_MEM_LEAK_DETECTION @@ -667,7 +667,7 @@ PUBLIC S16 SInit() ssdStart(); - RETVALUE(ROK); + return ROK; /* clean up code */ @@ -724,7 +724,7 @@ cleanup0: ssdDeinitGen(); - RETVALUE(RFAILED); + return RFAILED; } @@ -774,7 +774,7 @@ PUBLIC S16 SDeInit() #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS014, ERRZERO, "Could not destroy the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -786,7 +786,7 @@ PUBLIC S16 SDeInit() #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS015, ERRZERO, "Could not destroy the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -803,7 +803,7 @@ PUBLIC S16 SDeInit() SDestroyLock(&(osCp.logger.bufLock)); #endif /* SS_LOGGER_SUPPORT */ ssdDeinitLog(); - RETVALUE(ROK); + return ROK; } /* ss001.301: additions */ @@ -826,7 +826,7 @@ Txt *buf; /* buffer */ if(osCp.logger.started == FALSE) { (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(ROK); + return ROK; } /* * Append the buffer to the global buffer @@ -846,7 +846,7 @@ Txt *buf; /* buffer */ osCp.logger.curBufSiz += bufSz; } (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(ROK); + return ROK; } #endif /* SS_LOGGER_SUPPORT */ /* @@ -888,7 +888,7 @@ Txt *buf; /* buffer */ SWrtLogBuf(buf); #endif /* SS_LOGGER_SUPPORT */ - RETVALUE(ROK); + return ROK; } /* end of SPrint */ @@ -938,7 +938,7 @@ Reason reason; /* reason */ ret = ssdError(seq, reason); - RETVALUE(ret); + return (ret); } @@ -1037,7 +1037,7 @@ PUBLIC ProcId SFndProcId() { TRC1(SFndProcId); - RETVALUE(osCp.procId); + return (osCp.procId); } /* end of SFndProcId */ @@ -1115,7 +1115,7 @@ ProcId proc; if (osCp.procLst.procId[i] == proc) return i; - RETVALUE(SS_INV_PROCID_IDX); + return (SS_INV_PROCID_IDX); } /* SGetProcIdIdx */ @@ -1154,7 +1154,7 @@ ProcId proc; { osCp.procLst.procId[i] = proc; osCp.procLst.free--; - RETVALUE(ROK); + return ROK; } /* search for free entry upto idx */ @@ -1163,10 +1163,10 @@ ProcId proc; { osCp.procLst.procId[i] = proc; osCp.procLst.free--; - RETVALUE(ROK); + return ROK; } - RETVALUE(RFAILED); + return RFAILED; } /* SInsProcId */ @@ -1205,7 +1205,7 @@ ProcId proc; { osCp.procLst.procId[i] = SS_INV_PROCID; osCp.procLst.free++; - RETVALUE(ROK); + return ROK; } /* search upto idx */ @@ -1214,10 +1214,10 @@ ProcId proc; { osCp.procLst.procId[i] = SS_INV_PROCID; osCp.procLst.free++; - RETVALUE(ROK); + return ROK; } - RETVALUE(RFAILED); + return RFAILED; } /* SRemProcId */ @@ -1252,7 +1252,7 @@ PRIVATE S16 SLockOsCp(Void) { SSLOGERROR(ERRCLS_DEBUG, ESS016, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret); @@ -1269,14 +1269,14 @@ PRIVATE S16 SLockOsCp(Void) #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS018, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* SLockOsCp */ @@ -1313,11 +1313,11 @@ PRIVATE S16 SULockOsCp(Void) #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS019, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* SULockOsCp */ @@ -1359,7 +1359,7 @@ ProcId *pIdLst; { SSLOGERROR(ERRCLS_INT_PAR, ESS020, ERRZERO, "number of proc Ids exceeds\ limit"); - RETVALUE(RFAILED); + return RFAILED; } /* find if the entry exist in the table */ @@ -1368,14 +1368,14 @@ ProcId *pIdLst; if (pIdLst[i] == SS_INV_PROCID) { SSLOGERROR(ERRCLS_INT_PAR, ESS021, ERRZERO, "Invalid proc Ids"); - RETVALUE(RFAILED); + return RFAILED; } } #endif if (SLockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; #if (ERRCLASS & ERRCLS_INT_PAR) for (i = 0; i < numPIds; i++) @@ -1383,7 +1383,7 @@ ProcId *pIdLst; { SSLOGERROR(ERRCLS_INT_PAR, ESS022, ERRZERO, "Duplicate proc id"); (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } if (numPIds > osCp.procLst.free) @@ -1391,7 +1391,7 @@ ProcId *pIdLst; SSLOGERROR(ERRCLS_INT_PAR, ESS023, ERRZERO, "Total number of proc id \ exceeds"); (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1407,15 +1407,15 @@ exceeds"); "Could not insert the proc id"); #endif (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } } /* unlock the table */ if (SULockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ret); + return (ret); } /* SAddProcIdLst */ @@ -1451,16 +1451,16 @@ ProcId *pIdLst; #if (ERRCLASS & ERRCLS_INT_PAR) /* range check */ if (numPIds > SS_MAX_PROCS) - RETVALUE(RFAILED); + return RFAILED; #endif if (SLockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; if (numPIds > (SS_MAX_PROCS - osCp.procLst.free)) { (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } /* find if the entry exist in the table */ @@ -1469,7 +1469,7 @@ ProcId *pIdLst; if (SGetProcIdIdx(pIdLst[i]) == SS_INV_PROCID_IDX) { (Void) SULockOsCp(); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1478,9 +1478,9 @@ ProcId *pIdLst; SRemProcId(pIdLst[i]); if (SULockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* SRemProcIdLst */ @@ -1518,12 +1518,12 @@ ProcId *pIdLst; if ((numPIds == NULLP) || (pIdLst == NULLP)) { SSLOGERROR(ERRCLS_INT_PAR, ESS025, ERRZERO, "Invalid numPIds/pIdLst"); - RETVALUE(RFAILED); + return RFAILED; } #endif if (SLockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; for (i = 0; i < SS_MAX_PROCS; i++) { @@ -1534,12 +1534,12 @@ ProcId *pIdLst; *numPIds = count; if (SULockOsCp() != ROK) - RETVALUE(RFAILED); + return RFAILED; if (count == 0) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* SGetProcIdLst */ @@ -1582,7 +1582,7 @@ Void **xxCb; if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS026, ERRZERO, "Invalid proc/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1598,22 +1598,22 @@ Void **xxCb; #if (ERRCLASS & ERRCLS_INT_PAR) SSLOGERROR(ERRCLS_INT_PAR, ESS027, ERRZERO, "Could not get proc table idx"); #endif - RETVALUE(RFAILED); + return RFAILED; } idx = osCp.tTskIds[procIdIdx][ent][inst]; if (idx == SS_TSKNC) { - RETVALUE(RFAILED); + return RFAILED; } /* update the CB */ *xxCb = osCp.tTskTbl[idx].xxCb; /*ss032.103 added a check for NULLP */ if (*xxCb == NULLP) - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* SGetXxCb */ #endif /* SS_MULTIPLE_PROCS */ @@ -1809,7 +1809,7 @@ PUBLIC S16 SFillEntIds(Void) TRC2(SFillEntIds) memcpy((U8*)osCp.entId, (U8*)entInfo, sizeof(entInfo)); - RETVALUE(ROK); + return ROK; } /* SFillEntIds */ @@ -1877,7 +1877,7 @@ U8 *fileName; if (letter[1] == 'g' && letter[2] == 'u') { *entId = ENTGT; - RETVALUE(ROK); + return ROK; } default: break; @@ -1897,7 +1897,7 @@ U8 *fileName; if(letter[count] < 'a' || letter[count] > 'z') { *entId = ENTNC; - RETVALUE(ROK); + return ROK; } else { @@ -1915,7 +1915,7 @@ U8 *fileName; /* First two letter of file name are alphabets the get the * entity id from the static data base which is loaded in sFillEntIds() */ *entId = osCp.entId[firstIdx][secondIdx]; - RETVALUE(ROK); + return ROK; } /* SGetEntInd */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -1954,9 +1954,9 @@ U8 lockType; if((retVal = ssdLockNew(lockId, lockType)) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SLockNew(): Failed to aquire the lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -1991,9 +1991,9 @@ U8 lockType; if((retVal = ssdInitLockNew(lockId, lockType)) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SInitLockNew(): Initialization of lock Failed\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -2028,9 +2028,9 @@ U8 lockType; if((retVal = ssdUnlockNew(lockId, lockType)) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SUnlockNew(): Failed to release the lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -2065,9 +2065,9 @@ U8 lockType; if((retVal = ssdDestroyLockNew(lockId, lockType)) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SDestroyLockNew(): Failed to destroy the lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* SS_LOCK_SUPPORT */ @@ -2251,9 +2251,9 @@ PUBLIC S16 SReInitTmr() { /*ss012.301 : Fix log related issue to suite MT and NS implementations*/ SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SReInitTmr(): Failed to Restart the Tmr\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* diff --git a/src/mt/ss_gen.h b/src/mt/ss_gen.h index 9fc4851c0..9a657e5af 100755 --- a/src/mt/ss_gen.h +++ b/src/mt/ss_gen.h @@ -238,7 +238,7 @@ extern "C" { {\ SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ERRZERO,\ "Could not unlock the Semaphore");\ - RETVALUE(RFAILED);\ + return RFAILED;\ }\ }\ } diff --git a/src/mt/ss_mem.c b/src/mt/ss_mem.c index af2c6fce2..2de9272c7 100644 --- a/src/mt/ss_mem.c +++ b/src/mt/ss_mem.c @@ -134,14 +134,14 @@ SRegInfo *regInfo; /* information about the region */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS028, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate region info pointer */ if (regInfo == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS029, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -156,7 +156,7 @@ SRegInfo *regInfo; /* information about the region */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -167,7 +167,7 @@ SRegInfo *regInfo; /* information about the region */ SS_RELEASE_ALL_SEMA(&osCp.regionTblSem); SSLOGERROR(ERRCLS_INT_PAR, ESS031, ERRZERO, "Region ID used"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -189,7 +189,7 @@ SRegInfo *regInfo; /* information about the region */ SS_RELEASE_ALL_SEMA(&osCp.regionTblSem); - RETVALUE(ROK); + return ROK; } @@ -232,14 +232,14 @@ SRegInfo *regInfo; /* information about the region */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS028, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate region info pointer */ if (regInfo == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS029, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -254,7 +254,7 @@ SRegInfo *regInfo; /* information about the region */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -265,7 +265,7 @@ SRegInfo *regInfo; /* information about the region */ SS_RELEASE_ALL_SEMA(&osCp.regionTblSem); SSLOGERROR(ERRCLS_INT_PAR, ESS031, ERRZERO, "Region ID used"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -287,7 +287,7 @@ SRegInfo *regInfo; /* information about the region */ SS_RELEASE_ALL_SEMA(&osCp.regionTblSem); - RETVALUE(ROK); + return ROK; } @@ -326,7 +326,7 @@ Region region; /* region ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS032, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -341,7 +341,7 @@ Region region; /* region ID */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -351,7 +351,7 @@ Region region; /* region ID */ { SS_RELEASE_ALL_SEMA(&osCp.regionTblSem); SSLOGERROR(ERRCLS_INT_PAR, ESS034, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -373,7 +373,7 @@ Region region; /* region ID */ SS_RELEASE_ALL_SEMA(&osCp.regionTblSem); - RETVALUE(ROK); + return ROK; } @@ -462,7 +462,7 @@ Data **ptr; /* filled with pointer to block */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS035, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifndef XEON_SPECIFIC_CHANGES @@ -485,7 +485,7 @@ Data **ptr; /* filled with pointer to block */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -501,12 +501,12 @@ Data **ptr; /* filled with pointer to block */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS037, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS038, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss001.301: Additions */ @@ -563,7 +563,7 @@ Data **ptr; /* filled with pointer to block */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS039, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -577,7 +577,7 @@ Data **ptr; /* filled with pointer to block */ } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ret); + return (ret); } @@ -669,21 +669,21 @@ Size size; /* size of block */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS040, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to validate size and ptr */ if (size <= NULLD) { SSLOGERROR(ERRCLS_INT_PAR, ESS041, region, "Invalid size"); - RETVALUE(RFAILED); + return RFAILED; } /* validate ptr */ if (ptr == (Data *)NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS042, region, "Invalid ptr"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -700,7 +700,7 @@ Size size; /* size of block */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif #if (ERRCLASS & ERRCLS_INT_PAR) @@ -714,12 +714,12 @@ Size size; /* size of block */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS044, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS045, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -761,7 +761,7 @@ Size size; /* size of block */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS046, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -776,7 +776,7 @@ Size size; /* size of block */ } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ret); + return (ret); } #endif /* SS_FAP */ @@ -1022,7 +1022,7 @@ Ent *entId; }/* End of for. Region Count */ - RETVALUE(ROK); + return ROK; } #endif /* SS_HISTOGRAM_SUPPORT */ diff --git a/src/mt/ss_msg.c b/src/mt/ss_msg.c index ef783cbdc..b7bd4ebee 100644 --- a/src/mt/ss_msg.c +++ b/src/mt/ss_msg.c @@ -287,20 +287,20 @@ Buffer **dBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESS047, ERRZERO, "ssGetDBufOfSize : Null\ Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS048, ERRZERO, "ssGetDBufOfSize : Invalid\ region id"); - RETVALUE(RFAILED); + return RFAILED; } if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS049, ERRZERO, "ssGetDBufOfSize : Invalid\ size"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -312,7 +312,7 @@ Buffer **dBuf; if (SAlloc(region, &mdsize, 0, (Data **) dBuf) != ROK) #endif /* SS_HISTOGRAM_SUPPORT */ { - RETVALUE(ROUTRES); + return (ROUTRES); } data = (Data *) (*dBuf) + MDBSIZE; size = mdsize - MDBSIZE; @@ -327,7 +327,7 @@ Buffer **dBuf; } #endif - RETVALUE(ROK); + return ROK; } /* ssGetDBufOfSize */ @@ -423,19 +423,19 @@ Buffer **mBuf; /* pointer to message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS050, ERRZERO, "SGetMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS051, ERRZERO, "SGetMsg : Invalid region\ id"); - RETVALUE(RFAILED); + return RFAILED; } if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS052, ERRZERO, "SGetMsg : Invalid pool id"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -452,7 +452,7 @@ Buffer **mBuf; /* pointer to message buffer */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif #endif @@ -468,12 +468,12 @@ Buffer **mBuf; /* pointer to message buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS054, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS055, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -483,7 +483,7 @@ Buffer **mBuf; /* pointer to message buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS056, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -504,7 +504,7 @@ Buffer **mBuf; /* pointer to message buffer */ #endif /* SS_HISTOGRAM_SUPPORT */ { SSLOGERROR(ERRCLS_DEBUG, ESS058, ERRZERO, "SGetMsg:Failed in SAlloc"); - RETVALUE(ROUTRES); + return (ROUTRES); } #else /* SS_M_PROTO_REGION */ /* ss001.301: additions */ @@ -515,7 +515,7 @@ Buffer **mBuf; /* pointer to message buffer */ #endif /* SS_HISTOGRAM_SUPPORT */ { SSLOGERROR(ERRCLS_DEBUG, ESS059, ERRZERO, "SGetMsg:Failed in SAlloc"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif /* SS_M_PROTO_REGION */ @@ -546,7 +546,7 @@ Buffer **mBuf; /* pointer to message buffer */ } } #endif - RETVALUE(ROK); + return ROK; } #ifdef RGL_SPECIFIC_CHANGES @@ -558,7 +558,7 @@ S16 SSetMBufPool(Buffer *mBuf, Pool pool) minfo = (SsMsgInfo*) mBuf->b_rptr; minfo->pool = pool; - RETVALUE(ROK); + return ROK; } #endif @@ -638,7 +638,7 @@ Buffer *mBuf; } if (mBuf->refCnt > 0) { - RETVALUE(ROK); + return ROK; } } #endif @@ -655,7 +655,7 @@ Buffer *mBuf; { if(ROK == mtAddBufToRing(SS_RNG_BUF_MAC_FREE_RING,(Void *)mBuf,0)) { - RETVALUE(ROK); + return ROK; } } #endif @@ -664,7 +664,7 @@ Buffer *mBuf; { if(ROK == mtAddBufToRing(SS_RNG_BUF_RLC_FREE_RING,(Void *)mBuf,0)) { - RETVALUE(ROK); + return ROK; } } #endif @@ -676,13 +676,13 @@ Buffer *mBuf; if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS060, ERRZERO, "SPutMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS061, ERRZERO, "SPutMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -691,7 +691,7 @@ Buffer *mBuf; if(tmpThrReg == 0xFF) { printf("\n Not able to get region \n"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -726,7 +726,7 @@ Buffer *mBuf; if (SFree(minfo->region, (Data *) mBuf, MSGSIZE) == RFAILED) #endif #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(RFAILED); + return RFAILED; #else /* SS_M_PROTO_REGION */ /* ss021.103 - Addition to check return value of SFree */ #ifdef SS_HISTOGRAM_SUPPORT @@ -734,10 +734,10 @@ Buffer *mBuf; #else if (SFree(minfo->region, (Data *) mBuf, MSGSIZE) == RFAILED) #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(RFAILED); + return RFAILED; #endif /* SS_M_PROTO_REGION */ - RETVALUE(ROK); + return ROK; } #ifdef SS_LOCKLESS_MEMORY @@ -797,27 +797,27 @@ U8 memType; /* memory type used if shareable or not */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS220, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS221, pool, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS223, (ErrVal)0, "NULL data pointe"); - RETVALUE(RFAILED); + return RFAILED; } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS224, size, "Invalid size"); - RETVALUE(RFAILED); + return RFAILED; } #endif #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) @@ -832,7 +832,7 @@ U8 memType; /* memory type used if shareable or not */ { if(ROK == mtAddBufToRing(SS_RNG_BUF_MAC_FREE_RING,(Void *)ptr,1)) { - RETVALUE(ROK); + return ROK; } } #endif @@ -841,7 +841,7 @@ U8 memType; /* memory type used if shareable or not */ { if(ROK == mtAddBufToRing(SS_RNG_BUF_RLC_FREE_RING,(Void *)ptr,1)) { - RETVALUE(ROK); + return ROK; } } } @@ -859,7 +859,7 @@ U8 memType; /* memory type used if shareable or not */ (osCp.dynRegionTbl[region].used == FALSE))) { SSLOGERROR(ERRCLS_INT_PAR, ESS218, region, "Region not registered"); - RETVALUE(ret); + return (ret); } #endif @@ -891,7 +891,7 @@ U8 memType; /* memory type used if shareable or not */ } #endif - RETVALUE(ret); + return (ret); } /* @@ -953,27 +953,27 @@ U8 memType; /* memory type used if shareable or not */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS211, region, "Invalid region"); - RETVALUE(ret); + return (ret); } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS212, pool, "Invalid pool"); - RETVALUE(ret); + return (ret); } /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS214, (ErrVal)0 , "NULL data pointer"); - RETVALUE(ret); + return (ret); } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS215, size, "Invalid size"); - RETVALUE(ret); + return (ret); } #endif @@ -985,7 +985,7 @@ U8 memType; /* memory type used if shareable or not */ (osCp.dynRegionTbl[region].used == FALSE))) { SSLOGERROR(ERRCLS_INT_PAR, ESS218, region, "Region not registered"); - RETVALUE(ret); + return (ret); } #endif @@ -1023,7 +1023,7 @@ U8 memType; /* memory type used if shareable or not */ } #endif - RETVALUE(ret); + return (ret); } #endif /* SS_LOCKLESS_MEMORY */ @@ -1051,7 +1051,7 @@ U8 memType; /* memory type used if shareable or not */ ret = SGetSBuf(region, pool, ptr, size); - RETVALUE(ret); + return (ret); } @@ -1078,7 +1078,7 @@ U8 memType; /* memory type used if shareable or not */ ret = SPutSBuf(region, pool, ptr, size); - RETVALUE(ret); + return (ret); } #endif @@ -1121,7 +1121,7 @@ Size size /* size requested */ #endif #endif - RETVALUE(ret); + return (ret); } #ifdef T2K_MEM_LEAK_DBG @@ -1158,7 +1158,7 @@ Size size /* size */ #endif #endif - RETVALUE(ret); + return (ret); } #endif /* INTEL_WLS */ @@ -1265,28 +1265,28 @@ Size size; /* size requested */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS211, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS212, pool, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* ss008.13: addition */ /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS214, (ErrVal)0 , "NULL data pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS215, size, "Invalid size"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -1305,7 +1305,7 @@ Size size; /* size requested */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1322,12 +1322,12 @@ Size size; /* size requested */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS217, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS218, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -1425,7 +1425,7 @@ Size size; /* size requested */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS219, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -1439,7 +1439,7 @@ Size size; /* size requested */ } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ret); + return (ret); } @@ -1539,28 +1539,28 @@ Size size; /* size */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS220, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS221, pool, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* ss008.13: addition */ /* validate data pointer */ if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS223, (ErrVal)0, "NULL data pointe"); - RETVALUE(RFAILED); + return RFAILED; } /* validate size */ if (size <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS224, size, "Invalid size"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -1578,7 +1578,7 @@ Size size; /* size */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1594,12 +1594,12 @@ Size size; /* size */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS226, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS227, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1655,7 +1655,7 @@ Size size; /* size */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS228, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -1670,7 +1670,7 @@ Size size; /* size */ } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ret); + return (ret); } @@ -1713,13 +1713,13 @@ Buffer *mBuf; if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS062, ERRZERO, "SInitMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS063, ERRZERO, "SInitMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1729,7 +1729,7 @@ Buffer *mBuf; CM_MEM_GET_REGION(tmpRegId); if(tmpRegId == 0xFF) { - RETVALUE(RFAILED); + return RFAILED; } #endif minfo = (SsMsgInfo*) mBuf->b_rptr; @@ -1756,7 +1756,7 @@ Buffer *mBuf; minfo->endptr = NULLP; minfo->next = NULLP; - RETVALUE(ROK); + return ROK; } /* ss016.301 - Added a new API - SAddPreMsgMultInOrder. This preserves the @@ -1815,27 +1815,27 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS070, ERRZERO, "SAddPreMsgMultInOrder:\ Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS071, ERRZERO, "SAddPreMsgMultInOrder:\ Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS072, ERRZERO, "SAddPreMsgMultInOrder:\ Invalid count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS073, ERRZERO, "SAddPreMsgMultInOrder:\ Incorrect buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1875,7 +1875,7 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) if (!cnt) { minfo->len += len; - RETVALUE(ROK); + return ROK; } } newblk = prevblk = NULLP; @@ -1900,7 +1900,7 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) tmp->b_rptr = tmp->b_datap->db_base + offset; } - RETVALUE(ROUTRES); + return (ROUTRES); } /* attach curblk in the newblk chain */ if (prevblk) @@ -1947,7 +1947,7 @@ PUBLIC S16 SAddPreMsgMultInOrder(src, cnt, mBuf) /* update length of message */ minfo->len += len; - RETVALUE(ROK); + return ROK; } /* * @@ -1995,13 +1995,13 @@ Buffer *mBuf; if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS064, ERRZERO, "SAddPreMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS065, ERRZERO, "SAddPreMsg: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2014,7 +2014,7 @@ Buffer *mBuf; if (minfo->len == 0x7FFF) #endif { - RETVALUE(ROUTRES); + return (ROUTRES); } /* @@ -2030,7 +2030,7 @@ Buffer *mBuf; { SSLOGERROR(ERRCLS_DEBUG, ESS066, ERRZERO, "SAddPreMsg:Failed in\ SGetDBuf"); - RETVALUE(ROUTRES); + return (ROUTRES); } /* set the read and write pointers to end of data buffer */ /* subsequent prepends have all the buffer to insert data into */ @@ -2050,7 +2050,7 @@ Buffer *mBuf; *--tmp->b_rptr = data; minfo->len++; - RETVALUE(ROK); + return ROK; } /* @@ -2099,13 +2099,13 @@ Buffer *mBuf; if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS067, ERRZERO, "SAddPstMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS068, ERRZERO, "SAddPstMsg: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2119,7 +2119,7 @@ Buffer *mBuf; { SSLOGERROR(ERRCLS_DEBUG, ESS069, ERRZERO, "SAddPstMsg: Failed in\ SGetDBuf()"); - RETVALUE(ROUTRES); + return (ROUTRES); } /* append newb to the end of the mBuf chain */ @@ -2137,7 +2137,7 @@ Buffer *mBuf; *tmp->b_wptr++ = data; minfo->len++; - RETVALUE(ROK); + return ROK; } /* @@ -2211,26 +2211,26 @@ Buffer *mBuf; if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS070, ERRZERO, "SAddPreMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS071, ERRZERO, "SAddPreMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS072, ERRZERO, "SAddPreMsgMult: Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS073, ERRZERO, "SAddPreMsgMult: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2260,7 +2260,7 @@ Buffer *mBuf; if (!cnt) { minfo->len += len; - RETVALUE(ROK); + return ROK; } } newblk = prevblk = NULLP; @@ -2280,7 +2280,7 @@ Buffer *mBuf; tmp->b_rptr = tmp->b_datap->db_base + offset; } - RETVALUE(ROUTRES); + return (ROUTRES); } /* attach curblk in the newblk chain */ if (prevblk) @@ -2316,7 +2316,7 @@ Buffer *mBuf; /* update length of message */ minfo->len += len; - RETVALUE(ROK); + return ROK; } /* @@ -2389,26 +2389,26 @@ Buffer *mBuf; if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS074, ERRZERO, "SAddPstMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS075, ERRZERO, "SAddPstMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS076, ERRZERO, "SAddPstMsgMult:Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS077, ERRZERO, "SAddPstMsgMult: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2446,7 +2446,7 @@ Buffer *mBuf; if (!cnt) { minfo->len += len; - RETVALUE(ROK); + return ROK; } } @@ -2468,7 +2468,7 @@ Buffer *mBuf; tmp->b_wptr = tmp->b_datap->db_lim - offset; } - RETVALUE(ROUTRES); + return (ROUTRES); } /* insert curblk in the newblk chain */ @@ -2504,7 +2504,7 @@ Buffer *mBuf; /* update length */ minfo->len += len; - RETVALUE(ROK); + return ROK; } /* #ifdef SS_LOCKLESS_MEMORY */ @@ -2560,24 +2560,24 @@ Buffer *mBuf; if (!dataPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS078, ERRZERO, "SRemPreMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS079, ERRZERO, "SRemPreMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS080, ERRZERO, "SRemPreMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif if (!(tmp = mBuf->b_cont)) - RETVALUE(ROKDNA); + return (ROKDNA); /* get SsMsgInfo of mBuf */ minfo = (SsMsgInfo *) mBuf->b_rptr; @@ -2595,7 +2595,7 @@ Buffer *mBuf; if (!--minfo->len) minfo->endptr = NULLP; - RETVALUE(ROK); + return ROK; } /* @@ -2648,19 +2648,19 @@ Buffer *mBuf; /* message buffer */ if (dataPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS081, ERRZERO, "SRemPstMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS082, ERRZERO, "SRemPstMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS083, ERRZERO, "SRemPstMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2668,7 +2668,7 @@ Buffer *mBuf; /* message buffer */ minfo = (SsMsgInfo*) mBuf->b_rptr; if (!(last = minfo->endptr)) - RETVALUE(ROKDNA); + return (ROKDNA); /* read databyte into dataPtr and decrement write ptr */ *dataPtr = *--last->b_wptr; @@ -2690,7 +2690,7 @@ Buffer *mBuf; /* message buffer */ /* update SsMsgInfo */ minfo->len--; - RETVALUE(ROK); + return ROK; } @@ -2755,13 +2755,13 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_INT_PAR, ESS084, ERRZERO, "SRemPreMsgMult:Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS085, ERRZERO, "SRemPreMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check for NULL pointer */ /* check data pointer */ @@ -2770,7 +2770,7 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_INT_PAR, ESS086, ERRZERO, "SRemPreMsgMult : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2779,7 +2779,7 @@ Buffer *mBuf; /* message buffer */ /* check if data present */ if (minfo->len < cnt) - RETVALUE(ROKDNA); + return (ROKDNA); else minfo->len -= cnt; @@ -2814,7 +2814,7 @@ Buffer *mBuf; /* message buffer */ if (!minfo->len) minfo->endptr = NULLP; - RETVALUE(ROK); + return ROK; } /* @@ -2879,19 +2879,19 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_INT_PAR, ESS087, ERRZERO, "SRemPstMsgMult:Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS088, ERRZERO, "SRemPstMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS089, ERRZERO, "SRemPstMsgMult : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check dst data pointer */ /* check data pointer */ @@ -2903,7 +2903,7 @@ Buffer *mBuf; /* message buffer */ /* check if data present */ if (minfo->len < cnt) - RETVALUE(ROKDNA); + return (ROKDNA); else { minfo->len -= cnt; @@ -2950,7 +2950,7 @@ Buffer *mBuf; /* message buffer */ else minfo->endptr = prev; - RETVALUE(ROK); + return ROK; } /* @@ -3005,25 +3005,25 @@ MsgLen idx; /* index */ if (!dataPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS090, ERRZERO, "SExamMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS091, ERRZERO, "SExamMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check index */ if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS092, ERRZERO, "SExamMsg : Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS093, ERRZERO, "SExamMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3032,7 +3032,7 @@ MsgLen idx; /* index */ if (minfo->len <= idx) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* get the first SS_M_DATA blk */ @@ -3043,7 +3043,7 @@ MsgLen idx; /* index */ *dataPtr = *(tmp->b_rptr + idx); - RETVALUE(ROK); + return ROK; } @@ -3104,25 +3104,25 @@ MsgLen dataLen; if (!dataPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS090, ERRZERO, "SGetDataFrmMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS091, ERRZERO, "SGetDataFrmMsg: Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check index */ if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS092, ERRZERO, "SGetDataFrmMsg: Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS093, ERRZERO, "SGetDataFrmMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3131,7 +3131,7 @@ MsgLen dataLen; if (minfo->len <= (idx + dataLen) ) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* get the first SS_M_DATA blk */ @@ -3140,7 +3140,7 @@ MsgLen dataLen; /* determine offset */ if(tmp == NULLP) { - RETVALUE(ROKDNA); + return (ROKDNA); } else { @@ -3158,12 +3158,12 @@ MsgLen dataLen; } if( tmp == NULLP ) { - RETVALUE(ROKDNA); + return (ROKDNA); } SMemCpy((Void *)tmpDataPtr, (Void *)(tmp->b_rptr + idx), (size_t)dataLen); } - RETVALUE(ROK); + return ROK; } /* End of SGetDataFrmMsg() */ /* @@ -3205,19 +3205,19 @@ MsgLen *lngPtr; /* pointer to length */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS094, ERRZERO, "SFndLenMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check length pointer */ if (lngPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS095, ERRZERO, "SFndLenMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS096, ERRZERO, "SFndLenMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3227,7 +3227,7 @@ MsgLen *lngPtr; /* pointer to length */ /* read length */ *lngPtr = minfo->len; - RETVALUE(ROK); + return ROK; } @@ -3307,24 +3307,24 @@ Buffer **mBuf2; /* message 2 */ if (mBuf1 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS097, ERRZERO, "SSegMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer 2 */ if (mBuf2 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS098, ERRZERO, "SSegMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS099, ERRZERO, "SSegMsg : Invalid index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf1->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS100, ERRZERO, "SSegMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3338,13 +3338,13 @@ Buffer **mBuf2; /* message 2 */ if (idx >= minfo1->len) { *mBuf2 = NULLP; - RETVALUE(ROKDNA); + return (ROKDNA); } /* allocate message buffer */ if (SGetMsg(minfo1->region, minfo1->pool, mBuf2) != ROK) { SSLOGERROR(ERRCLS_DEBUG, ESS101, ERRZERO, "SSegMsg : SGetMsg failed"); - RETVALUE(RFAILED); + return RFAILED; } /* get the SsMsgInfo of mBuf2 */ @@ -3366,7 +3366,7 @@ Buffer **mBuf2; /* message 2 */ minfo1->endptr = NULLP; mBuf1->b_cont = NULLP; - RETVALUE(ROK); + return ROK; } /* get the first SS_M_DATA blk */ @@ -3396,7 +3396,7 @@ Buffer **mBuf2; /* message 2 */ /* reset length */ minfo1->len += minfo2->len; (Void) SPutMsg(*mBuf2); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf2)->b_cont = next; @@ -3434,7 +3434,7 @@ Buffer **mBuf2; /* message 2 */ /* reset length */ minfo1->len += minfo2->len; (Void) SPutMsg(*mBuf2); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf2)->b_cont = next; tmp->b_wptr = tmp->b_rptr + idx; @@ -3458,7 +3458,7 @@ Buffer **mBuf2; /* message 2 */ #endif /*SS_MULTICORE_SUPPORT*/ } - RETVALUE(ROK); + return ROK; } /* @@ -3506,31 +3506,31 @@ MsgLen *cCnt; /* copied count */ if (srcBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS102, ERRZERO, "SCpyFixMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check destination message buffer */ if (dstMbuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS103, ERRZERO, "SCpyFixMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check copied count buffer */ if (cCnt == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS104, ERRZERO, "SCpyFixMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check copy count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS105, ERRZERO, "SCpyFixMsg : Invalid count"); - RETVALUE(RFAILED); + return RFAILED; } if (dstMbuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS106, ERRZERO, "SCpyFixMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3541,7 +3541,7 @@ MsgLen *cCnt; /* copied count */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS107, ERRZERO, "SCpyFixMsg : Invalid Index"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition test if message length will exceed max msg length */ @@ -3555,7 +3555,7 @@ MsgLen *cCnt; /* copied count */ *cCnt = 0; SSLOGERROR(ERRCLS_INT_PAR, ESS108, ERRZERO, "SCpyFixMsg : msgLen + cnt > maxS16"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif @@ -3568,11 +3568,11 @@ MsgLen *cCnt; /* copied count */ SSLOGERROR(ERRCLS_DEBUG, ESS109, ERRZERO, "SCpyFixMsg : Failed in\ SAddPreMsgMult"); #endif - RETVALUE(ret); + return (ret); } *cCnt = cnt; - RETVALUE(ROK); + return ROK; } /* add data at the end of the dst buffer */ @@ -3580,17 +3580,17 @@ MsgLen *cCnt; /* copied count */ { if ((ret = SAddPstMsgMult(srcBuf, cnt, dstMbuf)) != ROK) { - RETVALUE(ret); + return (ret); } *cCnt = cnt; - RETVALUE(ROK); + return ROK; } /* segment the message into dstMbuf and right */ if ((ret = SSegMsg(dstMbuf, dstIdx, &right)) != ROK) { - RETVALUE(ret); + return (ret); } /* append data at the end of dstMbuf */ @@ -3598,7 +3598,7 @@ MsgLen *cCnt; /* copied count */ { /* ss020.103 - Addition for cleanup */ (Void) SPutMsg(right); - RETVALUE(ret); + return (ret); } /* cancatenate dstMbuf and right */ @@ -3606,14 +3606,14 @@ MsgLen *cCnt; /* copied count */ { /* ss020.103 - Addition for cleanup */ (Void) SPutMsg(right); - RETVALUE(ret); + return (ret); } *cCnt = cnt; (Void) SPutMsg(right); - RETVALUE(ROK); + return ROK; } /* @@ -3662,35 +3662,35 @@ MsgLen *cCnt; /* copied count */ if (srcMbuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS110, ERRZERO, "SCpyMsgFix : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check destination message buffer */ if (dstBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS111, ERRZERO, "SCpyMsgFix : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS112, ERRZERO, "SCpyMsgFix : Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (srcIdx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS113, ERRZERO, "SCpyMsgFix : Invalid Index"); - RETVALUE(RFAILED); + return RFAILED; } if (!cCnt) { SSLOGERROR(ERRCLS_INT_PAR, ESS114, ERRZERO, "SCpyMsgFix : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcMbuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS115, ERRZERO, "SCpyMsgFix : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3700,7 +3700,7 @@ MsgLen *cCnt; /* copied count */ if ((srcIdx + cnt) > minfo->len) { *cCnt = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } /* get the first SS_M_DATA blk */ @@ -3741,7 +3741,7 @@ MsgLen *cCnt; /* copied count */ break; } - RETVALUE(ROK); + return ROK; } /* @@ -3809,27 +3809,27 @@ Buffer **dstBuf; if (!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS116, ERRZERO, "SCpyMsgMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS117, ERRZERO, "SCpyMsgMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to validate region and pool */ if (dstRegion >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS118, ERRZERO, "SCpyMsgMsg : Invalid region id"); - RETVALUE(RFAILED); + return RFAILED; } if (dstPool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS119, ERRZERO, "SCpyMsgMsg : Invalid pool id"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -3845,7 +3845,7 @@ Buffer **dstBuf; "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3859,12 +3859,12 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS121, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS122, dstRegion, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -3875,7 +3875,7 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS123, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -3891,7 +3891,7 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS124, ERRZERO, "SCpyMsgMsg : SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* get the SsMsgInfo from srcBuf */ minfo1 = (SsMsgInfo*) srcBuf->b_rptr; @@ -3925,7 +3925,7 @@ Buffer **dstBuf; } printf("Failed to get the buffer of size %s %d\n", __FILE__, __LINE__); (Void) SPutMsg(*dstBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } if (!prevblk) @@ -3943,7 +3943,7 @@ Buffer **dstBuf; minfo2->endptr = curblk; (*dstBuf)->b_cont = newblk; - RETVALUE(ROK); + return ROK; } @@ -4008,13 +4008,13 @@ Buffer **dstBuf; if (!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS126, ERRZERO, "SAddMsgRef : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS127, ERRZERO, "SAddMsgRef : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef XEON_SPECIFIC_CHANGES @@ -4028,7 +4028,7 @@ Buffer **dstBuf; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS128, ERRZERO, "SAddMsgRef : SGetMsg failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* get the SsMsgInfo from srcBuf */ minfo1 = (SsMsgInfo*) srcBuf->b_rptr; @@ -4063,7 +4063,7 @@ Buffer **dstBuf; newblk = curblk; } (Void) SPutMsg(*dstBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } if (!prevblk) @@ -4081,7 +4081,7 @@ Buffer **dstBuf; minfo2->endptr = curblk; (*dstBuf)->b_cont = newblk; - RETVALUE(ROK); + return ROK; } /* allocate a data buffer */ @@ -4091,7 +4091,7 @@ Buffer **dstBuf; (Void) SPutMsg(*dstBuf); SSLOGERROR(ERRCLS_DEBUG, ESS129, ERRZERO, "SAddMsgRef : ssGetDBufOfSize\ failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } dBuf->b_datap->db_type = SS_M_DATA; @@ -4108,7 +4108,7 @@ Buffer **dstBuf; minfo2->endptr = dBuf; (*dstBuf)->b_cont = dBuf; - RETVALUE(ROK); + return ROK; } /* ss012.13: Addition */ #ifdef SS_M_PROTO_REGION @@ -4162,14 +4162,14 @@ Buffer *mp; /* message block */ if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS130, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS131, ERRZERO, "DupMsg : Invalid region\ id"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -4193,7 +4193,7 @@ Buffer *mp; /* message block */ SSLOGERROR(ERRCLS_ADD_RES, ESS132, (ErrVal) r, "SAlloc() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } /* generic set-up-message function */ #if 1 @@ -4218,7 +4218,7 @@ Buffer *mp; /* message block */ { SSLOGERROR(ERRCLS_DEBUG, ESS335, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(NULLP); + return (NULLP); } #endif /* increment the reference count of the dblock */ @@ -4230,12 +4230,12 @@ Buffer *mp; /* message block */ { SSLOGERROR(ERRCLS_DEBUG, ESS335, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(NULLP); + return (NULLP); } #endif - RETVALUE(bp); + return (bp); } /* DupMsg */ #endif /* SS_M_PROTO_REGION */ @@ -4313,19 +4313,19 @@ Buffer **bufPtr; /* pointer to buffer */ if (!bufPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS133, ERRZERO, "SGetDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS134, ERRZERO, "SGetDBuf : Invalid region\ id"); - RETVALUE(RFAILED); + return RFAILED; } if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS135, ERRZERO, "SGetDBuf : Invalid pool id"); - RETVALUE(RFAILED); + return RFAILED; } /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -4341,7 +4341,7 @@ Buffer **bufPtr; /* pointer to buffer */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4358,12 +4358,12 @@ Buffer **bufPtr; /* pointer to buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS137, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif SSLOGERROR(ERRCLS_INT_PAR, ESS138, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -4374,7 +4374,7 @@ Buffer **bufPtr; /* pointer to buffer */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS139, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4407,7 +4407,7 @@ Buffer **bufPtr; /* pointer to buffer */ if (SAlloc(region, &mdsize, 0, (Data **) bufPtr) != ROK) #endif /* SS_HISTOGRAM_SUPPORT */ { - RETVALUE(ROUTRES); + return (ROUTRES); } data = (Data *) (*bufPtr) + MDBSIZE; size = mdsize - MDBSIZE; @@ -4422,7 +4422,7 @@ Buffer **bufPtr; /* pointer to buffer */ } #endif - RETVALUE(ROK); + return ROK; } /* @@ -4487,26 +4487,26 @@ Buffer *buf; if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS141, ERRZERO, "SPutDBuf:Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS142, ERRZERO, "SPutDBuf:Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } if (buf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS143, ERRZERO, "SPutDBuf:Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } if ( (buf->b_datap->db_type != SS_M_DATA) && (buf->b_datap->db_type != SS_M_PROTO)) { SSLOGERROR(ERRCLS_INT_PAR, ESS144, ERRZERO, "SPutDBuf:Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss016.13: Addition */ @@ -4516,7 +4516,7 @@ Buffer *buf; if(dptr->db_type == SS_MEM_TYPE_SSI_ZBC) { ret = SPutZbcDBuf(region, buf); - RETVALUE(ret); + return (ret); } #ifdef TENB_DPDK_BUF @@ -4526,7 +4526,7 @@ Buffer *buf; SDetachDpdkPtrFrmDBuf(buf, &dpdkBuf); SPutSBufDpdk(dpdkBuf); ret = SFree(region, (Data *) buf, MDBSIZE); - RETVALUE(ret); + return (ret); } #endif /* TENB_DPDK_BUF */ #endif /* SS_USE_ZBC_MEMORY */ @@ -4554,7 +4554,7 @@ Buffer *buf; { SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(RFAILED); + return RFAILED; } #endif --dptr->db_ref; @@ -4593,7 +4593,7 @@ Buffer *buf; #else ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base); #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ret); + return (ret); } #ifndef SS_DBUF_REFLOCK_DISABLE ret = SUnlock(&(dptr->dBufLock)); @@ -4608,7 +4608,7 @@ Buffer *buf; ret = SFree(region, (Data *) buf, MDBSIZE + dptr->db_lim - dptr->db_base); #endif /* SS_HISTOGRAM_SUPPORT */ #endif /* SS_MULTICORE_SUPPORT */ - RETVALUE(ret); + return (ret); } @@ -4668,38 +4668,38 @@ Order order; /* order */ if (mBuf1 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS148, ERRZERO, "SCatMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer 2 */ if (mBuf2 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS149, ERRZERO, "SCatMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to test if same buffer */ /* check message buffer 1 and 2 not same buffer */ if (mBuf1 == mBuf2) { SSLOGERROR(ERRCLS_INT_PAR, ESS150, ERRZERO, "SCatMsg : mBuf1 == mBuf2"); - RETVALUE(RFAILED); + return RFAILED; } if ((order != M1M2) && (order != M2M1)) { SSLOGERROR(ERRCLS_INT_PAR, ESS151, ERRZERO, "SCatMsg : Invalid Order"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf1->b_datap->db_type != SS_M_PROTO) || (mBuf2->b_datap->db_type != SS_M_PROTO)) { SSLOGERROR(ERRCLS_INT_PAR, ESS152, ERRZERO, "SCatMsg : Incorrect buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* no data to append or prepend */ if (!mBuf2->b_cont) - RETVALUE(ROK); + return ROK; minfo1 = (SsMsgInfo*) mBuf1->b_rptr; minfo2 = (SsMsgInfo*) mBuf2->b_rptr; @@ -4713,7 +4713,7 @@ Order order; /* order */ #endif { SSLOGERROR(ERRCLS_INT_PAR, ESS153, ERRZERO, "SCpyFixMsg : messages too big"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif @@ -4722,7 +4722,7 @@ Order order; /* order */ /* duplicate mBuf2 from the region/pool of mBuf1, initialise mBuf2 */ /*ss015.13: addition */ if (SCpyMsgMsg(mBuf2, minfo1->region, minfo1->pool, &newb) != ROK) - RETVALUE(RFAILED); + return RFAILED; minfo2 = (SsMsgInfo*) newb->b_rptr; } @@ -4757,7 +4757,7 @@ Order order; /* order */ #endif if (newb && (newb != mBuf2)) (Void) SPutMsg(newb); - RETVALUE(RFAILED); + return RFAILED; } } } @@ -4775,7 +4775,7 @@ Order order; /* order */ (Void) SInitMsg(mBuf2); } - RETVALUE(ROK); + return ROK; } /* @@ -4834,18 +4834,18 @@ MsgLen idx; /* index */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS155, ERRZERO, "SRepMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS156, ERRZERO, "SRepMsg : Invalid index"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS157, ERRZERO, "SRepMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4854,7 +4854,7 @@ MsgLen idx; /* index */ /* if index > length of the buffer */ if (minfo->len <= idx) { - RETVALUE(ROKDNA); + return (ROKDNA); } tmp = mBuf->b_cont; /* get the first SS_M_DATA blk */ @@ -4871,7 +4871,7 @@ MsgLen idx; /* index */ { SSLOGERROR(ERRCLS_DEBUG, ESS158, ERRZERO, "SRepMsg : ssGetDBufOfSize\ failed"); - RETVALUE(RFAILED); + return RFAILED; } while (numBytes--) *newb->b_wptr++ = *tmp->b_rptr++; @@ -4887,7 +4887,7 @@ MsgLen idx; /* index */ } *(tmp->b_rptr + idx) = data; - RETVALUE(ROK); + return ROK; } /* @@ -4927,24 +4927,24 @@ MsgLen dLen; /* data length */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS159, ERRZERO, "SUpdMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS160, ERRZERO, "SUpdMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dLen < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS161, ERRZERO, "SUpdMsg : Invalid length"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf->b_datap->db_type != SS_M_PROTO) || (dBuf->b_datap->db_type != SS_M_DATA)) { SSLOGERROR(ERRCLS_INT_PAR, ESS162, ERRZERO, "SUpdMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4957,7 +4957,7 @@ MsgLen dLen; /* data length */ if ((dBuf->b_rptr + dLen) > dBuf->b_datap->db_lim) { SSLOGERROR(ERRCLS_DEBUG, ESS163, ERRZERO, "SUpdMsg:Offset out of bounds"); - RETVALUE(RFAILED); + return RFAILED; } /* offset write ptr from read ptr by dLen */ @@ -4974,7 +4974,7 @@ MsgLen dLen; /* data length */ minfo->len += dLen; - RETVALUE(ROK); + return ROK; } /* @@ -5019,20 +5019,20 @@ Buffer *dBuf; /* data buffer */ if (!mBuf || !dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS164, ERRZERO, "SAddDBufPst : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf->b_datap->db_type != SS_M_PROTO) || (dBuf->b_datap->db_type != SS_M_DATA)) { SSLOGERROR(ERRCLS_INT_PAR, ESS165, ERRZERO, "SAddDBufPst : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* no data, return */ if (dBuf->b_wptr == dBuf->b_rptr) - RETVALUE(ROK); + return ROK; minfo = (SsMsgInfo*) (mBuf)->b_rptr; @@ -5047,7 +5047,7 @@ Buffer *dBuf; /* data buffer */ minfo->len += dBuf->b_wptr - dBuf->b_rptr; - RETVALUE(ROK); + return ROK; } /* @@ -5093,20 +5093,20 @@ Buffer *dBuf; /* data buffer */ if (!mBuf || !dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS166, ERRZERO, "SAddDBufPre : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if ((mBuf->b_datap->db_type != SS_M_PROTO) || (dBuf->b_datap->db_type != SS_M_DATA)) { SSLOGERROR(ERRCLS_INT_PAR, ESS167, ERRZERO, "SAddDBufPre : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* no data, return */ if (dBuf->b_wptr == dBuf->b_rptr) - RETVALUE(ROK); + return ROK; minfo = (SsMsgInfo*) (mBuf)->b_rptr; @@ -5121,7 +5121,7 @@ Buffer *dBuf; /* data buffer */ if (!tmp) minfo->endptr = dBuf; - RETVALUE(ROK); + return ROK; } /* @@ -5168,19 +5168,19 @@ Buffer **dBufPtr; /* pointer to data buffer */ if (dBufPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS168, ERRZERO, "SRemDBufPre : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check queue */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS169, ERRZERO, "SRemDBufPre : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS170, ERRZERO, "SRemDBufPre : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5198,7 +5198,7 @@ Buffer **dBufPtr; /* pointer to data buffer */ if (!(minfo->len -= (*dBufPtr)->b_wptr - (*dBufPtr)->b_rptr)) minfo->endptr = NULLP; - RETVALUE(ROK); + return ROK; } /* @@ -5246,19 +5246,19 @@ Buffer **dBufPtr; /* pointer to data buffer */ if (!dBufPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS171, ERRZERO, "SRemDBufPst : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS172, ERRZERO, "SRemDBufPst : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS173, ERRZERO, "SRemDBufPst : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5280,7 +5280,7 @@ Buffer **dBufPtr; /* pointer to data buffer */ else minfo->endptr = tmp; - RETVALUE(ROK); + return ROK; } /* @@ -5316,13 +5316,13 @@ Buffer *mBuf; /* message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS174, ERRZERO, "SInitNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS175, ERRZERO, "SInitNxtDBuf : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5331,7 +5331,7 @@ Buffer *mBuf; /* message buffer */ /* set the next ptr of mBuf to point to the first SS_M_DATA blk */ minfo->next = mBuf->b_cont; - RETVALUE(ROK); + return ROK; } /* @@ -5369,18 +5369,18 @@ Buffer **dBuf; /* data buffer return */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS176, ERRZERO, "SGetNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS177, ERRZERO, "SGetNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS178, ERRZERO, "SGetNxtDBuf : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5388,12 +5388,12 @@ Buffer **dBuf; /* data buffer return */ /* if next ptr of mBuf is NULLP, return */ if ((*dBuf = minfo->next) == NULLP) - RETVALUE(ROKDNA); + return (ROKDNA); /* update next */ minfo->next = (*dBuf)->b_cont; - RETVALUE(ROK); + return ROK; } /* @@ -5428,13 +5428,13 @@ Buffer *mBuf; /* message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS179, ERRZERO, "SChkNxtDBuf : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS180, ERRZERO, "SChkNxtDBuf : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ @@ -5442,9 +5442,9 @@ Buffer *mBuf; /* message buffer */ /* if next is valid, return ROK */ if (minfo->next) - RETVALUE(ROK); + return ROK; else - RETVALUE(ROKDNA); + return (ROKDNA); } /* @@ -5487,23 +5487,23 @@ MsgLen *retDatLen; /* return data length */ if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS181, ERRZERO, "SGetDataRx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!retDatLen || (pad < 0)) { SSLOGERROR(ERRCLS_INT_PAR, ESS182, ERRZERO, "SGetDataRx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!retDatPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS183, ERRZERO, "SGetDataRx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS184, ERRZERO, "SGetDataRx : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ @@ -5513,7 +5513,7 @@ MsgLen *retDatLen; /* return data length */ SSLOGERROR(ERRCLS_DEBUG, ESS185, ERRZERO, "SGetDataRx : Reference\ count > 1"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* return the write ptr loc(with padding) if there is data to write to */ @@ -5525,10 +5525,10 @@ MsgLen *retDatLen; /* return data length */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS186, ERRZERO, "SGetDataRx:No data available"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -5570,25 +5570,25 @@ MsgLen *retDatLen; /* return data length */ if (!retDatPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS187, ERRZERO, "SGetDataTx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (!dBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS188, ERRZERO, "SGetDataTx : Null Buffer"); *retDatPtr = (Data *)NULLP; - RETVALUE(RFAILED); + return RFAILED; } if (!retDatLen) { SSLOGERROR(ERRCLS_INT_PAR, ESS189, ERRZERO, "SGetDataTx : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS190, ERRZERO, "SGetDataTx : Incorrect\ buffer type"); *retDatPtr = (Data *)NULLP; - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ @@ -5601,10 +5601,10 @@ MsgLen *retDatLen; /* return data length */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS191, ERRZERO, "SGetDataTx : Buffer empty"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #ifndef SS_ENABLE_MACROS @@ -5647,19 +5647,19 @@ Pool *pool; /* pool */ { SSLOGERROR(ERRCLS_INT_PAR, ESS192, ERRZERO, "SGetBufRegionPool : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if ((region == NULLP) && (pool == NULLP)) { SSLOGERROR(ERRCLS_INT_PAR, ESS193, ERRZERO, "SGetBufRegionPool : Null region and pool pointers"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS194, ERRZERO, "SUpdMsg : Incorrect buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR */ @@ -5670,7 +5670,7 @@ Pool *pool; /* pool */ SSLOGERROR(ERRCLS_DEBUG, ESS195, ERRZERO, "SGetBufRegionPool : mBuf's control data is null"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (region != NULLP) @@ -5678,7 +5678,7 @@ Pool *pool; /* pool */ if (pool != NULLP) *pool = mInfo->pool; - RETVALUE(ROK); + return ROK; } /* end of SGetBufRegionPool */ #endif /* SS_ENABLE_MACROS */ @@ -5728,13 +5728,13 @@ Buffer *mBuf; /* message buffer */ if (!mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS196, ERRZERO, "SCompressMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS197, ERRZERO, "SCompressMsg : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -5742,7 +5742,7 @@ Buffer *mBuf; /* message buffer */ if ((tmp = mBuf->b_cont) == minfo->endptr) { - RETVALUE(ROK); + return ROK; } /* allocate a data buffer of size bytes*/ @@ -5750,7 +5750,7 @@ Buffer *mBuf; /* message buffer */ { SSLOGERROR(ERRCLS_DEBUG, ESS198, ERRZERO, "SAddMsgRef : ssGetDBufOfSize\ failed"); - RETVALUE(RFAILED); + return RFAILED; } dBuf->b_datap->db_type = SS_M_DATA; @@ -5777,7 +5777,7 @@ Buffer *mBuf; /* message buffer */ mBuf->b_cont = dBuf; minfo->endptr = dBuf; - RETVALUE(ROK); + return ROK; } /* @@ -5838,7 +5838,7 @@ S16 dst; /* destination id */ sprintf(prntBuf,"\nmsg: empty\n"); SPrint(prntBuf); SPrint( (S8*)"\n\n"); - RETVALUE(ROK); + return ROK; } for (qlen = 0, tmp = mBuf->b_cont; tmp; qlen++) @@ -5862,7 +5862,7 @@ S16 dst; /* destination id */ sprintf(prntBuf," empty\n"); SPrint(prntBuf); SPrint( (S8*)"\n\n"); - RETVALUE(ROK); + return ROK; } tmp = mBuf->b_cont; cptr = tmp->b_rptr; @@ -5930,7 +5930,7 @@ S16 dst; /* destination id */ printf("%s\n", prntBuf); #endif } - RETVALUE(ROK); + return ROK; } /* end of SPrntMsg */ @@ -5981,16 +5981,16 @@ Buffer *mBuf; /* message buffer */ /* check message buffer */ if (mBuf == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* get the message info */ @@ -6014,7 +6014,7 @@ Buffer *mBuf; /* message buffer */ tmp->b_wptr += numBytes; if (!cnt) - RETVALUE(ROK); + return ROK; } if (ssGetDBufOfSize(minfo->region, cnt, &newb) != ROK) { @@ -6022,7 +6022,7 @@ Buffer *mBuf; /* message buffer */ if ((avail) && (tmp)) tmp->b_wptr = tmp->b_datap->db_lim - avail; minfo->len -= avail; - RETVALUE(ROUTRES); + return (ROUTRES); } minfo->len += cnt; @@ -6042,7 +6042,7 @@ Buffer *mBuf; /* message buffer */ minfo->endptr = newb; - RETVALUE(ROK); + return ROK; } /* @@ -6081,26 +6081,26 @@ Buffer *mBuf; /* check message buffer */ if (mBuf == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* get the message info */ minfo = (SsMsgInfo *) (mBuf->b_rptr); if (minfo->len < 2) - RETVALUE(RFAILED); + return RFAILED; /* get the first M_DATA blk*/ tmp = mBuf->b_cont; if (((tmp->b_rptr + 2) <= tmp->b_wptr) || (SCompressMsg(mBuf) == ROK)) - RETVALUE(ROK); + return ROK; - RETVALUE(RFAILED); + return RFAILED; } /* @@ -6137,23 +6137,23 @@ Buffer *dBuf; /* data buffer */ { SSLOGERROR(ERRCLS_INT_PAR, ESS199, ERRZERO, "SAlignDBufEven : Null\ Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS200, ERRZERO, "SAlignDBufEven : Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif src = dBuf->b_rptr; /* ss008.13: addition */ if (!((PTR)src % (PTR)2)) - RETVALUE(ROK); + return ROK; if (dBuf->b_datap->db_ref > 1) - RETVALUE(RFAILED); + return RFAILED; len = dBuf->b_wptr - dBuf->b_rptr; @@ -6172,9 +6172,9 @@ Buffer *dBuf; /* data buffer */ *--dBuf->b_rptr = *src--; } else - RETVALUE(RFAILED); + return RFAILED; - RETVALUE(ROK); + return ROK; } /* ss004.13: addition */ @@ -6216,13 +6216,13 @@ U32 align; /* alignemnt required */ { SSLOGERROR(ERRCLS_INT_PAR, ESS201, ERRZERO, "SAlignDBuf: Null\ Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dBuf->b_datap->db_type != SS_M_DATA) { SSLOGERROR(ERRCLS_INT_PAR, ESS202, ERRZERO, "SAlignDBuf: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6232,10 +6232,10 @@ U32 align; /* alignemnt required */ * the read and write pointers */ if (!upShift) - RETVALUE(ROK); + return ROK; if (dBuf->b_datap->db_ref > 1) - RETVALUE(RFAILED); + return RFAILED; downShift = align - upShift; /* no of bytes by which to shift down * the read and write pointers */ @@ -6261,10 +6261,10 @@ U32 align; /* alignemnt required */ *--dBuf->b_rptr = *src--; } else - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -6310,14 +6310,14 @@ Pool *pool; /* pointer to pool ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS203, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pointer to pool ID */ if (pool == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS204, region, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6326,7 +6326,7 @@ Pool *pool; /* pointer to pool ID */ *pool = 0; - RETVALUE(ROK); + return ROK; } @@ -6371,14 +6371,14 @@ Pool pool; /* pool ID */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS205, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS206, region, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check if region is registered */ @@ -6392,7 +6392,7 @@ Pool pool; /* pool ID */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -6405,12 +6405,12 @@ Pool pool; /* pool ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS208, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS209, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6419,12 +6419,12 @@ Pool pool; /* pool ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS210, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif - RETVALUE(ROK); + return ROK; } @@ -6468,21 +6468,21 @@ Status *status; /* pointer to status */ if (region >= SS_MAX_REGS) { SSLOGERROR(ERRCLS_INT_PAR, ESS229, region, "Invalid region"); - RETVALUE(RFAILED); + return RFAILED; } /* validate pool ID */ if (pool >= SS_MAX_POOLS_PER_REG) { SSLOGERROR(ERRCLS_INT_PAR, ESS230, region, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } /* validate status pointer */ if (status == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS231, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ss037.103 Removed the semaphore operation for performance enhancement */ @@ -6498,7 +6498,7 @@ Status *status; /* pointer to status */ "Could not lock region table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -6513,19 +6513,19 @@ Status *status; /* pointer to status */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS233, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS234, region, "Region not registered"); - RETVALUE(RFAILED); + return RFAILED; } /* verify that this is a valid pool */ if (osCp.regionTbl[region].poolTbl[pool].type != SS_POOL_DYNAMIC) { SSLOGERROR(ERRCLS_DEBUG, ESS235, ERRZERO, "Invalid pool"); - RETVALUE(RFAILED); + return RFAILED; } #endif #endif @@ -6545,12 +6545,12 @@ Status *status; /* pointer to status */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS236, ERRZERO, "Could not release semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif - RETVALUE(ret); + return (ret); } /* @@ -6598,25 +6598,25 @@ Buffer *mBuf2; /* message 2 */ if (mBuf1 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS237, ERRZERO, "SSwapMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check message buffer 2 */ if (mBuf2 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS238, ERRZERO, "SSwapMsg : Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf1->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS239, ERRZERO, "SSwapMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf2->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS240, ERRZERO, "SSwapMsg: Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } minfo1 = (SsMsgInfo*) mBuf1->b_rptr; minfo2 = (SsMsgInfo*) mBuf2->b_rptr; @@ -6624,7 +6624,7 @@ Buffer *mBuf2; /* message 2 */ { SSLOGERROR(ERRCLS_INT_PAR, ESS241, ERRZERO, "SSwapMsg: differnt regions\ for messages"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -6659,7 +6659,7 @@ Buffer *mBuf2; /* message 2 */ SMemCpy((Void *) (mBuf1->b_datap->db_base), (Void *) (mBuf2->b_datap->db_base), (size_t)(sizeof(SsMsgInfo))); SMemCpy((Void *) (mBuf2->b_datap->db_base), (Void *) minfop, (size_t)(sizeof(SsMsgInfo))); - RETVALUE(ROK); + return ROK; } /* ss004.301 : Cavium changes */ #ifdef SS_SEUM_CAVIUM @@ -6705,7 +6705,7 @@ PUBLIC S16 SConvPtrPhy (mBuf) /* check mBuf for NULLP */ if ( (mBuf == NULLP) || (*mBuf == NULLP ) ) { - RETVALUE(RFAILED); + return RFAILED; } /* first block in Buffer is head */ @@ -6818,7 +6818,7 @@ PUBLIC S16 SConvPtrPhy (mBuf) *mBuf = (Buffer*)cvmx_ptr_to_phys (*mBuf); - RETVALUE(ROK); + return ROK; } /* SConvPtrPhy */ @@ -6863,7 +6863,7 @@ PUBLIC S16 SConvPhyPtr (workPtr) /* check workPtr for NULLP */ if ( (workPtr == NULLP) || (*workPtr == NULLP) ) { - RETVALUE(RFAILED); + return RFAILED; } /* Convert the buffer address to pointer */ @@ -6976,7 +6976,7 @@ PUBLIC S16 SConvPhyPtr (workPtr) /* Place the converted buffer */ *workPtr = mBuf; - RETVALUE(ROK); + return ROK; } /* SConvPhyPtr */ @@ -7033,14 +7033,14 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) if ( srcBuf == (Buffer*)NULLP ) { - RETVALUE(RFAILED); + return RFAILED; } if ((dstRegion >= SS_MAX_REGS) || (dstPool >= SS_MAX_POOLS_PER_REG)) { /* Free the source buffer and return failure */ SPutFpaMsg(srcBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Allocate memory for destination buffer */ @@ -7048,7 +7048,7 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) { /* Free the source buffer and return failure */ SPutFpaMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } /* get the minfo of dest and src buffers */ @@ -7080,7 +7080,7 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) (Void) SPutMsg(*dstBuf); /* Free the source buffer and return failure */ SPutFpaMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } dat = (Data *)tmpblk + MDBSIZE; @@ -7130,7 +7130,7 @@ PUBLIC S16 SCpyFpaMsg (srcBuf, dstRegion, dstPool, dstBuf) /* Free the source buffer after copying it */ SPutFpaMsg(srcBuf); - RETVALUE(ROK); + return ROK; } /* SCpyFpaMsg */ @@ -7183,7 +7183,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) if (srcBuf == (Buffer*)NULLP) { - RETVALUE(RFAILED); + return RFAILED; } *dstBuf = (Buffer*)cvmx_fpa_alloc(SS_CVMX_POOL_0); @@ -7192,7 +7192,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) { /* Free the source buffer before returning */ SPutMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } dat = (Data *)(*dstBuf) + MDBSIZE; @@ -7250,7 +7250,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) SPutFpaMsg(*dstBuf); /* Free the source buffer before returning */ SPutMsg(srcBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Allocate for mBuf and copy both the header and contents */ @@ -7264,7 +7264,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) SPutFpaMsg(*dstBuf); /* Free the source buffer before returning */ SPutMsg(srcBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } dat = (Data *)tmpblk + MDBSIZE; @@ -7315,7 +7315,7 @@ PUBLIC S16 SCpyMsgFpa (srcBuf, dstBuf) /* Free the source buffer after copying it */ SPutMsg(srcBuf); - RETVALUE(ROK); + return ROK; } /* SCpyMsgFpa */ @@ -7355,7 +7355,7 @@ Buffer *fpaBuf; if( fpaBuf == NULLP ) { - RETVALUE(ROK); + return ROK; } curBlk = fpaBuf->b_cont; @@ -7398,7 +7398,7 @@ Buffer *fpaBuf; cvmx_fpa_free(fpaBuf, SS_CVMX_POOL_0, 0); - RETVALUE(ROK); + return ROK; } /* SPutFpaMsg */ @@ -7454,24 +7454,24 @@ Buffer *dstBuf; if (!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Null src Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Incorrect\ src buffer type"); - RETVALUE(RFAILED); + return RFAILED; } if(!dstBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Null dst Buffer"); - RETVALUE(RFAILED); + return RFAILED; } if (dstBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Incorrect\ dst buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ @@ -7483,7 +7483,7 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SCpyPartMsg : Incorrect\ idx value "); - RETVALUE(RFAILED); + return RFAILED; } sBuf = srcBuf->b_cont; @@ -7518,7 +7518,7 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_DEBUG, ESS125, ERRZERO, "SCpyPartMsg : SGetDBuf\ failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } dCnt = MIN(cnt, (dBuf->b_datap->db_lim - dBuf->b_datap->db_base)); dPrev->b_cont = dBuf; @@ -7571,7 +7571,7 @@ Buffer *dstBuf; dMinfo->len += numCpd; dMinfo->endptr = dBuf; - RETVALUE(ROK); + return ROK; } /* @@ -7621,24 +7621,24 @@ Buffer *dstBuf; if (!dstBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Null dstBuf"); - RETVALUE(RFAILED); + return RFAILED; } if (dstBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Incorrect\ dstBuf buffer type"); - RETVALUE(RFAILED); + return RFAILED; } if(!srcBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Null Src Buffer "); - RETVALUE(RFAILED); + return RFAILED; } if (srcBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Incorrect\ sBuf buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ @@ -7649,7 +7649,7 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : Incorrect\ cnt value "); - RETVALUE(RFAILED); + return RFAILED; } dBuf = dstBuf->b_cont; @@ -7692,10 +7692,10 @@ Buffer *dstBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRepPartMsg : unable to replace\ some bytes "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -7766,18 +7766,18 @@ Buffer *dstBuf; /* message 2 */ if ((!srcBuf) || (!dstBuf )) { SSLOGERROR(ERRCLS_INT_PAR, ESS097, ERRZERO, "SMovPartMsg : Null Buffer (src or Dst)"); - RETVALUE(RFAILED); + return RFAILED; } if (idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS099, ERRZERO, "SMovPartMsg : Invalid index"); - RETVALUE(RFAILED); + return RFAILED; } if ((srcBuf->b_datap->db_type != SS_M_PROTO) || (dstBuf->b_datap->db_type != SS_M_PROTO)) { SSLOGERROR(ERRCLS_INT_PAR, ESS100, ERRZERO, "SMovPartMsg : Incorrect buffer\ type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7791,7 +7791,7 @@ Buffer *dstBuf; /* message 2 */ /*-- ss008.301 */ if (idx > sMinfo->len) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* one block might not sufficient - Check for generic implementation */ @@ -7813,7 +7813,7 @@ Buffer *dstBuf; /* message 2 */ { SSLOGERROR(ERRCLS_DEBUG, ESS125, ERRZERO, "SCpyMsgPartMsg : SGetDBuf\ failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } dCnt = MIN(idx, (dBuf->b_datap->db_lim - dBuf->b_datap->db_base)); dPrev->b_cont = dBuf; @@ -7874,10 +7874,10 @@ Buffer *dstBuf; /* message 2 */ dMinfo->len -= idx; SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SMovPartMsg : unable to copy\ some bytes "); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -7935,26 +7935,26 @@ Buffer *mBuf; if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS070, ERRZERO, "SPkMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check source */ if (src == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS071, ERRZERO, "SPkMsgMult:Null Buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check count */ if (cnt <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS072, ERRZERO, "SPkMsgMult: Invalid\ count"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS073, ERRZERO, "SPkMsgMult: Incorrect\ buffer type"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -7983,7 +7983,7 @@ Buffer *mBuf; minfo->len += numBytes; if (!cnt) { - RETVALUE(ROK); + return ROK; } } @@ -7991,7 +7991,7 @@ Buffer *mBuf; newblk = NULLP; if (ssGetDBufOfSize(minfo->region, cnt, &newblk) != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } newblk->b_datap->db_type = SS_M_DATA; newblk->b_rptr = newblk->b_datap->db_lim - cnt; @@ -8003,7 +8003,7 @@ Buffer *mBuf; minfo->len += cnt; minfo->endptr = newblk; - RETVALUE(ROK); + return ROK; } /* ss006.301 : new buffer management APIs, end */ /* @@ -8047,7 +8047,7 @@ MsgLen *len; *len = 0; } - RETVALUE(ROK); + return ROK; } #ifdef SS_USE_ZBC_MEMORY /* @@ -8112,7 +8112,7 @@ Buffer** mBuf; if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: Null PTR"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -8122,7 +8122,7 @@ Buffer** mBuf; if(SGetMsg(region, pool, mBuf) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SGetMsg Failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } mdsize = MDBSIZE; @@ -8135,7 +8135,7 @@ Buffer** mBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SAlloc Failed"); SPutMsg(*mBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf)->b_cont = newblk; @@ -8164,7 +8164,7 @@ Buffer** mBuf; minfo->len = totalLen; minfo->endptr = newblk; - RETVALUE(ROK); + return ROK; } /* @@ -8249,7 +8249,7 @@ Buffer *buf; { SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(RFAILED); + return RFAILED; } #endif --dptr->db_ref; @@ -8286,14 +8286,14 @@ Buffer *buf; #else ret = SFree(region, (Data *) buf, MDBSIZE); #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ret); + return (ret); } #ifndef SS_DBUF_REFLOCK_DISABLE ret = SUnlock(&(dptr->dBufLock)); #endif } - RETVALUE(ret); + return (ret); } #endif /* SS_USE_ZBC_MEMORY */ @@ -8363,14 +8363,14 @@ Buffer** mBuf; if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: Null PTR"); - RETVALUE(RFAILED); + return RFAILED; } #endif if(SGetMsg(region, pool, mBuf) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SGetMsg Failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } region = 0; @@ -8384,7 +8384,7 @@ Buffer** mBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SAlloc Failed"); SPutMsg(*mBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf)->b_cont = newblk; @@ -8414,17 +8414,17 @@ Buffer** mBuf; minfo->endptr = newblk; //printf("Mbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr); - RETVALUE(ROK); + return ROK; } #endif /* INTEL_WLS */ PUBLIC S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf) { #ifndef L2_OPTMZ - RETVALUE(SAddMsgRef(srcBuf,dstRegion, dstPool,dstBuf)); + return (SAddMsgRef(srcBuf,dstRegion, dstPool,dstBuf)); #else *dstBuf = srcBuf; #endif - RETVALUE(ROK); + return ROK; } #ifdef L2_OPTMZ PUBLIC Void SResetMBuf(Buffer *mbuf) @@ -8522,7 +8522,7 @@ Buffer** mBuf; if (ptr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: Null PTR"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -8530,7 +8530,7 @@ Buffer** mBuf; if(SGetMsg(region, pool, mBuf) != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SGetMsg Failed"); - RETVALUE(ROUTRES); + return (ROUTRES); } mdsize = MDBSIZE; @@ -8543,7 +8543,7 @@ Buffer** mBuf; { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SAttachPtrToBuf: SAlloc Failed"); SPutMsg(*mBuf); - RETVALUE(ROUTRES); + return (ROUTRES); } (*mBuf)->b_cont = newblk; @@ -8573,7 +8573,7 @@ Buffer** mBuf; minfo->endptr = newblk; //printf("Mbuf PTR = %x, DBlk PTR = %x, PTR = %x\n", *mBuf, newblk, ptr); - RETVALUE(ROK); + return ROK; } #ifdef TENB_DPDK_BUF @@ -8590,7 +8590,7 @@ Size size /* size requested */ *ptr = ntl_alloc(mtGetNtlHdl(), size); - RETVALUE(ret); + return (ret); } PUBLIC S16 SPutSBufDpdk @@ -8603,7 +8603,7 @@ Data *ptr /* pointer to buffer */ ntl_free(mtGetNtlHdl(), ptr); - RETVALUE(ret); + return (ret); } PUBLIC S16 SDetachDpdkPtrFrmDBuf @@ -8626,7 +8626,7 @@ Data **ptr //minfo->len = 0; - RETVALUE(ROK); + return ROK; } @@ -8647,14 +8647,14 @@ PUBLIC S16 SDetachDpdkPtrFrmMBuf if(msgBlk == NULLP) { *ptr = NULLP; - RETVALUE(RFAILED); + return RFAILED; } dptr = msgBlk->b_datap; if(dptr->db_type != SS_MEM_TYPE_DPDK_ZBC) { *ptr = NULLP; - RETVALUE(RFAILED); + return RFAILED; } *ptr = msgBlk->b_rptr;; @@ -8664,7 +8664,7 @@ PUBLIC S16 SDetachDpdkPtrFrmMBuf minfo = (SsMsgInfo*) mBuf->b_rptr; minfo->len = 0; - RETVALUE(ROK); + return ROK; } @@ -8694,14 +8694,14 @@ Buffer** mBuf; SsDblk *dptr; if(0 == msgLen) - RETVALUE(RFAILED); + return RFAILED; SAttachWlsPtrToMBuf(region, pool, ptr, readPtr, msgLen, totalLen, mBuf); dptr = (SsDblk*) (((Data *) ((*mBuf)->b_cont)) + MBSIZE); dptr->db_type = SS_MEM_TYPE_DPDK_ZBC; - RETVALUE(ROK); + return ROK; } #endif /* TENB_DPDK_BUF */ diff --git a/src/mt/ss_pack.c b/src/mt/ss_pack.c index 7441a6c75..283e9844f 100644 --- a/src/mt/ss_pack.c +++ b/src/mt/ss_pack.c @@ -107,14 +107,14 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS242, (ErrVal)ret, "SAddPreMsg() failed"); #endif - RETVALUE(ret); + return (ret); } /* end of SPkS8 */ /* * -* Fun: SPkU8 +* Fun: oduUnpackUInt8 * * Desc: This function packs an unsigned 8 bit value into a message. * @@ -129,26 +129,26 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 SPkU8 +PUBLIC S16 oduUnpackUInt8 ( U8 val, /* value */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 SPkU8(val, mBuf) +PUBLIC S16 oduUnpackUInt8(val, mBuf) U8 val; /* value */ Buffer *mBuf; /* message buffer */ #endif { S16 ret; /* return code */ - TRC1(SPkU8) + TRC1(oduUnpackUInt8) ret = SAddPreMsg((Data) val, mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS243, (ErrVal)ret, "SAddPreMsg() failed"); #endif - RETVALUE(ret); -} /* end of SPkU8 */ + return (ret); +} /* end of oduUnpackUInt8 */ /* * @@ -194,13 +194,13 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS244, (ErrVal)ret, "SAddPreMsgMult() failed"); #endif - RETVALUE(ret); + return (ret); } /* end of SPkS16 */ /* * -* Fun: SPkU16 +* Fun: oduUnpackUInt16 * * Desc: This function packs an unsigned 16 bit value into a message. * @@ -215,13 +215,13 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 SPkU16 +PUBLIC S16 oduUnpackUInt16 ( U16 val, /* value */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 SPkU16(val, mBuf) +PUBLIC S16 oduUnpackUInt16(val, mBuf) U16 val; /* value */ Buffer *mBuf; /* message buffer */ #endif @@ -229,7 +229,7 @@ Buffer *mBuf; /* message buffer */ Data pkArray[2]; /* array for packing */ S16 ret; /* return code */ - TRC1(SPkU16) + TRC1(oduUnpackUInt16) #ifndef FCSPKINT /* backward compatibility, packing order */ pkArray[0] = (Data) GetHiByte(val); pkArray[1] = (Data) GetLoByte(val); @@ -242,8 +242,8 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS245, (ErrVal)ret, "SAddPreMsgMult() failed"); #endif - RETVALUE(ret); -} /* end of SPkU16 */ + return (ret); +} /* end of oduUnpackUInt16 */ /* @@ -299,13 +299,13 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS246, (ErrVal)ret, "SAddPreMsgMult() failed"); #endif - RETVALUE(ret); + return (ret); } /* end of SPkS32 */ /* * -* Fun: SPkU32 +* Fun: oduUnpackUInt32 * * Desc: This function packs an unsigned 32 bit value into a message. * @@ -320,13 +320,13 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 SPkU32 +PUBLIC S16 oduUnpackUInt32 ( U32 val, /* value */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 SPkU32(val, mBuf) +PUBLIC S16 oduUnpackUInt32(val, mBuf) U32 val; /* value */ Buffer *mBuf; /* message buffer */ #endif @@ -335,7 +335,7 @@ Buffer *mBuf; /* message buffer */ Data pkArray[4]; /* packing array */ S16 ret; /* return code */ - TRC1(SPkU32) + TRC1(oduUnpackUInt32) #ifndef FCSPKINT /* backward compatibility, packing order */ tmp = (U16) GetHiWord(val); pkArray[0] = (Data) GetHiByte(tmp); @@ -356,8 +356,8 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS247, (ErrVal)ret, "SAddPreMsgMult() failed"); #endif - RETVALUE(ret); -} /* end of SPkU32 */ + return (ret); +} /* end of oduUnpackUInt32 */ /*ss038.103 1. Added Floating point support*/ #ifdef SS_FLOAT @@ -417,7 +417,7 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS248, (ErrVal)ret, "SAddPreMsgMult() failed"); #endif - RETVALUE(ret); + return (ret); } /* end of SPkF32 */ /* @@ -477,7 +477,7 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_ADD_RES, ESS249, (ErrVal)ret, "SAddPreMsgMult() failed"); #endif - RETVALUE(ret); + return (ret); } /* end of SPkF64 */ #endif /* SS_FLOAT */ @@ -518,7 +518,7 @@ Buffer *mBuf; /* message buffer */ if (!val) { SSLOGERROR(ERRCLS_INT_PAR, ESS250, ERRZERO, "SUnpkS8 : Null value"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -528,13 +528,13 @@ Buffer *mBuf; /* message buffer */ SSLOGERROR(ERRCLS_DEBUG, ESS251, (ErrVal)ret, "SRemPreMsg() failed"); #endif *val = (S8) tmp; - RETVALUE(ret); + return (ret); } /* end of SUnpkS8 */ /* * -* Fun: SUnpkU8 +* Fun: oduPackUInt8 * * Desc: This function unpacks an unsigned 8 bit value from a message. * @@ -547,28 +547,28 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 SUnpkU8 +PUBLIC S16 oduPackUInt8 ( U8 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 SUnpkU8(val, mBuf) +PUBLIC S16 oduPackUInt8(val, mBuf) U8 *val; /* pointer to value */ Buffer *mBuf; /* message buffer */ #endif { Data tmp; /* temporary value */ S16 ret; /* return code */ - TRC1(SUnpkU8) + TRC1(oduPackUInt8) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!val) { - SSLOGERROR(ERRCLS_INT_PAR, ESS252, ERRZERO, "SUnpkU8 : Null value"); - RETVALUE(RFAILED); + SSLOGERROR(ERRCLS_INT_PAR, ESS252, ERRZERO, "oduPackUInt8 : Null value"); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -578,8 +578,8 @@ Buffer *mBuf; /* message buffer */ SSLOGERROR(ERRCLS_DEBUG, ESS253, (ErrVal)ret, "SRemPreMsg() failed"); #endif *val = (U8) tmp; - RETVALUE(ret); -} /* end of SUnpkU8 */ + return (ret); +} /* end of oduPackUInt8 */ /* * @@ -618,7 +618,7 @@ Buffer *mBuf; /* message buffer */ if (!val) { SSLOGERROR(ERRCLS_INT_PAR, ESS254, ERRZERO, "SUnpkS16 : Null value"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -636,13 +636,13 @@ Buffer *mBuf; /* message buffer */ tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]); #endif *val = (S16) tmp16; - RETVALUE(ret); + return (ret); } /* end of SUnpkS16 */ /* * -* Fun: SUnpkU16 +* Fun: oduPackUInt16 * * Desc: This function unpacks an unsigned 16 bit value from a message. * @@ -655,13 +655,13 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 SUnpkU16 +PUBLIC S16 oduPackUInt16 ( U16 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 SUnpkU16(val, mBuf) +PUBLIC S16 oduPackUInt16(val, mBuf) U16 *val; /* pointer to value */ Buffer *mBuf; /* message buffer */ #endif @@ -669,15 +669,15 @@ Buffer *mBuf; /* message buffer */ U16 tmp16; /* temporary value */ Data unpkArray[2]; /* unpacking array */ S16 ret; /* return code */ - TRC1(SUnpkU16) + TRC1(oduPackUInt16) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!val) { - SSLOGERROR(ERRCLS_INT_PAR, ESS256, ERRZERO, "SUnpkU16 : Null value"); - RETVALUE(RFAILED); + SSLOGERROR(ERRCLS_INT_PAR, ESS256, ERRZERO, "oduPackUInt16 : Null value"); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -695,8 +695,8 @@ Buffer *mBuf; /* message buffer */ tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]); #endif *val = tmp16; - RETVALUE(ret); -} /* end of SUnpkU16 */ + return (ret); +} /* end of oduPackUInt16 */ /* @@ -737,7 +737,7 @@ Buffer *mBuf; /* message buffer */ if (!val) { SSLOGERROR(ERRCLS_INT_PAR, ESS258, ERRZERO, "SUnpkS32 : Null value"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -764,13 +764,13 @@ Buffer *mBuf; /* message buffer */ tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); #endif *val = (S32) tmp32; - RETVALUE(ret); + return (ret); } /* end of SUnpkS32 */ /* * -* Fun: SUnpkU32 +* Fun: oduPackUInt32 * * Desc: This function unpacks an unsigned 32 bit value from a message. * @@ -783,13 +783,13 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PUBLIC S16 SUnpkU32 +PUBLIC S16 oduPackUInt32 ( U32 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 SUnpkU32(val, mBuf) +PUBLIC S16 oduPackUInt32(val, mBuf) U32 *val; /* pointer to value */ Buffer *mBuf; /* message buffer */ #endif @@ -800,15 +800,15 @@ Buffer *mBuf; /* message buffer */ #ifdef ERRCLASS S16 ret; /* return code */ #endif /* ERRCLASS */ - TRC1(SUnpkU32) + TRC1(oduPackUInt32) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!val) { - SSLOGERROR(ERRCLS_INT_PAR, ESS260, ERRZERO, "SUnpkU32 : Null value"); - RETVALUE(RFAILED); + SSLOGERROR(ERRCLS_INT_PAR, ESS260, ERRZERO, "oduPackUInt32 : Null value"); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -836,8 +836,8 @@ Buffer *mBuf; /* message buffer */ tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); #endif *val = tmp32; - RETVALUE(ret); -} /* end of SUnpkU32 */ + return (ret); +} /* end of oduPackUInt32 */ /*ss038.103 1. Added Floating point support*/ #ifdef SS_FLOAT @@ -882,7 +882,7 @@ Buffer *mBuf; /* message buffer */ if (!val) { SSLOGERROR(ERRCLS_INT_PAR, ESS262, ERRZERO, "SUnpkF32 : Null value"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -903,7 +903,7 @@ Buffer *mBuf; /* message buffer */ sscanf(tmpArray, "%f", val); #endif - RETVALUE(ret); + return (ret); } /* end of SUnpkF32 */ @@ -949,7 +949,7 @@ Buffer *mBuf; /* message buffer */ if (!val) { SSLOGERROR(ERRCLS_INT_PAR, ESS264, ERRZERO, "SUnpkF64 : Null value"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -970,7 +970,7 @@ Buffer *mBuf; /* message buffer */ sscanf(tmpArray, "%lf", val); #endif - RETVALUE(ret); + return (ret); } /* end of SUnpkF64 */ #endif /* SS_FLOAT */ diff --git a/src/mt/ss_queue.c b/src/mt/ss_queue.c index 53397ead3..e1cb63ba2 100644 --- a/src/mt/ss_queue.c +++ b/src/mt/ss_queue.c @@ -109,14 +109,14 @@ Queue *q; /* queue */ if (q == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS266, ERRZERO, "Null Ptr"); - RETVALUE(RFAILED); + return RFAILED; } #endif q->head = NULLP; q->tail = NULLP; q->crntSize = 0; - RETVALUE(ROK); + return ROK; } /* end of SInitQueue */ @@ -168,7 +168,7 @@ Queue *q; /* queue */ if (q == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS267, ERRZERO, "Null Q Ptr"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -189,7 +189,7 @@ Queue *q; /* queue */ q->head = NULLP; q->tail = NULLP; - RETVALUE(ROK); + return ROK; } /* end of SFlushQueue */ @@ -237,26 +237,26 @@ Order order; /* order */ if (q1 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS268, ERRZERO, "Null Q1 Ptr"); - RETVALUE(RFAILED); + return RFAILED; } if (q2 == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS269, ERRZERO, "Null Q2 Ptr"); - RETVALUE(RFAILED); + return RFAILED; } if ((order != Q1Q2) && (order != Q2Q1)) { SSLOGERROR(ERRCLS_INT_PAR, ESS270, ERRZERO, "Invalid queue order"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition if Q1 is Q2 */ if (q2 == q1) { SSLOGERROR(ERRCLS_INT_PAR, ESS271, ERRZERO, "Q1 == Q2"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ @@ -271,12 +271,12 @@ Order order; /* order */ q2->tail = NULLP; q2->crntSize = 0; - RETVALUE(ROK); + return ROK; } if (q2->crntSize == 0) { - RETVALUE(ROK); + return ROK; } switch (order) @@ -299,7 +299,7 @@ Order order; /* order */ break; } default: - RETVALUE(RFAILED); + return RFAILED; } q1->crntSize += q2->crntSize; @@ -308,7 +308,7 @@ Order order; /* order */ q2->tail = NULLP; q2->crntSize = 0; - RETVALUE(ROK); + return ROK; } /* end of SCatQueue */ @@ -348,19 +348,19 @@ QLen *lngPtr; /* pointer to length */ if (q == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS272, ERRZERO, "Null Q Ptr"); - RETVALUE(RFAILED); + return RFAILED; } /* check length */ if (lngPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS273, ERRZERO, "Null Q Len Ptr"); - RETVALUE(RFAILED); + return RFAILED; } #endif *lngPtr = q->crntSize; - RETVALUE(ROK); + return ROK; } /* end of SFndLenQueue */ @@ -410,28 +410,28 @@ QLen idx; /* index */ if (bufPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS274, ERRZERO, "Null Buf Ptr"); - RETVALUE(RFAILED); + return RFAILED; } /* check index */ if ((S32)idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS275, ERRZERO, "-ve index "); - RETVALUE(RFAILED); + return RFAILED; } /* check queue */ if (q == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS276, ERRZERO, "Null Q Ptr"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ if (idx >= q->crntSize) { *bufPtr = NULLP; - RETVALUE(ROKDNA); + return (ROKDNA); } if (idx == 0) @@ -452,7 +452,7 @@ QLen idx; /* index */ *bufPtr = tmpBuf; } - RETVALUE(ROK); + return ROK; } /* end of SExamQueue */ @@ -505,26 +505,26 @@ QLen idx; /* index */ if (q == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS277, ERRZERO, "Null Q Ptr"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS278, ERRZERO, "Null Buf Ptr"); - RETVALUE(RFAILED); + return RFAILED; } if ((S32)idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS279, ERRZERO, "-ve index"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check buffer type and if duplicate message */ if (mBuf->b_datap->db_type != SS_M_PROTO) { SSLOGERROR(ERRCLS_INT_PAR, ESS280, ERRZERO, "Incorrect buffer type"); - RETVALUE(RFAILED); + return RFAILED; } tBuf = q->head; while (tBuf != (Buffer *)NULLP) @@ -532,7 +532,7 @@ QLen idx; /* index */ if (tBuf == mBuf) { SSLOGERROR(ERRCLS_INT_PAR, ESS281, ERRZERO, "Duplicate queued mBuf"); - RETVALUE(RFAILED); + return RFAILED; } tBuf = tBuf->b_next; } @@ -541,7 +541,7 @@ QLen idx; /* index */ if (idx > q->crntSize) { SSLOGERROR(ERRCLS_DEBUG, ESS282, ERRZERO, "Invalid index"); - RETVALUE(ROKDNA); + return (ROKDNA); } else if (q->crntSize == 0) { @@ -579,7 +579,7 @@ QLen idx; /* index */ tBuf->b_prev = mBuf; } q->crntSize++; - RETVALUE(ROK); + return ROK; } /* end of SAddQueue */ @@ -630,27 +630,27 @@ QLen idx; /* index */ if (bufPtr == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS283, ERRZERO, "Null Buf Ptr"); - RETVALUE(RFAILED); + return RFAILED; } /* check queue */ if (q == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS284, ERRZERO, "Null Q Ptr"); - RETVALUE(RFAILED); + return RFAILED; } if ((S32)idx < 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS285, ERRZERO, "-ve Index"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS */ if (idx >= q->crntSize) { *bufPtr = NULLP; - RETVALUE(ROKDNA); + return (ROKDNA); } if (idx == 0) { @@ -687,7 +687,7 @@ QLen idx; /* index */ } q->crntSize--; - RETVALUE(ROK); + return ROK; } /* end of SRemQueue */ @@ -728,7 +728,7 @@ Queue *q; /* queue */ { TRC1(SQueueFirst) - RETVALUE(SAddQueue(buf, q, 0)); + return (SAddQueue(buf, q, 0)); } /* end of SQueueFirst */ @@ -767,7 +767,7 @@ Queue *q; /* queue */ { TRC2(SDequeueFirst) - RETVALUE(SRemQueue(bufPtr, q, 0)); + return (SRemQueue(bufPtr, q, 0)); } /* end of SDequeueFirst */ @@ -809,16 +809,16 @@ Queue *q; /* queue */ if (q == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS286, ERRZERO, "Null Q Ptr"); - RETVALUE(RFAILED); + return RFAILED; } /* check queue */ if (buf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS287, ERRZERO, "Null Buf Ptr"); - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(SAddQueue(buf, (q), ((q)->crntSize))); + return (SAddQueue(buf, (q), ((q)->crntSize))); } @@ -865,13 +865,13 @@ Queue *q; /* queue */ if (!bufPtr) { SSLOGERROR(ERRCLS_INT_PAR, ESS288, ERRZERO, "Null Buf Ptr"); - RETVALUE(RFAILED); + return RFAILED; } /* check queue */ if (!q) { SSLOGERROR(ERRCLS_INT_PAR, ESS289, ERRZERO, "Null Q Ptr"); - RETVALUE(RFAILED); + return RFAILED; } #endif if(q->crntSize > 0) @@ -879,7 +879,7 @@ Queue *q; /* queue */ else ret = SRemQueue(bufPtr, q, q->crntSize); - RETVALUE(ret); + return (ret); } #endif /* SS_ENABLE_MACROS */ @@ -918,7 +918,7 @@ SsDmndQ *dQueue; /* Demand Queue */ if (dQueue == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS290, ERRZERO, "NULL DQ Pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -950,7 +950,7 @@ SsDmndQ *dQueue; /* Demand Queue */ SSLOGERROR(ERRCLS_DEBUG, ESS291, (ErrVal)ret, "Failed to initialize lock"); #endif - RETVALUE(RFAILED); + return RFAILED; } } @@ -975,9 +975,9 @@ SsDmndQ *dQueue; /* Demand Queue */ SSLOGERROR(ERRCLS_DEBUG, ESS292, (ErrVal)ret, "Failed to init semaphore"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE (ROK); + return (ROK); } /* End of ssInitDmndQ */ @@ -1017,7 +1017,7 @@ SsDmndQ *dQueue; /* demand Queue */ if (dQueue == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS293, ERRZERO, "NULL DQ Pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1038,7 +1038,7 @@ SsDmndQ *dQueue; /* demand Queue */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS294, (ErrVal)ret, "Failed to destroy lock"); #endif - RETVALUE(RFAILED); + return RFAILED; } } for (i = 0; i < SS_MAX_NUM_DQ; i++) @@ -1056,10 +1056,10 @@ SsDmndQ *dQueue; /* demand Queue */ { SSLOGERROR(ERRCLS_DEBUG, ESS295, ERRZERO, "Could not delete the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE (ROK); + return (ROK); } /* end of ssDestroyDmndQ */ @@ -1119,25 +1119,25 @@ Order order; /* position */ if (dQueue == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS296, ERRZERO, "NULL DQ Pointer"); - RETVALUE(RFAILED); + return RFAILED; } if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS297, ERRZERO, "NULL mBuf Pointer"); - RETVALUE(RFAILED); + return RFAILED; } if ((priority == PRIORNC) || (priority > SS_MAX_DQ_PRIOR)) { SSLOGERROR(ERRCLS_INT_PAR, ESS298, ERRZERO, "invalid priority "); - RETVALUE(RFAILED); + return RFAILED; } if ((order != SS_DQ_FIRST) && (order != SS_DQ_LAST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS299, ERRZERO, "invalid order "); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1169,7 +1169,7 @@ Order order; /* position */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS300, (ErrVal)ret, "Failed to get lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } if (queue->crntSize == 0) @@ -1234,7 +1234,7 @@ Order order; /* position */ { SDequeueFirst(&mBuf, queue); } - RETVALUE (RFAILED); + return (RFAILED); } /* increment the counting semaphore */ @@ -1246,7 +1246,7 @@ Order order; /* position */ { sem_getvalue(&dQueue->dmndQSema, &value); if (value > 0) - RETVALUE(ROK); + return ROK; } #endif if (ssPostSema(&dQueue->dmndQSema) != ROK) @@ -1263,10 +1263,10 @@ Order order; /* position */ { SDequeueFirst(&mBuf, queue); } - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* End of ssDmndQPut */ @@ -1305,7 +1305,7 @@ SsDmndQ *dQueue; /* demand queue */ if (dQueue == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS303, ERRZERO, "NULL DQ Pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1318,10 +1318,10 @@ SsDmndQ *dQueue; /* demand queue */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS306, (ErrVal)ret, "Failed to get semaphore"); #endif - RETVALUE (RFAILED); + return (RFAILED); } - RETVALUE (ROK); + return (ROK); } /* End of ssDmndQWait */ @@ -1370,13 +1370,13 @@ Order order; /* position */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS304, ERRZERO, "NULL mBuf Pointer"); - RETVALUE(RFAILED); + return RFAILED; } if ((order != SS_DQ_FIRST) && (order != SS_DQ_LAST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS305, ERRZERO, "invalid order "); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1394,7 +1394,7 @@ Order order; /* position */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS307, (ErrVal)ret, "Failed to get lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } bitPosition = osCp.dmndQLookupTbl[dQueue->bitMask[i]]; @@ -1412,14 +1412,14 @@ Order order; /* position */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS308, ret, "Failed to release lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } } if (i >= SS_DQ_BIT_MASK_LEN) { /* Demand Queue is empty */ *mBuf = NULLP; - RETVALUE (ROKDNA); + return (ROKDNA); } qIndex = (i * 8) + (7 - bitPosition); @@ -1437,7 +1437,7 @@ Order order; /* position */ { /* Demand Queue is empty */ *mBuf = NULLP; - RETVALUE (ROKDNA); + return (ROKDNA); } /* ss039.103 : Replaced SLock with WTLock */ @@ -1451,7 +1451,7 @@ Order order; /* position */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS307, (ErrVal)ret, "Failed to get lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } #endif @@ -1502,10 +1502,10 @@ setting the crntSize to 0 and removing the message */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS309, (ErrVal)ret, "Failed to release lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } - RETVALUE (ROK); + return (ROK); } /* End of ssDmndQGet */ @@ -1550,7 +1550,7 @@ QLen *len; /* queue length */ if ((dQueue == NULLP) || (len == NULLP)) { SSLOGERROR(ERRCLS_INT_PAR, ESS310, ERRZERO, "NULL Pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1569,7 +1569,7 @@ QLen *len; /* queue length */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS311, (ErrVal)ret, "Failed to get lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } *len = dQueue->queue[priority].crntSize; @@ -1586,7 +1586,7 @@ QLen *len; /* queue length */ SSLOGERROR(ERRCLS_DEBUG, ESS312, (ErrVal)ret, \ "Failed to release lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } } else @@ -1623,14 +1623,14 @@ QLen *len; /* queue length */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS314, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } i--; } - RETVALUE (RFAILED); + return (RFAILED); } } @@ -1654,11 +1654,11 @@ QLen *len; /* queue length */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS315, (ErrVal)ret, "Failed to get lock"); #endif - RETVALUE (RFAILED); + return (RFAILED); } } } - RETVALUE(ROK); + return ROK; } /* End of ssFndLenDmndQ */ diff --git a/src/mt/ss_rbuf.c b/src/mt/ss_rbuf.c index d030e1b19..51692915c 100755 --- a/src/mt/ss_rbuf.c +++ b/src/mt/ss_rbuf.c @@ -88,7 +88,7 @@ U32 rngSize; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESSXXX, id, "Invalid RBUF ID"); #endif - RETVALUE(RFAILED); + return RFAILED; } if(SsRngInfoTbl[id].r_addr != 0) { @@ -96,7 +96,7 @@ U32 rngSize; SSLOGERROR(ERRCLS_DEBUG, ESSXXX, id, "Failed to Create Ring Buffer Id Ring already exist"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* Get Element Size */ @@ -108,7 +108,7 @@ U32 rngSize; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "Allocating Ring Failed!!!") #endif - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ring, @@ -128,7 +128,7 @@ U32 rngSize; SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "Allocating Ring Failed!!!") #endif free(ring); - RETVALUE(RFAILED); + return RFAILED; } /* Update Buffer Id Table */ SsRngInfoTbl[id].r_addr = ring; @@ -141,7 +141,7 @@ U32 rngSize; #else printf("Ring Buffer Created with id =%d rSize:%d eSize:%d %lx\n",id,ring->size,ring->type,(PTR)ring); #endif - RETVALUE(ROK); + return ROK; } /* @@ -169,7 +169,7 @@ U32 txRx; #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESSXXX, id, "Invalid RBUF ID"); #endif - RETVALUE(RFAILED); + return RFAILED; } if(SsRngInfoTbl[id].rngState < SS_RNG_CREATED) { @@ -184,7 +184,7 @@ U32 txRx; printf("Attach Request in Invalid Ring State %d id%d \n", SsRngInfoTbl[id].rngState,id); #endif - RETVALUE(RFAILED); + return RFAILED; } if(txRx == SS_RNG_TX) { @@ -196,7 +196,7 @@ U32 txRx; SsRngInfoTbl[id].rxEnt = ent; SsRngInfoTbl[id].rngState = SS_RNG_RX_ATTACHED; } - RETVALUE(ROK); + return ROK; } /* Func: SConnectSRngBuf @@ -216,7 +216,7 @@ U32 rxEnt; #endif { /* Send to Reciever ENT*/ - RETVALUE(ROK); + return ROK; } /* @@ -281,7 +281,7 @@ Void* elem; if (IsFull(ring)) { SsRngInfoTbl[id].nWriteFail++; - RETVALUE(RFAILED); + return RFAILED; } /* TBD Avoid multiplication for optimisation */ w_ptr = (U8*)ring->elem + (ring->write * ring->type); @@ -297,7 +297,7 @@ Void* elem; ring->write = (wrIndex == ring->size)?0: wrIndex; /* Update Statistics */ SsRngInfoTbl[id].n_write++; - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -313,7 +313,7 @@ U32 id; S16 freeDist = (SsRngInfoTbl[id].n_write- SsRngInfoTbl[id].n_read); - RETVALUE(freeDist); + return (freeDist); } /* Func: SDeqSRngBuf @@ -340,7 +340,7 @@ Void *elem; if(IsEmpty(ring)) { SsRngInfoTbl[id].nReadFail++; - RETVALUE(RFAILED); + return RFAILED; } r_ptr = (U8*)ring->elem + (ring->read * ring->type); for(i=0; itype; i++) @@ -353,7 +353,7 @@ Void *elem; rdIndex= ring->read + 1; ring->read = (rdIndex == ring->size)?0:rdIndex; SsRngInfoTbl[id].n_read++; - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -384,7 +384,7 @@ Pool pool; SsRngInfoTbl[id].rngState = SS_RNG_DESTROYED; SsRngInfoTbl[id].r_addr = 0; } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -402,7 +402,7 @@ U32 i; Txt prntBuf[100]; #ifdef RGL_SPECIFIC_CHANGES - RETVALUE(ROK); + return ROK; #endif for(i=0; i< SS_RNG_BUF_MAX;i++) { @@ -458,7 +458,7 @@ U32 i; #endif } } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -476,11 +476,11 @@ U32 rngId; if (IsFull(ring)) { SsRngInfoTbl[rngId].nWriteFail++; - RETVALUE(NULLP); + return (NULLP); } else { - RETVALUE(((U8 *)ring->elem) + (ring->type * ring->write)); + return (((U8 *)ring->elem) + (ring->type * ring->write)); } } @@ -499,11 +499,11 @@ U32 rngId; if(IsEmpty(ring)) { SsRngInfoTbl[rngId].nReadFail++; - RETVALUE(NULLP); + return (NULLP); } else { - RETVALUE(((U8 *)ring->elem) + (ring->type * ring->read)); + return (((U8 *)ring->elem) + (ring->type * ring->read)); } } @@ -572,7 +572,7 @@ S16 mtAddBufToRing(SsRngBufId ringId,void *bufPtr,U8 freeType) SsRngInfoTbl[ringId].pktDrop++; ret1 = RFAILED; } - RETVALUE(ret1); + return (ret1); } #endif #endif diff --git a/src/mt/ss_strm.c b/src/mt/ss_strm.c index 2fe524bf1..f000662bd 100644 --- a/src/mt/ss_strm.c +++ b/src/mt/ss_strm.c @@ -122,7 +122,7 @@ Region datRegId; /* region for data buffers */ strmCfg.datRegion = datRegId; - RETVALUE(ROK); + return ROK; } @@ -178,14 +178,14 @@ S32 len; /* bytes to remove */ if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS325, ERRZERO, "Null pointer"); - RETVALUE(0); + return (0); } #endif if (len == 0) /* nothing to do */ { - RETVALUE(1); + return (1); } @@ -210,7 +210,7 @@ S32 len; /* bytes to remove */ /* if we can't trim len bytes, fail */ if (len > size) { - RETVALUE(0); + return (0); } @@ -266,7 +266,7 @@ S32 len; /* bytes to remove */ size += len; if (size < 0) { - RETVALUE(0); + return (0); } @@ -294,7 +294,7 @@ S32 len; /* bytes to remove */ } - RETVALUE(1); + return (1); } /* ssAdjMsg */ @@ -358,7 +358,7 @@ U32 pri; /* message priority */ SSLOGERROR(ERRCLS_ADD_RES, ESS326, (ErrVal) r, "SAlloc() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -384,7 +384,7 @@ U32 pri; /* message priority */ #else SFree(strmCfg.mdRegion, (Data *)bp, m); #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(NULLP); + return (NULLP); } } /* we _can_ allocate a message with an empty data block */ @@ -397,7 +397,7 @@ U32 pri; /* message priority */ SS_STRM_INITB(bp, (SsDblk *)(((U8 *)bp) + sizeof(SsMblk)), dat, size, NULLP); - RETVALUE(bp); + return (bp); } /* ssAllocB */ @@ -439,7 +439,7 @@ SsMblk *mp; /* message block */ if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS328, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -452,7 +452,7 @@ SsMblk *mp; /* message block */ SSLOGERROR(ERRCLS_ADD_RES, ESS329, ERRZERO, "ssAllocB() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -468,7 +468,7 @@ SsMblk *mp; /* message block */ } - RETVALUE(bp); + return (bp); } /* ssCopyB */ @@ -509,7 +509,7 @@ SsMblk *mp; /* message block */ if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS330, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -522,7 +522,7 @@ SsMblk *mp; /* message block */ SSLOGERROR(ERRCLS_ADD_RES, ESS331, ERRZERO, "ssCopyB() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -541,14 +541,14 @@ SsMblk *mp; /* message block */ #endif ssFreeMsg(first); - RETVALUE(NULLP); + return (NULLP); } bp = bp->b_cont; } - RETVALUE(first); + return (first); } /* ssCopyMsg */ @@ -589,7 +589,7 @@ SsMblk *mp; /* message block */ if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS333, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -602,7 +602,7 @@ SsMblk *mp; /* message block */ SSLOGERROR(ERRCLS_ADD_RES, ESS334, ERRZERO, "ssAllocB() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -627,7 +627,7 @@ SsMblk *mp; /* message block */ { SSLOGERROR(ERRCLS_DEBUG, ESS335, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -642,12 +642,12 @@ SsMblk *mp; /* message block */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS336, ERRZERO, "Could not give the Semaphore"); - RETVALUE(NULLP); + return (NULLP); #endif } #endif - RETVALUE(bp); + return (bp); } /* ssDupB */ @@ -692,7 +692,7 @@ SsMblk *mp; /* message block */ SSLOGERROR(ERRCLS_ADD_RES, ESS337, ERRZERO, "ssDupB() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -711,14 +711,14 @@ SsMblk *mp; /* message block */ #endif ssFreeMsg(first); - RETVALUE(NULLP); + return (NULLP); } bp = bp->b_cont; } - RETVALUE(first); + return (first); } /* ssDupMsg */ @@ -768,7 +768,7 @@ SsFrtn *fr_rtn; /* free routine */ if (base == NULLP || fr_rtn == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS339, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -791,7 +791,7 @@ SsFrtn *fr_rtn; /* free routine */ SSLOGERROR(ERRCLS_ADD_RES, ESS340, (ErrVal) r, "SAlloc() failed"); #endif - RETVALUE(NULLP); + return (NULLP); } @@ -800,7 +800,7 @@ SsFrtn *fr_rtn; /* free routine */ base, size, fr_rtn); - RETVALUE(bp); + return (bp); } /* ssESBAlloc */ @@ -1139,7 +1139,7 @@ SsMblk *mp; /* message block */ } - RETVALUE(size); + return (size); } /* ssMsgDSize */ @@ -1195,13 +1195,13 @@ S32 len; /* number of bytes to align */ if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS346, ERRZERO, "Null pointer"); - RETVALUE(0); + return (0); } if (len < -1) { SSLOGERROR(ERRCLS_INT_PAR, ESS347, len, "Invalid length"); - RETVALUE(0); + return (0); } #endif @@ -1229,14 +1229,14 @@ S32 len; /* number of bytes to align */ if (len == 0) { - RETVALUE(1); + return (1); } /* do we have enough bytes to pull up? */ if (len < 0 || len > mLen) { - RETVALUE(0); + return (0); } @@ -1244,7 +1244,7 @@ S32 len; /* number of bytes to align */ newbp = ssAllocB(len, 0); if (newbp == NULLP) { - RETVALUE(0); + return (0); } newbp->b_datap->db_type = mp->b_datap->db_type; @@ -1341,7 +1341,7 @@ S32 len; /* number of bytes to align */ ssFreeB(newbp); - RETVALUE(1); + return (1); } /* ssPullupMsg */ @@ -1384,7 +1384,7 @@ SsMblk *bp; /* message block */ if (mp == NULLP || bp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS348, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -1405,7 +1405,7 @@ SsMblk *bp; /* message block */ { if (mp == NULLP) { - RETVALUE((SsMblk *)-1); + return ((SsMblk *)-1); } else if (mp->b_cont == bp) { @@ -1424,7 +1424,7 @@ SsMblk *bp; /* message block */ bp->b_cont = NULLP; - RETVALUE(rp); + return (rp); } /* ssRmvB */ @@ -1467,11 +1467,11 @@ U32 pri; /* priority of the message buffer */ if (bp) { ssFreeB(bp); - RETVALUE(1); + return (1); } - RETVALUE(0); + return (0); } /* ssTestB */ @@ -1511,7 +1511,7 @@ SsMblk *mp; /* message */ if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS349, ERRZERO, "Null pointer"); - RETVALUE(NULLP); + return (NULLP); } #endif @@ -1521,7 +1521,7 @@ SsMblk *mp; /* message */ mp->b_cont = NULLP; - RETVALUE(bp); + return (bp); } /* ssUnlinkB */ /********************************************************************** diff --git a/src/mt/ss_task.c b/src/mt/ss_task.c index 73f9037d8..52554457a 100644 --- a/src/mt/ss_task.c +++ b/src/mt/ss_task.c @@ -191,14 +191,14 @@ PAIFS16 initFnct; /* initialization function */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS350, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } /* check initialization function */ if (initFnct == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS351, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -217,7 +217,7 @@ PAIFS16 initFnct; /* initialization function */ { SSLOGERROR(ERRCLS_DEBUG, ESS352, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret); @@ -229,7 +229,7 @@ PAIFS16 initFnct; /* initialization function */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -246,11 +246,11 @@ PAIFS16 initFnct; /* initialization function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS355, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROUTRES); + return (ROUTRES); } /* check if entity and instance already registered */ @@ -266,11 +266,11 @@ PAIFS16 initFnct; /* initialization function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS357, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -312,11 +312,11 @@ PAIFS16 initFnct; /* initialization function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS358, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* SRegInit */ @@ -376,14 +376,14 @@ ActvTsk actvTsk; /* activate task function */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS359, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } /* check activation function */ if (actvTsk == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS360, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* check task type */ @@ -391,14 +391,14 @@ ActvTsk actvTsk; /* activate task function */ { SSLOGERROR(ERRCLS_INT_PAR, ESS361, ERRZERO, "Invalid task type"); /* ss021.103 - Addition of return fail for invalid task type */ - RETVALUE(RFAILED); + return RFAILED; } /* check task priority */ if (prior > PRIOR3) { SSLOGERROR(ERRCLS_INT_PAR, ESS362, ERRZERO, "Invalid task priority"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -408,7 +408,7 @@ ActvTsk actvTsk; /* activate task function */ { SSLOGERROR(ERRCLS_DEBUG, ESS363, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } /* lock TAPA task table */ @@ -420,13 +420,13 @@ ActvTsk actvTsk; /* activate task function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS364, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_DEBUG, ESS365, ERRZERO, "Could not lock TAPA task table"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Modification for SRegInit not called yet */ /* check if entity and instance already registered */ @@ -445,11 +445,11 @@ ActvTsk actvTsk; /* activate task function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS366, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS367, ERRZERO, "Too many tasks"); - RETVALUE(ROUTRES); + return (ROUTRES); } #endif @@ -491,13 +491,13 @@ ActvTsk actvTsk; /* activate task function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS368, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS369, ERRZERO, "ActvTask already registered"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -513,7 +513,7 @@ ActvTsk actvTsk; /* activate task function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS370, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -535,7 +535,7 @@ ActvTsk actvTsk; /* activate task function */ #endif SDeregTTsk(ent, inst); - RETVALUE(ret); + return (ret); } @@ -555,7 +555,7 @@ ActvTsk actvTsk; /* activate task function */ } - RETVALUE(ret); + return (ret); } /* SRegActvTsk */ @@ -602,7 +602,7 @@ Inst inst; /* instance */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS373, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -613,7 +613,7 @@ Inst inst; /* instance */ { SSLOGERROR(ERRCLS_DEBUG, ESS374, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } /* lock the TAPA task table */ @@ -626,7 +626,7 @@ Inst inst; /* instance */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -643,11 +643,11 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS377, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -675,7 +675,7 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS378, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -683,7 +683,7 @@ Inst inst; /* instance */ /* deregister the TAPA task */ if (SDeregTTsk(ent, inst) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } @@ -704,7 +704,7 @@ Inst inst; /* instance */ "Could not lock system task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } idx = (SsIdx) sTskId; @@ -720,11 +720,11 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS380, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* check if the system task is dying already */ @@ -737,10 +737,10 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS381, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } @@ -762,7 +762,7 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS382, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -781,13 +781,13 @@ Inst inst; /* instance */ "Could not destroy system task"); #endif - RETVALUE(RFAILED); + return RFAILED; } } } - RETVALUE(ROK); + return ROK; } /* SDeregInitTskTmr */ #endif /* SS_MULTIPLE_PROCS */ @@ -877,13 +877,13 @@ ActvTsk actvTsk; /* activation function */ if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS384, ERRZERO, "Invalid proc/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS385, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -891,7 +891,7 @@ ActvTsk actvTsk; /* activation function */ if (actvTsk == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS386, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* check task type */ @@ -899,14 +899,14 @@ ActvTsk actvTsk; /* activation function */ { SSLOGERROR(ERRCLS_INT_PAR, ESS387, ERRZERO, "Invalid task type"); /* ss021.103 - Addition of return fail for invalid task type */ - RETVALUE(RFAILED); + return RFAILED; } /* check task priority */ if (prior > PRIOR3) { SSLOGERROR(ERRCLS_INT_PAR, ESS388, ERRZERO, "Invalid task priority"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -923,7 +923,7 @@ ActvTsk actvTsk; /* activation function */ "Could not find proc table index"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -943,7 +943,7 @@ ActvTsk actvTsk; /* activation function */ { SSLOGERROR(ERRCLS_DEBUG, ESS390, ERRZERO, "Could not lock system task table"); - RETVALUE(RFAILED); + return RFAILED; } SS_ACQUIRE_ALL_SEMA(&osCp.tTskTblSem, ret); @@ -961,11 +961,11 @@ ActvTsk actvTsk; /* activation function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS392, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } @@ -982,11 +982,11 @@ ActvTsk actvTsk; /* activation function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS394, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROUTRES); + return (ROUTRES); } /* check if entity and instance already registered */ @@ -1007,11 +1007,11 @@ ActvTsk actvTsk; /* activation function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS396, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1111,10 +1111,10 @@ ActvTsk actvTsk; /* activation function */ SSLOGERROR(ERRCLS_DEBUG, ESS397, ERRZERO, "Could not give the Semaphore"); #endif - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* SRegTTsk */ /* ss002.301 Additions */ /* @@ -1179,13 +1179,13 @@ ActvTsk cbTsk; if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRegCbTsk() : Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } if (cbTsk == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, " SRegCbTsk() : Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1201,7 +1201,7 @@ ActvTsk cbTsk; " SRegCbTsk() : Could not find proc table index"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -1213,7 +1213,7 @@ ActvTsk cbTsk; SSLOGERROR(ERRCLS_DEBUG, ESSXXX, ERRZERO, "SRegCbTsk() : Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MULTIPLE_PROCS @@ -1227,7 +1227,7 @@ ActvTsk cbTsk; { SS_RELEASE_ALL_SEMA(&osCp.tTskTblSem); SSLOGERROR(ERRCLS_INT_PAR, ESSXXX, ERRZERO, "SRegCbTsk() : Unknown task"); - RETVALUE(RFAILED); + return RFAILED; } #endif tTsk = &osCp.tTskTbl[idx]; @@ -1235,7 +1235,7 @@ ActvTsk cbTsk; /* unlock the table */ SS_RELEASE_ALL_SEMA(&osCp.tTskTblSem); - RETVALUE(ROK); + return ROK; } @@ -1310,13 +1310,13 @@ Inst inst; /* instance */ if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS398, ERRZERO, "Invalid processor/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS399, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -1333,7 +1333,7 @@ Inst inst; /* instance */ SSLOGERROR(ERRCLS_DEBUG, ESS400, ERRZERO, "Could not find proc id index"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -1347,7 +1347,7 @@ Inst inst; /* instance */ SSLOGERROR(ERRCLS_DEBUG, ESS401, ERRZERO, "Could not lock timer table"); #endif - RETVALUE(RFAILED); + return RFAILED; } for (idx = 0; idx < SS_MAX_TMRS; idx++) @@ -1400,7 +1400,7 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS402, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -1408,7 +1408,7 @@ Inst inst; /* instance */ SSLOGERROR(ERRCLS_DEBUG, ESS403, ERRZERO, "Could not deregister task's timer(s)"); #endif - RETVALUE(RFAILED); + return RFAILED; } } @@ -1421,7 +1421,7 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS404, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } /* ss002.301 Additions */ @@ -1439,7 +1439,7 @@ Inst inst; /* instance */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -1459,7 +1459,7 @@ Inst inst; /* instance */ SSLOGERROR(ERRCLS_INT_PAR, ESS412, ERRZERO, "Unknown task"); /* ss002.301 Additions */ - RETVALUE(RFAILED); + return RFAILED; } tTsk = &osCp.tTskTbl[idx]; @@ -1492,7 +1492,7 @@ Inst inst; /* instance */ SSLOGERROR(ERRCLS_DEBUG, ESS415, ERRZERO, "Could not get a message"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* Update message*/ @@ -1528,12 +1528,12 @@ Inst inst; /* instance */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_INT_PAR, ESS416, ERRZERO, "Could not write to demand queue"); #endif - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ROK); + return ROK; } /* SDeregTTsk */ @@ -1578,7 +1578,7 @@ SSTskId *tskId; /* filled in with system task ID */ if (tskId == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS417, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* check system task priority */ @@ -1586,7 +1586,7 @@ SSTskId *tskId; /* filled in with system task ID */ { SSLOGERROR(ERRCLS_INT_PAR, ESS418, ERRZERO, "Invalid system task priority"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1601,7 +1601,7 @@ SSTskId *tskId; /* filled in with system task ID */ "Could not lock system task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -1647,10 +1647,10 @@ SSTskId *tskId; /* filled in with system task ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS420, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } #endif /* SS_SINGLE_THREADED */ @@ -1665,7 +1665,7 @@ SSTskId *tskId; /* filled in with system task ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS421, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -1673,7 +1673,7 @@ SSTskId *tskId; /* filled in with system task ID */ SSLOGERROR(ERRCLS_ADD_RES, ESS422, ERRZERO, "Too many system tasks"); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } @@ -1695,7 +1695,7 @@ SSTskId *tskId; /* filled in with system task ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS423, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -1704,7 +1704,7 @@ SSTskId *tskId; /* filled in with system task ID */ "Could not initialize demand queue"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* initialize the system task entry lock */ @@ -1718,7 +1718,7 @@ SSTskId *tskId; /* filled in with system task ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS425, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -1727,7 +1727,7 @@ SSTskId *tskId; /* filled in with system task ID */ "Could not initialize system task entry lock"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1750,7 +1750,7 @@ SSTskId *tskId; /* filled in with system task ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS427, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -1759,7 +1759,7 @@ SSTskId *tskId; /* filled in with system task ID */ "Could not create system task"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* success, update the table */ @@ -1781,11 +1781,11 @@ SSTskId *tskId; /* filled in with system task ID */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS429, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* SCreateSTsk */ @@ -1846,7 +1846,7 @@ U16 port /* Initialize the lock, return on failure */ if( SInitLock(&(osCp.logger.bufLock),SS_LOCK_MUTEX) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* if */ SLock(&osCp.logger.bufLock); @@ -1857,7 +1857,7 @@ U16 port if( osCp.logger.started == TRUE) { (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(RFAILED); + return RFAILED; } /* set the mode of the logging */ @@ -1882,7 +1882,7 @@ U16 port { SDisplay(0,"Error Opening Log File \n"); (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(RFAILED); + return RFAILED; } strcpy(osCp.logger.filePath,path); } @@ -1895,7 +1895,7 @@ U16 port { SDisplay(0, "Error at WSAStartup!\n"); (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(RFAILED); + return RFAILED; } #endif osCp.logger.socketdes = socket(AF_INET, SOCK_DGRAM, 0); @@ -1906,7 +1906,7 @@ U16 port WSACleanup(); #endif (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(RFAILED); + return RFAILED; } /* bind to local address */ localAddr.sin_family = AF_INET; @@ -1922,7 +1922,7 @@ U16 port close(osCp.logger.socketdes); #endif (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(RFAILED); + return RFAILED; } /* remote address */ remoteAddr.sin_family = AF_INET; @@ -1937,7 +1937,7 @@ U16 port close(osCp.logger.socketdes); #endif (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(RFAILED); + return RFAILED; } remoteAddr.sin_addr.s_addr = inet_addr(IPA); osCp.logger.remoteAddr = remoteAddr; @@ -1958,7 +1958,7 @@ U16 port (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(ROK); + return ROK; } /* SRegLogCfg */ /* @@ -2007,7 +2007,7 @@ S8 *logBuf { writeNum = sendto(osCp.logger.socketdes, buffer, cmStrlen((U8 *)buffer), 0, (struct sockaddr*)&osCp.logger.remoteAddr, sizeof(osCp.logger.remoteAddr)); /*ss013.301 : Returned after sending to socket*/ - RETVALUE(ROK); + return ROK; } osCp.logger.curNumFlush++; if(osCp.logger.curNumFlush == osCp.logger.maxNumFlush) @@ -2030,7 +2030,7 @@ S8 *logBuf /*SPutSBuf(DFLT_REGION,DFLT_POOL, (Data *)buffer, (Size)(osCp.logger.maxBufSiz * sizeof(S8)));*/ - RETVALUE(ROK); + return ROK; } /* SFlushBufToLog */ /* @@ -2062,7 +2062,7 @@ PUBLIC S16 SCleanUp() if(osCp.logger.started == FALSE) { (Void)SUnlock(&(osCp.logger.bufLock)); - RETVALUE(ROK); + return ROK; } if(osCp.logger.curBufSiz) { @@ -2089,7 +2089,7 @@ PUBLIC S16 SCleanUp() signal(SIGINT, App_SigExitCallBack); #endif - RETVALUE(ROK); + return ROK; } /* end of SCleanUp */ @@ -2122,7 +2122,7 @@ PUBLIC S16 SDeregLogCfg() SCleanUp(); - RETVALUE(ROK); + return ROK; } /* SDeregLogCfg */ @@ -2221,7 +2221,7 @@ SCpuInfo *cpuInfo; /* Information about the cores/threads per core */ cpuInfo->numCores < 1 || cpuInfo->threadsPerCore < 1 ) { SSLOGERROR(ERRCLS_INT_PAR, ESS430, ERRZERO, "Invalid number of cores\n"); - RETVALUE(RFAILED); + return RFAILED; } /* lock mCInfo */ @@ -2243,7 +2243,7 @@ SCpuInfo *cpuInfo; /* Information about the cores/threads per core */ /* unlock mCInfo */ SUnlock(&osCp.mCILock); - RETVALUE(ROK); + return ROK; } /* SRegCpuInfo */ @@ -2287,10 +2287,10 @@ U32 *coreId; /* the core/processor id to which the affinity i if (ret != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESS431, ERRZERO, "Failed to get affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ - RETVALUE(ROK); + return ROK; } /* SGetAffinity */ @@ -2335,7 +2335,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat mode > SS_AFFINITY_MODE_EXCL) { SSLOGERROR(ERRCLS_INT_PAR, ESS432, ERRZERO, "Invalid mode for setting core affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* check the value of core id */ @@ -2343,7 +2343,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat (coreId > osCp.mCInfo.cpuInfo.numCores || coreId < 0)) { SSLOGERROR(ERRCLS_INT_PAR, ESS433, ERRZERO, "Invalid core id\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* set affinity according to the mode supplied */ @@ -2374,7 +2374,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat { SSLOGERROR(ERRCLS_INT_PAR, ESS434, ERRZERO, \ "Failed to set core affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* lock mCInfo */ @@ -2414,7 +2414,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat { SSLOGERROR(ERRCLS_INT_PAR, ESS436, ERRZERO,\ "Can not set core affinity, core is exclusively used for other task\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* call the implementation specific affinity function with the core id supplied by caller */ ret = ssdSetAffinity(tskId, coreId); @@ -2422,7 +2422,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat if (ret != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESS437, ERRZERO, "Failed to set core affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* lock mCInfo */ @@ -2467,7 +2467,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat if (ret != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESS439, ERRZERO, "Failed to set core affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* lock mCInfo */ @@ -2498,7 +2498,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat { SSLOGERROR(ERRCLS_INT_PAR, ESS441, ERRZERO, "Can not set core affinity, core is exclusively used for other task\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end else */ tskNotFound = FALSE; break; @@ -2510,7 +2510,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat if (coreIndex == SS_MAX_CORES) { SSLOGERROR(ERRCLS_INT_PAR, ESS442, ERRZERO, "Invalid core id\n"); - RETVALUE(RFAILED); + return RFAILED; } /* if */ break; } /* end case SS_AFFINITY_MODE_ASSOC */ @@ -2527,7 +2527,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat if (ret != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESS443, ERRZERO, "Failed to set core affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* lock mCInfo */ @@ -2571,7 +2571,7 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat if (ret != ROK) { SSLOGERROR(ERRCLS_INT_PAR, ESS444, ERRZERO, "Failed to set core affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if */ /* lock mCInfo */ @@ -2604,25 +2604,25 @@ SSTskId *tskAssociatedTskId; /* filled in with system task ID of the associat { SSLOGERROR(ERRCLS_INT_PAR, ESS445, ERRZERO, "Failed to set core affinity, no threads on cores available\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end if no thrs on cores available */ } /* else if */ else { SSLOGERROR(ERRCLS_INT_PAR, ESS446, ERRZERO, "Can not set exclusive affinity for the core\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end else */ break; } /* end case SS_AFFINITY_MODE_EXCL */ default: { SSLOGERROR(ERRCLS_INT_PAR, ESS447, ERRZERO, "Invalid mode for setting core affinity\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end default case */ } /* end of switch */ - RETVALUE(ROK); + return ROK; } /* SSetAffinity */ @@ -2678,7 +2678,7 @@ SSTskId tskId; /* system task to be destroyed */ if (tskId >= SS_MAX_STSKS) { SSLOGERROR(ERRCLS_INT_PAR, ESS448, (ErrVal) tskId, "Invalid task ID"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2693,7 +2693,7 @@ SSTskId tskId; /* system task to be destroyed */ "Could not lock system task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -2715,13 +2715,13 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS450, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS451, (ErrVal) idx, "Invalid system task ID"); - RETVALUE(RFAILED); + return RFAILED; } else if (sTsk->termPend != FALSE) { @@ -2732,13 +2732,13 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS452, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS453, (ErrVal) idx, "Invalid system task ID"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2756,7 +2756,7 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS454, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -2765,7 +2765,7 @@ SSTskId tskId; /* system task to be destroyed */ "Could not lock system task entry"); #endif - RETVALUE(RFAILED); + return RFAILED; } } @@ -2782,7 +2782,7 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS456, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -2793,7 +2793,7 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS457, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -2802,7 +2802,7 @@ SSTskId tskId; /* system task to be destroyed */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -2840,7 +2840,7 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS459, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -2852,7 +2852,7 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS460, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -2875,7 +2875,7 @@ SSTskId tskId; /* system task to be destroyed */ "Could not destroy system task"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* multi-core support */ @@ -2932,12 +2932,12 @@ SSTskId tskId; /* system task to be destroyed */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS462, ERRZERO, "Could not unlock the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif - RETVALUE(ROK); + return ROK; } /* SDestroySTsk */ @@ -3024,14 +3024,14 @@ SSTskId sTskId; /* system task to use */ if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS463, ERRZERO, "Invalid processor/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ /* check entity and instance range */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS464, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -3040,7 +3040,7 @@ SSTskId sTskId; /* system task to use */ { SSLOGERROR(ERRCLS_INT_PAR, ESS465, (ErrVal) sTskId, "Invalid system task ID"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3055,7 +3055,7 @@ SSTskId sTskId; /* system task to use */ SSLOGERROR(ERRCLS_DEBUG, ESS466, ERRZERO, "Could not find proc id index"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -3069,7 +3069,7 @@ SSTskId sTskId; /* system task to use */ "Could not lock system task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -3087,13 +3087,13 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS468, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS469, (ErrVal) sTskId, "Unknown system task ID"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3111,7 +3111,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS470, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3120,7 +3120,7 @@ SSTskId sTskId; /* system task to use */ "Could not lock system task entry"); #endif - RETVALUE(RFAILED); + return RFAILED; } } @@ -3137,7 +3137,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS472, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -3148,11 +3148,11 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS473, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } @@ -3169,7 +3169,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS474, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -3181,7 +3181,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS475, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3190,7 +3190,7 @@ SSTskId sTskId; /* system task to use */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -3216,7 +3216,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS477, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -3227,12 +3227,12 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS478, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS479, ERRZERO, "Unknown task"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3250,7 +3250,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS480, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -3261,11 +3261,11 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS481, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } @@ -3282,7 +3282,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS482, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -3293,11 +3293,11 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS483, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROUTRES); + return (ROUTRES); } @@ -3337,7 +3337,7 @@ SSTskId sTskId; /* system task to use */ "Could not find proc table index"); #endif - RETVALUE(RFAILED); + return RFAILED; } (Void)(tTsk->initTsk)(tTsk->proc, tTsk->ent, tTsk->inst, sTsk->region, PWR_UP, &xxCb); /* @@ -3372,7 +3372,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS484, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -3383,7 +3383,7 @@ SSTskId sTskId; /* system task to use */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS485, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3399,11 +3399,11 @@ SSTskId sTskId; /* system task to use */ #else /* SS_MULTIPLE_PROCS */ SDetachTTsk(ent, inst); #endif /* SS_MULTIPLE_PROCS */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* SAttachTTsk */ @@ -3478,14 +3478,14 @@ Inst inst; /* instance ID of the task */ if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS486, ERRZERO, "Invalid processor/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ /* check entity and instance ranges */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS487, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ #endif @@ -3501,7 +3501,7 @@ Inst inst; /* instance ID of the task */ SSLOGERROR(ERRCLS_DEBUG, ESS488, ERRZERO, "Could not find proc id index"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -3519,7 +3519,7 @@ Inst inst; /* instance ID of the task */ "Could not lock system task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -3534,7 +3534,7 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS490, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3543,7 +3543,7 @@ Inst inst; /* instance ID of the task */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -3567,12 +3567,12 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS492, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS493, ERRZERO, "Unknown task"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3596,10 +3596,10 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS494, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } @@ -3629,7 +3629,7 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS495, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3638,7 +3638,7 @@ Inst inst; /* instance ID of the task */ "Could not lock system task entry"); #endif - RETVALUE(RFAILED); + return RFAILED; } } @@ -3654,7 +3654,7 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS497, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } if ( SUnlock(&osCp.sTskTblLock) != ROK) @@ -3662,7 +3662,7 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS498, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3671,7 +3671,7 @@ Inst inst; /* instance ID of the task */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -3713,7 +3713,7 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS500, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } } @@ -3726,7 +3726,7 @@ Inst inst; /* instance ID of the task */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS501, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3736,11 +3736,11 @@ Inst inst; /* instance ID of the task */ */ if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* SDetachTTsk */ @@ -3819,7 +3819,7 @@ Buffer *mBuf; /* message to post */ if (mBuf == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS502, ERRZERO, "Invalid message buffer"); - RETVALUE(RFAILED); + return RFAILED; } /* check the pst structure */ @@ -3827,7 +3827,7 @@ Buffer *mBuf; /* message to post */ { SPutMsg(mBuf); SSLOGERROR(ERRCLS_INT_PAR, ESS503, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } /* ss021.103 - Addition to check for valid route */ /* ss023.103 - Modification to fix bug in route validation */ @@ -3836,7 +3836,7 @@ Buffer *mBuf; /* message to post */ { SPutMsg(mBuf); SSLOGERROR(ERRCLS_INT_PAR, ESS504, ERRZERO, "No route defined"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3852,7 +3852,7 @@ Buffer *mBuf; /* message to post */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3874,7 +3874,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS506, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -3884,7 +3884,7 @@ Buffer *mBuf; /* message to post */ SSLOGERROR(ERRCLS_INT_PAR, ESS507, ERRZERO, "Invalid source/destination entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3917,7 +3917,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS508, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -3928,7 +3928,7 @@ Buffer *mBuf; /* message to post */ "Could not lock router task entry"); #endif - RETVALUE(RFAILED); + return RFAILED; } /* call the router activation function */ @@ -3942,7 +3942,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS510, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -3955,11 +3955,11 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS511, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif - RETVALUE((r == RFAILED) ? RFAILED : ROK); + return ((r == RFAILED) ? RFAILED : ROK); } } #endif /* SS_RTR_SUPPORT */ @@ -3986,7 +3986,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS512, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -3997,7 +3997,7 @@ Buffer *mBuf; /* message to post */ SSLOGERROR(ERRCLS_DEBUG, ESS513, ERRZERO, "Unknown task"); #endif - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ @@ -4022,7 +4022,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS514, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4032,7 +4032,7 @@ Buffer *mBuf; /* message to post */ SSLOGERROR(ERRCLS_DEBUG, ESS515, ERRZERO, "Unknown task"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -4086,7 +4086,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS516, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4097,7 +4097,7 @@ Buffer *mBuf; /* message to post */ "Could not lock driver task entry"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef L2_L3_SPLIT } @@ -4120,7 +4120,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS519, ERRZERO, "Could not give the Semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #ifdef L2_L3_SPLIT @@ -4134,11 +4134,11 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS520, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif - RETVALUE(ROK); + return ROK; } } @@ -4149,7 +4149,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS521, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4160,7 +4160,7 @@ Buffer *mBuf; /* message to post */ "Could not find a driver task to handle this proc ID"); #endif - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_DRVR_SUPPORT */ /* ss002.301 Modifications */ @@ -4181,7 +4181,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS512, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4189,7 +4189,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS513, ERRZERO, "call back function failed\n"); #endif - RETVALUE(ROK); + return ROK; } #ifdef SS_MULTIPLE_PROCS dstIdx = osCp.tTskIds[dstProcIdIdx][tempPst.dstEnt][tempPst.dstInst]; @@ -4213,7 +4213,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS527, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -4222,7 +4222,7 @@ Buffer *mBuf; /* message to post */ if( ret != ROK ) { /* No need to free the buffer, its already done in called fun */ - RETVALUE(RFAILED); + return RFAILED; } /* Allocate for the mBuf */ @@ -4231,7 +4231,7 @@ Buffer *mBuf; /* message to post */ if( workPtr == NULLP ) { SPutFpaMsg(wqBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Convert the pointers to physical address */ @@ -4239,7 +4239,7 @@ Buffer *mBuf; /* message to post */ if( ret != ROK ) { SPutFpaMsg(wqBuf); - RETVALUE(RFAILED); + return RFAILED; } /* Assign the values for work ptr */ @@ -4253,7 +4253,7 @@ Buffer *mBuf; /* message to post */ cvmx_pow_work_submit(workPtr, workPtr->tag, workPtr->tag_type, \ workPtr->qos, workPtr->grp); - RETVALUE(ROK); + return ROK; } #endif /* SS_SEUM_CAVIUM */ @@ -4273,7 +4273,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS523, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4284,7 +4284,7 @@ Buffer *mBuf; /* message to post */ "Destination TAPA task is not attached"); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_LOCKLESS_MEMORY @@ -4354,7 +4354,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS525, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4365,7 +4365,7 @@ Buffer *mBuf; /* message to post */ "Could not write to demand queue"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -4377,7 +4377,7 @@ Buffer *mBuf; /* message to post */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS527, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } #endif @@ -4388,7 +4388,7 @@ Buffer *mBuf; /* message to post */ */ ssdPstTsk(tempPst, mBuf, tTsk); - RETVALUE(ROK); + return ROK; } /* SPstTsk */ /* ss001.301: additions */ @@ -4430,7 +4430,7 @@ Ent *ent; /* entity */ ent[tskCnt] = osCp.tTskTbl[tskCnt].ent; } - RETVALUE(ROK); + return ROK; } /* SGetTapaTskEntIds */ /* @@ -4475,7 +4475,7 @@ Ent ent; /* entity */ "Could not lock TAPA task table"); #endif - RETVALUE(RFAILED); + return RFAILED; } for(tskCnt = 0; tskCnt < osCp.numTTsks; tskCnt++) @@ -4492,11 +4492,11 @@ Ent ent; /* entity */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS639, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ROK); + return ROK; } /* SGetTapaTskEntIds */ /* @@ -4548,7 +4548,7 @@ Bool *hstReg; /* entity */ *hstReg = TRUE; } - RETVALUE(ROK); + return ROK; } /* SGetTapaTskEntIds */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -4621,7 +4621,7 @@ void *data; #endif SPrint(prntBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -4660,7 +4660,7 @@ void; /* Implicit watchdog stop during dereg */ SStopHrtBt(); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -4678,7 +4678,7 @@ U8 timeInterval; ssdStartWatchDgTmr(NULLP, SS_TMR_HRTBT, timeInterval); ssdSndHrtBtMsg(TRUE, SS_WD_HB_REQ); - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -4695,7 +4695,7 @@ void osCp.wdCp.globWd.watchdogStop = 1; - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -4723,7 +4723,7 @@ Buffer *mBuf; /* message buffer */ ); SPrint(prntBuf); #endif /* DEBUGP */ - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -4808,7 +4808,7 @@ Buffer *mBuf; /* message buffer */ #endif /* DEBUGP */ } } - RETVALUE(ROK); + return ROK; } #endif /* SS_WATCHDOG */ @@ -4894,14 +4894,14 @@ U64 *totTime; if ((procId == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS463, ERRZERO, "Invalid processor/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ /* check entity and instance range */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS464, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ #endif @@ -4910,7 +4910,7 @@ U64 *totTime; ret = SLock(&osCp.sTskTblLock); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } @@ -4919,7 +4919,7 @@ U64 *totTime; if (procIdIdx == SS_INV_PROCID_IDX) { - RETVALUE(RFAILED); + return RFAILED; } idx = osCp.tTskIds[procIdIdx][ent][inst]; @@ -4931,7 +4931,7 @@ U64 *totTime; if(tTsk == NULLP ) { SUnlock(&osCp.sTskTblLock); - RETVALUE(RFAILED); + return RFAILED; } *curEvent = osCp.tTskTbl[idx].curEvent; *curEvtTime = osCp.tTskTbl[idx].curEvtTime; @@ -4939,7 +4939,7 @@ U64 *totTime; *sTskId = osCp.tTskTbl[idx].sTsk->tskId; SUnlock(&osCp.sTskTblLock); - RETVALUE(ROK); + return ROK; } #endif /* SS_THREAD_PROFILE */ diff --git a/src/mt/ss_timer.c b/src/mt/ss_timer.c index aa9e71f59..4bf43bd6a 100644 --- a/src/mt/ss_timer.c +++ b/src/mt/ss_timer.c @@ -174,7 +174,7 @@ PFS16 tmrFnct; /* timer function, typically SActvTmr */ ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn); - RETVALUE(ret); + return (ret); } #else /* SS_MULTIPLE_PROCS */ @@ -211,7 +211,7 @@ PAIFTMRS16 tmrFnct; /* timer function, typically SActvTmr */ ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn); - RETVALUE(ret); + return (ret); } #endif /* SS_MULTIPLE_PROCS */ @@ -267,7 +267,7 @@ PAIFTMRS16 tmrFnctMt; /* timer function, typically SActvTmr */ ssTmrActvFn.mtFlag = TRUE; ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn); - RETVALUE(ret); + return (ret); } #endif /* SS_MT_TMR */ #endif /* not SS_MULTIPLE_PROCS */ @@ -361,13 +361,13 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS528, ERRZERO, "Invalid processor/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS529, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -375,14 +375,14 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ if (period <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS530, ERRZERO, "Invalid period"); - RETVALUE(RFAILED); + return RFAILED; } /* check period units*/ if ((units < 1) || (units > SS_TICKS_SEC)) { SSLOGERROR(ERRCLS_INT_PAR, ESS531, ERRZERO, "Invalid period units"); - RETVALUE(RFAILED); + return RFAILED; } if(ssTmrActvFn.mtFlag == TRUE) @@ -393,13 +393,13 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ if (ssTmrActvFn.actvFnc.tmrActvFnMt == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS532, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #else - RETVALUE(RFAILED); + return RFAILED; #endif #else - RETVALUE(RFAILED); + return RFAILED; #endif } else @@ -407,7 +407,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ if (ssTmrActvFn.actvFnc.tmrActvFn == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS532, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } } @@ -419,7 +419,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ { SSLOGERROR(ERRCLS_INT_PAR, ESS533, ERRZERO, "Could not find proc id index"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -431,7 +431,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ { SSLOGERROR(ERRCLS_DEBUG, ESS534, ERRZERO, "Could not lock TAPA task table"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MULTIPLE_PROCS @@ -445,18 +445,18 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS535, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS536, ERRZERO, "Unknown task"); - RETVALUE(RFAILED); + return RFAILED; } if ( SS_RELEASE_SEMA(&osCp.tTskTblSem) != ROK) { #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS537, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -471,7 +471,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ SSLOGERROR(ERRCLS_DEBUG, ESS538, (ErrVal) ret, "Could not lock timer table"); #endif - RETVALUE(ret); + return (ret); } @@ -483,7 +483,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS539, ERRZERO, "Could not unlock the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -491,7 +491,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ SSLOGERROR(ERRCLS_DEBUG, ESS540, ERRZERO, "Too many timers"); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -528,10 +528,10 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ { #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS541, ERRZERO, "Could not unlock the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(RFAILED); + return RFAILED; } } } @@ -598,11 +598,11 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS542, ERRZERO, "Could not unlock the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ret); + return (ret); } @@ -653,7 +653,7 @@ PFS16 tmrFnct; /* timer function */ ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn); - RETVALUE(ret); + return (ret); } #else /* SS_MULTIPLE_PROCS */ @@ -690,7 +690,7 @@ PAIFTMRS16 tmrFnct; /* timer function */ ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn); - RETVALUE(ret); + return (ret); } #endif /* SS_MULTIPLE_PROCS */ @@ -742,7 +742,7 @@ PAIFTMRS16 tmrFnctMt; /* timer function */ ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn); - RETVALUE(ret); + return (ret); } #endif /* SS_MT_TMR */ #endif /* not SS_MULTIPLE_PROCS */ @@ -836,28 +836,28 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST)) { SSLOGERROR(ERRCLS_INT_PAR, ESS543, ERRZERO, "Invalid processor/entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #else /* SS_MULTIPLE_PROCS */ if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST) { SSLOGERROR(ERRCLS_INT_PAR, ESS544, ERRZERO, "Invalid entity/instance"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ /* check period */ if (period <= 0) { SSLOGERROR(ERRCLS_INT_PAR, ESS545, ERRZERO, "Invalid period"); - RETVALUE(RFAILED); + return RFAILED; } /* check period units */ if ((units < 1) || (units > SS_TICKS_SEC)) { SSLOGERROR(ERRCLS_INT_PAR, ESS546, ERRZERO, "Invalid period units"); - RETVALUE(RFAILED); + return RFAILED; } /* check timer function */ @@ -868,13 +868,13 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ if (ssTmrActvFn.actvFnc.tmrActvFnMt == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS547, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } #else - RETVALUE(RFAILED); + return RFAILED; #endif #else - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -883,7 +883,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ if (ssTmrActvFn.actvFnc.tmrActvFn == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS547, ERRZERO, "Null pointer"); - RETVALUE(RFAILED); + return RFAILED; } } @@ -895,7 +895,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ { SSLOGERROR(ERRCLS_INT_PAR, ESS548, ERRZERO, "Could not find proc id index"); - RETVALUE(RFAILED); + return RFAILED; } #endif /* SS_MULTIPLE_PROCS */ @@ -906,7 +906,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ { SSLOGERROR(ERRCLS_DEBUG, ESS549, ERRZERO, "Could not lock TAPA task table"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MULTIPLE_PROCS @@ -920,18 +920,18 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS550, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } SSLOGERROR(ERRCLS_INT_PAR, ESS551, ERRZERO, "Unknown task"); - RETVALUE(RFAILED); + return RFAILED; } if ( SS_RELEASE_SEMA(&osCp.tTskTblSem) != ROK) { #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS552, ERRZERO, "Could not release the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -946,7 +946,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ SSLOGERROR(ERRCLS_DEBUG, ESS553, (ErrVal) ret, "Could not lock timer table"); #endif - RETVALUE(ret); + return (ret); } @@ -993,7 +993,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS554, ERRZERO, "Could not unlock the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } @@ -1001,7 +1001,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ SSLOGERROR(ERRCLS_DEBUG, ESS555, ERRZERO, "Could not locate timer"); #endif - RETVALUE(RFAILED); + return RFAILED; } @@ -1041,12 +1041,12 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS556, ERRZERO, "Could not unlock the semaphore"); - RETVALUE(RFAILED); + return RFAILED; #endif } - RETVALUE(ret); + return (ret); } /********************************************************************** diff --git a/src/ric_stub/ric_e2ap_msg_hdl.c b/src/ric_stub/ric_e2ap_msg_hdl.c index b82dd8c65..007d86f1b 100644 --- a/src/ric_stub/ric_e2ap_msg_hdl.c +++ b/src/ric_stub/ric_e2ap_msg_hdl.c @@ -52,26 +52,26 @@ S16 SendE2APMsg(Region region, Pool pool) { Buffer *mBuf; - if(SGetMsg(region, pool, &mBuf) == ROK) + if(ODU_GET_MSG(region, pool, &mBuf) == ROK) { - if(SAddPstMsgMult((Data *)encBuf, encBufSize, mBuf) == ROK) + if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK) { - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); if(sctpSend(mBuf) != ROK) { DU_LOG("\nE2AP : SCTP Send for E2 failed"); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); return RFAILED; } } else { - DU_LOG("\nE2AP : SAddPstMsgMult failed"); - SPutMsg(mBuf); + DU_LOG("\nE2AP : ODU_ADD_POST_MSG_MULT failed"); + ODU_PUT_MSG(mBuf); return RFAILED; } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); } else { @@ -284,7 +284,7 @@ RICaction_ToBeSetup_Item_t* fillSetupItems(RICaction_ToBeSetup_Item_t *setupItem setupItems->ricActionType = RICactionType_report; } - RETVALUE(setupItems); + return (setupItems); } /******************************************************************* @@ -539,16 +539,18 @@ void E2APMsgHdlr(Buffer *mBuf) E2AP_PDU_t e2apasnmsg ; DU_LOG("\nE2AP : Received E2AP message buffer"); - SPrntMsg(mBuf, 0,0); + ODU_PRINT_MSG(mBuf, 0,0); /* Copy mBuf into char array to decode it */ - SFndLenMsg(mBuf, &recvBufLen); - if(SGetSBuf(DFLT_REGION, DFLT_POOL, (Data **)&recvBuf, (Size)recvBufLen) != ROK) + ODU_FIND_MSG_LEN(mBuf, &recvBufLen); + RIC_ALLOC(recvBuf, (Size)recvBufLen); + + if(recvBuf == NULLP) { DU_LOG("\nE2AP : Memory allocation failed"); return; } - if(SCpyMsgFix(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) + if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, ©Cnt) != ROK) { DU_LOG("\nE2AP : Failed while copying %d", copyCnt); return; @@ -565,7 +567,8 @@ void E2APMsgHdlr(Buffer *mBuf) memset(e2apMsg, 0, sizeof(E2AP_PDU_t)); rval = aper_decode(0, &asn_DEF_E2AP_PDU, (void **)&e2apMsg, recvBuf, recvBufLen, 0, 0); - SPutSBuf(DFLT_REGION, DFLT_POOL, (Data *)recvBuf, (Size)recvBufLen); + RIC_FREE(recvBuf, (Size)recvBufLen); + if(rval.code == RC_FAIL || rval.code == RC_WMORE) { DU_LOG("\nE2AP : ASN decode failed"); diff --git a/src/ric_stub/ric_stub.c b/src/ric_stub/ric_stub.c index 5fcca616a..fc7c4b4ac 100644 --- a/src/ric_stub/ric_stub.c +++ b/src/ric_stub/ric_stub.c @@ -82,7 +82,7 @@ void init_log() * * ****************************************************************/ -S16 tst() +uint8_t tst() { init_log(); diff --git a/src/ric_stub/ric_stub_sctp.c b/src/ric_stub/ric_stub_sctp.c index 2bf9ef15d..d4453cac0 100644 --- a/src/ric_stub/ric_stub_sctp.c +++ b/src/ric_stub/ric_stub_sctp.c @@ -151,7 +151,7 @@ S16 sctpStartReq() { DU_LOG("\nSCTP: Polling failed to start at RIC"); } - RETVALUE(ret); + return (ret); } /******************************************************************* * @@ -188,7 +188,7 @@ S16 sctpSetSockOpts(CmInetFd *sock_Fd) ret = RFAILED; } - RETVALUE(ret); + return (ret); } /******************************************************************* @@ -377,7 +377,7 @@ S16 sctpSockPoll() DU_LOG("\nSCTP : Failed to RecvMsg for E2 at RIC \n"); } }; - RETVALUE(ret); + return (ret); }/* End of sctpSockPoll() */ /******************************************************************* @@ -430,11 +430,11 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou else if(connUp & (pollParams->port == ricParams.destPort)) { E2APMsgHdlr(pollParams->mBuf); - SPutMsg(pollParams->mBuf); + ODU_PUT_MSG(pollParams->mBuf); } else { - SPutMsg(pollParams->mBuf); + ODU_PUT_MSG(pollParams->mBuf); } } } -- 2.16.6