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
Merge "JIRA-ID ODUHIGH-275 classification of logs of RLC part -2"
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_lmm.c
diff --git
a/src/5gnrsch/rg_sch_lmm.c
b/src/5gnrsch/rg_sch_lmm.c
index
098ca20
..
9c4e05a
100755
(executable)
--- a/
src/5gnrsch/rg_sch_lmm.c
+++ b/
src/5gnrsch/rg_sch_lmm.c
@@
-70,14
+70,14
@@
Void rgSCHCmnInit ARGS((Void));
/* forward references */
extern int schActvInit(Ent entity, Inst instId, Region region, Reason reason);
#ifdef UNUSE_FUN
/* forward references */
extern int schActvInit(Ent entity, Inst instId, Region region, Reason reason);
#ifdef UNUSE_FUN
-
PRIVATE
uint16_t rgSCHLmmSapCfg ARGS((
+
static
uint16_t rgSCHLmmSapCfg ARGS((
Inst inst,
RgCfg *cfg,
uint8_t sapIdx,
Elmnt sapType
));
#endif
Inst inst,
RgCfg *cfg,
uint8_t sapIdx,
Elmnt sapType
));
#endif
-
PRIVATE
Void rgSCHLmmShutdown ARGS((
+
static
Void rgSCHLmmShutdown ARGS((
Inst inst
));
Inst inst
));
@@
-118,21
+118,13
@@
void printSchCellInfo(void)
* -# LCM_REASON_NOT_APPL
**/
#ifdef UNUSE_FUN
* -# LCM_REASON_NOT_APPL
**/
#ifdef UNUSE_FUN
-#ifdef ANSI
-PRIVATE uint16_t rgSCHLmmSapCfg
+static uint16_t rgSCHLmmSapCfg
(
Inst dInst,
RgCfg *cfg, /* Configuaration information */
(
Inst dInst,
RgCfg *cfg, /* Configuaration information */
-uint8_t
sapIdx, /* SAP index */
+uint8_t sapIdx, /* SAP index */
Elmnt sapType /* SAP Type */
)
Elmnt sapType /* SAP Type */
)
-#else
-PRIVATE uint16_t rgSCHLmmSapCfg(dInst, cfg, sapIdx, sapType)
-Inst dInst;
-RgCfg *cfg; /* Configuaration information */
-uint8_t sapIdx; /* SAP index */
-Elmnt sapType; /* SAP Type */
-#endif
{
uint16_t ret = LCM_REASON_NOT_APPL;
RgSchLowSapCfgInfo *lowSapCfg = NULLP;
{
uint16_t ret = LCM_REASON_NOT_APPL;
RgSchLowSapCfgInfo *lowSapCfg = NULLP;
@@
-275,24
+267,16
@@
Elmnt sapType; /* SAP Type */
* File : rg_sch_lmm.c
*
**********************************************************/
* File : rg_sch_lmm.c
*
**********************************************************/
-#ifdef ANSI
-PRIVATE Void rgSCHLmmShutdown
-(
-Inst inst
-)
-#else
-PRIVATE Void rgSCHLmmShutdown(inst)
-Inst inst;
-#endif
+static Void rgSCHLmmShutdown(Inst inst)
{
Inst dInst = inst + SCH_INST_START;
{
Inst dInst = inst + SCH_INST_START;
- uint8_t
idx;
+ uint8_t idx;
#ifdef LTE_L2_MEAS
CmLList *lnk = NULLP;
RgSchCb *instCb = &rgSchCb[inst];
RgSchCellCb *cell = NULLP;
RgSchL2MeasCb *measCb;
#ifdef LTE_L2_MEAS
CmLList *lnk = NULLP;
RgSchCb *instCb = &rgSchCb[inst];
RgSchCellCb *cell = NULLP;
RgSchL2MeasCb *measCb;
- uint8_t
ulAllocIdx;
+ uint8_t ulAllocIdx;
RgSchCmnUlCell *cellUl;
RgSchClcBoRpt *bo = NULL;
#endif
RgSchCmnUlCell *cellUl;
RgSchClcBoRpt *bo = NULL;
#endif
@@
-359,7
+343,7
@@
Inst inst;
/* Unbind all the TFU SAP */
if(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_WAIT_BNDCFM)
{
/* Unbind all the TFU SAP */
if(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_WAIT_BNDCFM)
{
- rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND);
+
//
rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND);
if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE)
{
rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR, (PTR)&rgSchCb[inst].tfuSap[idx]);
if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE)
{
rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR, (PTR)&rgSchCb[inst].tfuSap[idx]);
@@
-368,7
+352,7
@@
Inst inst;
}
if(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_BND)
{
}
if(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_BND)
{
- rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND);
+
//
rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg, LRG_UNBND);
rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_UNBND;
}
/* Free the memory held by the cell associated with this SAP */
rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_UNBND;
}
/* Free the memory held by the cell associated with this SAP */
@@
-434,19
+418,7
@@
Inst inst;
* File : rg_sch_lmm.c
*
**********************************************************/
* File : rg_sch_lmm.c
*
**********************************************************/
-#ifdef ANSI
-Void rgSCHLmmGenCntrl
-(
-RgMngmt *cntrl,
-RgMngmt *cfm,
-Pst *cfmPst
-)
-#else
-Void rgSCHLmmGenCntrl(cntrl, cfm, cfmPst)
-RgMngmt *cntrl;
-RgMngmt *cfm;
-Pst *cfmPst;
-#endif
+Void rgSCHLmmGenCntrl(RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst)
{
Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */
{
Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */
@@
-562,19
+534,12
@@
Pst *cfmPst;
* File : rg_sch_lmm.c
*
**********************************************************/
* File : rg_sch_lmm.c
*
**********************************************************/
-#ifdef ANSI
Void rgSCHLmmSapCntrl
(
RgMngmt *cntrl,
RgMngmt *cfm,
Pst *cfmPst
)
Void rgSCHLmmSapCntrl
(
RgMngmt *cntrl,
RgMngmt *cfm,
Pst *cfmPst
)
-#else
-Void rgSCHLmmSapCntrl(cntrl, cfm, cfmPst)
-RgMngmt *cntrl;
-RgMngmt *cfm;
-Pst *cfmPst;
-#endif
{
uint8_t idx;
{
uint8_t idx;
@@
-626,8
+591,8
@@
Pst *cfmPst;
* Request to TFU */
RgMiLrgSchCntrlCfm(cfmPst, cfm);
* Request to TFU */
RgMiLrgSchCntrlCfm(cfmPst, cfm);
- rgSCHUtlTfuBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg.suId,
- rgSchCb[inst].tfuSap[idx].sapCfg.spId);
+
//
rgSCHUtlTfuBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg.suId,
+
//
rgSchCb[inst].tfuSap[idx].sapCfg.spId);
return;
}
break;
return;
}
break;
@@
-643,8
+608,8
@@
Pst *cfmPst;
}
else
{
}
else
{
- rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg,
- TFU_UBNDREQ_MNGMT);
+
//
rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg,
+
//
TFU_UBNDREQ_MNGMT);
if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE)
{
rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR,
if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE)
{
rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR,
@@
-661,8
+626,8
@@
Pst *cfmPst;
if ((rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_WAIT_BNDCFM) ||
(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_BND))
{
if ((rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_WAIT_BNDCFM) ||
(rgSchCb[inst].tfuSap[idx].sapSta.sapState == LRG_BND))
{
- rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg,
- TFU_UBNDREQ_MNGMT);
+
//
rgSCHUtlTfuUBndReq(inst, rgSchCb[inst].tfuSap[idx].sapCfg,
+
//
TFU_UBNDREQ_MNGMT);
if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE)
{
rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR,
if (rgSchCb[inst].tfuSap[idx].sapCfg.bndTmr.enb == TRUE)
{
rgSCHLmmStopTmr(inst, RGSCH_BNDREQ_TMR,
@@
-754,19
+719,12
@@
Pst *cfmPst;
* File : rg_sch_lmm.c
*
**********************************************************/
* File : rg_sch_lmm.c
*
**********************************************************/
-#ifdef ANSI
Void SchFillCfmPst
(
Pst *reqPst,
Pst *cfmPst,
RgMngmt *cfm
)
Void SchFillCfmPst
(
Pst *reqPst,
Pst *cfmPst,
RgMngmt *cfm
)
-#else
-Void SchFillCfmPst(reqPst, cfmPst, cfm)
-Pst *reqPst;
-Pst *cfmPst;
-RgMngmt *cfm;
-#endif
{
Inst inst;
{
Inst inst;
@@
-805,21
+763,13
@@
RgMngmt *cfm;
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
S16 rgSCHLmmStartTmr
(
S16 rgSCHLmmStartTmr
(
-Inst
inst,
-S16
tmrEvnt, /* Timer Event */
-uint32_t
tmrVal, /* Wait Time */
-PTR
cb /* Entry for which Timer Expired */
+Inst inst,
+S16 tmrEvnt, /* Timer Event */
+uint32_t tmrVal, /* Wait Time */
+PTR cb /* Entry for which Timer Expired */
)
)
-#else
-S16 rgSCHLmmStartTmr(inst, tmrEvnt, tmrVal, cb)
-Inst inst; /* scheduler instance ID */
-S16 tmrEvnt; /* Timer Event */
-uint32_t tmrVal; /* Wait Time */
-PTR cb; /* Entry for which Timer Expired */
-#endif
{
CmTmrArg arg;
/* Inst dInst = inst + SCH_INST_START; */
{
CmTmrArg arg;
/* Inst dInst = inst + SCH_INST_START; */
@@
-862,22
+812,15
@@
PTR cb; /* Entry for which Timer Expired */
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgSCHLmmStopTmr
(
S16 rgSCHLmmStopTmr
(
-Inst
inst, /* Scheduler instance */
-S16
tmrEvnt, /* Timer Event */
-PTR
cb /* Entry for which Timer Expired */
+Inst inst, /* Scheduler instance */
+S16 tmrEvnt, /* Timer Event */
+PTR cb /* Entry for which Timer Expired */
)
)
-#else
-S16 rgSCHLmmStopTmr(inst, tmrEvnt, cb)
-Inst inst; /* Scheduler instance */
-S16 tmrEvnt; /* Timer Event */
-PTR cb; /* Entry for which Timer Expired */
-#endif
{
CmTmrArg arg;
{
CmTmrArg arg;
- uint8_t
i;
+ uint8_t i;
S16 ret;
ret = RFAILED;
S16 ret;
ret = RFAILED;
@@
-926,17
+869,11
@@
PTR cb; /* Entry for which Timer Expired */
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
S16 rgSCHLmmTmrExpiry
(
PTR cb, /* Pointer to timer control block */
S16 tmrEvnt /* Timer Event */
)
S16 rgSCHLmmTmrExpiry
(
PTR cb, /* Pointer to timer control block */
S16 tmrEvnt /* Timer Event */
)
-#else
-S16 rgSCHLmmTmrExpiry(cb,tmrEvnt)
-PTR cb; /* Pointer to timer control block */
-S16 tmrEvnt; /* Timer Event */
-#endif
{
S16 ret = ROK;
RgSchLowSapCb *tfuSap = (RgSchLowSapCb *)cb;
{
S16 ret = ROK;
RgSchLowSapCb *tfuSap = (RgSchLowSapCb *)cb;
@@
-966,8
+903,8
@@
S16 tmrEvnt; /* Timer Event */
}
/* Send bind request */
}
/* Send bind request */
- rgSCHUtlTfuBndReq((uint8_t)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START),
- tfuSap->sapCfg.suId, tfuSap->sapCfg.spId);
+
//
rgSCHUtlTfuBndReq((uint8_t)(tfuSap->sapCfg.sapPst.srcInst - SCH_INST_START),
+
//
tfuSap->sapCfg.suId, tfuSap->sapCfg.spId);
}
break;
default:
}
break;
default:
@@
-1000,19
+937,12
@@
S16 tmrEvnt; /* Timer Event */
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
S16 rgSCHLmmBndCfm
(
Pst *pst, /* Post Structure */
SuId suId, /* Service user ID */
uint8_t status /* Status */
)
S16 rgSCHLmmBndCfm
(
Pst *pst, /* Post Structure */
SuId suId, /* Service user ID */
uint8_t status /* Status */
)
-#else
-S16 rgSCHLmmBndCfm(pst,suId,status)
-Pst *pst; /* Post Structure */
-SuId suId; /* Service user Id */
-uint8_t status; /* Status */
-#endif
{
S16 ret = ROK;
RgMngmt cntrlCfm;
{
S16 ret = ROK;
RgMngmt cntrlCfm;
@@
-1097,7
+1027,6
@@
uint8_t status; /* Status */
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
S16 rgSCHLmmStaInd
(
Inst inst,
S16 rgSCHLmmStaInd
(
Inst inst,
@@
-1106,14
+1035,6
@@
uint16_t event,
uint16_t cause,
RgUstaDgn *dgn
)
uint16_t cause,
RgUstaDgn *dgn
)
-#else
-S16 rgSCHLmmStaInd(inst, category, event, cause, dgn)
-Inst inst;
-uint16_t category;
-uint16_t event;
-uint16_t cause;
-RgUstaDgn *dgn;
-#endif
{
RgMngmt usta;
{
RgMngmt usta;
@@
-1164,17
+1085,7
@@
RgUstaDgn *dgn;
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
-S16 schActvTmr
-(
-Ent ent,
-Inst inst
-)
-#else
-S16 schActvTmr(ent, inst)
-Ent ent;
-Inst inst;
-#endif
+S16 schActvTmr(Ent ent,Inst inst)
{
Inst schInst = (inst - SCH_INST_START);
{
Inst schInst = (inst - SCH_INST_START);