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
Merge "JIRA-ID ODUHIGH-275 classification of logs of RLC part -2"
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_uim.c
diff --git
a/src/5gnrrlc/kw_uim.c
b/src/5gnrrlc/kw_uim.c
index
484ec84
..
9fab144
100755
(executable)
--- a/
src/5gnrrlc/kw_uim.c
+++ b/
src/5gnrrlc/kw_uim.c
@@
-37,10
+37,6
@@
File: kw_uim.c
**********************************************************************/
File: kw_uim.c
**********************************************************************/
-static const char* RLOG_MODULE_NAME="UIM";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=205;
-
/**
* @file kw_uim.c
* @brief RLC Upper Interface Module
/**
* @file kw_uim.c
* @brief RLC Upper Interface Module
@@
-116,7
+112,7
@@
SpId spId
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
-
RLOG2(L_DEBUG, "
spId(%d), suId(%d)", spId, suId);
+
DU_LOG("\nDEBUG --> RLC_UL :
spId(%d), suId(%d)", spId, suId);
ckwSap = &(tRlcCb->u.ulCb->ckwSap);
/* Take action based on the current state of the SAP */
switch(ckwSap->state)
ckwSap = &(tRlcCb->u.ulCb->ckwSap);
/* Take action based on the current state of the SAP */
switch(ckwSap->state)
@@
-134,7
+130,7
@@
SpId spId
/* Update the State */
ckwSap->state = RLC_SAP_BND;
/* Update the State */
ckwSap->state = RLC_SAP_BND;
-
RLOG1(L_DEBUG, "
RlcUiCkwBndReq: state (%d)", ckwSap->state);
+
DU_LOG("\nDEBUG --> RLC_UL :
RlcUiCkwBndReq: state (%d)", ckwSap->state);
break;
}
case RLC_SAP_BND:
break;
}
case RLC_SAP_BND:
@@
-151,7
+147,7
@@
SpId spId
LKW_EVENT_CKW_BND_REQ,
LCM_CAUSE_INV_PAR_VAL);
LKW_EVENT_CKW_BND_REQ,
LCM_CAUSE_INV_PAR_VAL);
-
RLOG0(L_ERROR, "
CKW SAP already Bound");
+
DU_LOG("\nERROR --> RLC_UL :
CKW SAP already Bound");
RlcUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_NOK);
return (RFAILED);
}
RlcUiCkwBndCfm(&(ckwSap->pst), ckwSap->suId, CM_BND_NOK);
return (RFAILED);
}
@@
-160,7
+156,7
@@
SpId spId
default:
{
#if (ERRCLASS & ERRCLS_INT_PAR)
default:
{
#if (ERRCLASS & ERRCLS_INT_PAR)
-
RLOG0(L_ERROR, "
Invalid CKW SAP State in Bind Req");
+
DU_LOG("\nERROR --> RLC_UL :
Invalid CKW SAP State in Bind Req");
RLC_SEND_SAPID_ALARM(tRlcCb,
spId,
LKW_EVENT_CKW_BND_REQ,
RLC_SEND_SAPID_ALARM(tRlcCb,
spId,
LKW_EVENT_CKW_BND_REQ,
@@
-212,7
+208,7
@@
Reason reason
#endif /* ERRCLASS & ERRCLS_INT_PAR */
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
#endif /* ERRCLASS & ERRCLS_INT_PAR */
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
-
RLOG2(L_DEBUG,"
spId(%d), reason(%d)",
+
DU_LOG("\nDEBUG --> RLC_UL :
spId(%d), reason(%d)",
spId,
reason);
spId,
reason);
@@
-283,7
+279,7
@@
RlcCfgInfo *cfg
tRlcCb->u.ulCb->rlcUlUdxEventType = pst->event;
if (rlcDbmAddUlTransaction(tRlcCb, cfgTmpData) != ROK)
{
tRlcCb->u.ulCb->rlcUlUdxEventType = pst->event;
if (rlcDbmAddUlTransaction(tRlcCb, cfgTmpData) != ROK)
{
-
RLOG0(L_ERROR, "
Addition to UL transId Lst Failed");
+
DU_LOG("\nERROR --> RLC_UL :
Addition to UL transId Lst Failed");
RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo));
return RFAILED;
RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo));
return RFAILED;
@@
-339,15
+335,12
@@
CkwUeInfo *newUeInfo
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
#ifndef ALIGN_64BIT
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
#ifndef ALIGN_64BIT
- RLOG_ARG2(L_DEBUG,DBG_CELLID,newUeInfo->cellId,
- "RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%ld))",
+ DU_LOG("\nDEBUG --> RLC_UL : RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%ld))",
spId,
transId);
#else
spId,
transId);
#else
- RLOG_ARG2(L_DEBUG,DBG_CELLID,newUeInfo->cellId,
- "RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%d))\n",
- spId,
- transId);
+ DU_LOG("\nDEBUG --> RLC_UL : RlcUiCkwUeIdChgReq(pst, spId(%d), transId(%d))\n",
+ spId, transId);
#endif
RLC_ALLOC(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData));
#endif
RLC_ALLOC(tRlcCb, cfgTmpData, sizeof (RlcUlCfgTmpData));
@@
-363,7
+356,7
@@
CkwUeInfo *newUeInfo
if (rlcDbmAddUlTransaction(tRlcCb, cfgTmpData))
{
if (rlcDbmAddUlTransaction(tRlcCb, cfgTmpData))
{
-
RLOG0(L_ERROR, "
Addition to UL transId Lst Failed");
+
DU_LOG("\nERROR --> RLC_UL :
Addition to UL transId Lst Failed");
ret = RFAILED;
break;
}
ret = RFAILED;
break;
}
@@
-387,8
+380,7
@@
CkwUeInfo *newUeInfo
if(ROK != rlcCfgValidateUeIdChng(tRlcCb,ueInfo,newUeInfo,cfgTmpData))
{
if(ROK != rlcCfgValidateUeIdChng(tRlcCb,ueInfo,newUeInfo,cfgTmpData))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfgTmpData->ueInfo->cellId,
- "Validation Failure for UeId change");
+ DU_LOG("\nERROR --> RLC_UL : Validation Failure for UeId change");
}
rlcUlUdxUeIdChgReq(&(RLC_GET_UDX_SAP(tRlcCb)->pst),
}
rlcUlUdxUeIdChgReq(&(RLC_GET_UDX_SAP(tRlcCb)->pst),
@@
-444,8
+436,7
@@
RlcCfgInfo *cfg
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
{
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
{
- RLOG_ARG2(L_ERROR,DBG_UEID, cfgTmpData->ueId,
- "CELLID [%u]:Validation Failure for UL RB [%d]",
+ DU_LOG("\nERROR --> RLC_UL : CELLID [%u]:Validation Failure for UL RB [%d]",
cfg->cellId,cfg->entCfg[idx].rbId);
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/*Validation is getting failed so no need to do configuration at DL.
cfg->cellId,cfg->entCfg[idx].rbId);
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/*Validation is getting failed so no need to do configuration at DL.
@@
-476,8
+467,7
@@
RlcCfgInfo *cfg
&cfg->entCfg[idx],
&cfgTmpData->cfgEntData[idx]))
{
&cfg->entCfg[idx],
&cfgTmpData->cfgEntData[idx]))
{
- RLOG_ARG2(L_ERROR,DBG_UEID,cfg->ueId,
- "CellID [%u]:Validation Failure for Reest UL RB [%d]",
+ DU_LOG("\nERROR --> RLC_UL : CellID [%u]:Validation Failure for Reest UL RB [%d]",
cfg->cellId,cfg->entCfg[idx].rbId);
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/* Setting dir as UL, so that no configuration is done at DL */
cfg->cellId,cfg->entCfg[idx].rbId);
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/* Setting dir as UL, so that no configuration is done at DL */
@@
-506,8
+496,7
@@
RlcCfgInfo *cfg
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
{
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cfg->cellId,
- "UL UEID [%d]:Validation Failure",
+ DU_LOG("\nERROR --> RLC_UL : UL UEID [%d]:Validation Failure",
cfgTmpData->ueId);
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/* Setting dir as UL, so that no configuration is done at DL */
cfgTmpData->ueId);
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/* Setting dir as UL, so that no configuration is done at DL */
@@
-523,8
+512,7
@@
RlcCfgInfo *cfg
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
{
&cfgTmpData->cfgEntData[idx],
cfgTmpData))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cfg->cellId,
- "Del UL Cell Validation Failure");
+ DU_LOG("\nERROR --> RLC_UL : Del UL Cell Validation Failure");
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/* Setting dir as UL, so that no configuration is done at DL */
cfg->entCfg[idx].dir = RLC_DIR_UL;
cfgTmpData->cfgEntData[idx].entUlCfgCfm.status.status = CKW_CFG_CFM_NOK;
/* Setting dir as UL, so that no configuration is done at DL */
cfg->entCfg[idx].dir = RLC_DIR_UL;
@@
-577,13
+565,13
@@
SpId spId
}
#endif
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
}
#endif
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
-
RLOG2(L_DEBUG, "
RlcUiKwuBndReq(pst, spId(%d), suId(%d))", spId, suId);
+
DU_LOG("\nDEBUG --> RLC_UL :
RlcUiKwuBndReq(pst, spId(%d), suId(%d))", spId, suId);
/* Validation of input parameters */
#if (ERRCLASS & ERRCLS_INT_PAR)
if(!((spId < (S16) tRlcCb->genCfg.maxKwuSaps) && (spId >=0)))
{
/* Validation of input parameters */
#if (ERRCLASS & ERRCLS_INT_PAR)
if(!((spId < (S16) tRlcCb->genCfg.maxKwuSaps) && (spId >=0)))
{
-
RLOG0(L_ERROR,"
Invalid spId");
+
DU_LOG("\nERROR --> RLC_UL :
Invalid spId");
RLC_SEND_SAPID_ALARM(tRlcCb,spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_SAP);
return RFAILED;
}
RLC_SEND_SAPID_ALARM(tRlcCb,spId, LKW_EVENT_KWU_BND_REQ, LCM_CAUSE_INV_SAP);
return RFAILED;
}
@@
-610,7
+598,7
@@
SpId spId
/* Update the State */
rlckwuSap->state = RLC_SAP_BND;
/* Update the State */
rlckwuSap->state = RLC_SAP_BND;
-
RLOG1(L_DEBUG, "
RlcUiKwuBndReq: state (%d)", rlckwuSap->state);
+
DU_LOG("\nDEBUG --> RLC_UL :
RlcUiKwuBndReq: state (%d)", rlckwuSap->state);
break;
}
case RLC_SAP_BND:
break;
}
case RLC_SAP_BND:
@@
-625,7
+613,7
@@
SpId spId
spId,
LKW_EVENT_KWU_BND_REQ,
LCM_CAUSE_INV_PAR_VAL);
spId,
LKW_EVENT_KWU_BND_REQ,
LCM_CAUSE_INV_PAR_VAL);
-
RLOG1(L_ERROR,"
RLC Mode [%d] : KWU SAP already Bound",
+
DU_LOG("\nERROR --> RLC_UL :
RLC Mode [%d] : KWU SAP already Bound",
tRlcCb->genCfg.rlcMode);
RlcUiKwuBndCfm(&(rlckwuSap->pst), rlckwuSap->suId, CM_BND_NOK);
return (RFAILED);
tRlcCb->genCfg.rlcMode);
RlcUiKwuBndCfm(&(rlckwuSap->pst), rlckwuSap->suId, CM_BND_NOK);
return (RFAILED);
@@
-636,7
+624,7
@@
SpId spId
default:
{
#if (ERRCLASS & ERRCLS_INT_PAR)
default:
{
#if (ERRCLASS & ERRCLS_INT_PAR)
-
RLOG1(L_ERROR,"
RLC Mode [%d]:Invalid KWU SAP State in Bind Req",
+
DU_LOG("\nERROR --> RLC_UL :
RLC Mode [%d]:Invalid KWU SAP State in Bind Req",
tRlcCb->genCfg.rlcMode);
RLC_SEND_SAPID_ALARM(tRlcCb,
spId,
tRlcCb->genCfg.rlcMode);
RLC_SEND_SAPID_ALARM(tRlcCb,
spId,
@@
-691,7
+679,7
@@
Reason reason
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
-
RLOG2(L_DEBUG, "
spId(%d), reason(%d)",
+
DU_LOG("\nDEBUG --> RLC_UL :
spId(%d), reason(%d)",
spId,
reason);
spId,
reason);
@@
-727,7
+715,7
@@
uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
RlcDlRbCb *rbCb; /* RB Control Block */
RlcCb *tRlcCb;
RlcDlRbCb *rbCb; /* RB Control Block */
RlcCb *tRlcCb;
- DU_LOG("\n
RLC
: Received DL Data");
+ DU_LOG("\n
DEBUG --> RLC_UL
: Received DL Data");
#if (ERRCLASS & ERRCLS_INT_PAR)
if(pst->dstInst >= MAX_RLC_INSTANCES)
#if (ERRCLASS & ERRCLS_INT_PAR)
if(pst->dstInst >= MAX_RLC_INSTANCES)
@@
-743,9
+731,9
@@
uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
rlcDbmFetchDlRbCbByRbId(tRlcCb, &datReq->rlcId, &rbCb);
if(!rbCb)
{
rlcDbmFetchDlRbCbByRbId(tRlcCb, &datReq->rlcId, &rbCb);
if(!rbCb)
{
- DU_LOG("\n
RLC
: CellId[%u]:DL RbId [%d] not found",
+ DU_LOG("\n
ERROR --> RLC_UL
: CellId[%u]:DL RbId [%d] not found",
datReq->rlcId.cellId,datReq->rlcId.rbId);
datReq->rlcId.cellId,datReq->rlcId.rbId);
-
RLC_FREE
_BUF(mBuf);
+
ODU_PUT_MSG
_BUF(mBuf);
return RFAILED;
}
return RFAILED;
}
@@
-753,7
+741,7
@@
uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
/* Dispatch according to mode of the rbCb */
switch (rbCb->mode)
{
/* Dispatch according to mode of the rbCb */
switch (rbCb->mode)
{
- case
CM_LTE
_MODE_TM:
+ case
RLC
_MODE_TM:
{
/* Verify the user */
if (pst->srcEnt != ENTNH)
{
/* Verify the user */
if (pst->srcEnt != ENTNH)
@@
-761,7
+749,7
@@
uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
/* kw002.201 Freeing from proper region */
RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datReq,
sizeof(KwuDatReqInfo));
/* kw002.201 Freeing from proper region */
RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datReq,
sizeof(KwuDatReqInfo));
-
RLC_FREE
_BUF(mBuf);
+
ODU_PUT_MSG
_BUF(mBuf);
return RFAILED;
}
return RFAILED;
}
@@
-769,20
+757,20
@@
uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
rlcTmmQSdu(tRlcCb,rbCb, datReq, mBuf);
break;
}
rlcTmmQSdu(tRlcCb,rbCb, datReq, mBuf);
break;
}
- case
CM_LTE
_MODE_UM:
+ case
RLC
_MODE_UM:
{
rlcUmmQSdu(tRlcCb,rbCb, datReq, mBuf);
break;
}
{
rlcUmmQSdu(tRlcCb,rbCb, datReq, mBuf);
break;
}
- case
CM_LTE
_MODE_AM:
+ case
RLC
_MODE_AM:
{
rlcAmmQSdu(tRlcCb,rbCb, mBuf, datReq);
break;
}
default:
{
{
rlcAmmQSdu(tRlcCb,rbCb, mBuf, datReq);
break;
}
default:
{
- DU_LOG("\n
RLC
: Invalid RB Mode");
+ DU_LOG("\n
ERROR --> RLC_UL
: Invalid RB Mode");
break;
}
}
break;
}
}