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/sptests/sp20 | |
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 '')
-rw-r--r-- | c/src/ada-tests/sptests/sp20/sp20.adb | 7 | ||||
-rw-r--r-- | c/src/ada-tests/sptests/sp20/sptest.adb | 43 | ||||
-rw-r--r-- | c/src/ada-tests/sptests/sp20/sptest.ads | 7 |
3 files changed, 29 insertions, 28 deletions
diff --git a/c/src/ada-tests/sptests/sp20/sp20.adb b/c/src/ada-tests/sptests/sp20/sp20.adb index a0cdeb050b..c42fcede39 100644 --- a/c/src/ada-tests/sptests/sp20/sp20.adb +++ b/c/src/ada-tests/sptests/sp20/sp20.adb @@ -9,7 +9,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 @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SPTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure SP20 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 10, RTEMS.MINIMUM_STACK_SIZE, @@ -39,7 +40,7 @@ begin ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, SPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/sptests/sp20/sptest.adb b/c/src/ada-tests/sptests/sp20/sptest.adb index 4d1f69a7a4..97df1edcb7 100644 --- a/c/src/ada-tests/sptests/sp20/sptest.adb +++ b/c/src/ada-tests/sptests/sp20/sptest.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 @@ -24,16 +24,17 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.CLOCK; +with RTEMS.RATE_MONOTONIC; 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; @@ -54,7 +55,7 @@ package body SPTEST is SPTEST.COUNT( INDEX ) := 0; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( INDEX ), SPTEST.PRIORITIES( INDEX ), 4096, @@ -70,28 +71,27 @@ package body SPTEST is for INDEX in 1 .. 6 loop - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( INDEX ), SPTEST.TASK_1_THROUGH_6'ACCESS, - RTEMS.TASK_ARGUMENT( INDEX ), + RTEMS.TASKS.ARGUMENT( INDEX ), STATUS ); 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 -- -- TASK_1_THROUGH_6 -- procedure TASK_1_THROUGH_6 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is RMID : RTEMS.ID; TEST_RMID : RTEMS.ID; @@ -103,14 +103,14 @@ package body SPTEST is MEASURE : RTEMS.INTERVAL; begin - RTEMS.RATE_MONOTONIC_CREATE( ARGUMENT, RMID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( ARGUMENT, RMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" ); TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( INTEGER( ARGUMENT ) ), FALSE ); TEXT_IO.PUT( "- rate_monotonic_create id = " ); UNSIGNED32_IO.PUT( RMID, WIDTH => 8, BASE => 16 ); TEXT_IO.NEW_LINE; - RTEMS.RATE_MONOTONIC_IDENT( ARGUMENT, TEST_RMID, STATUS ); + RTEMS.RATE_MONOTONIC.IDENT( ARGUMENT, TEST_RMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_IDENT" ); TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( INTEGER( ARGUMENT ) ), FALSE ); TEXT_IO.PUT( "- rate_monotonic_ident id = " ); @@ -132,13 +132,13 @@ package body SPTEST is ); TEXT_IO.NEW_LINE; - RTEMS.TASK_WAKE_AFTER( 2, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); case ARGUMENT is when 1 .. 4 => loop - RTEMS.RATE_MONOTONIC_PERIOD( + RTEMS.RATE_MONOTONIC.PERIOD( RMID, SPTEST.PERIODS( INTEGER( ARGUMENT ) ), STATUS @@ -159,7 +159,7 @@ package body SPTEST is PASS := 0; FAILED := 0; - RTEMS.RATE_MONOTONIC_PERIOD( + RTEMS.RATE_MONOTONIC.PERIOD( RMID, SPTEST.PERIODS( INTEGER( ARGUMENT ) ), STATUS @@ -174,7 +174,7 @@ package body SPTEST is loop - RTEMS.RATE_MONOTONIC_PERIOD( + RTEMS.RATE_MONOTONIC.PERIOD( RMID, SPTEST.PERIODS( INTEGER( ARGUMENT ) ), STATUS @@ -237,14 +237,14 @@ package body SPTEST is -- test changing periods for INDEX in 0 .. 10 loop PERIOD := RTEMS.INTERVAL( ( INDEX + 1 ) * 10 ); - RTEMS.RATE_MONOTONIC_PERIOD( RMID, PERIOD, STATUS); + RTEMS.RATE_MONOTONIC.PERIOD( RMID, PERIOD, STATUS); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "rate_monotonic_period of TA6" ); -- timestamp - RTEMS.CLOCK_GET( - RTEMS.CLOCK_GET_TICKS_SINCE_BOOT, + RTEMS.CLOCK.GET( + RTEMS.CLOCK.GET_TICKS_SINCE_BOOT, Time( INDEX )'ADDRESS, STATUS ); @@ -267,7 +267,7 @@ package body SPTEST is end if; end loop; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "task_suspend of TA6" ); @@ -279,7 +279,6 @@ package body SPTEST is end TASK_1_THROUGH_6; ---PAGE -- -- GET_ALL_COUNTERS -- @@ -290,7 +289,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -307,7 +306,7 @@ package body SPTEST is end loop; - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, diff --git a/c/src/ada-tests/sptests/sp20/sptest.ads b/c/src/ada-tests/sptests/sp20/sptest.ads index 523bdd7d64..17d102852c 100644 --- a/c/src/ada-tests/sptests/sp20/sptest.ads +++ b/c/src/ada-tests/sptests/sp20/sptest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2007. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -75,7 +76,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -88,7 +89,7 @@ package SPTEST is -- procedure TASK_1_THROUGH_6 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1_THROUGH_6); |