X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ptui.c;h=1d5896854bcdc9077290285ab69a5d09962df3e4;hb=aee73991f728cc127d1ed76d5a52571d916235a4;hp=99e00b0437001b634057a1ddd81de0e5040e9279;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c
index 99e00b043..1d5896854 100755
--- a/src/5gnrrlc/kw_ptui.c
+++ b/src/5gnrrlc/kw_ptui.c
@@ -37,18 +37,7 @@ static int RLOG_FILE_ID=199;
 
 
 /* header (.h) include files */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library defines */
-#include "cm_llist.h"      /* common link list  defines  */
-#include "cm_hash.h"       /* common hash list  defines */
-#include "cm_lte.h"        /* common LTE defines */
+#include "common_def.h"
 #include "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -59,16 +48,6 @@ static int RLOG_FILE_ID=199;
 #include "kw.h"            /* RLC defines */
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */
@@ -111,7 +90,7 @@ EXTERN "C" {
  *             Forward Declartion for KWU Porting Functions
  ********************************************************************/
 #if defined(PDCP_RLC_DL_RBUF) || defined(SS_RBUF)
-PUBLIC S16 kwDlBatchProc ARGS ((Void));
+PUBLIC S16 rlcDlBatchProc ARGS ((Void));
 PUBLIC S16 kwUtlDlFreeRlcRBuf ARGS((Void));
 EXTERN void kwUtlDlBatchProcHqStaInd ARGS ((Void));
 EXTERN Void kwUtlFreeDlMem ARGS((Void));
@@ -120,91 +99,9 @@ EXTERN S16 kwUtlDlBatchProcPkts ARGS((Void));
 #endif
 
 #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF))
-PUBLIC S16 kwDlBatchProcSplit  ARGS((Void));
+PUBLIC S16 rlcDlBatchProcSplit  ARGS((Void));
 #endif
 
-#ifdef PTKWKWU
-PRIVATE S16 PtUiKwuBndCfm  ARGS ((
-Pst *pst,                       /* post structure */
-SuId suId,                      /* Service User Id */
-U8 status                       /* status */
-));
-
-#endif /* PTKWKWU */
-
-PUBLIC S16 PtUiKwuDatCfm ARGS ((
-Pst               *pst,
-SuId              suId,
-KwuDatCfmInfo         *datCfm
-));
-
-PUBLIC S16 PtUiKwuStaInd ARGS ((
-Pst               *pst,
-SuId              suId,
-KwuStaIndInfo     *staInd
-));
-
-PUBLIC S16 PtUiKwuReEstCmpInd ARGS ((
-Pst               *pst,
-SuId              suId,
-CmLteRlcId        rlcId
-));
-/* kw005.201 added support for L2 Measurement */
-PUBLIC S16 PtUiKwuDiscSduCfm ARGS((
-Pst               *pst,
-SuId              suId,
-KwuDiscSduInfo    *discCfm
-));
-PUBLIC S16 PtUiKwuFlowCntrlInd ARGS((
-Pst                    *pst,
-SuId                   suId,
-KwuFlowCntrlIndInfo    *flowCntrlIndInfo
-));
-#ifdef LTE_L2_MEAS
-PUBLIC S16 PtUiKwuDatAckInd ARGS((
-Pst               *pst,
-SuId              suId,
-KwuDatAckInfo     *datAckInd
-));
-#endif
-#if (defined(PTKWKWU) || defined(KW_PDCP))
-PUBLIC S16 PtUiKwuDatInd ARGS ((
-Pst               *pst,
-SuId              suId,
-KwuDatIndInfo     *datInd,
-Buffer            *mBuf
-));
-#endif /* PTKWKWU || KW_PDCP */
-
-
-  
-/*********************************************************************
- *             Forward Declartion for CKW Porting Functions
- ********************************************************************/
-#ifdef PTKWCKW
-PRIVATE S16 PtUiCkwBndCfm  ARGS ((
-Pst *pst,                       /* post structure */
-SuId suId,                      /* Service User Id */
-U8 status                       /* status */
-));
-
-PUBLIC S16 PtUiCkwCfgCfm ARGS ((
-Pst            *pst,                      /* post structure */
-SuId           suId,                      /* Service User Id */
-CkwCfgCfmInfo  *cfmInfo                    /* Configuration Confirm */
-));
-
-PUBLIC S16 PtUiCkwUeIdChgCfm ARGS((
-Pst            *pst,                      /* post structure */
-SuId           suId,                      /* Service User Id */
-U32            transId,
-CkwUeInfo      *ueInfo,
-CmStatus       status
-));
-
-#endif /* PTKWCKW */
-
-
   
 /*********************************************************************
  *             Primitives for KWU interface 
@@ -216,26 +113,18 @@ PUBLIC KwuBndCfm kwUiKwuBndCfmMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuBndCfm,            /* 0 - loosely coupled */
-#else
-   PtUiKwuBndCfm,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef NH
    NhLiKwuBndCfm,            /* 1 - tightly coupled, RRC  */
-#else
-   PtUiKwuBndCfm,            /* 1 - tightly coupled, portable */
 #endif /* NH */
 #ifndef KW_PDCP
 #ifdef PJ
    PjLiKwuBndCfm,            /* 2 - tightly coupled, PDCP */
-#else
-   PtUiKwuBndCfm,      /* 2 - tightly coupled, portable */ 
 #endif /* NH */
 #endif /* KW_PDCP */
 #ifndef TENB_ACC
 #ifdef LWLCKWUIKWU
    cmPkKwuBndCfm,      /* 3 - light weight loosely coupled */ 
-#else
-   PtUiKwuBndCfm,      /* 3 - light weight loosely coupled, portable */
 #endif /* LCKWUIKWU */
 #endif /*TENB_ACC*/
 };
