diff options
Diffstat (limited to 'c/src/ada-tests/sptests/sp12/sptest.adb')
-rw-r--r-- | c/src/ada-tests/sptests/sp12/sptest.adb | 199 |
1 files changed, 97 insertions, 102 deletions
diff --git a/c/src/ada-tests/sptests/sp12/sptest.adb b/c/src/ada-tests/sptests/sp12/sptest.adb index 20e3aaaa67..93c7d411f8 100644 --- a/c/src/ada-tests/sptests/sp12/sptest.adb +++ b/c/src/ada-tests/sptests/sp12/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 @@ -24,16 +24,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; +with RTEMS.SEMAPHORE; 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; @@ -63,31 +63,31 @@ package body SPTEST is SPTEST.SEMAPHORE_NAME( 2 ) := RTEMS.BUILD_NAME( 'S', 'M', '2', ' ' ); SPTEST.SEMAPHORE_NAME( 3 ) := RTEMS.BUILD_NAME( 'S', 'M', '3', ' ' ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 1 ), 1, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 0, RTEMS.PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 3 ), 1, RTEMS.DEFAULT_ATTRIBUTES, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 3 ), STATUS ); @@ -105,17 +105,17 @@ TEST_SUPPORT.PAUSE; "INIT - Binary Semaphore and Priority Inheritance Test" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" ); TEXT_IO.PUT_LINE( "INIT - semaphore_create - allocated binary semaphore" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 0, RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); @@ -124,20 +124,20 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "INIT - semaphore_release - allocated binary semaphore" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" ); TEXT_IO.PUT_LINE( "INIT - semaphore_delete - allocated binary semaphore" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 1, RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); @@ -147,23 +147,23 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.PAUSE; - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" ); - RTEMS.SEMAPHORE_CREATE( + RTEMS.SEMAPHORE.CREATE( SPTEST.SEMAPHORE_NAME( 2 ), 0, RTEMS.PRIORITY, - RTEMS.NO_PRIORITY, + RTEMS.TASKS.NO_PRIORITY, SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 4, 2048, @@ -174,7 +174,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 4, 2048, @@ -185,7 +185,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 4, 2048, @@ -196,7 +196,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -204,7 +204,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 2 ), SPTEST.TASK_2'ACCESS, 0, @@ -212,7 +212,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 3 ), SPTEST.TASK_3'ACCESS, 0, @@ -220,12 +220,11 @@ TEST_SUPPORT.PAUSE; ); 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 -- -- PRIORITY_TEST_DRIVER -- @@ -233,7 +232,7 @@ TEST_SUPPORT.PAUSE; procedure PRIORITY_TEST_DRIVER ( PRIORITY_BASE : in RTEMS.UNSIGNED32 ) is - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -243,12 +242,12 @@ TEST_SUPPORT.PAUSE; case INDEX is when 1 | 2 | 3 => SPTEST.TASK_PRIORITY( INDEX ) := - PRIORITY_BASE + RTEMS.TASK_PRIORITY( INDEX ); + PRIORITY_BASE + RTEMS.TASKS.PRIORITY( INDEX ); when others => SPTEST.TASK_PRIORITY( INDEX ) := PRIORITY_BASE + 3; end case; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.PRIORITY_TASK_NAME( INDEX ), SPTEST.TASK_PRIORITY( INDEX ), 2048, @@ -266,10 +265,10 @@ TEST_SUPPORT.PAUSE; for INDEX in 1 .. 5 loop - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.PRIORITY_TASK_ID( INDEX ), SPTEST.PRIORITY_TASK'ACCESS, - RTEMS.TASK_ARGUMENT( INDEX ), + RTEMS.TASKS.ARGUMENT( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); @@ -281,20 +280,20 @@ TEST_SUPPORT.PAUSE; for INDEX in reverse 1 .. 5 loop - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.PRIORITY_TASK_ID( INDEX ), SPTEST.PRIORITY_TASK'ACCESS, - RTEMS.TASK_ARGUMENT( INDEX ), + RTEMS.TASKS.ARGUMENT( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); - 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 LOOP" ); if PRIORITY_BASE = 64 then if INDEX = 4 then - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.PRIORITY_TASK_ID( 5 ), PRIORITY_BASE + 4, PREVIOUS_PRIORITY, @@ -311,9 +310,9 @@ TEST_SUPPORT.PAUSE; ); end if; - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.PRIORITY_TASK_ID( 5 ), - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, PREVIOUS_PRIORITY, STATUS ); @@ -330,14 +329,14 @@ TEST_SUPPORT.PAUSE; 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 AFTER LOOP" ); if PRIORITY_BASE = 0 then for INDEX in 1 .. 5 loop - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); @@ -352,23 +351,23 @@ TEST_SUPPORT.PAUSE; if PRIORITY_BASE = 64 then TEXT_IO.PUT_LINE( "PDRV - task_resume - PRI5" ); - RTEMS.TASK_RESUME( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); + RTEMS.TASKS.RESUME( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); - 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 SO PRI5 can run" ); - RTEMS.TASK_DELETE( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF PRI5" ); else for INDEX in 1 .. 5 loop - RTEMS.TASK_DELETE( + RTEMS.TASKS.DELETE( SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS ); @@ -380,17 +379,16 @@ TEST_SUPPORT.PAUSE; end PRIORITY_TEST_DRIVER; ---PAGE -- -- PRIORITY_TASK -- procedure PRIORITY_TASK ( - ITS_INDEX : in RTEMS.TASK_ARGUMENT + ITS_INDEX : in RTEMS.TASKS.ARGUMENT ) is TIMEOUT : RTEMS.INTERVAL; - ITS_PRIORITY : RTEMS.TASK_PRIORITY; - CURRENT_PRIORITY : RTEMS.TASK_PRIORITY; + ITS_PRIORITY : RTEMS.TASKS.PRIORITY; + CURRENT_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -405,7 +403,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.PUT_NAME( PRIORITY_TASK_NAME( INTEGER(ITS_INDEX) ), FALSE ); TEXT_IO.PUT_LINE( " - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_OPTIONS, TIMEOUT, @@ -428,20 +426,20 @@ TEST_SUPPORT.PAUSE; ); end if; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); TEXT_IO.PUT_LINE( "PRI5 - task_delete - all tasks waiting on SM2" ); for INDEX in 1 .. 4 loop - RTEMS.TASK_DELETE( SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" ); end loop; TEXT_IO.PUT_LINE( "PRI5 - semaphore_obtain - nested" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_OPTIONS, TIMEOUT, @@ -450,16 +448,16 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN NESTED" ); TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - nested" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE NESTED" ); TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - restore priority" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( SPTEST.PRIORITY_TASK_ID( 5 ), - RTEMS.CURRENT_PRIORITY, + RTEMS.TASKS.CURRENT_PRIORITY, CURRENT_PRIORITY, STATUS ); @@ -470,24 +468,25 @@ TEST_SUPPORT.PAUSE; STATUS, "PRI5 TASK_SET_PRIORITY CURRENT" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); + -- DOES NOT RETURN. Following check makes compiler happy + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end PRIORITY_TASK; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); SMID : RTEMS.ID; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.SEMAPHORE_IDENT( + RTEMS.SEMAPHORE.IDENT( SPTEST.SEMAPHORE_NAME( 1 ), RTEMS.SEARCH_ALL_NODES, SMID, @@ -499,7 +498,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.NEW_LINE; TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -510,7 +509,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM2" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM3" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 3 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -521,7 +520,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM3" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - get SM1 - NO_WAIT" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.NO_WAIT, RTEMS.NO_TIMEOUT, @@ -532,19 +531,19 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM1" ); TEXT_IO.PUT_LINE( "TA1 - 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" ); TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" ); - RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - waiting for SM1 with 10 second timeout" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, 10 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -555,23 +554,23 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - got SM1" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM2" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" ); TEXT_IO.PUT_LINE( "TA1 - 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" ); TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA3" ); - 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( 4 ), 4, 2048, @@ -582,7 +581,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 5 ), 4, 2048, @@ -593,7 +592,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 4 ), SPTEST.TASK_4'ACCESS, 0, @@ -601,7 +600,7 @@ TEST_SUPPORT.PAUSE; ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 5 ), SPTEST.TASK_5'ACCESS, 0, @@ -610,53 +609,52 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA5" ); TEXT_IO.PUT_LINE( "TA1 - 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" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA4" ); - RTEMS.TASK_DELETE( SPTEST.TASK_ID( 4 ), STATUS ); + RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 4 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" ); TEXT_IO.PUT_LINE( "TA1 - 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" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM1" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM1" ); TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM3" ); - RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 3 ), STATUS ); + RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM3" ); TEXT_IO.PUT_LINE( "TA1 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" ); 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; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; begin TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -667,7 +665,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - got SM1" ); TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM1" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS ); @@ -676,7 +674,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - task_set_priority - make self highest priority task" ); - RTEMS.TASK_SET_PRIORITY( + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 3, PREVIOUS_PRIORITY, @@ -685,7 +683,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY ON TA2" ); TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -696,32 +694,31 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA2 - got SM2" ); TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM2" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" ); TEXT_IO.PUT_LINE( "TA2 - task_delete - delete self" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF 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 - semaphore_obtain - wait forever on SM2" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 2 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -731,14 +728,14 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA3 - got SM2" ); TEXT_IO.PUT_LINE( "TA3 - semaphore_release - release SM2" ); - RTEMS.SEMAPHORE_RELEASE( + RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" ); TEXT_IO.PUT_LINE( "TA3 - semaphore_obtain - wait forever on SM3" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 3 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -748,20 +745,19 @@ TEST_SUPPORT.PAUSE; end TASK_3; ---PAGE -- -- TASK_4 -- procedure TASK_4 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA4 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -771,20 +767,19 @@ TEST_SUPPORT.PAUSE; end TASK_4; ---PAGE -- -- TASK_5 -- procedure TASK_5 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, @@ -795,7 +790,7 @@ TEST_SUPPORT.PAUSE; TEXT_IO.PUT_LINE( "TA5 - got SM1" ); TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" ); - RTEMS.SEMAPHORE_OBTAIN( + RTEMS.SEMAPHORE.OBTAIN( SPTEST.SEMAPHORE_ID( 1 ), RTEMS.DEFAULT_MODES, RTEMS.NO_TIMEOUT, |