The word "RTEMS" almost completely removed from the core.

Configuration Table Template file added and all tests
modified to use this.  All gvar.h and conftbl.h files
removed from test directories.

Configuration parameter maximum_devices added.

Core semaphore and mutex handlers added and RTEMS API Semaphore
Manager updated to reflect this.

Initialization sequence changed to invoke API specific initialization
routines.  Initialization tasks table now owned by RTEMS Tasks Manager.

Added user extension for post-switch.

Utilized user extensions to implement API specific functionality
like signal dispatching.

Added extensions to the System Initialization Thread so that an
API can register a function to be invoked while the system
is being initialized.  These are largely equivalent to the
pre-driver and post-driver hooks.

Added the Modules file oar-go32_p5, modified oar-go32, and modified
the file make/custom/go32.cfg to look at an environment varable which
determines what CPU model is being used.

All BSPs updated to reflect named devices and clock driver's IOCTL
used by the Shared Memory Driver.  Also merged clock isr into
main file and removed ckisr.c where possible.

Updated spsize to reflect new and moved variables.

Makefiles for the executive source and include files updated to show
break down of files into Core, RTEMS API, and Neither.

Header and inline files installed into subdirectory based on whether
logically in the Core or a part of the RTEMS API.

1 files changed, 20 insertions, 16 deletions

diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h
index bab05378c7..21e88a4baf 100644
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ b/cpukit/rtems/include/rtems/rtems/timer.h
@@ -33,10 +33,9 @@
 extern "C" {
 #endif
 
-#include <rtems.h>
-#include <rtems/object.h>
-#include <rtems/tod.h>
-#include <rtems/watchdog.h>
+#include <rtems/core/object.h>
+#include <rtems/core/tod.h>
+#include <rtems/core/watchdog.h>
 
 /*
  *  The following enumerated type details the classes to which a timer
@@ -50,10 +49,15 @@ typedef enum {
 } Timer_Classes;
 
 /*
- *  The following defines the type of a Timer Service Routine.
+ *  The following types define a pointer to a timer service routine.
  */
-
-typedef rtems_timer_service_routine_entry Timer_Service;
+ 
+typedef void rtems_timer_service_routine;
+ 
+typedef rtems_timer_service_routine ( *rtems_timer_service_routine_entry )(
+                 rtems_id,
+                 void *
+             );
 
 /*
  *  The following defines the information control block used to manage
@@ -153,10 +157,10 @@ rtems_status_code rtems_timer_delete(
  */
 
 rtems_status_code rtems_timer_fire_after(
-  Objects_Id         id,
-  rtems_interval  ticks,
-  Timer_Service      routine,
-  void              *user_data
+  Objects_Id                         id,
+  rtems_interval                     ticks,
+  rtems_timer_service_routine_entry  routine,
+  void                              *user_data
 );
 
 /*
@@ -170,10 +174,10 @@ rtems_status_code rtems_timer_fire_after(
  */
 
 rtems_status_code rtems_timer_fire_when(
-  Objects_Id         id,
-  rtems_time_of_day       *wall_time,
-  Timer_Service      routine,
-  void              *user_data
+  Objects_Id                          id,
+  rtems_time_of_day                  *wall_time,
+  rtems_timer_service_routine_entry   routine,
+  void                               *user_data
 );
 
 /*
@@ -283,7 +287,7 @@ STATIC INLINE boolean _Timer_Is_null (
   Timer_Control *the_timer
 );
 
-#include <rtems/timer.inl>
+#include <rtems/rtems/timer.inl>
 
 #ifdef __cplusplus
 }