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

[o-du/l2.git] / src / 5gnrmac / rg_ptli.c

diff --git a/src/5gnrmac/rg_ptli.c b/src/5gnrmac/rg_ptli.c
index 13e6304..24b3665 100755 (executable)
--- 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 */
 
 
@@ -435,7 +418,7 @@ SpId spId;
 
    TRC3(RgLiTfuBndReq)
 
-   RETVALUE((*RgLiTfuBndReqMt[pst->selector])(pst, suId, spId));
+   return ((*RgLiTfuBndReqMt[pst->selector])(pst, suId, spId));
 
 }
 
@@ -477,7 +460,7 @@ SpId spId;
 
    TRC3(RgLiTfuSchBndReq)
 
-   RETVALUE((*RgLiTfuSchBndReqMt[pst->selector])(pst, suId, spId));
+   return ((*RgLiTfuSchBndReqMt[pst->selector])(pst, suId, spId));
 
 }
 
@@ -519,7 +502,7 @@ Reason reason;
 
    TRC3(RgLiTfuUbndReq)
 
-   RETVALUE((*RgLiTfuUbndReqMt[pst->selector])(pst, spId, reason));
+   return ((*RgLiTfuUbndReqMt[pst->selector])(pst, spId, reason));
 
 }
 
@@ -561,7 +544,7 @@ Reason reason;
 
    TRC3(RgLiTfuSchUbndReq)
 
-   RETVALUE((*RgLiTfuSchUbndReqMt[pst->selector])(pst, spId, reason));
+   return ((*RgLiTfuSchUbndReqMt[pst->selector])(pst, spId, reason));
 
 }
 
@@ -617,7 +600,7 @@ TfuRecpReqInfo * recpReq;
 
    TRC3(RgLiTfuRecpReq)
 
-   RETVALUE((*RgLiTfuRecpReqMt[pst->selector])(pst, spId, recpReq));
+   return ((*RgLiTfuRecpReqMt[pst->selector])(pst, spId, recpReq));
 
 }
 
@@ -666,7 +649,7 @@ TfuCntrlReqInfo * cntrlReq;
 
    TRC3(RgLiTfuCntrlReq)
 
-   RETVALUE((*RgLiTfuCntrlReqMt[pst->selector])(pst, spId, cntrlReq));
+   return ((*RgLiTfuCntrlReqMt[pst->selector])(pst, spId, cntrlReq));
 
 }
 
@@ -714,7 +697,7 @@ TfuDatReqInfo * datReq;
 
    TRC3(RgLiTfuDatReq)
 
-   RETVALUE((*RgLiTfuDatReqMt[pst->selector])(pst, spId, datReq));
+   return ((*RgLiTfuDatReqMt[pst->selector])(pst, spId, datReq));
 
 }
 
@@ -760,7 +743,7 @@ TfuDelDatReqInfo * delDatReq;
 
    TRC3(RgLiTfuDelDatReq)
 
-   RETVALUE((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq));
+   return ((*RgLiTfuDelDatReqMt[pst->selector])(pst, spId, delDatReq));
 
 }
 #endif /* L2_OPTMZ*/
@@ -811,7 +794,7 @@ SpId spId;
    UNUSED(suId);
    UNUSED(spId);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -857,7 +840,7 @@ SpId spId;
    UNUSED(suId);
    UNUSED(spId);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -903,7 +886,7 @@ Reason reason;
    UNUSED(spId);
    UNUSED(reason);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -949,7 +932,7 @@ Reason reason;
    UNUSED(spId);
    UNUSED(reason);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1009,7 +992,7 @@ TfuRecpReqInfo * recpReq;
    UNUSED(spId);
    UNUSED(recpReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1062,7 +1045,7 @@ TfuCntrlReqInfo * cntrlReq;
    UNUSED(spId);
    UNUSED(cntrlReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1114,7 +1097,7 @@ TfuDatReqInfo * datReq;
    UNUSED(spId);
    UNUSED(datReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 
@@ -1165,7 +1148,7 @@ TfuDelDatReqInfo * DelDatReq;
    UNUSED(spId);
    UNUSED(delDatReq);
 
-   RETVALUE(ROK);
+   return ROK;
 
 }
 #endif /*L2_OPTMZ*/