L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]

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

diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c
index a4154c2..5bfbbc0 100755 (executable)
--- a/src/5gnrrlc/kw_udx_ptul.c
+++ b/src/5gnrrlc/kw_udx_ptul.c
@@ -56,32 +56,31 @@
 
 
 #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, RlcCfgInfo *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 rlcDlUdxBndReq */
 
@@ -106,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 */
 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 */
 RlcCfgInfo *cfmInfo;              /* Config Info */
 #endif
 {
-   TRC3(PtUlUdxCfgReq)
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* 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)
 
-
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxCfgReq */
 
 
-PRIVATE S16  PtUlUdxStaPduReq
+static S16  PtUlUdxStaPduReq
 (
 Pst*                pst,
 SpId                spId,
 CmLteRlcId          *rlcId,
-KwUdxDlStaPdu       *pStaPdu
+RlcUdxDlStaPdu       *pStaPdu
 )
 {
-   TRC3(PtUlUdxStaPduReq);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -197,25 +191,23 @@ 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);
+   return ROK;
 } /* end of RlcUlmDlmStaUpd*/
 
 #ifdef LTE_L2_MEAS
@@ -232,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;
 } 
 
 /**
@@ -262,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;
 }
 
 /**
@@ -292,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 rlcUlUdxBndReqMt[] =
+static UdxBndReq rlcUlUdxBndReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxBndReq,            /* 0 - loosely coupled */
@@ -330,7 +316,7 @@ PRIVATE UdxBndReq rlcUlUdxBndReqMt[] =
 #endif /* KW */
 };
 
-PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] =
+static UdxUbndReq rlcUlUdxUbndReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxUbndReq,            /* 0 - loosely coupled */
@@ -350,7 +336,7 @@ PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] =
 };
 
 
-PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] =
+static UdxCfgReq rlcUlUdxCfgReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxCfgReq,            /* 0 - loosely coupled */
@@ -369,7 +355,7 @@ PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] =
 #endif /* KW */
 };
 
-PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] =
+static UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] =
 {
 #ifdef LCKWULUDX
    cmPkUdxUeIdChgReq,            /* 0 - loosely coupled */
@@ -389,7 +375,7 @@ PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] =
 };
 
 
-PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[KW_MAX_UDX] =
+static const UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxStaUpdReq,            /* 0 - loosely coupled */
@@ -408,7 +394,7 @@ PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[KW_MAX_UDX] =
 #endif /* KW */
 };
 
-PRIVATE CONSTANT UdxStaPduReq rlcUlUdxStaPduReqMt[KW_MAX_UDX] =
+static const UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxStaPduReq,            /* 0 - loosely coupled */
@@ -427,7 +413,7 @@ PRIVATE CONSTANT UdxStaPduReq rlcUlUdxStaPduReqMt[KW_MAX_UDX] =
 #endif /* KW */
 };
 #ifdef LTE_L2_MEAS
-PRIVATE CONSTANT UdxL2MeasReq rlcUlUdxL2MeasReqMt[KW_MAX_UDX] =
+static const UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxL2MeasReq,            /* 0 - loosely coupled */
@@ -446,7 +432,7 @@ PRIVATE CONSTANT UdxL2MeasReq rlcUlUdxL2MeasReqMt[KW_MAX_UDX] =
 #endif /* KW */
 };
 
-PRIVATE CONSTANT UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[KW_MAX_UDX] =
+static const UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxL2MeasSendReq,            /* 0 - loosely coupled */
@@ -465,7 +451,7 @@ PRIVATE CONSTANT UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[KW_MAX_UDX] =
 #endif /* KW */
 };
 
