diff options
Diffstat (limited to 'c/src/ada-tests/sptests/sp02/sptest.adb')
-rw-r--r-- | c/src/ada-tests/sptests/sp02/sptest.adb | 81 |
1 files changed, 38 insertions, 43 deletions
diff --git a/c/src/ada-tests/sptests/sp02/sptest.adb b/c/src/ada-tests/sptests/sp02/sptest.adb index affbdead6a..45f9425f9f 100644 --- a/c/src/ada-tests/sptests/sp02/sptest.adb +++ b/c/src/ada-tests/sptests/sp02/sptest.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 @@ -27,13 +27,12 @@ with UNSIGNED32_IO; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -44,7 +43,7 @@ package body SPTEST is SPTEST.PREEMPT_TASK_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'M', 'T' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.PREEMPT_TASK_NAME, 1, 2048, @@ -55,7 +54,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF PREEMPT" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.PREEMPT_TASK_ID, SPTEST.PREEMPT_TASK'ACCESS, 0, @@ -64,14 +63,14 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF PREEMPT" ); TEXT_IO.PUT_LINE( "INIT - task_wake_after - yielding processor" ); - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME( 'T', 'A', '3', ' ' ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 3, 2048, @@ -82,7 +81,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 3, 2048, @@ -93,7 +92,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 3, 2048, @@ -104,7 +103,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -112,7 +111,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 2 ), SPTEST.TASK_2'ACCESS, 0, @@ -120,7 +119,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 3 ), SPTEST.TASK_3'ACCESS, 0, @@ -132,19 +131,19 @@ package body SPTEST is "INIT - suspending TA2 while middle task on a ready chain" ); - RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.SUSPEND( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 1 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 3 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 1, 2048, @@ -155,7 +154,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 3, 2048, @@ -166,7 +165,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 3, 2048, @@ -177,7 +176,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -185,7 +184,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 2 ), SPTEST.TASK_2'ACCESS, 0, @@ -193,7 +192,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 3 ), SPTEST.TASK_3'ACCESS, 0, @@ -201,49 +200,47 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PREEMPT_TASK -- procedure PREEMPT_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "PREEMPT - task_delete - deleting self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF PREEMPT" ); end PREEMPT_TASK; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TID2 : RTEMS.ID; TID3 : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 1 second" ); - RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( SPTEST.TASK_NAME( 2 ), RTEMS.SEARCH_ALL_NODES, TID2, @@ -255,7 +252,7 @@ package body SPTEST is UNSIGNED32_IO.PUT( TID2, WIDTH => 8, BASE => 10#16# ); TEXT_IO.PUT_LINE( ")" ); - RTEMS.TASK_IDENT( + RTEMS.TASKS.IDENT( SPTEST.TASK_NAME( 3 ), RTEMS.SEARCH_ALL_NODES, TID3, @@ -267,7 +264,7 @@ package body SPTEST is UNSIGNED32_IO.PUT( TID3, WIDTH => 8, BASE => 10#16# ); TEXT_IO.PUT_LINE( ")" ); - RTEMS.TASK_SET_PRIORITY( TID3, 2, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( TID3, 2, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); TEXT_IO.PUT_LINE( @@ -275,15 +272,15 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2" ); - RTEMS.TASK_SUSPEND( TID2, STATUS ); + RTEMS.TASKS.SUSPEND( TID2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA2" ); - RTEMS.TASK_DELETE( TID2, STATUS ); + RTEMS.TASKS.DELETE( TID2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" ); TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep for 5 seconds" ); - 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 2 ***" ); @@ -291,42 +288,40 @@ package body SPTEST 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; begin TEXT_IO.PUT_LINE( "TA2 - task_wake_after - sleep 1 minute" ); - RTEMS.TASK_WAKE_AFTER( 60 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); + RTEMS.TASKS.WAKE_AFTER( 60 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER IN TA2" ); 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 TEXT_IO.PUT_LINE( "TA3 - task_wake_after - sleep 5 seconds" ); - 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 IN TA3" ); TEXT_IO.PUT_LINE( "TA3 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" ); end TASK_3; |