X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_prg_pt.c;h=96ac97a299479a4207c379504487f8611d2e10be;hb=7b22b6a99c6942021b2ac30383cd46d93d9354a6;hp=f8060546f4fc6cd942acc8b08f8e75852c333113;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c
index f8060546f..96ac97a29 100755
--- 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
@@ -93,13 +76,13 @@ PRIVATE CONSTANT RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] =
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellCfg
+S16 RgPrgPMacSMacUeSCellCfg
 (
  Pst         *pst,
  RgPrgUeSCellCfgInfo *ueSCellCfgInfo
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo)
+S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo)
  Pst         *pst;
  RgPrgUeSCellCfgInfo *ueSCellCfgInfo;
 #endif
@@ -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*/
@@ -133,13 +116,13 @@ PRIVATE CONSTANT RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] =
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgPrgSMacPMacCfg
+S16 RgPrgSMacPMacCfg
 (
  Pst             *pst,
  RgPrgCfgCfmInfo *cfgCfm
 )
 #else
-PUBLIC S16 RgPrgSMacPMacCfg(pst, cfgCfm)
+S16 RgPrgSMacPMacCfg(pst, cfgCfm)
  Pst             *pst;
  RgPrgCfgCfmInfo *cfgCfm;
 #endif
@@ -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 */
@@ -173,13 +156,13 @@ PRIVATE CONSTANT RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] =
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellDel
+S16 RgPrgPMacSMacUeSCellDel
 (
  Pst                 *pst,
  RgPrgUeSCellDelInfo *ueSCellDelInfo
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
+S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
  Pst                 *pst;
  RgPrgUeSCellDelInfo *ueSCellDelInfo;
 #endif
@@ -187,7 +170,7 @@ PUBLIC S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
 
    TRC3(RgPrgPMacSMacUeSCellDel);
 
-   RETVALUE((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
+   return ((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
 }
 
 
@@ -216,13 +199,13 @@ PRIVATE CONSTANT RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MA
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchMod
+S16 RgPrgPMacSMacUeScellLchMod
 (
  Pst                      *pst,
  RgPrgUeSCellLchModInfo   *lchCfgInfo
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
+S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
  Pst                      *pst;
  RgPrgUeSCellLchModInfo   *lchCfgInfo;
 #endif
@@ -230,7 +213,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
 
    TRC3(RgPrgPMacSMacUeScellLchMod);
 
-   RETVALUE((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
+   return ((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
 }
 
 
@@ -258,13 +241,13 @@ PRIVATE CONSTANT RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MA
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchDel
+S16 RgPrgPMacSMacUeScellLchDel
 (
  Pst                       *pst,
  RgPrgUeSCellLchDelInfo    *delLcCb
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
+S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
  Pst                       *pst;
  RgPrgUeSCellLchDelInfo    *delLcCb;
 #endif
@@ -272,7 +255,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
 
    TRC3(RgPrgPMacSMacUeScellLchDel);
 
-   RETVALUE((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
+   return ((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
 }
 
 
@@ -300,13 +283,13 @@ PRIVATE CONSTANT RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MA
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchAdd
+S16 RgPrgPMacSMacUeScellLchAdd
 (
  Pst                      *pst,
  RgPrgUeSCellLchAddInfo   *lchCfgInfo
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
+S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
  Pst                      *pst;
  RgPrgUeSCellLchAddInfo   *lchCfgInfo;
 #endif
@@ -314,7 +297,7 @@ PUBLIC S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
 
    TRC3(RgPrgPMacSMacUeScellLchAdd);
 
-   RETVALUE((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
+   return ((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
 }
 
 #endif /* LTE_ADV */