2011-02-16 Joel Sherrill <joel.sherrill@oarcorp.com>

	* ada-tests/mptests/mp01/mp01.adb, ada-tests/mptests/mp01/mptest.adb,
	ada-tests/mptests/mp01/mptest.ads,
	ada-tests/mptests/mp01/node1/mp01_node1.adb,
	ada-tests/mptests/mp01/node2/mp01_node2.adb,
	ada-tests/mptests/mp02/mptest.adb, ada-tests/mptests/mp02/mptest.ads,
	ada-tests/mptests/mp02/node1/mp02_node1.adb,
	ada-tests/mptests/mp02/node2/mp02_node2.adb,
	ada-tests/mptests/mp03/mptest.adb, ada-tests/mptests/mp03/mptest.ads,
	ada-tests/mptests/mp03/node1/mp03_node1.adb,
	ada-tests/mptests/mp03/node2/mp03_node2.adb,
	ada-tests/mptests/mp04/mptest.adb, ada-tests/mptests/mp04/mptest.ads,
	ada-tests/mptests/mp04/node1/mp04_node1.adb,
	ada-tests/mptests/mp04/node2/mp04_node2.adb,
	ada-tests/mptests/mp05/mptest.adb, ada-tests/mptests/mp05/mptest.ads,
	ada-tests/mptests/mp05/node1/mp05_node1.adb,
	ada-tests/mptests/mp05/node2/mp05_node2.adb,
	ada-tests/mptests/mp06/mptest.adb, ada-tests/mptests/mp06/mptest.ads,
	ada-tests/mptests/mp06/node1/mp06_node1.adb,
	ada-tests/mptests/mp06/node2/mp06_node2.adb,
	ada-tests/mptests/mp07/mptest.adb, ada-tests/mptests/mp07/mptest.ads,
	ada-tests/mptests/mp07/node1/mp07_node1.adb,
	ada-tests/mptests/mp07/node2/mp07_node2.adb,
	ada-tests/mptests/mp08/mptest.adb, ada-tests/mptests/mp08/mptest.ads,
	ada-tests/mptests/mp08/node1/mp08_node1.adb,
	ada-tests/mptests/mp08/node2/mp08_node2.adb,
	ada-tests/mptests/mp09/mptest.adb, ada-tests/mptests/mp09/mptest.ads,
	ada-tests/mptests/mp09/node1/mp09_node1.adb,
	ada-tests/mptests/mp09/node2/mp09_node2.adb,
	ada-tests/mptests/mp10/mptest.adb, ada-tests/mptests/mp10/mptest.ads,
	ada-tests/mptests/mp10/node1/mp10_node1.adb,
	ada-tests/mptests/mp10/node2/mp10_node2.adb,
	ada-tests/mptests/mp11/mptest.adb, ada-tests/mptests/mp11/mptest.ads,
	ada-tests/mptests/mp11/node1/mp11_node1.adb,
	ada-tests/mptests/mp11/node2/mp11_node2.adb,
	ada-tests/mptests/mp12/mptest.adb, ada-tests/mptests/mp12/mptest.ads,
	ada-tests/mptests/mp12/node1/mp12_node1.adb,
	ada-tests/mptests/mp12/node2/mp12_node2.adb,
	ada-tests/mptests/mp13/mptest.adb, ada-tests/mptests/mp13/mptest.ads,
	ada-tests/mptests/mp13/node1/mp13_node1.adb,
	ada-tests/mptests/mp13/node2/mp13_node2.adb,
	ada-tests/mptests/mp14/mptest.adb, ada-tests/mptests/mp14/mptest.ads,
	ada-tests/mptests/mp14/node1/mp14_node1.adb,
	ada-tests/mptests/mp14/node2/mp14_node2.adb,
	ada-tests/samples/base_mp/mptest.adb,
	ada-tests/samples/base_mp/mptest.ads,
	ada-tests/samples/base_sp/base_sp.adb,
	ada-tests/samples/base_sp/sptest.adb,
	ada-tests/samples/base_sp/sptest.ads,
	ada-tests/samples/hello/hello.adb,
	ada-tests/samples/hello/sptest.adb,
	ada-tests/samples/hello/sptest.ads,
	ada-tests/samples/nsecs/nsecs.adb,
	ada-tests/samples/nsecs/sptest.adb,
	ada-tests/samples/nsecs/sptest.ads,
	ada-tests/samples/ticker/sptest.adb,
	ada-tests/samples/ticker/sptest.ads,
	ada-tests/samples/ticker/ticker.adb, ada-tests/sptests/sp01/sp01.adb,
	ada-tests/sptests/sp01/sptest.adb, ada-tests/sptests/sp01/sptest.ads,
	ada-tests/sptests/sp02/sp02.adb, ada-tests/sptests/sp02/sptest.adb,
	ada-tests/sptests/sp02/sptest.ads, ada-tests/sptests/sp03/sp03.adb,
	ada-tests/sptests/sp03/sptest.adb, ada-tests/sptests/sp03/sptest.ads,
	ada-tests/sptests/sp04/sp04.adb, ada-tests/sptests/sp04/sptest.adb,
	ada-tests/sptests/sp04/sptest.ads, ada-tests/sptests/sp05/sp05.adb,
	ada-tests/sptests/sp05/sptest.adb, ada-tests/sptests/sp05/sptest.ads,
	ada-tests/sptests/sp06/sp06.adb, ada-tests/sptests/sp06/sptest.adb,
	ada-tests/sptests/sp06/sptest.ads, ada-tests/sptests/sp07/sp07.adb,
	ada-tests/sptests/sp07/sptest.adb, ada-tests/sptests/sp07/sptest.ads,
	ada-tests/sptests/sp08/sp08.adb, ada-tests/sptests/sp08/sptest.adb,
	ada-tests/sptests/sp08/sptest.ads, ada-tests/sptests/sp09/sp09.adb,
	ada-tests/sptests/sp09/sptest.adb, ada-tests/sptests/sp09/sptest.ads,
	ada-tests/sptests/sp11/sp11.adb, ada-tests/sptests/sp11/sptest.adb,
	ada-tests/sptests/sp11/sptest.ads, ada-tests/sptests/sp12/sp12.adb,
	ada-tests/sptests/sp12/sptest.adb, ada-tests/sptests/sp12/sptest.ads,
	ada-tests/sptests/sp13/sp13.adb, ada-tests/sptests/sp13/sptest.adb,
	ada-tests/sptests/sp13/sptest.ads, ada-tests/sptests/sp14/sp14.adb,
	ada-tests/sptests/sp14/sptest.adb, ada-tests/sptests/sp14/sptest.ads,
	ada-tests/sptests/sp15/sp15.adb, ada-tests/sptests/sp15/sptest.adb,
	ada-tests/sptests/sp15/sptest.ads, ada-tests/sptests/sp16/sp16.adb,
	ada-tests/sptests/sp16/sptest.adb, ada-tests/sptests/sp16/sptest.ads,
	ada-tests/sptests/sp17/sp17.adb, ada-tests/sptests/sp17/sptest.adb,
	ada-tests/sptests/sp17/sptest.ads, ada-tests/sptests/sp19/sp19.adb,
	ada-tests/sptests/sp19/sptest.adp, ada-tests/sptests/sp19/sptest.ads,
	ada-tests/sptests/sp20/sp20.adb, ada-tests/sptests/sp20/sptest.adb,
	ada-tests/sptests/sp20/sptest.ads, ada-tests/sptests/sp22/sp22.adb,
	ada-tests/sptests/sp22/sptest.adb, ada-tests/sptests/sp22/sptest.ads,
	ada-tests/sptests/sp23/sp23.adb, ada-tests/sptests/sp23/sptest.adb,
	ada-tests/sptests/sp23/sptest.ads, ada-tests/sptests/sp24/sp24.adb,
	ada-tests/sptests/sp24/sptest.adb, ada-tests/sptests/sp24/sptest.ads,
	ada-tests/sptests/sp25/sp25.adb, ada-tests/sptests/sp25/sptest.adb,
	ada-tests/sptests/sp25/sptest.ads,
	ada-tests/support/test_support.adb, ada-tests/tmtests/tm01/tm01.adb,
	ada-tests/tmtests/tm01/tmtest.adb, ada-tests/tmtests/tm01/tmtest.ads,
	ada-tests/tmtests/tm02/tm02.adb, ada-tests/tmtests/tm02/tmtest.adb,
	ada-tests/tmtests/tm02/tmtest.ads, ada-tests/tmtests/tm03/tm03.adb,
	ada-tests/tmtests/tm03/tmtest.adb, ada-tests/tmtests/tm03/tmtest.ads,
	ada-tests/tmtests/tm04/tm04.adb, ada-tests/tmtests/tm04/tmtest.adb,
	ada-tests/tmtests/tm04/tmtest.ads, ada-tests/tmtests/tm05/tm05.adb,
	ada-tests/tmtests/tm05/tmtest.adb, ada-tests/tmtests/tm05/tmtest.ads,
	ada-tests/tmtests/tm06/tm06.adb, ada-tests/tmtests/tm06/tmtest.adb,
	ada-tests/tmtests/tm06/tmtest.ads, ada-tests/tmtests/tm07/tm07.adb,
	ada-tests/tmtests/tm07/tmtest.adb, ada-tests/tmtests/tm07/tmtest.ads,
	ada-tests/tmtests/tm08/tm08.adb, ada-tests/tmtests/tm08/tmtest.adb,
	ada-tests/tmtests/tm08/tmtest.ads, ada-tests/tmtests/tm09/tm09.adb,
	ada-tests/tmtests/tm09/tmtest.adb, ada-tests/tmtests/tm09/tmtest.ads,
	ada-tests/tmtests/tm10/tm10.adb, ada-tests/tmtests/tm10/tmtest.adb,
	ada-tests/tmtests/tm10/tmtest.ads, ada-tests/tmtests/tm11/tm11.adb,
	ada-tests/tmtests/tm11/tmtest.adb, ada-tests/tmtests/tm11/tmtest.ads,
	ada-tests/tmtests/tm12/tm12.adb, ada-tests/tmtests/tm12/tmtest.adb,
	ada-tests/tmtests/tm12/tmtest.ads, ada-tests/tmtests/tm13/tm13.adb,
	ada-tests/tmtests/tm13/tmtest.adb, ada-tests/tmtests/tm13/tmtest.ads,
	ada-tests/tmtests/tm14/tm14.adb, ada-tests/tmtests/tm14/tmtest.adb,
	ada-tests/tmtests/tm14/tmtest.ads, ada-tests/tmtests/tm15/tm15.adb,
	ada-tests/tmtests/tm15/tmtest.adb, ada-tests/tmtests/tm15/tmtest.ads,
	ada-tests/tmtests/tm16/tm16.adb, ada-tests/tmtests/tm16/tmtest.adb,
	ada-tests/tmtests/tm16/tmtest.ads, ada-tests/tmtests/tm17/tm17.adb,
	ada-tests/tmtests/tm17/tmtest.adb, ada-tests/tmtests/tm17/tmtest.ads,
	ada-tests/tmtests/tm18/tm18.adb, ada-tests/tmtests/tm18/tmtest.adb,
	ada-tests/tmtests/tm18/tmtest.ads, ada-tests/tmtests/tm19/tm19.adb,
	ada-tests/tmtests/tm19/tmtest.adb, ada-tests/tmtests/tm19/tmtest.ads,
	ada-tests/tmtests/tm20/tm20.adb, ada-tests/tmtests/tm20/tmtest.adb,
	ada-tests/tmtests/tm20/tmtest.ads, ada-tests/tmtests/tm21/tm21.adb,
	ada-tests/tmtests/tm21/tmtest.adb, ada-tests/tmtests/tm21/tmtest.ads,
	ada-tests/tmtests/tm22/tm22.adb, ada-tests/tmtests/tm22/tmtest.adb,
	ada-tests/tmtests/tm22/tmtest.ads, ada-tests/tmtests/tm23/tm23.adb,
	ada-tests/tmtests/tm23/tmtest.adb, ada-tests/tmtests/tm23/tmtest.ads,
	ada-tests/tmtests/tm24/tm24.adb, ada-tests/tmtests/tm24/tmtest.adb,
	ada-tests/tmtests/tm24/tmtest.ads, ada-tests/tmtests/tm25/tm25.adb,
	ada-tests/tmtests/tm25/tmtest.adb, ada-tests/tmtests/tm25/tmtest.ads,
	ada-tests/tmtests/tm28/tm28.adb, ada-tests/tmtests/tm28/tmtest.adb,
	ada-tests/tmtests/tm28/tmtest.ads, ada-tests/tmtests/tm29/tm29.adb,
	ada-tests/tmtests/tm29/tmtest.adb, ada-tests/tmtests/tm29/tmtest.ads,
	ada-tests/tmtests/tmck/tmck.adb, ada-tests/tmtests/tmck/tmtest.adb,
	ada-tests/tmtests/tmck/tmtest.ads,
	ada-tests/tmtests/tmoverhd/dummy_rtems.adb,
	ada-tests/tmtests/tmoverhd/dummy_rtems.ads,
	ada-tests/tmtests/tmoverhd/tmoverhd.adb,
	ada-tests/tmtests/tmoverhd/tmtest.adb,
	ada-tests/tmtests/tmoverhd/tmtest.ads: Account for RTEMS binding
	child package rework. Eliminate all warnings.

