1 files changed, 20 insertions, 22 deletions
diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.adb b/c/src/ada-tests/tmtests/tm02/tmtest.adb
index bc7160e1f7..6fdd8b004b 100644
--- a/c/src/ada-tests/tmtests/tm02/tmtest.adb
+++ b/c/src/ada-tests/tmtests/tm02/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
@@ -26,16 +26,16 @@ with TEST_SUPPORT;
 with TEXT_IO;
 with TIME_TEST_SUPPORT;
 with TIMER_DRIVER;
+with RTEMS.SEMAPHORE;
 
 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;
@@ -46,18 +46,17 @@ package body TMTEST is
 
       TMTEST.TEST_INIT;
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 -- 
 --  TEST_INIT
 --
 
    procedure TEST_INIT is
-      PRIORITY : RTEMS.TASK_PRIORITY;
+      PRIORITY : RTEMS.TASKS.PRIORITY;
       HIGH_ID  : RTEMS.ID;
       LOW_ID   : RTEMS.ID;
       TASK_ID  : RTEMS.ID;
@@ -66,7 +65,7 @@ package body TMTEST is
 
       PRIORITY := 5;
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ),
          PRIORITY, 
          1024, 
@@ -79,7 +78,7 @@ package body TMTEST is
 
       PRIORITY := PRIORITY + 1;
 
-      RTEMS.TASK_START( 
+      RTEMS.TASKS.START( 
          HIGH_ID, 
          TMTEST.HIGH_TASK'ACCESS, 
          0, 
@@ -90,7 +89,7 @@ package body TMTEST is
       for INDEX in 2 .. TIME_TEST_SUPPORT.OPERATION_COUNT
       loop
 
-         RTEMS.TASK_CREATE( 
+         RTEMS.TASKS.CREATE( 
             RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ),
             PRIORITY, 
             1024, 
@@ -103,7 +102,7 @@ package body TMTEST is
 
          PRIORITY := PRIORITY + 1;
 
-         RTEMS.TASK_START( 
+         RTEMS.TASKS.START( 
             TASK_ID, 
             TMTEST.MIDDLE_TASKS'ACCESS, 
             0, 
@@ -113,7 +112,7 @@ package body TMTEST is
 
       end loop;
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ),
          PRIORITY, 
          2048, 
@@ -124,14 +123,14 @@ package body TMTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF LOW TASK" );
 
-      RTEMS.TASK_START( LOW_ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS );
+      RTEMS.TASKS.START( LOW_ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF LOW TASK" );
 
-      RTEMS.SEMAPHORE_CREATE(
+      RTEMS.SEMAPHORE.CREATE(
          RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ),
          0,
          RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
+         RTEMS.TASKS.NO_PRIORITY,
          TMTEST.SEMAPHORE_ID,
          STATUS
       );
@@ -139,56 +138,55 @@ package body TMTEST is
 
    end TEST_INIT;
 
---PAGE
 -- 
 --  HIGH_TASK
 --
 
    procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS                   : RTEMS.STATUS_CODES;
    begin
 
       TIMER_DRIVER.INITIALIZE;
-      RTEMS.SEMAPHORE_OBTAIN(
+      RTEMS.SEMAPHORE.OBTAIN(
          TMTEST.SEMAPHORE_ID,
          RTEMS.DEFAULT_OPTIONS,
          RTEMS.NO_TIMEOUT,
          STATUS
       );
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
 
    end HIGH_TASK;
 
---PAGE
 -- 
 --  MIDDLE_TASKS
 --
 
    procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS                   : RTEMS.STATUS_CODES;
    begin
 
-      RTEMS.SEMAPHORE_OBTAIN(
+      RTEMS.SEMAPHORE.OBTAIN(
          TMTEST.SEMAPHORE_ID,
          RTEMS.DEFAULT_OPTIONS,
          RTEMS.NO_TIMEOUT,
          STATUS
       );
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
 
    end MIDDLE_TASKS;
 
---PAGE
 -- 
 --  LOW_TASK
 --
 
    procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
    begin