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
Updated E2AP ports
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_lim.c
diff --git
a/src/5gnrrlc/kw_lim.c
b/src/5gnrrlc/kw_lim.c
index
ba46450
..
595ae9c
100755
(executable)
--- a/
src/5gnrrlc/kw_lim.c
+++ b/
src/5gnrrlc/kw_lim.c
@@
-35,9
+35,6
@@
File: kw_lim.c
**********************************************************************/
File: kw_lim.c
**********************************************************************/
-static const char* RLOG_MODULE_NAME="LIM";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=196;
/**
* @file kw_lim.c
/**
* @file kw_lim.c
@@
-75,7
+72,7
@@
static int RLOG_FILE_ID=196;
#include "rlc_mac_inf.h"
#ifdef __cplusplus
#include "rlc_mac_inf.h"
#ifdef __cplusplus
-
EXTERN
"C" {
+
extern
"C" {
#endif /* __cplusplus */
\f
#endif /* __cplusplus */
\f
@@
-99,22
+96,10
@@
EXTERN "C" {
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
-S16 RlcLiRguBndCfm
-(
-Pst *pst,
-SuId suId,
-U8 status
-)
-#else
-S16 RlcLiRguBndCfm (pst, suId, status)
-Pst *pst;
-SuId suId;
-U8 status;
-#endif
+S16 RlcLiRguBndCfm(Pst *pst,SuId suId,uint8_t status)
{
{
-
U16
event; /* Event */
-
U16
cause; /* Cause */
+
uint16_t
event; /* Event */
+
uint16_t
cause; /* Cause */
RlcRguSapCb *rguSap; /* RGU SAP Control Block */
RlcCb *tRlcCb;
RlcRguSapCb *rguSap; /* RGU SAP Control Block */
RlcCb *tRlcCb;
@@
-126,12
+111,12
@@
U8 status;
#endif
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
#endif
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
-
RLOG2(L_DEBUG,"
RlcLiRguBndCfm(suId(%d), status(%d)", suId, status);
+
DU_LOG("\nDEBUG --> RLC UL :
RlcLiRguBndCfm(suId(%d), status(%d)", suId, status);
#if (ERRCLASS & ERRCLS_INT_PAR)
if (tRlcCb->init.cfgDone != TRUE)
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if (tRlcCb->init.cfgDone != TRUE)
{
-
RLOG0(L_FATAL,"
General configuration not done");
+
DU_LOG("\nERROR --> RLC UL :
General configuration not done");
RLC_SEND_SAPID_ALARM(tRlcCb,suId,LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_STATE);
RLC_SEND_SAPID_ALARM(tRlcCb,suId,LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_STATE);
@@
-140,7
+125,7
@@
U8 status;
if ((suId >= tRlcCb->genCfg.maxRguSaps) || (suId < 0))
{
if ((suId >= tRlcCb->genCfg.maxRguSaps) || (suId < 0))
{
-
RLOG0(L_ERROR, "
Invalid suId");
+
DU_LOG("\nERROR --> RLC UL :
Invalid suId");
RLC_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_SUID);
RLC_SEND_SAPID_ALARM(tRlcCb,suId, LKW_EVENT_LI_BND_CFM, LCM_CAUSE_INV_SUID);
@@
-151,13
+136,13
@@
U8 status;
rguSap = (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_DL) ?
&(tRlcCb->u.dlCb->rguDlSap[suId]) : &(tRlcCb->u.ulCb->rguUlSap[suId]);
rguSap = (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_DL) ?
&(tRlcCb->u.dlCb->rguDlSap[suId]) : &(tRlcCb->u.ulCb->rguUlSap[suId]);
- RLOG1(L_DEBUG, "RlcLiRguBndCfm: For RGU SAP state=%d", rguSap->state)
+ DU_LOG("\nDEBUG --> RLC UL : RlcLiRguBndCfm: For RGU SAP state=%d", rguSap->state);
switch (rguSap->state)
{
case RLC_SAP_BINDING:
{
switch (rguSap->state)
{
case RLC_SAP_BINDING:
{
- rlcStopTmr (tRlcCb,(PTR)rguSap,
RLC_EVT
_WAIT_BNDCFM);
+ rlcStopTmr (tRlcCb,(PTR)rguSap,
EVENT_RLC
_WAIT_BNDCFM);
rguSap->retryCnt = 0;
rguSap->retryCnt = 0;
@@
-235,7
+220,7
@@
uint8_t rlcProcCommLcUlData(Pst *pst, SuId suId, RguCDatIndInfo *datInd)
#if (ERRCLASS & ERRCLS_DEBUG)
if(RLC_MAX_LCH_PER_CELL <= datInd->lcId)
{
#if (ERRCLASS & ERRCLS_DEBUG)
if(RLC_MAX_LCH_PER_CELL <= datInd->lcId)
{
- DU_LOG("\n
RLC
: rlcProcCommLcUlData : Invalid LcId [%d], Max is [%d]",\
+ DU_LOG("\n
ERROR --> RLC UL
: rlcProcCommLcUlData : Invalid LcId [%d], Max is [%d]",\
datInd->lcId, RLC_MAX_LCH_PER_CELL);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo));
return RFAILED;
datInd->lcId, RLC_MAX_LCH_PER_CELL);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo));
return RFAILED;
@@
-246,7
+231,7
@@
uint8_t rlcProcCommLcUlData(Pst *pst, SuId suId, RguCDatIndInfo *datInd)
rlcDbmFetchUlRbCbFromLchId(tRlcCb, datInd->rnti, datInd->cellId, datInd->lcId, &rbCb);
if (!rbCb)
{
rlcDbmFetchUlRbCbFromLchId(tRlcCb, datInd->rnti, datInd->cellId, datInd->lcId, &rbCb);
if (!rbCb)
{
- DU_LOG("\n
RLC
: rlcProcCommLcUlData : LcId [%d] not found",
+ DU_LOG("\n
ERROR --> RLC UL
: rlcProcCommLcUlData : LcId [%d] not found",
datInd->lcId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo));
return RFAILED;
datInd->lcId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo));
return RFAILED;
@@
-296,7
+281,7
@@
uint8_t rlcProcDedLcUlData(Pst *pst, SuId suId, RguDDatIndInfo *datInd)
#if (ERRCLASS & ERRCLS_DEBUG)
if (((RlcCb*)RLC_GET_RLCCB(pst->dstInst))->genCfg.rlcMode == LKW_RLC_MODE_DL)
{
#if (ERRCLASS & ERRCLS_DEBUG)
if (((RlcCb*)RLC_GET_RLCCB(pst->dstInst))->genCfg.rlcMode == LKW_RLC_MODE_DL)
{
- DU_LOG("\n
RLC
: rlcProcDedLcUlData : suId(%d))recieved in DL Inst", suId);
+ DU_LOG("\n
DEBUG --> RLC UL
: rlcProcDedLcUlData : suId(%d))recieved in DL Inst", suId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguDDatIndInfo));
return RFAILED;
}
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguDDatIndInfo));
return RFAILED;
}
@@
-349,12
+334,12
@@
uint8_t rlcProcCommLcSchedRpt(Pst *pst, SuId suId, RguCStaIndInfo *staInd)
#if (ERRCLASS & ERRCLS_INT_PAR)
if ((suId >= tRlcCb->genCfg.maxRguSaps) || (suId < 0))
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if ((suId >= tRlcCb->genCfg.maxRguSaps) || (suId < 0))
{
- DU_LOG("\n
RLC
: rlcProcCommLcSchedRpt: Invalid RGU suId %d\n", suId);
+ DU_LOG("\n
ERROR --> RLC UL
: rlcProcCommLcSchedRpt: Invalid RGU suId %d\n", suId);
return RFAILED;
}
if (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_UL)
{
return RFAILED;
}
if (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_UL)
{
- DU_LOG("\n
RLC
: rlcProcCommLcSchedRpt: Received in RLC UL CELLID:%d",
+ DU_LOG("\n
DEBUG --> RLC UL
: rlcProcCommLcSchedRpt: Received in RLC UL CELLID:%d",
staInd->cellId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo));
return RFAILED;
staInd->cellId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo));
return RFAILED;
@@
-367,7
+352,7
@@
uint8_t rlcProcCommLcSchedRpt(Pst *pst, SuId suId, RguCStaIndInfo *staInd)
#if (ERRCLASS & ERRCLS_DEBUG)
if(RLC_MAX_LCH_PER_CELL < staInd->lcId)
{
#if (ERRCLASS & ERRCLS_DEBUG)
if(RLC_MAX_LCH_PER_CELL < staInd->lcId)
{
- DU_LOG("\n
RLC
: rlcProcCommLcSchedRpt: Invalid LcId, Max is [%d] CELLID:%d",
+ DU_LOG("\n
ERROR --> RLC UL
: rlcProcCommLcSchedRpt: Invalid LcId, Max is [%d] CELLID:%d",
RLC_MAX_LCH_PER_CELL, staInd->cellId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo));
return RFAILED;
RLC_MAX_LCH_PER_CELL, staInd->cellId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo));
return RFAILED;
@@
-377,7
+362,7
@@
uint8_t rlcProcCommLcSchedRpt(Pst *pst, SuId suId, RguCStaIndInfo *staInd)
rlcDbmFetchDlRbCbFromLchId(tRlcCb,0, staInd->cellId, staInd->lcId, &rbCb);
if(!rbCb)
{
rlcDbmFetchDlRbCbFromLchId(tRlcCb,0, staInd->cellId, staInd->lcId, &rbCb);
if(!rbCb)
{
- DU_LOG("\n
RLC
: rlcProcCommLcSchedRpt: LcId [%d] not found CELLID:%d",
+ DU_LOG("\n
ERROR --> RLC UL
: rlcProcCommLcSchedRpt: LcId [%d] not found CELLID:%d",
staInd->lcId, staInd->cellId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo));
return RFAILED;
staInd->lcId, staInd->cellId);
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo));
return RFAILED;
@@
-434,13
+419,13
@@
uint8_t rlcProcDedLcSchedRpt(Pst *pst, SuId suId, RguDStaIndInfo *staInd)
#if (ERRCLASS & ERRCLS_INT_PAR)
if (((RlcCb*)RLC_GET_RLCCB(pst->dstInst))->genCfg.rlcMode == LKW_RLC_MODE_UL)
{
#if (ERRCLASS & ERRCLS_INT_PAR)
if (((RlcCb*)RLC_GET_RLCCB(pst->dstInst))->genCfg.rlcMode == LKW_RLC_MODE_UL)
{
- DU_LOG("\n
RLC
: rlcProcDedLcSchedRpt: Received in RLC UL ");
+ DU_LOG("\n
DEBUG --> RLC UL
: rlcProcDedLcSchedRpt: Received in RLC UL ");
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguDStaIndInfo));
return RFAILED;
}
if ((suId >= gCb->genCfg.maxRguSaps) || (suId < 0))
{
RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguDStaIndInfo));
return RFAILED;
}
if ((suId >= gCb->genCfg.maxRguSaps) || (suId < 0))
{
- DU_LOG("\n
RLC
: rlcProcDedLcSchedRpt: Invalid RGU suId %d\n", suId);
+ DU_LOG("\n
ERROR --> RLC UL
: rlcProcDedLcSchedRpt: Invalid RGU suId %d\n", suId);
return (RFAILED);
}
#endif
return (RFAILED);
}
#endif
@@
-469,24
+454,12
@@
uint8_t rlcProcDedLcSchedRpt(Pst *pst, SuId suId, RguDStaIndInfo *staInd)
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
-S16 RlcLiRguFlowCntrlInd
-(
-Pst *pst,
-SuId suId,
-RguFlowCntrlInd *flowCntrlInd
-)
-#else
-S16 RlcLiRguFlowCntrlInd(pst, suId, flowCntrlInd)
-Pst *pst;
-SuId suId;
-RguFlowCntrlInd *flowCntrlInd;
-#endif
+S16 RlcLiRguFlowCntrlInd(Pst *pst,SuId suId,RguFlowCntrlInd *flowCntrlInd)
{
RlcCb *tRlcCb;
RlcDlRbCb *rbCb = NULLP;
{
RlcCb *tRlcCb;
RlcDlRbCb *rbCb = NULLP;
-
U32
idx;
-
U32
lcIdx;
+
uint32_t
idx;
+
uint32_t
lcIdx;
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
for (idx = 0; idx < flowCntrlInd->numUes; idx++)
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
for (idx = 0; idx < flowCntrlInd->numUes; idx++)
@@
-503,7
+476,7
@@
RguFlowCntrlInd *flowCntrlInd;
rlcUtlTrigPdbFlowCntrl(tRlcCb, rbCb, lcInfo->pktAdmitCnt);
continue;
}
rlcUtlTrigPdbFlowCntrl(tRlcCb, rbCb, lcInfo->pktAdmitCnt);
continue;
}
- if (rbCb->mode ==
CM_LTE
_MODE_AM)
+ if (rbCb->mode ==
RLC
_MODE_AM)
{
if ((rbCb->m.amDl.retxLst.count != 0) ||
((rbCb->m.amDl.bo == 0) ||
{
if ((rbCb->m.amDl.retxLst.count != 0) ||
((rbCb->m.amDl.bo == 0) ||
@@
-551,26
+524,14
@@
RguFlowCntrlInd *flowCntrlInd;
* -# RFAILED
*
*/
* -# RFAILED
*
*/
-#ifdef ANSI
-S16 RlcLiRguHqStaInd
-(
-Pst *pst,
-SuId suId,
-RguHarqStatusInd *staInd
-)
-#else
-S16 RlcLiRguHqStaInd(pst,suId,staInd)
-Pst *pst;
-SuId suId;
-RguHarqStatusInd *staInd;
-#endif
+S16 RlcLiRguHqStaInd(Pst *pst, SuId suId,RguHarqStatusInd *staInd)
{
RlcUeKey ueKey;
{
RlcUeKey ueKey;
- S16 ret;
- RlcDlUeCb
*ueCb;
-
U8
tbIdx;
- RlcCb
*tRlcCb;
+ S16
ret;
+ RlcDlUeCb *ueCb;
+
uint8_t
tbIdx;
+ RlcCb *tRlcCb;
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
ueKey.cellId = staInd->cellId;
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
ueKey.cellId = staInd->cellId;