X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_timer.c;h=21013e5811a321cb087a0112150fefffa9aadd8b;hb=073b67b21b11eefdaa84a30029f374435c3e0fd0;hp=4bf43bd6a86712051de8dd1e94b6f970bcbf59e5;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git

diff --git a/src/mt/ss_timer.c b/src/mt/ss_timer.c
index 4bf43bd6a..21013e581 100644
--- a/src/mt/ss_timer.c
+++ b/src/mt/ss_timer.c
@@ -78,7 +78,7 @@
  * functions are enclosed in a union. 
  */
 #ifndef SS_MULTIPLE_PROCS
-PRIVATE S16 STmrRegHndlr ARGS((
+static S16 STmrRegHndlr ARGS((
          Ent ent,
          Inst inst,
          S16 period,
@@ -89,7 +89,7 @@ PRIVATE S16 STmrRegHndlr ARGS((
  * handled mtFlag in existing timer handlers. 
  */
 #else /* SS_MULTIPLE_PROCS */
-PRIVATE S16 STmrRegHndlr ARGS((
+static S16 STmrRegHndlr ARGS((
          ProcId proc,
          Ent ent,
          Inst inst,
@@ -101,7 +101,7 @@ PRIVATE S16 STmrRegHndlr ARGS((
 
 /* ss041.103 Declaration for STmrDeregHndlr */
 #ifndef SS_MULTIPLE_PROCS
-PRIVATE S16 STmrDeregHndlr ARGS((
+static S16 STmrDeregHndlr ARGS((
          Ent ent,
          Inst inst,
          S16 period,
@@ -112,7 +112,7 @@ PRIVATE S16 STmrDeregHndlr ARGS((
  * handled mtFlag in existing timer handlers.
  */
 #else /* SS_MULTIPLE_PROCS */
-PRIVATE S16 STmrDeregHndlr ARGS((
+static S16 STmrDeregHndlr ARGS((
          ProcId proc,
          Ent ent,
          Inst inst,
@@ -146,7 +146,7 @@ PRIVATE S16 STmrDeregHndlr ARGS((
 /* ss029.103: addition: procId added and timer function type modified */ 
 #ifndef SS_MULTIPLE_PROCS
 #ifdef ANSI
-PUBLIC S16 SRegCfgTmr
+S16 SRegCfgTmr
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -155,7 +155,7 @@ S16 units,                  /* period units */
 PFS16 tmrFnct               /* timer function, typically SActvTmr */
 )
 #else
-PUBLIC S16 SRegCfgTmr(ent, inst, period, units, tmrFnct)
+S16 SRegCfgTmr(ent, inst, period, units, tmrFnct)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -163,12 +163,10 @@ S16 units;                  /* period units*/
 PFS16 tmrFnct;              /* timer function, typically SActvTmr */
 #endif
 {
-	S16 ret;
-	/* ss015.301 - Enclosed all timer activation functions in a union. */
-	SsTmrActvFn ssTmrActvFn;
-	/* ss041.103 - Moved handling to STmrRegHndlr */
-
-   TRC1(SRegCfgTmr);
+   S16 ret;
+   /* ss015.301 - Enclosed all timer activation functions in a union. */
+   SsTmrActvFn ssTmrActvFn;
+   /* ss041.103 - Moved handling to STmrRegHndlr */
 
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
@@ -180,7 +178,7 @@ PFS16 tmrFnct;              /* timer function, typically SActvTmr */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SRegCfgTmr
+S16 SRegCfgTmr
 (
 ProcId proc,                /* processor */
 Ent ent,                    /* entity */
@@ -190,7 +188,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnct               /* timer function, typically SActvTmr */
 )
 #else
-PUBLIC S16 SRegCfgTmr(proc, ent, inst, period, units, tmrFnct)
+S16 SRegCfgTmr(proc, ent, inst, period, units, tmrFnct)
 ProcId proc;                /* processor */
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
@@ -205,8 +203,6 @@ PAIFTMRS16 tmrFnct;              /* timer function, typically SActvTmr */
    SsTmrActvFn ssTmrActvFn;
    /* ss041.103 - Moved handling to STmrRegHndlr */
 
-   TRC1(SRegCfgTmr);
-
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
    ret = STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn);
@@ -240,7 +236,7 @@ PAIFTMRS16 tmrFnct;              /* timer function, typically SActvTmr */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRegCfgTmrMt
+S16 SRegCfgTmrMt
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -249,7 +245,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnctMt        /* timer function, typically SActvTmr */
 )
 #else
-PUBLIC S16 SRegCfgTmrMt(ent, inst, period, units, tmrFnctMt)
+S16 SRegCfgTmrMt(ent, inst, period, units, tmrFnctMt)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -261,8 +257,6 @@ PAIFTMRS16 tmrFnctMt;       /* timer function, typically SActvTmr */
    /* ss015.301 - Enclosed all timer activation functions in a union. */
    SsTmrActvFn ssTmrActvFn;
 
-   TRC1(SRegCfgTmrMt);
-
    ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt;
    ssTmrActvFn.mtFlag = TRUE;
    ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn);
@@ -298,7 +292,7 @@ PAIFTMRS16 tmrFnctMt;       /* timer function, typically SActvTmr */
 #ifndef SS_MULTIPLE_PROCS
 
 #ifdef ANSI
-PRIVATE S16 STmrRegHndlr
+static S16 STmrRegHndlr
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -307,7 +301,7 @@ S16 units,                  /* period units */
 SsTmrActvFn ssTmrActvFn               /* timer function, typically SActvTmr */
 )
 #else
-PRIVATE S16 STmrRegHndlr(ent, inst, period, units, ssTmrActvFn)
+static S16 STmrRegHndlr(ent, inst, period, units, ssTmrActvFn)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -321,7 +315,7 @@ SsTmrActvFn ssTmrActvFn;              /* timer function, typically SActvTmr */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PRIVATE S16 STmrRegHndlr
+static S16 STmrRegHndlr
 (
 ProcId proc,                /* processor */
 Ent ent,                    /* entity */
@@ -331,7 +325,7 @@ S16 units,                  /* period units */
 SsTmrActvFn ssTmrActvFn     /* timer function */
 )
 #else
-PRIVATE S16 STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn)
+static S16 STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn)
 ProcId proc;                /* processor */
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
@@ -343,18 +337,16 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #endif /* SS_MULTIPLE_PROCS */
 {
 #if (ERRCLASS & ERRCLS_INT_PAR)
-   U8 i;
+   uint8_t i;
 #endif
    S16 ret;
    SsTmrEntry *tmr;
 #ifdef SS_MULTIPLE_PROCS
 #if (ERRCLASS & ERRCLS_INT_PAR)
-   U16 procIdIdx;
+   uint16_t procIdIdx;
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 #endif /* SS_MULTPLE_PROCS */
 
-   TRC1(STmrRegHndlr);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
 
 #ifdef SS_MULTIPLE_PROCS
@@ -517,7 +509,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #else
             && (osCp.tmrTbl[i].ssTmrActvFn.actvFnc.tmrActvFn == ssTmrActvFn.actvFnc.tmrActvFn)
 #endif
-            && (osCp.tmrTbl[i].interval == (U32) ((period * SS_TICKS_SEC) / units)))
+            && (osCp.tmrTbl[i].interval == (uint32_t) ((period * SS_TICKS_SEC) / units)))
       {
          /* is this timer in use ? (unexpired) */
          if (osCp.tmrTbl[i].used == TRUE)
@@ -545,7 +537,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #endif /* SS_MULTIPLE_PROCS */
    tmr->ownerEnt  = ent;
    tmr->ownerInst = inst;
-   tmr->interval  = (U32) ((period * SS_TICKS_SEC) / units);
+   tmr->interval  = (uint32_t) ((period * SS_TICKS_SEC) / units);
    tmr->ssTmrActvFn.mtFlag = ssTmrActvFn.mtFlag;
 
    /* ss041.103 */
@@ -625,7 +617,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #ifndef SS_MULTIPLE_PROCS
 
 #ifdef ANSI
-PUBLIC S16 SDeregCfgTmr
+S16 SDeregCfgTmr
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -634,7 +626,7 @@ S16 units,                  /* period units */
 PFS16 tmrFnct               /* timer function */
 )
 #else
-PUBLIC S16 SDeregCfgTmr(ent, inst, period, units, tmrFnct)
+S16 SDeregCfgTmr(ent, inst, period, units, tmrFnct)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -647,8 +639,6 @@ PFS16 tmrFnct;              /* timer function */
    SsTmrActvFn ssTmrActvFn;
    /* ss041.103 - Moved handling to STmrDeregHndlr */
 
-   TRC1(SDeregCfgTmr);
-
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;  
    ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn);
@@ -659,7 +649,7 @@ PFS16 tmrFnct;              /* timer function */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SDeregCfgTmr
+S16 SDeregCfgTmr
 (
 ProcId proc,                /* processor */
 Ent ent,                    /* entity */
@@ -669,7 +659,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnct               /* timer function */
 )
 #else
-PUBLIC S16 SDeregCfgTmr(proc, ent, inst, period, units, tmrFnct)
+S16 SDeregCfgTmr(proc, ent, inst, period, units, tmrFnct)
 ProcId proc;                /* processor */
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
@@ -684,8 +674,6 @@ PAIFTMRS16 tmrFnct;              /* timer function */
 
    /* ss041.103 - Moved handling to STmrDeregHndlr */
 
-   TRC1(SDeregCfgTmr);
-
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;  
    ret = STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn);
@@ -714,7 +702,7 @@ PAIFTMRS16 tmrFnct;              /* timer function */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDeregCfgTmrMt
+S16 SDeregCfgTmrMt
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -723,7 +711,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnctMt               /* timer function */
 )
 #else
-PUBLIC S16 SDeregCfgTmrMt(ent, inst, period, units, tmrFnctMt)
+S16 SDeregCfgTmrMt(ent, inst, period, units, tmrFnctMt)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -735,8 +723,6 @@ PAIFTMRS16 tmrFnctMt;              /* timer function */
    /* ss015.301 Enclosed all timer activation functions in a union. */
    SsTmrActvFn ssTmrActvFn;
 
-   TRC1(SDeregCfgTmrMt);
-
    ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt;
    ssTmrActvFn.mtFlag = TRUE;
 
@@ -770,7 +756,7 @@ PAIFTMRS16 tmrFnctMt;              /* timer function */
  */
 #ifndef SS_MULTIPLE_PROCS
 #ifdef ANSI
-PRIVATE S16 STmrDeregHndlr
+static S16 STmrDeregHndlr
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -782,7 +768,7 @@ SsTmrActvFn ssTmrActvFn           /* timer function */
 /* ss017.301: Modified the prototype of STmrDeregHndlr for Non-ANSI
  * compilation.
  */
-PRIVATE S16 STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn)
+static S16 STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -796,7 +782,7 @@ SsTmrActvFn ssTmrActvFn;          /* timer function */
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PRIVATE S16 STmrDeregHndlr
+static S16 STmrDeregHndlr
 (
 ProcId proc,                /* processor */
 Ent ent,                    /* entity */
@@ -806,7 +792,7 @@ S16 units,                  /* period units */
 SsTmrActvFn ssTmrActvFn          /* timer function */
 )
 #else
-PRIVATE S16 STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn)
+static S16 STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn)
 ProcId proc;                /* processor */
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
@@ -822,14 +808,11 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    SsTmrEntry *tmr;
 #ifdef SS_MULTIPLE_PROCS
 #if (ERRCLASS & ERRCLS_INT_PAR)
-   U16 procIdIdx;
+   uint16_t procIdIdx;
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 #endif /* SS_MULTIPLE_PROCS */
 
 
-   TRC1(STmrDeregHndlr);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
 
 #ifdef SS_MULTIPLE_PROCS
@@ -980,7 +963,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #else
             &&  osCp.tmrTbl[idx].ssTmrActvFn.actvFnc.tmrActvFn == ssTmrActvFn.actvFnc.tmrActvFn
 #endif
-            &&  osCp.tmrTbl[idx].interval == (U32) ((period * SS_TICKS_SEC) / units))
+            &&  osCp.tmrTbl[idx].interval == (uint32_t) ((period * SS_TICKS_SEC) / units))
       {
          break;
       }