diff options
Diffstat (limited to 'c/src/ada-tests/samples/ticker/sptest.adb')
-rw-r--r-- | c/src/ada-tests/samples/ticker/sptest.adb | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/c/src/ada-tests/samples/ticker/sptest.adb b/c/src/ada-tests/samples/ticker/sptest.adb index 7d9bfd6fa5..5d9ab4fb69 100644 --- a/c/src/ada-tests/samples/ticker/sptest.adb +++ b/c/src/ada-tests/samples/ticker/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.CLOCK; 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,14 +44,14 @@ 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', ' ' ); 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 ), 1, 2048, @@ -62,7 +62,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, @@ -73,7 +73,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( SPTEST.TASK_NAME( 3 ), 1, 2048, @@ -84,7 +84,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_THROUGH_3'ACCESS, 0, @@ -92,7 +92,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_1_THROUGH_3'ACCESS, 0, @@ -100,7 +100,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_1_THROUGH_3'ACCESS, 0, @@ -108,18 +108,17 @@ 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 -- -- TASK_1_THROUGH_3 -- procedure TASK_1_THROUGH_3 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); TID : RTEMS.ID; @@ -127,12 +126,12 @@ package body SPTEST is 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.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 @@ -148,7 +147,7 @@ package body SPTEST is TEST_SUPPORT.PRINT_TIME( "- clock_get - ", TIME, "" ); TEXT_IO.NEW_LINE; - RTEMS.TASK_WAKE_AFTER( + RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS |