From ff3c06a5297407d857289aea716c7867cf2399b8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 4 Oct 2009 22:08:43 +0000 Subject: 2009-10-04 Joel Sherrill * posix/include/rtems/posix/psignal.h: Add extern for ualarm timer. * posix/src/alarm.c, posix/src/ualarm.c: Change from switch to if since many enumerated values have no action. * posix/src/psignal.c: Initialize ualarm and alarm timers. --- cpukit/posix/src/alarm.c | 29 ++++++++++++----------------- cpukit/posix/src/psignal.c | 6 ++++++ cpukit/posix/src/ualarm.c | 38 +++++++++++++++++--------------------- 3 files changed, 35 insertions(+), 38 deletions(-) (limited to 'cpukit/posix/src') diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c index abc9ab3240..266df94283 100644 --- a/cpukit/posix/src/alarm.c +++ b/cpukit/posix/src/alarm.c @@ -56,23 +56,18 @@ unsigned int alarm( if ( !the_timer->routine ) { _Watchdog_Initialize( the_timer, _POSIX_signals_Alarm_TSR, 0, NULL ); } else { - switch ( _Watchdog_Remove( the_timer ) ) { - case WATCHDOG_INACTIVE: - case WATCHDOG_BEING_INSERTED: - break; - - case WATCHDOG_ACTIVE: - case 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. - */ - - remaining = the_timer->initial - - ((the_timer->stop_time - the_timer->start_time) / - TOD_TICKS_PER_SECOND); - break; + 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. + */ + + remaining = the_timer->initial - + ((the_timer->stop_time - the_timer->start_time) / TOD_TICKS_PER_SECOND); } } diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c index e477cd399e..926d1758da 100644 --- a/cpukit/posix/src/psignal.c +++ b/cpukit/posix/src/psignal.c @@ -214,4 +214,10 @@ void _POSIX_signals_Manager_Initialization(void) } else { _Chain_Initialize_empty( &_POSIX_signals_Inactive_siginfo ); } + + /* + * Initialize the Alarm Timer + */ + _Watchdog_Initialize( &_POSIX_signals_Alarm_timer, NULL, 0, NULL ); + _Watchdog_Initialize( &_POSIX_signals_Ualarm_timer, NULL, 0, NULL ); } diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c index 6fcc4087ed..8910dac217 100644 --- a/cpukit/posix/src/ualarm.c +++ b/cpukit/posix/src/ualarm.c @@ -66,27 +66,23 @@ useconds_t ualarm( if ( !the_timer->routine ) { _Watchdog_Initialize( the_timer, _POSIX_signals_Ualarm_TSR, 0, NULL ); } else { - switch ( _Watchdog_Remove( the_timer ) ) { - case WATCHDOG_INACTIVE: - case WATCHDOG_BEING_INSERTED: - break; - - case WATCHDOG_ACTIVE: - case 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; - break; + 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; } } -- cgit v1.2.3