2 files changed, 65 insertions, 9 deletions
diff --git a/c/src/tests/sptests/sp11/init.c b/c/src/tests/sptests/sp11/init.c
index 99ef1d55a0..c79a42fb4e 100644
--- a/c/src/tests/sptests/sp11/init.c
+++ b/c/src/tests/sptests/sp11/init.c
@@ -22,11 +22,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_task Init(
   rtems_task_argument argument
diff --git a/c/src/tests/sptests/sp11/system.h b/c/src/tests/sptests/sp11/system.h
index 0bf193dad9..983ed077b5 100644
--- a/c/src/tests/sptests/sp11/system.h
+++ b/c/src/tests/sptests/sp11/system.h
@@ -16,14 +16,73 @@
 
 #include <tmacros.h>
 
-/* Miscellaneous */
+/* functions */
 
-#define EXTERN  extern             /* external definition */
+rtems_task Init(
+  rtems_task_argument argument
+);
+ 
+rtems_task Task_1(
+  rtems_task_argument argument
+);
+ 
+rtems_task Task_2(
+  rtems_task_argument argument
+);
+ 
+rtems_timer_service_routine TA1_send_18_to_self_5_seconds(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+ 
+rtems_timer_service_routine TA1_send_8_to_self_60_seconds(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+ 
+rtems_timer_service_routine TA1_send_9_to_self_60_seconds(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+ 
+rtems_timer_service_routine TA1_send_10_to_self(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+ 
+rtems_timer_service_routine TA1_send_1_to_self_every_second(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+ 
+rtems_timer_service_routine TA1_send_11_to_self(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+ 
+rtems_timer_service_routine TA2_send_10_to_self(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
 
-/* macros */
+/* configuration information */
 
-/* structures */
+#define CONFIGURE_SPTEST
 
-#include "gvar.h"
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS              6
+#define CONFIGURE_TICKS_PER_TIMESLICE       100
+
+#include <confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
+
+TEST_EXTERN rtems_id   Timer_id[ 7 ];     /* array of timer ids */
+TEST_EXTERN rtems_name Timer_name[ 7 ];   /* array of timer names */
 
 /* end of include file */