@@ -246,26 +135,18 @@ PUBLIC KwuDatInd kwUiKwuDatIndMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuDatInd,            /* 0 - loosely coupled */
-#else
-   PtUiKwuDatInd,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef NH
    NhLiKwuDatInd,            /* 1 - tightly coupled, RRC  */
-#else
-   PtUiKwuDatInd,            /* 1 - tightly coupled, portable */
 #endif /* NH */
 #ifdef KW_PDCP
 #else
 #ifdef PJ
    PjLiKwuDatInd,            /* 2 - tightly coupled, PDCP */
-#else
-   PtUiKwuDatInd,         /* 2 - tightly coupled, portable */ 
 #endif /* NH */
 #ifndef TENB_ACC
 #ifdef LWLCKWUIKWU
    cmPkKwuDatInd,         /* 3 - light weight loosely coupled */ 
-#else
-   PtUiKwuDatInd,         /* 3 - light weight loosely coupled, portable */
 #endif /* LCKWUIKWU */
 #endif /*TENB_ACC*/
 #endif /* KW_PDCP */
@@ -276,20 +157,13 @@ PUBLIC KwuDatCfm kwUiKwuDatCfmMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuDatCfm,            /* 0 - loosely coupled */
-#else
-   PtUiKwuDatCfm,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
-   PtUiKwuDatCfm,            /* 1 - tightly coupled, portable */
 #ifdef PJ
    PjLiKwuDatCfm,            /* 2 - tightly coupled, PDCP */
-#else
-   PtUiKwuDatCfm,            /* 2 - tightly coupled, portable */
 #endif /* PJ */
 #ifndef TENB_ACC
 #ifdef LWLCKWUIKWU
    cmPkKwuDatCfm,         /* 3 - light weight loosely coupled */ 
-#else
-   PtUiKwuDatCfm,         /* 3 - light weight loosely coupled, portable */
 #endif /* LCKWUIKWU */
 #endif /*TENB_ACC*/
 };
