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
048e848
..
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 */
@@
-595,16
+595,16
@@
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;
RgCellCb **cell;
RgUeCb **ue;
RgErrInfo *errInfo;
@@
-673,7
+673,7
@@
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*/
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
/* RLC SAP to allocate flowCntrlInd buffer*/
@@
-754,7
+754,7
@@
RgErrInfo *errInfo;
memset(&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);
@@
-807,7
+807,7
@@
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;
#ifdef LTE_ADV
RgErrInfo errInfo;
#ifdef LTE_ADV
@@
-921,7
+921,7
@@
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;
@@
-1359,14
+1359,14
@@
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
{
@@
-1414,8
+1414,8
@@
CrgDel *cellDelInfo;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
- RgCellCb
*cell;
-
U8
idx;
+ RgCellCb *cell;
+
uint8_t
idx;
errInfo->errCause = RGERR_CFG_CRG_CELL_DEL;
errInfo->errCause = RGERR_CFG_CRG_CELL_DEL;
@@
-1635,7
+1635,7
@@
CrgCfgTransId transId;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGVldtCrgDedLcCfg
+
static
S16 rgCFGVldtCrgDedLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
(
Inst inst,
CrgLchCfg *lcCfg,
@@
-1644,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;
@@
-1652,7
+1652,7
@@
RgUeCb **ue;
RgErrInfo *errInfo;
#endif
{
RgErrInfo *errInfo;
#endif
{
-
U8
dirVld = FALSE;
+
uint8_t
dirVld = FALSE;
errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
errInfo->errCause = RGERR_CFG_INVALID_CRG_DED_LC_CFG;
@@
-1740,7
+1740,7
@@
RgErrInfo *errInfo;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGVldtCrgCmnLcCfg
+
static
S16 rgCFGVldtCrgCmnLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
(
Inst inst,
CrgLchCfg *lcCfg,
@@
-1748,14
+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;
+
uint8_t
dirVld = FALSE;
errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
errInfo->errCause = RGERR_CFG_INVALID_CRG_CMN_LC_CFG;
@@
-1865,7
+1865,7
@@
RgErrInfo *errInfo;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGCrgDedLcCfg
+
static
S16 rgCFGCrgDedLcCfg
(
RgCellCb *cell,
RgUeCb *ue,
(
RgCellCb *cell,
RgUeCb *ue,
@@
-1873,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;
@@
-1925,7
+1925,7
@@
RgErrInfo *errInfo;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-
PRIVATE
S16 rgCFGCrgCmnLcCfg
+
static
S16 rgCFGCrgCmnLcCfg
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1933,7
+1933,7
@@
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;
Inst inst;
RgCellCb *cell;
CrgLchCfg *lcCfg;
@@
-2018,16
+2018,16
@@
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;
for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++)
Inst inst = cell->macInst - RG_INST_START;
for(sfIdx = 0; sfIdx < RG_NUM_UL_SUB_FRAMES; sfIdx++)
@@
-2098,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 */
@@
-2148,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 */
@@
-2194,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 */
/***********************************************************
@@
-2214,12
+2214,12
@@
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
{
@@
-2227,7
+2227,7
@@
RgCellCb *cell;
/* Stack Crash Problem for TRACE5 Changes. Added return below */
/* Stack Crash Problem for TRACE5 Changes. Added return below */
-
RETVOID
;
+
return
;
} /* rgCFGFreeCmnLcLst */
} /* rgCFGFreeCmnLcLst */
@@
-2248,12
+2248,12
@@
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
{
RgCellCb *cell;
#endif
{
@@
-2274,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
@@
-2295,12
+2295,12
@@
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
{
RgCellCb *cell;
#endif
{
@@
-2384,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 )