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/tmtests/tm13/Makefile.am | 7 ++++--- testsuites/tmtests/tm13/system.h | 6 ++---- testsuites/tmtests/tm13/task1.c | 6 ++++-- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'testsuites/tmtests/tm13') diff --git a/testsuites/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am index caaf71f8b3..503f9af375 100644 --- a/testsuites/tmtests/tm13/Makefile.am +++ b/testsuites/tmtests/tm13/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm13 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/testsuites/tmtests/tm13/system.h b/testsuites/tmtests/tm13/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm13/system.h +++ b/testsuites/tmtests/tm13/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c index 317b1f1805..0b2afc8571 100644 --- a/testsuites/tmtests/tm13/task1.c +++ b/testsuites/tmtests/tm13/task1.c @@ -29,6 +29,8 @@ rtems_task High_task( rtems_task_argument argument ); +#define MESSAGE_SIZE (sizeof(long) * 4) + void Init( rtems_task_argument argument ) @@ -75,7 +77,7 @@ rtems_task test_init( status = rtems_message_queue_create( rtems_build_name( 'M', 'Q', '1', ' ' ), OPERATION_COUNT, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id ); @@ -104,7 +106,7 @@ rtems_task test_init( } Timer_initialize(); - (void) rtems_message_queue_urgent( Queue_id, (long (*)[4]) Buffer, 16 ); + (void) rtems_message_queue_urgent( Queue_id, Buffer, MESSAGE_SIZE ); } rtems_task Middle_tasks( -- cgit v1.2.3