Split Timer Manager into one routine per file.

10 files changed, 475 insertions, 618 deletions

diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index b77ce9d8ef..e27501ddfc 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/Makefile.in
@@ -24,9 +24,13 @@ TASK_PIECES=\
   taskmode taskrestart taskresume tasksetnote tasksetpriority \
   taskstart tasksuspend taskwakeafter taskwakewhen
 
-CLOCK_PIECES=
+CLOCK_PIECES=\
   clock clockget clockset clocktick
 
+TIMER_PIECES=\
+  timer timercancel timercreate timerdelete timerfireafter \
+  timerfirewhere timerident timerreset
+
 REGION_PIECES=\
   region regioncreate regiondelete regionextend regiongetsegment \
   regiongetsegmentsize regionident regionreturnsegemnt regionreturnsegemnt
@@ -50,7 +54,7 @@ RATEMON_PIECES=\
 C_PIECES=attr $(CLOCK_PIECES) dpmem $(EVENT_PIECES) intr intrbody \
    $(MESSAGE_QUEUE_PIECES) \
    part $(RATEMON_PIECES)  $(REGION_PIECES) $(SEMAPHORE_PIECES) signal \
-   $(TASK_PIECES) timer $(MP_PIECES)
+   $(TASK_PIECES) $(TIMER_PIECES) $(MP_PIECES)
 C_FILES=$(C_PIECES:%=%.c)
 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
diff --git a/c/src/exec/rtems/src/rtemstimer.c b/c/src/exec/rtems/src/rtemstimer.c
index 9337df3a25..67d9c4ce89 100644
--- a/c/src/exec/rtems/src/rtemstimer.c
+++ b/c/src/exec/rtems/src/rtemstimer.c
@@ -49,311 +49,3 @@ void _Timer_Manager_initialization(
     FALSE
   );
 }