@@ -300,20 +174,13 @@ PUBLIC KwuStaInd kwUiKwuStaIndMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuStaInd,            /* 0 - loosely coupled */
-#else
-   PtUiKwuStaInd,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
-   PtUiKwuStaInd,            /* 2 - tightly coupled, portable */
 #ifdef PJ
    PjLiKwuStaInd,            /* 2 - tightly coupled, PDCP */
-#else
-   PtUiKwuStaInd,            /* 2 - tightly coupled, portable */
 #endif /* PJ */
 #ifndef TENB_ACC
 #ifdef LWLCKWUIKWU
    cmPkKwuStaInd,         /* 3 - light weight loosely coupled */ 
-#else
-   PtUiKwuStaInd,         /* 3 - light weight loosely coupled, portable */
 #endif /* LCKWUIKWU */
 #endif /*TENB_ACC*/
 };
@@ -322,20 +189,14 @@ PUBLIC KwuReEstCmpInd kwUiKwuReEstCmpIndMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuReEstCmpInd,            /* 0 - loosely coupled */
-#else
-   PtUiKwuReEstCmpInd,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
-   PtUiKwuReEstCmpInd,            /* 1 - loosely coupled, portable  */
 #ifdef PJ
    PjLiKwuReEstCmpInd,            /* 2 - tightly coupled, PDCP */
 #else
-   PtUiKwuReEstCmpInd,            /* 2 - tightly coupled, portable */
 #endif /* PJ */
 #ifndef TENB_ACC
 #ifdef LWLCKWUIKWU
    cmPkKwuReEstCmpInd,    /* 3 - light weight loosely coupled */ 
-#else
-   PtUiKwuReEstCmpInd,    /* 3 - light weight loosely coupled, portable */
 #endif /* LCKWUIKWU */
 #endif /*TENB_ACC*/
 };
@@ -345,20 +206,13 @@ PUBLIC KwuDiscSduCfm kwUiKwuDiscSduCfmMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuDiscSduCfm,            /* 0 - loosely coupled */
-#else
-   PtUiKwuDiscSduCfm,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
-   PtUiKwuDiscSduCfm,            /* 1 - loosely coupled portable */
 #ifdef PJ
    PjLiKwuDiscSduCfm,            /* 2 - tightly coupled, PDCP */
-#else
-   PtUiKwuDiscSduCfm,    /* 2 - tightly coupled, PDCP */     
 #endif
 #ifndef TENB_ACC
 #ifdef LWLCKWUIKWU
    cmPkKwuDiscSduCfm,    /* 3 - light weight loosely coupled */    
-#else
-   PtUiKwuDiscSduCfm,    /* 3 - light weight loosely coupled, portable */  
 #endif /* PJ */
 #endif /*TENB_ACC*/
 };
@@ -366,19 +220,12 @@ PUBLIC KwuFlowCntrlInd kwUiKwuFlowCntrlIndMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuFlowCntrlInd,            /* 0 - loosely coupled */
-#else
-   PtUiKwuFlowCntrlInd,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
-   PtUiKwuFlowCntrlInd,            /* 1 - loosely coupled portable */
 #ifdef PJ
    PjLiKwuFlowCntrlInd,            /* 2 - tightly coupled, PDCP */
-#else
-   PtUiKwuFlowCntrlInd,            /* 2 - tightly coupled, portable */
 #endif /* PJ */
 #ifdef LCKWUIKWU
    cmPkKwuFlowCntrlInd,            /* 3 - light weight loosely coupled */
-#else
-   PtUiKwuFlowCntrlInd,            /* 3 - light weight loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 };
 #ifdef LTE_L2_MEAS
@@ -386,20 +233,13 @@ PUBLIC KwuDatAckInd kwUiKwuDatAckIndMt[] =
 {
 #ifdef LCKWUIKWU
    cmPkKwuDatAckInd,            /* 0 - loosely coupled */
