X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_udx_ptul.c;h=1e072a74d7be530d8e4b721c0335391eb9c4f859;hb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;hp=a4154c2d4ce32fd5810e784c01f914fb724930b8;hpb=5831bf6b3454aa200a92cd3e84209650734e4863;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c
index a4154c2d4..1e072a74d 100755
--- a/src/5gnrrlc/kw_udx_ptul.c
+++ b/src/5gnrrlc/kw_udx_ptul.c
@@ -60,11 +60,11 @@ 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 ));
+                                RlcUdxStaPdu         *pStaPdu ));
 PRIVATE S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, U32 transId, 
                                    CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo));
 PRIVATE S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId  spId, CmLteRlcId *rlcId,
-                             KwUdxDlStaPdu  *pStaPdu ));
+                             RlcUdxDlStaPdu  *pStaPdu ));
 #ifdef ANSI
 PRIVATE S16 PtUlUdxBndReq
 (
@@ -79,9 +79,8 @@ SuId suId;                      /* Service User Id */
 SpId spId;                    /* Status */
 #endif
 {
-   TRC3(PtUlUdxBndReq)
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxBndReq */
 
@@ -119,9 +118,8 @@ SpId spId;                      /* Service User Id */
 Reason Reason;                    /* Status */
 #endif
 {
-   TRC3(PtUlUdxUbndReq)
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of PtDlUdxBndReq */
 
@@ -139,9 +137,8 @@ SpId spId;                      /* Service User Id */
 RlcCfgInfo *cfmInfo;              /* Config Info */
 #endif
 {
-   TRC3(PtUlUdxCfgReq)
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxCfgReq */
 
@@ -163,10 +160,8 @@ CkwUeInfo *ueInfo;             /* Config Info */
 CkwUeInfo *newUeInfo;          /* Config Info */
 #endif
 {
-   TRC3(PtUlUdxUeIdChgReq)
 
-
-   RETVALUE(ROK);
+   return ROK;
 
 } /* end of rlcDlUdxCfgReq */
 
@@ -176,12 +171,11 @@ PRIVATE S16  PtUlUdxStaPduReq
 Pst*                pst,
 SpId                spId,
 CmLteRlcId          *rlcId,
-KwUdxDlStaPdu       *pStaPdu
+RlcUdxDlStaPdu       *pStaPdu
 )
 {
-   TRC3(PtUlUdxStaPduReq);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -202,20 +196,18 @@ PRIVATE S16  PtUlUdxStaUpdReq
 Pst*                pst,
 SpId                spId,
 CmLteRlcId          *rlcId,
-KwUdxStaPdu       *pStaPdu
+RlcUdxStaPdu       *pStaPdu
 )
 #else
 PRIVATE 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
@@ -235,18 +227,16 @@ KwUdxDlStaPdu       *pStaPdu;
 PRIVATE S16  PtUlUdxL2MeasReq
 (
 Pst*                pst,
-KwL2MeasReqEvt      *measReqEvt
+RlcL2MeasReqEvt      *measReqEvt
 )
 #else
 PRIVATE S16 PtUlUdxL2MeasReq(pst, measReqEvt )
 Pst*                pst;
-KwL2MeasReqEvt      *measReqEvt;
+RlcL2MeasReqEvt      *measReqEvt;
 #endif
 {
 
-   TRC3(PtUlUdxL2MeasReq);
-
-   RETVALUE(ROK);
+   return ROK;
 } 
 
 /**
@@ -274,9 +264,7 @@ U8                  status
 #endif
 {
 
-   TRC3(PtUlUdxL2MeasSendReq);
-
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /**
@@ -304,9 +292,7 @@ U8                  status
 #endif
 {
 
-   TRC3(PtUlUdxL2MeasStopReq);
-
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif
 #endif
@@ -389,7 +375,7 @@ PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] =
 };
 
 
-PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[KW_MAX_UDX] =
+PRIVATE CONSTANT 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] =
+PRIVATE CONSTANT 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] =
+PRIVATE CONSTANT 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] =
+PRIVATE CONSTANT 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] =
+PRIVATE CONSTANT 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,53 +532,50 @@ 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 */
@@ -603,7 +584,7 @@ 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 */
@@ -611,28 +592,19 @@ 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
 )
 #else
-PUBLIC S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt)
+S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt)
 Pst*                pst;
 U8                  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
 )
 #else
-PUBLIC S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt)
+S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt)
 Pst*                pst;
 U8                  measType;
 #endif
 {
 
-   TRC3(rlcUlUdxStaUpdReq);
-
-   RETVALUE((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));
+   return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));
 } /* end of rlcUlUdxMesReq*/
 #endif
 /**********************************************************************