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_ul_ex_ms.c
diff --git
a/src/5gnrrlc/kw_ul_ex_ms.c
b/src/5gnrrlc/kw_ul_ex_ms.c
index
72b6301
..
003ff98
100755
(executable)
--- a/
src/5gnrrlc/kw_ul_ex_ms.c
+++ b/
src/5gnrrlc/kw_ul_ex_ms.c
@@
-28,9
+28,6
@@
File: kw_ul_ex_ms.c
*********************************************************************21*/
File: kw_ul_ex_ms.c
*********************************************************************21*/
-static const char* RLOG_MODULE_NAME="RLC_UL";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=206;
/** @file kw_ul_ex_ms.c
@brief RLC System Services Interface
/** @file kw_ul_ex_ms.c
@brief RLC System Services Interface
@@
-58,13
+55,14
@@
static int RLOG_FILE_ID=206;
#include "kw_ul.x"
#include "kw_udx.x"
#include "kw_ul.x"
#include "kw_udx.x"
+#include "rlc_mac_inf.h"
#include "du_app_rlc_inf.h"
#ifdef TENB_STATS
#include "l2_tenb_stats.x"
#endif
#include "du_app_rlc_inf.h"
#ifdef TENB_STATS
#include "l2_tenb_stats.x"
#endif
-
PUBLIC
S16 rlcUlInitExt ARGS (( Void ));
+S16 rlcUlInitExt ARGS (( Void ));
\f
/**
*
\f
/**
*
@@
-80,15
+78,8
@@
PUBLIC S16 rlcUlInitExt ARGS (( Void ));
*
*/
*
*/
-#ifdef ANSI
-PUBLIC S16 rlcUlInitExt
-(
-)
-#else
-PUBLIC S16 rlcUlInitExt()
-#endif
+S16 rlcUlInitExt()
{
{
- TRC2(rlcUlInitExt);
return ROK;
} /* kwInitExt */
return ROK;
} /* kwInitExt */
@@
-122,24
+113,15
@@
PUBLIC S16 rlcUlInitExt()
* -# ROK
*
*/
* -# ROK
*
*/
-#ifdef ANSI
-PUBLIC S16 rlcUlActvInit
+S16 rlcUlActvInit
(
Ent ent, /* entity */
Inst inst, /* instance */
Region region, /* region */
Reason reason /* reason */
)
(
Ent ent, /* entity */
Inst inst, /* instance */
Region region, /* region */
Reason reason /* reason */
)
-#else
-PUBLIC S16 rlcUlActvInit(ent, inst, region, reason)
-Ent ent; /* entity */
-Inst inst; /* instance */
-Region region; /* region */
-Reason reason; /* reason */
-#endif
{
RlcCb *tRlcCb;
{
RlcCb *tRlcCb;
- TRC3(rlcUlActvInit)
if (inst >= MAX_RLC_INSTANCES)
{
if (inst >= MAX_RLC_INSTANCES)
{
@@
-171,7
+153,7
@@
Reason reason; /* reason */
tRlcCb->init.acnt = TRUE; /* enable accounting */
tRlcCb->init.usta = TRUE; /* enable unsolicited status */
tRlcCb->init.trc = FALSE; /* enable trace */
tRlcCb->init.acnt = TRUE; /* enable accounting */
tRlcCb->init.usta = TRUE; /* enable unsolicited status */
tRlcCb->init.trc = FALSE; /* enable trace */
- tRlcCb->init.procId =
SFndProcId
();
+ tRlcCb->init.procId =
ODU_GET_PROCID
();
rlcCb[inst] = tRlcCb;
rlcCb[inst] = tRlcCb;
@@
-204,21
+186,14
@@
Reason reason; /* reason */
* -# ROK
*
*/
* -# ROK
*
*/
-#ifdef ANSI
-PUBLIC S16 rlcUlActvTsk
+S16 rlcUlActvTsk
(
Pst *pst, /* pst structure */
Buffer *mBuf /* message buffer */
)
(
Pst *pst, /* pst structure */
Buffer *mBuf /* message buffer */
)
-#else
-PUBLIC S16 rlcUlActvTsk(pst, mBuf)
-Pst *pst; /* pst structure */
-Buffer *mBuf; /* message buffer */
-#endif
{
S16 ret = ROK;
{
S16 ret = ROK;
- TRC3(kwActvTsk);
switch(pst->srcEnt)
{
switch(pst->srcEnt)
{
@@
-229,59
+204,64
@@
Buffer *mBuf; /* message buffer */
#ifdef LCLKW
case LKW_EVT_CFG_REQ:
{
#ifdef LCLKW
case LKW_EVT_CFG_REQ:
{
- ret = unpackRlcConfigReq(
Kw
MiRlcConfigReq, pst, mBuf);
+ ret = unpackRlcConfigReq(
Rlc
MiRlcConfigReq, pst, mBuf);
break;
}
case LKW_EVT_CNTRL_REQ:
{
break;
}
case LKW_EVT_CNTRL_REQ:
{
- ret = cmUnpkLkwCntrlReq(
Kw
MiLkwCntrlReq, pst, mBuf);
+ ret = cmUnpkLkwCntrlReq(
Rlc
MiLkwCntrlReq, pst, mBuf);
break;
}
break;
}
- case EVENT_RLC_UL_UE_CREATE_REQ: /* UE Create Request */
+ case EVENT_RLC_UE_CREATE_REQ: /* UE Create Request */
+ {
+ ret = unpackRlcUeCreateReq(RlcProcUeCreateReq, pst, mBuf);
+ break;
+ }
+ case EVENT_RLC_UE_RECONFIG_REQ: /* UE Reconfig Request */
{
{
- ret = unpackRlcU
lUeCreateReq(RlcUlProcUeCreate
Req, pst, mBuf);
+ ret = unpackRlcU
eReconfigReq(RlcProcUeReconfig
Req, pst, mBuf);
break;
}
case LKW_EVT_STS_REQ:
{
break;
}
case LKW_EVT_STS_REQ:
{
- ret = cmUnpkLkwStsReq(
Kw
MiLkwStsReq, pst, mBuf);
+ ret = cmUnpkLkwStsReq(
Rlc
MiLkwStsReq, pst, mBuf);
break;
}
case LKW_EVT_STA_REQ:
{
break;
}
case LKW_EVT_STA_REQ:
{
- ret = cmUnpkLkwStaReq(
Kw
MiLkwStaReq, pst, mBuf);
+ ret = cmUnpkLkwStaReq(
Rlc
MiLkwStaReq, pst, mBuf);
break;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
case LKW_EVT_L2MEAS_REQ:
{
break;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
case LKW_EVT_L2MEAS_REQ:
{
- ret = cmUnpkLkwL2MeasReq(
Kw
MiLkwL2MeasReq, pst, mBuf);
+ ret = cmUnpkLkwL2MeasReq(
Rlc
MiLkwL2MeasReq, pst, mBuf);
break;
}
case LKW_EVT_L2MEAS_SEND_REQ:
{
break;
}
case LKW_EVT_L2MEAS_SEND_REQ:
{
- ret = cmUnpkLkwL2MeasSendReq(
Kw
MiLkwL2MeasSendReq, pst, mBuf);
+ ret = cmUnpkLkwL2MeasSendReq(
Rlc
MiLkwL2MeasSendReq, pst, mBuf);
break;
}
case LKW_EVT_L2MEAS_STOP_REQ:
{
break;
}
case LKW_EVT_L2MEAS_STOP_REQ:
{
- ret = cmUnpkLkwL2MeasStopReq(
Kw
MiLkwL2MeasStopReq, pst, mBuf);
+ ret = cmUnpkLkwL2MeasStopReq(
Rlc
MiLkwL2MeasStopReq, pst, mBuf);
break;
}
#endif
#endif /* LCLKW */
default:
break;
}
#endif
#endif /* LCLKW */
default:
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_FATAL,"
Received Invalid Event[%d] from SM",
+
DU_LOG("\nERROR --> RLC_UL :
Received Invalid Event[%d] from SM",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-291,7
+271,7
@@
Buffer *mBuf; /* message buffer */
break;
}
break;
}
- case ENT
KW
:
+ case ENT
RLC
:
{
switch(pst->event)
{
{
switch(pst->event)
{
@@
-323,10
+303,10
@@
Buffer *mBuf; /* message buffer */
#endif /* LCCKW */
default:
#endif /* LCCKW */
default:
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from RLC UL",
+
DU_LOG("\nERROR --> RLC_UL :
Received Invalid Event[%d] from RLC UL",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-343,19
+323,19
@@
Buffer *mBuf; /* message buffer */
#ifdef LCCKW
case CKW_EVT_BND_REQ: /* Bind request */
{
#ifdef LCCKW
case CKW_EVT_BND_REQ: /* Bind request */
{
- ret = cmUnpkCkwBndReq(
Kw
UiCkwBndReq, pst, mBuf );
+ ret = cmUnpkCkwBndReq(
Rlc
UiCkwBndReq, pst, mBuf );
break;
}
case CKW_EVT_UBND_REQ: /* Unbind request */
{
break;
}
case CKW_EVT_UBND_REQ: /* Unbind request */
{
- ret = cmUnpkCkwUbndReq(
Kw
UiCkwUbndReq, pst, mBuf );
+ ret = cmUnpkCkwUbndReq(
Rlc
UiCkwUbndReq, pst, mBuf );
break;
}
case CKW_EVT_UEIDCHG_REQ: /* Configuration request */
{
break;
}
case CKW_EVT_UEIDCHG_REQ: /* Configuration request */
{
- ret = cmUnpkCkwUeIdChgReq(
Kw
UiCkwUeIdChgReq, pst, mBuf);
+ ret = cmUnpkCkwUeIdChgReq(
Rlc
UiCkwUeIdChgReq, pst, mBuf);
break;
}
break;
}
@@
-364,21
+344,21
@@
Buffer *mBuf; /* message buffer */
#ifdef LCKWU
case KWU_EVT_BND_REQ: /* Bind request */
{
#ifdef LCKWU
case KWU_EVT_BND_REQ: /* Bind request */
{
- ret = cmUnpkKwuBndReq(
Kw
UiKwuBndReq, pst, mBuf );
+ ret = cmUnpkKwuBndReq(
Rlc
UiKwuBndReq, pst, mBuf );
break;
}
case KWU_EVT_UBND_REQ: /* Unbind request */
{
break;
}
case KWU_EVT_UBND_REQ: /* Unbind request */
{
- ret = cmUnpkKwuUbndReq(
Kw
UiKwuUbndReq, pst, mBuf );
+ ret = cmUnpkKwuUbndReq(
Rlc
UiKwuUbndReq, pst, mBuf );
break;
}
#endif /* LCKWU */
default:
break;
}
#endif /* LCKWU */
default:
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from RRC",
+
DU_LOG("\nERROR --> RLC_UL :
Received Invalid Event[%d] from RRC",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-395,21
+375,21
@@
Buffer *mBuf; /* message buffer */
#ifdef LCKWU
case KWU_EVT_BND_REQ: /* Bind request */
{
#ifdef LCKWU
case KWU_EVT_BND_REQ: /* Bind request */
{
- ret = cmUnpkKwuBndReq(
Kw
UiKwuBndReq, pst, mBuf );
+ ret = cmUnpkKwuBndReq(
Rlc
UiKwuBndReq, pst, mBuf );
break;
}
case KWU_EVT_UBND_REQ: /* Unbind request */
{
break;
}
case KWU_EVT_UBND_REQ: /* Unbind request */
{
- ret = cmUnpkKwuUbndReq(
Kw
UiKwuUbndReq, pst, mBuf );
+ ret = cmUnpkKwuUbndReq(
Rlc
UiKwuUbndReq, pst, mBuf );
break;
}
default:
break;
}
default:
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from PDCP",
+
DU_LOG("\nERROR --> RLC_UL :
Received Invalid Event[%d] from PDCP",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-419,30
+399,30
@@
Buffer *mBuf; /* message buffer */
break;
}
break;
}
- case ENT
RG
:
+ case ENT
MAC
:
{
switch(pst->event)
{
#ifdef LCRGU
case EVTRGUBNDCFM: /* Bind request */
{
{
switch(pst->event)
{
#ifdef LCRGU
case EVTRGUBNDCFM: /* Bind request */
{
- ret = cmUnpkRguBndCfm(
Kw
LiRguBndCfm, pst, mBuf );
+ ret = cmUnpkRguBndCfm(
Rlc
LiRguBndCfm, pst, mBuf );
break;
}
break;
}
- case EV
TRLCULDAT: /* Dedicated Channel
Data request */
+ case EV
ENT_UL_DATA_TO_RLC: /* UL
Data request */
{
{
- ret = unpackR
cvd
UlData(RlcProcUlData, pst, mBuf);
+ ret = unpackR
lc
UlData(RlcProcUlData, pst, mBuf);
break;
}
#endif /* LCRGU */
default:
break;
}
#endif /* LCRGU */
default:
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from MAC",
+
DU_LOG("\nERROR --> RLC_UL :
Received Invalid Event[%d] from MAC",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-458,7
+438,7
@@
Buffer *mBuf; /* message buffer */
case KWU_EVT_TTI_IND:
{
rlcUlBatchProc();
case KWU_EVT_TTI_IND:
{
rlcUlBatchProc();
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
break;
}
}
break;
}
}
@@
-467,7
+447,7
@@
Buffer *mBuf; /* message buffer */
#endif/* End for TENB_T2K3K_SPECIFIC_CHANGES and L2_L3_SPLIT */
#ifndef UL_RLC_NET_CLUSTER
#ifdef TENB_STATS
#endif/* End for TENB_T2K3K_SPECIFIC_CHANGES and L2_L3_SPLIT */
#ifndef UL_RLC_NET_CLUSTER
#ifdef TENB_STATS
- case ENT
TF
:
+ case ENT
LWRMAC
:
{
switch(pst->event)
{
{
switch(pst->event)
{
@@
-478,14
+458,14
@@
Buffer *mBuf; /* message buffer */
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
TSL2SendStatsToApp(&(tRlcCb->genCfg.lmPst), 0);
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
TSL2SendStatsToApp(&(tRlcCb->genCfg.lmPst), 0);
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
break;
}
default:
{
break;
}
default:
{
-
printf("\n ERROR
Invalid Event[%d] from CL to PDCPUL\n",
+
DU_LOG("\nERROR --> RLC_UL :
Invalid Event[%d] from CL to PDCPUL\n",
pst->event);
pst->event);
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
break;
}
}
break;
}
}
@@
-497,9
+477,9
@@
Buffer *mBuf; /* message buffer */
{
if (pst->dstInst < MAX_RLC_INSTANCES)
{
{
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR, "
Received Invalid Source Entity[%d]",pst->event);
+
DU_LOG("\nERROR --> RLC_UL :
Received Invalid Source Entity[%d]",pst->event);
}
}
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
ret = RFAILED;
break;
}
ret = RFAILED;
break;
}