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, 36 insertions, 33 deletions

diff --git a/c/src/ada-tests/sptests/sp19/sptest.adp b/c/src/ada-tests/sptests/sp19/sptest.adp
index ad5d72a439..3c37d7d8b0 100644
--- a/c/src/ada-tests/sptests/sp19/sptest.adp
+++ b/c/src/ada-tests/sptests/sp19/sptest.adp
@@ -21,20 +21,21 @@ with FLOAT_IO;
 with TEST_SUPPORT;
 with TEXT_IO;
 with UNSIGNED32_IO;
+with RTEMS.CLOCK;
 
 include(../../support/fp.inc)
 include(../../support/integer.inc)
 
 package body SPTEST is
 
---PAGE
 -- 
 --  INIT
 --
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
+      pragma Unreferenced(ARGUMENT);
       STATUS : RTEMS.STATUS_CODES;
    begin
 
@@ -48,7 +49,7 @@ package body SPTEST is
       SPTEST.TASK_NAME( 5 ) := RTEMS.BUILD_NAME(  'T', 'A', '5', ' ' );
       SPTEST.TASK_NAME( 6 ) := RTEMS.BUILD_NAME(  'F', 'P', '1', ' ' );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 1 ), 
          2, 
          2048, 
@@ -59,7 +60,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 2 ), 
          2, 
          2048, 
@@ -70,7 +71,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 3 ), 
          2, 
          2048, 
@@ -81,7 +82,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 4 ), 
          2, 
          2048, 
@@ -92,7 +93,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 5 ), 
          2, 
          2048, 
@@ -103,7 +104,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 6 ), 
          1, 
          2048, 
@@ -114,7 +115,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF FP1" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 6 ),
          SPTEST.FIRST_FP_TASK'ACCESS,
          0,
@@ -122,7 +123,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF FP1" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 1 ),
          SPTEST.TASK_1'ACCESS,
          0,
@@ -130,7 +131,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 2 ),
          SPTEST.TASK_1'ACCESS,
          0,
@@ -138,7 +139,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 3 ),
          SPTEST.TASK_1'ACCESS,
          0,
@@ -146,7 +147,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 4 ),
          SPTEST.FP_TASK'ACCESS,
          0,
@@ -154,7 +155,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 5 ),
          SPTEST.FP_TASK'ACCESS,
          0,
@@ -188,18 +189,17 @@ package body SPTEST is
       SPTEST.INTEGER_FACTORS( 8 ) := 16#8000#;
       SPTEST.INTEGER_FACTORS( 9 ) := 16#9000#;
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 -- 
 --  FIRST_FP_TASK
 --
 
    procedure FIRST_FP_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS     : RTEMS.STATUS_CODES;
       TID        : RTEMS.ID;
@@ -209,7 +209,7 @@ package body SPTEST is
       FP_DECLARE;
    begin
 
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
+      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
 
       TASK_INDEX := TEST_SUPPORT.TASK_NUMBER( TID );
@@ -234,8 +234,10 @@ package body SPTEST is
       FLOAT_IO.PUT( FP_FACTORS( TASK_INDEX ) );
       TEXT_IO.PUT_LINE( ")" );
 
+      FP_CHECK( FP_FACTORS( TASK_INDEX ) );
+      INTEGER_CHECK( INTEGER_FACTORS( TASK_INDEX ) );
       if ARGUMENT = 0 then
-         RTEMS.TASK_RESTART( 
+         RTEMS.TASKS.RESTART( 
             RTEMS.SELF,
             1,
             STATUS
@@ -243,22 +245,21 @@ package body SPTEST is
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF SELF" );
       else
          TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
-         RTEMS.CLOCK_SET( TIME, STATUS );
+         RTEMS.CLOCK.SET( TIME, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
 
-         RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+         RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
       end if;
 
    end FIRST_FP_TASK;
 
---PAGE
 -- 
 --  FP_TASK
 --
 
    procedure FP_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS     : RTEMS.STATUS_CODES;
@@ -269,7 +270,7 @@ package body SPTEST is
       FP_DECLARE;
    begin
 
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
+      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
       TASK_INDEX := TEST_SUPPORT.TASK_NUMBER( TID );
@@ -299,19 +300,19 @@ package body SPTEST is
 
       loop
 
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
+         RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
 
          if TIME.SECOND >= 16 then
 
             if TEST_SUPPORT.TASK_NUMBER( TID ) = 4 then
                TEXT_IO.PUT_LINE( "TA4 - task_delete - self" );
-               RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+               RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
                TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" );
             end if;
       
             TEXT_IO.PUT_LINE( "TA5 - task_delete - TA3" );
-            RTEMS.TASK_DELETE( SPTEST.TASK_ID( 3 ), STATUS );
+            RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 3 ), STATUS );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
  
             TEXT_IO.PUT_LINE( "*** END OF TEST 19 ***" );
@@ -329,20 +330,19 @@ package body SPTEST is
          INTEGER_CHECK( INTEGER_FACTORS( TASK_INDEX ) );
          FP_CHECK( FP_FACTORS( TASK_INDEX ) );
  
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+         RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
           
       end loop;
    
    end FP_TASK;
 
---PAGE
 -- 
 --  TASK_1
 --
 
    procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS     : RTEMS.STATUS_CODES;
@@ -350,14 +350,16 @@ package body SPTEST is
       TIME       : RTEMS.TIME_OF_DAY;
       TASK_INDEX : RTEMS.UNSIGNED32;
       INTEGER_DECLARE;
+      FP_DECLARE;
    begin
 
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
+      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
       TASK_INDEX := TEST_SUPPORT.TASK_NUMBER( TID );
   
       INTEGER_LOAD( INTEGER_FACTORS( TASK_INDEX ) );
+      FP_LOAD( FP_FACTORS( TASK_INDEX ) );
  
       TEST_SUPPORT.PUT_NAME(
          SPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
@@ -369,7 +371,7 @@ package body SPTEST is
  
       loop
 
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
+         RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
 
          TEST_SUPPORT.PUT_NAME( 
@@ -381,8 +383,9 @@ package body SPTEST is
          TEXT_IO.NEW_LINE;
 
          INTEGER_CHECK( INTEGER_FACTORS( TASK_INDEX ) );
+         FP_CHECK( FP_FACTORS( TASK_INDEX ) );
 
-         RTEMS.TASK_WAKE_AFTER( 
+         RTEMS.TASKS.WAKE_AFTER( 
             TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * 
               TEST_SUPPORT.TICKS_PER_SECOND, 
             STATUS