-#else
-   PtUiKwuDatAckInd,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
-   PtUiKwuDatAckInd,            /* 1 - loosely coupled, portable  */
 #ifdef PJ
    PjLiKwuDatAckInd,            /* 2 - tightly coupled, PDCP */
-#else
-   PtUiKwuDatAckInd,     /* 1 - tightly coupled, portable */  
 #endif /* PJ */
 #ifndef TENB_ACC
 #ifdef LWLCKWUIKWU
    cmPkKwuDatAckInd,     /* 3 - light weight loosely coupled, portable */          
-#else
-   PtUiKwuDatAckInd,     /* 3 - light weight loosely coupled */        
 #endif /* PJ */
 #endif /*TENB_ACC*/
 };
@@ -451,7 +291,7 @@ U8   status;                    /* Status */
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuBndCfmMt[pst->selector])(pst, suId, status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuBndCfm */
 
@@ -480,14 +320,12 @@ U8   status;                    /* Status */
 PUBLIC S16 KwUiKwuDatInd
 (
 Pst               *pst,
-SuId              suId,
 KwuDatIndInfo     *datInd,
 Buffer            *mBuf
 )
 #else
-PUBLIC S16 KwUiKwuDatInd(pst, suId, datInd, mBuf)
+PUBLIC S16 KwUiKwuDatInd(pst, datInd, mBuf)
 Pst               *pst;
-SuId              suId;
 KwuDatIndInfo     *datInd;
 Buffer            *mBuf;
 #endif
@@ -495,9 +333,9 @@ Buffer            *mBuf;
    TRC3(KwUiKwuDatInd)
 
    /* jump to specific primitive depending on configured selector */
-   (*kwUiKwuDatIndMt[pst->selector])(pst, suId, datInd, mBuf);
+   (*kwUiKwuDatIndMt[pst->selector])(pst, datInd, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuDatInd */
 
@@ -543,7 +381,7 @@ KwuDatCfmInfo     *datCfm;
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDatCfmMt[pst->selector])(pst, suId, datCfm);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuDatCfm */
 
@@ -587,7 +425,7 @@ KwuStaIndInfo     *staInd;
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuStaIndMt[pst->selector])(pst, suId, staInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuStaInd */
 
@@ -632,7 +470,7 @@ CmLteRlcId        rlcId;
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuReEstCmpIndMt[pst->selector])(pst, suId, rlcId);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuReEstCmpInd */
 /* kw005.201 added support for L2 Measurement */
@@ -674,7 +512,7 @@ KwuDiscSduInfo    *discCfm;
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDiscSduCfmMt[pst->selector])(pst, suId, discCfm);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuDiscSduCfm */ 
 
@@ -716,7 +554,7 @@ KwuFlowCntrlIndInfo   *flowCntrlIndInfo;
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuFlowCntrlIndMt[pst->selector])(pst, suId, flowCntrlIndInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuFlowCntrlInd */ 
 #ifdef LTE_L2_MEAS
@@ -758,420 +596,12 @@ KwuDatAckInfo     *datAckInd;
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDatAckIndMt[pst->selector])(pst, suId, datAckInd);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuDatAckInd */ 
 #endif /* LTE_L2_MEAS */
 #endif /* KW_PDCP */
 
