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 | |
| 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')
227 files changed, 2690 insertions, 2636 deletions
diff --git a/c/src/ada-tests/mptests/mp01/mp01.adb b/c/src/ada-tests/mptests/mp01/mp01.adb index d90b582397..1a41b56c0d 100644 --- a/c/src/ada-tests/mptests/mp01/mp01.adb +++ b/c/src/ada-tests/mptests/mp01/mp01.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 MPTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure MP01 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, 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; diff --git a/c/src/ada-tests/mptests/mp01/mptest.ads b/c/src/ada-tests/mptests/mp01/mptest.ads index 682d1a568c..dbbddfaff2 100644 --- a/c/src/ada-tests/mptests/mp01/mptest.ads +++ b/c/src/ada-tests/mptests/mp01/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -41,7 +42,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -54,7 +55,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb b/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb index 36c97108a0..6fa4ba337e 100644 --- a/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb +++ b/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP01_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb b/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb index 448e4247a4..ed34c0cd5d 100644 --- a/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb +++ b/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP01_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp02/mptest.adb b/c/src/ada-tests/mptests/mp02/mptest.adb index 9a55f1c572..325863ff64 100644 --- a/c/src/ada-tests/mptests/mp02/mptest.adb +++ b/c/src/ada-tests/mptests/mp02/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,19 @@ with INTERFACES; use INTERFACES; with RTEMS; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -52,7 +52,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating test task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 1, 2048, @@ -63,7 +63,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -71,18 +71,17 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - 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 TID : RTEMS.ID; TEST_TID : RTEMS.ID; @@ -92,7 +91,7 @@ package body MPTEST is 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" ); if TEST_SUPPORT.NODE = 1 then @@ -105,7 +104,7 @@ package body MPTEST is loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, REMOTE_TID, @@ -121,7 +120,7 @@ package body MPTEST is -- TEXT_IO.PUT_LINE( "Getting TID of remote task (1 node)" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( REMOTE_NODE ), REMOTE_NODE, TEST_TID, @@ -134,7 +133,7 @@ package body MPTEST is RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; - RTEMS.TASK_DELETE( REMOTE_TID, STATUS ); + RTEMS.TASKS.DELETE( REMOTE_TID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ILLEGAL_ON_REMOTE_OBJECT, @@ -144,7 +143,7 @@ package body MPTEST is "task_delete of remote task returned the correct error" ); - RTEMS.TASK_START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ILLEGAL_ON_REMOTE_OBJECT, @@ -154,7 +153,7 @@ package body MPTEST is "task_start of remote task returned the correct error" ); - RTEMS.TASK_RESTART( REMOTE_TID, 0, STATUS ); + RTEMS.TASKS.RESTART( REMOTE_TID, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ILLEGAL_ON_REMOTE_OBJECT, @@ -170,7 +169,7 @@ package body MPTEST is TEXT_IO.PUT( " of the remote task to " ); UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ), WIDTH=>1 ); TEXT_IO.NEW_LINE; - RTEMS.TASK_SET_NOTE( + RTEMS.TASKS.SET_NOTE( REMOTE_TID, RTEMS.GET_NODE( TID ), RTEMS.GET_NODE( TID ), @@ -179,7 +178,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" ); TEXT_IO.PUT_LINE( "Getting a notepad of the remote task" ); - RTEMS.TASK_GET_NOTE( + RTEMS.TASKS.GET_NOTE( REMOTE_TID, RTEMS.GET_NODE( TID ), NOTE, @@ -200,7 +199,7 @@ package body MPTEST is end if; - RTEMS.TASK_DELETE( REMOTE_TID, STATUS ); + RTEMS.TASKS.DELETE( REMOTE_TID, STATUS ); TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" ); RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/c/src/ada-tests/mptests/mp02/mptest.ads b/c/src/ada-tests/mptests/mp02/mptest.ads index 20f224cc1b..dcc55e2b6c 100644 --- a/c/src/ada-tests/mptests/mp02/mptest.ads +++ b/c/src/ada-tests/mptests/mp02/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -41,7 +42,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -54,7 +55,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb b/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb index 20083de3c2..6346cf1b49 100644 --- a/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb +++ b/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP02_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb b/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb index f9c1602940..06aae91fb5 100644 --- a/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb +++ b/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP02_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp03/mptest.adb b/c/src/ada-tests/mptests/mp03/mptest.adb index 7e53e840c6..160ef17754 100644 --- a/c/src/ada-tests/mptests/mp03/mptest.adb +++ b/c/src/ada-tests/mptests/mp03/mptest.adb @@ -6,7 +6,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 @@ -18,19 +18,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.EVENT; +with RTEMS.TASKS; +with RTEMS.TIMER; 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 STATUS : RTEMS.STATUS_CODES; begin @@ -47,7 +49,7 @@ package body MPTEST is MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( '2', '2', '2', ' ' ); TEXT_IO.PUT_LINE( "Creating Test_task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 1, 2048, @@ -59,7 +61,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -69,7 +71,7 @@ package body MPTEST is MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( MPTEST.TIMER_NAME( 1 ), MPTEST.TIMER_ID( 1 ), STATUS @@ -77,12 +79,11 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); TEXT_IO.PUT_LINE( "Deleting initialization task" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- DELAYED_SEND_EVENT -- @@ -94,24 +95,23 @@ package body MPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( MPTEST.TASK_ID( 1 ), RTEMS.EVENT_16, STATUS ); + RTEMS.EVENT.SEND( MPTEST.TASK_ID( 1 ), RTEMS.EVENT_16, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" ); end DELAYED_SEND_EVENT; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is 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" ); TEXT_IO.PUT_LINE( "Getting TID of remote task" ); @@ -126,7 +126,7 @@ package body MPTEST is loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, MPTEST.REMOTE_TID, @@ -137,7 +137,7 @@ package body MPTEST is end loop; - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( MPTEST.TIMER_ID( 1 ), 10 * TEST_SUPPORT.TICKS_PER_SECOND, MPTEST.DELAYED_SEND_EVENT'ACCESS, @@ -148,7 +148,7 @@ package body MPTEST is MPTEST.TEST_TASK_SUPPORT( 1 ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( MPTEST.TIMER_ID( 1 ), 11 * TEST_SUPPORT.TICKS_PER_SECOND, MPTEST.DELAYED_SEND_EVENT'ACCESS, @@ -159,7 +159,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 2 then - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); @@ -175,7 +175,6 @@ package body MPTEST is end TEST_TASK; ---PAGE -- -- TEST_TASK_SUPPORT -- @@ -192,7 +191,7 @@ package body MPTEST is loop - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -208,7 +207,7 @@ package body MPTEST is "EVENT_RECEIVE" ); - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); @@ -216,10 +215,10 @@ package body MPTEST is TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( NODE ), FALSE ); TEXT_IO.PUT_LINE( " - Suspending remote task" ); - RTEMS.TASK_SUSPEND( MPTEST.REMOTE_TID, STATUS ); + RTEMS.TASKS.SUSPEND( MPTEST.REMOTE_TID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); @@ -228,7 +227,7 @@ package body MPTEST is TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( NODE ), FALSE ); TEXT_IO.PUT_LINE( " - Resuming remote task" ); - RTEMS.TASK_RESUME( MPTEST.REMOTE_TID, STATUS ); + RTEMS.TASKS.RESUME( MPTEST.REMOTE_TID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); end loop; @@ -237,7 +236,7 @@ package body MPTEST is loop - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -255,7 +254,7 @@ package body MPTEST is TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( REMOTE_NODE ), FALSE ); TEXT_IO.PUT_LINE( " - have I been suspended???" ); - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); diff --git a/c/src/ada-tests/mptests/mp03/mptest.ads b/c/src/ada-tests/mptests/mp03/mptest.ads index 6429355a1d..befdce24e4 100644 --- a/c/src/ada-tests/mptests/mp03/mptest.ads +++ b/c/src/ada-tests/mptests/mp03/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -63,7 +64,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -91,7 +92,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb b/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb index a929a72667..bb9a53cd66 100644 --- a/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb +++ b/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP03_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb b/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb index 64b6b26526..8b6d43f890 100644 --- a/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb +++ b/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP03_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp04/mptest.adb b/c/src/ada-tests/mptests/mp04/mptest.adb index 78c7615926..30d4441844 100644 --- a/c/src/ada-tests/mptests/mp04/mptest.adb +++ b/c/src/ada-tests/mptests/mp04/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,19 @@ with INTERFACES; use INTERFACES; with RTEMS; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -52,7 +52,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating Test_task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), TEST_SUPPORT.NODE, 2048, @@ -65,7 +65,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Starting Test_task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -75,26 +75,25 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Deleting initialization task" ); - 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 TID : RTEMS.ID; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; - PREVIOUS_PRIORITY_1 : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; + PREVIOUS_PRIORITY_1 : RTEMS.TASKS.PRIORITY; 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" ); TEXT_IO.PUT_LINE( "Getting TID of remote task" ); @@ -109,7 +108,7 @@ package body MPTEST is loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, MPTEST.REMOTE_TID, @@ -120,7 +119,7 @@ package body MPTEST is end loop; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( MPTEST.REMOTE_TID, TEST_SUPPORT.NODE, PREVIOUS_PRIORITY, @@ -142,9 +141,9 @@ package body MPTEST is loop - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, PREVIOUS_PRIORITY_1, STATUS ); diff --git a/c/src/ada-tests/mptests/mp04/mptest.ads b/c/src/ada-tests/mptests/mp04/mptest.ads index 3c4d311923..d7c7255af4 100644 --- a/c/src/ada-tests/mptests/mp04/mptest.ads +++ b/c/src/ada-tests/mptests/mp04/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -55,7 +56,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -68,7 +69,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb b/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb index 3932c64b43..2f2d2250fe 100644 --- a/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb +++ b/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP04_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb b/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb index ccafc1dfa2..8989c5cb05 100644 --- a/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb +++ b/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP04_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp05/mptest.adb b/c/src/ada-tests/mptests/mp05/mptest.adb index b48b0d2785..a58418a847 100644 --- a/c/src/ada-tests/mptests/mp05/mptest.adb +++ b/c/src/ada-tests/mptests/mp05/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,22 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.FATAL; +with RTEMS.SIGNAL; +with RTEMS.TASKS; +with RTEMS.TIMER; 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 STATUS : RTEMS.STATUS_CODES; begin @@ -52,7 +55,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating Test_task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 1, 2048, @@ -65,7 +68,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Starting Test_task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -76,7 +79,7 @@ package body MPTEST is MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' ); MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'M', '2', ' ' ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( MPTEST.TIMER_NAME( TEST_SUPPORT.NODE ), MPTEST.TIMER_ID( 1 ), STATUS @@ -85,12 +88,11 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Deleting initialization task" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PROCESS_ASR -- @@ -109,7 +111,7 @@ package body MPTEST is UNSIGNED32_IO.PUT( SIGNAL, BASE => 16 ); TEXT_IO.NEW_LINE; - RTEMS.FATAL_ERROR_OCCURRED( 16#000F_0000# ); + RTEMS.FATAL.ERROR_OCCURRED( 16#000F_0000# ); end if; @@ -117,7 +119,6 @@ package body MPTEST is end PROCESS_ASR; ---PAGE -- -- STOP_TEST_TSR -- @@ -132,13 +133,12 @@ package body MPTEST is end STOP_TEST_TSR; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -149,7 +149,7 @@ package body MPTEST is MPTEST.SIGNAL_COUNT := 0; TEXT_IO.PUT_LINE( "signal_catch: initializing signal catcher" ); - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( MPTEST.PROCESS_ASR'ACCESS, RTEMS.NO_ASR + RTEMS.NO_PREEMPT, STATUS @@ -172,7 +172,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Getting TID of remote task" ); loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, MPTEST.REMOTE_TID, @@ -183,7 +183,7 @@ package body MPTEST is end loop; - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( MPTEST.TIMER_ID( 1 ), 3 * TEST_SUPPORT.TICKS_PER_SECOND, MPTEST.STOP_TEST_TSR'ACCESS, @@ -196,7 +196,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Sending signal to remote task" ); loop - RTEMS.SIGNAL_SEND( + RTEMS.SIGNAL.SEND( MPTEST.REMOTE_TID, MPTEST.REMOTE_SIGNAL, STATUS @@ -228,7 +228,7 @@ package body MPTEST is end if; - RTEMS.SIGNAL_SEND( + RTEMS.SIGNAL.SEND( MPTEST.REMOTE_TID, MPTEST.REMOTE_SIGNAL, STATUS diff --git a/c/src/ada-tests/mptests/mp05/mptest.ads b/c/src/ada-tests/mptests/mp05/mptest.ads index 08802f41e5..337c3374c1 100644 --- a/c/src/ada-tests/mptests/mp05/mptest.ads +++ b/c/src/ada-tests/mptests/mp05/mptest.ads @@ -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 @@ -21,6 +21,8 @@ -- with RTEMS; +with RTEMS.SIGNAL; +with RTEMS.TASKS; package MPTEST is @@ -95,7 +97,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -135,7 +137,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb b/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb index a4a826e035..1ceaeb8865 100644 --- a/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb +++ b/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP05_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb b/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb index 9ea86b9c55..9ab3828723 100644 --- a/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb +++ b/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP05_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp06/mptest.adb b/c/src/ada-tests/mptests/mp06/mptest.adb index 929256fc6f..066664671c 100644 --- a/c/src/ada-tests/mptests/mp06/mptest.adb +++ b/c/src/ada-tests/mptests/mp06/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,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.EVENT; +with RTEMS.TASKS; +with RTEMS.TIMER; 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 STATUS : RTEMS.STATUS_CODES; begin @@ -52,7 +54,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating Test_task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), TEST_SUPPORT.NODE, 2048, @@ -65,7 +67,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Starting Test_task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -76,7 +78,7 @@ package body MPTEST is MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' ); MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'M', '2', ' ' ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( MPTEST.TIMER_NAME( TEST_SUPPORT.NODE ), MPTEST.TIMER_ID( 1 ), STATUS @@ -85,12 +87,11 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Deleting initialization task" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- STOP_TEST_TSR -- @@ -105,13 +106,12 @@ package body MPTEST is end STOP_TEST_TSR; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; EVENT_OUT : RTEMS.EVENT_SET; @@ -134,7 +134,7 @@ package body MPTEST is loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, MPTEST.REMOTE_TID, @@ -151,7 +151,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Receiving events from remote task" ); end if; - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( MPTEST.TIMER_ID( 1 ), 5 * TEST_SUPPORT.TICKS_PER_SECOND, MPTEST.STOP_TEST_TSR'ACCESS, @@ -173,7 +173,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( MPTEST.REMOTE_TID, EVENT_FOR_THIS_ITERATION, STATUS @@ -182,7 +182,7 @@ package body MPTEST is else - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( EVENT_FOR_THIS_ITERATION, RTEMS.DEFAULT_OPTIONS, 1 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -227,7 +227,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 2 then - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, 1 * TEST_SUPPORT.TICKS_PER_SECOND, diff --git a/c/src/ada-tests/mptests/mp06/mptest.ads b/c/src/ada-tests/mptests/mp06/mptest.ads index db6204a549..b678db4e1c 100644 --- a/c/src/ada-tests/mptests/mp06/mptest.ads +++ b/c/src/ada-tests/mptests/mp06/mptest.ads @@ -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 @@ -21,6 +21,8 @@ -- with RTEMS; +with RTEMS.EVENT; +with RTEMS.TASKS; package MPTEST is @@ -114,7 +116,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -141,7 +143,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb b/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb index 396875e055..84cfc810e0 100644 --- a/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb +++ b/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP06_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb b/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb index 7a79bc1d36..004de64a68 100644 --- a/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb +++ b/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP06_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp07/mptest.adb b/c/src/ada-tests/mptests/mp07/mptest.adb index fc3bd8570a..4f401ca307 100644 --- a/c/src/ada-tests/mptests/mp07/mptest.adb +++ b/c/src/ada-tests/mptests/mp07/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,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.EVENT; +with RTEMS.TASKS; +with RTEMS.TIMER; 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 STATUS : RTEMS.STATUS_CODES; begin @@ -51,7 +53,7 @@ package body MPTEST is MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( '2', '2', '2', ' ' ); TEXT_IO.PUT_LINE( "Creating Test_task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), TEST_SUPPORT.NODE, 2048, @@ -63,7 +65,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -73,7 +75,7 @@ package body MPTEST is MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( MPTEST.TIMER_NAME( 1 ), MPTEST.TIMER_ID( 1 ), STATUS @@ -81,12 +83,11 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); TEXT_IO.PUT_LINE( "Deleting initialization task" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- STOP_TEST_TSR -- @@ -101,13 +102,12 @@ package body MPTEST is end STOP_TEST_TSR; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is EVENT_OUT : RTEMS.EVENT_SET; STATUS : RTEMS.STATUS_CODES; @@ -126,7 +126,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Getting TID of remote task" ); loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, MPTEST.REMOTE_TID, @@ -140,7 +140,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Sending first event to remote task" ); - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( MPTEST.REMOTE_TID, RTEMS.EVENT_16, STATUS @@ -149,7 +149,7 @@ package body MPTEST is end if; - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( MPTEST.TIMER_ID( 1 ), 5 * TEST_SUPPORT.TICKS_PER_SECOND, MPTEST.STOP_TEST_TSR'ACCESS, @@ -165,7 +165,7 @@ package body MPTEST is for COUNT in 1 .. MPTEST.PER_DOT loop - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, TEST_SUPPORT.TICKS_PER_SECOND, @@ -182,7 +182,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" ); end if; - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( MPTEST.REMOTE_TID, RTEMS.EVENT_16, STATUS diff --git a/c/src/ada-tests/mptests/mp07/mptest.ads b/c/src/ada-tests/mptests/mp07/mptest.ads index c33572f6e1..dee3e279c7 100644 --- a/c/src/ada-tests/mptests/mp07/mptest.ads +++ b/c/src/ada-tests/mptests/mp07/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -74,7 +75,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -101,7 +102,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb b/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb index b6374c854f..3761d156b0 100644 --- a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb +++ b/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP07_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb b/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb index 2af6a98954..a1469bbe0f 100644 --- a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb +++ b/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP07_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp08/mptest.adb b/c/src/ada-tests/mptests/mp08/mptest.adb index 4df686191e..347c382598 100644 --- a/c/src/ada-tests/mptests/mp08/mptest.adb +++ b/c/src/ada-tests/mptests/mp08/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,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.OBJECT; +with RTEMS.SEMAPHORE; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -56,7 +58,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating Semaphore(Global)" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( MPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.GLOBAL, @@ -68,7 +70,7 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "Creating Test_task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), TEST_SUPPORT.NODE, 2048, @@ -80,7 +82,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -89,18 +91,17 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Deleting initialization task" ); - 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 DOTS : RTEMS.UNSIGNED32; COUNT : RTEMS.UNSIGNED32; @@ -110,7 +111,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Getting SMID of semaphore" ); loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( MPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.SEMAPHORE_ID( 1 ), @@ -123,7 +124,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 2 then - RTEMS.SEMAPHORE_DELETE( + RTEMS.SEMAPHORE.DELETE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); @@ -145,7 +146,7 @@ package body MPTEST is TEST_SUPPORT.PUT_DOT( "p" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -175,14 +176,14 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 and then COUNT >= 1000 then - 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" ); TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "Deleting global semaphore" ); - RTEMS.SEMAPHORE_DELETE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE" ); TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" ); @@ -193,7 +194,7 @@ package body MPTEST is TEST_SUPPORT.PUT_DOT( "v" ); - RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); diff --git a/c/src/ada-tests/mptests/mp08/mptest.ads b/c/src/ada-tests/mptests/mp08/mptest.ads index 1779701617..5a71ff199e 100644 --- a/c/src/ada-tests/mptests/mp08/mptest.ads +++ b/c/src/ada-tests/mptests/mp08/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -69,7 +70,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -82,7 +83,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb b/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb index ac7a636068..4096449881 100644 --- a/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb +++ b/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP08_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb b/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb index dc838edf22..e440384b83 100644 --- a/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb +++ b/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP08_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp09/mptest.adb b/c/src/ada-tests/mptests/mp09/mptest.adb index 8e7a3da783..c4c4610937 100644 --- a/c/src/ada-tests/mptests/mp09/mptest.adb +++ b/c/src/ada-tests/mptests/mp09/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,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.OBJECT; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -75,7 +77,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( MPTEST.QUEUE_NAME( 1 ), 3, RTEMS.GLOBAL + RTEMS.LIMIT, @@ -87,7 +89,7 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "Creating Test_task (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), TEST_SUPPORT.NODE, 2048, @@ -99,7 +101,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -108,12 +110,11 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Deleting initialization task" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- SEND_MESSAGES -- @@ -127,7 +128,7 @@ package body MPTEST is MPTEST.PUT_BUFFER( MPTEST.BUFFER_AREA_1 ); TEXT_IO.NEW_LINE; - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( MPTEST.QUEUE_ID( 1 ), MPTEST.BUFFER_1, STATUS @@ -135,7 +136,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); TEXT_IO.PUT_LINE( "Delaying for a second" ); - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); @@ -145,7 +146,7 @@ package body MPTEST is MPTEST.PUT_BUFFER( MPTEST.BUFFER_AREA_2 ); TEXT_IO.NEW_LINE; - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( MPTEST.QUEUE_ID( 1 ), MPTEST.BUFFER_2, STATUS @@ -153,7 +154,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" ); TEXT_IO.PUT_LINE( "Delaying for a second" ); - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); @@ -163,7 +164,7 @@ package body MPTEST is MPTEST.PUT_BUFFER( MPTEST.BUFFER_AREA_3 ); TEXT_IO.NEW_LINE; - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( MPTEST.QUEUE_ID( 1 ), MPTEST.BUFFER_3, BROADCAST_COUNT, @@ -172,7 +173,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_BROADCAST" ); TEXT_IO.PUT_LINE( "Delaying for a second" ); - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); @@ -180,7 +181,6 @@ package body MPTEST is end SEND_MESSAGES; ---PAGE -- -- RECEIVE_MESSAGES -- @@ -194,7 +194,7 @@ package body MPTEST is loop TEXT_IO.PUT_LINE( "Receiving message ..." ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), MPTEST.RECEIVE_BUFFER, RTEMS.DEFAULT_OPTIONS, @@ -211,12 +211,11 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Receiver delaying for a second" ); - RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); end RECEIVE_MESSAGES; ---PAGE -- -- FILL_BUFFER -- @@ -243,7 +242,6 @@ package body MPTEST is end FILL_BUFFER; ---PAGE -- -- PUT_BUFFER -- @@ -264,26 +262,25 @@ package body MPTEST is end PUT_BUFFER; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Getting QID of message queue" ); loop - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( MPTEST.QUEUE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.QUEUE_ID( 1 ), @@ -296,7 +293,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 2 then - RTEMS.MESSAGE_QUEUE_DELETE( MPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( MPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, @@ -313,7 +310,7 @@ package body MPTEST is MPTEST.RECEIVE_MESSAGES; TEXT_IO.PUT_LINE( "Flushing remote empty queue" ); - RTEMS.MESSAGE_QUEUE_FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS ); + RTEMS.MESSAGE_QUEUE.FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" ); UNSIGNED32_IO.PUT( COUNT, WIDTH => 1 ); TEXT_IO.PUT_LINE( @@ -323,7 +320,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Send messages to be flushed from remote queue" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( MPTEST.QUEUE_ID( 1 ), MPTEST.BUFFER_1, STATUS @@ -331,7 +328,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); TEXT_IO.PUT_LINE( "Flushing remote queue" ); - RTEMS.MESSAGE_QUEUE_FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS ); + RTEMS.MESSAGE_QUEUE.FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" ); UNSIGNED32_IO.PUT( COUNT, WIDTH => 1 ); TEXT_IO.PUT_LINE( @@ -339,7 +336,7 @@ package body MPTEST is ); TEXT_IO.PUT_LINE( "Waiting for message queue to be deleted" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), MPTEST.RECEIVE_BUFFER, RTEMS.DEFAULT_OPTIONS, @@ -358,13 +355,13 @@ package body MPTEST is MPTEST.SEND_MESSAGES; - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); - RTEMS.MESSAGE_QUEUE_DELETE( MPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( MPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" ); end if; diff --git a/c/src/ada-tests/mptests/mp09/mptest.ads b/c/src/ada-tests/mptests/mp09/mptest.ads index 1f68ab351d..f780705bba 100644 --- a/c/src/ada-tests/mptests/mp09/mptest.ads +++ b/c/src/ada-tests/mptests/mp09/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -86,7 +87,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -144,7 +145,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb b/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb index 63ba6ddb8b..537d7dddab 100644 --- a/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb +++ b/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP09_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb b/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb index 18accbaa1b..9d7dba2731 100644 --- a/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb +++ b/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP09_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp10/mptest.adb b/c/src/ada-tests/mptests/mp10/mptest.adb index d370cb8e5b..d5c3000b8a 100644 --- a/c/src/ada-tests/mptests/mp10/mptest.adb +++ b/c/src/ada-tests/mptests/mp10/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,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.SEMAPHORE; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -59,7 +61,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( MPTEST.QUEUE_NAME( 1 ), 3, RTEMS.GLOBAL + RTEMS.LIMIT, @@ -69,7 +71,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( MPTEST.SEMAPHORE_NAME( 1 ), 0, RTEMS.GLOBAL + RTEMS.PRIORITY, @@ -78,13 +80,13 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" ); - RTEMS.TASK_WAKE_AFTER( 10 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 10 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); else TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 1 ), 1, 2048, @@ -96,7 +98,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK_1'ACCESS, 0, @@ -105,7 +107,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 2 ), 1, 2048, @@ -117,7 +119,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 2 ), MPTEST.TEST_TASK_2'ACCESS, 0, @@ -126,7 +128,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Creating Test_task 3 (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 3 ), 1, 2048, @@ -138,7 +140,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task 3 (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 3 ), MPTEST.TEST_TASK_3'ACCESS, 0, @@ -147,19 +149,19 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Sleeping for 1 second ..." ); - 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" ); TEXT_IO.PUT_LINE( "Deleting Test_task 2" ); - RTEMS.TASK_DELETE( MPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.DELETE( MPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF 2" ); TEXT_IO.PUT_LINE( "Deleting Test_task 1" ); - RTEMS.TASK_DELETE( MPTEST.TASK_ID( 1 ), STATUS ); + RTEMS.TASKS.DELETE( MPTEST.TASK_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF 1" ); TEXT_IO.PUT_LINE( "Restarting Test_task 3" ); - RTEMS.TASK_RESTART( MPTEST.TASK_ID( 3 ), 1, STATUS ); + RTEMS.TASKS.RESTART( MPTEST.TASK_ID( 3 ), 1, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF 3" ); end if; @@ -170,13 +172,12 @@ package body MPTEST is end INIT; ---PAGE -- -- TEST_TASK_1 -- procedure TEST_TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; RECEIVE_BUFFER_AREA : RTEMS.BUFFER; @@ -191,7 +192,7 @@ package body MPTEST is loop - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( MPTEST.QUEUE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.QUEUE_ID( 1 ), @@ -203,7 +204,7 @@ package body MPTEST is end loop; TEXT_IO.PUT_LINE( "Attempting to receive message ..." ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), RECEIVE_BUFFER, RTEMS.DEFAULT_OPTIONS, @@ -214,13 +215,12 @@ package body MPTEST is end TEST_TASK_1; ---PAGE -- -- TEST_TASK_2 -- procedure TEST_TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -229,7 +229,7 @@ package body MPTEST is loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( MPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.SEMAPHORE_ID( 1 ), @@ -241,7 +241,7 @@ package body MPTEST is end loop; TEXT_IO.PUT_LINE( "Attempting to acquire semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -251,20 +251,19 @@ package body MPTEST is end TEST_TASK_2; ---PAGE -- -- TEST_TASK_3 -- procedure TEST_TASK_3 ( - RESTART : in RTEMS.TASK_ARGUMENT + RESTART : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin if RESTART = 1 then - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); end if; @@ -273,7 +272,7 @@ package body MPTEST is loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( MPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.SEMAPHORE_ID( 1 ), @@ -285,7 +284,7 @@ package body MPTEST is end loop; TEXT_IO.PUT_LINE( "Attempting to acquire semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/mptests/mp10/mptest.ads b/c/src/ada-tests/mptests/mp10/mptest.ads index bcc7a6006b..50fb1b95cc 100644 --- a/c/src/ada-tests/mptests/mp10/mptest.ads +++ b/c/src/ada-tests/mptests/mp10/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -77,7 +78,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -90,7 +91,7 @@ package MPTEST is -- procedure TEST_TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK_1); @@ -103,7 +104,7 @@ package MPTEST is -- procedure TEST_TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK_2); @@ -116,7 +117,7 @@ package MPTEST is -- procedure TEST_TASK_3 ( - RESTART : in RTEMS.TASK_ARGUMENT + RESTART : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK_3); diff --git a/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb b/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb index 5fdb01be4a..f2da6a4404 100644 --- a/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb +++ b/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP10_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb b/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb index eef4d3c98b..eb4a64666a 100644 --- a/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb +++ b/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP10_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp11/mptest.adb b/c/src/ada-tests/mptests/mp11/mptest.adb index 3257fe5de6..be162647ac 100644 --- a/c/src/ada-tests/mptests/mp11/mptest.adb +++ b/c/src/ada-tests/mptests/mp11/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,22 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.PARTITION; +with RTEMS.SEMAPHORE; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -59,7 +62,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Attempting to create Test_task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 1 ), 1, 2048, @@ -76,7 +79,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "task_create correctly returned TOO_MANY" ); TEXT_IO.PUT_LINE( "Attempting to create Message Queue (Global)" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( MPTEST.QUEUE_NAME( 1 ), 3, RTEMS.GLOBAL + RTEMS.LIMIT, @@ -93,7 +96,7 @@ package body MPTEST is ); TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( MPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.GLOBAL, @@ -108,7 +111,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "semaphore_create correctly returned TOO_MANY" ); TEXT_IO.PUT_LINE( "Creating Partition (Global)" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( MPTEST.PARTITION_NAME( 1 ), MPTEST.PARTITION_AREA( 0 )'ADDRESS, 128, diff --git a/c/src/ada-tests/mptests/mp11/mptest.ads b/c/src/ada-tests/mptests/mp11/mptest.ads index fc37669b83..77f9b32b26 100644 --- a/c/src/ada-tests/mptests/mp11/mptest.ads +++ b/c/src/ada-tests/mptests/mp11/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -73,7 +74,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); diff --git a/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb b/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb index d578d9dd6a..ef81225262 100644 --- a/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb +++ b/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP11_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb b/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb index 773a38dc2a..abe614b2fc 100644 --- a/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb +++ b/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP11_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp12/mptest.adb b/c/src/ada-tests/mptests/mp12/mptest.adb index 86cf4102ba..b9a6fac6e6 100644 --- a/c/src/ada-tests/mptests/mp12/mptest.adb +++ b/c/src/ada-tests/mptests/mp12/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.PARTITION; +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 BUFFER_ADDRESS : RTEMS.ADDRESS; STATUS : RTEMS.STATUS_CODES; @@ -57,14 +58,14 @@ package body MPTEST is if TEST_SUPPORT.NODE = 2 then - RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Getting ID of remote Partition (Global)" ); loop - RTEMS.PARTITION_IDENT( + RTEMS.PARTITION.IDENT( MPTEST.PARTITION_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.PARTITION_ID( 1 ), @@ -79,7 +80,7 @@ package body MPTEST is "Attempting to delete remote Partition (Global)" ); - RTEMS.PARTITION_DELETE( MPTEST.PARTITION_ID( 1 ), STATUS ); + RTEMS.PARTITION.DELETE( MPTEST.PARTITION_ID( 1 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ILLEGAL_ON_REMOTE_OBJECT, @@ -92,7 +93,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Obtaining a buffer from the global partition" ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( MPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS, STATUS @@ -106,20 +107,20 @@ package body MPTEST is ); TEXT_IO.NEW_LINE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( MPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" ); - RTEMS.TASK_WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); else TEXT_IO.PUT_LINE( "Creating Partition (Global)" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( MPTEST.PARTITION_NAME( 1 ), MPTEST.PARTITION_AREA( 0 )'ADDRESS, 128, @@ -131,11 +132,11 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" ); TEXT_IO.PUT_LINE( "Sleeping for three seconds" ); - RTEMS.TASK_WAKE_AFTER( 3 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 3 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Deleting Partition (Global)" ); - RTEMS.PARTITION_DELETE( MPTEST.PARTITION_ID( 1 ), STATUS ); + RTEMS.PARTITION.DELETE( MPTEST.PARTITION_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE" ); end if; diff --git a/c/src/ada-tests/mptests/mp12/mptest.ads b/c/src/ada-tests/mptests/mp12/mptest.ads index 322bac8d17..5c0fe3febf 100644 --- a/c/src/ada-tests/mptests/mp12/mptest.ads +++ b/c/src/ada-tests/mptests/mp12/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -63,7 +64,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); diff --git a/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb b/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb index 87012a623d..a99fd2db8b 100644 --- a/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb +++ b/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP12_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb b/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb index 48a07fbd02..850d96923b 100644 --- a/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb +++ b/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP12_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp13/mptest.adb b/c/src/ada-tests/mptests/mp13/mptest.adb index 47eaafaaf5..f1369d5ccd 100644 --- a/c/src/ada-tests/mptests/mp13/mptest.adb +++ b/c/src/ada-tests/mptests/mp13/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,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.SEMAPHORE; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -57,7 +59,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( MPTEST.QUEUE_NAME( 1 ), 3, RTEMS.GLOBAL + RTEMS.LIMIT, @@ -67,7 +69,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( MPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.GLOBAL + RTEMS.PRIORITY, @@ -76,7 +78,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -87,7 +89,7 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 1 ), 1, 2048, @@ -99,7 +101,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK_1'ACCESS, 0, @@ -108,7 +110,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 2 ), 1, 2048, @@ -120,7 +122,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 2 ), MPTEST.TEST_TASK_2'ACCESS, 0, @@ -130,7 +132,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" ); @@ -140,18 +142,17 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "Deleting initialization task" ); - 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_1 -- procedure TEST_TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; RECEIVE_BUFFER_AREA : RTEMS.BUFFER; @@ -166,7 +167,7 @@ package body MPTEST is loop - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( MPTEST.QUEUE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.QUEUE_ID( 1 ), @@ -180,7 +181,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Receiving message ..." ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), RECEIVE_BUFFER, RTEMS.DEFAULT_OPTIONS, @@ -192,11 +193,11 @@ package body MPTEST is end if; - 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" ); TEXT_IO.PUT_LINE( "Receiving message ..." ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), RECEIVE_BUFFER, RTEMS.DEFAULT_OPTIONS, @@ -219,18 +220,17 @@ 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" ); end TEST_TASK_1; ---PAGE -- -- TEST_TASK_2 -- procedure TEST_TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -239,7 +239,7 @@ package body MPTEST is loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( MPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.SEMAPHORE_ID( 1 ), @@ -252,18 +252,18 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then - 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" ); TEXT_IO.PUT_LINE( "Releasing semaphore ..." ); - RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -272,7 +272,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -283,11 +283,11 @@ package body MPTEST is end if; - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -296,14 +296,14 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); TEXT_IO.PUT_LINE( "Releasing semaphore ..." ); - RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); - 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" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, 2 * TEST_SUPPORT.TICKS_PER_SECOND, diff --git a/c/src/ada-tests/mptests/mp13/mptest.ads b/c/src/ada-tests/mptests/mp13/mptest.ads index 5ab6882d46..fbdc87b143 100644 --- a/c/src/ada-tests/mptests/mp13/mptest.ads +++ b/c/src/ada-tests/mptests/mp13/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -71,7 +72,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -84,7 +85,7 @@ package MPTEST is -- procedure TEST_TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK_1); @@ -97,7 +98,7 @@ package MPTEST is -- procedure TEST_TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK_2); diff --git a/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb b/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb index 388996f16d..59b6f7eab9 100644 --- a/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb +++ b/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP13_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb b/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb index c47a10a4c8..df84cbf9be 100644 --- a/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb +++ b/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP13_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp14/mptest.adb b/c/src/ada-tests/mptests/mp14/mptest.adb index 846d85d452..b2b9316b7b 100644 --- a/c/src/ada-tests/mptests/mp14/mptest.adb +++ b/c/src/ada-tests/mptests/mp14/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 @@ -23,6 +23,12 @@ with INTERFACES; use INTERFACES; with INTERFACES.C; with RTEMS; +with RTEMS.EVENT; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.PARTITION; +with RTEMS.SEMAPHORE; +with RTEMS.TASKS; +with RTEMS.TIMER; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; @@ -31,7 +37,6 @@ with System.Storage_Elements; use System.Storage_Elements; package body MPTEST is ---PAGE -- -- STOP_TEST_TSR -- @@ -46,7 +51,6 @@ package body MPTEST is end STOP_TEST_TSR; ---PAGE -- -- EXIT_TEST -- @@ -58,7 +62,7 @@ package body MPTEST is pragma Import (C, BSP_MPCI_PRINT_STATISTICS, "MPCI_Print_statistics" ); begin - RTEMS.TASK_MODE(RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, STATUS); + RTEMS.TASKS.MODE(RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, STATUS); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); BSP_MPCI_PRINT_STATISTICS; @@ -67,17 +71,16 @@ package body MPTEST is end EXIT_TEST; ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is INDEX : RTEMS.UNSIGNED32; STATUS : RTEMS.STATUS_CODES; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin TEXT_IO.NEW_LINE( 2 ); @@ -92,14 +95,14 @@ package body MPTEST is MPTEST.STOP_TEST := FALSE; - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( MPTEST.STOP_TIMER_NAME, MPTEST.STOP_TIMER_ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( MPTEST.STOP_TIMER_ID, TEST_SUPPORT.MAXIMUM_LONG_TEST_DURATION * TEST_SUPPORT.TICKS_PER_SECOND, @@ -144,7 +147,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( MPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.GLOBAL, @@ -154,7 +157,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" ); TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( MPTEST.QUEUE_NAME( 1 ), 1, RTEMS.GLOBAL, @@ -164,7 +167,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); TEXT_IO.PUT_LINE( "Creating Partition (Global)" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( MPTEST.PARTITION_NAME( 1 ), MPTEST.PARTITION_AREA( 0 )'ADDRESS, 16#8000#, @@ -178,7 +181,7 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "Creating Event task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.EVENT_TASK_NAME( TEST_SUPPORT.NODE ), @@ -192,7 +195,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Event task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.EVENT_TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -201,7 +204,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Creating Semaphore task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.SEMAPHORE_TASK_NAME( TEST_SUPPORT.NODE ), @@ -215,7 +218,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Semaphore task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.SEMAPHORE_TASK_ID( 1 ), MPTEST.SEMAPHORE_TASK'ACCESS, 0, @@ -224,7 +227,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Creating Message Queue task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.QUEUE_TASK_NAME( TEST_SUPPORT.NODE ), @@ -238,7 +241,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Message Queue task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.QUEUE_TASK_ID( 1 ), MPTEST.MESSAGE_QUEUE_TASK'ACCESS, 1, -- index of buffer @@ -247,7 +250,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Creating Partition task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.PARTITION_TASK_NAME( TEST_SUPPORT.NODE ), @@ -261,7 +264,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Partition task (Global)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.PARTITION_TASK_ID( 1 ), MPTEST.PARTITION_TASK'ACCESS, 0, @@ -269,7 +272,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 2, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 2, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); MPTEST.DELAYED_EVENTS_TASK( 1 ); @@ -292,7 +295,7 @@ package body MPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( MPTEST.TASK_ID( RTEMS.GET_INDEX( TIMER_ID ) ), RTEMS.EVENT_16, STATUS @@ -310,7 +313,7 @@ package body MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is REMOTE_NODE : RTEMS.UNSIGNED32; REMOTE_TID : RTEMS.ID; @@ -326,7 +329,7 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "About to go to sleep!" ); - RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Waking up!" ); @@ -337,7 +340,7 @@ package body MPTEST is loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.EVENT_TASK_NAME( REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, REMOTE_TID, @@ -358,7 +361,7 @@ package body MPTEST is for COUNT in 1 .. MPTEST.EVENT_TASK_DOT_COUNT loop - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( REMOTE_TID, RTEMS.EVENT_16, STATUS @@ -384,7 +387,7 @@ package body MPTEST is loop exit when MPTEST.STOP_TEST = TRUE; - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -412,7 +415,7 @@ package body MPTEST is -- procedure DELAYED_EVENTS_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; PREVIOUS_MODE : RTEMS.MODE; @@ -420,7 +423,7 @@ package body MPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.PREEMPT + RTEMS.TIMESLICE, RTEMS.PREEMPT_MASK + RTEMS.TIMESLICE_MASK, PREVIOUS_MODE, @@ -428,14 +431,14 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( MPTEST.TIMER_NAME( 1 ), MPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, MPTEST.TASK_ID( RTEMS.GET_INDEX( MPTEST.TIMER_ID( 1 ) ) ), @@ -447,7 +450,7 @@ package body MPTEST is for COUNT in 1 .. MPTEST.DELAYED_EVENT_DOT_COUNT loop - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( MPTEST.TIMER_ID( 1 ), 1, MPTEST.DELAYED_SEND_EVENT'ACCESS, @@ -456,7 +459,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -484,7 +487,7 @@ package body MPTEST is -- procedure MESSAGE_QUEUE_TASK ( - INDEX : in RTEMS.TASK_ARGUMENT + INDEX : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; YIELD_COUNT : RTEMS.UNSIGNED32; @@ -502,7 +505,7 @@ package body MPTEST is loop - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( MPTEST.QUEUE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.QUEUE_ID( 1 ), @@ -516,7 +519,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( MPTEST.QUEUE_ID( 1 ), MPTEST.BUFFERS( INDEX ), STATUS @@ -554,7 +557,7 @@ package body MPTEST is exit when MPTEST.STOP_TEST = TRUE; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), MPTEST.BUFFERS( INDEX ), RTEMS.DEFAULT_OPTIONS, @@ -573,7 +576,7 @@ package body MPTEST is BUFFER_COUNT.ALL := BUFFER_COUNT.ALL + 1; end if; - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( MPTEST.QUEUE_ID( 1 ), MPTEST.BUFFERS( INDEX ), STATUS @@ -587,7 +590,7 @@ package body MPTEST is if YIELD_COUNT = 0 then - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" ); YIELD_COUNT := 100; @@ -617,7 +620,7 @@ package body MPTEST is -- procedure PARTITION_TASK ( - IGNORED : in RTEMS.TASK_ARGUMENT + IGNORED : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; BUFFER : RTEMS.ADDRESS; @@ -628,7 +631,7 @@ package body MPTEST is loop - RTEMS.PARTITION_IDENT( + RTEMS.PARTITION.IDENT( MPTEST.PARTITION_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.PARTITION_ID( 1 ), @@ -649,14 +652,14 @@ package body MPTEST is exit when MPTEST.STOP_TEST = TRUE; - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( MPTEST.PARTITION_ID( 1 ), BUFFER, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" ); - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( MPTEST.PARTITION_ID( 1 ), BUFFER, STATUS @@ -668,7 +671,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" ); end if; @@ -692,7 +695,7 @@ package body MPTEST is -- procedure SEMAPHORE_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; YIELD_COUNT : RTEMS.UNSIGNED32; @@ -703,7 +706,7 @@ package body MPTEST is loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( MPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.SEMAPHORE_ID( 1 ), @@ -726,7 +729,7 @@ package body MPTEST is exit when MPTEST.STOP_TEST = TRUE; - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -734,7 +737,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); - RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); if TEST_SUPPORT.NODE = 1 then @@ -743,7 +746,7 @@ package body MPTEST is if YIELD_COUNT = 0 then - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" ); YIELD_COUNT := 100; diff --git a/c/src/ada-tests/mptests/mp14/mptest.ads b/c/src/ada-tests/mptests/mp14/mptest.ads index 12e4a15451..71c8552959 100644 --- a/c/src/ada-tests/mptests/mp14/mptest.ads +++ b/c/src/ada-tests/mptests/mp14/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -175,7 +176,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -188,7 +189,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); @@ -201,7 +202,7 @@ package MPTEST is -- procedure DELAYED_EVENTS_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, DELAYED_EVENTS_TASK); @@ -214,7 +215,7 @@ package MPTEST is -- procedure MESSAGE_QUEUE_TASK ( - INDEX : in RTEMS.TASK_ARGUMENT + INDEX : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MESSAGE_QUEUE_TASK); @@ -227,7 +228,7 @@ package MPTEST is -- procedure PARTITION_TASK ( - IGNORED : in RTEMS.TASK_ARGUMENT + IGNORED : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, PARTITION_TASK); @@ -240,7 +241,7 @@ package MPTEST is -- procedure SEMAPHORE_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, SEMAPHORE_TASK); diff --git a/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb b/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb index 68e0c4f3ce..21efdc5726 100644 --- a/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb +++ b/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP14_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb b/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb index 4696cbb11e..b017f59222 100644 --- a/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb +++ b/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb @@ -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; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP14_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/samples/base_mp/mptest.adb b/c/src/ada-tests/samples/base_mp/mptest.adb index 54e8ed9e18..1c829effbf 100644 --- a/c/src/ada-tests/samples/base_mp/mptest.adb +++ b/c/src/ada-tests/samples/base_mp/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.INTERRUPT; +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 STATUS : RTEMS.STATUS_CODES; begin @@ -46,7 +47,7 @@ package body MPTEST is MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 1 ), 1, 2048, @@ -57,7 +58,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.APPLICATION_TASK'ACCESS, 0, @@ -65,24 +66,23 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- APPLICATION_TASK -- procedure APPLICATION_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is 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" ); TEXT_IO.PUT( "This task was invoked with node argument (" ); diff --git a/c/src/ada-tests/samples/base_mp/mptest.ads b/c/src/ada-tests/samples/base_mp/mptest.ads index eae9e5877f..3b5293ca48 100644 --- a/c/src/ada-tests/samples/base_mp/mptest.ads +++ b/c/src/ada-tests/samples/base_mp/mptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -41,7 +42,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -56,7 +57,7 @@ package MPTEST is -- procedure APPLICATION_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, APPLICATION_TASK); diff --git a/c/src/ada-tests/samples/base_sp/base_sp.adb b/c/src/ada-tests/samples/base_sp/base_sp.adb index 1f6efa2856..e8fae1c445 100644 --- a/c/src/ada-tests/samples/base_sp/base_sp.adb +++ b/c/src/ada-tests/samples/base_sp/base_sp.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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure Base_SP is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,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/samples/base_sp/sptest.adb b/c/src/ada-tests/samples/base_sp/sptest.adb index eed98596ea..6a869487fe 100644 --- a/c/src/ada-tests/samples/base_sp/sptest.adb +++ b/c/src/ada-tests/samples/base_sp/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 @@ -26,13 +26,12 @@ with UNSIGNED32_IO; 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; @@ -44,7 +43,7 @@ package body SPTEST is SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -55,7 +54,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.APPLICATION_TASK'ACCESS, 0, @@ -63,24 +62,23 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- APPLICATION_TASK -- procedure APPLICATION_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is 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 ); TEXT_IO.PUT( "Application task was invoked with argument (" ); UNSIGNED32_IO.PUT( ARGUMENT ); diff --git a/c/src/ada-tests/samples/base_sp/sptest.ads b/c/src/ada-tests/samples/base_sp/sptest.ads index 0808adbab4..e37279b815 100644 --- a/c/src/ada-tests/samples/base_sp/sptest.ads +++ b/c/src/ada-tests/samples/base_sp/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -41,7 +42,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -54,7 +55,7 @@ package SPTEST is -- procedure APPLICATION_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, APPLICATION_TASK); diff --git a/c/src/ada-tests/samples/hello/hello.adb b/c/src/ada-tests/samples/hello/hello.adb index c3b3d35894..23cfce012a 100644 --- a/c/src/ada-tests/samples/hello/hello.adb +++ b/c/src/ada-tests/samples/hello/hello.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 Hello is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/samples/hello/sptest.adb b/c/src/ada-tests/samples/hello/sptest.adb index 355c3b49dd..3f6745f3d9 100644 --- a/c/src/ada-tests/samples/hello/sptest.adb +++ b/c/src/ada-tests/samples/hello/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,13 +24,12 @@ with TEXT_IO; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/samples/hello/sptest.ads b/c/src/ada-tests/samples/hello/sptest.ads index cc53b38ff5..e3503da1f8 100644 --- a/c/src/ada-tests/samples/hello/sptest.ads +++ b/c/src/ada-tests/samples/hello/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -41,7 +42,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); diff --git a/c/src/ada-tests/samples/nsecs/nsecs.adb b/c/src/ada-tests/samples/nsecs/nsecs.adb index 9e427d9ae7..01b34a18a4 100644 --- a/c/src/ada-tests/samples/nsecs/nsecs.adb +++ b/c/src/ada-tests/samples/nsecs/nsecs.adb @@ -9,7 +9,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 @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SPTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure Nsecs is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, 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/samples/nsecs/sptest.adb b/c/src/ada-tests/samples/nsecs/sptest.adb index 8d06fc43e3..0696a2561d 100644 --- a/c/src/ada-tests/samples/nsecs/sptest.adb +++ b/c/src/ada-tests/samples/nsecs/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 @@ -23,6 +23,7 @@ with Ada.Integer_Text_IO; with Interfaces.C; with RTEMS; +with RTEMS.Clock; with Text_IO; use type Interfaces.C.Long; use type RTEMS.Time_T; @@ -54,13 +55,12 @@ package body SPTEST is end Subtract_Em; ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); Status : RTEMS.Status_Codes; @@ -88,8 +88,8 @@ package body SPTEST is for Index in 1 .. 10 loop - RTEMS.Clock_Get_Uptime( Start, Status ); - RTEMS.Clock_Get_Uptime( Stop, Status ); + RTEMS.Clock.Get_Uptime( Start, Status ); + RTEMS.Clock.Get_Uptime( Stop, Status ); Subtract_Em( Start, Stop, Diff ); @@ -118,11 +118,11 @@ package body SPTEST is for Index in 1 .. 10 loop Max := (Index * 10000); - RTEMS.Clock_Get_Uptime( Start, Status ); + RTEMS.Clock.Get_Uptime( Start, Status ); for j in 1 .. Max loop Simple_Procedure; end loop; - RTEMS.Clock_Get_Uptime( Stop, Status ); + RTEMS.Clock.Get_Uptime( Stop, Status ); Subtract_Em( Start, Stop, Diff ); diff --git a/c/src/ada-tests/samples/nsecs/sptest.ads b/c/src/ada-tests/samples/nsecs/sptest.ads index 7eead85987..5b02970d2d 100644 --- a/c/src/ada-tests/samples/nsecs/sptest.ads +++ b/c/src/ada-tests/samples/nsecs/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 @@ -33,7 +34,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); diff --git a/c/src/ada-tests/samples/ticker/sptest.adb b/c/src/ada-tests/samples/ticker/sptest.adb index 7d9bfd6fa5..5d9ab4fb69 100644 --- a/c/src/ada-tests/samples/ticker/sptest.adb +++ b/c/src/ada-tests/samples/ticker/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 @@ -23,16 +23,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.CLOCK; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -44,14 +44,14 @@ package body SPTEST 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" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -62,7 +62,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, 2048, @@ -73,7 +73,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 1, 2048, @@ -84,7 +84,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1_THROUGH_3'ACCESS, 0, @@ -92,7 +92,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_THROUGH_3'ACCESS, 0, @@ -100,7 +100,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_THROUGH_3'ACCESS, 0, @@ -108,18 +108,17 @@ package body SPTEST 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 -- -- TASK_1_THROUGH_3 -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TID : RTEMS.ID; @@ -127,12 +126,12 @@ package body SPTEST is 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" ); 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 >= 35 then @@ -148,7 +147,7 @@ package body SPTEST 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 diff --git a/c/src/ada-tests/samples/ticker/sptest.ads b/c/src/ada-tests/samples/ticker/sptest.ads index bb628effde..c6af2ca1c5 100644 --- a/c/src/ada-tests/samples/ticker/sptest.ads +++ b/c/src/ada-tests/samples/ticker/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -41,7 +42,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -54,7 +55,7 @@ package SPTEST is -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1_THROUGH_3); diff --git a/c/src/ada-tests/samples/ticker/ticker.adb b/c/src/ada-tests/samples/ticker/ticker.adb index 03302d4e59..ea172622e5 100644 --- a/c/src/ada-tests/samples/ticker/ticker.adb +++ b/c/src/ada-tests/samples/ticker/ticker.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 Ticker is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp01/sp01.adb b/c/src/ada-tests/sptests/sp01/sp01.adb index 9cd66caba1..1099eb0c5d 100644 --- a/c/src/ada-tests/sptests/sp01/sp01.adb +++ b/c/src/ada-tests/sptests/sp01/sp01.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 SP01 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp01/sptest.adb b/c/src/ada-tests/sptests/sp01/sptest.adb index 0188600784..bfe0dd3acd 100644 --- a/c/src/ada-tests/sptests/sp01/sptest.adb +++ b/c/src/ada-tests/sptests/sp01/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 @@ -23,16 +23,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.CLOCK; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -44,14 +44,14 @@ package body SPTEST 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" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -62,7 +62,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, 2048, @@ -73,7 +73,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 1, 2048, @@ -84,7 +84,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1_THROUGH_3'ACCESS, 0, @@ -92,7 +92,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_THROUGH_3'ACCESS, 0, @@ -100,7 +100,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_THROUGH_3'ACCESS, 0, @@ -108,18 +108,17 @@ package body SPTEST 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 -- -- TASK_1_THROUGH_3 -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TID : RTEMS.ID; @@ -127,12 +126,12 @@ package body SPTEST is 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" ); 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 >= 35 then @@ -148,7 +147,7 @@ package body SPTEST 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 diff --git a/c/src/ada-tests/sptests/sp01/sptest.ads b/c/src/ada-tests/sptests/sp01/sptest.ads index bb628effde..c6af2ca1c5 100644 --- a/c/src/ada-tests/sptests/sp01/sptest.ads +++ b/c/src/ada-tests/sptests/sp01/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -41,7 +42,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -54,7 +55,7 @@ package SPTEST is -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1_THROUGH_3); diff --git a/c/src/ada-tests/sptests/sp02/sp02.adb b/c/src/ada-tests/sptests/sp02/sp02.adb index d1ba27feba..1d99870864 100644 --- a/c/src/ada-tests/sptests/sp02/sp02.adb +++ b/c/src/ada-tests/sptests/sp02/sp02.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 SP02 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp02/sptest.adb b/c/src/ada-tests/sptests/sp02/sptest.adb index affbdead6a..45f9425f9f 100644 --- a/c/src/ada-tests/sptests/sp02/sptest.adb +++ b/c/src/ada-tests/sptests/sp02/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 @@ -27,13 +27,12 @@ with UNSIGNED32_IO; 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; @@ -44,7 +43,7 @@ package body SPTEST is SPTEST.PREEMPT_TASK_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'M', 'T' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.PREEMPT_TASK_NAME, 1, 2048, @@ -55,7 +54,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF PREEMPT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.PREEMPT_TASK_ID, SPTEST.PREEMPT_TASK'ACCESS, 0, @@ -64,14 +63,14 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF PREEMPT" ); TEXT_IO.PUT_LINE( "INIT - task_wake_after - yielding processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 3, 2048, @@ -82,7 +81,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 3, 2048, @@ -93,7 +92,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 3, 2048, @@ -104,7 +103,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -112,7 +111,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_2'ACCESS, 0, @@ -120,7 +119,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_3'ACCESS, 0, @@ -132,19 +131,19 @@ package body SPTEST is "INIT - suspending TA2 while middle task on a ready chain" ); - RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 1 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); - 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" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -155,7 +154,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 3, 2048, @@ -166,7 +165,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 3, 2048, @@ -177,7 +176,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -185,7 +184,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_2'ACCESS, 0, @@ -193,7 +192,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_3'ACCESS, 0, @@ -201,49 +200,47 @@ package body SPTEST 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 -- -- PREEMPT_TASK -- procedure PREEMPT_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "PREEMPT - task_delete - deleting self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF PREEMPT" ); end PREEMPT_TASK; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TID2 : RTEMS.ID; TID3 : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 1 second" ); - 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" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( SPTEST.TASK_NAME( 2 ), RTEMS.SEARCH_ALL_NODES, TID2, @@ -255,7 +252,7 @@ package body SPTEST is UNSIGNED32_IO.PUT( TID2, WIDTH => 8, BASE => 10#16# ); TEXT_IO.PUT_LINE( ")" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( SPTEST.TASK_NAME( 3 ), RTEMS.SEARCH_ALL_NODES, TID3, @@ -267,7 +264,7 @@ package body SPTEST is UNSIGNED32_IO.PUT( TID3, WIDTH => 8, BASE => 10#16# ); TEXT_IO.PUT_LINE( ")" ); - RTEMS.TASK_SET_PRIORITY( TID3, 2, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( TID3, 2, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); TEXT_IO.PUT_LINE( @@ -275,15 +272,15 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2" ); - RTEMS.TASK_SUSPEND( TID2, STATUS ); + RTEMS.TASKS.SUSPEND( TID2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA2" ); - RTEMS.TASK_DELETE( TID2, STATUS ); + RTEMS.TASKS.DELETE( TID2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep for 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" ); @@ -291,42 +288,40 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA2 - task_wake_after - sleep 1 minute" ); - RTEMS.TASK_WAKE_AFTER( 60 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 60 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER IN TA2" ); end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA3 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER IN TA3" ); TEXT_IO.PUT_LINE( "TA3 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" ); end TASK_3; diff --git a/c/src/ada-tests/sptests/sp02/sptest.ads b/c/src/ada-tests/sptests/sp02/sptest.ads index 1dd42d3eea..3801bf5001 100644 --- a/c/src/ada-tests/sptests/sp02/sptest.ads +++ b/c/src/ada-tests/sptests/sp02/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -44,7 +45,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -57,7 +58,7 @@ package SPTEST is -- procedure PREEMPT_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, PREEMPT_TASK); @@ -70,7 +71,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -83,7 +84,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -96,7 +97,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); diff --git a/c/src/ada-tests/sptests/sp03/sp03.adb b/c/src/ada-tests/sptests/sp03/sp03.adb index 245b8f8a50..8e9c7cb6c1 100644 --- a/c/src/ada-tests/sptests/sp03/sp03.adb +++ b/c/src/ada-tests/sptests/sp03/sp03.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 SP03 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp03/sptest.adb b/c/src/ada-tests/sptests/sp03/sptest.adb index 84ba6afb84..274ae55e70 100644 --- a/c/src/ada-tests/sptests/sp03/sptest.adb +++ b/c/src/ada-tests/sptests/sp03/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 @@ -23,16 +23,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.CLOCK; 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; @@ -44,7 +44,7 @@ package body SPTEST is SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -55,7 +55,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -66,7 +66,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -74,7 +74,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_2'ACCESS, 0, @@ -82,18 +82,17 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -102,7 +101,7 @@ package body SPTEST is TIME := ( 1988, 12, 31, 9, 15, 0, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" ); TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( 1 ), FALSE ); @@ -111,7 +110,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( SPTEST.TASK_NAME( 1 ), FALSE ); @@ -125,7 +124,7 @@ package body SPTEST is TIME.MINUTE := TIME.MINUTE mod 60; TIME.HOUR := TIME.HOUR mod 24; - RTEMS.TASK_WAKE_WHEN( TIME, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_WHEN" ); TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( 1 ), FALSE ); @@ -136,13 +135,12 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -151,10 +149,10 @@ package body SPTEST is loop - 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" ); - 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 >= 17 then diff --git a/c/src/ada-tests/sptests/sp03/sptest.ads b/c/src/ada-tests/sptests/sp03/sptest.ads index 5a54139d89..bafb948e5d 100644 --- a/c/src/ada-tests/sptests/sp03/sptest.ads +++ b/c/src/ada-tests/sptests/sp03/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -41,7 +42,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -55,7 +56,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -69,7 +70,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); diff --git a/c/src/ada-tests/sptests/sp04/sp04.adb b/c/src/ada-tests/sptests/sp04/sp04.adb index 81bbc27f72..d8d0cb6016 100644 --- a/c/src/ada-tests/sptests/sp04/sp04.adb +++ b/c/src/ada-tests/sptests/sp04/sp04.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 SP04 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp04/sptest.adb b/c/src/ada-tests/sptests/sp04/sptest.adb index 734e590ba5..b9b3957922 100644 --- a/c/src/ada-tests/sptests/sp04/sptest.adb +++ b/c/src/ada-tests/sptests/sp04/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 @@ -23,6 +23,9 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.CLOCK; +with RTEMS.EXTENSION; +with RTEMS.FATAL; package body SPTEST is @@ -43,7 +46,7 @@ package body SPTEST is ) is begin if Task_Events_Index = Task_Events'Last then - RTEMS.Fatal_Error_Occurred ( 1 ); -- no other choice + RTEMS.Fatal.Error_Occurred ( 1 ); -- no other choice else Task_Events (Task_Events_Index).Task_Index := Task_Index; Task_Events (Task_Events_Index).When_Switched := When_Switched; @@ -65,13 +68,12 @@ package body SPTEST is end Flush_Task_Event_Log; ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -83,12 +85,12 @@ package body SPTEST is TIME := ( 1988, 12, 31, 9, 15, 0, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" ); SPTEST.EXTENSION_NAME( 1 ) := RTEMS.BUILD_NAME( 'E', 'X', 'T', ' ' ); - RTEMS.EXTENSION_CREATE( + RTEMS.EXTENSION.CREATE( SPTEST.EXTENSION_NAME( 1 ), SPTEST.EXTENSIONS'ACCESS, EXTENSION_ID( 1 ), @@ -104,7 +106,7 @@ package body SPTEST is SPTEST.RUN_COUNT( 2 ) := 0; SPTEST.RUN_COUNT( 3 ) := 0; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -115,7 +117,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, 2048, @@ -126,7 +128,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 1, 2048, @@ -137,7 +139,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -145,7 +147,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_2'ACCESS, 0, @@ -153,7 +155,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_3'ACCESS, 0, @@ -161,18 +163,17 @@ package body SPTEST 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 -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SECONDS : RTEMS.UNSIGNED32; @@ -185,25 +186,25 @@ package body SPTEST is begin TEXT_IO.PUT_LINE( "TA1 - task_suspend - on Task 2" ); - RTEMS.TASK_SUSPEND( TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.SUSPEND( TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_suspend - on Task 3" ); - RTEMS.TASK_SUSPEND( TASK_ID( 3 ), STATUS ); + RTEMS.TASKS.SUSPEND( TASK_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA3" ); TEXT_IO.PUT_LINE( "TA1 - killing time" ); - RTEMS.CLOCK_GET( - RTEMS.CLOCK_GET_SECONDS_SINCE_EPOCH, + RTEMS.CLOCK.GET( + RTEMS.CLOCK.GET_SECONDS_SINCE_EPOCH, START_TIME'ADDRESS, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" ); loop - RTEMS.CLOCK_GET( - RTEMS.CLOCK_GET_SECONDS_SINCE_EPOCH, + RTEMS.CLOCK.GET( + RTEMS.CLOCK.GET_SECONDS_SINCE_EPOCH, END_TIME'ADDRESS, STATUS ); @@ -213,11 +214,11 @@ package body SPTEST is end loop; TEXT_IO.PUT_LINE( "TA1 - task_resume - on Task 2" ); - RTEMS.TASK_RESUME( TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.RESUME( TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_resume - on Task 3" ); - RTEMS.TASK_RESUME( TASK_ID( 3 ), STATUS ); + RTEMS.TASKS.RESUME( TASK_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA3" ); loop @@ -227,7 +228,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_mode - change mode to NO PREEMPT" ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -235,7 +236,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); - 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" ); OLD_SECONDS := TIME.SECOND; @@ -245,7 +246,7 @@ package body SPTEST is exit when SECONDS >= 6; - 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 /= OLD_SECONDS then @@ -261,7 +262,7 @@ package body SPTEST is "TA1 - task_mode - change mode to PREEMPT" ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -282,13 +283,12 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin @@ -299,13 +299,12 @@ package body SPTEST is end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin @@ -316,7 +315,6 @@ package body SPTEST is end TASK_3; ---PAGE -- -- TASK_SWITCH -- @@ -342,7 +340,7 @@ package body SPTEST is when 1 | 2 | 3 => SPTEST.RUN_COUNT( INDEX ) := SPTEST.RUN_COUNT( INDEX ) + 1; - 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" ); Log_Task_Event ( INDEX, TIME ); diff --git a/c/src/ada-tests/sptests/sp04/sptest.ads b/c/src/ada-tests/sptests/sp04/sptest.ads index 6bbd930e85..20c0830178 100644 --- a/c/src/ada-tests/sptests/sp04/sptest.ads +++ b/c/src/ada-tests/sptests/sp04/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -56,7 +57,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -69,7 +70,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -83,7 +84,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -97,7 +98,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); diff --git a/c/src/ada-tests/sptests/sp05/sp05.adb b/c/src/ada-tests/sptests/sp05/sp05.adb index 3e83e7da05..14a30ecdc7 100644 --- a/c/src/ada-tests/sptests/sp05/sp05.adb +++ b/c/src/ada-tests/sptests/sp05/sp05.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 SP05 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp05/sptest.adb b/c/src/ada-tests/sptests/sp05/sptest.adb index f048bedc3b..2a04921aec 100644 --- a/c/src/ada-tests/sptests/sp05/sptest.adb +++ b/c/src/ada-tests/sptests/sp05/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 @@ -26,13 +26,12 @@ with TEXT_IO; 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; @@ -45,7 +44,7 @@ package body SPTEST is SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -56,7 +55,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, 2048, @@ -67,7 +66,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 1, 2048, @@ -78,7 +77,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -86,7 +85,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_2'ACCESS, 0, @@ -94,7 +93,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_3'ACCESS, 0, @@ -102,18 +101,17 @@ package body SPTEST 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 -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TID2 : RTEMS.ID; @@ -121,7 +119,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( SPTEST.TASK_NAME( 2 ), 1, TID2, @@ -129,7 +127,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF TA2" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( SPTEST.TASK_NAME( 3 ), 1, TID3, @@ -141,11 +139,11 @@ package body SPTEST is loop TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER OF TA1" ); TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA3" ); - RTEMS.TASK_SUSPEND( TID3, STATUS ); + RTEMS.TASKS.SUSPEND( TID3, STATUS ); if PASS = 1 then TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, @@ -157,19 +155,19 @@ package body SPTEST is end if; TEXT_IO.PUT_LINE( "TA1 - task_resume - resume TA2" ); - RTEMS.TASK_RESUME( TID2, STATUS ); + RTEMS.TASKS.RESUME( TID2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2" ); - RTEMS.TASK_SUSPEND( TID2, STATUS ); + RTEMS.TASKS.SUSPEND( TID2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_resume - resume TA3" ); - RTEMS.TASK_RESUME( TID3, STATUS ); + RTEMS.TASKS.RESUME( TID3, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA3" ); end loop; @@ -179,49 +177,47 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA2 - task_suspend - suspend self" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); loop TEXT_IO.PUT_LINE( "TA2 - task_wake_after - sleep 1 second" ); - 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 OF TA2" ); end loop; end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA3 - task_suspend - suspend self" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA3" ); loop TEXT_IO.PUT_LINE( "TA3 - task_wake_after - sleep 1 second" ); - 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 OF TA3" ); end loop; diff --git a/c/src/ada-tests/sptests/sp05/sptest.ads b/c/src/ada-tests/sptests/sp05/sptest.ads index f0f7288360..8db055f069 100644 --- a/c/src/ada-tests/sptests/sp05/sptest.ads +++ b/c/src/ada-tests/sptests/sp05/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -41,7 +42,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -54,7 +55,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -67,7 +68,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -80,7 +81,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); diff --git a/c/src/ada-tests/sptests/sp06/sp06.adb b/c/src/ada-tests/sptests/sp06/sp06.adb index 5f14247fd4..20a32f2189 100644 --- a/c/src/ada-tests/sptests/sp06/sp06.adb +++ b/c/src/ada-tests/sptests/sp06/sp06.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 SP06 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp06/sptest.adb b/c/src/ada-tests/sptests/sp06/sptest.adb index 30d679a0a7..ec536702a1 100644 --- a/c/src/ada-tests/sptests/sp06/sptest.adb +++ b/c/src/ada-tests/sptests/sp06/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 @@ -26,17 +26,16 @@ with TEXT_IO; 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; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin TEXT_IO.NEW_LINE( 2 ); @@ -49,7 +48,7 @@ package body SPTEST is SPTEST.ARGUMENT := 0; SPTEST.RESTART_ARGUMENT := 1; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -60,7 +59,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, 2048, @@ -71,7 +70,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 10, 2048, @@ -82,7 +81,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -90,7 +89,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_2'ACCESS, SPTEST.ARGUMENT, @@ -98,7 +97,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_3'ACCESS, SPTEST.ARGUMENT, @@ -106,7 +105,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.TASK_ID( 3 ), 5, PREVIOUS_PRIORITY, @@ -114,18 +113,17 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY 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 -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is PASS : RTEMS.UNSIGNED32; STATUS : RTEMS.STATUS_CODES; @@ -142,45 +140,44 @@ package body SPTEST is if PASS = 1 then TEXT_IO.PUT_LINE( "TA1 - restarting TA3" ); - RTEMS.TASK_RESTART( + RTEMS.TASKS.RESTART( SPTEST.TASK_ID( 3 ), SPTEST.RESTART_ARGUMENT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF TA3" ); - RTEMS.TASK_WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); end if; - 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" ); TEXT_IO.PUT_LINE( "TA1 - task_restart - restarting TA2" ); - RTEMS.TASK_RESTART( + RTEMS.TASKS.RESTART( SPTEST.TASK_ID( 2 ), SPTEST.RESTART_ARGUMENT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF TA2" ); - 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" ); TEXT_IO.PUT_LINE( "TA1 - task_restart - restarting self" ); - RTEMS.TASK_RESTART( SPTEST.TASK_ID( 1 ), PASS, STATUS ); + RTEMS.TASKS.RESTART( SPTEST.TASK_ID( 1 ), PASS, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF SELF" ); end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -188,33 +185,32 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA2 - is beginning to run" ); if ARGUMENT = SPTEST.ARGUMENT then - RTEMS.TASK_WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); end if; loop TEXT_IO.PUT_LINE( "TA2 - task_wake_after - sleep 1/2 second" ); - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); end loop; end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end TASK_3; diff --git a/c/src/ada-tests/sptests/sp06/sptest.ads b/c/src/ada-tests/sptests/sp06/sptest.ads index ec04f0c1e9..5a61fb9558 100644 --- a/c/src/ada-tests/sptests/sp06/sptest.ads +++ b/c/src/ada-tests/sptests/sp06/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -48,7 +49,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -61,7 +62,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -74,7 +75,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -87,7 +88,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); diff --git a/c/src/ada-tests/sptests/sp07/sp07.adb b/c/src/ada-tests/sptests/sp07/sp07.adb index cc35c1eacf..dad98fb13b 100644 --- a/c/src/ada-tests/sptests/sp07/sp07.adb +++ b/c/src/ada-tests/sptests/sp07/sp07.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 SP07 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp07/sptest.adb b/c/src/ada-tests/sptests/sp07/sptest.adb index 95d566773a..c64706fe94 100644 --- a/c/src/ada-tests/sptests/sp07/sptest.adb +++ b/c/src/ada-tests/sptests/sp07/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,6 +24,8 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.EXTENSION; +with RTEMS.FATAL; package body SPTEST is @@ -50,7 +52,7 @@ package body SPTEST is ) is begin if Task_Events_Index = Task_Events'Last then - RTEMS.Fatal_Error_Occurred ( 1 ); -- no other choice + RTEMS.Fatal.Error_Occurred ( 1 ); -- no other choice else Task_Events (Task_Events_Index).The_Event := The_Event; Task_Events (Task_Events_Index).Task1 := Task1; @@ -110,7 +112,6 @@ package body SPTEST is end Flush_Task_Event_Log; ---PAGE -- -- TCB_To_ID -- @@ -120,13 +121,12 @@ package body SPTEST is ) return RTEMS.ID; pragma Import (C, TCB_To_ID, "tcb_to_id" ); ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -137,7 +137,7 @@ package body SPTEST is SPTEST.EXTENSION_NAME( 1 ) := RTEMS.BUILD_NAME( 'E', 'X', 'T', ' ' ); - RTEMS.EXTENSION_CREATE( + RTEMS.EXTENSION.CREATE( SPTEST.EXTENSION_NAME( 1 ), SPTEST.EXTENSIONS'ACCESS, EXTENSION_ID( 1 ), @@ -150,7 +150,7 @@ package body SPTEST is SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); SPTEST.TASK_NAME( 4 ) := RTEMS.BUILD_NAME( 'T', 'A', '4', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 4, RTEMS.MINIMUM_STACK_SIZE, @@ -161,7 +161,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 4, RTEMS.MINIMUM_STACK_SIZE, @@ -172,7 +172,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 250, RTEMS.MINIMUM_STACK_SIZE, @@ -183,7 +183,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 4 ), 254, RTEMS.MINIMUM_STACK_SIZE, @@ -194,7 +194,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -202,7 +202,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_2'ACCESS, 0, @@ -210,7 +210,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_3'ACCESS, 0, @@ -218,7 +218,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.TASK_4'ACCESS, 0, @@ -226,45 +226,44 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" ); - RTEMS.TASK_RESTART( SPTEST.TASK_ID( 3 ), 0, STATUS ); + RTEMS.TASKS.RESTART( SPTEST.TASK_ID( 3 ), 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF TA3" ); Flush_Task_Event_Log; - RTEMS.TASK_SET_NOTE( SPTEST.TASK_ID( 1 ), 8, 4, STATUS ); + RTEMS.TASKS.SET_NOTE( SPTEST.TASK_ID( 1 ), 8, 4, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE OF TA1" ); TEXT_IO.PUT( "INIT - task_set_note - set TA1's NOTEPAD_8" ); TEXT_IO.PUT_LINE( " to TA1's initial priority: 4" ); - RTEMS.TASK_SET_NOTE( SPTEST.TASK_ID( 2 ), 8, 4, STATUS ); + RTEMS.TASKS.SET_NOTE( SPTEST.TASK_ID( 2 ), 8, 4, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE OF TA2" ); TEXT_IO.PUT( "INIT - task_set_note - set TA2's NOTEPAD_8" ); TEXT_IO.PUT_LINE( " to TA2's initial priority: 4" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; - THE_PRIORITY : RTEMS.TASK_PRIORITY; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + THE_PRIORITY : RTEMS.TASKS.PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin TEST_SUPPORT.PAUSE; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, THE_PRIORITY, STATUS ); @@ -276,7 +275,7 @@ package body SPTEST is loop - RTEMS.TASK_GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS ); + RTEMS.TASKS.GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" ); TEXT_IO.PUT( "TA1 - task_get_note - "); TEXT_IO.PUT( "get NOTEPAD_8 - current priority: " ); @@ -287,12 +286,12 @@ package body SPTEST is if THE_PRIORITY = 0 then TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2" ); - RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TEXT_IO.PUT( "TA1 - task_set_priority - "); TEXT_IO.PUT_LINE( "set priority of TA2 ( blocked )"); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.TASK_ID( 2 ), 5, PREVIOUS_PRIORITY, @@ -300,10 +299,10 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end if; @@ -311,7 +310,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - task_set_note - set TA2's NOTEPAD_8: " ); UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); TEXT_IO.NEW_LINE; - RTEMS.TASK_SET_NOTE( + RTEMS.TASKS.SET_NOTE( SPTEST.TASK_ID( 2 ), 8, THE_PRIORITY, @@ -322,7 +321,7 @@ package body SPTEST is TEXT_IO.PUT("TA1 - task_set_priority - set TA2's priority: "); UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); TEXT_IO.NEW_LINE; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.TASK_ID( 2 ), THE_PRIORITY, PREVIOUS_PRIORITY, @@ -334,23 +333,22 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; - THE_PRIORITY : RTEMS.TASK_PRIORITY; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + THE_PRIORITY : RTEMS.TASKS.PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin loop - RTEMS.TASK_GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS ); + RTEMS.TASKS.GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" ); TEXT_IO.PUT( "TA2 - task_get_note - "); TEXT_IO.PUT( "get NOTEPAD_8 - current priority: " ); @@ -361,12 +359,12 @@ package body SPTEST is if THE_PRIORITY = 0 then TEXT_IO.PUT_LINE( "TA2 - task_suspend - suspend TA1" ); - RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 1 ), STATUS ); + RTEMS.TASKS.SUSPEND( SPTEST.TASK_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TEXT_IO.PUT( "TA2 - task_set_priority - "); TEXT_IO.PUT_LINE( "set priority of TA1 ( blocked )"); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.TASK_ID( 1 ), 5, PREVIOUS_PRIORITY, @@ -374,19 +372,19 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); - RTEMS.TASK_DELETE( + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 1 ), STATUS ); -- TA1 is blocked TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" ); - RTEMS.TASK_DELETE( + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 3 ), STATUS ); -- TA3 is ready TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); else @@ -394,7 +392,7 @@ package body SPTEST is TEXT_IO.PUT( "TA2 - task_set_note - set TA1's NOTEPAD_8: " ); UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); TEXT_IO.NEW_LINE; - RTEMS.TASK_SET_NOTE( + RTEMS.TASKS.SET_NOTE( SPTEST.TASK_ID( 1 ), 8, THE_PRIORITY, @@ -406,7 +404,7 @@ package body SPTEST is TEXT_IO.PUT( "set TA1's priority: "); UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2); TEXT_IO.NEW_LINE; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.TASK_ID( 1 ), THE_PRIORITY, PREVIOUS_PRIORITY, @@ -420,13 +418,12 @@ package body SPTEST is end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -434,20 +431,19 @@ package body SPTEST is loop - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); end loop; end TASK_3; ---PAGE -- -- TASK_4 -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin @@ -458,7 +454,6 @@ package body SPTEST is end TASK_4; ---PAGE -- -- TASK_EXIT_EXTENSION -- @@ -477,7 +472,6 @@ package body SPTEST is end TASK_EXIT_EXTENSION; ---PAGE -- -- TASK_CREATE_EXTENSION -- @@ -501,7 +495,6 @@ package body SPTEST is end TASK_CREATE_EXTENSION; ---PAGE -- -- TASK_DELETE_EXTENSION -- @@ -523,7 +516,6 @@ package body SPTEST is end TASK_DELETE_EXTENSION; ---PAGE -- -- TASK_RESTART_EXTENSION -- @@ -545,7 +537,6 @@ package body SPTEST is end TASK_RESTART_EXTENSION; ---PAGE -- -- TASK_START_EXTENSION -- diff --git a/c/src/ada-tests/sptests/sp07/sptest.ads b/c/src/ada-tests/sptests/sp07/sptest.ads index 2195acb399..262b1636c1 100644 --- a/c/src/ada-tests/sptests/sp07/sptest.ads +++ b/c/src/ada-tests/sptests/sp07/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 @@ -49,7 +50,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -62,7 +63,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -75,7 +76,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -88,7 +89,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); @@ -101,7 +102,7 @@ package SPTEST is -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_4); diff --git a/c/src/ada-tests/sptests/sp08/sp08.adb b/c/src/ada-tests/sptests/sp08/sp08.adb index 39697e008f..539aff53b6 100644 --- a/c/src/ada-tests/sptests/sp08/sp08.adb +++ b/c/src/ada-tests/sptests/sp08/sp08.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 SP08 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp08/sptest.adb b/c/src/ada-tests/sptests/sp08/sptest.adb index 8fe9523d8b..11707c4928 100644 --- a/c/src/ada-tests/sptests/sp08/sptest.adb +++ b/c/src/ada-tests/sptests/sp08/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 @@ -27,13 +27,12 @@ with UNSIGNED32_IO; 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; @@ -44,7 +43,7 @@ package body SPTEST is SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -55,7 +54,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -63,12 +62,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PUT_MODE -- @@ -85,13 +83,12 @@ package body SPTEST is end PUT_MODE; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); PREVIOUS_MODE : RTEMS.MODE; @@ -100,7 +97,7 @@ package body SPTEST is -- BEGINNING OF ASR - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.ASR, RTEMS.ASR_MASK, PREVIOUS_MODE, @@ -112,7 +109,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_ASR, RTEMS.ASR_MASK, PREVIOUS_MODE, @@ -124,7 +121,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_ASR, RTEMS.ASR_MASK, PREVIOUS_MODE, @@ -136,7 +133,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.ASR, RTEMS.ASR_MASK, PREVIOUS_MODE, @@ -152,7 +149,7 @@ package body SPTEST is -- BEGINNING OF TIMESLICE - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_TIMESLICE, RTEMS.TIMESLICE_MASK, PREVIOUS_MODE, @@ -164,7 +161,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.TIMESLICE, RTEMS.TIMESLICE_MASK, PREVIOUS_MODE, @@ -176,7 +173,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.TIMESLICE, RTEMS.TIMESLICE_MASK, PREVIOUS_MODE, @@ -188,7 +185,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_TIMESLICE, RTEMS.TIMESLICE_MASK, PREVIOUS_MODE, @@ -204,7 +201,7 @@ package body SPTEST is -- BEGINNING OF PREEMPT - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -216,7 +213,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -228,7 +225,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -240,7 +237,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -254,9 +251,9 @@ package body SPTEST is -- END OF PREEMPT --- BEGINNING OF INTERRUPT LEVEL +-- BEGINNING OF INTERRUPT_LEVEL - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 3 ), RTEMS.INTERRUPT_MASK, PREVIOUS_MODE, @@ -268,7 +265,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 5 ), RTEMS.INTERRUPT_MASK, PREVIOUS_MODE, @@ -280,11 +277,11 @@ package body SPTEST is PREVIOUS_MODE ); --- END OF INTERRUPT LEVEL +-- END OF INTERRUPT_LEVEL -- BEGINNING OF COMBINATIONS - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 3 ) + RTEMS.NO_ASR + RTEMS.TIMESLICE + RTEMS.NO_PREEMPT, RTEMS.INTERRUPT_MASK + RTEMS.ASR_MASK + @@ -298,7 +295,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 3 ) + RTEMS.NO_ASR + RTEMS.TIMESLICE + RTEMS.NO_PREEMPT, RTEMS.INTERRUPT_MASK + RTEMS.ASR_MASK + @@ -312,7 +309,7 @@ package body SPTEST is PREVIOUS_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 0 ) + RTEMS.ASR + RTEMS.NO_TIMESLICE + RTEMS.PREEMPT, RTEMS.INTERRUPT_MASK + RTEMS.ASR_MASK + @@ -330,7 +327,7 @@ package body SPTEST is -- BEGINNING OF CURRENT MODE - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.CURRENT_MODE, RTEMS.CURRENT_MODE, PREVIOUS_MODE, diff --git a/c/src/ada-tests/sptests/sp08/sptest.ads b/c/src/ada-tests/sptests/sp08/sptest.ads index caabb8280e..b0779b6252 100644 --- a/c/src/ada-tests/sptests/sp08/sptest.ads +++ b/c/src/ada-tests/sptests/sp08/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -41,7 +42,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -68,7 +69,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/sptests/sp09/sp09.adb b/c/src/ada-tests/sptests/sp09/sp09.adb index fb260770e3..6960990c97 100644 --- a/c/src/ada-tests/sptests/sp09/sp09.adb +++ b/c/src/ada-tests/sptests/sp09/sp09.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 SP09 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp09/sptest.adb b/c/src/ada-tests/sptests/sp09/sptest.adb index 0a2e24a37e..0026b2984e 100644 --- a/c/src/ada-tests/sptests/sp09/sptest.adb +++ b/c/src/ada-tests/sptests/sp09/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 @@ -23,16 +23,25 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.CLOCK; +with RTEMS.DEBUG; +with RTEMS.EVENT; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.PARTITION; +with RTEMS.PORT; +with RTEMS.RATE_MONOTONIC; +with RTEMS.REGION; +with RTEMS.SEMAPHORE; +with RTEMS.TIMER; 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; @@ -69,7 +78,7 @@ package body SPTEST is SPTEST.PERIOD_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 0, 2048, @@ -85,7 +94,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "INIT - task_create - INVALID_PRIORITY" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 4, 2048, @@ -96,7 +105,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_RESTART( + RTEMS.TASKS.RESTART( SPTEST.TASK_ID( 1 ), 0, STATUS @@ -108,7 +117,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "INIT - task_restart - INCORRECT_STATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -116,12 +125,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- DELAYED_SUBPROGRAM -- @@ -136,7 +144,6 @@ package body SPTEST is end DELAYED_SUBPROGRAM; ---PAGE -- -- SCREEN_1 -- @@ -145,11 +152,11 @@ package body SPTEST is is NOTEPAD_VALUE : RTEMS.UNSIGNED32 := 0; SELF_ID : RTEMS.ID; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_DELETE( 100, STATUS ); + RTEMS.TASKS.DELETE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -158,7 +165,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_delete - INVALID_ID" ); begin - RTEMS.TASK_GET_NOTE( RTEMS.SELF, + RTEMS.TASKS.GET_NOTE( RTEMS.SELF, RTEMS.NOTEPAD_INDEX'LAST + 10, NOTEPAD_VALUE, STATUS @@ -176,7 +183,7 @@ package body SPTEST is ); end; - RTEMS.TASK_GET_NOTE( + RTEMS.TASKS.GET_NOTE( 100, RTEMS.NOTEPAD_INDEX'LAST, NOTEPAD_VALUE, @@ -189,7 +196,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_get_note - INVALID_ID" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, SELF_ID, @@ -204,7 +211,7 @@ package body SPTEST is "TA1 - task_ident - current task SUCCESSFUL" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( 100, RTEMS.SEARCH_ALL_NODES, SPTEST.JUNK_ID, @@ -217,7 +224,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_ident - global INVALID_NAME" ); - RTEMS.TASK_IDENT( 100, 1, SPTEST.JUNK_ID, STATUS ); + RTEMS.TASKS.IDENT( 100, 1, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -225,7 +232,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_ident - local INVALID_NAME" ); - RTEMS.TASK_IDENT( 100, 2, SPTEST.JUNK_ID, STATUS ); + RTEMS.TASKS.IDENT( 100, 2, SPTEST.JUNK_ID, STATUS ); if TEST_SUPPORT.Is_Configured_Multiprocessing then TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, @@ -241,7 +248,7 @@ package body SPTEST is end if; TEXT_IO.PUT_LINE( "TA1 - task_ident - INVALID_NODE" ); - RTEMS.TASK_RESTART( 100, 0, STATUS ); + RTEMS.TASKS.RESTART( 100, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -249,7 +256,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_restart - INVALID_ID" ); - RTEMS.TASK_RESUME( 100, STATUS ); + RTEMS.TASKS.RESUME( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -257,7 +264,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_resume - INVALID_ID" ); - RTEMS.TASK_RESUME( RTEMS.SELF, STATUS ); + RTEMS.TASKS.RESUME( RTEMS.SELF, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INCORRECT_STATE, @@ -266,7 +273,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_resume - INCORRECT_STATE" ); begin - RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 512, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 512, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_PRIORITY, @@ -282,7 +289,7 @@ package body SPTEST is ); end; - RTEMS.TASK_SET_PRIORITY( 100, 8, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( 100, 8, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -291,7 +298,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_set_priority - INVALID_ID" ); begin - RTEMS.TASK_SET_NOTE( RTEMS.SELF, + RTEMS.TASKS.SET_NOTE( RTEMS.SELF, RTEMS.NOTEPAD_INDEX'LAST + 10, NOTEPAD_VALUE, STATUS @@ -309,7 +316,7 @@ package body SPTEST is ); end; - RTEMS.TASK_SET_NOTE( + RTEMS.TASKS.SET_NOTE( 100, RTEMS.NOTEPAD_INDEX'LAST, NOTEPAD_VALUE, @@ -322,7 +329,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_set_note - INVALID_ID" ); - RTEMS.TASK_START( 100, SPTEST.TASK_1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( 100, SPTEST.TASK_1'ACCESS, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -330,7 +337,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_start - INVALID_ID" ); - RTEMS.TASK_START( RTEMS.SELF, SPTEST.TASK_1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( RTEMS.SELF, SPTEST.TASK_1'ACCESS, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INCORRECT_STATE, @@ -338,7 +345,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_start - INCORRECT_STATE" ); - RTEMS.TASK_SUSPEND( 100, STATUS ); + RTEMS.TASKS.SUSPEND( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -348,7 +355,6 @@ package body SPTEST is end SCREEN_1; ---PAGE -- -- SCREEN_2 -- @@ -361,7 +367,7 @@ package body SPTEST is -- errors before clock is set - RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS ); + RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS ); if RTEMS.IS_STATUS_SUCCESSFUL( STATUS ) then TEXT_IO.PUT_LINE( @@ -376,7 +382,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - clock_get - NOT_DEFINED" ); end if; - RTEMS.TASK_WAKE_WHEN( TIME, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TIME, STATUS ); if RTEMS.IS_STATUS_SUCCESSFUL( STATUS ) then TEXT_IO.PUT( "TA1 - task_wake_when - NOT_DEFINED -- " ); TEXT_IO.PUT_LINE( "DID THE BSP SET THE TIME OF DAY?" ); @@ -389,7 +395,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_wake_when - NOT_DEFINED" ); end if; - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( 0, TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -415,7 +421,7 @@ package body SPTEST is TIME := ( 1987, 2, 5, 8, 30, 45, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -425,7 +431,7 @@ package body SPTEST is TIME := ( 1988, 15, 5, 8, 30, 45, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -435,7 +441,7 @@ package body SPTEST is TIME := ( 1988, 2, 32, 8, 30, 45, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -445,7 +451,7 @@ package body SPTEST is TIME := ( 1988, 2, 5, 25, 30, 45, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -455,7 +461,7 @@ package body SPTEST is TIME := ( 1988, 2, 5, 8, 61, 45, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -465,7 +471,7 @@ package body SPTEST is TIME := ( 1988, 2, 5, 8, 30, 61, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -475,7 +481,7 @@ package body SPTEST is TIME := ( 1988, 2, 5, 8, 30, 45, TEST_SUPPORT.TICKS_PER_SECOND + 1 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -485,7 +491,7 @@ package body SPTEST is TIME := ( 1988, 2, 5, 8, 30, 45, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" ); TEXT_IO.PUT_LINE( " - SUCCESSFUL" ); @@ -494,7 +500,7 @@ package body SPTEST is TIME := ( 1988, 2, 5, 8, 30, 48, TEST_SUPPORT.TICKS_PER_SECOND + 1 ); TEXT_IO.PUT( "TA1 - task_wake_when - TICK INVALID - " ); TEXT_IO.PUT_LINE( "sleep about 3 seconds" ); - RTEMS.TASK_WAKE_WHEN( TIME, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_WHEN WITH INVALID TICKS PER SECOND" @@ -504,7 +510,7 @@ package body SPTEST is TIME := ( 1961, 2, 5, 8, 30, 48, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - task_wake_when - ", TIME, "" ); - RTEMS.TASK_WAKE_WHEN( TIME, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -514,7 +520,7 @@ package body SPTEST is TIME := ( 1988, 2, 5, 25, 30, 48, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - task_wake_when - ", TIME, "" ); - RTEMS.TASK_WAKE_WHEN( TIME, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -522,14 +528,14 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( " - INVALID_CLOCK" ); - 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 SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - current time - ", TIME, "" ); TEXT_IO.NEW_LINE; TIME.MONTH := 1; TEST_SUPPORT.PRINT_TIME( "TA1 - task_wake_when - ", TIME, "" ); - RTEMS.TASK_WAKE_WHEN( TIME, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TIME, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_CLOCK, @@ -539,7 +545,6 @@ package body SPTEST is end SCREEN_2; ---PAGE -- -- SCREEN_3 -- @@ -552,7 +557,7 @@ package body SPTEST is TASK_NAME := 1; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 0, 1, 2048, @@ -570,7 +575,7 @@ package body SPTEST is "TA1 - task_create - INVALID_NAME" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TASK_NAME, 1, TEST_SUPPORT.WORK_SPACE_SIZE, @@ -588,7 +593,7 @@ package body SPTEST is "TA1 - task_create - stack size - UNSATISFIED" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 4, 2048, @@ -602,13 +607,13 @@ package body SPTEST is "TA1 - task_create - TA2 created - SUCCESSFUL" ); - RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2 - SUCCESSFUL" ); - RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ALREADY_SUSPENDED, @@ -618,13 +623,13 @@ package body SPTEST is "TA1 - task_suspend - suspend TA2 - ALREADY_SUSPENDED" ); - RTEMS.TASK_RESUME( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.RESUME( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_resume - TA2 resumed - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 4, 2048, @@ -638,7 +643,7 @@ package body SPTEST is "TA1 - task_create - TA3 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 4 ), 4, 2048, @@ -652,7 +657,7 @@ package body SPTEST is "TA1 - task_create - 4 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 5 ), 4, 2048, @@ -666,7 +671,7 @@ package body SPTEST is "TA1 - task_create - 5 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 6 ), 4, 2048, @@ -680,7 +685,7 @@ package body SPTEST is "TA1 - task_create - 6 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 7 ), 4, 2048, @@ -694,7 +699,7 @@ package body SPTEST is "TA1 - task_create - 7 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 8 ), 4, 2048, @@ -708,7 +713,7 @@ package body SPTEST is "TA1 - task_create - 8 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 9 ), 4, 2048, @@ -722,7 +727,7 @@ package body SPTEST is "TA1 - task_create - 9 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 10 ), 4, 2048, @@ -736,7 +741,7 @@ package body SPTEST is "TA1 - task_create - 10 created - SUCCESSFUL" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TASK_NAME, 4, 2048, @@ -753,7 +758,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_create - 11 - TOO_MANY" ); if TEST_SUPPORT.Is_Configured_Multiprocessing then - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TASK_NAME, 4, 2048, @@ -772,7 +777,6 @@ package body SPTEST is end SCREEN_3; ---PAGE -- -- SCREEN_4 -- @@ -784,7 +788,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -800,7 +804,7 @@ package body SPTEST is "TA1 - event_receive - UNSATISFIED ( all conditions )" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.NO_WAIT + RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -817,7 +821,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - event_receive - timeout in 3 seconds" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, 3 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -833,7 +837,7 @@ package body SPTEST is "TA1 - event_receive - woke with TIMEOUT" ); - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( 100, RTEMS.EVENT_16, STATUS @@ -850,18 +854,17 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 1 second - SUCCESSFUL" ); - 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 (1 SECOND)" ); TIME := ( 1988, 2, 5, 8, 30, 45, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" ); TEXT_IO.PUT_LINE( " - SUCCESSFUL" ); end SCREEN_4; ---PAGE -- -- SCREEN_5 -- @@ -871,11 +874,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( 0, 1, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.JUNK_ID, STATUS ); @@ -886,11 +889,11 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - semaphore_create - INVALID_NAME" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 1 ), STATUS ); @@ -900,11 +903,11 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - semaphore_create - 1 - SUCCESSFUL" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 1, (RTEMS.BINARY_SEMAPHORE or RTEMS.PRIORITY or RTEMS.INHERIT_PRIORITY), - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); @@ -915,11 +918,11 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - semaphore_create - 2 - SUCCESSFUL" ); loop - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 3 ), 1, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.JUNK_ID, STATUS ); @@ -934,11 +937,11 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - semaphore_create - 3 - TOO_MANY" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.INHERIT_PRIORITY + RTEMS.BINARY_SEMAPHORE + RTEMS.FIFO, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.JUNK_ID, STATUS ); @@ -949,11 +952,11 @@ package body SPTEST is ); TEXT_IO.PUT_LINE("TA1 - semaphore_create - NOT_DEFINED"); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.INHERIT_PRIORITY + RTEMS.COUNTING_SEMAPHORE + RTEMS.PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.JUNK_ID, STATUS ); @@ -964,11 +967,11 @@ package body SPTEST is ); TEXT_IO.PUT_LINE("TA1 - semaphore_create - NOT_DEFINED"); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 1 ), 2, RTEMS.BINARY_SEMAPHORE, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.JUNK_ID, STATUS ); @@ -980,11 +983,11 @@ package body SPTEST is TEXT_IO.PUT_LINE("TA1 - semaphore_create - INVALID_NUMBER"); if TEST_SUPPORT.Is_Configured_Multiprocessing then - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 3 ), 1, RTEMS.GLOBAL, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.JUNK_ID, STATUS ); @@ -996,7 +999,7 @@ package body SPTEST is end if; TEXT_IO.PUT_LINE("TA1 - semaphore_create - MP_NOT_CONFIGURED"); - RTEMS.SEMAPHORE_DELETE( 100, STATUS ); + RTEMS.SEMAPHORE.DELETE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1006,7 +1009,7 @@ package body SPTEST is "TA1 - semaphore_delete - unknown INVALID_ID" ); - RTEMS.SEMAPHORE_DELETE( 16#10100#, STATUS ); + RTEMS.SEMAPHORE.DELETE( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1016,7 +1019,7 @@ package body SPTEST is "TA1 - semaphore_delete - local INVALID_ID" ); - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( 100, RTEMS.SEARCH_ALL_NODES, SPTEST.JUNK_ID, @@ -1031,7 +1034,7 @@ package body SPTEST is "TA1 - semaphore_ident - global INVALID_NAME" ); - RTEMS.SEMAPHORE_IDENT( 100, 1, SPTEST.JUNK_ID, STATUS ); + RTEMS.SEMAPHORE.IDENT( 100, 1, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -1043,7 +1046,6 @@ package body SPTEST is end SCREEN_5; ---PAGE -- -- SCREEN_6 -- @@ -1053,7 +1055,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( 100, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -1066,7 +1068,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - INVALID_ID" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -1077,7 +1079,7 @@ package body SPTEST is "TA1 - semaphore_obtain - got sem 1 - SUCCESSFUL" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -1091,7 +1093,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - UNSATISFIED" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - timeout in 3 seconds" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, 3 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -1106,7 +1108,7 @@ package body SPTEST is "TA1 - semaphore_obtain - woke with TIMEOUT" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.NOT_OWNER_OF_RESOURCE, @@ -1116,7 +1118,7 @@ package body SPTEST is "TA1 - semaphore_release - NOT_OWNER_OF_RESOURCE" ); - RTEMS.SEMAPHORE_RELEASE( 100, STATUS ); + RTEMS.SEMAPHORE.RELEASE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1127,7 +1129,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_start - start TA2 - SUCCESSFUL" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 2 ), SPTEST.TASK_2'ACCESS, 0, @@ -1138,17 +1140,17 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor - SUCCESSFUL" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete sem 1 - SUCCESSFUL" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM1" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - binary semaphore" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -1159,7 +1161,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete sem 2 - RESOURCE_IN_USE" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.RESOURCE_IN_USE, @@ -1169,10 +1171,10 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor - SUCCESSFUL" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1184,7 +1186,6 @@ package body SPTEST is end SCREEN_6; ---PAGE -- -- SCREEN_7 -- @@ -1200,7 +1201,7 @@ package body SPTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( 100, BUFFER_POINTER, 16, @@ -1216,7 +1217,7 @@ package body SPTEST is "TA1 - message_queue_broadcast - INVALID_ID" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( 0, 3, 16, @@ -1234,7 +1235,7 @@ package body SPTEST is ); if TEST_SUPPORT.Is_Configured_Multiprocessing then - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 1, 16, @@ -1251,7 +1252,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - message_queue_create - Q 1 - MP_NOT_CONFIGURED"); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 2, 16, @@ -1267,7 +1268,7 @@ package body SPTEST is "TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 2 ), 1, 16, @@ -1284,7 +1285,7 @@ package body SPTEST is "TA1 - message_queue_create - Q 2 - TOO_MANY" ); - RTEMS.MESSAGE_QUEUE_DELETE( 100, STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1294,7 +1295,7 @@ package body SPTEST is "TA1 - message_queue_delete - unknown INVALID_ID" ); - RTEMS.MESSAGE_QUEUE_DELETE( 16#10100#, STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1304,7 +1305,7 @@ package body SPTEST is "TA1 - message_queue_delete - local INVALID_ID" ); - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( 100, RTEMS.SEARCH_ALL_NODES, SPTEST.JUNK_ID, @@ -1317,7 +1318,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - message_queue_ident - INVALID_NAME" ); - RTEMS.MESSAGE_QUEUE_GET_NUMBER_PENDING( 100, COUNT, STATUS ); + RTEMS.MESSAGE_QUEUE.GET_NUMBER_PENDING( 100, COUNT, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1325,7 +1326,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE("TA1 - message_queue_get_number_pending - INVALID_ID"); - RTEMS.MESSAGE_QUEUE_FLUSH( 100, COUNT, STATUS ); + RTEMS.MESSAGE_QUEUE.FLUSH( 100, COUNT, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1333,7 +1334,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - INVALID_ID" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( 100, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -1348,7 +1349,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - message_queue_receive - INVALID_ID" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.NO_WAIT, @@ -1368,7 +1369,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - message_queue_receive - Q 1 - timeout in 3 seconds" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -1385,7 +1386,7 @@ package body SPTEST is "TA1 - message_queue_receive - Q 1 - woke up with TIMEOUT" ); - RTEMS.MESSAGE_QUEUE_SEND( 100, BUFFER_POINTER, 16, STATUS ); + RTEMS.MESSAGE_QUEUE.SEND( 100, BUFFER_POINTER, 16, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1393,7 +1394,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - INVALID_ID" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1404,7 +1405,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1415,7 +1416,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1432,7 +1433,6 @@ package body SPTEST is end SCREEN_7; ---PAGE -- -- SCREEN_8 -- @@ -1446,7 +1446,7 @@ package body SPTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE SUCCESSFUL" @@ -1455,7 +1455,7 @@ package body SPTEST is "TA1 - message_queue_delete - Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 2, 16, @@ -1471,7 +1471,7 @@ package body SPTEST is "TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1482,7 +1482,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1493,7 +1493,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1508,7 +1508,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY" ); - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE SUCCESSFUL" @@ -1517,7 +1517,7 @@ package body SPTEST is "TA1 - message_queue_delete - Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 3, 16, @@ -1533,7 +1533,7 @@ package body SPTEST is "TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1544,7 +1544,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1555,7 +1555,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1566,7 +1566,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 3 TO Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -1581,7 +1581,7 @@ package body SPTEST is "TA1 - message_queue_send - BUFFER 4 TO Q 1 - TOO_MANY" ); - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE SUCCESSFUL" @@ -1590,7 +1590,7 @@ package body SPTEST is "TA1 - message_queue_delete - Q 1 - SUCCESSFUL" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 2, 16, @@ -1609,7 +1609,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_start - start TA3 - SUCCESSFUL" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 3 ), SPTEST.TASK_3'ACCESS, 0, @@ -1620,10 +1620,10 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor - SUCCESSFUL" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" ); - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE SUCCESSFUL" @@ -1635,12 +1635,11 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor - SUCCESSFUL" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" ); end SCREEN_8; ---PAGE -- -- SCREEN_9 -- @@ -1651,7 +1650,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( 0, SPTEST.INTERNAL_PORT_AREA'ADDRESS, SPTEST.EXTERNAL_PORT_AREA'ADDRESS, @@ -1666,7 +1665,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - port_create - INVALID_NAME" ); - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( SPTEST.PORT_NAME( 1 ), SPTEST.INTERNAL_PORT_AREA( 1 )'ADDRESS, SPTEST.EXTERNAL_PORT_AREA'ADDRESS, @@ -1681,7 +1680,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - port_create - INVALID_ADDRESS" ); - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( SPTEST.PORT_NAME( 1 ), SPTEST.INTERNAL_PORT_AREA'ADDRESS, SPTEST.EXTERNAL_PORT_AREA'ADDRESS, @@ -1696,7 +1695,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - port_create - TOO_MANY" ); - RTEMS.PORT_DELETE( 0, STATUS ); + RTEMS.PORT.DELETE( 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1704,7 +1703,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - port_delete - INVALID_ID" ); - RTEMS.PORT_IDENT( 0, SPTEST.JUNK_ID, STATUS ); + RTEMS.PORT.IDENT( 0, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -1712,7 +1711,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - port_ident - INVALID_NAME" ); - RTEMS.PORT_INTERNAL_TO_EXTERNAL( + RTEMS.PORT.INTERNAL_TO_EXTERNAL( 100, SPTEST.INTERNAL_PORT_AREA'ADDRESS, CONVERTED, @@ -1727,7 +1726,7 @@ package body SPTEST is "TA1 - port_internal_to_external - INVALID_ID" ); - RTEMS.PORT_EXTERNAL_TO_INTERNAL( + RTEMS.PORT.EXTERNAL_TO_INTERNAL( 100, SPTEST.EXTERNAL_PORT_AREA'ADDRESS, CONVERTED, @@ -1744,7 +1743,6 @@ package body SPTEST is end SCREEN_9; ---PAGE -- -- SCREEN_10 -- @@ -1754,7 +1752,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.RATE_MONOTONIC_CREATE( 0, SPTEST.JUNK_ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( 0, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -1764,7 +1762,7 @@ package body SPTEST is "TA1 - rate_monotonic_create - INVALID_NAME" ); - RTEMS.RATE_MONOTONIC_CREATE( + RTEMS.RATE_MONOTONIC.CREATE( SPTEST.PERIOD_NAME( 1 ), SPTEST.PERIOD_ID( 1 ), STATUS @@ -1774,7 +1772,7 @@ package body SPTEST is "TA1 - rate_monotonic_create - SUCCESSFUL" ); - RTEMS.RATE_MONOTONIC_CREATE( + RTEMS.RATE_MONOTONIC.CREATE( SPTEST.PERIOD_NAME( 1 ), SPTEST.JUNK_ID, STATUS @@ -1786,7 +1784,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - rate_monotonic_create - TOO_MANY" ); - RTEMS.RATE_MONOTONIC_IDENT( 0, SPTEST.JUNK_ID, STATUS ); + RTEMS.RATE_MONOTONIC.IDENT( 0, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -1796,7 +1794,7 @@ package body SPTEST is "TA1 - rate_monotonic_ident - INVALID_NAME" ); - RTEMS.RATE_MONOTONIC_PERIOD( 100, 5, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( 100, 5, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1806,7 +1804,7 @@ package body SPTEST is "TA1 - rate_monotonic_period - unknown INVALID_ID" ); - RTEMS.RATE_MONOTONIC_PERIOD( 16#10100#, 5, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( 16#10100#, 5, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1816,9 +1814,9 @@ package body SPTEST is "TA1 - rate_monotonic_period - local INVALID_ID" ); - RTEMS.RATE_MONOTONIC_PERIOD( + RTEMS.RATE_MONOTONIC.PERIOD( SPTEST.PERIOD_ID( 1 ), - RTEMS.PERIOD_STATUS, + RTEMS.RATE_MONOTONIC_PERIOD_STATUS, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( @@ -1830,7 +1828,7 @@ package body SPTEST is "TA1 - rate_monotonic_period( STATUS ) - NOT_DEFINED" ); - RTEMS.RATE_MONOTONIC_PERIOD( SPTEST.PERIOD_ID( 1 ), 100, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( SPTEST.PERIOD_ID( 1 ), 100, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD 100 TICKS" @@ -1838,9 +1836,9 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - rate_monotonic_period - 100 ticks - " ); TEXT_IO.PUT_LINE( "SUCCESSFUL" ); - RTEMS.RATE_MONOTONIC_PERIOD( + RTEMS.RATE_MONOTONIC.PERIOD( SPTEST.PERIOD_ID( 1 ), - RTEMS.PERIOD_STATUS, + RTEMS.RATE_MONOTONIC_PERIOD_STATUS, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( @@ -1852,9 +1850,9 @@ package body SPTEST is loop - RTEMS.RATE_MONOTONIC_PERIOD( + RTEMS.RATE_MONOTONIC.PERIOD( SPTEST.PERIOD_ID( 1 ), - RTEMS.PERIOD_STATUS, + RTEMS.RATE_MONOTONIC_PERIOD_STATUS, STATUS ); @@ -1869,7 +1867,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - rate_monotonic_period( STATUS ) - " ); TEXT_IO.PUT_LINE( "TIMEOUT" ); - RTEMS.RATE_MONOTONIC_CANCEL( 100, STATUS ); + RTEMS.RATE_MONOTONIC.CANCEL( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1879,7 +1877,7 @@ package body SPTEST is "TA1 - rate_monotonic_cancel - unknown INVALID_ID" ); - RTEMS.RATE_MONOTONIC_CANCEL( 16#10100#, STATUS ); + RTEMS.RATE_MONOTONIC.CANCEL( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1889,20 +1887,20 @@ package body SPTEST is "TA1 - rate_monotonic_cancel - local INVALID_ID" ); - RTEMS.RATE_MONOTONIC_CANCEL( SPTEST.PERIOD_ID( 1 ), STATUS ); + RTEMS.RATE_MONOTONIC.CANCEL( SPTEST.PERIOD_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CANCEL" ); TEXT_IO.PUT_LINE( "TA1 - rate_monotonic_cancel - SUCCESSFUL" ); - RTEMS.RATE_MONOTONIC_PERIOD( SPTEST.PERIOD_ID( 1 ), 5, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( SPTEST.PERIOD_ID( 1 ), 5, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD RESTART" ); - 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" ); - RTEMS.RATE_MONOTONIC_PERIOD( SPTEST.PERIOD_ID( 1 ), 5, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( SPTEST.PERIOD_ID( 1 ), 5, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.TIMEOUT, @@ -1912,7 +1910,7 @@ package body SPTEST is "TA1 - rate_monotonic_period - 5 ticks - TIMEOUT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 4 ), SPTEST.TASK_4'ACCESS, 0, @@ -1921,10 +1919,10 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yielding to TA4" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" ); - RTEMS.RATE_MONOTONIC_DELETE( 100, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1934,7 +1932,7 @@ package body SPTEST is "TA1 - rate_monotonic_delete - unknown INVALID_ID" ); - RTEMS.RATE_MONOTONIC_DELETE( 16#10100#, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -1944,7 +1942,7 @@ package body SPTEST is "TA1 - rate_monotonic_delete - local INVALID_ID" ); - RTEMS.RATE_MONOTONIC_DELETE( SPTEST.PERIOD_ID( 1 ), STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( SPTEST.PERIOD_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_DELETE" ); TEXT_IO.PUT_LINE( "TA1 - rate_monotonic_delete - SUCCESSFUL" @@ -1952,7 +1950,6 @@ package body SPTEST is end SCREEN_10; ---PAGE -- -- SCREEN_11 -- @@ -1965,7 +1962,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( 0, SPTEST.PARTITION_GOOD_AREA'ADDRESS, 128, @@ -1981,7 +1978,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_create - INVALID_NAME" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_GOOD_AREA'ADDRESS, 0, @@ -1999,7 +1996,7 @@ package body SPTEST is "TA1 - partition_create - length - INVALID_SIZE" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_GOOD_AREA'ADDRESS, 128, @@ -2017,7 +2014,7 @@ package body SPTEST is "TA1 - partition_create - buffer size - INVALID_SIZE" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_GOOD_AREA'ADDRESS, 128, @@ -2036,7 +2033,7 @@ package body SPTEST is ); if TEST_SUPPORT.Is_Configured_Multiprocessing then - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_GOOD_AREA'ADDRESS, 128, @@ -2053,7 +2050,7 @@ package body SPTEST is end if; TEXT_IO.PUT_LINE("TA1 - partition_create - MP_NOT_CONFIGURED"); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_BAD_AREA'ADDRESS, 128, @@ -2069,7 +2066,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_create - INVALID_ADDRESS" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_GOOD_AREA'ADDRESS, 128, @@ -2085,7 +2082,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_create - INVALID_SIZE" ); - RTEMS.PARTITION_DELETE( 100, STATUS ); + RTEMS.PARTITION.DELETE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2095,7 +2092,7 @@ package body SPTEST is "TA1 - partition_delete - unknown INVALID_ID" ); - RTEMS.PARTITION_DELETE( 16#10100#, STATUS ); + RTEMS.PARTITION.DELETE( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2105,7 +2102,7 @@ package body SPTEST is "TA1 - partition_delete - local INVALID_ID" ); - RTEMS.PARTITION_GET_BUFFER( 100, BUFFER_ADDRESS_1, STATUS ); + RTEMS.PARTITION.GET_BUFFER( 100, BUFFER_ADDRESS_1, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2113,7 +2110,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - INVALID_ID" ); - RTEMS.PARTITION_IDENT( + RTEMS.PARTITION.IDENT( 0, RTEMS.SEARCH_ALL_NODES, SPTEST.JUNK_ID, @@ -2126,7 +2123,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_ident - INVALID_NAME" ); - RTEMS.PARTITION_RETURN_BUFFER( 100, BUFFER_ADDRESS_1, STATUS ); + RTEMS.PARTITION.RETURN_BUFFER( 100, BUFFER_ADDRESS_1, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2136,7 +2133,7 @@ package body SPTEST is "TA1 - partition_return_buffer - INVALID_ID" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_GOOD_AREA'ADDRESS, 128, @@ -2148,7 +2145,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" ); TEXT_IO.PUT_LINE( "TA1 - partition_create - SUCCESSFUL" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), SPTEST.PARTITION_GOOD_AREA'ADDRESS, 128, @@ -2164,7 +2161,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_create - TOO_MANY" ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( SPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS_1, STATUS @@ -2172,7 +2169,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" ); TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - SUCCESSFUL" ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( SPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS_2, STATUS @@ -2180,7 +2177,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" ); TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - SUCCESSFUL" ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( SPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS_3, STATUS @@ -2192,7 +2189,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - UNSATISFIED" ); - RTEMS.PARTITION_DELETE( + RTEMS.PARTITION.DELETE( SPTEST.PARTITION_ID( 1 ), STATUS ); @@ -2203,7 +2200,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - partition_delete - RESOURCE_IN_USE" ); - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( SPTEST.PARTITION_ID( 1 ), SPTEST.REGION_GOOD_AREA( 0 )'ADDRESS, -- NOTE: REGION STATUS @@ -2216,7 +2213,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - partition_return_buffer - " ); TEXT_IO.PUT_LINE( "INVALID_ADDRESS - out of range" ); - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( SPTEST.PARTITION_ID( 1 ), SPTEST.PARTITION_GOOD_AREA( 7 )'ADDRESS, STATUS @@ -2232,7 +2229,6 @@ package body SPTEST is end SCREEN_11; ---PAGE -- -- SCREEN_12 -- @@ -2242,13 +2238,13 @@ package body SPTEST is SEGMENT_ADDRESS_1 : RTEMS.ADDRESS; SEGMENT_ADDRESS_2 : RTEMS.ADDRESS; SEGMENT_ADDRESS_3 : RTEMS.ADDRESS; - OFFSET : RTEMS.UNSIGNED32; - GOOD_FRONT_FLAG : RTEMS.UNSIGNED32; - GOOD_BACK_FLAG : RTEMS.UNSIGNED32; +-- OFFSET : RTEMS.UNSIGNED32; +-- GOOD_FRONT_FLAG : RTEMS.UNSIGNED32; +-- GOOD_BACK_FLAG : RTEMS.UNSIGNED32; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( 0, SPTEST.REGION_GOOD_AREA'ADDRESS, 16#40#, @@ -2264,7 +2260,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_create - INVALID_NAME" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 1 ), SPTEST.REGION_BAD_AREA'ADDRESS, 16#40#, @@ -2280,7 +2276,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_create - INVALID_ADDRESS" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 1 ), SPTEST.REGION_GOOD_AREA'ADDRESS, 34, @@ -2296,7 +2292,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_create - INVALID_SIZE" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 1 ), SPTEST.REGION_GOOD_AREA( SPTEST.REGION_START_OFFSET )'ADDRESS, SPTEST.REGION_LENGTH, @@ -2308,7 +2304,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE" ); TEXT_IO.PUT_LINE( "TA1 - region_create - SUCCESSFUL" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 1 ), SPTEST.REGION_GOOD_AREA'ADDRESS, SPTEST.REGION_LENGTH, @@ -2324,7 +2320,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_create - TOO_MANY" ); - RTEMS.REGION_DELETE( 100, STATUS ); + RTEMS.REGION.DELETE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2332,7 +2328,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_delete - unknown INVALID_ID" ); - RTEMS.REGION_DELETE( 16#10100#, STATUS ); + RTEMS.REGION.DELETE( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2340,7 +2336,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_delete - local INVALID_ID" ); - RTEMS.REGION_IDENT( 0, SPTEST.JUNK_ID, STATUS ); + RTEMS.REGION.IDENT( 0, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -2348,7 +2344,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_ident - INVALID_NAME" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( 100, 16#40#, RTEMS.DEFAULT_OPTIONS, @@ -2363,7 +2359,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_get_segment - INVALID_ID" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), (SPTEST.REGION_GOOD_AREA'SIZE / 8) * 2, RTEMS.DEFAULT_OPTIONS, @@ -2378,7 +2374,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_get_segment - INVALID_SIZE" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 384, RTEMS.DEFAULT_OPTIONS, @@ -2389,7 +2385,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); TEXT_IO.PUT_LINE( "TA1 - region_get_segment - SUCCESSFUL" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), SPTEST.REGION_LENGTH / 2, RTEMS.NO_WAIT, @@ -2405,7 +2401,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - region_get_segment - UNSATISFIED" ); TEXT_IO.PUT_LINE( "TA1 - region_get_segment - timeout in 3 seconds" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 128, RTEMS.DEFAULT_OPTIONS, @@ -2422,7 +2418,7 @@ package body SPTEST is "TA1 - region_get_segment - woke up with TIMEOUT" ); - RTEMS.REGION_DELETE( SPTEST.REGION_ID( 1 ), STATUS ); + RTEMS.REGION.DELETE( SPTEST.REGION_ID( 1 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.RESOURCE_IN_USE, @@ -2430,7 +2426,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_delete - RESOURCE_IN_USE" ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( 100, SEGMENT_ADDRESS_1, STATUS @@ -2442,7 +2438,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - region_return_segment - INVALID_ID" ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SPTEST.REGION_GOOD_AREA'ADDRESS, STATUS @@ -2459,11 +2455,11 @@ package body SPTEST is -- internal heap errors, subject to change if heap code changes TEXT_IO.PUT_LINE( "TA1 - debug_disable - DEBUG_REGION" ); - RTEMS.DEBUG_DISABLE( RTEMS.DEBUG_REGION ); + RTEMS.DEBUG.DISABLE( RTEMS.DEBUG.REGION ); - OFFSET := 0; - GOOD_BACK_FLAG := 0; - GOOD_FRONT_FLAG := 0; +-- OFFSET := 0; +-- GOOD_BACK_FLAG := 0; +-- GOOD_FRONT_FLAG := 0; TEXT_IO.PUT_LINE( "TA1 - region_return_segment - INVALID_ADDRESS - SKIPPED" @@ -2484,7 +2480,7 @@ package body SPTEST is -- GOOD_FRONT_FLAG := SPTEST.REGION_GOOD_AREA( OFFSET - 1 ); -- SPTEST.REGION_GOOD_AREA( OFFSET - 1 ) := GOOD_FRONT_FLAG + 2; -- --- RTEMS.REGION_RETURN_SEGMENT( +-- RTEMS.REGION.RETURN_SEGMENT( -- SPTEST.REGION_ID( 1 ), -- SEGMENT_ADDRESS_1, -- STATUS @@ -2505,7 +2501,7 @@ package body SPTEST is -- GOOD_BACK_FLAG := SPTEST.REGION_GOOD_AREA( OFFSET - 2 ); -- SPTEST.REGION_GOOD_AREA( OFFSET - 2 ) := 1024; -- --- RTEMS.REGION_RETURN_SEGMENT( +-- RTEMS.REGION.RETURN_SEGMENT( -- SPTEST.REGION_ID( 1 ), -- SEGMENT_ADDRESS_1, -- STATUS @@ -2522,9 +2518,9 @@ package body SPTEST is -- SPTEST.REGION_GOOD_AREA( OFFSET - 2 ) := GOOD_BACK_FLAG; TEXT_IO.PUT_LINE( "TA1 - debug_enable - DEBUG_REGION" ); - RTEMS.DEBUG_ENABLE( RTEMS.DEBUG_REGION ); + RTEMS.DEBUG.ENABLE( RTEMS.DEBUG.REGION ); - RTEMS.REGION_EXTEND( + RTEMS.REGION.EXTEND( 100, SPTEST.REGION_GOOD_AREA'ADDRESS, 128, @@ -2539,7 +2535,7 @@ package body SPTEST is "TA1 - region_extend - INVALID_ID" ); - RTEMS.REGION_EXTEND( + RTEMS.REGION.EXTEND( SPTEST.REGION_ID( 1 ), SPTEST.REGION_GOOD_AREA( SPTEST.REGION_START_OFFSET + 16 )'ADDRESS, 128, @@ -2554,7 +2550,7 @@ package body SPTEST is "TA1 - region_extend - within heap - INVALID_ADDRESS" ); - RTEMS.REGION_EXTEND( + RTEMS.REGION.EXTEND( SPTEST.REGION_ID( 1 ), SPTEST.REGION_BAD_AREA'ADDRESS, 128, @@ -2569,7 +2565,7 @@ package body SPTEST is "TA1 - region_extend - non-contiguous lower - NOT_IMPLEMENTED" ); - RTEMS.REGION_EXTEND( + RTEMS.REGION.EXTEND( SPTEST.REGION_ID( 1 ), SPTEST.REGION_GOOD_AREA( SPTEST.REGION_START_OFFSET - SPTEST.REGION_LENGTH )'ADDRESS, @@ -2585,7 +2581,7 @@ package body SPTEST is "TA1 - region_extend - contiguous lower - NOT_IMPLEMENTED" ); - RTEMS.REGION_EXTEND( + RTEMS.REGION.EXTEND( SPTEST.REGION_ID( 1 ), SPTEST.REGION_GOOD_AREA( SPTEST.REGION_START_OFFSET + SPTEST.REGION_LENGTH + 16 )'ADDRESS, @@ -2603,7 +2599,6 @@ package body SPTEST is end SCREEN_12; ---PAGE -- -- SCREEN_13 -- @@ -2614,7 +2609,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin TIME := ( 2000, 12, 31, 23, 59, 59, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", @@ -2622,9 +2617,9 @@ package body SPTEST is " - SUCCESSFUL" ); TEXT_IO.NEW_LINE; - 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" ); - 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 SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", @@ -2634,7 +2629,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TIME := ( 1999, 12, 31, 23, 59, 59, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", @@ -2642,9 +2637,9 @@ package body SPTEST is " - SUCCESSFUL" ); TEXT_IO.NEW_LINE; - 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" ); - 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 SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", @@ -2654,7 +2649,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TIME := ( 2100, 12, 31, 23, 59, 59, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", @@ -2662,9 +2657,9 @@ package body SPTEST is " - SUCCESSFUL" ); TEXT_IO.NEW_LINE; - 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" ); - 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 SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", @@ -2674,7 +2669,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TIME := ( 2099, 12, 31, 23, 59, 59, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", @@ -2682,9 +2677,9 @@ package body SPTEST is " - SUCCESSFUL" ); TEXT_IO.NEW_LINE; - 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" ); - 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 SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", @@ -2694,7 +2689,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TIME := ( 1991, 12, 31, 23, 59, 59, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", @@ -2702,9 +2697,9 @@ package body SPTEST is " - SUCCESSFUL" ); TEXT_IO.NEW_LINE; - 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" ); - 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 SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", @@ -2715,7 +2710,6 @@ package body SPTEST is end SCREEN_13; ---PAGE -- -- SCREEN_14 -- @@ -2726,7 +2720,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TIMER_CREATE( 0, SPTEST.JUNK_ID, STATUS ); + RTEMS.TIMER.CREATE( 0, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -2734,7 +2728,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_create - INVALID_NAME" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 1 ), SPTEST.TIMER_ID( 1 ), STATUS @@ -2742,7 +2736,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); TEXT_IO.PUT_LINE( "TA1 - timer_create - 1 - SUCCESSFUL" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 1 ), SPTEST.JUNK_ID, STATUS @@ -2754,7 +2748,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_create - 2 - TOO_MANY" ); - RTEMS.TIMER_DELETE( 100, STATUS ); + RTEMS.TIMER.DELETE( 100, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2762,7 +2756,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_delete - local INVALID_ID" ); - RTEMS.TIMER_DELETE( 16#10100#, STATUS ); + RTEMS.TIMER.DELETE( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2770,7 +2764,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_delete - global INVALID_ID" ); - RTEMS.TIMER_IDENT( 0, SPTEST.JUNK_ID, STATUS ); + RTEMS.TIMER.IDENT( 0, SPTEST.JUNK_ID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_NAME, @@ -2778,7 +2772,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_ident - INVALID_NAME" ); - RTEMS.TIMER_CANCEL( 16#10100#, STATUS ); + RTEMS.TIMER.CANCEL( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2786,7 +2780,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_cancel - INVALID_ID" ); - RTEMS.TIMER_RESET( 16#10100#, STATUS ); + RTEMS.TIMER.RESET( 16#10100#, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_ID, @@ -2794,7 +2788,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_reset - INVALID_ID" ); - RTEMS.TIMER_RESET( SPTEST.TIMER_ID( 1 ), STATUS ); + RTEMS.TIMER.RESET( SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.NOT_DEFINED, @@ -2802,7 +2796,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_reset - NOT_DEFINED" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( 16#10100#, 5 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2817,7 +2811,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_fire_after - INVALID_ID" ); TIME := ( 1994, 12, 31, 1, 0, 0, 0 ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( 16#10100#, TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2831,7 +2825,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_fire_when - INVALID_ID" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), 0, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2846,7 +2840,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_fire_after - INVALID_NUMBER" ); TIME := ( 1987, 2, 5, 8, 30, 45, 0 ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 1 ), TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2865,13 +2859,13 @@ package body SPTEST is ); TEXT_IO.NEW_LINE; - 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 SUCCESSFUL" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", TIME, "" ); TEXT_IO.NEW_LINE; TIME := ( 1990, 2, 5, 8, 30, 45, 0 ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 1 ), TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2890,7 +2884,7 @@ package body SPTEST is ); TEXT_IO.NEW_LINE; - RTEMS.TIMER_SERVER_FIRE_AFTER( + RTEMS.TIMER.SERVER_FIRE_AFTER( 0, 5, SPTEST.DELAYED_SUBPROGRAM'ACCESS, RTEMS.NULL_ADDRESS, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( @@ -2900,7 +2894,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_server_fire_after - INCORRECT_STATE" ); - RTEMS.TIMER_SERVER_FIRE_WHEN( + RTEMS.TIMER.SERVER_FIRE_WHEN( 0, TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, RTEMS.NULL_ADDRESS, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( @@ -2910,7 +2904,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_server_fire_when - INCORRECT_STATE" ); - RTEMS.timer_initiate_server( 0, 0, 0, STATUS ); + RTEMS.TIMER.INITIATE_SERVER( 0, 0, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.INVALID_PRIORITY, @@ -2918,15 +2912,15 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_initiate_server - INVALID_PRIORITY" ); - RTEMS.timer_initiate_server( + RTEMS.TIMER.INITIATE_SERVER( -- XXX ask Joel --- RTEMS.TIMER_SERVER_DEFAULT_PRIORITY, 0, 0, STATUS +-- RTEMS.TIMER.SERVER_DEFAULT_PRIORITY, 0, 0, STATUS -1, 0, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "timer_initiate_server" ); TEXT_IO.PUT_LINE( "TA1 - timer_initiate_server" ); - RTEMS.TIMER_SERVER_FIRE_AFTER( + RTEMS.TIMER.SERVER_FIRE_AFTER( 16#010100#, 5 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2941,7 +2935,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_server_fire_after - INVALID_ID" ); TIME := ( 1994, 12, 31, 9, 0, 0, 0 ); - RTEMS.TIMER_SERVER_FIRE_WHEN( + RTEMS.TIMER.SERVER_FIRE_WHEN( 16#010100#, TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2955,7 +2949,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - timer_server_fire_when - INVALID_ID" ); - RTEMS.TIMER_SERVER_FIRE_AFTER( + RTEMS.TIMER.SERVER_FIRE_AFTER( SPTEST.TIMER_ID( 1 ), 0, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2970,7 +2964,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_server_fire_after - INVALID_NUMBER" ); TIME := ( 1987, 2, 5, 8, 30, 45, 0 ); - RTEMS.TIMER_SERVER_FIRE_WHEN( + RTEMS.TIMER.SERVER_FIRE_WHEN( SPTEST.TIMER_ID( 1 ), TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -2989,13 +2983,13 @@ package body SPTEST is ); TEXT_IO.NEW_LINE; - 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_set" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", TIME, "" ); TEXT_IO.NEW_LINE; TIME := ( 1990, 2, 5, 8, 30, 45, 0 ); - RTEMS.TIMER_SERVER_FIRE_WHEN( + RTEMS.TIMER.SERVER_FIRE_WHEN( SPTEST.TIMER_ID( 1 ), TIME, SPTEST.DELAYED_SUBPROGRAM'ACCESS, @@ -3016,13 +3010,12 @@ package body SPTEST is end SCREEN_14; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin @@ -3073,20 +3066,19 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - sem 1 - WAIT FOREVER" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -3104,18 +3096,17 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA2 - task_delete - delete self - SUCCESSFUL" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : SPTEST.BUFFER; @@ -3129,7 +3120,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA3 - message_queue_receive - Q 1 - WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -3148,24 +3139,23 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA3 - task_delete - delete self - SUCCESSFUL" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" ); end TASK_3; ---PAGE -- -- TASK_4 -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.RATE_MONOTONIC_CANCEL( + RTEMS.RATE_MONOTONIC.CANCEL( SPTEST.PERIOD_ID( 1 ), STATUS ); @@ -3178,7 +3168,7 @@ package body SPTEST is "TA4 - rate_monotonic_cancel - NOT_OWNER_OF_RESOURCE" ); - RTEMS.RATE_MONOTONIC_PERIOD( + RTEMS.RATE_MONOTONIC.PERIOD( SPTEST.PERIOD_ID( 1 ), 5, STATUS @@ -3195,7 +3185,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA4 - task_delete - delete self - SUCCESSFUL" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" ); diff --git a/c/src/ada-tests/sptests/sp09/sptest.ads b/c/src/ada-tests/sptests/sp09/sptest.ads index 97eb00d04f..c825016234 100644 --- a/c/src/ada-tests/sptests/sp09/sptest.ads +++ b/c/src/ada-tests/sptests/sp09/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SYSTEM; with System.Storage_Elements; @@ -121,7 +122,7 @@ package SPTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -133,7 +134,7 @@ package SPTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -154,7 +155,7 @@ package SPTEST is PARTITION_BAD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for PARTITION_BAD_AREA use at PARTITION_BAD_AREA_ADDRESS; + for PARTITION_BAD_AREA'Address use PARTITION_BAD_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -179,7 +180,7 @@ package SPTEST is REGION_BAD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for REGION_BAD_AREA use at REGION_BAD_AREA_ADDRESS; + for REGION_BAD_AREA'Address use REGION_BAD_AREA_ADDRESS; -- -- INIT @@ -190,7 +191,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -218,7 +219,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -231,7 +232,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -244,7 +245,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); @@ -257,7 +258,7 @@ package SPTEST is -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_4); diff --git a/c/src/ada-tests/sptests/sp11/sp11.adb b/c/src/ada-tests/sptests/sp11/sp11.adb index c6c862c148..4aab9f8bd3 100644 --- a/c/src/ada-tests/sptests/sp11/sp11.adb +++ b/c/src/ada-tests/sptests/sp11/sp11.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 SP11 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp11/sptest.adb b/c/src/ada-tests/sptests/sp11/sptest.adb index 6868688a4e..aecdfea9f1 100644 --- a/c/src/ada-tests/sptests/sp11/sptest.adb +++ b/c/src/ada-tests/sptests/sp11/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,18 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.CLOCK; +with RTEMS.EVENT; +with RTEMS.TIMER; 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; @@ -45,7 +47,7 @@ package body SPTEST is SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 4, 2048, @@ -56,7 +58,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 4, 2048, @@ -67,7 +69,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -75,7 +77,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_2'ACCESS, 0, @@ -90,60 +92,59 @@ package body SPTEST is SPTEST.TIMER_NAME( 5 ) := RTEMS.BUILD_NAME( 'T', 'M', '5', ' ' ); SPTEST.TIMER_NAME( 6 ) := RTEMS.BUILD_NAME( 'T', 'M', '6', ' ' ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 1 ), SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM1" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 2 ), SPTEST.TIMER_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM2" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 3 ), SPTEST.TIMER_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM3" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 4 ), SPTEST.TIMER_ID( 4 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM4" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 5 ), SPTEST.TIMER_ID( 5 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM5" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 6 ), SPTEST.TIMER_ID( 6 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM6" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENTOUT : RTEMS.EVENT_SET; @@ -153,13 +154,13 @@ package body SPTEST is begin TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_16 to TA2" ); - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_16, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_16, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 16" ); TEXT_IO.PUT_LINE( "TA1 - event_receive - waiting forever on EVENT_14 and EVENT_15" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_14 + RTEMS.EVENT_15, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -172,13 +173,13 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_18 to TA2" ); - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_18, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_18, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 18" ); TEXT_IO.PUT_LINE( "TA1 - event_receive - waiting with 10 second timeout on EVENT_14" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_14, RTEMS.DEFAULT_OPTIONS, 10 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -191,10 +192,10 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_19 to TA2" ); - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_19, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_19, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 19" ); - 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, "TA1 CLOCK_GET" ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", TIME, "" ); TEXT_IO.NEW_LINE; @@ -204,7 +205,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_18 to self after 5 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), 5 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.TA1_SEND_18_TO_SELF_5_SECONDS'ACCESS, @@ -216,7 +217,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_receive - waiting forever on EVENT_18" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_18, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -225,7 +226,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 18" ); - 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, "TA1 CLOCK_GET" ); TEXT_IO.PUT( "TA1 - EVENT_18 received - eventout => "); @@ -236,13 +237,13 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_3 to self" ); - RTEMS.EVENT_SEND( RTEMS.SELF, RTEMS.EVENT_3, STATUS ); + RTEMS.EVENT.SEND( RTEMS.SELF, RTEMS.EVENT_3, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 3" ); TEXT_IO.PUT_LINE( "TA1 - event_receive - EVENT_3 or EVENT_22 - NO_WAIT and EVENT_ANY" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_3 + RTEMS.EVENT_22, RTEMS.NO_WAIT + RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -255,13 +256,13 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_4 to self" ); - RTEMS.EVENT_SEND( RTEMS.SELF, RTEMS.EVENT_4, STATUS ); + RTEMS.EVENT.SEND( RTEMS.SELF, RTEMS.EVENT_4, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 4" ); TEXT_IO.PUT_LINE( "TA1 - event_receive - waiting forever on EVENT_4 or EVENT_5 - EVENT_ANY" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_4 + RTEMS.EVENT_5, RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -278,7 +279,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_18 to self after 5 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), 5 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.TA1_SEND_18_TO_SELF_5_SECONDS'ACCESS, @@ -290,13 +291,13 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_cancel - cancelling timer for event EVENT_18" ); - RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); + RTEMS.TIMER.CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_8 to self after 60 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), 60 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.TA1_SEND_8_TO_SELF_60_SECONDS'ACCESS, @@ -308,7 +309,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_9 to self after 60 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 2 ), 60 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.TA1_SEND_9_TO_SELF_60_SECONDS'ACCESS, @@ -320,7 +321,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_10 to self after 60 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 3 ), 60 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.TA1_SEND_10_TO_SELF'ACCESS, @@ -332,20 +333,20 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_cancel - cancelling timer for event EVENT_8" ); - RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); + RTEMS.TIMER.CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); TIME := ( 1988, 2, 12, 8, 15, 0, 0 ); TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" ); TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_1 every second" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.TA1_SEND_1_TO_SELF_EVERY_SECOND'ACCESS, @@ -360,7 +361,7 @@ package body SPTEST is exit when INDEX = 3; - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_1, RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -369,7 +370,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 1" ); - 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, "TA1 CLOCK_GET" ); TEXT_IO.PUT( "TA1 - EVENT_1 received - eventout => "); @@ -378,7 +379,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; if INDEX < 2 then - RTEMS.TIMER_RESET( SPTEST.TIMER_ID( 1 ), STATUS ); + RTEMS.TIMER.RESET( SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 TIMER RESET" ); end if; @@ -388,7 +389,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_cancel - cancelling timer for event EVENT_1" ); - RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); + RTEMS.TIMER.CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); TEST_SUPPORT.PAUSE; @@ -397,7 +398,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_11 to self in 1 day" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 1 ), TIME, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -410,7 +411,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_11 to self in 1 day" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 2 ), TIME, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -424,7 +425,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_11 to self in 2 days" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 3 ), TIME, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -436,19 +437,19 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - timer_cancel - cancelling EVENT_11 to self in 1 day" ); - RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); + RTEMS.TIMER.CANCEL( SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); TEXT_IO.PUT_LINE( "TA1 - timer_cancel - cancelling EVENT_11 to self in 2 days" ); - RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 3 ), STATUS ); + RTEMS.TIMER.CANCEL( SPTEST.TIMER_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); TEXT_IO.PUT_LINE( "TA1 - event_send - resending EVENT_11 to self in 2 days" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 3 ), TIME, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -460,12 +461,12 @@ package body SPTEST is TIME.DAY := 15; TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" ); TEXT_IO.PUT_LINE( "TA1 - event_receive - waiting forever on EVENT_11" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_11, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -482,7 +483,7 @@ package body SPTEST is -- The following code tests the case of deleting a timer ??? TEXT_IO.PUT_LINE( "TA1 - event_send/event_receive combination" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), 10, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -490,7 +491,7 @@ package body SPTEST is STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 10 ticks" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_11, RTEMS.DEFAULT_OPTIONS, 11, @@ -503,14 +504,14 @@ package body SPTEST is TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" ); TIME.DAY := 13; TEXT_IO.PUT_LINE( "TA1 - event_receive all outstanding events" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.ALL_EVENTS, RTEMS.NO_WAIT + RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -526,7 +527,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_10 to self in 1 day" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 1 ), TIME, SPTEST.TA1_SEND_10_TO_SELF'ACCESS, @@ -539,7 +540,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_11 to self in 2 days" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 2 ), TIME, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -553,10 +554,10 @@ package body SPTEST is TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - set time backwards" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.ALL_EVENTS, RTEMS.NO_WAIT + RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -581,10 +582,10 @@ package body SPTEST is TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" ); TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - set time forwards (leave a timer)" ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.ALL_EVENTS, RTEMS.NO_WAIT + RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -603,7 +604,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_11 to self in 100 ticks" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), 100, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -615,7 +616,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_11 to self in 200 ticks" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 2 ), 100, SPTEST.TA1_SEND_11_TO_SELF'ACCESS, @@ -629,13 +630,12 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENTOUT : RTEMS.EVENT_SET; @@ -643,13 +643,13 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "TA2 - event_receive - waiting forever on EVENT_16" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -664,7 +664,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA2 - event_send - send EVENT_14 and EVENT_15 to TA1" ); - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_14 + RTEMS.EVENT_15, STATUS @@ -674,7 +674,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA2 - event_receive - waiting forever on EVENT_17 or EVENT_18 - EVENT_ANY" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_17 + RTEMS.EVENT_18, RTEMS.EVENT_ANY, RTEMS.NO_TIMEOUT, @@ -689,7 +689,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA2 - event_send - send EVENT_14 to TA1" ); - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_14, STATUS @@ -700,14 +700,14 @@ package body SPTEST is TEST_SUPPORT.PRINT_TIME( "TA2 - clock_set - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA2 CLOCK_SET" ); TIME.SECOND := TIME.SECOND + 5; TEXT_IO.PUT_LINE( "TA2 - event_send - sending EVENT_10 to self after 5 seconds" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( SPTEST.TIMER_ID( 5 ), TIME, SPTEST.TA2_SEND_10_TO_SELF'ACCESS, @@ -719,7 +719,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA2 - event_receive - waiting forever on EVENT_10" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_10, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -728,7 +728,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 10" ); - 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, "TA1 CLOCK_GET" ); TEXT_IO.PUT( "TA2 - EVENT_10 received - eventout => "); @@ -739,7 +739,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA2 - event_receive - PENDING_EVENTS" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.PENDING_EVENTS, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -754,7 +754,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA2 - event_receive - EVENT_19 - NO_WAIT" ); - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_19, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -767,12 +767,11 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA2 - task_delete - deletes self" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE of TA2" ); end TASK_2; ---PAGE -- -- TA1_SEND_18_TO_SELF_5_SECONDS -- @@ -787,12 +786,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_18, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_18, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 18" ); end TA1_SEND_18_TO_SELF_5_SECONDS; ---PAGE -- -- TA1_SEND_8_TO_SELF_60_SECONDS -- @@ -807,12 +805,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_8, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_8, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 8" ); end TA1_SEND_8_TO_SELF_60_SECONDS; ---PAGE -- -- TA1_SEND_9_TO_SELF_60_SECONDS -- @@ -827,12 +824,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_9, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_9, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 9" ); end TA1_SEND_9_TO_SELF_60_SECONDS; ---PAGE -- -- TA1_SEND_10_TO_SELF -- @@ -847,12 +843,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_10, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_10, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 10" ); end TA1_SEND_10_TO_SELF; ---PAGE -- -- TA1_SEND_1_TO_SELF_EVERY_SECOND -- @@ -867,12 +862,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_1, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_1, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 1" ); end TA1_SEND_1_TO_SELF_EVERY_SECOND; ---PAGE -- -- TA1_SEND_11_TO_SELF -- @@ -887,12 +881,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_11, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_11, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 11" ); end TA1_SEND_11_TO_SELF; ---PAGE -- -- TA2_SEND_10_TO_SELF -- @@ -907,7 +900,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_10, STATUS ); + RTEMS.EVENT.SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_10, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 10" ); end TA2_SEND_10_TO_SELF; diff --git a/c/src/ada-tests/sptests/sp11/sptest.ads b/c/src/ada-tests/sptests/sp11/sptest.ads index 62225fedfe..02ca5815d2 100644 --- a/c/src/ada-tests/sptests/sp11/sptest.ads +++ b/c/src/ada-tests/sptests/sp11/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -154,7 +155,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -167,7 +168,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -180,7 +181,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); diff --git a/c/src/ada-tests/sptests/sp12/sp12.adb b/c/src/ada-tests/sptests/sp12/sp12.adb index 260885f7d0..bdb067fef4 100644 --- a/c/src/ada-tests/sptests/sp12/sp12.adb +++ b/c/src/ada-tests/sptests/sp12/sp12.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 @@ -21,6 +21,7 @@ with Interfaces; use Interfaces; with RTEMS; +with RTEMS.TASKS; with SPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure SP12 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE * 2, @@ -41,7 +42,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/sp12/sptest.adb b/c/src/ada-tests/sptests/sp12/sptest.adb index 20e3aaaa67..93c7d411f8 100644 --- a/c/src/ada-tests/sptests/sp12/sptest.adb +++ b/c/src/ada-tests/sptests/sp12/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,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.SEMAPHORE; 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; @@ -63,31 +63,31 @@ package body SPTEST is SPTEST.SEMAPHORE_NAME( 2 ) := RTEMS.BUILD_NAME( 'S', 'M', '2', ' ' ); SPTEST.SEMAPHORE_NAME( 3 ) := RTEMS.BUILD_NAME( 'S', 'M', '3', ' ' ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 0, RTEMS.PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 3 ), 1, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 3 ), STATUS ); @@ -105,17 +105,17 @@ TEST_SUPPORT.PAUSE; "INIT - Binary Semaphore and Priority Inheritance Test" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" ); TEXT_IO.PUT_LINE( "INIT - semaphore_create - allocated binary semaphore" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 0, RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); @@ -124,20 +124,20 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "INIT - semaphore_release - allocated binary semaphore" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" ); TEXT_IO.PUT_LINE( "INIT - semaphore_delete - allocated binary semaphore" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 1, RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); @@ -147,23 +147,23 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.PAUSE; - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 0, RTEMS.PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 4, 2048, @@ -174,7 +174,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 4, 2048, @@ -185,7 +185,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 4, 2048, @@ -196,7 +196,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -204,7 +204,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 2 ), SPTEST.TASK_2'ACCESS, 0, @@ -212,7 +212,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 3 ), SPTEST.TASK_3'ACCESS, 0, @@ -220,12 +220,11 @@ TEST_SUPPORT.PAUSE; ); 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 -- -- PRIORITY_TEST_DRIVER -- @@ -233,7 +232,7 @@ TEST_SUPPORT.PAUSE; procedure PRIORITY_TEST_DRIVER ( PRIORITY_BASE : in RTEMS.UNSIGNED32 ) is - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -243,12 +242,12 @@ TEST_SUPPORT.PAUSE; case INDEX is when 1 | 2 | 3 => SPTEST.TASK_PRIORITY( INDEX ) := - PRIORITY_BASE + RTEMS.TASK_PRIORITY( INDEX ); + PRIORITY_BASE + RTEMS.TASKS.PRIORITY( INDEX ); when others => SPTEST.TASK_PRIORITY( INDEX ) := PRIORITY_BASE + 3; end case; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.PRIORITY_TASK_NAME( INDEX ), SPTEST.TASK_PRIORITY( INDEX ), 2048, @@ -266,10 +265,10 @@ TEST_SUPPORT.PAUSE; for INDEX in 1 .. 5 loop - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.PRIORITY_TASK_ID( INDEX ), SPTEST.PRIORITY_TASK'ACCESS, - RTEMS.TASK_ARGUMENT( INDEX ), + RTEMS.TASKS.ARGUMENT( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); @@ -281,20 +280,20 @@ TEST_SUPPORT.PAUSE; for INDEX in reverse 1 .. 5 loop - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.PRIORITY_TASK_ID( INDEX ), SPTEST.PRIORITY_TASK'ACCESS, - RTEMS.TASK_ARGUMENT( INDEX ), + RTEMS.TASKS.ARGUMENT( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); - 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 LOOP" ); if PRIORITY_BASE = 64 then if INDEX = 4 then - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.PRIORITY_TASK_ID( 5 ), PRIORITY_BASE + 4, PREVIOUS_PRIORITY, @@ -311,9 +310,9 @@ TEST_SUPPORT.PAUSE; ); end if; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.PRIORITY_TASK_ID( 5 ), - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, PREVIOUS_PRIORITY, STATUS ); @@ -330,14 +329,14 @@ TEST_SUPPORT.PAUSE; end if; - 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 AFTER LOOP" ); if PRIORITY_BASE = 0 then for INDEX in 1 .. 5 loop - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); @@ -352,23 +351,23 @@ TEST_SUPPORT.PAUSE; if PRIORITY_BASE = 64 then TEXT_IO.PUT_LINE( "PDRV - task_resume - PRI5" ); - RTEMS.TASK_RESUME( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); + RTEMS.TASKS.RESUME( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); - 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 SO PRI5 can run" ); - RTEMS.TASK_DELETE( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF PRI5" ); else for INDEX in 1 .. 5 loop - RTEMS.TASK_DELETE( + RTEMS.TASKS.DELETE( SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS ); @@ -380,17 +379,16 @@ TEST_SUPPORT.PAUSE; end PRIORITY_TEST_DRIVER; ---PAGE -- -- PRIORITY_TASK -- procedure PRIORITY_TASK ( - ITS_INDEX : in RTEMS.TASK_ARGUMENT + ITS_INDEX : in RTEMS.TASKS.ARGUMENT ) is TIMEOUT : RTEMS.INTERVAL; - ITS_PRIORITY : RTEMS.TASK_PRIORITY; - CURRENT_PRIORITY : RTEMS.TASK_PRIORITY; + ITS_PRIORITY : RTEMS.TASKS.PRIORITY; + CURRENT_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -405,7 +403,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.PUT_NAME( PRIORITY_TASK_NAME( INTEGER(ITS_INDEX) ), FALSE ); TEXT_IO.PUT_LINE( " - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_OPTIONS, TIMEOUT, @@ -428,20 +426,20 @@ TEST_SUPPORT.PAUSE; ); end if; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TEXT_IO.PUT_LINE( "PRI5 - task_delete - all tasks waiting on SM2" ); for INDEX in 1 .. 4 loop - RTEMS.TASK_DELETE( SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" ); end loop; TEXT_IO.PUT_LINE( "PRI5 - semaphore_obtain - nested" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_OPTIONS, TIMEOUT, @@ -450,16 +448,16 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN NESTED" ); TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - nested" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE NESTED" ); TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - restore priority" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.PRIORITY_TASK_ID( 5 ), - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, CURRENT_PRIORITY, STATUS ); @@ -470,24 +468,25 @@ TEST_SUPPORT.PAUSE; STATUS, "PRI5 TASK_SET_PRIORITY CURRENT" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + -- DOES NOT RETURN. Following check makes compiler happy + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end PRIORITY_TASK; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SMID : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( SPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, SMID, @@ -499,7 +498,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -510,7 +509,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM2" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM3" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 3 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -521,7 +520,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM3" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - get SM1 - NO_WAIT" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -532,19 +531,19 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM1" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - waiting for SM1 with 10 second timeout" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, 10 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -555,23 +554,23 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM1" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM2" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - task_delete - 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" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 4 ), 4, 2048, @@ -582,7 +581,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 5 ), 4, 2048, @@ -593,7 +592,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 4 ), SPTEST.TASK_4'ACCESS, 0, @@ -601,7 +600,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 5 ), SPTEST.TASK_5'ACCESS, 0, @@ -610,53 +609,52 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA5" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA4" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 4 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 4 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM1" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM1" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM3" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 3 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM3" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" ); end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -667,7 +665,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - got SM1" ); TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM1" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); @@ -676,7 +674,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - task_set_priority - make self highest priority task" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 3, PREVIOUS_PRIORITY, @@ -685,7 +683,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY ON TA2" ); TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -696,32 +694,31 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - got SM2" ); TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM2" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" ); TEXT_IO.PUT_LINE( "TA2 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA3 - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -731,14 +728,14 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA3 - got SM2" ); TEXT_IO.PUT_LINE( "TA3 - semaphore_release - release SM2" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" ); TEXT_IO.PUT_LINE( "TA3 - semaphore_obtain - wait forever on SM3" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 3 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -748,20 +745,19 @@ TEST_SUPPORT.PAUSE; end TASK_3; ---PAGE -- -- TASK_4 -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA4 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -771,20 +767,19 @@ TEST_SUPPORT.PAUSE; end TASK_4; ---PAGE -- -- TASK_5 -- procedure TASK_5 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -795,7 +790,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA5 - got SM1" ); TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/sptests/sp12/sptest.ads b/c/src/ada-tests/sptests/sp12/sptest.ads index fa2e9adb77..4db8278473 100644 --- a/c/src/ada-tests/sptests/sp12/sptest.ads +++ b/c/src/ada-tests/sptests/sp12/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -34,7 +35,7 @@ package SPTEST is PRIORITY_TASK_ID : array ( 1 .. 5 ) of RTEMS.ID; PRIORITY_TASK_NAME : array ( 1 .. 5 ) of RTEMS.NAME; - TASK_PRIORITY : array ( 1 .. 5 ) of RTEMS.TASK_PRIORITY; + TASK_PRIORITY : array ( 1 .. 5 ) of RTEMS.TASKS.PRIORITY; SEMAPHORE_ID : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID; SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME; @@ -48,7 +49,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package SPTEST is -- procedure PRIORITY_TASK ( - ITS_INDEX : in RTEMS.TASK_ARGUMENT + ITS_INDEX : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, PRIORITY_TASK); @@ -89,7 +90,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -102,7 +103,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -115,7 +116,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); @@ -128,7 +129,7 @@ package SPTEST is -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_4); @@ -141,7 +142,7 @@ package SPTEST is -- procedure TASK_5 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_5); diff --git a/c/src/ada-tests/sptests/sp13/sp13.adb b/c/src/ada-tests/sptests/sp13/sp13.adb index 1479c80e2e..a82cfe9ebb 100644 --- a/c/src/ada-tests/sptests/sp13/sp13.adb +++ b/c/src/ada-tests/sptests/sp13/sp13.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 SP13 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp13/sptest.adb b/c/src/ada-tests/sptests/sp13/sptest.adb index 1feb222aef..d06d8cef18 100644 --- a/c/src/ada-tests/sptests/sp13/sptest.adb +++ b/c/src/ada-tests/sptests/sp13/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 @@ -22,6 +22,7 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.MESSAGE_QUEUE; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; @@ -32,13 +33,12 @@ package body SPTEST is type BIG_BUFFER_TYPE is array (1 .. 2048) of RTEMS.UNSIGNED8; ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -51,7 +51,7 @@ package body SPTEST is SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 4, 2048, @@ -62,7 +62,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 4, 2048, @@ -73,7 +73,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 4, 2048, @@ -84,7 +84,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -92,7 +92,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_2'ACCESS, 0, @@ -100,7 +100,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_3'ACCESS, 0, @@ -112,7 +112,7 @@ package body SPTEST is SPTEST.QUEUE_NAME( 2 ) := RTEMS.BUILD_NAME( 'Q', '2', ' ', ' ' ); SPTEST.QUEUE_NAME( 3 ) := RTEMS.BUILD_NAME( 'Q', '3', ' ', ' ' ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 100, 16, @@ -122,7 +122,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "QUEUE_CREATE OF Q1" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 2 ), 10, 16, @@ -132,7 +132,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "QUEUE_CREATE OF Q2" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 3 ), 100, 16, @@ -142,12 +142,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "QUEUE_CREATE OF Q3" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- FILL_BUFFER -- @@ -192,7 +191,6 @@ package body SPTEST is end FILL_BUFFER; ---PAGE -- -- PUT_BUFFER -- @@ -213,13 +211,12 @@ package body SPTEST is end PUT_BUFFER; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); QID : RTEMS.ID; @@ -230,14 +227,14 @@ package body SPTEST is BIG_RECEIVE_BUFFER_POINTER : constant RTEMS.ADDRESS := BIG_RECEIVE_BUFFER'ADDRESS; BUFFER : SPTEST.BUFFER; - BUFFER_POINTER : RTEMS.ADDRESS := BUFFER'ADDRESS; + BUFFER_POINTER : constant RTEMS.ADDRESS := BUFFER'ADDRESS; COUNT : RTEMS.UNSIGNED32; MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; STATUS : RTEMS.STATUS_CODES; - SIZE : RTEMS.UNSIGNED32; + SIZE : RTEMS.UNSIGNED32 := 0; begin - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( SPTEST.QUEUE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, QID, @@ -250,7 +247,7 @@ package body SPTEST is SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 1 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 1" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -260,7 +257,7 @@ package body SPTEST is SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 1 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 2 TO Q 1" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -269,12 +266,12 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 1 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 3 TO Q 1" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -283,14 +280,14 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 2 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 2" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 2 ), BUFFER_POINTER, 16, @@ -302,7 +299,7 @@ TEST_SUPPORT.PAUSE; "TA1 - message_queue_receive - receive from queue 1 - " ); TEXT_IO.PUT_LINE( "10 second timeout" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -316,12 +313,12 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA2" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -330,14 +327,14 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" ); - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 2 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -347,7 +344,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 3 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -357,7 +354,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 4 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 4 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -367,7 +364,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 5 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_urgent - BUFFER 5 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -381,7 +378,7 @@ TEST_SUPPORT.PAUSE; "TA1 - message_queue_receive - receive from queue 3 - " ); TEXT_IO.PUT_LINE( "WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -397,7 +394,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 2 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_urgent - BUFFER 3 TO Q 2" ); - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( SPTEST.QUEUE_ID( 2 ), BUFFER_POINTER, 16, @@ -409,7 +406,7 @@ TEST_SUPPORT.PAUSE; "TA1 - message_queue_receive - receive from queue 2 - " ); TEXT_IO.PUT_LINE( "WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 2 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -425,12 +422,12 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - message_queue_delete - delete queue 1" ); - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" ); SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 2 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_urgent - BUFFER 3 TO Q 2" ); - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( SPTEST.QUEUE_ID( 2 ), BUFFER_POINTER, 16, @@ -439,11 +436,11 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" ); TEXT_IO.PUT_LINE( "TA1 - message_queue_delete - delete queue 2" ); - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 2 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" ); TEXT_IO.PUT_LINE( "TA1 - message_queue_get_number_pending - check Q 3" ); - RTEMS.MESSAGE_QUEUE_GET_NUMBER_PENDING( + RTEMS.MESSAGE_QUEUE.GET_NUMBER_PENDING( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( @@ -454,7 +451,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( " messages are pending on Q 3" ); TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - empty Q 3" ); - RTEMS.MESSAGE_QUEUE_FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); + RTEMS.MESSAGE_QUEUE.FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" ); TEXT_IO.PUT( "TA1 - " ); UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 ); @@ -462,7 +459,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -472,7 +469,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 2 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -483,7 +480,7 @@ TEST_SUPPORT.PAUSE; -- this broadcast should have no effect on the queue SPTEST.FIlL_BUFFER( "NO BUFFER TO Q1 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_broadcast - NO BUFFER TO Q1" ); - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -495,7 +492,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - message_queue_get_number_pending - check Q 3" ); - RTEMS.MESSAGE_QUEUE_GET_NUMBER_PENDING( + RTEMS.MESSAGE_QUEUE.GET_NUMBER_PENDING( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( @@ -507,7 +504,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 3 ", BUFFER ); TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 3 TO Q 3" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -516,7 +513,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - Q 3" ); - RTEMS.MESSAGE_QUEUE_FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); + RTEMS.MESSAGE_QUEUE.FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" ); TEXT_IO.PUT( "TA1 - " ); UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 ); @@ -527,7 +524,7 @@ TEST_SUPPORT.PAUSE; ); loop - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, 16, @@ -545,7 +542,7 @@ TEST_SUPPORT.PAUSE; ); TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - Q 3" ); - RTEMS.MESSAGE_QUEUE_FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); + RTEMS.MESSAGE_QUEUE.FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" ); TEXT_IO.PUT( "TA1 - " ); UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 ); @@ -554,7 +551,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - create message queue of 20 bytes on queue 1" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 100, 20, @@ -565,7 +562,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE of Q1; 20 bytes each" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BIG_SEND_BUFFER_POINTER, 40, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( @@ -573,14 +570,14 @@ TEST_SUPPORT.PAUSE; ); TEXT_IO.PUT_LINE( "TA1 - message_queue_delete - delete queue 1" ); - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" ); TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - message_queue_create - variable sizes " ); for QUEUE_SIZE in 1 .. 1029 loop - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 2, -- just 2 msgs each RTEMS.UNSIGNED32( QUEUE_SIZE ), @@ -599,7 +596,7 @@ TEST_SUPPORT.PAUSE; ); end if; - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "message_queue_delete" ); end loop; @@ -608,7 +605,7 @@ TEST_SUPPORT.PAUSE; ); for QUEUE_SIZE in 1 .. 1029 loop - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 2, -- just 2 msgs each RTEMS.UNSIGNED32( QUEUE_SIZE ), @@ -622,7 +619,7 @@ TEST_SUPPORT.PAUSE; BIG_RECEIVE_BUFFER := (others => CHARACTER'POS( 'Z' )); -- send a msg too big - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BIG_SEND_BUFFER_POINTER, RTEMS.UNSIGNED32( QUEUE_SIZE + 1 ), @@ -633,7 +630,7 @@ TEST_SUPPORT.PAUSE; ); -- send a msg that is just right - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BIG_SEND_BUFFER_POINTER, RTEMS.UNSIGNED32( QUEUE_SIZE ), @@ -644,7 +641,8 @@ TEST_SUPPORT.PAUSE; ); -- now read and verify the message just sent - RTEMS.MESSAGE_QUEUE_RECEIVE( + SIZE := INTERFACES.UNSIGNED_32(QUEUE_SIZE); + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BIG_RECEIVE_BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -678,7 +676,7 @@ TEST_SUPPORT.PAUSE; end loop; -- all done with this one; delete it - RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); + RTEMS.MESSAGE_QUEUE.DELETE( SPTEST.QUEUE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "message_queue_delete" ); end loop; @@ -687,18 +685,17 @@ TEST_SUPPORT.PAUSE; end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : SPTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; STATUS : RTEMS.STATUS_CODES; begin @@ -708,7 +705,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - message_queue_receive - receive from queue 1 - NO_WAIT" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.NO_WAIT, @@ -724,7 +721,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -740,7 +737,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -756,7 +753,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - task_set_priority - make self highest priority task" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 3, PREVIOUS_PRIORITY, @@ -767,7 +764,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - message_queue_receive - receive from queue 2 - WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 2 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -782,7 +779,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 2 ", BUFFER ); TEXT_IO.PUT_LINE( "TA2 - message_queue_send - BUFFER 2 TO Q 2" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 2 ), BUFFER_POINTER, 16, @@ -793,7 +790,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - message_queue_receive - receive from queue 1 - 10 second timeout" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -809,7 +806,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - message_queue_receive - receive from queue 3 - WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -824,13 +821,12 @@ TEST_SUPPORT.PAUSE; end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : SPTEST.BUFFER; @@ -845,7 +841,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA3 - message_queue_receive - receive from queue 2 - WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 2 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -860,7 +856,7 @@ TEST_SUPPORT.PAUSE; SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 1 ", BUFFER ); TEXT_IO.PUT_LINE( "TA3 - message_queue_broadcast - BUFFER 3 TO Q 1" ); - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( SPTEST.QUEUE_ID( 1 ), BUFFER_POINTER, 16, @@ -875,7 +871,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA3 - message_queue_receive - receive from queue 3 - WAIT FOREVER" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 3 ), BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -889,7 +885,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA3 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end TASK_3; diff --git a/c/src/ada-tests/sptests/sp13/sptest.ads b/c/src/ada-tests/sptests/sp13/sptest.ads index 4eb9588422..98f557e535 100644 --- a/c/src/ada-tests/sptests/sp13/sptest.ads +++ b/c/src/ada-tests/sptests/sp13/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -62,7 +63,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -102,7 +103,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -115,7 +116,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -128,7 +129,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); diff --git a/c/src/ada-tests/sptests/sp14/sp14.adb b/c/src/ada-tests/sptests/sp14/sp14.adb index b5a24033d7..ea97b092bc 100644 --- a/c/src/ada-tests/sptests/sp14/sp14.adb +++ b/c/src/ada-tests/sptests/sp14/sp14.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 SP14 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp14/sptest.adb b/c/src/ada-tests/sptests/sp14/sptest.adb index 12f25e4df5..4c31a6096f 100644 --- a/c/src/ada-tests/sptests/sp14/sptest.adb +++ b/c/src/ada-tests/sptests/sp14/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 @@ -25,16 +25,17 @@ with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; with INTERFACES; use INTERFACES; +with RTEMS.TIMER; +with RTEMS.SIGNAL; 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; @@ -46,7 +47,7 @@ package body SPTEST is SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, RTEMS.MINIMUM_STACK_SIZE * 2, @@ -57,7 +58,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, RTEMS.MINIMUM_STACK_SIZE * 2, @@ -68,7 +69,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -76,7 +77,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_2'ACCESS, 0, @@ -86,19 +87,18 @@ package body SPTEST is SPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 1 ), SPTEST.TIMER_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- SIGNAL_3_TO_TASK_1 -- @@ -110,7 +110,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SIGNAL_SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_3, STATUS ); + RTEMS.SIGNAL.SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_3, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND of 3" ); SPTEST.TIMER_GOT_THIS_ID := ID; @@ -120,13 +120,12 @@ package body SPTEST is end SIGNAL_3_TO_TASK_1; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); PREVIOUS_MODE : RTEMS.MODE; @@ -134,7 +133,7 @@ package body SPTEST is begin TEXT_IO.PUT_LINE( "TA1 - signal_catch - INTERRUPT_LEVEL( 3 )" ); - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( SPTEST.PROCESS_ASR'ACCESS, RTEMS.INTERRUPT_LEVEL( 3 ), STATUS @@ -142,34 +141,34 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH INTERRUPT(3)" ); TEXT_IO.PUT_LINE( "TA1 - signal_send - SIGNAL_16 to self" ); - RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_16, STATUS ); + RTEMS.SIGNAL.SEND( RTEMS.SELF, RTEMS.SIGNAL_16, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND - SIGNAL_16 to SELF" ); TEXT_IO.PUT_LINE( "TA1 - signal_send - SIGNAL_0 to self" ); - RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_0, STATUS ); + RTEMS.SIGNAL.SEND( RTEMS.SELF, RTEMS.SIGNAL_0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND - SIGNAL_0 to SELF" ); TEXT_IO.PUT_LINE( "TA1 - signal_catch - NO_ASR" ); - RTEMS.SIGNAL_CATCH(SPTEST.PROCESS_ASR'ACCESS, RTEMS.NO_ASR, STATUS); + RTEMS.SIGNAL.CATCH(SPTEST.PROCESS_ASR'ACCESS, RTEMS.NO_ASR, STATUS); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH - NO_ASR" ); TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - signal_send - SIGNAL_1 to self" ); - RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + RTEMS.SIGNAL.SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND - SIGNAL_1 to SELF" ); TEXT_IO.PUT_LINE( "TA1 - task_mode - disable ASRs" ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_ASR, RTEMS.ASR_MASK, PREVIOUS_MODE, @@ -181,7 +180,7 @@ package body SPTEST is SPTEST.TIMER_GOT_THIS_POINTER := RTEMS.NULL_ADDRESS; TEXT_IO.PUT_LINE( "TA1 - sending signal to SELF from timer" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( 1 ), TEST_SUPPORT.TICKS_PER_SECOND / 2, SPTEST.SIGNAL_3_TO_TASK_1'ACCESS, @@ -220,7 +219,7 @@ package body SPTEST is end if; TEXT_IO.PUT_LINE( "TA1 - task_mode - enable ASRs" ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.ASR, RTEMS.ASR_MASK, PREVIOUS_MODE, @@ -229,45 +228,44 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); TEXT_IO.PUT_LINE( "TA1 - signal_catch - ASR ADDRESS of NULL" ); - RTEMS.SIGNAL_CATCH( NULL, RTEMS.DEFAULT_MODES, STATUS ); + RTEMS.SIGNAL.CATCH( NULL, RTEMS.DEFAULT_MODES, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH - NULL ADDRESS" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA2 - signal_send - SIGNAL_17 to TA1" ); - RTEMS.SIGNAL_SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_17, STATUS ); + RTEMS.SIGNAL.SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_17, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND - SIGNAL_17 to TA1" ); TEXT_IO.PUT_LINE( "TA2 - task_wake_after - yield processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" ); TEXT_IO.PUT_LINE( "TA2 - signal_send - SIGNAL_18 and SIGNAL_19 to TA1" ); - RTEMS.SIGNAL_SEND( + RTEMS.SIGNAL.SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_18 + RTEMS.SIGNAL_19, STATUS @@ -278,7 +276,7 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA2 - task_wake_after - yield processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" ); TEXT_IO.PUT_LINE( "*** END OF TEST 14 ***" ); @@ -286,7 +284,6 @@ package body SPTEST is end TASK_2; ---PAGE -- -- PROCESS_ASR -- @@ -309,7 +306,7 @@ package body SPTEST is elsif THE_SIGNAL_SET = RTEMS.SIGNAL_0 or else THE_SIGNAL_SET = RTEMS.SIGNAL_1 then TEXT_IO.PUT_LINE( "ASR - task_wake_after - yield processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" diff --git a/c/src/ada-tests/sptests/sp14/sptest.ads b/c/src/ada-tests/sptests/sp14/sptest.ads index 6a484f3737..26eb32505c 100644 --- a/c/src/ada-tests/sptests/sp14/sptest.ads +++ b/c/src/ada-tests/sptests/sp14/sptest.ads @@ -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 @@ -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); @@ -115,7 +116,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -128,7 +129,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); diff --git a/c/src/ada-tests/sptests/sp15/sp15.adb b/c/src/ada-tests/sptests/sp15/sp15.adb index a8a769e91e..6d3cb52502 100644 --- a/c/src/ada-tests/sptests/sp15/sp15.adb +++ b/c/src/ada-tests/sptests/sp15/sp15.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 SP15 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp15/sptest.adb b/c/src/ada-tests/sptests/sp15/sptest.adb index 32e148f626..cea32693f0 100644 --- a/c/src/ada-tests/sptests/sp15/sptest.adb +++ b/c/src/ada-tests/sptests/sp15/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 @@ -23,16 +23,16 @@ with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.PARTITION; 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; @@ -46,7 +46,7 @@ package body SPTEST is SPTEST.PARTITION_NAME( 1 ) := RTEMS.BUILD_NAME( 'P', 'T', '1', ' ' ); SPTEST.PARTITION_NAME( 2 ) := RTEMS.BUILD_NAME( 'P', 'T', '2', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 4, 2048, @@ -57,7 +57,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -66,7 +66,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); TEXT_IO.PUT_LINE( "INIT - partition_create - partition 1" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 1 ), AREA_1'ADDRESS, 4096, @@ -78,7 +78,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE OF PT1" ); TEXT_IO.PUT_LINE( "INIT - partition_create - partition 2" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( SPTEST.PARTITION_NAME( 2 ), AREA_2'ADDRESS, 274, @@ -89,12 +89,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE OF PT2" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PUT_ADDRESS_FROM_AREA_1 -- @@ -113,7 +112,6 @@ package body SPTEST is end PUT_ADDRESS_FROM_AREA_1; ---PAGE -- -- PUT_ADDRESS_FROM_AREA_2 -- @@ -131,13 +129,12 @@ package body SPTEST is end PUT_ADDRESS_FROM_AREA_2; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); PTID_1 : RTEMS.ID; @@ -150,7 +147,7 @@ package body SPTEST is begin TEXT_IO.PUT( "TA1 - partition_ident - partition 1 id = " ); - RTEMS.PARTITION_IDENT( + RTEMS.PARTITION.IDENT( SPTEST.PARTITION_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, PTID_1, @@ -161,7 +158,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT( "TA1 - partition_ident - partition 2 id = " ); - RTEMS.PARTITION_IDENT( + RTEMS.PARTITION.IDENT( SPTEST.PARTITION_NAME( 2 ), RTEMS.SEARCH_ALL_NODES, PTID_2, @@ -174,7 +171,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - partition_get_buffer - get buffer 1 from partition 1 - " ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( SPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS_1, STATUS @@ -186,7 +183,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - partition_get_buffer - get buffer 2 from partition 1 - " ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( SPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS_2, STATUS @@ -198,7 +195,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - partition_get_buffer - get buffer 1 from partition 2 - " ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( SPTEST.PARTITION_ID( 2 ), BUFFER_ADDRESS_3, STATUS @@ -210,7 +207,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - partition_get_buffer - get buffer 2 from partition 2 - " ); - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( SPTEST.PARTITION_ID( 2 ), BUFFER_ADDRESS_4, STATUS @@ -224,7 +221,7 @@ package body SPTEST is ); SPTEST.PUT_ADDRESS_FROM_AREA_1( BUFFER_ADDRESS_1 ); TEXT_IO.NEW_LINE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( SPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS_1, STATUS @@ -236,7 +233,7 @@ package body SPTEST is ); SPTEST.PUT_ADDRESS_FROM_AREA_1( BUFFER_ADDRESS_2 ); TEXT_IO.NEW_LINE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( SPTEST.PARTITION_ID( 1 ), BUFFER_ADDRESS_2, STATUS @@ -248,7 +245,7 @@ package body SPTEST is ); SPTEST.PUT_ADDRESS_FROM_AREA_2( BUFFER_ADDRESS_3 ); TEXT_IO.NEW_LINE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( SPTEST.PARTITION_ID( 2 ), BUFFER_ADDRESS_3, STATUS @@ -260,7 +257,7 @@ package body SPTEST is ); SPTEST.PUT_ADDRESS_FROM_AREA_2( BUFFER_ADDRESS_4 ); TEXT_IO.NEW_LINE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( SPTEST.PARTITION_ID( 2 ), BUFFER_ADDRESS_4, STATUS @@ -268,11 +265,11 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" ); TEXT_IO.PUT_LINE( "TA1 - partition_delete - delete partition 1" ); - RTEMS.PARTITION_DELETE( SPTEST.PARTITION_ID( 1 ), STATUS ); + RTEMS.PARTITION.DELETE( SPTEST.PARTITION_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE OF SELF" ); TEXT_IO.PUT_LINE( "TA1 - partition_delete - delete partition 2" ); - RTEMS.PARTITION_DELETE( SPTEST.PARTITION_ID( 2 ), STATUS ); + RTEMS.PARTITION.DELETE( SPTEST.PARTITION_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE OF SELF" ); TEXT_IO.PUT_LINE( "*** END OF TEST 15 ***" ); diff --git a/c/src/ada-tests/sptests/sp15/sptest.ads b/c/src/ada-tests/sptests/sp15/sptest.ads index ec03089985..0774a548d0 100644 --- a/c/src/ada-tests/sptests/sp15/sptest.ads +++ b/c/src/ada-tests/sptests/sp15/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -61,7 +62,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -112,7 +113,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/sptests/sp16/sp16.adb b/c/src/ada-tests/sptests/sp16/sp16.adb index 3d719d2c94..5c56982564 100644 --- a/c/src/ada-tests/sptests/sp16/sp16.adb +++ b/c/src/ada-tests/sptests/sp16/sp16.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 SP16 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp16/sptest.adb b/c/src/ada-tests/sptests/sp16/sptest.adb index 822bc611cf..9788b17c18 100644 --- a/c/src/ada-tests/sptests/sp16/sptest.adb +++ b/c/src/ada-tests/sptests/sp16/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,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.REGION; 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; @@ -48,7 +48,7 @@ package body SPTEST is SPTEST.TASK_NAME( 4 ) := RTEMS.BUILD_NAME( 'T', 'A', '4', ' ' ); SPTEST.TASK_NAME( 5 ) := RTEMS.BUILD_NAME( 'T', 'A', '5', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), SPTEST.BASE_PRIORITY, 2048, @@ -59,7 +59,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), SPTEST.BASE_PRIORITY, 2048, @@ -70,7 +70,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), SPTEST.BASE_PRIORITY, 2048, @@ -81,7 +81,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -89,7 +89,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_2'ACCESS, 0, @@ -97,7 +97,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_3'ACCESS, 0, @@ -110,7 +110,7 @@ package body SPTEST is SPTEST.REGION_NAME( 3 ) := RTEMS.BUILD_NAME( 'R', 'N', '3', ' ' ); SPTEST.REGION_NAME( 4 ) := RTEMS.BUILD_NAME( 'R', 'N', '4', ' ' ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 1 ), SPTEST.AREA_1'ADDRESS, 4096, @@ -121,7 +121,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN1" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 2 ), SPTEST.AREA_2'ADDRESS, 4096, @@ -132,7 +132,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN2" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 3 ), SPTEST.AREA_3'ADDRESS, 4096, @@ -143,7 +143,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN3" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 4 ), SPTEST.AREA_4'ADDRESS, 4096, @@ -154,12 +154,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN4" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PUT_ADDRESS_FROM_AREA_1 -- @@ -178,7 +177,6 @@ package body SPTEST is end PUT_ADDRESS_FROM_AREA_1; ---PAGE -- -- PUT_ADDRESS_FROM_AREA_2 -- @@ -196,7 +194,6 @@ package body SPTEST is end PUT_ADDRESS_FROM_AREA_2; ---PAGE -- -- PUT_ADDRESS_FROM_AREA_3 -- @@ -214,7 +211,6 @@ package body SPTEST is end PUT_ADDRESS_FROM_AREA_3; ---PAGE -- -- PUT_ADDRESS_FROM_AREA_4 -- @@ -232,13 +228,12 @@ package body SPTEST is end PUT_ADDRESS_FROM_AREA_4; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); RNID : RTEMS.ID; @@ -249,7 +244,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.REGION_IDENT( SPTEST.REGION_NAME( 1 ), RNID, STATUS ); + RTEMS.REGION.IDENT( SPTEST.REGION_NAME( 1 ), RNID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_IDENT OF RN1" ); TEXT_IO.PUT( "TA1 - region_ident - rnid => " ); UNSIGNED32_IO.PUT( RNID, WIDTH => 8, BASE => 16 ); @@ -257,7 +252,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "100 byte segment from region 2" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 2 ), 100, RTEMS.DEFAULT_OPTIONS, @@ -272,7 +267,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "3K segment from region 3" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 3 ), 3072, RTEMS.DEFAULT_OPTIONS, @@ -287,7 +282,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - get 3080 byte segment " ); TEXT_IO.PUT_LINE( "from region 1 - NO_WAIT" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 3080, RTEMS.NO_WAIT, @@ -301,7 +296,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEST_SUPPORT.PAUSE; @@ -310,7 +305,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_3 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_3, STATUS @@ -320,7 +315,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT( "TA1 - region_get_segment - wait 10 seconds for 3K " ); TEXT_IO.PUT_LINE( "segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 3072, RTEMS.DEFAULT_OPTIONS, @@ -338,7 +333,7 @@ TEST_SUPPORT.PAUSE; ); SPTEST.PUT_ADDRESS_FROM_AREA_2( SEGMENT_ADDRESS_1 ); TEXT_IO.NEW_LINE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 2 ), SEGMENT_ADDRESS_1, STATUS @@ -346,16 +341,16 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - 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" ); TEST_SUPPORT.PAUSE; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 4 ), SPTEST.BASE_PRIORITY, 2048, @@ -366,7 +361,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 5 ), SPTEST.BASE_PRIORITY, 2048, @@ -377,7 +372,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 4 ), SPTEST.TASK_4'ACCESS, 0, @@ -385,7 +380,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 5 ), SPTEST.TASK_5'ACCESS, 0, @@ -394,14 +389,14 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA5" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" ); - 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" ); TEXT_IO.PUT( "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_4, STATUS @@ -410,12 +405,12 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" ); - 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" ); TEXT_IO.PUT( "TA1 - region_get_segment - wait 10 seconds for 3K " ); TEXT_IO.PUT_LINE( "segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 3072, RTEMS.DEFAULT_OPTIONS, @@ -429,18 +424,18 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" ); - 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" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA4" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 4 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 4 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" ); TEXT_IO.PUT( "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_4, STATUS @@ -449,17 +444,17 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - region_delete - delete region 1" ); - RTEMS.REGION_DELETE( SPTEST.REGION_ID( 1 ), STATUS ); + RTEMS.REGION.DELETE( SPTEST.REGION_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE OF RN1" ); --XXX TEXT_IO.PUT_LINE( "TA1 - region_get_segment - get 3K segment from region 4" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 4 ), 3072, RTEMS.DEFAULT_OPTIONS, @@ -475,7 +470,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - region_get_segment - attempt to get 3K segment from region 4" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 4 ), 3072, RTEMS.NO_WAIT, @@ -491,7 +486,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - task_get_note - UNSATISFIED" ); TEXT_IO.PUT_LINE( "TA1 - region_extend - extend region 4 by 4K" ); - RTEMS.REGION_EXTEND( + RTEMS.REGION.EXTEND( SPTEST.REGION_ID( 4 ), SPTEST.AREA_4( 4096 )'ADDRESS, 4096, @@ -502,7 +497,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - region_get_segment - attempt to get 3K segment from region 4" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 4 ), 3072, RTEMS.NO_WAIT, @@ -519,7 +514,7 @@ TEST_SUPPORT.PAUSE; "TA1 - return_segment - return segment to region 4 - " ); PUT_ADDRESS_FROM_AREA_4( segment_address_1 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 4 ), segment_address_1, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_return_segment" ); TEXT_IO.NEW_LINE; @@ -528,13 +523,13 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 4 - " ); PUT_ADDRESS_FROM_AREA_4( segment_address_3 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 4 ), segment_address_3, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_return_segment" ); TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - region_delete - delete region 4" ); - RTEMS.REGION_DELETE( SPTEST.REGION_ID( 4 ), STATUS ); + RTEMS.REGION.DELETE( SPTEST.REGION_ID( 4 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_delete" ); TEXT_IO.PUT_LINE( "*** END OF TEST 16 ***" ); @@ -542,16 +537,15 @@ TEST_SUPPORT.PAUSE; end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; SEGMENT_ADDRESS_1 : RTEMS.ADDRESS; SEGMENT_ADDRESS_2 : RTEMS.ADDRESS; STATUS : RTEMS.STATUS_CODES; @@ -559,7 +553,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT( "TA2 - region_get_segment - wait on 2K segment " ); TEXT_IO.PUT_LINE( "from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 2048, RTEMS.DEFAULT_OPTIONS, @@ -576,7 +570,7 @@ TEST_SUPPORT.PAUSE; "TA2 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_1, STATUS @@ -586,7 +580,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT( "TA2 - task_set_priority - make self " ); TEXT_IO.PUT_LINE( "highest priority task" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, SPTEST.BASE_PRIORITY - 1, PREVIOUS_PRIORITY, @@ -598,7 +592,7 @@ TEST_SUPPORT.PAUSE; "TA2 - region_get_segment - wait on 3950 byte segment " ); TEXT_IO.PUT_LINE( "from region 2" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 2 ), 3950, RTEMS.DEFAULT_OPTIONS, @@ -615,7 +609,7 @@ TEST_SUPPORT.PAUSE; "TA2 - region_return_segment - return segment to region 2 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_2( SEGMENT_ADDRESS_2 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 2 ), SEGMENT_ADDRESS_2, STATUS @@ -624,18 +618,17 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA2 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SEGMENT_ADDRESS_1 : RTEMS.ADDRESS; @@ -645,7 +638,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT( "TA3 - region_get_segment - wait on 3950 byte segment " ); TEXT_IO.PUT_LINE( "from region 2" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 2 ), 3950, RTEMS.DEFAULT_OPTIONS, @@ -660,7 +653,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT( "TA3 - region_get_segment - wait on 2K segment " ); TEXT_IO.PUT_LINE( "from region 3" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 3 ), 2048, RTEMS.DEFAULT_OPTIONS, @@ -672,13 +665,12 @@ TEST_SUPPORT.PAUSE; end TASK_3; ---PAGE -- -- TASK_4 -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SEGMENT_ADDRESS_1 : RTEMS.ADDRESS; @@ -688,7 +680,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT( "TA4 - region_get_segment - wait on 1.5K segment " ); TEXT_IO.PUT_LINE( "from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 1536, RTEMS.DEFAULT_OPTIONS, @@ -698,7 +690,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_1, STATUS @@ -708,12 +700,12 @@ TEST_SUPPORT.PAUSE; SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 ); TEXT_IO.NEW_LINE; - 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" ); TEXT_IO.PUT( "TA4 - region_get_segment - wait on 3K segment " ); TEXT_IO.PUT_LINE( "from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 3072, RTEMS.DEFAULT_OPTIONS, @@ -725,13 +717,12 @@ TEST_SUPPORT.PAUSE; end TASK_4; ---PAGE -- -- TASK_5 -- procedure TASK_5 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SEGMENT_ADDRESS_1 : RTEMS.ADDRESS; @@ -741,7 +732,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT( "TA5 - region_get_segment - wait on 1.5K segment " ); TEXT_IO.PUT_LINE( "from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 1536, RTEMS.DEFAULT_OPTIONS, @@ -751,7 +742,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_1, STATUS @@ -761,12 +752,12 @@ TEST_SUPPORT.PAUSE; SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 ); TEXT_IO.NEW_LINE; - 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" ); TEXT_IO.PUT( "TA5 - region_get_segment - wait on 3K segment " ); TEXT_IO.PUT_LINE( "from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 3072, RTEMS.DEFAULT_OPTIONS, @@ -779,7 +770,7 @@ TEST_SUPPORT.PAUSE; SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_2 ); TEXT_IO.NEW_LINE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_2, STATUS @@ -792,7 +783,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA5 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA5" ); end TASK_5; diff --git a/c/src/ada-tests/sptests/sp16/sptest.ads b/c/src/ada-tests/sptests/sp16/sptest.ads index 783cf0a210..f687c421b5 100644 --- a/c/src/ada-tests/sptests/sp16/sptest.ads +++ b/c/src/ada-tests/sptests/sp16/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 @@ -46,7 +47,7 @@ package SPTEST is -- easily set itself to a higher priority than the rest. -- - BASE_PRIORITY : constant RTEMS.TASK_PRIORITY := 140; + BASE_PRIORITY : constant RTEMS.TASKS.PRIORITY := 140; -- -- These arrays define the memory areas used for the regions in @@ -74,7 +75,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -144,7 +145,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -157,7 +158,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -170,7 +171,7 @@ package SPTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); @@ -183,7 +184,7 @@ package SPTEST is -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_4); @@ -196,7 +197,7 @@ package SPTEST is -- procedure TASK_5 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_5); diff --git a/c/src/ada-tests/sptests/sp17/sp17.adb b/c/src/ada-tests/sptests/sp17/sp17.adb index 2777e2f8e6..9370c3c2b8 100644 --- a/c/src/ada-tests/sptests/sp17/sp17.adb +++ b/c/src/ada-tests/sptests/sp17/sp17.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 SP17 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp17/sptest.adb b/c/src/ada-tests/sptests/sp17/sptest.adb index bd26c66422..5d5bbbf695 100644 --- a/c/src/ada-tests/sptests/sp17/sptest.adb +++ b/c/src/ada-tests/sptests/sp17/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 @@ -23,16 +23,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.SIGNAL; 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; @@ -46,7 +46,7 @@ package body SPTEST is SPTEST.TASK_2_PREEMPTED := FALSE; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 2, 2048, @@ -57,7 +57,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, 2048, @@ -68,7 +68,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -76,7 +76,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_2'ACCESS, 0, @@ -84,12 +84,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PROCESS_ASR -- @@ -101,25 +100,24 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_RESUME( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.RESUME( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "ASR - TASK_RESUME OF TA2" ); end PROCESS_ASR; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA1 - signal_catch: initializing signal catcher" ); - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( SPTEST.PROCESS_ASR'ACCESS, RTEMS.NO_ASR + RTEMS.NO_PREEMPT, STATUS @@ -127,7 +125,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); TEXT_IO.PUT_LINE( "TA1 - Sending signal to self" ); - RTEMS.SIGNAL_SEND( + RTEMS.SIGNAL.SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_16, STATUS @@ -145,13 +143,12 @@ package body SPTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -160,14 +157,14 @@ package body SPTEST is SPTEST.TASK_2_PREEMPTED := FALSE; TEXT_IO.PUT_LINE( "TA2 - Suspending self" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); TEXT_IO.PUT_LINE( "TA2 - signal_return preempted correctly" ); SPTEST.TASK_2_PREEMPTED := TRUE; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); end TASK_2; diff --git a/c/src/ada-tests/sptests/sp17/sptest.ads b/c/src/ada-tests/sptests/sp17/sptest.ads index b3ff420993..9ffe21efec 100644 --- a/c/src/ada-tests/sptests/sp17/sptest.ads +++ b/c/src/ada-tests/sptests/sp17/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -47,7 +48,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -89,7 +90,7 @@ package SPTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); diff --git a/c/src/ada-tests/sptests/sp19/sp19.adb b/c/src/ada-tests/sptests/sp19/sp19.adb index 8fffaa49ec..e032b14199 100644 --- a/c/src/ada-tests/sptests/sp19/sp19.adb +++ b/c/src/ada-tests/sptests/sp19/sp19.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 SP19 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/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 diff --git a/c/src/ada-tests/sptests/sp19/sptest.ads b/c/src/ada-tests/sptests/sp19/sptest.ads index ab663850c5..7da38c7e1f 100644 --- a/c/src/ada-tests/sptests/sp19/sptest.ads +++ b/c/src/ada-tests/sptests/sp19/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -56,7 +57,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -69,7 +70,7 @@ package SPTEST is -- procedure FIRST_FP_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, FIRST_FP_TASK); @@ -83,7 +84,7 @@ package SPTEST is -- procedure FP_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, FP_TASK); @@ -98,8 +99,23 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); +-- +-- Add_Float +-- +-- DESCRIPTION: +-- +-- This method ensures the compilers thinks we are using the variables. +-- + + function Add_Float( + n : in Float; + factor : in Float + ) return Float; + pragma Interface (C, Add_Float); + pragma Interface_Name (Add_Float, "add_float"); + end SPTEST; 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); diff --git a/c/src/ada-tests/sptests/sp22/sp22.adb b/c/src/ada-tests/sptests/sp22/sp22.adb index 97b62ce82b..3a9fc86171 100644 --- a/c/src/ada-tests/sptests/sp22/sp22.adb +++ b/c/src/ada-tests/sptests/sp22/sp22.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 SP22 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp22/sptest.adb b/c/src/ada-tests/sptests/sp22/sptest.adb index 95795683c2..03114d0463 100644 --- a/c/src/ada-tests/sptests/sp22/sptest.adb +++ b/c/src/ada-tests/sptests/sp22/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.TIMER; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -45,13 +46,13 @@ package body SPTEST 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" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -62,7 +63,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -71,7 +72,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); TEXT_IO.PUT_LINE( "INIT - timer_create - creating timer 1" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( 1 ), SPTEST.TIMER_ID( 1 ), STATUS @@ -81,12 +82,11 @@ package body SPTEST is UNSIGNED32_IO.PUT( SPTEST.TIMER_ID( 1 ), WIDTH => 8, BASE => 16 ); TEXT_IO.PUT_LINE( ")" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- DELAYED_RESUME -- @@ -100,12 +100,11 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_RESUME( SPTEST.TASK_ID( 1 ), STATUS ); + RTEMS.TASKS.RESUME( SPTEST.TASK_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF SELF" ); end DELAYED_RESUME; ---PAGE -- -- PRINT_TIME -- @@ -116,7 +115,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - 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( @@ -129,13 +128,12 @@ package body SPTEST is end PRINT_TIME; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TMID : RTEMS.ID; @@ -146,7 +144,7 @@ package body SPTEST is -- GET ID TEXT_IO.PUT_LINE( "TA1 - timer_ident - identing timer 1" ); - RTEMS.TIMER_IDENT( SPTEST.TIMER_NAME( 1 ), TMID, STATUS ); + RTEMS.TIMER.IDENT( SPTEST.TIMER_NAME( 1 ), TMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_IDENT OF TM1" ); TEXT_IO.PUT( "TA1 - timer 1 has id (" ); UNSIGNED32_IO.PUT( SPTEST.TIMER_ID( 1 ), WIDTH => 8, BASE => 16 ); @@ -157,7 +155,7 @@ package body SPTEST is SPTEST.PRINT_TIME; TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMID, 3 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.DELAYED_RESUME'ACCESS, @@ -167,7 +165,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); SPTEST.PRINT_TIME; @@ -175,7 +173,7 @@ package body SPTEST is -- AFTER WHICH IS RESET AND ALLOWED TO FIRE TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMID, 3 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.DELAYED_RESUME'ACCESS, @@ -185,17 +183,17 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - 1 second" ); - 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" ); SPTEST.PRINT_TIME; TEXT_IO.PUT_LINE( "TA1 - timer_reset - timer 1" ); - RTEMS.TIMER_RESET( TMID, STATUS ); + RTEMS.TIMER.RESET( TMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_RESET" ); TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); SPTEST.PRINT_TIME; @@ -210,13 +208,13 @@ TEST_SUPPORT.PAUSE; TIME := ( 1988, 12, 31, 9, 0, 7, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" ); -- after which is canceled TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMID, 3 * TEST_SUPPORT.TICKS_PER_SECOND, SPTEST.DELAYED_RESUME'ACCESS, @@ -226,20 +224,20 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); TEXT_IO.PUT_LINE( "TA1 - timer_cancel - timer 1" ); - RTEMS.TIMER_CANCEL( TMID, STATUS ); + RTEMS.TIMER.CANCEL( TMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); -- when which is allowed to fire SPTEST.PRINT_TIME; - 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" ); TIME.SECOND := TIME.SECOND + 3; TEXT_IO.PUT_LINE( "TA1 - timer_when - timer 1 in 3 seconds" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( TMID, TIME, SPTEST.DELAYED_RESUME'ACCESS, @@ -249,20 +247,20 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN" ); TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); SPTEST.PRINT_TIME; -- when which is canceled - 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" ); TIME.SECOND := TIME.SECOND + 3; TEXT_IO.PUT_LINE( "TA1 - timer_when - timer 1 in 3 seconds" ); - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( TMID, TIME, SPTEST.DELAYED_RESUME'ACCESS, @@ -272,13 +270,13 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - 1 second" ); - 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" ); SPTEST.PRINT_TIME; TEXT_IO.PUT_LINE( "TA1 - timer_cancel - timer 1" ); - RTEMS.TIMER_CANCEL( TMID, STATUS ); + RTEMS.TIMER.CANCEL( TMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); -- delete @@ -286,11 +284,11 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - task_wake_after - YIELD (only task at priority)" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" ); TEXT_IO.PUT_LINE( "TA1 - timer_delete - timer 1" ); - RTEMS.TIMER_DELETE( TMID, STATUS ); + RTEMS.TIMER.DELETE( TMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_DELETE" ); TEXT_IO.PUT_LINE( "*** END OF TEST 22 ***" ); diff --git a/c/src/ada-tests/sptests/sp22/sptest.ads b/c/src/ada-tests/sptests/sp22/sptest.ads index 054b3ab15e..5f464fb527 100644 --- a/c/src/ada-tests/sptests/sp22/sptest.ads +++ b/c/src/ada-tests/sptests/sp22/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -49,7 +50,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -87,7 +88,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/sptests/sp23/sp23.adb b/c/src/ada-tests/sptests/sp23/sp23.adb index 59dbae87e8..37ff2bf8a9 100644 --- a/c/src/ada-tests/sptests/sp23/sp23.adb +++ b/c/src/ada-tests/sptests/sp23/sp23.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 SP23 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp23/sptest.adb b/c/src/ada-tests/sptests/sp23/sptest.adb index 4eade35467..7362d34c33 100644 --- a/c/src/ada-tests/sptests/sp23/sptest.adb +++ b/c/src/ada-tests/sptests/sp23/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,16 @@ with ADDRESS_IO; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.PORT; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); INTERNAL_AREA : RTEMS.ADDRESS; @@ -46,7 +46,7 @@ package body SPTEST is SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -57,7 +57,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -69,7 +69,7 @@ package body SPTEST is INTERNAL_AREA := SPTEST.INTERNAL_PORT_AREA( 0 )'ADDRESS; EXTERNAL_AREA := SPTEST.EXTERNAL_PORT_AREA( 0 )'ADDRESS; - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( SPTEST.PORT_NAME( 1 ), INTERNAL_AREA, EXTERNAL_AREA, @@ -84,18 +84,17 @@ package body SPTEST is ADDRESS_IO.PUT( EXTERNAL_AREA, WIDTH => 8, BASE => 16 ); TEXT_IO.NEW_LINE; - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); DPID : RTEMS.ID; @@ -104,14 +103,14 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.PORT_IDENT( SPTEST.PORT_NAME( 1 ), DPID, STATUS ); + RTEMS.PORT.IDENT( SPTEST.PORT_NAME( 1 ), DPID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_IDENT" ); TEXT_IO.PUT( "TA1 - port_ident - " ); UNSIGNED32_IO.PUT( DPID, WIDTH => 8, BASE => 16 ); TEXT_IO.NEW_LINE; TO_BE_CONVERTED := SPTEST.EXTERNAL_PORT_AREA( 16#E# )'ADDRESS; - RTEMS.PORT_EXTERNAL_TO_INTERNAL( + RTEMS.PORT.EXTERNAL_TO_INTERNAL( SPTEST.PORT_ID( 1 ), TO_BE_CONVERTED, CONVERTED, @@ -125,7 +124,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TO_BE_CONVERTED := SPTEST.INTERNAL_PORT_AREA( 16#E# )'ADDRESS; - RTEMS.PORT_INTERNAL_TO_EXTERNAL( + RTEMS.PORT.INTERNAL_TO_EXTERNAL( SPTEST.PORT_ID( 1 ), TO_BE_CONVERTED, CONVERTED, @@ -139,7 +138,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TO_BE_CONVERTED := SPTEST.ABOVE_PORT_AREA( 16#E# )'ADDRESS; - RTEMS.PORT_EXTERNAL_TO_INTERNAL( + RTEMS.PORT.EXTERNAL_TO_INTERNAL( SPTEST.PORT_ID( 1 ), TO_BE_CONVERTED, CONVERTED, @@ -153,7 +152,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TO_BE_CONVERTED := SPTEST.BELOW_PORT_AREA( 16#E# )'ADDRESS; - RTEMS.PORT_INTERNAL_TO_EXTERNAL( + RTEMS.PORT.INTERNAL_TO_EXTERNAL( SPTEST.PORT_ID( 1 ), TO_BE_CONVERTED, CONVERTED, @@ -167,7 +166,7 @@ package body SPTEST is TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - port_delete - DP1" ); - RTEMS.PORT_DELETE( SPTEST.PORT_ID( 1 ), STATUS ); + RTEMS.PORT.DELETE( SPTEST.PORT_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_DELETE" ); TEXT_IO.PUT_LINE( "*** END OF TEST 23 ***" ); diff --git a/c/src/ada-tests/sptests/sp23/sptest.ads b/c/src/ada-tests/sptests/sp23/sptest.ads index 878d484f69..94941a22f0 100644 --- a/c/src/ada-tests/sptests/sp23/sptest.ads +++ b/c/src/ada-tests/sptests/sp23/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SYSTEM; with System.Storage_Elements; @@ -52,7 +53,7 @@ package SPTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -64,7 +65,7 @@ package SPTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used for @@ -76,7 +77,7 @@ package SPTEST is BELOW_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for BELOW_PORT_AREA use at BELOW_PORT_AREA_ADDRESS; + for BELOW_PORT_AREA'Address use BELOW_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used for @@ -88,7 +89,7 @@ package SPTEST is ABOVE_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for ABOVE_PORT_AREA use at ABOVE_PORT_AREA_ADDRESS; + for ABOVE_PORT_AREA'Address use ABOVE_PORT_AREA_ADDRESS; -- -- INIT @@ -99,7 +100,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -112,7 +113,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/sptests/sp24/sp24.adb b/c/src/ada-tests/sptests/sp24/sp24.adb index a18f7b3c25..33b100813c 100644 --- a/c/src/ada-tests/sptests/sp24/sp24.adb +++ b/c/src/ada-tests/sptests/sp24/sp24.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 SP24 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp24/sptest.adb b/c/src/ada-tests/sptests/sp24/sptest.adb index 97a6aed1a5..bc8c8c6a82 100644 --- a/c/src/ada-tests/sptests/sp24/sptest.adb +++ b/c/src/ada-tests/sptests/sp24/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 @@ -23,16 +23,17 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.CLOCK; +with RTEMS.TIMER; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -44,7 +45,7 @@ package body SPTEST 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" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); @@ -58,7 +59,7 @@ package body SPTEST is for INDEX in 1 .. 3 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( INDEX ), 1, 2048, @@ -69,7 +70,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( INDEX ), SPTEST.TIMER_ID( INDEX ), STATUS @@ -81,22 +82,21 @@ package body SPTEST is for INDEX in 1 .. 3 loop - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( INDEX ), SPTEST.TASK_1_THROUGH_3'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 -- -- RESUME_TASK -- @@ -111,30 +111,29 @@ package body SPTEST is begin TASK_TO_RESUME := SPTEST.TASK_ID(INTEGER( RTEMS.GET_INDEX( TIMER_ID ) )); - RTEMS.TASK_RESUME( TASK_TO_RESUME, STATUS ); + RTEMS.TASKS.RESUME( TASK_TO_RESUME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); end RESUME_TASK; ---PAGE -- -- TASK_1_THROUGH_3 -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is TID : RTEMS.ID; TIME : RTEMS.TIME_OF_DAY; 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" ); loop - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( INTEGER( ARGUMENT ) ), TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -144,7 +143,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_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" ); if TIME.SECOND >= 35 then @@ -160,7 +159,7 @@ package body SPTEST is TEST_SUPPORT.PRINT_TIME( " - clock_get - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end loop; diff --git a/c/src/ada-tests/sptests/sp24/sptest.ads b/c/src/ada-tests/sptests/sp24/sptest.ads index e0f159cc29..d8ccb0cb18 100644 --- a/c/src/ada-tests/sptests/sp24/sptest.ads +++ b/c/src/ada-tests/sptests/sp24/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -49,7 +50,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -77,7 +78,7 @@ package SPTEST is -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1_THROUGH_3); diff --git a/c/src/ada-tests/sptests/sp25/sp25.adb b/c/src/ada-tests/sptests/sp25/sp25.adb index 78a6aff231..94c7695615 100644 --- a/c/src/ada-tests/sptests/sp25/sp25.adb +++ b/c/src/ada-tests/sptests/sp25/sp25.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 SP25 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,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/sp25/sptest.adb b/c/src/ada-tests/sptests/sp25/sptest.adb index 3b0fc8319b..6924bfdcad 100644 --- a/c/src/ada-tests/sptests/sp25/sptest.adb +++ b/c/src/ada-tests/sptests/sp25/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 @@ -23,16 +23,16 @@ with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.REGION; 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; @@ -43,7 +43,7 @@ package body SPTEST is SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), SPTEST.BASE_PRIORITY, 2048, @@ -54,7 +54,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -64,7 +64,7 @@ package body SPTEST is SPTEST.REGION_NAME( 1 ) := RTEMS.BUILD_NAME( 'R', 'N', '1', ' ' ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( SPTEST.REGION_NAME( 1 ), SPTEST.AREA_1'ADDRESS, 64000, @@ -75,12 +75,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PUT_ADDRESS_FROM_AREA_1 -- @@ -99,13 +98,12 @@ package body SPTEST is end PUT_ADDRESS_FROM_AREA_1; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); RNID : RTEMS.ID; @@ -120,7 +118,7 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.REGION_IDENT( SPTEST.REGION_NAME( 1 ), RNID, STATUS ); + RTEMS.REGION.IDENT( SPTEST.REGION_NAME( 1 ), RNID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_IDENT OF RN1" ); TEXT_IO.PUT( "TA1 - region_ident - rnid => " ); UNSIGNED32_IO.PUT( RNID, WIDTH => 8, BASE => 16 ); @@ -128,7 +126,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "64 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 64, RTEMS.DEFAULT_OPTIONS, @@ -143,7 +141,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "128 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 128, RTEMS.DEFAULT_OPTIONS, @@ -158,7 +156,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "256 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 256, RTEMS.DEFAULT_OPTIONS, @@ -173,7 +171,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "512 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 512, RTEMS.DEFAULT_OPTIONS, @@ -188,7 +186,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "1024 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 1024, RTEMS.DEFAULT_OPTIONS, @@ -203,7 +201,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "2048 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 2048, RTEMS.DEFAULT_OPTIONS, @@ -218,7 +216,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "4096 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 4096, RTEMS.DEFAULT_OPTIONS, @@ -233,7 +231,7 @@ package body SPTEST is TEXT_IO.PUT( "TA1 - region_get_segment - wait on " ); TEXT_IO.PUT_LINE( "8192 byte segment from region 1" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( SPTEST.REGION_ID( 1 ), 8192, RTEMS.DEFAULT_OPTIONS, @@ -252,7 +250,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_3 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_3, STATUS @@ -265,7 +263,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_4, STATUS @@ -278,7 +276,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_1, STATUS @@ -291,7 +289,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_2 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_2, STATUS @@ -304,7 +302,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_7 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_7, STATUS @@ -317,7 +315,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_6 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_6, STATUS @@ -330,7 +328,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_8 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_8, STATUS @@ -343,7 +341,7 @@ TEST_SUPPORT.PAUSE; "TA1 - region_return_segment - return segment to region 1 - " ); SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_5 ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( SPTEST.REGION_ID( 1 ), SEGMENT_ADDRESS_5, STATUS @@ -355,7 +353,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - region_delete - walks heap if debug enabled" ); - RTEMS.REGION_DELETE( SPTEST.REGION_ID( 1 ), STATUS ); + RTEMS.REGION.DELETE( SPTEST.REGION_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE OF RN1" ); TEXT_IO.PUT_LINE( "*** END OF TEST 25 ***" ); diff --git a/c/src/ada-tests/sptests/sp25/sptest.ads b/c/src/ada-tests/sptests/sp25/sptest.ads index 7ba3969f00..e2a9974bac 100644 --- a/c/src/ada-tests/sptests/sp25/sptest.ads +++ b/c/src/ada-tests/sptests/sp25/sptest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package SPTEST is @@ -46,7 +47,7 @@ package SPTEST is -- easily set itself to a higher priority than the rest. -- - BASE_PRIORITY : constant RTEMS.TASK_PRIORITY := 140; + BASE_PRIORITY : constant RTEMS.TASKS.PRIORITY := 140; -- -- These arrays define the memory areas used for the regions in @@ -65,7 +66,7 @@ package SPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -97,7 +98,7 @@ package SPTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/support/test_support.adb b/c/src/ada-tests/support/test_support.adb index e1f17f15a8..99c6d21bed 100644 --- a/c/src/ada-tests/support/test_support.adb +++ b/c/src/ada-tests/support/test_support.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,10 +24,10 @@ with Interfaces; use Interfaces; with Unsigned32_IO; with Status_IO; with Text_IO; +with RTEMS.Fatal; package body Test_Support is ---PAGE -- -- Fatal_Directive_Status -- @@ -48,13 +48,12 @@ package body Test_Support is Status_IO.Put( Status ); Text_IO.New_Line; - RTEMS.Fatal_Error_Occurred( RTEMS.Status_Codes'Pos( Status ) ); + RTEMS.Fatal.Error_Occurred( RTEMS.Status_Codes'Pos( Status ) ); end if; end Fatal_Directive_Status; ---PAGE -- -- Directive_Failed -- @@ -73,7 +72,6 @@ package body Test_Support is end Directive_Failed; ---PAGE -- -- Print_Time -- @@ -101,7 +99,6 @@ package body Test_Support is end Print_Time; ---PAGE -- -- Put_Dot -- @@ -114,7 +111,6 @@ package body Test_Support is Text_IO.FLUSH; end Put_Dot; ---PAGE -- -- Pause -- @@ -133,7 +129,6 @@ package body Test_Support is end Pause; ---PAGE -- -- Pause_And_Screen_Number -- @@ -155,7 +150,6 @@ package body Test_Support is end Pause_And_Screen_Number; ---PAGE -- -- Put_Name -- @@ -183,7 +177,6 @@ package body Test_Support is end Put_Name; ---PAGE -- -- Task_Number -- @@ -198,7 +191,6 @@ package body Test_Support is end Task_Number; ---PAGE -- -- Do_Nothing -- @@ -209,7 +201,6 @@ package body Test_Support is end Do_Nothing; ---PAGE -- -- Milliseconds_Per_Tick -- @@ -222,7 +213,6 @@ package body Test_Support is return Milliseconds_Per_Tick_Base; end Milliseconds_Per_Tick; ---PAGE -- -- Milliseconds_Per_Tick -- diff --git a/c/src/ada-tests/tmtests/tm01/tm01.adb b/c/src/ada-tests/tmtests/tm01/tm01.adb index e4ac103797..7b56457468 100644 --- a/c/src/ada-tests/tmtests/tm01/tm01.adb +++ b/c/src/ada-tests/tmtests/tm01/tm01.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM01 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.adb b/c/src/ada-tests/tmtests/tm01/tmtest.adb index d32cd872db..6769e0ff32 100644 --- a/c/src/ada-tests/tmtests/tm01/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm01/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; @@ -48,7 +48,7 @@ package body TMTEST is TMTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); TMTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TMTEST.TASK_NAME( 1 ), 1, 2048, @@ -59,7 +59,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -67,18 +67,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SEMAPHORE_OBTAIN_TIME : RTEMS.UNSIGNED32; @@ -103,11 +102,11 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( NAME, TIME_TEST_SUPPORT.OPERATION_COUNT, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SMID, STATUS ); @@ -126,7 +125,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.SEMAPHORE_DELETE( SMID, STATUS ); + RTEMS.SEMAPHORE.DELETE( SMID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -140,11 +139,11 @@ package body TMTEST is -- Create semaphore for repeated operations. - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( NAME, TIME_TEST_SUPPORT.OPERATION_COUNT, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SMID, STATUS ); @@ -173,7 +172,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SMID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -193,7 +192,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_RELEASE( SMID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( SMID, STATUS ); end loop; @@ -209,7 +208,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SMID, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -230,7 +229,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_RELEASE( SMID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( SMID, STATUS ); end loop; diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.ads b/c/src/ada-tests/tmtests/tm01/tmtest.ads index 942cd455d9..00a8013f71 100644 --- a/c/src/ada-tests/tmtests/tm01/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm01/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -48,7 +49,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -61,7 +62,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/tmtests/tm02/tm02.adb b/c/src/ada-tests/tmtests/tm02/tm02.adb index 5aa7e405e3..5ca9b51128 100644 --- a/c/src/ada-tests/tmtests/tm02/tm02.adb +++ b/c/src/ada-tests/tmtests/tm02/tm02.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM02 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, 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 diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.ads b/c/src/ada-tests/tmtests/tm02/tmtest.ads index 014509f5b9..8b04651e5e 100644 --- a/c/src/ada-tests/tmtests/tm02/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm02/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -70,7 +71,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -84,7 +85,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -98,7 +99,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm03/tm03.adb b/c/src/ada-tests/tmtests/tm03/tm03.adb index 197587ae68..1c1bf08652 100644 --- a/c/src/ada-tests/tmtests/tm03/tm03.adb +++ b/c/src/ada-tests/tmtests/tm03/tm03.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM03 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.adb b/c/src/ada-tests/tmtests/tm03/tmtest.adb index 97821f9582..4ff2b3e682 100644 --- a/c/src/ada-tests/tmtests/tm03/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm03/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); TASK_ID : RTEMS.ID; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 3 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ), 252, 2048, @@ -56,35 +56,34 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TEST_INIT" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF 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 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PRIORITY : RTEMS.TASK_PRIORITY; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; begin PRIORITY := 250; - 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 ); @@ -93,7 +92,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, @@ -106,12 +105,12 @@ package body TMTEST is PRIORITY := PRIORITY - 1; - RTEMS.TASK_START( TASK_ID, TMTEST.MIDDLE_TASKS'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.MIDDLE_TASKS'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START MIDDLE" ); end loop; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), PRIORITY, 1024, @@ -122,50 +121,51 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF HIGH TASK" ); - RTEMS.TASK_START( TASK_ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF HIGH TASK" ); TIMER_DRIVER.INITIALIZE; - RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); end TEST_INIT; ---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" ); - RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); end MIDDLE_TASKS; ---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 - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -174,6 +174,8 @@ package body TMTEST is TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "LAST CALL DID NOT WORK" ); + TIME_TEST_SUPPORT.PUT_TIME( "SEMAPHORE_RELEASE (preemptive)", TMTEST.END_TIME, diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.ads b/c/src/ada-tests/tmtests/tm03/tmtest.ads index 244dca01e9..1c5867911f 100644 --- a/c/src/ada-tests/tmtests/tm03/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm03/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -61,7 +62,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -90,7 +91,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); diff --git a/c/src/ada-tests/tmtests/tm04/tm04.adb b/c/src/ada-tests/tmtests/tm04/tm04.adb index 651106d5ca..ba29fd6d26 100644 --- a/c/src/ada-tests/tmtests/tm04/tm04.adb +++ b/c/src/ada-tests/tmtests/tm04/tm04.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM04 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.adb b/c/src/ada-tests/tmtests/tm04/tmtest.adb index cf77ab9bd0..f7e1c52bd8 100644 --- a/c/src/ada-tests/tmtests/tm04/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm04/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,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; 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; @@ -45,12 +45,11 @@ 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 -- @@ -65,7 +64,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' ), 10, 1024, @@ -76,7 +75,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.LOW_TASKS'ACCESS, 0, @@ -86,11 +85,11 @@ package body TMTEST is end loop; - 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 ); @@ -98,15 +97,14 @@ package body TMTEST is end TEST_INIT; ---PAGE -- -- HIGHEST_TASK -- procedure HIGHEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is - OLD_PRIORITY : RTEMS.TASK_PRIORITY; + OLD_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -122,7 +120,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_RESTART ); - RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, OLD_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 254, OLD_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); elsif ARGUMENT = 2 then @@ -137,12 +135,12 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_RESTART ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); else - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -153,28 +151,29 @@ package body TMTEST is end HIGHEST_TASK; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - OLD_PRIORITY : RTEMS.TASK_PRIORITY; + OLD_PRIORITY : RTEMS.TASKS.PRIORITY; OVERHEAD : RTEMS.UNSIGNED32; NAME : RTEMS.NAME; STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESTART( TMTEST.HIGHEST_ID, 1, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.HIGHEST_ID, 1, STATUS ); -- preempted by Higher_task + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART" ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESTART( TMTEST.HIGHEST_ID, 2, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.HIGHEST_ID, 2, STATUS ); -- preempted by Higher_task + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART" ); TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT @@ -186,9 +185,10 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); TIME_TEST_SUPPORT.PUT_TIME( "SEMAPHORE_RELEASE (readying)", @@ -200,7 +200,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); end loop; @@ -209,7 +209,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( NAME, 10, 1024, @@ -232,7 +232,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.LOW_TASKS'ACCESS, 0, @@ -251,13 +251,13 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" ); end loop; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( NAME, 250, 1024, @@ -267,21 +267,21 @@ package body TMTEST is STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.RESTART_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); - RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 0, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( INDEX ), 0, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -295,14 +295,14 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -316,7 +316,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( NAME, 250, 1024, @@ -326,7 +326,7 @@ package body TMTEST is STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.RESTART_TASK'ACCESS, 0, @@ -338,7 +338,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -352,7 +352,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID( INDEX ), 5, OLD_PRIORITY, @@ -362,13 +362,13 @@ package body TMTEST is end loop; -- yield processor -- tasks block - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -381,13 +381,13 @@ package body TMTEST is ); -- yield processor -- tasks block - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -404,13 +404,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- LOW_TASKS -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -421,7 +420,7 @@ package body TMTEST is if TMTEST.TASK_COUNT = 0 then - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', ' ', ' ' ), 5, 2048, @@ -432,7 +431,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HI" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( ID, TMTEST.HIGH_TASK'ACCESS, 0, @@ -441,7 +440,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HI" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 3, 2048, @@ -452,7 +451,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.HIGHEST_ID, TMTEST.HIGHEST_TASK'ACCESS, 0, @@ -463,28 +462,28 @@ package body TMTEST is end if; - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); end LOW_TASKS; ---PAGE -- -- RESTART_TASK -- procedure RESTART_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin if ARGUMENT = 1 then - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.ads b/c/src/ada-tests/tmtests/tm04/tmtest.ads index 1627325bdf..88b18592bb 100644 --- a/c/src/ada-tests/tmtests/tm04/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm04/tmtest.ads @@ -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 @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -68,7 +69,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -99,7 +100,7 @@ package TMTEST is -- procedure HIGHEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGHEST_TASK); @@ -129,7 +130,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -144,7 +145,7 @@ package TMTEST is -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASKS); @@ -157,7 +158,7 @@ package TMTEST is -- procedure RESTART_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, RESTART_TASK); diff --git a/c/src/ada-tests/tmtests/tm05/tm05.adb b/c/src/ada-tests/tmtests/tm05/tm05.adb index 946b46f029..d9114abc6b 100644 --- a/c/src/ada-tests/tmtests/tm05/tm05.adb +++ b/c/src/ada-tests/tmtests/tm05/tm05.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM05 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.adb b/c/src/ada-tests/tmtests/tm05/tmtest.adb index 1fc20a6491..f31055f3f9 100644 --- a/c/src/ada-tests/tmtests/tm05/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm05/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 @@ -28,13 +28,12 @@ with TIMER_DRIVER; 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; @@ -45,20 +44,19 @@ 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 - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -67,7 +65,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -88,27 +86,27 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; 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.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPENT" ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -124,32 +122,32 @@ package body TMTEST is 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.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TMTEST.TASK_INDEX := TMTEST.TASK_INDEX + 1; - RTEMS.TASK_RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); end MIDDLE_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; @@ -166,7 +164,8 @@ package body TMTEST is TMTEST.TASK_INDEX := 1; TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); end LOW_TASK; diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.ads b/c/src/ada-tests/tmtests/tm05/tmtest.ads index 2e42638675..2ffc983178 100644 --- a/c/src/ada-tests/tmtests/tm05/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm05/tmtest.ads @@ -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 @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -50,7 +51,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -91,7 +92,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -108,7 +109,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm06/tm06.adb b/c/src/ada-tests/tmtests/tm06/tm06.adb index c2564fc942..d710ebd27a 100644 --- a/c/src/ada-tests/tmtests/tm06/tm06.adb +++ b/c/src/ada-tests/tmtests/tm06/tm06.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM06 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.adb b/c/src/ada-tests/tmtests/tm06/tmtest.adb index b4c2c11f99..16dfde9bf6 100644 --- a/c/src/ada-tests/tmtests/tm06/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm06/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 @@ -28,13 +28,12 @@ with TIMER_DRIVER; 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; @@ -45,12 +44,11 @@ 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 -- @@ -63,7 +61,7 @@ package body TMTEST is TMTEST.TASK_RESTARTED := TIME_TEST_SUPPORT.OPERATION_COUNT; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 128, 1024, @@ -74,18 +72,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); end TEST_INIT; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; @@ -99,7 +96,7 @@ package body TMTEST is TMTEST.TASK_RESTARTED := TMTEST.TASK_RESTARTED - 1; if TMTEST.TASK_RESTARTED /= 0 then - RTEMS.TASK_RESTART( RTEMS.SELF, 0, STATUS ); + RTEMS.TASKS.RESTART( RTEMS.SELF, 0, STATUS ); end if; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -122,7 +119,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' ), 254, 1024, @@ -133,7 +130,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.NULL_TASK'ACCESS, 0, @@ -146,7 +143,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -160,7 +157,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESUME( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -174,7 +171,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -190,13 +187,12 @@ package body TMTEST is end TASK_1; ---PAGE -- -- NULL_TASK -- procedure NULL_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.ads b/c/src/ada-tests/tmtests/tm06/tmtest.ads index e27437af2e..f0ae878d3b 100644 --- a/c/src/ada-tests/tmtests/tm06/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm06/tmtest.ads @@ -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 @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -84,7 +85,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -98,7 +99,7 @@ package TMTEST is -- procedure NULL_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, NULL_TASK); diff --git a/c/src/ada-tests/tmtests/tm07/tm07.adb b/c/src/ada-tests/tmtests/tm07/tm07.adb index 972d1a0b05..cf9330d501 100644 --- a/c/src/ada-tests/tmtests/tm07/tm07.adb +++ b/c/src/ada-tests/tmtests/tm07/tm07.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM07 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.adb b/c/src/ada-tests/tmtests/tm07/tmtest.adb index 2f92fed738..d9b7ec3e46 100644 --- a/c/src/ada-tests/tmtests/tm07/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm07/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 @@ -28,13 +28,12 @@ with TIMER_DRIVER; 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; @@ -45,20 +44,19 @@ 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 - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -67,7 +65,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -88,20 +86,19 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -116,7 +113,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_RESTART ); else - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); end if; TEXT_IO.PUT_LINE( "*** END OF TIME TEST 07 ***" ); @@ -124,13 +121,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -138,25 +134,24 @@ package body TMTEST is TMTEST.TASK_INDEX := TMTEST.TASK_INDEX + 1; if ARGUMENT > 0 then - RTEMS.TASK_RESTART( + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), 16#7FFFFFFF#, STATUS ); else - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); end if; end MIDDLE_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; @@ -165,11 +160,12 @@ package body TMTEST is TMTEST.TASK_INDEX := 1; TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESTART( + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), 16#7FFFFFFF#, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART" ); end LOW_TASK; diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.ads b/c/src/ada-tests/tmtests/tm07/tmtest.ads index 46eed68a62..9aa9671fd9 100644 --- a/c/src/ada-tests/tmtests/tm07/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm07/tmtest.ads @@ -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 @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -50,7 +51,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -91,7 +92,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -106,7 +107,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm08/tm08.adb b/c/src/ada-tests/tmtests/tm08/tm08.adb index 988f5a4185..473785b9ed 100644 --- a/c/src/ada-tests/tmtests/tm08/tm08.adb +++ b/c/src/ada-tests/tmtests/tm08/tm08.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM08 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.adb b/c/src/ada-tests/tmtests/tm08/tmtest.adb index 803c058305..ba793ab9f0 100644 --- a/c/src/ada-tests/tmtests/tm08/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm08/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.CLOCK; 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,12 +46,11 @@ 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 -- @@ -61,7 +60,7 @@ package body TMTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 128, 1024, @@ -72,10 +71,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 254, 1024, @@ -86,22 +85,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_TASK1'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); end TEST_INIT; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; - OLD_PRIORITY : RTEMS.TASK_PRIORITY; + OLD_PRIORITY : RTEMS.TASKS.PRIORITY; OLD_MODE : RTEMS.MODE; OLD_NOTE : RTEMS.NOTEPAD_INDEX; TIME : RTEMS.TIME_OF_DAY; @@ -118,9 +116,9 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID, - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, OLD_PRIORITY, STATUS ); @@ -137,7 +135,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID, 253, OLD_PRIORITY, @@ -156,7 +154,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.CURRENT_MODE, RTEMS.CURRENT_MODE, OLD_MODE, @@ -175,13 +173,13 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 1 ), RTEMS.INTERRUPT_MASK, OLD_MODE, STATUS ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 0 ), RTEMS.INTERRUPT_MASK, OLD_MODE, @@ -198,7 +196,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_ASR, RTEMS.ASR_MASK, OLD_MODE, @@ -213,7 +211,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, @@ -221,7 +219,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID, 1, OLD_PRIORITY, @@ -230,7 +228,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_MODE( -- preempted by TEST_TASK1 + RTEMS.TASKS.MODE( -- preempted by TEST_TASK1 RTEMS.PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, @@ -240,7 +238,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_NOTE( + RTEMS.TASKS.SET_NOTE( TMTEST.TASK_ID, 8, 10, @@ -259,7 +257,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_GET_NOTE( + RTEMS.TASKS.GET_NOTE( TMTEST.TASK_ID, 8, OLD_NOTE, @@ -280,7 +278,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.CLOCK_SET( + RTEMS.CLOCK.SET( TIME, STATUS ); @@ -297,7 +295,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS ); + RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -313,13 +311,12 @@ package body TMTEST is end TEST_TASK; ---PAGE -- -- TEST_TASK1 -- procedure TEST_TASK1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -334,7 +331,8 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_MODE ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "DOES NOT RETURN" ); end TEST_TASK1; diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.ads b/c/src/ada-tests/tmtests/tm08/tmtest.ads index 357b1ecfcc..89f8779298 100644 --- a/c/src/ada-tests/tmtests/tm08/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm08/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -42,7 +43,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -77,7 +78,7 @@ package TMTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); @@ -93,7 +94,7 @@ package TMTEST is -- procedure TEST_TASK1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK1); diff --git a/c/src/ada-tests/tmtests/tm09/tm09.adb b/c/src/ada-tests/tmtests/tm09/tm09.adb index cb0dad49bd..9b64e86db1 100644 --- a/c/src/ada-tests/tmtests/tm09/tm09.adb +++ b/c/src/ada-tests/tmtests/tm09/tm09.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM09 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.adb b/c/src/ada-tests/tmtests/tm09/tmtest.adb index 064ba9646b..47cbb99779 100644 --- a/c/src/ada-tests/tmtests/tm09/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm09/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.MESSAGE_QUEUE; 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; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 9 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 128, 4096, @@ -56,28 +56,27 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - 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 pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( 1, TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -97,11 +96,12 @@ package body TMTEST is TMTEST.QUEUE_TEST; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_DELETE( + RTEMS.MESSAGE_QUEUE.DELETE( TMTEST.QUEUE_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" ); TIME_TEST_SUPPORT.PUT_TIME( "MESSAGE_QUEUE_DELETE", TMTEST.END_TIME, @@ -115,7 +115,6 @@ package body TMTEST is end TEST_TASK; ---PAGE -- -- QUEUE_TEST -- @@ -178,7 +177,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -190,7 +189,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -204,7 +203,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -216,7 +215,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -228,7 +227,7 @@ package body TMTEST is RECEIVE_TIME := RECEIVE_TIME + TIMER_DRIVER.READ_TIMER; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_FLUSH( + RTEMS.MESSAGE_QUEUE.FLUSH( TMTEST.QUEUE_ID, EMPTY_FLUSH_COUNT, STATUS @@ -236,14 +235,14 @@ package body TMTEST is EMPTY_FLUSH_TIME := EMPTY_FLUSH_TIME + TIMER_DRIVER.READ_TIMER; -- send one message to flush - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_FLUSH( + RTEMS.MESSAGE_QUEUE.FLUSH( TMTEST.QUEUE_ID, FLUSH_COUNT, STATUS diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.ads b/c/src/ada-tests/tmtests/tm09/tmtest.ads index b40cc1e3e3..6d99dd3896 100644 --- a/c/src/ada-tests/tmtests/tm09/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm09/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/tmtests/tm10/tm10.adb b/c/src/ada-tests/tmtests/tm10/tm10.adb index eff9078963..a8e37d2bad 100644 --- a/c/src/ada-tests/tmtests/tm10/tm10.adb +++ b/c/src/ada-tests/tmtests/tm10/tm10.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM10 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.adb b/c/src/ada-tests/tmtests/tm10/tmtest.adb index 8719dad469..cc1248c5d1 100644 --- a/c/src/ada-tests/tmtests/tm10/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm10/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.MESSAGE_QUEUE; 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,20 +46,19 @@ 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 - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; OVERHEAD : RTEMS.UNSIGNED32; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; @@ -75,7 +74,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -96,12 +95,12 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( 1, TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -120,7 +119,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.NO_WAIT, @@ -140,13 +139,12 @@ 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); BUFFER : TMTEST.BUFFER; @@ -159,7 +157,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -170,13 +168,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -187,7 +184,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -198,13 +195,12 @@ package body TMTEST is end MIDDLE_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.ads b/c/src/ada-tests/tmtests/tm10/tmtest.ads index 97b2cb028b..492e5b2459 100644 --- a/c/src/ada-tests/tmtests/tm10/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm10/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -85,7 +86,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -98,7 +99,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -112,7 +113,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm11/tm11.adb b/c/src/ada-tests/tmtests/tm11/tm11.adb index a7519641eb..48d5134298 100644 --- a/c/src/ada-tests/tmtests/tm11/tm11.adb +++ b/c/src/ada-tests/tmtests/tm11/tm11.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM11 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.adb b/c/src/ada-tests/tmtests/tm11/tmtest.adb index 5a355efd5e..57e499f3f8 100644 --- a/c/src/ada-tests/tmtests/tm11/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm11/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.MESSAGE_QUEUE; 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; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 11 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,22 +64,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - 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 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; @@ -92,7 +91,7 @@ package body TMTEST is -- MESSAGE_QUEUE_RECEIVE. Upon completion of this loop all created tasks -- are blocked. - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -107,7 +106,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -126,28 +125,28 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -158,7 +157,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -182,13 +181,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -199,7 +197,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -207,13 +205,15 @@ package body TMTEST is MESSAGE_SIZE, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); end MIDDLE_TASKS; diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.ads b/c/src/ada-tests/tmtests/tm11/tmtest.ads index 716cc04a06..8bfc9e9d4f 100644 --- a/c/src/ada-tests/tmtests/tm11/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm11/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -95,7 +96,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -109,7 +110,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); diff --git a/c/src/ada-tests/tmtests/tm12/tm12.adb b/c/src/ada-tests/tmtests/tm12/tm12.adb index 6c37a5926c..6e204fa4ba 100644 --- a/c/src/ada-tests/tmtests/tm12/tm12.adb +++ b/c/src/ada-tests/tmtests/tm12/tm12.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM12 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.adb b/c/src/ada-tests/tmtests/tm12/tmtest.adb index 21202da68c..59be88b87c 100644 --- a/c/src/ada-tests/tmtests/tm12/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm12/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.MESSAGE_QUEUE; 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; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 12 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,27 +64,26 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - 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 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -99,7 +98,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -118,20 +117,19 @@ package body TMTEST is TASK_ENTRY := TMTEST.LOW_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -152,7 +150,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -177,13 +175,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- LOW_TASK -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -194,7 +191,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.ads b/c/src/ada-tests/tmtests/tm12/tmtest.ads index 6b7727dc3f..068e1af95a 100644 --- a/c/src/ada-tests/tmtests/tm12/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm12/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -72,7 +73,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -87,7 +88,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -100,7 +101,7 @@ package TMTEST is -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASKS); diff --git a/c/src/ada-tests/tmtests/tm13/tm13.adb b/c/src/ada-tests/tmtests/tm13/tm13.adb index b2f5914fcd..6287ba126a 100644 --- a/c/src/ada-tests/tmtests/tm13/tm13.adb +++ b/c/src/ada-tests/tmtests/tm13/tm13.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM13 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.adb b/c/src/ada-tests/tmtests/tm13/tmtest.adb index 3b9b762d74..43d8a405b5 100644 --- a/c/src/ada-tests/tmtests/tm13/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm13/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.MESSAGE_QUEUE; 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; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 13 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,22 +64,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - 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 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; @@ -92,7 +91,7 @@ package body TMTEST is -- MESSAGE_QUEUE_RECEIVE. Upon completion of this loop all created tasks -- are blocked. - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -106,7 +105,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -125,28 +124,28 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" ); end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -157,7 +156,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -180,13 +179,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -197,7 +195,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -205,13 +203,15 @@ package body TMTEST is MESSAGE_SIZE, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" ); - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" ); end MIDDLE_TASKS; diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.ads b/c/src/ada-tests/tmtests/tm13/tmtest.ads index 72492b2667..5b6a08d782 100644 --- a/c/src/ada-tests/tmtests/tm13/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm13/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -95,7 +96,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -109,7 +110,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); diff --git a/c/src/ada-tests/tmtests/tm14/tm14.adb b/c/src/ada-tests/tmtests/tm14/tm14.adb index 21c61ea78e..afef0cab28 100644 --- a/c/src/ada-tests/tmtests/tm14/tm14.adb +++ b/c/src/ada-tests/tmtests/tm14/tm14.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM14 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.adb b/c/src/ada-tests/tmtests/tm14/tmtest.adb index 94c227ae48..9abb9adf97 100644 --- a/c/src/ada-tests/tmtests/tm14/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm14/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.MESSAGE_QUEUE; 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; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 14 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,22 +64,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - 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 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; @@ -88,7 +87,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -102,7 +101,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -121,28 +120,28 @@ package body TMTEST is TASK_ENTRY := TMTEST.LOW_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSSAGE_QUEUE_URGENT" ); end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -163,7 +162,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -187,13 +186,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- LOW_TASKS -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -204,7 +202,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.ads b/c/src/ada-tests/tmtests/tm14/tmtest.ads index f76ac8f14e..96f7f85fb5 100644 --- a/c/src/ada-tests/tmtests/tm14/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm14/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -72,7 +73,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -87,7 +88,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -100,7 +101,7 @@ package TMTEST is -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASKS); diff --git a/c/src/ada-tests/tmtests/tm15/tm15.adb b/c/src/ada-tests/tmtests/tm15/tm15.adb index de88857bf3..95185f2699 100644 --- a/c/src/ada-tests/tmtests/tm15/tm15.adb +++ b/c/src/ada-tests/tmtests/tm15/tm15.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM15 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.adb b/c/src/ada-tests/tmtests/tm15/tmtest.adb index 26008e3f2d..9704d2d77b 100644 --- a/c/src/ada-tests/tmtests/tm15/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm15/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 @@ -24,16 +24,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.EVENT; 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; @@ -44,12 +44,11 @@ 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 -- @@ -64,7 +63,7 @@ package body TMTEST is TMTEST.TIME_SET := FALSE; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 10, 1024, @@ -75,13 +74,13 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" ); - RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOW" ); for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 5, 1024, @@ -92,7 +91,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.HIGH_TASKS'ACCESS, 0, @@ -112,7 +111,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.PENDING_EVENTS, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -133,7 +132,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.ALL_EVENTS, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -153,13 +152,12 @@ package body TMTEST is end TEST_INIT; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; @@ -187,7 +185,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_SEND( RTEMS.SELF, RTEMS.EVENT_16, STATUS ); + RTEMS.EVENT.SEND( RTEMS.SELF, RTEMS.EVENT_16, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -200,7 +198,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -220,7 +218,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( TMTEST.TASK_ID( INDEX ), RTEMS.EVENT_16, STATUS @@ -241,13 +239,12 @@ package body TMTEST is end LOW_TASK; ---PAGE -- -- HIGH_TASKS -- procedure HIGH_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; @@ -259,7 +256,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; end if; - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( 16#7FFFFFFF#, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.ads b/c/src/ada-tests/tmtests/tm15/tmtest.ads index 87e7bd3f3d..b4be8b2725 100644 --- a/c/src/ada-tests/tmtests/tm15/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm15/tmtest.ads @@ -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 @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -88,7 +89,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); @@ -103,7 +104,7 @@ package TMTEST is -- procedure HIGH_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASKS); diff --git a/c/src/ada-tests/tmtests/tm16/tm16.adb b/c/src/ada-tests/tmtests/tm16/tm16.adb index cc17686431..a9d675548a 100644 --- a/c/src/ada-tests/tmtests/tm16/tm16.adb +++ b/c/src/ada-tests/tmtests/tm16/tm16.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM16 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.adb b/c/src/ada-tests/tmtests/tm16/tmtest.adb index 0bb4f9d9b7..27c2615d64 100644 --- a/c/src/ada-tests/tmtests/tm16/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm16/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,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.EVENT; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -44,7 +44,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 16 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), 251, 2048, @@ -55,7 +55,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TEST INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -63,22 +63,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF 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 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PRIORITY : RTEMS.TASK_PRIORITY; - TASK_ENTRY : RTEMS.TASK_ENTRY; + PRIORITY : RTEMS.TASKS.PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin @@ -87,7 +86,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ), PRIORITY, 1024, @@ -104,7 +103,7 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, @@ -120,59 +119,60 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; -- starts the timer - RTEMS.EVENT_SEND( -- preempts task + RTEMS.EVENT.SEND( -- preempts task TMTEST.TASK_ID( TMTEST.TASK_COUNT ), RTEMS.EVENT_16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" ); end TEST_INIT; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_RECEIVE( -- task blocks + RTEMS.EVENT.RECEIVE( -- task blocks RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, EVENT_OUT, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" ); TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; - RTEMS.EVENT_SEND( -- preempts task + RTEMS.EVENT.SEND( -- preempts task TMTEST.TASK_ID( TMTEST.TASK_COUNT ), RTEMS.EVENT_16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" ); end MIDDLE_TASKS; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_RECEIVE( -- task blocks + RTEMS.EVENT.RECEIVE( -- task blocks RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.ads b/c/src/ada-tests/tmtests/tm16/tmtest.ads index c1492834d3..c7df756b67 100644 --- a/c/src/ada-tests/tmtests/tm16/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm16/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TIME_TEST_SUPPORT; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -70,7 +71,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -88,7 +89,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -106,7 +107,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); diff --git a/c/src/ada-tests/tmtests/tm17/tm17.adb b/c/src/ada-tests/tmtests/tm17/tm17.adb index fbb3b20d01..d7d4f24381 100644 --- a/c/src/ada-tests/tmtests/tm17/tm17.adb +++ b/c/src/ada-tests/tmtests/tm17/tm17.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM17 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.adb b/c/src/ada-tests/tmtests/tm17/tmtest.adb index 2d03e1e883..3b2ab4b951 100644 --- a/c/src/ada-tests/tmtests/tm17/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm17/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 @@ -28,16 +28,15 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin @@ -49,7 +48,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), TMTEST.TASK_PRIORITY, 1024, @@ -68,28 +67,27 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TMTEST.TASK_COUNT := 1; - 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_TASK -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -98,7 +96,7 @@ package body TMTEST is TMTEST.TASK_PRIORITY := TMTEST.TASK_PRIORITY - 1; TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID( TMTEST.TASK_COUNT ), TMTEST.TASK_PRIORITY, PREVIOUS_PRIORITY, @@ -107,23 +105,22 @@ package body TMTEST is end FIRST_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin TMTEST.TASK_PRIORITY := TMTEST.TASK_PRIORITY - 1; TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID( TMTEST.TASK_COUNT ), TMTEST.TASK_PRIORITY, PREVIOUS_PRIORITY, @@ -132,13 +129,12 @@ package body TMTEST is end MIDDLE_TASKS; ---PAGE -- -- LAST_TASK -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.ads b/c/src/ada-tests/tmtests/tm17/tmtest.ads index 90368080a9..8c8c290577 100644 --- a/c/src/ada-tests/tmtests/tm17/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm17/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TIME_TEST_SUPPORT; package TMTEST is @@ -42,7 +43,7 @@ package TMTEST is -- TASK_COUNT : RTEMS.UNSIGNED32; - TASK_PRIORITY : RTEMS.TASK_PRIORITY; + TASK_PRIORITY : RTEMS.TASKS.PRIORITY; -- -- The following variable is set to the execution time returned @@ -60,7 +61,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -75,7 +76,7 @@ package TMTEST is -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, FIRST_TASK); @@ -89,7 +90,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -104,7 +105,7 @@ package TMTEST is -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LAST_TASK); diff --git a/c/src/ada-tests/tmtests/tm18/tm18.adb b/c/src/ada-tests/tmtests/tm18/tm18.adb index 6c547f39ef..69638b68fe 100644 --- a/c/src/ada-tests/tmtests/tm18/tm18.adb +++ b/c/src/ada-tests/tmtests/tm18/tm18.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM18 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.adb b/c/src/ada-tests/tmtests/tm18/tmtest.adb index a0a679944b..0e21d4b433 100644 --- a/c/src/ada-tests/tmtests/tm18/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm18/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 @@ -29,13 +29,12 @@ with TIMER_DRIVER; 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,12 +45,11 @@ 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 -- @@ -59,14 +57,14 @@ package body TMTEST is procedure TEST_INIT is ID : RTEMS.ID; - TASK_ENTRY : RTEMS.TASK_ENTRY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 128, 1024, @@ -86,20 +84,19 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; end TEST_INIT; ---PAGE -- -- FIRST_TASK -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -107,33 +104,33 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); end FIRST_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.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); end MIDDLE_TASKS; ---PAGE -- -- LAST_TASK -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.ads b/c/src/ada-tests/tmtests/tm18/tmtest.ads index 8b18547129..d476ebd6e3 100644 --- a/c/src/ada-tests/tmtests/tm18/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm18/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -40,7 +41,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -64,7 +65,7 @@ package TMTEST is -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, FIRST_TASK); @@ -77,7 +78,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -91,7 +92,7 @@ package TMTEST is -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LAST_TASK); diff --git a/c/src/ada-tests/tmtests/tm19/tm19.adb b/c/src/ada-tests/tmtests/tm19/tm19.adb index 46811b1af4..64709d0d14 100644 --- a/c/src/ada-tests/tmtests/tm19/tm19.adb +++ b/c/src/ada-tests/tmtests/tm19/tm19.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM19 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.adb b/c/src/ada-tests/tmtests/tm19/tmtest.adb index fbcadae312..eb0c1cd42f 100644 --- a/c/src/ada-tests/tmtests/tm19/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm19/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,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.SIGNAL; 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; @@ -43,7 +43,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 19 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 128, 1024, @@ -54,7 +54,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -62,7 +62,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 127, 1024, @@ -73,7 +73,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 2 ), TMTEST.TASK_2'ACCESS, 0, @@ -81,7 +81,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 126, 1024, @@ -92,7 +92,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 3 ), TMTEST.TASK_3'ACCESS, 0, @@ -100,12 +100,11 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK3" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PROCESS_ASR_FOR_PASS_1 -- @@ -132,7 +131,6 @@ package body TMTEST is end PROCESS_ASR_FOR_PASS_1; ---PAGE -- -- PROCESS_ASR_FOR_PASS_2 -- @@ -146,32 +144,32 @@ package body TMTEST is TEXT_IO.PUT_LINE( "SIGNAL_ENTER (preemptive) na" ); - RTEMS.TASK_RESUME( TMTEST.TASK_ID( 3 ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); TIMER_DRIVER.INITIALIZE; end PROCESS_ASR_FOR_PASS_2; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( TMTEST.PROCESS_ASR_FOR_PASS_1'ACCESS, RTEMS.DEFAULT_MODES, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); TIME_TEST_SUPPORT.PUT_TIME( "SIGNAL_CATCH", @@ -182,8 +180,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_SEND( TMTEST.TASK_ID( 2 ), RTEMS.SIGNAL_1, STATUS ); + RTEMS.SIGNAL.SEND( TMTEST.TASK_ID( 2 ), RTEMS.SIGNAL_1, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" ); TIME_TEST_SUPPORT.PUT_TIME( "SIGNAL_SEND (non-preemptive)", @@ -194,7 +193,8 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + RTEMS.SIGNAL.SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" ); -- end time is done in ASR @@ -208,7 +208,7 @@ package body TMTEST is 0 ); - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( TMTEST.PROCESS_ASR_FOR_PASS_2'ACCESS, RTEMS.NO_PREEMPT, STATUS @@ -216,11 +216,11 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + RTEMS.SIGNAL.SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" ); end TASK_1; ---PAGE -- -- PROCESS_ASR_FOR_TASK_2 -- @@ -234,42 +234,42 @@ package body TMTEST is end PROCESS_ASR_FOR_TASK_2; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( TMTEST.PROCESS_ASR_FOR_TASK_2'ACCESS, RTEMS.DEFAULT_MODES, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.ads b/c/src/ada-tests/tmtests/tm19/tmtest.ads index 0f0a6e3d76..7e1283b77d 100644 --- a/c/src/ada-tests/tmtests/tm19/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm19/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -96,7 +97,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -124,7 +125,7 @@ package TMTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -141,7 +142,7 @@ package TMTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); diff --git a/c/src/ada-tests/tmtests/tm20/tm20.adb b/c/src/ada-tests/tmtests/tm20/tm20.adb index ca8ba1f688..af1089bf1c 100644 --- a/c/src/ada-tests/tmtests/tm20/tm20.adb +++ b/c/src/ada-tests/tmtests/tm20/tm20.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM20 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.adb b/c/src/ada-tests/tmtests/tm20/tmtest.adb index 506e5927df..69188c942e 100644 --- a/c/src/ada-tests/tmtests/tm20/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm20/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 RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.PARTITION; +with RTEMS.REGION; 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; @@ -43,7 +44,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 20 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', '1' ), 128, 2048, @@ -54,7 +55,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -62,7 +63,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', '2' ), 129, 2048, @@ -73,7 +74,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 2 ), TMTEST.TASK_2'ACCESS, 0, @@ -81,23 +82,22 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER_COUNT : RTEMS.UNSIGNED32; PREVIOUS_MODE : RTEMS.MODE; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -105,7 +105,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( TMTEST.PARTITION_NAME, TMTEST.PARTITION_AREA'ADDRESS, 2048, @@ -128,7 +128,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( TMTEST.REGION_NAME, TMTEST.REGION_AREA'ADDRESS, 2048, @@ -148,7 +148,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS @@ -166,7 +166,7 @@ package body TMTEST is BUFFER_COUNT := 0; loop - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESSES( BUFFER_COUNT ), STATUS @@ -179,7 +179,7 @@ package body TMTEST is end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS @@ -195,7 +195,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS @@ -213,7 +213,7 @@ package body TMTEST is for INDEX in 0 .. BUFFER_COUNT - 1 loop - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESSES( INDEX ), STATUS @@ -223,7 +223,7 @@ package body TMTEST is end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_DELETE( TMTEST.PARTITION_ID, STATUS ); + RTEMS.PARTITION.DELETE( TMTEST.PARTITION_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -234,7 +234,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.PARTITION_DELETE ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -245,7 +245,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -264,7 +264,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.NO_WAIT, @@ -282,7 +282,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_GET_SEGMENT ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_3, STATUS @@ -290,7 +290,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS @@ -305,7 +305,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -316,7 +316,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.DEFAULT_OPTIONS, @@ -337,14 +337,14 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -352,10 +352,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); - RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -364,7 +364,7 @@ package body TMTEST is STATUS ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.DEFAULT_OPTIONS, @@ -372,18 +372,21 @@ package body TMTEST is TMTEST.BUFFER_ADDRESS_2, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); -- execute TASK_2 - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_DELETE( TMTEST.REGION_ID, STATUS ); + RTEMS.REGION.DELETE( TMTEST.REGION_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE" ); TIME_TEST_SUPPORT.PUT_TIME( "REGION_DELETE", @@ -398,13 +401,12 @@ package body TMTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -421,21 +423,23 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS ); -- preempt back to TASK_1 + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIME_TEST_SUPPORT.PUT_TIME( "REGION_RETURN_SEGMENT (ready -- return)", @@ -445,7 +449,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end TASK_2; diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.ads b/c/src/ada-tests/tmtests/tm20/tmtest.ads index 58674f1771..105b8552b3 100644 --- a/c/src/ada-tests/tmtests/tm20/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm20/tmtest.ads @@ -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 @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -96,7 +97,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -128,7 +129,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -145,7 +146,7 @@ package TMTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); diff --git a/c/src/ada-tests/tmtests/tm21/tm21.adb b/c/src/ada-tests/tmtests/tm21/tm21.adb index 570f871100..e2acfad20b 100644 --- a/c/src/ada-tests/tmtests/tm21/tm21.adb +++ b/c/src/ada-tests/tmtests/tm21/tm21.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM21 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.adb b/c/src/ada-tests/tmtests/tm21/tmtest.adb index a59cc4c93e..104e955951 100644 --- a/c/src/ada-tests/tmtests/tm21/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm21/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,22 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.PARTITION; +with RTEMS.PORT; +with RTEMS.RATE_MONOTONIC; +with RTEMS.REGION; +with RTEMS.SEMAPHORE; +with RTEMS.TIMER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -44,7 +50,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 21 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 250, 2048, @@ -55,21 +61,20 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE TASK_1" ); - RTEMS.TASK_START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START TASK1" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -80,7 +85,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( INDEX, 254, 1024, @@ -91,7 +96,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( INDEX, TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -101,17 +106,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( INDEX, TIME_TEST_SUPPORT.OPERATION_COUNT, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( INDEX, TMTEST.REGION_AREA'ADDRESS, 2048, @@ -122,7 +127,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( INDEX, TMTEST.PARTITION_AREA'ADDRESS, 2048, @@ -133,7 +138,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" ); - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( INDEX, TMTEST.INTERNAL_PORT_AREA'ADDRESS, TMTEST.EXTERNAL_PORT_AREA'ADDRESS, @@ -143,10 +148,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_CREATE" ); - RTEMS.TIMER_CREATE( INDEX, ID, STATUS ); + RTEMS.TIMER.CREATE( INDEX, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); - RTEMS.RATE_MONOTONIC_CREATE( INDEX, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( INDEX, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" ); end loop; @@ -161,7 +166,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, STATUS ); + RTEMS.TASKS.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -176,7 +181,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, @@ -196,7 +201,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, @@ -216,7 +221,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PARTITION_IDENT( + RTEMS.PARTITION.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, @@ -236,7 +241,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.REGION_IDENT( INDEX, ID, STATUS ); + RTEMS.REGION.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -251,7 +256,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_IDENT( INDEX, ID, STATUS ); + RTEMS.PORT.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -266,7 +271,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_IDENT( INDEX, ID, STATUS ); + RTEMS.TIMER.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -281,7 +286,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.RATE_MONOTONIC_IDENT( INDEX, ID, STATUS ); + RTEMS.RATE_MONOTONIC.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.ads b/c/src/ada-tests/tmtests/tm21/tmtest.ads index 9714b0e12d..64146a27b9 100644 --- a/c/src/ada-tests/tmtests/tm21/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm21/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SYSTEM; with System.Storage_Elements; @@ -51,7 +52,7 @@ package TMTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -63,7 +64,7 @@ package TMTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -92,7 +93,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -115,7 +116,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/tmtests/tm22/tm22.adb b/c/src/ada-tests/tmtests/tm22/tm22.adb index 6af7a211f9..cf885b3307 100644 --- a/c/src/ada-tests/tmtests/tm22/tm22.adb +++ b/c/src/ada-tests/tmtests/tm22/tm22.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM22 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.adb b/c/src/ada-tests/tmtests/tm22/tmtest.adb index f4d59df030..3ea08c9b5b 100644 --- a/c/src/ada-tests/tmtests/tm22/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm22/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,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -44,7 +44,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 22 ***" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), 100, 16, @@ -54,7 +54,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 10, 2048, @@ -65,10 +65,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" ); - RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOW" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'P', 'R', 'M', 'T' ), 11, 2048, @@ -79,21 +79,20 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE PREEMPT" ); - RTEMS.TASK_START( ID, TMTEST.PREEMPT_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.PREEMPT_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START PREEMPT" ); - 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_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -105,7 +104,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, 16, @@ -122,18 +121,17 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end HIGH_TASK; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -147,7 +145,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 5, 2048, @@ -158,10 +156,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" ); - RTEMS.TASK_START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HIGH" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_MODES, @@ -180,7 +178,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, 16, @@ -198,7 +196,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_MODES, @@ -224,13 +222,12 @@ package body TMTEST is end LOW_TASK; ---PAGE -- -- LOW_TASK -- procedure PREEMPT_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -242,7 +239,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, 16, diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.ads b/c/src/ada-tests/tmtests/tm22/tmtest.ads index ab94637097..b21fd23fae 100644 --- a/c/src/ada-tests/tmtests/tm22/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm22/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -77,7 +78,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -100,7 +101,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); @@ -114,7 +115,7 @@ package TMTEST is -- procedure PREEMPT_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, PREEMPT_TASK); diff --git a/c/src/ada-tests/tmtests/tm23/tm23.adb b/c/src/ada-tests/tmtests/tm23/tm23.adb index e3022e5fe0..71041293f6 100644 --- a/c/src/ada-tests/tmtests/tm23/tm23.adb +++ b/c/src/ada-tests/tmtests/tm23/tm23.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM23 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.adb b/c/src/ada-tests/tmtests/tm23/tmtest.adb index c801e9a8ae..1e5bb67c2c 100644 --- a/c/src/ada-tests/tmtests/tm23/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm23/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,21 +25,22 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.CLOCK; +with RTEMS.TIMER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_PRIORITY : RTEMS.TASK_PRIORITY; + TASK_PRIORITY : RTEMS.TASKS.PRIORITY; ID : RTEMS.ID; - TASK_ENTRY : RTEMS.TASK_ENTRY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin @@ -51,7 +52,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' ), TASK_PRIORITY, 1024, @@ -70,19 +71,18 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); TASK_PRIORITY := TASK_PRIORITY + 1; 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 -- -- NULL_DELAY -- @@ -97,13 +97,12 @@ package body TMTEST is end NULL_DELAY; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; @@ -120,7 +119,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( INDEX, TMTEST.TIMER_ID( INDEX ), STATUS @@ -139,7 +138,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMTEST.TIMER_ID( INDEX ), 500, TMTEST.NULL_DELAY'ACCESS, @@ -160,7 +159,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMTEST.TIMER_ID( INDEX ), 500, TMTEST.NULL_DELAY'ACCESS, @@ -181,7 +180,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -196,7 +195,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -211,7 +210,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -226,7 +225,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -240,12 +239,12 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.TIME_OF_DAY := ( 1988, 12, 31, 9, 0, 0, 0 ); - RTEMS.CLOCK_SET( TMTEST.TIME_OF_DAY, STATUS ); + RTEMS.CLOCK.SET( TMTEST.TIME_OF_DAY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" ); TMTEST.TIME_OF_DAY.YEAR := 1989; @@ -253,7 +252,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( TMTEST.TIMER_ID( INDEX ), TMTEST.TIME_OF_DAY, TMTEST.NULL_DELAY'ACCESS, @@ -274,7 +273,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( TMTEST.TIMER_ID( INDEX ), TMTEST.TIME_OF_DAY, TMTEST.NULL_DELAY'ACCESS, @@ -295,7 +294,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -309,10 +308,10 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CREATE( INDEX, TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CREATE( INDEX, TMTEST.TIMER_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMTEST.TIMER_ID( INDEX ), 500, TMTEST.NULL_DELAY'ACCESS, @@ -321,7 +320,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); end loop; @@ -329,7 +328,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -342,33 +341,33 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_WHEN" ); 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.TASK_WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_WHEN" ); end MIDDLE_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.ads b/c/src/ada-tests/tmtests/tm23/tmtest.ads index 8d8d95f096..d69874863f 100644 --- a/c/src/ada-tests/tmtests/tm23/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm23/tmtest.ads @@ -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 @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -99,7 +100,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -112,7 +113,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -126,7 +127,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm24/tm24.adb b/c/src/ada-tests/tmtests/tm24/tm24.adb index fe6404f76e..b10e75f846 100644 --- a/c/src/ada-tests/tmtests/tm24/tm24.adb +++ b/c/src/ada-tests/tmtests/tm24/tm24.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM24 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.adb b/c/src/ada-tests/tmtests/tm24/tmtest.adb index f0f99fce89..9015df98d7 100644 --- a/c/src/ada-tests/tmtests/tm24/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm24/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 @@ -29,13 +29,12 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -52,7 +51,7 @@ package body TMTEST is end loop; TMTEST.OVERHEAD := TIMER_DRIVER.READ_TIMER; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 10, 1024, @@ -63,13 +62,13 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" ); - RTEMS.TASK_START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HIGH" ); for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'R', 'E', 'S', 'T' ), 128, 1024, @@ -80,23 +79,22 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASKS'ACCESS, 0, 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 -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -105,7 +103,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -119,18 +117,17 @@ package body TMTEST is TMTEST.TASK_COUNT := 0; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end HIGH_TASK; ---PAGE -- -- TASKS -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -158,7 +155,8 @@ package body TMTEST is end if; - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); end TASKS; diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.ads b/c/src/ada-tests/tmtests/tm24/tmtest.ads index 920709f519..72c7a997d4 100644 --- a/c/src/ada-tests/tmtests/tm24/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm24/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -63,7 +64,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -78,7 +79,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -93,7 +94,7 @@ package TMTEST is -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASKS); diff --git a/c/src/ada-tests/tmtests/tm25/tm25.adb b/c/src/ada-tests/tmtests/tm25/tm25.adb index 2a237b673b..e2fe3210b8 100644 --- a/c/src/ada-tests/tmtests/tm25/tm25.adb +++ b/c/src/ada-tests/tmtests/tm25/tm25.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM25 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, 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; diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.ads b/c/src/ada-tests/tmtests/tm25/tmtest.ads index ac9ca3864d..4c28a502bd 100644 --- a/c/src/ada-tests/tmtests/tm25/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm25/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -60,7 +61,7 @@ package TMTEST is -- procedure HIGH_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASKS); @@ -74,7 +75,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm28/tm28.adb b/c/src/ada-tests/tmtests/tm28/tm28.adb index d66703adf3..d6628124c5 100644 --- a/c/src/ada-tests/tmtests/tm28/tm28.adb +++ b/c/src/ada-tests/tmtests/tm28/tm28.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM28 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.adb b/c/src/ada-tests/tmtests/tm28/tmtest.adb index c1331b54fd..69379e7ae9 100644 --- a/c/src/ada-tests/tmtests/tm28/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm28/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 @@ -24,16 +24,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.PORT; 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; @@ -42,7 +42,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 28 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), 128, 1024, @@ -53,7 +53,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TEST_TASK'ACCESS, 0, @@ -61,18 +61,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - 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 pragma Unreferenced(ARGUMENT); NAME : RTEMS.NAME; @@ -92,7 +91,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( NAME, TMTEST.INTERNAL_PORT_AREA'ADDRESS, TMTEST.EXTERNAL_PORT_AREA'ADDRESS, @@ -114,7 +113,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_EXTERNAL_TO_INTERNAL( + RTEMS.PORT.EXTERNAL_TO_INTERNAL( TMTEST.PORT_ID( 1 ), TMTEST.EXTERNAL_PORT_AREA( 16#F# )'ADDRESS, CONVERTED, @@ -134,7 +133,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_INTERNAL_TO_EXTERNAL( + RTEMS.PORT.INTERNAL_TO_EXTERNAL( TMTEST.PORT_ID( 1 ), TMTEST.INTERNAL_PORT_AREA( 16#F# )'ADDRESS, CONVERTED, @@ -154,7 +153,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_DELETE( TMTEST.PORT_ID( INDEX ), STATUS ); + RTEMS.PORT.DELETE( TMTEST.PORT_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.ads b/c/src/ada-tests/tmtests/tm28/tmtest.ads index 2e7062cfa6..470cbddb81 100644 --- a/c/src/ada-tests/tmtests/tm28/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm28/tmtest.ads @@ -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 @@ -23,6 +23,7 @@ with SYSTEM; with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; with System.Storage_Elements; package TMTEST is @@ -50,7 +51,7 @@ package TMTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -62,7 +63,7 @@ package TMTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- -- The following variable is set to the execution time returned @@ -80,7 +81,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -99,7 +100,7 @@ package TMTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/tmtests/tm29/tm29.adb b/c/src/ada-tests/tmtests/tm29/tm29.adb index 5ece52b2ef..1cbe02d262 100644 --- a/c/src/ada-tests/tmtests/tm29/tm29.adb +++ b/c/src/ada-tests/tmtests/tm29/tm29.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM29 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.adb b/c/src/ada-tests/tmtests/tm29/tmtest.adb index b785fbeb39..9710fb32b9 100644 --- a/c/src/ada-tests/tmtests/tm29/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm29/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.RATE_MONOTONIC; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -48,7 +48,7 @@ package body TMTEST is TMTEST.PERIOD_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'D', ' ' ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -60,8 +60,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_PERIOD (initial)", @@ -72,8 +73,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_PERIOD( ID, RTEMS.PERIOD_STATUS, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, RTEMS.RATE_MONOTONIC_PERIOD_STATUS, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_PERIOD (STATUS)", @@ -84,8 +86,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_CANCEL( ID, STATUS ); + RTEMS.RATE_MONOTONIC.CANCEL( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CANCEL" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_CANCEL", @@ -96,7 +99,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -107,14 +110,14 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_DELETE ); - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" ); - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -128,7 +131,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', 'E', 'S', 'T' ), 128, 1024, @@ -139,12 +142,12 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 200, 2048, @@ -155,37 +158,38 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); TMTEST.TASK_COUNT := 0; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TASKS -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.NAME; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); -- Give up the processor to allow all tasks to actually -- create and start their period timer before the benchmark -- timer driver is initialized. - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; @@ -193,17 +197,17 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; end if; - RTEMS.RATE_MONOTONIC_PERIOD( ID, 100, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 100, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); end TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.ads b/c/src/ada-tests/tmtests/tm29/tmtest.ads index e254a8a98c..93d20c33cd 100644 --- a/c/src/ada-tests/tmtests/tm29/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm29/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -62,7 +63,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASKS); @@ -90,7 +91,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tmck/tmck.adb b/c/src/ada-tests/tmtests/tmck/tmck.adb index 5008c5c01f..86f29bf66a 100644 --- a/c/src/ada-tests/tmtests/tmck/tmck.adb +++ b/c/src/ada-tests/tmtests/tmck/tmck.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 TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TMCK is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.adb b/c/src/ada-tests/tmtests/tmck/tmtest.adb index ce49323a14..2a587065d7 100644 --- a/c/src/ada-tests/tmtests/tmck/tmtest.adb +++ b/c/src/ada-tests/tmtests/tmck/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 @@ -29,13 +29,12 @@ with UNSIGNED32_IO; 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; @@ -48,7 +47,7 @@ package body TMTEST is TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TMTEST.TASK_NAME( 1 ), 1, 2048, @@ -59,7 +58,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -67,18 +66,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin @@ -158,7 +156,6 @@ TEST_SUPPORT.PAUSE; end TASK_1; ---PAGE -- -- CHECK_READ_TIMER -- diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.ads b/c/src/ada-tests/tmtests/tmck/tmtest.ads index 6872152c6c..45bf7e0f07 100644 --- a/c/src/ada-tests/tmtests/tmck/tmtest.ads +++ b/c/src/ada-tests/tmtests/tmck/tmtest.ads @@ -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 @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -62,7 +63,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -78,7 +79,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb index 79c99e47ab..f93afbad0f 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb @@ -27,7 +27,7 @@ package body DUMMY_RTEMS is procedure TASK_CREATE ( NAME : in RTEMS.NAME; - INITIAL_PRIORITY : in RTEMS.TASK_PRIORITY; + INITIAL_PRIORITY : in RTEMS.TASKS.PRIORITY; STACK_SIZE : in RTEMS.UNSIGNED32; INITIAL_MODES : in RTEMS.MODE; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; @@ -63,7 +63,7 @@ package body DUMMY_RTEMS is procedure TASK_START ( ID : in RTEMS.ID; - ENTRY_POINT : in RTEMS.TASK_ENTRY; + ENTRY_POINT : in RTEMS.TASKS.ENTRY_POINT; ARGUMENT : in RTEMS.UNSIGNED32; RESULT : out RTEMS.STATUS_CODES ) is @@ -124,8 +124,8 @@ package body DUMMY_RTEMS is procedure TASK_SET_PRIORITY ( ID : in RTEMS.ID; - NEW_PRIORITY : in RTEMS.TASK_PRIORITY; - OLD_PRIORITY : out RTEMS.TASK_PRIORITY; + NEW_PRIORITY : in RTEMS.TASKS.PRIORITY; + OLD_PRIORITY : out RTEMS.TASKS.PRIORITY; RESULT : out RTEMS.STATUS_CODES ) is pragma Unreferenced(ID); @@ -222,7 +222,7 @@ package body DUMMY_RTEMS is -- Clock Manager procedure CLOCK_GET ( - OPTION : in RTEMS.CLOCK_GET_OPTIONS; + OPTION : in RTEMS.CLOCK.GET_OPTIONS; TIME_BUFFER : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ) is @@ -296,7 +296,7 @@ package body DUMMY_RTEMS is procedure TIMER_FIRE_AFTER ( ID : in RTEMS.ID; TICKS : in RTEMS.INTERVAL; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ) is @@ -313,7 +313,7 @@ package body DUMMY_RTEMS is procedure TIMER_FIRE_WHEN ( ID : in RTEMS.ID; WALL_TIME : in RTEMS.TIME_OF_DAY; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ) is @@ -355,7 +355,7 @@ package body DUMMY_RTEMS is NAME : in RTEMS.NAME; COUNT : in RTEMS.UNSIGNED32; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; - PRIORITY_CEILING : in RTEMS.TASK_PRIORITY; + PRIORITY_CEILING : in RTEMS.TASKS.PRIORITY; ID : out RTEMS.ID; RESULT : out RTEMS.STATUS_CODES ) is diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads index 3259ac75ca..6f6d62505b 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads +++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads @@ -22,6 +22,9 @@ -- with RTEMS; +with RTEMS.CLOCK; +with RTEMS.TASKS; +with RTEMS.TIMER; package DUMMY_RTEMS is @@ -29,7 +32,7 @@ package DUMMY_RTEMS is procedure TASK_CREATE ( NAME : in RTEMS.NAME; - INITIAL_PRIORITY : in RTEMS.TASK_PRIORITY; + INITIAL_PRIORITY : in RTEMS.TASKS.PRIORITY; STACK_SIZE : in RTEMS.UNSIGNED32; INITIAL_MODES : in RTEMS.MODE; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; @@ -46,7 +49,7 @@ package DUMMY_RTEMS is procedure TASK_START ( ID : in RTEMS.ID; - ENTRY_POINT : in RTEMS.TASK_ENTRY; + ENTRY_POINT : in RTEMS.TASKS.ENTRY_POINT; ARGUMENT : in RTEMS.UNSIGNED32; RESULT : out RTEMS.STATUS_CODES ); @@ -74,8 +77,8 @@ package DUMMY_RTEMS is procedure TASK_SET_PRIORITY ( ID : in RTEMS.ID; - NEW_PRIORITY : in RTEMS.TASK_PRIORITY; - OLD_PRIORITY : out RTEMS.TASK_PRIORITY; + NEW_PRIORITY : in RTEMS.TASKS.PRIORITY; + OLD_PRIORITY : out RTEMS.TASKS.PRIORITY; RESULT : out RTEMS.STATUS_CODES ); @@ -122,7 +125,7 @@ package DUMMY_RTEMS is -- Clock Manager procedure CLOCK_GET ( - OPTION : in RTEMS.CLOCK_GET_OPTIONS; + OPTION : in RTEMS.CLOCK.GET_OPTIONS; TIME_BUFFER : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ); @@ -158,7 +161,7 @@ package DUMMY_RTEMS is procedure TIMER_FIRE_AFTER ( ID : in RTEMS.ID; TICKS : in RTEMS.INTERVAL; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ); @@ -166,7 +169,7 @@ package DUMMY_RTEMS is procedure TIMER_FIRE_WHEN ( ID : in RTEMS.ID; WALL_TIME : in RTEMS.TIME_OF_DAY; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ); @@ -187,7 +190,7 @@ package DUMMY_RTEMS is NAME : in RTEMS.NAME; COUNT : in RTEMS.UNSIGNED32; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; - PRIORITY_CEILING : in RTEMS.TASK_PRIORITY; + PRIORITY_CEILING : in RTEMS.TASKS.PRIORITY; ID : out RTEMS.ID; RESULT : out RTEMS.STATUS_CODES ); diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb b/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb index 5f14134fd6..733e895514 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TMOVERHD is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb index bc2ae8b34d..5bd69282d7 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb @@ -25,6 +25,7 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.CLOCK; package body TMTEST is @@ -34,7 +35,7 @@ package body TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -47,7 +48,7 @@ package body TMTEST is TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TMTEST.TASK_NAME( 1 ), 254, 2048, @@ -58,7 +59,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -66,7 +67,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; @@ -120,14 +121,14 @@ package body TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); NAME : RTEMS.NAME; OVERHEAD : RTEMS.UNSIGNED32; ID : RTEMS.ID; - IN_PRIORITY : RTEMS.TASK_PRIORITY; - OUT_PRIORITY : RTEMS.TASK_PRIORITY; + IN_PRIORITY : RTEMS.TASKS.PRIORITY; + OUT_PRIORITY : RTEMS.TASKS.PRIORITY; IN_MODE : RTEMS.MODE; MASK : RTEMS.MODE; OUT_MODE : RTEMS.MODE; @@ -437,7 +438,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - DUMMY_RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS ); + DUMMY_RTEMS.CLOCK_GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -629,7 +630,7 @@ TEST_SUPPORT.PAUSE; NAME, 128, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, ID, STATUS ); diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads b/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads index 5d9b3e1b4f..9ce930f79b 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads +++ b/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SYSTEM; with System.Storage_Elements; @@ -64,7 +65,7 @@ package TMTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -76,7 +77,7 @@ package TMTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- @@ -96,7 +97,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -150,7 +151,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); |