diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-02-16 15:53:16 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-02-16 15:53:16 +0000 |
commit | 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb (patch) | |
tree | 903461d3fd2bac10fe132397a82640cb020aa51c /c/src/ada-tests/mptests/mp01/mptest.adb | |
parent | 2011-02-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb.tar.bz2 |
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.
Diffstat (limited to 'c/src/ada-tests/mptests/mp01/mptest.adb')
-rw-r--r-- | c/src/ada-tests/mptests/mp01/mptest.adb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/c/src/ada-tests/mptests/mp01/mptest.adb b/c/src/ada-tests/mptests/mp01/mptest.adb index 71787c65dc..73096718e7 100644 --- a/c/src/ada-tests/mptests/mp01/mptest.adb +++ b/c/src/ada-tests/mptests/mp01/mptest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,19 +22,20 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.CLOCK; +with RTEMS.TASKS; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; package body MPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is C : CHARACTER; TIME : RTEMS.TIME_OF_DAY; @@ -61,12 +62,12 @@ package body MPTEST is 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" ); TEXT_IO.PUT_LINE( "Creating task 1 (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 1 ), 1, 2048, @@ -79,7 +80,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating task 2 (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 2 ), 1, 2048, @@ -92,7 +93,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating task 3 (Local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 3 ), 1, 2048, @@ -103,7 +104,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -111,7 +112,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 2 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -119,7 +120,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 3 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -127,28 +128,27 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" ); - 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_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is TIME : RTEMS.TIME_OF_DAY; TID : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; 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" ); - 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( @@ -159,14 +159,14 @@ package body MPTEST is TEST_SUPPORT.PRINT_TIME( "- clock_get - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); - 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( @@ -186,7 +186,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( " - deleting self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); else if TEST_SUPPORT.TASK_NUMBER( TID ) = 2 then -- TASK 2 @@ -205,7 +205,7 @@ package body MPTEST is TEXT_IO.PUT( " - getting TID of " ); TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 2 ), TRUE ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( 2 ), RTEMS.SEARCH_ALL_NODES, TID, @@ -217,7 +217,7 @@ package body MPTEST is TEXT_IO.PUT( " - deleting " ); TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 2 ), TRUE ); - RTEMS.TASK_DELETE( TID, STATUS ); + RTEMS.TASKS.DELETE( TID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); end if; |