X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_dl_ex_ms.c;h=77d3a52ca3b5595acf2d160abaffc631c0d14098;hb=2b5e7ba18453db526316b51476673c1ea69c1a94;hp=e069a598a6fb445e00644e84637e6541454bc9f9;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dl_ex_ms.c b/src/5gnrrlc/kw_dl_ex_ms.c index e069a598a..77d3a52ca 100755 --- a/src/5gnrrlc/kw_dl_ex_ms.c +++ b/src/5gnrrlc/kw_dl_ex_ms.c @@ -58,22 +58,24 @@ static int RLOG_FILE_ID=195; #include "kw.x" #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)) -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 )); @@ -91,16 +93,8 @@ S16 rlcDlInitExt ARGS (( Void )); * */ -#ifdef ANSI -S16 rlcDlInitExt -( -) -#else S16 rlcDlInitExt() -#endif { - TRC2(rlcDlInitExt); - return ROK; } /* kwInitExt */ @@ -133,7 +127,6 @@ S16 rlcDlInitExt() * -# ROK * */ -#ifdef ANSI S16 rlcDlActvInit ( Ent ent, /* entity */ @@ -141,16 +134,8 @@ 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; - TRC3(rlcDlActvInit) if (inst >= MAX_RLC_INSTANCES) { @@ -181,7 +166,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.procId = SFndProcId(); + tRlcCb->init.procId = ODU_GET_PROCID(); rlcCb[inst] = tRlcCb; @@ -194,7 +179,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 */ @@ -228,21 +213,14 @@ 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; - TRC3(rlcDlActvTsk); #ifdef RLC_FREE_RING_BUF gRlcTId = pthread_self(); #endif @@ -283,12 +261,18 @@ Buffer *mBuf; /* message buffer */ #ifdef LCKWU case KWU_EVT_DAT_REQ: /* Data request */ { - ret = cmUnpkKwuDatReq(RlcUiKwuDatReq, pst, mBuf); + //ret = cmUnpkKwuDatReq(rlcProcDlData, pst, mBuf); break; } #endif /* LCKWU */ + + case EVENT_DL_RRC_MSG_TRANS_TO_RLC: + { + ret = unpackDlRrcMsgToRlc(RlcProcDlRrcMsgTransfer, pst, mBuf); + break; + } default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from SM", @@ -370,7 +354,7 @@ Buffer *mBuf; /* message buffer */ } default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RLC UL", @@ -402,13 +386,13 @@ Buffer *mBuf; /* message buffer */ #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 */ { - ret = cmUnpkKwuDatReq(RlcUiKwuDatReq, pst, mBuf); + //ret = cmUnpkKwuDatReq(rlcProcDlData, pst, mBuf); break; } #endif @@ -420,7 +404,7 @@ Buffer *mBuf; /* message buffer */ #endif /* LCKWU */ default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RRC", @@ -453,13 +437,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 */ { - ret = cmUnpkKwuDatReq(RlcUiKwuDatReq, pst, mBuf); + ret = cmUnpkKwuDatReq(rlcProcDlData, pst, mBuf); break; } #else case KWU_EVT_DAT_REQ: /* Data request */ { - ret = cmUnpkKwuDatReq(RlcUiKwuDatReq, pst, mBuf); + //ret = cmUnpkKwuDatReq(rlcProcDlData, pst, mBuf); break; } #endif @@ -470,7 +454,7 @@ Buffer *mBuf; /* message buffer */ } default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from PDCP", @@ -493,9 +477,9 @@ Buffer *mBuf; /* message buffer */ ret = cmUnpkRguBndCfm(RlcLiRguBndCfm, pst, mBuf ); break; } - case EVTSCHREP: /* Dedicated Channel Status Response */ + case EVENT_SCHED_RESULT_TO_RLC: { - ret = unpackSchedRep(RlcMacProcSchedRep, pst, mBuf); + ret = unpackSchedResultRpt(RlcProcSchedResultRpt, pst, mBuf); break; } /* kw005.201 added support for L2 Measurement */ @@ -521,7 +505,7 @@ Buffer *mBuf; /* message buffer */ #endif default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from MAC", @@ -543,7 +527,7 @@ Buffer *mBuf; /* message buffer */ break; } } - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); break; } #endif @@ -571,7 +555,7 @@ Buffer *mBuf; /* message buffer */ rlcUtlFreeDlMem(); #endif - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); break; } } @@ -587,7 +571,7 @@ Buffer *mBuf; /* message buffer */ RLOG1(L_ERROR, "Received Invalid Source Entity[%d]", pst->event); } - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); ret = RFAILED; break; }