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/tmtests | |
| 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/tmtests')
89 files changed, 884 insertions, 852 deletions
diff --git a/c/src/ada-tests/tmtests/tm01/tm01.adb b/c/src/ada-tests/tmtests/tm01/tm01.adb index e4ac103797..7b56457468 100644 --- a/c/src/ada-tests/tmtests/tm01/tm01.adb +++ b/c/src/ada-tests/tmtests/tm01/tm01.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM01 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.adb b/c/src/ada-tests/tmtests/tm01/tmtest.adb index d32cd872db..6769e0ff32 100644 --- a/c/src/ada-tests/tmtests/tm01/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm01/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.SEMAPHORE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -48,7 +48,7 @@ package body TMTEST is TMTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); TMTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TMTEST.TASK_NAME( 1 ), 1, 2048, @@ -59,7 +59,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -67,18 +67,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SEMAPHORE_OBTAIN_TIME : RTEMS.UNSIGNED32; @@ -103,11 +102,11 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( NAME, TIME_TEST_SUPPORT.OPERATION_COUNT, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SMID, STATUS ); @@ -126,7 +125,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.SEMAPHORE_DELETE( SMID, STATUS ); + RTEMS.SEMAPHORE.DELETE( SMID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -140,11 +139,11 @@ package body TMTEST is -- Create semaphore for repeated operations. - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( NAME, TIME_TEST_SUPPORT.OPERATION_COUNT, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SMID, STATUS ); @@ -173,7 +172,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SMID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -193,7 +192,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_RELEASE( SMID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( SMID, STATUS ); end loop; @@ -209,7 +208,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SMID, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -230,7 +229,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_RELEASE( SMID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( SMID, STATUS ); end loop; diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.ads b/c/src/ada-tests/tmtests/tm01/tmtest.ads index 942cd455d9..00a8013f71 100644 --- a/c/src/ada-tests/tmtests/tm01/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm01/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -48,7 +49,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -61,7 +62,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/tmtests/tm02/tm02.adb b/c/src/ada-tests/tmtests/tm02/tm02.adb index 5aa7e405e3..5ca9b51128 100644 --- a/c/src/ada-tests/tmtests/tm02/tm02.adb +++ b/c/src/ada-tests/tmtests/tm02/tm02.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM02 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.adb b/c/src/ada-tests/tmtests/tm02/tmtest.adb index bc7160e1f7..6fdd8b004b 100644 --- a/c/src/ada-tests/tmtests/tm02/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm02/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.SEMAPHORE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -46,18 +46,17 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT is - PRIORITY : RTEMS.TASK_PRIORITY; + PRIORITY : RTEMS.TASKS.PRIORITY; HIGH_ID : RTEMS.ID; LOW_ID : RTEMS.ID; TASK_ID : RTEMS.ID; @@ -66,7 +65,7 @@ package body TMTEST is PRIORITY := 5; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), PRIORITY, 1024, @@ -79,7 +78,7 @@ package body TMTEST is PRIORITY := PRIORITY + 1; - RTEMS.TASK_START( + RTEMS.TASKS.START( HIGH_ID, TMTEST.HIGH_TASK'ACCESS, 0, @@ -90,7 +89,7 @@ package body TMTEST is for INDEX in 2 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ), PRIORITY, 1024, @@ -103,7 +102,7 @@ package body TMTEST is PRIORITY := PRIORITY + 1; - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.MIDDLE_TASKS'ACCESS, 0, @@ -113,7 +112,7 @@ package body TMTEST is end loop; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), PRIORITY, 2048, @@ -124,14 +123,14 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF LOW TASK" ); - RTEMS.TASK_START( LOW_ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( LOW_ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF LOW TASK" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ), 0, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, TMTEST.SEMAPHORE_ID, STATUS ); @@ -139,56 +138,55 @@ package body TMTEST is end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); end MIDDLE_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.ads b/c/src/ada-tests/tmtests/tm02/tmtest.ads index 014509f5b9..8b04651e5e 100644 --- a/c/src/ada-tests/tmtests/tm02/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm02/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -70,7 +71,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -84,7 +85,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -98,7 +99,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm03/tm03.adb b/c/src/ada-tests/tmtests/tm03/tm03.adb index 197587ae68..1c1bf08652 100644 --- a/c/src/ada-tests/tmtests/tm03/tm03.adb +++ b/c/src/ada-tests/tmtests/tm03/tm03.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM03 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.adb b/c/src/ada-tests/tmtests/tm03/tmtest.adb index 97821f9582..4ff2b3e682 100644 --- a/c/src/ada-tests/tmtests/tm03/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm03/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.SEMAPHORE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TASK_ID : RTEMS.ID; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 3 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ), 252, 2048, @@ -56,35 +56,34 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TEST_INIT" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TEST_INIT" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PRIORITY : RTEMS.TASK_PRIORITY; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; begin PRIORITY := 250; - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ), 0, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, TMTEST.SEMAPHORE_ID, STATUS ); @@ -93,7 +92,7 @@ package body TMTEST is for INDEX in 2 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ), PRIORITY, 1024, @@ -106,12 +105,12 @@ package body TMTEST is PRIORITY := PRIORITY - 1; - RTEMS.TASK_START( TASK_ID, TMTEST.MIDDLE_TASKS'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.MIDDLE_TASKS'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START MIDDLE" ); end loop; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), PRIORITY, 1024, @@ -122,50 +121,51 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF HIGH TASK" ); - RTEMS.TASK_START( TASK_ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF HIGH TASK" ); TIMER_DRIVER.INITIALIZE; - RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); end TEST_INIT; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); - RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); end MIDDLE_TASKS; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -174,6 +174,8 @@ package body TMTEST is TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "LAST CALL DID NOT WORK" ); + TIME_TEST_SUPPORT.PUT_TIME( "SEMAPHORE_RELEASE (preemptive)", TMTEST.END_TIME, diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.ads b/c/src/ada-tests/tmtests/tm03/tmtest.ads index 244dca01e9..1c5867911f 100644 --- a/c/src/ada-tests/tmtests/tm03/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm03/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -61,7 +62,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -90,7 +91,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); diff --git a/c/src/ada-tests/tmtests/tm04/tm04.adb b/c/src/ada-tests/tmtests/tm04/tm04.adb index 651106d5ca..ba29fd6d26 100644 --- a/c/src/ada-tests/tmtests/tm04/tm04.adb +++ b/c/src/ada-tests/tmtests/tm04/tm04.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM04 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.adb b/c/src/ada-tests/tmtests/tm04/tmtest.adb index cf77ab9bd0..f7e1c52bd8 100644 --- a/c/src/ada-tests/tmtests/tm04/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm04/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,16 +25,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.SEMAPHORE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -45,12 +45,11 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- @@ -65,7 +64,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 10, 1024, @@ -76,7 +75,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.LOW_TASKS'ACCESS, 0, @@ -86,11 +85,11 @@ package body TMTEST is end loop; - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ), 0, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, TMTEST.SEMAPHORE_ID, STATUS ); @@ -98,15 +97,14 @@ package body TMTEST is end TEST_INIT; ---PAGE -- -- HIGHEST_TASK -- procedure HIGHEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is - OLD_PRIORITY : RTEMS.TASK_PRIORITY; + OLD_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -122,7 +120,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_RESTART ); - RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, OLD_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 254, OLD_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); elsif ARGUMENT = 2 then @@ -137,12 +135,12 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_RESTART ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); else - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -153,28 +151,29 @@ package body TMTEST is end HIGHEST_TASK; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - OLD_PRIORITY : RTEMS.TASK_PRIORITY; + OLD_PRIORITY : RTEMS.TASKS.PRIORITY; OVERHEAD : RTEMS.UNSIGNED32; NAME : RTEMS.NAME; STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESTART( TMTEST.HIGHEST_ID, 1, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.HIGHEST_ID, 1, STATUS ); -- preempted by Higher_task + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART" ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESTART( TMTEST.HIGHEST_ID, 2, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.HIGHEST_ID, 2, STATUS ); -- preempted by Higher_task + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART" ); TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT @@ -186,9 +185,10 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); + RTEMS.SEMAPHORE.RELEASE( TMTEST.SEMAPHORE_ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); TIME_TEST_SUPPORT.PUT_TIME( "SEMAPHORE_RELEASE (readying)", @@ -200,7 +200,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); end loop; @@ -209,7 +209,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( NAME, 10, 1024, @@ -232,7 +232,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.LOW_TASKS'ACCESS, 0, @@ -251,13 +251,13 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" ); end loop; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( NAME, 250, 1024, @@ -267,21 +267,21 @@ package body TMTEST is STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.RESTART_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); - RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 0, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( INDEX ), 0, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -295,14 +295,14 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -316,7 +316,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( NAME, 250, 1024, @@ -326,7 +326,7 @@ package body TMTEST is STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.RESTART_TASK'ACCESS, 0, @@ -338,7 +338,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -352,7 +352,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID( INDEX ), 5, OLD_PRIORITY, @@ -362,13 +362,13 @@ package body TMTEST is end loop; -- yield processor -- tasks block - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -381,13 +381,13 @@ package body TMTEST is ); -- yield processor -- tasks block - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -404,13 +404,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- LOW_TASKS -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -421,7 +420,7 @@ package body TMTEST is if TMTEST.TASK_COUNT = 0 then - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', ' ', ' ' ), 5, 2048, @@ -432,7 +431,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HI" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( ID, TMTEST.HIGH_TASK'ACCESS, 0, @@ -441,7 +440,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HI" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 3, 2048, @@ -452,7 +451,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.HIGHEST_ID, TMTEST.HIGHEST_TASK'ACCESS, 0, @@ -463,28 +462,28 @@ package body TMTEST is end if; - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); end LOW_TASKS; ---PAGE -- -- RESTART_TASK -- procedure RESTART_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin if ARGUMENT = 1 then - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.ads b/c/src/ada-tests/tmtests/tm04/tmtest.ads index 1627325bdf..88b18592bb 100644 --- a/c/src/ada-tests/tmtests/tm04/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm04/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -68,7 +69,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -99,7 +100,7 @@ package TMTEST is -- procedure HIGHEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGHEST_TASK); @@ -129,7 +130,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -144,7 +145,7 @@ package TMTEST is -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASKS); @@ -157,7 +158,7 @@ package TMTEST is -- procedure RESTART_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, RESTART_TASK); diff --git a/c/src/ada-tests/tmtests/tm05/tm05.adb b/c/src/ada-tests/tmtests/tm05/tm05.adb index 946b46f029..d9114abc6b 100644 --- a/c/src/ada-tests/tmtests/tm05/tm05.adb +++ b/c/src/ada-tests/tmtests/tm05/tm05.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM05 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.adb b/c/src/ada-tests/tmtests/tm05/tmtest.adb index 1fc20a6491..f31055f3f9 100644 --- a/c/src/ada-tests/tmtests/tm05/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm05/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -28,13 +28,12 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -45,20 +44,19 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT is - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -67,7 +65,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -88,27 +86,27 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPENT" ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -124,32 +122,32 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TMTEST.TASK_INDEX := TMTEST.TASK_INDEX + 1; - RTEMS.TASK_RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); end MIDDLE_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -166,7 +164,8 @@ package body TMTEST is TMTEST.TASK_INDEX := 1; TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); end LOW_TASK; diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.ads b/c/src/ada-tests/tmtests/tm05/tmtest.ads index 2e42638675..2ffc983178 100644 --- a/c/src/ada-tests/tmtests/tm05/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm05/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -50,7 +51,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -91,7 +92,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -108,7 +109,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm06/tm06.adb b/c/src/ada-tests/tmtests/tm06/tm06.adb index c2564fc942..d710ebd27a 100644 --- a/c/src/ada-tests/tmtests/tm06/tm06.adb +++ b/c/src/ada-tests/tmtests/tm06/tm06.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM06 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.adb b/c/src/ada-tests/tmtests/tm06/tmtest.adb index b4c2c11f99..16dfde9bf6 100644 --- a/c/src/ada-tests/tmtests/tm06/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm06/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -28,13 +28,12 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -45,12 +44,11 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- @@ -63,7 +61,7 @@ package body TMTEST is TMTEST.TASK_RESTARTED := TIME_TEST_SUPPORT.OPERATION_COUNT; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 128, 1024, @@ -74,18 +72,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); end TEST_INIT; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; @@ -99,7 +96,7 @@ package body TMTEST is TMTEST.TASK_RESTARTED := TMTEST.TASK_RESTARTED - 1; if TMTEST.TASK_RESTARTED /= 0 then - RTEMS.TASK_RESTART( RTEMS.SELF, 0, STATUS ); + RTEMS.TASKS.RESTART( RTEMS.SELF, 0, STATUS ); end if; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -122,7 +119,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 254, 1024, @@ -133,7 +130,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.NULL_TASK'ACCESS, 0, @@ -146,7 +143,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -160,7 +157,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_RESUME( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -174,7 +171,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( TMTEST.TASK_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -190,13 +187,12 @@ package body TMTEST is end TASK_1; ---PAGE -- -- NULL_TASK -- procedure NULL_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.ads b/c/src/ada-tests/tmtests/tm06/tmtest.ads index e27437af2e..f0ae878d3b 100644 --- a/c/src/ada-tests/tmtests/tm06/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm06/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -84,7 +85,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -98,7 +99,7 @@ package TMTEST is -- procedure NULL_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, NULL_TASK); diff --git a/c/src/ada-tests/tmtests/tm07/tm07.adb b/c/src/ada-tests/tmtests/tm07/tm07.adb index 972d1a0b05..cf9330d501 100644 --- a/c/src/ada-tests/tmtests/tm07/tm07.adb +++ b/c/src/ada-tests/tmtests/tm07/tm07.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM07 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.adb b/c/src/ada-tests/tmtests/tm07/tmtest.adb index 2f92fed738..d9b7ec3e46 100644 --- a/c/src/ada-tests/tmtests/tm07/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm07/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -28,13 +28,12 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -45,20 +44,19 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT is - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -67,7 +65,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -88,20 +86,19 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -116,7 +113,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_RESTART ); else - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); end if; TEXT_IO.PUT_LINE( "*** END OF TIME TEST 07 ***" ); @@ -124,13 +121,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -138,25 +134,24 @@ package body TMTEST is TMTEST.TASK_INDEX := TMTEST.TASK_INDEX + 1; if ARGUMENT > 0 then - RTEMS.TASK_RESTART( + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), 16#7FFFFFFF#, STATUS ); else - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); end if; end MIDDLE_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -165,11 +160,12 @@ package body TMTEST is TMTEST.TASK_INDEX := 1; TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_RESTART( + RTEMS.TASKS.RESTART( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), 16#7FFFFFFF#, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART" ); end LOW_TASK; diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.ads b/c/src/ada-tests/tmtests/tm07/tmtest.ads index 46eed68a62..9aa9671fd9 100644 --- a/c/src/ada-tests/tmtests/tm07/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm07/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -50,7 +51,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -91,7 +92,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -106,7 +107,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm08/tm08.adb b/c/src/ada-tests/tmtests/tm08/tm08.adb index 988f5a4185..473785b9ed 100644 --- a/c/src/ada-tests/tmtests/tm08/tm08.adb +++ b/c/src/ada-tests/tmtests/tm08/tm08.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM08 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.adb b/c/src/ada-tests/tmtests/tm08/tmtest.adb index 803c058305..ba793ab9f0 100644 --- a/c/src/ada-tests/tmtests/tm08/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm08/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.CLOCK; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -46,12 +46,11 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- @@ -61,7 +60,7 @@ package body TMTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 128, 1024, @@ -72,10 +71,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 254, 1024, @@ -86,22 +85,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_TASK1'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); end TEST_INIT; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; - OLD_PRIORITY : RTEMS.TASK_PRIORITY; + OLD_PRIORITY : RTEMS.TASKS.PRIORITY; OLD_MODE : RTEMS.MODE; OLD_NOTE : RTEMS.NOTEPAD_INDEX; TIME : RTEMS.TIME_OF_DAY; @@ -118,9 +116,9 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID, - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, OLD_PRIORITY, STATUS ); @@ -137,7 +135,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID, 253, OLD_PRIORITY, @@ -156,7 +154,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.CURRENT_MODE, RTEMS.CURRENT_MODE, OLD_MODE, @@ -175,13 +173,13 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 1 ), RTEMS.INTERRUPT_MASK, OLD_MODE, STATUS ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.INTERRUPT_LEVEL( 0 ), RTEMS.INTERRUPT_MASK, OLD_MODE, @@ -198,7 +196,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_ASR, RTEMS.ASR_MASK, OLD_MODE, @@ -213,7 +211,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_MODE ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, @@ -221,7 +219,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID, 1, OLD_PRIORITY, @@ -230,7 +228,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_MODE( -- preempted by TEST_TASK1 + RTEMS.TASKS.MODE( -- preempted by TEST_TASK1 RTEMS.PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, @@ -240,7 +238,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_SET_NOTE( + RTEMS.TASKS.SET_NOTE( TMTEST.TASK_ID, 8, 10, @@ -259,7 +257,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_GET_NOTE( + RTEMS.TASKS.GET_NOTE( TMTEST.TASK_ID, 8, OLD_NOTE, @@ -280,7 +278,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.CLOCK_SET( + RTEMS.CLOCK.SET( TIME, STATUS ); @@ -297,7 +295,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS ); + RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -313,13 +311,12 @@ package body TMTEST is end TEST_TASK; ---PAGE -- -- TEST_TASK1 -- procedure TEST_TASK1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -334,7 +331,8 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_MODE ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "DOES NOT RETURN" ); end TEST_TASK1; diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.ads b/c/src/ada-tests/tmtests/tm08/tmtest.ads index 357b1ecfcc..89f8779298 100644 --- a/c/src/ada-tests/tmtests/tm08/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm08/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -42,7 +43,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -77,7 +78,7 @@ package TMTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); @@ -93,7 +94,7 @@ package TMTEST is -- procedure TEST_TASK1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK1); diff --git a/c/src/ada-tests/tmtests/tm09/tm09.adb b/c/src/ada-tests/tmtests/tm09/tm09.adb index cb0dad49bd..9b64e86db1 100644 --- a/c/src/ada-tests/tmtests/tm09/tm09.adb +++ b/c/src/ada-tests/tmtests/tm09/tm09.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM09 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.adb b/c/src/ada-tests/tmtests/tm09/tmtest.adb index 064ba9646b..47cbb99779 100644 --- a/c/src/ada-tests/tmtests/tm09/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm09/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TASK_ID : RTEMS.ID; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 9 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 128, 4096, @@ -56,28 +56,27 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( 1, TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -97,11 +96,12 @@ package body TMTEST is TMTEST.QUEUE_TEST; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_DELETE( + RTEMS.MESSAGE_QUEUE.DELETE( TMTEST.QUEUE_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" ); TIME_TEST_SUPPORT.PUT_TIME( "MESSAGE_QUEUE_DELETE", TMTEST.END_TIME, @@ -115,7 +115,6 @@ package body TMTEST is end TEST_TASK; ---PAGE -- -- QUEUE_TEST -- @@ -178,7 +177,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -190,7 +189,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -204,7 +203,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -216,7 +215,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -228,7 +227,7 @@ package body TMTEST is RECEIVE_TIME := RECEIVE_TIME + TIMER_DRIVER.READ_TIMER; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_FLUSH( + RTEMS.MESSAGE_QUEUE.FLUSH( TMTEST.QUEUE_ID, EMPTY_FLUSH_COUNT, STATUS @@ -236,14 +235,14 @@ package body TMTEST is EMPTY_FLUSH_TIME := EMPTY_FLUSH_TIME + TIMER_DRIVER.READ_TIMER; -- send one message to flush - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_FLUSH( + RTEMS.MESSAGE_QUEUE.FLUSH( TMTEST.QUEUE_ID, FLUSH_COUNT, STATUS diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.ads b/c/src/ada-tests/tmtests/tm09/tmtest.ads index b40cc1e3e3..6d99dd3896 100644 --- a/c/src/ada-tests/tmtests/tm09/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm09/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/tmtests/tm10/tm10.adb b/c/src/ada-tests/tmtests/tm10/tm10.adb index eff9078963..a8e37d2bad 100644 --- a/c/src/ada-tests/tmtests/tm10/tm10.adb +++ b/c/src/ada-tests/tmtests/tm10/tm10.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM10 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.adb b/c/src/ada-tests/tmtests/tm10/tmtest.adb index 8719dad469..cc1248c5d1 100644 --- a/c/src/ada-tests/tmtests/tm10/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm10/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -46,20 +46,19 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT is - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; OVERHEAD : RTEMS.UNSIGNED32; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; @@ -75,7 +74,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -96,12 +95,12 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( 1, TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -120,7 +119,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.NO_WAIT, @@ -140,13 +139,12 @@ package body TMTEST is end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -159,7 +157,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -170,13 +168,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -187,7 +184,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -198,13 +195,12 @@ package body TMTEST is end MIDDLE_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.ads b/c/src/ada-tests/tmtests/tm10/tmtest.ads index 97b2cb028b..492e5b2459 100644 --- a/c/src/ada-tests/tmtests/tm10/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm10/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -85,7 +86,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -98,7 +99,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -112,7 +113,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm11/tm11.adb b/c/src/ada-tests/tmtests/tm11/tm11.adb index a7519641eb..48d5134298 100644 --- a/c/src/ada-tests/tmtests/tm11/tm11.adb +++ b/c/src/ada-tests/tmtests/tm11/tm11.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM11 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.adb b/c/src/ada-tests/tmtests/tm11/tmtest.adb index 5a355efd5e..57e499f3f8 100644 --- a/c/src/ada-tests/tmtests/tm11/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm11/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TASK_ID : RTEMS.ID; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 11 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,22 +64,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; @@ -92,7 +91,7 @@ package body TMTEST is -- MESSAGE_QUEUE_RECEIVE. Upon completion of this loop all created tasks -- are blocked. - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -107,7 +106,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -126,28 +125,28 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -158,7 +157,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -182,13 +181,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -199,7 +197,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -207,13 +205,15 @@ package body TMTEST is MESSAGE_SIZE, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" ); - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); end MIDDLE_TASKS; diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.ads b/c/src/ada-tests/tmtests/tm11/tmtest.ads index 716cc04a06..8bfc9e9d4f 100644 --- a/c/src/ada-tests/tmtests/tm11/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm11/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -95,7 +96,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -109,7 +110,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); diff --git a/c/src/ada-tests/tmtests/tm12/tm12.adb b/c/src/ada-tests/tmtests/tm12/tm12.adb index 6c37a5926c..6e204fa4ba 100644 --- a/c/src/ada-tests/tmtests/tm12/tm12.adb +++ b/c/src/ada-tests/tmtests/tm12/tm12.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM12 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.adb b/c/src/ada-tests/tmtests/tm12/tmtest.adb index 21202da68c..59be88b87c 100644 --- a/c/src/ada-tests/tmtests/tm12/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm12/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TASK_ID : RTEMS.ID; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 12 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,27 +64,26 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -99,7 +98,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -118,20 +117,19 @@ package body TMTEST is TASK_ENTRY := TMTEST.LOW_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -152,7 +150,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_SEND( + RTEMS.MESSAGE_QUEUE.SEND( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -177,13 +175,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- LOW_TASK -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -194,7 +191,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.ads b/c/src/ada-tests/tmtests/tm12/tmtest.ads index 6b7727dc3f..068e1af95a 100644 --- a/c/src/ada-tests/tmtests/tm12/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm12/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -72,7 +73,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -87,7 +88,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -100,7 +101,7 @@ package TMTEST is -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASKS); diff --git a/c/src/ada-tests/tmtests/tm13/tm13.adb b/c/src/ada-tests/tmtests/tm13/tm13.adb index b2f5914fcd..6287ba126a 100644 --- a/c/src/ada-tests/tmtests/tm13/tm13.adb +++ b/c/src/ada-tests/tmtests/tm13/tm13.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM13 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.adb b/c/src/ada-tests/tmtests/tm13/tmtest.adb index 3b9b762d74..43d8a405b5 100644 --- a/c/src/ada-tests/tmtests/tm13/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm13/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TASK_ID : RTEMS.ID; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 13 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,22 +64,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; @@ -92,7 +91,7 @@ package body TMTEST is -- MESSAGE_QUEUE_RECEIVE. Upon completion of this loop all created tasks -- are blocked. - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -106,7 +105,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -125,28 +124,28 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" ); end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -157,7 +156,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -180,13 +179,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -197,7 +195,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, @@ -205,13 +203,15 @@ package body TMTEST is MESSAGE_SIZE, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" ); - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" ); end MIDDLE_TASKS; diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.ads b/c/src/ada-tests/tmtests/tm13/tmtest.ads index 72492b2667..5b6a08d782 100644 --- a/c/src/ada-tests/tmtests/tm13/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm13/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -95,7 +96,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -109,7 +110,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); diff --git a/c/src/ada-tests/tmtests/tm14/tm14.adb b/c/src/ada-tests/tmtests/tm14/tm14.adb index 21c61ea78e..afef0cab28 100644 --- a/c/src/ada-tests/tmtests/tm14/tm14.adb +++ b/c/src/ada-tests/tmtests/tm14/tm14.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM14 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.adb b/c/src/ada-tests/tmtests/tm14/tmtest.adb index 94c227ae48..9abb9adf97 100644 --- a/c/src/ada-tests/tmtests/tm14/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm14/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TASK_ID : RTEMS.ID; @@ -45,7 +45,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 14 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( 1, 251, 1024, @@ -56,7 +56,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -64,22 +64,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; - PRIORITY : RTEMS.TASK_PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; + PRIORITY : RTEMS.TASKS.PRIORITY; TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; @@ -88,7 +87,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -102,7 +101,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), PRIORITY, 1024, @@ -121,28 +120,28 @@ package body TMTEST is TASK_ENTRY := TMTEST.LOW_TASKS'ACCESS; end if; - RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TASK_ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSSAGE_QUEUE_URGENT" ); end TEST_INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -163,7 +162,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_URGENT( + RTEMS.MESSAGE_QUEUE.URGENT( TMTEST.QUEUE_ID, BUFFER_POINTER, 16, @@ -187,13 +186,12 @@ package body TMTEST is end HIGH_TASK; ---PAGE -- -- LOW_TASKS -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -204,7 +202,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_OPTIONS, diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.ads b/c/src/ada-tests/tmtests/tm14/tmtest.ads index f76ac8f14e..96f7f85fb5 100644 --- a/c/src/ada-tests/tmtests/tm14/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm14/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -72,7 +73,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -87,7 +88,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -100,7 +101,7 @@ package TMTEST is -- procedure LOW_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASKS); diff --git a/c/src/ada-tests/tmtests/tm15/tm15.adb b/c/src/ada-tests/tmtests/tm15/tm15.adb index de88857bf3..95185f2699 100644 --- a/c/src/ada-tests/tmtests/tm15/tm15.adb +++ b/c/src/ada-tests/tmtests/tm15/tm15.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM15 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.adb b/c/src/ada-tests/tmtests/tm15/tmtest.adb index 26008e3f2d..9704d2d77b 100644 --- a/c/src/ada-tests/tmtests/tm15/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm15/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -24,16 +24,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.EVENT; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -44,12 +44,11 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- @@ -64,7 +63,7 @@ package body TMTEST is TMTEST.TIME_SET := FALSE; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 10, 1024, @@ -75,13 +74,13 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" ); - RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOW" ); for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 5, 1024, @@ -92,7 +91,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TMTEST.HIGH_TASKS'ACCESS, 0, @@ -112,7 +111,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.PENDING_EVENTS, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -133,7 +132,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.ALL_EVENTS, RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -153,13 +152,12 @@ package body TMTEST is end TEST_INIT; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; @@ -187,7 +185,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_SEND( RTEMS.SELF, RTEMS.EVENT_16, STATUS ); + RTEMS.EVENT.SEND( RTEMS.SELF, RTEMS.EVENT_16, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -200,7 +198,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -220,7 +218,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.EVENT_SEND( + RTEMS.EVENT.SEND( TMTEST.TASK_ID( INDEX ), RTEMS.EVENT_16, STATUS @@ -241,13 +239,12 @@ package body TMTEST is end LOW_TASK; ---PAGE -- -- HIGH_TASKS -- procedure HIGH_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; @@ -259,7 +256,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; end if; - RTEMS.EVENT_RECEIVE( + RTEMS.EVENT.RECEIVE( 16#7FFFFFFF#, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.ads b/c/src/ada-tests/tmtests/tm15/tmtest.ads index 87e7bd3f3d..b4be8b2725 100644 --- a/c/src/ada-tests/tmtests/tm15/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm15/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -88,7 +89,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); @@ -103,7 +104,7 @@ package TMTEST is -- procedure HIGH_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASKS); diff --git a/c/src/ada-tests/tmtests/tm16/tm16.adb b/c/src/ada-tests/tmtests/tm16/tm16.adb index cc17686431..a9d675548a 100644 --- a/c/src/ada-tests/tmtests/tm16/tm16.adb +++ b/c/src/ada-tests/tmtests/tm16/tm16.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM16 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.adb b/c/src/ada-tests/tmtests/tm16/tmtest.adb index 0bb4f9d9b7..27c2615d64 100644 --- a/c/src/ada-tests/tmtests/tm16/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm16/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,16 +25,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.EVENT; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -44,7 +44,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 16 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), 251, 2048, @@ -55,7 +55,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TEST INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( ID, TMTEST.TEST_INIT'ACCESS, 0, @@ -63,22 +63,21 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TEST INIT" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PRIORITY : RTEMS.TASK_PRIORITY; - TASK_ENTRY : RTEMS.TASK_ENTRY; + PRIORITY : RTEMS.TASKS.PRIORITY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin @@ -87,7 +86,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ), PRIORITY, 1024, @@ -104,7 +103,7 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, @@ -120,59 +119,60 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; -- starts the timer - RTEMS.EVENT_SEND( -- preempts task + RTEMS.EVENT.SEND( -- preempts task TMTEST.TASK_ID( TMTEST.TASK_COUNT ), RTEMS.EVENT_16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" ); end TEST_INIT; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_RECEIVE( -- task blocks + RTEMS.EVENT.RECEIVE( -- task blocks RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, EVENT_OUT, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" ); TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; - RTEMS.EVENT_SEND( -- preempts task + RTEMS.EVENT.SEND( -- preempts task TMTEST.TASK_ID( TMTEST.TASK_COUNT ), RTEMS.EVENT_16, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" ); end MIDDLE_TASKS; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); EVENT_OUT : RTEMS.EVENT_SET; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.EVENT_RECEIVE( -- task blocks + RTEMS.EVENT.RECEIVE( -- task blocks RTEMS.EVENT_16, RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.ads b/c/src/ada-tests/tmtests/tm16/tmtest.ads index c1492834d3..c7df756b67 100644 --- a/c/src/ada-tests/tmtests/tm16/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm16/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TIME_TEST_SUPPORT; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -70,7 +71,7 @@ package TMTEST is -- procedure TEST_INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_INIT); @@ -88,7 +89,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -106,7 +107,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); diff --git a/c/src/ada-tests/tmtests/tm17/tm17.adb b/c/src/ada-tests/tmtests/tm17/tm17.adb index fbb3b20d01..d7d4f24381 100644 --- a/c/src/ada-tests/tmtests/tm17/tm17.adb +++ b/c/src/ada-tests/tmtests/tm17/tm17.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM17 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.adb b/c/src/ada-tests/tmtests/tm17/tmtest.adb index 2d03e1e883..3b2ab4b951 100644 --- a/c/src/ada-tests/tmtests/tm17/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm17/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -28,16 +28,15 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_ENTRY : RTEMS.TASK_ENTRY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin @@ -49,7 +48,7 @@ package body TMTEST is for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), TMTEST.TASK_PRIORITY, 1024, @@ -68,28 +67,27 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; TMTEST.TASK_COUNT := 1; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- FIRST_TASK -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -98,7 +96,7 @@ package body TMTEST is TMTEST.TASK_PRIORITY := TMTEST.TASK_PRIORITY - 1; TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID( TMTEST.TASK_COUNT ), TMTEST.TASK_PRIORITY, PREVIOUS_PRIORITY, @@ -107,23 +105,22 @@ package body TMTEST is end FIRST_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin TMTEST.TASK_PRIORITY := TMTEST.TASK_PRIORITY - 1; TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( TMTEST.TASK_ID( TMTEST.TASK_COUNT ), TMTEST.TASK_PRIORITY, PREVIOUS_PRIORITY, @@ -132,13 +129,12 @@ package body TMTEST is end MIDDLE_TASKS; ---PAGE -- -- LAST_TASK -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.ads b/c/src/ada-tests/tmtests/tm17/tmtest.ads index 90368080a9..8c8c290577 100644 --- a/c/src/ada-tests/tmtests/tm17/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm17/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TIME_TEST_SUPPORT; package TMTEST is @@ -42,7 +43,7 @@ package TMTEST is -- TASK_COUNT : RTEMS.UNSIGNED32; - TASK_PRIORITY : RTEMS.TASK_PRIORITY; + TASK_PRIORITY : RTEMS.TASKS.PRIORITY; -- -- The following variable is set to the execution time returned @@ -60,7 +61,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -75,7 +76,7 @@ package TMTEST is -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, FIRST_TASK); @@ -89,7 +90,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -104,7 +105,7 @@ package TMTEST is -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LAST_TASK); diff --git a/c/src/ada-tests/tmtests/tm18/tm18.adb b/c/src/ada-tests/tmtests/tm18/tm18.adb index 6c547f39ef..69638b68fe 100644 --- a/c/src/ada-tests/tmtests/tm18/tm18.adb +++ b/c/src/ada-tests/tmtests/tm18/tm18.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM18 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.adb b/c/src/ada-tests/tmtests/tm18/tmtest.adb index a0a679944b..0e21d4b433 100644 --- a/c/src/ada-tests/tmtests/tm18/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm18/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -29,13 +29,12 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -46,12 +45,11 @@ package body TMTEST is TMTEST.TEST_INIT; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_INIT -- @@ -59,14 +57,14 @@ package body TMTEST is procedure TEST_INIT is ID : RTEMS.ID; - TASK_ENTRY : RTEMS.TASK_ENTRY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 128, 1024, @@ -86,20 +84,19 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; end TEST_INIT; ---PAGE -- -- FIRST_TASK -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -107,33 +104,33 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); end FIRST_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" ); end MIDDLE_TASKS; ---PAGE -- -- LAST_TASK -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.ads b/c/src/ada-tests/tmtests/tm18/tmtest.ads index 8b18547129..d476ebd6e3 100644 --- a/c/src/ada-tests/tmtests/tm18/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm18/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -40,7 +41,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -64,7 +65,7 @@ package TMTEST is -- procedure FIRST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, FIRST_TASK); @@ -77,7 +78,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -91,7 +92,7 @@ package TMTEST is -- procedure LAST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LAST_TASK); diff --git a/c/src/ada-tests/tmtests/tm19/tm19.adb b/c/src/ada-tests/tmtests/tm19/tm19.adb index 46811b1af4..64709d0d14 100644 --- a/c/src/ada-tests/tmtests/tm19/tm19.adb +++ b/c/src/ada-tests/tmtests/tm19/tm19.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM19 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.adb b/c/src/ada-tests/tmtests/tm19/tmtest.adb index fbcadae312..eb0c1cd42f 100644 --- a/c/src/ada-tests/tmtests/tm19/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm19/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,16 +25,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.SIGNAL; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -43,7 +43,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 19 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 128, 1024, @@ -54,7 +54,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -62,7 +62,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 127, 1024, @@ -73,7 +73,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 2 ), TMTEST.TASK_2'ACCESS, 0, @@ -81,7 +81,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 126, 1024, @@ -92,7 +92,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 3 ), TMTEST.TASK_3'ACCESS, 0, @@ -100,12 +100,11 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK3" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PROCESS_ASR_FOR_PASS_1 -- @@ -132,7 +131,6 @@ package body TMTEST is end PROCESS_ASR_FOR_PASS_1; ---PAGE -- -- PROCESS_ASR_FOR_PASS_2 -- @@ -146,32 +144,32 @@ package body TMTEST is TEXT_IO.PUT_LINE( "SIGNAL_ENTER (preemptive) na" ); - RTEMS.TASK_RESUME( TMTEST.TASK_ID( 3 ), STATUS ); + RTEMS.TASKS.RESUME( TMTEST.TASK_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); TIMER_DRIVER.INITIALIZE; end PROCESS_ASR_FOR_PASS_2; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( TMTEST.PROCESS_ASR_FOR_PASS_1'ACCESS, RTEMS.DEFAULT_MODES, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); TIME_TEST_SUPPORT.PUT_TIME( "SIGNAL_CATCH", @@ -182,8 +180,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_SEND( TMTEST.TASK_ID( 2 ), RTEMS.SIGNAL_1, STATUS ); + RTEMS.SIGNAL.SEND( TMTEST.TASK_ID( 2 ), RTEMS.SIGNAL_1, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" ); TIME_TEST_SUPPORT.PUT_TIME( "SIGNAL_SEND (non-preemptive)", @@ -194,7 +193,8 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + RTEMS.SIGNAL.SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" ); -- end time is done in ASR @@ -208,7 +208,7 @@ package body TMTEST is 0 ); - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( TMTEST.PROCESS_ASR_FOR_PASS_2'ACCESS, RTEMS.NO_PREEMPT, STATUS @@ -216,11 +216,11 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); TIMER_DRIVER.INITIALIZE; - RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + RTEMS.SIGNAL.SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" ); end TASK_1; ---PAGE -- -- PROCESS_ASR_FOR_TASK_2 -- @@ -234,42 +234,42 @@ package body TMTEST is end PROCESS_ASR_FOR_TASK_2; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( TMTEST.PROCESS_ASR_FOR_TASK_2'ACCESS, RTEMS.DEFAULT_MODES, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end TASK_2; ---PAGE -- -- TASK_3 -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.ads b/c/src/ada-tests/tmtests/tm19/tmtest.ads index 0f0a6e3d76..7e1283b77d 100644 --- a/c/src/ada-tests/tmtests/tm19/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm19/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -96,7 +97,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -124,7 +125,7 @@ package TMTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); @@ -141,7 +142,7 @@ package TMTEST is -- procedure TASK_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_3); diff --git a/c/src/ada-tests/tmtests/tm20/tm20.adb b/c/src/ada-tests/tmtests/tm20/tm20.adb index ca8ba1f688..af1089bf1c 100644 --- a/c/src/ada-tests/tmtests/tm20/tm20.adb +++ b/c/src/ada-tests/tmtests/tm20/tm20.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM20 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.adb b/c/src/ada-tests/tmtests/tm20/tmtest.adb index 506e5927df..69188c942e 100644 --- a/c/src/ada-tests/tmtests/tm20/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm20/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,16 +25,17 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.PARTITION; +with RTEMS.REGION; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -43,7 +44,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 20 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', '1' ), 128, 2048, @@ -54,7 +55,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -62,7 +63,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', '2' ), 129, 2048, @@ -73,7 +74,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 2 ), TMTEST.TASK_2'ACCESS, 0, @@ -81,23 +82,22 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER_COUNT : RTEMS.UNSIGNED32; PREVIOUS_MODE : RTEMS.MODE; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -105,7 +105,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( TMTEST.PARTITION_NAME, TMTEST.PARTITION_AREA'ADDRESS, 2048, @@ -128,7 +128,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( TMTEST.REGION_NAME, TMTEST.REGION_AREA'ADDRESS, 2048, @@ -148,7 +148,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS @@ -166,7 +166,7 @@ package body TMTEST is BUFFER_COUNT := 0; loop - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESSES( BUFFER_COUNT ), STATUS @@ -179,7 +179,7 @@ package body TMTEST is end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS @@ -195,7 +195,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS @@ -213,7 +213,7 @@ package body TMTEST is for INDEX in 0 .. BUFFER_COUNT - 1 loop - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESSES( INDEX ), STATUS @@ -223,7 +223,7 @@ package body TMTEST is end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_DELETE( TMTEST.PARTITION_ID, STATUS ); + RTEMS.PARTITION.DELETE( TMTEST.PARTITION_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -234,7 +234,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.PARTITION_DELETE ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -245,7 +245,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -264,7 +264,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.NO_WAIT, @@ -282,7 +282,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_GET_SEGMENT ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_3, STATUS @@ -290,7 +290,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS @@ -305,7 +305,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -316,7 +316,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.DEFAULT_OPTIONS, @@ -337,14 +337,14 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -352,10 +352,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); - RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -364,7 +364,7 @@ package body TMTEST is STATUS ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.DEFAULT_OPTIONS, @@ -372,18 +372,21 @@ package body TMTEST is TMTEST.BUFFER_ADDRESS_2, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); -- execute TASK_2 - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_DELETE( TMTEST.REGION_ID, STATUS ); + RTEMS.REGION.DELETE( TMTEST.REGION_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE" ); TIME_TEST_SUPPORT.PUT_TIME( "REGION_DELETE", @@ -398,13 +401,12 @@ package body TMTEST is end TASK_1; ---PAGE -- -- TASK_2 -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -421,21 +423,23 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS ); -- preempt back to TASK_1 + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIME_TEST_SUPPORT.PUT_TIME( "REGION_RETURN_SEGMENT (ready -- return)", @@ -445,7 +449,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end TASK_2; diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.ads b/c/src/ada-tests/tmtests/tm20/tmtest.ads index 58674f1771..105b8552b3 100644 --- a/c/src/ada-tests/tmtests/tm20/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm20/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -96,7 +97,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -128,7 +129,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); @@ -145,7 +146,7 @@ package TMTEST is -- procedure TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_2); diff --git a/c/src/ada-tests/tmtests/tm21/tm21.adb b/c/src/ada-tests/tmtests/tm21/tm21.adb index 570f871100..e2acfad20b 100644 --- a/c/src/ada-tests/tmtests/tm21/tm21.adb +++ b/c/src/ada-tests/tmtests/tm21/tm21.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM21 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.adb b/c/src/ada-tests/tmtests/tm21/tmtest.adb index a59cc4c93e..104e955951 100644 --- a/c/src/ada-tests/tmtests/tm21/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm21/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,16 +25,22 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.PARTITION; +with RTEMS.PORT; +with RTEMS.RATE_MONOTONIC; +with RTEMS.REGION; +with RTEMS.SEMAPHORE; +with RTEMS.TIMER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -44,7 +50,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 21 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 250, 2048, @@ -55,21 +61,20 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE TASK_1" ); - RTEMS.TASK_START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START TASK1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -80,7 +85,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( INDEX, 254, 1024, @@ -91,7 +96,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( INDEX, TIME_TEST_SUPPORT.OPERATION_COUNT, 16, @@ -101,17 +106,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( INDEX, TIME_TEST_SUPPORT.OPERATION_COUNT, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" ); - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( INDEX, TMTEST.REGION_AREA'ADDRESS, 2048, @@ -122,7 +127,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE" ); - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( INDEX, TMTEST.PARTITION_AREA'ADDRESS, 2048, @@ -133,7 +138,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" ); - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( INDEX, TMTEST.INTERNAL_PORT_AREA'ADDRESS, TMTEST.EXTERNAL_PORT_AREA'ADDRESS, @@ -143,10 +148,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_CREATE" ); - RTEMS.TIMER_CREATE( INDEX, ID, STATUS ); + RTEMS.TIMER.CREATE( INDEX, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); - RTEMS.RATE_MONOTONIC_CREATE( INDEX, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( INDEX, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" ); end loop; @@ -161,7 +166,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, STATUS ); + RTEMS.TASKS.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -176,7 +181,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, @@ -196,7 +201,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, @@ -216,7 +221,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PARTITION_IDENT( + RTEMS.PARTITION.IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, @@ -236,7 +241,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.REGION_IDENT( INDEX, ID, STATUS ); + RTEMS.REGION.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -251,7 +256,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_IDENT( INDEX, ID, STATUS ); + RTEMS.PORT.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -266,7 +271,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_IDENT( INDEX, ID, STATUS ); + RTEMS.TIMER.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -281,7 +286,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.RATE_MONOTONIC_IDENT( INDEX, ID, STATUS ); + RTEMS.RATE_MONOTONIC.IDENT( INDEX, ID, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.ads b/c/src/ada-tests/tmtests/tm21/tmtest.ads index 9714b0e12d..64146a27b9 100644 --- a/c/src/ada-tests/tmtests/tm21/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm21/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SYSTEM; with System.Storage_Elements; @@ -51,7 +52,7 @@ package TMTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -63,7 +64,7 @@ package TMTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -92,7 +93,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -115,7 +116,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/tmtests/tm22/tm22.adb b/c/src/ada-tests/tmtests/tm22/tm22.adb index 6af7a211f9..cf885b3307 100644 --- a/c/src/ada-tests/tmtests/tm22/tm22.adb +++ b/c/src/ada-tests/tmtests/tm22/tm22.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM22 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.adb b/c/src/ada-tests/tmtests/tm22/tmtest.adb index f4d59df030..3ea08c9b5b 100644 --- a/c/src/ada-tests/tmtests/tm22/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm22/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,16 +25,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.MESSAGE_QUEUE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -44,7 +44,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 22 ***" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), 100, 16, @@ -54,7 +54,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 10, 2048, @@ -65,10 +65,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" ); - RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOW" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'P', 'R', 'M', 'T' ), 11, 2048, @@ -79,21 +79,20 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE PREEMPT" ); - RTEMS.TASK_START( ID, TMTEST.PREEMPT_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.PREEMPT_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START PREEMPT" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -105,7 +104,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, 16, @@ -122,18 +121,17 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end HIGH_TASK; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -147,7 +145,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 5, 2048, @@ -158,10 +156,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" ); - RTEMS.TASK_START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HIGH" ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_MODES, @@ -180,7 +178,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, 16, @@ -198,7 +196,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, RTEMS.DEFAULT_MODES, @@ -224,13 +222,12 @@ package body TMTEST is end LOW_TASK; ---PAGE -- -- LOW_TASK -- procedure PREEMPT_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; @@ -242,7 +239,7 @@ package body TMTEST is BUFFER_POINTER := BUFFER'ADDRESS; TIMER_DRIVER.INITIALIZE; - RTEMS.MESSAGE_QUEUE_BROADCAST( + RTEMS.MESSAGE_QUEUE.BROADCAST( TMTEST.MESSAGE_QUEUE_ID, BUFFER_POINTER, 16, diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.ads b/c/src/ada-tests/tmtests/tm22/tmtest.ads index ab94637097..b21fd23fae 100644 --- a/c/src/ada-tests/tmtests/tm22/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm22/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -59,7 +60,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -77,7 +78,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -100,7 +101,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); @@ -114,7 +115,7 @@ package TMTEST is -- procedure PREEMPT_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, PREEMPT_TASK); diff --git a/c/src/ada-tests/tmtests/tm23/tm23.adb b/c/src/ada-tests/tmtests/tm23/tm23.adb index e3022e5fe0..71041293f6 100644 --- a/c/src/ada-tests/tmtests/tm23/tm23.adb +++ b/c/src/ada-tests/tmtests/tm23/tm23.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM23 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.adb b/c/src/ada-tests/tmtests/tm23/tmtest.adb index c801e9a8ae..1e5bb67c2c 100644 --- a/c/src/ada-tests/tmtests/tm23/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm23/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,21 +25,22 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.CLOCK; +with RTEMS.TIMER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); - TASK_PRIORITY : RTEMS.TASK_PRIORITY; + TASK_PRIORITY : RTEMS.TASKS.PRIORITY; ID : RTEMS.ID; - TASK_ENTRY : RTEMS.TASK_ENTRY; + TASK_ENTRY : RTEMS.TASKS.ENTRY_POINT; STATUS : RTEMS.STATUS_CODES; begin @@ -51,7 +52,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), TASK_PRIORITY, 1024, @@ -70,19 +71,18 @@ package body TMTEST is TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS; end if; - RTEMS.TASK_START( ID, TASK_ENTRY, 0, STATUS ); + RTEMS.TASKS.START( ID, TASK_ENTRY, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); TASK_PRIORITY := TASK_PRIORITY + 1; end loop; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- NULL_DELAY -- @@ -97,13 +97,12 @@ package body TMTEST is end NULL_DELAY; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; @@ -120,7 +119,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( INDEX, TMTEST.TIMER_ID( INDEX ), STATUS @@ -139,7 +138,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMTEST.TIMER_ID( INDEX ), 500, TMTEST.NULL_DELAY'ACCESS, @@ -160,7 +159,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMTEST.TIMER_ID( INDEX ), 500, TMTEST.NULL_DELAY'ACCESS, @@ -181,7 +180,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -196,7 +195,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -211,7 +210,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -226,7 +225,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.RESET( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -240,12 +239,12 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.TIME_OF_DAY := ( 1988, 12, 31, 9, 0, 0, 0 ); - RTEMS.CLOCK_SET( TMTEST.TIME_OF_DAY, STATUS ); + RTEMS.CLOCK.SET( TMTEST.TIME_OF_DAY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" ); TMTEST.TIME_OF_DAY.YEAR := 1989; @@ -253,7 +252,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( TMTEST.TIMER_ID( INDEX ), TMTEST.TIME_OF_DAY, TMTEST.NULL_DELAY'ACCESS, @@ -274,7 +273,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_FIRE_WHEN( + RTEMS.TIMER.FIRE_WHEN( TMTEST.TIMER_ID( INDEX ), TMTEST.TIME_OF_DAY, TMTEST.NULL_DELAY'ACCESS, @@ -295,7 +294,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -309,10 +308,10 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_CREATE( INDEX, TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CREATE( INDEX, TMTEST.TIMER_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" ); - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( TMTEST.TIMER_ID( INDEX ), 500, TMTEST.NULL_DELAY'ACCESS, @@ -321,7 +320,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); - RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" ); end loop; @@ -329,7 +328,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TIMER_DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); + RTEMS.TIMER.DELETE( TMTEST.TIMER_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -342,33 +341,33 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.TASK_WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_WHEN" ); end HIGH_TASK; ---PAGE -- -- MIDDLE_TASKS -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + RTEMS.TASKS.WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_WHEN" ); end MIDDLE_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.ads b/c/src/ada-tests/tmtests/tm23/tmtest.ads index 8d8d95f096..d69874863f 100644 --- a/c/src/ada-tests/tmtests/tm23/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm23/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,6 +22,7 @@ with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -55,7 +56,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -99,7 +100,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -112,7 +113,7 @@ package TMTEST is -- procedure MIDDLE_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, MIDDLE_TASKS); @@ -126,7 +127,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm24/tm24.adb b/c/src/ada-tests/tmtests/tm24/tm24.adb index fe6404f76e..b10e75f846 100644 --- a/c/src/ada-tests/tmtests/tm24/tm24.adb +++ b/c/src/ada-tests/tmtests/tm24/tm24.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM24 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.adb b/c/src/ada-tests/tmtests/tm24/tmtest.adb index f0f99fce89..9015df98d7 100644 --- a/c/src/ada-tests/tmtests/tm24/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm24/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -29,13 +29,12 @@ with TIMER_DRIVER; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -52,7 +51,7 @@ package body TMTEST is end loop; TMTEST.OVERHEAD := TIMER_DRIVER.READ_TIMER; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 10, 1024, @@ -63,13 +62,13 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" ); - RTEMS.TASK_START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HIGH" ); for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'R', 'E', 'S', 'T' ), 128, 1024, @@ -80,23 +79,22 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- HIGH_TASK -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -105,7 +103,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -119,18 +117,17 @@ package body TMTEST is TMTEST.TASK_COUNT := 0; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end HIGH_TASK; ---PAGE -- -- TASKS -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -158,7 +155,8 @@ package body TMTEST is end if; - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); end TASKS; diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.ads b/c/src/ada-tests/tmtests/tm24/tmtest.ads index 920709f519..72c7a997d4 100644 --- a/c/src/ada-tests/tmtests/tm24/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm24/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -63,7 +64,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -78,7 +79,7 @@ package TMTEST is -- procedure HIGH_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASK); @@ -93,7 +94,7 @@ package TMTEST is -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASKS); diff --git a/c/src/ada-tests/tmtests/tm25/tm25.adb b/c/src/ada-tests/tmtests/tm25/tm25.adb index 2a237b673b..e2fe3210b8 100644 --- a/c/src/ada-tests/tmtests/tm25/tm25.adb +++ b/c/src/ada-tests/tmtests/tm25/tm25.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM25 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.adb b/c/src/ada-tests/tmtests/tm25/tmtest.adb index 3a55f22800..4c4ca8429a 100644 --- a/c/src/ada-tests/tmtests/tm25/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm25/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -25,16 +25,17 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.CLOCK; +with RTEMS.SEMAPHORE; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TASK_ID : RTEMS.ID; @@ -44,17 +45,17 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 25 ***" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ), 0, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, TMTEST.SEMAPHORE_ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 254, 2048, @@ -65,7 +66,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.LOW_TASK'ACCESS, 0, @@ -76,7 +77,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), 128, 1024, @@ -87,7 +88,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TASK_ID, TMTEST.HIGH_TASKS'ACCESS, 0, @@ -96,39 +97,38 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- HIGH_TASKS -- procedure HIGH_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( TMTEST.SEMAPHORE_ID, RTEMS.DEFAULT_OPTIONS, RTEMS.INTERVAL'LAST, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); end HIGH_TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -137,7 +137,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.CLOCK_TICK( STATUS ); + RTEMS.CLOCK.TICK( STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.ads b/c/src/ada-tests/tmtests/tm25/tmtest.ads index ac9ca3864d..4c28a502bd 100644 --- a/c/src/ada-tests/tmtests/tm25/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm25/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -46,7 +47,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -60,7 +61,7 @@ package TMTEST is -- procedure HIGH_TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, HIGH_TASKS); @@ -74,7 +75,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tm28/tm28.adb b/c/src/ada-tests/tmtests/tm28/tm28.adb index d66703adf3..d6628124c5 100644 --- a/c/src/ada-tests/tmtests/tm28/tm28.adb +++ b/c/src/ada-tests/tmtests/tm28/tm28.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM28 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.adb b/c/src/ada-tests/tmtests/tm28/tmtest.adb index c1331b54fd..69379e7ae9 100644 --- a/c/src/ada-tests/tmtests/tm28/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm28/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -24,16 +24,16 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.PORT; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -42,7 +42,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 28 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), 128, 1024, @@ -53,7 +53,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TEST_TASK'ACCESS, 0, @@ -61,18 +61,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); NAME : RTEMS.NAME; @@ -92,7 +91,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_CREATE( + RTEMS.PORT.CREATE( NAME, TMTEST.INTERNAL_PORT_AREA'ADDRESS, TMTEST.EXTERNAL_PORT_AREA'ADDRESS, @@ -114,7 +113,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_EXTERNAL_TO_INTERNAL( + RTEMS.PORT.EXTERNAL_TO_INTERNAL( TMTEST.PORT_ID( 1 ), TMTEST.EXTERNAL_PORT_AREA( 16#F# )'ADDRESS, CONVERTED, @@ -134,7 +133,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_INTERNAL_TO_EXTERNAL( + RTEMS.PORT.INTERNAL_TO_EXTERNAL( TMTEST.PORT_ID( 1 ), TMTEST.INTERNAL_PORT_AREA( 16#F# )'ADDRESS, CONVERTED, @@ -154,7 +153,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.PORT_DELETE( TMTEST.PORT_ID( INDEX ), STATUS ); + RTEMS.PORT.DELETE( TMTEST.PORT_ID( INDEX ), STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.ads b/c/src/ada-tests/tmtests/tm28/tmtest.ads index 2e7062cfa6..470cbddb81 100644 --- a/c/src/ada-tests/tmtests/tm28/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm28/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -23,6 +23,7 @@ with SYSTEM; with TIME_TEST_SUPPORT; with RTEMS; +with RTEMS.TASKS; with System.Storage_Elements; package TMTEST is @@ -50,7 +51,7 @@ package TMTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -62,7 +63,7 @@ package TMTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- -- The following variable is set to the execution time returned @@ -80,7 +81,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -99,7 +100,7 @@ package TMTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/tmtests/tm29/tm29.adb b/c/src/ada-tests/tmtests/tm29/tm29.adb index 5ece52b2ef..1cbe02d262 100644 --- a/c/src/ada-tests/tmtests/tm29/tm29.adb +++ b/c/src/ada-tests/tmtests/tm29/tm29.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TM29 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.adb b/c/src/ada-tests/tmtests/tm29/tmtest.adb index b785fbeb39..9710fb32b9 100644 --- a/c/src/ada-tests/tmtests/tm29/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm29/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.RATE_MONOTONIC; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -48,7 +48,7 @@ package body TMTEST is TMTEST.PERIOD_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'D', ' ' ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -60,8 +60,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_PERIOD (initial)", @@ -72,8 +73,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_PERIOD( ID, RTEMS.PERIOD_STATUS, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, RTEMS.RATE_MONOTONIC_PERIOD_STATUS, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_PERIOD (STATUS)", @@ -84,8 +86,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_CANCEL( ID, STATUS ); + RTEMS.RATE_MONOTONIC.CANCEL( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CANCEL" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_CANCEL", @@ -96,7 +99,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -107,14 +110,14 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_DELETE ); - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" ); - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -128,7 +131,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), 128, 1024, @@ -139,12 +142,12 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 200, 2048, @@ -155,37 +158,38 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); TMTEST.TASK_COUNT := 0; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TASKS -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.NAME; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); -- Give up the processor to allow all tasks to actually -- create and start their period timer before the benchmark -- timer driver is initialized. - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; @@ -193,17 +197,17 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; end if; - RTEMS.RATE_MONOTONIC_PERIOD( ID, 100, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 100, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); end TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.ads b/c/src/ada-tests/tmtests/tm29/tmtest.ads index e254a8a98c..93d20c33cd 100644 --- a/c/src/ada-tests/tmtests/tm29/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm29/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -62,7 +63,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -76,7 +77,7 @@ package TMTEST is -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASKS); @@ -90,7 +91,7 @@ package TMTEST is -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, LOW_TASK); diff --git a/c/src/ada-tests/tmtests/tmck/tmck.adb b/c/src/ada-tests/tmtests/tmck/tmck.adb index 5008c5c01f..86f29bf66a 100644 --- a/c/src/ada-tests/tmtests/tmck/tmck.adb +++ b/c/src/ada-tests/tmtests/tmck/tmck.adb @@ -9,7 +9,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TMCK is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.adb b/c/src/ada-tests/tmtests/tmck/tmtest.adb index ce49323a14..2a587065d7 100644 --- a/c/src/ada-tests/tmtests/tmck/tmtest.adb +++ b/c/src/ada-tests/tmtests/tmck/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -29,13 +29,12 @@ with UNSIGNED32_IO; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -48,7 +47,7 @@ package body TMTEST is TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TMTEST.TASK_NAME( 1 ), 1, 2048, @@ -59,7 +58,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -67,18 +66,17 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); begin @@ -158,7 +156,6 @@ TEST_SUPPORT.PAUSE; end TASK_1; ---PAGE -- -- CHECK_READ_TIMER -- diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.ads b/c/src/ada-tests/tmtests/tmck/tmtest.ads index 6872152c6c..45bf7e0f07 100644 --- a/c/src/ada-tests/tmtests/tmck/tmtest.ads +++ b/c/src/ada-tests/tmtests/tmck/tmtest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package TMTEST is @@ -62,7 +63,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -78,7 +79,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb index 79c99e47ab..f93afbad0f 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb @@ -27,7 +27,7 @@ package body DUMMY_RTEMS is procedure TASK_CREATE ( NAME : in RTEMS.NAME; - INITIAL_PRIORITY : in RTEMS.TASK_PRIORITY; + INITIAL_PRIORITY : in RTEMS.TASKS.PRIORITY; STACK_SIZE : in RTEMS.UNSIGNED32; INITIAL_MODES : in RTEMS.MODE; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; @@ -63,7 +63,7 @@ package body DUMMY_RTEMS is procedure TASK_START ( ID : in RTEMS.ID; - ENTRY_POINT : in RTEMS.TASK_ENTRY; + ENTRY_POINT : in RTEMS.TASKS.ENTRY_POINT; ARGUMENT : in RTEMS.UNSIGNED32; RESULT : out RTEMS.STATUS_CODES ) is @@ -124,8 +124,8 @@ package body DUMMY_RTEMS is procedure TASK_SET_PRIORITY ( ID : in RTEMS.ID; - NEW_PRIORITY : in RTEMS.TASK_PRIORITY; - OLD_PRIORITY : out RTEMS.TASK_PRIORITY; + NEW_PRIORITY : in RTEMS.TASKS.PRIORITY; + OLD_PRIORITY : out RTEMS.TASKS.PRIORITY; RESULT : out RTEMS.STATUS_CODES ) is pragma Unreferenced(ID); @@ -222,7 +222,7 @@ package body DUMMY_RTEMS is -- Clock Manager procedure CLOCK_GET ( - OPTION : in RTEMS.CLOCK_GET_OPTIONS; + OPTION : in RTEMS.CLOCK.GET_OPTIONS; TIME_BUFFER : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ) is @@ -296,7 +296,7 @@ package body DUMMY_RTEMS is procedure TIMER_FIRE_AFTER ( ID : in RTEMS.ID; TICKS : in RTEMS.INTERVAL; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ) is @@ -313,7 +313,7 @@ package body DUMMY_RTEMS is procedure TIMER_FIRE_WHEN ( ID : in RTEMS.ID; WALL_TIME : in RTEMS.TIME_OF_DAY; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ) is @@ -355,7 +355,7 @@ package body DUMMY_RTEMS is NAME : in RTEMS.NAME; COUNT : in RTEMS.UNSIGNED32; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; - PRIORITY_CEILING : in RTEMS.TASK_PRIORITY; + PRIORITY_CEILING : in RTEMS.TASKS.PRIORITY; ID : out RTEMS.ID; RESULT : out RTEMS.STATUS_CODES ) is diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads index 3259ac75ca..6f6d62505b 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads +++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads @@ -22,6 +22,9 @@ -- with RTEMS; +with RTEMS.CLOCK; +with RTEMS.TASKS; +with RTEMS.TIMER; package DUMMY_RTEMS is @@ -29,7 +32,7 @@ package DUMMY_RTEMS is procedure TASK_CREATE ( NAME : in RTEMS.NAME; - INITIAL_PRIORITY : in RTEMS.TASK_PRIORITY; + INITIAL_PRIORITY : in RTEMS.TASKS.PRIORITY; STACK_SIZE : in RTEMS.UNSIGNED32; INITIAL_MODES : in RTEMS.MODE; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; @@ -46,7 +49,7 @@ package DUMMY_RTEMS is procedure TASK_START ( ID : in RTEMS.ID; - ENTRY_POINT : in RTEMS.TASK_ENTRY; + ENTRY_POINT : in RTEMS.TASKS.ENTRY_POINT; ARGUMENT : in RTEMS.UNSIGNED32; RESULT : out RTEMS.STATUS_CODES ); @@ -74,8 +77,8 @@ package DUMMY_RTEMS is procedure TASK_SET_PRIORITY ( ID : in RTEMS.ID; - NEW_PRIORITY : in RTEMS.TASK_PRIORITY; - OLD_PRIORITY : out RTEMS.TASK_PRIORITY; + NEW_PRIORITY : in RTEMS.TASKS.PRIORITY; + OLD_PRIORITY : out RTEMS.TASKS.PRIORITY; RESULT : out RTEMS.STATUS_CODES ); @@ -122,7 +125,7 @@ package DUMMY_RTEMS is -- Clock Manager procedure CLOCK_GET ( - OPTION : in RTEMS.CLOCK_GET_OPTIONS; + OPTION : in RTEMS.CLOCK.GET_OPTIONS; TIME_BUFFER : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ); @@ -158,7 +161,7 @@ package DUMMY_RTEMS is procedure TIMER_FIRE_AFTER ( ID : in RTEMS.ID; TICKS : in RTEMS.INTERVAL; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ); @@ -166,7 +169,7 @@ package DUMMY_RTEMS is procedure TIMER_FIRE_WHEN ( ID : in RTEMS.ID; WALL_TIME : in RTEMS.TIME_OF_DAY; - ROUTINE : in RTEMS.TIMER_SERVICE_ROUTINE; + ROUTINE : in RTEMS.TIMER.SERVICE_ROUTINE; USER_DATA : in RTEMS.ADDRESS; RESULT : out RTEMS.STATUS_CODES ); @@ -187,7 +190,7 @@ package DUMMY_RTEMS is NAME : in RTEMS.NAME; COUNT : in RTEMS.UNSIGNED32; ATTRIBUTE_SET : in RTEMS.ATTRIBUTE; - PRIORITY_CEILING : in RTEMS.TASK_PRIORITY; + PRIORITY_CEILING : in RTEMS.TASKS.PRIORITY; ID : out RTEMS.ID; RESULT : out RTEMS.STATUS_CODES ); diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb b/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb index 5f14134fd6..733e895514 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb @@ -20,6 +20,7 @@ -- with RTEMS; +with RTEMS.TASKS; with TMTEST; with TEST_SUPPORT; @@ -28,7 +29,7 @@ procedure TMOVERHD is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -40,7 +41,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, TMTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb index bc2ae8b34d..5bd69282d7 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb @@ -25,6 +25,7 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.CLOCK; package body TMTEST is @@ -34,7 +35,7 @@ package body TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -47,7 +48,7 @@ package body TMTEST is TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( TMTEST.TASK_NAME( 1 ), 254, 2048, @@ -58,7 +59,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -66,7 +67,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; @@ -120,14 +121,14 @@ package body TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); NAME : RTEMS.NAME; OVERHEAD : RTEMS.UNSIGNED32; ID : RTEMS.ID; - IN_PRIORITY : RTEMS.TASK_PRIORITY; - OUT_PRIORITY : RTEMS.TASK_PRIORITY; + IN_PRIORITY : RTEMS.TASKS.PRIORITY; + OUT_PRIORITY : RTEMS.TASKS.PRIORITY; IN_MODE : RTEMS.MODE; MASK : RTEMS.MODE; OUT_MODE : RTEMS.MODE; @@ -437,7 +438,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - DUMMY_RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS ); + DUMMY_RTEMS.CLOCK_GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS ); end loop; TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; @@ -629,7 +630,7 @@ TEST_SUPPORT.PAUSE; NAME, 128, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, ID, STATUS ); diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads b/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads index 5d9b3e1b4f..9ce930f79b 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads +++ b/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with SYSTEM; with System.Storage_Elements; @@ -64,7 +65,7 @@ package TMTEST is INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS; + for INTERNAL_PORT_AREA'Address use INTERNAL_PORT_AREA_ADDRESS; -- -- The following area defines a memory area to be used as the @@ -76,7 +77,7 @@ package TMTEST is EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8; - for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS; + for EXTERNAL_PORT_AREA'Address use EXTERNAL_PORT_AREA_ADDRESS; -- @@ -96,7 +97,7 @@ package TMTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -150,7 +151,7 @@ package TMTEST is -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TASK_1); |