From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/tests/itrontests/itronhello/Makefile.am      | 9 ++++-----
 c/src/tests/itrontests/itronhello/system.h         | 4 +++-
 c/src/tests/itrontests/itronmbf01/Makefile.am      | 9 ++++-----
 c/src/tests/itrontests/itronmbf01/system.h         | 8 +++++---
 c/src/tests/itrontests/itronmbox01/Makefile.am     | 9 ++++-----
 c/src/tests/itrontests/itronmbox01/itronmbox01.scn | 3 +++
 c/src/tests/itrontests/itronmbox01/system.h        | 4 +++-
 c/src/tests/itrontests/itronsem01/Makefile.am      | 9 ++++-----
 c/src/tests/itrontests/itronsem01/init.c           | 1 +
 c/src/tests/itrontests/itronsem01/system.h         | 8 +++++---
 c/src/tests/itrontests/itrontask01/Makefile.am     | 9 ++++-----
 c/src/tests/itrontests/itrontask01/system.h        | 6 ++++--
 c/src/tests/itrontests/itrontask02/Makefile.am     | 9 ++++-----
 c/src/tests/itrontests/itrontask02/system.h        | 5 ++++-
 c/src/tests/itrontests/itrontask03/Makefile.am     | 9 ++++-----
 c/src/tests/itrontests/itrontask03/system.h        | 7 +++++--
 c/src/tests/itrontests/itrontask04/Makefile.am     | 9 ++++-----
 c/src/tests/itrontests/itrontask04/system.h        | 7 +++++--
 c/src/tests/itrontests/itrontime01/Makefile.am     | 9 ++++-----
 c/src/tests/itrontests/itrontime01/itrontime01.scn | 4 ++++
 c/src/tests/itrontests/itrontime01/system.h        | 4 +++-
 21 files changed, 81 insertions(+), 61 deletions(-)

(limited to 'c/src/tests/itrontests')

diff --git a/c/src/tests/itrontests/itronhello/Makefile.am b/c/src/tests/itrontests/itronhello/Makefile.am
index 194ea819d2..5a2102990d 100644
--- a/c/src/tests/itrontests/itronhello/Makefile.am
+++ b/c/src/tests/itrontests/itronhello/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itronhello
 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/c/src/tests/itrontests/itronhello/system.h b/c/src/tests/itrontests/itronhello/system.h
index ed516a778b..f74b1d985a 100644
--- a/c/src/tests/itrontests/itronhello/system.h
+++ b/c/src/tests/itrontests/itronhello/system.h
@@ -22,7 +22,9 @@ void ITRON_Init( void );
 
 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_ITRON_TASKS      1
 
 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 
diff --git a/c/src/tests/itrontests/itronmbf01/Makefile.am b/c/src/tests/itrontests/itronmbf01/Makefile.am
index 79d9eeafd9..d21723eda3 100644
--- a/c/src/tests/itrontests/itronmbf01/Makefile.am
+++ b/c/src/tests/itrontests/itronmbf01/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itronmbf01
 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/c/src/tests/itrontests/itronmbf01/system.h b/c/src/tests/itrontests/itronmbf01/system.h
index 391829bb03..0aa53f784a 100644
--- a/c/src/tests/itrontests/itronmbf01/system.h
+++ b/c/src/tests/itrontests/itronmbf01/system.h
@@ -22,11 +22,13 @@ void ITRON_Init( void );
 
 /* configuration information */
 
-#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_ITRON_INIT_TASK_TABLE
+#define CONFIGURE_MAXIMUM_ITRON_TASKS             1
 #define CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS   10
+
+#define CONFIGURE_ITRON_INIT_TASK_TABLE
 #define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE (4 * RTEMS_MINIMUM_STACK_SIZE)
 
 #include <confdefs.h>
diff --git a/c/src/tests/itrontests/itronmbox01/Makefile.am b/c/src/tests/itrontests/itronmbox01/Makefile.am
index 434dbfc5d5..5d4ce5e507 100644
--- a/c/src/tests/itrontests/itronmbox01/Makefile.am
+++ b/c/src/tests/itrontests/itronmbox01/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itronmbox01
 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/c/src/tests/itrontests/itronmbox01/itronmbox01.scn b/c/src/tests/itrontests/itronmbox01/itronmbox01.scn
index e69de29bb2..89329090ba 100644
--- a/c/src/tests/itrontests/itronmbox01/itronmbox01.scn
+++ b/c/src/tests/itrontests/itronmbox01/itronmbox01.scn
@@ -0,0 +1,3 @@
+*** ITRON MBOX TEST 01 ***
+ITRON Mailboxes are implemented but there is currently no test.
+*** END OF ITRON MBOX TEST 01 ***
diff --git a/c/src/tests/itrontests/itronmbox01/system.h b/c/src/tests/itrontests/itronmbox01/system.h
index d400584887..3482ffa2a1 100644
--- a/c/src/tests/itrontests/itronmbox01/system.h
+++ b/c/src/tests/itrontests/itronmbox01/system.h
@@ -22,7 +22,9 @@ void ITRON_Init( void );
 
 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_ITRON_TASKS      1
 
 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 
