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 -4 classifying of logs of sch folder
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_l2m.c
diff --git
a/src/5gnrsch/rg_sch_l2m.c
b/src/5gnrsch/rg_sch_l2m.c
index
289b2af
..
4e2be55
100755
(executable)
--- a/
src/5gnrsch/rg_sch_l2m.c
+++ b/
src/5gnrsch/rg_sch_l2m.c
@@
-86,26
+86,18
@@
static RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
* @param [in] measTime
* @return Void
*/
* @param [in] measTime
* @return Void
*/
-#ifdef ANSI
S16 rgSchFillL2MeasCfm
(
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasCfmInfo *cfm,
S16 rgSchFillL2MeasCfm
(
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasCfmInfo *cfm,
-uint32_t
measTime
+uint32_t measTime
)
)
-#else
-S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
-RgSchCellCb *cell;
-RgSchL2MeasCb *measCb;
-LrgSchMeasCfmInfo *cfm;
-uint32_t measTime;
-#endif
{
{
- uint8_t
idx;
+ uint8_t idx;
LrgSchMeasReqInfo *measInfo;
LrgSchMeasReqInfo *measInfo;
- uint8_t
qciVal = 0;
- uint32_t
sampOc = 0;
+ uint8_t qciVal = 0;
+ uint32_t sampOc = 0;
measInfo = &measCb->measReq;
measInfo = &measCb->measReq;
@@
-190,8
+182,7
@@
uint32_t measTime;
cell->qciArray[qciVal].dlTotal_UeCount / sampOc;
cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal;
cell->qciArray[qciVal].dlTotal_UeCount / sampOc;
cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal;
- RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
- "L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
+ DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
qciVal,cell->qciArray[qciVal].dlTotal_UeCount,
cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci);
qciVal,cell->qciArray[qciVal].dlTotal_UeCount,
cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci);
@@
-212,8
+203,7
@@
uint32_t measTime;
cell->qciArray[qciVal].dlTotal_UeCount / sampOc;
cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal;
cell->qciArray[qciVal].dlTotal_UeCount / sampOc;
cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal;
- RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
- "L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
+ DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
qciVal,cell->qciArray[qciVal].dlTotal_UeCount,
cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci);
qciVal,cell->qciArray[qciVal].dlTotal_UeCount,
cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci);
@@
-244,8
+234,7
@@
uint32_t measTime;
cell->qciArray[qciVal].ulTotal_UeCount/ sampOc;
cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal;
cell->qciArray[qciVal].ulTotal_UeCount/ sampOc;
cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal;
- RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
- "L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
+ DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
qciVal,cell->qciArray[qciVal].ulTotal_UeCount,
cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci);
qciVal,cell->qciArray[qciVal].ulTotal_UeCount,
cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci);
@@
-265,8
+254,7
@@
uint32_t measTime;
cell->qciArray[qciVal].ulTotal_UeCount/ sampOc;
cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal;
cell->qciArray[qciVal].ulTotal_UeCount/ sampOc;
cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal;
- RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
- "L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
+ DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
qciVal,cell->qciArray[qciVal].ulTotal_UeCount,
cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci);
qciVal,cell->qciArray[qciVal].ulTotal_UeCount,
cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci);
@@
-317,7
+305,6
@@
uint32_t measTime;
* @param [in] Bool isErr
* @return Void
*/
* @param [in] Bool isErr
* @return Void
*/
-#ifdef ANSI
S16 rgSchL2mSndCfm
(
Pst *pst,
S16 rgSchL2mSndCfm
(
Pst *pst,
@@
-325,13
+312,6
@@
RgSchL2MeasCb *measCb,
LrgSchMeasReqInfo *measInfo,
Bool isErr
)
LrgSchMeasReqInfo *measInfo,
Bool isErr
)
-#else
-S16 rgSchL2mSndCfm(pst, measCb, measInfo, isErr)
-Pst *pst;
-RgSchL2MeasCb *measCb;
-LrgSchMeasReqInfo *measInfo;
-Bool isErr;
-#endif
{
LrgSchMeasCfmInfo cfm;
{
LrgSchMeasCfmInfo cfm;
@@
-361,19
+341,12
@@
Bool isErr;
* @param [in] LrgSchMeasReqInfo *measInfo
* @return Void
*/
* @param [in] LrgSchMeasReqInfo *measInfo
* @return Void
*/
-#ifdef ANSI
Void rgSchL2mFillCfmPst
(
Pst *pst,
Pst *cfmPst,
LrgSchMeasReqInfo *measInfo
)
Void rgSchL2mFillCfmPst
(
Pst *pst,
Pst *cfmPst,
LrgSchMeasReqInfo *measInfo
)
-#else
-Void rgSchL2mFillCfmPst(pst, cfmPst, measInfo)
-Pst *pst;
-Pst *cfmPst;
-LrgSchMeasReqInfo *measInfo;
-#endif
{
cfmPst->srcEnt = pst->dstEnt;
{
cfmPst->srcEnt = pst->dstEnt;
@@
-405,23
+378,16
@@
LrgSchMeasReqInfo *measInfo;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
static S16 rgSchL2mInsertMeasCb
(
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasReqInfo *measInfo
)
static S16 rgSchL2mInsertMeasCb
(
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasReqInfo *measInfo
)
-#else
-static S16 rgSchL2mInsertMeasCb(cell, measCb, measInfo)
-RgSchCellCb *cell;
-RgSchL2MeasCb *measCb;
-LrgSchMeasReqInfo *measInfo;
-#endif
{
CmLList *lnk, *node;
RgSchL2MeasCb *oldMeasCb;
{
CmLList *lnk, *node;
RgSchL2MeasCb *oldMeasCb;
- uint32_t
diffTime;
+ uint32_t diffTime;
/*
* 1. Check if l2mList has any entries.
/*
* 1. Check if l2mList has any entries.
@@
-466,20
+432,12
@@
LrgSchMeasReqInfo *measInfo;
*
* @param [in] RgSchCellCb *cell
*/
*
* @param [in] RgSchCellCb *cell
*/
-#ifdef ANSI
-static Void rgSchL2CalDlPrbCount
-(
-RgSchCellCb *cell
-)
-#else
-static Void rgSchL2CalDlPrbCount(cell)
-RgSchCellCb *cell;
-#endif
+static Void rgSchL2CalDlPrbCount(RgSchCellCb *cell)
{
CmLteTimingInfo frm;
RgSchDlSf *sf = NULLP;
#ifdef LTE_TDD
{
CmLteTimingInfo frm;
RgSchDlSf *sf = NULLP;
#ifdef LTE_TDD
- uint8_t
idx;
+ uint8_t idx;
#endif
frm = cell->crntTime;
#endif
frm = cell->crntTime;
@@
-508,20
+466,12
@@
RgSchCellCb *cell;
*
* @param [in] RgSchCellCb *cell
*/
*
* @param [in] RgSchCellCb *cell
*/
-#ifdef ANSI
-static Void rgSchL2CalUlPrbCount
-(
-RgSchCellCb *cell
-)
-#else
-static Void rgSchL2CalUlPrbCount(cell)
-RgSchCellCb *cell;
-#endif
+static Void rgSchL2CalUlPrbCount(RgSchCellCb *cell)
{
RgSchUlSf *sf = NULLP;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
#ifdef LTE_TDD
{
RgSchUlSf *sf = NULLP;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
#ifdef LTE_TDD
- uint8_t
idx;
+ uint8_t idx;
#endif
#ifdef LTE_TDD
#endif
#ifdef LTE_TDD
@@
-548,19
+498,12
@@
RgSchCellCb *cell;
* @param [out] RgSchErrInfo *err
* @return RgSchL2MeasCb *
*/
* @param [out] RgSchErrInfo *err
* @return RgSchL2MeasCb *
*/
-#ifdef ANSI
static RgSchL2MeasCb * rgSchL2mAllocMeasCb
(
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err
)
static RgSchL2MeasCb * rgSchL2mAllocMeasCb
(
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err
)
-#else
-static RgSchL2MeasCb * rgSchL2mAllocMeasCb(cell, measInfo, err)
-RgSchCellCb *cell;
-LrgSchMeasReqInfo *measInfo;
-RgSchErrInfo err;
-#endif
{
RgSchL2MeasCb *measCb = NULLP;
Inst inst = cell->instIdx;
{
RgSchL2MeasCb *measCb = NULLP;
Inst inst = cell->instIdx;
@@
-569,8
+512,7
@@
RgSchErrInfo err;
if((rgSCHUtlAllocSBuf(inst, (Data **)&measCb,
sizeof(RgSchL2MeasCb))) == RFAILED)
{
if((rgSCHUtlAllocSBuf(inst, (Data **)&measCb,
sizeof(RgSchL2MeasCb))) == RFAILED)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSchL2mAllocMeasCb():"
- "Allocation of RgSchL2MeasCb failed");
+ DU_LOG("\nERROR --> SCH : Allocation of RgSchL2MeasCb failed");
return (NULLP);
}
memcpy(&measCb->measReq, measInfo, sizeof(LrgSchMeasReqInfo));
return (NULLP);
}
memcpy(&measCb->measReq, measInfo, sizeof(LrgSchMeasReqInfo));
@@
-601,23
+543,16
@@
RgSchErrInfo err;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgSchL2mMeasReq
(
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err
)
S16 rgSchL2mMeasReq
(
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err
)
-#else
-S16 rgSchL2mMeasReq(cell, measInfo, err)
-RgSchCellCb *cell;
-LrgSchMeasReqInfo *measInfo;
-RgSchErrInfo err;
-#endif
{
RgSchL2MeasCb *measCb;
{
RgSchL2MeasCb *measCb;
- uint8_t
idx;
- uint8_t
qciVal;
+ uint8_t idx;
+ uint8_t qciVal;
qciVal = 0;
qciVal = 0;
@@
-625,8
+560,7
@@
RgSchErrInfo err;
{
RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ,
RGSCHERR_SCH_ALLOC_FAILED);
{
RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ,
RGSCHERR_SCH_ALLOC_FAILED);
- RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSchL2mMeasReq():"
- "Allocation of RgSchL2MeasCb failed");
+ DU_LOG("\nERROR --> SCH : Allocation of RgSchL2MeasCb failed");
return RFAILED;
}
/*memcpy(&measCb->measReq, measInfo,\
return RFAILED;
}
/*memcpy(&measCb->measReq, measInfo,\
@@
-696,31
+630,25
@@
RgSchErrInfo err;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgSCHL2Meas
(
RgSchCellCb *cell,
uint8_t isCalrCrcInd
)
S16 rgSCHL2Meas
(
RgSchCellCb *cell,
uint8_t isCalrCrcInd
)
-#else
-S16 rgschL2Meas(cell,isCalrCrcInd)
-RgSchCellCb *cell;
-uint8_t isCalrCrcInd
-#endif
{
CmLList *node = NULLP;
RgSchL2MeasCb *measCb = NULLP;
{
CmLList *node = NULLP;
RgSchL2MeasCb *measCb = NULLP;
- uint8_t
idx;
+ uint8_t idx;
LrgSchMeasCfmInfo measCfm;
LrgSchMeasCfmInfo measCfm;
- uint8_t
qciVal = 0;
- uint32_t
sfDiff;
- uint32_t
meas;
+ uint8_t qciVal = 0;
+ uint32_t sfDiff;
+ uint32_t meas;
#ifdef LTE_TDD
#ifdef LTE_TDD
- uint8_t
sfIdx;
+ uint8_t sfIdx;
Bool isDlDataAllowed;
Bool isDlDataAllowed;
- uint8_t
rem;
- uint32_t
numDlSf;
- uint32_t
numUlSf;
+ uint8_t rem;
+ uint32_t numDlSf;
+ uint32_t numUlSf;
#endif
node = cell->l2mList.first;
#endif
node = cell->l2mList.first;