diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-02-16 15:53:16 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-02-16 15:53:16 +0000 |
| commit | 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb (patch) | |
| tree | 903461d3fd2bac10fe132397a82640cb020aa51c /c/src/ada-tests/mptests | |
| parent | 2011-02-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb.tar.bz2 | |
2011-02-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* ada-tests/mptests/mp01/mp01.adb, ada-tests/mptests/mp01/mptest.adb,
ada-tests/mptests/mp01/mptest.ads,
ada-tests/mptests/mp01/node1/mp01_node1.adb,
ada-tests/mptests/mp01/node2/mp01_node2.adb,
ada-tests/mptests/mp02/mptest.adb, ada-tests/mptests/mp02/mptest.ads,
ada-tests/mptests/mp02/node1/mp02_node1.adb,
ada-tests/mptests/mp02/node2/mp02_node2.adb,
ada-tests/mptests/mp03/mptest.adb, ada-tests/mptests/mp03/mptest.ads,
ada-tests/mptests/mp03/node1/mp03_node1.adb,
ada-tests/mptests/mp03/node2/mp03_node2.adb,
ada-tests/mptests/mp04/mptest.adb, ada-tests/mptests/mp04/mptest.ads,
ada-tests/mptests/mp04/node1/mp04_node1.adb,
ada-tests/mptests/mp04/node2/mp04_node2.adb,
ada-tests/mptests/mp05/mptest.adb, ada-tests/mptests/mp05/mptest.ads,
ada-tests/mptests/mp05/node1/mp05_node1.adb,
ada-tests/mptests/mp05/node2/mp05_node2.adb,
ada-tests/mptests/mp06/mptest.adb, ada-tests/mptests/mp06/mptest.ads,
ada-tests/mptests/mp06/node1/mp06_node1.adb,
ada-tests/mptests/mp06/node2/mp06_node2.adb,
ada-tests/mptests/mp07/mptest.adb, ada-tests/mptests/mp07/mptest.ads,
ada-tests/mptests/mp07/node1/mp07_node1.adb,
ada-tests/mptests/mp07/node2/mp07_node2.adb,
ada-tests/mptests/mp08/mptest.adb, ada-tests/mptests/mp08/mptest.ads,
ada-tests/mptests/mp08/node1/mp08_node1.adb,
ada-tests/mptests/mp08/node2/mp08_node2.adb,
ada-tests/mptests/mp09/mptest.adb, ada-tests/mptests/mp09/mptest.ads,
ada-tests/mptests/mp09/node1/mp09_node1.adb,
ada-tests/mptests/mp09/node2/mp09_node2.adb,
ada-tests/mptests/mp10/mptest.adb, ada-tests/mptests/mp10/mptest.ads,
ada-tests/mptests/mp10/node1/mp10_node1.adb,
ada-tests/mptests/mp10/node2/mp10_node2.adb,
ada-tests/mptests/mp11/mptest.adb, ada-tests/mptests/mp11/mptest.ads,
ada-tests/mptests/mp11/node1/mp11_node1.adb,
ada-tests/mptests/mp11/node2/mp11_node2.adb,
ada-tests/mptests/mp12/mptest.adb, ada-tests/mptests/mp12/mptest.ads,
ada-tests/mptests/mp12/node1/mp12_node1.adb,
ada-tests/mptests/mp12/node2/mp12_node2.adb,
ada-tests/mptests/mp13/mptest.adb, ada-tests/mptests/mp13/mptest.ads,
ada-tests/mptests/mp13/node1/mp13_node1.adb,
ada-tests/mptests/mp13/node2/mp13_node2.adb,
ada-tests/mptests/mp14/mptest.adb, ada-tests/mptests/mp14/mptest.ads,
ada-tests/mptests/mp14/node1/mp14_node1.adb,
ada-tests/mptests/mp14/node2/mp14_node2.adb,
ada-tests/samples/base_mp/mptest.adb,
ada-tests/samples/base_mp/mptest.ads,
ada-tests/samples/base_sp/base_sp.adb,
ada-tests/samples/base_sp/sptest.adb,
ada-tests/samples/base_sp/sptest.ads,
ada-tests/samples/hello/hello.adb,
ada-tests/samples/hello/sptest.adb,
ada-tests/samples/hello/sptest.ads,
ada-tests/samples/nsecs/nsecs.adb,
ada-tests/samples/nsecs/sptest.adb,
ada-tests/samples/nsecs/sptest.ads,
ada-tests/samples/ticker/sptest.adb,
ada-tests/samples/ticker/sptest.ads,
ada-tests/samples/ticker/ticker.adb, ada-tests/sptests/sp01/sp01.adb,
ada-tests/sptests/sp01/sptest.adb, ada-tests/sptests/sp01/sptest.ads,
ada-tests/sptests/sp02/sp02.adb, ada-tests/sptests/sp02/sptest.adb,
ada-tests/sptests/sp02/sptest.ads, ada-tests/sptests/sp03/sp03.adb,
ada-tests/sptests/sp03/sptest.adb, ada-tests/sptests/sp03/sptest.ads,
ada-tests/sptests/sp04/sp04.adb, ada-tests/sptests/sp04/sptest.adb,
ada-tests/sptests/sp04/sptest.ads, ada-tests/sptests/sp05/sp05.adb,
ada-tests/sptests/sp05/sptest.adb, ada-tests/sptests/sp05/sptest.ads,
ada-tests/sptests/sp06/sp06.adb, ada-tests/sptests/sp06/sptest.adb,
ada-tests/sptests/sp06/sptest.ads, ada-tests/sptests/sp07/sp07.adb,
ada-tests/sptests/sp07/sptest.adb, ada-tests/sptests/sp07/sptest.ads,
ada-tests/sptests/sp08/sp08.adb, ada-tests/sptests/sp08/sptest.adb,
ada-tests/sptests/sp08/sptest.ads, ada-tests/sptests/sp09/sp09.adb,
ada-tests/sptests/sp09/sptest.adb, ada-tests/sptests/sp09/sptest.ads,
ada-tests/sptests/sp11/sp11.adb, ada-tests/sptests/sp11/sptest.adb,
ada-tests/sptests/sp11/sptest.ads, ada-tests/sptests/sp12/sp12.adb,
ada-tests/sptests/sp12/sptest.adb, ada-tests/sptests/sp12/sptest.ads,
ada-tests/sptests/sp13/sp13.adb, ada-tests/sptests/sp13/sptest.adb,
ada-tests/sptests/sp13/sptest.ads, ada-tests/sptests/sp14/sp14.adb,
ada-tests/sptests/sp14/sptest.adb, ada-tests/sptests/sp14/sptest.ads,
ada-tests/sptests/sp15/sp15.adb, ada-tests/sptests/sp15/sptest.adb,
ada-tests/sptests/sp15/sptest.ads, ada-tests/sptests/sp16/sp16.adb,
ada-tests/sptests/sp16/sptest.adb, ada-tests/sptests/sp16/sptest.ads,
ada-tests/sptests/sp17/sp17.adb, ada-tests/sptests/sp17/sptest.adb,
ada-tests/sptests/sp17/sptest.ads, ada-tests/sptests/sp19/sp19.adb,
ada-tests/sptests/sp19/sptest.adp, ada-tests/sptests/sp19/sptest.ads,
ada-tests/sptests/sp20/sp20.adb, ada-tests/sptests/sp20/sptest.adb,
ada-tests/sptests/sp20/sptest.ads, ada-tests/sptests/sp22/sp22.adb,
ada-tests/sptests/sp22/sptest.adb, ada-tests/sptests/sp22/sptest.ads,
ada-tests/sptests/sp23/sp23.adb, ada-tests/sptests/sp23/sptest.adb,
ada-tests/sptests/sp23/sptest.ads, ada-tests/sptests/sp24/sp24.adb,
ada-tests/sptests/sp24/sptest.adb, ada-tests/sptests/sp24/sptest.ads,
ada-tests/sptests/sp25/sp25.adb, ada-tests/sptests/sp25/sptest.adb,
ada-tests/sptests/sp25/sptest.ads,
ada-tests/support/test_support.adb, ada-tests/tmtests/tm01/tm01.adb,
ada-tests/tmtests/tm01/tmtest.adb, ada-tests/tmtests/tm01/tmtest.ads,
ada-tests/tmtests/tm02/tm02.adb, ada-tests/tmtests/tm02/tmtest.adb,
ada-tests/tmtests/tm02/tmtest.ads, ada-tests/tmtests/tm03/tm03.adb,
ada-tests/tmtests/tm03/tmtest.adb, ada-tests/tmtests/tm03/tmtest.ads,
ada-tests/tmtests/tm04/tm04.adb, ada-tests/tmtests/tm04/tmtest.adb,
ada-tests/tmtests/tm04/tmtest.ads, ada-tests/tmtests/tm05/tm05.adb,
ada-tests/tmtests/tm05/tmtest.adb, ada-tests/tmtests/tm05/tmtest.ads,
ada-tests/tmtests/tm06/tm06.adb, ada-tests/tmtests/tm06/tmtest.adb,
ada-tests/tmtests/tm06/tmtest.ads, ada-tests/tmtests/tm07/tm07.adb,
ada-tests/tmtests/tm07/tmtest.adb, ada-tests/tmtests/tm07/tmtest.ads,
ada-tests/tmtests/tm08/tm08.adb, ada-tests/tmtests/tm08/tmtest.adb,
ada-tests/tmtests/tm08/tmtest.ads, ada-tests/tmtests/tm09/tm09.adb,
ada-tests/tmtests/tm09/tmtest.adb, ada-tests/tmtests/tm09/tmtest.ads,
ada-tests/tmtests/tm10/tm10.adb, ada-tests/tmtests/tm10/tmtest.adb,
ada-tests/tmtests/tm10/tmtest.ads, ada-tests/tmtests/tm11/tm11.adb,
ada-tests/tmtests/tm11/tmtest.adb, ada-tests/tmtests/tm11/tmtest.ads,
ada-tests/tmtests/tm12/tm12.adb, ada-tests/tmtests/tm12/tmtest.adb,
ada-tests/tmtests/tm12/tmtest.ads, ada-tests/tmtests/tm13/tm13.adb,
ada-tests/tmtests/tm13/tmtest.adb, ada-tests/tmtests/tm13/tmtest.ads,
ada-tests/tmtests/tm14/tm14.adb, ada-tests/tmtests/tm14/tmtest.adb,
ada-tests/tmtests/tm14/tmtest.ads, ada-tests/tmtests/tm15/tm15.adb,
ada-tests/tmtests/tm15/tmtest.adb, ada-tests/tmtests/tm15/tmtest.ads,
ada-tests/tmtests/tm16/tm16.adb, ada-tests/tmtests/tm16/tmtest.adb,
ada-tests/tmtests/tm16/tmtest.ads, ada-tests/tmtests/tm17/tm17.adb,
ada-tests/tmtests/tm17/tmtest.adb, ada-tests/tmtests/tm17/tmtest.ads,
ada-tests/tmtests/tm18/tm18.adb, ada-tests/tmtests/tm18/tmtest.adb,
ada-tests/tmtests/tm18/tmtest.ads, ada-tests/tmtests/tm19/tm19.adb,
ada-tests/tmtests/tm19/tmtest.adb, ada-tests/tmtests/tm19/tmtest.ads,
ada-tests/tmtests/tm20/tm20.adb, ada-tests/tmtests/tm20/tmtest.adb,
ada-tests/tmtests/tm20/tmtest.ads, ada-tests/tmtests/tm21/tm21.adb,
ada-tests/tmtests/tm21/tmtest.adb, ada-tests/tmtests/tm21/tmtest.ads,
ada-tests/tmtests/tm22/tm22.adb, ada-tests/tmtests/tm22/tmtest.adb,
ada-tests/tmtests/tm22/tmtest.ads, ada-tests/tmtests/tm23/tm23.adb,
ada-tests/tmtests/tm23/tmtest.adb, ada-tests/tmtests/tm23/tmtest.ads,
ada-tests/tmtests/tm24/tm24.adb, ada-tests/tmtests/tm24/tmtest.adb,
ada-tests/tmtests/tm24/tmtest.ads, ada-tests/tmtests/tm25/tm25.adb,
ada-tests/tmtests/tm25/tmtest.adb, ada-tests/tmtests/tm25/tmtest.ads,
ada-tests/tmtests/tm28/tm28.adb, ada-tests/tmtests/tm28/tmtest.adb,
ada-tests/tmtests/tm28/tmtest.ads, ada-tests/tmtests/tm29/tm29.adb,
ada-tests/tmtests/tm29/tmtest.adb, ada-tests/tmtests/tm29/tmtest.ads,
ada-tests/tmtests/tmck/tmck.adb, ada-tests/tmtests/tmck/tmtest.adb,
ada-tests/tmtests/tmck/tmtest.ads,
ada-tests/tmtests/tmoverhd/dummy_rtems.adb,
ada-tests/tmtests/tmoverhd/dummy_rtems.ads,
ada-tests/tmtests/tmoverhd/tmoverhd.adb,
ada-tests/tmtests/tmoverhd/tmtest.adb,
ada-tests/tmtests/tmoverhd/tmtest.ads: Account for RTEMS binding
child package rework. Eliminate all warnings.
Diffstat (limited to 'c/src/ada-tests/mptests')
57 files changed, 477 insertions, 431 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, |