2009-10-04 Joel Sherrill <joel.sherrill@oarcorp.com>

	* 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.

1 files changed, 12 insertions, 17 deletions

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);
     }
   }