This commit was manufactured by cvs2svn to create tag 'rtems-4-8-1'.

Sprout from rtems-4-8-branch 2008-08-13 14:03:54 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2008-08-12	Joel Sherrill <joel.sherrill@OARcorp.com>'
Cherrypick from rtems-4-8-branch 2009-07-13 14:20:37 UTC cvs2git <rtems-devel@rtems.org> 'This commit was manufactured by cvs2svn to create branch 'rtems-4-8-branch'.':
    contrib/crossrpms/patches/binutils-2.17.50-cygwin-20060817-1.diff
    contrib/crossrpms/patches/gdb-6.5-bfinrtems-20071114.diff
    cpukit/libnetworking/ifaddrs.h
    cpukit/libnetworking/libc/getifaddrs.c
    cpukit/libnetworking/libc/if_indextoname.c
    cpukit/libnetworking/libc/if_nameindex.c

ChangeLog

@@ -1,88 +1,7 @@
-2008-10-01	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	PR 1324/bsps
-        * aclocal/check-bsps.m4: Adopt icecube changes from CVS-HEAD.
-
-2008-09-24	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* Makefile.maint: Bump rtems_api to 4.9.
-
-2008-09-24	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	PR 1324/bsps
-	* aclocal/check-bsps.m4: Add missing icecube.
-
-2008-09-10	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* MAINTAINERS, README.configure, aclocal/bsp-alias.m4,
-	aclocal/canonical-target-name.m4, aclocal/check-bsps.m4: Remove TI
-	C4x and NIOS2 ports from 4.9 branch.
-
-2008-09-09	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* README.configure: Updated list of BSPs.
-
-2008-09-08	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* make/custom/pghplus.cfg, make/custom/tqm8xx_stk8xx.cfg, 
-	* make/custom/tqm8xx.cfg,
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4:
-	added MPC8xx based tqm8xx BSP family
-
-2008-07-27	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* acinclude.m4 (_RTEMS_OUTPUT_SUBDIRS): Allow empty configdirs.
-
-2008-07-27	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Remove doxygen
-	comments.
-	* aclocal/rtems-top.m4: Require AC_DISABLE_OPTION_CHECKING.
-	AC_PREREQ(2.62).
-
-2008-07-14	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4: Added MPC5566EVB and
-	MPC8313ERDB.  Added Doxygen style comment.
-
-2008-07-14	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* make/custom/haleakala.cfg:
-	added PPC405 haleakala BSP contributed by Michael Hamel
-
-2008-07-09	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4,
-	* make/custom/m5484FireEngine.cfg:
-	added pgh360 BSP variant
-	added m5484FireEngine BSP
-
-2008-06-01	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac, acinclude.m4: s/AC_HELP/AS_HELP/.
-
 2008-04-14	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bootstrap: Use find . ... preinstall.am for portability reasons.
 
-2008-02-20	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/enable-cxx.m4, aclocal/enable-itron.m4,
-	aclocal/enable-multiprocessing.m4, aclocal/enable-networking.m4,
-	aclocal/enable-posix.m4, aclocal/enable-rtems-debug.m4,
-	aclocal/enable-rtemsbsp.m4, aclocal/enable-tests.m4,
-	aclocal/multilib.m4: s/AC_HELP/AS_HELP/.
-
-2007-11-06	Ray Xu <rayx.cn@gmail.com>
-
-	* aclocal/bsp-alias.m4, aclocal/check-bsps.m4:
-
-2007-09-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* VERSION: Bump VERSION to 4.8.99.0.
-	* aclocal/version.m4: Bump RTEMS_API to 4.9.
-	Bump RTEMS_VERSION to 4.8.99.0.
-
 2007-09-04	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* Makefile.maint: touch all documentation master files so the date on

MAINTAINERS

@@ -35,6 +35,7 @@ Networking		NAME-TBD		EMAIL-TBD
 
 arm			Jay Monkman		jtm@lopingdog.com
 avr			Ralf Corsepius		ralf.corsepius@rtems.org
+c4x			Joel Sherrill		joel.sherrill@OARcorp.com
 h8300			NAME-TBD		EMAIL-TBD
 i386			NAME-TBD		EMAIL-TBD
 m68k			NAME-TBD		EMAIL-TBD

Makefile.maint

@@ -31,7 +31,7 @@ TAG_SUFFIX = -test1
 
 rtems_version := $(shell cat VERSION | sed -n '/.* Version /{s/^.*Version[ ]*\([0-9\.]\+\)/\1/p};')
 rtems_tag     := $(shell echo "rtems-$(rtems_version)" | tr . -)
-rtems_api     := 4.9
+rtems_api     := 4.8
 PATH          := /opt/rtems-$(rtems_api)/bin:$(PATH)
 
 # -----------------

README.configure

@@ -88,17 +88,20 @@ within a target architecture.  Remember that the target specifies the
 CPU family while the BSP specifies the precise board you will be using. 
 The following targets are supported:
 
-      (none)	will build the host-based version on Linux, Solaris and HPUX.
+      (none)			will build the host-based version on Linux,
+			      Solaris and HPUX.
 
-      arm-rtems4.9
-      h8300-rtems4.9
-      i386-rtems4.9
-      m68k-rtems4.9
-      mips-rtems4.9
-      no_cpu-rtems4.9
-      powerpc-rtems4.9
-      sh-rtems4.9
-      sparc-rtems4.9
+      arm-rtems
+      c4x-rtems
+      h8300-rtems
+      i386-rtems
+      m68k-rtems
+      mips-rtems
+      no_cpu-rtems
+      or32-rtems
+      powerpc-rtems
+      sh-rtems
+      sparc-rtems
       bare                    see notes
 
 The cross-compiler is set to $(target)-gcc by default. This can be
@@ -123,13 +126,21 @@ As an example, to build and install the mvme136 and mvme162 bsps for m68k do:
       
       make install RTEMS_BSP="mvme136 mvme162"
 
-The sample tests are built by 'make all' when configured with
---enable-tests=samples.  Use --enable-tests=all to build the full
+The sample tests are built by 'make all', do a 'make test' to build the full
 test suite.
 
-Documentation is built separately from the source code.
+By default, --enable-docs is disabled and documentation is not built.
 
-2.2 Target Dependent Notes
+2.2 Build with Cygnus one-tree release
+
+[NOTE: This section does not apply anymore.]
+
+To build and install RTEMS with the one-tree structure, just copy the rtems
+directory to the tree. The one-tree configure.in and Makefile.in has to be 
+replaced with the RTEMS-aware versions. The build options are the same as 
+for the standalone build.
+
+2.3 Target Dependent Notes
 
 bare:
 
@@ -165,44 +176,42 @@ The following bsps are supported:
 
 host-based	: posix (on Linux, FreeBSD, Cygwin, Solaris, and HPUX)
 
-arm             : csb336 csb337 edb7312 gba gp32 nds rtl22x rtl22xx_t
-                  smdk2410
+arm             : csb336 csb337 edb7312 gba gp32 rtl22x
 
 avr:            : none
 
-bfin            : eZKit533 bf537Stamp
+bfin            : eZKit533
+
+c4x             : c3xsim c4xsim
 
 h8300           : h8sim
 
-i386		: i386ex pc386 pc386dx pc486 pc586 pc686 pck6 ts_386ex
+i386		: 386ex pc386 pc386dx pc486 pc586 pc686 pck6 ts_386ex
 		NOTE: The "pc386" BSP can be compiled to support a 
 		      variety of PC configurations including PC-104
 		      based solutions.
 
-m68k		: av5282 csb360 gen68302 gen68360 gen68360_040 
-		genmcf548x idp mcf5206elite mcf52235 mcf5235 mcf5239
-		m5484FireEngine mrm332 mvme136 mvme147s mvme162 mvme162lx
-		mvme167 ods68302 pgh360 sim68000 simcpu32 uC5282 
+m68k		: gen68360 gen68360_040 mvme136 mvme147s mvme162 mvme162lx
+		mvme167 ods68302 sim68000 mcf5206elite uC5282 
+		gen68302 csb360 simcpu32 mrm332 av5282 gen68340 mcf5235 idp
 
 no_cpu          : no_bsp  (porting example)
 
 mips            : csb350 genmongoosev hurricane jmr3904 rbtx4925 rbtx4938
-		p4600 p4650
 
-powerpc		: brs5l ep1a gen5200 gen83xx haleakala hsc_cm01 icecube
-		mbx821_001 mbx821_002 mbx821_002b mbx860_001b mbx860_002
-		mbx860_005b mcp750 mvme2100 mvme2307 mtx603e
-		mvme5500 mpc55xxevb mpc8260ads mpc8313erdb mpc8349eamds 
-		pghplus pm520_cr825 pm520_ze30 psim score603e ss555
-		tqm8xx_stk8xx virtex
+powerpc		: psim score603e mcp750 mvme2100 mvme2307 mpc8260ads ss555
+                  mvme5500 ep1a pm520_cr825 pm520_ze30 gen405 helas403
+                  mbx821_001 mbx821_002 mbx821_002b mbx860_001b
+                  mbx860_002 mbx860_005b mtx603e brs5l gen5200 ep5200
+		  virtex gen83xx mpc8349eamds 
+                  mbx860_002 mbx860_005b mtx603e brs5l gen5200 icecube
+		  virtex gen83xx mpc8349eamds hsc_cm01
 
                   NOTE: The "motorola_powerpc" BSP is a single BSP which
                   can be conditionally compiled to support most Motorola
                   VMEbus, CompactPCI, and MTX boards.)
 
-                  NOTE: The mbx8xx, gen5200, gen83xx, and tqm8xx BSPs are
-		  designed to handle a variety of boards based on the same
-		  family of system on chips CPUs
+                  NOTE: The ep5200 is a clone of the 5200Lite a.k.a. IceCube.
 
 sh              : gensh1 gensh2 gensh4 shsim simsh4 simsh7045
 
@@ -239,12 +248,22 @@ Please refer to the BSP and Device Driver Guide.
 7. Tested configurations
 ========================
 
-All BSPs have been built on GNU/Linux if the target architecture
-is supported in the FSF tools distribution. 
+All gnu-based bsps have been built on Linux. 
+
+The native (posix) ports have been built and run only on Linux.
+
+The following configurations have NOT been tested:
+
+    + Anything on Nextstep, HPUX and Irix.
+    + The C4x and OR32 ports (requires specially patched toolchain)
 
 8. Prerequisites
 ================
 
-GNU make
+Gawk version 2 or higher.
+GNU make version 3.72 or higher.
 Bash.
-binutils, gcc, newlib and gdb versions matching those in the RPMs.
+gcc version > 2.8
+
+NOTE: These prerequisites are probably out of date but autoconf should detect
+      any problems.

VERSION

@@ -4,4 +4,4 @@
 #  $Id$
 #
 
-RTEMS Version 4.9.4
+RTEMS Version 4.8.1

acinclude.m4

@@ -14,7 +14,7 @@ dnl Stripped down version of autoconf-2.52's AC_ARG_VAR.
 AC_DEFUN([_RTEMS_ARG_VAR],
 [
 m4_expand_once([m4_divert_once([HELP_VAR],
-[AS_HELP_STRING([$1], [$2], [              ])])],
+[AC_HELP_STRING([$1], [$2], [              ])])],
       [$0($1)])dnl
 ])
 
@@ -211,7 +211,7 @@ if test "$no_recursion" != yes; then
   esac
 
   ac_popdir=`pwd`
-  for ac_dir in : $$1_configdirs; do test "x$ac_dir" = x: && continue
+  for ac_dir in $$1_configdirs; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.

aclocal/bsp-alias.m4

@@ -8,12 +8,8 @@ AC_DEFUN([_RTEMS_BSP_ALIAS],
 [# account for "aliased" bsps which share source code
   case $1 in
     bare*)        $2=bare             ;; # EXP: bare-aliases
-
+    c3xsim)       $2=c4xsim           ;; # TI C3x Simulator in gdb
     gen68360_040) $2=gen68360         ;; # m68k - 68360 in companion mode
-    pghplus)      $2=tqm8xx           ;; # powerpc - mpc8xx custom board
-    tqm8xx_stk8xx) $2=tqm8xx          ;; # powerpc - tqm8xx on starter kit
-    pgh360)       $2=gen68360         ;; # m68k - 68360 custom board
-    m5484FireEngine) $2=genmcf548x    ;; # m68k - mcf548x eva board
     mbx8*)        $2=mbx8xx           ;; # MBX821/MBX860 board
     mcp750)       $2=motorola_powerpc ;; # Motorola PPC board variant
     mtx603e)      $2=motorola_powerpc ;; # Motorola PPC board variant
@@ -30,11 +26,8 @@ AC_DEFUN([_RTEMS_BSP_ALIAS],
     brs5l*)       $2=gen5200          ;; # MPC5200 based board
     pm520*)       $2=gen5200          ;; # MPC5200 based board
     icecube)      $2=gen5200          ;; # MPC5200 based board - LITE5200B
-    mpc55??evb)   $2=mpc55xxevb       ;; # MPC5566EVB based board
     mpc8349eamds) $2=gen83xx          ;; # MPC8349 based board
     hsc_cm01)     $2=gen83xx          ;; # MPC8349 based board