-PRIVATE CONSTANT UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[KW_MAX_UDX] =
+static const UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] =
 {
 #ifdef LCKWULUDX
    cmPkUdxL2MeasStopReq,            /* 0 - loosely coupled */
@@ -505,25 +491,23 @@ PRIVATE CONSTANT UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[KW_MAX_UDX] =
  *
  */
 #ifdef ANSI
-PUBLIC S16 rlcUlUdxBndReq
+S16 rlcUlUdxBndReq
 (
 Pst *pst,                       /* post structure */
 SuId suId,                      /* Service User Id */
 SpId spId                     /* Status */
 )
 #else
-PUBLIC S16 rlcUlUdxBndReq(pst, suId, status)
+S16 rlcUlUdxBndReq(pst, suId, status)
 Pst *pst;                       /* post structure */
 SuId suId;                      /* Service User Id */
 SpId spId;                    /* Status */
 #endif
 {
-   TRC3(rlcUlUdxBndReq)
-
    /* jump to specific primitive depending on configured selector */
    (*rlcUlUdxBndReqMt[pst->selector])(pst, suId, spId);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxBndReq */
 
@@ -548,91 +532,79 @@ SpId spId;                    /* Status */
  *
  */
 #ifdef ANSI
-PUBLIC S16 rlcUlUdxUbndReq
+S16 rlcUlUdxUbndReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 Reason   reason                     /* Status */
 )
 #else
-PUBLIC S16 rlcUlUdxUbndReq(pst, suId, status)
+S16 rlcUlUdxUbndReq(pst, suId, status)
 Pst *pst;                       /* post structure */
 SpId spId;                      /* Service User Id */
 Reason Reason;                    /* Status */
 #endif
 {
-   TRC3(rlcUlUdxUbndReq)
-
    /* jump to specific primitive depending on configured selector */
    (*rlcUlUdxUbndReqMt[pst->selector])(pst, spId,reason );
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxBndReq */
 
 #ifdef ANSI
-PUBLIC S16 rlcUlUdxCfgReq
+S16 rlcUlUdxCfgReq
 (
 Pst *pst,                       /* post structure */
 SpId spId,                      /* Service User Id */
 RlcCfgInfo *cfmInfo             /* Config Info */
 )
 #else
-PUBLIC S16 rlcUlUdxCfgReq(pst, suId, status)
+S16 rlcUlUdxCfgReq(pst, suId, status)
 Pst *pst;                       /* post structure */
 SuId spId;                      /* Service User Id */
 RlcCfgInfo *cfmInfo;              /* Config Info */
 #endif
 {
-   TRC3(rlcUlUdxCfgReq)
 
    /* jump to specific primitive depending on configured selector */
    (*rlcUlUdxCfgReqMt[pst->selector])(pst, spId, cfmInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxCfgReq */
 
 #ifdef ANSI
-PUBLIC S16 rlcUlUdxUeIdChgReq
+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 rlcUlUdxUeIdChgReq(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(rlcUlUdxUeIdChgReq)
 
    /* jump to specific primitive depending on configured selector */
    (*rlcUlUdxUeIdChgReqMt[pst->selector])(pst, spId,transId,ueInfo,newUeInfo);
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxCfgReq */
 
 
 
-PUBLIC S16  rlcUlUdxStaPduReq
-(
-Pst*                pst,
-SpId                spId,
-CmLteRlcId          *rlcId,
-KwUdxDlStaPdu       *pStaPdu
-)
+uint8_t rlcUlUdxStaPduReq(Pst* pst, SpId spId, CmLteRlcId *rlcId, RlcUdxDlStaPdu *pStaPdu)
 {
-   TRC3(rlcUlUdxStaPduReq);
-
-   RETVALUE((*rlcUlUdxStaPduReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
+   return ((*rlcUlUdxStaPduReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
 }
 
 /**
@@ -647,26 +619,9 @@ KwUdxDlStaPdu       *pStaPdu
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16  rlcUlUdxStaUpdReq
-(
-Pst*                pst,
-SpId                spId,
-CmLteRlcId          *rlcId,
-KwUdxStaPdu         *pStaPdu
-)
-#else
-PUBLIC S16 rlcUlUdxStaUpdReq(pst, rlcId, pStaPdu)
-Pst*                pst;
-SpId                spId;
-CmLteRlcId          *rlcId;
-KwUdxStaPdu         *pStaPdu;
-#endif
+uint8_t rlcUlUdxStaUpdReq(Pst* pst, SpId spId, CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu)
 {
-
-   TRC3(rlcUlUdxStaUpdReq);
-
-   RETVALUE((*rlcUlUdxStaUpdReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
+   return ((*rlcUlUdxStaUpdReqMt[pst->selector])(pst,spId, rlcId, pStaPdu));
 } /* end of RlcUlmDlmStaUpd*/
 
 #ifdef LTE_L2_MEAS
@@ -683,21 +638,19 @@ KwUdxStaPdu         *pStaPdu;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16  rlcUlUdxL2MeasReq
+S16  rlcUlUdxL2MeasReq
 (
 Pst*                pst,
-KwL2MeasReqEvt      *measReqEvt 
+RlcL2MeasReqEvt      *measReqEvt 
 )
 #else
-PUBLIC S16 rlcUlUdxL2MeasReq(pst,measReqEvt)
+S16 rlcUlUdxL2MeasReq(pst,measReqEvt)
 Pst*                pst;
-KwL2MeasReqEvt      *measReqEvt; 
+RlcL2MeasReqEvt      *measReqEvt; 
 #endif
 {
 
-   TRC3(rlcUlUdxStaUpdReq);
-
-   RETVALUE((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt));
+   return ((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt));
 } /* end of rlcUlUdxL2MeasReq*/
 
 /**
@@ -713,21 +666,19 @@ KwL2MeasReqEvt      *measReqEvt;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16  rlcUlUdxL2MeasSendReq
+S16  rlcUlUdxL2MeasSendReq
 (
-Pst*                pst,
-U8                  measType
+Pst*        pst,
+uint8_t     measType
 )
 #else
-PUBLIC S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt)
-Pst*                pst;
-U8                  measType;
+S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt)
+Pst*        pst;
+uint8_t     measType;
 #endif
 {
 
-   TRC3(rlcUlUdxStaUpdReq);
-
-   RETVALUE((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType));
+   return ((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType));
 } /* end of rlcUlUdxMesReq*/
 
 /**
@@ -743,21 +694,19 @@ U8                  measType;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16  rlcUlUdxL2MeasStopReq
+S16  rlcUlUdxL2MeasStopReq
 (
-Pst*                pst,
-U8                  measType
+Pst*        pst,
+uint8_t     measType
 )
 #else
-PUBLIC S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt)
-Pst*                pst;
-U8                  measType;
+S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt)
+Pst*        pst;
+uint8_t     measType;
 #endif
 {
 
-   TRC3(rlcUlUdxStaUpdReq);
-
-   RETVALUE((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));
+   return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));
 } /* end of rlcUlUdxMesReq*/
 #endif
 /**********************************************************************