1 files changed, 42 insertions, 38 deletions

diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.adb b/c/src/ada-tests/tmtests/tm20/tmtest.adb
index 506e5927df..69188c942e 100644
--- a/c/src/ada-tests/tmtests/tm20/tmtest.adb
+++ b/c/src/ada-tests/tmtests/tm20/tmtest.adb
@@ -10,7 +10,7 @@
 --
 --  
 --
---  COPYRIGHT (c) 1989-2009.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
 --  The license and distribution terms for this file may in
@@ -25,16 +25,17 @@ with RTEMS_CALLING_OVERHEAD;
 with TEST_SUPPORT;
 with TEXT_IO;
 with TIMER_DRIVER;
+with RTEMS.PARTITION;
+with RTEMS.REGION;
 
 package body TMTEST is
 
---PAGE
 -- 
 --  INIT
 --
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS     : RTEMS.STATUS_CODES;
@@ -43,7 +44,7 @@ package body TMTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT_LINE( "*** TIME TEST 20 ***" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          RTEMS.BUILD_NAME( 'T', 'I', 'M', '1' ),
          128,
          2048, 
@@ -54,7 +55,7 @@ package body TMTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" );
 
-      RTEMS.TASK_START( 
+      RTEMS.TASKS.START( 
          TMTEST.TASK_ID( 1 ), 
          TMTEST.TASK_1'ACCESS, 
          0, 
@@ -62,7 +63,7 @@ package body TMTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          RTEMS.BUILD_NAME( 'T', 'I', 'M', '2' ),
          129,
          2048, 
@@ -73,7 +74,7 @@ package body TMTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" );
 
-      RTEMS.TASK_START( 
+      RTEMS.TASKS.START( 
          TMTEST.TASK_ID( 2 ), 
          TMTEST.TASK_2'ACCESS, 
          0, 
@@ -81,23 +82,22 @@ package body TMTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" );
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 -- 
 --  TASK_1
 --
 
    procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       BUFFER_COUNT      : RTEMS.UNSIGNED32;
       PREVIOUS_MODE     : RTEMS.MODE;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
+      PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY;
       STATUS            : RTEMS.STATUS_CODES;
    begin
 
@@ -105,7 +105,7 @@ package body TMTEST is
 
       TIMER_DRIVER.INITIALIZE;
 
-         RTEMS.PARTITION_CREATE(
+         RTEMS.PARTITION.CREATE(
             TMTEST.PARTITION_NAME,
             TMTEST.PARTITION_AREA'ADDRESS,
             2048,
@@ -128,7 +128,7 @@ package body TMTEST is
 
       TIMER_DRIVER.INITIALIZE;
 
-         RTEMS.REGION_CREATE(
+         RTEMS.REGION.CREATE(
             TMTEST.REGION_NAME,
             TMTEST.REGION_AREA'ADDRESS,
             2048,
@@ -148,7 +148,7 @@ package body TMTEST is
       );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_GET_BUFFER(
+         RTEMS.PARTITION.GET_BUFFER(
             TMTEST.PARTITION_ID,
             TMTEST.BUFFER_ADDRESS_1,
             STATUS 
@@ -166,7 +166,7 @@ package body TMTEST is
       BUFFER_COUNT := 0;
       loop 
 
-         RTEMS.PARTITION_GET_BUFFER(
+         RTEMS.PARTITION.GET_BUFFER(
             TMTEST.PARTITION_ID,
             TMTEST.BUFFER_ADDRESSES( BUFFER_COUNT ),
             STATUS 
@@ -179,7 +179,7 @@ package body TMTEST is
       end loop;
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_GET_BUFFER(
+         RTEMS.PARTITION.GET_BUFFER(
             TMTEST.PARTITION_ID,
             TMTEST.BUFFER_ADDRESS_2,
             STATUS 
@@ -195,7 +195,7 @@ package body TMTEST is
       );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_RETURN_BUFFER(
+         RTEMS.PARTITION.RETURN_BUFFER(
             TMTEST.PARTITION_ID,
             TMTEST.BUFFER_ADDRESS_1,
             STATUS 
@@ -213,7 +213,7 @@ package body TMTEST is
       for INDEX in 0 .. BUFFER_COUNT - 1
       loop
 
-         RTEMS.PARTITION_RETURN_BUFFER(
+         RTEMS.PARTITION.RETURN_BUFFER(
             TMTEST.PARTITION_ID,
             TMTEST.BUFFER_ADDRESSES( INDEX ),
             STATUS 
@@ -223,7 +223,7 @@ package body TMTEST is
       end loop;
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_DELETE( TMTEST.PARTITION_ID, STATUS );
+         RTEMS.PARTITION.DELETE( TMTEST.PARTITION_ID, STATUS );
       TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
 
       TIME_TEST_SUPPORT.PUT_TIME( 
@@ -234,7 +234,7 @@ package body TMTEST is
          RTEMS_CALLING_OVERHEAD.PARTITION_DELETE 
       );
 
-      RTEMS.REGION_GET_SEGMENT(
+      RTEMS.REGION.GET_SEGMENT(
          TMTEST.REGION_ID,
          400,
          RTEMS.DEFAULT_OPTIONS,
@@ -245,7 +245,7 @@ package body TMTEST is
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_GET_SEGMENT(
+         RTEMS.REGION.GET_SEGMENT(
             TMTEST.REGION_ID,
             400,
             RTEMS.DEFAULT_OPTIONS,
@@ -264,7 +264,7 @@ package body TMTEST is
       );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_GET_SEGMENT(
+         RTEMS.REGION.GET_SEGMENT(
             TMTEST.REGION_ID,
             1998,
             RTEMS.NO_WAIT,
@@ -282,7 +282,7 @@ package body TMTEST is
          RTEMS_CALLING_OVERHEAD.REGION_GET_SEGMENT 
       );
 
-      RTEMS.REGION_RETURN_SEGMENT(
+      RTEMS.REGION.RETURN_SEGMENT(
          TMTEST.REGION_ID,
          TMTEST.BUFFER_ADDRESS_3,
          STATUS 
@@ -290,7 +290,7 @@ package body TMTEST is
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_RETURN_SEGMENT(
+         RTEMS.REGION.RETURN_SEGMENT(
             TMTEST.REGION_ID,
             TMTEST.BUFFER_ADDRESS_2,
             STATUS 
@@ -305,7 +305,7 @@ package body TMTEST is
          RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT 
       );
 
-      RTEMS.REGION_GET_SEGMENT(
+      RTEMS.REGION.GET_SEGMENT(
          TMTEST.REGION_ID,
          400,
          RTEMS.DEFAULT_OPTIONS,
@@ -316,7 +316,7 @@ package body TMTEST is
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_GET_SEGMENT(
+         RTEMS.REGION.GET_SEGMENT(
             TMTEST.REGION_ID,
             1998,
             RTEMS.DEFAULT_OPTIONS,
@@ -337,14 +337,14 @@ package body TMTEST is
          RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT 
       );
 
-      RTEMS.REGION_RETURN_SEGMENT(
+      RTEMS.REGION.RETURN_SEGMENT(
          TMTEST.REGION_ID,
          TMTEST.BUFFER_ADDRESS_2,
          STATUS 
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
 
-      RTEMS.TASK_MODE(
+      RTEMS.TASKS.MODE(
          RTEMS.NO_PREEMPT,
          RTEMS.PREEMPT_MASK,
          PREVIOUS_MODE,
@@ -352,10 +352,10 @@ package body TMTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
 
-      RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS );
+      RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
 
-      RTEMS.REGION_GET_SEGMENT(
+      RTEMS.REGION.GET_SEGMENT(
          TMTEST.REGION_ID,
          400,
          RTEMS.DEFAULT_OPTIONS,
@@ -364,7 +364,7 @@ package body TMTEST is
          STATUS 
       );
 
-      RTEMS.REGION_GET_SEGMENT(
+      RTEMS.REGION.GET_SEGMENT(
          TMTEST.REGION_ID,
          1998,
          RTEMS.DEFAULT_OPTIONS,
@@ -372,18 +372,21 @@ package body TMTEST is
          TMTEST.BUFFER_ADDRESS_2,
          STATUS 
       );
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
  
       -- execute TASK_2
 
-      RTEMS.REGION_RETURN_SEGMENT(
+      RTEMS.REGION.RETURN_SEGMENT(
          TMTEST.REGION_ID,
          TMTEST.BUFFER_ADDRESS_2,
          STATUS 
       );
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_DELETE( TMTEST.REGION_ID, STATUS );
+         RTEMS.REGION.DELETE( TMTEST.REGION_ID, STATUS );
       TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE" );
 
       TIME_TEST_SUPPORT.PUT_TIME( 
          "REGION_DELETE",
@@ -398,13 +401,12 @@ package body TMTEST is
 
    end TASK_1;
 
---PAGE
 -- 
 --  TASK_2
 --
 
    procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS            : RTEMS.STATUS_CODES;
@@ -421,21 +423,23 @@ package body TMTEST is
       );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_RETURN_SEGMENT(
+         RTEMS.REGION.RETURN_SEGMENT(
             TMTEST.REGION_ID,
             TMTEST.BUFFER_ADDRESS_1,
             STATUS 
          );
 
       -- preempt back to TASK_1
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
 
       TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_RETURN_SEGMENT(
+         RTEMS.REGION.RETURN_SEGMENT(
             TMTEST.REGION_ID,
             TMTEST.BUFFER_ADDRESS_1,
             STATUS 
          );
       TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
 
       TIME_TEST_SUPPORT.PUT_TIME( 
          "REGION_RETURN_SEGMENT (ready -- return)",
@@ -445,7 +449,7 @@ package body TMTEST is
          RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT 
       );
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end TASK_2;