RgCb rgCb[RG_MAX_INST];
/* local defines */
-PRIVATE S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
RgUeCb **ue, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
+static S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
CrgLchCfg *lcCfg, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
+static S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
RgErrInfo *errInfo));
-PRIVATE Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
-PRIVATE Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
/* Added support for SPS*/
#ifdef LTEMAC_SPS
-PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
#endif /* LTEMAC_SPS */
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgCellCfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG;
if ((rgCb[inst].cell != NULLP)
|| rgCb[inst].inactiveCell != NULLP)
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgUeCfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_CFG;
if ((ueCfg->txMode.pres == PRSNT_NODEF) &&
(ueCfg->txMode.tm == CRG_UE_TM_5))
#endif
{
- TRC2(rgCFGVldtCrgLcCfg);
-
if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
{
/* Dedicated logical channels */
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgCellRecfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG;
if (((*cell = rgCb[inst].cell) == NULLP)
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgUeRecfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG;
if ((ueRecfg->txMode.pres == PRSNT_NODEF) &&
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgLcRecfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG;
/* Fetch the cell */
#ifdef ANSI
S16 rgCFGVldtCrgUeReset
(
-Inst inst,
-CrgRst *reset,
+Inst inst,
+CrgRst *reset,
RgCellCb **cell,
RgUeCb **ue,
RgErrInfo *errInfo
)
#else
S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
-Inst inst;
-CrgRst *reset;
+Inst inst;
+CrgRst *reset;
RgCellCb **cell;
RgUeCb **ue;
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgUeReset);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET;
/* Fetch the Active cell */
{
S16 ret;
RgCellCb *cell = NULLP;
- U8 idx;
+ uint8_t idx;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
/* RLC SAP to allocate flowCntrlInd buffer*/
Pst *pst ;
- TRC2(rgCFGCrgCellCfg);
-
errInfo->errCause = RGERR_CFG_CRG_CELL_CFG;
/* Allocate the cell control block */
cmLListInit(&cell->l2mList);
for(idx = 0; idx < RG_NUM_UL_SUB_FRAMES; idx++)
{
- cmMemset((U8 *)&cell->ulSf[idx], 0, sizeof(RgUlSf));
+ memset(&cell->ulSf[idx], 0, sizeof(RgUlSf));
}
- cell->ttiCycle = (U32)RG_TTI_CYCLE_INVLD;
+ cell->ttiCycle = (uint32_t)RG_TTI_CYCLE_INVLD;
#endif
/* Update Statistics */
rgUpdtCellCnt(inst,RG_CFG_ADD);
RgUeCb *ueCb = NULLP;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
- U8 idx;
+ uint8_t idx;
RgErrInfo errInfo;
- TRC2(rgCfgAddUeSCellCfg);
-
#ifdef LTE_ADV
rguDlSapId = ueSCellCb->rguDlSapId;
rguUlSapId = ueSCellCb->rguUlSapId;
#endif
{
RgUeCb *ue = NULLP;
- U8 idx = 0;
+ uint8_t idx = 0;
Inst dstMacInst;
RgPrgUeSCellCfgInfo ueSCellCb;
Pst dstInstPst;
- TRC2(rgFillAndAddSCellCfg);
-
/* Fetch the Active cell */
if(((cell = rgCb[inst].cell) == NULLP) ||
(cell->cellId != ueRecfg->cellId))
ue->cfgCfmInfo.cfgCfgCount = 0;
ue->cfgCfmInfo.mask = 0x0;
- cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+ memcpy(&(ue->cfgCfmInfo.transId), &transId,
sizeof(CrgCfgTransId));
ueSCellCb.ueId = ueRecfg->oldCrnti;
ueSCellCb.txMode = ue->txMode;
ueSCellCb.maxUlHqRetx = ue->ul.hqEnt.maxHqRetx;
- cmMemcpy((U8 *)ueSCellCb.ulLcInfo, (U8 *)ue->ul.lcCb, sizeof(ue->ul.lcCb));
- cmMemcpy((U8 *)ueSCellCb.dlLcInfo, (U8 *)ue->dl.lcCb, sizeof(ue->dl.lcCb));
+ memcpy(ueSCellCb.ulLcInfo, ue->ul.lcCb, sizeof(ue->ul.lcCb));
+ memcpy(ueSCellCb.dlLcInfo, ue->dl.lcCb, sizeof(ue->dl.lcCb));
for (idx =0; idx < RG_MAX_LCG_PER_UE; idx++)
{
ueSCellCb.lcgInfo[idx].lcgId = ue->ul.lcgArr[idx].lcgId;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
- TRC2(rgCFGCrgUeCfg);
-
errInfo->errCause = RGERR_CFG_CRG_UE_CFG;
/* Start: LTEMAC_2.1_DEV_CFG */
#endif
{
- TRC2(rgCFGCrgLcCfg);
-
/* Handle Config for dedicated/common logical channels */
if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
{
}
#ifdef LTE_ADV
/*ERAB Multl Cell fix*/
- cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+ memcpy(&(ue->cfgCfmInfo.transId), &transId,
sizeof(CrgCfgTransId));
rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lcCfg,isCfmRqrd);
#endif
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgCellRecfg);
-
/* Store the given rachCfg */
cell->rachCfg = cellRecfg->rachRecfg;
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgUeRecfg);
-
errInfo->errCause = RGERR_CFG_CRG_UE_RECFG;
/* Fix : syed UE ID change at MAC will now be controlled
Bool *isCfmRqrd;
#endif
{
- TRC2(rgCFGCrgLcRecfg);
if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId)
{
(
RgCellCb *cell,
RgUeCb *ue,
-CrgRst *reset,
+CrgRst *reset,
RgErrInfo *errInfo
)
#else
S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
RgCellCb *cell;
RgUeCb *ue;
-CrgRst *reset;
+CrgRst *reset;
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgUeReset);
RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId);
rgDHMUeReset(cell, &ue->dl.hqEnt);
RgErrInfo *errInfo;
#endif
{
- RgCellCb *cell;
- U8 idx;
+ RgCellCb *cell;
+ uint8_t idx;
- TRC2(rgCFGCrgCellDel);
errInfo->errCause = RGERR_CFG_CRG_CELL_DEL;
if (((cell = rgCb[inst].cell) == NULLP)
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgUeDel);
errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
RgUlLcCb *ulLc;
RgDlLcCb *dlLc;
- TRC2(rgCFGCrgLcDel);
-
errInfo->errCause = RGERR_CFG_CRG_LC_DEL;
/* Fetch the Active cell */
}
#ifdef LTE_ADV
/*ERAB - multicell fix*/
- cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+ memcpy( &(ue->cfgCfmInfo.transId), &transId,
sizeof(CrgCfgTransId));
rgPomSndUeSCellLchDelToSmac(inst, lcDelInfo, isCfmRqrd);
#endif
*
**********************************************************/
#ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgDedLcCfg
+static S16 rgCFGVldtCrgDedLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
RgErrInfo *errInfo
)
#else
-PRIVATE S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)
+static S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)
Inst inst;
CrgLchCfg *lcCfg;
RgCellCb **cell;
RgErrInfo *errInfo;
#endif
{
- U8 dirVld = FALSE;
- TRC2(rgCFGVldtCrgDedLcCfg);
+ uint8_t dirVld = FALSE;
errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
*
**********************************************************/
#ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg
+static S16 rgCFGVldtCrgCmnLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
RgErrInfo *errInfo
)
#else
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)
+static S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)
Inst inst;
CrgLchCfg *lcCfg;
RgCellCb **cell;
RgErrInfo *errInfo;
#endif
{
- U8 dirVld = FALSE;
-
- TRC2(rgCFGVldtCrgCmnLcCfg);
+ uint8_t dirVld = FALSE;
errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
*
**********************************************************/
#ifdef ANSI
-PRIVATE S16 rgCFGCrgDedLcCfg
+static S16 rgCFGCrgDedLcCfg
(
RgCellCb *cell,
RgUeCb *ue,
RgErrInfo *errInfo
)
#else
-PRIVATE S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
+static S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
RgCellCb *cell;
RgUeCb *ue;
CrgLchCfg *lcCfg;
#endif
{
//Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGCrgDedLcCfg);
-
errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG;
/* Uplink/Bi-directional logical channel */
*
**********************************************************/
#ifdef ANSI
-PRIVATE S16 rgCFGCrgCmnLcCfg
+static S16 rgCFGCrgCmnLcCfg
(
Inst inst,
RgCellCb *cell,
RgErrInfo *errInfo
)
#else
-PRIVATE S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)
+static S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)
Inst inst;
RgCellCb *cell;
CrgLchCfg *lcCfg;
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgCmnLcCfg);
-
errInfo->errCause = RGERR_CFG_CRG_CMN_LC_CFG;
/* Handle configuration for CCCH/BCCH/PCCH */
*
**********************************************************/
#ifdef ANSI
-PRIVATE Void rgCFGFreeUeUlAlloc
+static Void rgCFGFreeUeUlAlloc
(
RgCellCb *cell
)
#else
-PRIVATE Void rgCFGFreeUeUlAlloc(cell)
+static Void rgCFGFreeUeUlAlloc(cell)
RgCellCb *cell;
#endif
{
- U8 sfIdx;
+ uint8_t sfIdx;
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeUeUlAlloc);
-
for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++)
{
if(cell->ulSf[sfIdx].ueUlAllocInfo != NULLP)
#endif
{
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeCellCb);
#ifdef LTE_ADV
RgLaaCellCbDeInit(cell);
RGDBGINFO(inst,(rgPBuf(inst), "Cell freed\n"));
/* Stack Crash Problem for TRACE5 Changes. Added return below */
- RETVOID;
+ return;
} /* rgCFGFreeCellCb */
#endif
{
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeInactvCellCb);
-
/* De-initialize the Ue list */
rgDBMDeInitUeCbLst(cell);
#ifdef LTEMAC_SPS
/* Stack Crash Problem for TRACE5 Changes. Added return below */
- RETVOID;
+ return;
} /* rgCFGFreeInactvCellCb */
{
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeUeCb);
-
rgDHMFreeUe(inst,&ue->dl.hqEnt);
/* ccpu00117052 - MOD - Passing double pointer for proper NULLP
/* Stack Crash Problem for TRACE5 Changes. Added return below */
- RETVOID;
+ return;
} /* rgCFGFreeUeCb */
/***********************************************************
*
**********************************************************/
#ifdef ANSI
-PRIVATE Void rgCFGFreeCmnLcLst
+static Void rgCFGFreeCmnLcLst
(
RgCellCb *cell
)
#else
-PRIVATE Void rgCFGFreeCmnLcLst(cell)
+static Void rgCFGFreeCmnLcLst(cell)
RgCellCb *cell;
#endif
{
- TRC2(rgCFGFreeCmnLcLst);
-
rgDBMFreeCmnLcLst(cell);
/* Stack Crash Problem for TRACE5 Changes. Added return below */
- RETVOID;
+ return;
} /* rgCFGFreeCmnLcLst */
*
**********************************************************/
#ifdef ANSI
-PRIVATE Void rgCFGFreeUeLst
+static Void rgCFGFreeUeLst
(
RgCellCb *cell
)
#else
-PRIVATE Void rgCFGFreeUeLst(cell)
+static Void rgCFGFreeUeLst(cell)
RgCellCb *cell;
#endif
{
RgUeCb *ue;
- TRC2(rgCFGFreeUeLst);
-
/* Free Ues in the list */
while ((ue = rgDBMGetNextUeCb(cell, NULLP)) != NULLP)
{
/* Stack Crash Problem for TRACE5 Changes. Added return below */
- RETVOID;
+ return;
} /* rgCFGFreeUeLst */
#ifdef LTEMAC_SPS
*
**********************************************************/
#ifdef ANSI
-PRIVATE Void rgCFGFreeSpsUeLst
+static Void rgCFGFreeSpsUeLst
(
RgCellCb *cell
)
#else
-PRIVATE Void rgCFGFreeSpsUeLst(cell)
+static Void rgCFGFreeSpsUeLst(cell)
RgCellCb *cell;
#endif
{
RgUeCb *ue;
- TRC2(rgCFGFreeSpsUeLst);
-
/* Free Ues in the list */
while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP)))
{
Inst inst;
RgCellCb *cell = NULLP;
- TRC3(RgSchMacCellRegReq)
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
/*Added Ue for Onging L2 Meas*/
#ifdef LTE_L2_MEAS
/*LTE_L2_MEAS_PHASE2*/
-S16 rgAddToL2MeasPerQci(RgCellCb *cell,U8 qci)
+S16 rgAddToL2MeasPerQci(RgCellCb *cell,uint8_t qci)
{
- S16 ret = ROK;
- CmLList *lnk;
- RgL2MeasCb *measCb;
- U16 idx;
+ S16 ret = ROK;
+ CmLList *lnk;
+ RgL2MeasCb *measCb;
+ uint16_t idx;
lnk = cell->l2mList.first;
while(lnk != NULLP )