summaryrefslogtreecommitdiffstats
path: root/cpukit/posix/src/ualarm.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-22 15:03:04 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-22 16:57:26 +0200
commit43f97f1de96a55deceb474d414a2185fdb07c5ab (patch)
tree0fc9cd11c7eb94abc5e5d025e51b48ea340a62ac /cpukit/posix/src/ualarm.c
parenta9cc1beb42776b7e6ac01792e070b4d6703aef39 (diff)
downloadrtems-43f97f1de96a55deceb474d414a2185fdb07c5ab.tar.bz2
posix: Statically init _POSIX_signals_Ualarm_timer
Diffstat (limited to 'cpukit/posix/src/ualarm.c')
-rw-r--r--cpukit/posix/src/ualarm.c49
1 files changed, 24 insertions, 25 deletions
diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c
index 74bfe8f557..c893800d09 100644
--- a/cpukit/posix/src/ualarm.c
+++ b/cpukit/posix/src/ualarm.c
@@ -27,6 +27,14 @@
#include <rtems/posix/psignalimpl.h>
#include <rtems/posix/time.h>
+static void _POSIX_signals_Ualarm_TSR( Objects_Id id, void *argument );
+
+static Watchdog_Control _POSIX_signals_Ualarm_timer = WATCHDOG_INITIALIZER(
+ _POSIX_signals_Ualarm_TSR,
+ 0,
+ NULL
+);
+
/*
* _POSIX_signals_Ualarm_TSR
*/
@@ -56,35 +64,26 @@ useconds_t ualarm(
useconds_t remaining = 0;
Watchdog_Control *the_timer;
Watchdog_Interval ticks;
+ Watchdog_States state;
struct timespec tp;
the_timer = &_POSIX_signals_Ualarm_timer;
- /*
- * Initialize the timer used to implement alarm().
- */
-
- if ( !the_timer->routine ) {
- _Watchdog_Initialize( the_timer, _POSIX_signals_Ualarm_TSR, 0, NULL );
- } else {
- Watchdog_States state;
-
- state = _Watchdog_Remove( the_timer );
- if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) {
- /*
- * The stop_time and start_time fields are snapshots of ticks since
- * boot. Since alarm() is dealing in seconds, we must account for
- * this.
- */
-
- ticks = the_timer->initial;
- ticks -= (the_timer->stop_time - the_timer->start_time);
- /* remaining is now in ticks */
-
- _Timespec_From_ticks( ticks, &tp );
- remaining = tp.tv_sec * TOD_MICROSECONDS_PER_SECOND;
- remaining += tp.tv_nsec / 1000;
- }
+ state = _Watchdog_Remove( the_timer );
+ if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) {
+ /*
+ * The stop_time and start_time fields are snapshots of ticks since
+ * boot. Since alarm() is dealing in seconds, we must account for
+ * this.
+ */
+
+ ticks = the_timer->initial;
+ ticks -= (the_timer->stop_time - the_timer->start_time);
+ /* remaining is now in ticks */
+
+ _Timespec_From_ticks( ticks, &tp );
+ remaining = tp.tv_sec * TOD_MICROSECONDS_PER_SECOND;
+ remaining += tp.tv_nsec / 1000;
}
/*