X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ul_ex_ms.c;h=003ff9805a298a1d8d5fd0231d33914f74794852;hb=2b5e7ba18453db526316b51476673c1ea69c1a94;hp=01fcde09a6026bf4d754887f98f78ea19ba2d98c;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c index 01fcde09a..003ff9805 100755 --- 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*/ -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 @@ -81,13 +78,7 @@ S16 rlcUlInitExt ARGS (( Void )); * */ -#ifdef ANSI -S16 rlcUlInitExt -( -) -#else S16 rlcUlInitExt() -#endif { return ROK; @@ -122,7 +113,6 @@ S16 rlcUlInitExt() * -# ROK * */ -#ifdef ANSI S16 rlcUlActvInit ( Ent ent, /* entity */ @@ -130,13 +120,6 @@ Inst inst, /* instance */ 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; @@ -203,17 +186,11 @@ Reason reason; /* reason */ * -# ROK * */ -#ifdef ANSI 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; @@ -237,9 +214,14 @@ Buffer *mBuf; /* message buffer */ 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 = unpackRlcUlUeCreateReq(RlcUlProcUeCreateReq, pst, mBuf); + ret = unpackRlcUeReconfigReq(RlcProcUeReconfigReq, pst, mBuf); break; } @@ -279,7 +261,7 @@ Buffer *mBuf; /* message buffer */ ODU_PUT_MSG_BUF(mBuf); 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; @@ -324,7 +306,7 @@ Buffer *mBuf; /* message buffer */ ODU_PUT_MSG_BUF(mBuf); 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; @@ -376,7 +358,7 @@ Buffer *mBuf; /* message buffer */ ODU_PUT_MSG_BUF(mBuf); 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; @@ -407,7 +389,7 @@ Buffer *mBuf; /* message buffer */ ODU_PUT_MSG_BUF(mBuf); 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; @@ -440,7 +422,7 @@ Buffer *mBuf; /* message buffer */ ODU_PUT_MSG_BUF(mBuf); 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; @@ -481,7 +463,7 @@ Buffer *mBuf; /* message buffer */ } 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); ODU_PUT_MSG_BUF(mBuf); break; @@ -495,7 +477,7 @@ Buffer *mBuf; /* message buffer */ { 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_BUF(mBuf); ret = RFAILED;