-    mpc8313erdb)  $2=gen83xx          ;; # MPC83XX based board
-    rtl22xx_t)    $2=rtl22xx          ;; # rtl22xx bsp in thumb mode
     simcpu32)     $2=sim68000         ;; # BSVC CPU32 variant
     simsh7032)    $2=shsim            ;; # SH7032 simulator
     simsh7045)    $2=shsim            ;; # SH7045 simulator

aclocal/canonical-target-name.m4

@@ -29,6 +29,9 @@ case "${target}" in
   sparc-sun-solaris*)           # unix "simulator" port
 	RTEMS_CPU=unix
 	;;
+  tic4x-*rtems*)          	# gcc changed the name
+	RTEMS_CPU=c4x
+	;;
   *) 
 	RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
 	;;

aclocal/check-bsps.m4

@@ -16,9 +16,8 @@ AC_MSG_CHECKING([for available BSPs])
         -e "s,/bsp_specs$,,"`
     case $bsp_family in
         # Now account for BSPs with build variants
-          gen68360)          bsps="gen68360 gen68360_040 pgh360";;
-          tqm8xx)            bsps="pghplus tqm8xx_stk8xx";;
-          genmcf548x)        bsps="m5484FireEngine";;
+          c4xsim)            bsps="c4xsim c3xsim";;
+          gen68360)          bsps="gen68360 gen68360_040";;
           p4000)             bsps="p4600 p4650";;
           mvme162)           bsps="mvme162 mvme162lx";;
           mbx8xx)            bsps="mbx821_001 mbx860_001b"
@@ -26,13 +25,11 @@ AC_MSG_CHECKING([for available BSPs])
                              bsps="$bsps mbx860_002"
                              bsps="$bsps mbx860_005b"
                              ;;
-          gen5200)           bsps="pm520_cr825 pm520_ze30 brs5l icecube";;
-          mpc55xxevb)        bsps="mpc5566evb";;
-          gen83xx)           bsps="mpc8349eamds hsc_cm01 mpc8313erdb";;
+          gen5200)           bsps="pm520_cr825 pm520_ze30 brs5l";;
+          gen83xx)           bsps="mpc8349eamds hsc_cm01";;
 	  motorola_powerpc)  bsps="mvme2307 mcp750 mtx603e mvme2100";;
 	  pc386)             bsps="pc386 pc386dx pc486 pc586 pc686 pck6";;
           erc32)             bsps="erc32 sis";;
-          rtl22xx)           bsps="rtl22xx rtl22xx_t)";;
 	  sim68000)          bsps="sim68000 simcpu32";;
 	  shsim)             bsps="simsh7032 simsh7045";;
 	  *) 		     bsps="$bsp_family";;

aclocal/enable-cxx.m4

@@ -3,7 +3,7 @@ dnl $Id$
 AC_DEFUN([RTEMS_ENABLE_CXX],
 [
 AC_ARG_ENABLE(cxx,
-[AS_HELP_STRING([--enable-cxx],
+[AC_HELP_STRING([--enable-cxx],
 [enable C++ support and build the rtems++ library])],
 [case "${enable_cxx}" in
   yes) RTEMS_HAS_CPLUSPLUS=yes ;;

aclocal/enable-itron.m4

@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_ITRON],
 ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 
 AC_ARG_ENABLE(itron,
-[AS_HELP_STRING([--enable-itron],[enable itron interface])],
+[AC_HELP_STRING([--enable-itron],[enable itron interface])],
 [case "${enableval}" in 
   yes) RTEMS_HAS_ITRON_API=yes ;;
   no) RTEMS_HAS_ITRON_API=no ;;

aclocal/enable-multiprocessing.m4

@@ -3,7 +3,7 @@ dnl $Id$
 AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
-[AS_HELP_STRING([--enable-multiprocessing],
+[AC_HELP_STRING([--enable-multiprocessing],
 [enable multiprocessing interface])],
 [case "${enable_multiprocessing}" in 
   yes) ;;

aclocal/enable-networking.m4

@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_NETWORKING],
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 
 AC_ARG_ENABLE(networking,
-[AS_HELP_STRING([--enable-networking],[enable TCP/IP stack])],
+[AC_HELP_STRING([--enable-networking],[enable TCP/IP stack])],
 [case "${enableval}" in
   yes) RTEMS_HAS_NETWORKING=yes ;;
   no) RTEMS_HAS_NETWORKING=no ;;

aclocal/enable-posix.m4

@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_POSIX],
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 
 AC_ARG_ENABLE(posix,
-[AS_HELP_STRING([--enable-posix],[enable posix interface])],
+[AC_HELP_STRING([--enable-posix],[enable posix interface])],
 [case "${enableval}" in 
   yes) RTEMS_HAS_POSIX_API=yes ;;
   no) RTEMS_HAS_POSIX_API=no ;;

aclocal/enable-rtems-debug.m4

@@ -3,7 +3,7 @@
 AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
 [
 AC_ARG_ENABLE(rtems-debug,
-AS_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
+AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
 [case "${enable_rtems_debug}" in
   yes) enable_rtems_debug=yes ;;
   no)  enable_rtems_debug=no ;;

aclocal/enable-rtemsbsp.m4

@@ -7,7 +7,7 @@ AC_DEFUN([RTEMS_ENABLE_RTEMSBSP],
 [
 AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
 AC_ARG_ENABLE(rtemsbsp,
-[AS_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
+[AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
 [BSPs to include in build])],
 [case "${enable_rtemsbsp}" in
   yes ) enable_rtemsbsp="" ;;

aclocal/enable-tests.m4

@@ -3,7 +3,7 @@ dnl $Id$
 AC_DEFUN([RTEMS_ENABLE_TESTS],
 [
 AC_ARG_ENABLE(tests,
-[AS_HELP_STRING([--enable-tests],[enable tests (default:samples)])],
+[AC_HELP_STRING([--enable-tests],[enable tests (default:samples)])],
   [case "${enableval}" in
     samples) enable_tests=samples;;
     yes) enable_tests=yes ;;

aclocal/multilib.m4

@@ -5,7 +5,7 @@ dnl parts of these macros are derived from newlib-1.8.2's multilib support
 AC_DEFUN([RTEMS_ENABLE_MULTILIB],
 [
 AC_ARG_ENABLE(multilib,
-AS_HELP_STRING([--enable-multilib],
+AC_HELP_STRING([--enable-multilib],
 [build many library versions (default=no)]),
 [case "${enableval}" in
   yes) multilib=yes ;;

aclocal/rtems-top.m4

@@ -1,8 +1,5 @@
 dnl $Id$
 
-# AC_DISABLE_OPTION_CHECKING is not available before 2.62
-AC_PREREQ(2.62)
-
 dnl
 dnl RTEMS_TOP($1)
 dnl 
@@ -11,7 +8,6 @@ dnl
 AC_DEFUN([RTEMS_TOP],
 [dnl
 AC_REQUIRE([RTEMS_VERSIONING])
-AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])
 AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl

aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.9.4]))
+m4_define([_RTEMS_VERSION],[4.8.1]))
 
-m4_define([RTEMS_API],[4.9])
+m4_define([RTEMS_API],[4.8])

bootstrap

@@ -98,7 +98,7 @@ done
 
 case $mode in
 preinstall)
-  confs=`find . -name Makefile.am -exec grep -l 'include .*/preinstall\.am' {} \;`
+  confs=`find -name Makefile.am -exec grep -l 'include .*/preinstall\.am' {} \;`
   for i in $confs; do
     dir=$(dirname $i);
     test "$quite" = "true" || echo "Generating $dir/preinstall.am"

c/ACKNOWLEDGEMENTS

@@ -153,7 +153,7 @@ The following persons/organizations have made contributions:
   interrupt management API that reduces interrupt latency while making
   it easier to support external interrupt controllers.
 
-+ Joel Sherrill <joel.sherrill@OARcorp.com> for the BSPs that work with 
++ Joel Sherrill <joel@OARcorp.com> for the BSPs that work with 
   numerous simulators including psim, c4xsim, h8sim, armulator,
   sim68000, and simcpu32.  Most of these BSPs work with instruction
   set simulators in gdb.

c/ChangeLog

@@ -1,8 +1,3 @@
-2008-09-10	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* ACKNOWLEDGEMENTS, TOOL_TARGETS: Remove TI C4x and NIOS2 ports from
-	4.9 branch.
-
 2007-03-27	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Use MKDIR_P instead of mkdir_p.

c/TOOL_TARGETS

@@ -5,32 +5,48 @@
 The following are targets for the GNU tools (gcc, binutils, newlib, and gdb)
 that are for RTEMS, their object format, and status notes
 
-arm: arm-rtems               ELF
+arm:
+        arm-rtems               ELF
 
-h8300: h8300-rtems             COFF
+c4x:
+        c4x-rtems               COFF           Requires patches
 
-i386: i386-rtems		ELF
+h8300:
+        h8300-rtems             COFF
 
-m68k: m68k-rtems		ELF
+i386:
+	i386-rtems		ELF
 
-mips: mips*-rtems		ELF		Big endian
-      mips*el-rtems		ELF		Little endian
+m68k:
+	m68k-rtems		ELF
+
+
+mips:
+	mips*-rtems		ELF		Big endian
+	mips*el-rtems		ELF		Little endian
 
 	NOTE: Little endian configuration is not in all tools and 
 	      is untested for RTEMS itself.
 
-nios2: nios2-elf           ELF     Little endian
+nios2: 
+    nios2-elf           ELF     Little endian
 
     NOTE: Currently there is no native nios2-rtems toolchain;
       Altera's nios2-elf-tools can be used with wrapper scripts.
 
-powerpc: powerpc-rtems		ELF
-	 powerpcle-rtems		ELF		Little endian
+powerpc:
+	powerpc-rtems		ELF
+	powerpcle-rtems		ELF		Little endian
 
 	NOTE: Little endian configuration is not in all tools and 
 	      is untested for RTEMS itself.
 
-sh: sh-rtems		ELF
+sh:
+	sh-rtems		COFF
+	sh-rtemscoff		COFF
+	sh-rtemself		ELF
+
+	NOTE:  ELF is not completely stable for SH yet.
 
 sparc:
 	sparc-rtems		ELF

c/src/ChangeLog

@@ -1,273 +1,8 @@
-2009-03-12	Daniel Hellstrom <daniel@gaisler.com>
+2008-04-25  Till Straumann <strauman@slac.stanford.edu>
 
-	PR 1392/bsps
-	* libchip/i2c/spi-memdrv.c: SPI Memory driver. Fix but where writes
-	over multiple pages results in extra data being written.
-
-2009-01-21	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.c: Fixed RTEMS_BLKDEV_CAPABILITIES ioctl
-	which caused invalid multiple block writes.
-
-2008-11-13	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/serial/ns16550.c: Transmit the character in the polled write
-	function within a critical section for printk() compatibility.
-
-2008-09-10 	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/prog-cc.m4: Remove pre-production testing CFLAGS.
-
-2008-09-10	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* aclocal/canonical-target-name.m4, aclocal/rtems-cpu-subdirs.m4:
-	Remove TI C4x and NIOS2 ports from 4.9 branch.
-
-2008-09-08 	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/ide/ata.h: Convert to Unix file format.
-
-2008-09-07 	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/serial/mc68681.c, libchip/serial/mc68681_p.h,
-	libchip/serial/ns16550.c, libchip/serial/ns16550_p.h,
-	libchip/serial/serial.h, libchip/serial/serprobe.c,
-	libchip/serial/sersupp.h, libchip/serial/z85c30.c:
-	Convert to "bool".
-	* libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-fram-fm25l256.c,
-	libchip/i2c/spi-memdrv.h: Convert to "bool".
-	* libchip/rtc/ds1375-rtc.h, libchip/rtc/ds1375.c,
-	libchip/rtc/mc146818a.c, libchip/rtc/mc146818a.h,
-	libchip/rtc/rtc.h, libchip/rtc/rtcprobe.c: Convert to "bool".
-	* libchip/ide/ata.c, libchip/ide/ata_internal.h,
-	libchip/ide/ide_ctrl_cfg.h: Convert to "bool".
-	* libchip/display/disp_hcms29xx.c, libchip/display/disp_hcms29xx.h:
-	Convert to "bool".
-	* libchip/network/if_fxp.c, libchip/network/if_fxpvar.h:
-	Convert to "bool".
-	* libchip/shmdr/fatal.c, libchip/shmdr/shm_driver.h:
-	Convert to "bool".
-
-2008-09-05	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/Makefile.am, libchip/shmdr/init.c, libchip/shmdr/mpisr.c,
-	libchip/shmdr/poll.c, libchip/shmdr/shm_driver.h: Update shared
-	memory driver to not use the clock ioctl to install a method to poll
-	for input. It now uses a Class API Timer which means we can eliminate
-	this special IOCTL from all clock drivers.
-	* libchip/shmdr/setckvec.c: Removed.
-
-2008-08-30	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/network/sonic.c: Do not declare a variable just to hold an
-	ignored return value.
-
-2008-08-20	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.c: Fixed integer conversion warnings.
-
-2008-08-19	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/display/disp_hcms29xx.c: Initialize softc_ptr to NULL.
-	* libchip/network/dec21140.c, libchip/network/if_dc.c: Use uint32_t.
-
-2008-08-19	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/display/disp_hcms29xx.c: Do not make these static. They
-	appear to be unused that way.
-
-2008-08-19	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/shmdr/shm_driver.h: Correct prototypes.
-
-2008-08-19	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/display/disp_hcms29xx.c: Fixed warnings. Initialized
-	variables and made methods static.
-
-2008-08-18	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/serial/ns16550.c: Fix warning.
-
-2008-08-18	Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* aclocal/prog-cc.m4: Add -Wnested-externs.
-
-2008-08-18	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* libchip/network/dec21140.c: Add missing prototype.
-	* libchip/ide/ata.c, libchip/network/elnk.c: Add missing prototypes.
-
-2008-08-16	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/prog-cc.m4: Add -Wimplicit-function-declaration 
-	-Wstrict-prototypes to RTEMS_CFLAGS.
-
-2008-08-02	Chris Johns <chrisj@rtems.org>
-
-	* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: Remove
-	rtems_blkdev_request count and start references. Use
-	RTEMS_BLKDEV_START_BLOCK.
-
-2008-07-29	Chris Johns <chrisj@rtems.org>
-
-	* libchip/i2c/spi-sd-card.c: Updated to the libblock changes.
-
-	* libchip/ide/ata.c: Change to use a mutex rather than disable
-	pre-emption. Updated to the libblock changes.
-
-	* libchip/ide/ata_internal.h: Updated to the new chains API.
-
-	* libchip/ide/ide_controller.c: Updated to the libblock
-	changes. Added come debug tracing.
-
-	* libchip/ide/ide_ctrl_cfg.h, libchip/ide/ide_ctrl_io.h: Updated
-	to the libblock changes.
-
-2008-07-27	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Remove RPCGEN, RPCTOOLS.
-
-2008-07-21	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.h, libchip/i2c/spi-sd-card.c: Use inttypes.h
-	for output format specifiers.
-
-2008-07-17	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/display/font_hcms29xx.h, libchip/display/disp_hcms29xx.h:
-	Fixed some data types
-
-2008-07-14	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.c: Added missing header file.
-	* libchip/Makefile.am: Added SD Card driver.
-
-2008-07-14	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/display/font_hcms29xx.c, libchip/display/disp_fonts.h
-	make glyphs non-constant, added file headers 
-
-2008-07-09	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/display/disp_fonts.h, libchip/display/disp_hcms29xx.c
-	* libchip/display/disp_hcms29xx.h, libchip/display/font_hcms29xx.c
-	* libchip/display/font_hcms29xx.h
-	Creation of SPI display driver
-
-2008-07-09	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
-	* libchip/i2c/spi-sd-card.h, libchip/i2c/spi-sd-card.c: SD Card driver
-	via SPI.
-
-2008-06-29 	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/rtems-top.m4: Require AC_DISABLE_OPTION_CHECKING.
-	AC_PREREQ(2.62).
-
-2008-06-01 	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/target.m4: Allow empty RTEMS_BUILD_SUBDIRS.
-
-2008-05-22	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/Makefile.am: Move termios helper routines from libchip to
-	libcsupport. Add routine which makes it easy for a termios device
-	driver to inform termios of its default baud rate. This avoids
-	inconsistencies in later termios settings changes.
-	* libchip/serial/termios_baud2index.c,
-	libchip/serial/termios_baud2num.c: Removed.
-
-2008-05-15	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* aclocal/bsp-bootcards-handles-ram-allocation.m4: New file.
-
-2008-05-15	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* wrapup/Makefile.am: Many BSPs do not include any .rel files now so do
-	not fail if there are none.
-
-2008-05-15	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-flash-m25p40.h,
-	* libchip/i2c/spi-fram-fm25l256.c, libchip/i2c/spi-fram-fm25l256.h,
-	* libchip/i2c/spi-memdrv.c, libchip/i2c/spi-memdrv.h,
-	* libchip/Makefile.am:
-	derived a generic spi memory driver from spi-flash-m25p40, 
-	added descriptor for fram fm25l256
-
-2008-05-07	Till Straumann <strauman@slac.stanford.edu>
-
-	PR 649/bsps
-	* libchip/ide/ata.c: Give up if the interface does not become ready.
-
-2008-04-25	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	Moved to cpukit.
-	* nfsclient/.cvsignore, nfsclient/ChangeLog.slac, nfsclient/LICENSE,
-	nfsclient/Makefile.am, nfsclient/README, nfsclient/preinstall.am,
-	nfsclient/rfc1094.txt, nfsclient/rtems-filesystem-patch,
-	nfsclient/proto/mount_prot.h, nfsclient/proto/mount_prot.x,
-	nfsclient/proto/mount_prot_xdr.c, nfsclient/proto/nfs_prot.h,
-	nfsclient/proto/nfs_prot.x, nfsclient/proto/nfs_prot_xdr.c,
-	nfsclient/src/cexphelp.c, nfsclient/src/dirutils.c,
-	nfsclient/src/librtemsNfs.h, nfsclient/src/nfs.c,
-	nfsclient/src/nfs.modini.c, nfsclient/src/nfsTest.c,
-	nfsclient/src/rpcio.c, nfsclient/src/rpcio.h,
-	nfsclient/src/rpcio.modini.c, nfsclient/src/sock_mbuf.c,
-	nfsclient/src/xdr_mbuf.c: Removed.
-
-2008-02-26	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* configure.ac: Stop building nfsclient here and build it in CPUKIT.
-
-2008-01-05	Chris Johns <chrisj@rtems.org>
-
-	* libchip/flash/am29lv160.c: Update the blank check error message
-	to say there is an error.
-	
-2007-12-22	Chris Johns <chrisj@rtems.org>
-
-	* nfsclient/src/nfs.c, nfsclient/src/rpcio.c: Adjust the length of
-	the hello message. Just one line but still a little too long.
-	
-2007-12-14	Chris Johns <chrisj@rtems.org>
-
-	* wrapup/Makefile.am: Add libflash.a to the libbsp library.
-	* libchip/Makefile.am, libchip/preinstall.am: Add the flash chip support.
-	* libchip/flash, libchip/flash/am29lv160.c,
-	libchip/flash/am29lv160.h: New.
-
-2007-11-26	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* libchip/network/if_fxp.c: Spacing.
-
-2007-11-20	Till Straumann <strauman@slac.stanford.edu>
-
-	* libchip/rtc/ds1375.c, libchip/rtc/ds1375-rtc.h:
-	Avoid using 'stdio' before the system is up and fully
-	initialized.
-
-2007-11-20	Till Straumann <strauman@slac.stanford.edu>
-
-	* libchip/rtc/ds1375.c, libchip/rtc/ds1375-rtc.h,
-	* libchip/Makefile.am, libchip/preinstall.am:
-	added new driver for Maxim DS1375 i2c RTC.
-
-2007-09-26	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/i2c/spi-flash-m25p40.c:
-	added addressing call in write function
-
-2007-09-24	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
-
-	* libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-flash-m25p40.c, 
-	* libchip/Makefile.am:
-	added SPI flash driver for a M25P40 chip (based on libi2c extensions)
-
-2007-09-25	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* libchip/shmdr/dump.c, libchip/shmdr/shm_driver.h: Fix warnings.
+	* nfsclient/Changelog.slac, nfsclient/src/nfs.c:
+	BUGFIX (PR#1284) -- possible memory corruption if
+	server connectivity is lost.
 
 2007-09-25	Joel Sherrill <joel.sherrill@OARcorp.com>
 
@@ -277,11 +12,6 @@
 
 	* nfsclient/Makefile.am, nfsclient/preinstall.am: Install libnfs.a.
 
-2007-09-21	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* aclocal/version.m4: Bump RTEMS_API to 4.9.
-	Bump RTEMS_VERSION to 4.8.99.0.
-
 2007-09-17	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* libchip/network/smc91111.h: Eliminate DEBUG_puts.

c/src/aclocal/bsp-bootcards-handles-ram-allocation.m4

@@ -1,35 +0,0 @@
-dnl $Id$
-dnl
-
-dnl RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION - some autoconf voodoo to
-dnl indicate that the BSP is using the shared RAM allocation code in 
-dnl bootcard.c.  This is a new way of doing things that will reduce the
-dnl size of each BSP's bspstart.c and open the door for another round
-dnl of benefits for BSPs that use this scheme.
-dnl
-dnl Benefits:
-dnl   - Reduced code in bspstart.c
-dnl   - Can optionally dirty memory at boot time.
-dnl
-dnl NOTE: This macro is intended to be temporary.  When most of the
-dnl       BSPs use the new shared method, we need to either bulk edit
-dnl       the remaining BSPs to eliminate code using the old way. Or
-dnl       switch the sense of this macro to be required on BSPs using
-dnl       the old way.
-dnl
-dnl       AGAIN: This is intended to be temporary.  Please help by
-dnl              updating BSPs to use the new scheme. 
-
-dnl To be used in bsp-configure scripts
-
-AC_DEFUN([RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION],
- [AC_DEFINE_UNQUOTED([BSP_BOOTCARD_HANDLES_RAM_ALLOCATION],
-  [1],
-  [BSP uses shared logic in bootcard.c]
-)
-RTEMS_BSPOPTS_SET([BSP_DIRTY_MEMORY],[*],[0])
-RTEMS_BSPOPTS_HELP([BSP_DIRTY_MEMORY],
-[If defined, then PSIM will put a non-zero pattern into the RTEMS
- Workspace and C program heap.  This should assist in finding
- code that assumes memory starts set to zero.])
-])

c/src/aclocal/canonical-target-name.m4

@@ -34,6 +34,10 @@ case "${host}" in
 	RTEMS_CPU=unix
         RTEMS_HOST=Solaris
 	;;
+  tic4x-*rtems*)          	# gcc changed the name
+	RTEMS_CPU=c4x
+	RTEMS_HOST=$host_os
+	;;
   *) 
 	RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
 	RTEMS_HOST=$host_os

c/src/aclocal/prog-cc.m4

@@ -35,10 +35,10 @@ GCCSPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
 
-AS_IF([test "$GCC" = yes],[
+if test "$GCC" = yes; then
 RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
 m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
-])
+fi
 AC_SUBST(RTEMS_CFLAGS)
 
 AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[

c/src/aclocal/rtems-cpu-subdirs.m4

@@ -13,11 +13,13 @@ case $RTEMS_CPU in
 _RTEMS_CPU_SUBDIR([arm],[$1]);;
 _RTEMS_CPU_SUBDIR([bfin],[$1]);;
 _RTEMS_CPU_SUBDIR([avr],[$1]);;
+_RTEMS_CPU_SUBDIR([c4x],[$1]);;
 _RTEMS_CPU_SUBDIR([h8300],[$1]);;
 _RTEMS_CPU_SUBDIR([hppa1.1],[$1]);;
 _RTEMS_CPU_SUBDIR([i386],[$1]);;
 _RTEMS_CPU_SUBDIR([m68k],[$1]);;
 _RTEMS_CPU_SUBDIR([mips],[$1]);;
+_RTEMS_CPU_SUBDIR([nios2],[$1]);;
 _RTEMS_CPU_SUBDIR([no_cpu],[$1]);;
 _RTEMS_CPU_SUBDIR([or32],[$1]);;
 _RTEMS_CPU_SUBDIR([powerpc],[$1]);;

c/src/aclocal/rtems-top.m4

@@ -1,8 +1,5 @@
 dnl $Id$
 
-# AC_DISABLE_OPTION_CHECKING is not available before 2.62
-AC_PREREQ(2.62)
-
 dnl
 dnl RTEMS_TOP($1)
 dnl 
@@ -11,7 +8,6 @@ dnl
 AC_DEFUN([RTEMS_TOP],
 [dnl
 AC_REQUIRE([RTEMS_VERSIONING])
-AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])
 AC_REQUIRE([AM_SET_LEADING_DOT])
 AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)

c/src/aclocal/target.m4

@@ -33,8 +33,7 @@ if test "$no_recursion" != yes; then
     ],
     [rtems_configure_args])
 
-  for rtems_config_dir in : $RTEMS_BUILD_SUBDIRS; do test "x$rtems_config_dir" = x: && continue
-
+  for rtems_config_dir in $RTEMS_BUILD_SUBDIRS; do
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
     if test ! -d $srcdir/$rtems_config_dir; then

c/src/aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.9.4]))
+m4_define([_RTEMS_VERSION],[4.8.1]))
 
-m4_define([RTEMS_API],[4.9])
+m4_define([RTEMS_API],[4.8])

c/src/ada-tests/ChangeLog

@@ -1,389 +1,3 @@
-2008-09-29	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* support/timer_driver.adb, support/timer_driver.ads,
-	tmtests/tm01/tmtest.adb, tmtests/tm02/tmtest.adb,
-	tmtests/tm03/tmtest.adb, tmtests/tm04/tmtest.adb,
-	tmtests/tm05/tmtest.adb, tmtests/tm06/tmtest.adb,
-	tmtests/tm07/tmtest.adb, tmtests/tm08/tmtest.adb,
-	tmtests/tm09/tmtest.adb, tmtests/tm10/tmtest.adb,
-	tmtests/tm11/tmtest.adb, tmtests/tm12/tmtest.adb,
-	tmtests/tm13/tmtest.adb, tmtests/tm14/tmtest.adb,
-	tmtests/tm15/tmtest.adb, tmtests/tm16/tmtest.adb,
-	tmtests/tm17/tmtest.adb, tmtests/tm18/tmtest.adb,
-	tmtests/tm19/tmtest.adb, tmtests/tm20/config.h,
-	tmtests/tm20/tmtest.adb, tmtests/tm21/tmtest.adb,
-	tmtests/tm22/tmtest.adb, tmtests/tm23/tmtest.adb,
-	tmtests/tm24/tmtest.adb, tmtests/tm25/tmtest.adb,
-	tmtests/tm28/tmtest.adb, tmtests/tm29/tmtest.adb,
-	tmtests/tmck/tmtest.adb, tmtests/tmoverhd/tmtest.adb: Clean up.
-	Verified to run on psim with gcc 4.3.2.
-
-2008-06-06	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* samples/hello/config.h, sptests/spname01/config.h: These needed
-	CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER.
-
-2008-03-11	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* mptests/mp01/mptest.ads, mptests/mp02/mptest.ads,
-	mptests/mp03/mptest.ads, mptests/mp04/mptest.ads,
-	mptests/mp05/mptest.ads, mptests/mp06/mptest.ads,
-	mptests/mp07/mptest.ads, mptests/mp08/mptest.ads,
-	mptests/mp09/mptest.ads, mptests/mp10/mptest.ads,
-	mptests/mp11/mptest.ads, mptests/mp12/mptest.ads,
-	mptests/mp13/mptest.ads, mptests/mp14/mptest.ads,
-	samples/base_mp/mptest.ads, samples/base_sp/sptest.ads,
-	samples/hello/sptest.ads, samples/nsecs/sptest.ads,
-	samples/ticker/sptest.ads, sptests/sp01/sptest.ads,
-	sptests/sp02/sptest.ads, sptests/sp03/sptest.ads,
-	sptests/sp04/sptest.ads, sptests/sp05/sptest.ads,
-	sptests/sp06/sptest.ads, sptests/sp07/sptest.ads,
-	sptests/sp08/sptest.ads, sptests/sp09/sptest.ads,
-	sptests/sp11/sptest.ads, sptests/sp12/sptest.ads,
-	sptests/sp13/sptest.ads, sptests/sp14/sptest.ads,
-	sptests/sp15/sptest.ads, sptests/sp16/sptest.ads,
-	sptests/sp17/sptest.ads, sptests/sp19/sptest.ads,
-	sptests/sp20/sptest.ads, sptests/sp22/sptest.ads,
-	sptests/sp23/sptest.ads, sptests/sp24/sptest.ads,
-	sptests/sp25/sptest.ads, sptests/spname01/spname01.adb,
-	tmtests/tm01/tmtest.ads, tmtests/tm02/tmtest.ads,
-	tmtests/tm03/tmtest.ads, tmtests/tm04/tmtest.ads,
-	tmtests/tm05/tmtest.ads, tmtests/tm06/tmtest.ads,
-	tmtests/tm07/tmtest.ads, tmtests/tm08/tmtest.ads,
-	tmtests/tm09/tmtest.ads, tmtests/tm10/tmtest.ads,
-	tmtests/tm11/tmtest.ads, tmtests/tm12/tmtest.ads,
-	tmtests/tm13/tmtest.ads, tmtests/tm14/tmtest.ads,
-	tmtests/tm15/tmtest.ads, tmtests/tm16/tmtest.ads,
-	tmtests/tm17/tmtest.ads, tmtests/tm18/tmtest.ads,
-	tmtests/tm19/tmtest.ads, tmtests/tm20/tmtest.adb,
-	tmtests/tm20/tmtest.ads, tmtests/tm21/tmtest.ads,
-	tmtests/tm22/tmtest.ads, tmtests/tm23/tmtest.ads,
-	tmtests/tm24/tmtest.ads, tmtests/tm25/tmtest.ads,
-	tmtests/tm28/tmtest.ads, tmtests/tm29/tmtest.ads,
-	tmtests/tmck/tmtest.ads, tmtests/tmoverhd/tmtest.ads:
-	Added pragma Convention C as required by gcc > 4.3.
-
-2008-02-04	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* sptests/spname01/config.h: New file.
-
-2008-02-04	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* configure.ac, sptests/Makefile.am: Exercise passing as object Id of
-	SELF.
-	* sptests/spname01/.cvsignore, sptests/spname01/Makefile.am,
-	sptests/spname01/ada_spname01.scn, sptests/spname01/spname01.adb,
-	sptests/spname01/sptest.adb, sptests/spname01/sptest.ads: New files.
-
-2008-02-01	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
-	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
-	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
-	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
-	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
-	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
-	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
-	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
-	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
-	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
-	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
-	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
-	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
-	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am,
-	samples/base_mp/node1/Makefile.am, samples/base_mp/node2/Makefile.am,
-	samples/base_sp/Makefile.am, samples/hello/Makefile.am,
-	samples/nsecs/Makefile.am, samples/ticker/Makefile.am,
-	sptests/sp01/Makefile.am, sptests/sp02/Makefile.am,
-	sptests/sp03/Makefile.am, sptests/sp04/Makefile.am,
-	sptests/sp05/Makefile.am, sptests/sp06/Makefile.am,
-	sptests/sp07/Makefile.am, sptests/sp08/Makefile.am,
-	sptests/sp09/Makefile.am, sptests/sp11/Makefile.am,
-	sptests/sp12/Makefile.am, sptests/sp13/Makefile.am,
-	sptests/sp14/Makefile.am, sptests/sp15/Makefile.am,
-	sptests/sp16/Makefile.am, sptests/sp17/Makefile.am,
-	sptests/sp19/Makefile.am, sptests/sp20/Makefile.am,
-	sptests/sp22/Makefile.am, sptests/sp23/Makefile.am,
-	sptests/sp24/Makefile.am, sptests/sp25/Makefile.am,
-	tmtests/tm01/Makefile.am, tmtests/tm02/Makefile.am,
-	tmtests/tm03/Makefile.am, tmtests/tm04/Makefile.am,
-	tmtests/tm05/Makefile.am, tmtests/tm06/Makefile.am,
-	tmtests/tm07/Makefile.am, tmtests/tm08/Makefile.am,
-	tmtests/tm09/Makefile.am, tmtests/tm10/Makefile.am,
-	tmtests/tm11/Makefile.am, tmtests/tm12/Makefile.am,
-	tmtests/tm13/Makefile.am, tmtests/tm14/Makefile.am,
-	tmtests/tm15/Makefile.am, tmtests/tm16/Makefile.am,
-	tmtests/tm17/Makefile.am, tmtests/tm18/Makefile.am,
-	tmtests/tm19/Makefile.am, tmtests/tm20/Makefile.am,
-	tmtests/tm21/Makefile.am, tmtests/tm22/Makefile.am,
-	tmtests/tm23/Makefile.am, tmtests/tm24/Makefile.am,
-	tmtests/tm25/Makefile.am, tmtests/tm28/Makefile.am,
-	tmtests/tm29/Makefile.am, tmtests/tmck/Makefile.am,
-	tmtests/tmoverhd/Makefile.am: Make all test names unique. All needed
-	ada_ as prefix to distinguish them from the C tests. MP tests should
-	produce an executable with test name and node number in it. Screens
-	renamed to follow.
-	* ada_mvscn, mptests/mp01/node1/ada_mp01-node1.scn,
-	mptests/mp01/node2/ada_mp01-node2.scn,
-	mptests/mp02/node1/ada_mp02-node1.scn,
-	mptests/mp02/node2/ada_mp02-node2.scn,
-	mptests/mp03/node1/ada_mp03-node1.scn,
-	mptests/mp03/node2/ada_mp03-node2.scn,
-	mptests/mp04/node1/ada_mp04-node1.scn,
-	mptests/mp04/node2/ada_mp04-node2.scn,
-	mptests/mp05/node1/ada_mp05-node1.scn,
-	mptests/mp05/node2/ada_mp05-node2.scn,
-	mptests/mp06/node1/ada_mp06-node1.scn,
-	mptests/mp06/node2/ada_mp06-node2.scn,
-	mptests/mp07/node1/ada_mp07-node1.scn,
-	mptests/mp07/node2/ada_mp07-node2.scn,
-	mptests/mp08/node1/ada_mp08-node1.scn,
-	mptests/mp08/node2/ada_mp08-node2.scn,
-	mptests/mp09/node1/ada_mp09-node1.scn,
-	mptests/mp09/node2/ada_mp09-node2.scn,
-	mptests/mp10/node1/ada_mp10-node1.scn,
-	mptests/mp10/node2/ada_mp10-node2.scn,
-	mptests/mp11/node1/ada_mp11-node1.scn,
-	mptests/mp11/node2/ada_mp11-node2.scn,
-	mptests/mp12/node1/ada_mp12-node1.scn,
-	mptests/mp12/node2/ada_mp12-node2.scn,
-	mptests/mp13/node1/ada_mp13-node1.scn,
-	mptests/mp13/node2/ada_mp13-node2.scn,
-	mptests/mp14/node1/ada_mp14-node1.scn,
-	mptests/mp14/node2/ada_mp14-node2.scn,
-	samples/base_mp/node1/ada_base_mp-node1.scn,
-	samples/base_mp/node2/ada_base_mp-node2.scn,
-	samples/base_sp/ada_base_sp.scn, samples/hello/ada_hello.scn,
-	samples/nsecs/ada_nsecs.scn, samples/ticker/ada_ticker.scn,
-	sptests/sp01/ada_sp01.scn, sptests/sp02/ada_sp02.scn,
-	sptests/sp03/ada_sp03.scn, sptests/sp04/ada_sp04.scn,
-	sptests/sp05/ada_sp05.scn, sptests/sp06/ada_sp06.scn,
-	sptests/sp07/ada_sp07.scn, sptests/sp08/ada_sp08.scn,
-	sptests/sp09/ada_sp09.scn, sptests/sp11/ada_sp11.scn,
-	sptests/sp12/ada_sp12.scn, sptests/sp13/ada_sp13.scn,
-	sptests/sp14/ada_sp14.scn, sptests/sp15/ada_sp15.scn,
-	sptests/sp16/ada_sp16.scn, sptests/sp17/ada_sp17.scn,
-	sptests/sp19/ada_sp19.scn, sptests/sp20/ada_sp20.scn,
-	sptests/sp22/ada_sp22.scn, sptests/sp23/ada_sp23.scn,
-	sptests/sp24/ada_sp24.scn, sptests/sp25/ada_sp25.scn: New files.
-	* mptests/mp01/node1/mp01-node1.scn, mptests/mp01/node2/mp01-node2.scn,
-	mptests/mp02/node1/mp02-node1.scn, mptests/mp02/node2/mp02-node2.scn,
-	mptests/mp03/node1/mp03-node1.scn, mptests/mp03/node2/mp03-node2.scn,
-	mptests/mp04/node1/mp04-node1.scn, mptests/mp04/node2/mp04-node2.scn,
-	mptests/mp05/node1/mp05-node1.scn, mptests/mp05/node2/mp05-node2.scn,
-	mptests/mp06/node1/mp06-node1.scn, mptests/mp06/node2/mp06-node2.scn,
-	mptests/mp07/node1/mp07-node1.scn, mptests/mp07/node2/mp07-node2.scn,
-	mptests/mp08/node1/mp08-node1.scn, mptests/mp08/node2/mp08-node2.scn,
-	mptests/mp09/node1/mp09-node1.scn, mptests/mp09/node2/mp09-node2.scn,
-	mptests/mp10/node1/mp10-node1.scn, mptests/mp10/node2/mp10-node2.scn,
-	mptests/mp11/node1/mp11-node1.scn, mptests/mp11/node2/mp11-node2.scn,
-	mptests/mp12/node1/mp12-node1.scn, mptests/mp12/node2/mp12-node2.scn,
-	mptests/mp13/node1/mp13-node1.scn, mptests/mp13/node2/mp13-node2.scn,
-	mptests/mp14/node1/mp14-node1.scn, mptests/mp14/node2/mp14-node2.scn,
-	samples/base_mp/node1/base_mp-node1.scn,
-	samples/base_mp/node2/base_mp-node2.scn, samples/base_sp/base_sp.scn,
-	samples/hello/hello.scn, samples/nsecs/nsecs.scn,
-	samples/ticker/ticker.scn, sptests/sp01/sp01.scn,
-	sptests/sp02/sp02.scn, sptests/sp03/sp03.scn, sptests/sp04/sp04.scn,
-	sptests/sp05/sp05.scn, sptests/sp06/sp06.scn, sptests/sp07/sp07.scn,
-	sptests/sp08/sp08.scn, sptests/sp09/sp09.scn, sptests/sp11/sp11.scn,
-	sptests/sp12/sp12.scn, sptests/sp13/sp13.scn, sptests/sp14/sp14.scn,
-	sptests/sp15/sp15.scn, sptests/sp16/sp16.scn, sptests/sp17/sp17.scn,
-	sptests/sp19/sp19.scn, sptests/sp20/sp20.scn, sptests/sp22/sp22.scn,
-	sptests/sp23/sp23.scn, sptests/sp24/sp24.scn, sptests/sp25/sp25.scn:
-	Removed.
-
-2007-11-09	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* ada.am: Now builds cleanly with GCC trunk.
-
-2007-10-25	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
-	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
-	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
-	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
-	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
-	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
-	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
-	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
-	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
-	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
-	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
-	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
-	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
-	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am,
-	samples/base_mp/Makefile.am, samples/base_mp/node1/Makefile.am,
-	samples/base_mp/node2/Makefile.am, samples/base_sp/Makefile.am,
-	samples/hello/Makefile.am, samples/nsecs/Makefile.am,
-	samples/ticker/Makefile.am, sptests/sp01/Makefile.am,
-	sptests/sp02/Makefile.am, sptests/sp03/Makefile.am,
-	sptests/sp04/Makefile.am, sptests/sp05/Makefile.am,
-	sptests/sp06/Makefile.am, sptests/sp07/Makefile.am,
-	sptests/sp08/Makefile.am, sptests/sp09/Makefile.am,
-	sptests/sp11/Makefile.am, sptests/sp12/Makefile.am,
-	sptests/sp13/Makefile.am, sptests/sp14/Makefile.am,
-	sptests/sp15/Makefile.am, sptests/sp16/Makefile.am,
-	sptests/sp17/Makefile.am, sptests/sp19/Makefile.am,
-	sptests/sp20/Makefile.am, sptests/sp22/Makefile.am,
-	sptests/sp23/Makefile.am, sptests/sp24/Makefile.am,
-	sptests/sp25/Makefile.am, tmtests/tm01/Makefile.am,
-	tmtests/tm02/Makefile.am, tmtests/tm03/Makefile.am,
-	tmtests/tm04/Makefile.am, tmtests/tm05/Makefile.am,
-	tmtests/tm06/Makefile.am, tmtests/tm07/Makefile.am,
-	tmtests/tm08/Makefile.am, tmtests/tm09/Makefile.am,
-	tmtests/tm10/Makefile.am, tmtests/tm11/Makefile.am,
-	tmtests/tm12/Makefile.am, tmtests/tm13/Makefile.am,
-	tmtests/tm14/Makefile.am, tmtests/tm15/Makefile.am,
-	tmtests/tm16/Makefile.am, tmtests/tm17/Makefile.am,
-	tmtests/tm18/Makefile.am, tmtests/tm19/Makefile.am,
-	tmtests/tm20/Makefile.am, tmtests/tm21/Makefile.am,
-	tmtests/tm22/Makefile.am, tmtests/tm23/Makefile.am,
-	tmtests/tm24/Makefile.am, tmtests/tm25/Makefile.am,
-	tmtests/tm28/Makefile.am, tmtests/tm29/Makefile.am,
-	tmtests/tmck/Makefile.am, tmtests/tmoverhd/Makefile.am: Executables
-	should end in .exe just like their C counterparts.
-
-2007-10-25	Glenn Humphrey <glenn.humphrey@OARcorp.com>
-
-	* configure.ac, samples/Makefile.am: Added a test for Clock_Get_Uptime
-	* samples/nsecs/.cvsignore, samples/nsecs/Makefile.am,
-	samples/nsecs/config.h, samples/nsecs/nsecs.adb,
-	samples/nsecs/nsecs.scn, samples/nsecs/sptest.adb,
-	samples/nsecs/sptest.ads: New files.
-
-2007-10-18	Glenn Humphrey <glenn.humphrey@OARcorp.com>
-
-	* sptests/sp16/sptest.ads, sptests/sp20/sptest.adb,
-	sptests/sp20/sptest.ads: Forgot to update the copyright.
-
-2007-10-18	Glenn Humphrey <glenn.humphrey@OARcorp.com>
-
-	* sptests/sp09/sp09.scn, sptests/sp09/sptest.adb,
-	sptests/sp13/sp13.scn, sptests/sp13/sptest.adb,
-	sptests/sp16/sp16.scn, sptests/sp16/sptest.adb,
-	sptests/sp16/sptest.ads, sptests/sp20/sp20.scn,
-	sptests/sp20/sptest.adb, sptests/sp20/sptest.ads: Updated tests to
-	match the current C tests and regenerated the .scn files.
-
-2007-10-10	Glenn Humphrey <glenn.humphrey@OARcorp.com>
-
-	* configure.ac, samples/base_sp/base_sp.scn, samples/base_sp/config.h,
-	samples/base_sp/sptest.adb, samples/hello/config.h,
-	samples/ticker/config.h, samples/ticker/ticker.scn,
-	sptests/Makefile.am, sptests/sp01/sp01.scn, sptests/sp02/config.h,
-	sptests/sp02/sp02.scn, sptests/sp03/config.h, sptests/sp03/sp03.scn,
-	sptests/sp04/sp04.scn, sptests/sp04/sptest.adb,
-	sptests/sp05/config.h, sptests/sp05/sp05.scn, sptests/sp06/config.h,
-	sptests/sp07/config.h, sptests/sp07/sp07.scn,
-	sptests/sp07/sptest.adb, sptests/sp07/sptest.ads,
-	sptests/sp08/config.h, sptests/sp08/sp08.scn,
-	sptests/sp09/Makefile.am, sptests/sp09/config.h,
-	sptests/sp09/sp09.scn, sptests/sp09/sptest.adb,
-	sptests/sp09/sptest.ads, sptests/sp11/config.h,
-	sptests/sp11/sp11.scn, sptests/sp12/config.h, sptests/sp12/sp12.scn,
-	sptests/sp13/config.h, sptests/sp13/sp13.scn,
-	sptests/sp13/sptest.adb, sptests/sp14/config.h,
-	sptests/sp14/sp14.scn, sptests/sp15/config.h, sptests/sp15/sp15.scn,
-	sptests/sp16/config.h, sptests/sp16/sp16.scn,
-	sptests/sp16/sptest.adb, sptests/sp17/config.h,
-	sptests/sp19/config.h, sptests/sp19/sp19.scn, sptests/sp20/config.h,
-	sptests/sp20/sp20.scn, sptests/sp22/config.h, sptests/sp22/sp22.scn,
-	sptests/sp23/config.h, sptests/sp23/sp23.scn, sptests/sp24/config.h,
-	sptests/sp24/sp24.scn, sptests/sp25/config.h, sptests/sp25/sp25.scn,
-	support/init.c, support/test_support.adb, support/test_support.ads,
-	tmtests/tm09/config.h, tmtests/tm20/tmtest.adb,
-	tmtests/tmoverhd/dummy_rtems.adb, tmtests/tmoverhd/dummy_rtems.ads,
-	tmtests/tmoverhd/tmtest.adb, tmtests/tmoverhd/tmtest.ads: Updated
-	tests so that they would all compile and run without errors. Some
-	tests that are no longer valid using the current binding were
-	removed. Also updated the .scn files to reflect the current test
-	output.
-	* sptests/sp21/.cvsignore, sptests/sp21/Makefile.am,
-	sptests/sp21/config.h, sptests/sp21/sp21.adb, sptests/sp21/sp21.scn,
-	sptests/sp21/sptest.adb, sptests/sp21/sptest.ads,
-	sptests/spsize/.cvsignore, sptests/spsize/Makefile.am,
-	sptests/spsize/spsize.adb, sptests/spsize/sptest.adb,
-	sptests/spsize/sptest.ads: Removed.
-
-2007-10-03	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
-	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
-	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
-	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
-	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
-	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
-	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
-	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
-	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
-	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
-	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
-	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
-	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
-	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am: Basic
-	build structure should now be correct. The remaining issues should be
-	test specific.
-	* mptests/mp01/config_base.h, mptests/mp01/node1/config.h,
-	mptests/mp01/node1/mp01_node1.adb, mptests/mp01/node2/config.h,
-	mptests/mp01/node2/mp01_node2.adb, mptests/mp02/config_base.h,
-	mptests/mp02/node1/config.h, mptests/mp02/node1/mp02_node1.adb,
-	mptests/mp02/node2/config.h, mptests/mp02/node2/mp02_node2.adb,
-	mptests/mp03/config_base.h, mptests/mp03/node1/config.h,
-	mptests/mp03/node1/mp03_node1.adb, mptests/mp03/node2/config.h,
-	mptests/mp03/node2/mp03_node2.adb, mptests/mp04/config_base.h,
-	mptests/mp04/node1/config.h, mptests/mp04/node1/mp04_node1.adb,
-	mptests/mp04/node2/config.h, mptests/mp04/node2/mp04_node2.adb,
-	mptests/mp05/config_base.h, mptests/mp05/node1/config.h,
-	mptests/mp05/node1/mp05_node1.adb, mptests/mp05/node2/config.h,
-	mptests/mp05/node2/mp05_node2.adb, mptests/mp06/config_base.h,
-	mptests/mp06/node1/config.h, mptests/mp06/node1/mp06_node1.adb,
-	mptests/mp06/node2/config.h, mptests/mp06/node2/mp06_node2.adb,
-	mptests/mp07/config_base.h, mptests/mp07/node1/config.h,
-	mptests/mp07/node1/mp07_node1.adb, mptests/mp07/node2/config.h,
-	mptests/mp07/node2/mp07_node2.adb, mptests/mp08/config_base.h,
-	mptests/mp08/node1/config.h, mptests/mp08/node1/mp08_node1.adb,
-	mptests/mp08/node2/config.h, mptests/mp08/node2/mp08_node2.adb,
-	mptests/mp09/config_base.h, mptests/mp09/node1/config.h,
-	mptests/mp09/node1/mp09_node1.adb, mptests/mp09/node2/config.h,
-	mptests/mp09/node2/mp09_node2.adb, mptests/mp10/config_base.h,
-	mptests/mp10/node1/config.h, mptests/mp10/node1/mp10_node1.adb,
-	mptests/mp10/node2/config.h, mptests/mp10/node2/mp10_node2.adb,
-	mptests/mp11/config_base.h, mptests/mp11/node1/config.h,
-	mptests/mp11/node1/mp11_node1.adb, mptests/mp11/node2/config.h,
-	mptests/mp11/node2/mp11_node2.adb, mptests/mp12/config_base.h,
-	mptests/mp12/node1/config.h, mptests/mp12/node1/mp12_node1.adb,
-	mptests/mp12/node2/config.h, mptests/mp12/node2/mp12_node2.adb,
-	mptests/mp13/config_base.h, mptests/mp13/node1/config.h,
-	mptests/mp13/node1/mp13_node1.adb, mptests/mp13/node2/config.h,
-	mptests/mp13/node2/mp13_node2.adb, mptests/mp14/config_base.h,
-	mptests/mp14/node1/config.h, mptests/mp14/node1/mp14_node1.adb,
-	mptests/mp14/node2/config.h, mptests/mp14/node2/mp14_node2.adb:
-	New files. GNATMAKE is easier to operate if the filename of the
-	main package matches the executable name.  In this case, we needed
-	one for each node's executable.
-	* mptests/mp01/config.h: Removed.
-
-2007-10-01	Joel Sherrill <joel.sherrill@OARcorp.com>
-
-	* mptests/mp01/mptest.adb, mptests/mp01/mptest.ads,
-	mptests/mp01/node1/Makefile.am, mptests/mp02/mptest.adb,
-	mptests/mp02/mptest.ads, mptests/mp03/mptest.adb,
-	mptests/mp03/mptest.ads, mptests/mp04/mptest.adb,
-	mptests/mp04/mptest.ads, mptests/mp05/mptest.adb,
-	mptests/mp05/mptest.ads, mptests/mp06/mptest.adb,
-	mptests/mp06/mptest.ads, mptests/mp07/mptest.adb,
-	mptests/mp07/mptest.ads, mptests/mp08/mptest.adb,
-	mptests/mp08/mptest.ads, mptests/mp09/mptest.adb,
-	mptests/mp09/mptest.ads, mptests/mp10/mptest.adb,
-	mptests/mp10/mptest.ads, mptests/mp11/mptest.adb,
-	mptests/mp11/mptest.ads, mptests/mp12/mptest.adb,
-	mptests/mp12/mptest.ads, mptests/mp13/mptest.adb,
-	mptests/mp13/mptest.ads, mptests/mp14/mptest.adb,
-	mptests/mp14/mptest.ads, support/init.c, support/test_support.adb,
-	support/test_support.ads: Most of single processor Ada tests now
-	build. Some run.
-
 2007-05-23	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* support/init.c: Spacing cleanup.

c/src/ada-tests/ada.am

@@ -1,6 +1,6 @@
 SUFFIXES = .adb .ali .ads .adp
 
-GNATMAKE = @GNATMAKE@
+GNATMAKE = @GNATMAKE@ -cargs $(GCCSPECS) -largs $(GCCSPECS)
 
 AM_ADAFLAGS = -I$(PROJECT_ROOT)/lib/include/adainclude \
 -I$(PROJECT_ROOT)/@RTEMS_BSP@/lib/include/adainclude \
@@ -10,9 +10,7 @@ GNATCOMPILE = $(GNATMAKE) \
 -bargs -Mgnat_main \
 -margs $(AM_ADAFLAGS) $(ADAFLAGS) \
 -cargs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-    $(GCCSPECS) \
 -largs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-    $(GCCSPECS) \
 $(AM_LDFLAGS) $(LDFLAGS) init.o
 
 CLEANFILES = *.ali *.o b~*.adb b~*.ads

c/src/ada-tests/ada_mvscn

@@ -1,65 +0,0 @@
-while read f
-do
-  bname=`basename $f`
-  # mv $f `dirname $f`/ada_`basename $f`
-  cvs rm -f $f 
-  cvs add `dirname $f`/ada_`basename $f`
-done <<EOF
-./sptests/sp15/sp15.scn
-./sptests/sp24/sp24.scn
-./sptests/sp20/sp20.scn
-./sptests/sp17/sp17.scn
-./sptests/sp19/sp19.scn
-./sptests/sp09/sp09.scn
-./sptests/sp07/sp07.scn
-./sptests/sp12/sp12.scn
-./sptests/sp14/sp14.scn
-./sptests/sp03/sp03.scn
-./sptests/sp23/sp23.scn
-./sptests/sp16/sp16.scn
-./sptests/sp06/sp06.scn
-./sptests/sp04/sp04.scn
-./sptests/sp11/sp11.scn
-./sptests/sp01/sp01.scn
-./sptests/sp22/sp22.scn
-./sptests/sp05/sp05.scn
-./sptests/sp02/sp02.scn
-./sptests/sp08/sp08.scn
-./sptests/sp25/sp25.scn
-./sptests/sp13/sp13.scn
-./mptests/mp13/node2/mp13-node2.scn
-./mptests/mp13/node1/mp13-node1.scn
-./mptests/mp02/node2/mp02-node2.scn
-./mptests/mp02/node1/mp02-node1.scn
-./mptests/mp01/node2/mp01-node2.scn
-./mptests/mp01/node1/mp01-node1.scn
-./mptests/mp10/node2/mp10-node2.scn
-./mptests/mp10/node1/mp10-node1.scn
-./mptests/mp11/node2/mp11-node2.scn
-./mptests/mp11/node1/mp11-node1.scn
-./mptests/mp03/node2/mp03-node2.scn
-./mptests/mp03/node1/mp03-node1.scn
-./mptests/mp05/node2/mp05-node2.scn
-./mptests/mp05/node1/mp05-node1.scn
-./mptests/mp12/node2/mp12-node2.scn
-./mptests/mp12/node1/mp12-node1.scn
-./mptests/mp14/node2/mp14-node2.scn
-./mptests/mp14/node1/mp14-node1.scn
-./mptests/mp04/node2/mp04-node2.scn
-./mptests/mp04/node1/mp04-node1.scn
-./mptests/mp08/node2/mp08-node2.scn
-./mptests/mp08/node1/mp08-node1.scn
-./mptests/mp07/node2/mp07-node2.scn
-./mptests/mp07/node1/mp07-node1.scn
-./mptests/mp06/node2/mp06-node2.scn
-./mptests/mp06/node1/mp06-node1.scn
-./mptests/mp09/node2/mp09-node2.scn
-./mptests/mp09/node1/mp09-node1.scn
-./mvscn
-./samples/base_mp/node2/base_mp-node2.scn
-./samples/base_mp/node1/base_mp-node1.scn
-./samples/hello/hello.scn
-./samples/base_sp/base_sp.scn
-./samples/nsecs/nsecs.scn
-./samples/ticker/ticker.scn
-EOF

c/src/ada-tests/configure.ac

@@ -48,7 +48,6 @@ samples/Makefile
 samples/base_sp/Makefile
 samples/hello/Makefile
 samples/ticker/Makefile
-samples/nsecs/Makefile
 samples/base_mp/Makefile
 samples/base_mp/node1/Makefile
 samples/base_mp/node2/Makefile
@@ -74,11 +73,12 @@ sptests/sp16/Makefile
 sptests/sp17/Makefile
 sptests/sp19/Makefile
 sptests/sp20/Makefile
+sptests/sp21/Makefile
 sptests/sp22/Makefile
 sptests/sp23/Makefile
 sptests/sp24/Makefile
 sptests/sp25/Makefile
-sptests/spname01/Makefile
+sptests/spsize/Makefile
 ])
 
 AC_CONFIG_FILES([

c/src/ada-tests/mptests/mp01/config.h

@@ -2,7 +2,7 @@
  *
  *  This include file defines the Configuration Table for this test.
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-1997.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may in
@@ -15,7 +15,7 @@
 
 /* configuration information */
 
-#define CONFIGURE_APPLICATION
+#define CONFIGURE_MPTEST
 
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
@@ -27,8 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
 
-#define CONFIGURE_MAXIMUM_TASKS              1
-
 #include <rtems/confdefs.h>
 
 /* end of include file */

c/src/ada-tests/mptests/mp01/config_base.h

@@ -1,32 +0,0 @@
-/*  config_base.h
- *
- *  This include file defines all of the Configuration Table for this test
- *  EXCEPT the NODE NUMBER.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_TASKS                       2
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <rtems/confdefs.h>
-
-/* end of include file */

c/src/ada-tests/mptests/mp01/mptest.adb

@@ -28,6 +28,8 @@ with UNSIGNED32_IO;
 
 package body MPTEST is
 
+   package body PER_NODE_CONFIGURATION is separate;
+
 --PAGE
 --
 --  INIT
@@ -36,7 +38,7 @@ package body MPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    ) is
-      C      : CHARACTER;
+      C      : RTEMS.CHARACTER;
       TIME   : RTEMS.TIME_OF_DAY;
       STATUS : RTEMS.STATUS_CODES;
    begin
@@ -44,12 +46,12 @@ package body MPTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT( "*** TEST 1 -- NODE " );
       UNSIGNED32_IO.PUT(
-         TEST_SUPPORT.NODE,
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
          WIDTH => 1
       );
       TEXT_IO.PUT_LINE( " ***" );
      
-      if TEST_SUPPORT.NODE /= 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE /= 1 then
          C := 'S';
       else
          C := 'M';

c/src/ada-tests/mptests/mp01/mptest.ads

@@ -43,7 +43,6 @@ package MPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, INIT);
 
 --
 --  TEST_TASK
@@ -56,6 +55,108 @@ package MPTEST is
    procedure TEST_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, TEST_TASK);
+
+--
+--  This is the Driver Address Table for this test.
+--
+
+   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
+   (1=>
+      (
+        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
+        RTEMS.NO_DRIVER_ENTRY,                       -- Open
+        RTEMS.NO_DRIVER_ENTRY,                       -- Close
+        RTEMS.NO_DRIVER_ENTRY,                       -- Read
+        RTEMS.NO_DRIVER_ENTRY,                       -- Write
+        RTEMS.NO_DRIVER_ENTRY                        -- Control
+      )
+   );
+
+--
+--  This is the Initialization Tasks Table for this test.
+--
+
+   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
+   (1=>
+     (
+       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
+       2048,                                          -- stack size
+       1,                                             -- priority
+       RTEMS.GLOBAL,                                  -- attributes
+       MPTEST.INIT'ACCESS,                            -- entry point
+       RTEMS.NO_PREEMPT,                              -- initial mode
+       0                                              -- argument list
+     )
+   );
+
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                             BEGIN SUBPACKAGE                           --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+   --
+   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
+   --
+   --  DESCRIPTION:
+   --
+   --  This package is the specification for the subpackage
+   --  which will define the per node configuration parameters.
+   --
+   
+   package PER_NODE_CONFIGURATION is
+
+   --
+   --  LOCAL_NODE_NUMBER
+   --
+   --  DESCRIPTION:
+   --
+   --  This function returns the node number for this node.
+   --
+
+      function LOCAL_NODE_NUMBER 
+      return RTEMS.UNSIGNED32;
+  
+      pragma INLINE ( LOCAL_NODE_NUMBER );
+
+   end PER_NODE_CONFIGURATION;
+  
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                              END SUBPACKAGE                            --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+--
+--  This is the Multiprocessor Configuration Table for this test.
+--
+
+   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
+      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
+      2,                         -- maximum # nodes in system 
+      33,                        -- maximum # global objects
+      33                         -- maximum # proxies
+    );
+
+--
+--  This is the Configuration Table for this test.
+--
+
+   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
+      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
+      64 * 1024,                 -- executive RAM size
+      10,                        -- maximum # tasks
+      0,                         -- maximum # timers
+      0,                         -- maximum # semaphores
+      0,                         -- maximum # message queues
+      0,                         -- maximum # messages
+      0,                         -- maximum # partitions
+      0,                         -- maximum # regions
+      0,                         -- maximum # dp memory areas
+      0,                         -- maximum # periods
+      0,                         -- maximum # user extensions
+      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
+      50                         -- # ticks in a timeslice
+  );
 
 end MPTEST;

c/src/ada-tests/mptests/mp01/node1/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_ada_mp01_node1.exe
-mp01_ada_mp01_node1_exe_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
-mp01_ada_mp01_node1_exe_SOURCES += ../../../support/init.c
-
-mp01_ada_mp01_node1.exe: mp01_node1.adb ../mptest.adb init.$(OBJEXT)
+node1$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp01-node1.scn
+dist_scn_DATA = mp01-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp01/node1/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      1
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp01/node2/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_ada_mp01_node2.exe
-mp01_ada_mp01_node2_exe_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
-mp01_ada_mp01_node2_exe_SOURCES += ../../../support/init.c
-
-mp01_ada_mp01_node2.exe: mp01_node2.adb ../mptest.adb init.$(OBJEXT)
+node2$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp01-node2.scn
+dist_scn_DATA = mp01-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp01/node2/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      2
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP01_NODE2 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP01_NODE2 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP01_NODE2;
-

c/src/ada-tests/mptests/mp02/config_base.h

@@ -1,32 +0,0 @@
-/*  config_base.h
- *
- *  This include file defines all of the Configuration Table for this test
- *  EXCEPT the NODE NUMBER.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_TASKS                       2
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <rtems/confdefs.h>
-
-/* end of include file */

c/src/ada-tests/mptests/mp02/mptest.adb

@@ -28,6 +28,8 @@ with UNSIGNED32_IO;
 
 package body MPTEST is
 
+   package body PER_NODE_CONFIGURATION is separate;
+
 --PAGE
 --
 --  INIT
@@ -42,7 +44,7 @@ package body MPTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT( "*** TEST 2 -- NODE " );
       UNSIGNED32_IO.PUT(
-         TEST_SUPPORT.NODE,
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
          WIDTH => 1
       );
       TEXT_IO.PUT_LINE( " ***" );
@@ -53,7 +55,7 @@ package body MPTEST is
       TEXT_IO.PUT_LINE( "Creating test task (Global)" );
 
       RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( TEST_SUPPORT.NODE ),
+         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ),
          1, 
          2048, 
          RTEMS.NO_PREEMPT,
@@ -95,7 +97,7 @@ package body MPTEST is
       RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
-      if TEST_SUPPORT.NODE = 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
          REMOTE_NODE := 2;
       else
          REMOTE_NODE := 1;

c/src/ada-tests/mptests/mp02/mptest.ads

@@ -43,7 +43,6 @@ package MPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, INIT);
 
 --
 --  TEST_TASK
@@ -56,6 +55,108 @@ package MPTEST is
    procedure TEST_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, TEST_TASK);
+
+--
+--  This is the Driver Address Table for this test.
+--
+
+   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
+   (1=>
+      (
+        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
+        RTEMS.NO_DRIVER_ENTRY,                       -- Open
+        RTEMS.NO_DRIVER_ENTRY,                       -- Close
+        RTEMS.NO_DRIVER_ENTRY,                       -- Read
+        RTEMS.NO_DRIVER_ENTRY,                       -- Write
+        RTEMS.NO_DRIVER_ENTRY                        -- Control
+      )
+   );
+
+--
+--  This is the Initialization Tasks Table for this test.
+--
+
+   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
+   (1=>
+     (
+       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
+       2048,                                          -- stack size
+       1,                                             -- priority
+       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
+       MPTEST.INIT'ACCESS,                            -- entry point
+       RTEMS.NO_PREEMPT,                              -- initial mode
+       0                                              -- argument list
+     )
+   );
+
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                             BEGIN SUBPACKAGE                           --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+   --
+   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
+   --
+   --  DESCRIPTION:
+   --
+   --  This package is the specification for the subpackage
+   --  which will define the per node configuration parameters.
+   --
+   
+   package PER_NODE_CONFIGURATION is
+
+   --
+   --  LOCAL_NODE_NUMBER
+   --
+   --  DESCRIPTION:
+   --
+   --  This function returns the node number for this node.
+   --
+
+      function LOCAL_NODE_NUMBER 
+      return RTEMS.UNSIGNED32;
+  
+      pragma INLINE ( LOCAL_NODE_NUMBER );
+
+   end PER_NODE_CONFIGURATION;
+  
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                              END SUBPACKAGE                            --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+--
+--  This is the Multiprocessor Configuration Table for this test.
+--
+
+   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
+      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
+      2,                         -- maximum # nodes in system 
+      32,                        -- maximum # global objects
+      32                         -- maximum # proxies
+    );
+
+--
+--  This is the Configuration Table for this test.
+--
+
+   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
+      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
+      64 * 1024,                 -- executive RAM size
+      10,                        -- maximum # tasks
+      0,                         -- maximum # timers
+      0,                         -- maximum # semaphores
+      0,                         -- maximum # message queues
+      0,                         -- maximum # messages
+      0,                         -- maximum # partitions
+      0,                         -- maximum # regions
+      0,                         -- maximum # dp memory areas
+      0,                         -- maximum # periods
+      0,                         -- maximum # user extensions
+      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
+      50                         -- # ticks in a timeslice
+  );
 
 end MPTEST;

c/src/ada-tests/mptests/mp02/node1/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_ada_mp02_node1.exe
-mp02_ada_mp02_node1_exe_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
-mp02_ada_mp02_node1_exe_SOURCES += ../../../support/init.c
-
-mp02_ada_mp02_node1.exe: mp02_node1.adb ../mptest.adb init.$(OBJEXT)
+node1$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp02-node1.scn
+dist_scn_DATA = mp02-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp02/node1/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      1
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP02_NODE1 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP02_NODE1 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP02_NODE1;
-

c/src/ada-tests/mptests/mp02/node2/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_ada_mp02_node2.exe
-mp02_ada_mp02_node2_exe_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
-mp02_ada_mp02_node2_exe_SOURCES += ../../../support/init.c
-
-mp02_ada_mp02_node2.exe: mp02_node2.adb ../mptest.adb init.$(OBJEXT)
+node2$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp02-node2.scn
+dist_scn_DATA = mp02-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp02/node2/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      2
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP02_NODE2 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP02_NODE2 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP02_NODE2;
-

c/src/ada-tests/mptests/mp03/config_base.h

@@ -1,32 +0,0 @@
-/*  config_base.h
- *
- *  This include file defines all of the Configuration Table for this test
- *  EXCEPT the NODE NUMBER.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_TASKS                       2
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <rtems/confdefs.h>
-
-/* end of include file */

c/src/ada-tests/mptests/mp03/mptest.adb

@@ -1,4 +1,8 @@
 --
+--  MPTEST / BODY
+--
+--  DESCRIPTION:
+--
 --  This package is the implementation for Test 3 of the RTEMS
 --  Multiprocessor Test Suite.
 --
@@ -24,6 +28,8 @@ with UNSIGNED32_IO;
 
 package body MPTEST is
 
+   package body PER_NODE_CONFIGURATION is separate;
+
 --PAGE
 --
 --  INIT
@@ -38,7 +44,7 @@ package body MPTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT( "*** TEST 3 -- NODE " );
       UNSIGNED32_IO.PUT(
-         TEST_SUPPORT.NODE,
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
          WIDTH => 1
       );
       TEXT_IO.PUT_LINE( " ***" );
@@ -48,7 +54,7 @@ package body MPTEST is
 
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
       RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
+         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
          1, 
          2048, 
          RTEMS.NO_PREEMPT,
@@ -115,7 +121,7 @@ package body MPTEST is
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
       TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-      if TEST_SUPPORT.NODE = 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
          MPTEST.REMOTE_NODE := 2;
       else
          MPTEST.REMOTE_NODE := 1;
@@ -157,7 +163,7 @@ package body MPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
 
-      if TEST_SUPPORT.NODE = 2 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
          
          RTEMS.TASK_WAKE_AFTER( 
             2 * TEST_SUPPORT.TICKS_PER_SECOND,
@@ -188,7 +194,7 @@ package body MPTEST is
       STATUS : RTEMS.STATUS_CODES;
    begin
 
-      if TEST_SUPPORT.NODE = NODE then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = NODE then
 
          loop
 

c/src/ada-tests/mptests/mp03/mptest.ads

@@ -65,7 +65,6 @@ package MPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, INIT);
 
 --
 --  DELAYED_SEND_EVENT
@@ -80,7 +79,6 @@ package MPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    );
-   pragma Convention (C, DELAYED_SEND_EVENT);
 
 --
 --  TEST_TASK
@@ -93,7 +91,6 @@ package MPTEST is
    procedure TEST_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, TEST_TASK);
 
 --
 --  TEST_TASK_SUPPORT
@@ -109,4 +106,107 @@ package MPTEST is
       NODE : in     RTEMS.UNSIGNED32
    );
 
+--
+--  This is the Driver Address Table for this test.
+--
+
+   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
+   (1=>
+      (
+        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
+        RTEMS.NO_DRIVER_ENTRY,                       -- Open
+        RTEMS.NO_DRIVER_ENTRY,                       -- Close
+        RTEMS.NO_DRIVER_ENTRY,                       -- Read
+        RTEMS.NO_DRIVER_ENTRY,                       -- Write
+        RTEMS.NO_DRIVER_ENTRY                        -- Control
+      )
+   );
+
+--
+--  This is the Initialization Tasks Table for this test.
+--
+
+   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
+   (1=>
+     (
+       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
+       2048,                                          -- stack size
+       1,                                             -- priority
+       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
+       MPTEST.INIT'ACCESS,                            -- entry point
+       RTEMS.NO_PREEMPT,                              -- initial mode
+       0                                              -- argument list
+     )
+   );
+
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                             BEGIN SUBPACKAGE                           --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+   --
+   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
+   --
+   --  DESCRIPTION:
+   --
+   --  This package is the specification for the subpackage
+   --  which will define the per node configuration parameters.
+   --
+   
+   package PER_NODE_CONFIGURATION is
+
+   --
+   --  LOCAL_NODE_NUMBER
+   --
+   --  DESCRIPTION:
+   --
+   --  This function returns the node number for this node.
+   --
+
+      function LOCAL_NODE_NUMBER 
+      return RTEMS.UNSIGNED32;
+  
+      pragma INLINE ( LOCAL_NODE_NUMBER );
+
+   end PER_NODE_CONFIGURATION;
+  
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                              END SUBPACKAGE                            --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+--
+--  This is the Multiprocessor Configuration Table for this test.
+--
+
+   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
+      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
+      2,                         -- maximum # nodes in system 
+      32,                        -- maximum # global objects
+      32                         -- maximum # proxies
+    );
+
+--
+--  This is the Configuration Table for this test.
+--
+
+   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
+      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
+      64 * 1024,                 -- executive RAM size
+      10,                        -- maximum # tasks
+      1,                         -- maximum # timers
+      0,                         -- maximum # semaphores
+      0,                         -- maximum # message queues
+      0,                         -- maximum # messages
+      0,                         -- maximum # partitions
+      0,                         -- maximum # regions
+      0,                         -- maximum # dp memory areas
+      0,                         -- maximum # periods
+      0,                         -- maximum # user extensions
+      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
+      50                         -- # ticks in a timeslice
+  );
+
 end MPTEST;

c/src/ada-tests/mptests/mp03/node1/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_ada_mp03_node1.exe
-mp03_ada_mp03_node1_exe_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
-mp03_ada_mp03_node1_exe_SOURCES += ../../../support/init.c
-
-mp03_ada_mp03_node1.exe: mp03_node1.adb ../mptest.adb init.$(OBJEXT)
+node1$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp03-node1.scn
+dist_scn_DATA = mp03-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp03/node1/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      1
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP03_NODE1 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP03_NODE1 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP03_NODE1;
-

c/src/ada-tests/mptests/mp03/node2/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_ada_mp03_node2.exe
-mp03_ada_mp03_node2_exe_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
-mp03_ada_mp03_node2_exe_SOURCES += ../../../support/init.c
-
-mp03_ada_mp03_node2.exe: mp03_node2.adb ../mptest.adb init.$(OBJEXT)
+node2$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp03-node2.scn
+dist_scn_DATA = mp03-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp03/node2/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      2
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP03_NODE2 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP03_NODE2 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP03_NODE2;
-

c/src/ada-tests/mptests/mp04/config_base.h

@@ -1,32 +0,0 @@
-/*  config_base.h
- *
- *  This include file defines all of the Configuration Table for this test
- *  EXCEPT the NODE NUMBER.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_TASKS                       2
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <rtems/confdefs.h>
-
-/* end of include file */

c/src/ada-tests/mptests/mp04/mptest.adb

@@ -28,6 +28,8 @@ with UNSIGNED32_IO;
 
 package body MPTEST is
 
+   package body PER_NODE_CONFIGURATION is separate;
+
 --PAGE
 --
 --  INIT
@@ -42,7 +44,7 @@ package body MPTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT( "*** TEST 4 -- NODE " );
       UNSIGNED32_IO.PUT(
-         TEST_SUPPORT.NODE,
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
          WIDTH => 1
       );
       TEXT_IO.PUT_LINE( " ***" );
@@ -53,8 +55,8 @@ package body MPTEST is
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
 
       RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
-         TEST_SUPPORT.NODE, 
+         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE, 
          2048, 
          RTEMS.DEFAULT_MODES,
          RTEMS.GLOBAL,
@@ -98,7 +100,7 @@ package body MPTEST is
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
       TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-      if TEST_SUPPORT.NODE = 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
          MPTEST.REMOTE_NODE := 2;
       else
          MPTEST.REMOTE_NODE := 1;
@@ -122,7 +124,7 @@ package body MPTEST is
 
       RTEMS.TASK_SET_PRIORITY(
          MPTEST.REMOTE_TID,
-         TEST_SUPPORT.NODE,
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
          PREVIOUS_PRIORITY,
          STATUS
       );

c/src/ada-tests/mptests/mp04/mptest.ads

@@ -57,7 +57,6 @@ package MPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, INIT);
 
 --
 --  TEST_TASK
@@ -70,6 +69,108 @@ package MPTEST is
    procedure TEST_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, TEST_TASK);
+
+--
+--  This is the Driver Address Table for this test.
+--
+
+   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
+   (1=>
+      (
+        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
+        RTEMS.NO_DRIVER_ENTRY,                       -- Open
+        RTEMS.NO_DRIVER_ENTRY,                       -- Close
+        RTEMS.NO_DRIVER_ENTRY,                       -- Read
+        RTEMS.NO_DRIVER_ENTRY,                       -- Write
+        RTEMS.NO_DRIVER_ENTRY                        -- Control
+      )
+   );
+
+--
+--  This is the Initialization Tasks Table for this test.
+--
+
+   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
+   (1=>
+     (
+       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
+       2048,                                          -- stack size
+       1,                                             -- priority
+       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
+       MPTEST.INIT'ACCESS,                            -- entry point
+       RTEMS.NO_PREEMPT,                              -- initial mode
+       0                                              -- argument list
+     )
+   );
+
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                             BEGIN SUBPACKAGE                           --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+   --
+   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
+   --
+   --  DESCRIPTION:
+   --
+   --  This package is the specification for the subpackage
+   --  which will define the per node configuration parameters.
+   --
+   
+   package PER_NODE_CONFIGURATION is
+
+   --
+   --  LOCAL_NODE_NUMBER
+   --
+   --  DESCRIPTION:
+   --
+   --  This function returns the node number for this node.
+   --
+
+      function LOCAL_NODE_NUMBER 
+      return RTEMS.UNSIGNED32;
+  
+      pragma INLINE ( LOCAL_NODE_NUMBER );
+
+   end PER_NODE_CONFIGURATION;
+  
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                              END SUBPACKAGE                            --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+--
+--  This is the Multiprocessor Configuration Table for this test.
+--
+
+   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
+      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
+      2,                         -- maximum # nodes in system 
+      32,                        -- maximum # global objects
+      32                         -- maximum # proxies
+    );
+
+--
+--  This is the Configuration Table for this test.
+--
+
+   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
+      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
+      64 * 1024,                 -- executive RAM size
+      10,                        -- maximum # tasks
+      1,                         -- maximum # timers
+      0,                         -- maximum # semaphores
+      0,                         -- maximum # message queues
+      0,                         -- maximum # messages
+      0,                         -- maximum # partitions
+      0,                         -- maximum # regions
+      0,                         -- maximum # dp memory areas
+      0,                         -- maximum # periods
+      0,                         -- maximum # user extensions
+      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
+      50                         -- # ticks in a timeslice
+  );
 
 end MPTEST;

c/src/ada-tests/mptests/mp04/node1/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_ada_mp04_node1.exe
-mp04_ada_mp04_node1_exe_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
-mp04_ada_mp04_node1_exe_SOURCES += ../../../support/init.c
-
-mp04_ada_mp04_node1.exe: mp04_node1.adb ../mptest.adb init.$(OBJEXT)
+node1$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp04-node1.scn
+dist_scn_DATA = mp04-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp04/node1/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      1
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP04_NODE1 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP04_NODE1 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP04_NODE1;
-

c/src/ada-tests/mptests/mp04/node2/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_ada_mp04_node2.exe
-mp04_ada_mp04_node2_exe_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
-mp04_ada_mp04_node2_exe_SOURCES += ../../../support/init.c
-
-mp04_ada_mp04_node2.exe: mp04_node2.adb ../mptest.adb init.$(OBJEXT)
+node2$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp04-node2.scn
+dist_scn_DATA = mp04-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp04/node2/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      2
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP04_NODE2 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP04_NODE2 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP04_NODE2;
-

c/src/ada-tests/mptests/mp05/config_base.h

@@ -1,32 +0,0 @@
-/*  config_base.h
- *
- *  This include file defines all of the Configuration Table for this test
- *  EXCEPT the NODE NUMBER.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_TASKS                       2
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <rtems/confdefs.h>
-
-/* end of include file */

c/src/ada-tests/mptests/mp05/mptest.adb

@@ -28,6 +28,8 @@ with UNSIGNED32_IO;
 
 package body MPTEST is
 
+   package body PER_NODE_CONFIGURATION is separate;
+
 --PAGE
 --
 --  INIT
@@ -42,7 +44,7 @@ package body MPTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT( "*** TEST 5 -- NODE " );
       UNSIGNED32_IO.PUT(
-         TEST_SUPPORT.NODE,
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
          WIDTH => 1
       );
       TEXT_IO.PUT_LINE( " ***" );
@@ -53,7 +55,7 @@ package body MPTEST is
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
 
       RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
+         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
          1,
          2048, 
          RTEMS.TIMESLICE,
@@ -77,7 +79,7 @@ package body MPTEST is
       MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
 
       RTEMS.TIMER_CREATE(
-         MPTEST.TIMER_NAME( TEST_SUPPORT.NODE ),
+         MPTEST.TIMER_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ),
          MPTEST.TIMER_ID( 1 ),
          STATUS
       );
@@ -156,7 +158,7 @@ package body MPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" );
 
-      if TEST_SUPPORT.NODE = 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
          MPTEST.REMOTE_NODE     := 2;
          MPTEST.REMOTE_SIGNAL   := RTEMS.SIGNAL_18;
          MPTEST.EXPECTED_SIGNAL := RTEMS.SIGNAL_17;
@@ -192,7 +194,7 @@ package body MPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
 
-      if TEST_SUPPORT.NODE = 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
 
          TEXT_IO.PUT_LINE( "Sending signal to remote task" );
          loop

c/src/ada-tests/mptests/mp05/mptest.ads

@@ -43,7 +43,7 @@ package MPTEST is
 --
 --  This variable is set when the test should stop executing.
 --
-   STOP_TEST : BOOLEAN;
+   STOP_TEST : RTEMS.BOOLEAN;
 
 --
 --  This variable contains the ID of the remote task with which this
@@ -77,7 +77,7 @@ package MPTEST is
 --  signal sets have been caught cumulative.
 --
 
-   SIGNAL_CAUGHT : BOOLEAN;
+   SIGNAL_CAUGHT : RTEMS.BOOLEAN;
    SIGNAL_COUNT  : RTEMS.UNSIGNED32;
 
 --
@@ -97,7 +97,6 @@ package MPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, INIT);
 
 --
 --  PROCESS_ASR
@@ -110,7 +109,6 @@ package MPTEST is
    procedure PROCESS_ASR (
       SIGNAL : in     RTEMS.SIGNAL_SET
    );
-   pragma Convention (C, PROCESS_ASR);
 
 --
 --  STOP_TEST_TSR
@@ -124,7 +122,6 @@ package MPTEST is
       IGNORED_ID      : in     RTEMS.ID;
       IGNORED_ADDRESS : in     RTEMS.ADDRESS
    );
-   pragma Convention (C, STOP_TEST_TSR);
 
 --
 --  TEST_TASK
@@ -137,6 +134,108 @@ package MPTEST is
    procedure TEST_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, TEST_TASK);
+
+--
+--  This is the Driver Address Table for this test.
+--
+
+   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
+   (1=>
+      (
+        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
+        RTEMS.NO_DRIVER_ENTRY,                       -- Open
+        RTEMS.NO_DRIVER_ENTRY,                       -- Close
+        RTEMS.NO_DRIVER_ENTRY,                       -- Read
+        RTEMS.NO_DRIVER_ENTRY,                       -- Write
+        RTEMS.NO_DRIVER_ENTRY                        -- Control
+      )
+   );
+
+--
+--  This is the Initialization Tasks Table for this test.
+--
+
+   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
+   (1=>
+     (
+       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
+       2048,                                          -- stack size
+       1,                                             -- priority
+       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
+       MPTEST.INIT'ACCESS,                            -- entry point
+       RTEMS.NO_PREEMPT,                              -- initial mode
+       0                                              -- argument list
+     )
+   );
+
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                             BEGIN SUBPACKAGE                           --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+   --
+   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
+   --
+   --  DESCRIPTION:
+   --
+   --  This package is the specification for the subpackage
+   --  which will define the per node configuration parameters.
+   --
+   
+   package PER_NODE_CONFIGURATION is
+
+   --
+   --  LOCAL_NODE_NUMBER
+   --
+   --  DESCRIPTION:
+   --
+   --  This function returns the node number for this node.
+   --
+
+      function LOCAL_NODE_NUMBER 
+      return RTEMS.UNSIGNED32;
+  
+      pragma INLINE ( LOCAL_NODE_NUMBER );
+
+   end PER_NODE_CONFIGURATION;
+  
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                              END SUBPACKAGE                            --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+--
+--  This is the Multiprocessor Configuration Table for this test.
+--
+
+   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
+      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
+      2,                         -- maximum # nodes in system 
+      32,                        -- maximum # global objects
+      32                         -- maximum # proxies
+    );
+
+--
+--  This is the Configuration Table for this test.
+--
+
+   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
+      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
+      64 * 1024,                 -- executive RAM size
+      10,                        -- maximum # tasks
+      1,                         -- maximum # timers
+      2,                         -- maximum # semaphores
+      0,                         -- maximum # message queues
+      0,                         -- maximum # messages
+      0,                         -- maximum # partitions
+      0,                         -- maximum # regions
+      0,                         -- maximum # dp memory areas
+      0,                         -- maximum # periods
+      0,                         -- maximum # user extensions
+      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
+      50                         -- # ticks in a timeslice
+  );
 
 end MPTEST;

c/src/ada-tests/mptests/mp05/node1/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_ada_mp05_node1.exe
-mp05_ada_mp05_node1_exe_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
-mp05_ada_mp05_node1_exe_SOURCES += ../../../support/init.c
-
-mp05_ada_mp05_node1.exe: mp05_node1.adb ../mptest.adb init.$(OBJEXT)
+node1$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp05-node1.scn
+dist_scn_DATA = mp05-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp05/node1/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      1
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP05_NODE1 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP05_NODE1 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP05_NODE1;
-

c/src/ada-tests/mptests/mp05/node2/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_ada_mp05_node2.exe
-mp05_ada_mp05_node2_exe_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
-mp05_ada_mp05_node2_exe_SOURCES += ../../../support/init.c
-
-mp05_ada_mp05_node2.exe: mp05_node2.adb ../mptest.adb init.$(OBJEXT)
+node2$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp05-node2.scn
+dist_scn_DATA = mp05-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp05/node2/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      2
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP05_NODE2 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP05_NODE2 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP05_NODE2;
-

c/src/ada-tests/mptests/mp06/config_base.h

@@ -1,32 +0,0 @@
-/*  config_base.h
- *
- *  This include file defines all of the Configuration Table for this test
- *  EXCEPT the NODE NUMBER.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_TASKS                       2
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <rtems/confdefs.h>
-
-/* end of include file */

c/src/ada-tests/mptests/mp06/mptest.adb

@@ -28,6 +28,8 @@ with UNSIGNED32_IO;
 
 package body MPTEST is
 
+   package body PER_NODE_CONFIGURATION is separate;
+
 --PAGE
 --
 --  INIT
@@ -42,7 +44,7 @@ package body MPTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT( "*** TEST 6 -- NODE " );
       UNSIGNED32_IO.PUT(
-         TEST_SUPPORT.NODE,
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
          WIDTH => 1
       );
       TEXT_IO.PUT_LINE( " ***" );
@@ -53,8 +55,8 @@ package body MPTEST is
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
 
       RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
-         TEST_SUPPORT.NODE, 
+         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
+         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE, 
          2048, 
          RTEMS.DEFAULT_MODES,
          RTEMS.GLOBAL,
@@ -77,7 +79,7 @@ package body MPTEST is
       MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
 
       RTEMS.TIMER_CREATE(
-         MPTEST.TIMER_NAME( TEST_SUPPORT.NODE ),
+         MPTEST.TIMER_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ),
          MPTEST.TIMER_ID( 1 ),
          STATUS
       );
@@ -121,7 +123,7 @@ package body MPTEST is
 
       MPTEST.STOP_TEST := FALSE;
 
-      if TEST_SUPPORT.NODE = 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
          MPTEST.REMOTE_NODE     := 2;
       else
          MPTEST.REMOTE_NODE     := 1;
@@ -145,7 +147,7 @@ package body MPTEST is
 
       end loop;
 
-      if TEST_SUPPORT.NODE = 1 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
          TEXT_IO.PUT_LINE( "Sending events to remote task" );
       else
          TEXT_IO.PUT_LINE( "Receiving events from remote task" );
@@ -171,7 +173,7 @@ package body MPTEST is
                INTEGER( COUNT ) mod MPTEST.EVENT_SET_TABLE'LAST + 1
             );
 
-         if TEST_SUPPORT.NODE = 1 then
+         if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
 
             RTEMS.EVENT_SEND( 
                MPTEST.REMOTE_TID,
@@ -193,7 +195,7 @@ package body MPTEST is
             if RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.TIMEOUT ) then
                TEXT_IO.NEW_LINE( 1 );
 
-               if TEST_SUPPORT.NODE = 2 then
+               if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
                   TEXT_IO.PUT_LINE(
                      "Correct behavior if the other node exitted."
                   );
@@ -225,7 +227,7 @@ package body MPTEST is
 
       TEXT_IO.NEW_LINE;
 
-      if TEST_SUPPORT.NODE = 2 then
+      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
 
          RTEMS.EVENT_RECEIVE( 
             RTEMS.EVENT_16,

c/src/ada-tests/mptests/mp06/mptest.ads

@@ -43,7 +43,7 @@ package MPTEST is
 --
 --  This variable is set when the test should stop executing.
 --
-   STOP_TEST : BOOLEAN;
+   STOP_TEST : RTEMS.BOOLEAN;
 
 --
 --  This variable contains the ID of the remote task with which this
@@ -116,7 +116,6 @@ package MPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, INIT);
 
 --
 --  STOP_TEST_TSR
@@ -130,7 +129,6 @@ package MPTEST is
       IGNORED1 : in     RTEMS.ID;
       IGNORED2 : in     RTEMS.ADDRESS
    );
-   pragma Convention (C, STOP_TEST_TSR);
 
 --
 --  TEST_TASK
@@ -143,6 +141,108 @@ package MPTEST is
    procedure TEST_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
-   pragma Convention (C, TEST_TASK);
+
+--
+--  This is the Driver Address Table for this test.
+--
+
+   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
+   (1=>
+      (
+        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
+        RTEMS.NO_DRIVER_ENTRY,                       -- Open
+        RTEMS.NO_DRIVER_ENTRY,                       -- Close
+        RTEMS.NO_DRIVER_ENTRY,                       -- Read
+        RTEMS.NO_DRIVER_ENTRY,                       -- Write
+        RTEMS.NO_DRIVER_ENTRY                        -- Control
+      )
+   );
+
+--
+--  This is the Initialization Tasks Table for this test.
+--
+
+   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
+   (1=>
+     (
+       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
+       2048,                                          -- stack size
+       1,                                             -- priority
+       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
+       MPTEST.INIT'ACCESS,                            -- entry point
+       RTEMS.NO_PREEMPT,                              -- initial mode
+       0                                              -- argument list
+     )
+   );
+
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                             BEGIN SUBPACKAGE                           --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+   --
+   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
+   --
+   --  DESCRIPTION:
+   --
+   --  This package is the specification for the subpackage
+   --  which will define the per node configuration parameters.
+   --
+   
+   package PER_NODE_CONFIGURATION is
+
+   --
+   --  LOCAL_NODE_NUMBER
+   --
+   --  DESCRIPTION:
+   --
+   --  This function returns the node number for this node.
+   --
+
+      function LOCAL_NODE_NUMBER 
+      return RTEMS.UNSIGNED32;
+  
+      pragma INLINE ( LOCAL_NODE_NUMBER );
+
+   end PER_NODE_CONFIGURATION;
+  
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+--                              END SUBPACKAGE                            --
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
+--
+--  This is the Multiprocessor Configuration Table for this test.
+--
+
+   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
+      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
+      2,                         -- maximum # nodes in system 
+      32,                        -- maximum # global objects
+      32                         -- maximum # proxies
+    );
+
+--
+--  This is the Configuration Table for this test.
+--
+
+   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
+      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
+      64 * 1024,                 -- executive RAM size
+      10,                        -- maximum # tasks
+      1,                         -- maximum # timers
+      2,                         -- maximum # semaphores
+      0,                         -- maximum # message queues
+      0,                         -- maximum # messages
+      0,                         -- maximum # partitions
+      0,                         -- maximum # regions
+      0,                         -- maximum # dp memory areas
+      0,                         -- maximum # periods
+      0,                         -- maximum # user extensions
+      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
+      50                         -- # ticks in a timeslice
+  );
 
 end MPTEST;

c/src/ada-tests/mptests/mp06/node1/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_ada_mp06_node1.exe
-mp06_ada_mp06_node1_exe_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
-mp06_ada_mp06_node1_exe_SOURCES += ../../../support/init.c
-
-mp06_ada_mp06_node1.exe: mp06_node1.adb ../mptest.adb init.$(OBJEXT)
+node1$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp06-node1.scn
+dist_scn_DATA = mp06-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp06/node1/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      1
-
-#include "../config_base.h"
-
-/* end of include file */

c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb

@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP06_NODE1 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-2007.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.rtems.com/license/LICENSE.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP06_NODE1 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP06_NODE1;
-

c/src/ada-tests/mptests/mp06/node2/Makefile.am

@@ -7,14 +7,16 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_ada_mp06_node2.exe
-mp06_ada_mp06_node2_exe_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
-mp06_ada_mp06_node2_exe_SOURCES += ../../../support/init.c
-
-mp06_ada_mp06_node2.exe: mp06_node2.adb ../mptest.adb init.$(OBJEXT)
+node2$(EXEEXT): ../mptest.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ada_mp06-node2.scn
+dist_scn_DATA = mp06-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am

c/src/ada-tests/mptests/mp06/node2/config.h

@@ -1,23 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MP_APPLICATION
-#define CONFIGURE_MP_NODE_NUMBER                      2
-
-#include "../config_base.h"
-
-/* end of include file */