diff options
Diffstat (limited to 'c/src/ada-tests/mptests/mp02')
-rw-r--r-- | c/src/ada-tests/mptests/mp02/mptest.adb | 33 | ||||
-rw-r--r-- | c/src/ada-tests/mptests/mp02/mptest.ads | 7 | ||||
-rw-r--r-- | c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb | 7 | ||||
-rw-r--r-- | c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb | 7 |
4 files changed, 28 insertions, 26 deletions
diff --git a/c/src/ada-tests/mptests/mp02/mptest.adb b/c/src/ada-tests/mptests/mp02/mptest.adb index 9a55f1c572..325863ff64 100644 --- a/c/src/ada-tests/mptests/mp02/mptest.adb +++ b/c/src/ada-tests/mptests/mp02/mptest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,19 +22,19 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.TASKS; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; package body MPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -52,7 +52,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating test task (Global)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 1, 2048, @@ -63,7 +63,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK'ACCESS, 0, @@ -71,18 +71,17 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_TASK -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is TID : RTEMS.ID; TEST_TID : RTEMS.ID; @@ -92,7 +91,7 @@ package body MPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS ); + RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" ); if TEST_SUPPORT.NODE = 1 then @@ -105,7 +104,7 @@ package body MPTEST is loop - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( REMOTE_NODE ), RTEMS.SEARCH_ALL_NODES, REMOTE_TID, @@ -121,7 +120,7 @@ package body MPTEST is -- TEXT_IO.PUT_LINE( "Getting TID of remote task (1 node)" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( MPTEST.TASK_NAME( REMOTE_NODE ), REMOTE_NODE, TEST_TID, @@ -134,7 +133,7 @@ package body MPTEST is RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; - RTEMS.TASK_DELETE( REMOTE_TID, STATUS ); + RTEMS.TASKS.DELETE( REMOTE_TID, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ILLEGAL_ON_REMOTE_OBJECT, @@ -144,7 +143,7 @@ package body MPTEST is "task_delete of remote task returned the correct error" ); - RTEMS.TASK_START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ILLEGAL_ON_REMOTE_OBJECT, @@ -154,7 +153,7 @@ package body MPTEST is "task_start of remote task returned the correct error" ); - RTEMS.TASK_RESTART( REMOTE_TID, 0, STATUS ); + RTEMS.TASKS.RESTART( REMOTE_TID, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, RTEMS.ILLEGAL_ON_REMOTE_OBJECT, @@ -170,7 +169,7 @@ package body MPTEST is TEXT_IO.PUT( " of the remote task to " ); UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ), WIDTH=>1 ); TEXT_IO.NEW_LINE; - RTEMS.TASK_SET_NOTE( + RTEMS.TASKS.SET_NOTE( REMOTE_TID, RTEMS.GET_NODE( TID ), RTEMS.GET_NODE( TID ), @@ -179,7 +178,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" ); TEXT_IO.PUT_LINE( "Getting a notepad of the remote task" ); - RTEMS.TASK_GET_NOTE( + RTEMS.TASKS.GET_NOTE( REMOTE_TID, RTEMS.GET_NODE( TID ), NOTE, @@ -200,7 +199,7 @@ package body MPTEST is end if; - RTEMS.TASK_DELETE( REMOTE_TID, STATUS ); + RTEMS.TASKS.DELETE( REMOTE_TID, STATUS ); TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" ); RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/c/src/ada-tests/mptests/mp02/mptest.ads b/c/src/ada-tests/mptests/mp02/mptest.ads index 20f224cc1b..dcc55e2b6c 100644 --- a/c/src/ada-tests/mptests/mp02/mptest.ads +++ b/c/src/ada-tests/mptests/mp02/mptest.ads @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; package MPTEST is @@ -41,7 +42,7 @@ package MPTEST is -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, INIT); @@ -54,7 +55,7 @@ package MPTEST is -- procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ); pragma Convention (C, TEST_TASK); diff --git a/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb b/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb index 20083de3c2..6346cf1b49 100644 --- a/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb +++ b/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2007. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP02_NODE1 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, diff --git a/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb b/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb index f9c1602940..06aae91fb5 100644 --- a/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb +++ b/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2007. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -21,6 +21,7 @@ -- with RTEMS; +with RTEMS.TASKS; with MPTEST; with TEST_SUPPORT; @@ -29,7 +30,7 @@ procedure MP02_NODE2 is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), 1, RTEMS.MINIMUM_STACK_SIZE, @@ -41,7 +42,7 @@ begin TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( INIT_ID, MPTEST.INIT'ACCESS, 0, |