From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- testsuites/sptests/sp09/Makefile.am | 6 +++--- testsuites/sptests/sp09/screen07.c | 20 +++++++++++--------- testsuites/sptests/sp09/screen08.c | 22 ++++++++++++---------- testsuites/sptests/sp09/system.h | 7 +++---- 4 files changed, 29 insertions(+), 26 deletions(-) (limited to 'testsuites/sptests/sp09') diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am index 095c8876f0..f61470e2e6 100644 --- a/testsuites/sptests/sp09/Makefile.am +++ b/testsuites/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/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c index 26dab852d5..737ba70a1f 100644 --- a/testsuites/sptests/sp09/screen07.c +++ b/testsuites/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/testsuites/sptests/sp09/screen08.c b/testsuites/sptests/sp09/screen08.c index dd0a9afba4..76af9e8bb9 100644 --- a/testsuites/sptests/sp09/screen08.c +++ b/testsuites/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/testsuites/sptests/sp09/system.h b/testsuites/sptests/sp09/system.h index c3a93d3b80..b9f10eb1d5 100644 --- a/testsuites/sptests/sp09/system.h +++ b/testsuites/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 -- cgit v1.2.3