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-275] Part -2 classifying of logs of sch folder
[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
8f257b7
..
b5afd68
100755
(executable)
--- a/
src/5gnrsch/rg_sch_lmm.c
+++ b/
src/5gnrsch/rg_sch_lmm.c
@@
-34,9
+34,6
@@
request primitives are defined here.
*/
request primitives are defined here.
*/
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_MODULE_ID=4096;
-static int RLOG_FILE_ID=167;
/* header include files (.h) */
#include "common_def.h"
/* header include files (.h) */
#include "common_def.h"
@@
-93,8
+90,8
@@
void printSchCellInfo(void)
* with this SAP */
if (rgSchCb[inst].tfuSap[idx].cell != NULLP)
{
* with this SAP */
if (rgSchCb[inst].tfuSap[idx].cell != NULLP)
{
-
RLOG1(L_INFO,"
CELL %d\n", idx);
-
RLOG1(L_INFO,"
NUM UEs :%d\n",rgSchCb[inst].tfuSap[idx].cell->ueLst.nmbEnt);
+
DU_LOG("\nINFO --> SCH :
CELL %d\n", idx);
+
DU_LOG("\nINFO --> SCH :
NUM UEs :%d\n",rgSchCb[inst].tfuSap[idx].cell->ueLst.nmbEnt);
}
}
}
}
}
}
@@
-118,21
+115,13
@@
void printSchCellInfo(void)
* -# LCM_REASON_NOT_APPL
**/
#ifdef UNUSE_FUN
* -# LCM_REASON_NOT_APPL
**/
#ifdef UNUSE_FUN
-#ifdef ANSI
static uint16_t rgSCHLmmSapCfg
(
Inst dInst,
RgCfg *cfg, /* Configuaration information */
static uint16_t rgSCHLmmSapCfg
(
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
-static 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;
@@
-149,7
+138,7
@@
Elmnt sapType; /* SAP Type */
(cfg->s.schInstCfg.rgrSap[sapIdx].selector != ODU_SELECTOR_LC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
(cfg->s.schInstCfg.rgrSap[sapIdx].selector != ODU_SELECTOR_LC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmSapCfg(): unsupported"
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmSapCfg(): unsupported"
" Selector value for RGR.");
break;
}
" Selector value for RGR.");
break;
}
@@
-183,7
+172,7
@@
Elmnt sapType; /* SAP Type */
(cfg->s.schInstCfg.tfuSap[sapIdx].selector != ODU_SELECTOR_LC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
(cfg->s.schInstCfg.tfuSap[sapIdx].selector != ODU_SELECTOR_LC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmSapCfg(): unsupported"
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmSapCfg(): unsupported"
" Selector value for TFU.");
break;
}
" Selector value for TFU.");
break;
}
@@
-223,7
+212,7
@@
Elmnt sapType; /* SAP Type */
(cfg->s.schInstCfg.rgmSap[sapIdx].selector != RGM_SEL_TC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
(cfg->s.schInstCfg.rgmSap[sapIdx].selector != RGM_SEL_TC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmSapCfg(): unsupported"
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmSapCfg(): unsupported"
" Selector value for RGM.");
break;
}
" Selector value for RGM.");
break;
}
@@
-275,24
+264,16
@@
Elmnt sapType; /* SAP Type */
* File : rg_sch_lmm.c
*
**********************************************************/
* File : rg_sch_lmm.c
*
**********************************************************/
-#ifdef ANSI
-static Void rgSCHLmmShutdown
-(
-Inst inst
-)
-#else
-static 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
@@
-434,19
+415,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 */
@@
-502,7
+471,7
@@
Pst *cfmPst;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmGenCntrl(): "
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmGenCntrl(): "
"invalid subaction=%d", cntrl->t.cntrl.subAction);
break;
}
"invalid subaction=%d", cntrl->t.cntrl.subAction);
break;
}
@@
-526,7
+495,7
@@
Pst *cfmPst;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmGenCntrl():"
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmGenCntrl():"
" invalid subaction=%d", cntrl->t.cntrl.subAction);
break;
}
" invalid subaction=%d", cntrl->t.cntrl.subAction);
break;
}
@@
-538,7
+507,7
@@
Pst *cfmPst;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmGenCntrl(): invalid"
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmGenCntrl(): invalid"
" action=%d", cntrl->t.cntrl.action);
break;
}
" action=%d", cntrl->t.cntrl.action);
break;
}
@@
-562,19
+531,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;
@@
-677,7
+639,7
@@
Pst *cfmPst;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmSapCntrl(): "
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmSapCntrl(): "
"invalid action=%d", cntrl->t.cntrl.action);
break;
}
"invalid action=%d", cntrl->t.cntrl.action);
break;
}
@@
-700,7
+662,7
@@
Pst *cfmPst;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmSapCntrl(): "
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmSapCntrl(): "
"invalid action=%d", cntrl->t.cntrl.action);
break;
}
"invalid action=%d", cntrl->t.cntrl.action);
break;
}
@@
-723,7
+685,7
@@
Pst *cfmPst;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-
RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmSapCntrl(): "
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmSapCntrl(): "
"invalid action=%d", cntrl->t.cntrl.action);
break;
}
"invalid action=%d", cntrl->t.cntrl.action);
break;
}
@@
-754,19
+716,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
+760,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
+809,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,23
+866,14
@@
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;
-#ifdef DEBUGP
- Inst inst = tfuSap->cell->instIdx;
-#endif
switch(tmrEvnt)
switch(tmrEvnt)
@@
-971,7
+902,7
@@
S16 tmrEvnt; /* Timer Event */
}
break;
default:
}
break;
default:
-
RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "
rgSCHLmmTmrExpiry(): Invalid"
+
DU_LOG("\nERROR --> SCH :
rgSCHLmmTmrExpiry(): Invalid"
" tmrEvnt=%d", tmrEvnt);
ret = RFAILED;
break;
" tmrEvnt=%d", tmrEvnt);
ret = RFAILED;
break;
@@
-1000,19
+931,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
+1021,6
@@
uint8_t status; /* Status */
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
S16 rgSCHLmmStaInd
(
Inst inst,
S16 rgSCHLmmStaInd
(
Inst inst,
@@
-1106,14
+1029,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
+1079,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);