summaryrefslogtreecommitdiffstats
path: root/c/src/ada-tests/mptests/mp07
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/ada-tests/mptests/mp07')
-rw-r--r--c/src/ada-tests/mptests/mp07/mptest.adb30
-rw-r--r--c/src/ada-tests/mptests/mp07/mptest.ads7
-rw-r--r--c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb7
-rw-r--r--c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb7
4 files changed, 27 insertions, 24 deletions
diff --git a/c/src/ada-tests/mptests/mp07/mptest.adb b/c/src/ada-tests/mptests/mp07/mptest.adb
index fc3bd8570a..4f401ca307 100644
--- a/c/src/ada-tests/mptests/mp07/mptest.adb
+++ b/c/src/ada-tests/mptests/mp07/mptest.adb
@@ -10,7 +10,7 @@
--
--
--
--- COPYRIGHT (c) 1989-1997.
+-- COPYRIGHT (c) 1989-2011.
-- On-Line Applications Research Corporation (OAR).
--
-- The license and distribution terms for this file may in
@@ -22,19 +22,21 @@
with INTERFACES; use INTERFACES;
with RTEMS;
+with RTEMS.EVENT;
+with RTEMS.TASKS;
+with RTEMS.TIMER;
with TEST_SUPPORT;
with TEXT_IO;
with UNSIGNED32_IO;
package body MPTEST is
---PAGE
--
-- INIT
--
procedure INIT (
- ARGUMENT : in RTEMS.TASK_ARGUMENT
+ ARGUMENT : in RTEMS.TASKS.ARGUMENT
) is
STATUS : RTEMS.STATUS_CODES;
begin
@@ -51,7 +53,7 @@ package body MPTEST is
MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( '2', '2', '2', ' ' );
TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
- RTEMS.TASK_CREATE(
+ RTEMS.TASKS.CREATE(
MPTEST.TASK_NAME( TEST_SUPPORT.NODE ),
TEST_SUPPORT.NODE,
2048,
@@ -63,7 +65,7 @@ package body MPTEST is
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
- RTEMS.TASK_START(
+ RTEMS.TASKS.START(
MPTEST.TASK_ID( 1 ),
MPTEST.TEST_TASK'ACCESS,
0,
@@ -73,7 +75,7 @@ package body MPTEST is
MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' );
- RTEMS.TIMER_CREATE(
+ RTEMS.TIMER.CREATE(
MPTEST.TIMER_NAME( 1 ),
MPTEST.TIMER_ID( 1 ),
STATUS
@@ -81,12 +83,11 @@ package body MPTEST is
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
TEXT_IO.PUT_LINE( "Deleting initialization task" );
- RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+ RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
end INIT;
---PAGE
--
-- STOP_TEST_TSR
--
@@ -101,13 +102,12 @@ package body MPTEST is
end STOP_TEST_TSR;
---PAGE
--
-- TEST_TASK
--
procedure TEST_TASK (
- ARGUMENT : in RTEMS.TASK_ARGUMENT
+ ARGUMENT : in RTEMS.TASKS.ARGUMENT
) is
EVENT_OUT : RTEMS.EVENT_SET;
STATUS : RTEMS.STATUS_CODES;
@@ -126,7 +126,7 @@ package body MPTEST is
TEXT_IO.PUT_LINE( "Getting TID of remote task" );
loop
- RTEMS.TASK_IDENT(
+ RTEMS.TASKS.IDENT(
MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
RTEMS.SEARCH_ALL_NODES,
MPTEST.REMOTE_TID,
@@ -140,7 +140,7 @@ package body MPTEST is
if TEST_SUPPORT.NODE = 1 then
TEXT_IO.PUT_LINE( "Sending first event to remote task" );
- RTEMS.EVENT_SEND(
+ RTEMS.EVENT.SEND(
MPTEST.REMOTE_TID,
RTEMS.EVENT_16,
STATUS
@@ -149,7 +149,7 @@ package body MPTEST is
end if;
- RTEMS.TIMER_FIRE_AFTER(
+ RTEMS.TIMER.FIRE_AFTER(
MPTEST.TIMER_ID( 1 ),
5 * TEST_SUPPORT.TICKS_PER_SECOND,
MPTEST.STOP_TEST_TSR'ACCESS,
@@ -165,7 +165,7 @@ package body MPTEST is
for COUNT in 1 .. MPTEST.PER_DOT
loop
- RTEMS.EVENT_RECEIVE(
+ RTEMS.EVENT.RECEIVE(
RTEMS.EVENT_16,
RTEMS.DEFAULT_OPTIONS,
TEST_SUPPORT.TICKS_PER_SECOND,
@@ -182,7 +182,7 @@ package body MPTEST is
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" );
end if;
- RTEMS.EVENT_SEND(
+ RTEMS.EVENT.SEND(
MPTEST.REMOTE_TID,
RTEMS.EVENT_16,
STATUS
diff --git a/c/src/ada-tests/mptests/mp07/mptest.ads b/c/src/ada-tests/mptests/mp07/mptest.ads
index c33572f6e1..dee3e279c7 100644
--- a/c/src/ada-tests/mptests/mp07/mptest.ads
+++ b/c/src/ada-tests/mptests/mp07/mptest.ads
@@ -10,7 +10,7 @@
--
--
--
--- COPYRIGHT (c) 1989-1997.
+-- COPYRIGHT (c) 1989-2011.
-- On-Line Applications Research Corporation (OAR).
--
-- The license and distribution terms for this file may in
@@ -21,6 +21,7 @@
--
with RTEMS;
+with RTEMS.TASKS;
package MPTEST is
@@ -74,7 +75,7 @@ package MPTEST is
--
procedure INIT (
- ARGUMENT : in RTEMS.TASK_ARGUMENT
+ ARGUMENT : in RTEMS.TASKS.ARGUMENT
);
pragma Convention (C, INIT);
@@ -101,7 +102,7 @@ package MPTEST is
--
procedure TEST_TASK (
- ARGUMENT : in RTEMS.TASK_ARGUMENT
+ ARGUMENT : in RTEMS.TASKS.ARGUMENT
);
pragma Convention (C, TEST_TASK);
diff --git a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb b/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
index b6374c854f..3761d156b0 100644
--- a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
+++ b/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
@@ -10,7 +10,7 @@
--
--
--
--- COPYRIGHT (c) 1989-2007.
+-- COPYRIGHT (c) 1989-2011.
-- On-Line Applications Research Corporation (OAR).
--
-- The license and distribution terms for this file may in
@@ -21,6 +21,7 @@
--
with RTEMS;
+with RTEMS.TASKS;
with MPTEST;
with TEST_SUPPORT;
@@ -29,7 +30,7 @@ procedure MP07_NODE1 is
STATUS : RTEMS.STATUS_CODES;
begin
- RTEMS.TASK_CREATE(
+ RTEMS.TASKS.CREATE(
RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
1,
RTEMS.MINIMUM_STACK_SIZE,
@@ -41,7 +42,7 @@ begin
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
- RTEMS.TASK_START(
+ RTEMS.TASKS.START(
INIT_ID,
MPTEST.INIT'ACCESS,
0,
diff --git a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb b/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
index 2af6a98954..a1469bbe0f 100644
--- a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
+++ b/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
@@ -10,7 +10,7 @@
--
--
--
--- COPYRIGHT (c) 1989-2007.
+-- COPYRIGHT (c) 1989-2011.
-- On-Line Applications Research Corporation (OAR).
--
-- The license and distribution terms for this file may in
@@ -21,6 +21,7 @@
--
with RTEMS;
+with RTEMS.TASKS;
with MPTEST;
with TEST_SUPPORT;
@@ -29,7 +30,7 @@ procedure MP07_NODE2 is
STATUS : RTEMS.STATUS_CODES;
begin
- RTEMS.TASK_CREATE(
+ RTEMS.TASKS.CREATE(
RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ),
1,
RTEMS.MINIMUM_STACK_SIZE,
@@ -41,7 +42,7 @@ begin
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
- RTEMS.TASK_START(
+ RTEMS.TASKS.START(
INIT_ID,
MPTEST.INIT'ACCESS,
0,