Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
remove/replaced PRIVATE and EXTERN keywords
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_cfg.c
diff --git
a/src/5gnrmac/rg_cfg.c
b/src/5gnrmac/rg_cfg.c
index
7181b0f
..
f7317c2
100755
(executable)
--- a/
src/5gnrmac/rg_cfg.c
+++ b/
src/5gnrmac/rg_cfg.c
@@
-64,20
+64,20
@@
static int RLOG_MODULE_ID=4096;
RgCb rgCb[RG_MAX_INST];
/* local defines */
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));
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));
RgErrInfo *errInfo));
-
PRIVATE
S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
+
static
S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
CrgLchCfg *lcCfg, RgErrInfo *errInfo));
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));
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
/* Added support for SPS*/
#ifdef LTEMAC_SPS
-
PRIVATE
Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
+
static
Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
#endif /* LTEMAC_SPS */
#endif /* LTEMAC_SPS */
@@
-126,8
+126,6
@@
CrgCellCfg *cellCfg;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgCellCfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG;
if ((rgCb[inst].cell != NULLP)
|| rgCb[inst].inactiveCell != NULLP)
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG;
if ((rgCb[inst].cell != NULLP)
|| rgCb[inst].inactiveCell != NULLP)
@@
-206,8
+204,6
@@
RgCellCb **cell;
RgErrInfo *errInfo;
#endif
{
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))
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_CFG;
if ((ueCfg->txMode.pres == PRSNT_NODEF) &&
(ueCfg->txMode.tm == CRG_UE_TM_5))
@@
-299,8
+295,6
@@
RgErrInfo *errInfo;
#endif
{
#endif
{
- TRC2(rgCFGVldtCrgLcCfg);
-
if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
{
/* Dedicated logical channels */
if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
{
/* Dedicated logical channels */
@@
-384,8
+378,6
@@
RgCellCb **cell;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgCellRecfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG;
if (((*cell = rgCb[inst].cell) == NULLP)
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG;
if (((*cell = rgCb[inst].cell) == NULLP)
@@
-456,8
+448,6
@@
RgUeCb **ue;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgUeRecfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG;
if ((ueRecfg->txMode.pres == PRSNT_NODEF) &&
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG;
if ((ueRecfg->txMode.pres == PRSNT_NODEF) &&
@@
-544,8
+534,6
@@
RgUlLcCb **ulLc;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgLcRecfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG;
/* Fetch the cell */
errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG;
/* Fetch the cell */
@@
-607,23
+595,21
@@
RgErrInfo *errInfo;
#ifdef ANSI
S16 rgCFGVldtCrgUeReset
(
#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)
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
{
RgCellCb **cell;
RgUeCb **ue;
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGVldtCrgUeReset);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET;
/* Fetch the Active cell */
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET;
/* Fetch the Active cell */
@@
-687,14
+673,12
@@
RgErrInfo *errInfo;
{
S16 ret;
RgCellCb *cell = NULLP;
{
S16 ret;
RgCellCb *cell = NULLP;
-
U8
idx;
+
uint8_t
idx;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
/* RLC SAP to allocate flowCntrlInd buffer*/
Pst *pst ;
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 */
errInfo->errCause = RGERR_CFG_CRG_CELL_CFG;
/* Allocate the cell control block */
@@
-767,10
+751,10
@@
RgErrInfo *errInfo;
cmLListInit(&cell->l2mList);
for(idx = 0; idx < RG_NUM_UL_SUB_FRAMES; idx++)
{
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);
#endif
/* Update Statistics */
rgUpdtCellCnt(inst,RG_CFG_ADD);
@@
-823,11
+807,9
@@
RgCellCb *cell;
RgUeCb *ueCb = NULLP;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
RgUeCb *ueCb = NULLP;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
-
U8
idx;
+
uint8_t
idx;
RgErrInfo errInfo;
RgErrInfo errInfo;
- TRC2(rgCfgAddUeSCellCfg);
-
#ifdef LTE_ADV
rguDlSapId = ueSCellCb->rguDlSapId;
rguUlSapId = ueSCellCb->rguUlSapId;
#ifdef LTE_ADV
rguDlSapId = ueSCellCb->rguDlSapId;
rguUlSapId = ueSCellCb->rguUlSapId;
@@
-939,13
+921,11
@@
Bool *isCfmRqrd;
#endif
{
RgUeCb *ue = NULLP;
#endif
{
RgUeCb *ue = NULLP;
-
U8
idx = 0;
+
uint8_t
idx = 0;
Inst dstMacInst;
RgPrgUeSCellCfgInfo ueSCellCb;
Pst dstInstPst;
Inst dstMacInst;
RgPrgUeSCellCfgInfo ueSCellCb;
Pst dstInstPst;
- TRC2(rgFillAndAddSCellCfg);
-
/* Fetch the Active cell */
if(((cell = rgCb[inst].cell) == NULLP) ||
(cell->cellId != ueRecfg->cellId))
/* Fetch the Active cell */
if(((cell = rgCb[inst].cell) == NULLP) ||
(cell->cellId != ueRecfg->cellId))
@@
-973,13
+953,13
@@
Bool *isCfmRqrd;
ue->cfgCfmInfo.cfgCfgCount = 0;
ue->cfgCfmInfo.mask = 0x0;
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;
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;
for (idx =0; idx < RG_MAX_LCG_PER_UE; idx++)
{
ueSCellCb.lcgInfo[idx].lcgId = ue->ul.lcgArr[idx].lcgId;
@@
-1054,8
+1034,6
@@
RgErrInfo *errInfo;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
- TRC2(rgCFGCrgUeCfg);
-
errInfo->errCause = RGERR_CFG_CRG_UE_CFG;
/* Start: LTEMAC_2.1_DEV_CFG */
errInfo->errCause = RGERR_CFG_CRG_UE_CFG;
/* Start: LTEMAC_2.1_DEV_CFG */
@@
-1161,8
+1139,6
@@
CrgCfgTransId transId;
#endif
{
#endif
{
- TRC2(rgCFGCrgLcCfg);
-
/* Handle Config for dedicated/common logical channels */
if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
{
/* Handle Config for dedicated/common logical channels */
if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
{
@@
-1175,7
+1151,7
@@
CrgCfgTransId transId;
}
#ifdef LTE_ADV
/*ERAB Multl Cell fix*/
}
#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
sizeof(CrgCfgTransId));
rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lcCfg,isCfmRqrd);
#endif
@@
-1233,8
+1209,6
@@
CrgCellRecfg *cellRecfg;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgCellRecfg);
-
/* Store the given rachCfg */
cell->rachCfg = cellRecfg->rachRecfg;
/* Store the given rachCfg */
cell->rachCfg = cellRecfg->rachRecfg;
@@
-1288,8
+1262,6
@@
CrgUeRecfg *ueRecfg;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgUeRecfg);
-
errInfo->errCause = RGERR_CFG_CRG_UE_RECFG;
/* Fix : syed UE ID change at MAC will now be controlled
errInfo->errCause = RGERR_CFG_CRG_UE_RECFG;
/* Fix : syed UE ID change at MAC will now be controlled
@@
-1350,7
+1322,6
@@
RgErrInfo *errInfo;
Bool *isCfmRqrd;
#endif
{
Bool *isCfmRqrd;
#endif
{
- TRC2(rgCFGCrgLcRecfg);
if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId)
{
if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId)
{
@@
-1388,18
+1359,17
@@
S16 rgCFGCrgUeReset
(
RgCellCb *cell,
RgUeCb *ue,
(
RgCellCb *cell,
RgUeCb *ue,
-CrgRst *reset,
+CrgRst
*reset,
RgErrInfo *errInfo
)
#else
S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
RgCellCb *cell;
RgUeCb *ue;
RgErrInfo *errInfo
)
#else
S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
RgCellCb *cell;
RgUeCb *ue;
-CrgRst *reset;
+CrgRst
*reset;
RgErrInfo *errInfo;
#endif
{
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);
RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId);
rgDHMUeReset(cell, &ue->dl.hqEnt);
@@
-1444,10
+1414,9
@@
CrgDel *cellDelInfo;
RgErrInfo *errInfo;
#endif
{
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)
errInfo->errCause = RGERR_CFG_CRG_CELL_DEL;
if (((cell = rgCb[inst].cell) == NULLP)
@@
-1524,7
+1493,6
@@
CrgDel *ueDelInfo;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgUeDel);
errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
@@
-1587,8
+1555,6
@@
CrgCfgTransId transId;
RgUlLcCb *ulLc;
RgDlLcCb *dlLc;
RgUlLcCb *ulLc;
RgDlLcCb *dlLc;
- TRC2(rgCFGCrgLcDel);
-
errInfo->errCause = RGERR_CFG_CRG_LC_DEL;
/* Fetch the Active cell */
errInfo->errCause = RGERR_CFG_CRG_LC_DEL;
/* Fetch the Active cell */
@@
-1644,7
+1610,7
@@
CrgCfgTransId transId;
}
#ifdef LTE_ADV
/*ERAB - multicell fix*/
}
#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
sizeof(CrgCfgTransId));
rgPomSndUeSCellLchDelToSmac(inst, lcDelInfo, isCfmRqrd);
#endif
@@
-1669,7
+1635,7
@@
CrgCfgTransId transId;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGVldtCrgDedLcCfg
+
static
S16 rgCFGVldtCrgDedLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
(
Inst inst,
CrgLchCfg *lcCfg,
@@
-1678,7
+1644,7
@@
RgUeCb **ue,
RgErrInfo *errInfo
)
#else
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;
Inst inst;
CrgLchCfg *lcCfg;
RgCellCb **cell;
@@
-1686,8
+1652,7
@@
RgUeCb **ue;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- U8 dirVld = FALSE;
- TRC2(rgCFGVldtCrgDedLcCfg);
+ uint8_t dirVld = FALSE;
errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
@@
-1775,7
+1740,7
@@
RgErrInfo *errInfo;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGVldtCrgCmnLcCfg
+
static
S16 rgCFGVldtCrgCmnLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
(
Inst inst,
CrgLchCfg *lcCfg,
@@
-1783,16
+1748,14
@@
RgCellCb **cell,
RgErrInfo *errInfo
)
#else
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
{
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;
errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
@@
-1902,7
+1865,7
@@
RgErrInfo *errInfo;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGCrgDedLcCfg
+
static
S16 rgCFGCrgDedLcCfg
(
RgCellCb *cell,
RgUeCb *ue,
(
RgCellCb *cell,
RgUeCb *ue,
@@
-1910,7
+1873,7
@@
CrgLchCfg *lcCfg,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PRIVATE
S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
+
static
S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
RgCellCb *cell;
RgUeCb *ue;
CrgLchCfg *lcCfg;
RgCellCb *cell;
RgUeCb *ue;
CrgLchCfg *lcCfg;
@@
-1918,8
+1881,6
@@
RgErrInfo *errInfo;
#endif
{
//Inst inst = cell->macInst - RG_INST_START;
#endif
{
//Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGCrgDedLcCfg);
-
errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG;
/* Uplink/Bi-directional logical channel */
errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG;
/* Uplink/Bi-directional logical channel */
@@
-1964,7
+1925,7
@@
RgErrInfo *errInfo;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGCrgCmnLcCfg
+
static
S16 rgCFGCrgCmnLcCfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1972,15
+1933,13
@@
CrgLchCfg *lcCfg,
RgErrInfo *errInfo
)
#else
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
{
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 */
errInfo->errCause = RGERR_CFG_CRG_CMN_LC_CFG;
/* Handle configuration for CCCH/BCCH/PCCH */
@@
-2059,20
+2018,18
@@
RgErrInfo *errInfo;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
Void rgCFGFreeUeUlAlloc
+
static
Void rgCFGFreeUeUlAlloc
(
RgCellCb *cell
)
#else
(
RgCellCb *cell
)
#else
-
PRIVATE
Void rgCFGFreeUeUlAlloc(cell)
+
static
Void rgCFGFreeUeUlAlloc(cell)
RgCellCb *cell;
#endif
{
RgCellCb *cell;
#endif
{
-
U8
sfIdx;
+
uint8_t
sfIdx;
Inst inst = cell->macInst - RG_INST_START;
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)
for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++)
{
if(cell->ulSf[sfIdx].ueUlAllocInfo != NULLP)
@@
-2112,7
+2069,6
@@
RgCellCb *cell;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeCellCb);
#ifdef LTE_ADV
RgLaaCellCbDeInit(cell);
#ifdef LTE_ADV
RgLaaCellCbDeInit(cell);
@@
-2142,7
+2098,7
@@
RgCellCb *cell;
RGDBGINFO(inst,(rgPBuf(inst), "Cell freed\n"));
/* Stack Crash Problem for TRACE5 Changes. Added return below */
RGDBGINFO(inst,(rgPBuf(inst), "Cell freed\n"));
/* Stack Crash Problem for TRACE5 Changes. Added return below */
-
RETVOID
;
+
return
;
} /* rgCFGFreeCellCb */
} /* rgCFGFreeCellCb */
@@
-2173,8
+2129,6
@@
RgCellCb *cell;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeInactvCellCb);
-
/* De-initialize the Ue list */
rgDBMDeInitUeCbLst(cell);
#ifdef LTEMAC_SPS
/* De-initialize the Ue list */
rgDBMDeInitUeCbLst(cell);
#ifdef LTEMAC_SPS
@@
-2194,7
+2148,7
@@
RgCellCb *cell;
/* Stack Crash Problem for TRACE5 Changes. Added return below */
/* Stack Crash Problem for TRACE5 Changes. Added return below */
-
RETVOID
;
+
return
;
} /* rgCFGFreeInactvCellCb */
} /* rgCFGFreeInactvCellCb */
@@
-2228,8
+2182,6
@@
RgUeCb *ue;
{
Inst inst = cell->macInst - RG_INST_START;
{
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeUeCb);
-
rgDHMFreeUe(inst,&ue->dl.hqEnt);
/* ccpu00117052 - MOD - Passing double pointer for proper NULLP
rgDHMFreeUe(inst,&ue->dl.hqEnt);
/* ccpu00117052 - MOD - Passing double pointer for proper NULLP
@@
-2242,7
+2194,7
@@
RgUeCb *ue;
/* Stack Crash Problem for TRACE5 Changes. Added return below */
/* Stack Crash Problem for TRACE5 Changes. Added return below */
-
RETVOID
;
+
return
;
} /* rgCFGFreeUeCb */
/***********************************************************
} /* rgCFGFreeUeCb */
/***********************************************************
@@
-2262,22
+2214,20
@@
RgUeCb *ue;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
Void rgCFGFreeCmnLcLst
+
static
Void rgCFGFreeCmnLcLst
(
RgCellCb *cell
)
#else
(
RgCellCb *cell
)
#else
-
PRIVATE
Void rgCFGFreeCmnLcLst(cell)
+
static
Void rgCFGFreeCmnLcLst(cell)
RgCellCb *cell;
#endif
{
RgCellCb *cell;
#endif
{
- TRC2(rgCFGFreeCmnLcLst);
-
rgDBMFreeCmnLcLst(cell);
/* Stack Crash Problem for TRACE5 Changes. Added return below */
rgDBMFreeCmnLcLst(cell);
/* Stack Crash Problem for TRACE5 Changes. Added return below */
-
RETVOID
;
+
return
;
} /* rgCFGFreeCmnLcLst */
} /* rgCFGFreeCmnLcLst */
@@
-2298,19
+2248,17
@@
RgCellCb *cell;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
Void rgCFGFreeUeLst
+
static
Void rgCFGFreeUeLst
(
RgCellCb *cell
)
#else
(
RgCellCb *cell
)
#else
-
PRIVATE
Void rgCFGFreeUeLst(cell)
+
static
Void rgCFGFreeUeLst(cell)
RgCellCb *cell;
#endif
{
RgUeCb *ue;
RgCellCb *cell;
#endif
{
RgUeCb *ue;
- TRC2(rgCFGFreeUeLst);
-
/* Free Ues in the list */
while ((ue = rgDBMGetNextUeCb(cell, NULLP)) != NULLP)
{
/* Free Ues in the list */
while ((ue = rgDBMGetNextUeCb(cell, NULLP)) != NULLP)
{
@@
-2326,7
+2274,7
@@
RgCellCb *cell;
/* Stack Crash Problem for TRACE5 Changes. Added return below */
/* Stack Crash Problem for TRACE5 Changes. Added return below */
-
RETVOID
;
+
return
;
} /* rgCFGFreeUeLst */
#ifdef LTEMAC_SPS
} /* rgCFGFreeUeLst */
#ifdef LTEMAC_SPS
@@
-2347,19
+2295,17
@@
RgCellCb *cell;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
Void rgCFGFreeSpsUeLst
+
static
Void rgCFGFreeSpsUeLst
(
RgCellCb *cell
)
#else
(
RgCellCb *cell
)
#else
-
PRIVATE
Void rgCFGFreeSpsUeLst(cell)
+
static
Void rgCFGFreeSpsUeLst(cell)
RgCellCb *cell;
#endif
{
RgUeCb *ue;
RgCellCb *cell;
#endif
{
RgUeCb *ue;
- TRC2(rgCFGFreeSpsUeLst);
-
/* Free Ues in the list */
while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP)))
{
/* Free Ues in the list */
while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP)))
{
@@
-2409,8
+2355,6
@@
RgInfCellReg* regReq;
Inst inst;
RgCellCb *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;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
@@
-2440,12
+2384,12
@@
RgInfCellReg* regReq;
/*Added Ue for Onging L2 Meas*/
#ifdef LTE_L2_MEAS
/*LTE_L2_MEAS_PHASE2*/
/*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 )
lnk = cell->l2mList.first;
while(lnk != NULLP )