X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_prg_pt.c;h=f01df710fe4cadef5850057c196e35b2df8b1682;hb=de6a435729e3cad9d4a66329080b8206a64f452c;hp=efa914ff6bd8ac18828ce29dd12c3136911f740a;hpb=451e626d5ac7c7e7586bab23358161230449af46;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c
index efa914ff6..f01df710f 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,15 +41,6 @@
 #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 */
@@ -72,7 +54,7 @@
 #include "rg_pom_scell.x"
 
 /* Matrix for Ue SCell Config Req*/
-PRIVATE CONSTANT RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] =
+static const RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] =
 {
 #ifdef LCPRG
   cmPkPrgPMacSMacUeSCellCfgReq,
@@ -93,26 +75,14 @@ PRIVATE CONSTANT RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellCfg
-(
- Pst         *pst,
- RgPrgUeSCellCfgInfo *ueSCellCfgInfo
-)
-#else
-PUBLIC S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo)
- Pst         *pst;
- RgPrgUeSCellCfgInfo *ueSCellCfgInfo;
-#endif
+S16 RgPrgPMacSMacUeSCellCfg(Pst *pst, RgPrgUeSCellCfgInfo *ueSCellCfgInfo)
 {
 
-   TRC3(RgPrgPMacSMacUeSCellCfg);
-
-   RETVALUE((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo));
+   return ((*RgPrgPMacSMacUeSCellCfgReqMt[0])(pst, ueSCellCfgInfo));
 }
 
 /* Matrix for config confirm from SMac to Pmac*/
-PRIVATE CONSTANT RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] =
+static const RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] =
 {
 #ifdef LCPRG
    cmPkPrgSMacPMacCfgCfm,
@@ -133,26 +103,14 @@ PRIVATE CONSTANT RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 RgPrgSMacPMacCfg
-(
- Pst             *pst,
- RgPrgCfgCfmInfo *cfgCfm
-)
-#else
-PUBLIC S16 RgPrgSMacPMacCfg(pst, cfgCfm)
- Pst             *pst;
- RgPrgCfgCfmInfo *cfgCfm;
-#endif
+S16 RgPrgSMacPMacCfg(Pst *pst,RgPrgCfgCfmInfo *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 */
-PRIVATE CONSTANT RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] =
+static const RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] =
 {
 #ifdef LCPRG
    cmPkPrgPMacSMacUeSCellDelReq,
@@ -173,28 +131,16 @@ PRIVATE CONSTANT RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] =
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellDel
-(
- Pst                 *pst,
- RgPrgUeSCellDelInfo *ueSCellDelInfo
-)
-#else
-PUBLIC S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo)
- Pst                 *pst;
- RgPrgUeSCellDelInfo *ueSCellDelInfo;
-#endif
+S16 RgPrgPMacSMacUeSCellDel(Pst *pst,RgPrgUeSCellDelInfo *ueSCellDelInfo)
 {
 
-   TRC3(RgPrgPMacSMacUeSCellDel);
-
-   RETVALUE((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
+   return ((*RgPrgPMacSMacUeSCellDelReqMt[0])(pst, ueSCellDelInfo));
 }
 
 
 
 /* Matrix for Lch ReConfig Req*/
-PRIVATE CONSTANT RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MAX] =
+static const RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MAX] =
 {
 #ifdef LCPRG
   cmPkPrgPMacSMacUeSCellLchModReq,
@@ -216,27 +162,15 @@ PRIVATE CONSTANT RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MA
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchMod
-(
- Pst                      *pst,
- RgPrgUeSCellLchModInfo   *lchCfgInfo
-)
-#else
-PUBLIC S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo)
- Pst                      *pst;
- RgPrgUeSCellLchModInfo   *lchCfgInfo;
-#endif
+S16 RgPrgPMacSMacUeScellLchMod(Pst *pst,RgPrgUeSCellLchModInfo *lchCfgInfo)
 {
 
-   TRC3(RgPrgPMacSMacUeScellLchMod);
-
-   RETVALUE((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
+   return ((*RgPrgPMacSMacUeScellModLchReqMt[0])(pst, lchCfgInfo));
 }
 
 
 /* Matrix for delete Lch Req*/
-PRIVATE CONSTANT RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MAX] =
+static const RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MAX] =
 {
 #ifdef LCPRG
   cmPkPrgPMacSMacUeSCellLchDelReq,
@@ -258,27 +192,15 @@ PRIVATE CONSTANT RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MA
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchDel
-(
- Pst                       *pst,
- RgPrgUeSCellLchDelInfo    *delLcCb
-)
-#else
-PUBLIC S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb)
- Pst                       *pst;
- RgPrgUeSCellLchDelInfo    *delLcCb;
-#endif
+S16 RgPrgPMacSMacUeScellLchDel(Pst *pst,RgPrgUeSCellLchDelInfo *delLcCb)
 {
 
-   TRC3(RgPrgPMacSMacUeScellLchDel);
-
-   RETVALUE((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
+   return ((*RgPrgPMacSMacUeScellDelLchReqMt[0])(pst, delLcCb));
 }
 
 
 /* Matrix for Lch Config Req*/
-PRIVATE CONSTANT RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MAX] =
+static const RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MAX] =
 {
 #ifdef LCPRG
   cmPkPrgPMacSMacUeSCellLchAddReq,
@@ -300,22 +222,10 @@ PRIVATE CONSTANT RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MA
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeScellLchAdd
-(
- Pst                      *pst,
- RgPrgUeSCellLchAddInfo   *lchCfgInfo
-)
-#else
-PUBLIC S16 RgPrgPMacSMacUeScellLchAdd(pst, lchCfgInfo)
- Pst                      *pst;
- RgPrgUeSCellLchAddInfo   *lchCfgInfo;
-#endif
+S16 RgPrgPMacSMacUeScellLchAdd(Pst *pst,RgPrgUeSCellLchAddInfo *lchCfgInfo)
 {
 
-   TRC3(RgPrgPMacSMacUeScellLchAdd);
-
-   RETVALUE((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
+   return ((*RgPrgPMacSMacUeScellAddLchReqMt[0])(pst, lchCfgInfo));
 }
 
 #endif /* LTE_ADV */