-
-#ifdef PTKWKWU
-/*************************************************************************
- *                         KWU Porting Functions
- ************************************************************************/
-/**
- *
- * @brief 
- *
- *        PtUiKwuBndCfm - Portable SAP bind confirm
- *
- *  @param[in] pst      - Post structure  
- *  @param[in] suId     - Service user SAP ID 
- *  @param[in] status   - Status
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PRIVATE S16 PtUiKwuBndCfm 
-(
-Pst *pst,                       /* post structure */
-SuId suId,                      /* Service User Id */
-U8 status                       /* status */
-)
-#else
-PRIVATE S16 PtUiKwuBndCfm(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-U8 status;                      /* status */
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuBndCfm);
-
-   UNUSED(suId);
-   UNUSED(status);
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-} /* end of PtUiKwuBndCfm */
-#endif /* PTKWKWU */
-
-
-/**
- *
- * @brief 
- *
- *        PtUiKwuDatCfm - Portable common channel data request
- *
- *  @param[in] pst    -  Post structure  
- *  @param[in] suId   -  Service user SAP ID 
- *  @param[in] datCfm -  Data Request
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PUBLIC S16 PtUiKwuDatCfm
-(
-Pst               *pst,
-SuId              suId,
-KwuDatCfmInfo    *datCfm
-)
-#else
-PUBLIC S16 PtUiKwuDatCfm(pst, suId, datCfm)
-Pst               *pst;
-SuId              suId;
-KwuDatCfmInfo     *datCfm;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuDatCfm)
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(datCfm);
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
- 
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-
-} /* end of PtUiKwuDatCfm */
-
-
-/**
- *
- * @brief 
- *
- *        PtUiKwuStaInd - Portable common channel data request
- *
- *  @param[in] pst    -  Post structure  
- *  @param[in] suId   -  Service user SAP ID 
- *  @param[in] staInd -  Data Request
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PUBLIC S16 PtUiKwuStaInd
-(
-Pst               *pst,
-SuId              suId,
-KwuStaIndInfo     *staInd
-)
-#else
-PUBLIC S16 PtUiKwuStaInd(pst, suId, staInd)
-Pst               *pst;
-SuId              suId;
-KwuStaIndInfo     *staInd;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuStaInd)
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(staInd);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-
-} /* end of PtUiKwuStaInd */
-
-
-/**
- *
- * @brief 
- *
- *        PtUiKwuReEstCmpInd - Portable common channel data request
- *
- *  @param[in] pst    -  Post structure  
- *  @param[in] suId   -  Service user SAP ID 
- *  @param[in] staInd -  Data Request
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PUBLIC S16 PtUiKwuReEstCmpInd
-(
-Pst               *pst,
-SuId              suId,
-CmLteRlcId        rlcId
-)
-#else
-PUBLIC S16 PtUiKwuReEstCmpInd(pst, suId, rlcId)
-Pst               *pst;
-SuId              suId;
-CmLteRlcId        rlcId;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuReEstCmpInd)
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(rlcId);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-
-} /* end of PtUiKwuReEstCmpInd */
-
-/* kw005.201 added support for L2 Measurement */
-/*
- * @brief 
- *
- *        PtUiKwuDiscSduCfm - Portable common channel data request
- *
- *  @param[in] pst    -  Post structure  
- *  @param[in] suId   -  Service user SAP ID 
- *  @param[in] staInd -  Data Request
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PUBLIC S16 PtUiKwuDiscSduCfm
-(
-Pst               *pst,
-SuId              suId,
-KwuDiscSduInfo    *discCfm
-)
-#else
-PUBLIC S16 PtUiKwuDiscSduCfm(pst, suId, discCfm)
-Pst               *pst;
-SuId              suId;
-KwuDiscSduInfo    *discCfm;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuDiscSduCfm)
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(discCfm);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-
-} /* end of PtUiKwuDiscSduCfm */
-
-/*
- * @brief 
- *
- *        PtUiKwuFlowCntrlInd - Portable Flow control idication
- *
- *  @param[in] pst          -  Post structure  
- *  @param[in] suId         -  Service user SAP ID 
- *  @param[in] flowCntrlInd -  Flow control information
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PUBLIC S16 PtUiKwuFlowCntrlInd
-(
-Pst                    *pst,
-SuId                   suId,
-KwuFlowCntrlIndInfo    *flowCntrlIndInfo
-)
-#else
-PUBLIC S16 PtUiKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo)
-Pst                    *pst;
-SuId                   suId;
-KwuFlowCntrlIndInfo    *flowCntrlIndInfo;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuFlowCntrlInd)
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(flowCntrlIndInfo);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-
-} /* end of PtUiKwuFlowCntrlInd */
-#ifdef LTE_L2_MEAS
-
-/**
- *
- * @brief 
- *
- *        Handler for sending the Data ack indication  to the upper layer. 
- *
- * @b Description:
- *       
- *       This function confirms the succesfull transmission of SDU
- *
- *  @param[in] pst         Post structure  
- *  @param[in] suId        Service User SAP ID 
- *  @param[in] datAckInd   DatAckInd
- *
- *  @return  S16
- *      -# ROK 
- *      -# RFAILED
- */
-#ifdef ANSI
-PUBLIC S16 PtUiKwuDatAckInd
-(
-Pst               *pst,
-SuId              suId,
-KwuDatAckInfo     *datAckInd
-)
-#else
-PUBLIC S16 PtUiKwuDatAckInd(pst, suId, datAckInd)
-Pst               *pst;
-SuId              suId;
-KwuDatAckInfo     *datAckInd;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuDatAckInd)
-   
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(datAckInd);
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-   RETVALUE(ROK);
-}/* end of PtUiKwuDatAckInd */
-#endif /* LTE_L2_MEAS */
-#if (defined(PTKWKWU) || defined(KW_PDCP))
-
-/**
- *
- * @brief 
- *
- *        PtUiKwuDatInd - Portable common channel data request
- *
- *  @param[in] pst    -  Post structure  
- *  @param[in] suId   -  Service user SAP ID 
- *  @param[in] datInd -  Data Request
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PUBLIC S16 PtUiKwuDatInd
-(
-Pst               *pst,
-SuId              suId,
-KwuDatIndInfo     *datInd,
-Buffer            *mBuf
-)
-#else
-PUBLIC S16 PtUiKwuDatInd(pst, suId, datInd, mBuf)
-Pst               *pst;
-SuId              suId;
-KwuDatIndInfo     *datInd;
-Buffer            *mBuf;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiKwuDatInd)
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(datInd);
-   UNUSED(mBuf);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-
-} /* end of PtUiKwuDatInd */
-#endif /* PTKWKWU || KW_PDCP */
-
 
   
 /*********************************************************************
@@ -1184,29 +614,21 @@ PUBLIC CkwBndCfm kwUiCkwBndCfmMt[] =
 {
 #ifdef LCKWUICKW
    cmPkCkwBndCfm,            /* 0 - loosely coupled */
