1 files changed, 16 insertions, 16 deletions

diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.adb b/c/src/ada-tests/tmtests/tm25/tmtest.adb
index 3a55f22800..4c4ca8429a 100644
--- a/c/src/ada-tests/tmtests/tm25/tmtest.adb
+++ b/c/src/ada-tests/tmtests/tm25/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 TEST_SUPPORT;
 with TEXT_IO;
 with TIME_TEST_SUPPORT;
 with TIMER_DRIVER;
+with RTEMS.CLOCK;
+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);
       TASK_ID : RTEMS.ID;
@@ -44,17 +45,17 @@ package body TMTEST is
       TEXT_IO.NEW_LINE( 2 );
       TEXT_IO.PUT_LINE( "*** TIME TEST 25 ***" );
 
-      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
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ),
          254, 
          2048, 
@@ -65,7 +66,7 @@ package body TMTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" );
 
-      RTEMS.TASK_START( 
+      RTEMS.TASKS.START( 
          TASK_ID, 
          TMTEST.LOW_TASK'ACCESS, 
          0, 
@@ -76,7 +77,7 @@ package body TMTEST is
       for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
       loop
 
-         RTEMS.TASK_CREATE( 
+         RTEMS.TASKS.CREATE( 
             RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
             128, 
             1024, 
@@ -87,7 +88,7 @@ package body TMTEST is
          );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
 
-         RTEMS.TASK_START( 
+         RTEMS.TASKS.START( 
             TASK_ID, 
             TMTEST.HIGH_TASKS'ACCESS, 
             0, 
@@ -96,39 +97,38 @@ package body TMTEST is
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
 
       end loop;
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 -- 
 --  HIGH_TASKS
 --
 
    procedure HIGH_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.INTERVAL'LAST,
          STATUS
       );
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
 
    end HIGH_TASKS;
 
---PAGE
 -- 
 --  LOW_TASK
 --
 
    procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS                   : RTEMS.STATUS_CODES;
@@ -137,7 +137,7 @@ package body TMTEST is
       TIMER_DRIVER.INITIALIZE;
          for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
          loop
-            RTEMS.CLOCK_TICK( STATUS );
+            RTEMS.CLOCK.TICK( STATUS );
          end loop;
       TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;