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
L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]
[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
b23df0c
..
289b2af
100755
(executable)
--- a/
src/5gnrsch/rg_sch_l2m.c
+++ b/
src/5gnrsch/rg_sch_l2m.c
@@
-55,19
+55,19
@@
#include "rg_sch.x" /* typedefs for Scheduler */
#include "rg_sch_cmn.x" /* typedefs for Scheduler */
/* local defines */
#include "rg_sch.x" /* typedefs for Scheduler */
#include "rg_sch_cmn.x" /* typedefs for Scheduler */
/* local defines */
-
U32
dlPrbCnt;
+
uint32_t
dlPrbCnt;
#ifdef LTE_L2_MEAS
static const char* RLOG_MODULE_NAME="MAC";
static int RLOG_MODULE_ID=4096;
static int RLOG_FILE_ID=166;
#ifdef LTE_L2_MEAS
static const char* RLOG_MODULE_NAME="MAC";
static int RLOG_MODULE_ID=4096;
static int RLOG_FILE_ID=166;
-
PRIVATE
S16 rgSchL2mInsertMeasCb ARGS((
+
static
S16 rgSchL2mInsertMeasCb ARGS((
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasReqInfo *measInfo ));
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasReqInfo *measInfo ));
-
PRIVATE
RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
+
static
RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err));
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err));
@@
-92,20
+92,20
@@
S16 rgSchFillL2MeasCfm
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasCfmInfo *cfm,
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasCfmInfo *cfm,
-
U32
measTime
+
uint32_t
measTime
)
#else
S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
RgSchCellCb *cell;
RgSchL2MeasCb *measCb;
LrgSchMeasCfmInfo *cfm;
)
#else
S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
RgSchCellCb *cell;
RgSchL2MeasCb *measCb;
LrgSchMeasCfmInfo *cfm;
-
U32
measTime;
+
uint32_t
measTime;
#endif
{
#endif
{
-
U8
idx;
+
uint8_t
idx;
LrgSchMeasReqInfo *measInfo;
LrgSchMeasReqInfo *measInfo;
-
U8
qciVal = 0;
-
U32
sampOc = 0;
+
uint8_t
qciVal = 0;
+
uint32_t
sampOc = 0;
measInfo = &measCb->measReq;
measInfo = &measCb->measReq;
@@
-389,7
+389,7
@@
LrgSchMeasReqInfo *measInfo;
cfmPst->region = measInfo->hdr.response.mem.region;
cfmPst->pool = measInfo->hdr.response.mem.pool;
cfmPst->region = measInfo->hdr.response.mem.region;
cfmPst->pool = measInfo->hdr.response.mem.pool;
-
RETVOID
;
+
return
;
} /* rgSchL2mFillCfmPst */
/** @brief This function inserts the MeasCb in to data base
} /* rgSchL2mFillCfmPst */
/** @brief This function inserts the MeasCb in to data base
@@
-406,14
+406,14
@@
LrgSchMeasReqInfo *measInfo;
* -# RFAILED
*/
#ifdef ANSI
* -# RFAILED
*/
#ifdef ANSI
-
PRIVATE
S16 rgSchL2mInsertMeasCb
+
static
S16 rgSchL2mInsertMeasCb
(
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasReqInfo *measInfo
)
#else
(
RgSchCellCb *cell,
RgSchL2MeasCb *measCb,
LrgSchMeasReqInfo *measInfo
)
#else
-
PRIVATE
S16 rgSchL2mInsertMeasCb(cell, measCb, measInfo)
+
static
S16 rgSchL2mInsertMeasCb(cell, measCb, measInfo)
RgSchCellCb *cell;
RgSchL2MeasCb *measCb;
LrgSchMeasReqInfo *measInfo;
RgSchCellCb *cell;
RgSchL2MeasCb *measCb;
LrgSchMeasReqInfo *measInfo;
@@
-421,7
+421,7
@@
LrgSchMeasReqInfo *measInfo;
{
CmLList *lnk, *node;
RgSchL2MeasCb *oldMeasCb;
{
CmLList *lnk, *node;
RgSchL2MeasCb *oldMeasCb;
-
U32
diffTime;
+
uint32_t
diffTime;
/*
* 1. Check if l2mList has any entries.
/*
* 1. Check if l2mList has any entries.
@@
-467,19
+467,19
@@
LrgSchMeasReqInfo *measInfo;
* @param [in] RgSchCellCb *cell
*/
#ifdef ANSI
* @param [in] RgSchCellCb *cell
*/
#ifdef ANSI
-
PRIVATE
Void rgSchL2CalDlPrbCount
+
static
Void rgSchL2CalDlPrbCount
(
RgSchCellCb *cell
)
#else
(
RgSchCellCb *cell
)
#else
-
PRIVATE
Void rgSchL2CalDlPrbCount(cell)
+
static
Void rgSchL2CalDlPrbCount(cell)
RgSchCellCb *cell;
#endif
{
CmLteTimingInfo frm;
RgSchDlSf *sf = NULLP;
#ifdef LTE_TDD
RgSchCellCb *cell;
#endif
{
CmLteTimingInfo frm;
RgSchDlSf *sf = NULLP;
#ifdef LTE_TDD
-
U8
idx;
+
uint8_t
idx;
#endif
frm = cell->crntTime;
#endif
frm = cell->crntTime;
@@
-496,7
+496,7
@@
RgSchCellCb *cell;
#else
cell->avgPrbDl.prbCount += sf->bwAssigned;
#endif
#else
cell->avgPrbDl.prbCount += sf->bwAssigned;
#endif
-
RETVOID
;
+
return
;
}
/** @brief This function calculates the up link prb count
}
/** @brief This function calculates the up link prb count
@@
-509,19
+509,19
@@
RgSchCellCb *cell;
* @param [in] RgSchCellCb *cell
*/
#ifdef ANSI
* @param [in] RgSchCellCb *cell
*/
#ifdef ANSI
-
PRIVATE
Void rgSchL2CalUlPrbCount
+
static
Void rgSchL2CalUlPrbCount
(
RgSchCellCb *cell
)
#else
(
RgSchCellCb *cell
)
#else
-
PRIVATE
Void rgSchL2CalUlPrbCount(cell)
+
static
Void rgSchL2CalUlPrbCount(cell)
RgSchCellCb *cell;
#endif
{
RgSchUlSf *sf = NULLP;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
#ifdef LTE_TDD
RgSchCellCb *cell;
#endif
{
RgSchUlSf *sf = NULLP;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
#ifdef LTE_TDD
-
U8
idx;
+
uint8_t
idx;
#endif
#ifdef LTE_TDD
#endif
#ifdef LTE_TDD
@@
-535,7
+535,7
@@
RgSchCellCb *cell;
sf = &cellUl->ulSfArr[cellUl->schdIdx];
cell->avgPrbUl.prbCount += sf->totPrb;
#endif
sf = &cellUl->ulSfArr[cellUl->schdIdx];
cell->avgPrbUl.prbCount += sf->totPrb;
#endif
-
RETVOID
;
+
return
;
}
/** @brief This function allocates memory from the heap
*
}
/** @brief This function allocates memory from the heap
*
@@
-549,14
+549,14
@@
RgSchCellCb *cell;
* @return RgSchL2MeasCb *
*/
#ifdef ANSI
* @return RgSchL2MeasCb *
*/
#ifdef ANSI
-
PRIVATE
RgSchL2MeasCb * rgSchL2mAllocMeasCb
+
static
RgSchL2MeasCb * rgSchL2mAllocMeasCb
(
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err
)
#else
(
RgSchCellCb *cell,
LrgSchMeasReqInfo *measInfo,
RgSchErrInfo err
)
#else
-
PRIVATE
RgSchL2MeasCb * rgSchL2mAllocMeasCb(cell, measInfo, err)
+
static
RgSchL2MeasCb * rgSchL2mAllocMeasCb(cell, measInfo, err)
RgSchCellCb *cell;
LrgSchMeasReqInfo *measInfo;
RgSchErrInfo err;
RgSchCellCb *cell;
LrgSchMeasReqInfo *measInfo;
RgSchErrInfo err;
@@
-616,8
+616,8
@@
RgSchErrInfo err;
#endif
{
RgSchL2MeasCb *measCb;
#endif
{
RgSchL2MeasCb *measCb;
-
U8
idx;
-
U8
qciVal;
+
uint8_t
idx;
+
uint8_t
qciVal;
qciVal = 0;
qciVal = 0;
@@
-700,27
+700,27
@@
RgSchErrInfo err;
S16 rgSCHL2Meas
(
RgSchCellCb *cell,
S16 rgSCHL2Meas
(
RgSchCellCb *cell,
-
U8
isCalrCrcInd
+
uint8_t
isCalrCrcInd
)
#else
S16 rgschL2Meas(cell,isCalrCrcInd)
RgSchCellCb *cell;
)
#else
S16 rgschL2Meas(cell,isCalrCrcInd)
RgSchCellCb *cell;
-
U8
isCalrCrcInd
+
uint8_t
isCalrCrcInd
#endif
{
CmLList *node = NULLP;
RgSchL2MeasCb *measCb = NULLP;
#endif
{
CmLList *node = NULLP;
RgSchL2MeasCb *measCb = NULLP;
-
U8
idx;
+
uint8_t
idx;
LrgSchMeasCfmInfo measCfm;
LrgSchMeasCfmInfo measCfm;
-
U8
qciVal = 0;
-
U32
sfDiff;
-
U32
meas;
+
uint8_t
qciVal = 0;
+
uint32_t
sfDiff;
+
uint32_t
meas;
#ifdef LTE_TDD
#ifdef LTE_TDD
-
U8
sfIdx;
+
uint8_t
sfIdx;
Bool isDlDataAllowed;
Bool isDlDataAllowed;
-
U8
rem;
-
U32
numDlSf;
-
U32
numUlSf;
+
uint8_t
rem;
+
uint32_t
numDlSf;
+
uint32_t
numUlSf;
#endif
node = cell->l2mList.first;
#endif
node = cell->l2mList.first;