X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dl_ex_ms.c;h=16492a237126f8dcdb18f946ccf87061b1a7fb88;hb=069f38324ca51afc183962404383802ae8a5553c;hp=adcf51f5d0ff05ce8eb33227bfa0a6a92330d2b7;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git
diff --git a/src/5gnrrlc/kw_dl_ex_ms.c b/src/5gnrrlc/kw_dl_ex_ms.c
index adcf51f5d..16492a237 100755
--- a/src/5gnrrlc/kw_dl_ex_ms.c
+++ b/src/5gnrrlc/kw_dl_ex_ms.c
@@ -18,19 +18,16 @@
/********************************************************************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
- of LTE-RLC
+ of NR RLC
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
@@ -65,17 +62,17 @@ static int RLOG_FILE_ID=195;
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))
-EXTERN S16 rlcDlBatchProcSplit ARGS((Void));
+S16 rlcDlBatchProcSplit ARGS((Void));
#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 ));
@@ -93,13 +90,7 @@ S16 rlcDlInitExt ARGS (( Void ));
*
*/
-#ifdef ANSI
-S16 rlcDlInitExt
-(
-)
-#else
S16 rlcDlInitExt()
-#endif
{
return ROK;
} /* kwInitExt */
@@ -116,16 +107,16 @@ S16 rlcDlInitExt()
* Activates Initialization
*
* @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.
*
- * @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
- * 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.
*
@@ -133,7 +124,6 @@ S16 rlcDlInitExt()
* -# ROK
*
*/
-#ifdef ANSI
S16 rlcDlActvInit
(
Ent ent, /* entity */
@@ -141,13 +131,6 @@ Inst inst, /* instance */
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;
@@ -193,7 +176,7 @@ Reason reason; /* reason */
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 */
@@ -214,7 +197,7 @@ Reason reason; /* reason */
* Activation Task
*
* @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
@@ -227,17 +210,11 @@ Reason reason; /* reason */
#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 */
)
-#else
-S16 rlcDlActvTsk(pst, mBuf)
-Pst *pst; /* pst structure */
-Buffer *mBuf; /* message buffer */
-#endif
{
S16 ret = ROK;
@@ -291,11 +268,16 @@ Buffer *mBuf; /* message buffer */
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)
{
- RLOG1(L_ERROR,"Received Invalid Event[%d] from SM",
+ DU_LOG("\nERROR --> RLC_DL : Received Invalid Event[%d] from SM",
pst->event);
}
ret = RFAILED;
@@ -377,7 +359,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_DL : Received Invalid Event[%d] from RLC UL",
pst->event);
}
ret = RFAILED;
@@ -427,7 +409,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_DL : Received Invalid Event[%d] from RRC",
pst->event);
}
ret = RFAILED;
@@ -477,7 +459,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_DL : Received Invalid Event[%d] from PDCP",
pst->event);
}
ret = RFAILED;
@@ -528,7 +510,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_DL : Received Invalid Event[%d] from MAC",
pst->event);
}
ret = RFAILED;
@@ -588,7 +570,7 @@ Buffer *mBuf; /* message buffer */
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);