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
Temporary fix of o1 compilation .[Issue-Id: ODUHIGH-285]
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_cfg_dl.c
diff --git
a/src/5gnrrlc/kw_cfg_dl.c
b/src/5gnrrlc/kw_cfg_dl.c
index
1d636d4
..
de810a3
100755
(executable)
--- a/
src/5gnrrlc/kw_cfg_dl.c
+++ b/
src/5gnrrlc/kw_cfg_dl.c
@@
-82,12
+82,12
@@
static int RLOG_FILE_ID=191;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-
PRIVATE S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8
newUeId)
+
static S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t
newUeId)
{
RlcL2MeasEvtCb *measEvtCb = NULLP;
RlcL2MeasCb *measCb = NULLP;
{
RlcL2MeasEvtCb *measEvtCb = NULLP;
RlcL2MeasCb *measCb = NULLP;
-
U16
cntr;
-
U16
ueIdx = 0;
+
uint16_t
cntr;
+
uint16_t
ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
{
@@
-123,12
+123,12
@@
PRIVATE S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, U8 cellId,U8 oldUeId, U8 newUeId)
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-
PRIVATE S16 rlcDelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8
ueId)
+
static S16 rlcDelFrmDlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t
ueId)
{
RlcL2MeasEvtCb *measEvtCb = NULLP;
RlcL2MeasCb *measCb = NULLP;
{
RlcL2MeasEvtCb *measEvtCb = NULLP;
RlcL2MeasCb *measCb = NULLP;
-
U16
cntr;
-
U16
ueIdx = 0;
+
uint16_t
cntr;
+
uint16_t
ueIdx = 0;
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
@@
-160,19
+160,19
@@
PRIVATE S16 rlcDelFrmDlL2Meas(RlcCb *gCb, U8 cellId,U8 ueId)
}
}
-
PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8
ueId)
+
static S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8_t
ueId)
{
RlcL2MeasEvtCb *measEvtCb = NULLP;
RlcL2MeasCb *measCb = NULLP;
{
RlcL2MeasEvtCb *measEvtCb = NULLP;
RlcL2MeasCb *measCb = NULLP;
-
U16
cntr;
-
U16
cntr1;
-
U16
ueIdx = 0;
-
U16
qciIdx = 0;
-
U16
*numQci;
+
uint16_t
cntr;
+
uint16_t
cntr1;
+
uint16_t
ueIdx = 0;
+
uint16_t
qciIdx = 0;
+
uint16_t
*numQci;
#ifndef XEON_SPECIFIC_CHANGES
#ifndef XEON_SPECIFIC_CHANGES
-
U8
freeIdx = gCb->genCfg.maxUe;
+
uint8_t
freeIdx = gCb->genCfg.maxUe;
#else
#else
-
U16
freeIdx = LKW_MAX_UE;
+
uint16_t
freeIdx = LKW_MAX_UE;
#endif
#endif
@@
-262,7
+262,7
@@
PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId)
ueIdx = freeIdx;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE;
ueIdx = freeIdx;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].isValid = TRUE;
-
cmMemset((U8 *)
&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI));
+
memset(
&measCb->val.ipThMeas.ueInfoLst[ueIdx].measData[0],0x00,(sizeof(RlcL2Cntr) *LKW_MAX_QCI));
measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId;
measCb->val.ipThMeas.ueInfoLst[ueIdx].numQci = 0;
}
measCb->val.ipThMeas.ueInfoLst[ueIdx].ueId = ueId;
@@
-315,23
+315,8
@@
PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,U8 cellId,U8 ueId)
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 rlcCfgFillDlRbCb
-(
-RlcCb *gCb,
-RlcDlRbCb *rbCb,
-RlcDlUeCb *ueCb,
-RlcEntCfgInfo *entCfg
-)
-#else
-PRIVATE S16 rlcCfgFillDlRbCb(gCb,rbCb,entCfg)
-RlcCb *gCb;
-RlcDlRbCb *rbCb;
-RlcDlUeCb *ueCb;
-RlcEntCfgInfo *entCfg;
-#endif
+static S16 rlcCfgFillDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb,RlcDlUeCb *ueCb,RlcEntCfgInfo *entCfg)
{
{
- TRC3(rlcCfgFillDlRbCb)
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))",
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))",
@@
-393,7
+378,7
@@
RlcEntCfgInfo *entCfg;
ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = rbCb;
#ifndef LTE_TDD
ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = rbCb;
#ifndef LTE_TDD
-
U32
hashIndex;
+
uint32_t
hashIndex;
RLC_ALLOC(gCb,
rbCb->m.amDl.txBufLst,
(RLC_TX_BUF_BIN_SIZE * sizeof(CmLListCp)));
RLC_ALLOC(gCb,
rbCb->m.amDl.txBufLst,
(RLC_TX_BUF_BIN_SIZE * sizeof(CmLListCp)));
@@
-432,23
+417,14
@@
RlcEntCfgInfo *entCfg;
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 rlcCfgUpdateDlRb
+static S16 rlcCfgUpdateDlRb
(
(
-RlcCb
*gCb,
-RlcDlRbCb
*rbCb,
+RlcCb *gCb,
+RlcDlRbCb *rbCb,
void *ptr,
RlcEntCfgInfo *entCfg
)
void *ptr,
RlcEntCfgInfo *entCfg
)
-#else
-PRIVATE S16 rlcCfgUpdateDlRb(gCb,rbCb, ptr, entCfg)
-RlcCb *gCb;
-RlcDlRbCb *rbCb;
-void *ptr;
-RlcEntCfgInfo *entCfg;
-#endif
{
{
- TRC3(rlcCfgUpdateDlRb)
if (rbCb->mode != entCfg->entMode)
{
if (rbCb->mode != entCfg->entMode)
{
@@
-548,7
+524,6
@@
RlcEntCfgInfo *entCfg;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgAddDlRb
(
RlcCb *gCb,
S16 rlcCfgAddDlRb
(
RlcCb *gCb,
@@
-557,21
+532,11
@@
CmLteCellId cellId,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
-#else
-S16 rlcCfgAddDlRb(gCb,ueId, cellId, entCfg, entCfm)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *entCfg;
-RlcEntCfgCfmInfo *entCfm;
-#endif
{
RlcDlUeCb *ueCb = NULLP; /* UE Control Block */
RlcDlCellCb *cellCb; /* Cell Control Block */
RlcDlRbCb *rlcRbCb; /* KW RB Control Block */
{
RlcDlUeCb *ueCb = NULLP; /* UE Control Block */
RlcDlCellCb *cellCb; /* Cell Control Block */
RlcDlRbCb *rlcRbCb; /* KW RB Control Block */
- U8 reason; /* Rb Identifier */
-
- TRC3(rlcCfgAddDlRb)
+ uint8_t reason; /* Rb Identifier */
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))",
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))",
@@
-875,7
+840,6
@@
RlcEntCfgCfmInfo *entCfm;
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
S16 rlcCfgReCfgDlRb
(
RlcCb *gCb,
S16 rlcCfgReCfgDlRb
(
RlcCb *gCb,
@@
-884,22
+848,12
@@
CmLteCellId cellId,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
-#else
-S16 rlcCfgReCfgDlRb(gCb,ueId, cellId, entCfg, entCfm)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *entCfg;
-RlcEntCfgCfmInfo *entCfm;
-#endif
{
RlcDlRbCb *rbCb; /* RB Control Block */
RlcDlRbCb tRbCb; /* KW RB Control Block */
RlcDlCellCb *cellCb; /* Cell Control Block */
RlcDlUeCb *ueCb; /* Ue Control Block */
{
RlcDlRbCb *rbCb; /* RB Control Block */
RlcDlRbCb tRbCb; /* KW RB Control Block */
RlcDlCellCb *cellCb; /* Cell Control Block */
RlcDlUeCb *ueCb; /* Ue Control Block */
- U8 ret;
-
- TRC3(rlcCfgReCfgDlRb)
+ uint8_t ret;
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d",
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d",
@@
-954,7
+908,7
@@
RlcEntCfgCfmInfo *entCfm;
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
-
cmMemcpy((U8 *)&tRbCb, (U8 *)
rbCb, sizeof(RlcDlRbCb));
+
memcpy(&tRbCb,
rbCb, sizeof(RlcDlRbCb));
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg);
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb, cellCb,entCfg);
@@
-971,7
+925,7
@@
RlcEntCfgCfmInfo *entCfm;
"CELLID:%u RBID:%d updation failed",
cellId,
entCfg->rbId);
"CELLID:%u RBID:%d updation failed",
cellId,
entCfg->rbId);
-
cmMemcpy((U8*)rbCb, (U8 *)
&tRbCb, sizeof(RlcDlRbCb));
+
memcpy(rbCb,
&tRbCb, sizeof(RlcDlRbCb));
return (ret);
}
return (ret);
}
@@
-1022,7
+976,7
@@
RlcEntCfgCfmInfo *entCfm;
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
/* Take backup of rbCb before updating.
* Because in failure case restore original rbCb
*/
-
cmMemcpy((U8 *)&tRbCb, (U8 *)
rbCb, sizeof(RlcDlRbCb));
+
memcpy(&tRbCb,
rbCb, sizeof(RlcDlRbCb));
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg);
/* Update rbCb */
ret = rlcCfgUpdateDlRb(gCb,rbCb,ueCb, entCfg);
@@
-1035,7
+989,7
@@
RlcEntCfgCfmInfo *entCfm;
"CELLID:%d RBID:%d updation failed",
cellId,
entCfg->rbId);
"CELLID:%d RBID:%d updation failed",
cellId,
entCfg->rbId);
-
cmMemcpy((U8*)rbCb, (U8 *)
&tRbCb, sizeof(RlcDlRbCb));
+
memcpy(rbCb,
&tRbCb, sizeof(RlcDlRbCb));
return (ret);
}
return (ret);
}
@@
-1078,7
+1032,6
@@
RlcEntCfgCfmInfo *entCfm;
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
S16 rlcCfgDelDlRb
(
RlcCb *gCb,
S16 rlcCfgDelDlRb
(
RlcCb *gCb,
@@
-1087,22
+1040,12
@@
CmLteCellId cellId,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
-#else
-S16 rlcCfgDelRb(gCb,ueId, cellId, entCfg, entCfm)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *entCfg;
-RlcEntCfgCfmInfo *entCfm;
-#endif
{
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
RlcDlCellCb *cellCb; /* UE Control Block */
RlcDlRbCb *rlcRbCb; /* KW RB Control Block */
{
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
RlcDlCellCb *cellCb; /* UE Control Block */
RlcDlRbCb *rlcRbCb; /* KW RB Control Block */
- TRC3(rlcCfgDelDlRb)
-
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))",
entCfg->rbId,
RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
"rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))",
entCfg->rbId,
@@
-1274,31
+1217,19
@@
RlcEntCfgCfmInfo *entCfm;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgReEstDlRb
(
S16 rlcCfgReEstDlRb
(
-RlcCb
*gCb,
+RlcCb *gCb,
CmLteRnti ueId,
CmLteCellId cellId,
Bool sndReEstInd,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
CmLteRnti ueId,
CmLteCellId cellId,
Bool sndReEstInd,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
-#else
-S16 rlcCfgReEstDlRb(gCb,ueId, cellId,sndReEstInd,entCfg, entCfm)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-Bool sndReEstInd;
-RlcEntCfgInfo *entCfg;
-RlcEntCfgCfmInfo *entCfm;
-#endif
{
RlcDlRbCb *rbCb; /* RB Control Block */
CmLteRlcId rlcId; /* RLC Identifier */
{
RlcDlRbCb *rbCb; /* RB Control Block */
CmLteRlcId rlcId; /* RLC Identifier */
- TRC3(rlcCfgReEstDlRb)
-
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
@@
-1377,29
+1308,18
@@
RlcEntCfgCfmInfo *entCfm;
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
S16 rlcCfgDelDlUe
(
S16 rlcCfgDelDlUe
(
-RlcCb
*gCb,
+RlcCb *gCb,
CmLteRnti ueId,
CmLteCellId cellId,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
CmLteRnti ueId,
CmLteCellId cellId,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
-#else
-S16 rlcCfgDelDlUe(ueId, cellId, entCfg, entCfm)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcEntCfgInfo *entCfg;
-RlcEntCfgCfmInfo *entCfm;
-#endif
{
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
{
S16 ret; /* Return Value */
RlcDlUeCb *ueCb; /* UE Control Block */
- TRC3(rlcCfgDelUe)
-
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))",
ueId,
@@
-1470,7
+1390,6
@@
RlcEntCfgCfmInfo *entCfm;
* -#ROK
* -#RFAILED
*/
* -#ROK
* -#RFAILED
*/
-#ifdef ANSI
S16 rlcCfgDelDlCell
(
RlcCb *gCb,
S16 rlcCfgDelDlCell
(
RlcCb *gCb,
@@
-1478,18
+1397,9
@@
CmLteCellId cellId,
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
RlcEntCfgInfo *entCfg,
RlcEntCfgCfmInfo *entCfm
)
-#else
-S16 rlcCfgDelCell(gCb,cellId, entCfg, entCfm)
-RlcCb *gCb;
-CmLteCellId cellId;
-RlcEntCfgInfo *entCfg;
-RlcEntCfgCfmInfo *entCfm;
-#endif
{
RlcDlCellCb *cellCb; /* UE Control Block */
{
RlcDlCellCb *cellCb; /* UE Control Block */
- U8 rbId; /* RB Identifier */
-
- TRC3(rlcCfgDelCell)
+ uint8_t rbId; /* RB Identifier */
RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelCell( cellId(%d), cfgType(%d)",
RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId,
"rlcCfgDelCell( cellId(%d), cfgType(%d)",
@@
-1556,7
+1466,6
@@
RlcEntCfgCfmInfo *entCfm;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcCfgDlUeIdChng
(
RlcCb *gCb,
S16 rlcCfgDlUeIdChng
(
RlcCb *gCb,
@@
-1564,17
+1473,9
@@
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo,
CmStatus *status
)
CkwUeInfo *newUeInfo,
CmStatus *status
)
-#else
-S16 rlcCfgDlUeIdChng(gCb,ueInfo,newUeInfo,status)
-RlcCb *gCb;
-CkwUeInfo *ueInfo;
-CkwUeInfo *newUeInfo;
-CmStatus *status;
-#endif
{
RlcDlUeCb *ueCb;
/*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/
{
RlcDlUeCb *ueCb;
/*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/
- TRC3(rlcCfgUeIdChng)
if ( (ueInfo->ueId == newUeInfo->ueId) &&
(ueInfo->cellId == newUeInfo->cellId))
if ( (ueInfo->ueId == newUeInfo->ueId) &&
(ueInfo->cellId == newUeInfo->cellId))
@@
-1627,8
+1528,8
@@
CmStatus *status;
ueCb->cellId = newUeInfo->cellId;
if(ROK != cmHashListInsert(&(gCb->u.dlCb->ueLstCp),
ueCb->cellId = newUeInfo->cellId;
if(ROK != cmHashListInsert(&(gCb->u.dlCb->ueLstCp),
- (PTR)ueCb, (
U8
*)&(ueCb->ueId),
- (
U16
) sizeof(CmLteRnti)))
+ (PTR)ueCb, (
uint8_t
*)&(ueCb->ueId),
+ (
uint16_t
) sizeof(CmLteRnti)))
{
RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,
{
RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,