X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_udx_ptul.c;h=5bfbbc0bdd56eadb9972233e181d5bddd9e37d30;hb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;hp=42f0453c3fa41dd3f2d8746044173b147c37bf3c;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c
index 42f0453c3..5bfbbc0bd 100755
--- a/src/5gnrrlc/kw_udx_ptul.c
+++ b/src/5gnrrlc/kw_udx_ptul.c
@@ -32,18 +32,7 @@
 */
 
 /* header include files (.h) */
-#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 */
@@ -56,16 +45,6 @@
 #include "kw_dl.h"
 
 /* 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 */
@@ -77,34 +56,33 @@
 
 
 #ifndef LCKWULUDX
-PRIVATE S16 PtUlUdxBndReq ARGS((Pst* pst, SuId suId,SpId  spId ));
-PRIVATE S16 PtUlUdxUbndReq ARGS((Pst* pst, SuId suId,Reason reason));
-PRIVATE S16 PtUlUdxCfgReq ARGS((Pst *pst, SpId spId, CkwCfgInfo *cfgInfo));
-PRIVATE S16 PtUlUdxStaUpdReq ARGS((Pst* pst,SpId spId,CmLteRlcId *rlcId,
-                                KwUdxStaPdu         *pStaPdu ));
-PRIVATE S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, U32 transId, 
+static S16 PtUlUdxBndReq ARGS((Pst* pst, SuId suId,SpId  spId ));
+static S16 PtUlUdxUbndReq ARGS((Pst* pst, SuId suId,Reason reason));
+static S16 PtUlUdxCfgReq ARGS((Pst *pst, SpId spId, RlcCfgInfo *cfgInfo));
+static S16 PtUlUdxStaUpdReq ARGS((Pst* pst,SpId spId,CmLteRlcId *rlcId,
+                                RlcUdxStaPdu         *pStaPdu ));
+static S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, 
                                    CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo));
-PRIVATE S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId  spId, CmLteRlcId *rlcId,
-                             KwUdxDlStaPdu  *pStaPdu ));
+static S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId  spId, CmLteRlcId *rlcId,
+                             RlcUdxDlStaPdu  *pStaPdu ));
 #ifdef ANSI
-PRIVATE S16 PtUlUdxBndReq
+static S16 PtUlUdxBndReq
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 SpId spId                    /* Status */
 )
 #else
-PRIVATE S16 PtUlUdxBndReq(pst, suId,spId)
+static S16 PtUlUdxBndReq(pst, suId,spId)
 Pst *pst;                       /* post structure */
 SuId suId;                      /* Service User Id */
 SpId spId;                    /* Status */
 #endif
 {
-   TRC3(PtUlUdxBndReq)
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwDlUdxBndReq */
+} /* end of rlcDlUdxBndReq */
 
 /**
  *
@@ -127,82 +105,77 @@ SpId spId;                    /* Status */
  *
  */
 #ifdef ANSI
-PRIVATE S16 PtUlUdxUbndReq
+static S16 PtUlUdxUbndReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 Reason   reason                     /* Status */
 )
 #else
-PRIVATE S16 PtUlUdxUbndReq(pst, suId, status)
+static S16 PtUlUdxUbndReq(pst, suId, status)
 Pst *pst;                       /* post structure */
 SpId spId;                      /* Service User Id */
 Reason Reason;                    /* Status */
 #endif
 {
-   TRC3(PtUlUdxUbndReq)
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of PtDlUdxBndReq */
 
 #ifdef ANSI
-PRIVATE S16 PtUlUdxCfgReq
+static S16 PtUlUdxCfgReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
-CkwCfgInfo *cfmInfo             /* Config Info */
+RlcCfgInfo *cfmInfo             /* Config Info */
 )
 #else
-PRIVATE S16 PtUlUdxCfgReq(pst, spId, status)
+static S16 PtUlUdxCfgReq(pst, spId, status)
 Pst *pst;                       /* post structure */
 SpId spId;                      /* Service User Id */
-CkwCfgInfo *cfmInfo;              /* Config Info */
+RlcCfgInfo *cfmInfo;              /* Config Info */
 #endif
 {
-   TRC3(PtUlUdxCfgReq)
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwDlUdxCfgReq */
+} /* end of rlcDlUdxCfgReq */
 
 #ifdef ANSI
-PRIVATE S16 PtUlUdxUeIdChgReq
+static S16 PtUlUdxUeIdChgReq
 (
 Pst *pst,                      /* post structure */
 SpId spId,                     /* Service User Id */
-U32      transId,              /* transaction Id */
+uint32_t  transId,              /* transaction Id */
 CkwUeInfo *ueInfo,             /* Config Info */
 CkwUeInfo *newUeInfo           /* Config Info */
 )
 #else
