X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ptui.c;h=3ccb28591ed566b5465306035590c3c192bd70e0;hb=604190ac7e354996f34ebfae0cdd00962811393f;hp=c056bc0ed5b4bdabc6bf76b7d1c80a74051c6dea;hpb=d10b52519198632f93deae9574adc69c7ce12efa;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c
index c056bc0ed..3ccb28591 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,7 +99,7 @@ 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
 
   
@@ -341,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
@@ -356,7 +333,7 @@ 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);
 
@@ -645,13 +622,13 @@ PUBLIC CkwBndCfm kwUiCkwBndCfmMt[] =
 
 /* CKW Configuration confirm primitive */
 
-PUBLIC CkwCfgCfm kwUiCkwCfgCfmMt[] =
+PUBLIC RlcCfgCfm kwUiRlcCfgCfmMt[] =
 {
 #ifdef LCKWUICKW
-   cmPkCkwCfgCfm,            /* 0 - loosely coupled */
+   cmPkRlcCfgCfm,            /* 0 - loosely coupled */
 #endif /* LCKWUICKW */
 #ifdef NH
-   NhLiCkwCfgCfm,            /* 1 - tightly coupled, RRC  */
+   NhLiRlcCfgCfm,            /* 1 - tightly coupled, RRC  */
 #endif /* NH */
 };
 
@@ -734,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);
 
-} /* end of KwUiCkwCfgCfm */
+} /* end of KwUiRlcCfgCfm */
 
 
 /**
@@ -802,7 +779,7 @@ CmStatus       status;
 
    RETVALUE(ROK);
 
-} /* end of KwUiCkwCfgCfm */
+} /* end of KwUiRlcCfgCfm */
 
 
 #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF))
@@ -810,18 +787,18 @@ CmStatus       status;
  *
  * @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
 {
@@ -896,12 +873,12 @@ Void;
 
 #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
 {
@@ -975,7 +952,7 @@ PUBLIC S16 kwUtlDlBatchProcPkts
 Void;
 #endif
 {
-    kwDlBatchProc();
+    rlcDlBatchProc();
 #ifdef SS_RBUF
 #ifdef LTE_L2_MEAS
     kwUtlDlBatchProcHqStaInd();