X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ptui.c;h=e9f8756d01674245e1ad272799cad2d048f258cd;hb=2193e4cf01012809495be026097e8d7eacb9f0ac;hp=1d5896854bcdc9077290285ab69a5d09962df3e4;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c index 1d5896854..e9f8756d0 100755 --- a/src/5gnrrlc/kw_ptui.c +++ b/src/5gnrrlc/kw_ptui.c @@ -62,25 +62,6 @@ static int RLOG_FILE_ID=199; #include "mt_plat_t33.x" #endif -#ifndef LCKWUIKWU -#define PTKWKWU -#endif - -#ifndef LCKWUICKW -#define PTKWCKW -#endif - -#ifndef NH -#define PTKWKWU -#define PTKWCKW -#endif - -#ifndef PJ -#define PTKWKWU -#define PTKWCKW -#endif - - #ifdef __cplusplus EXTERN "C" { #endif /* __cplusplus */ @@ -90,16 +71,16 @@ EXTERN "C" { * Forward Declartion for KWU Porting Functions ********************************************************************/ #if defined(PDCP_RLC_DL_RBUF) || defined(SS_RBUF) -PUBLIC S16 rlcDlBatchProc ARGS ((Void)); -PUBLIC S16 kwUtlDlFreeRlcRBuf ARGS((Void)); -EXTERN void kwUtlDlBatchProcHqStaInd ARGS ((Void)); -EXTERN Void kwUtlFreeDlMem ARGS((Void)); +S16 rlcDlBatchProc ARGS ((Void)); +S16 rlcUtlDlFreeRlcRBuf ARGS((Void)); +EXTERN void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); +EXTERN Void rlcUtlFreeDlMem ARGS((Void)); EXTERN SsRngBufCnt rngCb; -EXTERN S16 kwUtlDlBatchProcPkts ARGS((Void)); +EXTERN S16 rlcUtlDlBatchProcPkts ARGS((Void)); #endif #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF)) -PUBLIC S16 rlcDlBatchProcSplit ARGS((Void)); +S16 rlcDlBatchProcSplit ARGS((Void)); #endif @@ -109,7 +90,7 @@ PUBLIC S16 rlcDlBatchProcSplit ARGS((Void)); /* KWU Bind Confirm primitive */ -PUBLIC KwuBndCfm kwUiKwuBndCfmMt[] = +KwuBndCfm kwUiKwuBndCfmMt[] = { #ifdef LCKWUIKWU cmPkKwuBndCfm, /* 0 - loosely coupled */ @@ -131,7 +112,7 @@ PUBLIC KwuBndCfm kwUiKwuBndCfmMt[] = /* KWU Data Indication primitive */ -PUBLIC KwuDatInd kwUiKwuDatIndMt[] = +KwuDatInd kwUiKwuDatIndMt[] = { #ifdef LCKWUIKWU cmPkKwuDatInd, /* 0 - loosely coupled */ @@ -153,7 +134,7 @@ PUBLIC KwuDatInd kwUiKwuDatIndMt[] = }; #ifndef KW_PDCP -PUBLIC KwuDatCfm kwUiKwuDatCfmMt[] = +KwuDatCfm kwUiKwuDatCfmMt[] = { #ifdef LCKWUIKWU cmPkKwuDatCfm, /* 0 - loosely coupled */ @@ -170,7 +151,7 @@ PUBLIC KwuDatCfm kwUiKwuDatCfmMt[] = /* KWU AM Status Indication primitive */ -PUBLIC KwuStaInd kwUiKwuStaIndMt[] = +KwuStaInd kwUiKwuStaIndMt[] = { #ifdef LCKWUIKWU cmPkKwuStaInd, /* 0 - loosely coupled */ @@ -185,7 +166,7 @@ PUBLIC KwuStaInd kwUiKwuStaIndMt[] = #endif /*TENB_ACC*/ }; -PUBLIC KwuReEstCmpInd kwUiKwuReEstCmpIndMt[] = +KwuReEstCmpInd kwUiKwuReEstCmpIndMt[] = { #ifdef LCKWUIKWU cmPkKwuReEstCmpInd, /* 0 - loosely coupled */ @@ -202,7 +183,7 @@ PUBLIC KwuReEstCmpInd kwUiKwuReEstCmpIndMt[] = }; /* kw005.201 added support for L2 measurement */ -PUBLIC KwuDiscSduCfm kwUiKwuDiscSduCfmMt[] = +KwuDiscSduCfm kwUiKwuDiscSduCfmMt[] = { #ifdef LCKWUIKWU cmPkKwuDiscSduCfm, /* 0 - loosely coupled */ @@ -216,7 +197,7 @@ PUBLIC KwuDiscSduCfm kwUiKwuDiscSduCfmMt[] = #endif /* PJ */ #endif /*TENB_ACC*/ }; -PUBLIC KwuFlowCntrlInd kwUiKwuFlowCntrlIndMt[] = +KwuFlowCntrlInd kwUiKwuFlowCntrlIndMt[] = { #ifdef LCKWUIKWU cmPkKwuFlowCntrlInd, /* 0 - loosely coupled */ @@ -229,7 +210,7 @@ PUBLIC KwuFlowCntrlInd kwUiKwuFlowCntrlIndMt[] = #endif /* LCKWUIKWU */ }; #ifdef LTE_L2_MEAS -PUBLIC KwuDatAckInd kwUiKwuDatAckIndMt[] = +KwuDatAckInd kwUiKwuDatAckIndMt[] = { #ifdef LCKWUIKWU cmPkKwuDatAckInd, /* 0 - loosely coupled */ @@ -273,27 +254,27 @@ PUBLIC KwuDatAckInd kwUiKwuDatAckIndMt[] = * */ #ifdef ANSI -PUBLIC S16 KwUiKwuBndCfm +S16 RlcUiKwuBndCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ U8 status /* Status */ ) #else -PUBLIC S16 KwUiKwuBndCfm(pst, suId, status) +S16 RlcUiKwuBndCfm(pst, suId, status) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ U8 status; /* Status */ #endif { - TRC3(KwUiKwuBndCfm) + TRC3(RlcUiKwuBndCfm) /* jump to specific primitive depending on configured selector */ (*kwUiKwuBndCfmMt[pst->selector])(pst, suId, status); return ROK; -} /* end of KwUiKwuBndCfm */ +} /* end of RlcUiKwuBndCfm */ /** @@ -317,29 +298,29 @@ U8 status; /* Status */ * -# RFAILED */ #ifdef ANSI -PUBLIC S16 KwUiKwuDatInd +S16 rlcSendUlDataToDu ( Pst *pst, KwuDatIndInfo *datInd, Buffer *mBuf ) #else -PUBLIC S16 KwUiKwuDatInd(pst, datInd, mBuf) +S16 rlcSendUlDataToDu(pst, datInd, mBuf) Pst *pst; KwuDatIndInfo *datInd; Buffer *mBuf; #endif { - TRC3(KwUiKwuDatInd) + TRC3(rlcSendUlDataToDu) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatIndMt[pst->selector])(pst, datInd, mBuf); return ROK; -} /* end of KwUiKwuDatInd */ +} /* end of rlcSendUlDataToDu */ - PUBLIC int rlcDatCfmsSent = 0; + int rlcDatCfmsSent = 0; #ifndef KW_PDCP /** @@ -362,28 +343,28 @@ Buffer *mBuf; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 KwUiKwuDatCfm +S16 RlcUiKwuDatCfm ( Pst *pst, SuId suId, KwuDatCfmInfo *datCfm ) #else -PUBLIC S16 KwUiKwuDatCfm(pst, suId, datCfm) +S16 RlcUiKwuDatCfm(pst, suId, datCfm) Pst *pst; SuId suId; KwuDatCfmInfo *datCfm; #endif { rlcDatCfmsSent++; - TRC3(KwUiKwuDatCfm) + TRC3(RlcUiKwuDatCfm) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatCfmMt[pst->selector])(pst, suId, datCfm); return ROK; -} /* end of KwUiKwuDatCfm */ +} /* end of RlcUiKwuDatCfm */ /** @@ -407,27 +388,27 @@ KwuDatCfmInfo *datCfm; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 KwUiKwuStaInd +S16 RlcUiKwuStaInd ( Pst *pst, SuId suId, KwuStaIndInfo *staInd ) #else -PUBLIC S16 KwUiKwuStaInd(pst, suId, staInd) +S16 RlcUiKwuStaInd(pst, suId, staInd) Pst *pst; SuId suId; KwuStaIndInfo *staInd; #endif { - TRC3(KwUiKwuStaInd) + TRC3(RlcUiKwuStaInd) /* jump to specific primitive depending on configured selector */ (*kwUiKwuStaIndMt[pst->selector])(pst, suId, staInd); return ROK; -} /* end of KwUiKwuStaInd */ +} /* end of RlcUiKwuStaInd */ /** @@ -451,28 +432,28 @@ KwuStaIndInfo *staInd; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 KwUiKwuReEstCmpInd +S16 RlcUiKwuReEstCmpInd ( Pst *pst, SuId suId, CmLteRlcId rlcId ) #else -PUBLIC S16 KwUiKwuReEstCmpInd(pst, suId, rlcId) +S16 RlcUiKwuReEstCmpInd(pst, suId, rlcId) Pst *pst; SuId suId; CmLteRlcId rlcId; #endif { - TRC3(KwUiKwuReEstCmpInd) - RLOG0(L_DEBUG, "In KwUiKwuReEstCmpInd"); + TRC3(RlcUiKwuReEstCmpInd) + RLOG0(L_DEBUG, "In RlcUiKwuReEstCmpInd"); /* jump to specific primitive depending on configured selector */ (*kwUiKwuReEstCmpIndMt[pst->selector])(pst, suId, rlcId); return ROK; -} /* end of KwUiKwuReEstCmpInd */ +} /* end of RlcUiKwuReEstCmpInd */ /* kw005.201 added support for L2 Measurement */ /** @@ -494,27 +475,27 @@ CmLteRlcId rlcId; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 KwUiKwuDiscSduCfm +S16 RlcUiKwuDiscSduCfm ( Pst *pst, SuId suId, KwuDiscSduInfo *discCfm ) #else -PUBLIC S16 KwUiKwuDiscSduCfm(pst, suId, discCfm) +S16 RlcUiKwuDiscSduCfm(pst, suId, discCfm) Pst *pst; SuId suId; KwuDiscSduInfo *discCfm; #endif { - TRC3(KwUiKwuDiscSduCfm) + TRC3(RlcUiKwuDiscSduCfm) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDiscSduCfmMt[pst->selector])(pst, suId, discCfm); return ROK; -} /* end of KwUiKwuDiscSduCfm */ +} /* end of RlcUiKwuDiscSduCfm */ /** * @@ -536,27 +517,27 @@ KwuDiscSduInfo *discCfm; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 KwUiKwuFlowCntrlInd +S16 RlcUiKwuFlowCntrlInd ( Pst *pst, SuId suId, KwuFlowCntrlIndInfo *flowCntrlIndInfo ) #else -PUBLIC S16 KwUiKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo) +S16 RlcUiKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo) Pst *pst; SuId suId; KwuFlowCntrlIndInfo *flowCntrlIndInfo; #endif { - TRC3(KwUiKwuFlowCntrlInd) + TRC3(RlcUiKwuFlowCntrlInd) /* jump to specific primitive depending on configured selector */ (*kwUiKwuFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlIndInfo); return ROK; -} /* end of KwUiKwuFlowCntrlInd */ +} /* end of RlcUiKwuFlowCntrlInd */ #ifdef LTE_L2_MEAS /** @@ -578,27 +559,27 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; * -# RFAILED */ #ifdef ANSI -PUBLIC S16 KwUiKwuDatAckInd +S16 RlcUiKwuDatAckInd ( Pst *pst, SuId suId, KwuDatAckInfo *datAckInd ) #else -PUBLIC S16 KwUiKwuDatAckInd(pst, suId, datAckInd) +S16 RlcUiKwuDatAckInd(pst, suId, datAckInd) Pst *pst; SuId suId; KwuDatAckInfo *datAckInd; #endif { - TRC3(KwUiKwuDatAckInd) + TRC3(RlcUiKwuDatAckInd) /* jump to specific primitive depending on configured selector */ (*kwUiKwuDatAckIndMt[pst->selector])(pst, suId, datAckInd); return ROK; -} /* end of KwUiKwuDatAckInd */ +} /* end of RlcUiKwuDatAckInd */ #endif /* LTE_L2_MEAS */ #endif /* KW_PDCP */ @@ -610,7 +591,7 @@ KwuDatAckInfo *datAckInd; /* CKW Bind Confirm primitive */ -PUBLIC CkwBndCfm kwUiCkwBndCfmMt[] = +CkwBndCfm kwUiCkwBndCfmMt[] = { #ifdef LCKWUICKW cmPkCkwBndCfm, /* 0 - loosely coupled */ @@ -622,7 +603,7 @@ PUBLIC CkwBndCfm kwUiCkwBndCfmMt[] = /* CKW Configuration confirm primitive */ -PUBLIC RlcCfgCfm kwUiRlcCfgCfmMt[] = +RlcCfgCfm kwUiRlcCfgCfmMt[] = { #ifdef LCKWUICKW cmPkRlcCfgCfm, /* 0 - loosely coupled */ @@ -632,7 +613,7 @@ PUBLIC RlcCfgCfm kwUiRlcCfgCfmMt[] = #endif /* NH */ }; -PUBLIC CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] = +CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] = { #ifdef LCKWUICKW cmPkCkwUeIdChgCfm, /* 0 - loosely coupled */ @@ -667,27 +648,27 @@ PUBLIC CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] = * -# ROK */ #ifdef ANSI -PUBLIC S16 KwUiCkwBndCfm +S16 RlcUiCkwBndCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ U8 status /* Status */ ) #else -PUBLIC S16 KwUiCkwBndCfm(pst, suId, status) +S16 RlcUiCkwBndCfm(pst, suId, status) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ U8 status; /* Status */ #endif { - TRC3(KwUiCkwBndCfm) + TRC3(RlcUiCkwBndCfm) /* jump to specific primitive depending on configured selector */ (*kwUiCkwBndCfmMt[pst->selector])(pst, suId, status); return ROK; -} /* end of KwUiCkwBndCfm */ +} /* end of RlcUiCkwBndCfm */ /** @@ -711,27 +692,27 @@ U8 status; /* Status */ * */ #ifdef ANSI -PUBLIC S16 KwUiRlcCfgCfm +S16 RlcUiRlcCfgCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ RlcCfgCfmInfo *cfmInfo /* Configuration Confirm */ ) #else -PUBLIC S16 KwUiRlcCfgCfm(pst, suId, cfmInfo) +S16 RlcUiRlcCfgCfm(pst, suId, cfmInfo) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ RlcCfgCfmInfo *cfmInfo; /* Configuration Confirm */ #endif { - TRC3(KwUiRlcCfgCfm) + TRC3(RlcUiRlcCfgCfm) /* jump to specific primitive depending on configured selector */ (*kwUiRlcCfgCfmMt[pst->selector])(pst, suId, cfmInfo); return ROK; -} /* end of KwUiRlcCfgCfm */ +} /* end of RlcUiRlcCfgCfm */ /** @@ -755,7 +736,7 @@ RlcCfgCfmInfo *cfmInfo; /* Configuration Confirm */ * */ #ifdef ANSI -PUBLIC S16 KwUiCkwUeIdChgCfm +S16 RlcUiCkwUeIdChgCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ @@ -764,7 +745,7 @@ CkwUeInfo *ueInfo, CmStatus status ) #else -PUBLIC S16 KwUiCkwUeIdChgCfm(pst, suId, transId,ueInfo,status) +S16 RlcUiCkwUeIdChgCfm(pst, suId, transId,ueInfo,status) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ U32 transId; @@ -772,14 +753,14 @@ CkwUeInfo *ueInfo; CmStatus status; #endif { - TRC3(KwUiCkwUeIdChgCfm) + TRC3(RlcUiCkwUeIdChgCfm) /* jump to specific primitive depending on configured selector */ (*kwUiCkwUeIdChgCfmMt[pst->selector])(pst, suId, transId, ueInfo, status); return ROK; -} /* end of KwUiRlcCfgCfm */ +} /* end of RlcUiRlcCfgCfm */ #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF)) @@ -793,12 +774,12 @@ CmStatus status; * -# ROK */ #ifdef ANSI -PUBLIC S16 rlcDlBatchProcSplit +S16 rlcDlBatchProcSplit ( Void ) #else -PUBLIC S16 rlcDlBatchProcSplit() +S16 rlcDlBatchProcSplit() Void; #endif { @@ -835,13 +816,13 @@ Void; datReq = (RxmBufReq *)elmIndx; if(datReq->mBuf != NULLP) { - cmUnpkKwuDatReq(KwUiKwuDatReq, &datReq->pst, datReq->mBuf); + cmUnpkKwuDatReq(rlcProcDlData, &datReq->pst, datReq->mBuf); } else { RLOG0(L_ERROR, "mBuf is NULL"); if(datReq->mBuf) - cmUnpkKwuDatReq(KwUiKwuDatReq, &datReq->pst, datReq->mBuf); + cmUnpkKwuDatReq(rlcProcDlData, &datReq->pst, datReq->mBuf); } SsRngInfoTbl[SS_RNG_BUF_RX_TO_DLRLC].nPktProc++;//Number of pkt processed in tti @@ -873,12 +854,12 @@ Void; #if defined(PDCP_RLC_DL_RBUF) || defined(SS_RBUF) #ifdef ANSI -PUBLIC S16 rlcDlBatchProc +S16 rlcDlBatchProc ( Void ) #else -PUBLIC S16 rlcDlBatchProc() +S16 rlcDlBatchProc() Void; #endif { @@ -892,9 +873,9 @@ Void; /* Memory regions different for BRCM and Intel */ /*dstProcId,srcProcId,dstEnt,dstInst,srcEnt,srcInst,prior,route,event,region,pool,selector*/ #ifdef SS_RBUF - PRIVATE Pst rlcDlRbfuPst ={1,1,ENTKW,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,1,1,0,0}; + PRIVATE Pst rlcDlRbfuPst ={1,1,ENTRLC,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,1,1,0,0}; #else - PRIVATE Pst rlcDlRbfuPst ={1,1,ENTKW,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,2,1,0,0}; + PRIVATE Pst rlcDlRbfuPst ={1,1,ENTRLC,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,2,1,0,0}; #endif Void *elmIndx = NULLP; KwuDatReqDetl *kwuDatReqDetl = NULLP; @@ -926,7 +907,7 @@ Void; SsRngInfoTbl[SS_RNG_BUF_DLPDCP_TO_DLRLC].nPktProc++;;//Number of pkt processed in tti if(kwuDatReqDetl->mBuf != NULLP) { - KwUiKwuDatReq(&rlcDlRbfuPst, kwuDatReqDetl->spId, &datReq, kwuDatReqDetl->mBuf); + rlcProcDlData(&rlcDlRbfuPst, kwuDatReqDetl->spId, &datReq, kwuDatReqDetl->mBuf); } SRngIncrRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC); rngBufDeqIndx++; @@ -943,33 +924,33 @@ Void; #ifdef ANSI -PUBLIC S16 kwUtlDlBatchProcPkts +S16 rlcUtlDlBatchProcPkts ( Void ) #else -PUBLIC S16 kwUtlDlBatchProcPkts +S16 rlcUtlDlBatchProcPkts Void; #endif { rlcDlBatchProc(); #ifdef SS_RBUF #ifdef LTE_L2_MEAS - kwUtlDlBatchProcHqStaInd(); + rlcUtlDlBatchProcHqStaInd(); #endif - kwUtlFreeDlMem(); + rlcUtlFreeDlMem(); #endif return ROK; } #ifdef ANSI -PUBLIC S16 kwUtlDlFreeRlcRBuf +S16 rlcUtlDlFreeRlcRBuf ( Void ) #else -PUBLIC S16 kwUtlDlFreeRlcRBuf +S16 rlcUtlDlFreeRlcRBuf Void; #endif {