-#else
-   PtUiCkwBndCfm,            /* 0 - loosely coupled, portable  */
 #endif /* LCCKUICKW */
 #ifdef NH
    NhLiCkwBndCfm,            /* 1 - tightly coupled, RRC  */
-#else
-   PtUiCkwBndCfm,            /* 1 - tightly coupled, portable */
 #endif /* NH */
 };
 
 /* CKW Configuration confirm primitive */
 
-PUBLIC CkwCfgCfm kwUiCkwCfgCfmMt[] =
+PUBLIC RlcCfgCfm kwUiRlcCfgCfmMt[] =
 {
 #ifdef LCKWUICKW
-   cmPkCkwCfgCfm,            /* 0 - loosely coupled */
-#else
-   PtUiCkwCfgCfm,            /* 0 - loosely coupled, portable  */
+   cmPkRlcCfgCfm,            /* 0 - loosely coupled */
 #endif /* LCKWUICKW */
 #ifdef NH
-   NhLiCkwCfgCfm,            /* 1 - tightly coupled, RRC  */
-#else
-   PtUiCkwCfgCfm,            /* 1 - tightly coupled, portable */
+   NhLiRlcCfgCfm,            /* 1 - tightly coupled, RRC  */
 #endif /* NH */
 };
 
@@ -1214,13 +636,9 @@ PUBLIC CkwUeIdChgCfm kwUiCkwUeIdChgCfmMt[] =
 {
 #ifdef LCKWUICKW
    cmPkCkwUeIdChgCfm,            /* 0 - loosely coupled */
-#else
-   PtUiCkwUeIdChgCfm,            /* 0 - loosely coupled, portable  */
 #endif /* LCKWUICKW */
 #ifdef NH
    NhLiCkwUeIdChgCfm,            /* 1 - tightly coupled, RRC  */
-#else
-   PtUiCkwUeIdChgCfm,            /* 1 - tightly coupled, portable */
 #endif /* NH */
 };
 
