X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ul_ex_ms.c;h=05d850f3e7a0b2fa15652e48b117df3d56eed197;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=5793ac0b40b9f2f10e46d29e740ea2bd2c76decd;hpb=d10b52519198632f93deae9574adc69c7ce12efa;p=o-du%2Fl2.git
diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c
index 5793ac0b4..05d850f3e 100755
--- a/src/5gnrrlc/kw_ul_ex_ms.c
+++ b/src/5gnrrlc/kw_ul_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_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
@@ -38,18 +35,7 @@ static int RLOG_FILE_ID=206;
/* header (.h) include files */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-
-#include "gen.h" /* general */
-#include "ssi.h" /* system services */
-#include "cm5.h" /* common timer defines */
-#include "cm_tkns.h" /* common tokens defines */
-#include "cm_mblk.h" /* common memory allocation library defines */
-#include "cm_llist.h" /* common link list defines */
-#include "cm_hash.h" /* common hash list defines */
-#include "cm_lte.h" /* common LTE defines */
+#include "common_def.h"
#include "lkw.h" /* LKW defines */
#include "ckw.h" /* CKW defines */
#include "kwu.h" /* KWU defines */
@@ -61,16 +47,6 @@ static int RLOG_FILE_ID=206;
#include "kw_udx.h"
/* extern (.x) include files */
-#include "gen.x" /* general */
-#include "ssi.x" /* system services */
-
-#include "cm5.x" /* common timer library */
-#include "cm_tkns.x" /* common tokens */
-#include "cm_mblk.x" /* common memory allocation */
-#include "cm_llist.x" /* common link list */
-#include "cm_hash.x" /* common hash list */
-#include "cm_lte.x" /* common LTE includes */
-#include "cm_lib.x" /* common memory allocation library */
#include "lkw.x" /* LKW */
#include "ckw.x" /* CKW */
#include "kwu.x" /* KWU */
@@ -78,11 +54,15 @@ static int RLOG_FILE_ID=206;
#include "kw.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
-PUBLIC S16 kwUlInitExt ARGS (( Void ));
+S16 rlcUlInitExt ARGS (( Void ));
/**
*
@@ -98,17 +78,10 @@ PUBLIC S16 kwUlInitExt ARGS (( Void ));
*
*/
-#ifdef ANSI
-PUBLIC S16 kwUlInitExt
-(
-)
-#else
-PUBLIC S16 kwUlInitExt()
-#endif
+S16 rlcUlInitExt()
{
- TRC2(kwUlInitExt);
- RETVALUE(ROK);
+ return ROK;
} /* kwInitExt */
@@ -123,16 +96,16 @@ PUBLIC S16 kwUlInitExt()
* 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.
*
@@ -140,69 +113,60 @@ PUBLIC S16 kwUlInitExt()
* -# ROK
*
*/
-#ifdef ANSI
-PUBLIC S16 kwUlActvInit
+S16 rlcUlActvInit
(
Ent ent, /* entity */
Inst inst, /* instance */
Region region, /* region */
Reason reason /* reason */
)
-#else
-PUBLIC S16 kwUlActvInit(ent, inst, region, reason)
-Ent ent; /* entity */
-Inst inst; /* instance */
-Region region; /* region */
-Reason reason; /* reason */
-#endif
{
- KwCb *tKwCb;
- TRC3(kwDlActvInit)
+ RlcCb *tRlcCb;
- if (inst >= KW_MAX_RLC_INSTANCES)
+ if (inst >= MAX_RLC_INSTANCES)
{
/* intance greater than MAX instances */
- RETVALUE(RFAILED);
+ return RFAILED;
}
- if (kwCb[inst] != NULLP)
+ if (rlcCb[inst] != NULLP)
{
- RETVALUE (RFAILED);
+ return (RFAILED);
}
- if (SGetSBuf(region, 0, (Data **)&tKwCb,
- (Size)sizeof (KwCb)) != ROK)
+ if (SGetSBuf(region, 0, (Data **)&tRlcCb,
+ (Size)sizeof (RlcCb)) != ROK)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
- /* Initialize kwCb */
- KW_MEM_SET(tKwCb, 0, sizeof(KwCb));
+ /* Initialize rlcCb */
+ RLC_MEM_SET(tRlcCb, 0, sizeof(RlcCb));
/* Initialize task configuration parameters */
- tKwCb->init.ent = ent; /* entity */
- tKwCb->init.inst = inst; /* instance */
- tKwCb->init.region = region; /* static region */
- tKwCb->init.pool = 0; /* static pool */
- tKwCb->init.reason = reason; /* reason */
- tKwCb->init.cfgDone = FALSE; /* configuration done */
- tKwCb->init.acnt = TRUE; /* enable accounting */
- tKwCb->init.usta = TRUE; /* enable unsolicited status */
- tKwCb->init.trc = FALSE; /* enable trace */
- tKwCb->init.procId = SFndProcId();
-
- kwCb[inst] = tKwCb;
+ tRlcCb->init.ent = ent; /* entity */
+ tRlcCb->init.inst = inst; /* instance */
+ tRlcCb->init.region = region; /* static region */
+ tRlcCb->init.pool = 0; /* static pool */
+ tRlcCb->init.reason = reason; /* reason */
+ tRlcCb->init.cfgDone = FALSE; /* configuration done */
+ tRlcCb->init.acnt = TRUE; /* enable accounting */
+ tRlcCb->init.usta = TRUE; /* enable unsolicited status */
+ tRlcCb->init.trc = FALSE; /* enable trace */
+ tRlcCb->init.procId = ODU_GET_PROCID();
+
+ rlcCb[inst] = tRlcCb;
/* call external function for intialization */
/*
kwInitExt();
*/
#ifdef TENB_STATS
- TSL2AllocStatsMem(tKwCb->init.region, tKwCb->init.pool);
+ TSL2AllocStatsMem(tRlcCb->init.region, tRlcCb->init.pool);
#endif
- RETVALUE(ROK);
-} /* kwActvInit */
+ return ROK;
+} /* rlcUlActvInit */
/**
@@ -212,7 +176,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
@@ -222,21 +186,14 @@ Reason reason; /* reason */
* -# ROK
*
*/
-#ifdef ANSI
-PUBLIC S16 kwUlActvTsk
+S16 rlcUlActvTsk
(
Pst *pst, /* pst structure */
Buffer *mBuf /* message buffer */
)
-#else
-PUBLIC S16 kwUlActvTsk(pst, mBuf)
-Pst *pst; /* pst structure */
-Buffer *mBuf; /* message buffer */
-#endif
{
S16 ret = ROK;
- TRC3(kwActvTsk);
switch(pst->srcEnt)
{
@@ -247,59 +204,64 @@ Buffer *mBuf; /* message buffer */
#ifdef LCLKW
case LKW_EVT_CFG_REQ:
{
- ret = cmUnpkLkwCfgReq(KwMiLkwCfgReq, pst, mBuf);
+ ret = unpackRlcConfigReq(RlcMiRlcConfigReq, pst, mBuf);
break;
}
case LKW_EVT_CNTRL_REQ:
{
- ret = cmUnpkLkwCntrlReq(KwMiLkwCntrlReq, pst, mBuf);
+ ret = cmUnpkLkwCntrlReq(RlcMiLkwCntrlReq, pst, mBuf);
break;
}
- case RLC_EVT_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 = unpackUeCreateReq(RlcDuappProcUeCreateReq, pst, mBuf);
+ ret = unpackRlcUeReconfigReq(RlcProcUeReconfigReq, pst, mBuf);
break;
}
case LKW_EVT_STS_REQ:
{
- ret = cmUnpkLkwStsReq(KwMiLkwStsReq, pst, mBuf);
+ ret = cmUnpkLkwStsReq(RlcMiLkwStsReq, pst, mBuf);
break;
}
case LKW_EVT_STA_REQ:
{
- ret = cmUnpkLkwStaReq(KwMiLkwStaReq, pst, mBuf);
+ ret = cmUnpkLkwStaReq(RlcMiLkwStaReq, pst, mBuf);
break;
}
/* kw005.201 added support for L2 Measurement */
#ifdef LTE_L2_MEAS
case LKW_EVT_L2MEAS_REQ:
{
- ret = cmUnpkLkwL2MeasReq(KwMiLkwL2MeasReq, pst, mBuf);
+ ret = cmUnpkLkwL2MeasReq(RlcMiLkwL2MeasReq, pst, mBuf);
break;
}
case LKW_EVT_L2MEAS_SEND_REQ:
{
- ret = cmUnpkLkwL2MeasSendReq(KwMiLkwL2MeasSendReq, pst, mBuf);
+ ret = cmUnpkLkwL2MeasSendReq(RlcMiLkwL2MeasSendReq, pst, mBuf);
break;
}
case LKW_EVT_L2MEAS_STOP_REQ:
{
- ret = cmUnpkLkwL2MeasStopReq(KwMiLkwL2MeasStopReq, pst, mBuf);
+ ret = cmUnpkLkwL2MeasStopReq(RlcMiLkwL2MeasStopReq, pst, mBuf);
break;
}
#endif
#endif /* LCLKW */
default:
- SPutMsg(mBuf);
- if (pst->dstInst < KW_MAX_RLC_INSTANCES)
+ 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;
@@ -309,42 +271,42 @@ Buffer *mBuf; /* message buffer */
break;
}
- case ENTKW:
+ case ENTRLC:
{
switch(pst->event)
{
#ifdef LCUDX
case UDX_EVT_BND_CFM: /* Bind request */
{
- ret = cmUnpkUdxBndCfm(KwUlUdxBndCfm, pst, mBuf );
+ ret = cmUnpkUdxBndCfm(rlcUlUdxBndCfm, pst, mBuf );
break;
}
case UDX_EVT_CFG_CFM: /* Unbind request */
{
- ret = cmUnpkUdxCfgCfm(KwUlUdxCfgCfm, pst, mBuf );
+ ret = cmUnpkUdxCfgCfm(rlcUlUdxCfgCfm, pst, mBuf );
break;
}
case UDX_EVT_UEIDCHG_CFM: /* Configuration request */
{
- ret = cmUnpkUdxUeIdChgCfm(KwUlUdxUeIdChgCfm, pst, mBuf);
+ ret = cmUnpkUdxUeIdChgCfm(rlcUlUdxUeIdChgCfm, pst, mBuf);
break;
}
case UDX_EVT_STA_PHBT_TMR_START: /* Status Prohibit Timer Start */
{
- ret = cmUnpkUdxStaProhTmrStart(KwUlUdxStaProhTmrStart, pst, mBuf);
+ ret = cmUnpkUdxStaProhTmrStart(rlcUlUdxStaProhTmrStart, pst, mBuf);
break;
}
#endif /* LCCKW */
default:
- SPutMsg(mBuf);
- if (pst->dstInst < KW_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_UL : Received Invalid Event[%d] from RLC UL",
pst->event);
}
ret = RFAILED;
@@ -361,19 +323,19 @@ Buffer *mBuf; /* message buffer */
#ifdef LCCKW
case CKW_EVT_BND_REQ: /* Bind request */
{
- ret = cmUnpkCkwBndReq(KwUiCkwBndReq, pst, mBuf );
+ ret = cmUnpkCkwBndReq(RlcUiCkwBndReq, pst, mBuf );
break;
}
case CKW_EVT_UBND_REQ: /* Unbind request */
{
- ret = cmUnpkCkwUbndReq(KwUiCkwUbndReq, pst, mBuf );
+ ret = cmUnpkCkwUbndReq(RlcUiCkwUbndReq, pst, mBuf );
break;
}
case CKW_EVT_UEIDCHG_REQ: /* Configuration request */
{
- ret = cmUnpkCkwUeIdChgReq(KwUiCkwUeIdChgReq, pst, mBuf);
+ ret = cmUnpkCkwUeIdChgReq(RlcUiCkwUeIdChgReq, pst, mBuf);
break;
}
@@ -382,21 +344,21 @@ Buffer *mBuf; /* message buffer */
#ifdef LCKWU
case KWU_EVT_BND_REQ: /* Bind request */
{
- ret = cmUnpkKwuBndReq(KwUiKwuBndReq, pst, mBuf );
+ ret = cmUnpkKwuBndReq(RlcUiKwuBndReq, pst, mBuf );
break;
}
case KWU_EVT_UBND_REQ: /* Unbind request */
{
- ret = cmUnpkKwuUbndReq(KwUiKwuUbndReq, pst, mBuf );
+ ret = cmUnpkKwuUbndReq(RlcUiKwuUbndReq, pst, mBuf );
break;
}
#endif /* LCKWU */
default:
- SPutMsg(mBuf);
- if (pst->dstInst < KW_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_UL : Received Invalid Event[%d] from RRC",
pst->event);
}
ret = RFAILED;
@@ -413,21 +375,21 @@ Buffer *mBuf; /* message buffer */
#ifdef LCKWU
case KWU_EVT_BND_REQ: /* Bind request */
{
- ret = cmUnpkKwuBndReq(KwUiKwuBndReq, pst, mBuf );
+ ret = cmUnpkKwuBndReq(RlcUiKwuBndReq, pst, mBuf );
break;
}
case KWU_EVT_UBND_REQ: /* Unbind request */
{
- ret = cmUnpkKwuUbndReq(KwUiKwuUbndReq, pst, mBuf );
+ ret = cmUnpkKwuUbndReq(RlcUiKwuUbndReq, pst, mBuf );
break;
}
default:
- SPutMsg(mBuf);
- if (pst->dstInst < KW_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_UL : Received Invalid Event[%d] from PDCP",
pst->event);
}
ret = RFAILED;
@@ -437,30 +399,30 @@ Buffer *mBuf; /* message buffer */
break;
}
- case ENTRG:
+ case ENTMAC:
{
switch(pst->event)
{
#ifdef LCRGU
case EVTRGUBNDCFM: /* Bind request */
{
- ret = cmUnpkRguBndCfm(KwLiRguBndCfm, pst, mBuf );
+ ret = cmUnpkRguBndCfm(RlcLiRguBndCfm, pst, mBuf );
break;
}
- case EVTRLCULDAT: /* Dedicated Channel Data request */
+ case EVENT_UL_DATA_TO_RLC: /* UL Data request */
{
- ret = unpackRcvdUlData(RlcMacProcUlData, pst, mBuf);
+ ret = unpackRlcUlData(RlcProcUlData, pst, mBuf);
break;
}
#endif /* LCRGU */
default:
- SPutMsg(mBuf);
- if (pst->dstInst < KW_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_UL : Received Invalid Event[%d] from MAC",
pst->event);
}
ret = RFAILED;
@@ -475,8 +437,8 @@ Buffer *mBuf; /* message buffer */
{
case KWU_EVT_TTI_IND:
{
- kwUlBatchProc();
- SPutMsg(mBuf);
+ rlcUlBatchProc();
+ ODU_PUT_MSG_BUF(mBuf);
break;
}
}
@@ -485,25 +447,25 @@ Buffer *mBuf; /* message buffer */
#endif/* End for TENB_T2K3K_SPECIFIC_CHANGES and L2_L3_SPLIT */
#ifndef UL_RLC_NET_CLUSTER
#ifdef TENB_STATS
- case ENTTF:
+ case ENTLWRMAC:
{
switch(pst->event)
{
case TENBSTATSINIT:
{
- KwCb *tKwCb;
- tKwCb = KW_GET_KWCB(pst->dstInst);
+ RlcCb *tRlcCb;
+ tRlcCb = RLC_GET_RLCCB(pst->dstInst);
- TSL2SendStatsToApp(&(tKwCb->genCfg.lmPst), 0);
- SPutMsg(mBuf);
+ TSL2SendStatsToApp(&(tRlcCb->genCfg.lmPst), 0);
+ ODU_PUT_MSG_BUF(mBuf);
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);
- SPutMsg(mBuf);
+ ODU_PUT_MSG_BUF(mBuf);
break;
}
}
@@ -513,18 +475,18 @@ Buffer *mBuf; /* message buffer */
#endif
default:
{
- if (pst->dstInst < KW_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);
}
- SPutMsg(mBuf);
+ ODU_PUT_MSG_BUF(mBuf);
ret = RFAILED;
break;
}
}
- SExitTsk();
+ ODU_EXIT_TASK();
- RETVALUE(ret);
+ return (ret);
} /* kwActvTsk */