-PRIVATE S16 PtUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo)
+static S16 PtUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo)
 Pst *pst;                      /* post structure */
 SpId spId;                     /* Service User Id */
-U32      transId;              /* transaction Id */
+uint32_t  transId;              /* transaction Id */
 CkwUeInfo *ueInfo;             /* Config Info */
 CkwUeInfo *newUeInfo;          /* Config Info */
 #endif
 {
-   TRC3(PtUlUdxUeIdChgReq)
 
+   return ROK;
 
-   RETVALUE(ROK);
+} /* end of rlcDlUdxCfgReq */
 
-} /* end of KwDlUdxCfgReq */
 
-
-PRIVATE S16  PtUlUdxStaPduReq
+static S16  PtUlUdxStaPduReq
 (
 Pst*                pst,
 SpId                spId,
 CmLteRlcId          *rlcId,
-KwUdxDlStaPdu       *pStaPdu
+RlcUdxDlStaPdu       *pStaPdu
 )
 {
-   TRC3(PtUlUdxStaPduReq);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -218,26 +191,24 @@ KwUdxDlStaPdu       *pStaPdu
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16  PtUlUdxStaUpdReq
+static S16  PtUlUdxStaUpdReq
 (
 Pst*                pst,
 SpId                spId,
 CmLteRlcId          *rlcId,
-KwUdxStaPdu       *pStaPdu
+RlcUdxStaPdu       *pStaPdu
 )
 #else
-PRIVATE S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu)
+static S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu)
 Pst*                pst;
 SpId                spId;
 CmLteRlcId          *rlcId;
-KwUdxDlStaPdu       *pStaPdu;
+RlcUdxDlStaPdu       *pStaPdu;
 #endif
 {
 
-   TRC3(PtUlUdxStaUpdReq);
-
-   RETVALUE(ROK);
-} /* end of KwUlmDlmStaUpd*/
+   return ROK;
+} /* end of RlcUlmDlmStaUpd*/
 
 #ifdef LTE_L2_MEAS
 /**
@@ -253,21 +224,19 @@ KwUdxDlStaPdu       *pStaPdu;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16  PtUlUdxL2MeasReq
+static S16  PtUlUdxL2MeasReq
 (
 Pst*                pst,
-KwL2MeasReqEvt      *measReqEvt
+RlcL2MeasReqEvt      *measReqEvt
 )
 #else
-PRIVATE S16 PtUlUdxL2MeasReq(pst, measReqEvt )
+static S16 PtUlUdxL2MeasReq(pst, measReqEvt )
 Pst*                pst;
-KwL2MeasReqEvt      *measReqEvt;
+RlcL2MeasReqEvt      *measReqEvt;
 #endif
 {
 
-   TRC3(PtUlUdxL2MeasReq);
-
-   RETVALUE(ROK);
+   return ROK;
 } 
 
 /**
@@ -283,21 +252,19 @@ KwL2MeasReqEvt      *measReqEvt;
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16  PtUlUdxL2MeasSendReq
+static S16  PtUlUdxL2MeasSendReq
 (
-Pst*                pst,
-U8                  status
+Pst*       pst,
+uint8_t    status
 )
 #else
-PRIVATE S16 PtUlUdxL2MeasSendReq(pst, status )
-Pst*                pst;
-U8                  status
+static S16 PtUlUdxL2MeasSendReq(pst, status )
+Pst*        pst;
+uint8_t     status
 #endif
 {
 
-   TRC3(PtUlUdxL2MeasSendReq);
-
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -313,26 +280,24 @@ U8                  status
 *      -# ROK
 **/
 #ifdef ANSI
-PRIVATE S16  PtUlUdxL2MeasStopReq
+static S16  PtUlUdxL2MeasStopReq
 (
-Pst*                pst,
-U8                  status
+Pst*      pst,
+uint8_t   status
 )
 #else
