X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ul_ex_ms.c;h=72b6301bd8c1f456d501117c559359aaa016890a;hb=aee73991f728cc127d1ed76d5a52571d916235a4;hp=c72ae37b60588117ac4ad1d845e21c1ba147387a;hpb=d349ae65e1495488772f87e5cfa1ae71d9eab075;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c index c72ae37b6..72b6301bd 100755 --- a/src/5gnrrlc/kw_ul_ex_ms.c +++ b/src/5gnrrlc/kw_ul_ex_ms.c @@ -38,18 +38,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 +50,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 +57,14 @@ static int RLOG_FILE_ID=206; #include "kw.x" #include "kw_ul.x" #include "kw_udx.x" + +#include "du_app_rlc_inf.h" + #ifdef TENB_STATS #include "l2_tenb_stats.x" #endif -PUBLIC S16 kwUlInitExt ARGS (( Void )); +PUBLIC S16 rlcUlInitExt ARGS (( Void )); /** * @@ -99,16 +81,16 @@ PUBLIC S16 kwUlInitExt ARGS (( Void )); */ #ifdef ANSI -PUBLIC S16 kwUlInitExt +PUBLIC S16 rlcUlInitExt ( ) #else -PUBLIC S16 kwUlInitExt() +PUBLIC S16 rlcUlInitExt() #endif { - TRC2(kwUlInitExt); + TRC2(rlcUlInitExt); - RETVALUE(ROK); + return ROK; } /* kwInitExt */ @@ -141,7 +123,7 @@ PUBLIC S16 kwUlInitExt() * */ #ifdef ANSI -PUBLIC S16 kwUlActvInit +PUBLIC S16 rlcUlActvInit ( Ent ent, /* entity */ Inst inst, /* instance */ @@ -149,60 +131,60 @@ Region region, /* region */ Reason reason /* reason */ ) #else -PUBLIC S16 kwUlActvInit(ent, inst, region, reason) +PUBLIC S16 rlcUlActvInit(ent, inst, region, reason) Ent ent; /* entity */ Inst inst; /* instance */ Region region; /* region */ Reason reason; /* reason */ #endif { - KwCb *tKwCb; - TRC3(kwDlActvInit) + RlcCb *tRlcCb; + TRC3(rlcUlActvInit) - 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 = SFndProcId(); + + 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 */ /** @@ -223,13 +205,13 @@ Reason reason; /* reason */ * */ #ifdef ANSI -PUBLIC S16 kwUlActvTsk +PUBLIC S16 rlcUlActvTsk ( Pst *pst, /* pst structure */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 kwUlActvTsk(pst, mBuf) +PUBLIC S16 rlcUlActvTsk(pst, mBuf) Pst *pst; /* pst structure */ Buffer *mBuf; /* message buffer */ #endif @@ -247,7 +229,7 @@ Buffer *mBuf; /* message buffer */ #ifdef LCLKW case LKW_EVT_CFG_REQ: { - ret = cmUnpkLkwCfgReq(KwMiLkwCfgReq, pst, mBuf); + ret = unpackRlcConfigReq(KwMiRlcConfigReq, pst, mBuf); break; } @@ -256,6 +238,12 @@ Buffer *mBuf; /* message buffer */ ret = cmUnpkLkwCntrlReq(KwMiLkwCntrlReq, pst, mBuf); break; } + + case EVENT_RLC_UL_UE_CREATE_REQ: /* UE Create Request */ + { + ret = unpackRlcUlUeCreateReq(RlcUlProcUeCreateReq, pst, mBuf); + break; + } case LKW_EVT_STS_REQ: { @@ -290,8 +278,8 @@ Buffer *mBuf; /* message buffer */ #endif #endif /* LCLKW */ default: - SPutMsg(mBuf); - if (pst->dstInst < KW_MAX_RLC_INSTANCES) + ODU_PUT_MSG(mBuf); + if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_FATAL,"Received Invalid Event[%d] from SM", pst->event); @@ -310,33 +298,33 @@ Buffer *mBuf; /* message buffer */ #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(mBuf); + if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RLC UL", pst->event); @@ -365,12 +353,6 @@ Buffer *mBuf; /* message buffer */ break; } - case CKW_EVT_CFG_REQ: /* Configuration request */ - { - ret = cmUnpkCkwCfgReq(KwUiCkwCfgReq, pst, mBuf); - break; - } - case CKW_EVT_UEIDCHG_REQ: /* Configuration request */ { ret = cmUnpkCkwUeIdChgReq(KwUiCkwUeIdChgReq, pst, mBuf); @@ -393,8 +375,8 @@ Buffer *mBuf; /* message buffer */ } #endif /* LCKWU */ default: - SPutMsg(mBuf); - if (pst->dstInst < KW_MAX_RLC_INSTANCES) + ODU_PUT_MSG(mBuf); + if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RRC", pst->event); @@ -424,8 +406,8 @@ Buffer *mBuf; /* message buffer */ } default: - SPutMsg(mBuf); - if (pst->dstInst < KW_MAX_RLC_INSTANCES) + ODU_PUT_MSG(mBuf); + if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from PDCP", pst->event); @@ -448,23 +430,17 @@ Buffer *mBuf; /* message buffer */ break; } - case EVTRGUCDATIND: /* Coomon Channel Data request */ - { - ret = cmUnpkRguCDatInd(KwLiRguCDatInd, pst, mBuf); - break; - } - - case EVTRGUDDATIND: /* Dedicated Channel Data request */ + case EVTRLCULDAT: /* Dedicated Channel Data request */ { - ret = cmUnpkRguDDatInd(KwLiRguDDatInd, pst, mBuf); + ret = unpackRcvdUlData(RlcProcUlData, pst, mBuf); break; } #endif /* LCRGU */ default: - SPutMsg(mBuf); - if (pst->dstInst < KW_MAX_RLC_INSTANCES) + ODU_PUT_MSG(mBuf); + if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from MAC", pst->event); @@ -481,8 +457,8 @@ Buffer *mBuf; /* message buffer */ { case KWU_EVT_TTI_IND: { - kwUlBatchProc(); - SPutMsg(mBuf); + rlcUlBatchProc(); + ODU_PUT_MSG(mBuf); break; } } @@ -498,18 +474,18 @@ Buffer *mBuf; /* message buffer */ 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(mBuf); break; } default: { printf("\n ERROR Invalid Event[%d] from CL to PDCPUL\n", pst->event); - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); break; } } @@ -519,18 +495,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); } - SPutMsg(mBuf); + ODU_PUT_MSG(mBuf); ret = RFAILED; break; } } - SExitTsk(); + ODU_EXIT_TASK(); - RETVALUE(ret); + return (ret); } /* kwActvTsk */