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

[o-du/l2.git] / src / cm / kwu.x

diff --git a/src/cm/kwu.x b/src/cm/kwu.x
index 2e02492..c91c9e7 100755 (executable)
--- a/src/cm/kwu.x
+++ b/src/cm/kwu.x
@@ -125,9 +125,8 @@ typedef S16 (*KwuBndReq)      ARGS((Pst *pst, SuId suId,  SpId spId));
 typedef S16 (*KwuBndCfm)      ARGS((Pst *pst, SuId suId, U8 status));
 typedef S16 (*KwuUbndReq)     ARGS((Pst *pst, SuId suId, Reason reason));
 
-typedef S16 (*KwuDatReq)      ARGS((Pst *pst, SpId spId, KwuDatReqInfo* datReq,
-         Buffer *mBuf));
-typedef S16 (*KwuDatInd)      ARGS((Pst *pst, SuId suId, KwuDatIndInfo* datInd,
+typedef S16 (*KwuDatReq)      ARGS((Pst *pst, KwuDatReqInfo* datReq, Buffer *mBuf));
+typedef uint8_t (*KwuDatInd)      ARGS((Pst *pst, KwuDatIndInfo* datInd,
          Buffer *mBuf));
 typedef S16 (*KwuDatCfm)      ARGS((Pst *pst, SuId suId, KwuDatCfmInfo* datCfm));
 typedef S16 (*KwuDiscSduReq)  ARGS((Pst *pst, SpId spId, KwuDiscSduInfo* discSdu));
@@ -216,7 +215,6 @@ EXTERN S16 KwUiKwuUbndReq ARGS((Pst *pst,
  *   -# RFAILED
  */
 EXTERN S16 KwUiKwuDatReq ARGS((Pst *pst,
-         SpId spId,
          KwuDatReqInfo* datReq,
          Buffer *buf));
 
@@ -234,7 +232,6 @@ EXTERN S16 KwUiKwuDatReq ARGS((Pst *pst,
  *   -# RFAILED
  */
 EXTERN S16 KwUiKwuDatInd ARGS((Pst *pst,
-         SuId suId,
          KwuDatIndInfo* datInd,
          Buffer *mBuf));
 
@@ -359,7 +356,6 @@ EXTERN S16 NhLiKwuDatReq ARGS((Pst *pst,
          Buffer *buf));
 
 EXTERN S16 NhLiKwuDatInd ARGS((Pst *pst,
-         SuId suId,
          KwuDatIndInfo* datInd,
          Buffer *buf));
 #endif /* NH */
@@ -413,7 +409,6 @@ EXTERN S16 PjLiKwuDatReq ARGS((Pst *pst,
          Buffer *buf));
 
 EXTERN S16 PjLiKwuDatInd ARGS((Pst *pst,
-         SuId suId,
          KwuDatIndInfo* datInd,
          Buffer *buf));
 
@@ -455,12 +450,12 @@ EXTERN S16 kwUlBatchProc ARGS((Void));
  ****************************************************************************/
 #ifdef LCKWU
 /* Packing Functions */
-EXTERN S16 cmPkKwuDatReqInfo ARGS ((
+EXTERN uint8_t cmPkKwuDatReqInfo ARGS ((
 KwuDatReqInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkKwuDatIndInfo ARGS ((
+EXTERN uint8_t cmPkKwuDatIndInfo ARGS ((
 KwuDatIndInfo *param,
 Buffer *mBuf
 ));
@@ -493,16 +488,14 @@ SuId suId,
 U8 status
 ));
 
-EXTERN S16 cmPkKwuDatReq ARGS ((
+EXTERN uint8_t cmPkKwuDatReq ARGS ((
 Pst * pst,
-SpId spId,
 KwuDatReqInfo* datReq,
 Buffer * mBuf
 ));
 
-EXTERN S16 cmPkKwuDatInd ARGS ((
+EXTERN uint8_t cmPkKwuDatInd ARGS ((
 Pst * pst,
-SuId suId,
 KwuDatIndInfo* datInd,
 Buffer * mBuf
 ));
@@ -563,7 +556,7 @@ KwuDatReqInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkKwuDatIndInfo ARGS ((
+EXTERN uint8_t cmUnpkKwuDatIndInfo ARGS ((
 KwuDatIndInfo *param,
 Buffer *mBuf
 ));
@@ -602,7 +595,7 @@ Pst *pst,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkKwuDatInd ARGS ((
+EXTERN uint8_t cmUnpkKwuDatInd ARGS ((
 KwuDatInd func,
 Pst *pst,
 Buffer *mBuf