-PRIVATE S16 PtUlUdxL2MeasStopReq(pst, status )
-Pst*                pst;
-U8                  status
+static S16 PtUlUdxL2MeasStopReq(pst, status )
+Pst*       pst;
+uint8_t    status
 #endif
 {
 
-   TRC3(PtUlUdxL2MeasStopReq);
-
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 #endif
 
-PRIVATE UdxBndReq kwUlUdxBndReqMt[] =
+static UdxBndReq rlcUlUdxBndReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxBndReq,            /* 0 - loosely coupled */
@@ -345,13 +310,13 @@ PRIVATE UdxBndReq kwUlUdxBndReqMt[] =
    PtUlUdxBndReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxBndReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxBndReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxBndReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 
-PRIVATE UdxUbndReq kwUlUdxUbndReqMt[] =
+static UdxUbndReq rlcUlUdxUbndReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxUbndReq,            /* 0 - loosely coupled */
@@ -364,14 +329,14 @@ PRIVATE UdxUbndReq kwUlUdxUbndReqMt[] =
    PtUlUdxUbndReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxUbndReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxUbndReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxUbndReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 
 
-PRIVATE UdxCfgReq kwUlUdxCfgReqMt[] =
+static UdxCfgReq rlcUlUdxCfgReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxCfgReq,            /* 0 - loosely coupled */
@@ -384,13 +349,13 @@ PRIVATE UdxCfgReq kwUlUdxCfgReqMt[] =
    PtUlUdxCfgReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxCfgReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxCfgReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxCfgReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 
-PRIVATE UdxUeIdChgReq kwUlUdxUeIdChgReqMt[] =
+static UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxUeIdChgReq,            /* 0 - loosely coupled */
@@ -403,14 +368,14 @@ PRIVATE UdxUeIdChgReq kwUlUdxUeIdChgReqMt[] =
    PtUlUdxUeIdChgReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxUeIdChgReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxUeIdChgReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxUeIdChgReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 
 
-PRIVATE CONSTANT UdxStaUpdReq kwUlUdxStaUpdReqMt[KW_MAX_UDX] =
+static const UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxStaUpdReq,            /* 0 - loosely coupled */
@@ -423,13 +388,13 @@ PRIVATE CONSTANT UdxStaUpdReq kwUlUdxStaUpdReqMt[KW_MAX_UDX] =
    PtUlUdxStaUpdReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxStaUpdReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxStaUpdReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxStaUpdReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 
-PRIVATE CONSTANT UdxStaPduReq kwUlUdxStaPduReqMt[KW_MAX_UDX] =
+static const UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxStaPduReq,            /* 0 - loosely coupled */
@@ -442,13 +407,13 @@ PRIVATE CONSTANT UdxStaPduReq kwUlUdxStaPduReqMt[KW_MAX_UDX] =
    PtUlUdxStaPduReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxStaPduReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxStaPduReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxStaPduReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 #ifdef LTE_L2_MEAS
-PRIVATE CONSTANT UdxL2MeasReq kwUlUdxL2MeasReqMt[KW_MAX_UDX] =
+static const UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxL2MeasReq,            /* 0 - loosely coupled */
@@ -461,13 +426,13 @@ PRIVATE CONSTANT UdxL2MeasReq kwUlUdxL2MeasReqMt[KW_MAX_UDX] =
    PtUlUdxL2MeasReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxL2MeasReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxL2MeasReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxL2MeasReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 
-PRIVATE CONSTANT UdxL2MeasSendReq kwUlUdxL2MeasSendReqMt[KW_MAX_UDX] =
+static const UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxL2MeasSendReq,            /* 0 - loosely coupled */
@@ -480,13 +445,13 @@ PRIVATE CONSTANT UdxL2MeasSendReq kwUlUdxL2MeasSendReqMt[KW_MAX_UDX] =
    PtUlUdxL2MeasSendReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxL2MeasSendReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxL2MeasSendReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxL2MeasSendReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
 };
 
-PRIVATE CONSTANT UdxL2MeasStopReq kwUlUdxL2MeasStopReqMt[KW_MAX_UDX] =
+static const UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxL2MeasStopReq,            /* 0 - loosely coupled */
@@ -499,7 +464,7 @@ PRIVATE CONSTANT UdxL2MeasStopReq kwUlUdxL2MeasStopReqMt[KW_MAX_UDX] =
    PtUlUdxL2MeasStopReq,            /* 1 - loosely coupled, portable  */
 #endif /* LCKWUIKWU */
 #ifdef KW
-   KwDlUdxL2MeasStopReq,            /* 2 - tightly coupled, RRC  */
+   rlcDlUdxL2MeasStopReq,            /* 2 - tightly coupled, RRC  */
 #else
    PtUlUdxL2MeasStopReq,            /* 2 - tightly coupled, portable */
 #endif /* KW */
@@ -526,27 +491,25 @@ PRIVATE CONSTANT UdxL2MeasStopReq kwUlUdxL2MeasStopReqMt[KW_MAX_UDX] =
  *
  */
 #ifdef ANSI
