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
[JIRA ID: ODUHIGH-232]: RB config for MAC and SCH
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_cfg.c
diff --git
a/src/5gnrmac/rg_cfg.c
b/src/5gnrmac/rg_cfg.c
index
15cea81
..
048e848
100755
(executable)
--- a/
src/5gnrmac/rg_cfg.c
+++ b/
src/5gnrmac/rg_cfg.c
@@
-61,7
+61,7
@@
static int RLOG_MODULE_ID=4096;
#include "rg_pom_scell.x"
#endif
/* LTE-MAC Control Block Structure */
#include "rg_pom_scell.x"
#endif
/* LTE-MAC Control Block Structure */
-
PUBLIC
RgCb rgCb[RG_MAX_INST];
+RgCb rgCb[RG_MAX_INST];
/* local defines */
PRIVATE S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
/* local defines */
PRIVATE S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
@@
-113,21
+113,19
@@
PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGVldtCrgCellCfg
+S16 rgCFGVldtCrgCellCfg
(
Inst inst,
CrgCellCfg *cellCfg,
RgErrInfo *errInfo
)
#else
(
Inst inst,
CrgCellCfg *cellCfg,
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGVldtCrgCellCfg(inst,cellCfg, errInfo)
+S16 rgCFGVldtCrgCellCfg(inst,cellCfg, errInfo)
Inst inst;
CrgCellCfg *cellCfg;
RgErrInfo *errInfo;
#endif
{
Inst inst;
CrgCellCfg *cellCfg;
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)
@@
-191,7
+189,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGVldtCrgUeCfg
+S16 rgCFGVldtCrgUeCfg
(
Inst inst,
CrgUeCfg *ueCfg,
(
Inst inst,
CrgUeCfg *ueCfg,
@@
-199,15
+197,13
@@
RgCellCb **cell,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGVldtCrgUeCfg(inst,ueCfg, cell, errInfo)
+S16 rgCFGVldtCrgUeCfg(inst,ueCfg, cell, errInfo)
Inst inst;
CrgUeCfg *ueCfg;
RgCellCb **cell;
RgErrInfo *errInfo;
#endif
{
Inst inst;
CrgUeCfg *ueCfg;
RgCellCb **cell;
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))
@@
-281,7
+277,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGVldtCrgLcCfg
+S16 rgCFGVldtCrgLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
(
Inst inst,
CrgLchCfg *lcCfg,
@@
-290,7
+286,7
@@
RgUeCb **ue,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGVldtCrgLcCfg(inst,lcCfg, cell, ue, errInfo)
+S16 rgCFGVldtCrgLcCfg(inst,lcCfg, cell, ue, errInfo)
Inst inst;
CrgLchCfg *lcCfg;
RgCellCb **cell;
Inst inst;
CrgLchCfg *lcCfg;
RgCellCb **cell;
@@
-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 */
@@
-369,7
+363,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGVldtCrgCellRecfg
+S16 rgCFGVldtCrgCellRecfg
(
Inst inst,
CrgCellRecfg *cellRecfg,
(
Inst inst,
CrgCellRecfg *cellRecfg,
@@
-377,15
+371,13
@@
RgCellCb **cell,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGVldtCrgCellRecfg(inst,cellRecfg, cell, errInfo)
+S16 rgCFGVldtCrgCellRecfg(inst,cellRecfg, cell, errInfo)
Inst inst;
CrgCellRecfg *cellRecfg;
RgCellCb **cell;
RgErrInfo *errInfo;
#endif
{
Inst inst;
CrgCellRecfg *cellRecfg;
RgCellCb **cell;
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)
@@
-439,7
+431,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGVldtCrgUeRecfg
+S16 rgCFGVldtCrgUeRecfg
(
Inst inst,
CrgUeRecfg *ueRecfg,
(
Inst inst,
CrgUeRecfg *ueRecfg,
@@
-448,7
+440,7
@@
RgUeCb **ue,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGVldtCrgUeRecfg(inst,ueRecfg, cell, ue, errInfo)
+S16 rgCFGVldtCrgUeRecfg(inst,ueRecfg, cell, ue, errInfo)
Inst inst;
CrgUeRecfg *ueRecfg;
RgCellCb **cell;
Inst inst;
CrgUeRecfg *ueRecfg;
RgCellCb **cell;
@@
-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) &&
@@
-525,7
+515,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGVldtCrgLcRecfg
+S16 rgCFGVldtCrgLcRecfg
(
Inst inst,
CrgLchRecfg *lcRecfg,
(
Inst inst,
CrgLchRecfg *lcRecfg,
@@
-535,7
+525,7
@@
RgUlLcCb **ulLc,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGVldtCrgLcRecfg(inst,lcRecfg, cell, ue, ulLc, errInfo)
+S16 rgCFGVldtCrgLcRecfg(inst,lcRecfg, cell, ue, ulLc, errInfo)
Inst inst;
CrgLchRecfg *lcRecfg;
RgCellCb **cell;
Inst inst;
CrgLchRecfg *lcRecfg;
RgCellCb **cell;
@@
-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 */
@@
-605,7
+593,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGVldtCrgUeReset
+S16 rgCFGVldtCrgUeReset
(
Inst inst,
CrgRst *reset,
(
Inst inst,
CrgRst *reset,
@@
-614,7
+602,7
@@
RgUeCb **ue,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
+S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
Inst inst;
CrgRst *reset;
RgCellCb **cell;
Inst inst;
CrgRst *reset;
RgCellCb **cell;
@@
-622,8
+610,6
@@
RgUeCb **ue;
RgErrInfo *errInfo;
#endif
{
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 */
@@
-672,14
+658,14
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgCellCfg
+S16 rgCFGCrgCellCfg
(
Inst inst,
CrgCellCfg *cellCfg,
RgErrInfo *errInfo
)
#else
(
Inst inst,
CrgCellCfg *cellCfg,
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGCrgCellCfg(inst,cellCfg, errInfo)
+S16 rgCFGCrgCellCfg(inst,cellCfg, errInfo)
Inst inst;
CrgCellCfg *cellCfg;
RgErrInfo *errInfo;
Inst inst;
CrgCellCfg *cellCfg;
RgErrInfo *errInfo;
@@
-693,8
+679,6
@@
RgErrInfo *errInfo;
/* RLC SAP to allocate flowCntrlInd buffer*/
Pst *pst ;
/* 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,7
+751,7
@@
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 = (U32)RG_TTI_CYCLE_INVLD;
@@
-807,14
+791,14
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCfgAddUeSCellCfg
+S16 rgCfgAddUeSCellCfg
(
Inst dstMacInst,
RgPrgUeSCellCfgInfo *ueSCellCb,
RgCellCb *cell
)
#else
(
Inst dstMacInst,
RgPrgUeSCellCfgInfo *ueSCellCb,
RgCellCb *cell
)
#else
-
PUBLIC
S16 rgCfgAddUeSCellCfg(dstMacInst, ueSCellCb, cell)
+S16 rgCfgAddUeSCellCfg(dstMacInst, ueSCellCb, cell)
Inst dstMacInst;
RgPrgUeSCellCfgInfo *ueSCellCb;
RgCellCb *cell;
Inst dstMacInst;
RgPrgUeSCellCfgInfo *ueSCellCb;
RgCellCb *cell;
@@
-826,8
+810,6
@@
RgCellCb *cell;
U8 idx;
RgErrInfo errInfo;
U8 idx;
RgErrInfo errInfo;
- TRC2(rgCfgAddUeSCellCfg);
-
#ifdef LTE_ADV
rguDlSapId = ueSCellCb->rguDlSapId;
rguUlSapId = ueSCellCb->rguUlSapId;
#ifdef LTE_ADV
rguDlSapId = ueSCellCb->rguDlSapId;
rguUlSapId = ueSCellCb->rguUlSapId;
@@
-921,7
+903,7
@@
RgCellCb *cell;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgFillAndAddSCellCfg
+S16 rgFillAndAddSCellCfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-930,7
+912,7
@@
CrgCfgTransId transId,
Bool *isCfmRqrd
)
#else
Bool *isCfmRqrd
)
#else
-
PUBLIC
S16 rgFillAndAddSCellCfg(inst, cell, ueRecfg, transId, isCfmRqrd)
+S16 rgFillAndAddSCellCfg(inst, cell, ueRecfg, transId, isCfmRqrd)
Inst inst;
RgCellCb *cell;
CrgUeRecfg *ueRecfg;
Inst inst;
RgCellCb *cell;
CrgUeRecfg *ueRecfg;
@@
-944,8
+926,6
@@
Bool *isCfmRqrd;
RgPrgUeSCellCfgInfo ueSCellCb;
Pst dstInstPst;
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;
@@
-1034,7
+1014,7
@@
Bool *isCfmRqrd;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgUeCfg
+S16 rgCFGCrgUeCfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1042,7
+1022,7
@@
CrgUeCfg *ueCfg,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGCrgUeCfg(inst,cell, ueCfg, errInfo)
+S16 rgCFGCrgUeCfg(inst,cell, ueCfg, errInfo)
Inst inst;
RgCellCb *cell;
CrgUeCfg *ueCfg;
Inst inst;
RgCellCb *cell;
CrgUeCfg *ueCfg;
@@
-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 */
@@
-1139,7
+1117,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgLcCfg
+S16 rgCFGCrgLcCfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1150,7
+1128,7
@@
Bool *isCfmRqrd,
CrgCfgTransId transId
)
#else
CrgCfgTransId transId
)
#else
-
PUBLIC
S16 rgCFGCrgLcCfg(inst,cell, ue, lcCfg, errInfo, isCfmRqrd,transId)
+S16 rgCFGCrgLcCfg(inst,cell, ue, lcCfg, errInfo, isCfmRqrd,transId)
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
@@
-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
@@
-1218,7
+1194,7
@@
CrgCfgTransId transId;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgCellRecfg
+S16 rgCFGCrgCellRecfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1226,15
+1202,13
@@
CrgCellRecfg *cellRecfg,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGCrgCellRecfg(inst,cell, cellRecfg, errInfo)
+S16 rgCFGCrgCellRecfg(inst,cell, cellRecfg, errInfo)
Inst inst;
RgCellCb *cell;
CrgCellRecfg *cellRecfg;
RgErrInfo *errInfo;
#endif
{
Inst inst;
RgCellCb *cell;
CrgCellRecfg *cellRecfg;
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgCellRecfg);
-
/* Store the given rachCfg */
cell->rachCfg = cellRecfg->rachRecfg;
/* Store the given rachCfg */
cell->rachCfg = cellRecfg->rachRecfg;
@@
-1271,7
+1245,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgUeRecfg
+S16 rgCFGCrgUeRecfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1280,7
+1254,7
@@
CrgUeRecfg *ueRecfg,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGCrgUeRecfg(inst,cell, ue, ueRecfg, errInfo)
+S16 rgCFGCrgUeRecfg(inst,cell, ue, ueRecfg, errInfo)
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
@@
-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
@@
-1329,7
+1301,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgLcRecfg
+S16 rgCFGCrgLcRecfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1340,7
+1312,7
@@
RgErrInfo *errInfo,
Bool *isCfmRqrd
)
#else
Bool *isCfmRqrd
)
#else
-
PUBLIC
S16 rgCFGCrgLcRecfg(inst,cell, ue, ulLc, lcRecfg, errInfo, isCfmRqrd)
+S16 rgCFGCrgLcRecfg(inst,cell, ue, ulLc, lcRecfg, errInfo, isCfmRqrd)
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
Inst inst;
RgCellCb *cell;
RgUeCb *ue;
@@
-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)
{
@@
-1384,7
+1355,7
@@
Bool *isCfmRqrd;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgUeReset
+S16 rgCFGCrgUeReset
(
RgCellCb *cell,
RgUeCb *ue,
(
RgCellCb *cell,
RgUeCb *ue,
@@
-1392,14
+1363,13
@@
CrgRst *reset,
RgErrInfo *errInfo
)
#else
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
+S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
RgCellCb *cell;
RgUeCb *ue;
CrgRst *reset;
RgErrInfo *errInfo;
#endif
{
RgCellCb *cell;
RgUeCb *ue;
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);
RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId);
rgDHMUeReset(cell, &ue->dl.hqEnt);
@@
-1431,14
+1401,14
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgCellDel
+S16 rgCFGCrgCellDel
(
Inst inst,
CrgDel *cellDelInfo,
RgErrInfo *errInfo
)
#else
(
Inst inst,
CrgDel *cellDelInfo,
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGCrgCellDel(inst,cellDelInfo, errInfo)
+S16 rgCFGCrgCellDel(inst,cellDelInfo, errInfo)
Inst inst,
CrgDel *cellDelInfo;
RgErrInfo *errInfo;
Inst inst,
CrgDel *cellDelInfo;
RgErrInfo *errInfo;
@@
-1447,7
+1417,6
@@
RgErrInfo *errInfo;
RgCellCb *cell;
U8 idx;
RgCellCb *cell;
U8 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)
@@
-1511,20
+1480,19
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgUeDel
+S16 rgCFGCrgUeDel
(
Inst inst,
CrgDel *ueDelInfo,
RgErrInfo *errInfo
)
#else
(
Inst inst,
CrgDel *ueDelInfo,
RgErrInfo *errInfo
)
#else
-
PUBLIC
S16 rgCFGCrgUeDel(inst,ueDelInfo, errInfo)
+S16 rgCFGCrgUeDel(inst,ueDelInfo, errInfo)
Inst inst;
CrgDel *ueDelInfo;
RgErrInfo *errInfo;
#endif
{
Inst inst;
CrgDel *ueDelInfo;
RgErrInfo *errInfo;
#endif
{
- TRC2(rgCFGCrgUeDel);
errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
@@
-1565,7
+1533,7
@@
RgErrInfo *errInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgCFGCrgLcDel
+S16 rgCFGCrgLcDel
(
Inst inst,
CrgDel *lcDelInfo,
(
Inst inst,
CrgDel *lcDelInfo,
@@
-1574,7
+1542,7
@@
Bool *isCfmRqrd,
CrgCfgTransId transId
)
#else
CrgCfgTransId transId
)
#else
-
PUBLIC
S16 rgCFGCrgLcDel(inst,lcDelInfo, errInfo,isCfmRqrd,transId)
+S16 rgCFGCrgLcDel(inst,lcDelInfo, errInfo,isCfmRqrd,transId)
Inst inst;
CrgDel *lcDelInfo;
RgErrInfo *errInfo;
Inst inst;
CrgDel *lcDelInfo;
RgErrInfo *errInfo;
@@
-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
@@
-1687,7
+1653,6
@@
RgErrInfo *errInfo;
#endif
{
U8 dirVld = FALSE;
#endif
{
U8 dirVld = FALSE;
- TRC2(rgCFGVldtCrgDedLcCfg);
errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
@@
-1792,8
+1757,6
@@
RgErrInfo *errInfo;
{
U8 dirVld = FALSE;
{
U8 dirVld = FALSE;
- TRC2(rgCFGVldtCrgCmnLcCfg);
-
errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
/* Ensure cell is not in the active list */
errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
/* Ensure cell is not in the active list */
@@
-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 */
@@
-1979,8
+1940,6
@@
CrgLchCfg *lcCfg;
RgErrInfo *errInfo;
#endif
{
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 */
@@
-2071,8
+2030,6
@@
RgCellCb *cell;
U8 sfIdx;
Inst inst = cell->macInst - RG_INST_START;
U8 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)
for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++)
{
if(cell->ulSf[sfIdx].ueUlAllocInfo != NULLP)
@@
-2102,17
+2059,16
@@
RgCellCb *cell;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PUBLIC
Void rgCFGFreeCellCb
+Void rgCFGFreeCellCb
(
RgCellCb *cell
)
#else
(
RgCellCb *cell
)
#else
-
PUBLIC
Void rgCFGFreeCellCb(cell)
+Void rgCFGFreeCellCb(cell)
RgCellCb *cell;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
RgCellCb *cell;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgCFGFreeCellCb);
#ifdef LTE_ADV
RgLaaCellCbDeInit(cell);
#ifdef LTE_ADV
RgLaaCellCbDeInit(cell);
@@
-2163,18
+2119,16
@@
RgCellCb *cell;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PUBLIC
Void rgCFGFreeInactvCellCb
+Void rgCFGFreeInactvCellCb
(
RgCellCb *cell
)
#else
(
RgCellCb *cell
)
#else
-
PUBLIC
Void rgCFGFreeInactvCellCb(cell)
+Void rgCFGFreeInactvCellCb(cell)
RgCellCb *cell;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
RgCellCb *cell;
#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
@@
-2215,21
+2169,19
@@
RgCellCb *cell;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PUBLIC
Void rgCFGFreeUeCb
+Void rgCFGFreeUeCb
(
RgCellCb *cell,
RgUeCb *ue
)
#else
(
RgCellCb *cell,
RgUeCb *ue
)
#else
-
PUBLIC
Void rgCFGFreeUeCb(cell, ue)
+Void rgCFGFreeUeCb(cell, ue)
RgCellCb *cell;
RgUeCb *ue;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
RgCellCb *cell;
RgUeCb *ue;
#endif
{
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
@@
-2271,8
+2223,6
@@
PRIVATE Void rgCFGFreeCmnLcLst(cell)
RgCellCb *cell;
#endif
{
RgCellCb *cell;
#endif
{
- TRC2(rgCFGFreeCmnLcLst);
-
rgDBMFreeCmnLcLst(cell);
rgDBMFreeCmnLcLst(cell);
@@
-2309,8
+2259,6
@@
RgCellCb *cell;
{
RgUeCb *ue;
{
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)
{
@@
-2358,8
+2306,6
@@
RgCellCb *cell;
{
RgUeCb *ue;
{
RgUeCb *ue;
- TRC2(rgCFGFreeSpsUeLst);
-
/* Free Ues in the list */
while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP)))
{
/* Free Ues in the list */
while ((ue = rgDBMGetNextSpsUeCb(cell, NULLP)))
{
@@
-2395,13
+2341,13
@@
RgCellCb *cell;
* -# ROK
**/
#ifdef ANSI
* -# ROK
**/
#ifdef ANSI
-
PUBLIC
S16 RgSchMacCellRegReq
+S16 RgSchMacCellRegReq
(
Pst* pst,
RgInfCellReg* regReq
)
#else
(
Pst* pst,
RgInfCellReg* regReq
)
#else
-
PUBLIC
S16 RgSchMacCellRegReq(pst, regReq)
+S16 RgSchMacCellRegReq(pst, regReq)
Pst* pst;
RgInfCellReg* regReq;
#endif
Pst* pst;
RgInfCellReg* regReq;
#endif
@@
-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,7
+2384,7
@@
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*/
-
PUBLIC
S16 rgAddToL2MeasPerQci(RgCellCb *cell,U8 qci)
+S16 rgAddToL2MeasPerQci(RgCellCb *cell,U8 qci)
{
S16 ret = ROK;
CmLList *lnk;
{
S16 ret = ROK;
CmLList *lnk;