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.

2 files changed, 5 insertions, 114 deletions

diff --git a/c/src/ada-tests/mptests/mp03/mptest.adb b/c/src/ada-tests/mptests/mp03/mptest.adb
index 51c96d5f35..7e53e840c6 100644
--- a/c/src/ada-tests/mptests/mp03/mptest.adb
+++ b/c/src/ada-tests/mptests/mp03/mptest.adb
@@ -1,8 +1,4 @@
 --
---  MPTEST / BODY
---
---  DESCRIPTION:
---
 --  This package is the implementation for Test 3 of the RTEMS
 --  Multiprocessor Test Suite.
 --
@@ -28,8 +24,6 @@ with UNSIGNED32_IO;
 
 package body MPTEST is
 
-   package body PER_NODE_CONFIGURATION is separate;
-
 --PAGE
 --
 --  INIT
@@ -44,7 +38,7 @@ package body MPTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT( "*** TEST 3 -- NODE " );
       UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
+         TEST_SUPPORT.NODE,
          WIDTH => 1
       );
       TEXT_IO.PUT_LINE( " ***" );
@@ -54,7 +48,7 @@ package body MPTEST is
 
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
       RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
+         MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
          1, 
          2048, 
          RTEMS.NO_PREEMPT,
@@ -121,7 +115,7 @@ package body MPTEST is
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
       TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
+      if TEST_SUPPORT.NODE = 1 then
          MPTEST.REMOTE_NODE := 2;
       else
          MPTEST.REMOTE_NODE := 1;
@@ -163,7 +157,7 @@ package body MPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
 
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
+      if TEST_SUPPORT.NODE = 2 then
          
          RTEMS.TASK_WAKE_AFTER( 
             2 * TEST_SUPPORT.TICKS_PER_SECOND,
@@ -194,7 +188,7 @@ package body MPTEST is
       STATUS : RTEMS.STATUS_CODES;
    begin
 
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = NODE then
+      if TEST_SUPPORT.NODE = NODE then
 
          loop
 
diff --git a/c/src/ada-tests/mptests/mp03/mptest.ads b/c/src/ada-tests/mptests/mp03/mptest.ads
index d7013d35fd..c3a8b91993 100644
--- a/c/src/ada-tests/mptests/mp03/mptest.ads
+++ b/c/src/ada-tests/mptests/mp03/mptest.ads
@@ -106,107 +106,4 @@ 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;