X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_ptui.c;h=5c9619cd40447d26c2e9cd305fb0fc0c2e575cb5;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=7b2028cd88a279007e13c8333cc9aeba0be031b7;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c
index 7b2028cd8..5c9619cd4 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 */
@@ -277,16 +258,15 @@ S16 RlcUiKwuBndCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
-U8   status                     /* Status */
+uint8_t   status                     /* Status */
 )
 #else
 S16 RlcUiKwuBndCfm(pst, suId, status)
 Pst *pst;                       /* post structure */
 SuId suId;                      /* Service User Id */
-U8   status;                    /* Status */
+uint8_t   status;                    /* Status */
 #endif
 {
-   TRC3(RlcUiKwuBndCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuBndCfmMt[pst->selector])(pst, suId, status);
@@ -317,27 +297,26 @@ U8   status;                    /* Status */
  *      -# RFAILED
  */
 #ifdef ANSI
-S16 RlcUiKwuDatInd
+S16 rlcSendUlDataToDu
 (
 Pst               *pst,
 KwuDatIndInfo     *datInd,
 Buffer            *mBuf
 )
 #else
-S16 RlcUiKwuDatInd(pst, datInd, mBuf)
+S16 rlcSendUlDataToDu(pst, datInd, mBuf)
 Pst               *pst;
 KwuDatIndInfo     *datInd;
 Buffer            *mBuf;
 #endif
 {
-   TRC3(RlcUiKwuDatInd)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDatIndMt[pst->selector])(pst, datInd, mBuf);
 
    return ROK;
 
-} /* end of RlcUiKwuDatInd */
+} /* end of rlcSendUlDataToDu */
 
    int rlcDatCfmsSent = 0;
 
