X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ptui.c;h=840d46028d9fa1487e2ad5ac94e52ac1fc715659;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=47c1ab79f3042532a696f1e518f1f461ff9dcffd;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c index 47c1ab79f..840d46028 100755 --- a/src/5gnrrlc/kw_ptui.c +++ b/src/5gnrrlc/kw_ptui.c @@ -18,18 +18,15 @@ /********************************************************************20** - Name: LTE-RLC Layer - Upper Interface + Name: NR RLC Layer - Upper Interface Type: C file - Desc: C source code for the upper interface of LTE-RLC + Desc: C source code for the upper interface of NR RLC File: kw_ptui.c *********************************************************************21*/ -static const char* RLOG_MODULE_NAME="UIM"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=199; /** @file kw_ptui.c @brief RLC Upper Interface @@ -253,19 +250,12 @@ KwuDatAckInd kwUiKwuDatAckIndMt[] = * -# ROK * */ -#ifdef ANSI S16 RlcUiKwuBndCfm ( -Pst *pst, /* post structure */ -SuId suId, /* Service User Id */ -uint8_t status /* Status */ +Pst *pst, /* post structure */ +SuId suId, /* Service User Id */ +uint8_t status /* Status */ ) -#else -S16 RlcUiKwuBndCfm(pst, suId, status) -Pst *pst; /* post structure */ -SuId suId; /* Service User Id */ -uint8_t status; /* Status */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -296,19 +286,12 @@ uint8_t status; /* Status */ * -# ROK * -# RFAILED */ -#ifdef ANSI S16 rlcSendUlDataToDu ( Pst *pst, KwuDatIndInfo *datInd, Buffer *mBuf ) -#else -S16 rlcSendUlDataToDu(pst, datInd, mBuf) -Pst *pst; -KwuDatIndInfo *datInd; -Buffer *mBuf; -#endif { /* jump to specific primitive depending on configured selector */ @@ -340,19 +323,12 @@ Buffer *mBuf; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiKwuDatCfm ( -Pst *pst, -SuId suId, -KwuDatCfmInfo *datCfm +Pst *pst, +SuId suId, +KwuDatCfmInfo *datCfm ) -#else -S16 RlcUiKwuDatCfm(pst, suId, datCfm) -Pst *pst; -SuId suId; -KwuDatCfmInfo *datCfm; -#endif { rlcDatCfmsSent++; @@ -384,19 +360,12 @@ KwuDatCfmInfo *datCfm; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiKwuStaInd ( Pst *pst, SuId suId, KwuStaIndInfo *staInd ) -#else -S16 RlcUiKwuStaInd(pst, suId, staInd) -Pst *pst; -SuId suId; -KwuStaIndInfo *staInd; -#endif { /* jump to specific primitive depending on configured selector */ @@ -427,21 +396,14 @@ KwuStaIndInfo *staInd; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiKwuReEstCmpInd ( Pst *pst, SuId suId, CmLteRlcId rlcId ) -#else -S16 RlcUiKwuReEstCmpInd(pst, suId, rlcId) -Pst *pst; -SuId suId; -CmLteRlcId rlcId; -#endif { - RLOG0(L_DEBUG, "In RlcUiKwuReEstCmpInd"); + DU_LOG("\nINFO --> RLC : In RlcUiKwuReEstCmpInd"); /* jump to specific primitive depending on configured selector */ (*kwUiKwuReEstCmpIndMt[pst->selector])(pst, suId, rlcId); @@ -469,19 +431,12 @@ CmLteRlcId rlcId; * -# ROK * -# RFAILED */ -#ifdef ANSI S16 RlcUiKwuDiscSduCfm ( Pst *pst, SuId suId, KwuDiscSduInfo *discCfm ) -#else -S16 RlcUiKwuDiscSduCfm(pst, suId, discCfm) -Pst *pst; -SuId suId; -KwuDiscSduInfo *discCfm; -#endif { /* jump to specific primitive depending on configured selector */ @@ -510,19 +465,7 @@ KwuDiscSduInfo *discCfm; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 RlcUiKwuFlowCntrlInd -( -Pst *pst, -SuId suId, -KwuFlowCntrlIndInfo *flowCntrlIndInfo -) -#else -S16 RlcUiKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo) -Pst *pst; -SuId suId; -KwuFlowCntrlIndInfo *flowCntrlIndInfo; -#endif +S16 RlcUiKwuFlowCntrlInd(Pst *pst,SuId suId,KwuFlowCntrlIndInfo *flowCntrlIndInfo) { /* jump to specific primitive depending on configured selector */ @@ -551,19 +494,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; * -# ROK * -# RFAILED */ -#ifdef ANSI -S16 RlcUiKwuDatAckInd -( -Pst *pst, -SuId suId, -KwuDatAckInfo *datAckInd -) -#else -S16 RlcUiKwuDatAckInd(pst, suId, datAckInd) -Pst *pst; -SuId suId; -KwuDatAckInfo *datAckInd; -#endif +S16 RlcUiKwuDatAckInd(Pst *pst,SuId suId,KwuDatAckInfo *datAckInd) { /* jump to specific primitive depending on configured selector */ @@ -639,19 +570,12 @@ CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] = * @return S16 * -# ROK */ -#ifdef ANSI S16 RlcUiCkwBndCfm ( -Pst *pst, /* post structure */ -SuId suId, /* Service User Id */ -uint8_t status /* Status */ +Pst *pst, /* post structure */ +SuId suId, /* Service User Id */ +uint8_t status /* Status */ ) -#else -S16 RlcUiCkwBndCfm(pst, suId, status) -Pst *pst; /* post structure */ -SuId suId; /* Service User Id */ -uint8_t status; /* Status */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -682,19 +606,12 @@ uint8_t status; /* Status */ * -# ROK * */ -#ifdef ANSI S16 RlcUiRlcCfgCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ RlcCfgCfmInfo *cfmInfo /* Configuration Confirm */ ) -#else -S16 RlcUiRlcCfgCfm(pst, suId, cfmInfo) -Pst *pst; /* post structure */ -SuId suId; /* Service User Id */ -RlcCfgCfmInfo *cfmInfo; /* Configuration Confirm */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -725,7 +642,6 @@ RlcCfgCfmInfo *cfmInfo; /* Configuration Confirm */ * -# ROK * */ -#ifdef ANSI S16 RlcUiCkwUeIdChgCfm ( Pst *pst, /* post structure */ @@ -734,14 +650,6 @@ uint32_t transId, CkwUeInfo *ueInfo, CmStatus status ) -#else -S16 RlcUiCkwUeIdChgCfm(pst, suId, transId,ueInfo,status) -Pst *pst; /* post structure */ -SuId suId; /* Service User Id */ -uint32_t transId; -CkwUeInfo *ueInfo; -CmStatus status; -#endif { /* jump to specific primitive depending on configured selector */ @@ -762,15 +670,7 @@ CmStatus status; * @return S16 * -# ROK */ -#ifdef ANSI -S16 rlcDlBatchProcSplit -( -Void -) -#else -S16 rlcDlBatchProcSplit() -Void; -#endif +S16 rlcDlBatchProcSplit(Void) { /* Read from Ring Buffer and process PDCP packets */ @@ -809,7 +709,7 @@ Void; } else { - RLOG0(L_ERROR, "mBuf is NULL"); + DU_LOG("\nERROR --> RLC : mBuf is NULL"); if(datReq->mBuf) cmUnpkKwuDatReq(rlcProcDlData, &datReq->pst, datReq->mBuf); @@ -842,15 +742,7 @@ Void; #endif #if defined(PDCP_RLC_DL_RBUF) || defined(SS_RBUF) -#ifdef ANSI -S16 rlcDlBatchProc -( -Void -) -#else -S16 rlcDlBatchProc() -Void; -#endif +S16 rlcDlBatchProc(Void) { /* Read from Ring Buffer and process PDCP packets */ @@ -868,7 +760,7 @@ Void; #endif Void *elmIndx = NULLP; KwuDatReqDetl *kwuDatReqDetl = NULLP; - KwuDatReqInfo datReq; + RlcDatReqInfo datReq; rngBufDeqMaxCnt = SS_RNG_MAX_DLPDCP_TO_DLRLC_DQ_CNT; #ifdef TENB_T2K3K_SPECIFIC_CHANGES @@ -912,15 +804,7 @@ Void; } -#ifdef ANSI -S16 rlcUtlDlBatchProcPkts -( -Void -) -#else -S16 rlcUtlDlBatchProcPkts -Void; -#endif +S16 rlcUtlDlBatchProcPkts(Void) { rlcDlBatchProc(); #ifdef SS_RBUF @@ -933,15 +817,7 @@ Void; } -#ifdef ANSI -S16 rlcUtlDlFreeRlcRBuf -( -Void -) -#else -S16 rlcUtlDlFreeRlcRBuf -Void; -#endif +S16 rlcUtlDlFreeRlcRBuf(Void) { /* Read from Ring Buffer and process PDCP packets */ Void *elmIndx = NULLP;