Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
removed ANSI part -2 JIRA ID - ODUHIGH-249
[o-du/l2.git]
/
src
/
mt
/
ss_timer.c
diff --git
a/src/mt/ss_timer.c
b/src/mt/ss_timer.c
index
0d0fffc
..
21013e5
100644
(file)
--- 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
* functions are enclosed in a union.
*/
#ifndef SS_MULTIPLE_PROCS
-
PRIVATE
S16 STmrRegHndlr ARGS((
+
static
S16 STmrRegHndlr ARGS((
Ent ent,
Inst inst,
S16 period,
Ent ent,
Inst inst,
S16 period,
@@
-89,7
+89,7
@@
PRIVATE S16 STmrRegHndlr ARGS((
* handled mtFlag in existing timer handlers.
*/
#else /* SS_MULTIPLE_PROCS */
* handled mtFlag in existing timer handlers.
*/
#else /* SS_MULTIPLE_PROCS */
-
PRIVATE
S16 STmrRegHndlr ARGS((
+
static
S16 STmrRegHndlr ARGS((
ProcId proc,
Ent ent,
Inst inst,
ProcId proc,
Ent ent,
Inst inst,
@@
-101,7
+101,7
@@
PRIVATE S16 STmrRegHndlr ARGS((
/* ss041.103 Declaration for STmrDeregHndlr */
#ifndef SS_MULTIPLE_PROCS
/* ss041.103 Declaration for STmrDeregHndlr */
#ifndef SS_MULTIPLE_PROCS
-
PRIVATE
S16 STmrDeregHndlr ARGS((
+
static
S16 STmrDeregHndlr ARGS((
Ent ent,
Inst inst,
S16 period,
Ent ent,
Inst inst,
S16 period,
@@
-112,7
+112,7
@@
PRIVATE S16 STmrDeregHndlr ARGS((
* handled mtFlag in existing timer handlers.
*/
#else /* SS_MULTIPLE_PROCS */
* handled mtFlag in existing timer handlers.
*/
#else /* SS_MULTIPLE_PROCS */
-
PRIVATE
S16 STmrDeregHndlr ARGS((
+
static
S16 STmrDeregHndlr ARGS((
ProcId proc,
Ent ent,
Inst inst,
ProcId proc,
Ent ent,
Inst inst,
@@
-163,10
+163,10
@@
S16 units; /* period units*/
PFS16 tmrFnct; /* timer function, typically SActvTmr */
#endif
{
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 */
+ 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;
ssTmrActvFn.mtFlag = FALSE;
ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
@@
-292,7
+292,7
@@
PAIFTMRS16 tmrFnctMt; /* timer function, typically SActvTmr */
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PRIVATE
S16 STmrRegHndlr
+
static
S16 STmrRegHndlr
(
Ent ent, /* entity */
Inst inst, /* instance */
(
Ent ent, /* entity */
Inst inst, /* instance */
@@
-301,7
+301,7
@@
S16 units, /* period units */
SsTmrActvFn ssTmrActvFn /* timer function, typically SActvTmr */
)
#else
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 */
Ent ent; /* entity */
Inst inst; /* instance */
S16 period; /* period */
@@
-315,7
+315,7
@@
SsTmrActvFn ssTmrActvFn; /* timer function, typically SActvTmr */
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-
PRIVATE
S16 STmrRegHndlr
+
static
S16 STmrRegHndlr
(
ProcId proc, /* processor */
Ent ent, /* entity */
(
ProcId proc, /* processor */
Ent ent, /* entity */
@@
-325,7
+325,7
@@
S16 units, /* period units */
SsTmrActvFn ssTmrActvFn /* timer function */
)
#else
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 */
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
@@
-337,13
+337,13
@@
SsTmrActvFn ssTmrActvFn; /* timer function */
#endif /* SS_MULTIPLE_PROCS */
{
#if (ERRCLASS & ERRCLS_INT_PAR)
#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)
#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 */
#endif /* ERRCLASS & ERRCLS_INT_PAR */
#endif /* SS_MULTPLE_PROCS */
@@
-509,7
+509,7
@@
SsTmrActvFn ssTmrActvFn; /* timer function */
#else
&& (osCp.tmrTbl[i].ssTmrActvFn.actvFnc.tmrActvFn == ssTmrActvFn.actvFnc.tmrActvFn)
#endif
#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)
{
/* is this timer in use ? (unexpired) */
if (osCp.tmrTbl[i].used == TRUE)
@@
-537,7
+537,7
@@
SsTmrActvFn ssTmrActvFn; /* timer function */
#endif /* SS_MULTIPLE_PROCS */
tmr->ownerEnt = ent;
tmr->ownerInst = inst;
#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 */
tmr->ssTmrActvFn.mtFlag = ssTmrActvFn.mtFlag;
/* ss041.103 */
@@
-756,7
+756,7
@@
PAIFTMRS16 tmrFnctMt; /* timer function */
*/
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
*/
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-
PRIVATE
S16 STmrDeregHndlr
+
static
S16 STmrDeregHndlr
(
Ent ent, /* entity */
Inst inst, /* instance */
(
Ent ent, /* entity */
Inst inst, /* instance */
@@
-768,7
+768,7
@@
SsTmrActvFn ssTmrActvFn /* timer function */
/* ss017.301: Modified the prototype of STmrDeregHndlr for Non-ANSI
* compilation.
*/
/* 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 */
Ent ent; /* entity */
Inst inst; /* instance */
S16 period; /* period */
@@
-782,7
+782,7
@@
SsTmrActvFn ssTmrActvFn; /* timer function */
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-
PRIVATE
S16 STmrDeregHndlr
+
static
S16 STmrDeregHndlr
(
ProcId proc, /* processor */
Ent ent, /* entity */
(
ProcId proc, /* processor */
Ent ent, /* entity */
@@
-792,7
+792,7
@@
S16 units, /* period units */
SsTmrActvFn ssTmrActvFn /* timer function */
)
#else
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 */
ProcId proc; /* processor */
Ent ent; /* entity */
Inst inst; /* instance */
@@
-808,7
+808,7
@@
SsTmrActvFn ssTmrActvFn; /* timer function */
SsTmrEntry *tmr;
#ifdef SS_MULTIPLE_PROCS
#if (ERRCLASS & ERRCLS_INT_PAR)
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 */
#endif /* ERRCLASS & ERRCLS_INT_PAR */
#endif /* SS_MULTIPLE_PROCS */
@@
-963,7
+963,7
@@
SsTmrActvFn ssTmrActvFn; /* timer function */
#else
&& osCp.tmrTbl[idx].ssTmrActvFn.actvFnc.tmrActvFn == ssTmrActvFn.actvFnc.tmrActvFn
#endif
#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;
}
{
break;
}