-PUBLIC S16 KwUlUdxBndReq
+S16 rlcUlUdxBndReq
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 SpId spId                     /* Status */
 )
 #else
-PUBLIC S16 KwUlUdxBndReq(pst, suId, status)
+S16 rlcUlUdxBndReq(pst, suId, status)
 Pst *pst;                       /* post structure */
 SuId suId;                      /* Service User Id */
 SpId spId;                    /* Status */
 #endif
 {
-   TRC3(KwUlUdxBndReq)
-
    /* jump to specific primitive depending on configured selector */
-   (*kwUlUdxBndReqMt[pst->selector])(pst, suId, spId);
+   (*rlcUlUdxBndReqMt[pst->selector])(pst, suId, spId);
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwDlUdxBndReq */
+} /* end of rlcDlUdxBndReq */
 
 /**
  *
@@ -569,91 +532,79 @@ SpId spId;                    /* Status */
  *
  */
 #ifdef ANSI
-PUBLIC S16 KwUlUdxUbndReq
+S16 rlcUlUdxUbndReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 Reason   reason                     /* Status */
 )
 #else
-PUBLIC S16 KwUlUdxUbndReq(pst, suId, status)
+S16 rlcUlUdxUbndReq(pst, suId, status)
 Pst *pst;                       /* post structure */
 SpId spId;                      /* Service User Id */
 Reason Reason;                    /* Status */
 #endif
 {
-   TRC3(KwUlUdxUbndReq)
-
    /* jump to specific primitive depending on configured selector */
-   (*kwUlUdxUbndReqMt[pst->selector])(pst, spId,reason );
+   (*rlcUlUdxUbndReqMt[pst->selector])(pst, spId,reason );
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwDlUdxBndReq */
+} /* end of rlcDlUdxBndReq */
 
 #ifdef ANSI
-PUBLIC S16 KwUlUdxCfgReq
+S16 rlcUlUdxCfgReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
-CkwCfgInfo *cfmInfo             /* Config Info */
+RlcCfgInfo *cfmInfo             /* Config Info */
 )
 #else
-PUBLIC S16 KwUlUdxCfgReq(pst, suId, status)
+S16 rlcUlUdxCfgReq(pst, suId, status)
 Pst *pst;                       /* post structure */
 SuId spId;                      /* Service User Id */
-CkwCfgInfo *cfmInfo;              /* Config Info */
+RlcCfgInfo *cfmInfo;              /* Config Info */
 #endif
 {
-   TRC3(KwUlUdxCfgReq)
 
    /* jump to specific primitive depending on configured selector */
-   (*kwUlUdxCfgReqMt[pst->selector])(pst, spId, cfmInfo);
+   (*rlcUlUdxCfgReqMt[pst->selector])(pst, spId, cfmInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwDlUdxCfgReq */
+} /* end of rlcDlUdxCfgReq */
 
 #ifdef ANSI
-PUBLIC S16 KwUlUdxUeIdChgReq
+S16 rlcUlUdxUeIdChgReq
 (
 Pst *pst,                      /* post structure */
 SpId spId,                     /* Service User Id */
-U32      transId,              /* transaction Id */
+uint32_t  transId,              /* transaction Id */
 CkwUeInfo *ueInfo,             /* Config Info */
 CkwUeInfo *newUeInfo           /* Config Info */
 )
 #else
-PUBLIC S16 KwUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo)
+S16 rlcUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo)
 Pst *pst;                      /* post structure */
 SpId spId;                     /* Service User Id */