diff --git a/c/src/tests/itrontests/itronsem01/Makefile.am b/c/src/tests/itrontests/itronsem01/Makefile.am
index 0935883bb4..bfd003896f 100644
--- a/c/src/tests/itrontests/itronsem01/Makefile.am
+++ b/c/src/tests/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/c/src/tests/itrontests/itronsem01/init.c b/c/src/tests/itrontests/itronsem01/init.c
index e90d9d8537..44aaff3912 100644
--- a/c/src/tests/itrontests/itronsem01/init.c
+++ b/c/src/tests/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/c/src/tests/itrontests/itronsem01/system.h b/c/src/tests/itrontests/itronsem01/system.h
index 6989ad101b..ad7fe1fb12 100644
--- a/c/src/tests/itrontests/itronsem01/system.h
+++ b/c/src/tests/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 <confdefs.h>
 
 /* global variables */
diff --git a/c/src/tests/itrontests/itrontask01/Makefile.am b/c/src/tests/itrontests/itrontask01/Makefile.am
index e3d6d007f4..8cb34e5789 100644
--- a/c/src/tests/itrontests/itrontask01/Makefile.am
+++ b/c/src/tests/itrontests/itrontask01/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itrontask01
 PGM = ${ARCH}/$(TEST).exe
 
@@ -12,7 +13,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 = 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/c/src/tests/itrontests/itrontask01/system.h b/c/src/tests/itrontests/itrontask01/system.h
index 9974522892..fdd13f271a 100644
--- a/c/src/tests/itrontests/itrontask01/system.h
+++ b/c/src/tests/itrontests/itrontask01/system.h
@@ -23,8 +23,10 @@ void Task_2_through_4();
 
 /* configuration information */
 
-#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_ITRON_TASKS      4
 
 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 
diff --git a/c/src/tests/itrontests/itrontask02/Makefile.am b/c/src/tests/itrontests/itrontask02/Makefile.am
index c9a13f63d4..89035793fe 100644
--- a/c/src/tests/itrontests/itrontask02/Makefile.am
+++ b/c/src/tests/itrontests/itrontask02/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itrontask02
 PGM = ${ARCH}/$(TEST).exe
 
@@ -12,7 +13,7 @@ C_FILES = init.c dormant.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/c/src/tests/itrontests/itrontask02/system.h b/c/src/tests/itrontests/itrontask02/system.h
index df868d6c48..31498a5d3a 100644
--- a/c/src/tests/itrontests/itrontask02/system.h
+++ b/c/src/tests/itrontests/itrontask02/system.h
@@ -24,7 +24,10 @@ void Non_Dormant_task();
 
 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_ITRON_TASKS      5
+
 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 
 #include <confdefs.h>
diff --git a/c/src/tests/itrontests/itrontask03/Makefile.am b/c/src/tests/itrontests/itrontask03/Makefile.am
index 3d1751e714..779e2f0952 100644
--- a/c/src/tests/itrontests/itrontask03/Makefile.am
+++ b/c/src/tests/itrontests/itrontask03/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itrontask03
 PGM = ${ARCH}/$(TEST).exe
 
@@ -12,7 +13,7 @@ C_FILES = init.c preempt.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 = 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/c/src/tests/itrontests/itrontask03/system.h b/c/src/tests/itrontests/itrontask03/system.h
index 3f7a585bb2..762fc95d8c 100644
--- a/c/src/tests/itrontests/itrontask03/system.h
+++ b/c/src/tests/itrontests/itrontask03/system.h
@@ -26,8 +26,11 @@ void Task_3();
 
 /* configuration information */
 
-#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_ITRON_TASKS      6
+
 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 
 #include <confdefs.h>
diff --git a/c/src/tests/itrontests/itrontask04/Makefile.am b/c/src/tests/itrontests/itrontask04/Makefile.am
index f4713a718d..063062ebf3 100644
--- a/c/src/tests/itrontests/itrontask04/Makefile.am
+++ b/c/src/tests/itrontests/itrontask04/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itrontask04
 PGM = ${ARCH}/$(TEST).exe
 
@@ -12,7 +13,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 = 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/c/src/tests/itrontests/itrontask04/system.h b/c/src/tests/itrontests/itrontask04/system.h
index f9cc60958f..d0715d08e2 100644
--- a/c/src/tests/itrontests/itrontask04/system.h
+++ b/c/src/tests/itrontests/itrontask04/system.h
@@ -26,8 +26,11 @@ void Task_3();
 
 /* configuration information */
 
-#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_ITRON_TASKS      5
+
 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 
 #include <confdefs.h>
diff --git a/c/src/tests/itrontests/itrontime01/Makefile.am b/c/src/tests/itrontests/itrontime01/Makefile.am
index 03d4ea878c..19c9538920 100644
--- a/c/src/tests/itrontests/itrontime01/Makefile.am
+++ b/c/src/tests/itrontests/itrontime01/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = itrontime01
 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/c/src/tests/itrontests/itrontime01/itrontime01.scn b/c/src/tests/itrontests/itrontime01/itrontime01.scn
index e69de29bb2..c76eb631fd 100644
--- a/c/src/tests/itrontests/itrontime01/itrontime01.scn
+++ b/c/src/tests/itrontests/itrontime01/itrontime01.scn
@@ -0,0 +1,4 @@
+*** ITRON TIME TEST 01 ***
+The Time Services are not completely implemented.
+*** END OF ITRON TIME TEST 01 ***
+
diff --git a/c/src/tests/itrontests/itrontime01/system.h b/c/src/tests/itrontests/itrontime01/system.h
index d400584887..3482ffa2a1 100644
--- a/c/src/tests/itrontests/itrontime01/system.h
+++ b/c/src/tests/itrontests/itrontime01/system.h
@@ -22,7 +22,9 @@ void ITRON_Init( void );
 
 /* configuration information */
 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_ITRON_TASKS      1
 
 #define CONFIGURE_ITRON_INIT_TASK_TABLE
 
-- 
cgit v1.2.3