3 files changed, 63 insertions, 13 deletions
diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
index f5d00eae8e..3eb37a4fe3 100644
--- a/testsuites/sptests/sp07/init.c
+++ b/testsuites/sptests/sp07/init.c
@@ -22,11 +22,8 @@
  *  $Id$
  */
 
+#define TEST_INIT
 #include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
 
 rtems_extensions_table Extensions = {
   Task_create_extension,     /* task create user extension */
@@ -34,6 +31,7 @@ rtems_extensions_table Extensions = {
   Task_restart_extension,    /* task restart user extension */
   Task_delete_extension,     /* task delete user extension */
   NULL,                      /* task switch user extension */
+  NULL,                      /* task post switch user extension */
   NULL,                      /* begin user extension */
   Task_exit_extension,       /* task exitted user extension */
   NULL                       /* fatal error extension */
diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h
index c9246a0c07..3bd1ee69b5 100644
--- a/testsuites/sptests/sp07/system.h
+++ b/testsuites/sptests/sp07/system.h
@@ -16,19 +16,70 @@
 
 #include <tmacros.h>
 
-/* constants */
+/* functions */
 
-#define SI_NAME       0x53595349     /* name - "SYSI" */
-#define I_NAME        0x49444c45     /* name - "IDLE" */
+rtems_task Init(
+  rtems_task_argument argument
+);
 
-/* Miscellaneous */
+rtems_task Task_1(
+  rtems_task_argument argument
+);
+ 
+rtems_task Task_2(
+  rtems_task_argument argument
+);
+ 
+rtems_task Task_3(
+  rtems_task_argument argument
+);
+ 
+rtems_task Task_4(
+  rtems_task_argument argument
+);
+ 
+rtems_boolean Task_create_extension(
+  rtems_tcb *unused,
+  rtems_tcb *created_task
+);
+ 
+rtems_extension Task_delete_extension(
+  rtems_tcb *running_task,
+  rtems_tcb *deleted_task
+);
+ 
+rtems_extension Task_restart_extension(
+  rtems_tcb *unused,
+  rtems_tcb *restarted_task
+);
+ 
+rtems_extension Task_start_extension(
+  rtems_tcb *unused,
+  rtems_tcb *started_task
+);
+ 
+rtems_extension Task_exit_extension(
+  rtems_tcb *running_task
+);
 
-#define EXTERN  extern             /* external definition */
+/* configuration information */
 
-/* macros */
+#define CONFIGURE_SPTEST
 
-/* structures */
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
 
-#include "gvar.h"
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
+#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   Extension_id[ 4 ];
+TEST_EXTERN rtems_name Extension_name[ 4 ];  /* array of task names */
+ 
 /* end of include file */
diff --git a/testsuites/sptests/sp07/tcreate.c b/testsuites/sptests/sp07/tcreate.c
index 7b066630f0..aff47ed191 100644
--- a/testsuites/sptests/sp07/tcreate.c
+++ b/testsuites/sptests/sp07/tcreate.c
@@ -21,7 +21,7 @@
 
 #include "system.h"
 
-rtems_extension Task_create_extension(
+rtems_boolean Task_create_extension(
   rtems_tcb *unused,
   rtems_tcb *created_task
 )
@@ -31,4 +31,5 @@ rtems_extension Task_create_extension(
     put_name( Task_name[ task_number( created_task->Object.id ) ], FALSE );
     puts( " - created." );
   }
+  return TRUE;
 }