diff options
Diffstat (limited to 'c/src/ada-tests/sptests/sp17/sptest.adb')
| -rw-r--r-- | c/src/ada-tests/sptests/sp17/sptest.adb | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/c/src/ada-tests/sptests/sp17/sptest.adb b/c/src/ada-tests/sptests/sp17/sptest.adb index bd26c66422..5d5bbbf695 100644 --- a/c/src/ada-tests/sptests/sp17/sptest.adb +++ b/c/src/ada-tests/sptests/sp17/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 @@ -23,16 +23,16 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.SIGNAL; 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; @@ -46,7 +46,7 @@ package body SPTEST is SPTEST.TASK_2_PREEMPTED := FALSE; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 1 ), 2, 2048, @@ -57,7 +57,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 2 ), 1, 2048, @@ -68,7 +68,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( 1 ), SPTEST.TASK_1'ACCESS, 0, @@ -76,7 +76,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, @@ -84,12 +84,11 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- PROCESS_ASR -- @@ -101,25 +100,24 @@ package body SPTEST is STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_RESUME( SPTEST.TASK_ID( 2 ), STATUS ); + RTEMS.TASKS.RESUME( SPTEST.TASK_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "ASR - TASK_RESUME OF TA2" ); end PROCESS_ASR; ---PAGE -- -- TASK_1 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; begin TEXT_IO.PUT_LINE( "TA1 - signal_catch: initializing signal catcher" ); - RTEMS.SIGNAL_CATCH( + RTEMS.SIGNAL.CATCH( SPTEST.PROCESS_ASR'ACCESS, RTEMS.NO_ASR + RTEMS.NO_PREEMPT, STATUS @@ -127,7 +125,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); TEXT_IO.PUT_LINE( "TA1 - Sending signal to self" ); - RTEMS.SIGNAL_SEND( + RTEMS.SIGNAL.SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_16, STATUS @@ -145,13 +143,12 @@ 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; @@ -160,14 +157,14 @@ package body SPTEST is SPTEST.TASK_2_PREEMPTED := FALSE; TEXT_IO.PUT_LINE( "TA2 - Suspending self" ); - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); TEXT_IO.PUT_LINE( "TA2 - signal_return preempted correctly" ); SPTEST.TASK_2_PREEMPTED := TRUE; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" ); end TASK_2; |