@@ -1267,7 +685,7 @@ U8   status;                    /* Status */
    /* jump to specific primitive depending on configured selector */
    (*kwUiCkwBndCfmMt[pst->selector])(pst, suId, status);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiCkwBndCfm */
 
@@ -1293,27 +711,27 @@ U8   status;                    /* Status */
  *
  */
 #ifdef ANSI
-PUBLIC S16 KwUiCkwCfgCfm
+PUBLIC S16 KwUiRlcCfgCfm
 (
 Pst            *pst,                      /* post structure */
 SuId           suId,                      /* Service User Id */
-CkwCfgCfmInfo  *cfmInfo                    /* Configuration Confirm */
+RlcCfgCfmInfo  *cfmInfo                    /* Configuration Confirm */
 )
 #else
-PUBLIC S16 KwUiCkwCfgCfm(pst, suId, cfmInfo)
+PUBLIC S16 KwUiRlcCfgCfm(pst, suId, cfmInfo)
 Pst            *pst;                      /* post structure */
 SuId           suId;                      /* Service User Id */
-CkwCfgCfmInfo  *cfmInfo;                   /* Configuration Confirm */
+RlcCfgCfmInfo  *cfmInfo;                   /* Configuration Confirm */
 #endif
 {
-   TRC3(KwUiCkwCfgCfm)
+   TRC3(KwUiRlcCfgCfm)
 
    /* jump to specific primitive depending on configured selector */
-   (*kwUiCkwCfgCfmMt[pst->selector])(pst, suId, cfmInfo);
+   (*kwUiRlcCfgCfmMt[pst->selector])(pst, suId, cfmInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwUiCkwCfgCfm */
+} /* end of KwUiRlcCfgCfm */
 
 
 /**
@@ -1359,173 +777,28 @@ CmStatus       status;
    /* jump to specific primitive depending on configured selector */
    (*kwUiCkwUeIdChgCfmMt[pst->selector])(pst, suId, transId, ueInfo, status);
 
-   RETVALUE(ROK);
-
-} /* end of KwUiCkwCfgCfm */
-
-
-#ifdef PTKWCKW
-/*************************************************************************
- *                         CKW Porting Functions
- ************************************************************************/
-/**
- *
- * @brief 
- *
- *        KwUiCkwBndCfm - CKW SAP bind confirm
- *
- *  @param[in] pst      - Post structure  
- *  @param[in] suId     - Service user SAP ID 
- *  @param[in] status   - Status
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PRIVATE S16 PtUiCkwBndCfm 
-(
-Pst *pst,                       /* post structure */
-SuId suId,                      /* Service User Id */
-U8 status                       /* status */
-)
-#else
-PRIVATE S16 PtUiCkwBndCfm(pst, suId, status)
-Pst *pst;                       /* post structure */
-SuId suId;                      /* Service User Id */
-U8 status;                      /* status */
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiCkwBndCfm);
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(status);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-} /* end of PtUiCkwBndCfm */
-
-
-/**
- *
- * @brief 
- *
- *        PtUiCkwCfgCfm - KWU SAP bind confirm
- *
- *  @param[in] pst      - Post structure  
- *  @param[in] suId     - Service user SAP ID 
- *  @param[in] cfmInfo  - Configuration confirm
- *
- *  @return  S16
- *      -# ROK 
- */
-#ifdef ANSI
-PUBLIC S16 PtUiCkwCfgCfm
-(
-Pst            *pst,                      /* post structure */
-SuId           suId,                      /* Service User Id */
-CkwCfgCfmInfo  *cfmInfo                    /* Configuration Confirm */
-)
-#else
-PUBLIC S16 PtUiCkwCfgCfm(pst, suId, cfmInfo)
-Pst            *pst;                      /* post structure */
-SuId           suId;                      /* Service User Id */
-CkwCfgCfmInfo  *cfmInfo;                   /* Configuration Confirm */
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiCkwCfgCfm);
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(cfmInfo);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
-
-   RETVALUE(ROK);
-
-} /* end of PtUiCkwCfgCfm */
-
-#ifdef ANSI
-PUBLIC S16 PtUiCkwUeIdChgCfm 
-(
-Pst            *pst,                      /* post structure */
-SuId           suId,                      /* Service User Id */
-U32            transId,
-CkwUeInfo      *ueInfo,
-CmStatus       status
-)
-#else
-PUBLIC S16 PtUiCkwUeIdChgCfm(pst, suId,transId,ueInfo,status)
-Pst            *pst;                      /* post structure */
-SuId           suId;                      /* Service User Id */
-U32            transId;
-CkwUeInfo      *ueInfo;
-CmStatus       status;
-#endif
-{
-#if (ERRCLASS & ERRCLS_DEBUG)
-   KwCb   *tKwCb;
-#endif
-   TRC3(PtUiCkwUeIdChgCfm);
-
-   UNUSED(pst);
-   UNUSED(suId);
-   UNUSED(transId);
-   UNUSED(ueInfo);
-   UNUSED(status);
-
-#if (ERRCLASS & ERRCLS_DEBUG)
-   if (pst->srcInst >= KW_MAX_RLC_INSTANCES)
-   {
-      RETVALUE(RFAILED);
-   }
-   tKwCb = KW_GET_KWCB(pst->srcInst);
-   RLOG0(L_ERROR, "Improper selector value");
-#endif /* (ERRCLASS & ERRCLS_DEBUG) */
+   return ROK;
 
-   RETVALUE(ROK);
+} /* end of KwUiRlcCfgCfm */
 
