2011-10-04 Sebastian Huber <sebastian.huber@embedded-brains.de>

	PR 1922
	* spcbssched02/system.h, spcbssched03/system.h, spedfsched02/system.h,
	spedfsched02/task1.c, spedfsched03/system.h: EDF and CBS scheduler:
	extern declarations fix.

6 files changed, 28 insertions, 19 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 007e849b15..54cab0adfc 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-04	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	PR 1922
+	* spcbssched02/system.h, spcbssched03/system.h, spedfsched02/system.h,
+	spedfsched02/task1.c, spedfsched03/system.h: EDF and CBS scheduler:
+	extern declarations fix.
+
 2011-09-30	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* sp50/init.c, spclockget/init.c: Include "pritime.h".
diff --git a/testsuites/sptests/spcbssched02/system.h b/testsuites/sptests/spcbssched02/system.h
index c1017431e1..4ea1720e4f 100644
--- a/testsuites/sptests/spcbssched02/system.h
+++ b/testsuites/sptests/spcbssched02/system.h
@@ -52,13 +52,13 @@ rtems_task Task_Periodic(
 
 /* global variables */
 
-rtems_id   Task_id;
-rtems_name Task_name;
-rtems_id   Task_id2;
-rtems_name Task_name2;
-rtems_task_priority Priority;
-time_t  Period;
-time_t  Execution;
-time_t  Phase;
+TEST_EXTERN rtems_id   Task_id;
+TEST_EXTERN rtems_name Task_name;
+TEST_EXTERN rtems_id   Task_id2;
+TEST_EXTERN rtems_name Task_name2;
+TEST_EXTERN rtems_task_priority Priority;
+TEST_EXTERN time_t  Period;
+TEST_EXTERN time_t  Execution;
+TEST_EXTERN time_t  Phase;
 
 /* end of include file */
diff --git a/testsuites/sptests/spcbssched03/system.h b/testsuites/sptests/spcbssched03/system.h
index ed038cf550..f145dfd65a 100644
--- a/testsuites/sptests/spcbssched03/system.h
+++ b/testsuites/sptests/spcbssched03/system.h
@@ -64,10 +64,10 @@ rtems_task Tasks_Aperiodic(
 
 TEST_EXTERN rtems_id   Task_id[ 1+NUM_TASKS ];     /* array of task ids */
 TEST_EXTERN rtems_name Task_name[ 1+NUM_TASKS ];   /* array of task names */
-extern rtems_task_priority Priorities[ 1+NUM_TASKS ];
-extern uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
-extern uint32_t  Phases[1 + NUM_TASKS];
-extern uint32_t  Execution[1 + NUM_TASKS];
-bool Violating_task[1 + NUM_PERIODIC_TASKS];
+TEST_EXTERN rtems_task_priority Priorities[ 1+NUM_TASKS ];
+TEST_EXTERN uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
+TEST_EXTERN uint32_t  Phases[1 + NUM_TASKS];
+TEST_EXTERN uint32_t  Execution[1 + NUM_TASKS];
+TEST_EXTERN bool Violating_task[1 + NUM_PERIODIC_TASKS];
 
 /* end of include file */
diff --git a/testsuites/sptests/spedfsched02/system.h b/testsuites/sptests/spedfsched02/system.h
index 3a3c8360bd..b9898f488f 100644
--- a/testsuites/sptests/spedfsched02/system.h
+++ b/testsuites/sptests/spedfsched02/system.h
@@ -60,6 +60,6 @@ TEST_EXTERN rtems_name Task_name[ 7 ];   /* array of task names */
 
 TEST_EXTERN struct counters Count;       /* iteration counters */
 TEST_EXTERN struct counters Temporary_count;
-extern rtems_task_priority Priorities[ 7 ];
+TEST_EXTERN rtems_task_priority *Priorities;
 
 /* end of include file */
diff --git a/testsuites/sptests/spedfsched02/task1.c b/testsuites/sptests/spedfsched02/task1.c
index 0fdf40417b..5ae12bd36c 100644
--- a/testsuites/sptests/spedfsched02/task1.c
+++ b/testsuites/sptests/spedfsched02/task1.c
@@ -31,7 +31,7 @@
 
 uint32_t      Periods[7]    = { 0,   2,   2,   2,   2, 100, 0 };
 uint32_t      Iterations[7] = { 0,  50,  50,  50,  50,   1, TA6_ITERATIONS };
-rtems_task_priority Priorities[7] = { 0,   2,   2,   2,   2,  100, 1 };
+rtems_task_priority Prio[7] = { 0,   2,   2,   2,   2,  100, 1 };
 
 rtems_task Task_1_through_6(
   rtems_task_argument argument
@@ -44,6 +44,8 @@ rtems_task Task_1_through_6(
   uint32_t          failed;
   rtems_status_code status;
 
+  Priorities = Prio;
+
   status = rtems_rate_monotonic_create( argument, &rmid );
   directive_failed( status, "rtems_rate_monotonic_create" );
   put_name( Task_name[ argument ], FALSE );
diff --git a/testsuites/sptests/spedfsched03/system.h b/testsuites/sptests/spedfsched03/system.h
index b386195c94..acc0348644 100644
--- a/testsuites/sptests/spedfsched03/system.h
+++ b/testsuites/sptests/spedfsched03/system.h
@@ -63,9 +63,9 @@ rtems_task Tasks_Aperiodic(
 
 TEST_EXTERN rtems_id   Task_id[ 1+NUM_TASKS ];     /* array of task ids */
 TEST_EXTERN rtems_name Task_name[ 1+NUM_TASKS ];   /* array of task names */
-extern rtems_task_priority Priorities[ 1+NUM_TASKS ];
-extern uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
-extern uint32_t  Phases[1 + NUM_TASKS];
-extern uint32_t  Execution[1 + NUM_TASKS];
+TEST_EXTERN rtems_task_priority Priorities[ 1+NUM_TASKS ];
+TEST_EXTERN uint32_t  Periods[ 1 + NUM_PERIODIC_TASKS ];
+TEST_EXTERN uint32_t  Phases[1 + NUM_TASKS];
+TEST_EXTERN uint32_t  Execution[1 + NUM_TASKS];
 
 /* end of include file */