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 "Deleted the rlog folder"
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_dl_ex_ms.c
diff --git
a/src/5gnrrlc/kw_dl_ex_ms.c
b/src/5gnrrlc/kw_dl_ex_ms.c
index
ea4fc8f
..
16492a2
100755
(executable)
--- a/
src/5gnrrlc/kw_dl_ex_ms.c
+++ b/
src/5gnrrlc/kw_dl_ex_ms.c
@@
-18,19
+18,16
@@
/********************************************************************20**
/********************************************************************20**
- Name:
LTE-
RLC Layer - System Services Interface Functions
+ Name:
NR
RLC Layer - System Services Interface Functions
Type: C file
Desc: C source code for the interface to System Services
Type: C file
Desc: C source code for the interface to System Services
- of
LTE-
RLC
+ of
NR
RLC
File: kw_dl_ex_ms.c
*********************************************************************21*/
File: kw_dl_ex_ms.c
*********************************************************************21*/
-static const char* RLOG_MODULE_NAME="RLC_DL";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=195;
/** @filekw_dl_ex_ms.c
@brief RLC System Services Interface
/** @filekw_dl_ex_ms.c
@brief RLC System Services Interface
@@
-59,22
+56,23
@@
static int RLOG_FILE_ID=195;
#include "kw_udx.x"
#include "kw_dl.x"
#include "du_app_rlc_inf.h"
#include "kw_udx.x"
#include "kw_dl.x"
#include "du_app_rlc_inf.h"
+#include "rlc_mac_inf.h"
#include "ctf.h"
S16 rlcUtlDlBatchProcPkts(Void);
S16 rlcDlBatchProc(Void);
#if (defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS))
#include "ctf.h"
S16 rlcUtlDlBatchProcPkts(Void);
S16 rlcDlBatchProc(Void);
#if (defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS))
-
U32
isDatReqProcessed;
+
uint32_t
isDatReqProcessed;
void rlcUtlDlBatchProcHqStaInd ARGS ((Void));
#endif
#if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF))
void rlcUtlDlBatchProcHqStaInd ARGS ((Void));
#endif
#if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF))
-
EXTERN
S16 rlcDlBatchProcSplit ARGS((Void));
+S16 rlcDlBatchProcSplit ARGS((Void));
#endif
//UDAY
#ifdef L2_OPTMZ
#endif
//UDAY
#ifdef L2_OPTMZ
-
U32
rlcAmmStaPduList[512] = {0};
-
EXTERN
S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf));
+
uint32_t
rlcAmmStaPduList[512] = {0};
+S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf));
#endif
S16 rlcDlInitExt ARGS (( Void ));
\f
#endif
S16 rlcDlInitExt ARGS (( Void ));
\f
@@
-92,16
+90,8
@@
S16 rlcDlInitExt ARGS (( Void ));
*
*/
*
*/
-#ifdef ANSI
-S16 rlcDlInitExt
-(
-)
-#else
S16 rlcDlInitExt()
S16 rlcDlInitExt()
-#endif
{
{
- TRC2(rlcDlInitExt);
-
return ROK;
} /* kwInitExt */
return ROK;
} /* kwInitExt */
@@
-117,16
+107,16
@@
S16 rlcDlInitExt()
* <b> Activates Initialization </b>
*
* @b Description:
* <b> Activates Initialization </b>
*
* @b Description:
- * This function is invoked by system services to initialize the
LTE-
RLC
+ * This function is invoked by system services to initialize the
NR
RLC
* layer. This is an entry point used by LTE_RLC layer to initialize its
* global variables, before becoming operational.
*
* Allowable values for parameters are specified in ssi.h.
*
* layer. This is an entry point used by LTE_RLC layer to initialize its
* global variables, before becoming operational.
*
* Allowable values for parameters are specified in ssi.h.
*
- * @param[in] ent - Specify the entity id of the
LTE-
RLC task.
- * @param[in] inst - Specify the entity id of the
LTE-
RLC task.
+ * @param[in] ent - Specify the entity id of the
NR
RLC task.
+ * @param[in] inst - Specify the entity id of the
NR
RLC task.
* @param[in] region - Specifies the memory region from which
* @param[in] region - Specifies the memory region from which
- *
LTE-
RLC should allocate structures and buffers.
+ *
NR
RLC should allocate structures and buffers.
* @param[in] reason - Specifies the reason for calling this
* initialization function.
*
* @param[in] reason - Specifies the reason for calling this
* initialization function.
*
@@
-134,7
+124,6
@@
S16 rlcDlInitExt()
* -# ROK
*
*/
* -# ROK
*
*/
-#ifdef ANSI
S16 rlcDlActvInit
(
Ent ent, /* entity */
S16 rlcDlActvInit
(
Ent ent, /* entity */
@@
-142,16
+131,8
@@
Inst inst, /* instance */
Region region, /* region */
Reason reason /* reason */
)
Region region, /* region */
Reason reason /* reason */
)
-#else
-S16 rlcDlActvInit(ent, inst, region, reason)
-Ent ent; /* entity */
-Inst inst; /* instance */
-Region region; /* region */
-Reason reason; /* reason */
-#endif
{
RlcCb *tRlcCb;
{
RlcCb *tRlcCb;
- TRC3(rlcDlActvInit)
if (inst >= MAX_RLC_INSTANCES)
{
if (inst >= MAX_RLC_INSTANCES)
{
@@
-182,7
+163,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;
@@
-195,7
+176,7
@@
Reason reason; /* reason */
SGetMsg(1, 0 , &mBuf);
ssGetDBufOfSize(1 , 1800, &bufPtr);
SUpdMsg(mBuf, bufPtr, 0);
SGetMsg(1, 0 , &mBuf);
ssGetDBufOfSize(1 , 1800, &bufPtr);
SUpdMsg(mBuf, bufPtr, 0);
- rlcAmmStaPduList[i] = (
U32
)mBuf;
+ rlcAmmStaPduList[i] = (
uint32_t
)mBuf;
}
#endif
/* call external function for intialization */
}
#endif
/* call external function for intialization */
@@
-216,7
+197,7
@@
Reason reason; /* reason */
* <b> Activation Task </b>
*
* @b Description:
* <b> Activation Task </b>
*
* @b Description:
- * Processes events received for
MLTE-
RLC layer via System Services from
+ * Processes events received for
NR
RLC layer via System Services from
* other layers.
*
* @param[in] pst - Pst Structure
* other layers.
*
* @param[in] pst - Pst Structure
@@
-229,21
+210,14
@@
Reason reason; /* reason */
#if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF))
pthread_t gRlcTId = 0;
#endif
#if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF))
pthread_t gRlcTId = 0;
#endif
-#ifdef ANSI
S16 rlcDlActvTsk
(
Pst *pst, /* pst structure */
Buffer *mBuf /* message buffer */
)
S16 rlcDlActvTsk
(
Pst *pst, /* pst structure */
Buffer *mBuf /* message buffer */
)
-#else
-S16 rlcDlActvTsk(pst, mBuf)
-Pst *pst; /* pst structure */
-Buffer *mBuf; /* message buffer */
-#endif
{
S16 ret = ROK;
{
S16 ret = ROK;
- TRC3(rlcDlActvTsk);
#ifdef RLC_FREE_RING_BUF
gRlcTId = pthread_self();
#endif
#ifdef RLC_FREE_RING_BUF
gRlcTId = pthread_self();
#endif
@@
-284,7
+258,7
@@
Buffer *mBuf; /* message buffer */
#ifdef LCKWU
case KWU_EVT_DAT_REQ: /* Data request */
{
#ifdef LCKWU
case KWU_EVT_DAT_REQ: /* Data request */
{
-
ret = cmUnpkKwuDatReq(RlcUiKwuDatReq
, pst, mBuf);
+
//ret = cmUnpkKwuDatReq(rlcProcDlData
, pst, mBuf);
break;
}
#endif /* LCKWU */
break;
}
#endif /* LCKWU */
@@
-294,11
+268,16
@@
Buffer *mBuf; /* message buffer */
ret = unpackDlRrcMsgToRlc(RlcProcDlRrcMsgTransfer, pst, mBuf);
break;
}
ret = unpackDlRrcMsgToRlc(RlcProcDlRrcMsgTransfer, pst, mBuf);
break;
}
+ case EVENT_DL_USER_DATA_TRANS_TO_RLC:
+ {
+ ret = unpackRlcDlUserDataToRlc(RlcProcDlUserDataTransfer, pst, mBuf);
+ break;
+ }
default:
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
default:
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from SM",
+
DU_LOG("\nERROR --> RLC_DL :
Received Invalid Event[%d] from SM",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-380,7
+359,7
@@
Buffer *mBuf; /* message buffer */
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
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_DL :
Received Invalid Event[%d] from RLC UL",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-409,13
+388,13
@@
Buffer *mBuf; /* message buffer */
#ifdef L2_L3_SPLIT
case KWU_EVT_CPLANE_DAT_REQ: /* C-Plane Data request */
{
#ifdef L2_L3_SPLIT
case KWU_EVT_CPLANE_DAT_REQ: /* C-Plane Data request */
{
- ret = cmUnpkKwuDatReq(
RlcUiKwuDatReq
, pst, mBuf);
+ ret = cmUnpkKwuDatReq(
rlcProcDlData
, pst, mBuf);
break;
}
#else
case KWU_EVT_DAT_REQ: /* Data request */
{
break;
}
#else
case KWU_EVT_DAT_REQ: /* Data request */
{
-
ret = cmUnpkKwuDatReq(RlcUiKwuDatReq
, pst, mBuf);
+
//ret = cmUnpkKwuDatReq(rlcProcDlData
, pst, mBuf);
break;
}
#endif
break;
}
#endif
@@
-430,7
+409,7
@@
Buffer *mBuf; /* message buffer */
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from RRC",
+
DU_LOG("\nERROR --> RLC_DL :
Received Invalid Event[%d] from RRC",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-460,13
+439,13
@@
Buffer *mBuf; /* message buffer */
case KWU_EVT_CPLANE_DAT_REQ: /* C-Plane Data request */
case KWU_EVT_UPLANE_DAT_REQ: /* U-Plane Data request */
{
case KWU_EVT_CPLANE_DAT_REQ: /* C-Plane Data request */
case KWU_EVT_UPLANE_DAT_REQ: /* U-Plane Data request */
{
- ret = cmUnpkKwuDatReq(
RlcUiKwuDatReq
, pst, mBuf);
+ ret = cmUnpkKwuDatReq(
rlcProcDlData
, pst, mBuf);
break;
}
#else
case KWU_EVT_DAT_REQ: /* Data request */
{
break;
}
#else
case KWU_EVT_DAT_REQ: /* Data request */
{
-
ret = cmUnpkKwuDatReq(RlcUiKwuDatReq
, pst, mBuf);
+
//ret = cmUnpkKwuDatReq(rlcProcDlData
, pst, mBuf);
break;
}
#endif
break;
}
#endif
@@
-480,7
+459,7
@@
Buffer *mBuf; /* message buffer */
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from PDCP",
+
DU_LOG("\nERROR --> RLC_DL :
Received Invalid Event[%d] from PDCP",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-500,9
+479,9
@@
Buffer *mBuf; /* message buffer */
ret = cmUnpkRguBndCfm(RlcLiRguBndCfm, pst, mBuf );
break;
}
ret = cmUnpkRguBndCfm(RlcLiRguBndCfm, pst, mBuf );
break;
}
- case EV
TSCHREP: /* Dedicated Channel Status Response */
+ case EV
ENT_SCHED_RESULT_TO_RLC:
{
{
- ret = unpackSchedRe
p(RlcMacProcSchedRep
, pst, mBuf);
+ ret = unpackSchedRe
sultRpt(RlcProcSchedResultRpt
, pst, mBuf);
break;
}
/* kw005.201 added support for L2 Measurement */
break;
}
/* kw005.201 added support for L2 Measurement */
@@
-531,7
+510,7
@@
Buffer *mBuf; /* message buffer */
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
ODU_PUT_MSG_BUF(mBuf);
if (pst->dstInst < MAX_RLC_INSTANCES)
{
-
RLOG1(L_ERROR,"
Received Invalid Event[%d] from MAC",
+
DU_LOG("\nERROR --> RLC_DL :
Received Invalid Event[%d] from MAC",
pst->event);
}
ret = RFAILED;
pst->event);
}
ret = RFAILED;
@@
-591,7
+570,7
@@
Buffer *mBuf; /* message buffer */
if (pst->dstInst < MAX_RLC_INSTANCES)
{
/*RlcCb *tRlcCb = RLC_GET_RLCCB(pst->dstInst);*/
if (pst->dstInst < MAX_RLC_INSTANCES)
{
/*RlcCb *tRlcCb = RLC_GET_RLCCB(pst->dstInst);*/
-
RLOG1(L_ERROR, "
Received Invalid Source Entity[%d]",
+
DU_LOG("\nERROR --> RLC_DL :
Received Invalid Source Entity[%d]",
pst->event);
}
ODU_PUT_MSG_BUF(mBuf);
pst->event);
}
ODU_PUT_MSG_BUF(mBuf);