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_dbm_ul.c
diff --git
a/src/5gnrrlc/kw_dbm_ul.c
b/src/5gnrrlc/kw_dbm_ul.c
index
07e9588
..
e34412e
100755
(executable)
--- a/
src/5gnrrlc/kw_dbm_ul.c
+++ b/
src/5gnrrlc/kw_dbm_ul.c
@@
-73,22
+73,14
@@
static int RLOG_FILE_ID=194;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-S16 rlcDbmUlInit
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmUlInit(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmUlInit(RlcCb *gCb)
{
/* Initialize ueCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp),
{
/* Initialize ueCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp),
- (
U16
) RLC_UE_LIST_BUCKET_SIZE,
- (
U16
) 0,
+ (
uint16_t
) RLC_UE_LIST_BUCKET_SIZE,
+ (
uint16_t
) 0,
(Bool) FALSE,
(Bool) FALSE,
- (
U16
) CM_HASH_KEYTYPE_CONID,
+ (
uint16_t
) CM_HASH_KEYTYPE_CONID,
RLC_GET_MEM_REGION(gCb),
RLC_GET_MEM_POOL(gCb)))
{
RLC_GET_MEM_REGION(gCb),
RLC_GET_MEM_POOL(gCb)))
{
@@
-98,10
+90,10
@@
RlcCb *gCb;
/* Initialize cellCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->cellLstCp),
/* Initialize cellCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->cellLstCp),
- (
U16
) RLC_CELL_LIST_BUCKET_SIZE,
- (
U16
) 0,
+ (
uint16_t
) RLC_CELL_LIST_BUCKET_SIZE,
+ (
uint16_t
) 0,
(Bool) FALSE,
(Bool) FALSE,
- (
U16
) CM_HASH_KEYTYPE_CONID,
+ (
uint16_t
) CM_HASH_KEYTYPE_CONID,
RLC_GET_MEM_REGION(gCb),
RLC_GET_MEM_POOL(gCb)))
{
RLC_GET_MEM_REGION(gCb),
RLC_GET_MEM_POOL(gCb)))
{
@@
-111,10
+103,10
@@
RlcCb *gCb;
}
if(ROK != cmHashListInit(&(gCb->u.ulCb->transIdLstCp),
}
if(ROK != cmHashListInit(&(gCb->u.ulCb->transIdLstCp),
- (
U16
) RLC_TRANS_ID_LST_BKT_SIZE,
- (
U16
) 0,
+ (
uint16_t
) RLC_TRANS_ID_LST_BKT_SIZE,
+ (
uint16_t
) 0,
(Bool) FALSE,
(Bool) FALSE,
- (
U16
) CM_HASH_KEYTYPE_CONID,
+ (
uint16_t
) CM_HASH_KEYTYPE_CONID,
RLC_GET_MEM_REGION(gCb),
RLC_GET_MEM_POOL(gCb)))
{
RLC_GET_MEM_REGION(gCb),
RLC_GET_MEM_POOL(gCb)))
{
@@
-140,15
+132,7
@@
RlcCb *gCb;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-Void rlcDbmUlDeInit
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlDeInit(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlDeInit(RlcCb *gCb)
{
/* De Initialize ueCb Hash List */
{
/* De Initialize ueCb Hash List */
@@
-165,7
+149,7
@@
RlcCb *gCb;
cmHashListDeinit(&(rlcCb.rlcL2Cb.qciHlCp));
#endif /* LTE_L2_MEAS */
cmHashListDeinit(&(rlcCb.rlcL2Cb.qciHlCp));
#endif /* LTE_L2_MEAS */
-
RETVOID
;
+
return
;
} /* kwDbmDeInit */
} /* kwDbmDeInit */
@@
-182,19
+166,12
@@
RlcCb *gCb;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
Void rlcDbmFetchUlRbCbByRbId
(
RlcCb *gCb,
CmLteRlcId *rlcId,
RlcUlRbCb **rbCb
)
Void rlcDbmFetchUlRbCbByRbId
(
RlcCb *gCb,
CmLteRlcId *rlcId,
RlcUlRbCb **rbCb
)
-#else
-Void rlcDbmFetchUlRbCbByRbId(gCb, rlcId, rbCb)
-RlcCb *gCb;
-CmLteRlcId *rlcId;
-RlcUlRbCb **rbCb;
-#endif
{
*rbCb= NULLP;
{
*rbCb= NULLP;
@@
-210,7
+187,7
@@
RlcUlRbCb **rbCb;
rlcId->cellId,
rlcId->ueId,
RLC_MAX_RB_PER_CELL);
rlcId->cellId,
rlcId->ueId,
RLC_MAX_RB_PER_CELL);
-
RETVOID
;
+
return
;
}
rlcDbmFetchUlCellCb(gCb,rlcId->cellId, &cellCb);
}
rlcDbmFetchUlCellCb(gCb,rlcId->cellId, &cellCb);
@@
-220,7
+197,7
@@
RlcUlRbCb **rbCb;
"CellCb not found RBID:%d UEID:%d",
rlcId->rbId,
rlcId->ueId);
"CellCb not found RBID:%d UEID:%d",
rlcId->rbId,
rlcId->ueId);
-
RETVOID
;
+
return
;
}
*rbCb = cellCb->rbCb[rlcId->rbId];
}
*rbCb = cellCb->rbCb[rlcId->rbId];
@@
-236,7
+213,7
@@
RlcUlRbCb **rbCb;
rlcId->rbType,
rlcId->cellId,
rlcId->ueId);
rlcId->rbType,
rlcId->cellId,
rlcId->ueId);
-
RETVOID
;
+
return
;
}
if (rlcDbmFetchUlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb) != ROK)
}
if (rlcDbmFetchUlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb) != ROK)
@@
-245,12
+222,12
@@
RlcUlRbCb **rbCb;
"UeId [%d]: UeCb not found RBID:%d",
rlcId->ueId,
rlcId->rbId);
"UeId [%d]: UeCb not found RBID:%d",
rlcId->ueId,
rlcId->rbId);
-
RETVOID
;
+
return
;
}
RLC_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb);
}
}
RLC_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb);
}
-
RETVOID
;
+
return
;
} /* rlcDbmFetchUlRbCbByRbId */
\f
} /* rlcDbmFetchUlRbCbByRbId */
\f
@@
-319,21
+296,14
@@
void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
* @return Void
*
*/
* @return Void
*
*/
-#ifdef ANSI
Void rlcDbmDelAllUlRb
(
RlcCb *gCb,
RlcUlRbCb **rbCbLst,
Void rlcDbmDelAllUlRb
(
RlcCb *gCb,
RlcUlRbCb **rbCbLst,
-
U8
numRbCb
+
uint8_t
numRbCb
)
)
-#else
-Void rlcDbmDelAllUlRb(gCb, rbCbLst, numRbCb)
-RlcCb *gCb;
-RlcUlRbCb **rbCbLst;
-U8 numRbCb;
-#endif
{
{
-
U32
idx; /* Index */
+
uint32_t
idx; /* Index */
for (idx = 0; idx < numRbCb; idx++)
{
for (idx = 0; idx < numRbCb; idx++)
{
@@
-353,7
+323,7
@@
U8 numRbCb;
}
}
}
}
-
RETVOID
;
+
return
;
} /* kwDbmDelAllRb */
\f
} /* kwDbmDelAllRb */
\f
@@
-374,7
+344,6
@@
U8 numRbCb;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
S16 rlcDbmAddUlUeCb
(
RlcCb *gCb,
S16 rlcDbmAddUlUeCb
(
RlcCb *gCb,
@@
-382,13
+351,6
@@
CmLteRnti ueId,
CmLteCellId cellId,
RlcUlUeCb *ueCb
)
CmLteCellId cellId,
RlcUlUeCb *ueCb
)
-#else
-S16 rlcDbmAddUlUeCb(gCb, ueId, cellId, ueCb)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcUlUeCb *ueCb;
-#endif
{
ueCb->ueId = ueId;
{
ueCb->ueId = ueId;
@@
-396,8
+358,8
@@
RlcUlUeCb *ueCb;
if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp),
(PTR)ueCb,
if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp),
(PTR)ueCb,
- (
U8
*)&(ueCb->ueId),
- (
U16
) sizeof(CmLteRnti)))
+ (
uint8_t
*)&(ueCb->ueId),
+ (
uint16_t
) sizeof(CmLteRnti)))
{
RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
"UeId[%u] HashList Insertion Failed",
{
RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
"UeId[%u] HashList Insertion Failed",
@@
-426,17
+388,11
@@
RlcUlUeCb *ueCb;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
S16 rlcDbmAddUlTransaction
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
S16 rlcDbmAddUlTransaction
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
-#else
-S16 rlcDbmAddUlTransaction(gCb, cfg)
-RlcCb *gCb;
-RlcUlCfgTmpData *cfg;
-#endif
{
#ifndef ALIGN_64BIT
RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
{
#ifndef ALIGN_64BIT
RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
@@
-446,8
+402,8
@@
RlcUlCfgTmpData *cfg;
return (cmHashListInsert(&(gCb->u.ulCb->transIdLstCp),
(PTR)cfg,
return (cmHashListInsert(&(gCb->u.ulCb->transIdLstCp),
(PTR)cfg,
- (
U8
*)&(cfg->transId),
- (
U16
) sizeof(cfg->transId)));
+ (
uint8_t
*)&(cfg->transId),
+ (
uint16_t
) sizeof(cfg->transId)));
}
\f
}
\f
@@
-467,23
+423,16
@@
RlcUlCfgTmpData *cfg;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
S16 rlcDbmFindUlTransaction
(
RlcCb *gCb,
S16 rlcDbmFindUlTransaction
(
RlcCb *gCb,
-
U32
transId,
+
uint32_t
transId,
RlcUlCfgTmpData **cfg
)
RlcUlCfgTmpData **cfg
)
-#else
-S16 rlcDbmFindUlTransaction(gCb, cfg)
-RlcCb *gCb;
-U32 transId;
-RlcUlCfgTmpData **cfg;
-#endif
{
if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
{
if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
- (
U8
*) &transId,
+ (
uint8_t
*) &transId,
sizeof (transId),
RLC_DEF_SEQ_NUM,(PTR *) cfg))
{
sizeof (transId),
RLC_DEF_SEQ_NUM,(PTR *) cfg))
{
@@
-510,17
+459,11
@@
RlcUlCfgTmpData **cfg;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
S16 rlcDbmDelUlTransaction
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
S16 rlcDbmDelUlTransaction
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
-#else
-S16 rlcDbmDelUlTransaction(gCb, cfg)
-RlcCb *gCb;
-RlcUlCfgTmpData *cfg;
-#endif
{
if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK)
{
if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK)
@@
-546,15
+489,7
@@
RlcUlCfgTmpData *cfg;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
-S16 rlcDbmDelAllUlTransactions
-(
-RlcCb *gCb
-)
-#else
-S16 rlcDbmDelAllUlTransactions(gCb)
-RlcCb *gCb;
-#endif
+S16 rlcDbmDelAllUlTransactions(RlcCb *gCb)
{
RlcUlCfgTmpData *cfg = NULL;
{
RlcUlCfgTmpData *cfg = NULL;
@@
-615,19
+550,12
@@
uint8_t rlcDbmFetchUlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, RlcUl
* @return Void
*
*/
* @return Void
*
*/
-#ifdef ANSI
Void rlcDbmDelUlUeCb
(
RlcCb *gCb,
RlcUlUeCb *ueCb,
Bool abortFlag
)
Void rlcDbmDelUlUeCb
(
RlcCb *gCb,
RlcUlUeCb *ueCb,
Bool abortFlag
)
-#else
-Void rlcDbmDelUlUeCb(gCb,eCb, abortFlag)
-RlcCb *gCb;
-RlcUlUeCb *ueCb;
-Bool abortFlag;
-#endif
{
#if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
{
#if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
@@
-655,7
+583,7
@@
Bool abortFlag;
/* Deallocate ueCb */
RLC_FREE(gCb,ueCb, sizeof(RlcUlUeCb));
/* Deallocate ueCb */
RLC_FREE(gCb,ueCb, sizeof(RlcUlUeCb));
-
RETVOID
;
+
return
;
}
\f
/**
}
\f
/**
@@
-669,15
+597,7
@@
Bool abortFlag;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-Void rlcDbmDelAllUlUe
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlUe(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlUe(RlcCb *gCb)
{
RlcUlUeCb *ueCb = NULLP; /* UE Control Block */
{
RlcUlUeCb *ueCb = NULLP; /* UE Control Block */
@@
-691,7
+611,7
@@
RlcCb *gCb;
ueCb = NULLP;
}
ueCb = NULLP;
}
-
RETVOID
;
+
return
;
}
}
@@
-710,19
+630,12
@@
RlcCb *gCb;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcDbmAddUlCellCb
(
RlcCb *gCb,
CmLteCellId cellId,
RlcUlCellCb *cellCb
)
S16 rlcDbmAddUlCellCb
(
RlcCb *gCb,
CmLteCellId cellId,
RlcUlCellCb *cellCb
)
-#else
-S16 rlcDbmAddUlCellCb(gCb, cellId, cellCb)
-RlcCb *gCb;
-CmLteCellId cellId;
-RlcUlCellCb *cellCb;
-#endif
{
RlcUlCellCb *tCellCb;
{
RlcUlCellCb *tCellCb;
@@
-731,8
+644,8
@@
RlcUlCellCb *cellCb;
if(ROK != cmHashListInsert(&(gCb->u.ulCb->cellLstCp),
(PTR) tCellCb,
if(ROK != cmHashListInsert(&(gCb->u.ulCb->cellLstCp),
(PTR) tCellCb,
- (
U8
*)&(tCellCb->cellId),
- (
U16
) sizeof(CmLteCellId)))
+ (
uint8_t
*)&(tCellCb->cellId),
+ (
uint16_t
) sizeof(CmLteCellId)))
{
RLOG_ARG0(L_ERROR,DBG_CELLID,tCellCb->cellId,
"HashList Insertion Failed");
{
RLOG_ARG0(L_ERROR,DBG_CELLID,tCellCb->cellId,
"HashList Insertion Failed");
@@
-785,17
+698,7
@@
void rlcDbmFetchUlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcUlCellCb **cellCb)
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-Void rlcDbmDelUlCellCb
-(
-RlcCb *gCb,
-RlcUlCellCb *cellCb
-)
-#else
-Void rlcDbmDelUlCellCb(gCb, cellCb)
-RlcCb *gCb;
-RlcUlCellCb *cellCb;
-#endif
+Void rlcDbmDelUlCellCb(RlcCb *gCb,RlcUlCellCb *cellCb)
{
/* Delete all rbCbs in cellCb */
{
/* Delete all rbCbs in cellCb */
@@
-810,7
+713,7
@@
RlcUlCellCb *cellCb;
/* Deallocate cellCb */
RLC_FREE(gCb, cellCb, sizeof(RlcUlCellCb));
/* Deallocate cellCb */
RLC_FREE(gCb, cellCb, sizeof(RlcUlCellCb));
-
RETVOID
;
+
return
;
} /* kwDbmDelCellCb */
\f
} /* kwDbmDelCellCb */
\f
@@
-824,15
+727,7
@@
RlcUlCellCb *cellCb;
*
* @return Void
*/
*
* @return Void
*/
-#ifdef ANSI
-Void rlcDbmDelAllUlCell
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmDelAllUlCell(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmDelAllUlCell(RlcCb *gCb)
{
RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
{
RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
@@
-846,7
+741,7
@@
RlcCb *gCb;
cellCb = NULLP;
}
cellCb = NULLP;
}
-
RETVOID
;
+
return
;
}
\f
}
\f
@@
-860,15
+755,7
@@
RlcCb *gCb;
* @param[in] gCb RLC Instance Control Block
*
*/
* @param[in] gCb RLC Instance Control Block
*
*/
-#ifdef ANSI
-Void rlcDbmUlShutdown
-(
-RlcCb *gCb
-)
-#else
-Void rlcDbmUlShutdown(gCb)
-RlcCb *gCb;
-#endif
+Void rlcDbmUlShutdown(RlcCb *gCb)
{
rlcDbmDelAllUlCell(gCb);
{
rlcDbmDelAllUlCell(gCb);
@@
-877,7
+764,7
@@
RlcCb *gCb;
rlcDbmUlDeInit(gCb);
rlcDbmUlDeInit(gCb);
-
RETVOID
;
+
return
;
}
}