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
U8, U16, U32 data type changes
[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
2d6050e
..
63054fb
100755
(executable)
--- a/
src/5gnrrlc/kw_dbm_ul.c
+++ b/
src/5gnrrlc/kw_dbm_ul.c
@@
-58,7
+58,7
@@
static int RLOG_FILE_ID=194;
* @brief RLC Uplink database module
*/
* @brief RLC Uplink database module
*/
-#define
KW_MODULE KW
_DBGMASK_DUT
+#define
RLC_MODULE RLC
_DBGMASK_DUT
\f
/**
\f
/**
@@
-74,56
+74,54
@@
static int RLOG_FILE_ID=194;
* -# RFAILED
*/
#ifdef ANSI
* -# RFAILED
*/
#ifdef ANSI
-
PUBLIC S16 kw
DbmUlInit
+
S16 rlc
DbmUlInit
(
RlcCb *gCb
)
#else
(
RlcCb *gCb
)
#else
-
PUBLIC S16 kw
DbmUlInit(gCb)
+
S16 rlc
DbmUlInit(gCb)
RlcCb *gCb;
#endif
{
RlcCb *gCb;
#endif
{
- TRC3(rlcUlDbmInit)
-
/* Initialize ueCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp),
/* Initialize ueCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->ueLstCp),
- (
U16) KW
_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,
-
KW
_GET_MEM_REGION(gCb),
-
KW
_GET_MEM_POOL(gCb)))
+ (
uint16_t
) CM_HASH_KEYTYPE_CONID,
+
RLC
_GET_MEM_REGION(gCb),
+
RLC
_GET_MEM_POOL(gCb)))
{
RLOG0(L_ERROR, "UeLstCp Initialization Failed");
{
RLOG0(L_ERROR, "UeLstCp Initialization Failed");
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Initialize cellCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->cellLstCp),
}
/* Initialize cellCb Hash List */
if(ROK != cmHashListInit(&(gCb->u.ulCb->cellLstCp),
- (
U16) KW
_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,
-
KW
_GET_MEM_REGION(gCb),
-
KW
_GET_MEM_POOL(gCb)))
+ (
uint16_t
) CM_HASH_KEYTYPE_CONID,
+
RLC
_GET_MEM_REGION(gCb),
+
RLC
_GET_MEM_POOL(gCb)))
{
cmHashListDeinit(&gCb->u.ulCb->ueLstCp);
RLOG0(L_ERROR, "CellLstCp Initialization Failed");
{
cmHashListDeinit(&gCb->u.ulCb->ueLstCp);
RLOG0(L_ERROR, "CellLstCp Initialization Failed");
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if(ROK != cmHashListInit(&(gCb->u.ulCb->transIdLstCp),
}
if(ROK != cmHashListInit(&(gCb->u.ulCb->transIdLstCp),
- (
U16) KW
_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,
-
KW
_GET_MEM_REGION(gCb),
-
KW
_GET_MEM_POOL(gCb)))
+ (
uint16_t
) CM_HASH_KEYTYPE_CONID,
+
RLC
_GET_MEM_REGION(gCb),
+
RLC
_GET_MEM_POOL(gCb)))
{
cmHashListDeinit(&gCb->u.ulCb->ueLstCp);
cmHashListDeinit(&gCb->u.ulCb->cellLstCp);
RLOG0(L_ERROR, "transIdLstCp Initialization Failed");
{
cmHashListDeinit(&gCb->u.ulCb->ueLstCp);
cmHashListDeinit(&gCb->u.ulCb->cellLstCp);
RLOG0(L_ERROR, "transIdLstCp Initialization Failed");
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* kw005.201 added support for L2 Measurement */
}
/* kw005.201 added support for L2 Measurement */
@@
-131,8
+129,8
@@
RlcCb *gCb;
/* Initialize qcI Hash List */
#endif /* LTE_L2_MEAS */
/* Initialize qcI Hash List */
#endif /* LTE_L2_MEAS */
-
RETVALUE
(ROK);
-} /*
kw
DbmUlInit */
+
return
(ROK);
+} /*
rlc
DbmUlInit */
\f
/**
\f
/**
@@
-143,17
+141,15
@@
RlcCb *gCb;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmUlDeInit
+
Void rlc
DbmUlDeInit
(
RlcCb *gCb
)
#else
(
RlcCb *gCb
)
#else
-
PUBLIC Void kw
DbmUlDeInit(gCb)
+
Void rlc
DbmUlDeInit(gCb)
RlcCb *gCb;
#endif
{
RlcCb *gCb;
#endif
{
- TRC3(kwDbmUlDeInit);
-
/* De Initialize ueCb Hash List */
cmHashListDeinit(&(gCb->u.ulCb->ueLstCp));
/* De Initialize ueCb Hash List */
cmHashListDeinit(&(gCb->u.ulCb->ueLstCp));
@@
-166,10
+162,10
@@
RlcCb *gCb;
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS_RLC
/* De Initialize qciCb Hash List */
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS_RLC
/* De Initialize qciCb Hash List */
- cmHashListDeinit(&(rlcCb.
kw
L2Cb.qciHlCp));
+ cmHashListDeinit(&(rlcCb.
rlc
L2Cb.qciHlCp));
#endif /* LTE_L2_MEAS */
#endif /* LTE_L2_MEAS */
-
RETVOID
;
+
return
;
} /* kwDbmDeInit */
} /* kwDbmDeInit */
@@
-187,21
+183,19
@@
RlcCb *gCb;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmFetchUlRbCbByRbId
+
Void rlc
DbmFetchUlRbCbByRbId
(
RlcCb *gCb,
CmLteRlcId *rlcId,
RlcUlRbCb **rbCb
)
#else
(
RlcCb *gCb,
CmLteRlcId *rlcId,
RlcUlRbCb **rbCb
)
#else
-
PUBLIC Void kw
DbmFetchUlRbCbByRbId(gCb, rlcId, rbCb)
+
Void rlc
DbmFetchUlRbCbByRbId(gCb, rlcId, rbCb)
RlcCb *gCb;
CmLteRlcId *rlcId;
RlcUlRbCb **rbCb;
#endif
{
RlcCb *gCb;
CmLteRlcId *rlcId;
RlcUlRbCb **rbCb;
#endif
{
- TRC3(kwDbmFetchUlRbCbByRbId)
-
*rbCb= NULLP;
/* Check for UE CB or CELL CB */
*rbCb= NULLP;
/* Check for UE CB or CELL CB */
@@
-209,24
+203,24
@@
RlcUlRbCb **rbCb;
{
RlcUlCellCb *cellCb;
{
RlcUlCellCb *cellCb;
- if(rlcId->rbId >=
KW
_MAX_RB_PER_CELL)
+ if(rlcId->rbId >=
RLC
_MAX_RB_PER_CELL)
{
RLOG_ARG3(L_ERROR,DBG_RBID,rlcId->rbId ,
"Invalid RbId, cellId:%d UEID:%d Max is [%d]",
rlcId->cellId,
rlcId->ueId,
{
RLOG_ARG3(L_ERROR,DBG_RBID,rlcId->rbId ,
"Invalid RbId, cellId:%d UEID:%d Max is [%d]",
rlcId->cellId,
rlcId->ueId,
-
KW
_MAX_RB_PER_CELL);
-
RETVOID
;
+
RLC
_MAX_RB_PER_CELL);
+
return
;
}
}
-
kw
DbmFetchUlCellCb(gCb,rlcId->cellId, &cellCb);
+
rlc
DbmFetchUlCellCb(gCb,rlcId->cellId, &cellCb);
if(!cellCb)
{
RLOG_ARG2(L_ERROR,DBG_CELLID,rlcId->cellId,
"CellCb not found RBID:%d UEID:%d",
rlcId->rbId,
rlcId->ueId);
if(!cellCb)
{
RLOG_ARG2(L_ERROR,DBG_CELLID,rlcId->cellId,
"CellCb not found RBID:%d UEID:%d",
rlcId->rbId,
rlcId->ueId);
-
RETVOID
;
+
return
;
}
*rbCb = cellCb->rbCb[rlcId->rbId];
}
*rbCb = cellCb->rbCb[rlcId->rbId];
@@
-235,29
+229,29
@@
RlcUlRbCb **rbCb;
{
RlcUlUeCb *ueCb;
{
RlcUlUeCb *ueCb;
- if (!(
KW
_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId)))
+ if (!(
RLC
_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId)))
{
RLOG_ARG3(L_ERROR,DBG_RBID, rlcId->rbId,
"Invalid RbId for RbType[%d] CELLID:%d UEID:%d",
rlcId->rbType,
rlcId->cellId,
rlcId->ueId);
{
RLOG_ARG3(L_ERROR,DBG_RBID, rlcId->rbId,
"Invalid RbId for RbType[%d] CELLID:%d UEID:%d",
rlcId->rbType,
rlcId->cellId,
rlcId->ueId);
-
RETVOID
;
+
return
;
}
}
- if (
kw
DbmFetchUlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb) != ROK)
+ if (
rlc
DbmFetchUlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb) != ROK)
{
RLOG_ARG2(L_ERROR,DBG_CELLID, rlcId->cellId,
"UeId [%d]: UeCb not found RBID:%d",
rlcId->ueId,
rlcId->rbId);
{
RLOG_ARG2(L_ERROR,DBG_CELLID, rlcId->cellId,
"UeId [%d]: UeCb not found RBID:%d",
rlcId->ueId,
rlcId->rbId);
-
RETVOID
;
+
return
;
}
}
-
KW
_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb);
+
RLC
_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb);
}
}
-
RETVOID
;
-} /*
kw
DbmFetchUlRbCbByRbId */
+
return
;
+} /*
rlc
DbmFetchUlRbCbByRbId */
\f
/**
\f
/**
@@
-276,29
+270,11
@@
RlcUlRbCb **rbCb;
* @return Void
*
*/
* @return Void
*
*/
-#ifdef ANSI
-PUBLIC Void kwDbmFetchUlRbCbFromLchId
-(
-RlcCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-CmLteLcId lcId,
-RlcUlRbCb **rbCb
-)
-#else
-PUBLIC Void kwDbmFetchUlRbCbFromLchId(gCb, ueId, cellId, lcId, rbCb)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-CmLteLcId lcId;
-RlcUlRbCb **rbCb;
-#endif
+void rlcDbmFetchUlRbCbFromLchId(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId,\
+ CmLteLcId lcId, RlcUlRbCb **rbCb)
{
RlcUlUeCb *ueCb;
{
RlcUlUeCb *ueCb;
- TRC3(kwDbmFetchUlRbCbFromLchId)
-
-
*rbCb = NULLP;
/* Check for UE CB or CELL CB */
*rbCb = NULLP;
/* Check for UE CB or CELL CB */
@@
-306,26
+282,27
@@
RlcUlRbCb **rbCb;
{
RlcUlCellCb *cellCb;
{
RlcUlCellCb *cellCb;
-
kw
DbmFetchUlCellCb(gCb,cellId, &cellCb);
+
rlc
DbmFetchUlCellCb(gCb,cellId, &cellCb);
if(!cellCb)
{
if(!cellCb)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,"CellCb not found UEID:%d",ueId);
- RETVOID;
+ DU_LOG("\nRLC : rlcDbmFetchUlRbCbFromLchId: CellCb[%d] not found UEID:%d",\
+ cellId, ueId);
+ return;
}
*rbCb = cellCb->lCh[lcId - 1].ulRbCb;
}
*rbCb = cellCb->lCh[lcId - 1].ulRbCb;
-
RETVOID
;
+
return
;
}
}
- if (
kw
DbmFetchUlUeCb(gCb,ueId, cellId, &ueCb) != ROK)
+ if (
rlc
DbmFetchUlUeCb(gCb,ueId, cellId, &ueCb) != ROK)
{
{
-
RLOG_ARG1(L_ERROR,DBG_CELLID, cellId,"
UeId [%d]: UeCb not found",ueId);
-
RETVOID
;
+
DU_LOG("\nRLC : rlcDbmFetchUlRbCbFromLchId:
UeId [%d]: UeCb not found",ueId);
+
return
;
}
*rbCb = ueCb->lCh[lcId - 1].ulRbCb;
}
*rbCb = ueCb->lCh[lcId - 1].ulRbCb;
-
RETVOID
;
+
return
;
} /* kwDbmFetchRbCbFromLchId */
\f
} /* kwDbmFetchRbCbFromLchId */
\f
@@
-343,23
+320,20
@@
RlcUlRbCb **rbCb;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmDelAllUlRb
+
Void rlc
DbmDelAllUlRb
(
RlcCb *gCb,
RlcUlRbCb **rbCbLst,
(
RlcCb *gCb,
RlcUlRbCb **rbCbLst,
-
U8
numRbCb
+
uint8_t
numRbCb
)
#else
)
#else
-
PUBLIC Void kw
DbmDelAllUlRb(gCb, rbCbLst, numRbCb)
+
Void rlc
DbmDelAllUlRb(gCb, rbCbLst, numRbCb)
RlcCb *gCb;
RlcUlRbCb **rbCbLst;
RlcCb *gCb;
RlcUlRbCb **rbCbLst;
-
U8
numRbCb;
+
uint8_t
numRbCb;
#endif
{
#endif
{
- U32 idx; /* Index */
-
- TRC3(kwDbmDelAllUlRb)
-
+ uint32_t idx; /* Index */
for (idx = 0; idx < numRbCb; idx++)
{
for (idx = 0; idx < numRbCb; idx++)
{
@@
-368,18
+342,18
@@
U8 numRbCb;
/* Free the Buffers of RbCb */
if( CM_LTE_MODE_UM == rbCbLst[idx]->mode )
{
/* Free the Buffers of RbCb */
if( CM_LTE_MODE_UM == rbCbLst[idx]->mode )
{
-
kw
UmmFreeUlRbCb(gCb,rbCbLst[idx]);
+
rlc
UmmFreeUlRbCb(gCb,rbCbLst[idx]);
}
else if(CM_LTE_MODE_AM == rbCbLst[idx]->mode)
{
}
else if(CM_LTE_MODE_AM == rbCbLst[idx]->mode)
{
-
kw
AmmFreeUlRbCb(gCb,rbCbLst[idx]);
+
rlc
AmmFreeUlRbCb(gCb,rbCbLst[idx]);
}
RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcUlRbCb));
}
}
}
RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcUlRbCb));
}
}
-
RETVOID
;
+
return
;
} /* kwDbmDelAllRb */
\f
} /* kwDbmDelAllRb */
\f
@@
-401,7
+375,7
@@
U8 numRbCb;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC S16 kw
DbmAddUlUeCb
+
S16 rlc
DbmAddUlUeCb
(
RlcCb *gCb,
CmLteRnti ueId,
(
RlcCb *gCb,
CmLteRnti ueId,
@@
-409,34
+383,32
@@
CmLteCellId cellId,
RlcUlUeCb *ueCb
)
#else
RlcUlUeCb *ueCb
)
#else
-
PUBLIC S16 kw
DbmAddUlUeCb(gCb, ueId, cellId, ueCb)
+
S16 rlc
DbmAddUlUeCb(gCb, ueId, cellId, ueCb)
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
RlcUlUeCb *ueCb;
#endif
{
RlcCb *gCb;
CmLteRnti ueId;
CmLteCellId cellId;
RlcUlUeCb *ueCb;
#endif
{
- TRC3(kwDbmAddUlUeCb)
-
ueCb->ueId = ueId;
ueCb->cellId = cellId;
if(ROK != cmHashListInsert(&(gCb->u.ulCb->ueLstCp),
(PTR)ueCb,
ueCb->ueId = ueId;
ueCb->cellId = cellId;
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",
ueId);
{
RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
"UeId[%u] HashList Insertion Failed",
ueId);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* kw005.201 ccpu00117318, updating the statistics */
gCb->genSts.numUe++;
}
/* kw005.201 ccpu00117318, updating the statistics */
gCb->genSts.numUe++;
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-455,29
+427,27
@@
RlcUlUeCb *ueCb;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC S16 kw
DbmAddUlTransaction
+
S16 rlc
DbmAddUlTransaction
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
#else
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
#else
-
PUBLIC S16 kw
DbmAddUlTransaction(gCb, cfg)
+
S16 rlc
DbmAddUlTransaction(gCb, cfg)
RlcCb *gCb;
RlcUlCfgTmpData *cfg;
#endif
{
RlcCb *gCb;
RlcUlCfgTmpData *cfg;
#endif
{
- TRC3(kwDbmAddUlTransaction)
-
#ifndef ALIGN_64BIT
RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
#else
RLOG1(L_DEBUG, "(transId(%d))", cfg->transId);
#endif
#ifndef ALIGN_64BIT
RLOG1(L_DEBUG, "(transId(%ld)", cfg->transId);
#else
RLOG1(L_DEBUG, "(transId(%d))", cfg->transId);
#endif
-
RETVALUE
(cmHashListInsert(&(gCb->u.ulCb->transIdLstCp),
+
return
(cmHashListInsert(&(gCb->u.ulCb->transIdLstCp),
(PTR)cfg,
(PTR)cfg,
- (
U8
*)&(cfg->transId),
- (
U16
) sizeof(cfg->transId)));
+ (
uint8_t
*)&(cfg->transId),
+ (
uint16_t
) sizeof(cfg->transId)));
}
\f
}
\f
@@
-498,30
+468,29
@@
RlcUlCfgTmpData *cfg;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC S16 kw
DbmFindUlTransaction
+
S16 rlc
DbmFindUlTransaction
(
RlcCb *gCb,
(
RlcCb *gCb,
-
U32
transId,
+
uint32_t
transId,
RlcUlCfgTmpData **cfg
)
#else
RlcUlCfgTmpData **cfg
)
#else
-
PUBLIC S16 kw
DbmFindUlTransaction(gCb, cfg)
+
S16 rlc
DbmFindUlTransaction(gCb, cfg)
RlcCb *gCb;
RlcCb *gCb;
-
U32
transId;
+
uint32_t
transId;
RlcUlCfgTmpData **cfg;
#endif
{
RlcUlCfgTmpData **cfg;
#endif
{
- TRC3(kwDbmFindUlTransaction)
if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
if(ROK != cmHashListFind(&(gCb->u.ulCb->transIdLstCp),
- (
U8
*) &transId,
+ (
uint8_t
*) &transId,
sizeof (transId),
sizeof (transId),
-
KW
_DEF_SEQ_NUM,(PTR *) cfg))
+
RLC
_DEF_SEQ_NUM,(PTR *) cfg))
{
RLOG1(L_ERROR,"TransId [%ld] not found",transId);
{
RLOG1(L_ERROR,"TransId [%ld] not found",transId);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-542,27
+511,25
@@
RlcUlCfgTmpData **cfg;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC S16 kw
DbmDelUlTransaction
+
S16 rlc
DbmDelUlTransaction
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
#else
(
RlcCb *gCb,
RlcUlCfgTmpData *cfg
)
#else
-
PUBLIC S16 kw
DbmDelUlTransaction(gCb, cfg)
+
S16 rlc
DbmDelUlTransaction(gCb, cfg)
RlcCb *gCb;
RlcUlCfgTmpData *cfg;
#endif
{
RlcCb *gCb;
RlcUlCfgTmpData *cfg;
#endif
{
- TRC3(kwDbmDelUlTransaction)
-
if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK)
{
RLOG0(L_ERROR,"HashList Deletion failed");
if(cmHashListDelete(&(gCb->u.ulCb->transIdLstCp),(PTR) (cfg)) != ROK)
{
RLOG0(L_ERROR,"HashList Deletion failed");
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-580,33
+547,31
@@
RlcUlCfgTmpData *cfg;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC S16 kw
DbmDelAllUlTransactions
+
S16 rlc
DbmDelAllUlTransactions
(
RlcCb *gCb
)
#else
(
RlcCb *gCb
)
#else
-
PUBLIC S16 kw
DbmDelAllUlTransactions(gCb)
+
S16 rlc
DbmDelAllUlTransactions(gCb)
RlcCb *gCb;
#endif
{
RlcUlCfgTmpData *cfg = NULL;
RlcCb *gCb;
#endif
{
RlcUlCfgTmpData *cfg = NULL;
- TRC3(kwDbmDelAllUlTransctions)
-
/* Until no more ueCb is ueLstCp hash list get and delete ueCb */
while (ROK == cmHashListGetNext(&(gCb->u.ulCb->transIdLstCp),
(PTR) cfg,
(PTR *)&cfg))
{
/* Until no more ueCb is ueLstCp hash list get and delete ueCb */
while (ROK == cmHashListGetNext(&(gCb->u.ulCb->transIdLstCp),
(PTR) cfg,
(PTR *)&cfg))
{
- if(
kw
DbmDelUlTransaction(gCb, cfg) != ROK)
+ if(
rlc
DbmDelUlTransaction(gCb, cfg) != ROK)
{
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
cfg = NULLP;
}
}
cfg = NULLP;
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-626,28
+591,11
@@
RlcCb *gCb;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PUBLIC S16 kwDbmFetchUlUeCb
-(
-RlcCb *gCb,
-CmLteRnti ueId,
-CmLteCellId cellId,
-RlcUlUeCb **ueCb
-)
-#else
-PUBLIC S16 kwDbmFetchUlUeCb(gCb,ueId, cellId, ueCb)
-RlcCb *gCb;
-CmLteRnti ueId;
-CmLteCellId cellId;
-RlcUlUeCb **ueCb;
-#endif
+uint8_t rlcDbmFetchUlUeCb(RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, RlcUlUeCb **ueCb)
{
{
- TRC3(kwDbmFetchUlUeCb)
-
-
- RETVALUE(cmHashListFind(&(gCb->u.ulCb->ueLstCp),
- (U8 *)&(ueId), sizeof(CmLteRnti),
- KW_DEF_SEQ_NUM,
+ return (cmHashListFind(&(gCb->u.ulCb->ueLstCp),
+ (uint8_t *)&(ueId), sizeof(CmLteRnti),
+ RLC_DEF_SEQ_NUM,
(PTR *) ueCb));
}
(PTR *) ueCb));
}
@@
-668,34
+616,32
@@
RlcUlUeCb **ueCb;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmDelUlUeCb
+
Void rlc
DbmDelUlUeCb
(
RlcCb *gCb,
RlcUlUeCb *ueCb,
Bool abortFlag
)
#else
(
RlcCb *gCb,
RlcUlUeCb *ueCb,
Bool abortFlag
)
#else
-
PUBLIC Void kw
DbmDelUlUeCb(gCb,eCb, abortFlag)
+
Void rlc
DbmDelUlUeCb(gCb,eCb, abortFlag)
RlcCb *gCb;
RlcUlUeCb *ueCb;
Bool abortFlag;
#endif
{
RlcCb *gCb;
RlcUlUeCb *ueCb;
Bool abortFlag;
#endif
{
- TRC3(kwDbmDelUlUeCb)
-
#if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
UNUSED(abortFlag);
#endif /* (!defined(KW_PDCP) || ! (defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))*/
/* Delete all logical channels */
#if (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
UNUSED(abortFlag);
#endif /* (!defined(KW_PDCP) || ! (defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))*/
/* Delete all logical channels */
-
KW_MEM_ZERO(ueCb->lCh,sizeof(RlcUlLch) * KW
_MAX_LCH_PER_UE);
+
RLC_MEM_ZERO(ueCb->lCh,sizeof(RlcUlLch) * RLC
_MAX_LCH_PER_UE);
/* Delete all SRB RbCbs in UeCb */
/* Delete all SRB RbCbs in UeCb */
-
kwDbmDelAllUlRb(gCb,ueCb->srbCb, KW
_MAX_SRB_PER_UE);
+
rlcDbmDelAllUlRb(gCb,ueCb->srbCb, RLC
_MAX_SRB_PER_UE);
/* Delete all DRB RbCbs in UeCb */
/* Delete all DRB RbCbs in UeCb */
-
kwDbmDelAllUlRb(gCb,ueCb->drbCb, KW
_MAX_DRB_PER_UE);
+
rlcDbmDelAllUlRb(gCb,ueCb->drbCb, RLC
_MAX_DRB_PER_UE);
/* Delete ueCb entry from ueLstCp */
if(ROK != cmHashListDelete(&(gCb->u.ulCb->ueLstCp), (PTR) ueCb))
/* Delete ueCb entry from ueLstCp */
if(ROK != cmHashListDelete(&(gCb->u.ulCb->ueLstCp), (PTR) ueCb))
@@
-709,7
+655,7
@@
Bool abortFlag;
/* Deallocate ueCb */
RLC_FREE(gCb,ueCb, sizeof(RlcUlUeCb));
/* Deallocate ueCb */
RLC_FREE(gCb,ueCb, sizeof(RlcUlUeCb));
-
RETVOID
;
+
return
;
}
\f
/**
}
\f
/**
@@
-724,31
+670,28
@@
Bool abortFlag;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmDelAllUlUe
+
Void rlc
DbmDelAllUlUe
(
RlcCb *gCb
)
#else
(
RlcCb *gCb
)
#else
-
PUBLIC Void kw
DbmDelAllUlUe(gCb)
+
Void rlc
DbmDelAllUlUe(gCb)
RlcCb *gCb;
#endif
{
RlcUlUeCb *ueCb = NULLP; /* UE Control Block */
RlcCb *gCb;
#endif
{
RlcUlUeCb *ueCb = NULLP; /* UE Control Block */
- TRC3(kwDbmDelAllUlUe)
-
-
/* Until no more ueCb is ueLstCp hash list get and delete ueCb */
while (ROK == cmHashListGetNext(&(gCb->u.ulCb->ueLstCp),
(PTR) ueCb,
(PTR *)&ueCb))
{
/* Until no more ueCb is ueLstCp hash list get and delete ueCb */
while (ROK == cmHashListGetNext(&(gCb->u.ulCb->ueLstCp),
(PTR) ueCb,
(PTR *)&ueCb))
{
-
kw
DbmDelUlUeCb(gCb,ueCb, TRUE);
+
rlc
DbmDelUlUeCb(gCb,ueCb, TRUE);
ueCb = NULLP;
}
ueCb = NULLP;
}
-
RETVOID
;
+
return
;
}
}
@@
-768,14
+711,14
@@
RlcCb *gCb;
* -# RFAILED
*/
#ifdef ANSI
* -# RFAILED
*/
#ifdef ANSI
-
PUBLIC S16 kw
DbmAddUlCellCb
+
S16 rlc
DbmAddUlCellCb
(
RlcCb *gCb,
CmLteCellId cellId,
RlcUlCellCb *cellCb
)
#else
(
RlcCb *gCb,
CmLteCellId cellId,
RlcUlCellCb *cellCb
)
#else
-
PUBLIC S16 kw
DbmAddUlCellCb(gCb, cellId, cellCb)
+
S16 rlc
DbmAddUlCellCb(gCb, cellId, cellCb)
RlcCb *gCb;
CmLteCellId cellId;
RlcUlCellCb *cellCb;
RlcCb *gCb;
CmLteCellId cellId;
RlcUlCellCb *cellCb;
@@
-783,24
+726,20
@@
RlcUlCellCb *cellCb;
{
RlcUlCellCb *tCellCb;
{
RlcUlCellCb *tCellCb;
- TRC3(kwDbmAddUlCellCb)
-
-
-
tCellCb = cellCb;
tCellCb->cellId = cellId;
if(ROK != cmHashListInsert(&(gCb->u.ulCb->cellLstCp),
(PTR) tCellCb,
tCellCb = cellCb;
tCellCb->cellId = cellId;
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");
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
\f
}
\f
@@
-820,32
+759,17
@@
RlcUlCellCb *cellCb;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
-PUBLIC Void kwDbmFetchUlCellCb
-(
-RlcCb *gCb,
-CmLteCellId cellId,
-RlcUlCellCb **cellCb
-)
-#else
-PUBLIC Void kwDbmFetchUlCellCb(gCb, cellId, cellCb)
-RlcCb *gCb;
-CmLteCellId cellId;
-RlcUlCellCb **cellCb;
-#endif
+void rlcDbmFetchUlCellCb(RlcCb *gCb, CmLteCellId cellId, RlcUlCellCb **cellCb)
{
{
- TRC3(kwDbmFetchUlCellCb)
-
-
*cellCb = NULLP;
if(ROK != cmHashListFind(&(gCb->u.ulCb->cellLstCp),
*cellCb = NULLP;
if(ROK != cmHashListFind(&(gCb->u.ulCb->cellLstCp),
- (
U8
*)&(cellId),sizeof(CmLteCellId),
-
KW
_DEF_SEQ_NUM, (PTR*) cellCb))
+ (
uint8_t
*)&(cellId),sizeof(CmLteCellId),
+
RLC
_DEF_SEQ_NUM, (PTR*) cellCb))
{
{
-
RLOG_ARG0(L_ERROR,DBG_CELLID, cellId,"CellCb not found"
);
+
DU_LOG("\nRLC : rlcDbmFetchUlCellCb : CellCb[%d] not found", cellId
);
}
}
-
RETVOID
;
+
return
;
}
\f
}
\f
@@
-862,22
+786,20
@@
RlcUlCellCb **cellCb;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmDelUlCellCb
+
Void rlc
DbmDelUlCellCb
(
RlcCb *gCb,
RlcUlCellCb *cellCb
)
#else
(
RlcCb *gCb,
RlcUlCellCb *cellCb
)
#else
-
PUBLIC Void kw
DbmDelUlCellCb(gCb, cellCb)
+
Void rlc
DbmDelUlCellCb(gCb, cellCb)
RlcCb *gCb;
RlcUlCellCb *cellCb;
#endif
{
RlcCb *gCb;
RlcUlCellCb *cellCb;
#endif
{
- TRC3(kwDbmDelUlCellCb)
-
/* Delete all rbCbs in cellCb */
/* Delete all rbCbs in cellCb */
-
kwDbmDelAllUlRb(gCb,cellCb->rbCb, KW
_MAX_RB_PER_CELL);
+
rlcDbmDelAllUlRb(gCb,cellCb->rbCb, RLC
_MAX_RB_PER_CELL);
/* Delete cellCb entry in hash list cellLstCp */
if(ROK != cmHashListDelete(&(gCb->u.ulCb->cellLstCp), (PTR) cellCb))
/* Delete cellCb entry in hash list cellLstCp */
if(ROK != cmHashListDelete(&(gCb->u.ulCb->cellLstCp), (PTR) cellCb))
@@
-888,7
+810,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
@@
-903,31
+825,28
@@
RlcUlCellCb *cellCb;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmDelAllUlCell
+
Void rlc
DbmDelAllUlCell
(
RlcCb *gCb
)
#else
(
RlcCb *gCb
)
#else
-
PUBLIC Void kw
DbmDelAllUlCell(gCb)
+
Void rlc
DbmDelAllUlCell(gCb)
RlcCb *gCb;
#endif
{
RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
RlcCb *gCb;
#endif
{
RlcUlCellCb *cellCb = NULLP; /* Cell Control Block */
- TRC3(kwDbmDelAllUlCell)
-
-
/* Until no more cellCb is ueLstCp hash list get and delete cellCb */
while (ROK == cmHashListGetNext(&(gCb->u.ulCb->cellLstCp),
(PTR) cellCb,
(PTR *)&cellCb))
{
/* Until no more cellCb is ueLstCp hash list get and delete cellCb */
while (ROK == cmHashListGetNext(&(gCb->u.ulCb->cellLstCp),
(PTR) cellCb,
(PTR *)&cellCb))
{
-
kw
DbmDelUlCellCb(gCb,cellCb);
+
rlc
DbmDelUlCellCb(gCb,cellCb);
cellCb = NULLP;
}
cellCb = NULLP;
}
-
RETVOID
;
+
return
;
}
\f
}
\f
@@
-942,24
+861,23
@@
RlcCb *gCb;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC Void kw
DbmUlShutdown
+
Void rlc
DbmUlShutdown
(
RlcCb *gCb
)
#else
(
RlcCb *gCb
)
#else
-
PUBLIC Void kw
DbmUlShutdown(gCb)
+
Void rlc
DbmUlShutdown(gCb)
RlcCb *gCb;
#endif
{
RlcCb *gCb;
#endif
{
- TRC3(kwDbmUlShutdown)
-
kw
DbmDelAllUlCell(gCb);
+
rlc
DbmDelAllUlCell(gCb);
-
kw
DbmDelAllUlUe(gCb);
+
rlc
DbmDelAllUlUe(gCb);
-
kw
DbmUlDeInit(gCb);
+
rlc
DbmUlDeInit(gCb);
-
RETVOID
;
+
return
;
}
}