X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ptli.c;h=7d49cf70e4aa43485c0dab0cf2108808f64d7ae7;hb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;hp=13e63041d3bf14c4bd6d487e301f8d7ab2b0ce59;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ptli.c b/src/5gnrmac/rg_ptli.c
index 13e63041d..7d49cf70e 100755
--- a/src/5gnrmac/rg_ptli.c
+++ b/src/5gnrmac/rg_ptli.c
@@ -33,27 +33,10 @@
 */
 
 /* header include files (.h) */
-#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 "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_mblk.h"
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"           /* RGU Interface defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_mblk.x"
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 
 
@@ -419,23 +402,21 @@ PRIVATE CONSTANT TfuDelDatReq RgLiTfuDelDatReqMt[RG_MAX_TFU_PROV] =
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuBndReq
+S16 RgLiTfuBndReq
 (
 Pst * pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 RgLiTfuBndReq(pst, suId, spId)
+S16 RgLiTfuBndReq(pst, suId, spId)
 Pst * pst;
 SuId suId;
 SpId spId;
 #endif
 {
 
-   TRC3(RgLiTfuBndReq)
-
-   RETVALUE((*RgLiTfuBndReqMt[pst->selector])(pst, suId, spId));
+   return ((*RgLiTfuBndReqMt[pst->selector])(pst, suId, spId));
 
 }
 
@@ -461,23 +442,21 @@ SpId spId;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuSchBndReq
+S16 RgLiTfuSchBndReq
 (
 Pst * pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 RgLiTfuSchBndReq(pst, suId, spId)
+S16 RgLiTfuSchBndReq(pst, suId, spId)
 Pst * pst;
 SuId suId;
 SpId spId;
 #endif
 {
 
-   TRC3(RgLiTfuSchBndReq)
-
-   RETVALUE((*RgLiTfuSchBndReqMt[pst->selector])(pst, suId, spId));
+   return ((*RgLiTfuSchBndReqMt[pst->selector])(pst, suId, spId));
 
 }
 
@@ -503,23 +482,21 @@ SpId spId;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuUbndReq
+S16 RgLiTfuUbndReq
 (
 Pst * pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 RgLiTfuUbndReq(pst, spId, reason)
+S16 RgLiTfuUbndReq(pst, spId, reason)
 Pst * pst;
 SpId spId;
 Reason reason;
 #endif
 {
 
-   TRC3(RgLiTfuUbndReq)
-
-   RETVALUE((*RgLiTfuUbndReqMt[pst->selector])(pst, spId, reason));
+   return ((*RgLiTfuUbndReqMt[pst->selector])(pst, spId, reason));
 
 }
 
@@ -545,23 +522,21 @@ Reason reason;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuSchUbndReq
+S16 RgLiTfuSchUbndReq
 (
 Pst * pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 RgLiTfuSchUbndReq(pst, spId, reason)
+S16 RgLiTfuSchUbndReq(pst, spId, reason)
 Pst * pst;
 SpId spId;
 Reason reason;
 #endif
 {
 
-   TRC3(RgLiTfuSchUbndReq)
-
-   RETVALUE((*RgLiTfuSchUbndReqMt[pst->selector])(pst, spId, reason));
+   return ((*RgLiTfuSchUbndReqMt[pst->selector])(pst, spId, reason));
 
 }
 
@@ -601,23 +576,21 @@ Reason reason;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuRecpReq
+S16 RgLiTfuRecpReq
 (
 Pst * pst,
 SpId spId,
 TfuRecpReqInfo * recpReq
 )
 #else
-PUBLIC S16 RgLiTfuRecpReq(pst, spId, recpReq)
+S16 RgLiTfuRecpReq(pst, spId, recpReq)
 Pst * pst;
 SpId spId;
 TfuRecpReqInfo * recpReq;
 #endif
 {
 
-   TRC3(RgLiTfuRecpReq)
-
-   RETVALUE((*RgLiTfuRecpReqMt[pst->selector])(pst, spId, recpReq));
+   return ((*RgLiTfuRecpReqMt[pst->selector])(pst, spId, recpReq));
 
 }
 
@@ -650,23 +623,21 @@ TfuRecpReqInfo * recpReq;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuCntrlReq
+S16 RgLiTfuCntrlReq
 (
 Pst * pst,
 SpId spId,
 TfuCntrlReqInfo * cntrlReq
 )
 #else
-PUBLIC S16 RgLiTfuCntrlReq(pst, spId, cntrlReq)
+S16 RgLiTfuCntrlReq(pst, spId, cntrlReq)
 Pst * pst;
 SpId spId;
 TfuCntrlReqInfo * cntrlReq;
 #endif
 {
 
-   TRC3(RgLiTfuCntrlReq)
-
-   RETVALUE((*RgLiTfuCntrlReqMt[pst->selector])(pst, spId, cntrlReq));
+   return ((*RgLiTfuCntrlReqMt[pst->selector])(pst, spId, cntrlReq));
 
 }
 
@@ -698,23 +669,21 @@ TfuCntrlReqInfo * cntrlReq;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuDatReq
+S16 RgLiTfuDatReq
 (
 Pst * pst,
 SpId spId,
 TfuDatReqInfo * datReq
 )
 #else
-PUBLIC S16 RgLiTfuDatReq(pst, spId, datReq)
+S16 RgLiTfuDatReq(pst, spId, datReq)
 Pst * pst;
 SpId spId;
 TfuDatReqInfo * datReq;
 #endif
 {
 
-   TRC3(RgLiTfuDatReq)
-
-   RETVALUE((*RgLiTfuDatReqMt[pst->selector])(pst, spId, datReq));
+   return ((*RgLiTfuDatReqMt[pst->selector])(pst, spId, datReq));
 
 }
 
@@ -744,23 +713,21 @@ TfuDatReqInfo * datReq;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuDelDatReq
+S16 RgLiTfuDelDatReq
 (
 Pst * pst,
 SpId spId,
 TfuDelDatReqInfo * delDatReq
 )
 #else
-PUBLIC S16 RgLiTfuDelDatReq(pst, spId, delDatReq)
+S16 RgLiTfuDelDatReq(pst, spId, delDatReq)
 Pst * pst;
 SpId spId;
 TfuDelDatReqInfo * delDatReq;
 #endif
 {
 
-   TRC3(RgLiTfuDelDatReq)
-
-   RETVALUE((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq));
+   return ((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq));
 
 }
 #endif /* L2_OPTMZ*/
@@ -791,27 +758,26 @@ TfuDelDatReqInfo * delDatReq;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuBndReq
+S16 PtLiTfuBndReq
 (
 Pst * pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 PtLiTfuBndReq(pst, suId, spId)
+S16 PtLiTfuBndReq(pst, suId, spId)
 Pst * pst;
 SuId suId;
 SpId spId;
 #endif
 {
 
-   TRC3(PtLiTfuBndReq)
 
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(spId);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -837,27 +803,25 @@ SpId spId;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuSchBndReq
+S16 PtLiTfuSchBndReq
 (
 Pst * pst,
 SuId suId,
 SpId spId
 )
 #else
-PUBLIC S16 PtLiTfuSchBndReq(pst, suId, spId)
+S16 PtLiTfuSchBndReq(pst, suId, spId)
 Pst * pst;
 SuId suId;
 SpId spId;
 #endif
 {
 
-   TRC3(PtLiTfuSchBndReq)
-
    UNUSED(pst);
    UNUSED(suId);
    UNUSED(spId);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -883,27 +847,25 @@ SpId spId;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuUbndReq
+S16 PtLiTfuUbndReq
 (
 Pst * pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 PtLiTfuUbndReq(pst, spId, reason)
+S16 PtLiTfuUbndReq(pst, spId, reason)
 Pst * pst;
 SpId spId;
 Reason reason;
 #endif
 {
 
-   TRC3(PtLiTfuUbndReq)
-
    UNUSED(pst);
    UNUSED(spId);
    UNUSED(reason);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -929,27 +891,25 @@ Reason reason;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuSchUbndReq
+S16 PtLiTfuSchUbndReq
 (
 Pst * pst,
 SpId spId,
 Reason reason
 )
 #else
-PUBLIC S16 PtLiTfuSchUbndReq(pst, spId, reason)
+S16 PtLiTfuSchUbndReq(pst, spId, reason)
 Pst * pst;
 SpId spId;
 Reason reason;
 #endif
 {
 
-   TRC3(PtLiTfuSchUbndReq)
-
    UNUSED(pst);
    UNUSED(spId);
    UNUSED(reason);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -989,27 +949,25 @@ Reason reason;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuRecpReq
+S16 PtLiTfuRecpReq
 (
 Pst * pst,
 SpId spId,
 TfuRecpReqInfo * recpReq
 )
 #else
-PUBLIC S16 PtLiTfuRecpReq(pst, spId, recpReq)
+S16 PtLiTfuRecpReq(pst, spId, recpReq)
 Pst * pst;
 SpId spId;
 TfuRecpReqInfo * recpReq;
 #endif
 {
 
-   TRC3(PtLiTfuRecpReq)
-
    UNUSED(pst);
    UNUSED(spId);
    UNUSED(recpReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1042,27 +1000,25 @@ TfuRecpReqInfo * recpReq;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuCntrlReq
+S16 PtLiTfuCntrlReq
 (
 Pst * pst,
 SpId spId,
 TfuCntrlReqInfo * cntrlReq
 )
 #else
-PUBLIC S16 PtLiTfuCntrlReq(pst, spId, cntrlReq)
+S16 PtLiTfuCntrlReq(pst, spId, cntrlReq)
 Pst * pst;
 SpId spId;
 TfuCntrlReqInfo * cntrlReq;
 #endif
 {
 
-   TRC3(PtLiTfuCntrlReq)
-
    UNUSED(pst);
    UNUSED(spId);
    UNUSED(cntrlReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1094,27 +1050,25 @@ TfuCntrlReqInfo * cntrlReq;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuDatReq
+S16 PtLiTfuDatReq
 (
 Pst * pst,
 SpId spId,
 TfuDatReqInfo * datReq
 )
 #else
-PUBLIC S16 PtLiTfuDatReq(pst, spId, datReq)
+S16 PtLiTfuDatReq(pst, spId, datReq)
 Pst * pst;
 SpId spId;
 TfuDatReqInfo * datReq;
 #endif
 {
 
-   TRC3(PtLiTfuDatReq)
-
    UNUSED(pst);
    UNUSED(spId);
    UNUSED(datReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1145,27 +1099,25 @@ TfuDatReqInfo * datReq;
 *
 **********************************************************/
 #ifdef ANSI
-PUBLIC S16 PtLiTfuDelDatReq
+S16 PtLiTfuDelDatReq
 (
 Pst * pst,
 SpId spId,
 TfuDelDatReqInfo * delDatReq
 )
 #else
-PUBLIC S16 PtLiTfuDelDatReq(pst, spId, delDatReq)
+S16 PtLiTfuDelDatReq(pst, spId, delDatReq)
 Pst * pst;
 SpId spId;
 TfuDelDatReqInfo * DelDatReq;
 #endif
 {
 
-   TRC3(PtLiTfuDelDatReq)
-
    UNUSED(pst);
    UNUSED(spId);
    UNUSED(delDatReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /*L2_OPTMZ*/