diff options
Diffstat (limited to '')
67 files changed, 314 insertions, 274 deletions
diff --git a/c/src/tests/sptests/sp01/Makefile.am b/c/src/tests/sptests/sp01/Makefile.am index 065e7bcc2b..75bfbcc736 100644 --- a/c/src/tests/sptests/sp01/Makefile.am +++ b/c/src/tests/sptests/sp01/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp01/system.h b/c/src/tests/sptests/sp01/system.h index 5a1cbad8b8..3d4b636d38 100644 --- a/c/src/tests/sptests/sp01/system.h +++ b/c/src/tests/sptests/sp01/system.h @@ -27,14 +27,13 @@ rtems_task Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp02/Makefile.am b/c/src/tests/sptests/sp02/Makefile.am index 174e249375..ea8b740cad 100644 --- a/c/src/tests/sptests/sp02/Makefile.am +++ b/c/src/tests/sptests/sp02/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c preempt.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp02/system.h b/c/src/tests/sptests/sp02/system.h index b383c058e3..0303a97812 100644 --- a/c/src/tests/sptests/sp02/system.h +++ b/c/src/tests/sptests/sp02/system.h @@ -39,12 +39,11 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp03/Makefile.am b/c/src/tests/sptests/sp03/Makefile.am index 8224948a64..4b3096643c 100644 --- a/c/src/tests/sptests/sp03/Makefile.am +++ b/c/src/tests/sptests/sp03/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp03/system.h b/c/src/tests/sptests/sp03/system.h index 72d992def9..79bd7232cc 100644 --- a/c/src/tests/sptests/sp03/system.h +++ b/c/src/tests/sptests/sp03/system.h @@ -31,14 +31,14 @@ rtems_task Task_2( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 3 + #include <confdefs.h> diff --git a/c/src/tests/sptests/sp04/Makefile.am b/c/src/tests/sptests/sp04/Makefile.am index 925439b0e3..07a6f11e46 100644 --- a/c/src/tests/sptests/sp04/Makefile.am +++ b/c/src/tests/sptests/sp04/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c tswitch.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp04/system.h b/c/src/tests/sptests/sp04/system.h index f7f2832f54..cf5d6216f2 100644 --- a/c/src/tests/sptests/sp04/system.h +++ b/c/src/tests/sptests/sp04/system.h @@ -40,10 +40,8 @@ void Task_switch( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 100 @@ -51,6 +49,7 @@ void Task_switch( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> @@ -68,12 +67,15 @@ TEST_EXTERN volatile rtems_unsigned32 Run_count[ 4 ]; /* * Keep track of task switches */ + struct taskSwitchLog { int taskIndex; rtems_time_of_day when; }; + extern struct taskSwitchLog taskSwitchLog[]; extern int taskSwitchLogIndex; volatile extern int testsFinished; + /* end of include file */ diff --git a/c/src/tests/sptests/sp04/tswitch.c b/c/src/tests/sptests/sp04/tswitch.c index 975ca710c3..a573adbb1e 100644 --- a/c/src/tests/sptests/sp04/tswitch.c +++ b/c/src/tests/sptests/sp04/tswitch.c @@ -24,7 +24,7 @@ struct taskSwitchLog taskSwitchLog[1000]; int taskSwitchLogIndex; -volatile int testsFinished;; +volatile int testsFinished; rtems_extension Task_switch( rtems_tcb *unused, diff --git a/c/src/tests/sptests/sp05/Makefile.am b/c/src/tests/sptests/sp05/Makefile.am index 8e1d268e43..e64f03ad97 100644 --- a/c/src/tests/sptests/sp05/Makefile.am +++ b/c/src/tests/sptests/sp05/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp05/system.h b/c/src/tests/sptests/sp05/system.h index ec5c85e9a0..5b1cca7d5c 100644 --- a/c/src/tests/sptests/sp05/system.h +++ b/c/src/tests/sptests/sp05/system.h @@ -35,14 +35,13 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_TICKS_PER_TIMESLICE 100 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp06/Makefile.am b/c/src/tests/sptests/sp06/Makefile.am index 92d63010ba..2b6e8e7acb 100644 --- a/c/src/tests/sptests/sp06/Makefile.am +++ b/c/src/tests/sptests/sp06/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp06/system.h b/c/src/tests/sptests/sp06/system.h index f7687256bc..a397754d5f 100644 --- a/c/src/tests/sptests/sp06/system.h +++ b/c/src/tests/sptests/sp06/system.h @@ -35,14 +35,13 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_TICKS_PER_TIMESLICE 100 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp07/Makefile.am b/c/src/tests/sptests/sp07/Makefile.am index e61682c6b3..0b32e89e7f 100644 --- a/c/src/tests/sptests/sp07/Makefile.am +++ b/c/src/tests/sptests/sp07/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -13,7 +13,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c taskexit.c tcreate.c \ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp07/system.h b/c/src/tests/sptests/sp07/system.h index f9f8ddcdf4..d739d70cef 100644 --- a/c/src/tests/sptests/sp07/system.h +++ b/c/src/tests/sptests/sp07/system.h @@ -63,10 +63,8 @@ rtems_extension Task_exit_extension( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 100 @@ -74,6 +72,7 @@ rtems_extension Task_exit_extension( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 5 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp08/Makefile.am b/c/src/tests/sptests/sp08/Makefile.am index f729b3ae59..b1970b863c 100644 --- a/c/src/tests/sptests/sp08/Makefile.am +++ b/c/src/tests/sptests/sp08/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp08/system.h b/c/src/tests/sptests/sp08/system.h index fcc21d7b2a..5bb3407dac 100644 --- a/c/src/tests/sptests/sp08/system.h +++ b/c/src/tests/sptests/sp08/system.h @@ -30,16 +30,15 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_TICKS_PER_TIMESLICE 100 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 2 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp09/Makefile.am b/c/src/tests/sptests/sp09/Makefile.am index 095c8876f0..f61470e2e6 100644 --- a/c/src/tests/sptests/sp09/Makefile.am +++ b/c/src/tests/sptests/sp09/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -16,7 +16,7 @@ C_FILES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp09/screen07.c b/c/src/tests/sptests/sp09/screen07.c index 26dab852d5..737ba70a1f 100644 --- a/c/src/tests/sptests/sp09/screen07.c +++ b/c/src/tests/sptests/sp09/screen07.c @@ -18,6 +18,8 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + void Screen7() { long buffer[ 4 ]; @@ -25,7 +27,7 @@ void Screen7() rtems_unsigned32 count; rtems_status_code status; - status = rtems_message_queue_broadcast( 100, (long (*)[4]) buffer, 16, &count ); + status = rtems_message_queue_broadcast( 100, buffer, MESSAGE_SIZE, &count ); fatal_directive_status( status, RTEMS_INVALID_ID, @@ -36,7 +38,7 @@ void Screen7() status = rtems_message_queue_create( 0, 3, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Junk_id ); @@ -56,7 +58,7 @@ void Screen7() status = rtems_message_queue_create( Queue_name[ 1 ], 1, - 16, + MESSAGE_SIZE, RTEMS_GLOBAL, &Junk_id ); @@ -71,7 +73,7 @@ void Screen7() status = rtems_message_queue_create( Queue_name[ 1 ], 2, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -83,7 +85,7 @@ void Screen7() status = rtems_message_queue_create( Queue_name[ 2 ], 1, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Junk_id ); @@ -180,7 +182,7 @@ void Screen7() "TA1 - rtems_message_queue_receive - Q 1 - woke up with RTEMS_TIMEOUT" ); - status = rtems_message_queue_send( 100, (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( 100, buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_INVALID_ID, @@ -188,15 +190,15 @@ void Screen7() ); puts( "TA1 - rtems_message_queue_send - RTEMS_INVALID_ID" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_TOO_MANY, diff --git a/c/src/tests/sptests/sp09/screen08.c b/c/src/tests/sptests/sp09/screen08.c index dd0a9afba4..76af9e8bb9 100644 --- a/c/src/tests/sptests/sp09/screen08.c +++ b/c/src/tests/sptests/sp09/screen08.c @@ -18,6 +18,8 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + void Screen8() { long buffer[ 4 ]; @@ -30,7 +32,7 @@ void Screen8() status = rtems_message_queue_create( Queue_name[ 1 ], 2, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -39,15 +41,15 @@ void Screen8() "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_TOO_MANY, @@ -62,7 +64,7 @@ void Screen8() status = rtems_message_queue_create( Queue_name[ 1 ], 3, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -71,19 +73,19 @@ void Screen8() "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_TOO_MANY, @@ -100,7 +102,7 @@ void Screen8() status = rtems_message_queue_create( Queue_name[ 1 ], 3, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); diff --git a/c/src/tests/sptests/sp09/system.h b/c/src/tests/sptests/sp09/system.h index c3a93d3b80..b9f10eb1d5 100644 --- a/c/src/tests/sptests/sp09/system.h +++ b/c/src/tests/sptests/sp09/system.h @@ -80,11 +80,10 @@ void Screen14( void ); /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 10 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_SEMAPHORES 2 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/sptests/sp11/Makefile.am b/c/src/tests/sptests/sp11/Makefile.am index a2641d0e0d..89222d514d 100644 --- a/c/src/tests/sptests/sp11/Makefile.am +++ b/c/src/tests/sptests/sp11/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c timer.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp11/system.h b/c/src/tests/sptests/sp11/system.h index 133f23ec5d..be3df1116a 100644 --- a/c/src/tests/sptests/sp11/system.h +++ b/c/src/tests/sptests/sp11/system.h @@ -66,11 +66,10 @@ rtems_timer_service_routine TA2_send_10_to_self( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_MAXIMUM_TIMERS 6 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp12/Makefile.am b/c/src/tests/sptests/sp12/Makefile.am index cd748472e5..8f45e4bedc 100644 --- a/c/src/tests/sptests/sp12/Makefile.am +++ b/c/src/tests/sptests/sp12/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c pritask.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp12/system.h b/c/src/tests/sptests/sp12/system.h index 9ab3cb985f..134bb17578 100644 --- a/c/src/tests/sptests/sp12/system.h +++ b/c/src/tests/sptests/sp12/system.h @@ -51,12 +51,11 @@ rtems_task Task5( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) +#define CONFIGURE_MAXIMUM_TASKS 8 #define CONFIGURE_MAXIMUM_SEMAPHORES 10 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp13/Makefile.am b/c/src/tests/sptests/sp13/Makefile.am index e5cd4b406b..d6c57a86ff 100644 --- a/c/src/tests/sptests/sp13/Makefile.am +++ b/c/src/tests/sptests/sp13/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp13/fillbuff.c b/c/src/tests/sptests/sp13/fillbuff.c index 728606e5bb..6930913d3d 100644 --- a/c/src/tests/sptests/sp13/fillbuff.c +++ b/c/src/tests/sptests/sp13/fillbuff.c @@ -21,10 +21,26 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + void Fill_buffer( char *source, long *buffer ) { + char *p; + int i; +/* memcpy( buffer, source, 16 ); +*/ + p = source; + for ( i=0 ; i<MESSAGE_SIZE ; i++ ) { + buffer[i] = *p++; + buffer[i] <<= 8; + buffer[i] |= *p++; + buffer[i] <<= 8; + buffer[i] |= *p++; + buffer[i] <<= 8; + buffer[i] |= *p++; + } } diff --git a/c/src/tests/sptests/sp13/init.c b/c/src/tests/sptests/sp13/init.c index 2614d2a5d4..5d89586c86 100644 --- a/c/src/tests/sptests/sp13/init.c +++ b/c/src/tests/sptests/sp13/init.c @@ -24,6 +24,8 @@ #define TEST_INIT #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task Init( rtems_task_argument argument ) @@ -82,7 +84,7 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 1 ], 100, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -91,7 +93,7 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 2 ], 10, - 16, + MESSAGE_SIZE, RTEMS_PRIORITY, &Queue_id[ 2 ] ); @@ -100,7 +102,7 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 3 ], 100, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 3 ] ); diff --git a/c/src/tests/sptests/sp13/putbuff.c b/c/src/tests/sptests/sp13/putbuff.c index 26bf149049..70b23ff72f 100644 --- a/c/src/tests/sptests/sp13/putbuff.c +++ b/c/src/tests/sptests/sp13/putbuff.c @@ -20,9 +20,21 @@ #include "system.h" +#define MESSAGE_SIZE (4) + void Put_buffer( long *buffer ) { + int i; +/* printf( "%16s", (char *)buffer ); +*/ + for ( i=0 ; i< MESSAGE_SIZE ; i++ ) { + printf( "%c%c%c%c", (char) (buffer[i] >> 24), + (char) (buffer[i] >> 16 & 0xff), + (char) (buffer[i] >> 8 & 0xff), + (char) (buffer[i] >> 0 & 0xff) ); + } + } diff --git a/c/src/tests/sptests/sp13/system.h b/c/src/tests/sptests/sp13/system.h index 49b6d6feaf..fea6a652a6 100644 --- a/c/src/tests/sptests/sp13/system.h +++ b/c/src/tests/sptests/sp13/system.h @@ -44,11 +44,10 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 10 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp13/task1.c b/c/src/tests/sptests/sp13/task1.c index 859c3d46ab..015259b0f0 100644 --- a/c/src/tests/sptests/sp13/task1.c +++ b/c/src/tests/sptests/sp13/task1.c @@ -25,6 +25,8 @@ char big_receive_buffer[2048]; long buffer[ 4 ]; +#define MESSAGE_SIZE (sizeof(long) * 4) + void dope_buffer(unsigned char *buff, int buff_size, unsigned32 v) @@ -64,12 +66,12 @@ rtems_task Task_1( Fill_buffer( "BUFFER 1 TO Q 1", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1" ); - status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 2 TO Q 1", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1" ); - status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" ); @@ -78,7 +80,7 @@ rtems_task Task_1( Fill_buffer( "BUFFER 3 TO Q 1", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1" ); - status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" ); @@ -89,7 +91,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 1 TO Q 2", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 2" ); - status = rtems_message_queue_send( Queue_id[ 2 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts_nocr( "TA1 - rtems_message_queue_receive - receive from queue 1 - " ); @@ -112,7 +114,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 1 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" ); @@ -123,22 +125,22 @@ rtems_test_pause(); Fill_buffer( "BUFFER 2 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 3 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 4 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 4 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 5 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_urgent - BUFFER 5 TO Q 3" ); - status = rtems_message_queue_urgent( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_urgent( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_urgent" ); for ( index = 1 ; index <= 4 ; index++ ) { @@ -161,7 +163,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 3 TO Q 2", buffer ); puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" ); - status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 ); + status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_urgent" ); puts( @@ -188,7 +190,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 3 TO Q 2", buffer ); puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" ); - status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 ); + status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_urgent" ); puts( "TA1 - rtems_message_queue_delete - delete queue 2" ); @@ -205,12 +207,12 @@ rtems_test_pause(); Fill_buffer( "BUFFER 1 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 2 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); /* this broadcast should have no effect on the queue */ @@ -231,7 +233,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 3 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_message_queue_flush - Q 3" ); @@ -240,7 +242,7 @@ rtems_test_pause(); puts( "TA1 - rtems_message_queue_send until all message buffers consumed" ); while ( FOREVER ) { - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); if ( status == RTEMS_TOO_MANY ) break; directive_failed( status, "rtems_message_queue_send loop" ); } diff --git a/c/src/tests/sptests/sp13/task2.c b/c/src/tests/sptests/sp13/task2.c index c3e117fae3..258a036f8c 100644 --- a/c/src/tests/sptests/sp13/task2.c +++ b/c/src/tests/sptests/sp13/task2.c @@ -20,6 +20,8 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task Task_2( rtems_task_argument argument ) @@ -34,7 +36,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT @@ -50,7 +52,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT @@ -66,7 +68,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT @@ -86,7 +88,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 2 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT @@ -100,7 +102,7 @@ rtems_task Task_2( puts( "TA2 - rtems_message_queue_send - BUFFER 2 TO Q 2" ); directive_failed( status, "rtems_message_queue_send" ); - status = rtems_message_queue_send( Queue_id[ 2 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( @@ -109,7 +111,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, 10 * TICKS_PER_SECOND @@ -125,7 +127,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 3 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT diff --git a/c/src/tests/sptests/sp14/Makefile.am b/c/src/tests/sptests/sp14/Makefile.am index 223bb0e03e..1687f9c0bf 100644 --- a/c/src/tests/sptests/sp14/Makefile.am +++ b/c/src/tests/sptests/sp14/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c asr.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp14/system.h b/c/src/tests/sptests/sp14/system.h index 48de462729..2483902dcb 100644 --- a/c/src/tests/sptests/sp14/system.h +++ b/c/src/tests/sptests/sp14/system.h @@ -40,11 +40,10 @@ rtems_task Task_2( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp15/Makefile.am b/c/src/tests/sptests/sp15/Makefile.am index 453aad182f..aeebd7e9b8 100644 --- a/c/src/tests/sptests/sp15/Makefile.am +++ b/c/src/tests/sptests/sp15/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp15/system.h b/c/src/tests/sptests/sp15/system.h index f69ce5eb4c..be434159c3 100644 --- a/c/src/tests/sptests/sp15/system.h +++ b/c/src/tests/sptests/sp15/system.h @@ -27,11 +27,10 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_PARTITIONS 2 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp16/Makefile.am b/c/src/tests/sptests/sp16/Makefile.am index 87f9279f15..a5299f2ed0 100644 --- a/c/src/tests/sptests/sp16/Makefile.am +++ b/c/src/tests/sptests/sp16/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c task5.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp16/system.h b/c/src/tests/sptests/sp16/system.h index d3a3922382..fc218652b2 100644 --- a/c/src/tests/sptests/sp16/system.h +++ b/c/src/tests/sptests/sp16/system.h @@ -43,11 +43,10 @@ rtems_task Task5( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_REGIONS 4 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp17/Makefile.am b/c/src/tests/sptests/sp17/Makefile.am index d9697ea5a6..9ede8951fd 100644 --- a/c/src/tests/sptests/sp17/Makefile.am +++ b/c/src/tests/sptests/sp17/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c asr.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp17/system.h b/c/src/tests/sptests/sp17/system.h index e5f88b9fe2..b86cc5ff09 100644 --- a/c/src/tests/sptests/sp17/system.h +++ b/c/src/tests/sptests/sp17/system.h @@ -35,11 +35,10 @@ rtems_task Task_2( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(25) #define CONFIGURE_TICKS_PER_TIMESLICE 1000 diff --git a/c/src/tests/sptests/sp19/Makefile.am b/c/src/tests/sptests/sp19/Makefile.am index 45c43db672..0b7e960f03 100644 --- a/c/src/tests/sptests/sp19/Makefile.am +++ b/c/src/tests/sptests/sp19/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c first.c fptask.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h fptest.h inttest.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp19/system.h b/c/src/tests/sptests/sp19/system.h index 026d0a2c9b..bfece91ec1 100644 --- a/c/src/tests/sptests/sp19/system.h +++ b/c/src/tests/sptests/sp19/system.h @@ -35,12 +35,12 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 7 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp20/Makefile.am b/c/src/tests/sptests/sp20/Makefile.am index 74db12b302..9e15764811 100644 --- a/c/src/tests/sptests/sp20/Makefile.am +++ b/c/src/tests/sptests/sp20/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c getall.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp20/system.h b/c/src/tests/sptests/sp20/system.h index 03b6084606..868fd60ae5 100644 --- a/c/src/tests/sptests/sp20/system.h +++ b/c/src/tests/sptests/sp20/system.h @@ -35,15 +35,14 @@ void Get_all_counters( void ); /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 6 +#define CONFIGURE_MAXIMUM_PERIODS 10 #define CONFIGURE_INIT_TASK_PRIORITY 10 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES -#define CONFIGURE_MAXIMUM_PERIODS 10 - #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (15 * RTEMS_MINIMUM_STACK_SIZE) diff --git a/c/src/tests/sptests/sp21/Makefile.am b/c/src/tests/sptests/sp21/Makefile.am index 6d7cfa66c0..6862e94301 100644 --- a/c/src/tests/sptests/sp21/Makefile.am +++ b/c/src/tests/sptests/sp21/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp21/system.h b/c/src/tests/sptests/sp21/system.h index fe38835aa0..483dbcd2dc 100644 --- a/c/src/tests/sptests/sp21/system.h +++ b/c/src/tests/sptests/sp21/system.h @@ -27,11 +27,11 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_STUB_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp22/Makefile.am b/c/src/tests/sptests/sp22/Makefile.am index af0558eb24..986700ac57 100644 --- a/c/src/tests/sptests/sp22/Makefile.am +++ b/c/src/tests/sptests/sp22/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c prtime.c delay.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp22/system.h b/c/src/tests/sptests/sp22/system.h index 102be71e0c..4782a88979 100644 --- a/c/src/tests/sptests/sp22/system.h +++ b/c/src/tests/sptests/sp22/system.h @@ -34,11 +34,10 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 2 #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) diff --git a/c/src/tests/sptests/sp23/Makefile.am b/c/src/tests/sptests/sp23/Makefile.am index 58d175b655..4f05ae56b0 100644 --- a/c/src/tests/sptests/sp23/Makefile.am +++ b/c/src/tests/sptests/sp23/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp23/system.h b/c/src/tests/sptests/sp23/system.h index 24679a900a..3098ddb0be 100644 --- a/c/src/tests/sptests/sp23/system.h +++ b/c/src/tests/sptests/sp23/system.h @@ -27,12 +27,11 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_MAXIMUM_PORTS 1 +#define CONFIGURE_MAXIMUM_TASKS 2 +#define CONFIGURE_MAXIMUM_PORTS 1 #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp24/Makefile.am b/c/src/tests/sptests/sp24/Makefile.am index a0b836b0f4..db1582b474 100644 --- a/c/src/tests/sptests/sp24/Makefile.am +++ b/c/src/tests/sptests/sp24/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c resume.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp24/system.h b/c/src/tests/sptests/sp24/system.h index e048dc5722..1cb57dcf40 100644 --- a/c/src/tests/sptests/sp24/system.h +++ b/c/src/tests/sptests/sp24/system.h @@ -32,11 +32,10 @@ rtems_task Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_TIMERS 3 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp25/Makefile.am b/c/src/tests/sptests/sp25/Makefile.am index a785691f09..8b445734d6 100644 --- a/c/src/tests/sptests/sp25/Makefile.am +++ b/c/src/tests/sptests/sp25/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp25/sp25.scn b/c/src/tests/sptests/sp25/sp25.scn index 090bc35856..d15cc46897 100644 --- a/c/src/tests/sptests/sp25/sp25.scn +++ b/c/src/tests/sptests/sp25/sp25.scn @@ -1,29 +1,32 @@ +NOTE: Addresses vary between BSPs. Please check that the addresses + printed are reasonable for your target board and that the + segments noted as being returned were allocated from the region. *** TEST 25 *** TA1 - rtems_region_ident - 0x24010002 TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f9b8 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f930 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 256 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f828 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 512 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f620 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 1024 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f218 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 2048 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000ea10 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 4096 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000da08 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 8192 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000ba00 +TA1 - got segment from region 1 - 0xXXXXXXXX <pause> -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f828 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f620 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f9b8 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f930 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000da08 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000ea10 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000ba00 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f218 +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX TA1 - rtems_region_delete - walks heap if debug enabled *** END OF TEST 25 *** diff --git a/c/src/tests/sptests/sp25/system.h b/c/src/tests/sptests/sp25/system.h index 05b90c4164..d2dfd939a7 100644 --- a/c/src/tests/sptests/sp25/system.h +++ b/c/src/tests/sptests/sp25/system.h @@ -27,11 +27,10 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_REGIONS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp26/Makefile.am b/c/src/tests/sptests/sp26/Makefile.am index 754b94cef0..9903c69425 100644 --- a/c/src/tests/sptests/sp26/Makefile.am +++ b/c/src/tests/sptests/sp26/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp26/system.h b/c/src/tests/sptests/sp26/system.h index 5f13e865b3..dcd0904759 100644 --- a/c/src/tests/sptests/sp26/system.h +++ b/c/src/tests/sptests/sp26/system.h @@ -25,11 +25,10 @@ void task1(void); /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 5 #define CONFIGURE_MAXIMUM_REGIONS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE @@ -40,15 +39,7 @@ void task1(void); TEST_EXTERN rtems_id Task_id[ 6 ]; /* array of task ids */ TEST_EXTERN rtems_name Task_name[ 6 ]; /* array of task names */ -TEST_EXTERN rtems_id Region_id[ 2 ]; /* array of region ids */ -TEST_EXTERN rtems_name Region_name[ 2 ]; /* array of region names */ - -TEST_EXTERN rtems_unsigned8 Area_1[64000] CPU_STRUCTURE_ALIGNMENT; #define BASE_PRIORITY 140 -#define Put_address_from_area_1( _to_be_printed ) \ - printf( "0x%08lx", \ - (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) ) - /* end of include file */ diff --git a/c/src/tests/sptests/sp27/Makefile.am b/c/src/tests/sptests/sp27/Makefile.am index 1cb20586dd..11e5b2b073 100644 --- a/c/src/tests/sptests/sp27/Makefile.am +++ b/c/src/tests/sptests/sp27/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp27/init.c b/c/src/tests/sptests/sp27/init.c index 4ae5befb78..d3353e6de3 100644 --- a/c/src/tests/sptests/sp27/init.c +++ b/c/src/tests/sptests/sp27/init.c @@ -10,8 +10,10 @@ rtems_task Init (rtems_task_argument argument); #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 6 #define CONFIGURE_MICROSECONDS_PER_TICK 52429 @@ -52,7 +54,7 @@ starttask (int arg) rtems_task_set_priority (RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &priority); sc = rtems_task_create (rtems_build_name ('S', 'R', 'V', arg + 'A'), priority, - 10000, + RTEMS_MINIMUM_STACK_SIZE, RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0), RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL, &tid); diff --git a/c/src/tests/sptests/sp28/Makefile.am b/c/src/tests/sptests/sp28/Makefile.am index 5f966b4eb2..af4a0834d5 100644 --- a/c/src/tests/sptests/sp28/Makefile.am +++ b/c/src/tests/sptests/sp28/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp28/init.c b/c/src/tests/sptests/sp28/init.c index f6f7d70218..e2c5a40027 100644 --- a/c/src/tests/sptests/sp28/init.c +++ b/c/src/tests/sptests/sp28/init.c @@ -7,10 +7,11 @@ rtems_task Init(rtems_task_argument argument); -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 2 +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_MICROSECONDS_PER_TICK 52429 @@ -23,6 +24,8 @@ rtems_task Init(rtems_task_argument argument); #include <stdio.h> volatile void *taskvar; +volatile int nRunning; +volatile int nDeleted; rtems_task subtask (rtems_task_argument arg) @@ -31,7 +34,10 @@ subtask (rtems_task_argument arg) int i; rtems_status_code sc; - sc = rtems_task_variable_add (RTEMS_SELF, &taskvar, NULL); + nRunning++; + while (nRunning != 3) + rtems_task_wake_after (0); + sc = rtems_task_variable_add (RTEMS_SELF, (void **)&taskvar, NULL); if (sc != RTEMS_SUCCESSFUL) { printf ("Can't add task variable: %s\n", rtems_status_text (sc)); rtems_task_suspend (RTEMS_SELF); @@ -47,23 +53,37 @@ subtask (rtems_task_argument arg) rtems_task_suspend (RTEMS_SELF); } } - sc = rtems_task_variable_delete (RTEMS_SELF, &taskvar); + sc = rtems_task_variable_delete (RTEMS_SELF, (void **)&taskvar); + nDeleted++; if (sc != RTEMS_SUCCESSFUL) { printf ("Can't delete task variable: %s\n", rtems_status_text (sc)); + nRunning--; + rtems_task_suspend (RTEMS_SELF); + } + if ((int)taskvar == localvar) { + printf ("Task:%d deleted taskvar:%d localvar:%d\n", arg, (int)taskvar, localvar); + nRunning--; rtems_task_suspend (RTEMS_SELF); } - for (i = 0 ; ; i++) { + while (nDeleted != 3) + rtems_task_wake_after (0); + for (i = 0 ; i < 1000 ; i++) { taskvar = (void *)(localvar = 100 * arg); rtems_task_wake_after (0); + if (nRunning <= 1) + break; if ((int)taskvar == localvar) { printf ("Task:%d taskvar:%d localvar:%d\n", arg, (int)taskvar, localvar); + nRunning--; rtems_task_suspend (RTEMS_SELF); } - if ((arg == 3) && (i == 100)) { - printf ("Task variables test succeeded.\n"); - exit (0); - } } + nRunning--; + while (nRunning) + rtems_task_wake_after (0); + printf ("Task variables test complete.\n"); + puts ("*** END OF TEST SP28 ***" ); + exit (0); } void @@ -74,7 +94,7 @@ starttask (int arg) sc = rtems_task_create (rtems_build_name ('S', 'R', 'V', arg + 'A'), 100, - 10000, + RTEMS_MINIMUM_STACK_SIZE, RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0), RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL, &tid); @@ -92,6 +112,10 @@ starttask (int arg) rtems_task Init (rtems_task_argument ignored) { + + puts ("*** START OF TEST SP28 ***" ); + puts ("Task variables test begins. Any output between\n"); + puts ("this line and the `Task variables test complete' line indicates an error.\n"); starttask (1); starttask (2); starttask (3); diff --git a/c/src/tests/sptests/sp29/Makefile.am b/c/src/tests/sptests/sp29/Makefile.am index e34dfda22c..653acadd97 100644 --- a/c/src/tests/sptests/sp29/Makefile.am +++ b/c/src/tests/sptests/sp29/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp29/init.c b/c/src/tests/sptests/sp29/init.c index bf866bd32e..96daee4c3f 100644 --- a/c/src/tests/sptests/sp29/init.c +++ b/c/src/tests/sptests/sp29/init.c @@ -10,8 +10,10 @@ rtems_task Init (rtems_task_argument argument); #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 +#define CONFIGURE_MAXIMUM_SEMAPHORES 2 #define CONFIGURE_INIT diff --git a/c/src/tests/sptests/spfatal/Makefile.am b/c/src/tests/sptests/spfatal/Makefile.am index 7e2daafc95..ba6e2b4f89 100644 --- a/c/src/tests/sptests/spfatal/Makefile.am +++ b/c/src/tests/sptests/spfatal/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c puterr.c fatal.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/spfatal/system.h b/c/src/tests/sptests/spfatal/system.h index 091a07476d..da32fac308 100644 --- a/c/src/tests/sptests/spfatal/system.h +++ b/c/src/tests/sptests/spfatal/system.h @@ -52,10 +52,8 @@ extern rtems_extensions_table initial_extensions; Fatal_extension /* fatal */ \ } -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(0) #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/c/src/tests/sptests/spsize/Makefile.am b/c/src/tests/sptests/spsize/Makefile.am index 4e7d4aca2d..420132cf74 100644 --- a/c/src/tests/sptests/spsize/Makefile.am +++ b/c/src/tests/sptests/spsize/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c getint.c size.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/spsize/system.h b/c/src/tests/sptests/spsize/system.h index 4a432760b0..b29a466c98 100644 --- a/c/src/tests/sptests/spsize/system.h +++ b/c/src/tests/sptests/spsize/system.h @@ -29,11 +29,10 @@ int getint( void ); /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #include <confdefs.h> |