2001-01-16 Joel Sherrill <joel@OARcorp.com>

	* Added task-based timers to the Timer Manager.  This added three
	new directives:
	    - rtems_timer_initiate_server
	    - rtems_timer_server_fire_after
	    - rtems_timer_server_fire_when
	In the process of doing this, a number of cleanups were made.
	* src/timerserver.c, src/timerserverfireafter.c,
	src/timerserverfirewhen.c: New files.
	* include/timer/timer.h: Added new prototypes and supporting types.
	* inline/rtems/rtems/timer.h, macros/rtems/rtems/timer.h: Enhanced
	_Timer_Is_interval_class() to cover the class TIMER_INTERVAL_ON_TASK.
	* src/Makefile.am: Accounted for new files.
	* src/rtemstimer.c: Added initialization of _Timer_Server variable.
	* src/timercancel.c, src/timerreset.c: Account for addition
	of timer classes.  Also corrected the headers.
	* src/timercreate.c, src/timerdelete.c, src/timerfireafter.c,
	src/timerfireafter.c, src/timerident.c: Corrected header.

1 files changed, 79 insertions, 0 deletions

diff --git a/c/src/exec/rtems/src/timerserverfireafter.c b/c/src/exec/rtems/src/timerserverfireafter.c
new file mode 100644
index 0000000000..32b42b77ce
--- /dev/null
+++ b/c/src/exec/rtems/src/timerserverfireafter.c
@@ -0,0 +1,79 @@
+/*
+ *  Timer Manager - rtems_timer_server fire_after directive
+ *
+ *
+ *  COPYRIGHT (c) 1989-2002.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#include <rtems/system.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/support.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/rtems/timer.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
+
+/*PAGE
+ *
+ *  rtems_timer_server_fire_after
+ *
+ *  This directive allows a thread to start a timer which will by 
+ *  executed by the Timer Server when it fires.
+ *
+ *  Input parameters:
+ *    id        - timer id
+ *    ticks     - interval until routine is fired
+ *    routine   - routine to schedule
+ *    user_data - passed as argument to routine when it is fired
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code       - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_server_fire_after(
+  Objects_Id                         id,
+  rtems_interval                     ticks,
+  rtems_timer_service_routine_entry  routine,
+  void                              *user_data
+)
+{
+  Timer_Control        *the_timer;
+  Objects_Locations     location;
+  extern Chain_Control  _Timer_Ticks_chain;
+
+  if ( !_Timer_Server )
+    return RTEMS_INCORRECT_STATE;
+
+  if ( ticks == 0 )
+    return RTEMS_INVALID_NUMBER;
+
+  the_timer = _Timer_Get( id, &location );
+  switch ( location ) {
+    case OBJECTS_REMOTE:            /* should never return this */
+      return RTEMS_INTERNAL_ERROR;
+
+    case OBJECTS_ERROR:
+      return RTEMS_INVALID_ID;
+
+    case OBJECTS_LOCAL:
+      (void) _Watchdog_Remove( &the_timer->Ticker );
+      the_timer->the_class = TIMER_INTERVAL_ON_TASK;
+      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
+      the_timer->Ticker.initial = ticks;
+      _Watchdog_Insert( &_Timer_Ticks_chain, &the_timer->Ticker );
+      _Timer_Server_reset( TIMER_SERVER_RESET_TICKS );
+      _Thread_Enable_dispatch();
+      return RTEMS_SUCCESSFUL;
+  }
+
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}