diff options
Diffstat (limited to 'c/src/ada-tests/sptests/sp24/sptest.adb')
| -rw-r--r-- | c/src/ada-tests/sptests/sp24/sptest.adb | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/c/src/ada-tests/sptests/sp24/sptest.adb b/c/src/ada-tests/sptests/sp24/sptest.adb index 97a6aed1a5..bc8c8c6a82 100644 --- a/c/src/ada-tests/sptests/sp24/sptest.adb +++ b/c/src/ada-tests/sptests/sp24/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,17 @@ with INTERFACES; use INTERFACES; with TEST_SUPPORT; with TEXT_IO; +with RTEMS.CLOCK; +with RTEMS.TIMER; package body SPTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TIME : RTEMS.TIME_OF_DAY; @@ -44,7 +45,7 @@ package body SPTEST is TIME := ( 1988, 12, 31, 9, 0, 0, 0 ); - RTEMS.CLOCK_SET( TIME, STATUS ); + RTEMS.CLOCK.SET( TIME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); @@ -58,7 +59,7 @@ package body SPTEST is for INDEX in 1 .. 3 loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( INDEX ), 1, 2048, @@ -69,7 +70,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TIMER_CREATE( + RTEMS.TIMER.CREATE( SPTEST.TIMER_NAME( INDEX ), SPTEST.TIMER_ID( INDEX ), STATUS @@ -81,22 +82,21 @@ package body SPTEST is for INDEX in 1 .. 3 loop - RTEMS.TASK_START( + RTEMS.TASKS.START( SPTEST.TASK_ID( INDEX ), SPTEST.TASK_1_THROUGH_3'ACCESS, - RTEMS.TASK_ARGUMENT( INDEX ), + RTEMS.TASKS.ARGUMENT( INDEX ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- RESUME_TASK -- @@ -111,30 +111,29 @@ package body SPTEST is begin TASK_TO_RESUME := SPTEST.TASK_ID(INTEGER( RTEMS.GET_INDEX( TIMER_ID ) )); - RTEMS.TASK_RESUME( TASK_TO_RESUME, STATUS ); + RTEMS.TASKS.RESUME( TASK_TO_RESUME, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" ); end RESUME_TASK; ---PAGE -- -- TASK_1_THROUGH_3 -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is TID : RTEMS.ID; TIME : RTEMS.TIME_OF_DAY; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS ); + RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" ); loop - RTEMS.TIMER_FIRE_AFTER( + RTEMS.TIMER.FIRE_AFTER( SPTEST.TIMER_ID( INTEGER( ARGUMENT ) ), TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * TEST_SUPPORT.TICKS_PER_SECOND, @@ -144,7 +143,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); - RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS ); + RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" ); if TIME.SECOND >= 35 then @@ -160,7 +159,7 @@ package body SPTEST is TEST_SUPPORT.PRINT_TIME( " - clock_get - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); + RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" ); end loop; |