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/itrontests/itronsem01/Makefile.am | 9 ++++----- testsuites/itrontests/itronsem01/init.c | 1 + testsuites/itrontests/itronsem01/system.h | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'testsuites/itrontests/itronsem01') diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am index 0935883bb4..bfd003896f 100644 --- a/testsuites/itrontests/itronsem01/Makefile.am +++ b/testsuites/itrontests/itronsem01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronsem01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/testsuites/itrontests/itronsem01/init.c b/testsuites/itrontests/itronsem01/init.c index e90d9d8537..44aaff3912 100644 --- a/testsuites/itrontests/itronsem01/init.c +++ b/testsuites/itrontests/itronsem01/init.c @@ -54,6 +54,7 @@ void ITRON_Init( void ) assert( status == E_PAR ); puts( "Init - cre_sem - isemcnt > maxsem returns E_PAR" ); + pk_csem.sematr = 0; pk_csem.isemcnt = 3; pk_csem.maxsem = 2; status = cre_sem( 1, &pk_csem ); diff --git a/testsuites/itrontests/itronsem01/system.h b/testsuites/itrontests/itronsem01/system.h index 6989ad101b..ad7fe1fb12 100644 --- a/testsuites/itrontests/itronsem01/system.h +++ b/testsuites/itrontests/itronsem01/system.h @@ -23,12 +23,14 @@ void ITRON_Init( void ); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_ITRON_INIT_TASK_TABLE +#define CONFIGURE_MAXIMUM_ITRON_TASKS 1 #define CONFIGURE_MAXIMUM_ITRON_SEMAPHORES 10 +#define CONFIGURE_ITRON_INIT_TASK_TABLE + #include /* global variables */ -- cgit v1.2.3