@@ -376,7 +355,6 @@ KwuDatCfmInfo     *datCfm;
 #endif
 {
    rlcDatCfmsSent++;
-   TRC3(RlcUiKwuDatCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDatCfmMt[pst->selector])(pst, suId, datCfm);
@@ -420,7 +398,6 @@ SuId              suId;
 KwuStaIndInfo     *staInd;
 #endif
 {
-   TRC3(RlcUiKwuStaInd)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuStaIndMt[pst->selector])(pst, suId, staInd);
@@ -464,7 +441,6 @@ SuId              suId;
 CmLteRlcId        rlcId;
 #endif
 {
-   TRC3(RlcUiKwuReEstCmpInd)
    RLOG0(L_DEBUG, "In RlcUiKwuReEstCmpInd");
 
    /* jump to specific primitive depending on configured selector */
@@ -507,7 +483,6 @@ SuId              suId;
 KwuDiscSduInfo    *discCfm;
 #endif
 {
-   TRC3(RlcUiKwuDiscSduCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDiscSduCfmMt[pst->selector])(pst, suId, discCfm);
@@ -549,7 +524,6 @@ SuId                  suId;
 KwuFlowCntrlIndInfo   *flowCntrlIndInfo;
 #endif
 {
-   TRC3(RlcUiKwuFlowCntrlInd)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlIndInfo);
@@ -591,7 +565,6 @@ SuId              suId;
 KwuDatAckInfo     *datAckInd;
 #endif
 {
-   TRC3(RlcUiKwuDatAckInd)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDatAckIndMt[pst->selector])(pst, suId, datAckInd);
@@ -671,16 +644,15 @@ S16 RlcUiCkwBndCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
-U8   status                     /* Status */
+uint8_t   status                     /* Status */
 )
 #else
 S16 RlcUiCkwBndCfm(pst, suId, status)
 Pst *pst;                       /* post structure */
 SuId suId;                      /* Service User Id */
-U8   status;                    /* Status */
+uint8_t   status;                    /* Status */
 #endif
 {
-   TRC3(RlcUiCkwBndCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiCkwBndCfmMt[pst->selector])(pst, suId, status);
@@ -724,7 +696,6 @@ SuId           suId;                      /* Service User Id */
 RlcCfgCfmInfo  *cfmInfo;                   /* Configuration Confirm */
 #endif
 {
-   TRC3(RlcUiRlcCfgCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiRlcCfgCfmMt[pst->selector])(pst, suId, cfmInfo);
@@ -759,7 +730,7 @@ S16 RlcUiCkwUeIdChgCfm
 (
 Pst            *pst,                      /* post structure */
 SuId           suId,                      /* Service User Id */
-U32            transId,
+uint32_t       transId,
 CkwUeInfo      *ueInfo,
 CmStatus       status
 )
@@ -767,12 +738,11 @@ CmStatus       status
 S16 RlcUiCkwUeIdChgCfm(pst, suId, transId,ueInfo,status)
 Pst            *pst;                      /* post structure */
 SuId           suId;                      /* Service User Id */
-U32            transId;
+uint32_t       transId;
 CkwUeInfo      *ueInfo;
 CmStatus       status;
 #endif
 {
-   TRC3(RlcUiCkwUeIdChgCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiCkwUeIdChgCfmMt[pst->selector])(pst, suId, transId, ueInfo, status);
@@ -807,11 +777,11 @@ Void;
    Void *elmIndx = NULLP;
    RxmBufReq *datReq = NULLP;
 #ifdef LTE_ADV
-   U32 dlPktCount = 0;
+   uint32_t dlPktCount = 0;
 #endif
-   U8 rngBufDeqIndx = 0;
-   U32 rngBufDeqMaxCnt;
-   U32 rngBufCurrCnt;
+   uint8_t rngBufDeqIndx = 0;
+   uint32_t rngBufDeqMaxCnt;
+   uint32_t rngBufCurrCnt;
 
    rngBufDeqMaxCnt = SS_RNG_MAX_DLPDCP_TO_DLRLC_DQ_CNT;
 #ifdef TENB_T2K3K_SPECIFIC_CHANGES
@@ -835,13 +805,13 @@ Void;
       datReq = (RxmBufReq *)elmIndx;
       if(datReq->mBuf != NULLP)
       {
-        cmUnpkKwuDatReq(RlcUiKwuDatReq, &datReq->pst, datReq->mBuf);
+        cmUnpkKwuDatReq(rlcProcDlData, &datReq->pst, datReq->mBuf);
       }
       else
       {
          RLOG0(L_ERROR, "mBuf is NULL");
          if(datReq->mBuf)
-          cmUnpkKwuDatReq(RlcUiKwuDatReq, &datReq->pst, datReq->mBuf);
+          cmUnpkKwuDatReq(rlcProcDlData, &datReq->pst, datReq->mBuf);
 
       }
       SsRngInfoTbl[SS_RNG_BUF_RX_TO_DLRLC].nPktProc++;//Number of pkt processed in tti
@@ -884,10 +854,10 @@ Void;
 {
 /* Read from Ring Buffer and process PDCP packets */
 
-   U8 rngBufDeqIndx = 0;
-   U32 rngBufDeqMaxCnt;
+   uint8_t rngBufDeqIndx = 0;
+   uint32_t rngBufDeqMaxCnt;
 #ifdef TENB_T2K3K_SPECIFIC_CHANGES
-   U32 rngBufCurrCnt;
+   uint32_t rngBufCurrCnt;
 #endif
    /* Memory regions different for BRCM and Intel */
    /*dstProcId,srcProcId,dstEnt,dstInst,srcEnt,srcInst,prior,route,event,region,pool,selector*/
@@ -923,10 +893,10 @@ Void;
       datReq.rlcId = kwuDatReqDetl->rlcId;
       datReq.sduId = kwuDatReqDetl->sduId;
       datReq.lcType = kwuDatReqDetl->lcType;
-      SsRngInfoTbl[SS_RNG_BUF_DLPDCP_TO_DLRLC].nPktProc++;;//Number of pkt processed in tti
+      SsRngInfoTbl[SS_RNG_BUF_DLPDCP_TO_DLRLC].nPktProc++;//Number of pkt processed in tti
       if(kwuDatReqDetl->mBuf != NULLP)
       {
-         RlcUiKwuDatReq(&rlcDlRbfuPst, kwuDatReqDetl->spId, &datReq, kwuDatReqDetl->mBuf);
+         rlcProcDlData(&rlcDlRbfuPst, kwuDatReqDetl->spId, &datReq, kwuDatReqDetl->mBuf);
       }
       SRngIncrRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC);
       rngBufDeqIndx++;