/* 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 */
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 */
SsTmrActvFn ssTmrActvFn;
/* ss041.103 - Moved handling to STmrRegHndlr */
- TRC1(SRegCfgTmr);
-
ssTmrActvFn.mtFlag = FALSE;
ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn);
- RETVALUE(ret);
+ return (ret);
}
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-PUBLIC S16 SRegCfgTmr
+S16 SRegCfgTmr
(
ProcId proc, /* processor */
Ent ent, /* entity */
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 */
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);
- RETVALUE(ret);
+ return (ret);
}
#endif /* SS_MULTIPLE_PROCS */
*
*/
#ifdef ANSI
-PUBLIC S16 SRegCfgTmrMt
+S16 SRegCfgTmrMt
(
Ent ent, /* entity */
Inst inst, /* instance */
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 */
/* 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);
- RETVALUE(ret);
+ return (ret);
}
#endif /* SS_MT_TMR */
#endif /* not SS_MULTIPLE_PROCS */
#endif /* ERRCLASS & ERRCLS_INT_PAR */
#endif /* SS_MULTPLE_PROCS */
- TRC1(STmrRegHndlr);
-
#if (ERRCLASS & ERRCLS_INT_PAR)
#ifdef SS_MULTIPLE_PROCS
if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST))
{
SSLOGERROR(ERRCLS_INT_PAR, ESS528, ERRZERO, "Invalid processor/entity/instance");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else /* SS_MULTIPLE_PROCS */
if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS529, ERRZERO, "Invalid entity/instance");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif /* SS_MULTIPLE_PROCS */
if (period <= 0)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS530, ERRZERO, "Invalid period");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* check period units*/
if ((units < 1) || (units > SS_TICKS_SEC))
{
SSLOGERROR(ERRCLS_INT_PAR, ESS531, ERRZERO, "Invalid period units");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if(ssTmrActvFn.mtFlag == TRUE)
if (ssTmrActvFn.actvFnc.tmrActvFnMt == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS532, ERRZERO, "Null pointer");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
#else
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
else
if (ssTmrActvFn.actvFnc.tmrActvFn == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS532, ERRZERO, "Null pointer");
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
{
SSLOGERROR(ERRCLS_INT_PAR, ESS533, ERRZERO,
"Could not find proc id index");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif /* SS_MULTIPLE_PROCS */
{
SSLOGERROR(ERRCLS_DEBUG, ESS534, ERRZERO,
"Could not lock TAPA task table");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef SS_MULTIPLE_PROCS
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS535, ERRZERO,
"Could not release the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
SSLOGERROR(ERRCLS_INT_PAR, ESS536, ERRZERO, "Unknown task");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ( SS_RELEASE_SEMA(&osCp.tTskTblSem) != ROK)
{
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS537, ERRZERO,
"Could not release the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
SSLOGERROR(ERRCLS_DEBUG, ESS538, (ErrVal) ret,
"Could not lock timer table");
#endif
- RETVALUE(ret);
+ return (ret);
}
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS539, ERRZERO,
"Could not unlock the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
SSLOGERROR(ERRCLS_DEBUG, ESS540, ERRZERO, "Too many timers");
#endif
- RETVALUE(ROUTRES);
+ return (ROUTRES);
}
#if (ERRCLASS & ERRCLS_INT_PAR)
{
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS541, ERRZERO, "Could not unlock the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
}
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS542, ERRZERO,
"Could not unlock the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
- RETVALUE(ret);
+ return (ret);
}
#ifndef SS_MULTIPLE_PROCS
#ifdef ANSI
-PUBLIC S16 SDeregCfgTmr
+S16 SDeregCfgTmr
(
Ent ent, /* entity */
Inst inst, /* instance */
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 */
SsTmrActvFn ssTmrActvFn;
/* ss041.103 - Moved handling to STmrDeregHndlr */
- TRC1(SDeregCfgTmr);
-
ssTmrActvFn.mtFlag = FALSE;
ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn);
- RETVALUE(ret);
+ return (ret);
}
#else /* SS_MULTIPLE_PROCS */
#ifdef ANSI
-PUBLIC S16 SDeregCfgTmr
+S16 SDeregCfgTmr
(
ProcId proc, /* processor */
Ent ent, /* entity */
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 */
/* ss041.103 - Moved handling to STmrDeregHndlr */
- TRC1(SDeregCfgTmr);
-
ssTmrActvFn.mtFlag = FALSE;
ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
ret = STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn);
- RETVALUE(ret);
+ return (ret);
}
#endif /* SS_MULTIPLE_PROCS */
*
*/
#ifdef ANSI
-PUBLIC S16 SDeregCfgTmrMt
+S16 SDeregCfgTmrMt
(
Ent ent, /* entity */
Inst inst, /* instance */
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 */
/* ss015.301 Enclosed all timer activation functions in a union. */
SsTmrActvFn ssTmrActvFn;
- TRC1(SDeregCfgTmrMt);
-
ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt;
ssTmrActvFn.mtFlag = TRUE;
ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn);
- RETVALUE(ret);
+ return (ret);
}
#endif /* SS_MT_TMR */
#endif /* not SS_MULTIPLE_PROCS */
#endif /* SS_MULTIPLE_PROCS */
- TRC1(STmrDeregHndlr);
-
-
#if (ERRCLASS & ERRCLS_INT_PAR)
#ifdef SS_MULTIPLE_PROCS
if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) || (inst >= SS_MAX_INST))
{
SSLOGERROR(ERRCLS_INT_PAR, ESS543, ERRZERO, "Invalid processor/entity/instance");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else /* SS_MULTIPLE_PROCS */
if (ent >= SS_MAX_ENT || inst >= SS_MAX_INST)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS544, ERRZERO, "Invalid entity/instance");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif /* SS_MULTIPLE_PROCS */
/* check period */
if (period <= 0)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS545, ERRZERO, "Invalid period");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* check period units */
if ((units < 1) || (units > SS_TICKS_SEC))
{
SSLOGERROR(ERRCLS_INT_PAR, ESS546, ERRZERO, "Invalid period units");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* check timer function */
if (ssTmrActvFn.actvFnc.tmrActvFnMt == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS547, ERRZERO, "Null pointer");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
#else
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
if (ssTmrActvFn.actvFnc.tmrActvFn == NULLP)
{
SSLOGERROR(ERRCLS_INT_PAR, ESS547, ERRZERO, "Null pointer");
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
{
SSLOGERROR(ERRCLS_INT_PAR, ESS548, ERRZERO,
"Could not find proc id index");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif /* SS_MULTIPLE_PROCS */
{
SSLOGERROR(ERRCLS_DEBUG, ESS549, ERRZERO,
"Could not lock TAPA task table");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef SS_MULTIPLE_PROCS
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS550, ERRZERO,
"Could not release the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
SSLOGERROR(ERRCLS_INT_PAR, ESS551, ERRZERO, "Unknown task");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ( SS_RELEASE_SEMA(&osCp.tTskTblSem) != ROK)
{
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS552, ERRZERO,
"Could not release the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
SSLOGERROR(ERRCLS_DEBUG, ESS553, (ErrVal) ret,
"Could not lock timer table");
#endif
- RETVALUE(ret);
+ return (ret);
}
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS554, ERRZERO,
"Could not unlock the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
SSLOGERROR(ERRCLS_DEBUG, ESS555, ERRZERO, "Could not locate timer");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
#if (ERRCLASS & ERRCLS_DEBUG)
SSLOGERROR(ERRCLS_DEBUG, ESS556, ERRZERO,
"Could not unlock the semaphore");
- RETVALUE(RFAILED);
+ return RFAILED;
#endif
}
- RETVALUE(ret);
+ return (ret);
}
/**********************************************************************