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

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

diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c
index f806054..0e2bb0a 100755 (executable)
--- a/src/5gnrmac/rg_prg_pt.c
+++ b/src/5gnrmac/rg_prg_pt.c
@@ -29,16 +29,7 @@
 **********************************************************************/
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"           /* layer manager for MAC */
 #include "crg.h"           /* CRG interface includes*/
 #include "rgu.h"           /* RGU interface includes*/
@@ -50,21 +41,13 @@
 #include "rg_err.h"        /* MAC error includes*/
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "crg.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"    /* layer management typedefs for MAC */
 #include "rg_prg.x"        /* PRG interface typedefs*/
+#include "du_app_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
 #ifdef LTE_ADV
@@ -107,7 +90,7 @@ PUBLIC S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo)
 
    TRC3(RgPrgPMacSMacUeSCellCfg);
 
-   RETVALUE((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo));
+   return ((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo));
 }
 
 /* Matrix for config confirm from SMac to Pmac*/
@@ -147,7 +130,7 @@ PUBLIC S16 RgPrgSMacPMacCfg(pst, cfgCfm)
 
    TRC3(RgPrgSMacPMacCfg);
 
-   RETVALUE((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm));
+   return ((*RgPrgSMacPMacCfgCfmMt[0])(pst, cfgCfm));
 }
 
 /* Matrix for Ue SCell delete req/Ue Id change req from PMac to SMac */
@@ -187,7 +170,7 @@ PUBLIC S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
 
    TRC3(RgPrgPMacSMacUeSCellDel);
 
-   RETVALUE((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
+   return ((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
 }
 
 
@@ -230,7 +213,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
 
    TRC3(RgPrgPMacSMacUeScellLchMod);
 
-   RETVALUE((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
+   return ((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
 }
 
 
@@ -272,7 +255,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
 
    TRC3(RgPrgPMacSMacUeScellLchDel);
 
-   RETVALUE((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
+   return ((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
 }
 
 
@@ -314,7 +297,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
 
    TRC3(RgPrgPMacSMacUeScellLchAdd);
 
-   RETVALUE((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
+   return ((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
 }
 
 #endif /* LTE_ADV */