Merge "Replaced old SSI function with new macros jira id - ODUHIGH-212"

[o-du/l2.git] / src / 5gnrrlc / kw_ptui.c

diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c
index a1e49fb..1d58968 100755 (executable)
--- a/src/5gnrrlc/kw_ptui.c
+++ b/src/5gnrrlc/kw_ptui.c
@@ -37,18 +37,7 @@ static int RLOG_FILE_ID=199;
 
 \f
 /* 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
 
 \f  
@@ -312,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 */
 
@@ -356,7 +335,7 @@ Buffer            *mBuf;
    /* jump to specific primitive depending on configured selector */
    (*kwUiKwuDatIndMt[pst->selector])(pst, datInd, mBuf);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of KwUiKwuDatInd */
 
@@ -402,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 */
 
@@ -446,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 */
 
@@ -491,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 */
@@ -533,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 */ 
 
@@ -575,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
@@ -617,7 +596,7 @@ 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 */
@@ -643,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 */
 };
 
@@ -706,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 */
 
@@ -732,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 */
 
 \f
 /**
@@ -798,9 +777,9 @@ CmStatus       status;
    /* jump to specific primitive depending on configured selector */
    (*kwUiCkwUeIdChgCfmMt[pst->selector])(pst, suId, transId, ueInfo, status);
 
-   RETVALUE(ROK);
+   return ROK;
 
-} /* end of KwUiCkwCfgCfm */
+} /* end of KwUiRlcCfgCfm */
 
 
 #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF))
@@ -808,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
 {
@@ -888,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
 {
@@ -959,7 +938,7 @@ Void;
       elmIndx = (Void *)SRngGetRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC);
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -973,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;
 }   
 
 
@@ -1010,7 +989,7 @@ Void;
       if((elmIndx = SRngGetRIndx(SS_RNG_BUF_DLPDCP_TO_DLRLC)) == NULLP)
       break;
    }
-   RETVALUE(ROK);
+   return ROK;
 }