diff options
Diffstat (limited to 'c/src/ada-tests/mptests/mp13/mptest.adb')
-rw-r--r-- | c/src/ada-tests/mptests/mp13/mptest.adb | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/c/src/ada-tests/mptests/mp13/mptest.adb b/c/src/ada-tests/mptests/mp13/mptest.adb index 47eaafaaf5..f1369d5ccd 100644 --- a/c/src/ada-tests/mptests/mp13/mptest.adb +++ b/c/src/ada-tests/mptests/mp13/mptest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-1997. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -22,19 +22,21 @@ with INTERFACES; use INTERFACES; with RTEMS; +with RTEMS.MESSAGE_QUEUE; +with RTEMS.SEMAPHORE; +with RTEMS.TASKS; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; package body MPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -57,7 +59,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" ); - RTEMS.MESSAGE_QUEUE_CREATE( + RTEMS.MESSAGE_QUEUE.CREATE( MPTEST.QUEUE_NAME( 1 ), 3, RTEMS.GLOBAL + RTEMS.LIMIT, @@ -67,7 +69,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" ); TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( MPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.GLOBAL + RTEMS.PRIORITY, @@ -76,7 +78,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -87,7 +89,7 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 1 ), 1, 2048, @@ -99,7 +101,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 1 ), MPTEST.TEST_TASK_1'ACCESS, 0, @@ -108,7 +110,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( MPTEST.TASK_NAME( 2 ), 1, 2048, @@ -120,7 +122,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( MPTEST.TASK_ID( 2 ), MPTEST.TEST_TASK_2'ACCESS, 0, @@ -130,7 +132,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then - RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" ); @@ -140,18 +142,17 @@ package body MPTEST is end if; TEXT_IO.PUT_LINE( "Deleting initialization task" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TEST_TASK_1 -- procedure TEST_TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is COUNT : RTEMS.UNSIGNED32; RECEIVE_BUFFER_AREA : RTEMS.BUFFER; @@ -166,7 +167,7 @@ package body MPTEST is loop - RTEMS.MESSAGE_QUEUE_IDENT( + RTEMS.MESSAGE_QUEUE.IDENT( MPTEST.QUEUE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.QUEUE_ID( 1 ), @@ -180,7 +181,7 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Receiving message ..." ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), RECEIVE_BUFFER, RTEMS.DEFAULT_OPTIONS, @@ -192,11 +193,11 @@ package body MPTEST is end if; - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Receiving message ..." ); - RTEMS.MESSAGE_QUEUE_RECEIVE( + RTEMS.MESSAGE_QUEUE.RECEIVE( MPTEST.QUEUE_ID( 1 ), RECEIVE_BUFFER, RTEMS.DEFAULT_OPTIONS, @@ -219,18 +220,17 @@ package body MPTEST is ); TEXT_IO.PUT_LINE( "Deleting self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end TEST_TASK_1; ---PAGE -- -- TEST_TASK_2 -- procedure TEST_TASK_2 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is STATUS : RTEMS.STATUS_CODES; begin @@ -239,7 +239,7 @@ package body MPTEST is loop - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( MPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, MPTEST.SEMAPHORE_ID( 1 ), @@ -252,18 +252,18 @@ package body MPTEST is if TEST_SUPPORT.NODE = 1 then - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Releasing semaphore ..." ); - RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -272,7 +272,7 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -283,11 +283,11 @@ package body MPTEST is end if; - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, RTEMS.NO_TIMEOUT, @@ -296,14 +296,14 @@ package body MPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" ); TEXT_IO.PUT_LINE( "Releasing semaphore ..." ); - RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TEXT_IO.PUT_LINE( "Getting semaphore ..." ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( MPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_OPTIONS, 2 * TEST_SUPPORT.TICKS_PER_SECOND, |