|| 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)
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) ||
cellCfg->rguDlSapId,
cellCfg->rguUlSapId,
cellCfg->cellId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGVldtCrgCellCfg */
{
RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Transmission Mode=%d not supported",
ueCfg->txMode.tm);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Fetch the Active cell */
{
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) ||
ueCfg->rguDlSapId,
ueCfg->rguUlSapId,
ueCfg->crnti));
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGVldtCrgUeCfg */
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
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 ||
)
{
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 */
&& ((*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 */
{
RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Transmission Mode=%d not supported",
ueRecfg->txMode.tm);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Fetch the Active cell */
|| ((*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
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 */
|| ((*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 */
{
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 */
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 */
{
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
/* Allocate a buffer for flowCntrlInd.*/
SGetSBuf(pst->region, pst->pool, (Data **)&cell->flowCntrlInd,
sizeof(RguFlowCntrlInd));
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgCellCfg */
#ifdef LTE_ADV
"[%d]Ue already exist in scell %d during scell addition\n",
ueSCellCb->ueId,
cell->cellId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Create UeCb */
{
RGDBGERRNEW(dstMacInst, (rgPBuf(dstMacInst),
"[%d]UeCb creation failed\n", ueSCellCb->ueId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if(rgDHMHqEntInit(dstMacInst, &ueCb->dl.hqEnt,
{
RGDBGERRNEW(dstMacInst,(rgPBuf(dstMacInst),
"[%d]UeCb Harq Entity Initialization failed\n", ueSCellCb->ueId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
rgDBMInsUeCb(cell, ueCb);
ueCb->ul.lcgArr[idx].lcCount = ueSCellCb->lcgInfo[idx].lcCount;
ueCb->ul.lcgArr[idx].isGbr = ueSCellCb->lcgInfo[idx].isGbr;
}
- RETVALUE(ROK);
+ return ROK;
}/* rgCfgAddUeSCellCfg */
/**
RGDBGERRNEW(inst,(rgPBuf(inst),
"[%d]Active Cell does not exist %d\n",
ueRecfg->oldCrnti, ueRecfg->cellId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
RGDBGPRM(inst,(rgPBuf(inst),
{
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
} /*end of for loop */
*isCfmRqrd = FALSE;
- RETVALUE(ROK);
+ return ROK;
} /* rgFillAndAddSCellCfg */
#endif /* LTE_ADV */
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;
}
/* Update satistics */
rgUpdtUeCnt(inst,RG_CFG_ADD);
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgUeCfg */
{
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*/
{
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 */
cell->rachCfg = cellRecfg->rachRecfg;
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgCellRecfg */
rgUHMCrgUeRecfg(cell, ue, ueRecfg);
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgUeRecfg */
}
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgLcRecfg */
/* Start: LTEMAC_2.1_DEV_CFG */
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgUeReset */
/* End: LTEMAC_2.1_DEV_CFG */
RLOG_ARG0(L_ERROR,DBG_CELLID,cellDelInfo->u.cellDel.cellId,"Cell does not exist");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Delete cell from inactive list */
rgCFGFreeInactvCellCb(cell);
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
}
/* Delete from the cell list */
errInfo->errCause = RGERR_NONE;
RGDBGINFO(inst,(rgPBuf(inst), "Cell %d deleted\n", cellDelInfo->u.cellDel.cellId));
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgCellDel */
{
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 */
{
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 */
{
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 */
{
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;
{
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;
{
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*/
rgPomSndUeSCellLchDelToSmac(inst, lcDelInfo, isCfmRqrd);
#endif
errInfo->errCause = RGERR_NONE;
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgLcDel */
/***********************************************************
{
RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Active Cell does not exist: Cell %d",
lcCfg->cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Fetch the Ue */
{
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 */
{
RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid logical channel Id %d",
lcCfg->lcId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Validate downlink info */
{
RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Dedicated DL LC %d already configured",
lcCfg->lcId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
dirVld = TRUE;
}
{
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;
}
{
RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid Direction %d",
lcCfg->dir);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGVldtCrgDedLcCfg */
&& ((*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 */
{
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)
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)
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)
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;
}
{
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;
}
if (!dirVld)
{
RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid Direction %d", lcCfg->dir);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGVldtCrgCmnLcCfg */
/***********************************************************
{
rgDBMInsDlDedLcCb(ue, lcCfg->lcId);
}
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgDedLcCfg */
config\n", lcCfg->lcId);
}
- RETVALUE(ROK);
+ return ROK;
} /* rgCFGCrgCmnLcCfg */
#ifdef LTE_L2_MEAS
/***********************************************************
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 */
- RETVALUE(ret);
+ return (ret);
}