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
108c30a
..
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,6
+55,7
@@
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 "du_app_rlc_inf.h"
#ifdef TENB_STATS
@@
-80,15
+78,8
@@
S16 rlcUlInitExt ARGS (( Void ));
*
*/
*
*/
-#ifdef ANSI
-S16 rlcUlInitExt
-(
-)
-#else
S16 rlcUlInitExt()
S16 rlcUlInitExt()
-#endif
{
{
- TRC2(rlcUlInitExt);
return ROK;
} /* kwInitExt */
return ROK;
} /* kwInitExt */
@@
-122,7
+113,6
@@
S16 rlcUlInitExt()
* -# ROK
*
*/
* -# ROK
*
*/
-#ifdef ANSI
S16 rlcUlActvInit
(
Ent ent, /* entity */
S16 rlcUlActvInit
(
Ent ent, /* entity */
@@
-130,16
+120,8
@@
Inst inst, /* instance */
Region region, /* region */
Reason reason /* reason */
)
Region region, /* region */
Reason reason /* reason */
)
-#else
-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
S16 rlcUlActvTsk
(
Pst *pst, /* pst structure */
Buffer *mBuf /* message buffer */
)
S16 rlcUlActvTsk
(
Pst *pst, /* pst structure */
Buffer *mBuf /* message buffer */
)
-#else
-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)
{
@@
-239,9
+214,14
@@
Buffer *mBuf; /* message buffer */
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;
}
break;
}
@@
-278,10
+258,10
@@
Buffer *mBuf; /* message buffer */
#endif
#endif /* LCLKW */
default:
#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;
@@
-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;
@@
-375,10
+355,10
@@
Buffer *mBuf; /* message buffer */
}
#endif /* LCKWU */
default:
}
#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;
@@
-406,10
+386,10
@@
Buffer *mBuf; /* message buffer */
}
default:
}
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;
@@
-430,19
+410,19
@@
Buffer *mBuf; /* message buffer */
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;
}
}
@@
-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;
}