X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_tmr.c;h=c0452c17a1a33f2a28fcbf07b0be0e5c1da1876a;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=350f1bd57e2093ffcb1b61517f492047f7a139f7;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_tmr.c b/src/5gnrsch/rg_sch_tmr.c
index 350f1bd57..c0452c17a 100755
--- a/src/5gnrsch/rg_sch_tmr.c
+++ b/src/5gnrsch/rg_sch_tmr.c
@@ -36,17 +36,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=175;
 
 /* 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 services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -59,15 +49,6 @@ static int RLOG_FILE_ID=175;
 
 
 /* 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 "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -75,7 +56,7 @@ static int RLOG_FILE_ID=175;
 #include "rg_sch.x"            /* typedefs for MAC */
 
 #ifdef LTE_ADV
-EXTERN PUBLIC Void rgSCHSCellActivation ARGS((
+EXTERN Void rgSCHSCellActivation ARGS((
 RgSchUeCellInfo  *sCell
 ));
 #endif
@@ -96,7 +77,7 @@ RgSchUeCellInfo  *sCell
   *   @return  Void
   */
 #ifdef ANSI
-PUBLIC Void rgSCHTmrStartTmr
+Void rgSCHTmrStartTmr
 (
 RgSchCellCb *cell,
 Ptr         cb,
@@ -104,7 +85,7 @@ S16         tmrEvnt,
 U32         tmrVal
 )
 #else
-PUBLIC Void rgSCHTmrStartTmr (cell, cb, tmrEvnt, tmrVal)
+Void rgSCHTmrStartTmr (cell, cb, tmrEvnt, tmrVal)
 RgSchCellCb *cell;
 Ptr         cb;
 S16         tmrEvnt;
@@ -117,9 +98,6 @@ U32         tmrVal;
    RgSchUeCellInfo *sCellCb = NULLP;
 #endif
 
-   TRC2(rgSCHTmrStartTmr);
-
-
 #ifndef LTE_ADV
    ue = (RgSchUeCb*)cb;
 #else
@@ -226,14 +204,14 @@ U32         tmrVal;
   *   @return  Void
   */
 #ifdef ANSI
-PUBLIC Void rgSCHTmrStopTmr
+Void rgSCHTmrStopTmr
 (
 RgSchCellCb   *cell,
 S16           tmrEvnt,
 Ptr           cb
 )
 #else
-PUBLIC Void rgSCHTmrStopTmr (cell, tmrEvnt, cb)
+Void rgSCHTmrStopTmr (cell, tmrEvnt, cb)
 RgSchCellCb   *cell;
 S16           tmrEvnt;
 Ptr           cb;
@@ -245,9 +223,6 @@ Ptr           cb;
    RgSchUeCellInfo *sCellCb = NULLP;
 #endif
 
-   TRC2(rgSCHTmrStopTmr);
-
-
 #ifndef LTE_ADV
    ue = (RgSchUeCb*)cb;
 #else
@@ -353,13 +328,13 @@ Ptr           cb;
   *   @return  Void
   */
 #ifdef ANSI
-PUBLIC Void rgSCHTmrProcTmr 
+Void rgSCHTmrProcTmr 
 (
 Ptr         cb,
 S16         tmrEvnt
 )
 #else
-PUBLIC Void rgSCHTmrProcTmr (cb, tmrEvnt)
+Void rgSCHTmrProcTmr (cb, tmrEvnt)
 Ptr         cb;
 S16         tmrEvnt;
 #endif
@@ -369,8 +344,6 @@ S16         tmrEvnt;
    RgSchUeCellInfo *sCellCb = NULLP;
 #endif
 
-   TRC2(rgSCHTmrProcTmr);
-
 #ifndef LTE_ADV
    ue = (RgSchUeCb*)cb;
 #else