-
-/*PAGE
- *
- *  rtems_timer_create
- *
- *  This directive creates a timer and performs some initialization.
- *
- *  Input parameters:
- *    name - timer name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    id                - timer id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Timer_Control *the_timer;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  _Thread_Disable_dispatch();         /* to prevent deletion */
-
-  the_timer = _Timer_Allocate();
-
-  if ( !the_timer ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_timer->the_class = TIMER_DORMANT;
-
-  _Objects_Open( &_Timer_Information, &the_timer->Object, &name );
-
-  *id = the_timer->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_timer_ident
- *
- *  This directive returns the system ID associated with
- *  the timer name.
- *
- *  Input parameters:
- *    name - user defined message queue name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    *id               - message queue id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Timer_Information,
-    &name,
-    OBJECTS_SEARCH_LOCAL_NODE,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_timer_cancel
- *
- *  This directive allows a thread to cancel a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_cancel(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  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:
-      if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) 
-        (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_delete
- *
- *  This directive allows a thread to delete a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_delete(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  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:
-      _Objects_Close( &_Timer_Information, &the_timer->Object );
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Timer_Free( the_timer );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_after
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id      - timer id
- *    ticks   - interval until routine is fired
- *    routine - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-)
-{
-  Timer_Control      *the_timer;
-  Objects_Locations   location;
-
-  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;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_ticks( &the_timer->Ticker, ticks );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_when
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id        - timer id
- *    wall_time - time of day to fire timer
- *    routine   - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_when(
-  Objects_Id                          id,
-  rtems_time_of_day                  *wall_time,
-  rtems_timer_service_routine_entry   routine,
-  void                               *user_data
-)
-{
-  Timer_Control       *the_timer;
-  Objects_Locations    location;
-  rtems_interval       seconds;
-
-  if ( !_TOD_Is_set )
-    return RTEMS_NOT_DEFINED;
-
-  if ( !_TOD_Validate( wall_time ) )
-    return RTEMS_INVALID_CLOCK;
-
-  seconds = _TOD_To_seconds( wall_time );
-  if ( seconds <= _TOD_Seconds_since_epoch )
-    return RTEMS_INVALID_CLOCK;
-
-  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_TIME_OF_DAY;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_seconds(
-         &the_timer->Ticker,
-         seconds - _TOD_Seconds_since_epoch
-       );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_reset
- *
- *  This directive allows a thread to reset a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_reset(
-  Objects_Id id
-)
-{
-  Timer_Control     *the_timer;
-  Objects_Locations  location;
-
-  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:
-      if ( _Timer_Is_interval_class( the_timer->the_class ) ) {
-        _Watchdog_Reset( &the_timer->Ticker );
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_NOT_DEFINED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/c/src/exec/rtems/src/timer.c b/c/src/exec/rtems/src/timer.c
index 9337df3a25..67d9c4ce89 100644
--- a/c/src/exec/rtems/src/timer.c
+++ b/c/src/exec/rtems/src/timer.c
@@ -49,311 +49,3 @@ void _Timer_Manager_initialization(
     FALSE
   );
 }
-
-/*PAGE
- *
- *  rtems_timer_create
- *
- *  This directive creates a timer and performs some initialization.
- *
- *  Input parameters:
- *    name - timer name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    id                - timer id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Timer_Control *the_timer;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  _Thread_Disable_dispatch();         /* to prevent deletion */
-
-  the_timer = _Timer_Allocate();
-
-  if ( !the_timer ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_timer->the_class = TIMER_DORMANT;
-
-  _Objects_Open( &_Timer_Information, &the_timer->Object, &name );
-
-  *id = the_timer->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_timer_ident
- *
- *  This directive returns the system ID associated with
- *  the timer name.
- *
- *  Input parameters:
- *    name - user defined message queue name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    *id               - message queue id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Timer_Information,
-    &name,
-    OBJECTS_SEARCH_LOCAL_NODE,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_timer_cancel
- *
- *  This directive allows a thread to cancel a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_cancel(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  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:
-      if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) 
-        (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_delete
- *
- *  This directive allows a thread to delete a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_delete(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  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:
-      _Objects_Close( &_Timer_Information, &the_timer->Object );
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Timer_Free( the_timer );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_after
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id      - timer id
- *    ticks   - interval until routine is fired
- *    routine - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-)
-{
-  Timer_Control      *the_timer;
-  Objects_Locations   location;
-
-  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;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_ticks( &the_timer->Ticker, ticks );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_when
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id        - timer id
- *    wall_time - time of day to fire timer
- *    routine   - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_when(
-  Objects_Id                          id,
-  rtems_time_of_day                  *wall_time,
-  rtems_timer_service_routine_entry   routine,
-  void                               *user_data
-)
-{
-  Timer_Control       *the_timer;
-  Objects_Locations    location;
-  rtems_interval       seconds;
-
-  if ( !_TOD_Is_set )
-    return RTEMS_NOT_DEFINED;
-
-  if ( !_TOD_Validate( wall_time ) )
-    return RTEMS_INVALID_CLOCK;
-
-  seconds = _TOD_To_seconds( wall_time );
-  if ( seconds <= _TOD_Seconds_since_epoch )
-    return RTEMS_INVALID_CLOCK;
-
-  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_TIME_OF_DAY;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_seconds(
-         &the_timer->Ticker,
-         seconds - _TOD_Seconds_since_epoch
-       );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_reset
- *
- *  This directive allows a thread to reset a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_reset(
-  Objects_Id id
-)
-{
-  Timer_Control     *the_timer;
-  Objects_Locations  location;
-
-  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:
-      if ( _Timer_Is_interval_class( the_timer->the_class ) ) {
-        _Watchdog_Reset( &the_timer->Ticker );
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_NOT_DEFINED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/c/src/exec/rtems/src/timercancel.c b/c/src/exec/rtems/src/timercancel.c
new file mode 100644
index 0000000000..c223ad5332
--- /dev/null
+++ b/c/src/exec/rtems/src/timercancel.c
@@ -0,0 +1,62 @@
+/*
+ *  Timer Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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_cancel
+ *
+ *  This directive allows a thread to cancel a timer.
+ *
+ *  Input parameters:
+ *    id - timer id
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_cancel(
+  Objects_Id id
+)
+{
+  Timer_Control   *the_timer;
+  Objects_Locations       location;
+
+  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:
+      if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) 
+        (void) _Watchdog_Remove( &the_timer->Ticker );
+      _Thread_Enable_dispatch();
+      return RTEMS_SUCCESSFUL;
+  }
+
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}
diff --git a/c/src/exec/rtems/src/timercreate.c b/c/src/exec/rtems/src/timercreate.c
new file mode 100644
index 0000000000..72b0f4add8
--- /dev/null
+++ b/c/src/exec/rtems/src/timercreate.c
@@ -0,0 +1,67 @@
+/*
+ *  Timer Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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_create
+ *
+ *  This directive creates a timer and performs some initialization.
+ *
+ *  Input parameters:
+ *    name - timer name
+ *    id   - pointer to timer id
+ *
+ *  Output parameters:
+ *    id                - timer id
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code        - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_create(
+  rtems_name    name,
+  Objects_Id   *id
+)
+{
+  Timer_Control *the_timer;
+
+  if ( !rtems_is_name_valid( name ) )
+    return RTEMS_INVALID_NAME;
+
+  _Thread_Disable_dispatch();         /* to prevent deletion */
+
+  the_timer = _Timer_Allocate();
+
+  if ( !the_timer ) {
+    _Thread_Enable_dispatch();
+    return RTEMS_TOO_MANY;
+  }
+
+  the_timer->the_class = TIMER_DORMANT;
+
+  _Objects_Open( &_Timer_Information, &the_timer->Object, &name );
+
+  *id = the_timer->Object.id;
+  _Thread_Enable_dispatch();
+  return RTEMS_SUCCESSFUL;
+}
diff --git a/c/src/exec/rtems/src/timerdelete.c b/c/src/exec/rtems/src/timerdelete.c
new file mode 100644
index 0000000000..c7a0d6c092
--- /dev/null
+++ b/c/src/exec/rtems/src/timerdelete.c
@@ -0,0 +1,63 @@
+/*
+ *  Timer Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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_delete
+ *
+ *  This directive allows a thread to delete a timer.
+ *
+ *  Input parameters:
+ *    id - timer id
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_delete(
+  Objects_Id id
+)
+{
+  Timer_Control   *the_timer;
+  Objects_Locations       location;
+
+  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:
+      _Objects_Close( &_Timer_Information, &the_timer->Object );
+      (void) _Watchdog_Remove( &the_timer->Ticker );
+      _Timer_Free( the_timer );
+      _Thread_Enable_dispatch();
+      return RTEMS_SUCCESSFUL;
+  }
+
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}
diff --git a/c/src/exec/rtems/src/timerfireafter.c b/c/src/exec/rtems/src/timerfireafter.c
new file mode 100644
index 0000000000..6a19d3184c
--- /dev/null
+++ b/c/src/exec/rtems/src/timerfireafter.c
@@ -0,0 +1,72 @@
+/*
+ *  Timer Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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_fire_after
+ *
+ *  This directive allows a thread to start a timer.
+ *
+ *  Input parameters:
+ *    id      - timer id
+ *    ticks   - interval until routine is fired
+ *    routine - routine to schedule
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code        - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_fire_after(
+  Objects_Id                         id,
+  rtems_interval                     ticks,
+  rtems_timer_service_routine_entry  routine,
+  void                              *user_data
+)
+{
+  Timer_Control      *the_timer;
+  Objects_Locations   location;
+
+  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;
+      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
+      _Watchdog_Insert_ticks( &the_timer->Ticker, ticks );
+      _Thread_Enable_dispatch();
+      return RTEMS_SUCCESSFUL;
+  }
+
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}
diff --git a/c/src/exec/rtems/src/timerfirewhen.c b/c/src/exec/rtems/src/timerfirewhen.c
new file mode 100644
index 0000000000..a74d27e80b
--- /dev/null
+++ b/c/src/exec/rtems/src/timerfirewhen.c
@@ -0,0 +1,83 @@
+/*
+ *  Timer Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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_fire_when
+ *
+ *  This directive allows a thread to start a timer.
+ *
+ *  Input parameters:
+ *    id        - timer id
+ *    wall_time - time of day to fire timer
+ *    routine   - routine to schedule
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code        - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_fire_when(
+  Objects_Id                          id,
+  rtems_time_of_day                  *wall_time,
+  rtems_timer_service_routine_entry   routine,
+  void                               *user_data
+)
+{
+  Timer_Control       *the_timer;
+  Objects_Locations    location;
+  rtems_interval       seconds;
+
+  if ( !_TOD_Is_set )
+    return RTEMS_NOT_DEFINED;
+
+  if ( !_TOD_Validate( wall_time ) )
+    return RTEMS_INVALID_CLOCK;
+
+  seconds = _TOD_To_seconds( wall_time );
+  if ( seconds <= _TOD_Seconds_since_epoch )
+    return RTEMS_INVALID_CLOCK;
+
+  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_TIME_OF_DAY;
+      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
+      _Watchdog_Insert_seconds(
+         &the_timer->Ticker,
+         seconds - _TOD_Seconds_since_epoch
+       );
+      _Thread_Enable_dispatch();
+      return RTEMS_SUCCESSFUL;
+  }
+
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}
diff --git a/c/src/exec/rtems/src/timerident.c b/c/src/exec/rtems/src/timerident.c
new file mode 100644
index 0000000000..568233ce40
--- /dev/null
+++ b/c/src/exec/rtems/src/timerident.c
@@ -0,0 +1,57 @@
+/*
+ *  Timer Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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_ident
+ *
+ *  This directive returns the system ID associated with
+ *  the timer name.
+ *
+ *  Input parameters:
+ *    name - user defined message queue name
+ *    id   - pointer to timer id
+ *
+ *  Output parameters:
+ *    *id               - message queue id
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code        - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_ident(
+  rtems_name    name,
+  Objects_Id   *id
+)
+{
+  Objects_Name_to_id_errors  status;
+
+  status = _Objects_Name_to_id(
+    &_Timer_Information,
+    &name,
+    OBJECTS_SEARCH_LOCAL_NODE,
+    id
+  );
+
+  return _Status_Object_name_errors_to_status[ status ];
+}
diff --git a/c/src/exec/rtems/src/timerreset.c b/c/src/exec/rtems/src/timerreset.c
new file mode 100644
index 0000000000..1ef029b562
--- /dev/null
+++ b/c/src/exec/rtems/src/timerreset.c
@@ -0,0 +1,65 @@
+/*
+ *  Timer Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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_reset
+ *
+ *  This directive allows a thread to reset a timer.
+ *
+ *  Input parameters:
+ *    id - timer id
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code        - if unsuccessful
+ */
+
+rtems_status_code rtems_timer_reset(
+  Objects_Id id
+)
+{
+  Timer_Control     *the_timer;
+  Objects_Locations  location;
+
+  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:
+      if ( _Timer_Is_interval_class( the_timer->the_class ) ) {
+        _Watchdog_Reset( &the_timer->Ticker );
+        _Thread_Enable_dispatch();
+        return RTEMS_SUCCESSFUL;
+      }
+      _Thread_Enable_dispatch();
+      return RTEMS_NOT_DEFINED;
+  }
+
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}