X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dl_ex_ms.c;h=adcf51f5d0ff05ce8eb33227bfa0a6a92330d2b7;hb=42f73fef5ef8722af83284e0f146b2da693a1f68;hp=ea4fc8fa092ad989ec15c64f43ca56cea2c99231;hpb=088bb8763eaf91c139ede025faf2fac7e57d25ed;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_dl_ex_ms.c b/src/5gnrrlc/kw_dl_ex_ms.c index ea4fc8fa0..adcf51f5d 100755 --- a/src/5gnrrlc/kw_dl_ex_ms.c +++ b/src/5gnrrlc/kw_dl_ex_ms.c @@ -59,6 +59,7 @@ static int RLOG_FILE_ID=195; #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); @@ -100,8 +101,6 @@ S16 rlcDlInitExt S16 rlcDlInitExt() #endif { - TRC2(rlcDlInitExt); - return ROK; } /* kwInitExt */ @@ -151,7 +150,6 @@ Reason reason; /* reason */ #endif { RlcCb *tRlcCb; - TRC3(rlcDlActvInit) if (inst >= MAX_RLC_INSTANCES) { @@ -182,7 +180,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; @@ -243,7 +241,6 @@ Buffer *mBuf; /* message buffer */ { S16 ret = ROK; - TRC3(rlcDlActvTsk); #ifdef RLC_FREE_RING_BUF gRlcTId = pthread_self(); #endif @@ -284,7 +281,7 @@ 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 */ @@ -409,13 +406,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 @@ -460,13 +457,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 @@ -500,9 +497,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 */