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
Part -5 Separation of log [JIRA-ID ODUHIGH-275]
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_pom_scell.c
diff --git
a/src/5gnrmac/rg_pom_scell.c
b/src/5gnrmac/rg_pom_scell.c
index
f21f885
..
46ce511
100755
(executable)
--- a/
src/5gnrmac/rg_pom_scell.c
+++ b/
src/5gnrmac/rg_pom_scell.c
@@
-55,13
+55,13
@@
#include "rg.x"
#ifdef LTE_ADV
#include "rg_pom_scell.x"
#include "rg.x"
#ifdef LTE_ADV
#include "rg_pom_scell.x"
-
PRIVATE
S16 rgPomVldtSCellDedLchCfg ARGS((
+
static
S16 rgPomVldtSCellDedLchCfg ARGS((
Inst inst,
RgPrgUeSCellLchAddInfo *lcCfg,
RgCellCb **cell,
RgUeCb **ue
));
Inst inst,
RgPrgUeSCellLchAddInfo *lcCfg,
RgCellCb **cell,
RgUeCb **ue
));
-
PRIVATE
S16 rgPomUeSCellDedLcCfg ARGS((RgCellCb *cell,
+
static
S16 rgPomUeSCellDedLcCfg ARGS((RgCellCb *cell,
RgUeCb *ue,
RgPrgUeSCellLchAddInfo *lcCfg
));
RgUeCb *ue,
RgPrgUeSCellLchAddInfo *lcCfg
));
@@
-84,17
+84,11
@@
PRIVATE S16 rgPomUeSCellDedLcCfg ARGS((RgCellCb *cell,
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgPrgPMacSMacUeSCellLchModReq
(
Pst *pst,
RgPrgUeSCellLchModInfo *lchCfgCb
)
S16 RgPrgPMacSMacUeSCellLchModReq
(
Pst *pst,
RgPrgUeSCellLchModInfo *lchCfgCb
)
-#else
-S16 RgPrgPMacSMacUeSCellLchModReq(pst, lchCfgCb)
-Pst *pst;
-RgPrgUeSCellLchModInfo *lchCfgCb;
-#endif
{
RgPrgCfgCfmInfo cfgCfm;
Inst inst = pst->dstInst;
{
RgPrgCfgCfmInfo cfgCfm;
Inst inst = pst->dstInst;
@@
-169,21
+163,14
@@
RgPrgUeSCellLchModInfo *lchCfgCb;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgPomSndUeSCellLchDelToSmac
(
Inst inst,
CrgDel *lcDel,
Bool *isCfmRqrd
)
S16 rgPomSndUeSCellLchDelToSmac
(
Inst inst,
CrgDel *lcDel,
Bool *isCfmRqrd
)
-#else
-S16 rgPomSndUeSCellLchDelToSmac(inst,lcDel,isCfmRqrd)
-Inst inst;
-CrgDel *lcDel;
-Bool *isCfmRqrd;
-#endif
{
{
-
U8
idx = 0;
+
uint8_t
idx = 0;
Inst dstMacInst;
Pst dstInstPst;
RgPrgUeSCellLchDelInfo delLcCb;
Inst dstMacInst;
Pst dstInstPst;
RgPrgUeSCellLchDelInfo delLcCb;
@@
-259,7
+246,6
@@
Bool *isCfmRqrd;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgPomSndUeSCellLchModToSmac
(
Inst inst,
S16 rgPomSndUeSCellLchModToSmac
(
Inst inst,
@@
-268,16
+254,8
@@
RgUeCb *ue,
CrgLchRecfg *lchRecfg,
Bool *isCfmRqrd
)
CrgLchRecfg *lchRecfg,
Bool *isCfmRqrd
)
-#else
-S16 rgPomSndUeSCellLchModToSmac(inst, cell, ue, lchRecfg, isCfmRqrd)
-Inst inst;
-RgCellCb *cell;
-RgUeCb *ue;
-CrgLchRecfg *lchRecfg;
-Bool *isCfmRqrd;
-#endif
{
{
-
U8
idx = 0;
+
uint8_t
idx = 0;
Inst dstMacInst;
RgPrgUeSCellLchModInfo lchCfgCb;
Pst dstInstPst;
Inst dstMacInst;
RgPrgUeSCellLchModInfo lchCfgCb;
Pst dstInstPst;
@@
-326,7
+304,6
@@
Bool *isCfmRqrd;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgPomSndUeSCellLchAddToSmac
(
Inst inst,
S16 rgPomSndUeSCellLchAddToSmac
(
Inst inst,
@@
-335,16
+312,8
@@
RgUeCb *ue,
CrgLchCfg *lchCfg,
Bool *isCfmRqrd
)
CrgLchCfg *lchCfg,
Bool *isCfmRqrd
)
-#else
-S16 rgPomSndUeSCellLchAddToSmac(inst, cell, ue, lchCfg, isCfmRqrd)
-Inst inst;
-RgCellCb *cell;
-RgUeCb *ue;
-CrgLchCfg *lchCfg;
-Bool *isCfmRqrd;
-#endif
{
{
-
U8
idx = 0;
+
uint8_t
idx = 0;
Inst dstMacInst;
RgPrgUeSCellLchAddInfo lchCfgCb;
Pst dstInstPst;
Inst dstMacInst;
RgPrgUeSCellLchAddInfo lchCfgCb;
Pst dstInstPst;
@@
-394,17
+363,11
@@
Bool *isCfmRqrd;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgPrgPMacSMacUeSCellLchDelReq
(
Pst *pst,
RgPrgUeSCellLchDelInfo *delLcCb
)
S16 RgPrgPMacSMacUeSCellLchDelReq
(
Pst *pst,
RgPrgUeSCellLchDelInfo *delLcCb
)
-#else
-S16 RgPrgPMacSMacUeSCellLchDelReq(pst, delLcCb)
-Pst *pst;
-RgPrgUeSCellLchDelInfo *delLcCb;
-#endif
{
RgPrgCfgCfmInfo cfgCfm;
Inst inst = pst->dstInst;
{
RgPrgCfgCfmInfo cfgCfm;
Inst inst = pst->dstInst;
@@
-473,17
+436,11
@@
RgPrgUeSCellLchDelInfo *delLcCb;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgPrgPMacSMacUeSCellLchAddReq
(
Pst *pst,
RgPrgUeSCellLchAddInfo *lchCfgCb
)
S16 RgPrgPMacSMacUeSCellLchAddReq
(
Pst *pst,
RgPrgUeSCellLchAddInfo *lchCfgCb
)
-#else
-S16 RgPrgPMacSMacUeSCellLchAddReq(pst, lchCfgCb)
-Pst *pst;
-RgPrgUeSCellLchAddInfo *lchCfgCb;
-#endif
{
RgPrgCfgCfmInfo cfgCfm;
Inst inst = pst->dstInst;
{
RgPrgCfgCfmInfo cfgCfm;
Inst inst = pst->dstInst;
@@
-552,7
+509,6
@@
RgPrgUeSCellLchAddInfo *lchCfgCb;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgPomVldtAddLch
(
Inst inst,
S16 rgPomVldtAddLch
(
Inst inst,
@@
-560,13
+516,6
@@
RgPrgUeSCellLchAddInfo *lcCfg,
RgCellCb **cell,
RgUeCb **ue
)
RgCellCb **cell,
RgUeCb **ue
)
-#else
-S16 rgPomVldtAddLch(inst,lcCfg, cell, ue)
-Inst inst;
-RgPrgUeSCellLchAddInfo *lcCfg;
-RgCellCb **cell;
-RgUeCb **ue;
-#endif
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC CONFIG: cellId %d ueId %d lcId %d\
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC CONFIG: cellId %d ueId %d lcId %d\
@@
-626,7
+575,6
@@
RgUeCb **ue;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgPomUeSCellLcAdd
(
Inst inst,
S16 rgPomUeSCellLcAdd
(
Inst inst,
@@
-634,13
+582,6
@@
RgCellCb *cell,
RgUeCb *ue,
RgPrgUeSCellLchAddInfo *lcCfg
)
RgUeCb *ue,
RgPrgUeSCellLchAddInfo *lcCfg
)
-#else
-S16 rgPomUeSCellLcAdd(inst,cell, ue, lcCfg)
-Inst inst;
-RgCellCb *cell;
-RgUeCb *ue;
-RgPrgUeSCellLchAddInfo *lcCfg;
-#endif
{
RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC CONFIG: cellId %d ueId %d\
{
RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC CONFIG: cellId %d ueId %d\
@@
-680,21
+621,13
@@
RgPrgUeSCellLchAddInfo *lcCfg;
* File :
*
**********************************************************/
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgPomVldtSCellDedLchCfg
+static S16 rgPomVldtSCellDedLchCfg
(
Inst inst,
RgPrgUeSCellLchAddInfo *lcCfg,
RgCellCb **cell,
RgUeCb **ue
)
(
Inst inst,
RgPrgUeSCellLchAddInfo *lcCfg,
RgCellCb **cell,
RgUeCb **ue
)
-#else
-PRIVATE S16 rgPomVldtSCellDedLchCfg(inst,lcCfg, cell, ue)
-Inst inst;
-RgPrgUeSCellLchAddInfo *lcCfg;
-RgCellCb **cell;
-RgUeCb **ue;
-#endif
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATING CRG DEDICATED LC CONFIG \n"));
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATING CRG DEDICATED LC CONFIG \n"));
@@
-785,19
+718,12
@@
RgUeCb **ue;
* File :
*
**********************************************************/
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgPomUeSCellDedLcCfg
+static S16 rgPomUeSCellDedLcCfg
(
RgCellCb *cell,
RgUeCb *ue,
RgPrgUeSCellLchAddInfo *lcCfg
)
(
RgCellCb *cell,
RgUeCb *ue,
RgPrgUeSCellLchAddInfo *lcCfg
)
-#else
-PRIVATE S16 rgPomUeSCellDedLcCfg(cell, ue, lcCfg)
-RgCellCb *cell;
-RgUeCb *ue;
-RgPrgUeSCellLchAddInfo *lcCfg;
-#endif
{
//Inst inst = cell->macInst - RG_INST_START;
//RGDBGPRM(inst,(rgPBuf(inst), "APPLYING DEDICATED LC CONFIG\n"));
{
//Inst inst = cell->macInst - RG_INST_START;
//RGDBGPRM(inst,(rgPBuf(inst), "APPLYING DEDICATED LC CONFIG\n"));
@@
-843,23
+769,14
@@
RgPrgUeSCellLchAddInfo *lcCfg;
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
S16 rgPomVltdModLch
(
S16 rgPomVltdModLch
(
-
Inst inst,
-
RgPrgUeSCellLchModInfo *lchCfgCb,
-
RgCellCb **cell,
-
RgUeCb **ue,
-
RgUlLcCb **ulLc
+Inst inst,
+RgPrgUeSCellLchModInfo *lchCfgCb,
+RgCellCb **cell,
+RgUeCb **ue,
+RgUlLcCb **ulLc
)
)
-#else
-S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
- Inst inst;
- RgPrgUeSCellLchModInfo *lchCfgCb;
- RgCellCb **cell;
- RgUeCb **ue;
- RgUlLcCb **ulLc;
-#endif
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
lcId %d cell %p ue %p ulLc %p\n",lchCfgCb->cellId,
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
lcId %d cell %p ue %p ulLc %p\n",lchCfgCb->cellId,
@@
-914,7
+831,6
@@
S16 rgPomVltdModLch(inst, lchCfgCb, cell, ue, ulLc)
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgPomUeSCellLcMod
(
Inst inst,
S16 rgPomUeSCellLcMod
(
Inst inst,
@@
-922,13
+838,6
@@
RgUeCb *ue,
RgUlLcCb *ulLc,
RgPrgUeSCellLchModInfo *lchCfgCb
)
RgUlLcCb *ulLc,
RgPrgUeSCellLchModInfo *lchCfgCb
)
-#else
-S16 rgPomUeSCellLcMod(inst,cell, ue, ulLc, lchCfgCb)
-Inst inst;
-RgUeCb *ue;
-RgUlLcCb *ulLc;
-RgPrgUeSCellLchModInfo *lchCfgCb;
-#endif
{
RGDBGPRM(inst,(rgPBuf(inst), "APPLYING SMAC LC RECONFIG: cellId %d ueId %d\
lcId %d \n",
{
RGDBGPRM(inst,(rgPBuf(inst), "APPLYING SMAC LC RECONFIG: cellId %d ueId %d\
lcId %d \n",
@@
-960,25
+869,15
@@
RgPrgUeSCellLchModInfo *lchCfgCb;
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
S16 rgPomVltdDelLch
(
S16 rgPomVltdDelLch
(
-
Inst inst,
-
RgPrgUeSCellLchDelInfo *delLcCb,
-
RgCellCb **cell,
-
RgUeCb **ue,
-
RgUlLcCb **ulLc,
-
RgDlLcCb **dlLc
+Inst inst,
+RgPrgUeSCellLchDelInfo *delLcCb,
+RgCellCb **cell,
+RgUeCb **ue,
+RgUlLcCb **ulLc,
+RgDlLcCb **dlLc
)
)
-#else
-S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
- Inst inst;
- RgPrgUeSCellLchDelInfo *delLcCb;
- RgCellCb **cell;
- RgUeCb **ue;
- RgUlLcCb **ulLc;
- RgDlLcCb **dlLc;
-#endif
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
lcId %d cell %p ue %p ulLc %p\n",delLcCb->cellId,
{
RGDBGPRM(inst,(rgPBuf(inst), "VALIDATE SMAC LC RECONFIG: cellId %d ueId %d \
lcId %d cell %p ue %p ulLc %p\n",delLcCb->cellId,
@@
-1033,7
+932,6
@@
S16 rgPomVltdDelLch(inst, delLcCb, cell, ue, ulLc, dlLc)
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgPomUeSCellLcDel
(
Inst inst,
S16 rgPomUeSCellLcDel
(
Inst inst,
@@
-1042,14
+940,6
@@
RgUeCb *ue,
RgUlLcCb *ulLc,
RgDlLcCb *dlLc
)
RgUlLcCb *ulLc,
RgDlLcCb *dlLc
)
-#else
-S16 rgPomUeSCellLcDel(inst,delLcCb,ue,ulLc,dlLc)
-Inst inst;
-RgPrgUeSCellLchDelInfo *delLcCb;
-RgUeCb *ue;
-RgUlLcCb *ulLc;
-RgDlLcCb *dlLc;
-#endif
{
RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC DELETE: cellId %d ueId %d\
{
RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG LC DELETE: cellId %d ueId %d\