-} /* end of PtUiCkwUeIdChgCfm */
-#endif /* PTKWCKW */
 
 #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF))
 /**
  *
  * @brief 
  *
- *        kwDlBatchProcSplit- process rbug messages
+ *        rlcDlBatchProcSplit- process rbug messages
  *
  *  @return  S16
  *      -# ROK 
  */
 #ifdef ANSI
-PUBLIC S16 kwDlBatchProcSplit 
+PUBLIC S16 rlcDlBatchProcSplit 
 (
 Void
 )
 #else
-PUBLIC S16 kwDlBatchProcSplit()
+PUBLIC S16 rlcDlBatchProcSplit()
 Void;
 #endif
 {
@@ -1594,18 +867,18 @@ Void;
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 
 #if defined(PDCP_RLC_DL_RBUF) || defined(SS_RBUF)
 #ifdef ANSI
-PUBLIC S16 kwDlBatchProc
+PUBLIC S16 rlcDlBatchProc
 (
 Void
 )
 #else
-PUBLIC S16 kwDlBatchProc()
+PUBLIC S16 rlcDlBatchProc()
 Void;
 #endif
 {
@@ -1665,7 +938,7 @@ Void;
       elmIndx = (Void *)SRngGetRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1679,14 +952,14 @@ PUBLIC S16 kwUtlDlBatchProcPkts
 Void;
 #endif
 {
-    kwDlBatchProc();
+    rlcDlBatchProc();
 #ifdef SS_RBUF
 #ifdef LTE_L2_MEAS
     kwUtlDlBatchProcHqStaInd();
 #endif
     kwUtlFreeDlMem();
 #endif
-    RETVALUE(ROK);
+    return ROK;
 }   
 
 
@@ -1716,7 +989,7 @@ Void;
       if((elmIndx = SRngGetRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC)) == NULLP)
       break;
    }
-   RETVALUE(ROK);
+   return ROK;
 }