U8, U16, U32 data type changes
[o-du/l2.git] / src / 5gnrrlc / kw_ptui.c
index 1d58968..5c9619c 100755 (executable)
@@ -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
 
 \f  
@@ -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,26 @@ PUBLIC KwuDatAckInd kwUiKwuDatAckIndMt[] =
  *
  */
 #ifdef ANSI
-PUBLIC S16 KwUiKwuBndCfm
+S16 RlcUiKwuBndCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
-U8   status                     /* Status */
+uint8_t   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 */
+uint8_t   status;                    /* Status */
 #endif
 {
-   TRC3(KwUiKwuBndCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuBndCfmMt[pst->selector])(pst, suId, status);
 
    return ROK;
 
-} /* end of KwUiKwuBndCfm */
+} /* end of RlcUiKwuBndCfm */
 
 \f
 /**
@@ -317,29 +297,28 @@ 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)
 
    /* 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;
 \f
 #ifndef KW_PDCP
 /**
@@ -362,28 +341,27 @@ 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)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDatCfmMt[pst->selector])(pst, suId, datCfm);
 
    return ROK;
 
-} /* end of KwUiKwuDatCfm */
+} /* end of RlcUiKwuDatCfm */
 
 \f
 /**
@@ -407,27 +385,26 @@ 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)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuStaIndMt[pst->selector])(pst, suId, staInd);
 
    return ROK;
 
-} /* end of KwUiKwuStaInd */
+} /* end of RlcUiKwuStaInd */
 
 \f
 /**
@@ -451,28 +428,27 @@ 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");
+   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 */
 \f
 /**
@@ -494,27 +470,26 @@ 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)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDiscSduCfmMt[pst->selector])(pst, suId, discCfm);
 
    return ROK;
 
-} /* end of KwUiKwuDiscSduCfm */ 
+} /* end of RlcUiKwuDiscSduCfm */ 
 
 /**
  *
@@ -536,27 +511,26 @@ 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)
 
    /* 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
 \f
 /**
@@ -578,27 +552,26 @@ 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)
 
    /* 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 +583,7 @@ KwuDatAckInfo     *datAckInd;
 
 /* CKW Bind Confirm primitive */
 
-PUBLIC CkwBndCfm kwUiCkwBndCfmMt[] =
+CkwBndCfm kwUiCkwBndCfmMt[] =
 {
 #ifdef LCKWUICKW
    cmPkCkwBndCfm,            /* 0 - loosely coupled */
@@ -622,7 +595,7 @@ PUBLIC CkwBndCfm kwUiCkwBndCfmMt[] =
 
 /* CKW Configuration confirm primitive */
 
-PUBLIC RlcCfgCfm kwUiRlcCfgCfmMt[] =
+RlcCfgCfm kwUiRlcCfgCfmMt[] =
 {
 #ifdef LCKWUICKW
    cmPkRlcCfgCfm,            /* 0 - loosely coupled */
@@ -632,7 +605,7 @@ PUBLIC RlcCfgCfm kwUiRlcCfgCfmMt[] =
 #endif /* NH */
 };
 
-PUBLIC CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] =
+CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] =
 {
 #ifdef LCKWUICKW
    cmPkCkwUeIdChgCfm,            /* 0 - loosely coupled */
@@ -667,27 +640,26 @@ PUBLIC CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] =
  *      -# ROK 
  */
 #ifdef ANSI
-PUBLIC S16 KwUiCkwBndCfm
+S16 RlcUiCkwBndCfm
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
-U8   status                     /* Status */
+uint8_t   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 */
+uint8_t   status;                    /* Status */
 #endif
 {
-   TRC3(KwUiCkwBndCfm)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiCkwBndCfmMt[pst->selector])(pst, suId, status);
 
    return ROK;
 
-} /* end of KwUiCkwBndCfm */
+} /* end of RlcUiCkwBndCfm */
 
 \f
 /**
@@ -711,27 +683,26 @@ 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)
 
    /* jump to specific primitive depending on configured selector */
    (*kwUiRlcCfgCfmMt[pst->selector])(pst, suId, cfmInfo);
 
    return ROK;
 
-} /* end of KwUiRlcCfgCfm */
+} /* end of RlcUiRlcCfgCfm */
 
 \f
 /**
@@ -755,31 +726,30 @@ RlcCfgCfmInfo  *cfmInfo;                   /* Configuration Confirm */
  *
  */
 #ifdef ANSI
-PUBLIC S16 KwUiCkwUeIdChgCfm 
+S16 RlcUiCkwUeIdChgCfm 
 (
 Pst            *pst,                      /* post structure */
 SuId           suId,                      /* Service User Id */
-U32            transId,
+uint32_t       transId,
 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;
+uint32_t       transId;
 CkwUeInfo      *ueInfo;
 CmStatus       status;
 #endif
 {
-   TRC3(KwUiCkwUeIdChgCfm)
 
    /* 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 +763,12 @@ CmStatus       status;
  *      -# ROK 
  */
 #ifdef ANSI
-PUBLIC S16 rlcDlBatchProcSplit 
+S16 rlcDlBatchProcSplit 
 (
 Void
 )
 #else
-PUBLIC S16 rlcDlBatchProcSplit()
+S16 rlcDlBatchProcSplit()
 Void;
 #endif
 {
@@ -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(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,28 +843,28 @@ 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
 {
 /* 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*/
 #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;
@@ -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)
       {
-         KwUiKwuDatReq(&rlcDlRbfuPst, kwuDatReqDetl->spId, &datReq, kwuDatReqDetl->mBuf);
+         rlcProcDlData(&rlcDlRbfuPst, kwuDatReqDetl->spId, &datReq, kwuDatReqDetl->mBuf);
       }
       SRngIncrRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC);
       rngBufDeqIndx++;
@@ -943,33 +913,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
 {