-U32      transId;              /* transaction Id */
+uint32_t  transId;              /* transaction Id */
 CkwUeInfo *ueInfo;             /* Config Info */
 CkwUeInfo *newUeInfo;          /* Config Info */
 #endif
 {
-   TRC3(KwUlUdxUeIdChgReq)
 
    /* jump to specific primitive depending on configured selector */
-   (*kwUlUdxUeIdChgReqMt[pst->selector])(pst, spId,transId,ueInfo,newUeInfo);
+   (*rlcUlUdxUeIdChgReqMt[pst->selector])(pst, spId,transId,ueInfo,newUeInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwDlUdxCfgReq */
+} /* end of rlcDlUdxCfgReq */
 
 
 
-PUBLIC S16  KwUlUdxStaPduReq
-(
-Pst*                pst,
-SpId                spId,
-CmLteRlcId          *rlcId,
-KwUdxDlStaPdu       *pStaPdu
-)
+uint8_t rlcUlUdxStaPduReq(Pst* pst, SpId spId, CmLteRlcId *rlcId, RlcUdxDlStaPdu *pStaPdu)
 {
-   TRC3(KwUlUdxStaPduReq);
-
-   RETVALUE((*kwUlUdxStaPduReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
+   return ((*rlcUlUdxStaPduReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
 }
 
 /**
@@ -668,27 +619,10 @@ KwUdxDlStaPdu       *pStaPdu
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16  KwUlUdxStaUpdReq
-(
-Pst*                pst,
-SpId                spId,
-CmLteRlcId          *rlcId,
-KwUdxStaPdu         *pStaPdu
-)
-#else
-PUBLIC S16 KwUlUdxStaUpdReq(pst, rlcId, pStaPdu)
-Pst*                pst;
-SpId                spId;
-CmLteRlcId          *rlcId;
-KwUdxStaPdu         *pStaPdu;
-#endif
+uint8_t rlcUlUdxStaUpdReq(Pst* pst, SpId spId, CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu)
 {
-
-   TRC3(KwUlUdxStaUpdReq);
-
-   RETVALUE((*kwUlUdxStaUpdReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
-} /* end of KwUlmDlmStaUpd*/
+   return ((*rlcUlUdxStaUpdReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
+} /* end of RlcUlmDlmStaUpd*/
 
 #ifdef LTE_L2_MEAS
 /**
@@ -696,7 +630,7 @@ KwUdxStaPdu         *pStaPdu;
 *
 * @details
 *
-*     Function : KwUlUdxL2MeasReq
+*     Function : rlcUlUdxL2MeasReq
 *
 *  @param[in]   Pst*           pst
 
@@ -704,29 +638,27 @@ KwUdxStaPdu         *pStaPdu;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16  KwUlUdxL2MeasReq
+S16  rlcUlUdxL2MeasReq
 (
 Pst*                pst,
-KwL2MeasReqEvt      *measReqEvt 
+RlcL2MeasReqEvt      *measReqEvt 
 )
 #else
-PUBLIC S16 KwUlUdxL2MeasReq(pst,measReqEvt)
+S16 rlcUlUdxL2MeasReq(pst,measReqEvt)
 Pst*                pst;
-KwL2MeasReqEvt      *measReqEvt; 
+RlcL2MeasReqEvt      *measReqEvt; 
 #endif
 {
 
-   TRC3(KwUlUdxStaUpdReq);
-
-   RETVALUE((*kwUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt));
-} /* end of KwUlUdxL2MeasReq*/
+   return ((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt));
+} /* end of rlcUlUdxL2MeasReq*/
 
 /**
 * @brief Request from ULM to DLM for MeasSendReq 
 *
 * @details
 *
-*     Function : KwUlUdxMeasSendReq
+*     Function : rlcUlUdxMeasSendReq
 *
 *  @param[in]   Pst*           pst
 
@@ -734,29 +666,27 @@ KwL2MeasReqEvt      *measReqEvt;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16  KwUlUdxL2MeasSendReq
+S16  rlcUlUdxL2MeasSendReq
 (
-Pst*                pst,
-U8                  measType
+Pst*        pst,
+uint8_t     measType
 )
 #else
-PUBLIC S16 KwUlUdxL2MeasSendReq(pst,measReqEvt)
-Pst*                pst;
-U8                  measType;
+S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt)
+Pst*        pst;
+uint8_t     measType;
 #endif
 {
 
-   TRC3(KwUlUdxStaUpdReq);
-
-   RETVALUE((*kwUlUdxL2MeasSendReqMt[pst->selector])(pst,measType));
-} /* end of KwUlUdxMesReq*/
+   return ((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType));
+} /* end of rlcUlUdxMesReq*/
 
 /**
 * @brief Request from ULM to DLM for MeasStopReq 
 *
 * @details
 *
-*     Function : KwUlUdxL2MeasStopReq
+*     Function : rlcUlUdxL2MeasStopReq
 *
 *  @param[in]   Pst*           pst
 
@@ -764,22 +694,20 @@ U8                  measType;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16  KwUlUdxL2MeasStopReq
+S16  rlcUlUdxL2MeasStopReq
 (
-Pst*                pst,
-U8                  measType
+Pst*        pst,
+uint8_t     measType
 )
 #else
-PUBLIC S16 KwUlUdxL2MeasStopReq(pst,measReqEvt)
-Pst*                pst;
-U8                  measType;
+S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt)
+Pst*        pst;
+uint8_t     measType;
 #endif
 {
 
-   TRC3(KwUlUdxStaUpdReq);
-
-   RETVALUE((*kwUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));
-} /* end of KwUlUdxMesReq*/
+   return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));
+} /* end of rlcUlUdxMesReq*/
 #endif
 /**********************************************************************